Merged revisions 42277-42278,42286-42290,42292-42293,42297,42300-42301,42303,42305-42306 via svnmerge from

https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk ........ r42277 | drmccoy | 2009-07-09 12:54:10 +1000 (Thu, 09 Jul 2009) | 1 line Giving Font its own real class ........ r42278 | dreammaster | 2009-07-09 13:07:30 +1000 (Thu, 09 Jul 2009) | 1 line Changed the status of the cruise engine to be enabled by default ........ r42286 | drmccoy | 2009-07-09 19:39:51 +1000 (Thu, 09 Jul 2009) | 1 line Warn instead of crash when a video frame part was found although the header says there's no video ........ r42287 | thebluegr | 2009-07-09 23:17:46 +1000 (Thu, 09 Jul 2009) | 1 line Renamed sound/iff.* to sound/iff_sound.* to fix an issue with the upcoming changes to the MSVC project files (sound/iff.* produces iff.obj, which clashes with iff.obj from graphics/iff.*) ........ r42288 | thebluegr | 2009-07-10 01:12:35 +1000 (Fri, 10 Jul 2009) | 3 lines - Rewrote and greatly simplified the MSVC8 and MSVC9 project files so that they use common compilation properties, based on patch #2774908. These common properties make it much simpler to change options and compilation defines globally, similar to how GCC *.mk files do. Also, this fixes problems where an ENABLE_* define was set for one project file but not another (like the situation in revisions 42257 and 42259). It's now much easier to construct a tool which will create the project files dynamically. - Dropped support for MSVC7 and MSVC7.1 for now (as they don't support common compilation properties and it's no longer easy to construct them from the MSVC8 ones) - hopefully, they will return in the future, once we got a more sophisticated tool to create them - Simplified the MSVC9 <-> MSVC8 conversion tools a bit ........ r42289 | thebluegr | 2009-07-10 01:15:49 +1000 (Fri, 10 Jul 2009) | 1 line Reverted commit #42257, as the original issue was with the compilation process of MSVC and the ENABLE_* checks work correctly ........ r42290 | thebluegr | 2009-07-10 01:17:45 +1000 (Fri, 10 Jul 2009) | 1 line Added proper safeguards for shorten.*, thereby fixing commit 42259 ........ r42292 | lordhoto | 2009-07-10 01:32:06 +1000 (Fri, 10 Jul 2009) | 1 line Cleanup. ........ r42293 | lordhoto | 2009-07-10 01:32:25 +1000 (Fri, 10 Jul 2009) | 1 line Cleanup rollDice (the results of the old and the new function are almost identical). ........ r42297 | thebluegr | 2009-07-10 01:46:26 +1000 (Fri, 10 Jul 2009) | 1 line restAdjust should be a signed integer. Fixes crashes with SCI1 games that take absolute lofs parameters (a regression of commit #42260) ........ r42300 | thebluegr | 2009-07-10 01:54:18 +1000 (Fri, 10 Jul 2009) | 1 line Applied patch #2818845 - "SCI: resource.map detection for SCI1/1.1 fixed", with some slight formatting changes ........ r42301 | lordhoto | 2009-07-10 01:59:20 +1000 (Fri, 10 Jul 2009) | 1 line Fix wrong format arugment. ........ r42303 | lordhoto | 2009-07-10 02:16:08 +1000 (Fri, 10 Jul 2009) | 1 line By comparing the commit log of r42300, it seems that "off" was renamed to "lastDirectoryOffset". I changed the SCI32 specific code to use that now. I can't assure this is anyhow correct, so anyone with knowledge of this code please check it. ........ r42305 | lordhoto | 2009-07-10 02:23:22 +1000 (Fri, 10 Jul 2009) | 1 line Add fixme about SCI32 specific code. ........ r42306 | lordhoto | 2009-07-10 02:24:59 +1000 (Fri, 10 Jul 2009) | 1 line Oops specify the correct revsision number in the fixme. ........ svn-id: r42318
author: Travis Howell 2009-07-10 00:07:26 +0000
committer: Travis Howell 2009-07-10 00:07:26 +0000
commit: 4e99bee142899dae1385210012dd34453920fe54 (patch)
tree: 1ff2f4e640b6aa7cbe8e35b887e55c6c3e063de8
parent: ff208c5387a8566546a384afa9ab48c0a1f356a0 (diff)
parent: e8e9b882275b8dc5d77db3b1faaf30466c7b7a31 (diff)
download: scummvm-rg350-4e99bee142899dae1385210012dd34453920fe54.tar.gz
scummvm-rg350-4e99bee142899dae1385210012dd34453920fe54.tar.bz2
scummvm-rg350-4e99bee142899dae1385210012dd34453920fe54.zip
140 files changed, 4020 insertions, 37757 deletions
diff --git a/configure b/configure
index db9dc908a5..7cced38278 100755
--- a/configure
+++ b/configure
@@ -73,7 +73,7 @@ add_engine agi "AGI" yes
 add_engine agos "AGOS" yes "pn"
 add_engine pn "Personal Nightmare" no
 add_engine cine "Cinematique evo 1" yes
-add_engine cruise "Cinematique evo 2" no
+add_engine cruise "Cinematique evo 2" yes
 add_engine drascula "Drascula: The Vampire Strikes Back" yes
 add_engine gob "Gobli*ns" yes
 add_engine groovie "Groovie" yes
diff --git a/dists/msvc7/agi.vcproj b/dists/msvc7/agi.vcproj
deleted file mode 100644
index 1bbeeb0364..0000000000
--- a/dists/msvc7/agi.vcproj
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7,00"
-	Name="agi"
-	ProjectGUID="{F5F57066-CDF4-4F80-B9E7-7F4D21850D6E}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="agi_Debug"
-			IntermediateDirectory="agi_Debug"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="TRUE"
-				ExceptionHandling="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				SuppressStartupBanner="FALSE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/agi.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="agi_Release"
-			IntermediateDirectory="agi_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="TRUE"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="TRUE"
-				ExceptionHandling="TRUE"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="FALSE"
-				EnableFunctionLevelLinking="FALSE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				DebugInformationFormat="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/agi.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<File
-			RelativePath="..\..\engines\agi\agi.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\agi.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\checks.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\console.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\console.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\cycle.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\detection.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\font.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\global.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\graphics.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\graphics.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\id.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\inv.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\keyboard.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\keyboard.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\loader_v2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\loader_v3.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\logic.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\logic.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\lzw.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\lzw.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\menu.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\menu.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\motion.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\objects.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\op_cmd.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\op_dbg.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\op_test.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\opcodes.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\picture.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\picture.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\preagi.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\preagi.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\preagi_common.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\preagi_common.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\preagi_mickey.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\preagi_mickey.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\preagi_troll.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\preagi_troll.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\preagi_winnie.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\preagi_winnie.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\predictive.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\saveload.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\sound.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\sound.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\sprite.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\sprite.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\text.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\view.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\view.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\wagparser.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\wagparser.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\words.cpp">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/dists/msvc7/agos.vcproj b/dists/msvc7/agos.vcproj
deleted file mode 100644
index 4e9882dc7a..0000000000
--- a/dists/msvc7/agos.vcproj
+++ /dev/null
@@ -1,280 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7,00"
-	Name="agos"
-	ProjectGUID="{E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="agos_Debug"
-			IntermediateDirectory="agos_Debug"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="TRUE"
-				ExceptionHandling="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="FALSE"
-				SuppressStartupBanner="FALSE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/agos.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="agos_Release"
-			IntermediateDirectory="agos_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="TRUE"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="TRUE"
-				ExceptionHandling="TRUE"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="FALSE"
-				EnableFunctionLevelLinking="FALSE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				DebugInformationFormat="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/agos.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<File
-			RelativePath="..\..\engines\agos\agos.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\agos.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\animation.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\animation.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\charset-fontdata.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\charset.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\contain.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\cursor.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\debug.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\debug.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\debugger.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\debugger.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\detection.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\detection_tables.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\draw.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\event.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\feeble.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\gfx.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\icons.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\input.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\intern.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\items.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\menus.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\midi.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\midi.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\midiparser_s1d.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\oracle.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\pn.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\res.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\res_ami.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\res_snd.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\rooms.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\saveload.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\script.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\script_e1.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\script_e2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\script_ff.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\script_pn.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\script_pp.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\script_s1.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\script_s2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\script_ww.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\sound.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\sound.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\string.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\subroutine.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\verb.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\vga.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\vga.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\vga_e2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\vga_ff.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\vga_pn.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\vga_s1.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\vga_s2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\vga_ww.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\window.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\zones.cpp">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/dists/msvc7/cine.vcproj b/dists/msvc7/cine.vcproj
deleted file mode 100644
index e5363f7724..0000000000
--- a/dists/msvc7/cine.vcproj
+++ /dev/null
@@ -1,223 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7,00"
-	Name="cine"
-	ProjectGUID="{1CA4AC50-5426-433A-8B5E-FFE39568098E}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="cine_Debug"
-			IntermediateDirectory="cine_Debug"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="TRUE"
-				ExceptionHandling="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				SuppressStartupBanner="FALSE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/cine.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="cine_Release"
-			IntermediateDirectory="cine_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="TRUE"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="TRUE"
-				ExceptionHandling="TRUE"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="FALSE"
-				EnableFunctionLevelLinking="FALSE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				DebugInformationFormat="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/cine.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<File
-			RelativePath="..\..\engines\cine\anim.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\anim.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\bg.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\bg.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\bg_list.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\bg_list.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\cine.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\cine.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\detection.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\gfx.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\gfx.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\main_loop.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\main_loop.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\msg.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\msg.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\object.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\object.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\pal.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\pal.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\part.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\part.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\prc.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\prc.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\rel.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\rel.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\saveload.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\saveload.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\script.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\script_fw.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\script_os.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\sound.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\sound.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\texte.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\texte.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\unpack.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\unpack.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\various.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\various.h">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/dists/msvc7/cruise.vcproj b/dists/msvc7/cruise.vcproj
deleted file mode 100644
index 8a1bd8a7a0..0000000000
--- a/dists/msvc7/cruise.vcproj
+++ /dev/null
@@ -1,283 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7,00"
-	Name="cruise"
-	ProjectGUID="{8863B00B-059A-471E-876D-A955ECEFD0D2}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="cruise_Debug"
-			IntermediateDirectory="cruise_Debug"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="TRUE"
-				ExceptionHandling="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				SuppressStartupBanner="FALSE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/cruise.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="cruise_Release"
-			IntermediateDirectory="cruise_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="TRUE"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="TRUE"
-				ExceptionHandling="TRUE"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="FALSE"
-				EnableFunctionLevelLinking="FALSE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				DebugInformationFormat="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/cruise.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<File
-			RelativePath="..\..\engines\cruise\actor.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\actor.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\background.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\background.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\backgroundIncrust.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\backgroundIncrust.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\cell.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\cell.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\cruise.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\cruise.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\cruise_main.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\cruise_main.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\ctp.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\ctp.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\dataLoader.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\dataLoader.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\debugger.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\debugger.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\delphine-unpack.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\detection.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\font.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\font.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\function.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\function.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\gfxModule.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\gfxModule.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\linker.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\linker.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\mainDraw.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\mainDraw.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\menu.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\menu.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\mouse.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\mouse.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\object.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\object.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\overlay.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\overlay.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\perso.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\perso.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\polys.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\polys.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\saveload.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\saveload.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\script.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\script.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\sound.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\sound.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\stack.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\stack.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\staticres.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\staticres.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\various.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\various.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\vars.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\vars.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\volume.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\volume.h">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/dists/msvc7/drascula.vcproj b/dists/msvc7/drascula.vcproj
deleted file mode 100644
index 70f51b89c3..0000000000
--- a/dists/msvc7/drascula.vcproj
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7,00"
-	Name="drascula"
-	ProjectGUID="{CF888EE2-239C-40D7-83F1-1CDD4F7D56E3}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="drascula_Debug"
-			IntermediateDirectory="drascula_Debug"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="TRUE"
-				ExceptionHandling="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				SuppressStartupBanner="FALSE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/drascula.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="drascula_Release"
-			IntermediateDirectory="drascula_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="TRUE"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="TRUE"
-				ExceptionHandling="TRUE"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="FALSE"
-				EnableFunctionLevelLinking="FALSE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				DebugInformationFormat="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/drascula.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<File
-			RelativePath="..\..\engines\drascula\actors.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\animation.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\converse.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\detection.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\drascula.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\drascula.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\graphics.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\interface.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\objects.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\palette.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\rooms.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\saveload.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\sound.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\talk.cpp">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/dists/msvc7/gob.vcproj b/dists/msvc7/gob.vcproj
deleted file mode 100644
index 9919d09c9f..0000000000
--- a/dists/msvc7/gob.vcproj
+++ /dev/null
@@ -1,469 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7,00"
-	Name="gob"
-	ProjectGUID="{976D947A-A45F-4437-991E-412F695C64C7}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="gob_Debug"
-			IntermediateDirectory="gob_Debug"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="TRUE"
-				ExceptionHandling="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				SuppressStartupBanner="FALSE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/gob.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="gob_Release"
-			IntermediateDirectory="gob_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="TRUE"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="TRUE"
-				ExceptionHandling="TRUE"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="FALSE"
-				EnableFunctionLevelLinking="FALSE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				DebugInformationFormat="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/gob.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<Filter
-			Name="sound">
-			<File
-				RelativePath="..\..\engines\gob\sound\adlib.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\adlib.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\bgatmosphere.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\bgatmosphere.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\cdrom.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\cdrom.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\infogrames.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\infogrames.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\pcspeaker.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\pcspeaker.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\protracker.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\protracker.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\sound.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\sound.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\soundblaster.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\soundblaster.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\sounddesc.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\sounddesc.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\soundmixer.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\soundmixer.h">
-			</File>
-		</Filter>
-		<File
-			RelativePath="..\..\engines\gob\demos\batplayer.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\demos\batplayer.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\dataio.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\dataio.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\demos\demoplayer.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\demos\demoplayer.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\detection.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\draw.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\draw.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\draw_bargon.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\draw_fascin.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\draw_v1.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\draw_v2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\driver_vga.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\driver_vga.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\expression.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\expression.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\game.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\game.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\global.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\global.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\gob.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\gob.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\goblin.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\goblin.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\goblin_v1.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\goblin_v2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\goblin_v3.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\goblin_v4.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\helper.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\hotspots.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\hotspots.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\init.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\init.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\init_v1.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\init_v2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\init_v3.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\init_v6.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\inter.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\inter.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\inter_bargon.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\inter_fascin.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\inter_v1.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\inter_v2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\inter_v3.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\inter_v4.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\inter_v5.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\inter_v6.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\map.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\map.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\map_v1.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\map_v2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\map_v4.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\mult.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\mult.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\mult_v1.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\mult_v2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\palanim.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\palanim.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\resources.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\resources.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveconverter.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveconverter.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveconverter_v2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveconverter_v3.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveconverter_v4.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveconverter_v6.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\savefile.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\savefile.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\savehandler.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\savehandler.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveload.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveload.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveload_v2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveload_v3.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveload_v4.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveload_v6.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveload_playtoons.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\scenery.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\scenery.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\scenery_v1.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\scenery_v2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\demos\scnplayer.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\demos\scnplayer.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\script.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\script.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\totfile.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\totfile.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\util.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\util.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\variables.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\variables.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\video.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\video.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\video_v1.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\video_v2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\video_v6.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\videoplayer.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\videoplayer.h">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/dists/msvc7/groovie.vcproj b/dists/msvc7/groovie.vcproj
deleted file mode 100644
index 84bd30bbd7..0000000000
--- a/dists/msvc7/groovie.vcproj
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7,00"
-	Name="groovie"
-	ProjectGUID="{2C1EA540-0B09-11DD-BD00-000000000000}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="groovie_Debug"
-			IntermediateDirectory="groovie_Debug"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="0"
-				AdditionalIncludeDirectories="../..;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="TRUE"
-				ExceptionHandling="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="FALSE"
-				SuppressStartupBanner="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/groovie.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="groovie_Release"
-			IntermediateDirectory="groovie_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="TRUE"
-				ExceptionHandling="TRUE"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="FALSE"
-				EnableFunctionLevelLinking="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				DebugInformationFormat="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/groovie.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<File
-			RelativePath="..\..\engines\groovie\cell.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\cell.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\cursor.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\cursor.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\debug.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\debug.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\detection.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\font.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\font.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\graphics.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\graphics.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\groovie.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\groovie.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\lzss.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\lzss.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\music.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\music.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\player.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\player.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\resource.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\resource.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\roq.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\roq.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\saveload.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\saveload.h">
-		</File>		
-		<File
-			RelativePath="..\..\engines\groovie\script.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\script.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\vdx.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\vdx.h">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/dists/msvc7/igor.vcproj b/dists/msvc7/igor.vcproj
deleted file mode 100644
index 1f25143030..0000000000
--- a/dists/msvc7/igor.vcproj
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7,00"
-	Name="igor"
-	ProjectGUID="{83945CAF-87A0-4202-8BA4-87A0CB15D78A}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="igor_Debug"
-			IntermediateDirectory="igor_Debug"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="TRUE"
-				ExceptionHandling="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				SuppressStartupBanner="FALSE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/igor.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="igor_Release"
-			IntermediateDirectory="igor_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="TRUE"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="TRUE"
-				ExceptionHandling="TRUE"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="FALSE"
-				EnableFunctionLevelLinking="FALSE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				DebugInformationFormat="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/igor.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<Filter
-			Name="parts">
-			<File
-				RelativePath="..\..\engines\igor\parts\part_04.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_05.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_06.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_12.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_13.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_14.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_15.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_16.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_17.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_18.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_19.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_21.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_22.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_23.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_24.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_25.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_26.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_27.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_28.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_30.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_31.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_33.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_36.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_37.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_75.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_85.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_90.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_95.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_main.cpp">
-			</File>
-		</Filter>
-		<File
-			RelativePath="..\..\engines\igor\detection.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\igor\igor.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\igor\igor.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\igor\menu.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\igor\midi.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\igor\midi.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\igor\resource_ids.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\igor\saveload.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\igor\staticres.cpp">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/dists/msvc7/kyra.vcproj b/dists/msvc7/kyra.vcproj
deleted file mode 100644
index cf1bee5dde..0000000000
--- a/dists/msvc7/kyra.vcproj
+++ /dev/null
@@ -1,457 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7,00"
-	Name="kyra"
-	ProjectGUID="{9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="kyra_Debug"
-			IntermediateDirectory="kyra_Debug"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;ENABLE_LOL"
-				MinimalRebuild="TRUE"
-				ExceptionHandling="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				SuppressStartupBanner="FALSE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/kyra.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="kyra_Release"
-			IntermediateDirectory="kyra_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="TRUE"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;ENABLE_LOL"
-				StringPooling="TRUE"
-				ExceptionHandling="TRUE"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="FALSE"
-				EnableFunctionLevelLinking="FALSE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				DebugInformationFormat="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/kyra.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<File
-			RelativePath="..\..\engines\kyra\animator_hof.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\animator_lok.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\animator_lok.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\animator_mr.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\animator_v2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\debugger.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\debugger.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\detection.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui_hof.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui_hof.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui_lok.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui_lok.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui_lol.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui_lol.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui_mr.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui_mr.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui_v2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui_v2.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\items_hof.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\items_lok.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\items_lol.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\items_mr.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\items_v2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\kyra_hof.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\kyra_hof.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\kyra_lok.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\kyra_lok.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\kyra_mr.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\kyra_mr.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\kyra_v1.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\kyra_v1.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\kyra_v2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\kyra_v2.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\lol.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\lol.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\resource.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\resource.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\resource_intern.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\resource_intern.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\saveload.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\saveload_hof.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\saveload_lok.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\saveload_lol.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\saveload_mr.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\scene_hof.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\scene_lok.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\scene_lol.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\scene_mr.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\scene_v1.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\scene_v2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen_hof.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen_hof.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen_lok.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen_lok.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen_lol.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen_lol.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen_mr.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen_mr.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen_v2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen_v2.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\script.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\script.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\script_hof.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\script_lok.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\script_lol.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\script_mr.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\script_tim.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\script_tim.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\script_v1.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\script_v2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\seqplayer.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\seqplayer.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sequences_hof.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sequences_lok.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sequences_lol.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sequences_mr.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sequences_v2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sound.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sound.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sound_adlib.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sound_digital.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sound_intern.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sound_lok.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sound_lol.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sound_midi.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sound_pcspk.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sound_towns.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sprites.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sprites.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sprites_lol.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\staticres.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\text.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\text.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\text_hof.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\text_hof.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\text_lok.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\text_lol.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\text_lol.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\text_mr.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\text_mr.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\timer.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\timer.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\timer_hof.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\timer_lok.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\timer_lol.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\timer_mr.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\util.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\util.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\vqa.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\vqa.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\wsamovie.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\wsamovie.h">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/dists/msvc7/lure.vcproj b/dists/msvc7/lure.vcproj
deleted file mode 100644
index af6c4ebc23..0000000000
--- a/dists/msvc7/lure.vcproj
+++ /dev/null
@@ -1,241 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7,00"
-	Name="lure"
-	ProjectGUID="{1A1CA028-61B5-4A6C-A918-F5D8721AB1AC}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="lure_Debug"
-			IntermediateDirectory="lure_Debug"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="TRUE"
-				ExceptionHandling="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				SuppressStartupBanner="FALSE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/lure.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="lure_Release"
-			IntermediateDirectory="lure_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="TRUE"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="TRUE"
-				ExceptionHandling="TRUE"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="FALSE"
-				EnableFunctionLevelLinking="FALSE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				DebugInformationFormat="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/lure.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<File
-			RelativePath="..\..\engines\lure\animseq.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\animseq.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\debugger.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\debugger.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\decode.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\decode.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\detection.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\disk.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\disk.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\events.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\events.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\fights.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\fights.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\game.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\game.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\hotspots.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\hotspots.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\intro.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\intro.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\lure.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\lure.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\luredefs.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\memory.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\memory.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\menu.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\menu.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\palette.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\palette.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\res.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\res.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\res_struct.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\res_struct.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\room.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\room.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\screen.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\screen.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\scripts.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\scripts.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\sound.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\sound.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\strings.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\strings.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\surface.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\surface.h">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/dists/msvc7/m4.vcproj b/dists/msvc7/m4.vcproj
deleted file mode 100644
index d4c700db0e..0000000000
--- a/dists/msvc7/m4.vcproj
+++ /dev/null
@@ -1,283 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7,00"
-	Name="m4"
-	ProjectGUID="{6D576A24-B9CE-11DC-BC77-8D2856D89593}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="m4_Debug"
-			IntermediateDirectory="m4_Debug"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="TRUE"
-				ExceptionHandling="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				SuppressStartupBanner="FALSE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/m4.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="m4_Release"
-			IntermediateDirectory="m4_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="TRUE"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="TRUE"
-				ExceptionHandling="TRUE"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="FALSE"
-				EnableFunctionLevelLinking="FALSE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				DebugInformationFormat="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/m4.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<File
-			RelativePath="..\..\engines\m4\actor.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\actor.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\animation.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\animation.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\assets.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\assets.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\burger_data.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\compression.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\compression.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\console.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\console.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\converse.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\converse.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\detection.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\events.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\events.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\font.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\font.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\globals.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\globals.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\graphics.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\graphics.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\gui.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\gui.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\hotspot.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\hotspot.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\m4.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\m4.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\m4_menus.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\m4_menus.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\m4_views.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\m4_views.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\mads_anim.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\mads_anim.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\mads_menus.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\mads_menus.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\midi.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\midi.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\rails.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\rails.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\resource.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\resource.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\saveload.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\saveload.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\scene.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\scene.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\script.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\script.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\sound.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\sound.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\sprite.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\sprite.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\viewmgr.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\viewmgr.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\woodscript.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\woodscript.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\ws_machine.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\ws_sequence.cpp">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/dists/msvc7/made.vcproj b/dists/msvc7/made.vcproj
deleted file mode 100644
index 922658c318..0000000000
--- a/dists/msvc7/made.vcproj
+++ /dev/null
@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7,00"
-	Name="made"
-	ProjectGUID="{E29B5D40-08F7-11DD-BD0B-0800200C9A66}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="made_Debug"
-			IntermediateDirectory="made_Debug"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="TRUE"
-				ExceptionHandling="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				SuppressStartupBanner="FALSE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/made.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="made_Release"
-			IntermediateDirectory="made_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="TRUE"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="TRUE"
-				ExceptionHandling="TRUE"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="FALSE"
-				EnableFunctionLevelLinking="FALSE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				DebugInformationFormat="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/made.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<File
-			RelativePath="..\..\engines\made\database.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\made\database.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\made\detection.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\made\graphics.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\made\graphics.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\made\made.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\made\made.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\made\music.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\made\music.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\made\pmvplayer.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\made\pmvplayer.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\made\redreader.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\made\redreader.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\made\resource.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\made\resource.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\made\screen.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\made\screen.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\made\screenfx.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\made\screenfx.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\made\script.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\made\script.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\made\scriptfuncs.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\made\scriptfuncs.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\made\sound.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\made\sound.h">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/dists/msvc7/parallaction.vcproj b/dists/msvc7/parallaction.vcproj
deleted file mode 100644
index a5ded11e4f..0000000000
--- a/dists/msvc7/parallaction.vcproj
+++ /dev/null
@@ -1,244 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7,00"
-	Name="parallaction"
-	ProjectGUID="{0068957B-E2E1-4988-8C87-D541D84DAF20}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="parallaction_Debug"
-			IntermediateDirectory="parallaction_Debug"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="TRUE"
-				ExceptionHandling="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				SuppressStartupBanner="FALSE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/parallaction.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="parallaction_Release"
-			IntermediateDirectory="parallaction_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="TRUE"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="TRUE"
-				ExceptionHandling="TRUE"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="FALSE"
-				EnableFunctionLevelLinking="FALSE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				DebugInformationFormat="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/parallaction.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<File
-			RelativePath="..\..\engines\parallaction\balloons.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\callables_br.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\callables_ns.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\debug.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\debug.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\detection.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\dialogue.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\disk.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\disk.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\disk_br.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\disk_ns.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\exec.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\exec.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\exec_br.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\exec_ns.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\font.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\gfxbase.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\graphics.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\graphics.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\gui.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\gui.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\gui_br.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\gui_ns.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\input.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\input.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\inventory.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\inventory.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\objects.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\objects.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\parallaction.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\parallaction.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\parallaction_br.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\parallaction_ns.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\parser.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\parser.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\parser_br.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\parser_ns.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\saveload.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\saveload.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\sound.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\sound_br.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\sound_ns.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\staticres.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\walk.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\walk.h">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/dists/msvc7/queen.vcproj b/dists/msvc7/queen.vcproj
deleted file mode 100644
index afc0aa17e3..0000000000
--- a/dists/msvc7/queen.vcproj
+++ /dev/null
@@ -1,232 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7,00"
-	Name="queen"
-	ProjectGUID="{6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="queen_Debug"
-			IntermediateDirectory="queen_Debug"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="TRUE"
-				ExceptionHandling="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				SuppressStartupBanner="FALSE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/queen.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="queen_Release"
-			IntermediateDirectory="queen_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="TRUE"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="TRUE"
-				ExceptionHandling="TRUE"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="FALSE"
-				EnableFunctionLevelLinking="FALSE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				DebugInformationFormat="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/queen.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<File
-			RelativePath="..\..\engines\queen\bankman.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\bankman.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\command.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\command.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\credits.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\credits.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\cutaway.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\cutaway.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\debug.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\debug.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\defs.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\display.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\display.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\graphics.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\graphics.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\grid.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\grid.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\input.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\input.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\journal.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\journal.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\logic.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\logic.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\midiadlib.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\music.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\music.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\musicdata.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\queen.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\queen.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\resource.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\resource.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\restables.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\sound.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\sound.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\state.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\state.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\structs.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\talk.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\talk.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\walk.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\walk.h">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/dists/msvc7/saga.vcproj b/dists/msvc7/saga.vcproj
deleted file mode 100644
index 7bab826b12..0000000000
--- a/dists/msvc7/saga.vcproj
+++ /dev/null
@@ -1,289 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7,00"
-	Name="saga"
-	ProjectGUID="{676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="saga_Debug"
-			IntermediateDirectory="saga_Debug"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;ENABLE_IHNM;ENABLE_SAGA2;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="TRUE"
-				ExceptionHandling="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				SuppressStartupBanner="FALSE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/saga.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="saga_Release"
-			IntermediateDirectory="saga_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="TRUE"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;ENABLE_IHNM;ENABLE_SAGA2;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="TRUE"
-				ExceptionHandling="TRUE"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="FALSE"
-				EnableFunctionLevelLinking="FALSE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				DebugInformationFormat="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/saga.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<File
-			RelativePath="..\..\engines\saga\actor.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\actor.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\actor_path.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\actor_walk.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\animation.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\animation.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\console.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\console.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\detection.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\detection_tables.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\displayinfo.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\events.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\events.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\font.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\font.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\font_map.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\gfx.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\gfx.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\image.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\input.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\interface.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\interface.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\introproc_ihnm.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\introproc_ite.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\introproc_saga2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\isomap.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\isomap.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\itedata.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\itedata.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\music.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\music.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\objectmap.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\objectmap.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\palanim.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\palanim.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\puzzle.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\puzzle.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\render.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\render.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\resource.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\resource.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\resource_hrs.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\resource_res.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\resource_rsc.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\saga.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\saga.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\saveload.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\scene.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\scene.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\script.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\script.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\sfuncs.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\sfuncs_ihnm.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\sndres.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\sndres.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\sound.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\sound.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\sprite.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\sprite.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\sthread.cpp">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/dists/msvc7/sci.vcproj b/dists/msvc7/sci.vcproj
deleted file mode 100644
index c62600ad9a..0000000000
--- a/dists/msvc7/sci.vcproj
+++ /dev/null
@@ -1,454 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7,00"
-	Name="sci"
-	ProjectGUID="{53F17B2B-0412-4EC3-A999-ED0537BB5223}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="sci_Debug"
-			IntermediateDirectory="sci_Debug"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="TRUE"
-				ExceptionHandling="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="FALSE"
-				SuppressStartupBanner="FALSE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/sci.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="sci_Release"
-			IntermediateDirectory="sci_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="TRUE"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="TRUE"
-				ExceptionHandling="TRUE"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="FALSE"
-				EnableFunctionLevelLinking="FALSE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				DebugInformationFormat="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/sci.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<Filter
-			Name="engine">
-			<File
-				RelativePath="..\..\engines\sci\engine\game.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\gc.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\gc.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\grammar.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\intmap.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\intmap.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\kernel.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\kernel.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\kernel_types.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\kevent.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\kfile.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\kgraphics.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\klists.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\kmath.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\kmenu.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\kmisc.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\kmovement.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\kpathing.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\kscripts.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\ksound.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\kstring.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\memobj.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\memobj.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\message.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\message.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\said.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\savegame.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\savegame.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\script.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\scriptdebug.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\seg_manager.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\seg_manager.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\state.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\state.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\stringfrag.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\vm.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\vm.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\vm_types.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="gfx">
-			<File
-				RelativePath="..\..\engines\sci\gfx\font.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\font.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_driver.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_driver.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_gui.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_gui.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_options.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_pixmap_scale.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_res_options.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_res_options.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_resmgr.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_resmgr.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_resource.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_resource.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_state_internal.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_support.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_system.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_tools.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_tools.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_widgets.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_widgets.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\menubar.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\menubar.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\operations.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\operations.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\palette.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\palette.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\res_cursor.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\res_font.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\res_pal.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\res_pic.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\res_view.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\seq_decoder.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\seq_decoder.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="sfx">
-			<File
-				RelativePath="..\..\engines\sci\sfx\core.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\core.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\device.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\iterator.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\iterator.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\iterator_internal.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\misc.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\player.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\sci_midi.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\sequencer.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\sfx_pcm.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\softseq.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\songlib.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\songlib.h">
-			</File>
-			<Filter
-				Name="softseq">
-				<File
-					RelativePath="..\..\engines\sci\sfx\softseq\adlib.cpp">
-				</File>
-				<File
-					RelativePath="..\..\engines\sci\sfx\softseq\adlib.h">
-				</File>
-				<File
-					RelativePath="..\..\engines\sci\sfx\softseq\amiga.cpp">
-				</File>
-				<File
-					RelativePath="..\..\engines\sci\sfx\softseq\pcjr.cpp">
-				</File>
-				<File
-					RelativePath="..\..\engines\sci\sfx\softseq\pcjr.h">
-				</File>
-			</Filter>
-			<Filter
-				Name="seq">
-				<File
-					RelativePath="..\..\engines\sci\sfx\seq\sequencers.cpp">
-				</File>
-			</Filter>
-		</Filter>
-		<File
-			RelativePath="..\..\engines\sci\console.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\console.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\debug.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\decompressor.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\decompressor.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\detection.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\exereader.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\exereader.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\resource.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\resource.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\sci.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\sci.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\engine\script.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\tools.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\tools.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\uinput.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\vocabulary.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\vocabulary.h">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/dists/msvc7/scumm.vcproj b/dists/msvc7/scumm.vcproj
deleted file mode 100644
index 9d8e22eff6..0000000000
--- a/dists/msvc7/scumm.vcproj
+++ /dev/null
@@ -1,613 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7,00"
-	Name="scumm"
-	ProjectGUID="{B6AFD548-63D2-40CD-A652-E87095AFCBAF}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="scumm_Debug"
-			IntermediateDirectory="scumm_Debug"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;ENABLE_SCUMM_7_8;ENABLE_HE;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="TRUE"
-				ExceptionHandling="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				SuppressStartupBanner="FALSE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/scumm.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="scumm_Release"
-			IntermediateDirectory="scumm_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="TRUE"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;ENABLE_SCUMM_7_8;ENABLE_HE;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="TRUE"
-				ExceptionHandling="TRUE"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="FALSE"
-				EnableFunctionLevelLinking="FALSE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				DebugInformationFormat="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/scumm.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<Filter
-			Name="smush">
-			<File
-				RelativePath="..\..\engines\scumm\smush\channel.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\channel.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\chunk_type.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\codec1.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\codec37.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\codec37.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\codec47.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\codec47.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\imuse_channel.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\saud_channel.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\smush_font.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\smush_font.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\smush_mixer.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\smush_mixer.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\smush_player.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\smush_player.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="imuse_digi">
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_bndmgr.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_bndmgr.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_codecs.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_music.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_script.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_sndmgr.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_sndmgr.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_tables.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_tables.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_track.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_track.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="insane">
-			<File
-				RelativePath="..\..\engines\scumm\insane\insane.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\insane\insane.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\insane\insane_ben.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\insane\insane_enemy.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\insane\insane_iact.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\insane\insane_scenes.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="he">
-			<File
-				RelativePath="..\..\engines\scumm\he\animation_he.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\animation_he.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\cup_player_he.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\cup_player_he.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\floodfill_he.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\floodfill_he.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\intern_he.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\logic_he.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\logic_he.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\palette_he.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\resource_he.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\resource_he.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\script_v100he.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\script_v60he.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\script_v70he.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\script_v71he.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\script_v72he.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\script_v80he.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\script_v90he.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\sound_he.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\sound_he.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\sprite_he.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\sprite_he.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\wiz_he.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\wiz_he.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="imuse">
-			<File
-				RelativePath="..\..\engines\scumm\imuse\imuse.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse\imuse.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse\imuse_internal.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse\imuse_part.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse\imuse_player.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse\instrument.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse\instrument.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse\sysex.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse\sysex_samnmax.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse\sysex_scumm.cpp">
-			</File>
-		</Filter>
-		<File
-			RelativePath="..\..\engines\scumm\actor.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\actor.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\akos.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\akos.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\base-costume.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\base-costume.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\bomp.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\bomp.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\boxes.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\boxes.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\camera.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\charset-fontdata.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\charset.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\charset.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\costume.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\costume.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\cursor.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\debugger.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\debugger.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\detection.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\detection.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\detection_tables.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\dialogs.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\dialogs.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\file.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\file.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\file_nes.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\file_nes.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\gfx.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\gfx.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\help.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\help.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\input.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\intern.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\midiparser_eup.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\midiparser_ro.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\music.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\nut_renderer.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\nut_renderer.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\object.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\object.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\palette.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_mod.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_mod.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_nes.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_nes.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_v1.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_v1.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_v2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_v2.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_v2a.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_v2a.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_v2cms.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_v3a.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_v3a.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\resource.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\resource.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\resource_v2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\resource_v3.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\resource_v4.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\room.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\saveload.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\saveload.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\script.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\script.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\script_v0.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\script_v2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\script_v3.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\script_v4.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\script_v5.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\script_v6.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\script_v8.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\scumm-md5.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\scumm.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\scumm.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\scumm_v0.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\scumm_v2.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\scumm_v3.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\scumm_v4.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\scumm_v5.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\scumm_v6.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\scumm_v7.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\scumm_v8.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\sound.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\sound.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\string.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\usage_bits.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\usage_bits.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\util.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\util.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\vars.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\verbs.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\verbs.h">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/dists/msvc7/scummvm.sln b/dists/msvc7/scummvm.sln
deleted file mode 100644
index 7c3010df07..0000000000
--- a/dists/msvc7/scummvm.sln
+++ /dev/null
@@ -1,185 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 7.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scummvm", "scummvm.vcproj", "{8434CB15-D08F-427D-9E6D-581AE5B28440}"
-	ProjectSection(ProjectDependencies) = postProject
-		{8863B00B-059A-471E-876D-A955ECEFD0D2} = {8863B00B-059A-471E-876D-A955ECEFD0D2}
-		{53F17B2B-0412-4EC3-A999-ED0537BB5223} = {53F17B2B-0412-4EC3-A999-ED0537BB5223}
-		{CF888EE2-239C-40D7-83F1-1CDD4F7D56E3} = {CF888EE2-239C-40D7-83F1-1CDD4F7D56E3}
-		{FF064FD0-AF6E-11DD-AD8B-0800200C9A66} = {FF064FD0-AF6E-11DD-AD8B-0800200C9A66}
-		{676DB4C5-9A3E-4EE1-8483-EBB79DC0700E} = {676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}
-		{83945CAF-87A0-4202-8BA4-87A0CB15D78A} = {83945CAF-87A0-4202-8BA4-87A0CB15D78A}
-		{9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC} = {9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}
-		{0068957B-E2E1-4988-8C87-D541D84DAF20} = {0068957B-E2E1-4988-8C87-D541D84DAF20}
-		{976D947A-A45F-4437-991E-412F695C64C7} = {976D947A-A45F-4437-991E-412F695C64C7}
-		{E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA} = {E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}
-		{F5F57066-CDF4-4F80-B9E7-7F4D21850D6E} = {F5F57066-CDF4-4F80-B9E7-7F4D21850D6E}
-		{6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7} = {6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7}
-		{22AA7760-2C91-11DD-BD0B-0800200C9A66} = {22AA7760-2C91-11DD-BD0B-0800200C9A66}
-		{B5527758-2F51-4CCD-AAE1-B0E28654BD6A} = {B5527758-2F51-4CCD-AAE1-B0E28654BD6A}
-		{D4986356-D0BB-4981-924A-854157BDF11F} = {D4986356-D0BB-4981-924A-854157BDF11F}
-		{1CA4AC50-5426-433A-8B5E-FFE39568098E} = {1CA4AC50-5426-433A-8B5E-FFE39568098E}
-		{B6AFD548-63D2-40CD-A652-E87095AFCBAF} = {B6AFD548-63D2-40CD-A652-E87095AFCBAF}
-		{2C1EA540-0B09-11DD-BD00-000000000000} = {2C1EA540-0B09-11DD-BD00-000000000000}
-		{E29B5D40-08F7-11DD-BD0B-0800200C9A66} = {E29B5D40-08F7-11DD-BD0B-0800200C9A66}
-		{C8AAE83E-198B-4ECA-A877-166827953979} = {C8AAE83E-198B-4ECA-A877-166827953979}
-		{1A1CA028-61B5-4A6C-A918-F5D8721AB1AC} = {1A1CA028-61B5-4A6C-A918-F5D8721AB1AC}
-		{6D576A24-B9CE-11DC-BC77-8D2856D89593} = {6D576A24-B9CE-11DC-BC77-8D2856D89593}
-		{6CC3E421-779D-4E80-8100-520886A0F9FF} = {6CC3E421-779D-4E80-8100-520886A0F9FF}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sword2", "sword2.vcproj", "{6CC3E421-779D-4E80-8100-520886A0F9FF}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "queen", "queen.vcproj", "{6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scumm", "scumm.vcproj", "{B6AFD548-63D2-40CD-A652-E87095AFCBAF}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "agos", "agos.vcproj", "{E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sky", "sky.vcproj", "{B5527758-2F51-4CCD-AAE1-B0E28654BD6A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sword1", "sword1.vcproj", "{C8AAE83E-198B-4ECA-A877-166827953979}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kyra", "kyra.vcproj", "{9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "saga", "saga.vcproj", "{676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gob", "gob.vcproj", "{976D947A-A45F-4437-991E-412F695C64C7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lure", "lure.vcproj", "{1A1CA028-61B5-4A6C-A918-F5D8721AB1AC}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cine", "cine.vcproj", "{1CA4AC50-5426-433A-8B5E-FFE39568098E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "agi", "agi.vcproj", "{F5F57066-CDF4-4F80-B9E7-7F4D21850D6E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "touche", "touche.vcproj", "{D4986356-D0BB-4981-924A-854157BDF11F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "parallaction", "parallaction.vcproj", "{0068957B-E2E1-4988-8C87-D541D84DAF20}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cruise", "cruise.vcproj", "{8863B00B-059A-471E-876D-A955ECEFD0D2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "drascula", "drascula.vcproj", "{CF888EE2-239C-40D7-83F1-1CDD4F7D56E3}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "igor", "igor.vcproj", "{83945CAF-87A0-4202-8BA4-87A0CB15D78A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "m4", "m4.vcproj", "{6D576A24-B9CE-11DC-BC77-8D2856D89593}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "made", "made.vcproj", "{E29B5D40-08F7-11DD-BD0B-0800200C9A66}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tinsel", "tinsel.vcproj", "{22AA7760-2C91-11DD-BD0B-0800200C9A66}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tucker", "tucker.vcproj", "{FF064FD0-AF6E-11DD-AD8B-0800200C9A66}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "groovie", "groovie.vcproj", "{2C1EA540-0B09-11DD-BD00-000000000000}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sci", "sci.vcproj", "{53F17B2B-0412-4EC3-A999-ED0537BB5223}"
-EndProject
-Global
-	GlobalSection(SolutionConfiguration) = preSolution
-		Debug = Debug
-		Release = Release
-	EndGlobalSection
-	GlobalSection(ProjectDependencies) = postSolution
-		{8434CB15-D08F-427D-9E6D-581AE5B28440}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8434CB15-D08F-427D-9E6D-581AE5B28440}.Debug|Win32.Build.0 = Debug|Win32
-		{8434CB15-D08F-427D-9E6D-581AE5B28440}.Release|Win32.ActiveCfg = Release|Win32
-		{8434CB15-D08F-427D-9E6D-581AE5B28440}.Release|Win32.Build.0 = Release|Win32
-		{6CC3E421-779D-4E80-8100-520886A0F9FF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6CC3E421-779D-4E80-8100-520886A0F9FF}.Debug|Win32.Build.0 = Debug|Win32
-		{6CC3E421-779D-4E80-8100-520886A0F9FF}.Release|Win32.ActiveCfg = Release|Win32
-		{6CC3E421-779D-4E80-8100-520886A0F9FF}.Release|Win32.Build.0 = Release|Win32
-		{6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7}.Debug|Win32.Build.0 = Debug|Win32
-		{6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7}.Release|Win32.ActiveCfg = Release|Win32
-		{6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7}.Release|Win32.Build.0 = Release|Win32
-		{B6AFD548-63D2-40CD-A652-E87095AFCBAF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B6AFD548-63D2-40CD-A652-E87095AFCBAF}.Debug|Win32.Build.0 = Debug|Win32
-		{B6AFD548-63D2-40CD-A652-E87095AFCBAF}.Release|Win32.ActiveCfg = Release|Win32
-		{B6AFD548-63D2-40CD-A652-E87095AFCBAF}.Release|Win32.Build.0 = Release|Win32
-		{E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}.Debug|Win32.Build.0 = Debug|Win32
-		{E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}.Release|Win32.ActiveCfg = Release|Win32
-		{E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}.Release|Win32.Build.0 = Release|Win32
-		{B5527758-2F51-4CCD-AAE1-B0E28654BD6A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B5527758-2F51-4CCD-AAE1-B0E28654BD6A}.Debug|Win32.Build.0 = Debug|Win32
-		{B5527758-2F51-4CCD-AAE1-B0E28654BD6A}.Release|Win32.ActiveCfg = Release|Win32
-		{B5527758-2F51-4CCD-AAE1-B0E28654BD6A}.Release|Win32.Build.0 = Release|Win32
-		{C8AAE83E-198B-4ECA-A877-166827953979}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C8AAE83E-198B-4ECA-A877-166827953979}.Debug|Win32.Build.0 = Debug|Win32
-		{C8AAE83E-198B-4ECA-A877-166827953979}.Release|Win32.ActiveCfg = Release|Win32
-		{C8AAE83E-198B-4ECA-A877-166827953979}.Release|Win32.Build.0 = Release|Win32
-		{9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}.Debug|Win32.Build.0 = Debug|Win32
-		{9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}.Release|Win32.ActiveCfg = Release|Win32
-		{9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}.Release|Win32.Build.0 = Release|Win32
-		{676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}.Debug|Win32.Build.0 = Debug|Win32
-		{676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}.Release|Win32.ActiveCfg = Release|Win32
-		{676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}.Release|Win32.Build.0 = Release|Win32
-		{976D947A-A45F-4437-991E-412F695C64C7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{976D947A-A45F-4437-991E-412F695C64C7}.Debug|Win32.Build.0 = Debug|Win32
-		{976D947A-A45F-4437-991E-412F695C64C7}.Release|Win32.ActiveCfg = Release|Win32
-		{976D947A-A45F-4437-991E-412F695C64C7}.Release|Win32.Build.0 = Release|Win32
-		{1A1CA028-61B5-4A6C-A918-F5D8721AB1AC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1A1CA028-61B5-4A6C-A918-F5D8721AB1AC}.Debug|Win32.Build.0 = Debug|Win32
-		{1A1CA028-61B5-4A6C-A918-F5D8721AB1AC}.Release|Win32.ActiveCfg = Release|Win32
-		{1A1CA028-61B5-4A6C-A918-F5D8721AB1AC}.Release|Win32.Build.0 = Release|Win32
-		{1CA4AC50-5426-433A-8B5E-FFE39568098E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1CA4AC50-5426-433A-8B5E-FFE39568098E}.Debug|Win32.Build.0 = Debug|Win32
-		{1CA4AC50-5426-433A-8B5E-FFE39568098E}.Release|Win32.ActiveCfg = Release|Win32
-		{1CA4AC50-5426-433A-8B5E-FFE39568098E}.Release|Win32.Build.0 = Release|Win32
-		{F5F57066-CDF4-4F80-B9E7-7F4D21850D6E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F5F57066-CDF4-4F80-B9E7-7F4D21850D6E}.Debug|Win32.Build.0 = Debug|Win32
-		{F5F57066-CDF4-4F80-B9E7-7F4D21850D6E}.Release|Win32.ActiveCfg = Release|Win32
-		{F5F57066-CDF4-4F80-B9E7-7F4D21850D6E}.Release|Win32.Build.0 = Release|Win32
-		{D4986356-D0BB-4981-924A-854157BDF11F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D4986356-D0BB-4981-924A-854157BDF11F}.Debug|Win32.Build.0 = Debug|Win32
-		{D4986356-D0BB-4981-924A-854157BDF11F}.Release|Win32.ActiveCfg = Release|Win32
-		{D4986356-D0BB-4981-924A-854157BDF11F}.Release|Win32.Build.0 = Release|Win32
-		{0068957B-E2E1-4988-8C87-D541D84DAF20}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0068957B-E2E1-4988-8C87-D541D84DAF20}.Debug|Win32.Build.0 = Debug|Win32
-		{0068957B-E2E1-4988-8C87-D541D84DAF20}.Release|Win32.ActiveCfg = Release|Win32
-		{0068957B-E2E1-4988-8C87-D541D84DAF20}.Release|Win32.Build.0 = Release|Win32
-		{8863B00B-059A-471E-876D-A955ECEFD0D2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8863B00B-059A-471E-876D-A955ECEFD0D2}.Debug|Win32.Build.0 = Debug|Win32
-		{8863B00B-059A-471E-876D-A955ECEFD0D2}.Release|Win32.ActiveCfg = Release|Win32
-		{8863B00B-059A-471E-876D-A955ECEFD0D2}.Release|Win32.Build.0 = Release|Win32
-		{CF888EE2-239C-40D7-83F1-1CDD4F7D56E3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CF888EE2-239C-40D7-83F1-1CDD4F7D56E3}.Debug|Win32.Build.0 = Debug|Win32
-		{CF888EE2-239C-40D7-83F1-1CDD4F7D56E3}.Release|Win32.ActiveCfg = Release|Win32
-		{CF888EE2-239C-40D7-83F1-1CDD4F7D56E3}.Release|Win32.Build.0 = Release|Win32
-		{83945CAF-87A0-4202-8BA4-87A0CB15D78A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{83945CAF-87A0-4202-8BA4-87A0CB15D78A}.Debug|Win32.Build.0 = Debug|Win32
-		{83945CAF-87A0-4202-8BA4-87A0CB15D78A}.Release|Win32.ActiveCfg = Release|Win32
-		{83945CAF-87A0-4202-8BA4-87A0CB15D78A}.Release|Win32.Build.0 = Release|Win32
-		{6D576A24-B9CE-11DC-BC77-8D2856D89593}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6D576A24-B9CE-11DC-BC77-8D2856D89593}.Debug|Win32.Build.0 = Debug|Win32
-		{6D576A24-B9CE-11DC-BC77-8D2856D89593}.Release|Win32.ActiveCfg = Release|Win32
-		{6D576A24-B9CE-11DC-BC77-8D2856D89593}.Release|Win32.Build.0 = Release|Win32
-		{E29B5D40-08F7-11DD-BD0B-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E29B5D40-08F7-11DD-BD0B-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32
-		{E29B5D40-08F7-11DD-BD0B-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32
-		{E29B5D40-08F7-11DD-BD0B-0800200C9A66}.Release|Win32.Build.0 = Release|Win32
-		{22AA7760-2C91-11DD-BD0B-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32
-		{22AA7760-2C91-11DD-BD0B-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32
-		{22AA7760-2C91-11DD-BD0B-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32
-		{22AA7760-2C91-11DD-BD0B-0800200C9A66}.Release|Win32.Build.0 = Release|Win32
-		{FF064FD0-AF6E-11DD-AD8B-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FF064FD0-AF6E-11DD-AD8B-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32
-		{FF064FD0-AF6E-11DD-AD8B-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32
-		{FF064FD0-AF6E-11DD-AD8B-0800200C9A66}.Release|Win32.Build.0 = Release|Win32
-		{2C1EA540-0B09-11DD-BD00-000000000000}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2C1EA540-0B09-11DD-BD00-000000000000}.Debug|Win32.Build.0 = Debug|Win32
-		{2C1EA540-0B09-11DD-BD00-000000000000}.Release|Win32.ActiveCfg = Release|Win32
-		{2C1EA540-0B09-11DD-BD00-000000000000}.Release|Win32.Build.0 = Release|Win32
-		{53F17B2B-0412-4EC3-A999-ED0537BB5223}.Debug|Win32.ActiveCfg = Debug|Win32
-		{53F17B2B-0412-4EC3-A999-ED0537BB5223}.Debug|Win32.Build.0 = Debug|Win32
-		{53F17B2B-0412-4EC3-A999-ED0537BB5223}.Release|Win32.ActiveCfg = Release|Win32
-		{53F17B2B-0412-4EC3-A999-ED0537BB5223}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
-	EndGlobalSection
-EndGlobal
diff --git a/dists/msvc7/scummvm.vcproj b/dists/msvc7/scummvm.vcproj
deleted file mode 100644
index e591824809..0000000000
--- a/dists/msvc7/scummvm.vcproj
+++ /dev/null
@@ -1,1320 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7,00"
-	Name="scummvm"
-	ProjectGUID="{8434CB15-D08F-427D-9E6D-581AE5B28440}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="scummvm_Debug"
-			IntermediateDirectory="scummvm_Debug"
-			ConfigurationType="1"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_NASM;USE_MT32EMU;ENABLE_AGI;ENABLE_AGOS;ENABLE_CINE;ENABLE_CRUISE;ENABLE_DRASCULA;ENABLE_GOB;ENABLE_IGOR;ENABLE_KYRA;ENABLE_LURE;ENABLE_M4;ENABLE_MADE;ENABLE_PARALLACTION;ENABLE_QUEEN;ENABLE_SAGA;ENABLE_IHNM;ENABLE_SAGA2;ENABLE_SCI;ENABLE_SCUMM;ENABLE_SKY;ENABLE_SWORD1;ENABLE_SWORD2;ENABLE_TOUCHE;ENABLE_SCUMM_7_8;ENABLE_HE;ENABLE_TINSEL;ENABLE_TUCKER;ENABLE_GROOVIE"
-				MinimalRebuild="TRUE"
-				ExceptionHandling="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				SuppressStartupBanner="FALSE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib sdl.lib zlib.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib sword1_debug/sword1.lib sword2_debug/sword2.lib lure_debug/lure.lib cine_debug/cine.lib cruise_debug/cruise.lib igor_debug/igor.lib kyra_debug/kyra.lib gob_debug/gob.lib queen_debug/queen.lib saga_debug/saga.lib agi_debug/agi.lib scumm_debug/scumm.lib agos_debug/agos.lib drascula_debug/drascula.lib sky_debug/sky.lib sci_debug/sci.lib parallaction_debug/parallaction.lib m4_debug/m4.lib made_debug/made.lib tinsel_Debug/tinsel.lib tucker_Debug/tucker.lib groovie_Debug/groovie.lib"
-				OutputFile="$(OutDir)/scummvm.exe"
-				LinkIncremental="2"
-				IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="$(OutDir)/scummvm.pdb"
-				SubSystem="1"
-				EntryPointSymbol="WinMainCRTStartup"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="scummvm_Release"
-			IntermediateDirectory="scummvm_Release"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="TRUE"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_MT32EMU;ENABLE_AGI;ENABLE_AGOS;ENABLE_CINE;ENABLE_CRUISE;ENABLE_DRASCULA;ENABLE_GOB;ENABLE_IGOR;ENABLE_KYRA;ENABLE_LURE;ENABLE_M4;ENABLE_MADE;ENABLE_PARALLACTION;ENABLE_QUEEN;ENABLE_SAGA;ENABLE_IHNM;ENABLE_SAGA2;ENABLE_SCI;ENABLE_SCUMM;ENABLE_SKY;ENABLE_SWORD1;ENABLE_SWORD2;ENABLE_TOUCHE;ENABLE_SCUMM_7_8;ENABLE_HE;ENABLE_TINSEL;ENABLE_TUCKER;ENABLE_GROOVIE"
-				StringPooling="TRUE"
-				MinimalRebuild="FALSE"
-				ExceptionHandling="TRUE"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="FALSE"
-				EnableFunctionLevelLinking="FALSE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				DebugInformationFormat="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib sdl.lib zlib.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib saga_release/saga.lib agi_release/agi.lib sword1_release/sword1.lib sword2_release/sword2.lib lure_release/lure.lib cine_release/cine.lib cruise_release/cruise.lib igor_release/igor.lib kyra_release/kyra.lib gob_release/gob.lib queen_release/queen.lib scumm_release/scumm.lib agos_release/agos.lib sky_release/sky.lib sci_release/sci.lib drascula_release/drascula.lib parallaction_release/parallaction.lib m4_release/m4.lib made_release/made.lib tinsel_release/tinsel.lib tucker_release/tucker.lib groovie_release/groovie.lib"
-				OutputFile="$(OutDir)/scummvm.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				IgnoreDefaultLibraryNames="libc.lib"
-				GenerateDebugInformation="FALSE"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				EntryPointSymbol="WinMainCRTStartup"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<Filter
-			Name="base">
-			<File
-				RelativePath="..\..\base\commandLine.cpp">
-			</File>
-			<File
-				RelativePath="..\..\base\commandLine.h">
-			</File>
-			<File
-				RelativePath="..\..\base\internal_version.h">
-			</File>
-			<File
-				RelativePath="..\..\base\main.cpp">
-			</File>
-			<File
-				RelativePath="..\..\base\main.h">
-			</File>
-			<File
-				RelativePath="..\..\base\plugins.cpp">
-			</File>
-			<File
-				RelativePath="..\..\base\plugins.h">
-			</File>
-			<File
-				RelativePath="..\..\base\version.cpp">
-			</File>
-			<File
-				RelativePath="..\..\base\version.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="common">
-			<File
-				RelativePath="..\..\common\algorithm.h">
-			</File>
-			<File
-				RelativePath="..\..\common\archive.cpp">
-			</File>
-			<File
-				RelativePath="..\..\common\archive.h">
-			</File>
-			<File
-				RelativePath="..\..\common\array.h">
-			</File>
-			<File
-				RelativePath="..\..\common\config-file.cpp">
-			</File>
-			<File
-				RelativePath="..\..\common\config-file.h">
-			</File>
-			<File
-				RelativePath="..\..\common\config-manager.cpp">
-			</File>
-			<File
-				RelativePath="..\..\common\config-manager.h">
-			</File>
-			<File
-				RelativePath="..\..\common\debug.cpp">
-			</File>
-			<File
-				RelativePath="..\..\common\debug.h">
-			</File>
-			<File
-				RelativePath="..\..\common\endian.h">
-			</File>
-			<File
-				RelativePath="..\..\common\error.h">
-			</File>
-			<File
-				RelativePath="..\..\common\events.h">
-			</File>
-			<File
-				RelativePath="..\..\common\file.cpp">
-			</File>
-			<File
-				RelativePath="..\..\common\file.h">
-			</File>
-			<File
-				RelativePath="..\..\common\frac.h">
-			</File>
-			<File
-				RelativePath="..\..\common\fs.cpp">
-			</File>
-			<File
-				RelativePath="..\..\common\fs.h">
-			</File>
-			<File
-				RelativePath="..\..\common\func.h">
-			</File>
-			<File
-				RelativePath="..\..\common\hash-str.h">
-			</File>
-			<File
-				RelativePath="..\..\common\hashmap.cpp">
-			</File>
-			<File
-				RelativePath="..\..\common\hashmap.h">
-			</File>
-			<File
-				RelativePath="..\..\common\iff_container.h">
-			</File>
-			<File
-				RelativePath="..\..\common\keyboard.h">
-			</File>
-			<File
-				RelativePath="..\..\common\list.h">
-			</File>
-			<File
-				RelativePath="..\..\common\list_intern.h">
-			</File>
-			<File
-				RelativePath="..\..\common\md5.cpp">
-			</File>
-			<File
-				RelativePath="..\..\common\md5.h">
-			</File>
-			<File
-				RelativePath="..\..\common\memorypool.cpp">
-			</File>
-			<File
-				RelativePath="..\..\common\memorypool.h">
-			</File>
-			<File
-				RelativePath="..\..\common\mutex.cpp">
-			</File>
-			<File
-				RelativePath="..\..\common\mutex.h">
-			</File>
-			<File
-				RelativePath="..\..\common\noncopyable.h">
-			</File>
-			<File
-				RelativePath="..\..\common\pack-end.h">
-			</File>
-			<File
-				RelativePath="..\..\common\pack-start.h">
-			</File>
-			<File
-				RelativePath="..\..\common\ptr.h">
-			</File>
-			<File
-				RelativePath="..\..\common\queue.h">
-			</File>
-			<File
-				RelativePath="..\..\common\rect.h">
-			</File>
-			<File
-				RelativePath="..\..\common\savefile.h">
-			</File>
-			<File
-				RelativePath="..\..\common\scummsys.h">
-			</File>
-			<File
-				RelativePath="..\..\common\serializer.h">
-			</File>
-			<File
-				RelativePath="..\..\common\singleton.h">
-			</File>
-			<File
-				RelativePath="..\..\common\stack.h">
-			</File>
-			<File
-				RelativePath="..\..\common\str.cpp">
-			</File>
-			<File
-				RelativePath="..\..\common\str.h">
-			</File>
-			<File
-				RelativePath="..\..\common\stream.cpp">
-			</File>
-			<File
-				RelativePath="..\..\common\stream.h">
-			</File>
-			<File
-				RelativePath="..\..\common\system.cpp">
-			</File>
-			<File
-				RelativePath="..\..\common\system.h">
-			</File>
-			<File
-				RelativePath="..\..\common\timer.h">
-			</File>
-			<File
-				RelativePath="..\..\common\unarj.cpp">
-			</File>
-			<File
-				RelativePath="..\..\common\unarj.h">
-			</File>
-			<File
-				RelativePath="..\..\common\unzip.cpp">
-			</File>
-			<File
-				RelativePath="..\..\common\unzip.h">
-			</File>
-			<File
-				RelativePath="..\..\common\util.cpp">
-			</File>
-			<File
-				RelativePath="..\..\common\util.h">
-			</File>
-			<File
-				RelativePath="..\..\common\xmlparser.cpp">
-			</File>
-			<File
-				RelativePath="..\..\common\xmlparser.h">
-			</File>
-			<File
-				RelativePath="..\..\common\zlib.cpp">
-			</File>
-			<File
-				RelativePath="..\..\common\zlib.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="sound">
-			<File
-				RelativePath="..\..\sound\adpcm.cpp">
-			</File>
-			<File
-				RelativePath="..\..\sound\adpcm.h">
-			</File>
-			<File
-				RelativePath="..\..\sound\aiff.cpp">
-			</File>
-			<File
-				RelativePath="..\..\sound\aiff.h">
-			</File>
-			<File
-				RelativePath="..\..\sound\audiocd.cpp">
-			</File>
-			<File
-				RelativePath="..\..\sound\audiocd.h">
-			</File>
-			<File
-				RelativePath="..\..\sound\audiostream.cpp">
-			</File>
-			<File
-				RelativePath="..\..\sound\audiostream.h">
-			</File>
-			<File
-				RelativePath="..\..\sound\flac.cpp">
-			</File>
-			<File
-				RelativePath="..\..\sound\flac.h">
-			</File>
-			<File
-				RelativePath="..\..\sound\fmopl.cpp">
-			</File>
-			<File
-				RelativePath="..\..\sound\fmopl.h">
-			</File>
-			<File
-				RelativePath="..\..\sound\iff.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\sound\iff.h">
-			</File>
-			<File
-				RelativePath="..\..\sound\mididrv.cpp">
-			</File>
-			<File
-				RelativePath="..\..\sound\mididrv.h">
-			</File>
-			<File
-				RelativePath="..\..\sound\midiparser.cpp">
-			</File>
-			<File
-				RelativePath="..\..\sound\midiparser.h">
-			</File>
-			<File
-				RelativePath="..\..\sound\midiparser_smf.cpp">
-			</File>
-			<File
-				RelativePath="..\..\sound\midiparser_xmidi.cpp">
-			</File>
-			<File
-				RelativePath="..\..\sound\mixer.cpp">
-			</File>
-			<File
-				RelativePath="..\..\sound\mixer.h">
-			</File>
-			<File
-				RelativePath="..\..\sound\mixer_intern.h">
-			</File>
-			<File
-				RelativePath="..\..\sound\mp3.cpp">
-			</File>
-			<File
-				RelativePath="..\..\sound\mp3.h">
-			</File>
-			<File
-				RelativePath="..\..\sound\mpu401.cpp">
-			</File>
-			<File
-				RelativePath="..\..\sound\mpu401.h">
-			</File>
-			<File
-				RelativePath="..\..\sound\musicplugin.cpp">
-			</File>
-			<File
-				RelativePath="..\..\sound\musicplugin.h">
-			</File>
-			<File
-				RelativePath="..\..\sound\null.cpp">
-			</File>
-			<File
-				RelativePath="..\..\sound\rate.cpp">
-			</File>
-			<File
-				RelativePath="..\..\sound\rate.h">
-			</File>
-			<File
-				RelativePath="..\..\sound\shorten.cpp">
-			</File>
-			<File
-				RelativePath="..\..\sound\shorten.h">
-			</File>
-			<File
-				RelativePath="..\..\sound\timestamp.cpp">
-			</File>
-			<File
-				RelativePath="..\..\sound\timestamp.h">
-			</File>
-			<File
-				RelativePath="..\..\sound\vag.cpp">
-			</File>
-			<File
-				RelativePath="..\..\sound\vag.h">
-			</File>
-			<File
-				RelativePath="..\..\sound\voc.cpp">
-			</File>
-			<File
-				RelativePath="..\..\sound\voc.h">
-			</File>
-			<File
-				RelativePath="..\..\sound\vorbis.cpp">
-			</File>
-			<File
-				RelativePath="..\..\sound\vorbis.h">
-			</File>
-			<File
-				RelativePath="..\..\sound\wave.cpp">
-			</File>
-			<File
-				RelativePath="..\..\sound\wave.h">
-			</File>
-			<Filter
-				Name="softhsynth">
-				<File
-					RelativePath="..\..\sound\softsynth\adlib.cpp">
-					<FileConfiguration
-						Name="Debug|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc"/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\sound\softsynth\emumidi.h">
-				</File>
-				<File
-					RelativePath="..\..\sound\softsynth\fluidsynth.cpp">
-				</File>
-				<File
-					RelativePath="..\..\sound\softsynth\mt32.cpp">
-					<FileConfiguration
-						Name="Debug|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc"/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\sound\softsynth\pcspk.cpp">
-				</File>
-				<File
-					RelativePath="..\..\sound\softsynth\pcspk.h">
-				</File>
-				<File
-					RelativePath="..\..\sound\softsynth\ym2612.cpp">
-					<FileConfiguration
-						Name="Debug|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc"/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\sound\softsynth\ym2612.h">
-				</File>
-				<Filter
-					Name="mt32">
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\freeverb.cpp">
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\freeverb.h">
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\i386.cpp">
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\i386.h">
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\mt32_file.cpp">
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\mt32_file.h">
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\mt32emu.h">
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\part.cpp">
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\part.h">
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\partial.cpp">
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\partial.h">
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\partialManager.cpp">
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\partialManager.h">
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\structures.h">
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\synth.cpp">
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\synth.h">
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\tables.cpp">
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\tables.h">
-					</File>
-				</Filter>
-				<Filter
-					Name="opl">
-					<File
-						RelativePath="..\..\sound\softsynth\opl\dosbox.cpp">
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\opl\dosbox.h">
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\opl\mame.cpp">
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\opl\mame.h">
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\opl\opl_impl.h">
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\opl\opl_inc.h">
-					</File>
-				</Filter>
-			</Filter>
-			<Filter
-				Name="mods">
-				<File
-					RelativePath="..\..\sound\mods\infogrames.cpp">
-				</File>
-				<File
-					RelativePath="..\..\sound\mods\infogrames.h">
-				</File>
-				<File
-					RelativePath="..\..\sound\mods\module.cpp">
-				</File>
-				<File
-					RelativePath="..\..\sound\mods\module.h">
-				</File>
-				<File
-					RelativePath="..\..\sound\mods\paula.cpp">
-				</File>
-				<File
-					RelativePath="..\..\sound\mods\paula.h">
-				</File>
-				<File
-					RelativePath="..\..\sound\mods\protracker.cpp">
-				</File>
-				<File
-					RelativePath="..\..\sound\mods\protracker.h">
-				</File>
-				<File
-					RelativePath="..\..\sound\mods\rjp1.cpp">
-				</File>
-				<File
-					RelativePath="..\..\sound\mods\rjp1.h">
-				</File>
-				<File
-					RelativePath="..\..\sound\mods\soundfx.cpp">
-				</File>
-				<File
-					RelativePath="..\..\sound\mods\soundfx.h">
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="txt">
-			<File
-				RelativePath="..\..\COPYING">
-			</File>
-			<File
-				RelativePath="..\..\NEWS">
-			</File>
-			<File
-				RelativePath="..\..\README">
-			</File>
-			<File
-				RelativePath="..\..\TODO">
-			</File>
-		</Filter>
-		<Filter
-			Name="rsc"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
-			<File
-				RelativePath="..\..\icons\scummvm.ico">
-			</File>
-			<File
-				RelativePath="..\..\dists\scummvm.rc">
-			</File>
-		</Filter>
-		<Filter
-			Name="backends">
-			<File
-				RelativePath="..\..\backends\base-backend.cpp">
-			</File>
-			<File
-				RelativePath="..\..\backends\base-backend.h">
-			</File>
-			<Filter
-				Name="sdl">
-				<File
-					RelativePath="..\..\backends\platform\sdl\events.cpp">
-				</File>
-				<File
-					RelativePath="..\..\backends\platform\sdl\graphics.cpp">
-				</File>
-				<File
-					RelativePath="..\..\backends\platform\sdl\hardwarekeys.cpp">
-				</File>
-				<File
-					RelativePath="..\..\backends\platform\sdl\main.cpp">
-					<FileConfiguration
-						Name="Debug|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\backends\platform\sdl\sdl.cpp">
-				</File>
-				<File
-					RelativePath="..\..\backends\platform\sdl\sdl.h">
-				</File>
-			</Filter>
-			<Filter
-				Name="fs">
-				<File
-					RelativePath="..\..\backends\fs\abstract-fs.cpp">
-				</File>
-				<File
-					RelativePath="..\..\backends\fs\abstract-fs.h">
-				</File>
-				<File
-					RelativePath="..\..\backends\fs\fs-factory.h">
-				</File>
-				<File
-					RelativePath="..\..\backends\fs\stdiostream.cpp">
-				</File>
-				<File
-					RelativePath="..\..\backends\fs\stdiostream.h">
-				</File>
-				<Filter
-					Name="windows">
-					<File
-						RelativePath="..\..\backends\fs\windows\windows-fs-factory.cpp">
-					</File>
-					<File
-						RelativePath="..\..\backends\fs\windows\windows-fs-factory.h">
-					</File>
-				</Filter>
-			</Filter>
-			<Filter
-				Name="midi">
-				<File
-					RelativePath="..\..\backends\midi\windows.cpp">
-				</File>
-			</Filter>
-			<Filter
-				Name="timer">
-				<File
-					RelativePath="..\..\backends\timer\default\default-timer.cpp">
-				</File>
-				<File
-					RelativePath="..\..\backends\timer\default\default-timer.h">
-				</File>
-			</Filter>
-			<Filter
-				Name="saves">
-				<File
-					RelativePath="..\..\backends\saves\default\default-saves.cpp">
-				</File>
-				<File
-					RelativePath="..\..\backends\saves\default\default-saves.h">
-				</File>
-				<File
-					RelativePath="..\..\backends\saves\savefile.cpp">
-				</File>
-			</Filter>
-			<Filter
-				Name="events">
-				<Filter
-					Name="default">
-					<File
-						RelativePath="..\..\backends\events\default\default-events.cpp">
-					</File>
-					<File
-						RelativePath="..\..\backends\events\default\default-events.h">
-					</File>
-				</Filter>
-			</Filter>
-			<Filter
-				Name="keymapper">
-				<File
-					RelativePath="..\..\backends\keymapper\action.cpp">
-				</File>
-				<File
-					RelativePath="..\..\backends\keymapper\action.h">
-				</File>
-				<File
-					RelativePath="..\..\backends\keymapper\hardware-key.h">
-				</File>
-				<File
-					RelativePath="..\..\backends\keymapper\keymap.cpp">
-				</File>
-				<File
-					RelativePath="..\..\backends\keymapper\keymap.h">
-				</File>
-				<File
-					RelativePath="..\..\backends\keymapper\keymapper.cpp">
-				</File>
-				<File
-					RelativePath="..\..\backends\keymapper\keymapper.h">
-				</File>
-				<File
-					RelativePath="..\..\backends\keymapper\remap-dialog.cpp">
-				</File>
-				<File
-					RelativePath="..\..\backends\keymapper\remap-dialog.h">
-				</File>
-				<File
-					RelativePath="..\..\backends\keymapper\types.h">
-				</File>
-			</Filter>
-			<Filter
-				Name="vkeybd">
-				<File
-					RelativePath="..\..\backends\vkeybd\image-map.cpp">
-				</File>
-				<File
-					RelativePath="..\..\backends\vkeybd\image-map.h">
-				</File>
-				<File
-					RelativePath="..\..\backends\vkeybd\keycode-descriptions.h">
-				</File>
-				<File
-					RelativePath="..\..\backends\vkeybd\polygon.cpp">
-				</File>
-				<File
-					RelativePath="..\..\backends\vkeybd\polygon.h">
-				</File>
-				<File
-					RelativePath="..\..\backends\vkeybd\virtual-keyboard-gui.cpp">
-				</File>
-				<File
-					RelativePath="..\..\backends\vkeybd\virtual-keyboard-gui.h">
-				</File>
-				<File
-					RelativePath="..\..\backends\vkeybd\virtual-keyboard-parser.cpp">
-				</File>
-				<File
-					RelativePath="..\..\backends\vkeybd\virtual-keyboard-parser.h">
-				</File>
-				<File
-					RelativePath="..\..\backends\vkeybd\virtual-keyboard.cpp">
-				</File>
-				<File
-					RelativePath="..\..\backends\vkeybd\virtual-keyboard.h">
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="gui">
-			<File
-				RelativePath="..\..\gui\about.cpp">
-			</File>
-			<File
-				RelativePath="..\..\gui\about.h">
-			</File>
-			<File
-				RelativePath="..\..\gui\browser.cpp">
-			</File>
-			<File
-				RelativePath="..\..\gui\browser.h">
-			</File>
-			<File
-				RelativePath="..\..\gui\chooser.cpp">
-			</File>
-			<File
-				RelativePath="..\..\gui\chooser.h">
-			</File>
-			<File
-				RelativePath="..\..\gui\console.cpp">
-			</File>
-			<File
-				RelativePath="..\..\gui\console.h">
-			</File>
-			<File
-				RelativePath="..\..\gui\credits.h">
-			</File>
-			<File
-				RelativePath="..\..\gui\debugger.cpp">
-			</File>
-			<File
-				RelativePath="..\..\gui\debugger.h">
-			</File>
-			<File
-				RelativePath="..\..\gui\dialog.cpp">
-			</File>
-			<File
-				RelativePath="..\..\gui\dialog.h">
-			</File>
-			<File
-				RelativePath="..\..\gui\editable.cpp">
-			</File>
-			<File
-				RelativePath="..\..\gui\editable.h">
-			</File>
-			<File
-				RelativePath="..\..\gui\EditTextWidget.cpp">
-			</File>
-			<File
-				RelativePath="..\..\gui\EditTextWidget.h">
-			</File>
-			<File
-				RelativePath="..\..\gui\GuiManager.cpp">
-			</File>
-			<File
-				RelativePath="..\..\gui\GuiManager.h">
-			</File>
-			<File
-				RelativePath="..\..\gui\Key.cpp">
-			</File>
-			<File
-				RelativePath="..\..\gui\Key.h">
-			</File>
-			<File
-				RelativePath="..\..\gui\launcher.cpp">
-			</File>
-			<File
-				RelativePath="..\..\gui\launcher.h">
-			</File>
-			<File
-				RelativePath="..\..\gui\ListWidget.cpp">
-			</File>
-			<File
-				RelativePath="..\..\gui\ListWidget.h">
-			</File>
-			<File
-				RelativePath="..\..\gui\massadd.cpp">
-			</File>
-			<File
-				RelativePath="..\..\gui\massadd.h">
-			</File>
-			<File
-				RelativePath="..\..\gui\message.cpp">
-			</File>
-			<File
-				RelativePath="..\..\gui\message.h">
-			</File>
-			<File
-				RelativePath="..\..\gui\object.cpp">
-			</File>
-			<File
-				RelativePath="..\..\gui\object.h">
-			</File>
-			<File
-				RelativePath="..\..\gui\options.cpp">
-			</File>
-			<File
-				RelativePath="..\..\gui\options.h">
-			</File>
-			<File
-				RelativePath="..\..\gui\PopUpWidget.cpp">
-			</File>
-			<File
-				RelativePath="..\..\gui\PopUpWidget.h">
-			</File>
-			<File
-				RelativePath="..\..\gui\saveload.cpp">
-			</File>
-			<File
-				RelativePath="..\..\gui\saveload.h">
-			</File>
-			<File
-				RelativePath="..\..\gui\ScrollBarWidget.cpp">
-			</File>
-			<File
-				RelativePath="..\..\gui\ScrollBarWidget.h">
-			</File>
-			<File
-				RelativePath="..\..\gui\TabWidget.cpp">
-			</File>
-			<File
-				RelativePath="..\..\gui\TabWidget.h">
-			</File>
-			<File
-				RelativePath="..\..\gui\themebrowser.cpp">
-			</File>
-			<File
-				RelativePath="..\..\gui\themebrowser.h">
-			</File>
-			<File
-				RelativePath="..\..\gui\ThemeEngine.cpp">
-			</File>
-			<File
-				RelativePath="..\..\gui\ThemeEngine.h">
-			</File>
-			<File
-				RelativePath="..\..\gui\ThemeEval.cpp">
-			</File>
-			<File
-				RelativePath="..\..\gui\ThemeLayout.cpp">
-			</File>
-			<File
-				RelativePath="..\..\gui\ThemeLayout.h">
-			</File>
-			<File
-				RelativePath="..\..\gui\ThemeParser.cpp">
-			</File>
-			<File
-				RelativePath="..\..\gui\ThemeParser.h">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCustomBuildTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\gui\widget.cpp">
-			</File>
-			<File
-				RelativePath="..\..\gui\widget.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="graphics">
-			<File
-				RelativePath="..\..\graphics\colormasks.h">
-			</File>
-			<File
-				RelativePath="..\..\graphics\conversion.cpp">
-			</File>
-			<File
-				RelativePath="..\..\graphics\conversion.h">
-			</File>
-			<File
-				RelativePath="..\..\graphics\cursorman.cpp">
-			</File>
-			<File
-				RelativePath="..\..\graphics\cursorman.h">
-			</File>
-			<File
-				RelativePath="..\..\graphics\dither.cpp">
-			</File>
-			<File
-				RelativePath="..\..\graphics\dither.h">
-			</File>
-			<File
-				RelativePath="..\..\graphics\font.cpp">
-			</File>
-			<File
-				RelativePath="..\..\graphics\font.h">
-			</File>
-			<File
-				RelativePath="..\..\graphics\fontman.cpp">
-			</File>
-			<File
-				RelativePath="..\..\graphics\fontman.h">
-			</File>
-			<File
-				RelativePath="..\..\graphics\iff.cpp">
-			</File>
-			<File
-				RelativePath="..\..\graphics\iff.h">
-			</File>
-			<File
-				RelativePath="..\..\graphics\imagedec.cpp">
-			</File>
-			<File
-				RelativePath="..\..\graphics\imagedec.h">
-			</File>
-			<File
-				RelativePath="..\..\graphics\jpeg.cpp">
-			</File>
-			<File
-				RelativePath="..\..\graphics\jpeg.h">
-			</File>
-			<File
-				RelativePath="..\..\graphics\pixelformat.h">
-			</File>
-			<File
-				RelativePath="..\..\graphics\primitives.cpp">
-			</File>
-			<File
-				RelativePath="..\..\graphics\primitives.h">
-			</File>
-			<File
-				RelativePath="..\..\graphics\scaler.cpp">
-			</File>
-			<File
-				RelativePath="..\..\graphics\scaler.h">
-			</File>
-			<File
-				RelativePath="..\..\graphics\sjis.cpp">
-			</File>
-			<File
-				RelativePath="..\..\graphics\sjis.h">
-			</File>
-			<File
-				RelativePath="..\..\graphics\surface.cpp">
-			</File>
-			<File
-				RelativePath="..\..\graphics\surface.h">
-			</File>
-			<File
-				RelativePath="..\..\graphics\thumbnail.cpp">
-			</File>
-			<File
-				RelativePath="..\..\graphics\thumbnail.h">
-			</File>
-			<File
-				RelativePath="..\..\graphics\VectorRenderer.cpp">
-			</File>
-			<File
-				RelativePath="..\..\graphics\VectorRenderer.h">
-			</File>
-			<File
-				RelativePath="..\..\graphics\VectorRendererSpec.cpp">
-			</File>
-			<File
-				RelativePath="..\..\graphics\VectorRendererSpec.h">
-			</File>
-			<Filter
-				Name="scaler">
-				<File
-					RelativePath="..\..\graphics\scaler\2xsai.cpp">
-				</File>
-				<File
-					RelativePath="..\..\graphics\scaler\aspect.cpp">
-				</File>
-				<File
-					RelativePath="..\..\graphics\scaler\hq2x.cpp">
-				</File>
-				<File
-					RelativePath="..\..\graphics\scaler\hq2x.h">
-				</File>
-				<File
-					RelativePath="..\..\graphics\scaler\hq2x_i386.asm">
-					<FileConfiguration
-						Name="Debug|Win32">
-						<Tool
-							Name="VCCustomBuildTool"
-							CommandLine="nasm.exe -f win32 -g -o &quot;$(OutDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-							Outputs="$(OutDir)\$(InputName).obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32">
-						<Tool
-							Name="VCCustomBuildTool"
-							CommandLine="nasm.exe  -f win32 -o &quot;$(OutDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-							Outputs="$(OutDir)\$(InputName).obj"/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\graphics\scaler\hq3x.cpp">
-				</File>
-				<File
-					RelativePath="..\..\graphics\scaler\hq3x.h">
-				</File>
-				<File
-					RelativePath="..\..\graphics\scaler\hq3x_i386.asm">
-					<FileConfiguration
-						Name="Debug|Win32">
-						<Tool
-							Name="VCCustomBuildTool"
-							CommandLine="nasm.exe -f win32 -g -o &quot;$(OutDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-							Outputs="$(OutDir)\$(InputName).obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32">
-						<Tool
-							Name="VCCustomBuildTool"
-							CommandLine="nasm.exe -f win32 -o &quot;$(OutDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-							Outputs="$(OutDir)\$(InputName).obj"/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\graphics\scaler\intern.h">
-				</File>
-				<File
-					RelativePath="..\..\graphics\scaler\scale2x.cpp">
-				</File>
-				<File
-					RelativePath="..\..\graphics\scaler\scale2x.h">
-				</File>
-				<File
-					RelativePath="..\..\graphics\scaler\scale3x.cpp">
-				</File>
-				<File
-					RelativePath="..\..\graphics\scaler\scale3x.h">
-				</File>
-				<File
-					RelativePath="..\..\graphics\scaler\scalebit.cpp">
-				</File>
-				<File
-					RelativePath="..\..\graphics\scaler\scalebit.h">
-				</File>
-				<File
-					RelativePath="..\..\graphics\scaler\thumbnail_intern.cpp">
-				</File>
-			</Filter>
-			<Filter
-				Name="fonts">
-				<File
-					RelativePath="..\..\graphics\fonts\consolefont.cpp">
-				</File>
-				<File
-					RelativePath="..\..\graphics\fonts\newfont.cpp">
-				</File>
-				<File
-					RelativePath="..\..\graphics\fonts\newfont_big.cpp">
-				</File>
-				<File
-					RelativePath="..\..\graphics\fonts\scummfont.cpp">
-				</File>
-			</Filter>
-			<Filter
-				Name="video">
-				<File
-					RelativePath="..\..\graphics\video\dxa_decoder.cpp">
-				</File>
-				<File
-					RelativePath="..\..\graphics\video\dxa_decoder.h">
-				</File>
-				<File
-					RelativePath="..\..\graphics\video\flic_decoder.cpp">
-				</File>
-				<File
-					RelativePath="..\..\graphics\video\flic_decoder.h">
-				</File>
-				<File
-					RelativePath="..\..\graphics\video\mpeg_player.cpp">
-				</File>
-				<File
-					RelativePath="..\..\graphics\video\mpeg_player.h">
-				</File>
-				<File
-					RelativePath="..\..\graphics\video\smk_decoder.cpp">
-				</File>
-				<File
-					RelativePath="..\..\graphics\video\smk_decoder.h">
-				</File>
-				<File
-					RelativePath="..\..\graphics\video\video_player.cpp">
-				</File>
-				<File
-					RelativePath="..\..\graphics\video\video_player.h">
-				</File>
-				<Filter
-					Name="coktelvideo">
-					<File
-						RelativePath="..\..\graphics\video\coktelvideo\coktelvideo.cpp">
-					</File>
-					<File
-						RelativePath="..\..\graphics\video\coktelvideo\coktelvideo.h">
-					</File>
-					<File
-						RelativePath="..\..\graphics\video\coktelvideo\indeo3.cpp">
-					</File>
-					<File
-						RelativePath="..\..\graphics\video\coktelvideo\indeo3.h">
-					</File>
-					<File
-						RelativePath="..\..\graphics\video\coktelvideo\indeo3data.h">
-					</File>
-				</Filter>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="engines">
-			<File
-				RelativePath="..\..\engines\advancedDetector.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\advancedDetector.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\dialogs.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\dialogs.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\engine.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\engine.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\game.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\game.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\metaengine.h">
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/dists/msvc7/sky.vcproj b/dists/msvc7/sky.vcproj
deleted file mode 100644
index 4e3842c993..0000000000
--- a/dists/msvc7/sky.vcproj
+++ /dev/null
@@ -1,244 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7,00"
-	Name="sky"
-	ProjectGUID="{B5527758-2F51-4CCD-AAE1-B0E28654BD6A}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="sky_Debug"
-			IntermediateDirectory="sky_Debug"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="TRUE"
-				ExceptionHandling="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				SuppressStartupBanner="FALSE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/sky.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="sky_Release"
-			IntermediateDirectory="sky_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="TRUE"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="TRUE"
-				ExceptionHandling="TRUE"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="FALSE"
-				EnableFunctionLevelLinking="FALSE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				DebugInformationFormat="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/sky.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<Filter
-			Name="music">
-			<File
-				RelativePath="..\..\engines\sky\music\adlibchannel.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sky\music\adlibchannel.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sky\music\adlibmusic.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sky\music\adlibmusic.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sky\music\gmchannel.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sky\music\gmchannel.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sky\music\gmmusic.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sky\music\gmmusic.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sky\music\mt32music.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sky\music\mt32music.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sky\music\musicbase.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sky\music\musicbase.h">
-			</File>
-		</Filter>
-		<File
-			RelativePath="..\..\engines\sky\autoroute.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\autoroute.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\compact.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\compact.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\control.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\control.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\debug.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\debug.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\detection.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\disk.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\disk.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\grid.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\grid.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\hufftext.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\intro.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\intro.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\logic.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\logic.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\mouse.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\mouse.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\rnc_deco.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\rnc_deco.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\screen.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\screen.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\sky.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\sky.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\skydefs.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\sound.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\sound.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\struc.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\text.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\text.h">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/dists/msvc7/sword1.vcproj b/dists/msvc7/sword1.vcproj
deleted file mode 100644
index 998f43a02b..0000000000
--- a/dists/msvc7/sword1.vcproj
+++ /dev/null
@@ -1,223 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7,00"
-	Name="sword1"
-	ProjectGUID="{C8AAE83E-198B-4ECA-A877-166827953979}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="sword1_Debug"
-			IntermediateDirectory="sword1_Debug"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2"
-				MinimalRebuild="TRUE"
-				ExceptionHandling="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				SuppressStartupBanner="FALSE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/sword1.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="sword1_Release"
-			IntermediateDirectory="sword1_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="TRUE"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2"
-				StringPooling="TRUE"
-				ExceptionHandling="TRUE"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="FALSE"
-				EnableFunctionLevelLinking="FALSE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				DebugInformationFormat="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/sword1.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<File
-			RelativePath="..\..\engines\sword1\animation.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\animation.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\collision.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\control.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\control.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\debug.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\debug.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\detection.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\eventman.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\eventman.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\logic.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\logic.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\memman.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\memman.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\menu.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\menu.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\mouse.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\mouse.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\music.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\music.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\object.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\objectman.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\objectman.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\resman.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\resman.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\router.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\router.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\screen.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\screen.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\sound.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\sound.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\staticres.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\sword1.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\sword1.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\sworddefs.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\swordres.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\text.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\text.h">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/dists/msvc7/sword2.vcproj b/dists/msvc7/sword2.vcproj
deleted file mode 100644
index 5da67dda34..0000000000
--- a/dists/msvc7/sword2.vcproj
+++ /dev/null
@@ -1,256 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7,00"
-	Name="sword2"
-	ProjectGUID="{6CC3E421-779D-4E80-8100-520886A0F9FF}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="sword2_Debug"
-			IntermediateDirectory="sword2_Debug"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2"
-				MinimalRebuild="TRUE"
-				ExceptionHandling="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				SuppressStartupBanner="FALSE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/sword2.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="sword2_Release"
-			IntermediateDirectory="sword2_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="TRUE"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2"
-				StringPooling="TRUE"
-				ExceptionHandling="TRUE"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="FALSE"
-				EnableFunctionLevelLinking="FALSE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				DebugInformationFormat="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/sword2.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<File
-			RelativePath="..\..\engines\sword2\animation.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\animation.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\anims.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\console.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\console.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\controls.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\controls.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\debug.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\debug.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\defs.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\events.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\function.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\header.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\icons.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\interpreter.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\interpreter.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\layers.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\logic.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\logic.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\maketext.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\maketext.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\memory.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\memory.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\menu.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\mouse.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\mouse.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\music.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\object.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\palette.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\protocol.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\render.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\resman.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\resman.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\router.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\router.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\saveload.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\saveload.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\screen.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\screen.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\scroll.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\sound.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\sound.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\speech.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\sprite.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\startup.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\sword2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\sword2.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\sync.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\walker.cpp">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/dists/msvc7/tinsel.vcproj b/dists/msvc7/tinsel.vcproj
deleted file mode 100644
index 4b1ed05830..0000000000
--- a/dists/msvc7/tinsel.vcproj
+++ /dev/null
@@ -1,370 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7,00"
-	Name="tinsel"
-	ProjectGUID="{22AA7760-2C91-11DD-BD0B-0800200C9A66}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="tinsel_Debug"
-			IntermediateDirectory="tinsel_Debug"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="TRUE"
-				ExceptionHandling="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				SuppressStartupBanner="FALSE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/tinsel.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="tinsel_Release"
-			IntermediateDirectory="tinsel_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="TRUE"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="TRUE"
-				ExceptionHandling="TRUE"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="FALSE"
-				EnableFunctionLevelLinking="FALSE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				DebugInformationFormat="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/tinsel.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<File
-			RelativePath="..\..\engines\tinsel\actors.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\actors.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\anim.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\anim.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\background.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\background.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\bg.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\bmv.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\cliprect.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\cliprect.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\config.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\config.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\coroutine.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\cursor.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\cursor.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\debugger.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\debugger.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\detection.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\dialogs.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\dialogs.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\drives.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\drives.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\dw.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\effect.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\events.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\events.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\faders.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\faders.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\film.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\font.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\font.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\graphics.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\graphics.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\handle.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\handle.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\heapmem.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\heapmem.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\mareels.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\mareels.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\move.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\move.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\multiobj.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\multiobj.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\music.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\music.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\object.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\object.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\palette.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\palette.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\pcode.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\pcode.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\pdisplay.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\pdisplay.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\pid.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\play.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\play.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\polygons.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\polygons.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\rince.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\rince.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\saveload.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\savescn.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\savescn.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\scene.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\scene.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\sched.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\sched.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\scn.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\scn.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\scroll.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\scroll.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\sound.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\sound.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\strres.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\strres.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\sysvar.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\sysvar.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\text.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\text.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\timers.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\timers.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\tinlib.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\tinlib.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\tinsel.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\tinsel.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\token.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\token.h">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/dists/msvc7/touche.vcproj b/dists/msvc7/touche.vcproj
deleted file mode 100644
index 52fc1d2d91..0000000000
--- a/dists/msvc7/touche.vcproj
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7,00"
-	Name="touche"
-	ProjectGUID="{D4986356-D0BB-4981-924A-854157BDF11F}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="touche_Debug"
-			IntermediateDirectory="touche_Debug"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="TRUE"
-				ExceptionHandling="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				SuppressStartupBanner="FALSE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/touche.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="touche_Release"
-			IntermediateDirectory="touche_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="TRUE"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="TRUE"
-				ExceptionHandling="TRUE"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="FALSE"
-				EnableFunctionLevelLinking="FALSE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				DebugInformationFormat="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/touche.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<File
-			RelativePath="..\..\engines\touche\detection.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\touche\graphics.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\touche\graphics.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\touche\menu.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\touche\midi.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\touche\midi.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\touche\opcodes.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\touche\resource.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\touche\saveload.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\touche\staticres.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\touche\touche.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\touche\touche.h">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/dists/msvc7/tucker.vcproj b/dists/msvc7/tucker.vcproj
deleted file mode 100644
index 10084b59c2..0000000000
--- a/dists/msvc7/tucker.vcproj
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7,00"
-	Name="tucker"
-	ProjectGUID="{FF064FD0-AF6E-11DD-AD8B-0800200C9A66}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="tucker_Debug"
-			IntermediateDirectory="tucker_Debug"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="TRUE"
-				ExceptionHandling="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				SuppressStartupBanner="FALSE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/tucker.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="tucker_Release"
-			IntermediateDirectory="tucker_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="TRUE"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="TRUE"
-				ExceptionHandling="TRUE"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="FALSE"
-				EnableFunctionLevelLinking="FALSE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				DebugInformationFormat="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/tucker.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<File
-			RelativePath="..\..\engines\tucker\detection.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tucker\graphics.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tucker\graphics.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tucker\locations.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tucker\resource.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tucker\saveload.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tucker\sequences.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tucker\staticres.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tucker\tucker.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tucker\tucker.h">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/dists/msvc71/agi.vcproj b/dists/msvc71/agi.vcproj
deleted file mode 100644
index 4b5c0fa10e..0000000000
--- a/dists/msvc71/agi.vcproj
+++ /dev/null
@@ -1,282 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7,10"
-	Name="agi"
-	ProjectGUID="{F5F57066-CDF4-4F80-B9E7-7F4D21850D6E}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="agi_Debug"
-			IntermediateDirectory="agi_Debug"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="TRUE"
-				ExceptionHandling="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				SuppressStartupBanner="FALSE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/agi.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="agi_Release"
-			IntermediateDirectory="agi_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="TRUE"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="TRUE"
-				ExceptionHandling="TRUE"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="FALSE"
-				EnableFunctionLevelLinking="FALSE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				DebugInformationFormat="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/agi.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\engines\agi\agi.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\agi.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\checks.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\console.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\console.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\cycle.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\detection.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\font.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\global.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\graphics.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\graphics.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\id.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\inv.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\keyboard.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\keyboard.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\loader_v2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\loader_v3.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\logic.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\logic.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\lzw.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\lzw.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\menu.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\menu.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\motion.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\objects.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\op_cmd.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\op_dbg.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\op_test.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\opcodes.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\picture.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\picture.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\preagi.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\preagi.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\preagi_common.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\preagi_common.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\preagi_mickey.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\preagi_mickey.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\preagi_troll.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\preagi_troll.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\preagi_winnie.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\preagi_winnie.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\predictive.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\saveload.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\sound.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\sound.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\sprite.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\sprite.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\text.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\view.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\view.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\wagparser.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\wagparser.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\words.cpp">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/dists/msvc71/agos.vcproj b/dists/msvc71/agos.vcproj
deleted file mode 100644
index 059da5c3f1..0000000000
--- a/dists/msvc71/agos.vcproj
+++ /dev/null
@@ -1,294 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7,10"
-	Name="agos"
-	ProjectGUID="{E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="agos_Debug"
-			IntermediateDirectory="agos_Debug"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="TRUE"
-				ExceptionHandling="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="FALSE"
-				SuppressStartupBanner="FALSE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/agos.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="agos_Release"
-			IntermediateDirectory="agos_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="TRUE"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="TRUE"
-				ExceptionHandling="TRUE"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="FALSE"
-				EnableFunctionLevelLinking="FALSE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				DebugInformationFormat="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/agos.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\engines\agos\agos.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\agos.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\animation.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\animation.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\charset-fontdata.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\charset.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\contain.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\cursor.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\debug.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\debug.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\debugger.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\debugger.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\detection.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\detection_tables.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\draw.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\event.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\feeble.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\gfx.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\icons.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\input.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\intern.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\items.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\menus.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\midi.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\midi.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\midiparser_s1d.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\oracle.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\pn.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\res.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\res_ami.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\res_snd.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\rooms.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\saveload.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\script.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\script_e1.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\script_e2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\script_ff.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\script_pn.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\script_pp.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\script_s1.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\script_s2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\script_ww.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\sound.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\sound.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\string.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\subroutine.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\verb.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\vga.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\vga.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\vga_e2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\vga_ff.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\vga_pn.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\vga_s1.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\vga_s2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\vga_ww.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\window.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\zones.cpp">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/dists/msvc71/cine.vcproj b/dists/msvc71/cine.vcproj
deleted file mode 100644
index 3b1973c3b0..0000000000
--- a/dists/msvc71/cine.vcproj
+++ /dev/null
@@ -1,237 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7,10"
-	Name="cine"
-	ProjectGUID="{1CA4AC50-5426-433A-8B5E-FFE39568098E}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="cine_Debug"
-			IntermediateDirectory="cine_Debug"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="TRUE"
-				ExceptionHandling="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				SuppressStartupBanner="FALSE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/cine.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="cine_Release"
-			IntermediateDirectory="cine_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="TRUE"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="TRUE"
-				ExceptionHandling="TRUE"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="FALSE"
-				EnableFunctionLevelLinking="FALSE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				DebugInformationFormat="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/cine.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\engines\cine\anim.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\anim.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\bg.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\bg.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\bg_list.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\bg_list.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\cine.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\cine.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\detection.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\gfx.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\gfx.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\main_loop.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\main_loop.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\msg.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\msg.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\object.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\object.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\pal.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\pal.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\part.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\part.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\prc.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\prc.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\rel.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\rel.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\saveload.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\saveload.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\script.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\script_fw.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\script_os.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\sound.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\sound.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\texte.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\texte.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\unpack.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\unpack.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\various.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\various.h">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/dists/msvc71/cruise.vcproj b/dists/msvc71/cruise.vcproj
deleted file mode 100644
index b5c33b8ca2..0000000000
--- a/dists/msvc71/cruise.vcproj
+++ /dev/null
@@ -1,297 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7,10"
-	Name="cruise"
-	ProjectGUID="{8863B00B-059A-471E-876D-A955ECEFD0D2}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="cruise_Debug"
-			IntermediateDirectory="cruise_Debug"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="TRUE"
-				ExceptionHandling="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				SuppressStartupBanner="FALSE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/cruise.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="cruise_Release"
-			IntermediateDirectory="cruise_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="TRUE"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="TRUE"
-				ExceptionHandling="TRUE"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="FALSE"
-				EnableFunctionLevelLinking="FALSE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				DebugInformationFormat="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/cruise.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\engines\cruise\actor.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\actor.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\background.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\background.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\backgroundIncrust.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\backgroundIncrust.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\cell.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\cell.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\cruise.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\cruise.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\cruise_main.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\cruise_main.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\ctp.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\ctp.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\dataLoader.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\dataLoader.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\debugger.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\debugger.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\delphine-unpack.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\detection.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\font.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\font.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\function.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\function.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\gfxModule.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\gfxModule.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\linker.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\linker.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\mainDraw.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\mainDraw.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\menu.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\menu.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\mouse.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\mouse.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\object.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\object.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\overlay.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\overlay.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\perso.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\perso.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\polys.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\polys.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\saveload.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\saveload.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\script.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\script.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\sound.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\sound.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\stack.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\stack.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\staticres.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\staticres.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\various.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\various.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\vars.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\vars.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\volume.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\volume.h">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/dists/msvc71/drascula.vcproj b/dists/msvc71/drascula.vcproj
deleted file mode 100644
index 63922e333b..0000000000
--- a/dists/msvc71/drascula.vcproj
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7,10"
-	Name="drascula"
-	ProjectGUID="{CF888EE2-239C-40D7-83F1-1CDD4F7D56E3}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="drascula_Debug"
-			IntermediateDirectory="drascula_Debug"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="TRUE"
-				ExceptionHandling="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				SuppressStartupBanner="FALSE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/drascula.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="drascula_Release"
-			IntermediateDirectory="drascula_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="TRUE"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="TRUE"
-				ExceptionHandling="TRUE"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="FALSE"
-				EnableFunctionLevelLinking="FALSE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				DebugInformationFormat="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/drascula.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\engines\drascula\actors.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\animation.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\converse.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\detection.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\drascula.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\drascula.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\graphics.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\interface.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\objects.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\palette.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\rooms.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\saveload.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\sound.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\talk.cpp">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/dists/msvc71/gob.vcproj b/dists/msvc71/gob.vcproj
deleted file mode 100644
index 0a5f869970..0000000000
--- a/dists/msvc71/gob.vcproj
+++ /dev/null
@@ -1,483 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7,10"
-	Name="gob"
-	ProjectGUID="{976D947A-A45F-4437-991E-412F695C64C7}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="gob_Debug"
-			IntermediateDirectory="gob_Debug"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="TRUE"
-				ExceptionHandling="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				SuppressStartupBanner="FALSE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/gob.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="gob_Release"
-			IntermediateDirectory="gob_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="TRUE"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="TRUE"
-				ExceptionHandling="TRUE"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="FALSE"
-				EnableFunctionLevelLinking="FALSE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				DebugInformationFormat="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/gob.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="sound">
-			<File
-				RelativePath="..\..\engines\gob\sound\adlib.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\adlib.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\bgatmosphere.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\bgatmosphere.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\cdrom.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\cdrom.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\infogrames.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\infogrames.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\pcspeaker.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\pcspeaker.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\protracker.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\protracker.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\sound.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\sound.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\soundblaster.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\soundblaster.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\sounddesc.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\sounddesc.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\soundmixer.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\soundmixer.h">
-			</File>
-		</Filter>
-		<File
-			RelativePath="..\..\engines\gob\demos\batplayer.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\demos\batplayer.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\dataio.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\dataio.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\demos\demoplayer.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\demos\demoplayer.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\detection.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\draw.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\draw.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\draw_bargon.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\draw_fascin.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\draw_v1.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\draw_v2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\driver_vga.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\driver_vga.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\expression.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\expression.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\game.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\game.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\global.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\global.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\gob.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\gob.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\goblin.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\goblin.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\goblin_v1.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\goblin_v2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\goblin_v3.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\goblin_v4.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\helper.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\hotspots.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\hotspots.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\init.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\init.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\init_v1.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\init_v2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\init_v3.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\init_v6.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\inter.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\inter.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\inter_bargon.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\inter_fascin.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\inter_v1.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\inter_v2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\inter_v3.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\inter_v4.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\inter_v5.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\inter_v6.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\map.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\map.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\map_v1.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\map_v2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\map_v4.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\mult.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\mult.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\mult_v1.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\mult_v2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\palanim.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\palanim.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\resources.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\resources.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveconverter.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveconverter.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveconverter_v2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveconverter_v3.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveconverter_v4.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveconverter_v6.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\savefile.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\savefile.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\savehandler.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\savehandler.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveload.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveload.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveload_v2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveload_v3.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveload_v4.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveload_v6.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveload_playtoons.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\scenery.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\scenery.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\scenery_v1.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\scenery_v2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\demos\scnplayer.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\demos\scnplayer.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\script.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\script.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\totfile.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\totfile.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\util.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\util.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\variables.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\variables.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\video.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\video.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\video_v1.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\video_v2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\video_v6.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\videoplayer.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\videoplayer.h">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/dists/msvc71/groovie.vcproj b/dists/msvc71/groovie.vcproj
deleted file mode 100644
index 1e1ac8d7c7..0000000000
--- a/dists/msvc71/groovie.vcproj
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7,10"
-	Name="groovie"
-	ProjectGUID="{2C1EA540-0B09-11DD-BD00-000000000000}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="groovie_Debug"
-			IntermediateDirectory="groovie_Debug"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="0"
-				AdditionalIncludeDirectories="../..;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="TRUE"
-				ExceptionHandling="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="FALSE"
-				SuppressStartupBanner="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/groovie.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="groovie_Release"
-			IntermediateDirectory="groovie_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="TRUE"
-				ExceptionHandling="TRUE"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="FALSE"
-				EnableFunctionLevelLinking="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				DebugInformationFormat="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/groovie.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\engines\groovie\cell.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\cell.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\cursor.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\cursor.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\debug.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\debug.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\detection.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\font.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\font.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\graphics.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\graphics.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\groovie.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\groovie.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\lzss.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\lzss.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\music.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\music.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\player.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\player.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\resource.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\resource.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\roq.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\roq.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\saveload.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\saveload.h">
-		</File>		
-		<File
-			RelativePath="..\..\engines\groovie\script.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\script.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\vdx.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\vdx.h">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/dists/msvc71/igor.vcproj b/dists/msvc71/igor.vcproj
deleted file mode 100644
index 10b744e9b3..0000000000
--- a/dists/msvc71/igor.vcproj
+++ /dev/null
@@ -1,240 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7,10"
-	Name="igor"
-	ProjectGUID="{83945CAF-87A0-4202-8BA4-87A0CB15D78A}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="igor_Debug"
-			IntermediateDirectory="igor_Debug"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="TRUE"
-				ExceptionHandling="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				SuppressStartupBanner="FALSE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/igor.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="igor_Release"
-			IntermediateDirectory="igor_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="TRUE"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="TRUE"
-				ExceptionHandling="TRUE"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="FALSE"
-				EnableFunctionLevelLinking="FALSE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				DebugInformationFormat="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/igor.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="parts">
-			<File
-				RelativePath="..\..\engines\igor\parts\part_04.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_05.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_06.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_12.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_13.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_14.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_15.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_16.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_17.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_18.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_19.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_21.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_22.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_23.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_24.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_25.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_26.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_27.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_28.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_30.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_31.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_33.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_36.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_37.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_75.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_85.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_90.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_95.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_main.cpp">
-			</File>
-		</Filter>
-		<File
-			RelativePath="..\..\engines\igor\detection.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\igor\igor.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\igor\igor.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\igor\menu.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\igor\midi.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\igor\midi.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\igor\resource_ids.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\igor\saveload.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\igor\staticres.cpp">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/dists/msvc71/kyra.vcproj b/dists/msvc71/kyra.vcproj
deleted file mode 100644
index f37e479012..0000000000
--- a/dists/msvc71/kyra.vcproj
+++ /dev/null
@@ -1,471 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7,10"
-	Name="kyra"
-	ProjectGUID="{9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="kyra_Debug"
-			IntermediateDirectory="kyra_Debug"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;ENABLE_LOL"
-				MinimalRebuild="TRUE"
-				ExceptionHandling="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				SuppressStartupBanner="FALSE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/kyra.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="kyra_Release"
-			IntermediateDirectory="kyra_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="TRUE"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;ENABLE_LOL"
-				StringPooling="TRUE"
-				ExceptionHandling="TRUE"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="FALSE"
-				EnableFunctionLevelLinking="FALSE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				DebugInformationFormat="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/kyra.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\engines\kyra\animator_hof.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\animator_lok.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\animator_lok.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\animator_mr.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\animator_v2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\debugger.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\debugger.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\detection.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui_hof.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui_hof.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui_lok.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui_lok.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui_lol.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui_lol.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui_mr.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui_mr.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui_v2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui_v2.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\items_hof.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\items_lok.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\items_lol.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\items_mr.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\items_v2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\kyra_hof.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\kyra_hof.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\kyra_lok.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\kyra_lok.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\kyra_mr.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\kyra_mr.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\kyra_v1.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\kyra_v1.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\kyra_v2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\kyra_v2.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\lol.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\lol.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\resource.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\resource.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\resource_intern.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\resource_intern.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\saveload.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\saveload_hof.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\saveload_lok.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\saveload_lol.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\saveload_mr.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\scene_hof.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\scene_lok.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\scene_lol.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\scene_mr.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\scene_v1.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\scene_v2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen_hof.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen_hof.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen_lok.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen_lok.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen_lol.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen_lol.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen_mr.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen_mr.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen_v2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen_v2.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\script.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\script.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\script_hof.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\script_lok.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\script_lol.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\script_mr.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\script_tim.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\script_tim.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\script_v1.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\script_v2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\seqplayer.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\seqplayer.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sequences_hof.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sequences_lok.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sequences_lol.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sequences_mr.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sequences_v2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sound.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sound.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sound_adlib.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sound_digital.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sound_intern.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sound_lok.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sound_lol.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sound_midi.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sound_pcspk.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sound_towns.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sprites.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sprites.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sprites_lol.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\staticres.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\text.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\text.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\text_hof.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\text_hof.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\text_lok.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\text_lol.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\text_lol.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\text_mr.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\text_mr.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\timer.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\timer.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\timer_hof.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\timer_lok.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\timer_lol.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\timer_mr.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\util.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\util.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\vqa.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\vqa.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\wsamovie.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\wsamovie.h">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/dists/msvc71/lure.vcproj b/dists/msvc71/lure.vcproj
deleted file mode 100644
index 94d672229a..0000000000
--- a/dists/msvc71/lure.vcproj
+++ /dev/null
@@ -1,255 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7,10"
-	Name="lure"
-	ProjectGUID="{1A1CA028-61B5-4A6C-A918-F5D8721AB1AC}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="lure_Debug"
-			IntermediateDirectory="lure_Debug"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="TRUE"
-				ExceptionHandling="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				SuppressStartupBanner="FALSE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/lure.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="lure_Release"
-			IntermediateDirectory="lure_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="TRUE"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="TRUE"
-				ExceptionHandling="TRUE"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="FALSE"
-				EnableFunctionLevelLinking="FALSE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				DebugInformationFormat="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/lure.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\engines\lure\animseq.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\animseq.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\debugger.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\debugger.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\decode.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\decode.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\detection.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\disk.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\disk.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\events.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\events.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\fights.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\fights.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\game.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\game.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\hotspots.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\hotspots.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\intro.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\intro.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\lure.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\lure.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\luredefs.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\memory.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\memory.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\menu.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\menu.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\palette.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\palette.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\res.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\res.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\res_struct.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\res_struct.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\room.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\room.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\screen.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\screen.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\scripts.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\scripts.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\sound.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\sound.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\strings.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\strings.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\surface.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\surface.h">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/dists/msvc71/m4.vcproj b/dists/msvc71/m4.vcproj
deleted file mode 100644
index ea1ca572eb..0000000000
--- a/dists/msvc71/m4.vcproj
+++ /dev/null
@@ -1,297 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7,10"
-	Name="m4"
-	ProjectGUID="{6D576A24-B9CE-11DC-BC77-8D2856D89593}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="m4_Debug"
-			IntermediateDirectory="m4_Debug"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="TRUE"
-				ExceptionHandling="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				SuppressStartupBanner="FALSE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/m4.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="m4_Release"
-			IntermediateDirectory="m4_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="TRUE"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="TRUE"
-				ExceptionHandling="TRUE"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="FALSE"
-				EnableFunctionLevelLinking="FALSE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				DebugInformationFormat="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/m4.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\engines\m4\actor.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\actor.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\animation.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\animation.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\assets.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\assets.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\burger_data.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\compression.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\compression.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\console.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\console.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\converse.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\converse.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\detection.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\events.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\events.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\font.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\font.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\globals.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\globals.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\graphics.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\graphics.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\gui.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\gui.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\hotspot.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\hotspot.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\m4.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\m4.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\m4_menus.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\m4_menus.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\m4_views.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\m4_views.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\mads_anim.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\mads_anim.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\mads_menus.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\mads_menus.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\midi.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\midi.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\rails.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\rails.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\resource.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\resource.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\saveload.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\saveload.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\scene.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\scene.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\script.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\script.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\sound.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\sound.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\sprite.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\sprite.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\viewmgr.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\viewmgr.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\woodscript.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\woodscript.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\ws_machine.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\ws_sequence.cpp">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/dists/msvc71/made.vcproj b/dists/msvc71/made.vcproj
deleted file mode 100644
index a233f28e58..0000000000
--- a/dists/msvc71/made.vcproj
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7,10"
-	Name="made"
-	ProjectGUID="{E29B5D40-08F7-11DD-BD0B-0800200C9A66}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="made_Debug"
-			IntermediateDirectory="made_Debug"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="TRUE"
-				ExceptionHandling="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				SuppressStartupBanner="FALSE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/made.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="made_Release"
-			IntermediateDirectory="made_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="TRUE"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="TRUE"
-				ExceptionHandling="TRUE"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="FALSE"
-				EnableFunctionLevelLinking="FALSE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				DebugInformationFormat="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/made.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\engines\made\database.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\made\database.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\made\detection.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\made\graphics.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\made\graphics.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\made\made.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\made\made.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\made\music.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\made\music.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\made\pmvplayer.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\made\pmvplayer.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\made\redreader.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\made\redreader.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\made\resource.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\made\resource.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\made\screen.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\made\screen.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\made\screenfx.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\made\screenfx.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\made\script.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\made\script.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\made\scriptfuncs.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\made\scriptfuncs.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\made\sound.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\made\sound.h">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/dists/msvc71/parallaction.vcproj b/dists/msvc71/parallaction.vcproj
deleted file mode 100644
index 5e57f5e581..0000000000
--- a/dists/msvc71/parallaction.vcproj
+++ /dev/null
@@ -1,258 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7,10"
-	Name="parallaction"
-	ProjectGUID="{0068957B-E2E1-4988-8C87-D541D84DAF20}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="parallaction_Debug"
-			IntermediateDirectory="parallaction_Debug"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="TRUE"
-				ExceptionHandling="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				SuppressStartupBanner="FALSE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/parallaction.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="parallaction_Release"
-			IntermediateDirectory="parallaction_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="TRUE"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="TRUE"
-				ExceptionHandling="TRUE"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="FALSE"
-				EnableFunctionLevelLinking="FALSE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				DebugInformationFormat="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/parallaction.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\engines\parallaction\balloons.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\callables_br.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\callables_ns.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\debug.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\debug.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\detection.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\dialogue.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\disk.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\disk.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\disk_br.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\disk_ns.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\exec.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\exec.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\exec_br.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\exec_ns.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\font.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\gfxbase.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\graphics.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\graphics.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\gui.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\gui.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\gui_br.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\gui_ns.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\input.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\input.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\inventory.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\inventory.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\objects.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\objects.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\parallaction.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\parallaction.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\parallaction_br.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\parallaction_ns.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\parser.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\parser.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\parser_br.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\parser_ns.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\saveload.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\saveload.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\sound.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\sound_br.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\sound_ns.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\staticres.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\walk.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\walk.h">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/dists/msvc71/queen.vcproj b/dists/msvc71/queen.vcproj
deleted file mode 100644
index e301f12726..0000000000
--- a/dists/msvc71/queen.vcproj
+++ /dev/null
@@ -1,246 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7,10"
-	Name="queen"
-	ProjectGUID="{6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="queen_Debug"
-			IntermediateDirectory="queen_Debug"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="TRUE"
-				ExceptionHandling="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				SuppressStartupBanner="FALSE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/queen.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="queen_Release"
-			IntermediateDirectory="queen_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="TRUE"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="TRUE"
-				ExceptionHandling="TRUE"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="FALSE"
-				EnableFunctionLevelLinking="FALSE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				DebugInformationFormat="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/queen.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\engines\queen\bankman.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\bankman.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\command.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\command.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\credits.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\credits.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\cutaway.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\cutaway.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\debug.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\debug.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\defs.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\display.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\display.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\graphics.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\graphics.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\grid.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\grid.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\input.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\input.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\journal.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\journal.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\logic.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\logic.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\midiadlib.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\music.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\music.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\musicdata.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\queen.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\queen.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\resource.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\resource.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\restables.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\sound.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\sound.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\state.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\state.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\structs.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\talk.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\talk.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\walk.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\walk.h">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/dists/msvc71/saga.vcproj b/dists/msvc71/saga.vcproj
deleted file mode 100644
index d4a5628368..0000000000
--- a/dists/msvc71/saga.vcproj
+++ /dev/null
@@ -1,303 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7,10"
-	Name="saga"
-	ProjectGUID="{676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="saga_Debug"
-			IntermediateDirectory="saga_Debug"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;ENABLE_IHNM;ENABLE_SAGA2;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="TRUE"
-				ExceptionHandling="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				SuppressStartupBanner="FALSE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/saga.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="saga_Release"
-			IntermediateDirectory="saga_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="TRUE"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;ENABLE_IHNM;ENABLE_SAGA2;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="TRUE"
-				ExceptionHandling="TRUE"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="FALSE"
-				EnableFunctionLevelLinking="FALSE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				DebugInformationFormat="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/saga.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\engines\saga\actor.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\actor.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\actor_path.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\actor_walk.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\animation.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\animation.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\console.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\console.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\detection.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\detection_tables.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\displayinfo.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\events.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\events.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\font.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\font.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\font_map.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\gfx.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\gfx.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\image.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\input.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\interface.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\interface.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\introproc_ihnm.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\introproc_ite.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\introproc_saga2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\isomap.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\isomap.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\itedata.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\itedata.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\music.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\music.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\objectmap.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\objectmap.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\palanim.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\palanim.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\puzzle.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\puzzle.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\render.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\render.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\resource.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\resource.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\resource_hrs.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\resource_res.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\resource_rsc.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\saga.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\saga.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\saveload.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\scene.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\scene.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\script.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\script.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\sfuncs.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\sfuncs_ihnm.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\sndres.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\sndres.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\sound.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\sound.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\sprite.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\sprite.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\sthread.cpp">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/dists/msvc71/sci.vcproj b/dists/msvc71/sci.vcproj
deleted file mode 100644
index 564c5666dc..0000000000
--- a/dists/msvc71/sci.vcproj
+++ /dev/null
@@ -1,468 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7,10"
-	Name="sci"
-	ProjectGUID="{53F17B2B-0412-4EC3-A999-ED0537BB5223}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="sci_Debug"
-			IntermediateDirectory="sci_Debug"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="TRUE"
-				ExceptionHandling="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="FALSE"
-				SuppressStartupBanner="FALSE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/sci.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="sci_Release"
-			IntermediateDirectory="sci_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="TRUE"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="TRUE"
-				ExceptionHandling="TRUE"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="FALSE"
-				EnableFunctionLevelLinking="FALSE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				DebugInformationFormat="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/sci.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="engine">
-			<File
-				RelativePath="..\..\engines\sci\engine\game.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\gc.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\gc.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\grammar.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\intmap.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\intmap.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\kernel.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\kernel.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\kernel_types.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\kevent.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\kfile.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\kgraphics.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\klists.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\kmath.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\kmenu.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\kmisc.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\kmovement.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\kpathing.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\kscripts.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\ksound.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\kstring.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\memobj.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\memobj.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\message.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\message.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\said.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\savegame.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\savegame.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\script.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\scriptdebug.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\seg_manager.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\seg_manager.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\state.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\state.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\stringfrag.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\vm.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\vm.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\vm_types.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="gfx">
-			<File
-				RelativePath="..\..\engines\sci\gfx\font.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\font.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_driver.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_driver.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_gui.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_gui.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_options.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_pixmap_scale.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_res_options.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_res_options.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_resmgr.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_resmgr.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_resource.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_resource.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_state_internal.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_support.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_system.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_tools.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_tools.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_widgets.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_widgets.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\menubar.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\menubar.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\operations.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\operations.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\palette.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\palette.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\res_cursor.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\res_font.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\res_pal.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\res_pic.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\res_view.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\seq_decoder.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\seq_decoder.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="sfx">
-			<File
-				RelativePath="..\..\engines\sci\sfx\core.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\core.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\device.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\iterator.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\iterator.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\iterator_internal.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\misc.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\player.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\sci_midi.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\sequencer.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\sfx_pcm.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\softseq.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\songlib.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\songlib.h">
-			</File>
-			<Filter
-				Name="softseq">
-				<File
-					RelativePath="..\..\engines\sci\sfx\softseq\adlib.cpp">
-				</File>
-				<File
-					RelativePath="..\..\engines\sci\sfx\softseq\adlib.h">
-				</File>
-				<File
-					RelativePath="..\..\engines\sci\sfx\softseq\amiga.cpp">
-				</File>
-				<File
-					RelativePath="..\..\engines\sci\sfx\softseq\pcjr.cpp">
-				</File>
-				<File
-					RelativePath="..\..\engines\sci\sfx\softseq\pcjr.h">
-				</File>
-			</Filter>
-			<Filter
-				Name="seq">
-				<File
-					RelativePath="..\..\engines\sci\sfx\seq\sequencers.cpp">
-				</File>
-			</Filter>
-		</Filter>
-		<File
-			RelativePath="..\..\engines\sci\console.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\console.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\debug.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\decompressor.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\decompressor.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\detection.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\exereader.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\exereader.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\resource.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\resource.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\sci.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\sci.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\engine\script.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\tools.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\tools.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\uinput.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\vocabulary.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\vocabulary.h">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/dists/msvc71/scumm.vcproj b/dists/msvc71/scumm.vcproj
deleted file mode 100644
index d6b7555c1f..0000000000
--- a/dists/msvc71/scumm.vcproj
+++ /dev/null
@@ -1,627 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7,10"
-	Name="scumm"
-	ProjectGUID="{B6AFD548-63D2-40CD-A652-E87095AFCBAF}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="scumm_Debug"
-			IntermediateDirectory="scumm_Debug"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;ENABLE_SCUMM_7_8;ENABLE_HE;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="TRUE"
-				ExceptionHandling="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				SuppressStartupBanner="FALSE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/scumm.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="scumm_Release"
-			IntermediateDirectory="scumm_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="TRUE"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;ENABLE_SCUMM_7_8;ENABLE_HE;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="TRUE"
-				ExceptionHandling="TRUE"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="FALSE"
-				EnableFunctionLevelLinking="FALSE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				DebugInformationFormat="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/scumm.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="smush">
-			<File
-				RelativePath="..\..\engines\scumm\smush\channel.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\channel.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\chunk_type.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\codec1.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\codec37.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\codec37.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\codec47.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\codec47.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\imuse_channel.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\saud_channel.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\smush_font.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\smush_font.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\smush_mixer.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\smush_mixer.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\smush_player.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\smush_player.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="imuse_digi">
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_bndmgr.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_bndmgr.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_codecs.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_music.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_script.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_sndmgr.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_sndmgr.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_tables.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_tables.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_track.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_track.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="insane">
-			<File
-				RelativePath="..\..\engines\scumm\insane\insane.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\insane\insane.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\insane\insane_ben.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\insane\insane_enemy.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\insane\insane_iact.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\insane\insane_scenes.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="he">
-			<File
-				RelativePath="..\..\engines\scumm\he\animation_he.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\animation_he.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\cup_player_he.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\cup_player_he.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\floodfill_he.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\floodfill_he.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\intern_he.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\logic_he.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\logic_he.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\palette_he.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\resource_he.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\resource_he.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\script_v100he.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\script_v60he.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\script_v70he.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\script_v71he.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\script_v72he.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\script_v80he.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\script_v90he.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\sound_he.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\sound_he.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\sprite_he.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\sprite_he.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\wiz_he.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\wiz_he.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="imuse">
-			<File
-				RelativePath="..\..\engines\scumm\imuse\imuse.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse\imuse.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse\imuse_internal.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse\imuse_part.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse\imuse_player.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse\instrument.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse\instrument.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse\sysex.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse\sysex_samnmax.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse\sysex_scumm.cpp">
-			</File>
-		</Filter>
-		<File
-			RelativePath="..\..\engines\scumm\actor.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\actor.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\akos.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\akos.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\base-costume.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\base-costume.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\bomp.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\bomp.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\boxes.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\boxes.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\camera.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\charset-fontdata.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\charset.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\charset.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\costume.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\costume.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\cursor.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\debugger.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\debugger.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\detection.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\detection.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\detection_tables.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\dialogs.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\dialogs.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\file.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\file.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\file_nes.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\file_nes.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\gfx.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\gfx.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\help.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\help.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\input.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\intern.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\midiparser_eup.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\midiparser_ro.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\music.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\nut_renderer.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\nut_renderer.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\object.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\object.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\palette.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_mod.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_mod.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_nes.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_nes.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_v1.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_v1.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_v2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_v2.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_v2a.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_v2a.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_v2cms.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_v3a.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_v3a.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\resource.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\resource.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\resource_v2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\resource_v3.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\resource_v4.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\room.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\saveload.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\saveload.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\script.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\script.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\script_v0.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\script_v2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\script_v3.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\script_v4.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\script_v5.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\script_v6.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\script_v8.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\scumm-md5.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\scumm.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\scumm.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\scumm_v0.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\scumm_v2.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\scumm_v3.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\scumm_v4.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\scumm_v5.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\scumm_v6.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\scumm_v7.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\scumm_v8.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\sound.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\sound.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\string.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\usage_bits.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\usage_bits.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\util.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\util.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\vars.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\verbs.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\verbs.h">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/dists/msvc71/scummvm.sln b/dists/msvc71/scummvm.sln
deleted file mode 100644
index 05e30e965b..0000000000
--- a/dists/msvc71/scummvm.sln
+++ /dev/null
@@ -1,231 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scummvm", "scummvm.vcproj", "{8434CB15-D08F-427D-9E6D-581AE5B28440}"
-	ProjectSection(ProjectDependencies) = postProject
-		{8863B00B-059A-471E-876D-A955ECEFD0D2} = {8863B00B-059A-471E-876D-A955ECEFD0D2}
-		{53F17B2B-0412-4EC3-A999-ED0537BB5223} = {53F17B2B-0412-4EC3-A999-ED0537BB5223}
-		{CF888EE2-239C-40D7-83F1-1CDD4F7D56E3} = {CF888EE2-239C-40D7-83F1-1CDD4F7D56E3}
-		{FF064FD0-AF6E-11DD-AD8B-0800200C9A66} = {FF064FD0-AF6E-11DD-AD8B-0800200C9A66}
-		{676DB4C5-9A3E-4EE1-8483-EBB79DC0700E} = {676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}
-		{83945CAF-87A0-4202-8BA4-87A0CB15D78A} = {83945CAF-87A0-4202-8BA4-87A0CB15D78A}
-		{9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC} = {9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}
-		{0068957B-E2E1-4988-8C87-D541D84DAF20} = {0068957B-E2E1-4988-8C87-D541D84DAF20}
-		{976D947A-A45F-4437-991E-412F695C64C7} = {976D947A-A45F-4437-991E-412F695C64C7}
-		{E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA} = {E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}
-		{F5F57066-CDF4-4F80-B9E7-7F4D21850D6E} = {F5F57066-CDF4-4F80-B9E7-7F4D21850D6E}
-		{6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7} = {6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7}
-		{22AA7760-2C91-11DD-BD0B-0800200C9A66} = {22AA7760-2C91-11DD-BD0B-0800200C9A66}
-		{B5527758-2F51-4CCD-AAE1-B0E28654BD6A} = {B5527758-2F51-4CCD-AAE1-B0E28654BD6A}
-		{D4986356-D0BB-4981-924A-854157BDF11F} = {D4986356-D0BB-4981-924A-854157BDF11F}
-		{1CA4AC50-5426-433A-8B5E-FFE39568098E} = {1CA4AC50-5426-433A-8B5E-FFE39568098E}
-		{B6AFD548-63D2-40CD-A652-E87095AFCBAF} = {B6AFD548-63D2-40CD-A652-E87095AFCBAF}
-		{2C1EA540-0B09-11DD-BD00-000000000000} = {2C1EA540-0B09-11DD-BD00-000000000000}
-		{E29B5D40-08F7-11DD-BD0B-0800200C9A66} = {E29B5D40-08F7-11DD-BD0B-0800200C9A66}
-		{C8AAE83E-198B-4ECA-A877-166827953979} = {C8AAE83E-198B-4ECA-A877-166827953979}
-		{1A1CA028-61B5-4A6C-A918-F5D8721AB1AC} = {1A1CA028-61B5-4A6C-A918-F5D8721AB1AC}
-		{6D576A24-B9CE-11DC-BC77-8D2856D89593} = {6D576A24-B9CE-11DC-BC77-8D2856D89593}
-		{6CC3E421-779D-4E80-8100-520886A0F9FF} = {6CC3E421-779D-4E80-8100-520886A0F9FF}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sword2", "sword2.vcproj", "{6CC3E421-779D-4E80-8100-520886A0F9FF}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "queen", "queen.vcproj", "{6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scumm", "scumm.vcproj", "{B6AFD548-63D2-40CD-A652-E87095AFCBAF}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "agos", "agos.vcproj", "{E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sky", "sky.vcproj", "{B5527758-2F51-4CCD-AAE1-B0E28654BD6A}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sword1", "sword1.vcproj", "{C8AAE83E-198B-4ECA-A877-166827953979}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kyra", "kyra.vcproj", "{9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "saga", "saga.vcproj", "{676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gob", "gob.vcproj", "{976D947A-A45F-4437-991E-412F695C64C7}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lure", "lure.vcproj", "{1A1CA028-61B5-4A6C-A918-F5D8721AB1AC}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cine", "cine.vcproj", "{1CA4AC50-5426-433A-8B5E-FFE39568098E}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "agi", "agi.vcproj", "{F5F57066-CDF4-4F80-B9E7-7F4D21850D6E}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "touche", "touche.vcproj", "{D4986356-D0BB-4981-924A-854157BDF11F}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "parallaction", "parallaction.vcproj", "{0068957B-E2E1-4988-8C87-D541D84DAF20}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cruise", "cruise.vcproj", "{8863B00B-059A-471E-876D-A955ECEFD0D2}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "drascula", "drascula.vcproj", "{CF888EE2-239C-40D7-83F1-1CDD4F7D56E3}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "igor", "igor.vcproj", "{83945CAF-87A0-4202-8BA4-87A0CB15D78A}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "m4", "m4.vcproj", "{6D576A24-B9CE-11DC-BC77-8D2856D89593}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "made", "made.vcproj", "{E29B5D40-08F7-11DD-BD0B-0800200C9A66}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tinsel", "tinsel.vcproj", "{22AA7760-2C91-11DD-BD0B-0800200C9A66}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tucker", "tucker.vcproj", "{FF064FD0-AF6E-11DD-AD8B-0800200C9A66}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "groovie", "groovie.vcproj", "{2C1EA540-0B09-11DD-BD00-000000000000}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sci", "sci.vcproj", "{53F17B2B-0412-4EC3-A999-ED0537BB5223}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfiguration) = preSolution
-		Debug = Debug
-		Release = Release
-	EndGlobalSection
-	GlobalSection(ProjectDependencies) = postSolution
-		{8434CB15-D08F-427D-9E6D-581AE5B28440}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8434CB15-D08F-427D-9E6D-581AE5B28440}.Debug|Win32.Build.0 = Debug|Win32
-		{8434CB15-D08F-427D-9E6D-581AE5B28440}.Release|Win32.ActiveCfg = Release|Win32
-		{8434CB15-D08F-427D-9E6D-581AE5B28440}.Release|Win32.Build.0 = Release|Win32
-		{6CC3E421-779D-4E80-8100-520886A0F9FF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6CC3E421-779D-4E80-8100-520886A0F9FF}.Debug|Win32.Build.0 = Debug|Win32
-		{6CC3E421-779D-4E80-8100-520886A0F9FF}.Release|Win32.ActiveCfg = Release|Win32
-		{6CC3E421-779D-4E80-8100-520886A0F9FF}.Release|Win32.Build.0 = Release|Win32
-		{6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7}.Debug|Win32.Build.0 = Debug|Win32
-		{6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7}.Release|Win32.ActiveCfg = Release|Win32
-		{6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7}.Release|Win32.Build.0 = Release|Win32
-		{B6AFD548-63D2-40CD-A652-E87095AFCBAF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B6AFD548-63D2-40CD-A652-E87095AFCBAF}.Debug|Win32.Build.0 = Debug|Win32
-		{B6AFD548-63D2-40CD-A652-E87095AFCBAF}.Release|Win32.ActiveCfg = Release|Win32
-		{B6AFD548-63D2-40CD-A652-E87095AFCBAF}.Release|Win32.Build.0 = Release|Win32
-		{E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}.Debug|Win32.Build.0 = Debug|Win32
-		{E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}.Release|Win32.ActiveCfg = Release|Win32
-		{E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}.Release|Win32.Build.0 = Release|Win32
-		{B5527758-2F51-4CCD-AAE1-B0E28654BD6A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B5527758-2F51-4CCD-AAE1-B0E28654BD6A}.Debug|Win32.Build.0 = Debug|Win32
-		{B5527758-2F51-4CCD-AAE1-B0E28654BD6A}.Release|Win32.ActiveCfg = Release|Win32
-		{B5527758-2F51-4CCD-AAE1-B0E28654BD6A}.Release|Win32.Build.0 = Release|Win32
-		{C8AAE83E-198B-4ECA-A877-166827953979}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C8AAE83E-198B-4ECA-A877-166827953979}.Debug|Win32.Build.0 = Debug|Win32
-		{C8AAE83E-198B-4ECA-A877-166827953979}.Release|Win32.ActiveCfg = Release|Win32
-		{C8AAE83E-198B-4ECA-A877-166827953979}.Release|Win32.Build.0 = Release|Win32
-		{9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}.Debug|Win32.Build.0 = Debug|Win32
-		{9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}.Release|Win32.ActiveCfg = Release|Win32
-		{9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}.Release|Win32.Build.0 = Release|Win32
-		{676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}.Debug|Win32.Build.0 = Debug|Win32
-		{676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}.Release|Win32.ActiveCfg = Release|Win32
-		{676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}.Release|Win32.Build.0 = Release|Win32
-		{976D947A-A45F-4437-991E-412F695C64C7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{976D947A-A45F-4437-991E-412F695C64C7}.Debug|Win32.Build.0 = Debug|Win32
-		{976D947A-A45F-4437-991E-412F695C64C7}.Release|Win32.ActiveCfg = Release|Win32
-		{976D947A-A45F-4437-991E-412F695C64C7}.Release|Win32.Build.0 = Release|Win32
-		{1A1CA028-61B5-4A6C-A918-F5D8721AB1AC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1A1CA028-61B5-4A6C-A918-F5D8721AB1AC}.Debug|Win32.Build.0 = Debug|Win32
-		{1A1CA028-61B5-4A6C-A918-F5D8721AB1AC}.Release|Win32.ActiveCfg = Release|Win32
-		{1A1CA028-61B5-4A6C-A918-F5D8721AB1AC}.Release|Win32.Build.0 = Release|Win32
-		{1CA4AC50-5426-433A-8B5E-FFE39568098E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1CA4AC50-5426-433A-8B5E-FFE39568098E}.Debug|Win32.Build.0 = Debug|Win32
-		{1CA4AC50-5426-433A-8B5E-FFE39568098E}.Release|Win32.ActiveCfg = Release|Win32
-		{1CA4AC50-5426-433A-8B5E-FFE39568098E}.Release|Win32.Build.0 = Release|Win32
-		{F5F57066-CDF4-4F80-B9E7-7F4D21850D6E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F5F57066-CDF4-4F80-B9E7-7F4D21850D6E}.Debug|Win32.Build.0 = Debug|Win32
-		{F5F57066-CDF4-4F80-B9E7-7F4D21850D6E}.Release|Win32.ActiveCfg = Release|Win32
-		{F5F57066-CDF4-4F80-B9E7-7F4D21850D6E}.Release|Win32.Build.0 = Release|Win32
-		{D4986356-D0BB-4981-924A-854157BDF11F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D4986356-D0BB-4981-924A-854157BDF11F}.Debug|Win32.Build.0 = Debug|Win32
-		{D4986356-D0BB-4981-924A-854157BDF11F}.Release|Win32.ActiveCfg = Release|Win32
-		{D4986356-D0BB-4981-924A-854157BDF11F}.Release|Win32.Build.0 = Release|Win32
-		{0068957B-E2E1-4988-8C87-D541D84DAF20}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0068957B-E2E1-4988-8C87-D541D84DAF20}.Debug|Win32.Build.0 = Debug|Win32
-		{0068957B-E2E1-4988-8C87-D541D84DAF20}.Release|Win32.ActiveCfg = Release|Win32
-		{0068957B-E2E1-4988-8C87-D541D84DAF20}.Release|Win32.Build.0 = Release|Win32
-		{8863B00B-059A-471E-876D-A955ECEFD0D2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8863B00B-059A-471E-876D-A955ECEFD0D2}.Debug|Win32.Build.0 = Debug|Win32
-		{8863B00B-059A-471E-876D-A955ECEFD0D2}.Release|Win32.ActiveCfg = Release|Win32
-		{8863B00B-059A-471E-876D-A955ECEFD0D2}.Release|Win32.Build.0 = Release|Win32
-		{CF888EE2-239C-40D7-83F1-1CDD4F7D56E3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CF888EE2-239C-40D7-83F1-1CDD4F7D56E3}.Debug|Win32.Build.0 = Debug|Win32
-		{CF888EE2-239C-40D7-83F1-1CDD4F7D56E3}.Release|Win32.ActiveCfg = Release|Win32
-		{CF888EE2-239C-40D7-83F1-1CDD4F7D56E3}.Release|Win32.Build.0 = Release|Win32
-		{83945CAF-87A0-4202-8BA4-87A0CB15D78A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{83945CAF-87A0-4202-8BA4-87A0CB15D78A}.Debug|Win32.Build.0 = Debug|Win32
-		{83945CAF-87A0-4202-8BA4-87A0CB15D78A}.Release|Win32.ActiveCfg = Release|Win32
-		{83945CAF-87A0-4202-8BA4-87A0CB15D78A}.Release|Win32.Build.0 = Release|Win32
-		{6D576A24-B9CE-11DC-BC77-8D2856D89593}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6D576A24-B9CE-11DC-BC77-8D2856D89593}.Debug|Win32.Build.0 = Debug|Win32
-		{6D576A24-B9CE-11DC-BC77-8D2856D89593}.Release|Win32.ActiveCfg = Release|Win32
-		{6D576A24-B9CE-11DC-BC77-8D2856D89593}.Release|Win32.Build.0 = Release|Win32
-		{E29B5D40-08F7-11DD-BD0B-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E29B5D40-08F7-11DD-BD0B-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32
-		{E29B5D40-08F7-11DD-BD0B-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32
-		{E29B5D40-08F7-11DD-BD0B-0800200C9A66}.Release|Win32.Build.0 = Release|Win32
-		{22AA7760-2C91-11DD-BD0B-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32
-		{22AA7760-2C91-11DD-BD0B-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32
-		{22AA7760-2C91-11DD-BD0B-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32
-		{22AA7760-2C91-11DD-BD0B-0800200C9A66}.Release|Win32.Build.0 = Release|Win32
-		{FF064FD0-AF6E-11DD-AD8B-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FF064FD0-AF6E-11DD-AD8B-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32
-		{FF064FD0-AF6E-11DD-AD8B-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32
-		{FF064FD0-AF6E-11DD-AD8B-0800200C9A66}.Release|Win32.Build.0 = Release|Win32
-		{2C1EA540-0B09-11DD-BD00-000000000000}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2C1EA540-0B09-11DD-BD00-000000000000}.Debug|Win32.Build.0 = Debug|Win32
-		{2C1EA540-0B09-11DD-BD00-000000000000}.Release|Win32.ActiveCfg = Release|Win32
-		{2C1EA540-0B09-11DD-BD00-000000000000}.Release|Win32.Build.0 = Release|Win32
-		{53F17B2B-0412-4EC3-A999-ED0537BB5223}.Debug|Win32.ActiveCfg = Debug|Win32
-		{53F17B2B-0412-4EC3-A999-ED0537BB5223}.Debug|Win32.Build.0 = Debug|Win32
-		{53F17B2B-0412-4EC3-A999-ED0537BB5223}.Release|Win32.ActiveCfg = Release|Win32
-		{53F17B2B-0412-4EC3-A999-ED0537BB5223}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
-	EndGlobalSection
-EndGlobal
diff --git a/dists/msvc71/scummvm.vcproj b/dists/msvc71/scummvm.vcproj
deleted file mode 100644
index e06016e641..0000000000
--- a/dists/msvc71/scummvm.vcproj
+++ /dev/null
@@ -1,1334 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7,10"
-	Name="scummvm"
-	ProjectGUID="{8434CB15-D08F-427D-9E6D-581AE5B28440}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="scummvm_Debug"
-			IntermediateDirectory="scummvm_Debug"
-			ConfigurationType="1"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_NASM;USE_MT32EMU;ENABLE_AGI;ENABLE_AGOS;ENABLE_CINE;ENABLE_CRUISE;ENABLE_DRASCULA;ENABLE_GOB;ENABLE_IGOR;ENABLE_KYRA;ENABLE_LURE;ENABLE_M4;ENABLE_MADE;ENABLE_PARALLACTION;ENABLE_QUEEN;ENABLE_SAGA;ENABLE_IHNM;ENABLE_SAGA2;ENABLE_SCI;ENABLE_SCUMM;ENABLE_SKY;ENABLE_SWORD1;ENABLE_SWORD2;ENABLE_TOUCHE;ENABLE_SCUMM_7_8;ENABLE_HE;ENABLE_TINSEL;ENABLE_TUCKER;ENABLE_GROOVIE"
-				MinimalRebuild="TRUE"
-				ExceptionHandling="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				SuppressStartupBanner="FALSE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib sdl.lib zlib.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib sword1_debug/sword1.lib sword2_debug/sword2.lib lure_debug/lure.lib cine_debug/cine.lib cruise_debug/cruise.lib igor_debug/igor.lib kyra_debug/kyra.lib gob_debug/gob.lib queen_debug/queen.lib saga_debug/saga.lib agi_debug/agi.lib scumm_debug/scumm.lib agos_debug/agos.lib drascula_debug/drascula.lib sky_debug/sky.lib sci_debug/sci.lib parallaction_debug/parallaction.lib m4_debug/m4.lib made_debug/made.lib tinsel_Debug/tinsel.lib tucker_Debug/tucker.lib groovie_Debug/groovie.lib"
-				OutputFile="$(OutDir)/scummvm.exe"
-				LinkIncremental="2"
-				IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="$(OutDir)/scummvm.pdb"
-				SubSystem="1"
-				EntryPointSymbol="WinMainCRTStartup"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="scummvm_Release"
-			IntermediateDirectory="scummvm_Release"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="TRUE"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_MT32EMU;ENABLE_AGI;ENABLE_AGOS;ENABLE_CINE;ENABLE_CRUISE;ENABLE_DRASCULA;ENABLE_GOB;ENABLE_IGOR;ENABLE_KYRA;ENABLE_LURE;ENABLE_M4;ENABLE_MADE;ENABLE_PARALLACTION;ENABLE_QUEEN;ENABLE_SAGA;ENABLE_IHNM;ENABLE_SAGA2;ENABLE_SCI;ENABLE_SCUMM;ENABLE_SKY;ENABLE_SWORD1;ENABLE_SWORD2;ENABLE_TOUCHE;ENABLE_SCUMM_7_8;ENABLE_HE;ENABLE_TINSEL;ENABLE_TUCKER;ENABLE_GROOVIE"
-				StringPooling="TRUE"
-				MinimalRebuild="FALSE"
-				ExceptionHandling="TRUE"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="FALSE"
-				EnableFunctionLevelLinking="FALSE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				DebugInformationFormat="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib sdl.lib zlib.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib saga_release/saga.lib agi_release/agi.lib sword1_release/sword1.lib sword2_release/sword2.lib lure_release/lure.lib cine_release/cine.lib cruise_release/cruise.lib igor_release/igor.lib kyra_release/kyra.lib gob_release/gob.lib queen_release/queen.lib scumm_release/scumm.lib agos_release/agos.lib sky_release/sky.lib sci_release/sci.lib drascula_release/drascula.lib parallaction_release/parallaction.lib m4_release/m4.lib made_release/made.lib tinsel_release/tinsel.lib tucker_release/tucker.lib groovie_release/groovie.lib"
-				OutputFile="$(OutDir)/scummvm.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				IgnoreDefaultLibraryNames="libc.lib"
-				GenerateDebugInformation="FALSE"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				EntryPointSymbol="WinMainCRTStartup"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="base">
-			<File
-				RelativePath="..\..\base\commandLine.cpp">
-			</File>
-			<File
-				RelativePath="..\..\base\commandLine.h">
-			</File>
-			<File
-				RelativePath="..\..\base\internal_version.h">
-			</File>
-			<File
-				RelativePath="..\..\base\main.cpp">
-			</File>
-			<File
-				RelativePath="..\..\base\main.h">
-			</File>
-			<File
-				RelativePath="..\..\base\plugins.cpp">
-			</File>
-			<File
-				RelativePath="..\..\base\plugins.h">
-			</File>
-			<File
-				RelativePath="..\..\base\version.cpp">
-			</File>
-			<File
-				RelativePath="..\..\base\version.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="common">
-			<File
-				RelativePath="..\..\common\algorithm.h">
-			</File>
-			<File
-				RelativePath="..\..\common\archive.cpp">
-			</File>
-			<File
-				RelativePath="..\..\common\archive.h">
-			</File>
-			<File
-				RelativePath="..\..\common\array.h">
-			</File>
-			<File
-				RelativePath="..\..\common\config-file.cpp">
-			</File>
-			<File
-				RelativePath="..\..\common\config-file.h">
-			</File>
-			<File
-				RelativePath="..\..\common\config-manager.cpp">
-			</File>
-			<File
-				RelativePath="..\..\common\config-manager.h">
-			</File>
-			<File
-				RelativePath="..\..\common\debug.cpp">
-			</File>
-			<File
-				RelativePath="..\..\common\debug.h">
-			</File>
-			<File
-				RelativePath="..\..\common\endian.h">
-			</File>
-			<File
-				RelativePath="..\..\common\error.h">
-			</File>
-			<File
-				RelativePath="..\..\common\events.h">
-			</File>
-			<File
-				RelativePath="..\..\common\file.cpp">
-			</File>
-			<File
-				RelativePath="..\..\common\file.h">
-			</File>
-			<File
-				RelativePath="..\..\common\frac.h">
-			</File>
-			<File
-				RelativePath="..\..\common\fs.cpp">
-			</File>
-			<File
-				RelativePath="..\..\common\fs.h">
-			</File>
-			<File
-				RelativePath="..\..\common\func.h">
-			</File>
-			<File
-				RelativePath="..\..\common\hash-str.h">
-			</File>
-			<File
-				RelativePath="..\..\common\hashmap.cpp">
-			</File>
-			<File
-				RelativePath="..\..\common\hashmap.h">
-			</File>
-			<File
-				RelativePath="..\..\common\iff_container.h">
-			</File>
-			<File
-				RelativePath="..\..\common\keyboard.h">
-			</File>
-			<File
-				RelativePath="..\..\common\list.h">
-			</File>
-			<File
-				RelativePath="..\..\common\list_intern.h">
-			</File>
-			<File
-				RelativePath="..\..\common\md5.cpp">
-			</File>
-			<File
-				RelativePath="..\..\common\md5.h">
-			</File>
-			<File
-				RelativePath="..\..\common\memorypool.cpp">
-			</File>
-			<File
-				RelativePath="..\..\common\memorypool.h">
-			</File>
-			<File
-				RelativePath="..\..\common\mutex.cpp">
-			</File>
-			<File
-				RelativePath="..\..\common\mutex.h">
-			</File>
-			<File
-				RelativePath="..\..\common\noncopyable.h">
-			</File>
-			<File
-				RelativePath="..\..\common\pack-end.h">
-			</File>
-			<File
-				RelativePath="..\..\common\pack-start.h">
-			</File>
-			<File
-				RelativePath="..\..\common\ptr.h">
-			</File>
-			<File
-				RelativePath="..\..\common\queue.h">
-			</File>
-			<File
-				RelativePath="..\..\common\rect.h">
-			</File>
-			<File
-				RelativePath="..\..\common\savefile.h">
-			</File>
-			<File
-				RelativePath="..\..\common\scummsys.h">
-			</File>
-			<File
-				RelativePath="..\..\common\serializer.h">
-			</File>
-			<File
-				RelativePath="..\..\common\singleton.h">
-			</File>
-			<File
-				RelativePath="..\..\common\stack.h">
-			</File>
-			<File
-				RelativePath="..\..\common\str.cpp">
-			</File>
-			<File
-				RelativePath="..\..\common\str.h">
-			</File>
-			<File
-				RelativePath="..\..\common\stream.cpp">
-			</File>
-			<File
-				RelativePath="..\..\common\stream.h">
-			</File>
-			<File
-				RelativePath="..\..\common\system.cpp">
-			</File>
-			<File
-				RelativePath="..\..\common\system.h">
-			</File>
-			<File
-				RelativePath="..\..\common\timer.h">
-			</File>
-			<File
-				RelativePath="..\..\common\unarj.cpp">
-			</File>
-			<File
-				RelativePath="..\..\common\unarj.h">
-			</File>
-			<File
-				RelativePath="..\..\common\unzip.cpp">
-			</File>
-			<File
-				RelativePath="..\..\common\unzip.h">
-			</File>
-			<File
-				RelativePath="..\..\common\util.cpp">
-			</File>
-			<File
-				RelativePath="..\..\common\util.h">
-			</File>
-			<File
-				RelativePath="..\..\common\xmlparser.cpp">
-			</File>
-			<File
-				RelativePath="..\..\common\xmlparser.h">
-			</File>
-			<File
-				RelativePath="..\..\common\zlib.cpp">
-			</File>
-			<File
-				RelativePath="..\..\common\zlib.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="sound">
-			<File
-				RelativePath="..\..\sound\adpcm.cpp">
-			</File>
-			<File
-				RelativePath="..\..\sound\adpcm.h">
-			</File>
-			<File
-				RelativePath="..\..\sound\aiff.cpp">
-			</File>
-			<File
-				RelativePath="..\..\sound\aiff.h">
-			</File>
-			<File
-				RelativePath="..\..\sound\audiocd.cpp">
-			</File>
-			<File
-				RelativePath="..\..\sound\audiocd.h">
-			</File>
-			<File
-				RelativePath="..\..\sound\audiostream.cpp">
-			</File>
-			<File
-				RelativePath="..\..\sound\audiostream.h">
-			</File>
-			<File
-				RelativePath="..\..\sound\flac.cpp">
-			</File>
-			<File
-				RelativePath="..\..\sound\flac.h">
-			</File>
-			<File
-				RelativePath="..\..\sound\fmopl.cpp">
-			</File>
-			<File
-				RelativePath="..\..\sound\fmopl.h">
-			</File>
-			<File
-				RelativePath="..\..\sound\iff.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\sound\iff.h">
-			</File>
-			<File
-				RelativePath="..\..\sound\mididrv.cpp">
-			</File>
-			<File
-				RelativePath="..\..\sound\mididrv.h">
-			</File>
-			<File
-				RelativePath="..\..\sound\midiparser.cpp">
-			</File>
-			<File
-				RelativePath="..\..\sound\midiparser.h">
-			</File>
-			<File
-				RelativePath="..\..\sound\midiparser_smf.cpp">
-			</File>
-			<File
-				RelativePath="..\..\sound\midiparser_xmidi.cpp">
-			</File>
-			<File
-				RelativePath="..\..\sound\mixer.cpp">
-			</File>
-			<File
-				RelativePath="..\..\sound\mixer.h">
-			</File>
-			<File
-				RelativePath="..\..\sound\mixer_intern.h">
-			</File>
-			<File
-				RelativePath="..\..\sound\mp3.cpp">
-			</File>
-			<File
-				RelativePath="..\..\sound\mp3.h">
-			</File>
-			<File
-				RelativePath="..\..\sound\mpu401.cpp">
-			</File>
-			<File
-				RelativePath="..\..\sound\mpu401.h">
-			</File>
-			<File
-				RelativePath="..\..\sound\musicplugin.cpp">
-			</File>
-			<File
-				RelativePath="..\..\sound\musicplugin.h">
-			</File>
-			<File
-				RelativePath="..\..\sound\null.cpp">
-			</File>
-			<File
-				RelativePath="..\..\sound\rate.cpp">
-			</File>
-			<File
-				RelativePath="..\..\sound\rate.h">
-			</File>
-			<File
-				RelativePath="..\..\sound\shorten.cpp">
-			</File>
-			<File
-				RelativePath="..\..\sound\shorten.h">
-			</File>
-			<File
-				RelativePath="..\..\sound\timestamp.cpp">
-			</File>
-			<File
-				RelativePath="..\..\sound\timestamp.h">
-			</File>
-			<File
-				RelativePath="..\..\sound\vag.cpp">
-			</File>
-			<File
-				RelativePath="..\..\sound\vag.h">
-			</File>
-			<File
-				RelativePath="..\..\sound\voc.cpp">
-			</File>
-			<File
-				RelativePath="..\..\sound\voc.h">
-			</File>
-			<File
-				RelativePath="..\..\sound\vorbis.cpp">
-			</File>
-			<File
-				RelativePath="..\..\sound\vorbis.h">
-			</File>
-			<File
-				RelativePath="..\..\sound\wave.cpp">
-			</File>
-			<File
-				RelativePath="..\..\sound\wave.h">
-			</File>
-			<Filter
-				Name="softhsynth">
-				<File
-					RelativePath="..\..\sound\softsynth\adlib.cpp">
-					<FileConfiguration
-						Name="Debug|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc"/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\sound\softsynth\emumidi.h">
-				</File>
-				<File
-					RelativePath="..\..\sound\softsynth\fluidsynth.cpp">
-				</File>
-				<File
-					RelativePath="..\..\sound\softsynth\mt32.cpp">
-					<FileConfiguration
-						Name="Debug|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc"/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\sound\softsynth\pcspk.cpp">
-				</File>
-				<File
-					RelativePath="..\..\sound\softsynth\pcspk.h">
-				</File>
-				<File
-					RelativePath="..\..\sound\softsynth\ym2612.cpp">
-					<FileConfiguration
-						Name="Debug|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc"/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\sound\softsynth\ym2612.h">
-				</File>
-				<Filter
-					Name="mt32">
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\freeverb.cpp">
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\freeverb.h">
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\i386.cpp">
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\i386.h">
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\mt32_file.cpp">
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\mt32_file.h">
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\mt32emu.h">
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\part.cpp">
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\part.h">
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\partial.cpp">
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\partial.h">
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\partialManager.cpp">
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\partialManager.h">
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\structures.h">
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\synth.cpp">
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\synth.h">
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\tables.cpp">
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\tables.h">
-					</File>
-				</Filter>
-				<Filter
-					Name="opl">
-					<File
-						RelativePath="..\..\sound\softsynth\opl\dosbox.cpp">
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\opl\dosbox.h">
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\opl\mame.cpp">
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\opl\mame.h">
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\opl\opl_impl.h">
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\opl\opl_inc.h">
-					</File>
-				</Filter>
-			</Filter>
-			<Filter
-				Name="mods">
-				<File
-					RelativePath="..\..\sound\mods\infogrames.cpp">
-				</File>
-				<File
-					RelativePath="..\..\sound\mods\infogrames.h">
-				</File>
-				<File
-					RelativePath="..\..\sound\mods\module.cpp">
-				</File>
-				<File
-					RelativePath="..\..\sound\mods\module.h">
-				</File>
-				<File
-					RelativePath="..\..\sound\mods\paula.cpp">
-				</File>
-				<File
-					RelativePath="..\..\sound\mods\paula.h">
-				</File>
-				<File
-					RelativePath="..\..\sound\mods\protracker.cpp">
-				</File>
-				<File
-					RelativePath="..\..\sound\mods\protracker.h">
-				</File>
-				<File
-					RelativePath="..\..\sound\mods\rjp1.cpp">
-				</File>
-				<File
-					RelativePath="..\..\sound\mods\rjp1.h">
-				</File>
-				<File
-					RelativePath="..\..\sound\mods\soundfx.cpp">
-				</File>
-				<File
-					RelativePath="..\..\sound\mods\soundfx.h">
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="txt">
-			<File
-				RelativePath="..\..\COPYING">
-			</File>
-			<File
-				RelativePath="..\..\NEWS">
-			</File>
-			<File
-				RelativePath="..\..\README">
-			</File>
-			<File
-				RelativePath="..\..\TODO">
-			</File>
-		</Filter>
-		<Filter
-			Name="rsc"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
-			<File
-				RelativePath="..\..\icons\scummvm.ico">
-			</File>
-			<File
-				RelativePath="..\..\dists\scummvm.rc">
-			</File>
-		</Filter>
-		<Filter
-			Name="backends">
-			<File
-				RelativePath="..\..\backends\base-backend.cpp">
-			</File>
-			<File
-				RelativePath="..\..\backends\base-backend.h">
-			</File>
-			<Filter
-				Name="sdl">
-				<File
-					RelativePath="..\..\backends\platform\sdl\events.cpp">
-				</File>
-				<File
-					RelativePath="..\..\backends\platform\sdl\graphics.cpp">
-				</File>
-				<File
-					RelativePath="..\..\backends\platform\sdl\hardwarekeys.cpp">
-				</File>
-				<File
-					RelativePath="..\..\backends\platform\sdl\main.cpp">
-					<FileConfiguration
-						Name="Debug|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\backends\platform\sdl\sdl.cpp">
-				</File>
-				<File
-					RelativePath="..\..\backends\platform\sdl\sdl.h">
-				</File>
-			</Filter>
-			<Filter
-				Name="fs">
-				<File
-					RelativePath="..\..\backends\fs\abstract-fs.cpp">
-				</File>
-				<File
-					RelativePath="..\..\backends\fs\abstract-fs.h">
-				</File>
-				<File
-					RelativePath="..\..\backends\fs\fs-factory.h">
-				</File>
-				<File
-					RelativePath="..\..\backends\fs\stdiostream.cpp">
-				</File>
-				<File
-					RelativePath="..\..\backends\fs\stdiostream.h">
-				</File>
-				<Filter
-					Name="windows">
-					<File
-						RelativePath="..\..\backends\fs\windows\windows-fs-factory.cpp">
-					</File>
-					<File
-						RelativePath="..\..\backends\fs\windows\windows-fs-factory.h">
-					</File>
-				</Filter>
-			</Filter>
-			<Filter
-				Name="midi">
-				<File
-					RelativePath="..\..\backends\midi\windows.cpp">
-				</File>
-			</Filter>
-			<Filter
-				Name="timer">
-				<File
-					RelativePath="..\..\backends\timer\default\default-timer.cpp">
-				</File>
-				<File
-					RelativePath="..\..\backends\timer\default\default-timer.h">
-				</File>
-			</Filter>
-			<Filter
-				Name="saves">
-				<File
-					RelativePath="..\..\backends\saves\default\default-saves.cpp">
-				</File>
-				<File
-					RelativePath="..\..\backends\saves\default\default-saves.h">
-				</File>
-				<File
-					RelativePath="..\..\backends\saves\savefile.cpp">
-				</File>
-			</Filter>
-			<Filter
-				Name="events">
-				<Filter
-					Name="default">
-					<File
-						RelativePath="..\..\backends\events\default\default-events.cpp">
-					</File>
-					<File
-						RelativePath="..\..\backends\events\default\default-events.h">
-					</File>
-				</Filter>
-			</Filter>
-			<Filter
-				Name="keymapper">
-				<File
-					RelativePath="..\..\backends\keymapper\action.cpp">
-				</File>
-				<File
-					RelativePath="..\..\backends\keymapper\action.h">
-				</File>
-				<File
-					RelativePath="..\..\backends\keymapper\hardware-key.h">
-				</File>
-				<File
-					RelativePath="..\..\backends\keymapper\keymap.cpp">
-				</File>
-				<File
-					RelativePath="..\..\backends\keymapper\keymap.h">
-				</File>
-				<File
-					RelativePath="..\..\backends\keymapper\keymapper.cpp">
-				</File>
-				<File
-					RelativePath="..\..\backends\keymapper\keymapper.h">
-				</File>
-				<File
-					RelativePath="..\..\backends\keymapper\remap-dialog.cpp">
-				</File>
-				<File
-					RelativePath="..\..\backends\keymapper\remap-dialog.h">
-				</File>
-				<File
-					RelativePath="..\..\backends\keymapper\types.h">
-				</File>
-			</Filter>
-			<Filter
-				Name="vkeybd">
-				<File
-					RelativePath="..\..\backends\vkeybd\image-map.cpp">
-				</File>
-				<File
-					RelativePath="..\..\backends\vkeybd\image-map.h">
-				</File>
-				<File
-					RelativePath="..\..\backends\vkeybd\keycode-descriptions.h">
-				</File>
-				<File
-					RelativePath="..\..\backends\vkeybd\polygon.cpp">
-				</File>
-				<File
-					RelativePath="..\..\backends\vkeybd\polygon.h">
-				</File>
-				<File
-					RelativePath="..\..\backends\vkeybd\virtual-keyboard-gui.cpp">
-				</File>
-				<File
-					RelativePath="..\..\backends\vkeybd\virtual-keyboard-gui.h">
-				</File>
-				<File
-					RelativePath="..\..\backends\vkeybd\virtual-keyboard-parser.cpp">
-				</File>
-				<File
-					RelativePath="..\..\backends\vkeybd\virtual-keyboard-parser.h">
-				</File>
-				<File
-					RelativePath="..\..\backends\vkeybd\virtual-keyboard.cpp">
-				</File>
-				<File
-					RelativePath="..\..\backends\vkeybd\virtual-keyboard.h">
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="gui">
-			<File
-				RelativePath="..\..\gui\about.cpp">
-			</File>
-			<File
-				RelativePath="..\..\gui\about.h">
-			</File>
-			<File
-				RelativePath="..\..\gui\browser.cpp">
-			</File>
-			<File
-				RelativePath="..\..\gui\browser.h">
-			</File>
-			<File
-				RelativePath="..\..\gui\chooser.cpp">
-			</File>
-			<File
-				RelativePath="..\..\gui\chooser.h">
-			</File>
-			<File
-				RelativePath="..\..\gui\console.cpp">
-			</File>
-			<File
-				RelativePath="..\..\gui\console.h">
-			</File>
-			<File
-				RelativePath="..\..\gui\credits.h">
-			</File>
-			<File
-				RelativePath="..\..\gui\debugger.cpp">
-			</File>
-			<File
-				RelativePath="..\..\gui\debugger.h">
-			</File>
-			<File
-				RelativePath="..\..\gui\dialog.cpp">
-			</File>
-			<File
-				RelativePath="..\..\gui\dialog.h">
-			</File>
-			<File
-				RelativePath="..\..\gui\editable.cpp">
-			</File>
-			<File
-				RelativePath="..\..\gui\editable.h">
-			</File>
-			<File
-				RelativePath="..\..\gui\EditTextWidget.cpp">
-			</File>
-			<File
-				RelativePath="..\..\gui\EditTextWidget.h">
-			</File>
-			<File
-				RelativePath="..\..\gui\GuiManager.cpp">
-			</File>
-			<File
-				RelativePath="..\..\gui\GuiManager.h">
-			</File>
-			<File
-				RelativePath="..\..\gui\Key.cpp">
-			</File>
-			<File
-				RelativePath="..\..\gui\Key.h">
-			</File>
-			<File
-				RelativePath="..\..\gui\launcher.cpp">
-			</File>
-			<File
-				RelativePath="..\..\gui\launcher.h">
-			</File>
-			<File
-				RelativePath="..\..\gui\ListWidget.cpp">
-			</File>
-			<File
-				RelativePath="..\..\gui\ListWidget.h">
-			</File>
-			<File
-				RelativePath="..\..\gui\massadd.cpp">
-			</File>
-			<File
-				RelativePath="..\..\gui\massadd.h">
-			</File>
-			<File
-				RelativePath="..\..\gui\message.cpp">
-			</File>
-			<File
-				RelativePath="..\..\gui\message.h">
-			</File>
-			<File
-				RelativePath="..\..\gui\object.cpp">
-			</File>
-			<File
-				RelativePath="..\..\gui\object.h">
-			</File>
-			<File
-				RelativePath="..\..\gui\options.cpp">
-			</File>
-			<File
-				RelativePath="..\..\gui\options.h">
-			</File>
-			<File
-				RelativePath="..\..\gui\PopUpWidget.cpp">
-			</File>
-			<File
-				RelativePath="..\..\gui\PopUpWidget.h">
-			</File>
-			<File
-				RelativePath="..\..\gui\saveload.cpp">
-			</File>
-			<File
-				RelativePath="..\..\gui\saveload.h">
-			</File>
-			<File
-				RelativePath="..\..\gui\ScrollBarWidget.cpp">
-			</File>
-			<File
-				RelativePath="..\..\gui\ScrollBarWidget.h">
-			</File>
-			<File
-				RelativePath="..\..\gui\TabWidget.cpp">
-			</File>
-			<File
-				RelativePath="..\..\gui\TabWidget.h">
-			</File>
-			<File
-				RelativePath="..\..\gui\themebrowser.cpp">
-			</File>
-			<File
-				RelativePath="..\..\gui\themebrowser.h">
-			</File>
-			<File
-				RelativePath="..\..\gui\ThemeEngine.cpp">
-			</File>
-			<File
-				RelativePath="..\..\gui\ThemeEngine.h">
-			</File>
-			<File
-				RelativePath="..\..\gui\ThemeEval.cpp">
-			</File>
-			<File
-				RelativePath="..\..\gui\ThemeLayout.cpp">
-			</File>
-			<File
-				RelativePath="..\..\gui\ThemeLayout.h">
-			</File>
-			<File
-				RelativePath="..\..\gui\ThemeParser.cpp">
-			</File>
-			<File
-				RelativePath="..\..\gui\ThemeParser.h">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCustomBuildTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\gui\widget.cpp">
-			</File>
-			<File
-				RelativePath="..\..\gui\widget.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="graphics">
-			<File
-				RelativePath="..\..\graphics\colormasks.h">
-			</File>
-			<File
-				RelativePath="..\..\graphics\conversion.cpp">
-			</File>
-			<File
-				RelativePath="..\..\graphics\conversion.h">
-			</File>
-			<File
-				RelativePath="..\..\graphics\cursorman.cpp">
-			</File>
-			<File
-				RelativePath="..\..\graphics\cursorman.h">
-			</File>
-			<File
-				RelativePath="..\..\graphics\dither.cpp">
-			</File>
-			<File
-				RelativePath="..\..\graphics\dither.h">
-			</File>
-			<File
-				RelativePath="..\..\graphics\font.cpp">
-			</File>
-			<File
-				RelativePath="..\..\graphics\font.h">
-			</File>
-			<File
-				RelativePath="..\..\graphics\fontman.cpp">
-			</File>
-			<File
-				RelativePath="..\..\graphics\fontman.h">
-			</File>
-			<File
-				RelativePath="..\..\graphics\iff.cpp">
-			</File>
-			<File
-				RelativePath="..\..\graphics\iff.h">
-			</File>
-			<File
-				RelativePath="..\..\graphics\imagedec.cpp">
-			</File>
-			<File
-				RelativePath="..\..\graphics\imagedec.h">
-			</File>
-			<File
-				RelativePath="..\..\graphics\jpeg.cpp">
-			</File>
-			<File
-				RelativePath="..\..\graphics\jpeg.h">
-			</File>
-			<File
-				RelativePath="..\..\graphics\pixelformat.h">
-			</File>
-			<File
-				RelativePath="..\..\graphics\primitives.cpp">
-			</File>
-			<File
-				RelativePath="..\..\graphics\primitives.h">
-			</File>
-			<File
-				RelativePath="..\..\graphics\scaler.cpp">
-			</File>
-			<File
-				RelativePath="..\..\graphics\scaler.h">
-			</File>
-			<File
-				RelativePath="..\..\graphics\sjis.cpp">
-			</File>
-			<File
-				RelativePath="..\..\graphics\sjis.h">
-			</File>
-			<File
-				RelativePath="..\..\graphics\surface.cpp">
-			</File>
-			<File
-				RelativePath="..\..\graphics\surface.h">
-			</File>
-			<File
-				RelativePath="..\..\graphics\thumbnail.cpp">
-			</File>
-			<File
-				RelativePath="..\..\graphics\thumbnail.h">
-			</File>
-			<File
-				RelativePath="..\..\graphics\VectorRenderer.cpp">
-			</File>
-			<File
-				RelativePath="..\..\graphics\VectorRenderer.h">
-			</File>
-			<File
-				RelativePath="..\..\graphics\VectorRendererSpec.cpp">
-			</File>
-			<File
-				RelativePath="..\..\graphics\VectorRendererSpec.h">
-			</File>
-			<Filter
-				Name="scaler">
-				<File
-					RelativePath="..\..\graphics\scaler\2xsai.cpp">
-				</File>
-				<File
-					RelativePath="..\..\graphics\scaler\aspect.cpp">
-				</File>
-				<File
-					RelativePath="..\..\graphics\scaler\hq2x.cpp">
-				</File>
-				<File
-					RelativePath="..\..\graphics\scaler\hq2x.h">
-				</File>
-				<File
-					RelativePath="..\..\graphics\scaler\hq2x_i386.asm">
-					<FileConfiguration
-						Name="Debug|Win32">
-						<Tool
-							Name="VCCustomBuildTool"
-							CommandLine="nasm.exe -f win32 -g -o &quot;$(OutDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-							Outputs="$(OutDir)\$(InputName).obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32">
-						<Tool
-							Name="VCCustomBuildTool"
-							CommandLine="nasm.exe  -f win32 -o &quot;$(OutDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-							Outputs="$(OutDir)\$(InputName).obj"/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\graphics\scaler\hq3x.cpp">
-				</File>
-				<File
-					RelativePath="..\..\graphics\scaler\hq3x.h">
-				</File>
-				<File
-					RelativePath="..\..\graphics\scaler\hq3x_i386.asm">
-					<FileConfiguration
-						Name="Debug|Win32">
-						<Tool
-							Name="VCCustomBuildTool"
-							CommandLine="nasm.exe -f win32 -g -o &quot;$(OutDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-							Outputs="$(OutDir)\$(InputName).obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32">
-						<Tool
-							Name="VCCustomBuildTool"
-							CommandLine="nasm.exe -f win32 -o &quot;$(OutDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-							Outputs="$(OutDir)\$(InputName).obj"/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\graphics\scaler\intern.h">
-				</File>
-				<File
-					RelativePath="..\..\graphics\scaler\scale2x.cpp">
-				</File>
-				<File
-					RelativePath="..\..\graphics\scaler\scale2x.h">
-				</File>
-				<File
-					RelativePath="..\..\graphics\scaler\scale3x.cpp">
-				</File>
-				<File
-					RelativePath="..\..\graphics\scaler\scale3x.h">
-				</File>
-				<File
-					RelativePath="..\..\graphics\scaler\scalebit.cpp">
-				</File>
-				<File
-					RelativePath="..\..\graphics\scaler\scalebit.h">
-				</File>
-				<File
-					RelativePath="..\..\graphics\scaler\thumbnail_intern.cpp">
-				</File>
-			</Filter>
-			<Filter
-				Name="fonts">
-				<File
-					RelativePath="..\..\graphics\fonts\consolefont.cpp">
-				</File>
-				<File
-					RelativePath="..\..\graphics\fonts\newfont.cpp">
-				</File>
-				<File
-					RelativePath="..\..\graphics\fonts\newfont_big.cpp">
-				</File>
-				<File
-					RelativePath="..\..\graphics\fonts\scummfont.cpp">
-				</File>
-			</Filter>
-			<Filter
-				Name="video">
-				<File
-					RelativePath="..\..\graphics\video\dxa_decoder.cpp">
-				</File>
-				<File
-					RelativePath="..\..\graphics\video\dxa_decoder.h">
-				</File>
-				<File
-					RelativePath="..\..\graphics\video\flic_decoder.cpp">
-				</File>
-				<File
-					RelativePath="..\..\graphics\video\flic_decoder.h">
-				</File>
-				<File
-					RelativePath="..\..\graphics\video\mpeg_player.cpp">
-				</File>
-				<File
-					RelativePath="..\..\graphics\video\mpeg_player.h">
-				</File>
-				<File
-					RelativePath="..\..\graphics\video\smk_decoder.cpp">
-				</File>
-				<File
-					RelativePath="..\..\graphics\video\smk_decoder.h">
-				</File>
-				<File
-					RelativePath="..\..\graphics\video\video_player.cpp">
-				</File>
-				<File
-					RelativePath="..\..\graphics\video\video_player.h">
-				</File>
-				<Filter
-					Name="coktelvideo">
-					<File
-						RelativePath="..\..\graphics\video\coktelvideo\coktelvideo.cpp">
-					</File>
-					<File
-						RelativePath="..\..\graphics\video\coktelvideo\coktelvideo.h">
-					</File>
-					<File
-						RelativePath="..\..\graphics\video\coktelvideo\indeo3.cpp">
-					</File>
-					<File
-						RelativePath="..\..\graphics\video\coktelvideo\indeo3.h">
-					</File>
-					<File
-						RelativePath="..\..\graphics\video\coktelvideo\indeo3data.h">
-					</File>
-				</Filter>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="engines">
-			<File
-				RelativePath="..\..\engines\advancedDetector.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\advancedDetector.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\dialogs.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\dialogs.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\engine.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\engine.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\game.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\game.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\metaengine.h">
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/dists/msvc71/sky.vcproj b/dists/msvc71/sky.vcproj
deleted file mode 100644
index 88025caba1..0000000000
--- a/dists/msvc71/sky.vcproj
+++ /dev/null
@@ -1,258 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7,10"
-	Name="sky"
-	ProjectGUID="{B5527758-2F51-4CCD-AAE1-B0E28654BD6A}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="sky_Debug"
-			IntermediateDirectory="sky_Debug"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="TRUE"
-				ExceptionHandling="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				SuppressStartupBanner="FALSE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/sky.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="sky_Release"
-			IntermediateDirectory="sky_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="TRUE"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="TRUE"
-				ExceptionHandling="TRUE"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="FALSE"
-				EnableFunctionLevelLinking="FALSE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				DebugInformationFormat="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/sky.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="music">
-			<File
-				RelativePath="..\..\engines\sky\music\adlibchannel.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sky\music\adlibchannel.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sky\music\adlibmusic.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sky\music\adlibmusic.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sky\music\gmchannel.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sky\music\gmchannel.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sky\music\gmmusic.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sky\music\gmmusic.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sky\music\mt32music.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sky\music\mt32music.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sky\music\musicbase.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sky\music\musicbase.h">
-			</File>
-		</Filter>
-		<File
-			RelativePath="..\..\engines\sky\autoroute.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\autoroute.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\compact.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\compact.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\control.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\control.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\debug.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\debug.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\detection.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\disk.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\disk.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\grid.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\grid.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\hufftext.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\intro.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\intro.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\logic.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\logic.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\mouse.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\mouse.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\rnc_deco.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\rnc_deco.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\screen.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\screen.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\sky.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\sky.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\skydefs.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\sound.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\sound.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\struc.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\text.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\text.h">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/dists/msvc71/sword1.vcproj b/dists/msvc71/sword1.vcproj
deleted file mode 100644
index 31a677d866..0000000000
--- a/dists/msvc71/sword1.vcproj
+++ /dev/null
@@ -1,237 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7,10"
-	Name="sword1"
-	ProjectGUID="{C8AAE83E-198B-4ECA-A877-166827953979}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="sword1_Debug"
-			IntermediateDirectory="sword1_Debug"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2"
-				MinimalRebuild="TRUE"
-				ExceptionHandling="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				SuppressStartupBanner="FALSE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/sword1.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="sword1_Release"
-			IntermediateDirectory="sword1_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="TRUE"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2"
-				StringPooling="TRUE"
-				ExceptionHandling="TRUE"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="FALSE"
-				EnableFunctionLevelLinking="FALSE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				DebugInformationFormat="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/sword1.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\engines\sword1\animation.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\animation.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\collision.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\control.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\control.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\debug.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\debug.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\detection.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\eventman.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\eventman.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\logic.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\logic.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\memman.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\memman.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\menu.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\menu.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\mouse.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\mouse.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\music.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\music.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\object.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\objectman.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\objectman.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\resman.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\resman.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\router.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\router.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\screen.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\screen.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\sound.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\sound.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\staticres.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\sword1.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\sword1.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\sworddefs.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\swordres.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\text.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\text.h">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/dists/msvc71/sword2.vcproj b/dists/msvc71/sword2.vcproj
deleted file mode 100644
index f6256a3300..0000000000
--- a/dists/msvc71/sword2.vcproj
+++ /dev/null
@@ -1,270 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7,10"
-	Name="sword2"
-	ProjectGUID="{6CC3E421-779D-4E80-8100-520886A0F9FF}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="sword2_Debug"
-			IntermediateDirectory="sword2_Debug"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2"
-				MinimalRebuild="TRUE"
-				ExceptionHandling="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				SuppressStartupBanner="FALSE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/sword2.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="sword2_Release"
-			IntermediateDirectory="sword2_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="TRUE"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2"
-				StringPooling="TRUE"
-				ExceptionHandling="TRUE"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="FALSE"
-				EnableFunctionLevelLinking="FALSE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				DebugInformationFormat="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/sword2.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\engines\sword2\animation.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\animation.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\anims.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\console.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\console.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\controls.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\controls.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\debug.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\debug.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\defs.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\events.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\function.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\header.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\icons.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\interpreter.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\interpreter.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\layers.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\logic.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\logic.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\maketext.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\maketext.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\memory.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\memory.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\menu.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\mouse.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\mouse.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\music.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\object.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\palette.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\protocol.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\render.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\resman.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\resman.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\router.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\router.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\saveload.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\saveload.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\screen.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\screen.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\scroll.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\sound.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\sound.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\speech.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\sprite.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\startup.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\sword2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\sword2.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\sync.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\walker.cpp">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/dists/msvc71/tinsel.vcproj b/dists/msvc71/tinsel.vcproj
deleted file mode 100644
index 6b3920b1d1..0000000000
--- a/dists/msvc71/tinsel.vcproj
+++ /dev/null
@@ -1,384 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7,10"
-	Name="tinsel"
-	ProjectGUID="{22AA7760-2C91-11DD-BD0B-0800200C9A66}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="tinsel_Debug"
-			IntermediateDirectory="tinsel_Debug"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="TRUE"
-				ExceptionHandling="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				SuppressStartupBanner="FALSE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/tinsel.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="tinsel_Release"
-			IntermediateDirectory="tinsel_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="TRUE"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="TRUE"
-				ExceptionHandling="TRUE"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="FALSE"
-				EnableFunctionLevelLinking="FALSE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				DebugInformationFormat="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/tinsel.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\engines\tinsel\actors.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\actors.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\anim.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\anim.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\background.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\background.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\bg.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\bmv.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\cliprect.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\cliprect.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\config.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\config.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\coroutine.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\cursor.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\cursor.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\debugger.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\debugger.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\detection.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\dialogs.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\dialogs.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\drives.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\drives.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\dw.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\effect.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\events.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\events.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\faders.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\faders.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\film.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\font.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\font.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\graphics.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\graphics.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\handle.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\handle.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\heapmem.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\heapmem.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\mareels.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\mareels.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\move.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\move.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\multiobj.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\multiobj.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\music.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\music.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\object.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\object.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\palette.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\palette.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\pcode.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\pcode.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\pdisplay.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\pdisplay.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\pid.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\play.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\play.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\polygons.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\polygons.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\rince.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\rince.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\saveload.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\savescn.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\savescn.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\scene.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\scene.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\sched.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\sched.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\scn.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\scn.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\scroll.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\scroll.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\sound.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\sound.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\strres.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\strres.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\sysvar.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\sysvar.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\text.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\text.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\timers.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\timers.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\tinlib.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\tinlib.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\tinsel.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\tinsel.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\token.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\token.h">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/dists/msvc71/touche.vcproj b/dists/msvc71/touche.vcproj
deleted file mode 100644
index 33b80e9b48..0000000000
--- a/dists/msvc71/touche.vcproj
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7,10"
-	Name="touche"
-	ProjectGUID="{D4986356-D0BB-4981-924A-854157BDF11F}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="touche_Debug"
-			IntermediateDirectory="touche_Debug"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="TRUE"
-				ExceptionHandling="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				SuppressStartupBanner="FALSE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/touche.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="touche_Release"
-			IntermediateDirectory="touche_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="TRUE"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="TRUE"
-				ExceptionHandling="TRUE"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="FALSE"
-				EnableFunctionLevelLinking="FALSE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				DebugInformationFormat="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/touche.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\engines\touche\detection.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\touche\graphics.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\touche\graphics.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\touche\menu.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\touche\midi.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\touche\midi.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\touche\opcodes.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\touche\resource.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\touche\saveload.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\touche\staticres.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\touche\touche.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\touche\touche.h">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/dists/msvc71/tucker.vcproj b/dists/msvc71/tucker.vcproj
deleted file mode 100644
index 8ceffd432f..0000000000
--- a/dists/msvc71/tucker.vcproj
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7,10"
-	Name="tucker"
-	ProjectGUID="{FF064FD0-AF6E-11DD-AD8B-0800200C9A66}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="tucker_Debug"
-			IntermediateDirectory="tucker_Debug"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="TRUE"
-				ExceptionHandling="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				SuppressStartupBanner="FALSE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/tucker.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="tucker_Release"
-			IntermediateDirectory="tucker_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="TRUE"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="TRUE"
-				ExceptionHandling="TRUE"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="FALSE"
-				EnableFunctionLevelLinking="FALSE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="TRUE"
-				DebugInformationFormat="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/tucker.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\engines\tucker\detection.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tucker\graphics.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tucker\graphics.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\tucker\locations.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tucker\resource.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tucker\saveload.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tucker\sequences.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tucker\staticres.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tucker\tucker.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\tucker\tucker.h">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/dists/msvc8/ScummVM_Debug.vsprops b/dists/msvc8/ScummVM_Debug.vsprops
new file mode 100644
index 0000000000..910096cab6
--- /dev/null
+++ b/dists/msvc8/ScummVM_Debug.vsprops
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="ScummVM_Debug32"
+	InheritedPropertySheets=".\ScummVM_Global.vsprops"
+	>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="0"
+		PreprocessorDefinitions="WIN32"
+		MinimalRebuild="true"
+		BasicRuntimeChecks="3"
+		RuntimeLibrary="1"
+		EnableFunctionLevelLinking="true"
+		WarnAsError="false"
+		DebugInformationFormat="4"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		LinkIncremental="2"
+		GenerateDebugInformation="true"
+		IgnoreDefaultLibraryNames="libcmt.lib"
+	/>
+</VisualStudioPropertySheet>
diff --git a/dists/msvc8/ScummVM_Global.vsprops b/dists/msvc8/ScummVM_Global.vsprops
new file mode 100644
index 0000000000..7ba00aac7b
--- /dev/null
+++ b/dists/msvc8/ScummVM_Global.vsprops
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="ScummVM_Global"
+	OutputDirectory="$(ConfigurationName)"
+	IntermediateDirectory="$(ConfigurationName)/$(ProjectName)"
+	>
+	<Tool
+		Name="VCCLCompilerTool"
+		DisableSpecificWarnings="4068;4100;4103;4121;4127;4189;4201;4221;4244;4250;4310;4351;4355;4510;4511;4512;4610;4701;4702;4706;4800;4996"
+		AdditionalIncludeDirectories="../..;../../engines"
+		PreprocessorDefinitions="USE_NASM;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_MT32EMU;ENABLE_AGI;ENABLE_AGOS;ENABLE_CINE;ENABLE_CRUISE;ENABLE_DRASCULA;ENABLE_GOB;ENABLE_IGOR;ENABLE_KYRA;ENABLE_LOL;ENABLE_LURE;ENABLE_M4;ENABLE_MADE;ENABLE_PARALLACTION;ENABLE_QUEEN;ENABLE_SAGA;ENABLE_IHNM;ENABLE_SAGA2;ENABLE_SCI;ENABLE_SCUMM;ENABLE_SKY;ENABLE_SWORD1;ENABLE_SWORD2;ENABLE_TOUCHE;ENABLE_SCUMM_7_8;ENABLE_HE;ENABLE_TINSEL;ENABLE_TUCKER;ENABLE_GROOVIE"
+		ExceptionHandling="0"
+		RuntimeTypeInfo="false"
+		WarningLevel="4"
+		WarnAsError="true"
+		CompileAs="0"
+	/>
+	<Tool
+		Name="VCLibrarianTool"
+		IgnoreDefaultLibraryNames=""
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		IgnoreDefaultLibraryNames=""
+		SubSystem="1"
+		EntryPointSymbol="WinMainCRTStartup"
+	/>
+</VisualStudioPropertySheet>
diff --git a/dists/msvc8/ScummVM_Release.vsprops b/dists/msvc8/ScummVM_Release.vsprops
new file mode 100644
index 0000000000..837be3b94c
--- /dev/null
+++ b/dists/msvc8/ScummVM_Release.vsprops
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="ScummVM_Release32"
+	InheritedPropertySheets=".\ScummVM_Global.vsprops"
+	>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="1"
+		EnableIntrinsicFunctions="true"
+		WholeProgramOptimization="true"
+		PreprocessorDefinitions="WIN32"
+		StringPooling="true"
+		BufferSecurityCheck="false"
+		DebugInformationFormat="0"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		LinkIncremental="1"
+		IgnoreDefaultLibraryNames=""
+		SetChecksum="true"
+	/>
+</VisualStudioPropertySheet>
diff --git a/dists/msvc8/agi.vcproj b/dists/msvc8/agi.vcproj
index 08d734221b..705be31ae4 100644
--- a/dists/msvc8/agi.vcproj
+++ b/dists/msvc8/agi.vcproj
@@ -8,377 +8,65 @@
 	Keyword="Win32Proj"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="agi_Debug"
-			IntermediateDirectory="agi_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/agi.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="agi_Release"
-			IntermediateDirectory="agi_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/agi.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
+		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
+		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<File
-			RelativePath="..\..\engines\agi\agi.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\agi.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\checks.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\console.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\console.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\cycle.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\detection.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\font.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\global.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\graphics.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\graphics.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\id.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\inv.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\keyboard.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\keyboard.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\loader_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\loader_v3.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\logic.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\logic.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\lzw.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\lzw.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\menu.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\menu.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\motion.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\objects.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\op_cmd.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\op_dbg.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\op_test.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\opcodes.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\picture.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\picture.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\preagi.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\preagi.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\preagi_common.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\preagi_common.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\preagi_mickey.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\preagi_mickey.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\preagi_troll.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\preagi_troll.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\preagi_winnie.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\preagi_winnie.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\predictive.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\saveload.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\sound.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\sound.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\sprite.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\sprite.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\text.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\view.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\view.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\wagparser.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\wagparser.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\words.cpp"
-			>
-		</File>
+		<File RelativePath="..\..\engines\agi\agi.cpp" />
+		<File RelativePath="..\..\engines\agi\agi.h" />
+		<File RelativePath="..\..\engines\agi\checks.cpp" />
+		<File RelativePath="..\..\engines\agi\console.cpp" />
+		<File RelativePath="..\..\engines\agi\console.h" />
+		<File RelativePath="..\..\engines\agi\cycle.cpp" />
+		<File RelativePath="..\..\engines\agi\detection.cpp" />
+		<File RelativePath="..\..\engines\agi\font.h" />
+		<File RelativePath="..\..\engines\agi\global.cpp" />
+		<File RelativePath="..\..\engines\agi\graphics.cpp" />
+		<File RelativePath="..\..\engines\agi\graphics.h" />
+		<File RelativePath="..\..\engines\agi\id.cpp" />
+		<File RelativePath="..\..\engines\agi\inv.cpp" />
+		<File RelativePath="..\..\engines\agi\keyboard.cpp" />
+		<File RelativePath="..\..\engines\agi\keyboard.h" />
+		<File RelativePath="..\..\engines\agi\loader_v2.cpp" />
+		<File RelativePath="..\..\engines\agi\loader_v3.cpp" />
+		<File RelativePath="..\..\engines\agi\logic.cpp" />
+		<File RelativePath="..\..\engines\agi\logic.h" />
+		<File RelativePath="..\..\engines\agi\lzw.cpp" />
+		<File RelativePath="..\..\engines\agi\lzw.h" />
+		<File RelativePath="..\..\engines\agi\menu.cpp" />
+		<File RelativePath="..\..\engines\agi\menu.h" />
+		<File RelativePath="..\..\engines\agi\motion.cpp" />
+		<File RelativePath="..\..\engines\agi\objects.cpp" />
+		<File RelativePath="..\..\engines\agi\op_cmd.cpp" />
+		<File RelativePath="..\..\engines\agi\op_dbg.cpp" />
+		<File RelativePath="..\..\engines\agi\op_test.cpp" />
+		<File RelativePath="..\..\engines\agi\opcodes.h" />
+		<File RelativePath="..\..\engines\agi\picture.cpp" />
+		<File RelativePath="..\..\engines\agi\picture.h" />
+		<File RelativePath="..\..\engines\agi\preagi.cpp" />
+		<File RelativePath="..\..\engines\agi\preagi.h" />
+		<File RelativePath="..\..\engines\agi\preagi_common.cpp" />
+		<File RelativePath="..\..\engines\agi\preagi_common.h" />
+		<File RelativePath="..\..\engines\agi\preagi_mickey.cpp" />
+		<File RelativePath="..\..\engines\agi\preagi_mickey.h" />
+		<File RelativePath="..\..\engines\agi\preagi_troll.cpp" />
+		<File RelativePath="..\..\engines\agi\preagi_troll.h" />
+		<File RelativePath="..\..\engines\agi\preagi_winnie.cpp" />
+		<File RelativePath="..\..\engines\agi\preagi_winnie.h" />
+		<File RelativePath="..\..\engines\agi\predictive.cpp" />
+		<File RelativePath="..\..\engines\agi\saveload.cpp" />
+		<File RelativePath="..\..\engines\agi\sound.cpp" />
+		<File RelativePath="..\..\engines\agi\sound.h" />
+		<File RelativePath="..\..\engines\agi\sprite.cpp" />
+		<File RelativePath="..\..\engines\agi\sprite.h" />
+		<File RelativePath="..\..\engines\agi\text.cpp" />
+		<File RelativePath="..\..\engines\agi\view.cpp" />
+		<File RelativePath="..\..\engines\agi\view.h" />
+		<File RelativePath="..\..\engines\agi\wagparser.cpp" />
+		<File RelativePath="..\..\engines\agi\wagparser.h" />
+		<File RelativePath="..\..\engines\agi\words.cpp" />
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>
diff --git a/dists/msvc8/agos.vcproj b/dists/msvc8/agos.vcproj
index be21dc9f2a..5d6fe215b2 100644
--- a/dists/msvc8/agos.vcproj
+++ b/dists/msvc8/agos.vcproj
@@ -8,393 +8,69 @@
 	Keyword="Win32Proj"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="agos_Debug"
-			IntermediateDirectory="agos_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="false"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/agos.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="agos_Release"
-			IntermediateDirectory="agos_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/agos.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
+		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
+		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<File
-			RelativePath="..\..\engines\agos\agos.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\agos.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\animation.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\animation.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\charset-fontdata.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\charset.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\contain.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\cursor.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\debug.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\debug.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\debugger.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\debugger.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\detection.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\detection_tables.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\draw.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\event.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\feeble.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\gfx.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\icons.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\input.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\intern.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\items.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\menus.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\midi.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\midi.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\midiparser_s1d.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\oracle.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\pn.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\res.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\res_ami.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\res_snd.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\rooms.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\saveload.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\script.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\script_e1.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\script_e2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\script_ff.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\script_pn.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\script_pp.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\script_s1.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\script_s2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\script_ww.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\sound.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\sound.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\string.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\subroutine.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\verb.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\vga.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\vga.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\vga_e2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\vga_ff.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\vga_pn.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\vga_s1.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\vga_s2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\vga_ww.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\window.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\zones.cpp"
-			>
-		</File>
+		<File RelativePath="..\..\engines\agos\agos.cpp" />
+		<File RelativePath="..\..\engines\agos\agos.h" />
+		<File RelativePath="..\..\engines\agos\animation.cpp" />
+		<File RelativePath="..\..\engines\agos\animation.h" />
+		<File RelativePath="..\..\engines\agos\charset-fontdata.cpp" />
+		<File RelativePath="..\..\engines\agos\charset.cpp" />
+		<File RelativePath="..\..\engines\agos\contain.cpp" />
+		<File RelativePath="..\..\engines\agos\cursor.cpp" />
+		<File RelativePath="..\..\engines\agos\debug.cpp" />
+		<File RelativePath="..\..\engines\agos\debug.h" />
+		<File RelativePath="..\..\engines\agos\debugger.cpp" />
+		<File RelativePath="..\..\engines\agos\debugger.h" />
+		<File RelativePath="..\..\engines\agos\detection.cpp" />
+		<File RelativePath="..\..\engines\agos\detection_tables.h" />
+		<File RelativePath="..\..\engines\agos\draw.cpp" />
+		<File RelativePath="..\..\engines\agos\event.cpp" />
+		<File RelativePath="..\..\engines\agos\feeble.cpp" />
+		<File RelativePath="..\..\engines\agos\gfx.cpp" />
+		<File RelativePath="..\..\engines\agos\icons.cpp" />
+		<File RelativePath="..\..\engines\agos\input.cpp" />
+		<File RelativePath="..\..\engines\agos\intern.h" />
+		<File RelativePath="..\..\engines\agos\items.cpp" />
+		<File RelativePath="..\..\engines\agos\menus.cpp" />
+		<File RelativePath="..\..\engines\agos\midi.cpp" />
+		<File RelativePath="..\..\engines\agos\midi.h" />
+		<File RelativePath="..\..\engines\agos\midiparser_s1d.cpp" />
+		<File RelativePath="..\..\engines\agos\oracle.cpp" />
+		<File RelativePath="..\..\engines\agos\pn.cpp" />
+		<File RelativePath="..\..\engines\agos\res.cpp" />
+		<File RelativePath="..\..\engines\agos\res_ami.cpp" />
+		<File RelativePath="..\..\engines\agos\res_snd.cpp" />
+		<File RelativePath="..\..\engines\agos\rooms.cpp" />
+		<File RelativePath="..\..\engines\agos\saveload.cpp" />
+		<File RelativePath="..\..\engines\agos\script.cpp" />
+		<File RelativePath="..\..\engines\agos\script_e1.cpp" />
+		<File RelativePath="..\..\engines\agos\script_e2.cpp" />
+		<File RelativePath="..\..\engines\agos\script_ff.cpp" />
+		<File RelativePath="..\..\engines\agos\script_pn.cpp" />
+		<File RelativePath="..\..\engines\agos\script_pp.cpp" />
+		<File RelativePath="..\..\engines\agos\script_s1.cpp" />
+		<File RelativePath="..\..\engines\agos\script_s2.cpp" />
+		<File RelativePath="..\..\engines\agos\script_ww.cpp" />
+		<File RelativePath="..\..\engines\agos\sound.cpp" />
+		<File RelativePath="..\..\engines\agos\sound.h" />
+		<File RelativePath="..\..\engines\agos\string.cpp" />
+		<File RelativePath="..\..\engines\agos\subroutine.cpp" />
+		<File RelativePath="..\..\engines\agos\verb.cpp" />
+		<File RelativePath="..\..\engines\agos\vga.cpp" />
+		<File RelativePath="..\..\engines\agos\vga.h" />
+		<File RelativePath="..\..\engines\agos\vga_e2.cpp" />
+		<File RelativePath="..\..\engines\agos\vga_ff.cpp" />
+		<File RelativePath="..\..\engines\agos\vga_pn.cpp" />
+		<File RelativePath="..\..\engines\agos\vga_s1.cpp" />
+		<File RelativePath="..\..\engines\agos\vga_s2.cpp" />
+		<File RelativePath="..\..\engines\agos\vga_ww.cpp" />
+		<File RelativePath="..\..\engines\agos\window.cpp" />
+		<File RelativePath="..\..\engines\agos\zones.cpp" />
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>
diff --git a/dists/msvc8/cine.vcproj b/dists/msvc8/cine.vcproj
index 3abcd9250b..59a95fae26 100644
--- a/dists/msvc8/cine.vcproj
+++ b/dists/msvc8/cine.vcproj
@@ -8,317 +8,50 @@
 	Keyword="Win32Proj"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="cine_Debug"
-			IntermediateDirectory="cine_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/cine.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="cine_Release"
-			IntermediateDirectory="cine_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/cine.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
+		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
+		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<File
-			RelativePath="..\..\engines\cine\anim.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\anim.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\bg.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\bg.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\bg_list.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\bg_list.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\cine.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\cine.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\detection.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\gfx.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\gfx.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\main_loop.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\main_loop.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\msg.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\msg.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\object.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\object.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\pal.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\pal.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\part.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\part.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\prc.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\prc.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\rel.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\rel.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\saveload.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\saveload.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\script.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\script_fw.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\script_os.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\sound.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\sound.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\texte.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\texte.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\unpack.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\unpack.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\various.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\various.h"
-			>
-		</File>
+		<File RelativePath="..\..\engines\cine\anim.cpp" />
+		<File RelativePath="..\..\engines\cine\anim.h" />
+		<File RelativePath="..\..\engines\cine\bg.cpp" />
+		<File RelativePath="..\..\engines\cine\bg.h" />
+		<File RelativePath="..\..\engines\cine\bg_list.cpp" />
+		<File RelativePath="..\..\engines\cine\bg_list.h" />
+		<File RelativePath="..\..\engines\cine\cine.cpp" />
+		<File RelativePath="..\..\engines\cine\cine.h" />
+		<File RelativePath="..\..\engines\cine\detection.cpp" />
+		<File RelativePath="..\..\engines\cine\gfx.cpp" />
+		<File RelativePath="..\..\engines\cine\gfx.h" />
+		<File RelativePath="..\..\engines\cine\main_loop.cpp" />
+		<File RelativePath="..\..\engines\cine\main_loop.h" />
+		<File RelativePath="..\..\engines\cine\msg.cpp" />
+		<File RelativePath="..\..\engines\cine\msg.h" />
+		<File RelativePath="..\..\engines\cine\object.cpp" />
+		<File RelativePath="..\..\engines\cine\object.h" />
+		<File RelativePath="..\..\engines\cine\pal.cpp" />
+		<File RelativePath="..\..\engines\cine\pal.h" />
+		<File RelativePath="..\..\engines\cine\part.cpp" />
+		<File RelativePath="..\..\engines\cine\part.h" />
+		<File RelativePath="..\..\engines\cine\prc.cpp" />
+		<File RelativePath="..\..\engines\cine\prc.h" />
+		<File RelativePath="..\..\engines\cine\rel.cpp" />
+		<File RelativePath="..\..\engines\cine\rel.h" />
+		<File RelativePath="..\..\engines\cine\saveload.cpp" />
+		<File RelativePath="..\..\engines\cine\saveload.h" />
+		<File RelativePath="..\..\engines\cine\script.h" />
+		<File RelativePath="..\..\engines\cine\script_fw.cpp" />
+		<File RelativePath="..\..\engines\cine\script_os.cpp" />
+		<File RelativePath="..\..\engines\cine\sound.cpp" />
+		<File RelativePath="..\..\engines\cine\sound.h" />
+		<File RelativePath="..\..\engines\cine\texte.cpp" />
+		<File RelativePath="..\..\engines\cine\texte.h" />
+		<File RelativePath="..\..\engines\cine\unpack.cpp" />
+		<File RelativePath="..\..\engines\cine\unpack.h" />
+		<File RelativePath="..\..\engines\cine\various.cpp" />
+		<File RelativePath="..\..\engines\cine\various.h" />
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>
diff --git a/dists/msvc8/cruise.vcproj b/dists/msvc8/cruise.vcproj
index df65453e4d..89b82ae8e6 100644
--- a/dists/msvc8/cruise.vcproj
+++ b/dists/msvc8/cruise.vcproj
@@ -8,397 +8,70 @@
 	Keyword="Win32Proj"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="cruise_Debug"
-			IntermediateDirectory="cruise_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/cruise.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="cruise_Release"
-			IntermediateDirectory="cruise_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/cruise.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
+		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
+		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<File
-			RelativePath="..\..\engines\cruise\actor.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\actor.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\background.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\background.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\backgroundIncrust.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\backgroundIncrust.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\cell.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\cell.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\cruise.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\cruise.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\cruise_main.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\cruise_main.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\ctp.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\ctp.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\dataLoader.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\dataLoader.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\debugger.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\debugger.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\delphine-unpack.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\detection.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\font.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\font.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\function.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\function.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\gfxModule.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\gfxModule.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\linker.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\linker.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\mainDraw.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\mainDraw.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\menu.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\menu.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\mouse.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\mouse.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\object.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\object.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\overlay.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\overlay.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\perso.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\perso.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\polys.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\polys.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\saveload.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\saveload.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\script.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\script.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\sound.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\sound.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\stack.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\stack.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\staticres.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\staticres.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\various.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\various.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\vars.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\vars.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\volume.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\volume.h"
-			>
-		</File>
+		<File RelativePath="..\..\engines\cruise\actor.cpp" />
+		<File RelativePath="..\..\engines\cruise\actor.h" />
+		<File RelativePath="..\..\engines\cruise\background.cpp" />
+		<File RelativePath="..\..\engines\cruise\background.h" />
+		<File RelativePath="..\..\engines\cruise\backgroundIncrust.cpp" />
+		<File RelativePath="..\..\engines\cruise\backgroundIncrust.h" />
+		<File RelativePath="..\..\engines\cruise\cell.cpp" />
+		<File RelativePath="..\..\engines\cruise\cell.h" />
+		<File RelativePath="..\..\engines\cruise\cruise.cpp" />
+		<File RelativePath="..\..\engines\cruise\cruise.h" />
+		<File RelativePath="..\..\engines\cruise\cruise_main.cpp" />
+		<File RelativePath="..\..\engines\cruise\cruise_main.h" />
+		<File RelativePath="..\..\engines\cruise\ctp.cpp" />
+		<File RelativePath="..\..\engines\cruise\ctp.h" />
+		<File RelativePath="..\..\engines\cruise\dataLoader.cpp" />
+		<File RelativePath="..\..\engines\cruise\dataLoader.h" />
+		<File RelativePath="..\..\engines\cruise\debugger.cpp" />
+		<File RelativePath="..\..\engines\cruise\debugger.h" />
+		<File RelativePath="..\..\engines\cruise\delphine-unpack.cpp" />
+		<File RelativePath="..\..\engines\cruise\detection.cpp" />
+		<File RelativePath="..\..\engines\cruise\font.cpp" />
+		<File RelativePath="..\..\engines\cruise\font.h" />
+		<File RelativePath="..\..\engines\cruise\function.cpp" />
+		<File RelativePath="..\..\engines\cruise\function.h" />
+		<File RelativePath="..\..\engines\cruise\gfxModule.cpp" />
+		<File RelativePath="..\..\engines\cruise\gfxModule.h" />
+		<File RelativePath="..\..\engines\cruise\linker.cpp" />
+		<File RelativePath="..\..\engines\cruise\linker.h" />
+		<File RelativePath="..\..\engines\cruise\mainDraw.cpp" />
+		<File RelativePath="..\..\engines\cruise\mainDraw.h" />
+		<File RelativePath="..\..\engines\cruise\menu.cpp" />
+		<File RelativePath="..\..\engines\cruise\menu.h" />
+		<File RelativePath="..\..\engines\cruise\mouse.cpp" />
+		<File RelativePath="..\..\engines\cruise\mouse.h" />
+		<File RelativePath="..\..\engines\cruise\object.cpp" />
+		<File RelativePath="..\..\engines\cruise\object.h" />
+		<File RelativePath="..\..\engines\cruise\overlay.cpp" />
+		<File RelativePath="..\..\engines\cruise\overlay.h" />
+		<File RelativePath="..\..\engines\cruise\perso.cpp" />
+		<File RelativePath="..\..\engines\cruise\perso.h" />
+		<File RelativePath="..\..\engines\cruise\polys.cpp" />
+		<File RelativePath="..\..\engines\cruise\polys.h" />
+		<File RelativePath="..\..\engines\cruise\saveload.cpp" />
+		<File RelativePath="..\..\engines\cruise\saveload.h" />
+		<File RelativePath="..\..\engines\cruise\script.cpp" />
+		<File RelativePath="..\..\engines\cruise\script.h" />
+		<File RelativePath="..\..\engines\cruise\sound.cpp" />
+		<File RelativePath="..\..\engines\cruise\sound.h" />
+		<File RelativePath="..\..\engines\cruise\stack.cpp" />
+		<File RelativePath="..\..\engines\cruise\stack.h" />
+		<File RelativePath="..\..\engines\cruise\staticres.cpp" />
+		<File RelativePath="..\..\engines\cruise\staticres.h" />
+		<File RelativePath="..\..\engines\cruise\various.cpp" />
+		<File RelativePath="..\..\engines\cruise\various.h" />
+		<File RelativePath="..\..\engines\cruise\vars.cpp" />
+		<File RelativePath="..\..\engines\cruise\vars.h" />
+		<File RelativePath="..\..\engines\cruise\volume.cpp" />
+		<File RelativePath="..\..\engines\cruise\volume.h" />
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>
diff --git a/dists/msvc8/drascula.vcproj b/dists/msvc8/drascula.vcproj
index e096b33239..7481d2d81a 100644
--- a/dists/msvc8/drascula.vcproj
+++ b/dists/msvc8/drascula.vcproj
@@ -8,221 +8,26 @@
 	Keyword="Win32Proj"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="drascula_Debug"
-			IntermediateDirectory="drascula_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/drascula.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="drascula_Release"
-			IntermediateDirectory="drascula_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/drascula.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
+		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
+		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<File
-			RelativePath="..\..\engines\drascula\actors.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\animation.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\converse.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\detection.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\drascula.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\drascula.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\graphics.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\interface.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\objects.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\palette.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\rooms.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\saveload.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\sound.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\talk.cpp"
-			>
-		</File>
+		<File RelativePath="..\..\engines\drascula\actors.cpp" />
+		<File RelativePath="..\..\engines\drascula\animation.cpp" />
+		<File RelativePath="..\..\engines\drascula\converse.cpp" />
+		<File RelativePath="..\..\engines\drascula\detection.cpp" />
+		<File RelativePath="..\..\engines\drascula\drascula.cpp" />
+		<File RelativePath="..\..\engines\drascula\drascula.h" />
+		<File RelativePath="..\..\engines\drascula\graphics.cpp" />
+		<File RelativePath="..\..\engines\drascula\interface.cpp" />
+		<File RelativePath="..\..\engines\drascula\objects.cpp" />
+		<File RelativePath="..\..\engines\drascula\palette.cpp" />
+		<File RelativePath="..\..\engines\drascula\rooms.cpp" />
+		<File RelativePath="..\..\engines\drascula\saveload.cpp" />
+		<File RelativePath="..\..\engines\drascula\sound.cpp" />
+		<File RelativePath="..\..\engines\drascula\talk.cpp" />
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>
diff --git a/dists/msvc8/gob.vcproj b/dists/msvc8/gob.vcproj
index aa888f7018..22e7cba5fb 100644
--- a/dists/msvc8/gob.vcproj
+++ b/dists/msvc8/gob.vcproj
@@ -8,645 +8,133 @@
 	Keyword="Win32Proj"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="gob_Debug"
-			IntermediateDirectory="gob_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;ENABLE_RGB_COLOR"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/gob.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="gob_Release"
-			IntermediateDirectory="gob_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/gob.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
+		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
+		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<Filter
-			Name="sound"
-			>
-			<File
-				RelativePath="..\..\engines\gob\sound\adlib.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\adlib.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\bgatmosphere.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\bgatmosphere.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\cdrom.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\cdrom.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\infogrames.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\infogrames.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\pcspeaker.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\pcspeaker.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\protracker.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\protracker.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\sound.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\sound.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\soundblaster.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\soundblaster.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\sounddesc.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\sounddesc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\soundmixer.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\soundmixer.h"
-				>
-			</File>
+		<Filter Name="sound">
+			<File RelativePath="..\..\engines\gob\sound\adlib.cpp" />
+			<File RelativePath="..\..\engines\gob\sound\adlib.h" />
+			<File RelativePath="..\..\engines\gob\sound\bgatmosphere.cpp" />
+			<File RelativePath="..\..\engines\gob\sound\bgatmosphere.h" />
+			<File RelativePath="..\..\engines\gob\sound\cdrom.cpp" />
+			<File RelativePath="..\..\engines\gob\sound\cdrom.h" />
+			<File RelativePath="..\..\engines\gob\sound\infogrames.cpp" />
+			<File RelativePath="..\..\engines\gob\sound\infogrames.h" />
+			<File RelativePath="..\..\engines\gob\sound\pcspeaker.cpp" />
+			<File RelativePath="..\..\engines\gob\sound\pcspeaker.h" />
+			<File RelativePath="..\..\engines\gob\sound\protracker.cpp" />
+			<File RelativePath="..\..\engines\gob\sound\protracker.h" />
+			<File RelativePath="..\..\engines\gob\sound\sound.cpp" />
+			<File RelativePath="..\..\engines\gob\sound\sound.h" />
+			<File RelativePath="..\..\engines\gob\sound\soundblaster.cpp" />
+			<File RelativePath="..\..\engines\gob\sound\soundblaster.h" />
+			<File RelativePath="..\..\engines\gob\sound\sounddesc.cpp" />
+			<File RelativePath="..\..\engines\gob\sound\sounddesc.h" />
+			<File RelativePath="..\..\engines\gob\sound\soundmixer.cpp" />
+			<File RelativePath="..\..\engines\gob\sound\soundmixer.h" />
 		</Filter>
-		<File
-			RelativePath="..\..\engines\gob\demos\batplayer.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\demos\batplayer.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\dataio.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\dataio.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\demos\demoplayer.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\demos\demoplayer.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\detection.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\draw.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\draw.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\draw_bargon.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\draw_fascin.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\draw_v1.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\draw_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\driver_vga.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\driver_vga.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\expression.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\expression.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\game.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\game.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\global.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\global.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\gob.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\gob.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\goblin.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\goblin.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\goblin_v1.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\goblin_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\goblin_v3.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\goblin_v4.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\helper.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\hotspots.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\hotspots.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\init.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\init.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\init_v1.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\init_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\init_v3.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\init_v6.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\inter.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\inter.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\inter_bargon.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\inter_fascin.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\inter_v1.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\inter_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\inter_v3.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\inter_v4.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\inter_v5.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\inter_v6.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\map.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\map.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\map_v1.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\map_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\map_v4.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\mult.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\mult.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\mult_v1.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\mult_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\palanim.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\palanim.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\resources.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\resources.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveconverter.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveconverter.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveconverter_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveconverter_v3.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveconverter_v4.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveconverter_v6.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\savefile.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\savefile.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\savehandler.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\savehandler.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveload.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveload.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveload_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveload_v3.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveload_v4.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveload_v6.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveload_playtoons.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\scenery.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\scenery.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\scenery_v1.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\scenery_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\demos\scnplayer.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\demos\scnplayer.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\script.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\script.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\totfile.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\totfile.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\util.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\util.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\variables.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\variables.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\video.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\video.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\video_v1.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\video_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\video_v6.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\videoplayer.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\videoplayer.h"
-			>
-		</File>
+		<File RelativePath="..\..\engines\gob\demos\batplayer.cpp" />
+		<File RelativePath="..\..\engines\gob\demos\batplayer.h" />
+		<File RelativePath="..\..\engines\gob\dataio.cpp" />
+		<File RelativePath="..\..\engines\gob\dataio.h" />
+		<File RelativePath="..\..\engines\gob\demos\demoplayer.cpp" />
+		<File RelativePath="..\..\engines\gob\demos\demoplayer.h" />
+		<File RelativePath="..\..\engines\gob\detection.cpp" />
+		<File RelativePath="..\..\engines\gob\draw.cpp" />
+		<File RelativePath="..\..\engines\gob\draw.h" />
+		<File RelativePath="..\..\engines\gob\draw_bargon.cpp" />
+		<File RelativePath="..\..\engines\gob\draw_fascin.cpp" />
+		<File RelativePath="..\..\engines\gob\draw_v1.cpp" />
+		<File RelativePath="..\..\engines\gob\draw_v2.cpp" />
+		<File RelativePath="..\..\engines\gob\driver_vga.cpp" />
+		<File RelativePath="..\..\engines\gob\driver_vga.h" />
+		<File RelativePath="..\..\engines\gob\expression.cpp" />
+		<File RelativePath="..\..\engines\gob\expression.h" />
+		<File RelativePath="..\..\engines\gob\game.cpp" />
+		<File RelativePath="..\..\engines\gob\game.h" />
+		<File RelativePath="..\..\engines\gob\global.cpp" />
+		<File RelativePath="..\..\engines\gob\global.h" />
+		<File RelativePath="..\..\engines\gob\gob.cpp" />
+		<File RelativePath="..\..\engines\gob\gob.h" />
+		<File RelativePath="..\..\engines\gob\goblin.cpp" />
+		<File RelativePath="..\..\engines\gob\goblin.h" />
+		<File RelativePath="..\..\engines\gob\goblin_v1.cpp" />
+		<File RelativePath="..\..\engines\gob\goblin_v2.cpp" />
+		<File RelativePath="..\..\engines\gob\goblin_v3.cpp" />
+		<File RelativePath="..\..\engines\gob\goblin_v4.cpp" />
+		<File RelativePath="..\..\engines\gob\helper.h" />
+		<File RelativePath="..\..\engines\gob\hotspots.cpp" />
+		<File RelativePath="..\..\engines\gob\hotspots.h" />
+		<File RelativePath="..\..\engines\gob\init.cpp" />
+		<File RelativePath="..\..\engines\gob\init.h" />
+		<File RelativePath="..\..\engines\gob\init_v1.cpp" />
+		<File RelativePath="..\..\engines\gob\init_v2.cpp" />
+		<File RelativePath="..\..\engines\gob\init_v3.cpp" />
+		<File RelativePath="..\..\engines\gob\init_v6.cpp" />
+		<File RelativePath="..\..\engines\gob\inter.cpp" />
+		<File RelativePath="..\..\engines\gob\inter.h" />
+		<File RelativePath="..\..\engines\gob\inter_bargon.cpp" />
+		<File RelativePath="..\..\engines\gob\inter_fascin.cpp" />
+		<File RelativePath="..\..\engines\gob\inter_v1.cpp" />
+		<File RelativePath="..\..\engines\gob\inter_v2.cpp" />
+		<File RelativePath="..\..\engines\gob\inter_v3.cpp" />
+		<File RelativePath="..\..\engines\gob\inter_v4.cpp" />
+		<File RelativePath="..\..\engines\gob\inter_v5.cpp" />
+		<File RelativePath="..\..\engines\gob\inter_v6.cpp" />
+		<File RelativePath="..\..\engines\gob\map.cpp" />
+		<File RelativePath="..\..\engines\gob\map.h" />
+		<File RelativePath="..\..\engines\gob\map_v1.cpp" />
+		<File RelativePath="..\..\engines\gob\map_v2.cpp" />
+		<File RelativePath="..\..\engines\gob\map_v4.cpp" />
+		<File RelativePath="..\..\engines\gob\mult.cpp" />
+		<File RelativePath="..\..\engines\gob\mult.h" />
+		<File RelativePath="..\..\engines\gob\mult_v1.cpp" />
+		<File RelativePath="..\..\engines\gob\mult_v2.cpp" />
+		<File RelativePath="..\..\engines\gob\palanim.cpp" />
+		<File RelativePath="..\..\engines\gob\palanim.h" />
+		<File RelativePath="..\..\engines\gob\resources.cpp" />
+		<File RelativePath="..\..\engines\gob\resources.h" />
+		<File RelativePath="..\..\engines\gob\save\saveconverter.cpp" />
+		<File RelativePath="..\..\engines\gob\save\saveconverter.h" />
+		<File RelativePath="..\..\engines\gob\save\saveconverter_v2.cpp" />
+		<File RelativePath="..\..\engines\gob\save\saveconverter_v3.cpp" />
+		<File RelativePath="..\..\engines\gob\save\saveconverter_v4.cpp" />
+		<File RelativePath="..\..\engines\gob\save\saveconverter_v6.cpp" />
+		<File RelativePath="..\..\engines\gob\save\savefile.cpp" />
+		<File RelativePath="..\..\engines\gob\save\savefile.h" />
+		<File RelativePath="..\..\engines\gob\save\savehandler.cpp" />
+		<File RelativePath="..\..\engines\gob\save\savehandler.h" />
+		<File RelativePath="..\..\engines\gob\save\saveload.cpp" />
+		<File RelativePath="..\..\engines\gob\save\saveload.h" />
+		<File RelativePath="..\..\engines\gob\save\saveload_v2.cpp" />
+		<File RelativePath="..\..\engines\gob\save\saveload_v3.cpp" />
+		<File RelativePath="..\..\engines\gob\save\saveload_v4.cpp" />
+		<File RelativePath="..\..\engines\gob\save\saveload_v6.cpp" />
+		<File RelativePath="..\..\engines\gob\save\saveload_playtoons.cpp" />
+		<File RelativePath="..\..\engines\gob\scenery.cpp" />
+		<File RelativePath="..\..\engines\gob\scenery.h" />
+		<File RelativePath="..\..\engines\gob\scenery_v1.cpp" />
+		<File RelativePath="..\..\engines\gob\scenery_v2.cpp" />
+		<File RelativePath="..\..\engines\gob\demos\scnplayer.cpp" />
+		<File RelativePath="..\..\engines\gob\demos\scnplayer.h" />
+		<File RelativePath="..\..\engines\gob\script.cpp" />
+		<File RelativePath="..\..\engines\gob\script.h" />
+		<File RelativePath="..\..\engines\gob\totfile.cpp" />
+		<File RelativePath="..\..\engines\gob\totfile.h" />
+		<File RelativePath="..\..\engines\gob\util.cpp" />
+		<File RelativePath="..\..\engines\gob\util.h" />
+		<File RelativePath="..\..\engines\gob\variables.cpp" />
+		<File RelativePath="..\..\engines\gob\variables.h" />
+		<File RelativePath="..\..\engines\gob\video.cpp" />
+		<File RelativePath="..\..\engines\gob\video.h" />
+		<File RelativePath="..\..\engines\gob\video_v1.cpp" />
+		<File RelativePath="..\..\engines\gob\video_v2.cpp" />
+		<File RelativePath="..\..\engines\gob\video_v6.cpp" />
+		<File RelativePath="..\..\engines\gob\videoplayer.cpp" />
+		<File RelativePath="..\..\engines\gob\videoplayer.h" />
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>
diff --git a/dists/msvc8/groovie.vcproj b/dists/msvc8/groovie.vcproj
index e6e7e792ba..f62cef0f94 100644
--- a/dists/msvc8/groovie.vcproj
+++ b/dists/msvc8/groovie.vcproj
@@ -8,275 +8,41 @@
 	Keyword="Win32Proj"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="groovie_Debug"
-			IntermediateDirectory="groovie_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				AdditionalIncludeDirectories="../..;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS; ENABLE_RGB_COLOR; GROOVIE_EXPERIMENTAL"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="false"
-				SuppressStartupBanner="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/groovie.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="groovie_Release"
-			IntermediateDirectory="groovie_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/groovie.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
+		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
+		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<File
-			RelativePath="..\..\engines\groovie\cell.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\cell.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\cursor.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\cursor.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\debug.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\debug.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\detection.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\font.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\font.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\graphics.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\graphics.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\groovie.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\groovie.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\lzss.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\lzss.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\music.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\music.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\player.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\player.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\resource.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\resource.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\roq.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\roq.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\saveload.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\saveload.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\script.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\script.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\vdx.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\vdx.h"
-			>
-		</File>
+		<File RelativePath="..\..\engines\groovie\cell.cpp" />
+		<File RelativePath="..\..\engines\groovie\cell.h" />
+		<File RelativePath="..\..\engines\groovie\cursor.cpp" />
+		<File RelativePath="..\..\engines\groovie\cursor.h" />
+		<File RelativePath="..\..\engines\groovie\debug.cpp" />
+		<File RelativePath="..\..\engines\groovie\debug.h" />
+		<File RelativePath="..\..\engines\groovie\detection.cpp" />
+		<File RelativePath="..\..\engines\groovie\font.cpp" />
+		<File RelativePath="..\..\engines\groovie\font.h" />
+		<File RelativePath="..\..\engines\groovie\graphics.cpp" />
+		<File RelativePath="..\..\engines\groovie\graphics.h" />
+		<File RelativePath="..\..\engines\groovie\groovie.cpp" />
+		<File RelativePath="..\..\engines\groovie\groovie.h" />
+		<File RelativePath="..\..\engines\groovie\lzss.cpp" />
+		<File RelativePath="..\..\engines\groovie\lzss.h" />
+		<File RelativePath="..\..\engines\groovie\music.cpp" />
+		<File RelativePath="..\..\engines\groovie\music.h" />
+		<File RelativePath="..\..\engines\groovie\player.cpp" />
+		<File RelativePath="..\..\engines\groovie\player.h" />
+		<File RelativePath="..\..\engines\groovie\resource.cpp" />
+		<File RelativePath="..\..\engines\groovie\resource.h" />
+		<File RelativePath="..\..\engines\groovie\roq.cpp" />
+		<File RelativePath="..\..\engines\groovie\roq.h" />
+		<File RelativePath="..\..\engines\groovie\saveload.cpp" />
+		<File RelativePath="..\..\engines\groovie\saveload.h" />		
+		<File RelativePath="..\..\engines\groovie\script.cpp" />
+		<File RelativePath="..\..\engines\groovie\script.h" />
+		<File RelativePath="..\..\engines\groovie\vdx.cpp" />
+		<File RelativePath="..\..\engines\groovie\vdx.h" />
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>
diff --git a/dists/msvc8/igor.vcproj b/dists/msvc8/igor.vcproj
index dbfc5cc6bc..f40b41ff2f 100644
--- a/dists/msvc8/igor.vcproj
+++ b/dists/msvc8/igor.vcproj
@@ -8,321 +8,52 @@
 	Keyword="Win32Proj"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="igor_Debug"
-			IntermediateDirectory="igor_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/igor.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="igor_Release"
-			IntermediateDirectory="igor_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/igor.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
+		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
+		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<Filter
-			Name="parts"
-			>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_04.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_05.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_06.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_12.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_13.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_14.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_15.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_16.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_17.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_18.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_19.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_21.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_22.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_23.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_24.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_25.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_26.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_27.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_28.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_30.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_31.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_33.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_36.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_37.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_75.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_85.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_90.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_95.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_main.cpp"
-				>
-			</File>
+		<Filter Name="parts">
+			<File RelativePath="..\..\engines\igor\parts\part_04.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_05.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_06.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_12.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_13.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_14.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_15.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_16.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_17.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_18.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_19.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_21.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_22.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_23.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_24.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_25.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_26.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_27.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_28.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_30.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_31.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_33.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_36.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_37.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_75.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_85.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_90.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_95.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_main.cpp" />
 		</Filter>
-		<File
-			RelativePath="..\..\engines\igor\detection.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\igor\igor.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\igor\igor.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\igor\menu.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\igor\midi.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\igor\midi.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\igor\resource_ids.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\igor\saveload.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\igor\staticres.cpp"
-			>
-		</File>
+		<File RelativePath="..\..\engines\igor\detection.cpp" />
+		<File RelativePath="..\..\engines\igor\igor.cpp" />
+		<File RelativePath="..\..\engines\igor\igor.h" />
+		<File RelativePath="..\..\engines\igor\menu.cpp" />
+		<File RelativePath="..\..\engines\igor\midi.cpp" />
+		<File RelativePath="..\..\engines\igor\midi.h" />
+		<File RelativePath="..\..\engines\igor\resource_ids.h" />
+		<File RelativePath="..\..\engines\igor\saveload.cpp" />
+		<File RelativePath="..\..\engines\igor\staticres.cpp" />
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>
diff --git a/dists/msvc8/kyra.vcproj b/dists/msvc8/kyra.vcproj
index 940be7996f..7aba5b0856 100644
--- a/dists/msvc8/kyra.vcproj
+++ b/dists/msvc8/kyra.vcproj
@@ -8,629 +8,128 @@
 	Keyword="Win32Proj"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="kyra_Debug"
-			IntermediateDirectory="kyra_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;ENABLE_LOL"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/kyra.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="kyra_Release"
-			IntermediateDirectory="kyra_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;ENABLE_LOL"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/kyra.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
+		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
+		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<File
-			RelativePath="..\..\engines\kyra\animator_hof.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\animator_lok.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\animator_lok.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\animator_mr.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\animator_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\debugger.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\debugger.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\detection.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui_hof.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui_hof.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui_lok.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui_lok.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui_lol.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui_lol.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui_mr.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui_mr.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui_v2.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\items_hof.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\items_lok.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\items_lol.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\items_mr.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\items_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\kyra_hof.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\kyra_hof.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\kyra_lok.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\kyra_lok.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\kyra_mr.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\kyra_mr.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\kyra_v1.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\kyra_v1.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\kyra_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\kyra_v2.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\lol.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\lol.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\resource.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\resource.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\resource_intern.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\resource_intern.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\saveload.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\saveload_hof.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\saveload_lok.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\saveload_lol.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\saveload_mr.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\scene_hof.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\scene_lok.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\scene_lol.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\scene_mr.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\scene_v1.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\scene_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen_hof.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen_hof.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen_lok.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen_lok.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen_lol.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen_lol.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen_mr.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen_mr.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen_v2.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\script.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\script.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\script_hof.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\script_lok.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\script_lol.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\script_mr.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\script_tim.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\script_tim.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\script_v1.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\script_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\seqplayer.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\seqplayer.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sequences_hof.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sequences_lok.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sequences_lol.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sequences_mr.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sequences_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sound.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sound.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sound_adlib.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sound_digital.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sound_intern.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sound_lok.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sound_lol.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sound_midi.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sound_pcspk.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sound_towns.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sprites.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sprites.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sprites_lol.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\staticres.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\text.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\text.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\text_hof.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\text_hof.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\text_lok.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\text_lol.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\text_lol.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\text_mr.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\text_mr.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\timer.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\timer.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\timer_hof.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\timer_lok.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\timer_lol.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\timer_mr.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\util.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\util.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\vqa.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\vqa.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\wsamovie.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\wsamovie.h"
-			>
-		</File>
+		<File RelativePath="..\..\engines\kyra\animator_hof.cpp" />
+		<File RelativePath="..\..\engines\kyra\animator_lok.cpp" />
+		<File RelativePath="..\..\engines\kyra\animator_lok.h" />
+		<File RelativePath="..\..\engines\kyra\animator_mr.cpp" />
+		<File RelativePath="..\..\engines\kyra\animator_v2.cpp" />
+		<File RelativePath="..\..\engines\kyra\debugger.cpp" />
+		<File RelativePath="..\..\engines\kyra\debugger.h" />
+		<File RelativePath="..\..\engines\kyra\detection.cpp" />
+		<File RelativePath="..\..\engines\kyra\gui.cpp" />
+		<File RelativePath="..\..\engines\kyra\gui.h" />
+		<File RelativePath="..\..\engines\kyra\gui_hof.cpp" />
+		<File RelativePath="..\..\engines\kyra\gui_hof.h" />
+		<File RelativePath="..\..\engines\kyra\gui_lok.cpp" />
+		<File RelativePath="..\..\engines\kyra\gui_lok.h" />
+		<File RelativePath="..\..\engines\kyra\gui_lol.cpp" />
+		<File RelativePath="..\..\engines\kyra\gui_lol.h" />
+		<File RelativePath="..\..\engines\kyra\gui_mr.cpp" />
+		<File RelativePath="..\..\engines\kyra\gui_mr.h" />
+		<File RelativePath="..\..\engines\kyra\gui_v2.cpp" />
+		<File RelativePath="..\..\engines\kyra\gui_v2.h" />
+		<File RelativePath="..\..\engines\kyra\items_hof.cpp" />
+		<File RelativePath="..\..\engines\kyra\items_lok.cpp" />
+		<File RelativePath="..\..\engines\kyra\items_lol.cpp" />
+		<File RelativePath="..\..\engines\kyra\items_mr.cpp" />
+		<File RelativePath="..\..\engines\kyra\items_v2.cpp" />
+		<File RelativePath="..\..\engines\kyra\kyra_hof.cpp" />
+		<File RelativePath="..\..\engines\kyra\kyra_hof.h" />
+		<File RelativePath="..\..\engines\kyra\kyra_lok.cpp" />
+		<File RelativePath="..\..\engines\kyra\kyra_lok.h" />
+		<File RelativePath="..\..\engines\kyra\kyra_mr.cpp" />
+		<File RelativePath="..\..\engines\kyra\kyra_mr.h" />
+		<File RelativePath="..\..\engines\kyra\kyra_v1.cpp" />
+		<File RelativePath="..\..\engines\kyra\kyra_v1.h" />
+		<File RelativePath="..\..\engines\kyra\kyra_v2.cpp" />
+		<File RelativePath="..\..\engines\kyra\kyra_v2.h" />
+		<File RelativePath="..\..\engines\kyra\lol.cpp" />
+		<File RelativePath="..\..\engines\kyra\lol.h" />
+		<File RelativePath="..\..\engines\kyra\resource.cpp" />
+		<File RelativePath="..\..\engines\kyra\resource.h" />
+		<File RelativePath="..\..\engines\kyra\resource_intern.cpp" />
+		<File RelativePath="..\..\engines\kyra\resource_intern.h" />
+		<File RelativePath="..\..\engines\kyra\saveload.cpp" />
+		<File RelativePath="..\..\engines\kyra\saveload_hof.cpp" />
+		<File RelativePath="..\..\engines\kyra\saveload_lok.cpp" />
+		<File RelativePath="..\..\engines\kyra\saveload_lol.cpp" />
+		<File RelativePath="..\..\engines\kyra\saveload_mr.cpp" />
+		<File RelativePath="..\..\engines\kyra\scene_hof.cpp" />
+		<File RelativePath="..\..\engines\kyra\scene_lok.cpp" />
+		<File RelativePath="..\..\engines\kyra\scene_lol.cpp" />
+		<File RelativePath="..\..\engines\kyra\scene_mr.cpp" />
+		<File RelativePath="..\..\engines\kyra\scene_v1.cpp" />
+		<File RelativePath="..\..\engines\kyra\scene_v2.cpp" />
+		<File RelativePath="..\..\engines\kyra\screen.cpp" />
+		<File RelativePath="..\..\engines\kyra\screen.h" />
+		<File RelativePath="..\..\engines\kyra\screen_hof.cpp" />
+		<File RelativePath="..\..\engines\kyra\screen_hof.h" />
+		<File RelativePath="..\..\engines\kyra\screen_lok.cpp" />
+		<File RelativePath="..\..\engines\kyra\screen_lok.h" />
+		<File RelativePath="..\..\engines\kyra\screen_lol.cpp" />
+		<File RelativePath="..\..\engines\kyra\screen_lol.h" />
+		<File RelativePath="..\..\engines\kyra\screen_mr.cpp" />
+		<File RelativePath="..\..\engines\kyra\screen_mr.h" />
+		<File RelativePath="..\..\engines\kyra\screen_v2.cpp" />
+		<File RelativePath="..\..\engines\kyra\screen_v2.h" />
+		<File RelativePath="..\..\engines\kyra\script.cpp" />
+		<File RelativePath="..\..\engines\kyra\script.h" />
+		<File RelativePath="..\..\engines\kyra\script_hof.cpp" />
+		<File RelativePath="..\..\engines\kyra\script_lok.cpp" />
+		<File RelativePath="..\..\engines\kyra\script_lol.cpp" />
+		<File RelativePath="..\..\engines\kyra\script_mr.cpp" />
+		<File RelativePath="..\..\engines\kyra\script_tim.cpp" />
+		<File RelativePath="..\..\engines\kyra\script_tim.h" />
+		<File RelativePath="..\..\engines\kyra\script_v1.cpp" />
+		<File RelativePath="..\..\engines\kyra\script_v2.cpp" />
+		<File RelativePath="..\..\engines\kyra\seqplayer.cpp" />
+		<File RelativePath="..\..\engines\kyra\seqplayer.h" />
+		<File RelativePath="..\..\engines\kyra\sequences_hof.cpp" />
+		<File RelativePath="..\..\engines\kyra\sequences_lok.cpp" />
+		<File RelativePath="..\..\engines\kyra\sequences_lol.cpp" />
+		<File RelativePath="..\..\engines\kyra\sequences_mr.cpp" />
+		<File RelativePath="..\..\engines\kyra\sequences_v2.cpp" />
+		<File RelativePath="..\..\engines\kyra\sound.cpp" />
+		<File RelativePath="..\..\engines\kyra\sound.h" />
+		<File RelativePath="..\..\engines\kyra\sound_adlib.cpp" />
+		<File RelativePath="..\..\engines\kyra\sound_digital.cpp" />
+		<File RelativePath="..\..\engines\kyra\sound_intern.h" />
+		<File RelativePath="..\..\engines\kyra\sound_lok.cpp" />
+		<File RelativePath="..\..\engines\kyra\sound_lol.cpp" />
+		<File RelativePath="..\..\engines\kyra\sound_midi.cpp" />
+		<File RelativePath="..\..\engines\kyra\sound_pcspk.cpp" />
+		<File RelativePath="..\..\engines\kyra\sound_towns.cpp" />
+		<File RelativePath="..\..\engines\kyra\sprites.cpp" />
+		<File RelativePath="..\..\engines\kyra\sprites.h" />
+		<File RelativePath="..\..\engines\kyra\sprites_lol.cpp" />
+		<File RelativePath="..\..\engines\kyra\staticres.cpp" />
+		<File RelativePath="..\..\engines\kyra\text.cpp" />
+		<File RelativePath="..\..\engines\kyra\text.h" />
+		<File RelativePath="..\..\engines\kyra\text_hof.cpp" />
+		<File RelativePath="..\..\engines\kyra\text_hof.h" />
+		<File RelativePath="..\..\engines\kyra\text_lok.cpp" />
+		<File RelativePath="..\..\engines\kyra\text_lol.cpp" />
+		<File RelativePath="..\..\engines\kyra\text_lol.h" />
+		<File RelativePath="..\..\engines\kyra\text_mr.cpp" />
+		<File RelativePath="..\..\engines\kyra\text_mr.h" />
+		<File RelativePath="..\..\engines\kyra\timer.cpp" />
+		<File RelativePath="..\..\engines\kyra\timer.h" />
+		<File RelativePath="..\..\engines\kyra\timer_hof.cpp" />
+		<File RelativePath="..\..\engines\kyra\timer_lok.cpp" />
+		<File RelativePath="..\..\engines\kyra\timer_lol.cpp" />
+		<File RelativePath="..\..\engines\kyra\timer_mr.cpp" />
+		<File RelativePath="..\..\engines\kyra\util.cpp" />
+		<File RelativePath="..\..\engines\kyra\util.h" />
+		<File RelativePath="..\..\engines\kyra\vqa.cpp" />
+		<File RelativePath="..\..\engines\kyra\vqa.h" />
+		<File RelativePath="..\..\engines\kyra\wsamovie.cpp" />
+		<File RelativePath="..\..\engines\kyra\wsamovie.h" />
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>
diff --git a/dists/msvc8/lure.vcproj b/dists/msvc8/lure.vcproj
index 5102e74117..221eccf426 100644
--- a/dists/msvc8/lure.vcproj
+++ b/dists/msvc8/lure.vcproj
@@ -8,341 +8,56 @@
 	Keyword="Win32Proj"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="lure_Debug"
-			IntermediateDirectory="lure_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/lure.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="lure_Release"
-			IntermediateDirectory="lure_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/lure.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
+		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
+		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<File
-			RelativePath="..\..\engines\lure\animseq.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\animseq.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\debugger.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\debugger.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\decode.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\decode.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\detection.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\disk.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\disk.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\events.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\events.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\fights.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\fights.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\game.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\game.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\hotspots.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\hotspots.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\intro.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\intro.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\lure.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\lure.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\luredefs.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\memory.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\memory.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\menu.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\menu.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\palette.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\palette.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\res.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\res.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\res_struct.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\res_struct.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\room.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\room.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\screen.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\screen.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\scripts.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\scripts.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\sound.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\sound.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\strings.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\strings.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\surface.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\surface.h"
-			>
-		</File>
+		<File RelativePath="..\..\engines\lure\animseq.cpp" />
+		<File RelativePath="..\..\engines\lure\animseq.h" />
+		<File RelativePath="..\..\engines\lure\debugger.cpp" />
+		<File RelativePath="..\..\engines\lure\debugger.h" />
+		<File RelativePath="..\..\engines\lure\decode.cpp" />
+		<File RelativePath="..\..\engines\lure\decode.h" />
+		<File RelativePath="..\..\engines\lure\detection.cpp" />
+		<File RelativePath="..\..\engines\lure\disk.cpp" />
+		<File RelativePath="..\..\engines\lure\disk.h" />
+		<File RelativePath="..\..\engines\lure\events.cpp" />
+		<File RelativePath="..\..\engines\lure\events.h" />
+		<File RelativePath="..\..\engines\lure\fights.cpp" />
+		<File RelativePath="..\..\engines\lure\fights.h" />
+		<File RelativePath="..\..\engines\lure\game.cpp" />
+		<File RelativePath="..\..\engines\lure\game.h" />
+		<File RelativePath="..\..\engines\lure\hotspots.cpp" />
+		<File RelativePath="..\..\engines\lure\hotspots.h" />
+		<File RelativePath="..\..\engines\lure\intro.cpp" />
+		<File RelativePath="..\..\engines\lure\intro.h" />
+		<File RelativePath="..\..\engines\lure\lure.cpp" />
+		<File RelativePath="..\..\engines\lure\lure.h" />
+		<File RelativePath="..\..\engines\lure\luredefs.h" />
+		<File RelativePath="..\..\engines\lure\memory.cpp" />
+		<File RelativePath="..\..\engines\lure\memory.h" />
+		<File RelativePath="..\..\engines\lure\menu.cpp" />
+		<File RelativePath="..\..\engines\lure\menu.h" />
+		<File RelativePath="..\..\engines\lure\palette.cpp" />
+		<File RelativePath="..\..\engines\lure\palette.h" />
+		<File RelativePath="..\..\engines\lure\res.cpp" />
+		<File RelativePath="..\..\engines\lure\res.h" />
+		<File RelativePath="..\..\engines\lure\res_struct.cpp" />
+		<File RelativePath="..\..\engines\lure\res_struct.h" />
+		<File RelativePath="..\..\engines\lure\room.cpp" />
+		<File RelativePath="..\..\engines\lure\room.h" />
+		<File RelativePath="..\..\engines\lure\screen.cpp" />
+		<File RelativePath="..\..\engines\lure\screen.h" />
+		<File RelativePath="..\..\engines\lure\scripts.cpp" />
+		<File RelativePath="..\..\engines\lure\scripts.h" />
+		<File RelativePath="..\..\engines\lure\sound.cpp" />
+		<File RelativePath="..\..\engines\lure\sound.h" />
+		<File RelativePath="..\..\engines\lure\strings.cpp" />
+		<File RelativePath="..\..\engines\lure\strings.h" />
+		<File RelativePath="..\..\engines\lure\surface.cpp" />
+		<File RelativePath="..\..\engines\lure\surface.h" />
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>
diff --git a/dists/msvc8/m4.vcproj b/dists/msvc8/m4.vcproj
index 9d27e60132..b522ecef78 100644
--- a/dists/msvc8/m4.vcproj
+++ b/dists/msvc8/m4.vcproj
@@ -8,397 +8,70 @@
 	Keyword="Win32Proj"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="m4_Debug"
-			IntermediateDirectory="m4_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/m4.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="m4_Release"
-			IntermediateDirectory="m4_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/m4.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
+		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
+		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<File
-			RelativePath="..\..\engines\m4\actor.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\actor.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\animation.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\animation.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\assets.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\assets.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\burger_data.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\compression.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\compression.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\console.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\console.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\converse.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\converse.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\detection.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\events.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\events.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\font.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\font.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\globals.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\globals.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\graphics.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\graphics.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\gui.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\gui.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\hotspot.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\hotspot.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\m4.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\m4.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\m4_menus.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\m4_menus.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\m4_views.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\m4_views.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\mads_anim.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\mads_anim.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\mads_menus.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\mads_menus.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\midi.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\midi.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\rails.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\rails.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\resource.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\resource.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\saveload.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\saveload.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\scene.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\scene.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\script.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\script.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\sound.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\sound.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\sprite.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\sprite.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\viewmgr.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\viewmgr.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\woodscript.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\woodscript.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\ws_machine.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\ws_sequence.cpp"
-			>
-		</File>
+		<File RelativePath="..\..\engines\m4\actor.cpp" />
+		<File RelativePath="..\..\engines\m4\actor.h" />
+		<File RelativePath="..\..\engines\m4\animation.cpp" />
+		<File RelativePath="..\..\engines\m4\animation.h" />
+		<File RelativePath="..\..\engines\m4\assets.cpp" />
+		<File RelativePath="..\..\engines\m4\assets.h" />
+		<File RelativePath="..\..\engines\m4\burger_data.h" />
+		<File RelativePath="..\..\engines\m4\compression.cpp" />
+		<File RelativePath="..\..\engines\m4\compression.h" />
+		<File RelativePath="..\..\engines\m4\console.cpp" />
+		<File RelativePath="..\..\engines\m4\console.h" />
+		<File RelativePath="..\..\engines\m4\converse.cpp" />
+		<File RelativePath="..\..\engines\m4\converse.h" />
+		<File RelativePath="..\..\engines\m4\detection.cpp" />
+		<File RelativePath="..\..\engines\m4\events.cpp" />
+		<File RelativePath="..\..\engines\m4\events.h" />
+		<File RelativePath="..\..\engines\m4\font.cpp" />
+		<File RelativePath="..\..\engines\m4\font.h" />
+		<File RelativePath="..\..\engines\m4\globals.cpp" />
+		<File RelativePath="..\..\engines\m4\globals.h" />
+		<File RelativePath="..\..\engines\m4\graphics.cpp" />
+		<File RelativePath="..\..\engines\m4\graphics.h" />
+		<File RelativePath="..\..\engines\m4\gui.cpp" />
+		<File RelativePath="..\..\engines\m4\gui.h" />
+		<File RelativePath="..\..\engines\m4\hotspot.cpp" />
+		<File RelativePath="..\..\engines\m4\hotspot.h" />
+		<File RelativePath="..\..\engines\m4\m4.cpp" />
+		<File RelativePath="..\..\engines\m4\m4.h" />
+		<File RelativePath="..\..\engines\m4\m4_menus.cpp" />
+		<File RelativePath="..\..\engines\m4\m4_menus.h" />
+		<File RelativePath="..\..\engines\m4\m4_views.cpp" />
+		<File RelativePath="..\..\engines\m4\m4_views.h" />
+		<File RelativePath="..\..\engines\m4\mads_anim.cpp" />
+		<File RelativePath="..\..\engines\m4\mads_anim.h" />
+		<File RelativePath="..\..\engines\m4\mads_menus.cpp" />
+		<File RelativePath="..\..\engines\m4\mads_menus.h" />
+		<File RelativePath="..\..\engines\m4\midi.cpp" />
+		<File RelativePath="..\..\engines\m4\midi.h" />
+		<File RelativePath="..\..\engines\m4\rails.cpp" />
+		<File RelativePath="..\..\engines\m4\rails.h" />
+		<File RelativePath="..\..\engines\m4\resource.cpp" />
+		<File RelativePath="..\..\engines\m4\resource.h" />
+		<File RelativePath="..\..\engines\m4\saveload.cpp" />
+		<File RelativePath="..\..\engines\m4\saveload.h" />
+		<File RelativePath="..\..\engines\m4\scene.cpp" />
+		<File RelativePath="..\..\engines\m4\scene.h" />
+		<File RelativePath="..\..\engines\m4\script.cpp" />
+		<File RelativePath="..\..\engines\m4\script.h" />
+		<File RelativePath="..\..\engines\m4\sound.cpp" />
+		<File RelativePath="..\..\engines\m4\sound.h" />
+		<File RelativePath="..\..\engines\m4\sprite.cpp" />
+		<File RelativePath="..\..\engines\m4\sprite.h" />
+		<File RelativePath="..\..\engines\m4\viewmgr.cpp" />
+		<File RelativePath="..\..\engines\m4\viewmgr.h" />
+		<File RelativePath="..\..\engines\m4\woodscript.cpp" />
+		<File RelativePath="..\..\engines\m4\woodscript.h" />
+		<File RelativePath="..\..\engines\m4\ws_machine.cpp" />
+		<File RelativePath="..\..\engines\m4\ws_sequence.cpp" />
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>
diff --git a/dists/msvc8/made.vcproj b/dists/msvc8/made.vcproj
index 13b32b61d5..aa2a2ec01e 100644
--- a/dists/msvc8/made.vcproj
+++ b/dists/msvc8/made.vcproj
@@ -8,265 +8,37 @@
 	Keyword="Win32Proj"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="made_Debug"
-			IntermediateDirectory="made_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/made.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="made_Release"
-			IntermediateDirectory="made_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/made.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
+		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
+		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<File
-			RelativePath="..\..\engines\made\database.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\made\database.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\made\detection.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\made\graphics.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\made\graphics.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\made\made.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\made\made.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\made\music.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\made\music.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\made\pmvplayer.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\made\pmvplayer.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\made\redreader.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\made\redreader.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\made\resource.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\made\resource.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\made\screen.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\made\screen.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\made\screenfx.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\made\screenfx.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\made\script.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\made\script.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\made\scriptfuncs.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\made\scriptfuncs.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\made\sound.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\made\sound.h"
-			>
-		</File>
+		<File RelativePath="..\..\engines\made\database.cpp" />
+		<File RelativePath="..\..\engines\made\database.h" />
+		<File RelativePath="..\..\engines\made\detection.cpp" />
+		<File RelativePath="..\..\engines\made\graphics.cpp" />
+		<File RelativePath="..\..\engines\made\graphics.h" />
+		<File RelativePath="..\..\engines\made\made.cpp" />
+		<File RelativePath="..\..\engines\made\made.h" />
+		<File RelativePath="..\..\engines\made\music.cpp" />
+		<File RelativePath="..\..\engines\made\music.h" />
+		<File RelativePath="..\..\engines\made\pmvplayer.cpp" />
+		<File RelativePath="..\..\engines\made\pmvplayer.h" />
+		<File RelativePath="..\..\engines\made\redreader.cpp" />
+		<File RelativePath="..\..\engines\made\redreader.h" />
+		<File RelativePath="..\..\engines\made\resource.cpp" />
+		<File RelativePath="..\..\engines\made\resource.h" />
+		<File RelativePath="..\..\engines\made\screen.cpp" />
+		<File RelativePath="..\..\engines\made\screen.h" />
+		<File RelativePath="..\..\engines\made\screenfx.cpp" />
+		<File RelativePath="..\..\engines\made\screenfx.h" />
+		<File RelativePath="..\..\engines\made\script.cpp" />
+		<File RelativePath="..\..\engines\made\script.h" />
+		<File RelativePath="..\..\engines\made\scriptfuncs.cpp" />
+		<File RelativePath="..\..\engines\made\scriptfuncs.h" />
+		<File RelativePath="..\..\engines\made\sound.cpp" />
+		<File RelativePath="..\..\engines\made\sound.h" />
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>
diff --git a/dists/msvc8/parallaction.vcproj b/dists/msvc8/parallaction.vcproj
index 75b32bbf6e..ee4bb0ce23 100644
--- a/dists/msvc8/parallaction.vcproj
+++ b/dists/msvc8/parallaction.vcproj
@@ -8,345 +8,57 @@
 	Keyword="Win32Proj"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="parallaction_Debug"
-			IntermediateDirectory="parallaction_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/parallaction.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="parallaction_Release"
-			IntermediateDirectory="parallaction_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/parallaction.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
+		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
+		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<File
-			RelativePath="..\..\engines\parallaction\balloons.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\callables_br.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\callables_ns.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\debug.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\debug.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\detection.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\dialogue.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\disk.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\disk.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\disk_br.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\disk_ns.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\exec.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\exec.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\exec_br.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\exec_ns.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\font.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\gfxbase.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\graphics.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\graphics.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\gui.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\gui.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\gui_br.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\gui_ns.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\input.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\input.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\inventory.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\inventory.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\objects.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\objects.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\parallaction.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\parallaction.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\parallaction_br.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\parallaction_ns.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\parser.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\parser.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\parser_br.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\parser_ns.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\saveload.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\saveload.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\sound.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\sound_br.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\sound_ns.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\staticres.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\walk.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\walk.h"
-			>
-		</File>
+		<File RelativePath="..\..\engines\parallaction\balloons.cpp" />
+		<File RelativePath="..\..\engines\parallaction\callables_br.cpp" />
+		<File RelativePath="..\..\engines\parallaction\callables_ns.cpp" />
+		<File RelativePath="..\..\engines\parallaction\debug.cpp" />
+		<File RelativePath="..\..\engines\parallaction\debug.h" />
+		<File RelativePath="..\..\engines\parallaction\detection.cpp" />
+		<File RelativePath="..\..\engines\parallaction\dialogue.cpp" />
+		<File RelativePath="..\..\engines\parallaction\disk.cpp" />
+		<File RelativePath="..\..\engines\parallaction\disk.h" />
+		<File RelativePath="..\..\engines\parallaction\disk_br.cpp" />
+		<File RelativePath="..\..\engines\parallaction\disk_ns.cpp" />
+		<File RelativePath="..\..\engines\parallaction\exec.cpp" />
+		<File RelativePath="..\..\engines\parallaction\exec.h" />
+		<File RelativePath="..\..\engines\parallaction\exec_br.cpp" />
+		<File RelativePath="..\..\engines\parallaction\exec_ns.cpp" />
+		<File RelativePath="..\..\engines\parallaction\font.cpp" />
+		<File RelativePath="..\..\engines\parallaction\gfxbase.cpp" />
+		<File RelativePath="..\..\engines\parallaction\graphics.cpp" />
+		<File RelativePath="..\..\engines\parallaction\graphics.h" />
+		<File RelativePath="..\..\engines\parallaction\gui.cpp" />
+		<File RelativePath="..\..\engines\parallaction\gui.h" />
+		<File RelativePath="..\..\engines\parallaction\gui_br.cpp" />
+		<File RelativePath="..\..\engines\parallaction\gui_ns.cpp" />
+		<File RelativePath="..\..\engines\parallaction\input.cpp" />
+		<File RelativePath="..\..\engines\parallaction\input.h" />
+		<File RelativePath="..\..\engines\parallaction\inventory.cpp" />
+		<File RelativePath="..\..\engines\parallaction\inventory.h" />
+		<File RelativePath="..\..\engines\parallaction\objects.cpp" />
+		<File RelativePath="..\..\engines\parallaction\objects.h" />
+		<File RelativePath="..\..\engines\parallaction\parallaction.cpp" />
+		<File RelativePath="..\..\engines\parallaction\parallaction.h" />
+		<File RelativePath="..\..\engines\parallaction\parallaction_br.cpp" />
+		<File RelativePath="..\..\engines\parallaction\parallaction_ns.cpp" />
+		<File RelativePath="..\..\engines\parallaction\parser.cpp" />
+		<File RelativePath="..\..\engines\parallaction\parser.h" />
+		<File RelativePath="..\..\engines\parallaction\parser_br.cpp" />
+		<File RelativePath="..\..\engines\parallaction\parser_ns.cpp" />
+		<File RelativePath="..\..\engines\parallaction\saveload.cpp" />
+		<File RelativePath="..\..\engines\parallaction\saveload.h" />
+		<File RelativePath="..\..\engines\parallaction\sound.h" />
+		<File RelativePath="..\..\engines\parallaction\sound_br.cpp" />
+		<File RelativePath="..\..\engines\parallaction\sound_ns.cpp" />
+		<File RelativePath="..\..\engines\parallaction\staticres.cpp" />
+		<File RelativePath="..\..\engines\parallaction\walk.cpp" />
+		<File RelativePath="..\..\engines\parallaction\walk.h" />
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>
diff --git a/dists/msvc8/queen.vcproj b/dists/msvc8/queen.vcproj
index eec37976bf..610d90738c 100644
--- a/dists/msvc8/queen.vcproj
+++ b/dists/msvc8/queen.vcproj
@@ -8,329 +8,53 @@
 	Keyword="Win32Proj"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="queen_Debug"
-			IntermediateDirectory="queen_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/queen.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="queen_Release"
-			IntermediateDirectory="queen_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/queen.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
+		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
+		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<File
-			RelativePath="..\..\engines\queen\bankman.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\bankman.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\command.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\command.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\credits.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\credits.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\cutaway.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\cutaway.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\debug.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\debug.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\defs.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\display.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\display.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\graphics.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\graphics.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\grid.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\grid.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\input.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\input.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\journal.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\journal.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\logic.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\logic.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\midiadlib.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\music.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\music.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\musicdata.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\queen.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\queen.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\resource.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\resource.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\restables.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\sound.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\sound.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\state.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\state.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\structs.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\talk.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\talk.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\walk.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\walk.h"
-			>
-		</File>
+		<File RelativePath="..\..\engines\queen\bankman.cpp" />
+		<File RelativePath="..\..\engines\queen\bankman.h" />
+		<File RelativePath="..\..\engines\queen\command.cpp" />
+		<File RelativePath="..\..\engines\queen\command.h" />
+		<File	RelativePath="..\..\engines\queen\credits.cpp" />
+		<File	RelativePath="..\..\engines\queen\credits.h" />
+		<File	RelativePath="..\..\engines\queen\cutaway.cpp" />
+		<File	RelativePath="..\..\engines\queen\cutaway.h" />
+		<File	RelativePath="..\..\engines\queen\debug.cpp" />
+		<File	RelativePath="..\..\engines\queen\debug.h" />
+		<File	RelativePath="..\..\engines\queen\defs.h" />
+		<File	RelativePath="..\..\engines\queen\display.cpp" />
+		<File	RelativePath="..\..\engines\queen\display.h" />
+		<File	RelativePath="..\..\engines\queen\graphics.cpp" />
+		<File	RelativePath="..\..\engines\queen\graphics.h" />
+		<File	RelativePath="..\..\engines\queen\grid.cpp" />
+		<File	RelativePath="..\..\engines\queen\grid.h" />
+		<File	RelativePath="..\..\engines\queen\input.cpp" />
+		<File	RelativePath="..\..\engines\queen\input.h" />
+		<File RelativePath="..\..\engines\queen\journal.cpp" />
+		<File RelativePath="..\..\engines\queen\journal.h" />
+		<File RelativePath="..\..\engines\queen\logic.cpp" />
+		<File RelativePath="..\..\engines\queen\logic.h" />
+		<File RelativePath="..\..\engines\queen\midiadlib.cpp" />
+		<File RelativePath="..\..\engines\queen\music.cpp" />
+		<File RelativePath="..\..\engines\queen\music.h" />
+		<File RelativePath="..\..\engines\queen\musicdata.cpp" />
+		<File RelativePath="..\..\engines\queen\queen.cpp" />
+		<File RelativePath="..\..\engines\queen\queen.h" />
+		<File RelativePath="..\..\engines\queen\resource.cpp" />
+		<File RelativePath="..\..\engines\queen\resource.h" />
+		<File RelativePath="..\..\engines\queen\restables.cpp" />
+		<File RelativePath="..\..\engines\queen\sound.cpp" />
+		<File RelativePath="..\..\engines\queen\sound.h" />
+		<File RelativePath="..\..\engines\queen\state.cpp" />
+		<File RelativePath="..\..\engines\queen\state.h" />
+		<File RelativePath="..\..\engines\queen\structs.h" />
+		<File RelativePath="..\..\engines\queen\talk.cpp" />
+		<File RelativePath="..\..\engines\queen\talk.h" />
+		<File RelativePath="..\..\engines\queen\walk.cpp" />
+		<File RelativePath="..\..\engines\queen\walk.h" />
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>
diff --git a/dists/msvc8/saga.vcproj b/dists/msvc8/saga.vcproj
index 4cd1c62a7c..f6d6e7b87b 100644
--- a/dists/msvc8/saga.vcproj
+++ b/dists/msvc8/saga.vcproj
@@ -8,405 +8,72 @@
 	Keyword="Win32Proj"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="saga_Debug"
-			IntermediateDirectory="saga_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;ENABLE_IHNM;ENABLE_SAGA2;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/saga.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="saga_Release"
-			IntermediateDirectory="saga_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;ENABLE_IHNM;ENABLE_SAGA2;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/saga.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
+		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
+		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<File
-			RelativePath="..\..\engines\saga\actor.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\actor.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\actor_path.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\actor_walk.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\animation.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\animation.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\console.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\console.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\detection.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\detection_tables.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\displayinfo.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\events.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\events.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\font.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\font.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\font_map.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\gfx.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\gfx.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\image.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\input.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\interface.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\interface.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\introproc_ihnm.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\introproc_ite.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\introproc_saga2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\isomap.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\isomap.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\itedata.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\itedata.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\music.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\music.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\objectmap.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\objectmap.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\palanim.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\palanim.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\puzzle.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\puzzle.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\render.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\render.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\resource.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\resource.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\resource_hrs.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\resource_res.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\resource_rsc.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\saga.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\saga.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\saveload.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\scene.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\scene.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\script.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\script.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\sfuncs.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\sfuncs_ihnm.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\sndres.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\sndres.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\sound.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\sound.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\sprite.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\sprite.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\sthread.cpp"
-			>
-		</File>
+		<File RelativePath="..\..\engines\saga\actor.cpp" />
+		<File RelativePath="..\..\engines\saga\actor.h" />
+		<File RelativePath="..\..\engines\saga\actor_path.cpp" />
+		<File RelativePath="..\..\engines\saga\actor_walk.cpp" />
+		<File RelativePath="..\..\engines\saga\animation.cpp" />
+		<File RelativePath="..\..\engines\saga\animation.h" />
+		<File RelativePath="..\..\engines\saga\console.cpp" />
+		<File RelativePath="..\..\engines\saga\console.h" />
+		<File RelativePath="..\..\engines\saga\detection.cpp" />
+		<File RelativePath="..\..\engines\saga\detection_tables.h" />
+		<File RelativePath="..\..\engines\saga\displayinfo.h" />
+		<File RelativePath="..\..\engines\saga\events.cpp" />
+		<File RelativePath="..\..\engines\saga\events.h" />
+		<File RelativePath="..\..\engines\saga\font.cpp" />
+		<File RelativePath="..\..\engines\saga\font.h" />
+		<File RelativePath="..\..\engines\saga\font_map.cpp" />
+		<File RelativePath="..\..\engines\saga\gfx.cpp" />
+		<File RelativePath="..\..\engines\saga\gfx.h" />
+		<File RelativePath="..\..\engines\saga\image.cpp" />
+		<File RelativePath="..\..\engines\saga\input.cpp" />
+		<File RelativePath="..\..\engines\saga\interface.cpp" />
+		<File RelativePath="..\..\engines\saga\interface.h" />
+		<File RelativePath="..\..\engines\saga\introproc_ihnm.cpp" />
+		<File RelativePath="..\..\engines\saga\introproc_ite.cpp" />
+		<File RelativePath="..\..\engines\saga\introproc_saga2.cpp" />
+		<File RelativePath="..\..\engines\saga\isomap.cpp" />
+		<File RelativePath="..\..\engines\saga\isomap.h" />
+		<File RelativePath="..\..\engines\saga\itedata.cpp" />
+		<File RelativePath="..\..\engines\saga\itedata.h" />
+		<File RelativePath="..\..\engines\saga\music.cpp" />
+		<File RelativePath="..\..\engines\saga\music.h" />
+		<File RelativePath="..\..\engines\saga\objectmap.cpp" />
+		<File RelativePath="..\..\engines\saga\objectmap.h" />
+		<File RelativePath="..\..\engines\saga\palanim.cpp" />
+		<File RelativePath="..\..\engines\saga\palanim.h" />
+		<File RelativePath="..\..\engines\saga\puzzle.cpp" />
+		<File RelativePath="..\..\engines\saga\puzzle.h" />
+		<File RelativePath="..\..\engines\saga\render.cpp" />
+		<File RelativePath="..\..\engines\saga\render.h" />
+		<File RelativePath="..\..\engines\saga\resource.cpp" />
+		<File RelativePath="..\..\engines\saga\resource.h" />
+		<File RelativePath="..\..\engines\saga\resource_hrs.cpp" />
+		<File RelativePath="..\..\engines\saga\resource_res.cpp" />
+		<File RelativePath="..\..\engines\saga\resource_rsc.cpp" />
+		<File RelativePath="..\..\engines\saga\saga.cpp" />
+		<File RelativePath="..\..\engines\saga\saga.h" />
+		<File RelativePath="..\..\engines\saga\saveload.cpp" />
+		<File RelativePath="..\..\engines\saga\scene.cpp" />
+		<File RelativePath="..\..\engines\saga\scene.h" />
+		<File RelativePath="..\..\engines\saga\script.cpp" />
+		<File RelativePath="..\..\engines\saga\script.h" />
+		<File RelativePath="..\..\engines\saga\sfuncs.cpp" />
+		<File RelativePath="..\..\engines\saga\sfuncs_ihnm.cpp" />
+		<File RelativePath="..\..\engines\saga\sndres.cpp" />
+		<File RelativePath="..\..\engines\saga\sndres.h" />
+		<File RelativePath="..\..\engines\saga\sound.cpp" />
+		<File RelativePath="..\..\engines\saga\sound.h" />
+		<File RelativePath="..\..\engines\saga\sprite.cpp" />
+		<File RelativePath="..\..\engines\saga\sprite.h" />
+		<File RelativePath="..\..\engines\saga\sthread.cpp" />
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>
diff --git a/dists/msvc8/sci.vcproj b/dists/msvc8/sci.vcproj
index 8575096239..36053d82a5 100644
--- a/dists/msvc8/sci.vcproj
+++ b/dists/msvc8/sci.vcproj
@@ -8,625 +8,132 @@
 	Keyword="Win32Proj"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="sci_Debug"
-			IntermediateDirectory="sci_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;ENABLE_RGB_COLOR"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="false"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/sci.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="sci_Release"
-			IntermediateDirectory="sci_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/sci.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
+		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
+		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<Filter
-			Name="engine"
-			>
-			<File
-				RelativePath="..\..\engines\sci\engine\game.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\gc.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\gc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\grammar.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\intmap.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\intmap.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\kernel.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\kernel.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\kernel_types.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\kevent.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\kfile.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\kgraphics.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\klists.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\kmath.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\kmenu.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\kmisc.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\kmovement.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\kpathing.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\kscripts.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\ksound.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\kstring.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\memobj.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\memobj.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\message.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\message.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\said.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\savegame.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\savegame.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\script.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\scriptdebug.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\seg_manager.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\seg_manager.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\state.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\state.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\stringfrag.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\vm.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\vm.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\vm_types.h"
-				>
-			</File>
+		<Filter Name="engine">
+			<File RelativePath="..\..\engines\sci\engine\game.cpp" />
+			<File RelativePath="..\..\engines\sci\engine\gc.cpp" />
+			<File RelativePath="..\..\engines\sci\engine\gc.h" />
+			<File RelativePath="..\..\engines\sci\engine\grammar.cpp" />
+			<File RelativePath="..\..\engines\sci\engine\intmap.cpp" />
+			<File RelativePath="..\..\engines\sci\engine\intmap.h" />
+			<File RelativePath="..\..\engines\sci\engine\kernel.cpp" />
+			<File RelativePath="..\..\engines\sci\engine\kernel.h" />
+			<File RelativePath="..\..\engines\sci\engine\kernel_types.h" />
+			<File RelativePath="..\..\engines\sci\engine\kevent.cpp" />
+			<File RelativePath="..\..\engines\sci\engine\kfile.cpp" />
+			<File RelativePath="..\..\engines\sci\engine\kgraphics.cpp" />
+			<File RelativePath="..\..\engines\sci\engine\klists.cpp" />
+			<File RelativePath="..\..\engines\sci\engine\kmath.cpp" />
+			<File RelativePath="..\..\engines\sci\engine\kmenu.cpp" />
+			<File RelativePath="..\..\engines\sci\engine\kmisc.cpp" />
+			<File RelativePath="..\..\engines\sci\engine\kmovement.cpp" />
+			<File RelativePath="..\..\engines\sci\engine\kpathing.cpp" />
+			<File RelativePath="..\..\engines\sci\engine\kscripts.cpp" />
+			<File RelativePath="..\..\engines\sci\engine\ksound.cpp" />
+			<File RelativePath="..\..\engines\sci\engine\kstring.cpp" />
+			<File RelativePath="..\..\engines\sci\engine\memobj.cpp" />
+			<File RelativePath="..\..\engines\sci\engine\memobj.h" />
+			<File RelativePath="..\..\engines\sci\engine\message.cpp" />
+			<File RelativePath="..\..\engines\sci\engine\message.h" />
+			<File RelativePath="..\..\engines\sci\engine\said.cpp" />
+			<File RelativePath="..\..\engines\sci\engine\savegame.cpp" />
+			<File RelativePath="..\..\engines\sci\engine\savegame.h" />
+			<File RelativePath="..\..\engines\sci\engine\script.h" />
+			<File RelativePath="..\..\engines\sci\engine\scriptdebug.cpp" />
+			<File RelativePath="..\..\engines\sci\engine\seg_manager.cpp" />
+			<File RelativePath="..\..\engines\sci\engine\seg_manager.h" />
+			<File RelativePath="..\..\engines\sci\engine\state.cpp" />
+			<File RelativePath="..\..\engines\sci\engine\state.h" />
+			<File RelativePath="..\..\engines\sci\engine\stringfrag.cpp" />
+			<File RelativePath="..\..\engines\sci\engine\vm.cpp" />
+			<File RelativePath="..\..\engines\sci\engine\vm.h" />
+			<File RelativePath="..\..\engines\sci\engine\vm_types.h" />
 		</Filter>
-		<Filter
-			Name="gfx"
-			>
-			<File
-				RelativePath="..\..\engines\sci\gfx\font.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\font.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_driver.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_driver.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_gui.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_gui.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_options.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_pixmap_scale.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_res_options.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_res_options.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_resmgr.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_resmgr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_resource.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_resource.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_state_internal.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_support.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_system.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_tools.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_tools.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_widgets.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_widgets.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\menubar.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\menubar.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\operations.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\operations.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\palette.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\palette.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\res_cursor.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\res_font.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\res_pal.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\res_pic.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\res_view.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\seq_decoder.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\seq_decoder.h"
-				>
-			</File>
+		<Filter	Name="gfx">
+			<File RelativePath="..\..\engines\sci\gfx\font.cpp" />
+			<File RelativePath="..\..\engines\sci\gfx\font.h" />
+			<File RelativePath="..\..\engines\sci\gfx\gfx_driver.cpp" />
+			<File RelativePath="..\..\engines\sci\gfx\gfx_driver.h" />
+			<File RelativePath="..\..\engines\sci\gfx\gfx_gui.cpp" />
+			<File RelativePath="..\..\engines\sci\gfx\gfx_gui.h" />
+			<File RelativePath="..\..\engines\sci\gfx\gfx_options.h" />
+			<File RelativePath="..\..\engines\sci\gfx\gfx_pixmap_scale.cpp" />
+			<File RelativePath="..\..\engines\sci\gfx\gfx_res_options.cpp" />
+			<File RelativePath="..\..\engines\sci\gfx\gfx_res_options.h" />
+			<File RelativePath="..\..\engines\sci\gfx\gfx_resmgr.cpp" />
+			<File RelativePath="..\..\engines\sci\gfx\gfx_resmgr.h" />
+			<File RelativePath="..\..\engines\sci\gfx\gfx_resource.cpp" />
+			<File RelativePath="..\..\engines\sci\gfx\gfx_resource.h" />
+			<File RelativePath="..\..\engines\sci\gfx\gfx_state_internal.h" />
+			<File RelativePath="..\..\engines\sci\gfx\gfx_support.cpp" />
+			<File RelativePath="..\..\engines\sci\gfx\gfx_system.h" />
+			<File RelativePath="..\..\engines\sci\gfx\gfx_tools.cpp" />
+			<File RelativePath="..\..\engines\sci\gfx\gfx_tools.h" />
+			<File RelativePath="..\..\engines\sci\gfx\gfx_widgets.cpp" />
+			<File RelativePath="..\..\engines\sci\gfx\gfx_widgets.h" />
+			<File RelativePath="..\..\engines\sci\gfx\menubar.cpp" />
+			<File RelativePath="..\..\engines\sci\gfx\menubar.h" />
+			<File RelativePath="..\..\engines\sci\gfx\operations.cpp" />
+			<File RelativePath="..\..\engines\sci\gfx\operations.h" />
+			<File RelativePath="..\..\engines\sci\gfx\palette.cpp" />
+			<File RelativePath="..\..\engines\sci\gfx\palette.h" />
+			<File RelativePath="..\..\engines\sci\gfx\res_cursor.cpp" />
+			<File RelativePath="..\..\engines\sci\gfx\res_font.cpp" />
+			<File RelativePath="..\..\engines\sci\gfx\res_pal.cpp" />
+			<File RelativePath="..\..\engines\sci\gfx\res_pic.cpp" />
+			<File RelativePath="..\..\engines\sci\gfx\res_view.cpp" />
+			<File RelativePath="..\..\engines\sci\gfx\seq_decoder.cpp" />
+			<File RelativePath="..\..\engines\sci\gfx\seq_decoder.h" />
 		</Filter>
-		<Filter
-			Name="sfx"
-			>
-			<File
-				RelativePath="..\..\engines\sci\sfx\core.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\core.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\device.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\iterator.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\iterator.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\iterator_internal.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\misc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\player.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\sci_midi.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\sequencer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\sfx_pcm.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\softseq.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\songlib.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\songlib.h"
-				>
-			</File>
-			<Filter
-				Name="softseq"
-				>
-				<File
-					RelativePath="..\..\engines\sci\sfx\softseq\adlib.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\engines\sci\sfx\softseq\adlib.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\engines\sci\sfx\softseq\amiga.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\engines\sci\sfx\softseq\pcjr.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\engines\sci\sfx\softseq\pcjr.h"
-					>
-				</File>
+		<Filter	Name="sfx">
+			<File RelativePath="..\..\engines\sci\sfx\core.cpp" />
+			<File RelativePath="..\..\engines\sci\sfx\core.h" />
+			<File RelativePath="..\..\engines\sci\sfx\device.h" />
+			<File RelativePath="..\..\engines\sci\sfx\iterator.cpp" />
+			<File RelativePath="..\..\engines\sci\sfx\iterator.h" />
+			<File RelativePath="..\..\engines\sci\sfx\iterator_internal.h" />
+			<File RelativePath="..\..\engines\sci\sfx\misc.h" />
+			<File RelativePath="..\..\engines\sci\sfx\player.h" />
+			<File RelativePath="..\..\engines\sci\sfx\sci_midi.h" />
+			<File RelativePath="..\..\engines\sci\sfx\sequencer.h" />
+			<File RelativePath="..\..\engines\sci\sfx\sfx_pcm.h" />
+			<File RelativePath="..\..\engines\sci\sfx\softseq.h" />
+			<File RelativePath="..\..\engines\sci\sfx\songlib.cpp" />
+			<File RelativePath="..\..\engines\sci\sfx\songlib.h" />
+			<Filter	Name="softseq">
+				<File RelativePath="..\..\engines\sci\sfx\softseq\adlib.cpp" />
+				<File RelativePath="..\..\engines\sci\sfx\softseq\adlib.h" />
+				<File RelativePath="..\..\engines\sci\sfx\softseq\amiga.cpp" />
+				<File RelativePath="..\..\engines\sci\sfx\softseq\pcjr.cpp" />
+				<File RelativePath="..\..\engines\sci\sfx\softseq\pcjr.h" />
 			</Filter>
-			<Filter
-				Name="seq"
-				>
-				<File
-					RelativePath="..\..\engines\sci\sfx\seq\sequencers.cpp"
-					>
-				</File>
+			<Filter	Name="seq">
+				<File RelativePath="..\..\engines\sci\sfx\seq\sequencers.cpp" />
 			</Filter>
 		</Filter>
-		<File
-			RelativePath="..\..\engines\sci\console.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\console.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\debug.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\decompressor.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\decompressor.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\detection.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\exereader.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\exereader.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\resource.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\resource.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\sci.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\sci.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\engine\script.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\tools.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\tools.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\uinput.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\vocabulary.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\vocabulary.h"
-			>
-		</File>
+		<File RelativePath="..\..\engines\sci\console.cpp" />
+		<File RelativePath="..\..\engines\sci\console.h" />
+		<File RelativePath="..\..\engines\sci\debug.h" />
+		<File RelativePath="..\..\engines\sci\decompressor.cpp" />
+		<File RelativePath="..\..\engines\sci\decompressor.h" />
+		<File RelativePath="..\..\engines\sci\detection.cpp" />
+		<File RelativePath="..\..\engines\sci\exereader.cpp" />
+		<File RelativePath="..\..\engines\sci\exereader.h" />
+		<File RelativePath="..\..\engines\sci\resource.cpp" />
+		<File RelativePath="..\..\engines\sci\resource.h" />
+		<File RelativePath="..\..\engines\sci\sci.cpp" />
+		<File RelativePath="..\..\engines\sci\sci.h" />
+		<File RelativePath="..\..\engines\sci\engine\script.cpp" />
+		<File RelativePath="..\..\engines\sci\tools.cpp" />
+		<File RelativePath="..\..\engines\sci\tools.h" />
+		<File RelativePath="..\..\engines\sci\uinput.h" />
+		<File RelativePath="..\..\engines\sci\vocabulary.cpp" />
+		<File RelativePath="..\..\engines\sci\vocabulary.h" />
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>
diff --git a/dists/msvc8/scumm.vcproj b/dists/msvc8/scumm.vcproj
index 8cc0ab9719..e99fdae790 100644
--- a/dists/msvc8/scumm.vcproj
+++ b/dists/msvc8/scumm.vcproj
@@ -8,837 +8,186 @@
 	Keyword="Win32Proj"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="scumm_Debug"
-			IntermediateDirectory="scumm_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;ENABLE_SCUMM_7_8;ENABLE_HE;USE_ZLIB;USE_MAD;USE_VORBIS;ENABLE_RGB_COLOR"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/scumm.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="scumm_Release"
-			IntermediateDirectory="scumm_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;ENABLE_SCUMM_7_8;ENABLE_HE;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/scumm.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
+		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
+		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
+
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<Filter
-			Name="smush"
-			>
-			<File
-				RelativePath="..\..\engines\scumm\smush\channel.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\channel.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\chunk_type.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\codec1.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\codec37.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\codec37.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\codec47.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\codec47.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\imuse_channel.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\saud_channel.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\smush_font.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\smush_font.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\smush_mixer.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\smush_mixer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\smush_player.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\smush_player.h"
-				>
-			</File>
+		<Filter Name="smush">
+			<File RelativePath="..\..\engines\scumm\smush\channel.cpp" />
+			<File RelativePath="..\..\engines\scumm\smush\channel.h" />
+			<File RelativePath="..\..\engines\scumm\smush\chunk_type.h" />
+			<File RelativePath="..\..\engines\scumm\smush\codec1.cpp" />
+			<File RelativePath="..\..\engines\scumm\smush\codec37.cpp" />
+			<File RelativePath="..\..\engines\scumm\smush\codec37.h" />
+			<File RelativePath="..\..\engines\scumm\smush\codec47.cpp" />
+			<File RelativePath="..\..\engines\scumm\smush\codec47.h" />
+			<File RelativePath="..\..\engines\scumm\smush\imuse_channel.cpp" />
+			<File RelativePath="..\..\engines\scumm\smush\saud_channel.cpp" />
+			<File RelativePath="..\..\engines\scumm\smush\smush_font.cpp" />
+			<File RelativePath="..\..\engines\scumm\smush\smush_font.h" />
+			<File RelativePath="..\..\engines\scumm\smush\smush_mixer.cpp" />
+			<File RelativePath="..\..\engines\scumm\smush\smush_mixer.h" />
+			<File RelativePath="..\..\engines\scumm\smush\smush_player.cpp" />
+			<File RelativePath="..\..\engines\scumm\smush\smush_player.h" />
 		</Filter>
-		<Filter
-			Name="imuse_digi"
-			>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_bndmgr.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_bndmgr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_codecs.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_music.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_script.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_sndmgr.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_sndmgr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_tables.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_tables.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_track.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_track.h"
-				>
-			</File>
+		<Filter Name="imuse_digi">
+			<File RelativePath="..\..\engines\scumm\imuse_digi\dimuse.cpp" />
+			<File RelativePath="..\..\engines\scumm\imuse_digi\dimuse.h" />
+			<File RelativePath="..\..\engines\scumm\imuse_digi\dimuse_bndmgr.cpp" />
+			<File RelativePath="..\..\engines\scumm\imuse_digi\dimuse_bndmgr.h" />
+			<File RelativePath="..\..\engines\scumm\imuse_digi\dimuse_codecs.cpp" />
+			<File RelativePath="..\..\engines\scumm\imuse_digi\dimuse_music.cpp" />
+			<File RelativePath="..\..\engines\scumm\imuse_digi\dimuse_script.cpp" />
+			<File RelativePath="..\..\engines\scumm\imuse_digi\dimuse_sndmgr.cpp" />
+			<File RelativePath="..\..\engines\scumm\imuse_digi\dimuse_sndmgr.h" />
+			<File RelativePath="..\..\engines\scumm\imuse_digi\dimuse_tables.cpp" />
+			<File RelativePath="..\..\engines\scumm\imuse_digi\dimuse_tables.h" />
+			<File RelativePath="..\..\engines\scumm\imuse_digi\dimuse_track.cpp" />
+			<File RelativePath="..\..\engines\scumm\imuse_digi\dimuse_track.h" />
 		</Filter>
-		<Filter
-			Name="insane"
-			>
-			<File
-				RelativePath="..\..\engines\scumm\insane\insane.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\insane\insane.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\insane\insane_ben.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\insane\insane_enemy.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\insane\insane_iact.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\insane\insane_scenes.cpp"
-				>
-			</File>
+		<Filter Name="insane">
+			<File RelativePath="..\..\engines\scumm\insane\insane.cpp" />
+			<File RelativePath="..\..\engines\scumm\insane\insane.h" />
+			<File RelativePath="..\..\engines\scumm\insane\insane_ben.cpp" />
+			<File RelativePath="..\..\engines\scumm\insane\insane_enemy.cpp" />
+			<File RelativePath="..\..\engines\scumm\insane\insane_iact.cpp" />
+			<File RelativePath="..\..\engines\scumm\insane\insane_scenes.cpp" />
 		</Filter>
-		<Filter
-			Name="he"
-			>
-			<File
-				RelativePath="..\..\engines\scumm\he\animation_he.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\animation_he.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\cup_player_he.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\cup_player_he.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\floodfill_he.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\floodfill_he.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\intern_he.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\logic_he.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\logic_he.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\palette_he.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\resource_he.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\resource_he.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\script_v100he.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\script_v60he.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\script_v70he.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\script_v71he.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\script_v72he.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\script_v80he.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\script_v90he.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\sound_he.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\sound_he.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\sprite_he.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\sprite_he.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\wiz_he.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\wiz_he.h"
-				>
-			</File>
+		<Filter Name="he">
+			<File RelativePath="..\..\engines\scumm\he\animation_he.cpp" />
+			<File RelativePath="..\..\engines\scumm\he\animation_he.h" />
+			<File RelativePath="..\..\engines\scumm\he\cup_player_he.cpp" />
+			<File RelativePath="..\..\engines\scumm\he\cup_player_he.h" />
+			<File RelativePath="..\..\engines\scumm\he\floodfill_he.cpp" />
+			<File RelativePath="..\..\engines\scumm\he\floodfill_he.h" />
+			<File RelativePath="..\..\engines\scumm\he\intern_he.h" />
+			<File RelativePath="..\..\engines\scumm\he\logic_he.cpp" />
+			<File RelativePath="..\..\engines\scumm\he\logic_he.h" />
+			<File RelativePath="..\..\engines\scumm\he\palette_he.cpp" />
+			<File RelativePath="..\..\engines\scumm\he\resource_he.cpp" />
+			<File RelativePath="..\..\engines\scumm\he\resource_he.h" />
+			<File RelativePath="..\..\engines\scumm\he\script_v100he.cpp" />
+			<File RelativePath="..\..\engines\scumm\he\script_v60he.cpp" />
+			<File RelativePath="..\..\engines\scumm\he\script_v70he.cpp" />
+			<File RelativePath="..\..\engines\scumm\he\script_v71he.cpp" />
+			<File RelativePath="..\..\engines\scumm\he\script_v72he.cpp" />
+			<File RelativePath="..\..\engines\scumm\he\script_v80he.cpp" />
+			<File RelativePath="..\..\engines\scumm\he\script_v90he.cpp" />
+			<File RelativePath="..\..\engines\scumm\he\sound_he.cpp" />
+			<File RelativePath="..\..\engines\scumm\he\sound_he.h" />
+			<File RelativePath="..\..\engines\scumm\he\sprite_he.cpp" />
+			<File RelativePath="..\..\engines\scumm\he\sprite_he.h" />
+			<File RelativePath="..\..\engines\scumm\he\wiz_he.cpp" />
+			<File RelativePath="..\..\engines\scumm\he\wiz_he.h" />
 		</Filter>
-		<Filter
-			Name="imuse"
-			>
-			<File
-				RelativePath="..\..\engines\scumm\imuse\imuse.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse\imuse.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse\imuse_internal.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse\imuse_part.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse\imuse_player.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse\instrument.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse\instrument.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse\sysex.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse\sysex_samnmax.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse\sysex_scumm.cpp"
-				>
-			</File>
+		<Filter Name="imuse">
+			<File RelativePath="..\..\engines\scumm\imuse\imuse.cpp" />
+			<File RelativePath="..\..\engines\scumm\imuse\imuse.h" />
+			<File RelativePath="..\..\engines\scumm\imuse\imuse_internal.h" />
+			<File RelativePath="..\..\engines\scumm\imuse\imuse_part.cpp" />
+			<File RelativePath="..\..\engines\scumm\imuse\imuse_player.cpp" />
+			<File RelativePath="..\..\engines\scumm\imuse\instrument.cpp" />
+			<File RelativePath="..\..\engines\scumm\imuse\instrument.h" />
+			<File RelativePath="..\..\engines\scumm\imuse\sysex.h" />
+			<File RelativePath="..\..\engines\scumm\imuse\sysex_samnmax.cpp" />
+			<File RelativePath="..\..\engines\scumm\imuse\sysex_scumm.cpp" />
 		</Filter>
-		<File
-			RelativePath="..\..\engines\scumm\actor.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\actor.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\akos.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\akos.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\base-costume.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\base-costume.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\bomp.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\bomp.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\boxes.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\boxes.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\camera.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\charset-fontdata.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\charset.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\charset.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\costume.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\costume.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\cursor.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\debugger.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\debugger.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\detection.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\detection.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\detection_tables.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\dialogs.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\dialogs.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\file.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\file.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\file_nes.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\file_nes.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\gfx.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\gfx.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\help.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\help.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\input.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\intern.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\midiparser_eup.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\midiparser_ro.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\music.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\nut_renderer.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\nut_renderer.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\object.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\object.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\palette.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_mod.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_mod.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_nes.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_nes.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_v1.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_v1.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_v2.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_v2a.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_v2a.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_v2cms.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_v3a.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_v3a.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\resource.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\resource.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\resource_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\resource_v3.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\resource_v4.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\room.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\saveload.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\saveload.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\script.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\script.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\script_v0.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\script_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\script_v3.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\script_v4.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\script_v5.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\script_v6.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\script_v8.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\scumm-md5.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\scumm.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\scumm.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\scumm_v0.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\scumm_v2.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\scumm_v3.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\scumm_v4.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\scumm_v5.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\scumm_v6.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\scumm_v7.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\scumm_v8.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\sound.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\sound.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\string.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\usage_bits.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\usage_bits.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\util.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\util.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\vars.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\verbs.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\verbs.h"
-			>
-		</File>
+		<File RelativePath="..\..\engines\scumm\actor.cpp" />
+		<File RelativePath="..\..\engines\scumm\actor.h" />
+		<File RelativePath="..\..\engines\scumm\akos.cpp" />
+		<File RelativePath="..\..\engines\scumm\akos.h" />
+		<File RelativePath="..\..\engines\scumm\base-costume.cpp" />
+		<File RelativePath="..\..\engines\scumm\base-costume.h" />
+		<File RelativePath="..\..\engines\scumm\bomp.cpp" />
+		<File RelativePath="..\..\engines\scumm\bomp.h" />
+		<File RelativePath="..\..\engines\scumm\boxes.cpp" />
+		<File RelativePath="..\..\engines\scumm\boxes.h" />
+		<File RelativePath="..\..\engines\scumm\camera.cpp" />
+		<File RelativePath="..\..\engines\scumm\charset-fontdata.cpp" />
+		<File RelativePath="..\..\engines\scumm\charset.cpp" />
+		<File RelativePath="..\..\engines\scumm\charset.h" />
+		<File RelativePath="..\..\engines\scumm\costume.cpp" />
+		<File RelativePath="..\..\engines\scumm\costume.h" />
+		<File RelativePath="..\..\engines\scumm\cursor.cpp" />
+		<File RelativePath="..\..\engines\scumm\debugger.cpp" />
+		<File RelativePath="..\..\engines\scumm\debugger.h" />
+		<File RelativePath="..\..\engines\scumm\detection.cpp" />
+		<File RelativePath="..\..\engines\scumm\detection.h" />
+		<File RelativePath="..\..\engines\scumm\detection_tables.h" />
+		<File RelativePath="..\..\engines\scumm\dialogs.cpp" />
+		<File RelativePath="..\..\engines\scumm\dialogs.h" />
+		<File RelativePath="..\..\engines\scumm\file.cpp" />
+		<File RelativePath="..\..\engines\scumm\file.h" />
+		<File RelativePath="..\..\engines\scumm\file_nes.cpp" />
+		<File RelativePath="..\..\engines\scumm\file_nes.h" />
+		<File RelativePath="..\..\engines\scumm\gfx.cpp" />
+		<File RelativePath="..\..\engines\scumm\gfx.h" />
+		<File RelativePath="..\..\engines\scumm\help.cpp" />
+		<File RelativePath="..\..\engines\scumm\help.h" />
+		<File RelativePath="..\..\engines\scumm\input.cpp" />
+		<File RelativePath="..\..\engines\scumm\intern.h" />
+		<File RelativePath="..\..\engines\scumm\midiparser_eup.cpp" />
+		<File RelativePath="..\..\engines\scumm\midiparser_ro.cpp" />
+		<File RelativePath="..\..\engines\scumm\music.h" />
+		<File RelativePath="..\..\engines\scumm\nut_renderer.cpp" />
+		<File RelativePath="..\..\engines\scumm\nut_renderer.h" />
+		<File RelativePath="..\..\engines\scumm\object.cpp" />
+		<File RelativePath="..\..\engines\scumm\object.h" />
+		<File RelativePath="..\..\engines\scumm\palette.cpp" />
+		<File RelativePath="..\..\engines\scumm\player_mod.cpp" />
+		<File RelativePath="..\..\engines\scumm\player_mod.h" />
+		<File RelativePath="..\..\engines\scumm\player_nes.cpp" />
+		<File RelativePath="..\..\engines\scumm\player_nes.h" />
+		<File RelativePath="..\..\engines\scumm\player_v1.cpp" />
+		<File RelativePath="..\..\engines\scumm\player_v1.h" />
+		<File RelativePath="..\..\engines\scumm\player_v2.cpp" />
+		<File RelativePath="..\..\engines\scumm\player_v2.h" />
+		<File RelativePath="..\..\engines\scumm\player_v2a.cpp" />
+		<File RelativePath="..\..\engines\scumm\player_v2a.h" />
+		<File RelativePath="..\..\engines\scumm\player_v2cms.cpp" />
+		<File RelativePath="..\..\engines\scumm\player_v3a.cpp" />
+		<File RelativePath="..\..\engines\scumm\player_v3a.h" />
+		<File RelativePath="..\..\engines\scumm\resource.cpp" />
+		<File RelativePath="..\..\engines\scumm\resource.h" />
+		<File RelativePath="..\..\engines\scumm\resource_v2.cpp" />
+		<File RelativePath="..\..\engines\scumm\resource_v3.cpp" />
+		<File RelativePath="..\..\engines\scumm\resource_v4.cpp" />
+		<File RelativePath="..\..\engines\scumm\room.cpp" />
+		<File RelativePath="..\..\engines\scumm\saveload.cpp" />
+		<File RelativePath="..\..\engines\scumm\saveload.h" />
+		<File RelativePath="..\..\engines\scumm\script.cpp" />
+		<File RelativePath="..\..\engines\scumm\script.h" />
+		<File RelativePath="..\..\engines\scumm\script_v0.cpp" />
+		<File RelativePath="..\..\engines\scumm\script_v2.cpp" />
+		<File RelativePath="..\..\engines\scumm\script_v3.cpp" />
+		<File RelativePath="..\..\engines\scumm\script_v4.cpp" />
+		<File RelativePath="..\..\engines\scumm\script_v5.cpp" />
+		<File RelativePath="..\..\engines\scumm\script_v6.cpp" />
+		<File RelativePath="..\..\engines\scumm\script_v8.cpp" />
+		<File RelativePath="..\..\engines\scumm\scumm-md5.h" />
+		<File RelativePath="..\..\engines\scumm\scumm.cpp" />
+		<File RelativePath="..\..\engines\scumm\scumm.h" />
+		<File RelativePath="..\..\engines\scumm\scumm_v0.h" />
+		<File RelativePath="..\..\engines\scumm\scumm_v2.h" />
+		<File RelativePath="..\..\engines\scumm\scumm_v3.h" />
+		<File RelativePath="..\..\engines\scumm\scumm_v4.h" />
+		<File RelativePath="..\..\engines\scumm\scumm_v5.h" />
+		<File RelativePath="..\..\engines\scumm\scumm_v6.h" />
+		<File RelativePath="..\..\engines\scumm\scumm_v7.h" />
+		<File RelativePath="..\..\engines\scumm\scumm_v8.h" />
+		<File RelativePath="..\..\engines\scumm\sound.cpp" />
+		<File RelativePath="..\..\engines\scumm\sound.h" />
+		<File RelativePath="..\..\engines\scumm\string.cpp" />
+		<File RelativePath="..\..\engines\scumm\usage_bits.cpp" />
+		<File RelativePath="..\..\engines\scumm\usage_bits.h" />
+		<File RelativePath="..\..\engines\scumm\util.cpp" />
+		<File RelativePath="..\..\engines\scumm\util.h" />
+		<File RelativePath="..\..\engines\scumm\vars.cpp" />
+		<File RelativePath="..\..\engines\scumm\verbs.cpp" />
+		<File RelativePath="..\..\engines\scumm\verbs.h" />
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>
diff --git a/dists/msvc8/scummvm.sln b/dists/msvc8/scummvm.sln
index 6c5bee71e4..810ce8498c 100644
--- a/dists/msvc8/scummvm.sln
+++ b/dists/msvc8/scummvm.sln
@@ -1,5 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
+# Visual Studio 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scummvm", "scummvm.vcproj", "{8434CB15-D08F-427D-9E6D-581AE5B28440}"
 	ProjectSection(ProjectDependencies) = postProject
 		{8863B00B-059A-471E-876D-A955ECEFD0D2} = {8863B00B-059A-471E-876D-A955ECEFD0D2}
diff --git a/dists/msvc8/scummvm.vcproj b/dists/msvc8/scummvm.vcproj
index 1cd4682c3f..ab89c8d91f 100644
--- a/dists/msvc8/scummvm.vcproj
+++ b/dists/msvc8/scummvm.vcproj
@@ -8,990 +8,209 @@
 	Keyword="Win32Proj"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="scummvm_Debug"
-			IntermediateDirectory="scummvm_Debug"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_NASM;USE_MT32EMU;ENABLE_AGI;ENABLE_AGOS;ENABLE_CINE;ENABLE_CRUISE;ENABLE_DRASCULA;ENABLE_GOB;ENABLE_IGOR;ENABLE_KYRA;ENABLE_LURE;ENABLE_M4;ENABLE_MADE;ENABLE_PARALLACTION;ENABLE_QUEEN;ENABLE_SAGA;ENABLE_IHNM;ENABLE_SAGA2;ENABLE_SCI;ENABLE_SCUMM;ENABLE_SKY;ENABLE_SWORD1;ENABLE_SWORD2;ENABLE_TOUCHE;ENABLE_SCUMM_7_8;ENABLE_HE;ENABLE_TINSEL;ENABLE_TUCKER;ENABLE_GROOVIE;ENABLE_RGB_COLOR"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib sdl.lib zlib.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib sword1_debug/sword1.lib sword2_debug/sword2.lib lure_debug/lure.lib cine_debug/cine.lib cruise_debug/cruise.lib igor_debug/igor.lib kyra_debug/kyra.lib gob_debug/gob.lib queen_debug/queen.lib saga_debug/saga.lib agi_debug/agi.lib scumm_debug/scumm.lib agos_debug/agos.lib drascula_debug/drascula.lib sky_debug/sky.lib sci_debug/sci.lib parallaction_debug/parallaction.lib m4_debug/m4.lib made_debug/made.lib tinsel_Debug/tinsel.lib tucker_Debug/tucker.lib groovie_Debug/groovie.lib"
-				OutputFile="$(OutDir)/scummvm.exe"
-				LinkIncremental="2"
-				IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/scummvm.pdb"
-				SubSystem="1"
-				EntryPointSymbol="WinMainCRTStartup"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
+		<Configuration Name="Debug|Win32" ConfigurationType="1" InheritedPropertySheets=".\ScummVM_Debug.vsprops">
+			<Tool	Name="VCLinkerTool" OutputFile="$(OutDir)/scummvm.exe"
+				AdditionalDependencies="winmm.lib sdl.lib zlib.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib $(OutDir)/*.lib"
 			/>
 		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="scummvm_Release"
-			IntermediateDirectory="scummvm_Release"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_MT32EMU;ENABLE_AGI;ENABLE_AGOS;ENABLE_CINE;ENABLE_CRUISE;ENABLE_DRASCULA;ENABLE_GOB;ENABLE_IGOR;ENABLE_KYRA;ENABLE_LURE;ENABLE_M4;ENABLE_MADE;ENABLE_PARALLACTION;ENABLE_QUEEN;ENABLE_SAGA;ENABLE_IHNM;ENABLE_SAGA2;ENABLE_SCI;ENABLE_SCUMM;ENABLE_SKY;ENABLE_SWORD1;ENABLE_SWORD2;ENABLE_TOUCHE;ENABLE_SCUMM_7_8;ENABLE_HE;ENABLE_TINSEL;ENABLE_TUCKER;ENABLE_GROOVIE"
-				StringPooling="true"
-				MinimalRebuild="false"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib sdl.lib zlib.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib saga_release/saga.lib agi_release/agi.lib sword1_release/sword1.lib sword2_release/sword2.lib lure_release/lure.lib cine_release/cine.lib cruise_release/cruise.lib igor_release/igor.lib kyra_release/kyra.lib gob_release/gob.lib queen_release/queen.lib scumm_release/scumm.lib agos_release/agos.lib sky_release/sky.lib sci_release/sci.lib drascula_release/drascula.lib parallaction_release/parallaction.lib m4_release/m4.lib made_release/made.lib tinsel_release/tinsel.lib tucker_release/tucker.lib groovie_release/groovie.lib"
-				OutputFile="$(OutDir)/scummvm.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				IgnoreDefaultLibraryNames="libc.lib"
-				GenerateDebugInformation="false"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				EntryPointSymbol="WinMainCRTStartup"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
+		<Configuration Name="Release|Win32" ConfigurationType="1" InheritedPropertySheets=".\ScummVM_Release.vsprops">
+			<Tool Name="VCLinkerTool" OutputFile="$(OutDir)/scummvm.exe"
+				AdditionalDependencies="winmm.lib sdl.lib zlib.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib $(OutDir)/*.lib"
 			/>
 		</Configuration>
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<Filter
-			Name="base"
-			>
-			<File
-				RelativePath="..\..\base\commandLine.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\base\commandLine.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\base\internal_version.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\base\main.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\base\main.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\base\plugins.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\base\plugins.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\base\version.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\base\version.h"
-				>
-			</File>
+		<Filter	Name="base">
+			<File RelativePath="..\..\base\commandLine.cpp" />
+			<File RelativePath="..\..\base\commandLine.h" />
+			<File RelativePath="..\..\base\internal_version.h" />
+			<File RelativePath="..\..\base\main.cpp" />
+			<File RelativePath="..\..\base\main.h" />
+			<File RelativePath="..\..\base\plugins.cpp" />
+			<File RelativePath="..\..\base\plugins.h" />
+			<File RelativePath="..\..\base\version.cpp" />
+			<File RelativePath="..\..\base\version.h" />
 		</Filter>
-		<Filter
-			Name="common"
-			>
-			<File
-				RelativePath="..\..\common\algorithm.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\archive.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\archive.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\array.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\config-file.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\config-file.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\config-manager.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\config-manager.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\debug.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\debug.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\endian.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\error.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\events.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\file.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\file.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\frac.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\fs.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\fs.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\func.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\hash-str.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\hashmap.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\hashmap.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\iff_container.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\keyboard.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\list.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\list_intern.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\md5.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\md5.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\memorypool.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\memorypool.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\mutex.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\mutex.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\noncopyable.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\pack-end.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\pack-start.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\ptr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\queue.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\rect.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\savefile.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\scummsys.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\serializer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\singleton.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\stack.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\str.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\str.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\stream.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\stream.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\system.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\system.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\timer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\unarj.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\unarj.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\unzip.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\unzip.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\util.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\util.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\xmlparser.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\xmlparser.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\zlib.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\zlib.h"
-				>
-			</File>
+		<Filter	Name="common">
+			<File RelativePath="..\..\common\algorithm.h" />
+			<File RelativePath="..\..\common\archive.cpp" />
+			<File RelativePath="..\..\common\archive.h" />
+			<File RelativePath="..\..\common\array.h" />
+			<File RelativePath="..\..\common\config-file.cpp" />
+			<File RelativePath="..\..\common\config-file.h" />
+			<File RelativePath="..\..\common\config-manager.cpp" />
+			<File RelativePath="..\..\common\config-manager.h" />
+			<File RelativePath="..\..\common\debug.cpp" />
+			<File RelativePath="..\..\common\debug.h" />
+			<File RelativePath="..\..\common\endian.h" />
+			<File RelativePath="..\..\common\error.h" />
+			<File RelativePath="..\..\common\events.h" />
+			<File RelativePath="..\..\common\file.cpp" />
+			<File RelativePath="..\..\common\file.h" />
+			<File RelativePath="..\..\common\frac.h" />
+			<File RelativePath="..\..\common\fs.cpp" />
+			<File RelativePath="..\..\common\fs.h" />
+			<File RelativePath="..\..\common\func.h" />
+			<File RelativePath="..\..\common\hash-str.h" />
+			<File RelativePath="..\..\common\hashmap.cpp" />
+			<File RelativePath="..\..\common\hashmap.h" />
+			<File RelativePath="..\..\common\iff_container.h" />
+			<File RelativePath="..\..\common\keyboard.h" />
+			<File RelativePath="..\..\common\list.h" />
+			<File RelativePath="..\..\common\list_intern.h" />
+			<File RelativePath="..\..\common\md5.cpp" />
+			<File RelativePath="..\..\common\md5.h" />
+			<File RelativePath="..\..\common\memorypool.cpp" />
+			<File RelativePath="..\..\common\memorypool.h" />
+			<File RelativePath="..\..\common\mutex.cpp" />
+			<File RelativePath="..\..\common\mutex.h" />
+			<File RelativePath="..\..\common\noncopyable.h" />
+			<File RelativePath="..\..\common\pack-end.h" />
+			<File RelativePath="..\..\common\pack-start.h" />
+			<File RelativePath="..\..\common\ptr.h" />
+			<File RelativePath="..\..\common\queue.h" />
+			<File RelativePath="..\..\common\rect.h" />
+			<File RelativePath="..\..\common\savefile.h" />
+			<File RelativePath="..\..\common\scummsys.h" />
+			<File RelativePath="..\..\common\serializer.h" />
+			<File RelativePath="..\..\common\singleton.h" />
+			<File RelativePath="..\..\common\stack.h" />
+			<File RelativePath="..\..\common\str.cpp" />
+			<File RelativePath="..\..\common\str.h" />
+			<File RelativePath="..\..\common\stream.cpp" />
+			<File RelativePath="..\..\common\stream.h" />
+			<File RelativePath="..\..\common\system.cpp" />
+			<File RelativePath="..\..\common\system.h" />
+			<File RelativePath="..\..\common\timer.h" />
+			<File RelativePath="..\..\common\unarj.cpp" />
+			<File RelativePath="..\..\common\unarj.h" />
+			<File RelativePath="..\..\common\unzip.cpp" />
+			<File RelativePath="..\..\common\unzip.h" />
+			<File RelativePath="..\..\common\util.cpp" />
+			<File RelativePath="..\..\common\util.h" />
+			<File RelativePath="..\..\common\xmlparser.cpp" />
+			<File RelativePath="..\..\common\xmlparser.h" />
+			<File RelativePath="..\..\common\zlib.cpp" />
+			<File RelativePath="..\..\common\zlib.h" />
 		</Filter>
-		<Filter
-			Name="sound"
-			>
-			<File
-				RelativePath="..\..\sound\adpcm.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\adpcm.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\aiff.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\aiff.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\audiocd.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\audiocd.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\audiostream.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\audiostream.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\flac.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\flac.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\fmopl.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\fmopl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\iff.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\sound\iff.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\mididrv.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\mididrv.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\midiparser.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\midiparser.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\midiparser_smf.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\midiparser_xmidi.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\mixer.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\mixer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\mixer_intern.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\mp3.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\mp3.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\mpu401.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\mpu401.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\musicplugin.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\musicplugin.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\null.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\rate.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\rate.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\shorten.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\shorten.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\timestamp.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\timestamp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\vag.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\vag.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\voc.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\voc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\vorbis.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\vorbis.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\wave.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\wave.h"
-				>
-			</File>
-			<Filter
-				Name="softhsynth"
-				>
-				<File
-					RelativePath="..\..\sound\softsynth\adlib.cpp"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\sound\softsynth\emumidi.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\sound\softsynth\fluidsynth.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\sound\softsynth\mt32.cpp"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\sound\softsynth\pcspk.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\sound\softsynth\pcspk.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\sound\softsynth\ym2612.cpp"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\sound\softsynth\ym2612.h"
-					>
-				</File>
-				<Filter
-					Name="mt32"
-					>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\freeverb.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\freeverb.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\i386.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\i386.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\mt32_file.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\mt32_file.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\mt32emu.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\part.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\part.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\partial.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\partial.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\partialManager.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\partialManager.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\structures.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\synth.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\synth.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\tables.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\tables.h"
-						>
-					</File>
+		<Filter	Name="sound">
+			<File RelativePath="..\..\sound\adpcm.cpp" />
+			<File RelativePath="..\..\sound\adpcm.h" />
+			<File RelativePath="..\..\sound\aiff.cpp" />
+			<File RelativePath="..\..\sound\aiff.h" />
+			<File RelativePath="..\..\sound\audiocd.cpp" />
+			<File RelativePath="..\..\sound\audiocd.h" />
+			<File RelativePath="..\..\sound\audiostream.cpp" />
+			<File RelativePath="..\..\sound\audiostream.h" />
+			<File RelativePath="..\..\sound\flac.cpp" />
+			<File RelativePath="..\..\sound\flac.h" />
+			<File RelativePath="..\..\sound\fmopl.cpp" />
+			<File RelativePath="..\..\sound\fmopl.h" />
+			<File RelativePath="..\..\sound\iff_sound.cpp" />
+			<File RelativePath="..\..\sound\iff_sound.h" />
+			<File RelativePath="..\..\sound\mididrv.cpp" />
+			<File RelativePath="..\..\sound\mididrv.h" />
+			<File RelativePath="..\..\sound\midiparser.cpp" />
+			<File RelativePath="..\..\sound\midiparser.h" />
+			<File RelativePath="..\..\sound\midiparser_smf.cpp" />
+			<File RelativePath="..\..\sound\midiparser_xmidi.cpp" />
+			<File RelativePath="..\..\sound\mixer.cpp" />
+			<File RelativePath="..\..\sound\mixer.h" />
+			<File RelativePath="..\..\sound\mixer_intern.h" />
+			<File RelativePath="..\..\sound\mp3.cpp" />
+			<File RelativePath="..\..\sound\mp3.h" />
+			<File RelativePath="..\..\sound\mpu401.cpp" />
+			<File RelativePath="..\..\sound\mpu401.h" />
+			<File RelativePath="..\..\sound\musicplugin.cpp" />
+			<File RelativePath="..\..\sound\musicplugin.h" />
+			<File RelativePath="..\..\sound\null.cpp" />
+			<File RelativePath="..\..\sound\rate.cpp" />
+			<File RelativePath="..\..\sound\rate.h" />
+			<File RelativePath="..\..\sound\shorten.cpp" />
+			<File RelativePath="..\..\sound\shorten.h" />
+			<File RelativePath="..\..\sound\timestamp.cpp" />
+			<File RelativePath="..\..\sound\timestamp.h" />
+			<File RelativePath="..\..\sound\vag.cpp" />
+			<File RelativePath="..\..\sound\vag.h" />
+			<File RelativePath="..\..\sound\voc.cpp" />
+			<File RelativePath="..\..\sound\voc.h" />
+			<File RelativePath="..\..\sound\vorbis.cpp" />
+			<File RelativePath="..\..\sound\vorbis.h" />
+			<File RelativePath="..\..\sound\wave.cpp" />
+			<File RelativePath="..\..\sound\wave.h" />
+			<Filter Name="softhsynth">
+				<File	RelativePath="..\..\sound\softsynth\adlib.cpp" />
+				<File RelativePath="..\..\sound\softsynth\emumidi.h" />
+				<File RelativePath="..\..\sound\softsynth\fluidsynth.cpp" />
+				<File RelativePath="..\..\sound\softsynth\mt32.cpp" />
+				<File RelativePath="..\..\sound\softsynth\pcspk.cpp" />
+				<File RelativePath="..\..\sound\softsynth\pcspk.h" />
+				<File RelativePath="..\..\sound\softsynth\ym2612.cpp" />
+				<File RelativePath="..\..\sound\softsynth\ym2612.h" />
+				<Filter	Name="mt32">
+					<File RelativePath="..\..\sound\softsynth\mt32\freeverb.cpp" />
+					<File RelativePath="..\..\sound\softsynth\mt32\freeverb.h" />
+					<File RelativePath="..\..\sound\softsynth\mt32\i386.cpp" />
+					<File RelativePath="..\..\sound\softsynth\mt32\i386.h" />
+					<File RelativePath="..\..\sound\softsynth\mt32\mt32_file.cpp" />
+					<File RelativePath="..\..\sound\softsynth\mt32\mt32_file.h" />
+					<File RelativePath="..\..\sound\softsynth\mt32\mt32emu.h" />
+					<File RelativePath="..\..\sound\softsynth\mt32\part.cpp" />
+					<File RelativePath="..\..\sound\softsynth\mt32\part.h" />
+					<File RelativePath="..\..\sound\softsynth\mt32\partial.cpp" />
+					<File RelativePath="..\..\sound\softsynth\mt32\partial.h" />
+					<File RelativePath="..\..\sound\softsynth\mt32\partialManager.cpp" />
+					<File RelativePath="..\..\sound\softsynth\mt32\partialManager.h" />
+					<File RelativePath="..\..\sound\softsynth\mt32\structures.h" />
+					<File RelativePath="..\..\sound\softsynth\mt32\synth.cpp" />
+					<File RelativePath="..\..\sound\softsynth\mt32\synth.h" />
+					<File RelativePath="..\..\sound\softsynth\mt32\tables.cpp" />
+					<File RelativePath="..\..\sound\softsynth\mt32\tables.h" />
 				</Filter>
-				<Filter
-					Name="opl"
-					>
-					<File
-						RelativePath="..\..\sound\softsynth\opl\dosbox.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\opl\dosbox.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\opl\mame.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\opl\mame.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\opl\opl_impl.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\opl\opl_inc.h"
-						>
-					</File>
+				<Filter Name="opl">
+					<File RelativePath="..\..\sound\softsynth\opl\dosbox.cpp" />
+					<File RelativePath="..\..\sound\softsynth\opl\dosbox.h" />
+					<File RelativePath="..\..\sound\softsynth\opl\mame.cpp" />
+					<File RelativePath="..\..\sound\softsynth\opl\mame.h" />
+					<File RelativePath="..\..\sound\softsynth\opl\opl_impl.h" />
+					<File RelativePath="..\..\sound\softsynth\opl\opl_inc.h" />
 				</Filter>
 			</Filter>
-			<Filter
-				Name="mods"
-				>
-				<File
-					RelativePath="..\..\sound\mods\infogrames.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\sound\mods\infogrames.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\sound\mods\module.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\sound\mods\module.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\sound\mods\paula.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\sound\mods\paula.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\sound\mods\protracker.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\sound\mods\protracker.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\sound\mods\rjp1.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\sound\mods\rjp1.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\sound\mods\soundfx.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\sound\mods\soundfx.h"
-					>
-				</File>
+			<Filter Name="mods">
+				<File RelativePath="..\..\sound\mods\infogrames.cpp" />
+				<File RelativePath="..\..\sound\mods\infogrames.h" />
+				<File RelativePath="..\..\sound\mods\module.cpp" />
+				<File RelativePath="..\..\sound\mods\module.h" />
+				<File RelativePath="..\..\sound\mods\paula.cpp" />
+				<File RelativePath="..\..\sound\mods\paula.h" />
+				<File RelativePath="..\..\sound\mods\protracker.cpp" />
+				<File RelativePath="..\..\sound\mods\protracker.h" />
+				<File RelativePath="..\..\sound\mods\rjp1.cpp" />
+				<File RelativePath="..\..\sound\mods\rjp1.h" />
+				<File RelativePath="..\..\sound\mods\soundfx.cpp" />
+				<File RelativePath="..\..\sound\mods\soundfx.h" />
 			</Filter>
 		</Filter>
-		<Filter
-			Name="txt"
-			>
-			<File
-				RelativePath="..\..\COPYING"
-				>
-			</File>
-			<File
-				RelativePath="..\..\NEWS"
-				>
-			</File>
-			<File
-				RelativePath="..\..\README"
-				>
-			</File>
-			<File
-				RelativePath="..\..\TODO"
-				>
-			</File>
+		<Filter Name="txt">
+			<File RelativePath="..\..\COPYING" />
+			<File RelativePath="..\..\NEWS" />
+			<File RelativePath="..\..\README" />
+			<File RelativePath="..\..\TODO" />
 		</Filter>
-		<Filter
-			Name="rsc"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-			>
-			<File
-				RelativePath="..\..\icons\scummvm.ico"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dists\scummvm.rc"
-				>
-			</File>
+		<Filter Name="rsc">
+			<File RelativePath="..\..\icons\scummvm.ico" />
+			<File RelativePath="..\..\dists\scummvm.rc" />
 		</Filter>
-		<Filter
-			Name="backends"
-			>
-			<File
-				RelativePath="..\..\backends\base-backend.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\backends\base-backend.h"
-				>
-			</File>
-			<Filter
-				Name="sdl"
-				>
-				<File
-					RelativePath="..\..\backends\platform\sdl\events.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\platform\sdl\graphics.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\platform\sdl\hardwarekeys.cpp"
-					>
-				</File>
+		<Filter Name="backends">
+			<File RelativePath="..\..\backends\base-backend.cpp" />
+			<File RelativePath="..\..\backends\base-backend.h" />
+			<Filter Name="sdl">
+				<File RelativePath="..\..\backends\platform\sdl\events.cpp" />
+				<File RelativePath="..\..\backends\platform\sdl\graphics.cpp" />
+				<File RelativePath="..\..\backends\platform\sdl\hardwarekeys.cpp" />
 				<File
 					RelativePath="..\..\backends\platform\sdl\main.cpp"
 					>
@@ -1014,565 +233,156 @@
 						/>
 					</FileConfiguration>
 				</File>
-				<File
-					RelativePath="..\..\backends\platform\sdl\sdl.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\platform\sdl\sdl.h"
-					>
-				</File>
+				<File RelativePath="..\..\backends\platform\sdl\sdl.cpp" />
+				<File RelativePath="..\..\backends\platform\sdl\sdl.h" />
 			</Filter>
-			<Filter
-				Name="fs"
-				>
-				<File
-					RelativePath="..\..\backends\fs\abstract-fs.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\fs\abstract-fs.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\fs\fs-factory.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\fs\stdiostream.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\fs\stdiostream.h"
-					>
-				</File>
-				<Filter
-					Name="windows"
-					>
-					<File
-						RelativePath="..\..\backends\fs\windows\windows-fs-factory.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\backends\fs\windows\windows-fs-factory.h"
-						>
-					</File>
+			<Filter Name="fs">
+				<File RelativePath="..\..\backends\fs\abstract-fs.cpp" />
+				<File RelativePath="..\..\backends\fs\abstract-fs.h" />
+				<File RelativePath="..\..\backends\fs\fs-factory.h" />
+				<File RelativePath="..\..\backends\fs\stdiostream.cpp" />
+				<File RelativePath="..\..\backends\fs\stdiostream.h" />
+				<Filter Name="windows">
+					<File RelativePath="..\..\backends\fs\windows\windows-fs-factory.cpp" />
+					<File RelativePath="..\..\backends\fs\windows\windows-fs-factory.h" />
 				</Filter>
 			</Filter>
-			<Filter
-				Name="midi"
-				>
-				<File
-					RelativePath="..\..\backends\midi\windows.cpp"
-					>
-				</File>
+			<Filter Name="midi">
+				<File RelativePath="..\..\backends\midi\windows.cpp" />
 			</Filter>
-			<Filter
-				Name="timer"
-				>
-				<File
-					RelativePath="..\..\backends\timer\default\default-timer.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\timer\default\default-timer.h"
-					>
-				</File>
+			<Filter Name="timer">
+				<File RelativePath="..\..\backends\timer\default\default-timer.cpp" />
+				<File RelativePath="..\..\backends\timer\default\default-timer.h" />
 			</Filter>
-			<Filter
-				Name="saves"
-				>
-				<File
-					RelativePath="..\..\backends\saves\default\default-saves.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\saves\default\default-saves.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\saves\savefile.cpp"
-					>
-				</File>
+			<Filter Name="saves">
+				<File RelativePath="..\..\backends\saves\default\default-saves.cpp" />
+				<File RelativePath="..\..\backends\saves\default\default-saves.h" />
+				<File RelativePath="..\..\backends\saves\savefile.cpp" />
 			</Filter>
-			<Filter
-				Name="events"
-				>
-				<Filter
-					Name="default"
-					>
-					<File
-						RelativePath="..\..\backends\events\default\default-events.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\backends\events\default\default-events.h"
-						>
-					</File>
+			<Filter Name="events">
+				<Filter Name="default">
+					<File RelativePath="..\..\backends\events\default\default-events.cpp" />
+					<File RelativePath="..\..\backends\events\default\default-events.h" />
 				</Filter>
 			</Filter>
-			<Filter
-				Name="keymapper"
-				>
-				<File
-					RelativePath="..\..\backends\keymapper\action.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\keymapper\action.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\keymapper\hardware-key.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\keymapper\keymap.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\keymapper\keymap.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\keymapper\keymapper.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\keymapper\keymapper.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\keymapper\remap-dialog.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\keymapper\remap-dialog.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\keymapper\types.h"
-					>
-				</File>
+			<Filter Name="keymapper">
+				<File RelativePath="..\..\backends\keymapper\action.cpp" />
+				<File RelativePath="..\..\backends\keymapper\action.h" />
+				<File RelativePath="..\..\backends\keymapper\hardware-key.h" />
+				<File RelativePath="..\..\backends\keymapper\keymap.cpp" />
+				<File RelativePath="..\..\backends\keymapper\keymap.h" />
+				<File RelativePath="..\..\backends\keymapper\keymapper.cpp" />
+				<File RelativePath="..\..\backends\keymapper\keymapper.h" />
+				<File RelativePath="..\..\backends\keymapper\remap-dialog.cpp" />
+				<File RelativePath="..\..\backends\keymapper\remap-dialog.h" />
+				<File RelativePath="..\..\backends\keymapper\types.h" />
 			</Filter>
-			<Filter
-				Name="vkeybd"
-				>
-				<File
-					RelativePath="..\..\backends\vkeybd\image-map.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\vkeybd\image-map.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\vkeybd\keycode-descriptions.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\vkeybd\polygon.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\vkeybd\polygon.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\vkeybd\virtual-keyboard-gui.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\vkeybd\virtual-keyboard-gui.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\vkeybd\virtual-keyboard-parser.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\vkeybd\virtual-keyboard-parser.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\vkeybd\virtual-keyboard.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\vkeybd\virtual-keyboard.h"
-					>
-				</File>
+			<Filter Name="vkeybd">
+				<File RelativePath="..\..\backends\vkeybd\image-map.cpp" />
+				<File RelativePath="..\..\backends\vkeybd\image-map.h" />
+				<File RelativePath="..\..\backends\vkeybd\keycode-descriptions.h" />
+				<File RelativePath="..\..\backends\vkeybd\polygon.cpp" />
+				<File RelativePath="..\..\backends\vkeybd\polygon.h" />
+				<File RelativePath="..\..\backends\vkeybd\virtual-keyboard-gui.cpp" />
+				<File RelativePath="..\..\backends\vkeybd\virtual-keyboard-gui.h" />
+				<File RelativePath="..\..\backends\vkeybd\virtual-keyboard-parser.cpp" />
+				<File RelativePath="..\..\backends\vkeybd\virtual-keyboard-parser.h" />
+				<File RelativePath="..\..\backends\vkeybd\virtual-keyboard.cpp" />
+				<File RelativePath="..\..\backends\vkeybd\virtual-keyboard.h" />
 			</Filter>
 		</Filter>
-		<Filter
-			Name="gui"
-			>
-			<File
-				RelativePath="..\..\gui\about.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\about.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\browser.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\browser.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\chooser.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\chooser.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\console.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\console.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\credits.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\debugger.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\debugger.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\dialog.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\dialog.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\editable.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\editable.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\EditTextWidget.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\EditTextWidget.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\GuiManager.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\GuiManager.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\Key.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\Key.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\launcher.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\launcher.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\ListWidget.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\ListWidget.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\massadd.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\massadd.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\message.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\message.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\object.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\object.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\options.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\options.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\PopUpWidget.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\PopUpWidget.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\saveload.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\saveload.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\ScrollBarWidget.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\ScrollBarWidget.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\TabWidget.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\TabWidget.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\themebrowser.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\themebrowser.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\ThemeEngine.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\ThemeEngine.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\ThemeEval.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\ThemeLayout.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\ThemeLayout.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\ThemeParser.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\ThemeParser.h"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\gui\widget.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\widget.h"
-				>
-			</File>
+		<Filter Name="gui">
+			<File RelativePath="..\..\gui\about.cpp" />
+			<File RelativePath="..\..\gui\about.h" />
+			<File RelativePath="..\..\gui\browser.cpp" />
+			<File RelativePath="..\..\gui\browser.h" />
+			<File RelativePath="..\..\gui\chooser.cpp" />
+			<File RelativePath="..\..\gui\chooser.h" />
+			<File RelativePath="..\..\gui\console.cpp" />
+			<File RelativePath="..\..\gui\console.h" />
+			<File RelativePath="..\..\gui\credits.h" />
+			<File RelativePath="..\..\gui\debugger.cpp" />
+			<File RelativePath="..\..\gui\debugger.h" />
+			<File RelativePath="..\..\gui\dialog.cpp" />
+			<File RelativePath="..\..\gui\dialog.h" />
+			<File RelativePath="..\..\gui\editable.cpp" />
+			<File RelativePath="..\..\gui\editable.h" />
+			<File RelativePath="..\..\gui\EditTextWidget.cpp" />
+			<File RelativePath="..\..\gui\EditTextWidget.h" />
+			<File RelativePath="..\..\gui\GuiManager.cpp" />
+			<File RelativePath="..\..\gui\GuiManager.h" />
+			<File RelativePath="..\..\gui\Key.cpp" />
+			<File RelativePath="..\..\gui\Key.h" />
+			<File RelativePath="..\..\gui\launcher.cpp" />
+			<File RelativePath="..\..\gui\launcher.h" />
+			<File RelativePath="..\..\gui\ListWidget.cpp" />
+			<File RelativePath="..\..\gui\ListWidget.h" />
+			<File RelativePath="..\..\gui\massadd.cpp" />
+			<File RelativePath="..\..\gui\massadd.h" />
+			<File RelativePath="..\..\gui\message.cpp" />
+			<File RelativePath="..\..\gui\message.h" />
+			<File RelativePath="..\..\gui\object.cpp" />
+			<File RelativePath="..\..\gui\object.h" />
+			<File RelativePath="..\..\gui\options.cpp" />
+			<File RelativePath="..\..\gui\options.h" />
+			<File RelativePath="..\..\gui\PopUpWidget.cpp" />
+			<File RelativePath="..\..\gui\PopUpWidget.h" />
+			<File RelativePath="..\..\gui\saveload.cpp" />
+			<File RelativePath="..\..\gui\saveload.h" />
+			<File RelativePath="..\..\gui\ScrollBarWidget.cpp" />
+			<File RelativePath="..\..\gui\ScrollBarWidget.h" />
+			<File RelativePath="..\..\gui\TabWidget.cpp" />
+			<File RelativePath="..\..\gui\TabWidget.h" />
+			<File RelativePath="..\..\gui\themebrowser.cpp" />
+			<File RelativePath="..\..\gui\themebrowser.h" />
+			<File RelativePath="..\..\gui\ThemeEngine.cpp" />
+			<File RelativePath="..\..\gui\ThemeEngine.h" />
+			<File RelativePath="..\..\gui\ThemeEval.cpp" />
+			<File RelativePath="..\..\gui\ThemeLayout.cpp" />
+			<File RelativePath="..\..\gui\ThemeLayout.h" />
+			<File RelativePath="..\..\gui\ThemeParser.cpp" />
+			<File RelativePath="..\..\gui\ThemeParser.h" />
+			<File RelativePath="..\..\gui\widget.cpp" />
+			<File RelativePath="..\..\gui\widget.h" />
 		</Filter>
-		<Filter
-			Name="graphics"
-			>
-			<File
-				RelativePath="..\..\graphics\colormasks.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\conversion.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\conversion.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\cursorman.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\cursorman.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\dither.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\dither.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\font.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\font.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\fontman.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\fontman.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\iff.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\iff.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\imagedec.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\imagedec.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\jpeg.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\jpeg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\pixelformat.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\primitives.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\primitives.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\scaler.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\scaler.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\sjis.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\sjis.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\surface.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\surface.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\thumbnail.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\thumbnail.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\VectorRenderer.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\VectorRenderer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\VectorRendererSpec.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\VectorRendererSpec.h"
-				>
-			</File>
-			<Filter
-				Name="scaler"
-				>
-				<File
-					RelativePath="..\..\graphics\scaler\2xsai.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\graphics\scaler\aspect.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\graphics\scaler\hq2x.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\graphics\scaler\hq2x.h"
-					>
-				</File>
+		<Filter Name="graphics">
+			<File RelativePath="..\..\graphics\colormasks.h" />
+			<File RelativePath="..\..\graphics\conversion.cpp" />
+			<File RelativePath="..\..\graphics\conversion.h" />
+			<File RelativePath="..\..\graphics\cursorman.cpp" />
+			<File RelativePath="..\..\graphics\cursorman.h" />
+			<File RelativePath="..\..\graphics\dither.cpp" />
+			<File RelativePath="..\..\graphics\dither.h" />
+			<File RelativePath="..\..\graphics\font.cpp" />
+			<File RelativePath="..\..\graphics\font.h" />
+			<File RelativePath="..\..\graphics\fontman.cpp" />
+			<File RelativePath="..\..\graphics\fontman.h" />
+			<File RelativePath="..\..\graphics\iff.cpp" />
+			<File RelativePath="..\..\graphics\iff.h" />
+			<File RelativePath="..\..\graphics\jpeg.cpp" />
+			<File RelativePath="..\..\graphics\jpeg.h" />
+			<File RelativePath="..\..\graphics\imagedec.cpp" />
+			<File RelativePath="..\..\graphics\imagedec.h" />
+			<File RelativePath="..\..\graphics\pixelformat.h" />
+			<File RelativePath="..\..\graphics\primitives.cpp" />
+			<File RelativePath="..\..\graphics\primitives.h" />
+			<File RelativePath="..\..\graphics\scaler.cpp" />
+			<File RelativePath="..\..\graphics\scaler.h" />
+			<File RelativePath="..\..\graphics\sjis.cpp" />
+			<File RelativePath="..\..\graphics\sjis.h" />
+			<File RelativePath="..\..\graphics\surface.cpp" />
+			<File RelativePath="..\..\graphics\surface.h" />
+			<File RelativePath="..\..\graphics\thumbnail.cpp" />
+			<File RelativePath="..\..\graphics\thumbnail.h" />
+			<File RelativePath="..\..\graphics\VectorRenderer.cpp" />
+			<File RelativePath="..\..\graphics\VectorRenderer.h" />
+			<File RelativePath="..\..\graphics\VectorRendererSpec.cpp" />
+			<File RelativePath="..\..\graphics\VectorRendererSpec.h" />
+			<Filter Name="scaler">
+				<File RelativePath="..\..\graphics\scaler\2xsai.cpp" />
+				<File RelativePath="..\..\graphics\scaler\aspect.cpp" />
+				<File RelativePath="..\..\graphics\scaler\hq2x.cpp" />
+				<File RelativePath="..\..\graphics\scaler\hq2x.h" />
 				<File
 					RelativePath="..\..\graphics\scaler\hq2x_i386.asm"
 					>
@@ -1595,14 +405,8 @@
 						/>
 					</FileConfiguration>
 				</File>
-				<File
-					RelativePath="..\..\graphics\scaler\hq3x.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\graphics\scaler\hq3x.h"
-					>
-				</File>
+				<File RelativePath="..\..\graphics\scaler\hq3x.cpp" />
+				<File RelativePath="..\..\graphics\scaler\hq3x.h" />
 				<File
 					RelativePath="..\..\graphics\scaler\hq3x_i386.asm"
 					>
@@ -1625,169 +429,51 @@
 						/>
 					</FileConfiguration>
 				</File>
-				<File
-					RelativePath="..\..\graphics\scaler\intern.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\graphics\scaler\scale2x.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\graphics\scaler\scale2x.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\graphics\scaler\scale3x.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\graphics\scaler\scale3x.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\graphics\scaler\scalebit.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\graphics\scaler\scalebit.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\graphics\scaler\thumbnail_intern.cpp"
-					>
-				</File>
+				<File RelativePath="..\..\graphics\scaler\intern.h" />
+				<File RelativePath="..\..\graphics\scaler\scale2x.cpp" />
+				<File RelativePath="..\..\graphics\scaler\scale2x.h" />
+				<File RelativePath="..\..\graphics\scaler\scale3x.cpp" />
+				<File RelativePath="..\..\graphics\scaler\scale3x.h" />
+				<File RelativePath="..\..\graphics\scaler\scalebit.cpp" />
+				<File RelativePath="..\..\graphics\scaler\scalebit.h" />
+				<File RelativePath="..\..\graphics\scaler\thumbnail_intern.cpp" />
 			</Filter>
-			<Filter
-				Name="fonts"
-				>
-				<File
-					RelativePath="..\..\graphics\fonts\consolefont.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\graphics\fonts\newfont.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\graphics\fonts\newfont_big.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\graphics\fonts\scummfont.cpp"
-					>
-				</File>
+			<Filter Name="fonts">
+				<File RelativePath="..\..\graphics\fonts\consolefont.cpp" />
+				<File RelativePath="..\..\graphics\fonts\newfont.cpp" />
+				<File RelativePath="..\..\graphics\fonts\newfont_big.cpp" />
+				<File RelativePath="..\..\graphics\fonts\scummfont.cpp" />
 			</Filter>
-			<Filter
-				Name="video"
-				>
-				<File
-					RelativePath="..\..\graphics\video\dxa_decoder.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\graphics\video\dxa_decoder.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\graphics\video\flic_decoder.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\graphics\video\flic_decoder.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\graphics\video\mpeg_player.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\graphics\video\mpeg_player.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\graphics\video\smk_decoder.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\graphics\video\smk_decoder.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\graphics\video\video_player.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\graphics\video\video_player.h"
-					>
-				</File>
-				<Filter
-					Name="coktelvideo"
-					>
-					<File
-						RelativePath="..\..\graphics\video\coktelvideo\coktelvideo.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\graphics\video\coktelvideo\coktelvideo.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\graphics\video\coktelvideo\indeo3.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\graphics\video\coktelvideo\indeo3.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\graphics\video\coktelvideo\indeo3data.h"
-						>
-					</File>
+			<Filter Name="video">
+				<File RelativePath="..\..\graphics\video\dxa_decoder.cpp" />
+				<File RelativePath="..\..\graphics\video\dxa_decoder.h" />
+				<File RelativePath="..\..\graphics\video\flic_decoder.cpp" />
+				<File RelativePath="..\..\graphics\video\flic_decoder.h" />
+				<File RelativePath="..\..\graphics\video\mpeg_player.cpp" />
+				<File RelativePath="..\..\graphics\video\mpeg_player.h" />
+				<File RelativePath="..\..\graphics\video\smk_decoder.cpp" />
+				<File RelativePath="..\..\graphics\video\smk_decoder.h" />
+				<File RelativePath="..\..\graphics\video\video_player.cpp" />
+				<File RelativePath="..\..\graphics\video\video_player.h" />
+				<Filter Name="coktelvideo">
+					<File RelativePath="..\..\graphics\video\coktelvideo\coktelvideo.cpp" />
+					<File RelativePath="..\..\graphics\video\coktelvideo\coktelvideo.h" />
+					<File RelativePath="..\..\graphics\video\coktelvideo\indeo3.cpp" />
+					<File RelativePath="..\..\graphics\video\coktelvideo\indeo3.h" />
+					<File RelativePath="..\..\graphics\video\coktelvideo\indeo3data.h" />
 				</Filter>
 			</Filter>
 		</Filter>
-		<Filter
-			Name="engines"
-			>
-			<File
-				RelativePath="..\..\engines\advancedDetector.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\advancedDetector.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\dialogs.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\dialogs.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\engine.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\engine.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\game.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\game.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\metaengine.h"
-				>
-			</File>
+		<Filter Name="engines">
+			<File RelativePath="..\..\engines\advancedDetector.cpp" />
+			<File RelativePath="..\..\engines\advancedDetector.h" />
+			<File RelativePath="..\..\engines\dialogs.cpp" />
+			<File RelativePath="..\..\engines\dialogs.h" />
+			<File RelativePath="..\..\engines\engine.cpp" />
+			<File RelativePath="..\..\engines\engine.h" />
+			<File RelativePath="..\..\engines\game.cpp" />
+			<File RelativePath="..\..\engines\game.h" />
+			<File RelativePath="..\..\engines\metaengine.h" />
 		</Filter>
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>
diff --git a/dists/msvc8/sky.vcproj b/dists/msvc8/sky.vcproj
index 5a91684f7c..5a9b6117d3 100644
--- a/dists/msvc8/sky.vcproj
+++ b/dists/msvc8/sky.vcproj
@@ -8,345 +8,58 @@
 	Keyword="Win32Proj"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="sky_Debug"
-			IntermediateDirectory="sky_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/sky.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="sky_Release"
-			IntermediateDirectory="sky_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/sky.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
+		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
+		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<Filter
-			Name="music"
-			>
-			<File
-				RelativePath="..\..\engines\sky\music\adlibchannel.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sky\music\adlibchannel.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sky\music\adlibmusic.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sky\music\adlibmusic.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sky\music\gmchannel.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sky\music\gmchannel.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sky\music\gmmusic.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sky\music\gmmusic.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sky\music\mt32music.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sky\music\mt32music.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sky\music\musicbase.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sky\music\musicbase.h"
-				>
-			</File>
+		<Filter	Name="music">
+			<File RelativePath="..\..\engines\sky\music\adlibchannel.cpp" />
+			<File RelativePath="..\..\engines\sky\music\adlibchannel.h" />
+			<File RelativePath="..\..\engines\sky\music\adlibmusic.cpp" />
+			<File RelativePath="..\..\engines\sky\music\adlibmusic.h" />
+			<File RelativePath="..\..\engines\sky\music\gmchannel.cpp" />
+			<File RelativePath="..\..\engines\sky\music\gmchannel.h" />
+			<File RelativePath="..\..\engines\sky\music\gmmusic.cpp" />
+			<File RelativePath="..\..\engines\sky\music\gmmusic.h" />
+			<File RelativePath="..\..\engines\sky\music\mt32music.cpp" />
+			<File RelativePath="..\..\engines\sky\music\mt32music.h" />
+			<File RelativePath="..\..\engines\sky\music\musicbase.cpp" />
+			<File RelativePath="..\..\engines\sky\music\musicbase.h" />
 		</Filter>
-		<File
-			RelativePath="..\..\engines\sky\autoroute.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\autoroute.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\compact.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\compact.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\control.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\control.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\debug.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\debug.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\detection.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\disk.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\disk.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\grid.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\grid.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\hufftext.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\intro.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\intro.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\logic.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\logic.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\mouse.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\mouse.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\rnc_deco.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\rnc_deco.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\screen.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\screen.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\sky.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\sky.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\skydefs.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\sound.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\sound.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\struc.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\text.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\text.h"
-			>
-		</File>
+		<File RelativePath="..\..\engines\sky\autoroute.cpp" />
+		<File RelativePath="..\..\engines\sky\autoroute.h" />
+		<File RelativePath="..\..\engines\sky\compact.cpp" />
+		<File RelativePath="..\..\engines\sky\compact.h" />
+		<File RelativePath="..\..\engines\sky\control.cpp" />
+		<File RelativePath="..\..\engines\sky\control.h" />
+		<File RelativePath="..\..\engines\sky\debug.cpp" />
+		<File RelativePath="..\..\engines\sky\debug.h" />
+		<File RelativePath="..\..\engines\sky\detection.cpp" />
+		<File RelativePath="..\..\engines\sky\disk.cpp" />
+		<File RelativePath="..\..\engines\sky\disk.h" />
+		<File RelativePath="..\..\engines\sky\grid.cpp" />
+		<File RelativePath="..\..\engines\sky\grid.h" />
+		<File RelativePath="..\..\engines\sky\hufftext.cpp" />
+		<File RelativePath="..\..\engines\sky\intro.cpp" />
+		<File RelativePath="..\..\engines\sky\intro.h" />
+		<File RelativePath="..\..\engines\sky\logic.cpp" />
+		<File RelativePath="..\..\engines\sky\logic.h" />
+		<File RelativePath="..\..\engines\sky\mouse.cpp" />
+		<File RelativePath="..\..\engines\sky\mouse.h" />
+		<File RelativePath="..\..\engines\sky\rnc_deco.cpp" />
+		<File RelativePath="..\..\engines\sky\rnc_deco.h" />
+		<File RelativePath="..\..\engines\sky\screen.cpp" />
+		<File RelativePath="..\..\engines\sky\screen.h" />
+		<File RelativePath="..\..\engines\sky\sky.cpp" />
+		<File RelativePath="..\..\engines\sky\sky.h" />
+		<File RelativePath="..\..\engines\sky\skydefs.h" />
+		<File RelativePath="..\..\engines\sky\sound.cpp" />
+		<File RelativePath="..\..\engines\sky\sound.h" />
+		<File RelativePath="..\..\engines\sky\struc.h" />
+		<File RelativePath="..\..\engines\sky\text.cpp" />
+		<File RelativePath="..\..\engines\sky\text.h" />
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>
diff --git a/dists/msvc8/sword1.vcproj b/dists/msvc8/sword1.vcproj
index b21f4ec22b..e09577e5c5 100644
--- a/dists/msvc8/sword1.vcproj
+++ b/dists/msvc8/sword1.vcproj
@@ -8,317 +8,50 @@
 	Keyword="Win32Proj"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="sword1_Debug"
-			IntermediateDirectory="sword1_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/sword1.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="sword1_Release"
-			IntermediateDirectory="sword1_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/sword1.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
+		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
+		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<File
-			RelativePath="..\..\engines\sword1\animation.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\animation.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\collision.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\control.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\control.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\debug.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\debug.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\detection.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\eventman.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\eventman.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\logic.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\logic.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\memman.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\memman.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\menu.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\menu.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\mouse.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\mouse.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\music.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\music.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\object.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\objectman.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\objectman.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\resman.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\resman.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\router.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\router.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\screen.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\screen.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\sound.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\sound.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\staticres.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\sword1.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\sword1.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\sworddefs.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\swordres.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\text.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\text.h"
-			>
-		</File>
+		<File RelativePath="..\..\engines\sword1\animation.cpp" />
+		<File RelativePath="..\..\engines\sword1\animation.h" />
+		<File RelativePath="..\..\engines\sword1\collision.h" />
+		<File RelativePath="..\..\engines\sword1\control.cpp" />
+		<File RelativePath="..\..\engines\sword1\control.h" />
+		<File RelativePath="..\..\engines\sword1\debug.cpp" />
+		<File RelativePath="..\..\engines\sword1\debug.h" />
+		<File RelativePath="..\..\engines\sword1\detection.cpp" />
+		<File RelativePath="..\..\engines\sword1\eventman.cpp" />
+		<File RelativePath="..\..\engines\sword1\eventman.h" />
+		<File RelativePath="..\..\engines\sword1\logic.cpp" />
+		<File RelativePath="..\..\engines\sword1\logic.h" />
+		<File RelativePath="..\..\engines\sword1\memman.cpp" />
+		<File RelativePath="..\..\engines\sword1\memman.h" />
+		<File RelativePath="..\..\engines\sword1\menu.cpp" />
+		<File RelativePath="..\..\engines\sword1\menu.h" />
+		<File RelativePath="..\..\engines\sword1\mouse.cpp" />
+		<File RelativePath="..\..\engines\sword1\mouse.h" />
+		<File RelativePath="..\..\engines\sword1\music.cpp" />
+		<File RelativePath="..\..\engines\sword1\music.h" />
+		<File RelativePath="..\..\engines\sword1\object.h" />
+		<File RelativePath="..\..\engines\sword1\objectman.cpp" />
+		<File RelativePath="..\..\engines\sword1\objectman.h" />
+		<File RelativePath="..\..\engines\sword1\resman.cpp" />
+		<File RelativePath="..\..\engines\sword1\resman.h" />
+		<File RelativePath="..\..\engines\sword1\router.cpp" />
+		<File RelativePath="..\..\engines\sword1\router.h" />
+		<File RelativePath="..\..\engines\sword1\screen.cpp" />
+		<File RelativePath="..\..\engines\sword1\screen.h" />
+		<File RelativePath="..\..\engines\sword1\sound.cpp" />
+		<File RelativePath="..\..\engines\sword1\sound.h" />
+		<File RelativePath="..\..\engines\sword1\staticres.cpp" />
+		<File RelativePath="..\..\engines\sword1\sword1.cpp" />
+		<File RelativePath="..\..\engines\sword1\sword1.h" />
+		<File RelativePath="..\..\engines\sword1\sworddefs.h" />
+		<File RelativePath="..\..\engines\sword1\swordres.h" />
+		<File RelativePath="..\..\engines\sword1\text.cpp" />
+		<File RelativePath="..\..\engines\sword1\text.h" />
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>
diff --git a/dists/msvc8/sword2.vcproj b/dists/msvc8/sword2.vcproj
index b90f38be9f..d0cbe3d639 100644
--- a/dists/msvc8/sword2.vcproj
+++ b/dists/msvc8/sword2.vcproj
@@ -8,361 +8,61 @@
 	Keyword="Win32Proj"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="sword2_Debug"
-			IntermediateDirectory="sword2_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/sword2.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="sword2_Release"
-			IntermediateDirectory="sword2_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/sword2.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
+		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
+		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<File
-			RelativePath="..\..\engines\sword2\animation.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\animation.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\anims.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\console.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\console.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\controls.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\controls.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\debug.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\debug.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\defs.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\events.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\function.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\header.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\icons.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\interpreter.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\interpreter.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\layers.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\logic.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\logic.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\maketext.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\maketext.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\memory.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\memory.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\menu.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\mouse.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\mouse.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\music.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\object.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\palette.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\protocol.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\render.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\resman.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\resman.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\router.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\router.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\saveload.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\saveload.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\screen.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\screen.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\scroll.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\sound.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\sound.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\speech.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\sprite.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\startup.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\sword2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\sword2.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\sync.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\walker.cpp"
-			>
-		</File>
+		<File RelativePath="..\..\engines\sword2\animation.cpp" />
+		<File RelativePath="..\..\engines\sword2\animation.h" />
+		<File RelativePath="..\..\engines\sword2\anims.cpp" />
+		<File RelativePath="..\..\engines\sword2\console.cpp" />
+		<File RelativePath="..\..\engines\sword2\console.h" />
+		<File RelativePath="..\..\engines\sword2\controls.cpp" />
+		<File RelativePath="..\..\engines\sword2\controls.h" />
+		<File RelativePath="..\..\engines\sword2\debug.cpp" />
+		<File RelativePath="..\..\engines\sword2\debug.h" />
+		<File RelativePath="..\..\engines\sword2\defs.h" />
+		<File RelativePath="..\..\engines\sword2\events.cpp" />
+		<File RelativePath="..\..\engines\sword2\function.cpp" />
+		<File RelativePath="..\..\engines\sword2\header.h" />
+		<File RelativePath="..\..\engines\sword2\icons.cpp" />
+		<File RelativePath="..\..\engines\sword2\interpreter.cpp" />
+		<File RelativePath="..\..\engines\sword2\interpreter.h" />
+		<File RelativePath="..\..\engines\sword2\layers.cpp" />
+		<File RelativePath="..\..\engines\sword2\logic.cpp" />
+		<File RelativePath="..\..\engines\sword2\logic.h" />
+		<File RelativePath="..\..\engines\sword2\maketext.cpp" />
+		<File RelativePath="..\..\engines\sword2\maketext.h" />
+		<File RelativePath="..\..\engines\sword2\memory.cpp" />
+		<File RelativePath="..\..\engines\sword2\memory.h" />
+		<File RelativePath="..\..\engines\sword2\menu.cpp" />
+		<File RelativePath="..\..\engines\sword2\mouse.cpp" />
+		<File RelativePath="..\..\engines\sword2\mouse.h" />
+		<File RelativePath="..\..\engines\sword2\music.cpp" />
+		<File RelativePath="..\..\engines\sword2\object.h" />
+		<File RelativePath="..\..\engines\sword2\palette.cpp" />
+		<File RelativePath="..\..\engines\sword2\protocol.cpp" />
+		<File RelativePath="..\..\engines\sword2\render.cpp" />
+		<File RelativePath="..\..\engines\sword2\resman.cpp" />
+		<File RelativePath="..\..\engines\sword2\resman.h" />
+		<File RelativePath="..\..\engines\sword2\router.cpp" />
+		<File RelativePath="..\..\engines\sword2\router.h" />
+		<File RelativePath="..\..\engines\sword2\saveload.cpp" />
+		<File RelativePath="..\..\engines\sword2\saveload.h" />
+		<File RelativePath="..\..\engines\sword2\screen.cpp" />
+		<File RelativePath="..\..\engines\sword2\screen.h" />
+		<File RelativePath="..\..\engines\sword2\scroll.cpp" />
+		<File RelativePath="..\..\engines\sword2\sound.cpp" />
+		<File RelativePath="..\..\engines\sword2\sound.h" />
+		<File RelativePath="..\..\engines\sword2\speech.cpp" />
+		<File RelativePath="..\..\engines\sword2\sprite.cpp" />
+		<File RelativePath="..\..\engines\sword2\startup.cpp" />
+		<File RelativePath="..\..\engines\sword2\sword2.cpp" />
+		<File RelativePath="..\..\engines\sword2\sword2.h" />
+		<File RelativePath="..\..\engines\sword2\sync.cpp" />
+		<File RelativePath="..\..\engines\sword2\walker.cpp" />
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>
diff --git a/dists/msvc8/tinsel.vcproj b/dists/msvc8/tinsel.vcproj
index b14cf9735a..07f3975a6e 100644
--- a/dists/msvc8/tinsel.vcproj
+++ b/dists/msvc8/tinsel.vcproj
@@ -8,513 +8,101 @@
 	Keyword="Win32Proj"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="tinsel_Debug"
-			IntermediateDirectory="tinsel_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/tinsel.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="tinsel_Release"
-			IntermediateDirectory="tinsel_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/tinsel.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops">
+			<Tool Name="VCCLCompilerTool" DebugInformationFormat="3" />
 		</Configuration>
+		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<File
-			RelativePath="..\..\engines\tinsel\actors.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\actors.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\anim.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\anim.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\background.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\background.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\bg.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\bmv.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\cliprect.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\cliprect.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\config.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\config.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\coroutine.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\cursor.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\cursor.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\debugger.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\debugger.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\detection.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\dialogs.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\dialogs.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\drives.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\drives.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\dw.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\effect.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\events.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\events.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\faders.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\faders.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\film.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\font.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\font.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\graphics.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\graphics.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\handle.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\handle.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\heapmem.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\heapmem.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\mareels.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\mareels.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\move.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\move.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\multiobj.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\multiobj.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\music.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\music.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\object.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\object.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\palette.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\palette.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\pcode.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\pcode.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\pdisplay.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\pdisplay.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\pid.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\play.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\play.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\polygons.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\polygons.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\rince.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\rince.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\saveload.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\savescn.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\savescn.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\scene.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\scene.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\sched.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\sched.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\scn.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\scn.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\scroll.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\scroll.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\sound.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\sound.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\strres.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\strres.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\sysvar.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\sysvar.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\text.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\text.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\timers.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\timers.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\tinlib.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\tinlib.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\tinsel.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\tinsel.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\token.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\token.h"
-			>
-		</File>
+		<File RelativePath="..\..\engines\tinsel\actors.cpp" />
+		<File RelativePath="..\..\engines\tinsel\actors.h" />
+		<File RelativePath="..\..\engines\tinsel\anim.cpp" />
+		<File RelativePath="..\..\engines\tinsel\anim.h" />
+		<File RelativePath="..\..\engines\tinsel\background.cpp" />
+		<File RelativePath="..\..\engines\tinsel\background.h" />
+		<File RelativePath="..\..\engines\tinsel\bg.cpp" />
+		<File RelativePath="..\..\engines\tinsel\bmv.cpp" />
+		<File RelativePath="..\..\engines\tinsel\cliprect.cpp" />
+		<File RelativePath="..\..\engines\tinsel\cliprect.h" />
+		<File RelativePath="..\..\engines\tinsel\config.cpp" />
+		<File RelativePath="..\..\engines\tinsel\config.h" />
+		<File RelativePath="..\..\engines\tinsel\coroutine.h" />
+		<File RelativePath="..\..\engines\tinsel\cursor.cpp" />
+		<File RelativePath="..\..\engines\tinsel\cursor.h" />
+		<File RelativePath="..\..\engines\tinsel\debugger.cpp" />
+		<File RelativePath="..\..\engines\tinsel\debugger.h" />
+		<File RelativePath="..\..\engines\tinsel\detection.cpp" />
+		<File RelativePath="..\..\engines\tinsel\dialogs.cpp" />
+		<File RelativePath="..\..\engines\tinsel\dialogs.h" />
+		<File RelativePath="..\..\engines\tinsel\drives.cpp" />
+		<File RelativePath="..\..\engines\tinsel\drives.h" />
+		<File RelativePath="..\..\engines\tinsel\dw.h" />
+		<File RelativePath="..\..\engines\tinsel\effect.cpp" />
+		<File RelativePath="..\..\engines\tinsel\events.cpp" />
+		<File RelativePath="..\..\engines\tinsel\events.h" />
+		<File RelativePath="..\..\engines\tinsel\faders.cpp" />
+		<File RelativePath="..\..\engines\tinsel\faders.h" />
+		<File RelativePath="..\..\engines\tinsel\film.h" />
+		<File RelativePath="..\..\engines\tinsel\font.cpp" />
+		<File RelativePath="..\..\engines\tinsel\font.h" />
+		<File RelativePath="..\..\engines\tinsel\graphics.cpp" />
+		<File RelativePath="..\..\engines\tinsel\graphics.h" />
+		<File RelativePath="..\..\engines\tinsel\handle.cpp" />
+		<File RelativePath="..\..\engines\tinsel\handle.h" />
+		<File RelativePath="..\..\engines\tinsel\heapmem.cpp" />
+		<File RelativePath="..\..\engines\tinsel\heapmem.h" />
+		<File RelativePath="..\..\engines\tinsel\mareels.cpp" />
+		<File RelativePath="..\..\engines\tinsel\mareels.h" />
+		<File RelativePath="..\..\engines\tinsel\move.cpp" />
+		<File RelativePath="..\..\engines\tinsel\move.h" />
+		<File RelativePath="..\..\engines\tinsel\multiobj.cpp" />
+		<File RelativePath="..\..\engines\tinsel\multiobj.h" />
+		<File RelativePath="..\..\engines\tinsel\music.cpp" />
+		<File RelativePath="..\..\engines\tinsel\music.h" />
+		<File RelativePath="..\..\engines\tinsel\object.cpp" />
+		<File RelativePath="..\..\engines\tinsel\object.h" />
+		<File RelativePath="..\..\engines\tinsel\palette.cpp" />
+		<File RelativePath="..\..\engines\tinsel\palette.h" />
+		<File RelativePath="..\..\engines\tinsel\pcode.cpp" />
+		<File RelativePath="..\..\engines\tinsel\pcode.h" />
+		<File RelativePath="..\..\engines\tinsel\pdisplay.cpp" />
+		<File RelativePath="..\..\engines\tinsel\pdisplay.h" />
+		<File RelativePath="..\..\engines\tinsel\pid.h" />
+		<File RelativePath="..\..\engines\tinsel\play.cpp" />
+		<File RelativePath="..\..\engines\tinsel\play.h" />
+		<File RelativePath="..\..\engines\tinsel\polygons.cpp" />
+		<File RelativePath="..\..\engines\tinsel\polygons.h" />
+		<File RelativePath="..\..\engines\tinsel\rince.cpp" />
+		<File RelativePath="..\..\engines\tinsel\rince.h" />
+		<File RelativePath="..\..\engines\tinsel\saveload.cpp" />
+		<File RelativePath="..\..\engines\tinsel\savescn.cpp" />
+		<File RelativePath="..\..\engines\tinsel\savescn.h" />
+		<File RelativePath="..\..\engines\tinsel\scene.cpp" />
+		<File RelativePath="..\..\engines\tinsel\scene.h" />
+		<File RelativePath="..\..\engines\tinsel\sched.cpp" />
+		<File RelativePath="..\..\engines\tinsel\sched.h" />
+		<File RelativePath="..\..\engines\tinsel\scn.cpp" />
+		<File RelativePath="..\..\engines\tinsel\scn.h" />
+		<File RelativePath="..\..\engines\tinsel\scroll.cpp" />
+		<File RelativePath="..\..\engines\tinsel\scroll.h" />
+		<File RelativePath="..\..\engines\tinsel\sound.cpp" />
+		<File RelativePath="..\..\engines\tinsel\sound.h" />
+		<File RelativePath="..\..\engines\tinsel\strres.cpp" />
+		<File RelativePath="..\..\engines\tinsel\strres.h" />
+		<File RelativePath="..\..\engines\tinsel\sysvar.cpp" />
+		<File RelativePath="..\..\engines\tinsel\sysvar.h" />
+		<File RelativePath="..\..\engines\tinsel\text.cpp" />
+		<File RelativePath="..\..\engines\tinsel\text.h" />
+		<File RelativePath="..\..\engines\tinsel\timers.cpp" />
+		<File RelativePath="..\..\engines\tinsel\timers.h" />
+		<File RelativePath="..\..\engines\tinsel\tinlib.cpp" />
+		<File RelativePath="..\..\engines\tinsel\tinlib.h" />
+		<File RelativePath="..\..\engines\tinsel\tinsel.cpp" />
+		<File RelativePath="..\..\engines\tinsel\tinsel.h" />
+		<File RelativePath="..\..\engines\tinsel\token.cpp" />
+		<File RelativePath="..\..\engines\tinsel\token.h" />
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>
diff --git a/dists/msvc8/touche.vcproj b/dists/msvc8/touche.vcproj
index d314a910da..b05b3e98ad 100644
--- a/dists/msvc8/touche.vcproj
+++ b/dists/msvc8/touche.vcproj
@@ -8,213 +8,24 @@
 	Keyword="Win32Proj"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="touche_Debug"
-			IntermediateDirectory="touche_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/touche.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="touche_Release"
-			IntermediateDirectory="touche_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/touche.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
+		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
+		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<File
-			RelativePath="..\..\engines\touche\detection.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\touche\graphics.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\touche\graphics.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\touche\menu.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\touche\midi.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\touche\midi.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\touche\opcodes.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\touche\resource.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\touche\saveload.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\touche\staticres.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\touche\touche.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\touche\touche.h"
-			>
-		</File>
+		<File RelativePath="..\..\engines\touche\detection.cpp" />
+		<File RelativePath="..\..\engines\touche\graphics.cpp" />
+		<File RelativePath="..\..\engines\touche\graphics.h" />
+		<File RelativePath="..\..\engines\touche\menu.cpp" />
+		<File RelativePath="..\..\engines\touche\midi.cpp" />
+		<File RelativePath="..\..\engines\touche\midi.h" />
+		<File RelativePath="..\..\engines\touche\opcodes.cpp" />
+		<File RelativePath="..\..\engines\touche\resource.cpp" />
+		<File RelativePath="..\..\engines\touche\saveload.cpp" />
+		<File RelativePath="..\..\engines\touche\staticres.cpp" />
+		<File RelativePath="..\..\engines\touche\touche.cpp" />
+		<File RelativePath="..\..\engines\touche\touche.h" />
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>
diff --git a/dists/msvc8/tucker.vcproj b/dists/msvc8/tucker.vcproj
index 9dae4e7fa3..0d7e5ed2fb 100644
--- a/dists/msvc8/tucker.vcproj
+++ b/dists/msvc8/tucker.vcproj
@@ -8,205 +8,22 @@
 	Keyword="Win32Proj"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="tucker_Debug"
-			IntermediateDirectory="tucker_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/tucker.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="tucker_Release"
-			IntermediateDirectory="tucker_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/tucker.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
+		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
+		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<File
-			RelativePath="..\..\engines\tucker\detection.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tucker\graphics.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tucker\graphics.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tucker\locations.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tucker\resource.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tucker\saveload.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tucker\sequences.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tucker\staticres.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tucker\tucker.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tucker\tucker.h"
-			>
-		</File>
+		<File RelativePath="..\..\engines\tucker\detection.cpp" />
+		<File RelativePath="..\..\engines\tucker\graphics.cpp" />
+		<File RelativePath="..\..\engines\tucker\graphics.h" />
+		<File RelativePath="..\..\engines\tucker\locations.cpp" />
+		<File RelativePath="..\..\engines\tucker\resource.cpp" />
+		<File RelativePath="..\..\engines\tucker\saveload.cpp" />
+		<File RelativePath="..\..\engines\tucker\sequences.cpp" />
+		<File RelativePath="..\..\engines\tucker\staticres.cpp" />
+		<File RelativePath="..\..\engines\tucker\tucker.cpp" />
+		<File RelativePath="..\..\engines\tucker\tucker.h" />
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>
diff --git a/dists/msvc8_to_msvc7_71.bat b/dists/msvc8_to_msvc7_71.bat
deleted file mode 100644
index 146403f268..0000000000
--- a/dists/msvc8_to_msvc7_71.bat
+++ /dev/null
@@ -1,102 +0,0 @@
-@echo off
-rem This batch file is used to convert MSVC8 (Visual Studio 2005) project files to 
-rem MSVC71 (Visual Studio 2003) and MSVC7 (Visual Studio 2002) ones
-rem You need the Windows version of GNU rpl
-rem Get it here:
-rem http://gnuwin32.sourceforge.net/packages/rpl.htm
-rem Place rpl.exe from the bin folder inside the archive in the folder where
-rem this batch file resides
-
-if not exist rpl.exe goto no_rpl
-
-echo Creating MSVC71 project files from the MSVC8 ones
-copy /y msvc8\*.vcproj msvc71\
-copy /y msvc8\*.sln msvc71\
-rpl -e -q "Version=\"8.00\"" "Version=\"7.10\"" msvc71\*.vcproj
-rpl -e -q "Version=\"8,00\"" "Version=\"7,10\"" msvc71\*.vcproj
-for %%i in (msvc71\*.vcproj) do rpl -e -q "RootNamespace=\"%%~ni\"\n" "" %%i
-rpl -e -q "RootNamespace=" "#RootNamespace=" msvc71\*.vcproj
-rpl -e -q "\t\tKeyword=" "\tKeyword=" msvc71\*.vcproj
-rpl -e -q "\t<ToolFiles>\n\t</ToolFiles>\n" "" msvc71\*.vcproj
-rpl -e -q " /wd4996" "" msvc71\*.vcproj
-rpl -e -q "ExceptionHandling=\"1\"" "ExceptionHandling=\"true\"" msvc71\*.vcproj
-rpl -e -q "\t\t\t<Tool\n\t\t\t\tName=\"VCManagedResourceCompilerTool\"\n\t\t\t/>\n" "" msvc71\*.vcproj
-rpl -e -q "\t\t\t<Tool\n\t\t\t\tName=\"VCPreLinkEventTool\"\n\t\t\t/>\n" "" msvc71\*.vcproj
-rpl -e -q "\t\t\t<Tool\n\t\t\t\tName=\"VCALinkTool\"\n\t\t\t/>\n" "" msvc71\*.vcproj
-rpl -e -q "\t\t\t<Tool\n\t\t\t\tName=\"VCXDCMakeTool\"\n\t\t\t/>\n" "" msvc71\*.vcproj
-rpl -e -q "\t\t\t<Tool\n\t\t\t\tName=\"VCBscMakeTool\"\n\t\t\t/>\n" "" msvc71\*.vcproj
-rpl -e -q "\t\t\t<Tool\n\t\t\t\tName=\"VCFxCopTool\"\n\t\t\t/>\n" "" msvc71\*.vcproj
-rpl -e -q "WholeProgramOptimization=\"1\"" "WholeProgramOptimization=\"true\"" msvc71\*.vcproj
-rpl -e -q "ExceptionHandling=\"1\"" "ExceptionHandling=\"true\"" msvc71\*.vcproj
-rem Change multi-line XML closing tags to single line
-rpl -e -q "\"\n\t\0x3e\n" "\"\0x3e\n" msvc71\*.vcproj
-rpl -e -q "\"\n\t/\0x3e\n" "\"/\0x3e\n" msvc71\*.vcproj
-rpl -e -q "\"\n\t\t\0x3e\n" "\"\0x3e\n" msvc71\*.vcproj
-rpl -e -q "\"\n\t\t/\0x3e\n" "\"/\0x3e\n" msvc71\*.vcproj
-rpl -e -q "\"\n\t\t\t\0x3e\n" "\"\0x3e\n" msvc71\*.vcproj
-rpl -e -q "\"\n\t\t\t/\0x3e\n" "\"/\0x3e\n" msvc71\*.vcproj
-rpl -e -q "\"\n\t\t\t\t\0x3e\n" "\"\0x3e\n" msvc71\*.vcproj
-rpl -e -q "\"\n\t\t\t\t/\0x3e\n" "\"/\0x3e\n" msvc71\*.vcproj
-rpl -e -q "\"\n\t\t\t\t\t\0x3e\n" "\"\0x3e\n" msvc71\*.vcproj
-rpl -e -q "\"\n\t\t\t\t\t/\0x3e\n" "\"/\0x3e\n" msvc71\*.vcproj
-rpl -e -q "\"\n\t\t\t\t\t\t\0x3e\n" "\"\0x3e\n" msvc71\*.vcproj
-rpl -e -q "\"\n\t\t\t\t\t\t/\0x3e\n" "\"/\0x3e\n" msvc71\*.vcproj
-rem Change lower case true and false to upper case
-rpl -e -q "\"true\"" "\"TRUE\"" msvc71\*.vcproj
-rpl -e -q "\"false\"" "\"FALSE\"" msvc71\*.vcproj
-rem The following are mainly line swaps to keep layout the same
-rpl -e -q "\t\t\t<Tool\n\t\t\t\tName=\"VCPreBuildEventTool\"/>\n" "" msvc71\*.vcproj
-rpl -e -q "\t\t\t<Tool\n\t\t\t\tName=\"VCCustomBuildTool\"/>\n" "" msvc71\*.vcproj
-rpl -e -q "\t\t\t<Tool\n\t\t\t\tName=\"VCXMLDataGeneratorTool\"/>\n" "" msvc71\*.vcproj
-rpl -e -q "\t\t\t<Tool\n\t\t\t\tName=\"VCWebServiceProxyGeneratorTool\"/>\n" "" msvc71\*.vcproj
-rpl -e -q "\t\t\t<Tool\n\t\t\t\tName=\"VCMIDLTool\"/>\n" "" msvc71\*.vcproj
-rpl -e -q "\t\t\t<Tool\n\t\t\t\tName=\"VCAppVerifierTool\"/>\n" "" msvc71\*.vcproj
-rpl -e -q ".lib\"/\0x3e\n" ".lib\"/\0x3e\n\t\t\t<Tool\n\t\t\t\tName=\"VCMIDLTool\"/\0x3e\n" msvc71\*.vcproj	
-rem This is needed, but needs to go after the line that deletes the VCCustomBuildTool entry
-rpl -e -q "\"VCResourceCompilerTool\"" "\"VCCustomBuildTool\"" msvc71\*.vcproj
-rem This is needed too
-rpl -e -q "\"VCManifestTool\"" "\"VCMIDLTool\"" msvc71\*.vcproj
-rpl -e -q "\"VCPostBuildEventTool\"/>\n" "\"VCPostBuildEventTool\"/>\n\t\t\t<Tool\n\t\t\t\tName=\"VCPreBuildEventTool\"/>\n" msvc71\*.vcproj
-rpl -e -q "\"VCPreBuildEventTool\"/>\n" "\"VCPreBuildEventTool\"/>\n\t\t\t<Tool\n\t\t\t\tName=\"VCPreLinkEventTool\"/>\n" msvc71\*.vcproj
-rpl -e -q "\"VCPreLinkEventTool\"/>\n" "\"VCPreLinkEventTool\"/>\n\t\t\t<Tool\n\t\t\t\tName=\"VCResourceCompilerTool\"/>\n" msvc71\*.vcproj
-rpl -e -q "\"VCResourceCompilerTool\"/>\n" "\"VCResourceCompilerTool\"/>\n\t\t\t<Tool\n\t\t\t\tName=\"VCWebServiceProxyGeneratorTool\"/>\n" msvc71\*.vcproj
-rpl -e -q "\"VCWebServiceProxyGeneratorTool\"/>\n" "\"VCWebServiceProxyGeneratorTool\"/>\n\t\t\t<Tool\n\t\t\t\tName=\"VCXMLDataGeneratorTool\"/>\n" msvc71\*.vcproj
-rpl -e -q "\"VCXMLDataGeneratorTool\"/>\n" "\"VCXMLDataGeneratorTool\"/>\n\t\t\t<Tool\n\t\t\t\tName=\"VCManagedWrapperGeneratorTool\"/>\n" msvc71\*.vcproj
-rpl -e -q "\"VCManagedWrapperGeneratorTool\"/>\n" "\"VCManagedWrapperGeneratorTool\"/>\n\t\t\t<Tool\n\t\t\t\tName=\"VCAuxiliaryManagedWrapperGeneratorTool\"/>\n" msvc71\*.vcproj
-			
-rpl -e -q "Format Version 9.00" "Format Version 8.00" msvc71\scummvm.sln
-rpl -e -q "Format Version 9,00" "Format Version 8,00" msvc71\scummvm.sln
-rpl -e -q "# Visual C++ Express 2005\n" "" msvc71\scummvm.sln
-rpl -e -q "# Visual Studio 2005\n" "" msvc71\scummvm.sln
-rpl -e -q "\"\nEndProject\n" "\"\n\tProjectSection(ProjectDependencies) = postProject\n\tEndProjectSection\nEndProject\n" msvc71\scummvm.sln
-rpl -e -q "SolutionConfigurationPlatforms" "SolutionConfiguration" msvc71\scummvm.sln
-rpl -e -q "ProjectConfigurationPlatforms" "ProjectDependencies" msvc71\scummvm.sln
-rpl -e -q "Debug|Win32 = Debug|Win32" "Debug = Debug" msvc71\scummvm.sln
-rpl -e -q "Release|Win32 = Release|Win32" "Release = Release" msvc71\scummvm.sln
-rpl -e -q "EndGlobal\n" "\tGlobalSection(ExtensibilityGlobals) = postSolution\n\tEndGlobalSection\nEndGlobal\n" msvc71\scummvm.sln
-rpl -e -q "EndGlobal\n" "\tGlobalSection(ExtensibilityAddIns) = postSolution\n\tEndGlobalSection\nEndGlobal\n" msvc71\scummvm.sln
-
-echo Creating MSVC71 project files from the MSVC7 ones
-copy /y msvc71\*.vcproj msvc7\
-copy /y msvc71\*.sln msvc7\
-rpl -e -q "Version=\"7.10\"" "Version=\"7.00\"" msvc7\*.vcproj
-rpl -e -q "Version=\"7,10\"" "Version=\"7,00\"" msvc7\*.vcproj
-rpl -e -q "\t\t\t<Tool\n\t\t\t\tName=\"VCXMLDataGeneratorTool\"/>\n" "" msvc7\*.vcproj
-rpl -e -q "\t\t\t<Tool\n\t\t\t\tName=\"VCManagedWrapperGeneratorTool\"/>\n" "" msvc7\*.vcproj
-rpl -e -q "\t\t\t<Tool\n\t\t\t\tName=\"VCAuxiliaryManagedWrapperGeneratorTool\"/>\n" "" msvc7\*.vcproj
-rpl -e -q "\t<References>\n\t</References>\n" "" msvc7\*.vcproj
-
-rpl -e -q "Format Version 8.00" "Format Version 7.00" msvc7\scummvm.sln
-rpl -e -q "Format Version 8,00" "Format Version 7,00" msvc7\scummvm.sln
-rpl -e -q "\tProjectSection(ProjectDependencies) = postProject\n\tEndProjectSection\n" "" msvc7\scummvm.sln
-goto the_end
-
-:no_rpl
-echo You need the Windows version of GNU rpl
-echo Get it here:
-echo http://gnuwin32.sourceforge.net/packages/rpl.htm
-echo Place rpl.exe from the bin folder inside the archive in the folder where
-echo this batch file resides
-
-:the_end
-pause
diff --git a/dists/msvc8_to_msvc9.bat b/dists/msvc8_to_msvc9.bat
index b8d62b9244..1faacbd1a6 100644
--- a/dists/msvc8_to_msvc9.bat
+++ b/dists/msvc8_to_msvc9.bat
@@ -11,14 +11,12 @@ if not exist rpl.exe goto no_rpl
 echo Creating MSVC9 project files from the MSVC8 ones
 copy /y msvc8\*.vcproj msvc9\
 copy /y msvc8\*.sln msvc9\
+copy /y msvc8\*.vsprops msvc9\
 rpl -e -q "Version=\"8.00\"" "Version=\"9.00\"" msvc9\*.vcproj
 rpl -e -q "Version=\"8,00\"" "Version=\"9,00\"" msvc9\*.vcproj
 rpl -e -q "Keyword=\"Win32Proj\"" "Keyword=\"Win32Proj\"\n\tTargetFrameworkVersion=\"131072\"" msvc9\*.vcproj
-rpl -e -q "EntryPointSymbol=\"WinMainCRTStartup\"" "EntryPointSymbol=\"WinMainCRTStartup\"\n\t\t\t\tRandomizedBaseAddress=\"1\"\n\t\t\t\tDataExecutionPrevention=\"0\"" msvc9\scummvm.vcproj
 rpl -e -q "Format Version 9.00" "Format Version 10.00" msvc9\scummvm.sln
 rpl -e -q "Format Version 9,00" "Format Version 10,00" msvc9\scummvm.sln
-rpl -e -q "# Visual C++ Express 2005" "# Visual C++ Express 2008" msvc9\scummvm.sln
-rpl -e -q "# Visual Studio 2005" "# Visual Studio 2008" msvc9\scummvm.sln
 goto the_end
 
 :no_rpl
diff --git a/dists/msvc9/ScummVM_Debug.vsprops b/dists/msvc9/ScummVM_Debug.vsprops
new file mode 100644
index 0000000000..910096cab6
--- /dev/null
+++ b/dists/msvc9/ScummVM_Debug.vsprops
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="ScummVM_Debug32"
+	InheritedPropertySheets=".\ScummVM_Global.vsprops"
+	>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="0"
+		PreprocessorDefinitions="WIN32"
+		MinimalRebuild="true"
+		BasicRuntimeChecks="3"
+		RuntimeLibrary="1"
+		EnableFunctionLevelLinking="true"
+		WarnAsError="false"
+		DebugInformationFormat="4"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		LinkIncremental="2"
+		GenerateDebugInformation="true"
+		IgnoreDefaultLibraryNames="libcmt.lib"
+	/>
+</VisualStudioPropertySheet>
diff --git a/dists/msvc9/ScummVM_Global.vsprops b/dists/msvc9/ScummVM_Global.vsprops
new file mode 100644
index 0000000000..7ba00aac7b
--- /dev/null
+++ b/dists/msvc9/ScummVM_Global.vsprops
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="ScummVM_Global"
+	OutputDirectory="$(ConfigurationName)"
+	IntermediateDirectory="$(ConfigurationName)/$(ProjectName)"
+	>
+	<Tool
+		Name="VCCLCompilerTool"
+		DisableSpecificWarnings="4068;4100;4103;4121;4127;4189;4201;4221;4244;4250;4310;4351;4355;4510;4511;4512;4610;4701;4702;4706;4800;4996"
+		AdditionalIncludeDirectories="../..;../../engines"
+		PreprocessorDefinitions="USE_NASM;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_MT32EMU;ENABLE_AGI;ENABLE_AGOS;ENABLE_CINE;ENABLE_CRUISE;ENABLE_DRASCULA;ENABLE_GOB;ENABLE_IGOR;ENABLE_KYRA;ENABLE_LOL;ENABLE_LURE;ENABLE_M4;ENABLE_MADE;ENABLE_PARALLACTION;ENABLE_QUEEN;ENABLE_SAGA;ENABLE_IHNM;ENABLE_SAGA2;ENABLE_SCI;ENABLE_SCUMM;ENABLE_SKY;ENABLE_SWORD1;ENABLE_SWORD2;ENABLE_TOUCHE;ENABLE_SCUMM_7_8;ENABLE_HE;ENABLE_TINSEL;ENABLE_TUCKER;ENABLE_GROOVIE"
+		ExceptionHandling="0"
+		RuntimeTypeInfo="false"
+		WarningLevel="4"
+		WarnAsError="true"
+		CompileAs="0"
+	/>
+	<Tool
+		Name="VCLibrarianTool"
+		IgnoreDefaultLibraryNames=""
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		IgnoreDefaultLibraryNames=""
+		SubSystem="1"
+		EntryPointSymbol="WinMainCRTStartup"
+	/>
+</VisualStudioPropertySheet>
diff --git a/dists/msvc9/ScummVM_Release.vsprops b/dists/msvc9/ScummVM_Release.vsprops
new file mode 100644
index 0000000000..837be3b94c
--- /dev/null
+++ b/dists/msvc9/ScummVM_Release.vsprops
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="ScummVM_Release32"
+	InheritedPropertySheets=".\ScummVM_Global.vsprops"
+	>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="1"
+		EnableIntrinsicFunctions="true"
+		WholeProgramOptimization="true"
+		PreprocessorDefinitions="WIN32"
+		StringPooling="true"
+		BufferSecurityCheck="false"
+		DebugInformationFormat="0"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		LinkIncremental="1"
+		IgnoreDefaultLibraryNames=""
+		SetChecksum="true"
+	/>
+</VisualStudioPropertySheet>
diff --git a/dists/msvc9/agi.vcproj b/dists/msvc9/agi.vcproj
index de79be933d..5b5494cfe1 100644
--- a/dists/msvc9/agi.vcproj
+++ b/dists/msvc9/agi.vcproj
@@ -9,377 +9,65 @@
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="agi_Debug"
-			IntermediateDirectory="agi_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/agi.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="agi_Release"
-			IntermediateDirectory="agi_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/agi.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
+		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
+		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<File
-			RelativePath="..\..\engines\agi\agi.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\agi.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\checks.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\console.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\console.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\cycle.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\detection.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\font.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\global.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\graphics.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\graphics.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\id.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\inv.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\keyboard.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\keyboard.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\loader_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\loader_v3.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\logic.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\logic.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\lzw.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\lzw.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\menu.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\menu.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\motion.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\objects.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\op_cmd.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\op_dbg.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\op_test.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\opcodes.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\picture.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\picture.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\preagi.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\preagi.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\preagi_common.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\preagi_common.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\preagi_mickey.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\preagi_mickey.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\preagi_troll.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\preagi_troll.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\preagi_winnie.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\preagi_winnie.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\predictive.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\saveload.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\sound.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\sound.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\sprite.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\sprite.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\text.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\view.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\view.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\wagparser.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\wagparser.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\words.cpp"
-			>
-		</File>
+		<File RelativePath="..\..\engines\agi\agi.cpp" />
+		<File RelativePath="..\..\engines\agi\agi.h" />
+		<File RelativePath="..\..\engines\agi\checks.cpp" />
+		<File RelativePath="..\..\engines\agi\console.cpp" />
+		<File RelativePath="..\..\engines\agi\console.h" />
+		<File RelativePath="..\..\engines\agi\cycle.cpp" />
+		<File RelativePath="..\..\engines\agi\detection.cpp" />
+		<File RelativePath="..\..\engines\agi\font.h" />
+		<File RelativePath="..\..\engines\agi\global.cpp" />
+		<File RelativePath="..\..\engines\agi\graphics.cpp" />
+		<File RelativePath="..\..\engines\agi\graphics.h" />
+		<File RelativePath="..\..\engines\agi\id.cpp" />
+		<File RelativePath="..\..\engines\agi\inv.cpp" />
+		<File RelativePath="..\..\engines\agi\keyboard.cpp" />
+		<File RelativePath="..\..\engines\agi\keyboard.h" />
+		<File RelativePath="..\..\engines\agi\loader_v2.cpp" />
+		<File RelativePath="..\..\engines\agi\loader_v3.cpp" />
+		<File RelativePath="..\..\engines\agi\logic.cpp" />
+		<File RelativePath="..\..\engines\agi\logic.h" />
+		<File RelativePath="..\..\engines\agi\lzw.cpp" />
+		<File RelativePath="..\..\engines\agi\lzw.h" />
+		<File RelativePath="..\..\engines\agi\menu.cpp" />
+		<File RelativePath="..\..\engines\agi\menu.h" />
+		<File RelativePath="..\..\engines\agi\motion.cpp" />
+		<File RelativePath="..\..\engines\agi\objects.cpp" />
+		<File RelativePath="..\..\engines\agi\op_cmd.cpp" />
+		<File RelativePath="..\..\engines\agi\op_dbg.cpp" />
+		<File RelativePath="..\..\engines\agi\op_test.cpp" />
+		<File RelativePath="..\..\engines\agi\opcodes.h" />
+		<File RelativePath="..\..\engines\agi\picture.cpp" />
+		<File RelativePath="..\..\engines\agi\picture.h" />
+		<File RelativePath="..\..\engines\agi\preagi.cpp" />
+		<File RelativePath="..\..\engines\agi\preagi.h" />
+		<File RelativePath="..\..\engines\agi\preagi_common.cpp" />
+		<File RelativePath="..\..\engines\agi\preagi_common.h" />
+		<File RelativePath="..\..\engines\agi\preagi_mickey.cpp" />
+		<File RelativePath="..\..\engines\agi\preagi_mickey.h" />
+		<File RelativePath="..\..\engines\agi\preagi_troll.cpp" />
+		<File RelativePath="..\..\engines\agi\preagi_troll.h" />
+		<File RelativePath="..\..\engines\agi\preagi_winnie.cpp" />
+		<File RelativePath="..\..\engines\agi\preagi_winnie.h" />
+		<File RelativePath="..\..\engines\agi\predictive.cpp" />
+		<File RelativePath="..\..\engines\agi\saveload.cpp" />
+		<File RelativePath="..\..\engines\agi\sound.cpp" />
+		<File RelativePath="..\..\engines\agi\sound.h" />
+		<File RelativePath="..\..\engines\agi\sprite.cpp" />
+		<File RelativePath="..\..\engines\agi\sprite.h" />
+		<File RelativePath="..\..\engines\agi\text.cpp" />
+		<File RelativePath="..\..\engines\agi\view.cpp" />
+		<File RelativePath="..\..\engines\agi\view.h" />
+		<File RelativePath="..\..\engines\agi\wagparser.cpp" />
+		<File RelativePath="..\..\engines\agi\wagparser.h" />
+		<File RelativePath="..\..\engines\agi\words.cpp" />
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>
diff --git a/dists/msvc9/agos.vcproj b/dists/msvc9/agos.vcproj
index a5126717d4..b352dff3e1 100644
--- a/dists/msvc9/agos.vcproj
+++ b/dists/msvc9/agos.vcproj
@@ -9,393 +9,69 @@
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="agos_Debug"
-			IntermediateDirectory="agos_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="false"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/agos.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="agos_Release"
-			IntermediateDirectory="agos_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/agos.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
+		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
+		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<File
-			RelativePath="..\..\engines\agos\agos.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\agos.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\animation.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\animation.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\charset-fontdata.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\charset.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\contain.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\cursor.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\debug.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\debug.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\debugger.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\debugger.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\detection.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\detection_tables.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\draw.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\event.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\feeble.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\gfx.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\icons.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\input.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\intern.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\items.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\menus.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\midi.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\midi.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\midiparser_s1d.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\oracle.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\pn.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\res.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\res_ami.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\res_snd.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\rooms.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\saveload.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\script.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\script_e1.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\script_e2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\script_ff.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\script_pn.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\script_pp.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\script_s1.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\script_s2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\script_ww.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\sound.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\sound.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\string.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\subroutine.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\verb.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\vga.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\vga.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\vga_e2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\vga_ff.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\vga_pn.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\vga_s1.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\vga_s2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\vga_ww.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\window.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\zones.cpp"
-			>
-		</File>
+		<File RelativePath="..\..\engines\agos\agos.cpp" />
+		<File RelativePath="..\..\engines\agos\agos.h" />
+		<File RelativePath="..\..\engines\agos\animation.cpp" />
+		<File RelativePath="..\..\engines\agos\animation.h" />
+		<File RelativePath="..\..\engines\agos\charset-fontdata.cpp" />
+		<File RelativePath="..\..\engines\agos\charset.cpp" />
+		<File RelativePath="..\..\engines\agos\contain.cpp" />
+		<File RelativePath="..\..\engines\agos\cursor.cpp" />
+		<File RelativePath="..\..\engines\agos\debug.cpp" />
+		<File RelativePath="..\..\engines\agos\debug.h" />
+		<File RelativePath="..\..\engines\agos\debugger.cpp" />
+		<File RelativePath="..\..\engines\agos\debugger.h" />
+		<File RelativePath="..\..\engines\agos\detection.cpp" />
+		<File RelativePath="..\..\engines\agos\detection_tables.h" />
+		<File RelativePath="..\..\engines\agos\draw.cpp" />
+		<File RelativePath="..\..\engines\agos\event.cpp" />
+		<File RelativePath="..\..\engines\agos\feeble.cpp" />
+		<File RelativePath="..\..\engines\agos\gfx.cpp" />
+		<File RelativePath="..\..\engines\agos\icons.cpp" />
+		<File RelativePath="..\..\engines\agos\input.cpp" />
+		<File RelativePath="..\..\engines\agos\intern.h" />
+		<File RelativePath="..\..\engines\agos\items.cpp" />
+		<File RelativePath="..\..\engines\agos\menus.cpp" />
+		<File RelativePath="..\..\engines\agos\midi.cpp" />
+		<File RelativePath="..\..\engines\agos\midi.h" />
+		<File RelativePath="..\..\engines\agos\midiparser_s1d.cpp" />
+		<File RelativePath="..\..\engines\agos\oracle.cpp" />
+		<File RelativePath="..\..\engines\agos\pn.cpp" />
+		<File RelativePath="..\..\engines\agos\res.cpp" />
+		<File RelativePath="..\..\engines\agos\res_ami.cpp" />
+		<File RelativePath="..\..\engines\agos\res_snd.cpp" />
+		<File RelativePath="..\..\engines\agos\rooms.cpp" />
+		<File RelativePath="..\..\engines\agos\saveload.cpp" />
+		<File RelativePath="..\..\engines\agos\script.cpp" />
+		<File RelativePath="..\..\engines\agos\script_e1.cpp" />
+		<File RelativePath="..\..\engines\agos\script_e2.cpp" />
+		<File RelativePath="..\..\engines\agos\script_ff.cpp" />
+		<File RelativePath="..\..\engines\agos\script_pn.cpp" />
+		<File RelativePath="..\..\engines\agos\script_pp.cpp" />
+		<File RelativePath="..\..\engines\agos\script_s1.cpp" />
+		<File RelativePath="..\..\engines\agos\script_s2.cpp" />
+		<File RelativePath="..\..\engines\agos\script_ww.cpp" />
+		<File RelativePath="..\..\engines\agos\sound.cpp" />
+		<File RelativePath="..\..\engines\agos\sound.h" />
+		<File RelativePath="..\..\engines\agos\string.cpp" />
+		<File RelativePath="..\..\engines\agos\subroutine.cpp" />
+		<File RelativePath="..\..\engines\agos\verb.cpp" />
+		<File RelativePath="..\..\engines\agos\vga.cpp" />
+		<File RelativePath="..\..\engines\agos\vga.h" />
+		<File RelativePath="..\..\engines\agos\vga_e2.cpp" />
+		<File RelativePath="..\..\engines\agos\vga_ff.cpp" />
+		<File RelativePath="..\..\engines\agos\vga_pn.cpp" />
+		<File RelativePath="..\..\engines\agos\vga_s1.cpp" />
+		<File RelativePath="..\..\engines\agos\vga_s2.cpp" />
+		<File RelativePath="..\..\engines\agos\vga_ww.cpp" />
+		<File RelativePath="..\..\engines\agos\window.cpp" />
+		<File RelativePath="..\..\engines\agos\zones.cpp" />
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>
diff --git a/dists/msvc9/cine.vcproj b/dists/msvc9/cine.vcproj
index 68d12a8f52..c78db8e649 100644
--- a/dists/msvc9/cine.vcproj
+++ b/dists/msvc9/cine.vcproj
@@ -9,317 +9,50 @@
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="cine_Debug"
-			IntermediateDirectory="cine_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/cine.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="cine_Release"
-			IntermediateDirectory="cine_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/cine.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
+		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
+		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<File
-			RelativePath="..\..\engines\cine\anim.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\anim.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\bg.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\bg.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\bg_list.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\bg_list.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\cine.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\cine.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\detection.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\gfx.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\gfx.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\main_loop.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\main_loop.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\msg.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\msg.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\object.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\object.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\pal.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\pal.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\part.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\part.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\prc.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\prc.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\rel.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\rel.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\saveload.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\saveload.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\script.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\script_fw.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\script_os.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\sound.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\sound.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\texte.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\texte.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\unpack.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\unpack.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\various.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\various.h"
-			>
-		</File>
+		<File RelativePath="..\..\engines\cine\anim.cpp" />
+		<File RelativePath="..\..\engines\cine\anim.h" />
+		<File RelativePath="..\..\engines\cine\bg.cpp" />
+		<File RelativePath="..\..\engines\cine\bg.h" />
+		<File RelativePath="..\..\engines\cine\bg_list.cpp" />
+		<File RelativePath="..\..\engines\cine\bg_list.h" />
+		<File RelativePath="..\..\engines\cine\cine.cpp" />
+		<File RelativePath="..\..\engines\cine\cine.h" />
+		<File RelativePath="..\..\engines\cine\detection.cpp" />
+		<File RelativePath="..\..\engines\cine\gfx.cpp" />
+		<File RelativePath="..\..\engines\cine\gfx.h" />
+		<File RelativePath="..\..\engines\cine\main_loop.cpp" />
+		<File RelativePath="..\..\engines\cine\main_loop.h" />
+		<File RelativePath="..\..\engines\cine\msg.cpp" />
+		<File RelativePath="..\..\engines\cine\msg.h" />
+		<File RelativePath="..\..\engines\cine\object.cpp" />
+		<File RelativePath="..\..\engines\cine\object.h" />
+		<File RelativePath="..\..\engines\cine\pal.cpp" />
+		<File RelativePath="..\..\engines\cine\pal.h" />
+		<File RelativePath="..\..\engines\cine\part.cpp" />
+		<File RelativePath="..\..\engines\cine\part.h" />
+		<File RelativePath="..\..\engines\cine\prc.cpp" />
+		<File RelativePath="..\..\engines\cine\prc.h" />
+		<File RelativePath="..\..\engines\cine\rel.cpp" />
+		<File RelativePath="..\..\engines\cine\rel.h" />
+		<File RelativePath="..\..\engines\cine\saveload.cpp" />
+		<File RelativePath="..\..\engines\cine\saveload.h" />
+		<File RelativePath="..\..\engines\cine\script.h" />
+		<File RelativePath="..\..\engines\cine\script_fw.cpp" />
+		<File RelativePath="..\..\engines\cine\script_os.cpp" />
+		<File RelativePath="..\..\engines\cine\sound.cpp" />
+		<File RelativePath="..\..\engines\cine\sound.h" />
+		<File RelativePath="..\..\engines\cine\texte.cpp" />
+		<File RelativePath="..\..\engines\cine\texte.h" />
+		<File RelativePath="..\..\engines\cine\unpack.cpp" />
+		<File RelativePath="..\..\engines\cine\unpack.h" />
+		<File RelativePath="..\..\engines\cine\various.cpp" />
+		<File RelativePath="..\..\engines\cine\various.h" />
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>
diff --git a/dists/msvc9/cruise.vcproj b/dists/msvc9/cruise.vcproj
index a6f521b721..1a68736c66 100644
--- a/dists/msvc9/cruise.vcproj
+++ b/dists/msvc9/cruise.vcproj
@@ -9,397 +9,70 @@
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="cruise_Debug"
-			IntermediateDirectory="cruise_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/cruise.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="cruise_Release"
-			IntermediateDirectory="cruise_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/cruise.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
+		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
+		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<File
-			RelativePath="..\..\engines\cruise\actor.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\actor.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\background.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\background.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\backgroundIncrust.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\backgroundIncrust.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\cell.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\cell.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\cruise.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\cruise.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\cruise_main.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\cruise_main.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\ctp.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\ctp.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\dataLoader.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\dataLoader.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\debugger.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\debugger.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\delphine-unpack.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\detection.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\font.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\font.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\function.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\function.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\gfxModule.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\gfxModule.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\linker.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\linker.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\mainDraw.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\mainDraw.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\menu.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\menu.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\mouse.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\mouse.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\object.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\object.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\overlay.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\overlay.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\perso.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\perso.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\polys.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\polys.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\saveload.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\saveload.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\script.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\script.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\sound.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\sound.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\stack.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\stack.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\staticres.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\staticres.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\various.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\various.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\vars.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\vars.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\volume.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\volume.h"
-			>
-		</File>
+		<File RelativePath="..\..\engines\cruise\actor.cpp" />
+		<File RelativePath="..\..\engines\cruise\actor.h" />
+		<File RelativePath="..\..\engines\cruise\background.cpp" />
+		<File RelativePath="..\..\engines\cruise\background.h" />
+		<File RelativePath="..\..\engines\cruise\backgroundIncrust.cpp" />
+		<File RelativePath="..\..\engines\cruise\backgroundIncrust.h" />
+		<File RelativePath="..\..\engines\cruise\cell.cpp" />
+		<File RelativePath="..\..\engines\cruise\cell.h" />
+		<File RelativePath="..\..\engines\cruise\cruise.cpp" />
+		<File RelativePath="..\..\engines\cruise\cruise.h" />
+		<File RelativePath="..\..\engines\cruise\cruise_main.cpp" />
+		<File RelativePath="..\..\engines\cruise\cruise_main.h" />
+		<File RelativePath="..\..\engines\cruise\ctp.cpp" />
+		<File RelativePath="..\..\engines\cruise\ctp.h" />
+		<File RelativePath="..\..\engines\cruise\dataLoader.cpp" />
+		<File RelativePath="..\..\engines\cruise\dataLoader.h" />
+		<File RelativePath="..\..\engines\cruise\debugger.cpp" />
+		<File RelativePath="..\..\engines\cruise\debugger.h" />
+		<File RelativePath="..\..\engines\cruise\delphine-unpack.cpp" />
+		<File RelativePath="..\..\engines\cruise\detection.cpp" />
+		<File RelativePath="..\..\engines\cruise\font.cpp" />
+		<File RelativePath="..\..\engines\cruise\font.h" />
+		<File RelativePath="..\..\engines\cruise\function.cpp" />
+		<File RelativePath="..\..\engines\cruise\function.h" />
+		<File RelativePath="..\..\engines\cruise\gfxModule.cpp" />
+		<File RelativePath="..\..\engines\cruise\gfxModule.h" />
+		<File RelativePath="..\..\engines\cruise\linker.cpp" />
+		<File RelativePath="..\..\engines\cruise\linker.h" />
+		<File RelativePath="..\..\engines\cruise\mainDraw.cpp" />
+		<File RelativePath="..\..\engines\cruise\mainDraw.h" />
+		<File RelativePath="..\..\engines\cruise\menu.cpp" />
+		<File RelativePath="..\..\engines\cruise\menu.h" />
+		<File RelativePath="..\..\engines\cruise\mouse.cpp" />
+		<File RelativePath="..\..\engines\cruise\mouse.h" />
+		<File RelativePath="..\..\engines\cruise\object.cpp" />
+		<File RelativePath="..\..\engines\cruise\object.h" />
+		<File RelativePath="..\..\engines\cruise\overlay.cpp" />
+		<File RelativePath="..\..\engines\cruise\overlay.h" />
+		<File RelativePath="..\..\engines\cruise\perso.cpp" />
+		<File RelativePath="..\..\engines\cruise\perso.h" />
+		<File RelativePath="..\..\engines\cruise\polys.cpp" />
+		<File RelativePath="..\..\engines\cruise\polys.h" />
+		<File RelativePath="..\..\engines\cruise\saveload.cpp" />
+		<File RelativePath="..\..\engines\cruise\saveload.h" />
+		<File RelativePath="..\..\engines\cruise\script.cpp" />
+		<File RelativePath="..\..\engines\cruise\script.h" />
+		<File RelativePath="..\..\engines\cruise\sound.cpp" />
+		<File RelativePath="..\..\engines\cruise\sound.h" />
+		<File RelativePath="..\..\engines\cruise\stack.cpp" />
+		<File RelativePath="..\..\engines\cruise\stack.h" />
+		<File RelativePath="..\..\engines\cruise\staticres.cpp" />
+		<File RelativePath="..\..\engines\cruise\staticres.h" />
+		<File RelativePath="..\..\engines\cruise\various.cpp" />
+		<File RelativePath="..\..\engines\cruise\various.h" />
+		<File RelativePath="..\..\engines\cruise\vars.cpp" />
+		<File RelativePath="..\..\engines\cruise\vars.h" />
+		<File RelativePath="..\..\engines\cruise\volume.cpp" />
+		<File RelativePath="..\..\engines\cruise\volume.h" />
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>
diff --git a/dists/msvc9/drascula.vcproj b/dists/msvc9/drascula.vcproj
index a0ed0eaa09..786436608f 100644
--- a/dists/msvc9/drascula.vcproj
+++ b/dists/msvc9/drascula.vcproj
@@ -9,221 +9,26 @@
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="drascula_Debug"
-			IntermediateDirectory="drascula_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/drascula.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="drascula_Release"
-			IntermediateDirectory="drascula_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/drascula.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
+		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
+		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<File
-			RelativePath="..\..\engines\drascula\actors.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\animation.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\converse.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\detection.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\drascula.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\drascula.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\graphics.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\interface.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\objects.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\palette.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\rooms.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\saveload.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\sound.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\talk.cpp"
-			>
-		</File>
+		<File RelativePath="..\..\engines\drascula\actors.cpp" />
+		<File RelativePath="..\..\engines\drascula\animation.cpp" />
+		<File RelativePath="..\..\engines\drascula\converse.cpp" />
+		<File RelativePath="..\..\engines\drascula\detection.cpp" />
+		<File RelativePath="..\..\engines\drascula\drascula.cpp" />
+		<File RelativePath="..\..\engines\drascula\drascula.h" />
+		<File RelativePath="..\..\engines\drascula\graphics.cpp" />
+		<File RelativePath="..\..\engines\drascula\interface.cpp" />
+		<File RelativePath="..\..\engines\drascula\objects.cpp" />
+		<File RelativePath="..\..\engines\drascula\palette.cpp" />
+		<File RelativePath="..\..\engines\drascula\rooms.cpp" />
+		<File RelativePath="..\..\engines\drascula\saveload.cpp" />
+		<File RelativePath="..\..\engines\drascula\sound.cpp" />
+		<File RelativePath="..\..\engines\drascula\talk.cpp" />
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>
diff --git a/dists/msvc9/gob.vcproj b/dists/msvc9/gob.vcproj
index 306f12c1a3..8852e59fa3 100644
--- a/dists/msvc9/gob.vcproj
+++ b/dists/msvc9/gob.vcproj
@@ -9,645 +9,133 @@
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="gob_Debug"
-			IntermediateDirectory="gob_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/gob.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="gob_Release"
-			IntermediateDirectory="gob_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/gob.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
+		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
+		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<Filter
-			Name="sound"
-			>
-			<File
-				RelativePath="..\..\engines\gob\sound\adlib.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\adlib.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\bgatmosphere.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\bgatmosphere.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\cdrom.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\cdrom.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\infogrames.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\infogrames.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\pcspeaker.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\pcspeaker.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\protracker.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\protracker.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\sound.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\sound.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\soundblaster.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\soundblaster.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\sounddesc.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\sounddesc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\soundmixer.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\soundmixer.h"
-				>
-			</File>
+		<Filter Name="sound">
+			<File RelativePath="..\..\engines\gob\sound\adlib.cpp" />
+			<File RelativePath="..\..\engines\gob\sound\adlib.h" />
+			<File RelativePath="..\..\engines\gob\sound\bgatmosphere.cpp" />
+			<File RelativePath="..\..\engines\gob\sound\bgatmosphere.h" />
+			<File RelativePath="..\..\engines\gob\sound\cdrom.cpp" />
+			<File RelativePath="..\..\engines\gob\sound\cdrom.h" />
+			<File RelativePath="..\..\engines\gob\sound\infogrames.cpp" />
+			<File RelativePath="..\..\engines\gob\sound\infogrames.h" />
+			<File RelativePath="..\..\engines\gob\sound\pcspeaker.cpp" />
+			<File RelativePath="..\..\engines\gob\sound\pcspeaker.h" />
+			<File RelativePath="..\..\engines\gob\sound\protracker.cpp" />
+			<File RelativePath="..\..\engines\gob\sound\protracker.h" />
+			<File RelativePath="..\..\engines\gob\sound\sound.cpp" />
+			<File RelativePath="..\..\engines\gob\sound\sound.h" />
+			<File RelativePath="..\..\engines\gob\sound\soundblaster.cpp" />
+			<File RelativePath="..\..\engines\gob\sound\soundblaster.h" />
+			<File RelativePath="..\..\engines\gob\sound\sounddesc.cpp" />
+			<File RelativePath="..\..\engines\gob\sound\sounddesc.h" />
+			<File RelativePath="..\..\engines\gob\sound\soundmixer.cpp" />
+			<File RelativePath="..\..\engines\gob\sound\soundmixer.h" />
 		</Filter>
-		<File
-			RelativePath="..\..\engines\gob\demos\batplayer.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\demos\batplayer.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\dataio.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\dataio.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\demos\demoplayer.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\demos\demoplayer.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\detection.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\draw.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\draw.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\draw_bargon.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\draw_fascin.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\draw_v1.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\draw_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\driver_vga.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\driver_vga.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\expression.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\expression.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\game.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\game.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\global.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\global.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\gob.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\gob.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\goblin.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\goblin.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\goblin_v1.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\goblin_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\goblin_v3.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\goblin_v4.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\helper.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\hotspots.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\hotspots.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\init.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\init.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\init_v1.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\init_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\init_v3.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\init_v6.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\inter.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\inter.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\inter_bargon.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\inter_fascin.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\inter_v1.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\inter_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\inter_v3.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\inter_v4.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\inter_v5.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\inter_v6.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\map.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\map.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\map_v1.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\map_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\map_v4.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\mult.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\mult.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\mult_v1.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\mult_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\palanim.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\palanim.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\resources.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\resources.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveconverter.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveconverter.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveconverter_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveconverter_v3.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveconverter_v4.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveconverter_v6.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\savefile.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\savefile.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\savehandler.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\savehandler.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveload.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveload.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveload_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveload_v3.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveload_v4.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveload_v6.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveload_playtoons.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\scenery.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\scenery.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\scenery_v1.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\scenery_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\demos\scnplayer.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\demos\scnplayer.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\script.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\script.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\totfile.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\totfile.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\util.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\util.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\variables.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\variables.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\video.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\video.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\video_v1.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\video_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\video_v6.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\videoplayer.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\videoplayer.h"
-			>
-		</File>
+		<File RelativePath="..\..\engines\gob\demos\batplayer.cpp" />
+		<File RelativePath="..\..\engines\gob\demos\batplayer.h" />
+		<File RelativePath="..\..\engines\gob\dataio.cpp" />
+		<File RelativePath="..\..\engines\gob\dataio.h" />
+		<File RelativePath="..\..\engines\gob\demos\demoplayer.cpp" />
+		<File RelativePath="..\..\engines\gob\demos\demoplayer.h" />
+		<File RelativePath="..\..\engines\gob\detection.cpp" />
+		<File RelativePath="..\..\engines\gob\draw.cpp" />
+		<File RelativePath="..\..\engines\gob\draw.h" />
+		<File RelativePath="..\..\engines\gob\draw_bargon.cpp" />
+		<File RelativePath="..\..\engines\gob\draw_fascin.cpp" />
+		<File RelativePath="..\..\engines\gob\draw_v1.cpp" />
+		<File RelativePath="..\..\engines\gob\draw_v2.cpp" />
+		<File RelativePath="..\..\engines\gob\driver_vga.cpp" />
+		<File RelativePath="..\..\engines\gob\driver_vga.h" />
+		<File RelativePath="..\..\engines\gob\expression.cpp" />
+		<File RelativePath="..\..\engines\gob\expression.h" />
+		<File RelativePath="..\..\engines\gob\game.cpp" />
+		<File RelativePath="..\..\engines\gob\game.h" />
+		<File RelativePath="..\..\engines\gob\global.cpp" />
+		<File RelativePath="..\..\engines\gob\global.h" />
+		<File RelativePath="..\..\engines\gob\gob.cpp" />
+		<File RelativePath="..\..\engines\gob\gob.h" />
+		<File RelativePath="..\..\engines\gob\goblin.cpp" />
+		<File RelativePath="..\..\engines\gob\goblin.h" />
+		<File RelativePath="..\..\engines\gob\goblin_v1.cpp" />
+		<File RelativePath="..\..\engines\gob\goblin_v2.cpp" />
+		<File RelativePath="..\..\engines\gob\goblin_v3.cpp" />
+		<File RelativePath="..\..\engines\gob\goblin_v4.cpp" />
+		<File RelativePath="..\..\engines\gob\helper.h" />
+		<File RelativePath="..\..\engines\gob\hotspots.cpp" />
+		<File RelativePath="..\..\engines\gob\hotspots.h" />
+		<File RelativePath="..\..\engines\gob\init.cpp" />
+		<File RelativePath="..\..\engines\gob\init.h" />
+		<File RelativePath="..\..\engines\gob\init_v1.cpp" />
+		<File RelativePath="..\..\engines\gob\init_v2.cpp" />
+		<File RelativePath="..\..\engines\gob\init_v3.cpp" />
+		<File RelativePath="..\..\engines\gob\init_v6.cpp" />
+		<File RelativePath="..\..\engines\gob\inter.cpp" />
+		<File RelativePath="..\..\engines\gob\inter.h" />
+		<File RelativePath="..\..\engines\gob\inter_bargon.cpp" />
+		<File RelativePath="..\..\engines\gob\inter_fascin.cpp" />
+		<File RelativePath="..\..\engines\gob\inter_v1.cpp" />
+		<File RelativePath="..\..\engines\gob\inter_v2.cpp" />
+		<File RelativePath="..\..\engines\gob\inter_v3.cpp" />
+		<File RelativePath="..\..\engines\gob\inter_v4.cpp" />
+		<File RelativePath="..\..\engines\gob\inter_v5.cpp" />
+		<File RelativePath="..\..\engines\gob\inter_v6.cpp" />
+		<File RelativePath="..\..\engines\gob\map.cpp" />
+		<File RelativePath="..\..\engines\gob\map.h" />
+		<File RelativePath="..\..\engines\gob\map_v1.cpp" />
+		<File RelativePath="..\..\engines\gob\map_v2.cpp" />
+		<File RelativePath="..\..\engines\gob\map_v4.cpp" />
+		<File RelativePath="..\..\engines\gob\mult.cpp" />
+		<File RelativePath="..\..\engines\gob\mult.h" />
+		<File RelativePath="..\..\engines\gob\mult_v1.cpp" />
+		<File RelativePath="..\..\engines\gob\mult_v2.cpp" />
+		<File RelativePath="..\..\engines\gob\palanim.cpp" />
+		<File RelativePath="..\..\engines\gob\palanim.h" />
+		<File RelativePath="..\..\engines\gob\resources.cpp" />
+		<File RelativePath="..\..\engines\gob\resources.h" />
+		<File RelativePath="..\..\engines\gob\save\saveconverter.cpp" />
+		<File RelativePath="..\..\engines\gob\save\saveconverter.h" />
+		<File RelativePath="..\..\engines\gob\save\saveconverter_v2.cpp" />
+		<File RelativePath="..\..\engines\gob\save\saveconverter_v3.cpp" />
+		<File RelativePath="..\..\engines\gob\save\saveconverter_v4.cpp" />
+		<File RelativePath="..\..\engines\gob\save\saveconverter_v6.cpp" />
+		<File RelativePath="..\..\engines\gob\save\savefile.cpp" />
+		<File RelativePath="..\..\engines\gob\save\savefile.h" />
+		<File RelativePath="..\..\engines\gob\save\savehandler.cpp" />
+		<File RelativePath="..\..\engines\gob\save\savehandler.h" />
+		<File RelativePath="..\..\engines\gob\save\saveload.cpp" />
+		<File RelativePath="..\..\engines\gob\save\saveload.h" />
+		<File RelativePath="..\..\engines\gob\save\saveload_v2.cpp" />
+		<File RelativePath="..\..\engines\gob\save\saveload_v3.cpp" />
+		<File RelativePath="..\..\engines\gob\save\saveload_v4.cpp" />
+		<File RelativePath="..\..\engines\gob\save\saveload_v6.cpp" />
+		<File RelativePath="..\..\engines\gob\save\saveload_playtoons.cpp" />
+		<File RelativePath="..\..\engines\gob\scenery.cpp" />
+		<File RelativePath="..\..\engines\gob\scenery.h" />
+		<File RelativePath="..\..\engines\gob\scenery_v1.cpp" />
+		<File RelativePath="..\..\engines\gob\scenery_v2.cpp" />
+		<File RelativePath="..\..\engines\gob\demos\scnplayer.cpp" />
+		<File RelativePath="..\..\engines\gob\demos\scnplayer.h" />
+		<File RelativePath="..\..\engines\gob\script.cpp" />
+		<File RelativePath="..\..\engines\gob\script.h" />
+		<File RelativePath="..\..\engines\gob\totfile.cpp" />
+		<File RelativePath="..\..\engines\gob\totfile.h" />
+		<File RelativePath="..\..\engines\gob\util.cpp" />
+		<File RelativePath="..\..\engines\gob\util.h" />
+		<File RelativePath="..\..\engines\gob\variables.cpp" />
+		<File RelativePath="..\..\engines\gob\variables.h" />
+		<File RelativePath="..\..\engines\gob\video.cpp" />
+		<File RelativePath="..\..\engines\gob\video.h" />
+		<File RelativePath="..\..\engines\gob\video_v1.cpp" />
+		<File RelativePath="..\..\engines\gob\video_v2.cpp" />
+		<File RelativePath="..\..\engines\gob\video_v6.cpp" />
+		<File RelativePath="..\..\engines\gob\videoplayer.cpp" />
+		<File RelativePath="..\..\engines\gob\videoplayer.h" />
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>
diff --git a/dists/msvc9/groovie.vcproj b/dists/msvc9/groovie.vcproj
index 61c18ab6da..c3ce8f0f58 100644
--- a/dists/msvc9/groovie.vcproj
+++ b/dists/msvc9/groovie.vcproj
@@ -9,275 +9,41 @@
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="groovie_Debug"
-			IntermediateDirectory="groovie_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				AdditionalIncludeDirectories="../..;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="false"
-				SuppressStartupBanner="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/groovie.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="groovie_Release"
-			IntermediateDirectory="groovie_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/groovie.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
+		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
+		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<File
-			RelativePath="..\..\engines\groovie\cell.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\cell.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\cursor.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\cursor.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\debug.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\debug.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\detection.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\font.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\font.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\graphics.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\graphics.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\groovie.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\groovie.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\lzss.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\lzss.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\music.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\music.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\player.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\player.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\resource.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\resource.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\roq.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\roq.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\saveload.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\saveload.h"
-			>
-		</File>		
-		<File
-			RelativePath="..\..\engines\groovie\script.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\script.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\vdx.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\vdx.h"
-			>
-		</File>
+		<File RelativePath="..\..\engines\groovie\cell.cpp" />
+		<File RelativePath="..\..\engines\groovie\cell.h" />
+		<File RelativePath="..\..\engines\groovie\cursor.cpp" />
+		<File RelativePath="..\..\engines\groovie\cursor.h" />
+		<File RelativePath="..\..\engines\groovie\debug.cpp" />
+		<File RelativePath="..\..\engines\groovie\debug.h" />
+		<File RelativePath="..\..\engines\groovie\detection.cpp" />
+		<File RelativePath="..\..\engines\groovie\font.cpp" />
+		<File RelativePath="..\..\engines\groovie\font.h" />
+		<File RelativePath="..\..\engines\groovie\graphics.cpp" />
+		<File RelativePath="..\..\engines\groovie\graphics.h" />
+		<File RelativePath="..\..\engines\groovie\groovie.cpp" />
+		<File RelativePath="..\..\engines\groovie\groovie.h" />
+		<File RelativePath="..\..\engines\groovie\lzss.cpp" />
+		<File RelativePath="..\..\engines\groovie\lzss.h" />
+		<File RelativePath="..\..\engines\groovie\music.cpp" />
+		<File RelativePath="..\..\engines\groovie\music.h" />
+		<File RelativePath="..\..\engines\groovie\player.cpp" />
+		<File RelativePath="..\..\engines\groovie\player.h" />
+		<File RelativePath="..\..\engines\groovie\resource.cpp" />
+		<File RelativePath="..\..\engines\groovie\resource.h" />
+		<File RelativePath="..\..\engines\groovie\roq.cpp" />
+		<File RelativePath="..\..\engines\groovie\roq.h" />
+		<File RelativePath="..\..\engines\groovie\saveload.cpp" />
+		<File RelativePath="..\..\engines\groovie\saveload.h" />		
+		<File RelativePath="..\..\engines\groovie\script.cpp" />
+		<File RelativePath="..\..\engines\groovie\script.h" />
+		<File RelativePath="..\..\engines\groovie\vdx.cpp" />
+		<File RelativePath="..\..\engines\groovie\vdx.h" />
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>
diff --git a/dists/msvc9/igor.vcproj b/dists/msvc9/igor.vcproj
index b812db787c..0d0b8739a7 100644
--- a/dists/msvc9/igor.vcproj
+++ b/dists/msvc9/igor.vcproj
@@ -9,321 +9,52 @@
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="igor_Debug"
-			IntermediateDirectory="igor_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/igor.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="igor_Release"
-			IntermediateDirectory="igor_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/igor.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
+		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
+		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<Filter
-			Name="parts"
-			>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_04.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_05.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_06.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_12.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_13.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_14.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_15.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_16.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_17.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_18.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_19.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_21.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_22.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_23.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_24.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_25.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_26.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_27.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_28.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_30.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_31.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_33.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_36.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_37.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_75.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_85.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_90.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_95.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_main.cpp"
-				>
-			</File>
+		<Filter Name="parts">
+			<File RelativePath="..\..\engines\igor\parts\part_04.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_05.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_06.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_12.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_13.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_14.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_15.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_16.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_17.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_18.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_19.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_21.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_22.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_23.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_24.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_25.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_26.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_27.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_28.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_30.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_31.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_33.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_36.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_37.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_75.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_85.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_90.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_95.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_main.cpp" />
 		</Filter>
-		<File
-			RelativePath="..\..\engines\igor\detection.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\igor\igor.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\igor\igor.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\igor\menu.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\igor\midi.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\igor\midi.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\igor\resource_ids.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\igor\saveload.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\igor\staticres.cpp"
-			>
-		</File>
+		<File RelativePath="..\..\engines\igor\detection.cpp" />
+		<File RelativePath="..\..\engines\igor\igor.cpp" />
+		<File RelativePath="..\..\engines\igor\igor.h" />
+		<File RelativePath="..\..\engines\igor\menu.cpp" />
+		<File RelativePath="..\..\engines\igor\midi.cpp" />
+		<File RelativePath="..\..\engines\igor\midi.h" />
+		<File RelativePath="..\..\engines\igor\resource_ids.h" />
+		<File RelativePath="..\..\engines\igor\saveload.cpp" />
+		<File RelativePath="..\..\engines\igor\staticres.cpp" />
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>
diff --git a/dists/msvc9/kyra.vcproj b/dists/msvc9/kyra.vcproj
index e3902094e5..98b2609718 100644
--- a/dists/msvc9/kyra.vcproj
+++ b/dists/msvc9/kyra.vcproj
@@ -9,629 +9,128 @@
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="kyra_Debug"
-			IntermediateDirectory="kyra_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;ENABLE_LOL"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/kyra.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="kyra_Release"
-			IntermediateDirectory="kyra_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;ENABLE_LOL"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/kyra.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
+		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
+		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<File
-			RelativePath="..\..\engines\kyra\animator_hof.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\animator_lok.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\animator_lok.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\animator_mr.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\animator_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\debugger.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\debugger.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\detection.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui_hof.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui_hof.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui_lok.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui_lok.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui_lol.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui_lol.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui_mr.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui_mr.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui_v2.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\items_hof.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\items_lok.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\items_lol.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\items_mr.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\items_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\kyra_hof.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\kyra_hof.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\kyra_lok.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\kyra_lok.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\kyra_mr.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\kyra_mr.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\kyra_v1.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\kyra_v1.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\kyra_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\kyra_v2.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\lol.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\lol.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\resource.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\resource.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\resource_intern.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\resource_intern.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\saveload.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\saveload_hof.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\saveload_lok.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\saveload_lol.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\saveload_mr.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\scene_hof.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\scene_lok.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\scene_lol.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\scene_mr.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\scene_v1.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\scene_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen_hof.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen_hof.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen_lok.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen_lok.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen_lol.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen_lol.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen_mr.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen_mr.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen_v2.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\script.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\script.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\script_hof.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\script_lok.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\script_lol.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\script_mr.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\script_tim.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\script_tim.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\script_v1.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\script_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\seqplayer.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\seqplayer.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sequences_hof.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sequences_lok.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sequences_lol.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sequences_mr.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sequences_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sound.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sound.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sound_adlib.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sound_digital.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sound_intern.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sound_lok.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sound_lol.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sound_midi.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sound_pcspk.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sound_towns.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sprites.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sprites.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\sprites_lol.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\staticres.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\text.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\text.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\text_hof.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\text_hof.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\text_lok.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\text_lol.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\text_lol.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\text_mr.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\text_mr.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\timer.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\timer.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\timer_hof.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\timer_lok.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\timer_lol.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\timer_mr.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\util.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\util.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\vqa.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\vqa.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\wsamovie.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\wsamovie.h"
-			>
-		</File>
+		<File RelativePath="..\..\engines\kyra\animator_hof.cpp" />
+		<File RelativePath="..\..\engines\kyra\animator_lok.cpp" />
+		<File RelativePath="..\..\engines\kyra\animator_lok.h" />
+		<File RelativePath="..\..\engines\kyra\animator_mr.cpp" />
+		<File RelativePath="..\..\engines\kyra\animator_v2.cpp" />
+		<File RelativePath="..\..\engines\kyra\debugger.cpp" />
+		<File RelativePath="..\..\engines\kyra\debugger.h" />
+		<File RelativePath="..\..\engines\kyra\detection.cpp" />
+		<File RelativePath="..\..\engines\kyra\gui.cpp" />
+		<File RelativePath="..\..\engines\kyra\gui.h" />
+		<File RelativePath="..\..\engines\kyra\gui_hof.cpp" />
+		<File RelativePath="..\..\engines\kyra\gui_hof.h" />
+		<File RelativePath="..\..\engines\kyra\gui_lok.cpp" />
+		<File RelativePath="..\..\engines\kyra\gui_lok.h" />
+		<File RelativePath="..\..\engines\kyra\gui_lol.cpp" />
+		<File RelativePath="..\..\engines\kyra\gui_lol.h" />
+		<File RelativePath="..\..\engines\kyra\gui_mr.cpp" />
+		<File RelativePath="..\..\engines\kyra\gui_mr.h" />
+		<File RelativePath="..\..\engines\kyra\gui_v2.cpp" />
+		<File RelativePath="..\..\engines\kyra\gui_v2.h" />
+		<File RelativePath="..\..\engines\kyra\items_hof.cpp" />
+		<File RelativePath="..\..\engines\kyra\items_lok.cpp" />
+		<File RelativePath="..\..\engines\kyra\items_lol.cpp" />
+		<File RelativePath="..\..\engines\kyra\items_mr.cpp" />
+		<File RelativePath="..\..\engines\kyra\items_v2.cpp" />
+		<File RelativePath="..\..\engines\kyra\kyra_hof.cpp" />
+		<File RelativePath="..\..\engines\kyra\kyra_hof.h" />
+		<File RelativePath="..\..\engines\kyra\kyra_lok.cpp" />
+		<File RelativePath="..\..\engines\kyra\kyra_lok.h" />
+		<File RelativePath="..\..\engines\kyra\kyra_mr.cpp" />
+		<File RelativePath="..\..\engines\kyra\kyra_mr.h" />
+		<File RelativePath="..\..\engines\kyra\kyra_v1.cpp" />
+		<File RelativePath="..\..\engines\kyra\kyra_v1.h" />
+		<File RelativePath="..\..\engines\kyra\kyra_v2.cpp" />
+		<File RelativePath="..\..\engines\kyra\kyra_v2.h" />
+		<File RelativePath="..\..\engines\kyra\lol.cpp" />
+		<File RelativePath="..\..\engines\kyra\lol.h" />
+		<File RelativePath="..\..\engines\kyra\resource.cpp" />
+		<File RelativePath="..\..\engines\kyra\resource.h" />
+		<File RelativePath="..\..\engines\kyra\resource_intern.cpp" />
+		<File RelativePath="..\..\engines\kyra\resource_intern.h" />
+		<File RelativePath="..\..\engines\kyra\saveload.cpp" />
+		<File RelativePath="..\..\engines\kyra\saveload_hof.cpp" />
+		<File RelativePath="..\..\engines\kyra\saveload_lok.cpp" />
+		<File RelativePath="..\..\engines\kyra\saveload_lol.cpp" />
+		<File RelativePath="..\..\engines\kyra\saveload_mr.cpp" />
+		<File RelativePath="..\..\engines\kyra\scene_hof.cpp" />
+		<File RelativePath="..\..\engines\kyra\scene_lok.cpp" />
+		<File RelativePath="..\..\engines\kyra\scene_lol.cpp" />
+		<File RelativePath="..\..\engines\kyra\scene_mr.cpp" />
+		<File RelativePath="..\..\engines\kyra\scene_v1.cpp" />
+		<File RelativePath="..\..\engines\kyra\scene_v2.cpp" />
+		<File RelativePath="..\..\engines\kyra\screen.cpp" />
+		<File RelativePath="..\..\engines\kyra\screen.h" />
+		<File RelativePath="..\..\engines\kyra\screen_hof.cpp" />
+		<File RelativePath="..\..\engines\kyra\screen_hof.h" />
+		<File RelativePath="..\..\engines\kyra\screen_lok.cpp" />
+		<File RelativePath="..\..\engines\kyra\screen_lok.h" />
+		<File RelativePath="..\..\engines\kyra\screen_lol.cpp" />
+		<File RelativePath="..\..\engines\kyra\screen_lol.h" />
+		<File RelativePath="..\..\engines\kyra\screen_mr.cpp" />
+		<File RelativePath="..\..\engines\kyra\screen_mr.h" />
+		<File RelativePath="..\..\engines\kyra\screen_v2.cpp" />
+		<File RelativePath="..\..\engines\kyra\screen_v2.h" />
+		<File RelativePath="..\..\engines\kyra\script.cpp" />
+		<File RelativePath="..\..\engines\kyra\script.h" />
+		<File RelativePath="..\..\engines\kyra\script_hof.cpp" />
+		<File RelativePath="..\..\engines\kyra\script_lok.cpp" />
+		<File RelativePath="..\..\engines\kyra\script_lol.cpp" />
+		<File RelativePath="..\..\engines\kyra\script_mr.cpp" />
+		<File RelativePath="..\..\engines\kyra\script_tim.cpp" />
+		<File RelativePath="..\..\engines\kyra\script_tim.h" />
+		<File RelativePath="..\..\engines\kyra\script_v1.cpp" />
+		<File RelativePath="..\..\engines\kyra\script_v2.cpp" />
+		<File RelativePath="..\..\engines\kyra\seqplayer.cpp" />
+		<File RelativePath="..\..\engines\kyra\seqplayer.h" />
+		<File RelativePath="..\..\engines\kyra\sequences_hof.cpp" />
+		<File RelativePath="..\..\engines\kyra\sequences_lok.cpp" />
+		<File RelativePath="..\..\engines\kyra\sequences_lol.cpp" />
+		<File RelativePath="..\..\engines\kyra\sequences_mr.cpp" />
+		<File RelativePath="..\..\engines\kyra\sequences_v2.cpp" />
+		<File RelativePath="..\..\engines\kyra\sound.cpp" />
+		<File RelativePath="..\..\engines\kyra\sound.h" />
+		<File RelativePath="..\..\engines\kyra\sound_adlib.cpp" />
+		<File RelativePath="..\..\engines\kyra\sound_digital.cpp" />
+		<File RelativePath="..\..\engines\kyra\sound_intern.h" />
+		<File RelativePath="..\..\engines\kyra\sound_lok.cpp" />
+		<File RelativePath="..\..\engines\kyra\sound_lol.cpp" />
+		<File RelativePath="..\..\engines\kyra\sound_midi.cpp" />
+		<File RelativePath="..\..\engines\kyra\sound_pcspk.cpp" />
+		<File RelativePath="..\..\engines\kyra\sound_towns.cpp" />
+		<File RelativePath="..\..\engines\kyra\sprites.cpp" />
+		<File RelativePath="..\..\engines\kyra\sprites.h" />
+		<File RelativePath="..\..\engines\kyra\sprites_lol.cpp" />
+		<File RelativePath="..\..\engines\kyra\staticres.cpp" />
+		<File RelativePath="..\..\engines\kyra\text.cpp" />
+		<File RelativePath="..\..\engines\kyra\text.h" />
+		<File RelativePath="..\..\engines\kyra\text_hof.cpp" />
+		<File RelativePath="..\..\engines\kyra\text_hof.h" />
+		<File RelativePath="..\..\engines\kyra\text_lok.cpp" />
+		<File RelativePath="..\..\engines\kyra\text_lol.cpp" />
+		<File RelativePath="..\..\engines\kyra\text_lol.h" />
+		<File RelativePath="..\..\engines\kyra\text_mr.cpp" />
+		<File RelativePath="..\..\engines\kyra\text_mr.h" />
+		<File RelativePath="..\..\engines\kyra\timer.cpp" />
+		<File RelativePath="..\..\engines\kyra\timer.h" />
+		<File RelativePath="..\..\engines\kyra\timer_hof.cpp" />
+		<File RelativePath="..\..\engines\kyra\timer_lok.cpp" />
+		<File RelativePath="..\..\engines\kyra\timer_lol.cpp" />
+		<File RelativePath="..\..\engines\kyra\timer_mr.cpp" />
+		<File RelativePath="..\..\engines\kyra\util.cpp" />
+		<File RelativePath="..\..\engines\kyra\util.h" />
+		<File RelativePath="..\..\engines\kyra\vqa.cpp" />
+		<File RelativePath="..\..\engines\kyra\vqa.h" />
+		<File RelativePath="..\..\engines\kyra\wsamovie.cpp" />
+		<File RelativePath="..\..\engines\kyra\wsamovie.h" />
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>
diff --git a/dists/msvc9/lure.vcproj b/dists/msvc9/lure.vcproj
index 2915a69dbc..a4590a40e7 100644
--- a/dists/msvc9/lure.vcproj
+++ b/dists/msvc9/lure.vcproj
@@ -9,341 +9,56 @@
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="lure_Debug"
-			IntermediateDirectory="lure_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/lure.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="lure_Release"
-			IntermediateDirectory="lure_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/lure.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
+		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
+		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<File
-			RelativePath="..\..\engines\lure\animseq.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\animseq.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\debugger.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\debugger.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\decode.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\decode.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\detection.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\disk.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\disk.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\events.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\events.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\fights.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\fights.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\game.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\game.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\hotspots.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\hotspots.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\intro.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\intro.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\lure.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\lure.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\luredefs.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\memory.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\memory.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\menu.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\menu.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\palette.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\palette.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\res.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\res.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\res_struct.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\res_struct.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\room.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\room.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\screen.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\screen.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\scripts.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\scripts.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\sound.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\sound.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\strings.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\strings.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\surface.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\surface.h"
-			>
-		</File>
+		<File RelativePath="..\..\engines\lure\animseq.cpp" />
+		<File RelativePath="..\..\engines\lure\animseq.h" />
+		<File RelativePath="..\..\engines\lure\debugger.cpp" />
+		<File RelativePath="..\..\engines\lure\debugger.h" />
+		<File RelativePath="..\..\engines\lure\decode.cpp" />
+		<File RelativePath="..\..\engines\lure\decode.h" />
+		<File RelativePath="..\..\engines\lure\detection.cpp" />
+		<File RelativePath="..\..\engines\lure\disk.cpp" />
+		<File RelativePath="..\..\engines\lure\disk.h" />
+		<File RelativePath="..\..\engines\lure\events.cpp" />
+		<File RelativePath="..\..\engines\lure\events.h" />
+		<File RelativePath="..\..\engines\lure\fights.cpp" />
+		<File RelativePath="..\..\engines\lure\fights.h" />
+		<File RelativePath="..\..\engines\lure\game.cpp" />
+		<File RelativePath="..\..\engines\lure\game.h" />
+		<File RelativePath="..\..\engines\lure\hotspots.cpp" />
+		<File RelativePath="..\..\engines\lure\hotspots.h" />
+		<File RelativePath="..\..\engines\lure\intro.cpp" />
+		<File RelativePath="..\..\engines\lure\intro.h" />
+		<File RelativePath="..\..\engines\lure\lure.cpp" />
+		<File RelativePath="..\..\engines\lure\lure.h" />
+		<File RelativePath="..\..\engines\lure\luredefs.h" />
+		<File RelativePath="..\..\engines\lure\memory.cpp" />
+		<File RelativePath="..\..\engines\lure\memory.h" />
+		<File RelativePath="..\..\engines\lure\menu.cpp" />
+		<File RelativePath="..\..\engines\lure\menu.h" />
+		<File RelativePath="..\..\engines\lure\palette.cpp" />
+		<File RelativePath="..\..\engines\lure\palette.h" />
+		<File RelativePath="..\..\engines\lure\res.cpp" />
+		<File RelativePath="..\..\engines\lure\res.h" />
+		<File RelativePath="..\..\engines\lure\res_struct.cpp" />
+		<File RelativePath="..\..\engines\lure\res_struct.h" />
+		<File RelativePath="..\..\engines\lure\room.cpp" />
+		<File RelativePath="..\..\engines\lure\room.h" />
+		<File RelativePath="..\..\engines\lure\screen.cpp" />
+		<File RelativePath="..\..\engines\lure\screen.h" />
+		<File RelativePath="..\..\engines\lure\scripts.cpp" />
+		<File RelativePath="..\..\engines\lure\scripts.h" />
+		<File RelativePath="..\..\engines\lure\sound.cpp" />
+		<File RelativePath="..\..\engines\lure\sound.h" />
+		<File RelativePath="..\..\engines\lure\strings.cpp" />
+		<File RelativePath="..\..\engines\lure\strings.h" />
+		<File RelativePath="..\..\engines\lure\surface.cpp" />
+		<File RelativePath="..\..\engines\lure\surface.h" />
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>
diff --git a/dists/msvc9/m4.vcproj b/dists/msvc9/m4.vcproj
index 89cf4cef78..3bd8fc1e5c 100644
--- a/dists/msvc9/m4.vcproj
+++ b/dists/msvc9/m4.vcproj
@@ -9,397 +9,70 @@
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="m4_Debug"
-			IntermediateDirectory="m4_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/m4.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="m4_Release"
-			IntermediateDirectory="m4_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/m4.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
+		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
+		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<File
-			RelativePath="..\..\engines\m4\actor.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\actor.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\animation.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\animation.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\assets.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\assets.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\burger_data.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\compression.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\compression.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\console.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\console.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\converse.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\converse.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\detection.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\events.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\events.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\font.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\font.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\globals.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\globals.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\graphics.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\graphics.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\gui.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\gui.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\hotspot.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\hotspot.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\m4.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\m4.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\m4_menus.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\m4_menus.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\m4_views.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\m4_views.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\mads_anim.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\mads_anim.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\mads_menus.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\mads_menus.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\midi.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\midi.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\rails.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\rails.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\resource.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\resource.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\saveload.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\saveload.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\scene.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\scene.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\script.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\script.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\sound.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\sound.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\sprite.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\sprite.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\viewmgr.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\viewmgr.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\woodscript.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\woodscript.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\ws_machine.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\m4\ws_sequence.cpp"
-			>
-		</File>
+		<File RelativePath="..\..\engines\m4\actor.cpp" />
+		<File RelativePath="..\..\engines\m4\actor.h" />
+		<File RelativePath="..\..\engines\m4\animation.cpp" />
+		<File RelativePath="..\..\engines\m4\animation.h" />
+		<File RelativePath="..\..\engines\m4\assets.cpp" />
+		<File RelativePath="..\..\engines\m4\assets.h" />
+		<File RelativePath="..\..\engines\m4\burger_data.h" />
+		<File RelativePath="..\..\engines\m4\compression.cpp" />
+		<File RelativePath="..\..\engines\m4\compression.h" />
+		<File RelativePath="..\..\engines\m4\console.cpp" />
+		<File RelativePath="..\..\engines\m4\console.h" />
+		<File RelativePath="..\..\engines\m4\converse.cpp" />
+		<File RelativePath="..\..\engines\m4\converse.h" />
+		<File RelativePath="..\..\engines\m4\detection.cpp" />
+		<File RelativePath="..\..\engines\m4\events.cpp" />
+		<File RelativePath="..\..\engines\m4\events.h" />
+		<File RelativePath="..\..\engines\m4\font.cpp" />
+		<File RelativePath="..\..\engines\m4\font.h" />
+		<File RelativePath="..\..\engines\m4\globals.cpp" />
+		<File RelativePath="..\..\engines\m4\globals.h" />
+		<File RelativePath="..\..\engines\m4\graphics.cpp" />
+		<File RelativePath="..\..\engines\m4\graphics.h" />
+		<File RelativePath="..\..\engines\m4\gui.cpp" />
+		<File RelativePath="..\..\engines\m4\gui.h" />
+		<File RelativePath="..\..\engines\m4\hotspot.cpp" />
+		<File RelativePath="..\..\engines\m4\hotspot.h" />
+		<File RelativePath="..\..\engines\m4\m4.cpp" />
+		<File RelativePath="..\..\engines\m4\m4.h" />
+		<File RelativePath="..\..\engines\m4\m4_menus.cpp" />
+		<File RelativePath="..\..\engines\m4\m4_menus.h" />
+		<File RelativePath="..\..\engines\m4\m4_views.cpp" />
+		<File RelativePath="..\..\engines\m4\m4_views.h" />
+		<File RelativePath="..\..\engines\m4\mads_anim.cpp" />
+		<File RelativePath="..\..\engines\m4\mads_anim.h" />
+		<File RelativePath="..\..\engines\m4\mads_menus.cpp" />
+		<File RelativePath="..\..\engines\m4\mads_menus.h" />
+		<File RelativePath="..\..\engines\m4\midi.cpp" />
+		<File RelativePath="..\..\engines\m4\midi.h" />
+		<File RelativePath="..\..\engines\m4\rails.cpp" />
+		<File RelativePath="..\..\engines\m4\rails.h" />
+		<File RelativePath="..\..\engines\m4\resource.cpp" />
+		<File RelativePath="..\..\engines\m4\resource.h" />
+		<File RelativePath="..\..\engines\m4\saveload.cpp" />
+		<File RelativePath="..\..\engines\m4\saveload.h" />
+		<File RelativePath="..\..\engines\m4\scene.cpp" />
+		<File RelativePath="..\..\engines\m4\scene.h" />
+		<File RelativePath="..\..\engines\m4\script.cpp" />
+		<File RelativePath="..\..\engines\m4\script.h" />
+		<File RelativePath="..\..\engines\m4\sound.cpp" />
+		<File RelativePath="..\..\engines\m4\sound.h" />
+		<File RelativePath="..\..\engines\m4\sprite.cpp" />
+		<File RelativePath="..\..\engines\m4\sprite.h" />
+		<File RelativePath="..\..\engines\m4\viewmgr.cpp" />
+		<File RelativePath="..\..\engines\m4\viewmgr.h" />
+		<File RelativePath="..\..\engines\m4\woodscript.cpp" />
+		<File RelativePath="..\..\engines\m4\woodscript.h" />
+		<File RelativePath="..\..\engines\m4\ws_machine.cpp" />
+		<File RelativePath="..\..\engines\m4\ws_sequence.cpp" />
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>
diff --git a/dists/msvc9/made.vcproj b/dists/msvc9/made.vcproj
index 880b484be3..5272eae1b5 100644
--- a/dists/msvc9/made.vcproj
+++ b/dists/msvc9/made.vcproj
@@ -9,265 +9,37 @@
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="made_Debug"
-			IntermediateDirectory="made_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/made.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="made_Release"
-			IntermediateDirectory="made_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/made.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
+		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
+		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<File
-			RelativePath="..\..\engines\made\database.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\made\database.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\made\detection.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\made\graphics.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\made\graphics.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\made\made.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\made\made.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\made\music.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\made\music.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\made\pmvplayer.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\made\pmvplayer.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\made\redreader.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\made\redreader.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\made\resource.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\made\resource.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\made\screen.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\made\screen.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\made\screenfx.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\made\screenfx.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\made\script.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\made\script.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\made\scriptfuncs.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\made\scriptfuncs.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\made\sound.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\made\sound.h"
-			>
-		</File>
+		<File RelativePath="..\..\engines\made\database.cpp" />
+		<File RelativePath="..\..\engines\made\database.h" />
+		<File RelativePath="..\..\engines\made\detection.cpp" />
+		<File RelativePath="..\..\engines\made\graphics.cpp" />
+		<File RelativePath="..\..\engines\made\graphics.h" />
+		<File RelativePath="..\..\engines\made\made.cpp" />
+		<File RelativePath="..\..\engines\made\made.h" />
+		<File RelativePath="..\..\engines\made\music.cpp" />
+		<File RelativePath="..\..\engines\made\music.h" />
+		<File RelativePath="..\..\engines\made\pmvplayer.cpp" />
+		<File RelativePath="..\..\engines\made\pmvplayer.h" />
+		<File RelativePath="..\..\engines\made\redreader.cpp" />
+		<File RelativePath="..\..\engines\made\redreader.h" />
+		<File RelativePath="..\..\engines\made\resource.cpp" />
+		<File RelativePath="..\..\engines\made\resource.h" />
+		<File RelativePath="..\..\engines\made\screen.cpp" />
+		<File RelativePath="..\..\engines\made\screen.h" />
+		<File RelativePath="..\..\engines\made\screenfx.cpp" />
+		<File RelativePath="..\..\engines\made\screenfx.h" />
+		<File RelativePath="..\..\engines\made\script.cpp" />
+		<File RelativePath="..\..\engines\made\script.h" />
+		<File RelativePath="..\..\engines\made\scriptfuncs.cpp" />
+		<File RelativePath="..\..\engines\made\scriptfuncs.h" />
+		<File RelativePath="..\..\engines\made\sound.cpp" />
+		<File RelativePath="..\..\engines\made\sound.h" />
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>
diff --git a/dists/msvc9/parallaction.vcproj b/dists/msvc9/parallaction.vcproj
index f5fc1cee79..acefaedf41 100644
--- a/dists/msvc9/parallaction.vcproj
+++ b/dists/msvc9/parallaction.vcproj
@@ -9,345 +9,57 @@
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="parallaction_Debug"
-			IntermediateDirectory="parallaction_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/parallaction.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="parallaction_Release"
-			IntermediateDirectory="parallaction_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/parallaction.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
+		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
+		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<File
-			RelativePath="..\..\engines\parallaction\balloons.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\callables_br.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\callables_ns.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\debug.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\debug.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\detection.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\dialogue.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\disk.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\disk.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\disk_br.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\disk_ns.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\exec.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\exec.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\exec_br.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\exec_ns.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\font.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\gfxbase.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\graphics.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\graphics.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\gui.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\gui.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\gui_br.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\gui_ns.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\input.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\input.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\inventory.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\inventory.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\objects.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\objects.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\parallaction.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\parallaction.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\parallaction_br.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\parallaction_ns.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\parser.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\parser.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\parser_br.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\parser_ns.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\saveload.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\saveload.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\sound.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\sound_br.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\sound_ns.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\staticres.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\walk.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\walk.h"
-			>
-		</File>
+		<File RelativePath="..\..\engines\parallaction\balloons.cpp" />
+		<File RelativePath="..\..\engines\parallaction\callables_br.cpp" />
+		<File RelativePath="..\..\engines\parallaction\callables_ns.cpp" />
+		<File RelativePath="..\..\engines\parallaction\debug.cpp" />
+		<File RelativePath="..\..\engines\parallaction\debug.h" />
+		<File RelativePath="..\..\engines\parallaction\detection.cpp" />
+		<File RelativePath="..\..\engines\parallaction\dialogue.cpp" />
+		<File RelativePath="..\..\engines\parallaction\disk.cpp" />
+		<File RelativePath="..\..\engines\parallaction\disk.h" />
+		<File RelativePath="..\..\engines\parallaction\disk_br.cpp" />
+		<File RelativePath="..\..\engines\parallaction\disk_ns.cpp" />
+		<File RelativePath="..\..\engines\parallaction\exec.cpp" />
+		<File RelativePath="..\..\engines\parallaction\exec.h" />
+		<File RelativePath="..\..\engines\parallaction\exec_br.cpp" />
+		<File RelativePath="..\..\engines\parallaction\exec_ns.cpp" />
+		<File RelativePath="..\..\engines\parallaction\font.cpp" />
+		<File RelativePath="..\..\engines\parallaction\gfxbase.cpp" />
+		<File RelativePath="..\..\engines\parallaction\graphics.cpp" />
+		<File RelativePath="..\..\engines\parallaction\graphics.h" />
+		<File RelativePath="..\..\engines\parallaction\gui.cpp" />
+		<File RelativePath="..\..\engines\parallaction\gui.h" />
+		<File RelativePath="..\..\engines\parallaction\gui_br.cpp" />
+		<File RelativePath="..\..\engines\parallaction\gui_ns.cpp" />
+		<File RelativePath="..\..\engines\parallaction\input.cpp" />
+		<File RelativePath="..\..\engines\parallaction\input.h" />
+		<File RelativePath="..\..\engines\parallaction\inventory.cpp" />
+		<File RelativePath="..\..\engines\parallaction\inventory.h" />
+		<File RelativePath="..\..\engines\parallaction\objects.cpp" />
+		<File RelativePath="..\..\engines\parallaction\objects.h" />
+		<File RelativePath="..\..\engines\parallaction\parallaction.cpp" />
+		<File RelativePath="..\..\engines\parallaction\parallaction.h" />
+		<File RelativePath="..\..\engines\parallaction\parallaction_br.cpp" />
+		<File RelativePath="..\..\engines\parallaction\parallaction_ns.cpp" />
+		<File RelativePath="..\..\engines\parallaction\parser.cpp" />
+		<File RelativePath="..\..\engines\parallaction\parser.h" />
+		<File RelativePath="..\..\engines\parallaction\parser_br.cpp" />
+		<File RelativePath="..\..\engines\parallaction\parser_ns.cpp" />
+		<File RelativePath="..\..\engines\parallaction\saveload.cpp" />
+		<File RelativePath="..\..\engines\parallaction\saveload.h" />
+		<File RelativePath="..\..\engines\parallaction\sound.h" />
+		<File RelativePath="..\..\engines\parallaction\sound_br.cpp" />
+		<File RelativePath="..\..\engines\parallaction\sound_ns.cpp" />
+		<File RelativePath="..\..\engines\parallaction\staticres.cpp" />
+		<File RelativePath="..\..\engines\parallaction\walk.cpp" />
+		<File RelativePath="..\..\engines\parallaction\walk.h" />
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>
diff --git a/dists/msvc9/queen.vcproj b/dists/msvc9/queen.vcproj
index 384cede45c..787cbfab93 100644
--- a/dists/msvc9/queen.vcproj
+++ b/dists/msvc9/queen.vcproj
@@ -9,329 +9,53 @@
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="queen_Debug"
-			IntermediateDirectory="queen_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/queen.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="queen_Release"
-			IntermediateDirectory="queen_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/queen.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
+		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
+		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<File
-			RelativePath="..\..\engines\queen\bankman.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\bankman.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\command.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\command.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\credits.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\credits.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\cutaway.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\cutaway.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\debug.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\debug.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\defs.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\display.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\display.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\graphics.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\graphics.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\grid.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\grid.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\input.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\input.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\journal.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\journal.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\logic.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\logic.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\midiadlib.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\music.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\music.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\musicdata.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\queen.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\queen.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\resource.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\resource.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\restables.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\sound.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\sound.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\state.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\state.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\structs.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\talk.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\talk.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\walk.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\queen\walk.h"
-			>
-		</File>
+		<File RelativePath="..\..\engines\queen\bankman.cpp" />
+		<File RelativePath="..\..\engines\queen\bankman.h" />
+		<File RelativePath="..\..\engines\queen\command.cpp" />
+		<File RelativePath="..\..\engines\queen\command.h" />
+		<File	RelativePath="..\..\engines\queen\credits.cpp" />
+		<File	RelativePath="..\..\engines\queen\credits.h" />
+		<File	RelativePath="..\..\engines\queen\cutaway.cpp" />
+		<File	RelativePath="..\..\engines\queen\cutaway.h" />
+		<File	RelativePath="..\..\engines\queen\debug.cpp" />
+		<File	RelativePath="..\..\engines\queen\debug.h" />
+		<File	RelativePath="..\..\engines\queen\defs.h" />
+		<File	RelativePath="..\..\engines\queen\display.cpp" />
+		<File	RelativePath="..\..\engines\queen\display.h" />
+		<File	RelativePath="..\..\engines\queen\graphics.cpp" />
+		<File	RelativePath="..\..\engines\queen\graphics.h" />
+		<File	RelativePath="..\..\engines\queen\grid.cpp" />
+		<File	RelativePath="..\..\engines\queen\grid.h" />
+		<File	RelativePath="..\..\engines\queen\input.cpp" />
+		<File	RelativePath="..\..\engines\queen\input.h" />
+		<File RelativePath="..\..\engines\queen\journal.cpp" />
+		<File RelativePath="..\..\engines\queen\journal.h" />
+		<File RelativePath="..\..\engines\queen\logic.cpp" />
+		<File RelativePath="..\..\engines\queen\logic.h" />
+		<File RelativePath="..\..\engines\queen\midiadlib.cpp" />
+		<File RelativePath="..\..\engines\queen\music.cpp" />
+		<File RelativePath="..\..\engines\queen\music.h" />
+		<File RelativePath="..\..\engines\queen\musicdata.cpp" />
+		<File RelativePath="..\..\engines\queen\queen.cpp" />
+		<File RelativePath="..\..\engines\queen\queen.h" />
+		<File RelativePath="..\..\engines\queen\resource.cpp" />
+		<File RelativePath="..\..\engines\queen\resource.h" />
+		<File RelativePath="..\..\engines\queen\restables.cpp" />
+		<File RelativePath="..\..\engines\queen\sound.cpp" />
+		<File RelativePath="..\..\engines\queen\sound.h" />
+		<File RelativePath="..\..\engines\queen\state.cpp" />
+		<File RelativePath="..\..\engines\queen\state.h" />
+		<File RelativePath="..\..\engines\queen\structs.h" />
+		<File RelativePath="..\..\engines\queen\talk.cpp" />
+		<File RelativePath="..\..\engines\queen\talk.h" />
+		<File RelativePath="..\..\engines\queen\walk.cpp" />
+		<File RelativePath="..\..\engines\queen\walk.h" />
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>
diff --git a/dists/msvc9/saga.vcproj b/dists/msvc9/saga.vcproj
index 98ef1b426b..993793d7b3 100644
--- a/dists/msvc9/saga.vcproj
+++ b/dists/msvc9/saga.vcproj
@@ -9,405 +9,72 @@
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="saga_Debug"
-			IntermediateDirectory="saga_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;ENABLE_IHNM;ENABLE_SAGA2;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/saga.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="saga_Release"
-			IntermediateDirectory="saga_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;ENABLE_IHNM;ENABLE_SAGA2;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/saga.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
+		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
+		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<File
-			RelativePath="..\..\engines\saga\actor.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\actor.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\actor_path.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\actor_walk.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\animation.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\animation.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\console.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\console.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\detection.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\detection_tables.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\displayinfo.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\events.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\events.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\font.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\font.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\font_map.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\gfx.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\gfx.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\image.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\input.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\interface.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\interface.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\introproc_ihnm.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\introproc_ite.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\introproc_saga2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\isomap.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\isomap.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\itedata.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\itedata.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\music.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\music.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\objectmap.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\objectmap.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\palanim.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\palanim.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\puzzle.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\puzzle.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\render.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\render.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\resource.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\resource.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\resource_hrs.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\resource_res.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\resource_rsc.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\saga.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\saga.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\saveload.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\scene.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\scene.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\script.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\script.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\sfuncs.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\sfuncs_ihnm.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\sndres.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\sndres.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\sound.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\sound.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\sprite.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\sprite.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\saga\sthread.cpp"
-			>
-		</File>
+		<File RelativePath="..\..\engines\saga\actor.cpp" />
+		<File RelativePath="..\..\engines\saga\actor.h" />
+		<File RelativePath="..\..\engines\saga\actor_path.cpp" />
+		<File RelativePath="..\..\engines\saga\actor_walk.cpp" />
+		<File RelativePath="..\..\engines\saga\animation.cpp" />
+		<File RelativePath="..\..\engines\saga\animation.h" />
+		<File RelativePath="..\..\engines\saga\console.cpp" />
+		<File RelativePath="..\..\engines\saga\console.h" />
+		<File RelativePath="..\..\engines\saga\detection.cpp" />
+		<File RelativePath="..\..\engines\saga\detection_tables.h" />
+		<File RelativePath="..\..\engines\saga\displayinfo.h" />
+		<File RelativePath="..\..\engines\saga\events.cpp" />
+		<File RelativePath="..\..\engines\saga\events.h" />
+		<File RelativePath="..\..\engines\saga\font.cpp" />
+		<File RelativePath="..\..\engines\saga\font.h" />
+		<File RelativePath="..\..\engines\saga\font_map.cpp" />
+		<File RelativePath="..\..\engines\saga\gfx.cpp" />
+		<File RelativePath="..\..\engines\saga\gfx.h" />
+		<File RelativePath="..\..\engines\saga\image.cpp" />
+		<File RelativePath="..\..\engines\saga\input.cpp" />
+		<File RelativePath="..\..\engines\saga\interface.cpp" />
+		<File RelativePath="..\..\engines\saga\interface.h" />
+		<File RelativePath="..\..\engines\saga\introproc_ihnm.cpp" />
+		<File RelativePath="..\..\engines\saga\introproc_ite.cpp" />
+		<File RelativePath="..\..\engines\saga\introproc_saga2.cpp" />
+		<File RelativePath="..\..\engines\saga\isomap.cpp" />
+		<File RelativePath="..\..\engines\saga\isomap.h" />
+		<File RelativePath="..\..\engines\saga\itedata.cpp" />
+		<File RelativePath="..\..\engines\saga\itedata.h" />
+		<File RelativePath="..\..\engines\saga\music.cpp" />
+		<File RelativePath="..\..\engines\saga\music.h" />
+		<File RelativePath="..\..\engines\saga\objectmap.cpp" />
+		<File RelativePath="..\..\engines\saga\objectmap.h" />
+		<File RelativePath="..\..\engines\saga\palanim.cpp" />
+		<File RelativePath="..\..\engines\saga\palanim.h" />
+		<File RelativePath="..\..\engines\saga\puzzle.cpp" />
+		<File RelativePath="..\..\engines\saga\puzzle.h" />
+		<File RelativePath="..\..\engines\saga\render.cpp" />
+		<File RelativePath="..\..\engines\saga\render.h" />
+		<File RelativePath="..\..\engines\saga\resource.cpp" />
+		<File RelativePath="..\..\engines\saga\resource.h" />
+		<File RelativePath="..\..\engines\saga\resource_hrs.cpp" />
+		<File RelativePath="..\..\engines\saga\resource_res.cpp" />
+		<File RelativePath="..\..\engines\saga\resource_rsc.cpp" />
+		<File RelativePath="..\..\engines\saga\saga.cpp" />
+		<File RelativePath="..\..\engines\saga\saga.h" />
+		<File RelativePath="..\..\engines\saga\saveload.cpp" />
+		<File RelativePath="..\..\engines\saga\scene.cpp" />
+		<File RelativePath="..\..\engines\saga\scene.h" />
+		<File RelativePath="..\..\engines\saga\script.cpp" />
+		<File RelativePath="..\..\engines\saga\script.h" />
+		<File RelativePath="..\..\engines\saga\sfuncs.cpp" />
+		<File RelativePath="..\..\engines\saga\sfuncs_ihnm.cpp" />
+		<File RelativePath="..\..\engines\saga\sndres.cpp" />
+		<File RelativePath="..\..\engines\saga\sndres.h" />
+		<File RelativePath="..\..\engines\saga\sound.cpp" />
+		<File RelativePath="..\..\engines\saga\sound.h" />
+		<File RelativePath="..\..\engines\saga\sprite.cpp" />
+		<File RelativePath="..\..\engines\saga\sprite.h" />
+		<File RelativePath="..\..\engines\saga\sthread.cpp" />
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>
diff --git a/dists/msvc9/sci.vcproj b/dists/msvc9/sci.vcproj
index 3a90afd545..d5a5f37f6c 100644
--- a/dists/msvc9/sci.vcproj
+++ b/dists/msvc9/sci.vcproj
@@ -9,625 +9,132 @@
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="sci_Debug"
-			IntermediateDirectory="sci_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="false"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/sci.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="sci_Release"
-			IntermediateDirectory="sci_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/sci.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
+		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
+		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<Filter
-			Name="engine"
-			>
-			<File
-				RelativePath="..\..\engines\sci\engine\game.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\gc.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\gc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\grammar.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\intmap.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\intmap.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\kernel.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\kernel.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\kernel_types.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\kevent.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\kfile.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\kgraphics.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\klists.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\kmath.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\kmenu.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\kmisc.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\kmovement.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\kpathing.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\kscripts.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\ksound.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\kstring.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\memobj.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\memobj.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\message.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\message.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\said.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\savegame.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\savegame.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\script.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\scriptdebug.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\seg_manager.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\seg_manager.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\state.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\state.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\stringfrag.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\vm.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\vm.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\engine\vm_types.h"
-				>
-			</File>
+		<Filter Name="engine">
+			<File RelativePath="..\..\engines\sci\engine\game.cpp" />
+			<File RelativePath="..\..\engines\sci\engine\gc.cpp" />
+			<File RelativePath="..\..\engines\sci\engine\gc.h" />
+			<File RelativePath="..\..\engines\sci\engine\grammar.cpp" />
+			<File RelativePath="..\..\engines\sci\engine\intmap.cpp" />
+			<File RelativePath="..\..\engines\sci\engine\intmap.h" />
+			<File RelativePath="..\..\engines\sci\engine\kernel.cpp" />
+			<File RelativePath="..\..\engines\sci\engine\kernel.h" />
+			<File RelativePath="..\..\engines\sci\engine\kernel_types.h" />
+			<File RelativePath="..\..\engines\sci\engine\kevent.cpp" />
+			<File RelativePath="..\..\engines\sci\engine\kfile.cpp" />
+			<File RelativePath="..\..\engines\sci\engine\kgraphics.cpp" />
+			<File RelativePath="..\..\engines\sci\engine\klists.cpp" />
+			<File RelativePath="..\..\engines\sci\engine\kmath.cpp" />
+			<File RelativePath="..\..\engines\sci\engine\kmenu.cpp" />
+			<File RelativePath="..\..\engines\sci\engine\kmisc.cpp" />
+			<File RelativePath="..\..\engines\sci\engine\kmovement.cpp" />
+			<File RelativePath="..\..\engines\sci\engine\kpathing.cpp" />
+			<File RelativePath="..\..\engines\sci\engine\kscripts.cpp" />
+			<File RelativePath="..\..\engines\sci\engine\ksound.cpp" />
+			<File RelativePath="..\..\engines\sci\engine\kstring.cpp" />
+			<File RelativePath="..\..\engines\sci\engine\memobj.cpp" />
+			<File RelativePath="..\..\engines\sci\engine\memobj.h" />
+			<File RelativePath="..\..\engines\sci\engine\message.cpp" />
+			<File RelativePath="..\..\engines\sci\engine\message.h" />
+			<File RelativePath="..\..\engines\sci\engine\said.cpp" />
+			<File RelativePath="..\..\engines\sci\engine\savegame.cpp" />
+			<File RelativePath="..\..\engines\sci\engine\savegame.h" />
+			<File RelativePath="..\..\engines\sci\engine\script.h" />
+			<File RelativePath="..\..\engines\sci\engine\scriptdebug.cpp" />
+			<File RelativePath="..\..\engines\sci\engine\seg_manager.cpp" />
+			<File RelativePath="..\..\engines\sci\engine\seg_manager.h" />
+			<File RelativePath="..\..\engines\sci\engine\state.cpp" />
+			<File RelativePath="..\..\engines\sci\engine\state.h" />
+			<File RelativePath="..\..\engines\sci\engine\stringfrag.cpp" />
+			<File RelativePath="..\..\engines\sci\engine\vm.cpp" />
+			<File RelativePath="..\..\engines\sci\engine\vm.h" />
+			<File RelativePath="..\..\engines\sci\engine\vm_types.h" />
 		</Filter>
-		<Filter
-			Name="gfx"
-			>
-			<File
-				RelativePath="..\..\engines\sci\gfx\font.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\font.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_driver.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_driver.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_gui.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_gui.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_options.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_pixmap_scale.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_res_options.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_res_options.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_resmgr.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_resmgr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_resource.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_resource.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_state_internal.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_support.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_system.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_tools.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_tools.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_widgets.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_widgets.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\menubar.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\menubar.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\operations.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\operations.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\palette.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\palette.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\res_cursor.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\res_font.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\res_pal.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\res_pic.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\res_view.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\seq_decoder.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\gfx\seq_decoder.h"
-				>
-			</File>
+		<Filter	Name="gfx">
+			<File RelativePath="..\..\engines\sci\gfx\font.cpp" />
+			<File RelativePath="..\..\engines\sci\gfx\font.h" />
+			<File RelativePath="..\..\engines\sci\gfx\gfx_driver.cpp" />
+			<File RelativePath="..\..\engines\sci\gfx\gfx_driver.h" />
+			<File RelativePath="..\..\engines\sci\gfx\gfx_gui.cpp" />
+			<File RelativePath="..\..\engines\sci\gfx\gfx_gui.h" />
+			<File RelativePath="..\..\engines\sci\gfx\gfx_options.h" />
+			<File RelativePath="..\..\engines\sci\gfx\gfx_pixmap_scale.cpp" />
+			<File RelativePath="..\..\engines\sci\gfx\gfx_res_options.cpp" />
+			<File RelativePath="..\..\engines\sci\gfx\gfx_res_options.h" />
+			<File RelativePath="..\..\engines\sci\gfx\gfx_resmgr.cpp" />
+			<File RelativePath="..\..\engines\sci\gfx\gfx_resmgr.h" />
+			<File RelativePath="..\..\engines\sci\gfx\gfx_resource.cpp" />
+			<File RelativePath="..\..\engines\sci\gfx\gfx_resource.h" />
+			<File RelativePath="..\..\engines\sci\gfx\gfx_state_internal.h" />
+			<File RelativePath="..\..\engines\sci\gfx\gfx_support.cpp" />
+			<File RelativePath="..\..\engines\sci\gfx\gfx_system.h" />
+			<File RelativePath="..\..\engines\sci\gfx\gfx_tools.cpp" />
+			<File RelativePath="..\..\engines\sci\gfx\gfx_tools.h" />
+			<File RelativePath="..\..\engines\sci\gfx\gfx_widgets.cpp" />
+			<File RelativePath="..\..\engines\sci\gfx\gfx_widgets.h" />
+			<File RelativePath="..\..\engines\sci\gfx\menubar.cpp" />
+			<File RelativePath="..\..\engines\sci\gfx\menubar.h" />
+			<File RelativePath="..\..\engines\sci\gfx\operations.cpp" />
+			<File RelativePath="..\..\engines\sci\gfx\operations.h" />
+			<File RelativePath="..\..\engines\sci\gfx\palette.cpp" />
+			<File RelativePath="..\..\engines\sci\gfx\palette.h" />
+			<File RelativePath="..\..\engines\sci\gfx\res_cursor.cpp" />
+			<File RelativePath="..\..\engines\sci\gfx\res_font.cpp" />
+			<File RelativePath="..\..\engines\sci\gfx\res_pal.cpp" />
+			<File RelativePath="..\..\engines\sci\gfx\res_pic.cpp" />
+			<File RelativePath="..\..\engines\sci\gfx\res_view.cpp" />
+			<File RelativePath="..\..\engines\sci\gfx\seq_decoder.cpp" />
+			<File RelativePath="..\..\engines\sci\gfx\seq_decoder.h" />
 		</Filter>
-		<Filter
-			Name="sfx"
-			>
-			<File
-				RelativePath="..\..\engines\sci\sfx\core.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\core.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\device.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\iterator.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\iterator.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\iterator_internal.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\misc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\player.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\sci_midi.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\sequencer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\sfx_pcm.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\softseq.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\songlib.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\songlib.h"
-				>
-			</File>
-			<Filter
-				Name="softseq"
-				>
-				<File
-					RelativePath="..\..\engines\sci\sfx\softseq\adlib.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\engines\sci\sfx\softseq\adlib.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\engines\sci\sfx\softseq\amiga.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\engines\sci\sfx\softseq\pcjr.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\engines\sci\sfx\softseq\pcjr.h"
-					>
-				</File>
+		<Filter	Name="sfx">
+			<File RelativePath="..\..\engines\sci\sfx\core.cpp" />
+			<File RelativePath="..\..\engines\sci\sfx\core.h" />
+			<File RelativePath="..\..\engines\sci\sfx\device.h" />
+			<File RelativePath="..\..\engines\sci\sfx\iterator.cpp" />
+			<File RelativePath="..\..\engines\sci\sfx\iterator.h" />
+			<File RelativePath="..\..\engines\sci\sfx\iterator_internal.h" />
+			<File RelativePath="..\..\engines\sci\sfx\misc.h" />
+			<File RelativePath="..\..\engines\sci\sfx\player.h" />
+			<File RelativePath="..\..\engines\sci\sfx\sci_midi.h" />
+			<File RelativePath="..\..\engines\sci\sfx\sequencer.h" />
+			<File RelativePath="..\..\engines\sci\sfx\sfx_pcm.h" />
+			<File RelativePath="..\..\engines\sci\sfx\softseq.h" />
+			<File RelativePath="..\..\engines\sci\sfx\songlib.cpp" />
+			<File RelativePath="..\..\engines\sci\sfx\songlib.h" />
+			<Filter	Name="softseq">
+				<File RelativePath="..\..\engines\sci\sfx\softseq\adlib.cpp" />
+				<File RelativePath="..\..\engines\sci\sfx\softseq\adlib.h" />
+				<File RelativePath="..\..\engines\sci\sfx\softseq\amiga.cpp" />
+				<File RelativePath="..\..\engines\sci\sfx\softseq\pcjr.cpp" />
+				<File RelativePath="..\..\engines\sci\sfx\softseq\pcjr.h" />
 			</Filter>
-			<Filter
-				Name="seq"
-				>
-				<File
-					RelativePath="..\..\engines\sci\sfx\seq\sequencers.cpp"
-					>
-				</File>
+			<Filter	Name="seq">
+				<File RelativePath="..\..\engines\sci\sfx\seq\sequencers.cpp" />
 			</Filter>
 		</Filter>
-		<File
-			RelativePath="..\..\engines\sci\console.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\console.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\debug.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\decompressor.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\decompressor.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\detection.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\exereader.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\exereader.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\resource.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\resource.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\sci.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\sci.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\engine\script.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\tools.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\tools.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\uinput.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\vocabulary.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sci\vocabulary.h"
-			>
-		</File>
+		<File RelativePath="..\..\engines\sci\console.cpp" />
+		<File RelativePath="..\..\engines\sci\console.h" />
+		<File RelativePath="..\..\engines\sci\debug.h" />
+		<File RelativePath="..\..\engines\sci\decompressor.cpp" />
+		<File RelativePath="..\..\engines\sci\decompressor.h" />
+		<File RelativePath="..\..\engines\sci\detection.cpp" />
+		<File RelativePath="..\..\engines\sci\exereader.cpp" />
+		<File RelativePath="..\..\engines\sci\exereader.h" />
+		<File RelativePath="..\..\engines\sci\resource.cpp" />
+		<File RelativePath="..\..\engines\sci\resource.h" />
+		<File RelativePath="..\..\engines\sci\sci.cpp" />
+		<File RelativePath="..\..\engines\sci\sci.h" />
+		<File RelativePath="..\..\engines\sci\engine\script.cpp" />
+		<File RelativePath="..\..\engines\sci\tools.cpp" />
+		<File RelativePath="..\..\engines\sci\tools.h" />
+		<File RelativePath="..\..\engines\sci\uinput.h" />
+		<File RelativePath="..\..\engines\sci\vocabulary.cpp" />
+		<File RelativePath="..\..\engines\sci\vocabulary.h" />
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>
diff --git a/dists/msvc9/scumm.vcproj b/dists/msvc9/scumm.vcproj
index d9214f7ff0..c2c116ef8b 100644
--- a/dists/msvc9/scumm.vcproj
+++ b/dists/msvc9/scumm.vcproj
@@ -9,837 +9,186 @@
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="scumm_Debug"
-			IntermediateDirectory="scumm_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;ENABLE_SCUMM_7_8;ENABLE_HE;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/scumm.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="scumm_Release"
-			IntermediateDirectory="scumm_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;ENABLE_SCUMM_7_8;ENABLE_HE;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/scumm.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
+		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
+		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
+
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<Filter
-			Name="smush"
-			>
-			<File
-				RelativePath="..\..\engines\scumm\smush\channel.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\channel.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\chunk_type.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\codec1.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\codec37.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\codec37.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\codec47.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\codec47.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\imuse_channel.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\saud_channel.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\smush_font.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\smush_font.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\smush_mixer.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\smush_mixer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\smush_player.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\smush_player.h"
-				>
-			</File>
+		<Filter Name="smush">
+			<File RelativePath="..\..\engines\scumm\smush\channel.cpp" />
+			<File RelativePath="..\..\engines\scumm\smush\channel.h" />
+			<File RelativePath="..\..\engines\scumm\smush\chunk_type.h" />
+			<File RelativePath="..\..\engines\scumm\smush\codec1.cpp" />
+			<File RelativePath="..\..\engines\scumm\smush\codec37.cpp" />
+			<File RelativePath="..\..\engines\scumm\smush\codec37.h" />
+			<File RelativePath="..\..\engines\scumm\smush\codec47.cpp" />
+			<File RelativePath="..\..\engines\scumm\smush\codec47.h" />
+			<File RelativePath="..\..\engines\scumm\smush\imuse_channel.cpp" />
+			<File RelativePath="..\..\engines\scumm\smush\saud_channel.cpp" />
+			<File RelativePath="..\..\engines\scumm\smush\smush_font.cpp" />
+			<File RelativePath="..\..\engines\scumm\smush\smush_font.h" />
+			<File RelativePath="..\..\engines\scumm\smush\smush_mixer.cpp" />
+			<File RelativePath="..\..\engines\scumm\smush\smush_mixer.h" />
+			<File RelativePath="..\..\engines\scumm\smush\smush_player.cpp" />
+			<File RelativePath="..\..\engines\scumm\smush\smush_player.h" />
 		</Filter>
-		<Filter
-			Name="imuse_digi"
-			>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_bndmgr.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_bndmgr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_codecs.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_music.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_script.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_sndmgr.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_sndmgr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_tables.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_tables.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_track.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_track.h"
-				>
-			</File>
+		<Filter Name="imuse_digi">
+			<File RelativePath="..\..\engines\scumm\imuse_digi\dimuse.cpp" />
+			<File RelativePath="..\..\engines\scumm\imuse_digi\dimuse.h" />
+			<File RelativePath="..\..\engines\scumm\imuse_digi\dimuse_bndmgr.cpp" />
+			<File RelativePath="..\..\engines\scumm\imuse_digi\dimuse_bndmgr.h" />
+			<File RelativePath="..\..\engines\scumm\imuse_digi\dimuse_codecs.cpp" />
+			<File RelativePath="..\..\engines\scumm\imuse_digi\dimuse_music.cpp" />
+			<File RelativePath="..\..\engines\scumm\imuse_digi\dimuse_script.cpp" />
+			<File RelativePath="..\..\engines\scumm\imuse_digi\dimuse_sndmgr.cpp" />
+			<File RelativePath="..\..\engines\scumm\imuse_digi\dimuse_sndmgr.h" />
+			<File RelativePath="..\..\engines\scumm\imuse_digi\dimuse_tables.cpp" />
+			<File RelativePath="..\..\engines\scumm\imuse_digi\dimuse_tables.h" />
+			<File RelativePath="..\..\engines\scumm\imuse_digi\dimuse_track.cpp" />
+			<File RelativePath="..\..\engines\scumm\imuse_digi\dimuse_track.h" />
 		</Filter>
-		<Filter
-			Name="insane"
-			>
-			<File
-				RelativePath="..\..\engines\scumm\insane\insane.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\insane\insane.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\insane\insane_ben.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\insane\insane_enemy.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\insane\insane_iact.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\insane\insane_scenes.cpp"
-				>
-			</File>
+		<Filter Name="insane">
+			<File RelativePath="..\..\engines\scumm\insane\insane.cpp" />
+			<File RelativePath="..\..\engines\scumm\insane\insane.h" />
+			<File RelativePath="..\..\engines\scumm\insane\insane_ben.cpp" />
+			<File RelativePath="..\..\engines\scumm\insane\insane_enemy.cpp" />
+			<File RelativePath="..\..\engines\scumm\insane\insane_iact.cpp" />
+			<File RelativePath="..\..\engines\scumm\insane\insane_scenes.cpp" />
 		</Filter>
-		<Filter
-			Name="he"
-			>
-			<File
-				RelativePath="..\..\engines\scumm\he\animation_he.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\animation_he.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\cup_player_he.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\cup_player_he.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\floodfill_he.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\floodfill_he.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\intern_he.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\logic_he.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\logic_he.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\palette_he.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\resource_he.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\resource_he.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\script_v100he.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\script_v60he.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\script_v70he.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\script_v71he.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\script_v72he.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\script_v80he.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\script_v90he.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\sound_he.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\sound_he.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\sprite_he.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\sprite_he.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\wiz_he.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\wiz_he.h"
-				>
-			</File>
+		<Filter Name="he">
+			<File RelativePath="..\..\engines\scumm\he\animation_he.cpp" />
+			<File RelativePath="..\..\engines\scumm\he\animation_he.h" />
+			<File RelativePath="..\..\engines\scumm\he\cup_player_he.cpp" />
+			<File RelativePath="..\..\engines\scumm\he\cup_player_he.h" />
+			<File RelativePath="..\..\engines\scumm\he\floodfill_he.cpp" />
+			<File RelativePath="..\..\engines\scumm\he\floodfill_he.h" />
+			<File RelativePath="..\..\engines\scumm\he\intern_he.h" />
+			<File RelativePath="..\..\engines\scumm\he\logic_he.cpp" />
+			<File RelativePath="..\..\engines\scumm\he\logic_he.h" />
+			<File RelativePath="..\..\engines\scumm\he\palette_he.cpp" />
+			<File RelativePath="..\..\engines\scumm\he\resource_he.cpp" />
+			<File RelativePath="..\..\engines\scumm\he\resource_he.h" />
+			<File RelativePath="..\..\engines\scumm\he\script_v100he.cpp" />
+			<File RelativePath="..\..\engines\scumm\he\script_v60he.cpp" />
+			<File RelativePath="..\..\engines\scumm\he\script_v70he.cpp" />
+			<File RelativePath="..\..\engines\scumm\he\script_v71he.cpp" />
+			<File RelativePath="..\..\engines\scumm\he\script_v72he.cpp" />
+			<File RelativePath="..\..\engines\scumm\he\script_v80he.cpp" />
+			<File RelativePath="..\..\engines\scumm\he\script_v90he.cpp" />
+			<File RelativePath="..\..\engines\scumm\he\sound_he.cpp" />
+			<File RelativePath="..\..\engines\scumm\he\sound_he.h" />
+			<File RelativePath="..\..\engines\scumm\he\sprite_he.cpp" />
+			<File RelativePath="..\..\engines\scumm\he\sprite_he.h" />
+			<File RelativePath="..\..\engines\scumm\he\wiz_he.cpp" />
+			<File RelativePath="..\..\engines\scumm\he\wiz_he.h" />
 		</Filter>
-		<Filter
-			Name="imuse"
-			>
-			<File
-				RelativePath="..\..\engines\scumm\imuse\imuse.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse\imuse.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse\imuse_internal.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse\imuse_part.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse\imuse_player.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse\instrument.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse\instrument.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse\sysex.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse\sysex_samnmax.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse\sysex_scumm.cpp"
-				>
-			</File>
+		<Filter Name="imuse">
+			<File RelativePath="..\..\engines\scumm\imuse\imuse.cpp" />
+			<File RelativePath="..\..\engines\scumm\imuse\imuse.h" />
+			<File RelativePath="..\..\engines\scumm\imuse\imuse_internal.h" />
+			<File RelativePath="..\..\engines\scumm\imuse\imuse_part.cpp" />
+			<File RelativePath="..\..\engines\scumm\imuse\imuse_player.cpp" />
+			<File RelativePath="..\..\engines\scumm\imuse\instrument.cpp" />
+			<File RelativePath="..\..\engines\scumm\imuse\instrument.h" />
+			<File RelativePath="..\..\engines\scumm\imuse\sysex.h" />
+			<File RelativePath="..\..\engines\scumm\imuse\sysex_samnmax.cpp" />
+			<File RelativePath="..\..\engines\scumm\imuse\sysex_scumm.cpp" />
 		</Filter>
-		<File
-			RelativePath="..\..\engines\scumm\actor.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\actor.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\akos.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\akos.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\base-costume.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\base-costume.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\bomp.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\bomp.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\boxes.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\boxes.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\camera.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\charset-fontdata.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\charset.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\charset.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\costume.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\costume.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\cursor.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\debugger.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\debugger.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\detection.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\detection.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\detection_tables.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\dialogs.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\dialogs.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\file.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\file.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\file_nes.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\file_nes.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\gfx.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\gfx.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\help.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\help.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\input.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\intern.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\midiparser_eup.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\midiparser_ro.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\music.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\nut_renderer.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\nut_renderer.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\object.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\object.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\palette.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_mod.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_mod.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_nes.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_nes.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_v1.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_v1.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_v2.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_v2a.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_v2a.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_v2cms.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_v3a.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_v3a.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\resource.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\resource.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\resource_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\resource_v3.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\resource_v4.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\room.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\saveload.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\saveload.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\script.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\script.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\script_v0.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\script_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\script_v3.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\script_v4.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\script_v5.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\script_v6.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\script_v8.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\scumm-md5.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\scumm.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\scumm.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\scumm_v0.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\scumm_v2.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\scumm_v3.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\scumm_v4.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\scumm_v5.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\scumm_v6.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\scumm_v7.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\scumm_v8.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\sound.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\sound.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\string.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\usage_bits.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\usage_bits.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\util.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\util.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\vars.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\verbs.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\verbs.h"
-			>
-		</File>
+		<File RelativePath="..\..\engines\scumm\actor.cpp" />
+		<File RelativePath="..\..\engines\scumm\actor.h" />
+		<File RelativePath="..\..\engines\scumm\akos.cpp" />
+		<File RelativePath="..\..\engines\scumm\akos.h" />
+		<File RelativePath="..\..\engines\scumm\base-costume.cpp" />
+		<File RelativePath="..\..\engines\scumm\base-costume.h" />
+		<File RelativePath="..\..\engines\scumm\bomp.cpp" />
+		<File RelativePath="..\..\engines\scumm\bomp.h" />
+		<File RelativePath="..\..\engines\scumm\boxes.cpp" />
+		<File RelativePath="..\..\engines\scumm\boxes.h" />
+		<File RelativePath="..\..\engines\scumm\camera.cpp" />
+		<File RelativePath="..\..\engines\scumm\charset-fontdata.cpp" />
+		<File RelativePath="..\..\engines\scumm\charset.cpp" />
+		<File RelativePath="..\..\engines\scumm\charset.h" />
+		<File RelativePath="..\..\engines\scumm\costume.cpp" />
+		<File RelativePath="..\..\engines\scumm\costume.h" />
+		<File RelativePath="..\..\engines\scumm\cursor.cpp" />
+		<File RelativePath="..\..\engines\scumm\debugger.cpp" />
+		<File RelativePath="..\..\engines\scumm\debugger.h" />
+		<File RelativePath="..\..\engines\scumm\detection.cpp" />
+		<File RelativePath="..\..\engines\scumm\detection.h" />
+		<File RelativePath="..\..\engines\scumm\detection_tables.h" />
+		<File RelativePath="..\..\engines\scumm\dialogs.cpp" />
+		<File RelativePath="..\..\engines\scumm\dialogs.h" />
+		<File RelativePath="..\..\engines\scumm\file.cpp" />
+		<File RelativePath="..\..\engines\scumm\file.h" />
+		<File RelativePath="..\..\engines\scumm\file_nes.cpp" />
+		<File RelativePath="..\..\engines\scumm\file_nes.h" />
+		<File RelativePath="..\..\engines\scumm\gfx.cpp" />
+		<File RelativePath="..\..\engines\scumm\gfx.h" />
+		<File RelativePath="..\..\engines\scumm\help.cpp" />
+		<File RelativePath="..\..\engines\scumm\help.h" />
+		<File RelativePath="..\..\engines\scumm\input.cpp" />
+		<File RelativePath="..\..\engines\scumm\intern.h" />
+		<File RelativePath="..\..\engines\scumm\midiparser_eup.cpp" />
+		<File RelativePath="..\..\engines\scumm\midiparser_ro.cpp" />
+		<File RelativePath="..\..\engines\scumm\music.h" />
+		<File RelativePath="..\..\engines\scumm\nut_renderer.cpp" />
+		<File RelativePath="..\..\engines\scumm\nut_renderer.h" />
+		<File RelativePath="..\..\engines\scumm\object.cpp" />
+		<File RelativePath="..\..\engines\scumm\object.h" />
+		<File RelativePath="..\..\engines\scumm\palette.cpp" />
+		<File RelativePath="..\..\engines\scumm\player_mod.cpp" />
+		<File RelativePath="..\..\engines\scumm\player_mod.h" />
+		<File RelativePath="..\..\engines\scumm\player_nes.cpp" />
+		<File RelativePath="..\..\engines\scumm\player_nes.h" />
+		<File RelativePath="..\..\engines\scumm\player_v1.cpp" />
+		<File RelativePath="..\..\engines\scumm\player_v1.h" />
+		<File RelativePath="..\..\engines\scumm\player_v2.cpp" />
+		<File RelativePath="..\..\engines\scumm\player_v2.h" />
+		<File RelativePath="..\..\engines\scumm\player_v2a.cpp" />
+		<File RelativePath="..\..\engines\scumm\player_v2a.h" />
+		<File RelativePath="..\..\engines\scumm\player_v2cms.cpp" />
+		<File RelativePath="..\..\engines\scumm\player_v3a.cpp" />
+		<File RelativePath="..\..\engines\scumm\player_v3a.h" />
+		<File RelativePath="..\..\engines\scumm\resource.cpp" />
+		<File RelativePath="..\..\engines\scumm\resource.h" />
+		<File RelativePath="..\..\engines\scumm\resource_v2.cpp" />
+		<File RelativePath="..\..\engines\scumm\resource_v3.cpp" />
+		<File RelativePath="..\..\engines\scumm\resource_v4.cpp" />
+		<File RelativePath="..\..\engines\scumm\room.cpp" />
+		<File RelativePath="..\..\engines\scumm\saveload.cpp" />
+		<File RelativePath="..\..\engines\scumm\saveload.h" />
+		<File RelativePath="..\..\engines\scumm\script.cpp" />
+		<File RelativePath="..\..\engines\scumm\script.h" />
+		<File RelativePath="..\..\engines\scumm\script_v0.cpp" />
+		<File RelativePath="..\..\engines\scumm\script_v2.cpp" />
+		<File RelativePath="..\..\engines\scumm\script_v3.cpp" />
+		<File RelativePath="..\..\engines\scumm\script_v4.cpp" />
+		<File RelativePath="..\..\engines\scumm\script_v5.cpp" />
+		<File RelativePath="..\..\engines\scumm\script_v6.cpp" />
+		<File RelativePath="..\..\engines\scumm\script_v8.cpp" />
+		<File RelativePath="..\..\engines\scumm\scumm-md5.h" />
+		<File RelativePath="..\..\engines\scumm\scumm.cpp" />
+		<File RelativePath="..\..\engines\scumm\scumm.h" />
+		<File RelativePath="..\..\engines\scumm\scumm_v0.h" />
+		<File RelativePath="..\..\engines\scumm\scumm_v2.h" />
+		<File RelativePath="..\..\engines\scumm\scumm_v3.h" />
+		<File RelativePath="..\..\engines\scumm\scumm_v4.h" />
+		<File RelativePath="..\..\engines\scumm\scumm_v5.h" />
+		<File RelativePath="..\..\engines\scumm\scumm_v6.h" />
+		<File RelativePath="..\..\engines\scumm\scumm_v7.h" />
+		<File RelativePath="..\..\engines\scumm\scumm_v8.h" />
+		<File RelativePath="..\..\engines\scumm\sound.cpp" />
+		<File RelativePath="..\..\engines\scumm\sound.h" />
+		<File RelativePath="..\..\engines\scumm\string.cpp" />
+		<File RelativePath="..\..\engines\scumm\usage_bits.cpp" />
+		<File RelativePath="..\..\engines\scumm\usage_bits.h" />
+		<File RelativePath="..\..\engines\scumm\util.cpp" />
+		<File RelativePath="..\..\engines\scumm\util.h" />
+		<File RelativePath="..\..\engines\scumm\vars.cpp" />
+		<File RelativePath="..\..\engines\scumm\verbs.cpp" />
+		<File RelativePath="..\..\engines\scumm\verbs.h" />
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>
diff --git a/dists/msvc9/scummvm.vcproj b/dists/msvc9/scummvm.vcproj
index cf277c2955..de625cd8d9 100644
--- a/dists/msvc9/scummvm.vcproj
+++ b/dists/msvc9/scummvm.vcproj
@@ -9,988 +9,209 @@
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="scummvm_Debug"
-			IntermediateDirectory="scummvm_Debug"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_NASM;USE_MT32EMU;ENABLE_AGI;ENABLE_AGOS;ENABLE_CINE;ENABLE_CRUISE;ENABLE_DRASCULA;ENABLE_GOB;ENABLE_IGOR;ENABLE_KYRA;ENABLE_LURE;ENABLE_M4;ENABLE_MADE;ENABLE_PARALLACTION;ENABLE_QUEEN;ENABLE_SAGA;ENABLE_IHNM;ENABLE_SAGA2;ENABLE_SCI;ENABLE_SCUMM;ENABLE_SKY;ENABLE_SWORD1;ENABLE_SWORD2;ENABLE_TOUCHE;ENABLE_SCUMM_7_8;ENABLE_HE;ENABLE_TINSEL;ENABLE_TUCKER;ENABLE_GROOVIE"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib sdl.lib zlib.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib sword1_debug/sword1.lib sword2_debug/sword2.lib lure_debug/lure.lib cine_debug/cine.lib cruise_debug/cruise.lib igor_debug/igor.lib kyra_debug/kyra.lib gob_debug/gob.lib queen_debug/queen.lib saga_debug/saga.lib agi_debug/agi.lib scumm_debug/scumm.lib agos_debug/agos.lib drascula_debug/drascula.lib sky_debug/sky.lib sci_debug/sci.lib parallaction_debug/parallaction.lib m4_debug/m4.lib made_debug/made.lib tinsel_Debug/tinsel.lib tucker_Debug/tucker.lib groovie_Debug/groovie.lib"
-				OutputFile="$(OutDir)/scummvm.exe"
-				LinkIncremental="2"
-				IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/scummvm.pdb"
-				SubSystem="1"
-				EntryPointSymbol="WinMainCRTStartup"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
+		<Configuration Name="Debug|Win32" ConfigurationType="1" InheritedPropertySheets=".\ScummVM_Debug.vsprops">
+			<Tool	Name="VCLinkerTool" OutputFile="$(OutDir)/scummvm.exe"
+				AdditionalDependencies="winmm.lib sdl.lib zlib.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib $(OutDir)/*.lib"
 			/>
 		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="scummvm_Release"
-			IntermediateDirectory="scummvm_Release"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_MT32EMU;ENABLE_AGI;ENABLE_AGOS;ENABLE_CINE;ENABLE_CRUISE;ENABLE_DRASCULA;ENABLE_GOB;ENABLE_IGOR;ENABLE_KYRA;ENABLE_LURE;ENABLE_M4;ENABLE_MADE;ENABLE_PARALLACTION;ENABLE_QUEEN;ENABLE_SAGA;ENABLE_IHNM;ENABLE_SAGA2;ENABLE_SCI;ENABLE_SCUMM;ENABLE_SKY;ENABLE_SWORD1;ENABLE_SWORD2;ENABLE_TOUCHE;ENABLE_SCUMM_7_8;ENABLE_HE;ENABLE_TINSEL;ENABLE_TUCKER;ENABLE_GROOVIE"
-				StringPooling="true"
-				MinimalRebuild="false"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib sdl.lib zlib.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib saga_release/saga.lib agi_release/agi.lib sword1_release/sword1.lib sword2_release/sword2.lib lure_release/lure.lib cine_release/cine.lib cruise_release/cruise.lib igor_release/igor.lib kyra_release/kyra.lib gob_release/gob.lib queen_release/queen.lib scumm_release/scumm.lib agos_release/agos.lib sky_release/sky.lib sci_release/sci.lib drascula_release/drascula.lib parallaction_release/parallaction.lib m4_release/m4.lib made_release/made.lib tinsel_release/tinsel.lib tucker_release/tucker.lib groovie_release/groovie.lib"
-				OutputFile="$(OutDir)/scummvm.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				IgnoreDefaultLibraryNames="libc.lib"
-				GenerateDebugInformation="false"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				EntryPointSymbol="WinMainCRTStartup"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
+		<Configuration Name="Release|Win32" ConfigurationType="1" InheritedPropertySheets=".\ScummVM_Release.vsprops">
+			<Tool Name="VCLinkerTool" OutputFile="$(OutDir)/scummvm.exe"
+				AdditionalDependencies="winmm.lib sdl.lib zlib.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib $(OutDir)/*.lib"
 			/>
 		</Configuration>
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<Filter
-			Name="base"
-			>
-			<File
-				RelativePath="..\..\base\commandLine.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\base\commandLine.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\base\internal_version.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\base\main.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\base\main.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\base\plugins.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\base\plugins.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\base\version.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\base\version.h"
-				>
-			</File>
+		<Filter	Name="base">
+			<File RelativePath="..\..\base\commandLine.cpp" />
+			<File RelativePath="..\..\base\commandLine.h" />
+			<File RelativePath="..\..\base\internal_version.h" />
+			<File RelativePath="..\..\base\main.cpp" />
+			<File RelativePath="..\..\base\main.h" />
+			<File RelativePath="..\..\base\plugins.cpp" />
+			<File RelativePath="..\..\base\plugins.h" />
+			<File RelativePath="..\..\base\version.cpp" />
+			<File RelativePath="..\..\base\version.h" />
 		</Filter>
-		<Filter
-			Name="common"
-			>
-			<File
-				RelativePath="..\..\common\algorithm.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\archive.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\archive.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\array.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\config-file.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\config-file.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\config-manager.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\config-manager.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\debug.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\debug.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\endian.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\error.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\events.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\file.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\file.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\frac.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\fs.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\fs.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\func.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\hash-str.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\hashmap.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\hashmap.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\iff_container.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\keyboard.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\list.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\list_intern.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\md5.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\md5.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\memorypool.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\memorypool.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\mutex.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\mutex.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\noncopyable.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\pack-end.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\pack-start.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\ptr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\queue.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\rect.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\savefile.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\scummsys.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\serializer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\singleton.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\stack.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\str.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\str.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\stream.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\stream.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\system.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\system.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\timer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\unarj.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\unarj.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\unzip.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\unzip.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\util.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\util.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\xmlparser.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\xmlparser.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\zlib.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\zlib.h"
-				>
-			</File>
+		<Filter	Name="common">
+			<File RelativePath="..\..\common\algorithm.h" />
+			<File RelativePath="..\..\common\archive.cpp" />
+			<File RelativePath="..\..\common\archive.h" />
+			<File RelativePath="..\..\common\array.h" />
+			<File RelativePath="..\..\common\config-file.cpp" />
+			<File RelativePath="..\..\common\config-file.h" />
+			<File RelativePath="..\..\common\config-manager.cpp" />
+			<File RelativePath="..\..\common\config-manager.h" />
+			<File RelativePath="..\..\common\debug.cpp" />
+			<File RelativePath="..\..\common\debug.h" />
+			<File RelativePath="..\..\common\endian.h" />
+			<File RelativePath="..\..\common\error.h" />
+			<File RelativePath="..\..\common\events.h" />
+			<File RelativePath="..\..\common\file.cpp" />
+			<File RelativePath="..\..\common\file.h" />
+			<File RelativePath="..\..\common\frac.h" />
+			<File RelativePath="..\..\common\fs.cpp" />
+			<File RelativePath="..\..\common\fs.h" />
+			<File RelativePath="..\..\common\func.h" />
+			<File RelativePath="..\..\common\hash-str.h" />
+			<File RelativePath="..\..\common\hashmap.cpp" />
+			<File RelativePath="..\..\common\hashmap.h" />
+			<File RelativePath="..\..\common\iff_container.h" />
+			<File RelativePath="..\..\common\keyboard.h" />
+			<File RelativePath="..\..\common\list.h" />
+			<File RelativePath="..\..\common\list_intern.h" />
+			<File RelativePath="..\..\common\md5.cpp" />
+			<File RelativePath="..\..\common\md5.h" />
+			<File RelativePath="..\..\common\memorypool.cpp" />
+			<File RelativePath="..\..\common\memorypool.h" />
+			<File RelativePath="..\..\common\mutex.cpp" />
+			<File RelativePath="..\..\common\mutex.h" />
+			<File RelativePath="..\..\common\noncopyable.h" />
+			<File RelativePath="..\..\common\pack-end.h" />
+			<File RelativePath="..\..\common\pack-start.h" />
+			<File RelativePath="..\..\common\ptr.h" />
+			<File RelativePath="..\..\common\queue.h" />
+			<File RelativePath="..\..\common\rect.h" />
+			<File RelativePath="..\..\common\savefile.h" />
+			<File RelativePath="..\..\common\scummsys.h" />
+			<File RelativePath="..\..\common\serializer.h" />
+			<File RelativePath="..\..\common\singleton.h" />
+			<File RelativePath="..\..\common\stack.h" />
+			<File RelativePath="..\..\common\str.cpp" />
+			<File RelativePath="..\..\common\str.h" />
+			<File RelativePath="..\..\common\stream.cpp" />
+			<File RelativePath="..\..\common\stream.h" />
+			<File RelativePath="..\..\common\system.cpp" />
+			<File RelativePath="..\..\common\system.h" />
+			<File RelativePath="..\..\common\timer.h" />
+			<File RelativePath="..\..\common\unarj.cpp" />
+			<File RelativePath="..\..\common\unarj.h" />
+			<File RelativePath="..\..\common\unzip.cpp" />
+			<File RelativePath="..\..\common\unzip.h" />
+			<File RelativePath="..\..\common\util.cpp" />
+			<File RelativePath="..\..\common\util.h" />
+			<File RelativePath="..\..\common\xmlparser.cpp" />
+			<File RelativePath="..\..\common\xmlparser.h" />
+			<File RelativePath="..\..\common\zlib.cpp" />
+			<File RelativePath="..\..\common\zlib.h" />
 		</Filter>
-		<Filter
-			Name="sound"
-			>
-			<File
-				RelativePath="..\..\sound\adpcm.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\adpcm.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\aiff.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\aiff.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\audiocd.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\audiocd.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\audiostream.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\audiostream.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\flac.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\flac.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\fmopl.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\fmopl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\iff.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\sound\iff.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\mididrv.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\mididrv.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\midiparser.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\midiparser.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\midiparser_smf.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\midiparser_xmidi.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\mixer.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\mixer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\mixer_intern.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\mp3.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\mp3.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\mpu401.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\mpu401.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\musicplugin.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\musicplugin.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\null.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\rate.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\rate.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\shorten.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\shorten.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\timestamp.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\timestamp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\vag.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\vag.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\voc.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\voc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\vorbis.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\vorbis.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\wave.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sound\wave.h"
-				>
-			</File>
-			<Filter
-				Name="softhsynth"
-				>
-				<File
-					RelativePath="..\..\sound\softsynth\adlib.cpp"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\sound\softsynth\emumidi.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\sound\softsynth\fluidsynth.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\sound\softsynth\mt32.cpp"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\sound\softsynth\pcspk.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\sound\softsynth\pcspk.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\sound\softsynth\ym2612.cpp"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\sound\softsynth\ym2612.h"
-					>
-				</File>
-				<Filter
-					Name="mt32"
-					>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\freeverb.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\freeverb.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\i386.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\i386.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\mt32_file.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\mt32_file.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\mt32emu.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\part.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\part.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\partial.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\partial.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\partialManager.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\partialManager.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\structures.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\synth.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\synth.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\tables.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\mt32\tables.h"
-						>
-					</File>
+		<Filter	Name="sound">
+			<File RelativePath="..\..\sound\adpcm.cpp" />
+			<File RelativePath="..\..\sound\adpcm.h" />
+			<File RelativePath="..\..\sound\aiff.cpp" />
+			<File RelativePath="..\..\sound\aiff.h" />
+			<File RelativePath="..\..\sound\audiocd.cpp" />
+			<File RelativePath="..\..\sound\audiocd.h" />
+			<File RelativePath="..\..\sound\audiostream.cpp" />
+			<File RelativePath="..\..\sound\audiostream.h" />
+			<File RelativePath="..\..\sound\flac.cpp" />
+			<File RelativePath="..\..\sound\flac.h" />
+			<File RelativePath="..\..\sound\fmopl.cpp" />
+			<File RelativePath="..\..\sound\fmopl.h" />
+			<File RelativePath="..\..\sound\iff_sound.cpp" />
+			<File RelativePath="..\..\sound\iff_sound.h" />
+			<File RelativePath="..\..\sound\mididrv.cpp" />
+			<File RelativePath="..\..\sound\mididrv.h" />
+			<File RelativePath="..\..\sound\midiparser.cpp" />
+			<File RelativePath="..\..\sound\midiparser.h" />
+			<File RelativePath="..\..\sound\midiparser_smf.cpp" />
+			<File RelativePath="..\..\sound\midiparser_xmidi.cpp" />
+			<File RelativePath="..\..\sound\mixer.cpp" />
+			<File RelativePath="..\..\sound\mixer.h" />
+			<File RelativePath="..\..\sound\mixer_intern.h" />
+			<File RelativePath="..\..\sound\mp3.cpp" />
+			<File RelativePath="..\..\sound\mp3.h" />
+			<File RelativePath="..\..\sound\mpu401.cpp" />
+			<File RelativePath="..\..\sound\mpu401.h" />
+			<File RelativePath="..\..\sound\musicplugin.cpp" />
+			<File RelativePath="..\..\sound\musicplugin.h" />
+			<File RelativePath="..\..\sound\null.cpp" />
+			<File RelativePath="..\..\sound\rate.cpp" />
+			<File RelativePath="..\..\sound\rate.h" />
+			<File RelativePath="..\..\sound\shorten.cpp" />
+			<File RelativePath="..\..\sound\shorten.h" />
+			<File RelativePath="..\..\sound\timestamp.cpp" />
+			<File RelativePath="..\..\sound\timestamp.h" />
+			<File RelativePath="..\..\sound\vag.cpp" />
+			<File RelativePath="..\..\sound\vag.h" />
+			<File RelativePath="..\..\sound\voc.cpp" />
+			<File RelativePath="..\..\sound\voc.h" />
+			<File RelativePath="..\..\sound\vorbis.cpp" />
+			<File RelativePath="..\..\sound\vorbis.h" />
+			<File RelativePath="..\..\sound\wave.cpp" />
+			<File RelativePath="..\..\sound\wave.h" />
+			<Filter Name="softhsynth">
+				<File	RelativePath="..\..\sound\softsynth\adlib.cpp" />
+				<File RelativePath="..\..\sound\softsynth\emumidi.h" />
+				<File RelativePath="..\..\sound\softsynth\fluidsynth.cpp" />
+				<File RelativePath="..\..\sound\softsynth\mt32.cpp" />
+				<File RelativePath="..\..\sound\softsynth\pcspk.cpp" />
+				<File RelativePath="..\..\sound\softsynth\pcspk.h" />
+				<File RelativePath="..\..\sound\softsynth\ym2612.cpp" />
+				<File RelativePath="..\..\sound\softsynth\ym2612.h" />
+				<Filter	Name="mt32">
+					<File RelativePath="..\..\sound\softsynth\mt32\freeverb.cpp" />
+					<File RelativePath="..\..\sound\softsynth\mt32\freeverb.h" />
+					<File RelativePath="..\..\sound\softsynth\mt32\i386.cpp" />
+					<File RelativePath="..\..\sound\softsynth\mt32\i386.h" />
+					<File RelativePath="..\..\sound\softsynth\mt32\mt32_file.cpp" />
+					<File RelativePath="..\..\sound\softsynth\mt32\mt32_file.h" />
+					<File RelativePath="..\..\sound\softsynth\mt32\mt32emu.h" />
+					<File RelativePath="..\..\sound\softsynth\mt32\part.cpp" />
+					<File RelativePath="..\..\sound\softsynth\mt32\part.h" />
+					<File RelativePath="..\..\sound\softsynth\mt32\partial.cpp" />
+					<File RelativePath="..\..\sound\softsynth\mt32\partial.h" />
+					<File RelativePath="..\..\sound\softsynth\mt32\partialManager.cpp" />
+					<File RelativePath="..\..\sound\softsynth\mt32\partialManager.h" />
+					<File RelativePath="..\..\sound\softsynth\mt32\structures.h" />
+					<File RelativePath="..\..\sound\softsynth\mt32\synth.cpp" />
+					<File RelativePath="..\..\sound\softsynth\mt32\synth.h" />
+					<File RelativePath="..\..\sound\softsynth\mt32\tables.cpp" />
+					<File RelativePath="..\..\sound\softsynth\mt32\tables.h" />
 				</Filter>
-				<Filter
-					Name="opl"
-					>
-					<File
-						RelativePath="..\..\sound\softsynth\opl\dosbox.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\opl\dosbox.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\opl\mame.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\opl\mame.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\opl\opl_impl.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\sound\softsynth\opl\opl_inc.h"
-						>
-					</File>
+				<Filter Name="opl">
+					<File RelativePath="..\..\sound\softsynth\opl\dosbox.cpp" />
+					<File RelativePath="..\..\sound\softsynth\opl\dosbox.h" />
+					<File RelativePath="..\..\sound\softsynth\opl\mame.cpp" />
+					<File RelativePath="..\..\sound\softsynth\opl\mame.h" />
+					<File RelativePath="..\..\sound\softsynth\opl\opl_impl.h" />
+					<File RelativePath="..\..\sound\softsynth\opl\opl_inc.h" />
 				</Filter>
 			</Filter>
-			<Filter
-				Name="mods"
-				>
-				<File
-					RelativePath="..\..\sound\mods\infogrames.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\sound\mods\infogrames.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\sound\mods\module.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\sound\mods\module.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\sound\mods\paula.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\sound\mods\paula.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\sound\mods\protracker.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\sound\mods\protracker.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\sound\mods\rjp1.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\sound\mods\rjp1.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\sound\mods\soundfx.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\sound\mods\soundfx.h"
-					>
-				</File>
+			<Filter Name="mods">
+				<File RelativePath="..\..\sound\mods\infogrames.cpp" />
+				<File RelativePath="..\..\sound\mods\infogrames.h" />
+				<File RelativePath="..\..\sound\mods\module.cpp" />
+				<File RelativePath="..\..\sound\mods\module.h" />
+				<File RelativePath="..\..\sound\mods\paula.cpp" />
+				<File RelativePath="..\..\sound\mods\paula.h" />
+				<File RelativePath="..\..\sound\mods\protracker.cpp" />
+				<File RelativePath="..\..\sound\mods\protracker.h" />
+				<File RelativePath="..\..\sound\mods\rjp1.cpp" />
+				<File RelativePath="..\..\sound\mods\rjp1.h" />
+				<File RelativePath="..\..\sound\mods\soundfx.cpp" />
+				<File RelativePath="..\..\sound\mods\soundfx.h" />
 			</Filter>
 		</Filter>
-		<Filter
-			Name="txt"
-			>
-			<File
-				RelativePath="..\..\COPYING"
-				>
-			</File>
-			<File
-				RelativePath="..\..\NEWS"
-				>
-			</File>
-			<File
-				RelativePath="..\..\README"
-				>
-			</File>
-			<File
-				RelativePath="..\..\TODO"
-				>
-			</File>
+		<Filter Name="txt">
+			<File RelativePath="..\..\COPYING" />
+			<File RelativePath="..\..\NEWS" />
+			<File RelativePath="..\..\README" />
+			<File RelativePath="..\..\TODO" />
 		</Filter>
-		<Filter
-			Name="rsc"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-			>
-			<File
-				RelativePath="..\..\icons\scummvm.ico"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dists\scummvm.rc"
-				>
-			</File>
+		<Filter Name="rsc">
+			<File RelativePath="..\..\icons\scummvm.ico" />
+			<File RelativePath="..\..\dists\scummvm.rc" />
 		</Filter>
-		<Filter
-			Name="backends"
-			>
-			<File
-				RelativePath="..\..\backends\base-backend.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\backends\base-backend.h"
-				>
-			</File>
-			<Filter
-				Name="sdl"
-				>
-				<File
-					RelativePath="..\..\backends\platform\sdl\events.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\platform\sdl\graphics.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\platform\sdl\hardwarekeys.cpp"
-					>
-				</File>
+		<Filter Name="backends">
+			<File RelativePath="..\..\backends\base-backend.cpp" />
+			<File RelativePath="..\..\backends\base-backend.h" />
+			<Filter Name="sdl">
+				<File RelativePath="..\..\backends\platform\sdl\events.cpp" />
+				<File RelativePath="..\..\backends\platform\sdl\graphics.cpp" />
+				<File RelativePath="..\..\backends\platform\sdl\hardwarekeys.cpp" />
 				<File
 					RelativePath="..\..\backends\platform\sdl\main.cpp"
 					>
@@ -1013,565 +234,156 @@
 						/>
 					</FileConfiguration>
 				</File>
-				<File
-					RelativePath="..\..\backends\platform\sdl\sdl.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\platform\sdl\sdl.h"
-					>
-				</File>
+				<File RelativePath="..\..\backends\platform\sdl\sdl.cpp" />
+				<File RelativePath="..\..\backends\platform\sdl\sdl.h" />
 			</Filter>
-			<Filter
-				Name="fs"
-				>
-				<File
-					RelativePath="..\..\backends\fs\abstract-fs.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\fs\abstract-fs.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\fs\fs-factory.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\fs\stdiostream.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\fs\stdiostream.h"
-					>
-				</File>
-				<Filter
-					Name="windows"
-					>
-					<File
-						RelativePath="..\..\backends\fs\windows\windows-fs-factory.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\backends\fs\windows\windows-fs-factory.h"
-						>
-					</File>
+			<Filter Name="fs">
+				<File RelativePath="..\..\backends\fs\abstract-fs.cpp" />
+				<File RelativePath="..\..\backends\fs\abstract-fs.h" />
+				<File RelativePath="..\..\backends\fs\fs-factory.h" />
+				<File RelativePath="..\..\backends\fs\stdiostream.cpp" />
+				<File RelativePath="..\..\backends\fs\stdiostream.h" />
+				<Filter Name="windows">
+					<File RelativePath="..\..\backends\fs\windows\windows-fs-factory.cpp" />
+					<File RelativePath="..\..\backends\fs\windows\windows-fs-factory.h" />
 				</Filter>
 			</Filter>
-			<Filter
-				Name="midi"
-				>
-				<File
-					RelativePath="..\..\backends\midi\windows.cpp"
-					>
-				</File>
+			<Filter Name="midi">
+				<File RelativePath="..\..\backends\midi\windows.cpp" />
 			</Filter>
-			<Filter
-				Name="timer"
-				>
-				<File
-					RelativePath="..\..\backends\timer\default\default-timer.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\timer\default\default-timer.h"
-					>
-				</File>
+			<Filter Name="timer">
+				<File RelativePath="..\..\backends\timer\default\default-timer.cpp" />
+				<File RelativePath="..\..\backends\timer\default\default-timer.h" />
 			</Filter>
-			<Filter
-				Name="saves"
-				>
-				<File
-					RelativePath="..\..\backends\saves\default\default-saves.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\saves\default\default-saves.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\saves\savefile.cpp"
-					>
-				</File>
+			<Filter Name="saves">
+				<File RelativePath="..\..\backends\saves\default\default-saves.cpp" />
+				<File RelativePath="..\..\backends\saves\default\default-saves.h" />
+				<File RelativePath="..\..\backends\saves\savefile.cpp" />
 			</Filter>
-			<Filter
-				Name="events"
-				>
-				<Filter
-					Name="default"
-					>
-					<File
-						RelativePath="..\..\backends\events\default\default-events.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\backends\events\default\default-events.h"
-						>
-					</File>
+			<Filter Name="events">
+				<Filter Name="default">
+					<File RelativePath="..\..\backends\events\default\default-events.cpp" />
+					<File RelativePath="..\..\backends\events\default\default-events.h" />
 				</Filter>
 			</Filter>
-			<Filter
-				Name="keymapper"
-				>
-				<File
-					RelativePath="..\..\backends\keymapper\action.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\keymapper\action.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\keymapper\hardware-key.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\keymapper\keymap.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\keymapper\keymap.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\keymapper\keymapper.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\keymapper\keymapper.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\keymapper\remap-dialog.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\keymapper\remap-dialog.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\keymapper\types.h"
-					>
-				</File>
+			<Filter Name="keymapper">
+				<File RelativePath="..\..\backends\keymapper\action.cpp" />
+				<File RelativePath="..\..\backends\keymapper\action.h" />
+				<File RelativePath="..\..\backends\keymapper\hardware-key.h" />
+				<File RelativePath="..\..\backends\keymapper\keymap.cpp" />
+				<File RelativePath="..\..\backends\keymapper\keymap.h" />
+				<File RelativePath="..\..\backends\keymapper\keymapper.cpp" />
+				<File RelativePath="..\..\backends\keymapper\keymapper.h" />
+				<File RelativePath="..\..\backends\keymapper\remap-dialog.cpp" />
+				<File RelativePath="..\..\backends\keymapper\remap-dialog.h" />
+				<File RelativePath="..\..\backends\keymapper\types.h" />
 			</Filter>
-			<Filter
-				Name="vkeybd"
-				>
-				<File
-					RelativePath="..\..\backends\vkeybd\image-map.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\vkeybd\image-map.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\vkeybd\keycode-descriptions.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\vkeybd\polygon.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\vkeybd\polygon.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\vkeybd\virtual-keyboard-gui.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\vkeybd\virtual-keyboard-gui.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\vkeybd\virtual-keyboard-parser.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\vkeybd\virtual-keyboard-parser.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\vkeybd\virtual-keyboard.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\vkeybd\virtual-keyboard.h"
-					>
-				</File>
+			<Filter Name="vkeybd">
+				<File RelativePath="..\..\backends\vkeybd\image-map.cpp" />
+				<File RelativePath="..\..\backends\vkeybd\image-map.h" />
+				<File RelativePath="..\..\backends\vkeybd\keycode-descriptions.h" />
+				<File RelativePath="..\..\backends\vkeybd\polygon.cpp" />
+				<File RelativePath="..\..\backends\vkeybd\polygon.h" />
+				<File RelativePath="..\..\backends\vkeybd\virtual-keyboard-gui.cpp" />
+				<File RelativePath="..\..\backends\vkeybd\virtual-keyboard-gui.h" />
+				<File RelativePath="..\..\backends\vkeybd\virtual-keyboard-parser.cpp" />
+				<File RelativePath="..\..\backends\vkeybd\virtual-keyboard-parser.h" />
+				<File RelativePath="..\..\backends\vkeybd\virtual-keyboard.cpp" />
+				<File RelativePath="..\..\backends\vkeybd\virtual-keyboard.h" />
 			</Filter>
 		</Filter>
-		<Filter
-			Name="gui"
-			>
-			<File
-				RelativePath="..\..\gui\about.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\about.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\browser.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\browser.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\chooser.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\chooser.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\console.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\console.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\credits.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\debugger.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\debugger.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\dialog.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\dialog.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\editable.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\editable.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\EditTextWidget.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\EditTextWidget.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\GuiManager.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\GuiManager.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\Key.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\Key.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\launcher.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\launcher.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\ListWidget.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\ListWidget.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\massadd.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\massadd.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\message.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\message.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\object.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\object.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\options.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\options.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\PopUpWidget.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\PopUpWidget.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\saveload.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\saveload.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\ScrollBarWidget.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\ScrollBarWidget.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\TabWidget.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\TabWidget.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\themebrowser.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\themebrowser.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\ThemeEngine.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\ThemeEngine.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\ThemeEval.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\ThemeLayout.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\ThemeLayout.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\ThemeParser.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\ThemeParser.h"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\gui\widget.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\widget.h"
-				>
-			</File>
+		<Filter Name="gui">
+			<File RelativePath="..\..\gui\about.cpp" />
+			<File RelativePath="..\..\gui\about.h" />
+			<File RelativePath="..\..\gui\browser.cpp" />
+			<File RelativePath="..\..\gui\browser.h" />
+			<File RelativePath="..\..\gui\chooser.cpp" />
+			<File RelativePath="..\..\gui\chooser.h" />
+			<File RelativePath="..\..\gui\console.cpp" />
+			<File RelativePath="..\..\gui\console.h" />
+			<File RelativePath="..\..\gui\credits.h" />
+			<File RelativePath="..\..\gui\debugger.cpp" />
+			<File RelativePath="..\..\gui\debugger.h" />
+			<File RelativePath="..\..\gui\dialog.cpp" />
+			<File RelativePath="..\..\gui\dialog.h" />
+			<File RelativePath="..\..\gui\editable.cpp" />
+			<File RelativePath="..\..\gui\editable.h" />
+			<File RelativePath="..\..\gui\EditTextWidget.cpp" />
+			<File RelativePath="..\..\gui\EditTextWidget.h" />
+			<File RelativePath="..\..\gui\GuiManager.cpp" />
+			<File RelativePath="..\..\gui\GuiManager.h" />
+			<File RelativePath="..\..\gui\Key.cpp" />
+			<File RelativePath="..\..\gui\Key.h" />
+			<File RelativePath="..\..\gui\launcher.cpp" />
+			<File RelativePath="..\..\gui\launcher.h" />
+			<File RelativePath="..\..\gui\ListWidget.cpp" />
+			<File RelativePath="..\..\gui\ListWidget.h" />
+			<File RelativePath="..\..\gui\massadd.cpp" />
+			<File RelativePath="..\..\gui\massadd.h" />
+			<File RelativePath="..\..\gui\message.cpp" />
+			<File RelativePath="..\..\gui\message.h" />
+			<File RelativePath="..\..\gui\object.cpp" />
+			<File RelativePath="..\..\gui\object.h" />
+			<File RelativePath="..\..\gui\options.cpp" />
+			<File RelativePath="..\..\gui\options.h" />
+			<File RelativePath="..\..\gui\PopUpWidget.cpp" />
+			<File RelativePath="..\..\gui\PopUpWidget.h" />
+			<File RelativePath="..\..\gui\saveload.cpp" />
+			<File RelativePath="..\..\gui\saveload.h" />
+			<File RelativePath="..\..\gui\ScrollBarWidget.cpp" />
+			<File RelativePath="..\..\gui\ScrollBarWidget.h" />
+			<File RelativePath="..\..\gui\TabWidget.cpp" />
+			<File RelativePath="..\..\gui\TabWidget.h" />
+			<File RelativePath="..\..\gui\themebrowser.cpp" />
+			<File RelativePath="..\..\gui\themebrowser.h" />
+			<File RelativePath="..\..\gui\ThemeEngine.cpp" />
+			<File RelativePath="..\..\gui\ThemeEngine.h" />
+			<File RelativePath="..\..\gui\ThemeEval.cpp" />
+			<File RelativePath="..\..\gui\ThemeLayout.cpp" />
+			<File RelativePath="..\..\gui\ThemeLayout.h" />
+			<File RelativePath="..\..\gui\ThemeParser.cpp" />
+			<File RelativePath="..\..\gui\ThemeParser.h" />
+			<File RelativePath="..\..\gui\widget.cpp" />
+			<File RelativePath="..\..\gui\widget.h" />
 		</Filter>
-		<Filter
-			Name="graphics"
-			>
-			<File
-				RelativePath="..\..\graphics\colormasks.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\conversion.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\conversion.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\cursorman.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\cursorman.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\dither.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\dither.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\font.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\font.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\fontman.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\fontman.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\iff.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\iff.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\imagedec.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\imagedec.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\jpeg.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\jpeg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\pixelformat.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\primitives.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\primitives.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\scaler.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\scaler.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\sjis.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\sjis.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\surface.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\surface.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\thumbnail.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\thumbnail.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\VectorRenderer.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\VectorRenderer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\VectorRendererSpec.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\VectorRendererSpec.h"
-				>
-			</File>
-			<Filter
-				Name="scaler"
-				>
-				<File
-					RelativePath="..\..\graphics\scaler\2xsai.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\graphics\scaler\aspect.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\graphics\scaler\hq2x.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\graphics\scaler\hq2x.h"
-					>
-				</File>
+		<Filter Name="graphics">
+			<File RelativePath="..\..\graphics\colormasks.h" />
+			<File RelativePath="..\..\graphics\conversion.cpp" />
+			<File RelativePath="..\..\graphics\conversion.h" />
+			<File RelativePath="..\..\graphics\cursorman.cpp" />
+			<File RelativePath="..\..\graphics\cursorman.h" />
+			<File RelativePath="..\..\graphics\dither.cpp" />
+			<File RelativePath="..\..\graphics\dither.h" />
+			<File RelativePath="..\..\graphics\font.cpp" />
+			<File RelativePath="..\..\graphics\font.h" />
+			<File RelativePath="..\..\graphics\fontman.cpp" />
+			<File RelativePath="..\..\graphics\fontman.h" />
+			<File RelativePath="..\..\graphics\iff.cpp" />
+			<File RelativePath="..\..\graphics\iff.h" />
+			<File RelativePath="..\..\graphics\imagedec.cpp" />
+			<File RelativePath="..\..\graphics\imagedec.h" />
+			<File RelativePath="..\..\graphics\jpeg.cpp" />
+			<File RelativePath="..\..\graphics\jpeg.h" />
+			<File RelativePath="..\..\graphics\pixelformat.h" />
+			<File RelativePath="..\..\graphics\primitives.cpp" />
+			<File RelativePath="..\..\graphics\primitives.h" />
+			<File RelativePath="..\..\graphics\scaler.cpp" />
+			<File RelativePath="..\..\graphics\scaler.h" />
+			<File RelativePath="..\..\graphics\sjis.cpp" />
+			<File RelativePath="..\..\graphics\sjis.h" />
+			<File RelativePath="..\..\graphics\surface.cpp" />
+			<File RelativePath="..\..\graphics\surface.h" />
+			<File RelativePath="..\..\graphics\thumbnail.cpp" />
+			<File RelativePath="..\..\graphics\thumbnail.h" />
+			<File RelativePath="..\..\graphics\VectorRenderer.cpp" />
+			<File RelativePath="..\..\graphics\VectorRenderer.h" />
+			<File RelativePath="..\..\graphics\VectorRendererSpec.cpp" />
+			<File RelativePath="..\..\graphics\VectorRendererSpec.h" />
+			<Filter Name="scaler">
+				<File RelativePath="..\..\graphics\scaler\2xsai.cpp" />
+				<File RelativePath="..\..\graphics\scaler\aspect.cpp" />
+				<File RelativePath="..\..\graphics\scaler\hq2x.cpp" />
+				<File RelativePath="..\..\graphics\scaler\hq2x.h" />
 				<File
 					RelativePath="..\..\graphics\scaler\hq2x_i386.asm"
 					>
@@ -1594,14 +406,8 @@
 						/>
 					</FileConfiguration>
 				</File>
-				<File
-					RelativePath="..\..\graphics\scaler\hq3x.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\graphics\scaler\hq3x.h"
-					>
-				</File>
+				<File RelativePath="..\..\graphics\scaler\hq3x.cpp" />
+				<File RelativePath="..\..\graphics\scaler\hq3x.h" />
 				<File
 					RelativePath="..\..\graphics\scaler\hq3x_i386.asm"
 					>
@@ -1624,169 +430,51 @@
 						/>
 					</FileConfiguration>
 				</File>
-				<File
-					RelativePath="..\..\graphics\scaler\intern.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\graphics\scaler\scale2x.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\graphics\scaler\scale2x.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\graphics\scaler\scale3x.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\graphics\scaler\scale3x.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\graphics\scaler\scalebit.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\graphics\scaler\scalebit.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\graphics\scaler\thumbnail_intern.cpp"
-					>
-				</File>
+				<File RelativePath="..\..\graphics\scaler\intern.h" />
+				<File RelativePath="..\..\graphics\scaler\scale2x.cpp" />
+				<File RelativePath="..\..\graphics\scaler\scale2x.h" />
+				<File RelativePath="..\..\graphics\scaler\scale3x.cpp" />
+				<File RelativePath="..\..\graphics\scaler\scale3x.h" />
+				<File RelativePath="..\..\graphics\scaler\scalebit.cpp" />
+				<File RelativePath="..\..\graphics\scaler\scalebit.h" />
+				<File RelativePath="..\..\graphics\scaler\thumbnail_intern.cpp" />
 			</Filter>
-			<Filter
-				Name="fonts"
-				>
-				<File
-					RelativePath="..\..\graphics\fonts\consolefont.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\graphics\fonts\newfont.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\graphics\fonts\newfont_big.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\graphics\fonts\scummfont.cpp"
-					>
-				</File>
+			<Filter Name="fonts">
+				<File RelativePath="..\..\graphics\fonts\consolefont.cpp" />
+				<File RelativePath="..\..\graphics\fonts\newfont.cpp" />
+				<File RelativePath="..\..\graphics\fonts\newfont_big.cpp" />
+				<File RelativePath="..\..\graphics\fonts\scummfont.cpp" />
 			</Filter>
-			<Filter
-				Name="video"
-				>
-				<File
-					RelativePath="..\..\graphics\video\dxa_decoder.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\graphics\video\dxa_decoder.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\graphics\video\flic_decoder.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\graphics\video\flic_decoder.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\graphics\video\mpeg_player.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\graphics\video\mpeg_player.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\graphics\video\smk_decoder.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\graphics\video\smk_decoder.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\graphics\video\video_player.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\graphics\video\video_player.h"
-					>
-				</File>
-				<Filter
-					Name="coktelvideo"
-					>
-					<File
-						RelativePath="..\..\graphics\video\coktelvideo\coktelvideo.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\graphics\video\coktelvideo\coktelvideo.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\graphics\video\coktelvideo\indeo3.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\graphics\video\coktelvideo\indeo3.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\graphics\video\coktelvideo\indeo3data.h"
-						>
-					</File>
+			<Filter Name="video">
+				<File RelativePath="..\..\graphics\video\dxa_decoder.cpp" />
+				<File RelativePath="..\..\graphics\video\dxa_decoder.h" />
+				<File RelativePath="..\..\graphics\video\flic_decoder.cpp" />
+				<File RelativePath="..\..\graphics\video\flic_decoder.h" />
+				<File RelativePath="..\..\graphics\video\mpeg_player.cpp" />
+				<File RelativePath="..\..\graphics\video\mpeg_player.h" />
+				<File RelativePath="..\..\graphics\video\smk_decoder.cpp" />
+				<File RelativePath="..\..\graphics\video\smk_decoder.h" />
+				<File RelativePath="..\..\graphics\video\video_player.cpp" />
+				<File RelativePath="..\..\graphics\video\video_player.h" />
+				<Filter Name="coktelvideo">
+					<File RelativePath="..\..\graphics\video\coktelvideo\coktelvideo.cpp" />
+					<File RelativePath="..\..\graphics\video\coktelvideo\coktelvideo.h" />
+					<File RelativePath="..\..\graphics\video\coktelvideo\indeo3.cpp" />
+					<File RelativePath="..\..\graphics\video\coktelvideo\indeo3.h" />
+					<File RelativePath="..\..\graphics\video\coktelvideo\indeo3data.h" />
 				</Filter>
 			</Filter>
 		</Filter>
-		<Filter
-			Name="engines"
-			>
-			<File
-				RelativePath="..\..\engines\advancedDetector.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\advancedDetector.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\dialogs.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\dialogs.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\engine.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\engine.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\game.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\game.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\metaengine.h"
-				>
-			</File>
+		<Filter Name="engines">
+			<File RelativePath="..\..\engines\advancedDetector.cpp" />
+			<File RelativePath="..\..\engines\advancedDetector.h" />
+			<File RelativePath="..\..\engines\dialogs.cpp" />
+			<File RelativePath="..\..\engines\dialogs.h" />
+			<File RelativePath="..\..\engines\engine.cpp" />
+			<File RelativePath="..\..\engines\engine.h" />
+			<File RelativePath="..\..\engines\game.cpp" />
+			<File RelativePath="..\..\engines\game.h" />
+			<File RelativePath="..\..\engines\metaengine.h" />
 		</Filter>
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>
diff --git a/dists/msvc9/sky.vcproj b/dists/msvc9/sky.vcproj
index 82a5131fdf..bc412315b2 100644
--- a/dists/msvc9/sky.vcproj
+++ b/dists/msvc9/sky.vcproj
@@ -9,345 +9,58 @@
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="sky_Debug"
-			IntermediateDirectory="sky_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/sky.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="sky_Release"
-			IntermediateDirectory="sky_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/sky.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
+		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
+		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<Filter
-			Name="music"
-			>
-			<File
-				RelativePath="..\..\engines\sky\music\adlibchannel.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sky\music\adlibchannel.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sky\music\adlibmusic.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sky\music\adlibmusic.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sky\music\gmchannel.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sky\music\gmchannel.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sky\music\gmmusic.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sky\music\gmmusic.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sky\music\mt32music.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sky\music\mt32music.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sky\music\musicbase.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sky\music\musicbase.h"
-				>
-			</File>
+		<Filter	Name="music">
+			<File RelativePath="..\..\engines\sky\music\adlibchannel.cpp" />
+			<File RelativePath="..\..\engines\sky\music\adlibchannel.h" />
+			<File RelativePath="..\..\engines\sky\music\adlibmusic.cpp" />
+			<File RelativePath="..\..\engines\sky\music\adlibmusic.h" />
+			<File RelativePath="..\..\engines\sky\music\gmchannel.cpp" />
+			<File RelativePath="..\..\engines\sky\music\gmchannel.h" />
+			<File RelativePath="..\..\engines\sky\music\gmmusic.cpp" />
+			<File RelativePath="..\..\engines\sky\music\gmmusic.h" />
+			<File RelativePath="..\..\engines\sky\music\mt32music.cpp" />
+			<File RelativePath="..\..\engines\sky\music\mt32music.h" />
+			<File RelativePath="..\..\engines\sky\music\musicbase.cpp" />
+			<File RelativePath="..\..\engines\sky\music\musicbase.h" />
 		</Filter>
-		<File
-			RelativePath="..\..\engines\sky\autoroute.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\autoroute.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\compact.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\compact.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\control.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\control.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\debug.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\debug.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\detection.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\disk.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\disk.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\grid.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\grid.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\hufftext.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\intro.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\intro.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\logic.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\logic.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\mouse.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\mouse.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\rnc_deco.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\rnc_deco.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\screen.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\screen.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\sky.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\sky.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\skydefs.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\sound.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\sound.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\struc.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\text.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sky\text.h"
-			>
-		</File>
+		<File RelativePath="..\..\engines\sky\autoroute.cpp" />
+		<File RelativePath="..\..\engines\sky\autoroute.h" />
+		<File RelativePath="..\..\engines\sky\compact.cpp" />
+		<File RelativePath="..\..\engines\sky\compact.h" />
+		<File RelativePath="..\..\engines\sky\control.cpp" />
+		<File RelativePath="..\..\engines\sky\control.h" />
+		<File RelativePath="..\..\engines\sky\debug.cpp" />
+		<File RelativePath="..\..\engines\sky\debug.h" />
+		<File RelativePath="..\..\engines\sky\detection.cpp" />
+		<File RelativePath="..\..\engines\sky\disk.cpp" />
+		<File RelativePath="..\..\engines\sky\disk.h" />
+		<File RelativePath="..\..\engines\sky\grid.cpp" />
+		<File RelativePath="..\..\engines\sky\grid.h" />
+		<File RelativePath="..\..\engines\sky\hufftext.cpp" />
+		<File RelativePath="..\..\engines\sky\intro.cpp" />
+		<File RelativePath="..\..\engines\sky\intro.h" />
+		<File RelativePath="..\..\engines\sky\logic.cpp" />
+		<File RelativePath="..\..\engines\sky\logic.h" />
+		<File RelativePath="..\..\engines\sky\mouse.cpp" />
+		<File RelativePath="..\..\engines\sky\mouse.h" />
+		<File RelativePath="..\..\engines\sky\rnc_deco.cpp" />
+		<File RelativePath="..\..\engines\sky\rnc_deco.h" />
+		<File RelativePath="..\..\engines\sky\screen.cpp" />
+		<File RelativePath="..\..\engines\sky\screen.h" />
+		<File RelativePath="..\..\engines\sky\sky.cpp" />
+		<File RelativePath="..\..\engines\sky\sky.h" />
+		<File RelativePath="..\..\engines\sky\skydefs.h" />
+		<File RelativePath="..\..\engines\sky\sound.cpp" />
+		<File RelativePath="..\..\engines\sky\sound.h" />
+		<File RelativePath="..\..\engines\sky\struc.h" />
+		<File RelativePath="..\..\engines\sky\text.cpp" />
+		<File RelativePath="..\..\engines\sky\text.h" />
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>
diff --git a/dists/msvc9/sword1.vcproj b/dists/msvc9/sword1.vcproj
index c94cbe387f..13dfb89db9 100644
--- a/dists/msvc9/sword1.vcproj
+++ b/dists/msvc9/sword1.vcproj
@@ -9,317 +9,50 @@
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="sword1_Debug"
-			IntermediateDirectory="sword1_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/sword1.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="sword1_Release"
-			IntermediateDirectory="sword1_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/sword1.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
+		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
+		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<File
-			RelativePath="..\..\engines\sword1\animation.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\animation.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\collision.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\control.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\control.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\debug.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\debug.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\detection.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\eventman.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\eventman.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\logic.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\logic.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\memman.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\memman.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\menu.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\menu.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\mouse.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\mouse.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\music.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\music.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\object.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\objectman.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\objectman.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\resman.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\resman.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\router.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\router.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\screen.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\screen.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\sound.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\sound.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\staticres.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\sword1.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\sword1.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\sworddefs.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\swordres.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\text.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword1\text.h"
-			>
-		</File>
+		<File RelativePath="..\..\engines\sword1\animation.cpp" />
+		<File RelativePath="..\..\engines\sword1\animation.h" />
+		<File RelativePath="..\..\engines\sword1\collision.h" />
+		<File RelativePath="..\..\engines\sword1\control.cpp" />
+		<File RelativePath="..\..\engines\sword1\control.h" />
+		<File RelativePath="..\..\engines\sword1\debug.cpp" />
+		<File RelativePath="..\..\engines\sword1\debug.h" />
+		<File RelativePath="..\..\engines\sword1\detection.cpp" />
+		<File RelativePath="..\..\engines\sword1\eventman.cpp" />
+		<File RelativePath="..\..\engines\sword1\eventman.h" />
+		<File RelativePath="..\..\engines\sword1\logic.cpp" />
+		<File RelativePath="..\..\engines\sword1\logic.h" />
+		<File RelativePath="..\..\engines\sword1\memman.cpp" />
+		<File RelativePath="..\..\engines\sword1\memman.h" />
+		<File RelativePath="..\..\engines\sword1\menu.cpp" />
+		<File RelativePath="..\..\engines\sword1\menu.h" />
+		<File RelativePath="..\..\engines\sword1\mouse.cpp" />
+		<File RelativePath="..\..\engines\sword1\mouse.h" />
+		<File RelativePath="..\..\engines\sword1\music.cpp" />
+		<File RelativePath="..\..\engines\sword1\music.h" />
+		<File RelativePath="..\..\engines\sword1\object.h" />
+		<File RelativePath="..\..\engines\sword1\objectman.cpp" />
+		<File RelativePath="..\..\engines\sword1\objectman.h" />
+		<File RelativePath="..\..\engines\sword1\resman.cpp" />
+		<File RelativePath="..\..\engines\sword1\resman.h" />
+		<File RelativePath="..\..\engines\sword1\router.cpp" />
+		<File RelativePath="..\..\engines\sword1\router.h" />
+		<File RelativePath="..\..\engines\sword1\screen.cpp" />
+		<File RelativePath="..\..\engines\sword1\screen.h" />
+		<File RelativePath="..\..\engines\sword1\sound.cpp" />
+		<File RelativePath="..\..\engines\sword1\sound.h" />
+		<File RelativePath="..\..\engines\sword1\staticres.cpp" />
+		<File RelativePath="..\..\engines\sword1\sword1.cpp" />
+		<File RelativePath="..\..\engines\sword1\sword1.h" />
+		<File RelativePath="..\..\engines\sword1\sworddefs.h" />
+		<File RelativePath="..\..\engines\sword1\swordres.h" />
+		<File RelativePath="..\..\engines\sword1\text.cpp" />
+		<File RelativePath="..\..\engines\sword1\text.h" />
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>
diff --git a/dists/msvc9/sword2.vcproj b/dists/msvc9/sword2.vcproj
index fb8c4d8db1..bcca55b340 100644
--- a/dists/msvc9/sword2.vcproj
+++ b/dists/msvc9/sword2.vcproj
@@ -9,361 +9,61 @@
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="sword2_Debug"
-			IntermediateDirectory="sword2_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/sword2.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="sword2_Release"
-			IntermediateDirectory="sword2_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/sword2.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
+		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
+		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<File
-			RelativePath="..\..\engines\sword2\animation.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\animation.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\anims.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\console.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\console.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\controls.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\controls.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\debug.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\debug.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\defs.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\events.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\function.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\header.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\icons.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\interpreter.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\interpreter.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\layers.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\logic.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\logic.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\maketext.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\maketext.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\memory.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\memory.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\menu.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\mouse.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\mouse.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\music.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\object.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\palette.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\protocol.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\render.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\resman.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\resman.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\router.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\router.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\saveload.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\saveload.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\screen.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\screen.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\scroll.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\sound.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\sound.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\speech.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\sprite.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\startup.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\sword2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\sword2.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\sync.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\walker.cpp"
-			>
-		</File>
+		<File RelativePath="..\..\engines\sword2\animation.cpp" />
+		<File RelativePath="..\..\engines\sword2\animation.h" />
+		<File RelativePath="..\..\engines\sword2\anims.cpp" />
+		<File RelativePath="..\..\engines\sword2\console.cpp" />
+		<File RelativePath="..\..\engines\sword2\console.h" />
+		<File RelativePath="..\..\engines\sword2\controls.cpp" />
+		<File RelativePath="..\..\engines\sword2\controls.h" />
+		<File RelativePath="..\..\engines\sword2\debug.cpp" />
+		<File RelativePath="..\..\engines\sword2\debug.h" />
+		<File RelativePath="..\..\engines\sword2\defs.h" />
+		<File RelativePath="..\..\engines\sword2\events.cpp" />
+		<File RelativePath="..\..\engines\sword2\function.cpp" />
+		<File RelativePath="..\..\engines\sword2\header.h" />
+		<File RelativePath="..\..\engines\sword2\icons.cpp" />
+		<File RelativePath="..\..\engines\sword2\interpreter.cpp" />
+		<File RelativePath="..\..\engines\sword2\interpreter.h" />
+		<File RelativePath="..\..\engines\sword2\layers.cpp" />
+		<File RelativePath="..\..\engines\sword2\logic.cpp" />
+		<File RelativePath="..\..\engines\sword2\logic.h" />
+		<File RelativePath="..\..\engines\sword2\maketext.cpp" />
+		<File RelativePath="..\..\engines\sword2\maketext.h" />
+		<File RelativePath="..\..\engines\sword2\memory.cpp" />
+		<File RelativePath="..\..\engines\sword2\memory.h" />
+		<File RelativePath="..\..\engines\sword2\menu.cpp" />
+		<File RelativePath="..\..\engines\sword2\mouse.cpp" />
+		<File RelativePath="..\..\engines\sword2\mouse.h" />
+		<File RelativePath="..\..\engines\sword2\music.cpp" />
+		<File RelativePath="..\..\engines\sword2\object.h" />
+		<File RelativePath="..\..\engines\sword2\palette.cpp" />
+		<File RelativePath="..\..\engines\sword2\protocol.cpp" />
+		<File RelativePath="..\..\engines\sword2\render.cpp" />
+		<File RelativePath="..\..\engines\sword2\resman.cpp" />
+		<File RelativePath="..\..\engines\sword2\resman.h" />
+		<File RelativePath="..\..\engines\sword2\router.cpp" />
+		<File RelativePath="..\..\engines\sword2\router.h" />
+		<File RelativePath="..\..\engines\sword2\saveload.cpp" />
+		<File RelativePath="..\..\engines\sword2\saveload.h" />
+		<File RelativePath="..\..\engines\sword2\screen.cpp" />
+		<File RelativePath="..\..\engines\sword2\screen.h" />
+		<File RelativePath="..\..\engines\sword2\scroll.cpp" />
+		<File RelativePath="..\..\engines\sword2\sound.cpp" />
+		<File RelativePath="..\..\engines\sword2\sound.h" />
+		<File RelativePath="..\..\engines\sword2\speech.cpp" />
+		<File RelativePath="..\..\engines\sword2\sprite.cpp" />
+		<File RelativePath="..\..\engines\sword2\startup.cpp" />
+		<File RelativePath="..\..\engines\sword2\sword2.cpp" />
+		<File RelativePath="..\..\engines\sword2\sword2.h" />
+		<File RelativePath="..\..\engines\sword2\sync.cpp" />
+		<File RelativePath="..\..\engines\sword2\walker.cpp" />
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>
diff --git a/dists/msvc9/tinsel.vcproj b/dists/msvc9/tinsel.vcproj
index 21638f9856..8f6a060bb9 100644
--- a/dists/msvc9/tinsel.vcproj
+++ b/dists/msvc9/tinsel.vcproj
@@ -9,513 +9,101 @@
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="tinsel_Debug"
-			IntermediateDirectory="tinsel_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/tinsel.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="tinsel_Release"
-			IntermediateDirectory="tinsel_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/tinsel.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops">
+			<Tool Name="VCCLCompilerTool" DebugInformationFormat="3" />
 		</Configuration>
+		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<File
-			RelativePath="..\..\engines\tinsel\actors.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\actors.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\anim.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\anim.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\background.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\background.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\bg.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\bmv.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\cliprect.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\cliprect.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\config.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\config.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\coroutine.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\cursor.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\cursor.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\debugger.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\debugger.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\detection.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\dialogs.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\dialogs.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\drives.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\drives.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\dw.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\effect.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\events.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\events.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\faders.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\faders.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\film.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\font.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\font.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\graphics.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\graphics.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\handle.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\handle.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\heapmem.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\heapmem.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\mareels.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\mareels.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\move.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\move.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\multiobj.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\multiobj.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\music.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\music.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\object.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\object.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\palette.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\palette.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\pcode.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\pcode.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\pdisplay.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\pdisplay.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\pid.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\play.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\play.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\polygons.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\polygons.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\rince.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\rince.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\saveload.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\savescn.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\savescn.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\scene.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\scene.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\sched.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\sched.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\scn.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\scn.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\scroll.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\scroll.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\sound.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\sound.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\strres.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\strres.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\sysvar.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\sysvar.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\text.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\text.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\timers.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\timers.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\tinlib.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\tinlib.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\tinsel.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\tinsel.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\token.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tinsel\token.h"
-			>
-		</File>
+		<File RelativePath="..\..\engines\tinsel\actors.cpp" />
+		<File RelativePath="..\..\engines\tinsel\actors.h" />
+		<File RelativePath="..\..\engines\tinsel\anim.cpp" />
+		<File RelativePath="..\..\engines\tinsel\anim.h" />
+		<File RelativePath="..\..\engines\tinsel\background.cpp" />
+		<File RelativePath="..\..\engines\tinsel\background.h" />
+		<File RelativePath="..\..\engines\tinsel\bg.cpp" />
+		<File RelativePath="..\..\engines\tinsel\bmv.cpp" />
+		<File RelativePath="..\..\engines\tinsel\cliprect.cpp" />
+		<File RelativePath="..\..\engines\tinsel\cliprect.h" />
+		<File RelativePath="..\..\engines\tinsel\config.cpp" />
+		<File RelativePath="..\..\engines\tinsel\config.h" />
+		<File RelativePath="..\..\engines\tinsel\coroutine.h" />
+		<File RelativePath="..\..\engines\tinsel\cursor.cpp" />
+		<File RelativePath="..\..\engines\tinsel\cursor.h" />
+		<File RelativePath="..\..\engines\tinsel\debugger.cpp" />
+		<File RelativePath="..\..\engines\tinsel\debugger.h" />
+		<File RelativePath="..\..\engines\tinsel\detection.cpp" />
+		<File RelativePath="..\..\engines\tinsel\dialogs.cpp" />
+		<File RelativePath="..\..\engines\tinsel\dialogs.h" />
+		<File RelativePath="..\..\engines\tinsel\drives.cpp" />
+		<File RelativePath="..\..\engines\tinsel\drives.h" />
+		<File RelativePath="..\..\engines\tinsel\dw.h" />
+		<File RelativePath="..\..\engines\tinsel\effect.cpp" />
+		<File RelativePath="..\..\engines\tinsel\events.cpp" />
+		<File RelativePath="..\..\engines\tinsel\events.h" />
+		<File RelativePath="..\..\engines\tinsel\faders.cpp" />
+		<File RelativePath="..\..\engines\tinsel\faders.h" />
+		<File RelativePath="..\..\engines\tinsel\film.h" />
+		<File RelativePath="..\..\engines\tinsel\font.cpp" />
+		<File RelativePath="..\..\engines\tinsel\font.h" />
+		<File RelativePath="..\..\engines\tinsel\graphics.cpp" />
+		<File RelativePath="..\..\engines\tinsel\graphics.h" />
+		<File RelativePath="..\..\engines\tinsel\handle.cpp" />
+		<File RelativePath="..\..\engines\tinsel\handle.h" />
+		<File RelativePath="..\..\engines\tinsel\heapmem.cpp" />
+		<File RelativePath="..\..\engines\tinsel\heapmem.h" />
+		<File RelativePath="..\..\engines\tinsel\mareels.cpp" />
+		<File RelativePath="..\..\engines\tinsel\mareels.h" />
+		<File RelativePath="..\..\engines\tinsel\move.cpp" />
+		<File RelativePath="..\..\engines\tinsel\move.h" />
+		<File RelativePath="..\..\engines\tinsel\multiobj.cpp" />
+		<File RelativePath="..\..\engines\tinsel\multiobj.h" />
+		<File RelativePath="..\..\engines\tinsel\music.cpp" />
+		<File RelativePath="..\..\engines\tinsel\music.h" />
+		<File RelativePath="..\..\engines\tinsel\object.cpp" />
+		<File RelativePath="..\..\engines\tinsel\object.h" />
+		<File RelativePath="..\..\engines\tinsel\palette.cpp" />
+		<File RelativePath="..\..\engines\tinsel\palette.h" />
+		<File RelativePath="..\..\engines\tinsel\pcode.cpp" />
+		<File RelativePath="..\..\engines\tinsel\pcode.h" />
+		<File RelativePath="..\..\engines\tinsel\pdisplay.cpp" />
+		<File RelativePath="..\..\engines\tinsel\pdisplay.h" />
+		<File RelativePath="..\..\engines\tinsel\pid.h" />
+		<File RelativePath="..\..\engines\tinsel\play.cpp" />
+		<File RelativePath="..\..\engines\tinsel\play.h" />
+		<File RelativePath="..\..\engines\tinsel\polygons.cpp" />
+		<File RelativePath="..\..\engines\tinsel\polygons.h" />
+		<File RelativePath="..\..\engines\tinsel\rince.cpp" />
+		<File RelativePath="..\..\engines\tinsel\rince.h" />
+		<File RelativePath="..\..\engines\tinsel\saveload.cpp" />
+		<File RelativePath="..\..\engines\tinsel\savescn.cpp" />
+		<File RelativePath="..\..\engines\tinsel\savescn.h" />
+		<File RelativePath="..\..\engines\tinsel\scene.cpp" />
+		<File RelativePath="..\..\engines\tinsel\scene.h" />
+		<File RelativePath="..\..\engines\tinsel\sched.cpp" />
+		<File RelativePath="..\..\engines\tinsel\sched.h" />
+		<File RelativePath="..\..\engines\tinsel\scn.cpp" />
+		<File RelativePath="..\..\engines\tinsel\scn.h" />
+		<File RelativePath="..\..\engines\tinsel\scroll.cpp" />
+		<File RelativePath="..\..\engines\tinsel\scroll.h" />
+		<File RelativePath="..\..\engines\tinsel\sound.cpp" />
+		<File RelativePath="..\..\engines\tinsel\sound.h" />
+		<File RelativePath="..\..\engines\tinsel\strres.cpp" />
+		<File RelativePath="..\..\engines\tinsel\strres.h" />
+		<File RelativePath="..\..\engines\tinsel\sysvar.cpp" />
+		<File RelativePath="..\..\engines\tinsel\sysvar.h" />
+		<File RelativePath="..\..\engines\tinsel\text.cpp" />
+		<File RelativePath="..\..\engines\tinsel\text.h" />
+		<File RelativePath="..\..\engines\tinsel\timers.cpp" />
+		<File RelativePath="..\..\engines\tinsel\timers.h" />
+		<File RelativePath="..\..\engines\tinsel\tinlib.cpp" />
+		<File RelativePath="..\..\engines\tinsel\tinlib.h" />
+		<File RelativePath="..\..\engines\tinsel\tinsel.cpp" />
+		<File RelativePath="..\..\engines\tinsel\tinsel.h" />
+		<File RelativePath="..\..\engines\tinsel\token.cpp" />
+		<File RelativePath="..\..\engines\tinsel\token.h" />
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>
diff --git a/dists/msvc9/touche.vcproj b/dists/msvc9/touche.vcproj
index 0ff5673c56..02167e4cf4 100644
--- a/dists/msvc9/touche.vcproj
+++ b/dists/msvc9/touche.vcproj
@@ -9,213 +9,24 @@
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="touche_Debug"
-			IntermediateDirectory="touche_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/touche.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="touche_Release"
-			IntermediateDirectory="touche_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/touche.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
+		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
+		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<File
-			RelativePath="..\..\engines\touche\detection.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\touche\graphics.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\touche\graphics.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\touche\menu.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\touche\midi.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\touche\midi.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\touche\opcodes.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\touche\resource.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\touche\saveload.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\touche\staticres.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\touche\touche.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\touche\touche.h"
-			>
-		</File>
+		<File RelativePath="..\..\engines\touche\detection.cpp" />
+		<File RelativePath="..\..\engines\touche\graphics.cpp" />
+		<File RelativePath="..\..\engines\touche\graphics.h" />
+		<File RelativePath="..\..\engines\touche\menu.cpp" />
+		<File RelativePath="..\..\engines\touche\midi.cpp" />
+		<File RelativePath="..\..\engines\touche\midi.h" />
+		<File RelativePath="..\..\engines\touche\opcodes.cpp" />
+		<File RelativePath="..\..\engines\touche\resource.cpp" />
+		<File RelativePath="..\..\engines\touche\saveload.cpp" />
+		<File RelativePath="..\..\engines\touche\staticres.cpp" />
+		<File RelativePath="..\..\engines\touche\touche.cpp" />
+		<File RelativePath="..\..\engines\touche\touche.h" />
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>
diff --git a/dists/msvc9/tucker.vcproj b/dists/msvc9/tucker.vcproj
index 3d08c60c3a..5589745a4f 100644
--- a/dists/msvc9/tucker.vcproj
+++ b/dists/msvc9/tucker.vcproj
@@ -9,205 +9,22 @@
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="tucker_Debug"
-			IntermediateDirectory="tucker_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/tucker.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="tucker_Release"
-			IntermediateDirectory="tucker_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/tucker.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
+		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
+		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<File
-			RelativePath="..\..\engines\tucker\detection.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tucker\graphics.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tucker\graphics.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tucker\locations.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tucker\resource.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tucker\saveload.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tucker\sequences.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tucker\staticres.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tucker\tucker.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\tucker\tucker.h"
-			>
-		</File>
+		<File RelativePath="..\..\engines\tucker\detection.cpp" />
+		<File RelativePath="..\..\engines\tucker\graphics.cpp" />
+		<File RelativePath="..\..\engines\tucker\graphics.h" />
+		<File RelativePath="..\..\engines\tucker\locations.cpp" />
+		<File RelativePath="..\..\engines\tucker\resource.cpp" />
+		<File RelativePath="..\..\engines\tucker\saveload.cpp" />
+		<File RelativePath="..\..\engines\tucker\sequences.cpp" />
+		<File RelativePath="..\..\engines\tucker\staticres.cpp" />
+		<File RelativePath="..\..\engines\tucker\tucker.cpp" />
+		<File RelativePath="..\..\engines\tucker\tucker.h" />
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>
diff --git a/dists/msvc9_to_msvc8.bat b/dists/msvc9_to_msvc8.bat
index 39fab8bc4a..c4e4e17cb9 100644
--- a/dists/msvc9_to_msvc8.bat
+++ b/dists/msvc9_to_msvc8.bat
@@ -11,15 +11,12 @@ if not exist rpl.exe goto no_rpl
 echo Creating MSVC8 project files from the MSVC9 ones
 copy /y msvc9\*.vcproj msvc8\
 copy /y msvc9\*.sln msvc8\
+copy /y msvc9\*.vsprops msvc8\
 rpl -e -q "Version=\"9.00\"" "Version=\"8.00\"" msvc8\*.vcproj
 rpl -e -q "Version=\"9,00\"" "Version=\"8,00\"" msvc8\*.vcproj
 rpl -e -q "\tTargetFrameworkVersion=\"131072\"\n" "" msvc8\*.vcproj
-rpl -e -q "\t\t\t\tRandomizedBaseAddress=\"1\"\n" "" msvc8\scummvm.vcproj
-rpl -e -q "\t\t\t\tDataExecutionPrevention=\"0\"\n" "" msvc8\scummvm.vcproj
 rpl -e -q "Format Version 10.00" "Format Version 9.00" msvc8\scummvm.sln
 rpl -e -q "Format Version 10,00" "Format Version 9,00" msvc8\scummvm.sln
-rpl -e -q "# Visual C++ Express 2008" "# Visual C++ Express 2005" msvc8\scummvm.sln
-rpl -e -q "# Visual Studio 2008" "# Visual Studio 2005" msvc8\scummvm.sln
 goto the_end
 
 :no_rpl
diff --git a/engines/gob/dataio.cpp b/engines/gob/dataio.cpp
index f59fa80e8d..99cf7c1193 100644
--- a/engines/gob/dataio.cpp
+++ b/engines/gob/dataio.cpp
@@ -488,6 +488,9 @@ int16 DataIO::openData(const char *path) {
 }
 
 bool DataIO::existData(const char *path) {
+	if (!path || (path[0] == '\0'))
+		return false;
+
 	int16 handle = openData(path);
 
 	if (handle < 0)
@@ -584,7 +587,7 @@ byte *DataIO::getData(const char *path) {
 }
 
 DataStream *DataIO::getDataStream(const char *path) {
-	if (!path || (path[0] == '\0') || !existData(path))
+	if (!existData(path))
 		return 0;
 
 	uint32 size = getDataSize(path);
diff --git a/engines/gob/draw.cpp b/engines/gob/draw.cpp
index c20bece7b4..fb3cb9bbcd 100644
--- a/engines/gob/draw.cpp
+++ b/engines/gob/draw.cpp
@@ -29,6 +29,7 @@
 #include "gob/draw.h"
 #include "gob/global.h"
 #include "gob/util.h"
+#include "gob/dataio.h"
 #include "gob/game.h"
 #include "gob/script.h"
 #include "gob/inter.h"
@@ -60,7 +61,7 @@ Draw::Draw(GobEngine *vm) : _vm(vm) {
 	_backDeltaX = 0;
 	_backDeltaY = 0;
 
-	for (int i = 0; i < 8; i++)
+	for (int i = 0; i < kFontCount; i++)
 		_fonts[i] = 0;
 
 	_spritesArray.resize(SPRITES_COUNT);
@@ -128,7 +129,7 @@ Draw::Draw(GobEngine *vm) : _vm(vm) {
 }
 
 Draw::~Draw() {
-	for (int i = 0; i < 8; i++)
+	for (int i = 0; i < kFontCount; i++)
 		delete _fonts[i];
 }
 
@@ -346,6 +347,8 @@ int Draw::stringLength(const char *str, int16 fontIndex) {
 	if ((fontIndex < 0) || (fontIndex > 7) || !_fonts[fontIndex])
 		return 0;
 
+	Font &font = *_fonts[fontIndex];
+
 	int len = 0;
 
 	if (_vm->_global->_language == 10) {
@@ -355,16 +358,16 @@ int Draw::stringLength(const char *str, int16 fontIndex) {
 				len += japaneseExtraCharLen[4];
 				i++;
 			} else
-				len += _fonts[fontIndex]->itemWidth;
+				len += font.getCharWidth();
 		}
 
 	} else {
 
-		if (_fonts[fontIndex]->charWidths)
-			while (*str != 0)
-				len += *(_fonts[fontIndex]->charWidths + (*str++ - _fonts[fontIndex]->startItem));
+		if (!font.isMonospaced())
+			while (*str != '\0')
+				len += font.getCharWidth(*str++);
 		else
-			len = (strlen(str) * _fonts[fontIndex]->itemWidth);
+			len = strlen(str) * font.getCharWidth();
 
 	}
 
@@ -372,14 +375,11 @@ int Draw::stringLength(const char *str, int16 fontIndex) {
 }
 
 void Draw::drawString(const char *str, int16 x, int16 y, int16 color1, int16 color2,
-		int16 transp, SurfaceDesc &dest, Video::FontDesc *font) {
+		int16 transp, SurfaceDesc &dest, const Font &font) {
 
 	while (*str != '\0') {
 		_vm->_video->drawLetter(*str, x, y, font, transp, color1, color2, dest);
-		if (!font->charWidths)
-			x += font->itemWidth;
-		else
-			x += *(font->charWidths + (*str - font->startItem));
+		x += font.getCharWidth(*str);
 		str++;
 	}
 }
@@ -407,23 +407,23 @@ void Draw::printTextCentered(int16 id, int16 left, int16 top, int16 right,
 	if (str[0] == '\0')
 		return;
 
-	int16 width = 0;
-
 	_transparency = 1;
 	_destSpriteX = left;
 	_destSpriteY = top;
 	_fontIndex = fontIndex;
 	_frontColor = color;
 	_textToPrint = str;
-	if (_fonts[fontIndex]->charWidths != 0) {
-		uint8 *widths = _fonts[fontIndex]->charWidths;
-		int length = strlen(str);
 
-		for (int i = 0; i < length; i++)
-			width += *(widths + (str[i] - _fonts[_fontIndex]->startItem));
+	Font &font = *_fonts[fontIndex];
+
+	int16 width = 0;
+	if (!font.isMonospaced()) {
+		const char *s = str;
+		while (*s != '\0')
+			width += font.getCharWidth(*s++);
 	}
 	else
-		width = strlen(str) * _fonts[fontIndex]->itemWidth;
+		width = strlen(str) * font.getCharWidth();
 
 	adjustCoords(1, &width, 0);
 	_destSpriteX += (right - left + 1 - width) / 2;
@@ -546,4 +546,24 @@ void Draw::wobble(SurfaceDesc &surfDesc) {
 	delete[] offsets;
 }
 
+Font *Draw::loadFont(const char *path) const {
+	if (!_vm->_dataIO->existData(path))
+		return 0;
+
+	byte *data = _vm->_dataIO->getData(path);
+
+	return new Font(data);
+}
+
+bool Draw::loadFont(int fontIndex, const char *path) {
+	if ((fontIndex < 0) || (fontIndex >= kFontCount))
+		return false;
+
+	delete _fonts[fontIndex];
+
+	_fonts[fontIndex] = loadFont(path);
+
+	return _fonts[fontIndex] != 0;
+}
+
 } // End of namespace Gob
diff --git a/engines/gob/draw.h b/engines/gob/draw.h
index 26f78ce3b3..ba32df0c3e 100644
--- a/engines/gob/draw.h
+++ b/engines/gob/draw.h
@@ -45,6 +45,8 @@ namespace Gob {
 
 class Draw {
 public:
+	static const int kFontCount = 8;
+
 	struct FontToSprite {
 		int8 sprite;
 		int8 base;
@@ -76,7 +78,7 @@ public:
 	int16 _backDeltaY;
 
 	FontToSprite _fontToSprite[4];
-	Video::FontDesc *_fonts[8];
+	Font *_fonts[kFontCount];
 
 	Common::Array<SurfaceDescPtr> _spritesArray;
 
@@ -152,7 +154,7 @@ public:
 	}
 	int stringLength(const char *str, int16 fontIndex);
 	void drawString(const char *str, int16 x, int16 y, int16 color1, int16 color2,
-			int16 transp, SurfaceDesc &dest, Video::FontDesc *font);
+			int16 transp, SurfaceDesc &dest, const Font &font);
 	void printTextCentered(int16 id, int16 left, int16 top, int16 right,
 			int16 bottom, const char *str, int16 fontIndex, int16 color);
 	int32 getSpriteRectSize(int16 index);
@@ -161,6 +163,9 @@ public:
 	static const int16 _wobbleTable[360];
 	void wobble(SurfaceDesc &surfDesc);
 
+	Font *loadFont(const char *path) const;
+	bool loadFont(int fontIndex, const char *path);
+
 	virtual void initScreen() = 0;
 	virtual void closeScreen() = 0;
 	virtual void blitCursor() = 0;
diff --git a/engines/gob/draw_v1.cpp b/engines/gob/draw_v1.cpp
index 91f2a45637..e2cfcb613d 100644
--- a/engines/gob/draw_v1.cpp
+++ b/engines/gob/draw_v1.cpp
@@ -248,7 +248,7 @@ void Draw_v1::printTotText(int16 id) {
 			_letterToPrint = (char) *ptr;
 			spriteOperation(DRAW_DRAWLETTER);
 			_destSpriteX +=
-			    _fonts[_fontIndex]->itemWidth;
+			    _fonts[_fontIndex]->getCharWidth();
 			ptr++;
 		} else {
 			cmd = ptrEnd[17] & 0x7F;
@@ -281,7 +281,7 @@ void Draw_v1::printTotText(int16 id) {
 			spriteOperation(DRAW_PRINTTEXT);
 			if (ptrEnd[17] & 0x80) {
 				if (ptr[1] == ' ') {
-					_destSpriteX += _fonts[_fontIndex]->itemWidth;
+					_destSpriteX += _fonts[_fontIndex]->getCharWidth();
 					while (ptr[1] == ' ')
 						ptr++;
 					if (ptr[1] == 2) {
@@ -290,10 +290,10 @@ void Draw_v1::printTotText(int16 id) {
 					}
 				} else if (ptr[1] == 2 && READ_LE_UINT16(ptr + 4) == _destSpriteY) {
 					ptr += 5;
-					_destSpriteX += _fonts[_fontIndex]->itemWidth;
+					_destSpriteX += _fonts[_fontIndex]->getCharWidth();
 				}
 			} else {
-				_destSpriteX = destSpriteX + _fonts[_fontIndex]->itemWidth;
+				_destSpriteX = destSpriteX + _fonts[_fontIndex]->getCharWidth();
 			}
 			ptrEnd += 23;
 			ptr++;
@@ -341,6 +341,7 @@ void Draw_v1::spriteOperation(int16 operation) {
 		}
 	}
 
+	Font *font = 0;
 	switch (operation) {
 	case DRAW_BLITSURF:
 		_vm->_video->drawSprite(*_spritesArray[_sourceSurface],
@@ -402,20 +403,25 @@ void Draw_v1::spriteOperation(int16 operation) {
 		break;
 
 	case DRAW_PRINTTEXT:
+		font = _fonts[_fontIndex];
+		if (!font) {
+			warning("Trying to print \"%s\" with undefined font %d", _textToPrint, _fontIndex);
+			break;
+		}
+
 		len = strlen(_textToPrint);
 		dirtiedRect(_destSurface, _destSpriteX, _destSpriteY,
-				_destSpriteX + len * _fonts[_fontIndex]->itemWidth - 1,
-				_destSpriteY + _fonts[_fontIndex]->itemHeight - 1);
+				_destSpriteX + len * font->getCharWidth() - 1,
+				_destSpriteY + font->getCharHeight() - 1);
 
 		for (int i = 0; i < len; i++) {
 			_vm->_video->drawLetter(_textToPrint[i],
 			    _destSpriteX, _destSpriteY,
-			    _fonts[_fontIndex],
-			    _transparency,
+			    *font, _transparency,
 			    _frontColor, _backColor,
 			    *_spritesArray[_destSurface]);
 
-			_destSpriteX += _fonts[_fontIndex]->itemWidth;
+			_destSpriteX += font->getCharWidth();
 		}
 		break;
 
@@ -458,14 +464,19 @@ void Draw_v1::spriteOperation(int16 operation) {
 		break;
 
 	case DRAW_DRAWLETTER:
+		font = _fonts[_fontIndex];
+		if (!font) {
+			warning("Trying to print \'%c\' with undefined font %d", _letterToPrint, _fontIndex);
+			break;
+		}
+
 		if (_fontToSprite[_fontIndex].sprite == -1) {
 			dirtiedRect(_destSurface, _destSpriteX, _destSpriteY,
-					_destSpriteX + _fonts[_fontIndex]->itemWidth - 1,
-					_destSpriteY + _fonts[_fontIndex]->itemHeight - 1);
+					_destSpriteX + font->getCharWidth()  - 1,
+					_destSpriteY + font->getCharHeight() - 1);
 			_vm->_video->drawLetter(_letterToPrint,
 			    _destSpriteX, _destSpriteY,
-			    _fonts[_fontIndex],
-			    _transparency,
+			    *font, _transparency,
 			    _frontColor, _backColor,
 			    *_spritesArray[_destSurface]);
 			break;
diff --git a/engines/gob/draw_v2.cpp b/engines/gob/draw_v2.cpp
index a0be23516c..8fe70589a7 100644
--- a/engines/gob/draw_v2.cpp
+++ b/engines/gob/draw_v2.cpp
@@ -371,14 +371,14 @@ void Draw_v2::printTotText(int16 id) {
 		if ((((*ptr >= 1) && (*ptr <= 7)) || (*ptr == 10)) && (strPos != 0)) {
 			str[MAX(strPos, strPos2)] = 0;
 			strPosBak = strPos;
-			width = strlen(str) * _fonts[fontIndex]->itemWidth;
+			width = strlen(str) * _fonts[fontIndex]->getCharWidth();
 			adjustCoords(1, &width, 0);
 
 			if (colCmd & 0x0F) {
 				rectLeft = offX - 2;
 				rectTop = offY - 2;
 				rectRight = offX + width + 1;
-				rectBottom = _fonts[fontIndex]->itemHeight;
+				rectBottom = _fonts[fontIndex]->getCharHeight();
 				adjustCoords(1, &rectBottom, 0);
 				rectBottom += offY + 1;
 				adjustCoords(0, &rectLeft, &rectTop);
@@ -404,9 +404,9 @@ void Draw_v2::printTotText(int16 id) {
 
 				if (_needAdjust != 2) {
 					if ((_destSpriteX >= destX) && (_destSpriteY >= destY) &&
-					    (((_fonts[_fontIndex]->itemHeight / 2) + _destSpriteY - 1) <= spriteBottom)) {
+					    (((_fonts[_fontIndex]->getCharHeight() / 2) + _destSpriteY - 1) <= spriteBottom)) {
 						while (((_destSpriteX + width - 1) > spriteRight) && (width > 0)) {
-							width -= _fonts[_fontIndex]->itemWidth / 2;
+							width -= _fonts[_fontIndex]->getCharWidth() / 2;
 							str[strlen(str) - 1] = '\0';
 						}
 						spriteOperation(DRAW_PRINTTEXT);
@@ -419,8 +419,8 @@ void Draw_v2::printTotText(int16 id) {
 					if (mask[strPos] == '\0')
 						continue;
 
-					rectLeft = _fonts[fontIndex]->itemWidth;
-					rectTop = _fonts[fontIndex]->itemHeight;
+					rectLeft = _fonts[fontIndex]->getCharWidth();
+					rectTop = _fonts[fontIndex]->getCharHeight();
 					adjustCoords(1, &rectLeft, &rectTop);
 					_destSpriteX = strPos * rectLeft + offX;
 					_spriteRight = _destSpriteX + rectLeft - 1;
@@ -430,7 +430,7 @@ void Draw_v2::printTotText(int16 id) {
 				}
 			}
 
-			rectLeft = _fonts[_fontIndex]->itemWidth;
+			rectLeft = _fonts[_fontIndex]->getCharWidth();
 			adjustCoords(1, &rectLeft, 0);
 			offX += strPosBak * rectLeft;
 			strPos = 0;
@@ -598,8 +598,6 @@ void Draw_v2::spriteOperation(int16 operation) {
 	int16 left;
 	int16 ratio;
 	Resource *resource;
-	// Always assigned to -1 in Game::loadTotFile()
-	int16 someHandle = -1;
 
 	deltaVeto = (operation & 0x10) != 0;
 	operation &= 0x0F;
@@ -761,8 +759,13 @@ void Draw_v2::spriteOperation(int16 operation) {
 		left = _destSpriteX;
 
 		if ((_fontIndex >= 4) || (_fontToSprite[_fontIndex].sprite == -1)) {
+			Font *font = _fonts[_fontIndex];
+			if (!font) {
+				warning("Trying to print \"%s\" with undefined font %d", _textToPrint, _fontIndex);
+				break;
+			}
 
-			if (!_fonts[_fontIndex]->charWidths) {
+			if (font->isMonospaced()) {
 				if (((int8) _textToPrint[0]) == -1) {
 					_vm->validateLanguage();
 
@@ -770,26 +773,20 @@ void Draw_v2::spriteOperation(int16 operation) {
 					len = *dataBuf++;
 					for (int i = 0; i < len; i++, dataBuf += 2) {
 						_vm->_video->drawLetter(READ_LE_UINT16(dataBuf), _destSpriteX,
-								_destSpriteY, _fonts[_fontIndex], _transparency, _frontColor,
+								_destSpriteY, *font, _transparency, _frontColor,
 								_backColor, *_spritesArray[_destSurface]);
 					}
 				} else {
 					drawString(_textToPrint, _destSpriteX, _destSpriteY, _frontColor,
-							_backColor, _transparency, *_spritesArray[_destSurface],
-							_fonts[_fontIndex]);
-					_destSpriteX += len * _fonts[_fontIndex]->itemWidth;
+							_backColor, _transparency, *_spritesArray[_destSurface], *font);
+					_destSpriteX += len * font->getCharWidth();
 				}
 			} else {
 				for (int i = 0; i < len; i++) {
-					if ((someHandle < 0) || (_textToPrint[i] != ' ')) {
-						_vm->_video->drawLetter(_textToPrint[i], _destSpriteX,
-								_destSpriteY, _fonts[_fontIndex], _transparency,
-								_frontColor, _backColor, *_spritesArray[_destSurface]);
-						_destSpriteX += *(_fonts[_fontIndex]->charWidths +
-								(_textToPrint[i] - _fonts[_fontIndex]->startItem));
-					}
-					else
-						_destSpriteX += _fonts[_fontIndex]->itemWidth;
+					_vm->_video->drawLetter(_textToPrint[i], _destSpriteX,
+							_destSpriteY, *font, _transparency,
+							_frontColor, _backColor, *_spritesArray[_destSurface]);
+					_destSpriteX += font->getCharWidth(_textToPrint[i]);
 				}
 			}
 
@@ -813,7 +810,7 @@ void Draw_v2::spriteOperation(int16 operation) {
 		}
 
 		dirtiedRect(_destSurface, left, _destSpriteY,
-				_destSpriteX - 1, _destSpriteY + _fonts[_fontIndex]->itemHeight - 1);
+				_destSpriteX - 1, _destSpriteY + _fonts[_fontIndex]->getCharHeight() - 1);
 		break;
 
 	case DRAW_DRAWBAR:
@@ -884,7 +881,7 @@ void Draw_v2::spriteOperation(int16 operation) {
 	_sourceSurface = sourceSurface;
 
 	if (operation == DRAW_PRINTTEXT) {
-		len = _fonts[_fontIndex]->itemWidth;
+		len = _fonts[_fontIndex]->getCharWidth();
 		adjustCoords(1, &len, 0);
 		_destSpriteX += len * strlen(_textToPrint);
 	}
diff --git a/engines/gob/driver_vga.cpp b/engines/gob/driver_vga.cpp
index aff971164f..c93962c206 100644
--- a/engines/gob/driver_vga.cpp
+++ b/engines/gob/driver_vga.cpp
@@ -70,24 +70,22 @@ void VGAVideoDriver::fillRect(SurfaceDesc &dest, int16 left, int16 top,
 }
 
 void VGAVideoDriver::drawLetter(unsigned char item, int16 x, int16 y,
-		Video::FontDesc *fontDesc, byte color1, byte color2,
+		const Font &font, byte color1, byte color2,
 		byte transp, SurfaceDesc &dest) {
-	byte *src, *dst;
 	uint16 data;
 
-	src = fontDesc->dataPtr +
-		(item - fontDesc->startItem) * (fontDesc->itemSize & 0xFF);
-	dst = dest.getVidMem() + x + dest.getWidth() * y;
+	const byte *src = font.getCharData(item);
+	byte *dst = dest.getVidMem() + x + dest.getWidth() * y;
 
-	int nWidth = fontDesc->itemWidth;
+	int nWidth = font.getCharWidth();
 
 	if (nWidth & 7)
 		nWidth = (nWidth & 0xF8) + 8;
 
 	nWidth >>= 3;
 
-	for (int i = 0; i < fontDesc->itemHeight; i++) {
-		int width = fontDesc->itemWidth;
+	for (int i = 0; i < font.getCharHeight(); i++) {
+		int width = font.getCharWidth();
 
 		for (int k = 0; k < nWidth; k++) {
 
@@ -106,7 +104,7 @@ void VGAVideoDriver::drawLetter(unsigned char item, int16 x, int16 y,
 
 		}
 
-		dst += dest.getWidth() - fontDesc->itemWidth;
+		dst += dest.getWidth() - font.getCharWidth();
 	}
 }
 
diff --git a/engines/gob/driver_vga.h b/engines/gob/driver_vga.h
index c50ea5c475..3102016cb5 100644
--- a/engines/gob/driver_vga.h
+++ b/engines/gob/driver_vga.h
@@ -41,7 +41,7 @@ public:
 	void fillRect(SurfaceDesc &dest, int16 left, int16 top,
 			int16 right, int16 bottom, byte color);
 	void drawLetter(unsigned char item, int16 x, int16 y,
-			Video::FontDesc *fontDesc, byte color1, byte color2,
+			const Font &font, byte color1, byte color2,
 			byte transp, SurfaceDesc &dest);
 	void drawSprite(SurfaceDesc &source, SurfaceDesc &dest, int16 left,
 			int16 top, int16 right, int16 bottom, int16 x, int16 y, int16 transp);
diff --git a/engines/gob/gob.cpp b/engines/gob/gob.cpp
index 94255b1277..fa4f04eab8 100644
--- a/engines/gob/gob.cpp
+++ b/engines/gob/gob.cpp
@@ -456,7 +456,7 @@ bool GobEngine::initGameParts() {
 		_init = new Init_v2(this);
 		_video = new Video_v2(this);
 //		_inter = new Inter_Playtoons(this);
-		_inter = new Inter_v4(this);
+		_inter = new Inter_v6(this);
 		_mult = new Mult_v2(this);
 		_draw = new Draw_v2(this);
 		_map = new Map_v2(this);
diff --git a/engines/gob/hotspots.cpp b/engines/gob/hotspots.cpp
index fb8e29f528..b218634d4e 100644
--- a/engines/gob/hotspots.cpp
+++ b/engines/gob/hotspots.cpp
@@ -805,7 +805,7 @@ uint16 Hotspots::updateInput(uint16 xPos, uint16 yPos, uint16 width, uint16 heig
 		uint16 backColor, uint16 frontColor, char *str, uint16 fontIndex,
 		Type type, int16 &duration, uint16 &id, uint16 &index) {
 
-	if ((fontIndex >= 8) || !_vm->_draw->_fonts[fontIndex]) {
+	if ((fontIndex >= Draw::kFontCount) || !_vm->_draw->_fonts[fontIndex]) {
 		warning("Hotspots::updateInput(): Invalid font specified: %d", fontIndex);
 		return 0;
 	}
@@ -816,16 +816,13 @@ uint16 Hotspots::updateInput(uint16 xPos, uint16 yPos, uint16 width, uint16 heig
 	    ((_vm->_global->_useMouse != 0) || (_vm->_game->_forceHandleMouse != 0)))
 		handleMouse = true;
 
-	const Video::FontDesc &font = *_vm->_draw->_fonts[fontIndex];
-
-	// The font doesn't specify individual character widths => monospaced
-	bool monoSpaced = (font.charWidths == 0);
+	const Font &font = *_vm->_draw->_fonts[fontIndex];
 
 	// Current position in the string, preset to the end
 	uint32 pos      = strlen(str);
 	/* Size of input field in characters.
 	 * If the font is not monospaced, we can't know that */
-	uint32 editSize = monoSpaced ? (width / font.itemWidth) : 0;
+	uint32 editSize = font.isMonospaced() ? (width / font.getCharWidth()) : 0;
 
 	uint16 key = 0;
 	char tempStr[256];
@@ -839,11 +836,11 @@ uint16 Hotspots::updateInput(uint16 xPos, uint16 yPos, uint16 width, uint16 heig
 
 		// Clear input area
 		fillRect(xPos, yPos,
-		         monoSpaced ? (editSize * font.itemWidth) : width, height,
+		         font.isMonospaced() ? (editSize * font.getCharWidth()) : width, height,
 		         backColor);
 
 		// Print the current string, vertically centered
-		printText(xPos, yPos + (height - font.itemHeight) / 2,
+		printText(xPos, yPos + (height - font.getCharHeight()) / 2,
 				tempStr, fontIndex, frontColor);
 
 		// If we've reached the end of the input field, set the cursor to the last character
@@ -889,7 +886,7 @@ uint16 Hotspots::updateInput(uint16 xPos, uint16 yPos, uint16 width, uint16 heig
 			fillRect(cursorX, cursorY, cursorWidth, cursorHeight, backColor);
 
 			// Print the current string, vertically centered
-			printText(cursorX, yPos + (height - font.itemHeight) / 2,
+			printText(cursorX, yPos + (height - font.getCharHeight()) / 2,
 					tempStr, fontIndex, frontColor);
 
 			if ((key != 0) || (id != 0))
@@ -1027,8 +1024,7 @@ uint16 Hotspots::updateInput(uint16 xPos, uint16 yPos, uint16 width, uint16 heig
 				if (editSize == 0) {
 					// Length of the string + current character + next one
 					int length = _vm->_draw->stringLength(str, fontIndex) +
-						font.charWidths[' ' - font.startItem] +
-						font.charWidths[key - font.startItem];
+						font.getCharWidth(' ') + font.getCharWidth(key);
 
 					if (length > width)
 						// We're above the limit, ignore the key
@@ -1220,7 +1216,7 @@ void Hotspots::evaluateNew(uint16 i, uint16 *ids, InputDesc *inputs,
 
 	int16 key   = 0;
 	int16 flags = 0;
-	Video::FontDesc *font = 0;
+	Font *font = 0;
 	uint32 funcEnter = 0, funcLeave = 0;
 
 	// Evaluate parameters for the new hotspot
@@ -1292,9 +1288,8 @@ void Hotspots::evaluateNew(uint16 i, uint16 *ids, InputDesc *inputs,
 		}
 
 		font = _vm->_draw->_fonts[inputs[inputCount].fontIndex];
-		if (!font->charWidths)
-			// Monospaced font
-			right = left + width * font->itemWidth - 1;
+		if (font->isMonospaced())
+			right = left + width * font->getCharWidth() - 1;
 
 		funcEnter = 0;
 		funcPos   = 0;
@@ -1890,11 +1885,11 @@ uint16 Hotspots::convertSpecialKey(uint16 key) const {
 	return key;
 }
 
-void Hotspots::getTextCursorPos(const Video::FontDesc &font, const char *str,
+void Hotspots::getTextCursorPos(const Font &font, const char *str,
 		uint32 pos, uint16 x, uint16 y, uint16 width, uint16 height,
 		uint16 &cursorX, uint16 &cursorY, uint16 &cursorWidth, uint16 &cursorHeight) const {
 
-	if (font.charWidths) {
+	if (!font.isMonospaced()) {
 		// Cursor to the right of the current character
 
 		cursorX      = x;
@@ -1904,14 +1899,14 @@ void Hotspots::getTextCursorPos(const Video::FontDesc &font, const char *str,
 
 		// Iterate through the string and add each character's width
 		for (uint32 i = 0; i < pos; i++)
-			cursorX += font.charWidths[str[i] - font.startItem];
+			cursorX += font.getCharWidth(str[i]);
 
 	} else {
 		// Cursor underlining the current character
 
-		cursorX      = x + font.itemWidth * pos;
+		cursorX      = x + font.getCharWidth() * pos;
 		cursorY      = y + height - 1;
-		cursorWidth  = font.itemWidth;
+		cursorWidth  = font.getCharWidth();
 		cursorHeight = 1;
 	}
 }
@@ -1969,7 +1964,7 @@ void Hotspots::updateAllTexts(const InputDesc *inputs) const {
 		fillRect(x, y, width, height, inputs[input].backColor);
 
 		// Center the text vertically
-		y += (height - _vm->_draw->_fonts[_vm->_draw->_fontIndex]->itemHeight) / 2;
+		y += (height - _vm->_draw->_fonts[_vm->_draw->_fontIndex]->getCharHeight()) / 2;
 
 		// Draw it
 		printText(x, y, tempStr, inputs[input].fontIndex, inputs[input].frontColor);
diff --git a/engines/gob/hotspots.h b/engines/gob/hotspots.h
index c269cbb290..a389987c27 100644
--- a/engines/gob/hotspots.h
+++ b/engines/gob/hotspots.h
@@ -32,6 +32,7 @@
 
 namespace Gob {
 
+class Font;
 class Script;
 
 class Hotspots {
@@ -253,7 +254,7 @@ private:
 	uint16 convertSpecialKey(uint16 key) const;
 
 	/** Calculate the graphical cursor position. */
-	void getTextCursorPos(const Video::FontDesc &font, const char *str,
+	void getTextCursorPos(const Font &font, const char *str,
 			uint32 pos, uint16 x, uint16 y, uint16 width, uint16 height,
 			uint16 &cursorX, uint16 &cursorY, uint16 &cursorWidth, uint16 &cursorHeight) const;
 
diff --git a/engines/gob/init.cpp b/engines/gob/init.cpp
index f9a22f52fb..faf85a5b41 100644
--- a/engines/gob/init.cpp
+++ b/engines/gob/init.cpp
@@ -123,8 +123,7 @@ void Init::initGame() {
 	if (!_vm->_dataIO->existData("intro.inf")) {
 
 		for (int i = 0; i < 4; i++)
-			if (_vm->_dataIO->existData(_fontNames[i]))
-				_vm->_draw->_fonts[i] = _vm->_util->loadFont(_fontNames[i]);
+			_vm->_draw->loadFont(i, _fontNames[i]);
 
 	} else {
 		infBuf = _vm->_dataIO->getData("intro.inf");
@@ -140,8 +139,8 @@ void Init::initGame() {
 			buffer[j] = 0;
 
 			strcat(buffer, ".let");
-			if (_vm->_dataIO->existData(buffer))
-				_vm->_draw->_fonts[i] = _vm->_util->loadFont(buffer);
+
+			_vm->_draw->loadFont(i, buffer);
 
 			if ((infPtr + 1) >= infEnd)
 				break;
diff --git a/engines/gob/inter_v1.cpp b/engines/gob/inter_v1.cpp
index 7c5094d175..69c392b198 100644
--- a/engines/gob/inter_v1.cpp
+++ b/engines/gob/inter_v1.cpp
@@ -1712,12 +1712,9 @@ bool Inter_v1::o1_loadFont(OpFuncParams &params) {
 	_vm->_game->_script->evalExpr(0);
 	index = _vm->_game->_script->readInt16();
 
-	delete _vm->_draw->_fonts[index];
-
 	_vm->_draw->animateCursor(4);
 
-	_vm->_draw->_fonts[index] =
-		_vm->_util->loadFont(_vm->_game->_script->getResultStr());
+	_vm->_draw->loadFont(index, _vm->_game->_script->getResultStr());
 
 	return false;
 }
diff --git a/engines/gob/inter_v5.cpp b/engines/gob/inter_v5.cpp
index 1c20851c8d..986bad7cd3 100644
--- a/engines/gob/inter_v5.cpp
+++ b/engines/gob/inter_v5.cpp
@@ -266,9 +266,9 @@ void Inter_v5::o5_spaceShooter(OpGobParams &params) {
 void Inter_v5::o5_getSystemCDSpeed(OpGobParams &params) {
 	WRITE_VAR_UINT32(_vm->_game->_script->readInt16(), 100); // Fudging 100%
 
-	Video::FontDesc *font;
-	if ((font = _vm->_util->loadFont("SPEED.LET"))) {
-		_vm->_draw->drawString("100 %", 402, 89, 112, 144, 0, *_vm->_draw->_backSurface, font);
+	Font *font;
+	if ((font = _vm->_draw->loadFont("SPEED.LET"))) {
+		_vm->_draw->drawString("100 %", 402, 89, 112, 144, 0, *_vm->_draw->_backSurface, *font);
 		_vm->_draw->forceBlit();
 
 		delete font;
@@ -278,9 +278,9 @@ void Inter_v5::o5_getSystemCDSpeed(OpGobParams &params) {
 void Inter_v5::o5_getSystemRAM(OpGobParams &params) {
 	WRITE_VAR_UINT32(_vm->_game->_script->readInt16(), 100); // Fudging 100%
 
-	Video::FontDesc *font;
-	if ((font = _vm->_util->loadFont("SPEED.LET"))) {
-		_vm->_draw->drawString("100 %", 402, 168, 112, 144, 0, *_vm->_draw->_backSurface, font);
+	Font *font;
+	if ((font = _vm->_draw->loadFont("SPEED.LET"))) {
+		_vm->_draw->drawString("100 %", 402, 168, 112, 144, 0, *_vm->_draw->_backSurface, *font);
 		_vm->_draw->forceBlit();
 
 		delete font;
@@ -290,9 +290,9 @@ void Inter_v5::o5_getSystemRAM(OpGobParams &params) {
 void Inter_v5::o5_getSystemCPUSpeed(OpGobParams &params) {
 	WRITE_VAR_UINT32(_vm->_game->_script->readInt16(), 100); // Fudging 100%
 
-	Video::FontDesc *font;
-	if ((font = _vm->_util->loadFont("SPEED.LET"))) {
-		_vm->_draw->drawString("100 %", 402, 248, 112, 144, 0, *_vm->_draw->_backSurface, font);
+	Font *font;
+	if ((font = _vm->_draw->loadFont("SPEED.LET"))) {
+		_vm->_draw->drawString("100 %", 402, 248, 112, 144, 0, *_vm->_draw->_backSurface, *font);
 		_vm->_draw->forceBlit();
 
 		delete font;
@@ -302,9 +302,9 @@ void Inter_v5::o5_getSystemCPUSpeed(OpGobParams &params) {
 void Inter_v5::o5_getSystemDrawSpeed(OpGobParams &params) {
 	WRITE_VAR_UINT32(_vm->_game->_script->readInt16(), 100); // Fudging 100%
 
-	Video::FontDesc *font;
-	if ((font = _vm->_util->loadFont("SPEED.LET"))) {
-		_vm->_draw->drawString("100 %", 402, 326, 112, 144, 0, *_vm->_draw->_backSurface, font);
+	Font *font;
+	if ((font = _vm->_draw->loadFont("SPEED.LET"))) {
+		_vm->_draw->drawString("100 %", 402, 326, 112, 144, 0, *_vm->_draw->_backSurface, *font);
 		_vm->_draw->forceBlit();
 
 		delete font;
@@ -314,9 +314,9 @@ void Inter_v5::o5_getSystemDrawSpeed(OpGobParams &params) {
 void Inter_v5::o5_totalSystemSpecs(OpGobParams &params) {
 	WRITE_VAR_UINT32(_vm->_game->_script->readInt16(), 100); // Fudging 100%
 
-	Video::FontDesc *font;
-	if ((font = _vm->_util->loadFont("SPEED.LET"))) {
-		_vm->_draw->drawString("100 %", 402, 405, 112, 144, 0, *_vm->_draw->_backSurface, font);
+	Font *font;
+	if ((font = _vm->_draw->loadFont("SPEED.LET"))) {
+		_vm->_draw->drawString("100 %", 402, 405, 112, 144, 0, *_vm->_draw->_backSurface, *font);
 		_vm->_draw->forceBlit();
 
 		delete font;
diff --git a/engines/gob/util.cpp b/engines/gob/util.cpp
index 429b0269cf..356eb3c643 100644
--- a/engines/gob/util.cpp
+++ b/engines/gob/util.cpp
@@ -379,38 +379,6 @@ void Util::setScrollOffset(int16 x, int16 y) {
 	_vm->_video->waitRetrace();
 }
 
-Video::FontDesc *Util::loadFont(const char *path) {
-	Video::FontDesc *fontDesc = new Video::FontDesc;
-	byte *data;
-
-	if (!fontDesc)
-		return 0;
-
-	data = _vm->_dataIO->getData(path);
-	if (!data) {
-		delete fontDesc;
-		return 0;
-	}
-
-	fontDesc->dataPtr = data + 4;
-	fontDesc->itemWidth = data[0] & 0x7F;
-	fontDesc->itemHeight = data[1];
-	fontDesc->startItem = data[2];
-	fontDesc->endItem = data[3];
-
-	fontDesc->itemSize =
-	    ((fontDesc->itemWidth - 1) / 8 + 1) * fontDesc->itemHeight;
-	fontDesc->bitWidth = fontDesc->itemWidth;
-
-	if (data[0] & 0x80)
-		fontDesc->charWidths = data + 4 + fontDesc->itemSize *
-			(fontDesc->endItem - fontDesc->startItem + 1);
-	else
-		fontDesc->charWidths = 0;
-
-	return fontDesc;
-}
-
 void Util::insertStr(const char *str1, char *str2, int16 pos) {
 	int len1 = strlen(str1);
 	int len2 = strlen(str2);
diff --git a/engines/gob/util.h b/engines/gob/util.h
index 088a78a64d..82e2df94de 100644
--- a/engines/gob/util.h
+++ b/engines/gob/util.h
@@ -28,10 +28,10 @@
 
 #include "common/keyboard.h"
 
-#include "gob/video.h"
-
 namespace Gob {
 
+class GobEngine;
+
 #define KEYBUFSIZE 16
 
 enum MouseButtons {
@@ -121,8 +121,6 @@ public:
 	void waitEndFrame();
 	void setScrollOffset(int16 x = -1, int16 y = -1);
 
-	Video::FontDesc *loadFont(const char *path);
-
 	static void insertStr(const char *str1, char *str2, int16 pos);
 	static void cutFromStr(char *str, int16 from, int16 cutlen);
 	static void cleanupStr(char *str);
diff --git a/engines/gob/video.cpp b/engines/gob/video.cpp
index 3b4822cc77..f05ee8565f 100644
--- a/engines/gob/video.cpp
+++ b/engines/gob/video.cpp
@@ -40,6 +40,82 @@
 
 namespace Gob {
 
+Font::Font(const byte *data) : _dataPtr(data) {
+	assert(data);
+
+	bool hasWidths = _dataPtr[0] & 0x80;
+
+	_data       = _dataPtr + 4;
+	_itemWidth  = _dataPtr[0] & 0x7F;
+	_itemHeight = _dataPtr[1];
+	_startItem  = _dataPtr[2];
+	_endItem    = _dataPtr[3];
+	_charWidths = 0;
+
+	uint8 rowAlignedBits = (_itemWidth - 1) / 8 + 1;
+
+	_itemSize = rowAlignedBits * _itemHeight;
+	_bitWidth = _itemWidth;
+
+	if (hasWidths)
+		_charWidths = _dataPtr + 4 + _itemSize * getCharCount();
+}
+
+Font::~Font() {
+	delete _dataPtr;
+}
+
+uint8 Font::getCharWidth(uint8 c) const {
+	if (!_charWidths || (_endItem == 0))
+		return _itemWidth;
+
+	if ((c < _startItem) || (c > _endItem))
+		return _itemWidth;
+
+	return _charWidths[c - _startItem];
+}
+
+uint8 Font::getCharWidth() const {
+	return _itemWidth;
+}
+
+uint8 Font::getCharHeight() const {
+	return _itemHeight;
+}
+
+uint16 Font::getCharCount() const {
+	return _endItem - _startItem + 1;
+}
+
+uint8 Font::getFirstChar() const {
+	return _startItem;
+}
+
+uint8 Font::getLastChar() const {
+	return _endItem;
+}
+
+uint8 Font::getCharSize() const {
+	return _itemSize;
+}
+
+bool Font::isMonospaced() const {
+	return _charWidths == 0;
+}
+
+const byte *Font::getCharData(uint8 c) const {
+	if (_endItem == 0) {
+		warning("Font::getCharData(): _endItem == 0");
+		return 0;
+	}
+
+	if ((c < _startItem) || (c > _endItem))
+		return 0;
+
+	return _data + (c - _startItem) * _itemSize;
+}
+
+
 SurfaceDesc::SurfaceDesc(int16 vidMode, int16 width, int16 height,
 		byte *vidMem) : _width(width), _height(height) {
 
@@ -381,41 +457,9 @@ void Video::drawSpriteDouble(SurfaceDesc &source, SurfaceDesc &dest,
 	_videoDriver->drawSpriteDouble(source, dest, left, top, right, bottom, x, y, transp);
 }
 
-void Video::drawLetter(int16 item, int16 x, int16 y, FontDesc *fontDesc,
+void Video::drawLetter(int16 item, int16 x, int16 y, const Font &font,
 		int16 color1, int16 color2, int16 transp, SurfaceDesc &dest) {
-	byte *dataPtr;
-	byte *itemData;
-	int16 itemSize;
-	int16 newItem;
-	int16 curItem;
-	int16 newItemPos;
-	int16 curItemPos;
-
-	if (fontDesc->endItem == 0) {
-		itemSize = fontDesc->itemSize + 3;
-		dataPtr = fontDesc->dataPtr;
-		//        startItem
-		curItem = READ_LE_UINT16(dataPtr - 2) - 1;
-
-		curItemPos = 0;
-		do {
-			newItemPos = ((curItemPos + curItem) / 2) * itemSize;
-			itemData = fontDesc->dataPtr + newItemPos;
-			newItem = (READ_LE_UINT16(itemData) & 0x7FFF);
-			if (item > newItem)
-				curItem = newItemPos - 1;
-			else
-				curItemPos = newItemPos + 1;
-		} while ((newItem != item) && (curItemPos <= curItem));
-
-		if (newItem != item)
-			return;
-
-		fontDesc->dataPtr = itemData + 3;
-		item = 0;
-	}
-
-	_videoDriver->drawLetter((unsigned char)item, x, y, fontDesc, color1, color2, transp, dest);
+	_videoDriver->drawLetter((unsigned char)item, x, y, font, color1, color2, transp, dest);
 }
 
 void Video::drawPackedSprite(byte *sprBuf, int16 width, int16 height,
diff --git a/engines/gob/video.h b/engines/gob/video.h
index 8716a637c2..b8a46598b7 100644
--- a/engines/gob/video.h
+++ b/engines/gob/video.h
@@ -38,6 +38,36 @@ namespace Graphics {
 
 namespace Gob {
 
+class Font {
+public:
+	uint8  getCharWidth (uint8 c) const;
+	uint8  getCharWidth ()        const;
+	uint8  getCharHeight()        const;
+	uint16 getCharCount ()        const;
+	uint8  getFirstChar ()        const;
+	uint8  getLastChar  ()        const;
+	uint8  getCharSize  ()        const;
+
+	bool isMonospaced() const;
+
+	const byte *getCharData(uint8 c) const;
+
+	Font(const byte *data);
+	~Font();
+
+private:
+	const byte *_dataPtr;
+	const byte  *_data;
+	const uint8 *_charWidths;
+
+	int8   _itemWidth;
+	int8   _itemHeight;
+	uint8  _startItem;
+	uint8  _endItem;
+	int8   _itemSize;
+	int8   _bitWidth;
+};
+
 // Some Surfaces are simultaneous in Draw::spritesArray and discrete
 // variables, so if in doubt you should use a SurfaceDescPtr shared
 // pointer object to refer to any SurfaceDesc.
@@ -70,23 +100,6 @@ typedef Common::SharedPtr<SurfaceDesc> SurfaceDescPtr;
 
 class Video {
 public:
-	struct FontDesc {
-		byte *dataPtr;
-		int8 itemWidth;
-		int8 itemHeight;
-		uint8 startItem;
-		uint8 endItem;
-		int8 itemSize;
-		int8 bitWidth;
-		uint8 *charWidths;
-		FontDesc() : dataPtr(0), itemWidth(0), itemHeight(0), startItem(0),
-		             endItem(0), itemSize(0), bitWidth(0) {}
-		~FontDesc() {
-			if (dataPtr)
-				delete[] (dataPtr - 4);
-		}
-	};
-
 #define GDR_VERSION	4
 
 #define PRIMARY_SURFACE		0x80
@@ -154,7 +167,7 @@ public:
 			int16 x, int16 y, int16 transp);
 	void drawSpriteDouble(SurfaceDesc &source, SurfaceDesc &dest,
 	    int16 left, int16 top, int16 right, int16 bottom, int16 x, int16 y, int16 transp);
-	void drawLetter(int16 item, int16 x, int16 y, FontDesc *fontDesc,
+	void drawLetter(int16 item, int16 x, int16 y, const Font &font,
 			int16 color1, int16 color2, int16 transp, SurfaceDesc &dest);
 	void drawPackedSprite(byte *sprBuf, int16 width, int16 height,
 			int16 x, int16 y, int16 transp, SurfaceDesc &dest);
@@ -266,7 +279,7 @@ public:
 	virtual void drawSpriteDouble(SurfaceDesc &source, SurfaceDesc &dest, int16 left, int16 top, int16 right, int16 bottom, int16 x, int16 y, int16 transp) = 0;
 	virtual void fillRect(SurfaceDesc &dest, int16 left, int16 top, int16 right, int16 bottom, byte color) = 0;
 	virtual void putPixel(int16 x, int16 y, byte color, SurfaceDesc &dest) = 0;
-	virtual void drawLetter(unsigned char item, int16 x, int16 y, Video::FontDesc *fontDesc, byte color1, byte color2, byte transp, SurfaceDesc &dest) = 0;
+	virtual void drawLetter(unsigned char item, int16 x, int16 y, const Font &font, byte color1, byte color2, byte transp, SurfaceDesc &dest) = 0;
 	virtual void drawLine(SurfaceDesc &dest, int16 x0, int16 y0, int16 x1, int16 y1, byte color) = 0;
 	virtual void drawPackedSprite(byte *sprBuf, int16 width, int16 height, int16 x, int16 y, byte transp, SurfaceDesc &dest) = 0;
 };
diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp
index f2617dc8b4..d2c8be9556 100644
--- a/engines/kyra/lol.cpp
+++ b/engines/kyra/lol.cpp
@@ -1877,15 +1877,8 @@ int LoLEngine::rollDice(int times, int pips) {
 		return 0;
 
 	int res = 0;
-	int d = 0;
-
-	do {
-		int val = (((int)_rnd.getRandomNumber(0x7fff) * pips) / 0x8000) + 1;
-		if (val > pips)
-			val -= pips;
-		res += val;
-		d++;
-	} while (d < times);
+	while (times--)
+		res += _rnd.getRandomNumberRng(1, pips);
 
 	return res;
 }
@@ -1901,7 +1894,7 @@ int LoLEngine::castSpell(int charNum, int spellType, int spellLevel) {
 	_activeSpell.spell = spellType;
 	_activeSpell.p = &_spellProperties[spellType];
 
-	_activeSpell.level = spellLevel < 0 ? -spellLevel : spellLevel;
+	_activeSpell.level = ABS(spellLevel);
 
 	if ((_spellProperties[spellType].flags & 0x100) && testWallFlag(calcNewBlockPosition(_currentBlock, _currentDirection), _currentDirection, 1)) {
 		_txt->printMessage(2, getLangString(0x4257));
diff --git a/engines/parallaction/sound.h b/engines/parallaction/sound.h
index 8fcfb94a9a..5a2c5e1c38 100644
--- a/engines/parallaction/sound.h
+++ b/engines/parallaction/sound.h
@@ -30,7 +30,7 @@
 #include "common/mutex.h"
 
 #include "sound/audiostream.h"
-#include "sound/iff.h"
+#include "sound/iff_sound.h"
 #include "sound/mixer.h"
 #include "sound/mididrv.h"
 
diff --git a/engines/sci/debug.h b/engines/sci/debug.h
index ccf0602600..0963159c98 100644
--- a/engines/sci/debug.h
+++ b/engines/sci/debug.h
@@ -46,7 +46,7 @@ struct ScriptState {
 	int old_pc_offset;
 	StackPtr old_sp;
 	ExecStack *xs;
-	uint16 restadjust;
+	int16 restadjust;
 	reg_t *variables[4];		// global, local, temp, param, as immediate pointers
 	reg_t *variables_base[4];	// Used for referencing VM ops
 	SegmentId variables_seg[4];	// Same as above, contains segment IDs
diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp
index a9dac98572..a80baf182e 100644
--- a/engines/sci/detection.cpp
+++ b/engines/sci/detection.cpp
@@ -1850,7 +1850,7 @@ static const struct SciGameDescription SciGameDescriptions[] = {
 		{"resource.000", 0, "4462fe48c7452d98fddcec327a3e738d", 5789138},
 		{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
 		0,
-		SCI_VERSION_1_1,
+		SCI_VERSION_AUTODETECT,
 		SCI_VERSION_1_1
 	},
 
@@ -1861,7 +1861,7 @@ static const struct SciGameDescription SciGameDescriptions[] = {
 		{"resource.000", 0, "57d5fe8bb9e044158514476ea7678eb0", 5754790},
 		{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NONE},
 		0,
-		SCI_VERSION_1_1,
+		SCI_VERSION_AUTODETECT,
 		SCI_VERSION_1_1
 	},
 
@@ -2574,7 +2574,7 @@ static const struct SciGameDescription SciGameDescriptions[] = {
 		{"resource.000", 0, "ecace1a2771846b1a8aa1afdd44111a0", 6570147},
 		{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
 		0,
-		SCI_VERSION_1,
+		SCI_VERSION_AUTODETECT,
 		SCI_VERSION_1_1
 	},
 
@@ -2585,7 +2585,7 @@ static const struct SciGameDescription SciGameDescriptions[] = {
 		{"resource.000", 0, "ec6f5cf369054dd3e5392995e9975b9e", 768218},
 		{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
 		0,
-		SCI_VERSION_1,
+		SCI_VERSION_AUTODETECT,
 		SCI_VERSION_1_1
 	},
 
diff --git a/engines/sci/engine/state.h b/engines/sci/engine/state.h
index 92a5b5e411..1759b26dcb 100644
--- a/engines/sci/engine/state.h
+++ b/engines/sci/engine/state.h
@@ -208,7 +208,7 @@ public:
 	bool _executionStackPosChanged;   /**< Set to true if the execution stack position should be re-evaluated by the vm */
 
 	reg_t r_acc; /**< Accumulator */
-	uint16 restAdjust; /**< &rest register (only used for save games) */
+	int16 restAdjust; /**< &rest register (only used for save games) */
 	reg_t r_prev; /**< previous comparison result */
 
 	SegmentId stack_segment; /**< Heap area for the stack to use */
diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp
index 30e917557d..5fdc286894 100644
--- a/engines/sci/resource.cpp
+++ b/engines/sci/resource.cpp
@@ -728,32 +728,51 @@ int ResourceManager::detectMapVersion() {
 		}
 		return SCI_VERSION_0;
 	}
-	// SCI1E/L and some SCI1.1 maps have last directory entry set to 0xFF
-	// and offset set to filesize
-	// SCI1 have 6-bytes entries, while SCI1.1 have 5-byte entries
-	file.seek(1, SEEK_SET);
-	uint16 off1, off = file.readUint16LE();
-	uint16 nEntries  = off / 3;
-	file.seek(1, SEEK_CUR);
-	file.seek(off - 3, SEEK_SET);
-	if (file.readByte() == 0xFF && file.readUint16LE() == file.size()) {
-		file.seek(3, SEEK_SET);
-		for (int i = 0; i < nEntries; i++) {
-			file.seek(1, SEEK_CUR);
-			off1 = file.readUint16LE();
-			if ((off1 - off) % 5 && (off1 - off) % 6 == 0)
-				return SCI_VERSION_1;
-			if ((off1 - off) % 5 == 0 && (off1 - off) % 6)
-				return SCI_VERSION_1_1;
-			off = off1;
+
+	// SCI1 and SCI1.1 maps consist of a fixed 3-byte header, a directory list (3-bytes each) that has one entry
+	// of id FFh and points to EOF. The actual entries have 6-bytes on SCI1 and 5-bytes on SCI1.1
+	byte directoryType = 0;
+	uint16 directoryOffset = 0;
+	uint16 lastDirectoryOffset = 0;
+	uint16 directorySize = 0;
+	int    mapDetected = 0;
+	file.seek(0, SEEK_SET);
+	while (!file.eos()) {
+		directoryType = file.readByte();
+		directoryOffset = file.readUint16LE();
+		if ((directoryType < 0x80) || ((directoryType > 0xA0) && (directoryType != 0xFF)))
+			break;
+		// Offset is above file size? -> definitely not SCI1/SCI1.1
+		if (directoryOffset > file.size())
+			break;
+		if (lastDirectoryOffset) {
+			directorySize = directoryOffset - lastDirectoryOffset;
+			if ((directorySize % 5) && (directorySize % 6 == 0))
+				mapDetected = SCI_VERSION_1;
+			if ((directorySize % 5 == 0) && (directorySize % 6))
+				mapDetected = SCI_VERSION_1_1;
 		}
-		return SCI_VERSION_1;
+		if (directoryType==0xFF) {
+			// FFh entry needs to point to EOF
+			if (directoryOffset != file.size())
+				break;
+			if (mapDetected) 
+				return mapDetected;
+			return SCI_VERSION_1;
+		}
+		lastDirectoryOffset = directoryOffset;
 	}
 
 #ifdef ENABLE_SCI32
 	// late SCI1.1 and SCI32 maps have last directory entry set to 0xFF
 	// offset set to filesize and 4 more bytes
-	file.seek(off - 7, SEEK_SET);
+
+	// TODO/FIXME: This code was not updated in r42300, which changed the behavior of this
+	// function a lot. To make it compile again "off" was changed to the newly introduced
+	// "lastDirectoryOffset". This is probably not the correct fix, since before r43000
+	// the loop above could not prematurely terminate and thus this would always check the
+	// last directory entry instead of the last checked directory entry.
+	file.seek(lastDirectoryOffset - 7, SEEK_SET);
 	if (file.readByte() == 0xFF && file.readUint16LE() == file.size())
 		return SCI_VERSION_32; // TODO : check if there is a difference between these maps
 #endif
@@ -974,6 +993,9 @@ int ResourceManager::readResourceMapSCI0(ResourceSource *map) {
 			res->file_offset = offset & (((~bMask) << 24) | 0xFFFFFF);
 			res->id = resId;
 			res->source = getVolume(map, offset >> bShift);
+			if (!res->source) {
+				warning("Could not get volume for resource %d, VolumeID %d\n", id, offset >> bShift);
+			}
 			_resMap.setVal(resId, res);
 		}
 	} while (!file.eos());
diff --git a/graphics/sjis.cpp b/graphics/sjis.cpp
index 95736cf401..5392a1c9a4 100644
--- a/graphics/sjis.cpp
+++ b/graphics/sjis.cpp
@@ -23,15 +23,10 @@
  */
 
 #include "graphics/sjis.h"
-#include "common/debug.h"
 
-// The code in this file is currently only used in KYRA and SCI.
-// So if neither of those is enabled, we will skip compiling it.
-// If you plan to use this code in another engine, you will have
-// to add the proper define check here.
-// Also please add the define check at the comment after the
-// matching #endif further down this file.
-#if defined(ENABLE_KYRA) || defined(ENABLE_SCI)
+#ifdef GRAPHICS_SJIS_H
+
+#include "common/debug.h"
 
 namespace Graphics {
 
@@ -198,5 +193,5 @@ uint FontTowns::sjisToChunk(uint8 f, uint8 s) {
 
 } // end of namespace Graphics
 
-#endif // defined(ENABLE_KYRA) || defined(ENABLE_SCI)
+#endif // defined(GRAPHICS_SJIS_H)
 
diff --git a/graphics/sjis.h b/graphics/sjis.h
index c7eeeed9f6..f7321742af 100644
--- a/graphics/sjis.h
+++ b/graphics/sjis.h
@@ -22,6 +22,14 @@
  * $Id$
  */
 
+// The code in this file is currently only used in KYRA and SCI.
+// So if neither of those is enabled, we will skip compiling it.
+// If you plan to use this code in another engine, you will have
+// to add the proper define check here.
+// Also please add the define check at the comment after the
+// matching #endif further down this file.
+#if defined(ENABLE_KYRA) || defined(ENABLE_SCI)
+
 #ifndef GRAPHICS_SJIS_H
 #define GRAPHICS_SJIS_H
 
@@ -123,3 +131,5 @@ private:
 
 #endif
 
+#endif // defined(ENABLE_KYRA) || defined(ENABLE_SCI)
+
diff --git a/graphics/video/coktelvideo/coktelvideo.cpp b/graphics/video/coktelvideo/coktelvideo.cpp
index 9e0391ecc5..d18e727a35 100644
--- a/graphics/video/coktelvideo/coktelvideo.cpp
+++ b/graphics/video/coktelvideo/coktelvideo.cpp
@@ -1325,7 +1325,9 @@ CoktelVideo::State Vmd::processFrame(uint16 frame) {
 				_stream->skip(part.size);
 			}
 
-		} else if (part.type == kPartTypeVideo) {
+		} else if ((part.type == kPartTypeVideo) && !_hasVideo) {
+			warning("Header claims there's no video, but video frame part found");
+		} else if ((part.type == kPartTypeVideo) && _hasVideo) {
 			state.flags &= ~kStateNoVideoData;
 
 			uint32 size = part.size;
diff --git a/sound/iff.cpp b/sound/iff_sound.cpp
index 1df58b178c..60a1486ed5 100644
--- a/sound/iff.cpp
+++ b/sound/iff_sound.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "sound/iff.h"
+#include "sound/iff_sound.h"
 #include "sound/audiostream.h"
 #include "sound/mixer.h"
 #include "common/func.h"
diff --git a/sound/iff.h b/sound/iff_sound.h
index 82106cb75e..82106cb75e 100644
--- a/sound/iff.h
+++ b/sound/iff_sound.h
diff --git a/sound/module.mk b/sound/module.mk
index dba9501a38..3bcdd47c56 100644
--- a/sound/module.mk
+++ b/sound/module.mk
@@ -5,7 +5,7 @@ MODULE_OBJS := \
 	aiff.o \
 	audiocd.o \
 	audiostream.o \
-	iff.o \
+	iff_sound.o \
 	flac.o \
 	fmopl.o \
 	mididrv.o \
diff --git a/sound/shorten.cpp b/sound/shorten.cpp
index d1031aed3a..e8066a49be 100644
--- a/sound/shorten.cpp
+++ b/sound/shorten.cpp
@@ -23,13 +23,9 @@
  *
  */
 
-// The code in this file is currently only used in SAGA2 (in the
-// SAGA engine), so if that engine isn't enabled, we will skip
-// compiling it. If you plan to use this code in another engine,
-// you will have to add the proper define check here.
-// Also please add the define check at the comment after the
-// matching #endif further down this file.
-#if defined(ENABLE_SAGA2)
+#include "sound/shorten.h"
+
+#ifdef SOUND_SHORTEN_H
 
 // Based on etree's Shorten tool, version 3.6.1
 // http://etree.org/shnutils/shorten/
@@ -40,7 +36,6 @@
 #include "common/util.h"
 #include "common/stream.h"
 
-#include "sound/shorten.h"
 #include "sound/audiostream.h"
 #include "sound/mixer.h"
 
@@ -535,5 +530,5 @@ AudioStream *makeShortenStream(Common::SeekableReadStream &stream) {
 
 } // End of namespace Audio
 
-#endif // defined(ENABLE_SAGA2)
+#endif // defined(SOUND_SHORTEN_H)
 
diff --git a/sound/shorten.h b/sound/shorten.h
index fa45ecc65d..c2a40280d3 100644
--- a/sound/shorten.h
+++ b/sound/shorten.h
@@ -23,6 +23,14 @@
  *
  */
 
+// The code in this file is currently only used in SAGA2 (in the
+// SAGA engine), so if that engine isn't enabled, we will skip
+// compiling it. If you plan to use this code in another engine,
+// you will have to add the proper define check here.
+// Also please add the define check at the comment after the
+// matching #endif further down this file.
+#if defined(ENABLE_SAGA2)
+
 #ifndef SOUND_SHORTEN_H
 #define SOUND_SHORTEN_H
 
@@ -53,3 +61,7 @@ AudioStream *makeShortenStream(Common::ReadStream &stream);
 } // End of namespace Audio
 
 #endif
+
+#endif // defined(ENABLE_SAGA2)
+
+
author	Travis Howell	2009-07-10 00:07:26 +0000
committer	Travis Howell	2009-07-10 00:07:26 +0000
commit	4e99bee142899dae1385210012dd34453920fe54 (patch)
tree	1ff2f4e640b6aa7cbe8e35b887e55c6c3e063de8
parent	ff208c5387a8566546a384afa9ab48c0a1f356a0 (diff)
parent	e8e9b882275b8dc5d77db3b1faaf30466c7b7a31 (diff)
download	scummvm-rg350-4e99bee142899dae1385210012dd34453920fe54.tar.gz scummvm-rg350-4e99bee142899dae1385210012dd34453920fe54.tar.bz2 scummvm-rg350-4e99bee142899dae1385210012dd34453920fe54.zip