Updated and synced all MSVC project files

svn-id: r38771

25 files changed, 2120 insertions, 5159 deletions

diff --git a/dists/msvc7/agi.vcproj b/dists/msvc7/agi.vcproj
index 352a4ad2b2..1bbeeb0364 100644
--- a/dists/msvc7/agi.vcproj
+++ b/dists/msvc7/agi.vcproj
@@ -4,40 +4,18 @@
 	Version="7,00"
 	Name="agi"
 	ProjectGUID="{F5F57066-CDF4-4F80-B9E7-7F4D21850D6E}"
-	#RootNamespace="agi"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
+	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
-			Name="Win32"
-		/>
+			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"
-			/>
+			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
@@ -58,36 +36,24 @@
 				WarnAsError="TRUE"
 				SuppressStartupBanner="FALSE"
 				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				DebugInformationFormat="4"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/agi.lib"
-			/>
+				OutputFile="$(OutDir)/agi.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
@@ -95,23 +61,7 @@
 			IntermediateDirectory="agi_Release"
 			ConfigurationType="4"
 			CharacterSet="2"
-			WholeProgramOptimization="TRUE"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
+			WholeProgramOptimization="TRUE">
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
@@ -132,252 +82,185 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
 				WarnAsError="TRUE"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				DebugInformationFormat="0"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/agi.lib"
-			/>
+				OutputFile="$(OutDir)/agi.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	<References>
-	</References>
 	<Files>
 		<File
-			RelativePath="..\..\engines\agi\agi.cpp"
-			>
+			RelativePath="..\..\engines\agi\agi.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agi\agi.h"
-			>
+			RelativePath="..\..\engines\agi\agi.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\agi\checks.cpp"
-			>
+			RelativePath="..\..\engines\agi\checks.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agi\console.cpp"
-			>
+			RelativePath="..\..\engines\agi\console.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agi\console.h"
-			>
+			RelativePath="..\..\engines\agi\console.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\agi\cycle.cpp"
-			>
+			RelativePath="..\..\engines\agi\cycle.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agi\detection.cpp"
-			>
+			RelativePath="..\..\engines\agi\detection.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agi\font.h"
-			>
+			RelativePath="..\..\engines\agi\font.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\agi\global.cpp"
-			>
+			RelativePath="..\..\engines\agi\global.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agi\graphics.cpp"
-			>
+			RelativePath="..\..\engines\agi\graphics.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agi\graphics.h"
-			>
+			RelativePath="..\..\engines\agi\graphics.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\agi\id.cpp"
-			>
+			RelativePath="..\..\engines\agi\id.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agi\inv.cpp"
-			>
+			RelativePath="..\..\engines\agi\inv.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agi\keyboard.cpp"
-			>
+			RelativePath="..\..\engines\agi\keyboard.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agi\keyboard.h"
-			>
+			RelativePath="..\..\engines\agi\keyboard.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\agi\loader_v2.cpp"
-			>
+			RelativePath="..\..\engines\agi\loader_v2.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agi\loader_v3.cpp"
-			>
+			RelativePath="..\..\engines\agi\loader_v3.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agi\logic.cpp"
-			>
+			RelativePath="..\..\engines\agi\logic.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agi\logic.h"
-			>
+			RelativePath="..\..\engines\agi\logic.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\agi\lzw.cpp"
-			>
+			RelativePath="..\..\engines\agi\lzw.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agi\lzw.h"
-			>
+			RelativePath="..\..\engines\agi\lzw.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\agi\menu.cpp"
-			>
+			RelativePath="..\..\engines\agi\menu.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agi\menu.h"
-			>
+			RelativePath="..\..\engines\agi\menu.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\agi\motion.cpp"
-			>
+			RelativePath="..\..\engines\agi\motion.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agi\objects.cpp"
-			>
+			RelativePath="..\..\engines\agi\objects.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agi\op_cmd.cpp"
-			>
+			RelativePath="..\..\engines\agi\op_cmd.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agi\op_dbg.cpp"
-			>
+			RelativePath="..\..\engines\agi\op_dbg.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agi\op_test.cpp"
-			>
+			RelativePath="..\..\engines\agi\op_test.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agi\opcodes.h"
-			>
+			RelativePath="..\..\engines\agi\opcodes.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\agi\picture.cpp"
-			>
+			RelativePath="..\..\engines\agi\picture.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agi\picture.h"
-			>
+			RelativePath="..\..\engines\agi\picture.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\agi\preagi.cpp"
-			>
+			RelativePath="..\..\engines\agi\preagi.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agi\preagi.h"
-			>
+			RelativePath="..\..\engines\agi\preagi.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\agi\preagi_common.cpp"
-			>
+			RelativePath="..\..\engines\agi\preagi_common.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agi\preagi_common.h"
-			>
+			RelativePath="..\..\engines\agi\preagi_common.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\agi\preagi_mickey.cpp"
-			>
+			RelativePath="..\..\engines\agi\preagi_mickey.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agi\preagi_mickey.h"
-			>
+			RelativePath="..\..\engines\agi\preagi_mickey.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\agi\preagi_troll.cpp"
-			>
+			RelativePath="..\..\engines\agi\preagi_troll.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agi\preagi_troll.h"
-			>
+			RelativePath="..\..\engines\agi\preagi_troll.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\agi\preagi_winnie.cpp"
-			>
+			RelativePath="..\..\engines\agi\preagi_winnie.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agi\preagi_winnie.h"
-			>
+			RelativePath="..\..\engines\agi\preagi_winnie.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\agi\predictive.cpp"
-			>
+			RelativePath="..\..\engines\agi\predictive.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agi\saveload.cpp"
-			>
+			RelativePath="..\..\engines\agi\saveload.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agi\sound.cpp"
-			>
+			RelativePath="..\..\engines\agi\sound.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agi\sound.h"
-			>
+			RelativePath="..\..\engines\agi\sound.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\agi\sprite.cpp"
-			>
+			RelativePath="..\..\engines\agi\sprite.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agi\sprite.h"
-			>
+			RelativePath="..\..\engines\agi\sprite.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\agi\text.cpp"
-			>
+			RelativePath="..\..\engines\agi\text.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agi\view.cpp"
-			>
+			RelativePath="..\..\engines\agi\view.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agi\view.h"
-			>
+			RelativePath="..\..\engines\agi\view.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\agi\wagparser.cpp"
-			>
+			RelativePath="..\..\engines\agi\wagparser.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agi\wagparser.h"
-			>
+			RelativePath="..\..\engines\agi\wagparser.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\agi\words.cpp"
-			>
+			RelativePath="..\..\engines\agi\words.cpp">
 		</File>
 	</Files>
 	<Globals>
diff --git a/dists/msvc7/agos.vcproj b/dists/msvc7/agos.vcproj
index 19c8d44eab..80442fc46d 100644
--- a/dists/msvc7/agos.vcproj
+++ b/dists/msvc7/agos.vcproj
@@ -4,40 +4,18 @@
 	Version="7,00"
 	Name="agos"
 	ProjectGUID="{E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}"
-	#RootNamespace="agos"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
+	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
-			Name="Win32"
-		/>
+			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"
-			/>
+			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
@@ -58,36 +36,24 @@
 				WarnAsError="TRUE"
 				SuppressStartupBanner="FALSE"
 				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				DebugInformationFormat="4"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/agos.lib"
-			/>
+				OutputFile="$(OutDir)/agos.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
@@ -95,23 +61,7 @@
 			IntermediateDirectory="agos_Release"
 			ConfigurationType="4"
 			CharacterSet="2"
-			WholeProgramOptimization="TRUE"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
+			WholeProgramOptimization="TRUE">
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
@@ -132,252 +82,185 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
 				WarnAsError="TRUE"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				DebugInformationFormat="0"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/agos.lib"
-			/>
+				OutputFile="$(OutDir)/agos.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	<References>
-	</References>
 	<Files>
 		<File
-			RelativePath="..\..\engines\agos\agos.cpp"
-			>
+			RelativePath="..\..\engines\agos\agos.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agos\agos.h"
-			>
+			RelativePath="..\..\engines\agos\agos.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\agos\animation.cpp"
-			>
+			RelativePath="..\..\engines\agos\animation.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agos\animation.h"
-			>
+			RelativePath="..\..\engines\agos\animation.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\agos\charset-fontdata.cpp"
-			>
+			RelativePath="..\..\engines\agos\charset-fontdata.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agos\charset.cpp"
-			>
+			RelativePath="..\..\engines\agos\charset.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agos\contain.cpp"
-			>
+			RelativePath="..\..\engines\agos\contain.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agos\cursor.cpp"
-			>
+			RelativePath="..\..\engines\agos\cursor.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agos\debug.cpp"
-			>
+			RelativePath="..\..\engines\agos\debug.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agos\debug.h"
-			>
+			RelativePath="..\..\engines\agos\debug.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\agos\debugger.cpp"
-			>
+			RelativePath="..\..\engines\agos\debugger.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agos\debugger.h"
-			>
+			RelativePath="..\..\engines\agos\debugger.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\agos\detection.cpp"
-			>
+			RelativePath="..\..\engines\agos\detection.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agos\detection_tables.h"
-			>
+			RelativePath="..\..\engines\agos\detection_tables.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\agos\draw.cpp"
-			>
+			RelativePath="..\..\engines\agos\draw.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agos\event.cpp"
-			>
+			RelativePath="..\..\engines\agos\event.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agos\gfx.cpp"
-			>
+			RelativePath="..\..\engines\agos\gfx.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agos\icons.cpp"
-			>
+			RelativePath="..\..\engines\agos\icons.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agos\input.cpp"
-			>
+			RelativePath="..\..\engines\agos\input.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agos\intern.h"
-			>
+			RelativePath="..\..\engines\agos\intern.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\agos\items.cpp"
-			>
+			RelativePath="..\..\engines\agos\items.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agos\menus.cpp"
-			>
+			RelativePath="..\..\engines\agos\menus.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agos\midi.cpp"
-			>
+			RelativePath="..\..\engines\agos\midi.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agos\midi.h"
-			>
+			RelativePath="..\..\engines\agos\midi.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\agos\midiparser_s1d.cpp"
-			>
+			RelativePath="..\..\engines\agos\midiparser_s1d.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agos\oracle.cpp"
-			>
+			RelativePath="..\..\engines\agos\oracle.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agos\res.cpp"
-			>
+			RelativePath="..\..\engines\agos\res.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agos\res_ami.cpp"
-			>
+			RelativePath="..\..\engines\agos\res_ami.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agos\res_snd.cpp"
-			>
+			RelativePath="..\..\engines\agos\res_snd.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agos\rooms.cpp"
-			>
+			RelativePath="..\..\engines\agos\rooms.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agos\saveload.cpp"
-			>
+			RelativePath="..\..\engines\agos\saveload.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agos\script.cpp"
-			>
+			RelativePath="..\..\engines\agos\script.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agos\script_e1.cpp"
-			>
+			RelativePath="..\..\engines\agos\script_e1.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agos\script_e2.cpp"
-			>
+			RelativePath="..\..\engines\agos\script_e2.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agos\script_ff.cpp"
-			>
+			RelativePath="..\..\engines\agos\script_ff.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agos\script_pp.cpp"
-			>
+			RelativePath="..\..\engines\agos\script_pp.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agos\script_s1.cpp"
-			>
+			RelativePath="..\..\engines\agos\script_s1.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agos\script_s2.cpp"
-			>
+			RelativePath="..\..\engines\agos\script_s2.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agos\script_ww.cpp"
-			>
+			RelativePath="..\..\engines\agos\script_ww.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agos\sound.cpp"
-			>
+			RelativePath="..\..\engines\agos\sound.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agos\sound.h"
-			>
+			RelativePath="..\..\engines\agos\sound.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\agos\string.cpp"
-			>
+			RelativePath="..\..\engines\agos\string.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agos\subroutine.cpp"
-			>
+			RelativePath="..\..\engines\agos\subroutine.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agos\verb.cpp"
-			>
+			RelativePath="..\..\engines\agos\verb.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agos\vga.cpp"
-			>
+			RelativePath="..\..\engines\agos\vga.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agos\vga.h"
-			>
+			RelativePath="..\..\engines\agos\vga.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\agos\vga_e2.cpp"
-			>
+			RelativePath="..\..\engines\agos\vga_e2.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agos\vga_ff.cpp"
-			>
+			RelativePath="..\..\engines\agos\vga_ff.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agos\vga_s1.cpp"
-			>
+			RelativePath="..\..\engines\agos\vga_s1.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agos\vga_s2.cpp"
-			>
+			RelativePath="..\..\engines\agos\vga_s2.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agos\vga_ww.cpp"
-			>
+			RelativePath="..\..\engines\agos\vga_ww.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agos\window.cpp"
-			>
+			RelativePath="..\..\engines\agos\window.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\agos\zones.cpp"
-			>
+			RelativePath="..\..\engines\agos\zones.cpp">
 		</File>
 	</Files>
 	<Globals>
diff --git a/dists/msvc7/cine.vcproj b/dists/msvc7/cine.vcproj
index 08d4c24326..e5363f7724 100644
--- a/dists/msvc7/cine.vcproj
+++ b/dists/msvc7/cine.vcproj
@@ -4,40 +4,18 @@
 	Version="7,00"
 	Name="cine"
 	ProjectGUID="{1CA4AC50-5426-433A-8B5E-FFE39568098E}"
-	#RootNamespace="cine"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
+	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
-			Name="Win32"
-		/>
+			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"
-			/>
+			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
@@ -58,36 +36,24 @@
 				WarnAsError="TRUE"
 				SuppressStartupBanner="FALSE"
 				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				DebugInformationFormat="4"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/cine.lib"
-			/>
+				OutputFile="$(OutDir)/cine.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
@@ -95,23 +61,7 @@
 			IntermediateDirectory="cine_Release"
 			ConfigurationType="4"
 			CharacterSet="2"
-			WholeProgramOptimization="TRUE"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
+			WholeProgramOptimization="TRUE">
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
@@ -132,192 +82,140 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
 				WarnAsError="TRUE"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				DebugInformationFormat="0"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/cine.lib"
-			/>
+				OutputFile="$(OutDir)/cine.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	<References>
-	</References>
 	<Files>
 		<File
-			RelativePath="..\..\engines\cine\anim.cpp"
-			>
+			RelativePath="..\..\engines\cine\anim.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\cine\anim.h"
-			>
+			RelativePath="..\..\engines\cine\anim.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\cine\bg.cpp"
-			>
+			RelativePath="..\..\engines\cine\bg.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\cine\bg.h"
-			>
+			RelativePath="..\..\engines\cine\bg.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\cine\bg_list.cpp"
-			>
+			RelativePath="..\..\engines\cine\bg_list.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\cine\bg_list.h"
-			>
+			RelativePath="..\..\engines\cine\bg_list.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\cine\cine.cpp"
-			>
+			RelativePath="..\..\engines\cine\cine.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\cine\cine.h"
-			>
+			RelativePath="..\..\engines\cine\cine.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\cine\detection.cpp"
-			>
+			RelativePath="..\..\engines\cine\detection.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\cine\gfx.cpp"
-			>
+			RelativePath="..\..\engines\cine\gfx.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\cine\gfx.h"
-			>
+			RelativePath="..\..\engines\cine\gfx.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\cine\main_loop.cpp"
-			>
+			RelativePath="..\..\engines\cine\main_loop.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\cine\main_loop.h"
-			>
+			RelativePath="..\..\engines\cine\main_loop.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\cine\msg.cpp"
-			>
+			RelativePath="..\..\engines\cine\msg.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\cine\msg.h"
-			>
+			RelativePath="..\..\engines\cine\msg.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\cine\object.cpp"
-			>
+			RelativePath="..\..\engines\cine\object.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\cine\object.h"
-			>
+			RelativePath="..\..\engines\cine\object.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\cine\pal.cpp"
-			>
+			RelativePath="..\..\engines\cine\pal.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\cine\pal.h"
-			>
+			RelativePath="..\..\engines\cine\pal.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\cine\part.cpp"
-			>
+			RelativePath="..\..\engines\cine\part.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\cine\part.h"
-			>
+			RelativePath="..\..\engines\cine\part.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\cine\prc.cpp"
-			>
+			RelativePath="..\..\engines\cine\prc.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\cine\prc.h"
-			>
+			RelativePath="..\..\engines\cine\prc.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\cine\rel.cpp"
-			>
+			RelativePath="..\..\engines\cine\rel.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\cine\rel.h"
-			>
+			RelativePath="..\..\engines\cine\rel.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\cine\saveload.cpp"
-			>
+			RelativePath="..\..\engines\cine\saveload.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\cine\saveload.h"
-			>
+			RelativePath="..\..\engines\cine\saveload.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\cine\script.h"
-			>
+			RelativePath="..\..\engines\cine\script.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\cine\script_fw.cpp"
-			>
+			RelativePath="..\..\engines\cine\script_fw.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\cine\script_os.cpp"
-			>
+			RelativePath="..\..\engines\cine\script_os.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\cine\sound.cpp"
-			>
+			RelativePath="..\..\engines\cine\sound.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\cine\sound.h"
-			>
+			RelativePath="..\..\engines\cine\sound.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\cine\texte.cpp"
-			>
+			RelativePath="..\..\engines\cine\texte.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\cine\texte.h"
-			>
+			RelativePath="..\..\engines\cine\texte.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\cine\unpack.cpp"
-			>
+			RelativePath="..\..\engines\cine\unpack.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\cine\unpack.h"
-			>
+			RelativePath="..\..\engines\cine\unpack.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\cine\various.cpp"
-			>
+			RelativePath="..\..\engines\cine\various.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\cine\various.h"
-			>
+			RelativePath="..\..\engines\cine\various.h">
 		</File>
 	</Files>
 	<Globals>
diff --git a/dists/msvc7/cruise.vcproj b/dists/msvc7/cruise.vcproj
index 2386f58bfe..966f5066ab 100644
--- a/dists/msvc7/cruise.vcproj
+++ b/dists/msvc7/cruise.vcproj
@@ -4,40 +4,18 @@
 	Version="7,00"
 	Name="cruise"
 	ProjectGUID="{8863B00B-059A-471E-876D-A955ECEFD0D2}"
-	#RootNamespace="cruise"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
+	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
-			Name="Win32"
-		/>
+			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"
-			/>
+			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
@@ -58,36 +36,24 @@
 				WarnAsError="TRUE"
 				SuppressStartupBanner="FALSE"
 				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				DebugInformationFormat="4"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/cruise.lib"
-			/>
+				OutputFile="$(OutDir)/cruise.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
@@ -95,23 +61,7 @@
 			IntermediateDirectory="cruise_Release"
 			ConfigurationType="4"
 			CharacterSet="2"
-			WholeProgramOptimization="TRUE"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
+			WholeProgramOptimization="TRUE">
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
@@ -132,264 +82,194 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
 				WarnAsError="TRUE"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				DebugInformationFormat="0"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/cruise.lib"
-			/>
+				OutputFile="$(OutDir)/cruise.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	<References>
-	</References>
 	<Files>
 		<File
-			RelativePath="..\..\engines\cruise\actor.cpp"
-			>
+			RelativePath="..\..\engines\cruise\actor.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\actor.h"
-			>
+			RelativePath="..\..\engines\cruise\actor.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\background.cpp"
-			>
+			RelativePath="..\..\engines\cruise\background.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\background.h"
-			>
+			RelativePath="..\..\engines\cruise\background.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\backgroundIncrust.cpp"
-			>
+			RelativePath="..\..\engines\cruise\backgroundIncrust.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\backgroundIncrust.h"
-			>
+			RelativePath="..\..\engines\cruise\backgroundIncrust.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\cell.cpp"
-			>
+			RelativePath="..\..\engines\cruise\cell.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\cell.h"
-			>
+			RelativePath="..\..\engines\cruise\cell.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\cruise.cpp"
-			>
+			RelativePath="..\..\engines\cruise\cruise.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\cruise.h"
-			>
+			RelativePath="..\..\engines\cruise\cruise.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\cruise_main.cpp"
-			>
+			RelativePath="..\..\engines\cruise\cruise_main.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\cruise_main.h"
-			>
+			RelativePath="..\..\engines\cruise\cruise_main.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\ctp.cpp"
-			>
+			RelativePath="..\..\engines\cruise\ctp.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\ctp.h"
-			>
+			RelativePath="..\..\engines\cruise\ctp.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\dataLoader.cpp"
-			>
+			RelativePath="..\..\engines\cruise\dataLoader.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\dataLoader.h"
-			>
+			RelativePath="..\..\engines\cruise\dataLoader.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\debugger.cpp"
-			>
+			RelativePath="..\..\engines\cruise\debugger.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\debugger.h"
-			>
+			RelativePath="..\..\engines\cruise\debugger.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\delphine-unpack.cpp"
-			>
+			RelativePath="..\..\engines\cruise\delphine-unpack.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\detection.cpp"
-			>
+			RelativePath="..\..\engines\cruise\detection.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\font.cpp"
-			>
+			RelativePath="..\..\engines\cruise\font.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\font.h"
-			>
+			RelativePath="..\..\engines\cruise\font.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\function.cpp"
-			>
+			RelativePath="..\..\engines\cruise\function.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\function.h"
-			>
+			RelativePath="..\..\engines\cruise\function.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\gfxModule.cpp"
-			>
+			RelativePath="..\..\engines\cruise\gfxModule.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\gfxModule.h"
-			>
+			RelativePath="..\..\engines\cruise\gfxModule.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\linker.cpp"
-			>
+			RelativePath="..\..\engines\cruise\linker.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\linker.h"
-			>
+			RelativePath="..\..\engines\cruise\linker.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\mainDraw.cpp"
-			>
+			RelativePath="..\..\engines\cruise\mainDraw.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\mainDraw.h"
-			>
+			RelativePath="..\..\engines\cruise\mainDraw.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\menu.cpp"
-			>
+			RelativePath="..\..\engines\cruise\menu.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\menu.h"
-			>
+			RelativePath="..\..\engines\cruise\menu.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\mouse.cpp"
-			>
+			RelativePath="..\..\engines\cruise\mouse.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\mouse.h"
-			>
+			RelativePath="..\..\engines\cruise\mouse.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\object.cpp"
-			>
+			RelativePath="..\..\engines\cruise\object.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\object.h"
-			>
+			RelativePath="..\..\engines\cruise\object.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\overlay.cpp"
-			>
+			RelativePath="..\..\engines\cruise\overlay.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\overlay.h"
-			>
+			RelativePath="..\..\engines\cruise\overlay.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\perso.cpp"
-			>
+			RelativePath="..\..\engines\cruise\perso.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\perso.h"
-			>
+			RelativePath="..\..\engines\cruise\perso.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\polys.cpp"
-			>
+			RelativePath="..\..\engines\cruise\polys.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\polys.h"
-			>
+			RelativePath="..\..\engines\cruise\polys.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\saveload.cpp"
-			>
+			RelativePath="..\..\engines\cruise\saveload.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\saveload.h"
-			>
+			RelativePath="..\..\engines\cruise\saveload.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\script.cpp"
-			>
+			RelativePath="..\..\engines\cruise\script.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\script.h"
-			>
+			RelativePath="..\..\engines\cruise\script.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\stack.cpp"
-			>
+			RelativePath="..\..\engines\cruise\stack.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\stack.h"
-			>
+			RelativePath="..\..\engines\cruise\stack.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\staticres.cpp"
-			>
+			RelativePath="..\..\engines\cruise\staticres.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\staticres.h"
-			>
+			RelativePath="..\..\engines\cruise\staticres.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\various.cpp"
-			>
+			RelativePath="..\..\engines\cruise\various.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\various.h"
-			>
+			RelativePath="..\..\engines\cruise\various.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\vars.cpp"
-			>
+			RelativePath="..\..\engines\cruise\vars.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\vars.h"
-			>
+			RelativePath="..\..\engines\cruise\vars.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\volume.cpp"
-			>
+			RelativePath="..\..\engines\cruise\volume.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\volume.h"
-			>
+			RelativePath="..\..\engines\cruise\volume.h">
 		</File>
 	</Files>
 	<Globals>
diff --git a/dists/msvc7/drascula.vcproj b/dists/msvc7/drascula.vcproj
index c6a553acaa..70f51b89c3 100644
--- a/dists/msvc7/drascula.vcproj
+++ b/dists/msvc7/drascula.vcproj
@@ -4,40 +4,18 @@
 	Version="7,00"
 	Name="drascula"
 	ProjectGUID="{CF888EE2-239C-40D7-83F1-1CDD4F7D56E3}"
-	#RootNamespace="drascula"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
+	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
-			Name="Win32"
-		/>
+			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"
-			/>
+			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
@@ -58,36 +36,24 @@
 				WarnAsError="TRUE"
 				SuppressStartupBanner="FALSE"
 				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				DebugInformationFormat="4"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/drascula.lib"
-			/>
+				OutputFile="$(OutDir)/drascula.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
@@ -95,23 +61,7 @@
 			IntermediateDirectory="drascula_Release"
 			ConfigurationType="4"
 			CharacterSet="2"
-			WholeProgramOptimization="TRUE"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
+			WholeProgramOptimization="TRUE">
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
@@ -132,96 +82,68 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
 				WarnAsError="TRUE"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				DebugInformationFormat="0"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/drascula.lib"
-			/>
+				OutputFile="$(OutDir)/drascula.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	<References>
-	</References>
 	<Files>
 		<File
-			RelativePath="..\..\engines\drascula\actors.cpp"
-			>
+			RelativePath="..\..\engines\drascula\actors.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\drascula\animation.cpp"
-			>
+			RelativePath="..\..\engines\drascula\animation.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\drascula\converse.cpp"
-			>
+			RelativePath="..\..\engines\drascula\converse.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\drascula\detection.cpp"
-			>
+			RelativePath="..\..\engines\drascula\detection.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\drascula\drascula.cpp"
-			>
+			RelativePath="..\..\engines\drascula\drascula.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\drascula\drascula.h"
-			>
+			RelativePath="..\..\engines\drascula\drascula.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\drascula\graphics.cpp"
-			>
+			RelativePath="..\..\engines\drascula\graphics.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\drascula\interface.cpp"
-			>
+			RelativePath="..\..\engines\drascula\interface.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\drascula\objects.cpp"
-			>
+			RelativePath="..\..\engines\drascula\objects.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\drascula\palette.cpp"
-			>
+			RelativePath="..\..\engines\drascula\palette.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\drascula\rooms.cpp"
-			>
+			RelativePath="..\..\engines\drascula\rooms.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\drascula\saveload.cpp"
-			>
+			RelativePath="..\..\engines\drascula\saveload.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\drascula\sound.cpp"
-			>
+			RelativePath="..\..\engines\drascula\sound.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\drascula\talk.cpp"
-			>
+			RelativePath="..\..\engines\drascula\talk.cpp">
 		</File>
 	</Files>
 	<Globals>
diff --git a/dists/msvc7/gob.vcproj b/dists/msvc7/gob.vcproj
index 45ebac6d93..cd4b5ebef6 100644
--- a/dists/msvc7/gob.vcproj
+++ b/dists/msvc7/gob.vcproj
@@ -4,40 +4,18 @@
 	Version="7,00"
 	Name="gob"
 	ProjectGUID="{976D947A-A45F-4437-991E-412F695C64C7}"
-	#RootNamespace="gob"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
+	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
-			Name="Win32"
-		/>
+			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"
-			/>
+			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
@@ -58,36 +36,24 @@
 				WarnAsError="TRUE"
 				SuppressStartupBanner="FALSE"
 				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				DebugInformationFormat="4"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/gob.lib"
-			/>
+				OutputFile="$(OutDir)/gob.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
@@ -95,23 +61,7 @@
 			IntermediateDirectory="gob_Release"
 			ConfigurationType="4"
 			CharacterSet="2"
-			WholeProgramOptimization="TRUE"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
+			WholeProgramOptimization="TRUE">
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
@@ -132,436 +82,323 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
 				WarnAsError="TRUE"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				DebugInformationFormat="0"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/gob.lib"
-			/>
+				OutputFile="$(OutDir)/gob.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	<References>
-	</References>
 	<Files>
 		<Filter
-			Name="sound"
-			>
+			Name="sound">
 			<File
-				RelativePath="..\..\engines\gob\sound\adlib.cpp"
-				>
+				RelativePath="..\..\engines\gob\sound\adlib.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\gob\sound\adlib.h"
-				>
+				RelativePath="..\..\engines\gob\sound\adlib.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\gob\sound\bgatmosphere.cpp"
-				>
+				RelativePath="..\..\engines\gob\sound\bgatmosphere.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\gob\sound\bgatmosphere.h"
-				>
+				RelativePath="..\..\engines\gob\sound\bgatmosphere.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\gob\sound\cdrom.cpp"
-				>
+				RelativePath="..\..\engines\gob\sound\cdrom.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\gob\sound\cdrom.h"
-				>
+				RelativePath="..\..\engines\gob\sound\cdrom.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\gob\sound\infogrames.cpp"
-				>
+				RelativePath="..\..\engines\gob\sound\infogrames.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\gob\sound\infogrames.h"
-				>
+				RelativePath="..\..\engines\gob\sound\infogrames.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\gob\sound\pcspeaker.cpp"
-				>
+				RelativePath="..\..\engines\gob\sound\pcspeaker.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\gob\sound\pcspeaker.h"
-				>
+				RelativePath="..\..\engines\gob\sound\pcspeaker.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\gob\sound\sound.cpp"
-				>
+				RelativePath="..\..\engines\gob\sound\sound.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\gob\sound\sound.h"
-				>
+				RelativePath="..\..\engines\gob\sound\sound.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\gob\sound\soundblaster.cpp"
-				>
+				RelativePath="..\..\engines\gob\sound\soundblaster.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\gob\sound\soundblaster.h"
-				>
+				RelativePath="..\..\engines\gob\sound\soundblaster.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\gob\sound\sounddesc.cpp"
-				>
+				RelativePath="..\..\engines\gob\sound\sounddesc.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\gob\sound\sounddesc.h"
-				>
+				RelativePath="..\..\engines\gob\sound\sounddesc.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\gob\sound\soundmixer.cpp"
-				>
+				RelativePath="..\..\engines\gob\sound\soundmixer.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\gob\sound\soundmixer.h"
-				>
+				RelativePath="..\..\engines\gob\sound\soundmixer.h">
 			</File>
 		</Filter>
 		<File
-			RelativePath="..\..\engines\gob\coktelvideo.cpp"
-			>
+			RelativePath="..\..\engines\gob\coktelvideo.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\coktelvideo.h"
-			>
+			RelativePath="..\..\engines\gob\coktelvideo.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\dataio.cpp"
-			>
+			RelativePath="..\..\engines\gob\dataio.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\dataio.h"
-			>
+			RelativePath="..\..\engines\gob\dataio.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\detection.cpp"
-			>
+			RelativePath="..\..\engines\gob\detection.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\draw.cpp"
-			>
+			RelativePath="..\..\engines\gob\draw.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\draw.h"
-			>
+			RelativePath="..\..\engines\gob\draw.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\draw_bargon.cpp"
-			>
+			RelativePath="..\..\engines\gob\draw_bargon.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\draw_v1.cpp"
-			>
+			RelativePath="..\..\engines\gob\draw_v1.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\draw_v2.cpp"
-			>
+			RelativePath="..\..\engines\gob\draw_v2.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\driver_vga.cpp"
-			>
+			RelativePath="..\..\engines\gob\driver_vga.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\driver_vga.h"
-			>
+			RelativePath="..\..\engines\gob\driver_vga.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\game.cpp"
-			>
+			RelativePath="..\..\engines\gob\game.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\game.h"
-			>
+			RelativePath="..\..\engines\gob\game.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\game_v1.cpp"
-			>
+			RelativePath="..\..\engines\gob\game_v1.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\game_v2.cpp"
-			>
+			RelativePath="..\..\engines\gob\game_v2.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\game_v6.cpp"
-			>
+			RelativePath="..\..\engines\gob\game_v6.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\global.cpp"
-			>
+			RelativePath="..\..\engines\gob\global.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\global.h"
-			>
+			RelativePath="..\..\engines\gob\global.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\gob.cpp"
-			>
+			RelativePath="..\..\engines\gob\gob.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\gob.h"
-			>
+			RelativePath="..\..\engines\gob\gob.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\goblin.cpp"
-			>
+			RelativePath="..\..\engines\gob\goblin.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\goblin.h"
-			>
+			RelativePath="..\..\engines\gob\goblin.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\goblin_v1.cpp"
-			>
+			RelativePath="..\..\engines\gob\goblin_v1.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\goblin_v2.cpp"
-			>
+			RelativePath="..\..\engines\gob\goblin_v2.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\goblin_v3.cpp"
-			>
+			RelativePath="..\..\engines\gob\goblin_v3.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\goblin_v4.cpp"
-			>
+			RelativePath="..\..\engines\gob\goblin_v4.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\indeo3.cpp"
-			>
+			RelativePath="..\..\engines\gob\indeo3.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\indeo3.h"
-			>
+			RelativePath="..\..\engines\gob\indeo3.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\indeo3data.h"
-			>
+			RelativePath="..\..\engines\gob\indeo3data.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\init.cpp"
-			>
+			RelativePath="..\..\engines\gob\init.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\init.h"
-			>
+			RelativePath="..\..\engines\gob\init.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\init_v1.cpp"
-			>
+			RelativePath="..\..\engines\gob\init_v1.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\init_v2.cpp"
-			>
+			RelativePath="..\..\engines\gob\init_v2.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\init_v3.cpp"
-			>
+			RelativePath="..\..\engines\gob\init_v3.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\inter.cpp"
-			>
+			RelativePath="..\..\engines\gob\inter.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\inter.h"
-			>
+			RelativePath="..\..\engines\gob\inter.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\inter_bargon.cpp"
-			>
+			RelativePath="..\..\engines\gob\inter_bargon.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\inter_v1.cpp"
-			>
+			RelativePath="..\..\engines\gob\inter_v1.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\inter_v2.cpp"
-			>
+			RelativePath="..\..\engines\gob\inter_v2.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\inter_v3.cpp"
-			>
+			RelativePath="..\..\engines\gob\inter_v3.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\inter_v4.cpp"
-			>
+			RelativePath="..\..\engines\gob\inter_v4.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\inter_v5.cpp"
-			>
+			RelativePath="..\..\engines\gob\inter_v5.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\inter_v6.cpp"
-			>
+			RelativePath="..\..\engines\gob\inter_v6.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\map.cpp"
-			>
+			RelativePath="..\..\engines\gob\map.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\map.h"
-			>
+			RelativePath="..\..\engines\gob\map.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\map_v1.cpp"
-			>
+			RelativePath="..\..\engines\gob\map_v1.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\map_v2.cpp"
-			>
+			RelativePath="..\..\engines\gob\map_v2.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\map_v4.cpp"
-			>
+			RelativePath="..\..\engines\gob\map_v4.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\mult.cpp"
-			>
+			RelativePath="..\..\engines\gob\mult.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\mult.h"
-			>
+			RelativePath="..\..\engines\gob\mult.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\mult_v1.cpp"
-			>
+			RelativePath="..\..\engines\gob\mult_v1.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\mult_v2.cpp"
-			>
+			RelativePath="..\..\engines\gob\mult_v2.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\palanim.cpp"
-			>
+			RelativePath="..\..\engines\gob\palanim.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\palanim.h"
-			>
+			RelativePath="..\..\engines\gob\palanim.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\parse.cpp"
-			>
+			RelativePath="..\..\engines\gob\parse.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\parse.h"
-			>
+			RelativePath="..\..\engines\gob\parse.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\parse_v1.cpp"
-			>
+			RelativePath="..\..\engines\gob\parse_v1.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\parse_v2.cpp"
-			>
+			RelativePath="..\..\engines\gob\parse_v2.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\saveload.cpp"
-			>
+			RelativePath="..\..\engines\gob\saveload.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\saveload.h"
-			>
+			RelativePath="..\..\engines\gob\saveload.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\saveload_v2.cpp"
-			>
+			RelativePath="..\..\engines\gob\saveload_v2.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\saveload_v3.cpp"
-			>
+			RelativePath="..\..\engines\gob\saveload_v3.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\saveload_v4.cpp"
-			>
+			RelativePath="..\..\engines\gob\saveload_v4.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\saveload_v6.cpp"
-			>
+			RelativePath="..\..\engines\gob\saveload_v6.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\scenery.cpp"
-			>
+			RelativePath="..\..\engines\gob\scenery.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\scenery.h"
-			>
+			RelativePath="..\..\engines\gob\scenery.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\scenery_v1.cpp"
-			>
+			RelativePath="..\..\engines\gob\scenery_v1.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\scenery_v2.cpp"
-			>
+			RelativePath="..\..\engines\gob\scenery_v2.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\util.cpp"
-			>
+			RelativePath="..\..\engines\gob\util.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\util.h"
-			>
+			RelativePath="..\..\engines\gob\util.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\variables.cpp"
-			>
+			RelativePath="..\..\engines\gob\variables.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\variables.h"
-			>
+			RelativePath="..\..\engines\gob\variables.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\video.cpp"
-			>
+			RelativePath="..\..\engines\gob\video.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\video.h"
-			>
+			RelativePath="..\..\engines\gob\video.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\video_v1.cpp"
-			>
+			RelativePath="..\..\engines\gob\video_v1.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\video_v2.cpp"
-			>
+			RelativePath="..\..\engines\gob\video_v2.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\video_v6.cpp"
-			>
+			RelativePath="..\..\engines\gob\video_v6.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\videoplayer.cpp"
-			>
+			RelativePath="..\..\engines\gob\videoplayer.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\videoplayer.h"
-			>
+			RelativePath="..\..\engines\gob\videoplayer.h">
 		</File>
 	</Files>
 	<Globals>
diff --git a/dists/msvc7/groovie.vcproj b/dists/msvc7/groovie.vcproj
index 6d45372484..84bd30bbd7 100644
--- a/dists/msvc7/groovie.vcproj
+++ b/dists/msvc7/groovie.vcproj
@@ -4,40 +4,18 @@
 	Version="7,00"
 	Name="groovie"
 	ProjectGUID="{2C1EA540-0B09-11DD-BD00-000000000000}"
-	#RootNamespace="groovie"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
+	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
-			Name="Win32"
-		/>
+			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"
-			/>
+			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
@@ -55,36 +33,24 @@
 				WarningLevel="4"
 				WarnAsError="FALSE"
 				SuppressStartupBanner="FALSE"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				DebugInformationFormat="4"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/groovie.lib"
-			/>
+				OutputFile="$(OutDir)/groovie.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
@@ -92,23 +58,7 @@
 			IntermediateDirectory="groovie_Release"
 			ConfigurationType="4"
 			CharacterSet="2"
-			WholeProgramOptimization="TRUE"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
+			WholeProgramOptimization="TRUE">
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
@@ -126,156 +76,113 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
 				WarnAsError="TRUE"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				DebugInformationFormat="0"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/groovie.lib"
-			/>
+				OutputFile="$(OutDir)/groovie.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	<References>
-	</References>
 	<Files>
 		<File
-			RelativePath="..\..\engines\groovie\cell.cpp"
-			>
+			RelativePath="..\..\engines\groovie\cell.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\groovie\cell.h"
-			>
+			RelativePath="..\..\engines\groovie\cell.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\groovie\cursor.cpp"
-			>
+			RelativePath="..\..\engines\groovie\cursor.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\groovie\cursor.h"
-			>
+			RelativePath="..\..\engines\groovie\cursor.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\groovie\debug.cpp"
-			>
+			RelativePath="..\..\engines\groovie\debug.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\groovie\debug.h"
-			>
+			RelativePath="..\..\engines\groovie\debug.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\groovie\detection.cpp"
-			>
+			RelativePath="..\..\engines\groovie\detection.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\groovie\font.cpp"
-			>
+			RelativePath="..\..\engines\groovie\font.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\groovie\font.h"
-			>
+			RelativePath="..\..\engines\groovie\font.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\groovie\graphics.cpp"
-			>
+			RelativePath="..\..\engines\groovie\graphics.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\groovie\graphics.h"
-			>
+			RelativePath="..\..\engines\groovie\graphics.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\groovie\groovie.cpp"
-			>
+			RelativePath="..\..\engines\groovie\groovie.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\groovie\groovie.h"
-			>
+			RelativePath="..\..\engines\groovie\groovie.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\groovie\lzss.cpp"
-			>
+			RelativePath="..\..\engines\groovie\lzss.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\groovie\lzss.h"
-			>
+			RelativePath="..\..\engines\groovie\lzss.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\groovie\music.cpp"
-			>
+			RelativePath="..\..\engines\groovie\music.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\groovie\music.h"
-			>
+			RelativePath="..\..\engines\groovie\music.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\groovie\player.cpp"
-			>
+			RelativePath="..\..\engines\groovie\player.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\groovie\player.h"
-			>
+			RelativePath="..\..\engines\groovie\player.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\groovie\resource.cpp"
-			>
+			RelativePath="..\..\engines\groovie\resource.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\groovie\resource.h"
-			>
+			RelativePath="..\..\engines\groovie\resource.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\groovie\roq.cpp"
-			>
+			RelativePath="..\..\engines\groovie\roq.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\groovie\roq.h"
-			>
+			RelativePath="..\..\engines\groovie\roq.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\groovie\saveload.cpp"
-			>
+			RelativePath="..\..\engines\groovie\saveload.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\groovie\saveload.h"
-			>
+			RelativePath="..\..\engines\groovie\saveload.h">
 		</File>		
 		<File
-			RelativePath="..\..\engines\groovie\script.cpp"
-			>
+			RelativePath="..\..\engines\groovie\script.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\groovie\script.h"
-			>
+			RelativePath="..\..\engines\groovie\script.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\groovie\vdx.cpp"
-			>
+			RelativePath="..\..\engines\groovie\vdx.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\groovie\vdx.h"
-			>
+			RelativePath="..\..\engines\groovie\vdx.h">
 		</File>
 	</Files>
 	<Globals>
diff --git a/dists/msvc7/igor.vcproj b/dists/msvc7/igor.vcproj
index 46823f464d..1f25143030 100644
--- a/dists/msvc7/igor.vcproj
+++ b/dists/msvc7/igor.vcproj
@@ -4,40 +4,18 @@
 	Version="7,00"
 	Name="igor"
 	ProjectGUID="{83945CAF-87A0-4202-8BA4-87A0CB15D78A}"
-	#RootNamespace="igor"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
+	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
-			Name="Win32"
-		/>
+			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"
-			/>
+			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
@@ -58,36 +36,24 @@
 				WarnAsError="TRUE"
 				SuppressStartupBanner="FALSE"
 				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				DebugInformationFormat="4"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/igor.lib"
-			/>
+				OutputFile="$(OutDir)/igor.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
@@ -95,23 +61,7 @@
 			IntermediateDirectory="igor_Release"
 			ConfigurationType="4"
 			CharacterSet="2"
-			WholeProgramOptimization="TRUE"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
+			WholeProgramOptimization="TRUE">
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
@@ -132,196 +82,143 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
 				WarnAsError="TRUE"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				DebugInformationFormat="0"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/igor.lib"
-			/>
+				OutputFile="$(OutDir)/igor.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	<References>
-	</References>
 	<Files>
 		<Filter
-			Name="parts"
-			>
+			Name="parts">
 			<File
-				RelativePath="..\..\engines\igor\parts\part_04.cpp"
-				>
+				RelativePath="..\..\engines\igor\parts\part_04.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\igor\parts\part_05.cpp"
-				>
+				RelativePath="..\..\engines\igor\parts\part_05.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\igor\parts\part_06.cpp"
-				>
+				RelativePath="..\..\engines\igor\parts\part_06.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\igor\parts\part_12.cpp"
-				>
+				RelativePath="..\..\engines\igor\parts\part_12.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\igor\parts\part_13.cpp"
-				>
+				RelativePath="..\..\engines\igor\parts\part_13.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\igor\parts\part_14.cpp"
-				>
+				RelativePath="..\..\engines\igor\parts\part_14.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\igor\parts\part_15.cpp"
-				>
+				RelativePath="..\..\engines\igor\parts\part_15.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\igor\parts\part_16.cpp"
-				>
+				RelativePath="..\..\engines\igor\parts\part_16.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\igor\parts\part_17.cpp"
-				>
+				RelativePath="..\..\engines\igor\parts\part_17.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\igor\parts\part_18.cpp"
-				>
+				RelativePath="..\..\engines\igor\parts\part_18.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\igor\parts\part_19.cpp"
-				>
+				RelativePath="..\..\engines\igor\parts\part_19.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\igor\parts\part_21.cpp"
-				>
+				RelativePath="..\..\engines\igor\parts\part_21.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\igor\parts\part_22.cpp"
-				>
+				RelativePath="..\..\engines\igor\parts\part_22.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\igor\parts\part_23.cpp"
-				>
+				RelativePath="..\..\engines\igor\parts\part_23.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\igor\parts\part_24.cpp"
-				>
+				RelativePath="..\..\engines\igor\parts\part_24.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\igor\parts\part_25.cpp"
-				>
+				RelativePath="..\..\engines\igor\parts\part_25.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\igor\parts\part_26.cpp"
-				>
+				RelativePath="..\..\engines\igor\parts\part_26.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\igor\parts\part_27.cpp"
-				>
+				RelativePath="..\..\engines\igor\parts\part_27.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\igor\parts\part_28.cpp"
-				>
+				RelativePath="..\..\engines\igor\parts\part_28.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\igor\parts\part_30.cpp"
-				>
+				RelativePath="..\..\engines\igor\parts\part_30.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\igor\parts\part_31.cpp"
-				>
+				RelativePath="..\..\engines\igor\parts\part_31.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\igor\parts\part_33.cpp"
-				>
+				RelativePath="..\..\engines\igor\parts\part_33.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\igor\parts\part_36.cpp"
-				>
+				RelativePath="..\..\engines\igor\parts\part_36.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\igor\parts\part_37.cpp"
-				>
+				RelativePath="..\..\engines\igor\parts\part_37.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\igor\parts\part_75.cpp"
-				>
+				RelativePath="..\..\engines\igor\parts\part_75.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\igor\parts\part_85.cpp"
-				>
+				RelativePath="..\..\engines\igor\parts\part_85.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\igor\parts\part_90.cpp"
-				>
+				RelativePath="..\..\engines\igor\parts\part_90.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\igor\parts\part_95.cpp"
-				>
+				RelativePath="..\..\engines\igor\parts\part_95.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\igor\parts\part_main.cpp"
-				>
+				RelativePath="..\..\engines\igor\parts\part_main.cpp">
 			</File>
 		</Filter>
 		<File
-			RelativePath="..\..\engines\igor\detection.cpp"
-			>
+			RelativePath="..\..\engines\igor\detection.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\igor\igor.cpp"
-			>
+			RelativePath="..\..\engines\igor\igor.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\igor\igor.h"
-			>
+			RelativePath="..\..\engines\igor\igor.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\igor\menu.cpp"
-			>
+			RelativePath="..\..\engines\igor\menu.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\igor\midi.cpp"
-			>
+			RelativePath="..\..\engines\igor\midi.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\igor\midi.h"
-			>
+			RelativePath="..\..\engines\igor\midi.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\igor\resource_ids.h"
-			>
+			RelativePath="..\..\engines\igor\resource_ids.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\igor\saveload.cpp"
-			>
+			RelativePath="..\..\engines\igor\saveload.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\igor\staticres.cpp"
-			>
+			RelativePath="..\..\engines\igor\staticres.cpp">
 		</File>
 	</Files>
 	<Globals>
diff --git a/dists/msvc7/kyra.vcproj b/dists/msvc7/kyra.vcproj
index 26ae0c7878..c29228bc52 100644
--- a/dists/msvc7/kyra.vcproj
+++ b/dists/msvc7/kyra.vcproj
@@ -4,40 +4,18 @@
 	Version="7,00"
 	Name="kyra"
 	ProjectGUID="{9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}"
-	#RootNamespace="kyra"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
+	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
-			Name="Win32"
-		/>
+			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"
-			/>
+			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
@@ -58,36 +36,24 @@
 				WarnAsError="TRUE"
 				SuppressStartupBanner="FALSE"
 				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
+				DebugInformationFormat="4"/>
 			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/kyra.lib"
-			/>
+				OutputFile="$(OutDir)/kyra.lib"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
@@ -95,23 +61,7 @@
 			IntermediateDirectory="kyra_Release"
 			ConfigurationType="4"
 			CharacterSet="2"
-			WholeProgramOptimization="TRUE"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
+			WholeProgramOptimization="TRUE">
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
@@ -132,480 +82,359 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
 				WarnAsError="TRUE"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				DebugInformationFormat="0"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/kyra.lib"
-			/>
+				OutputFile="$(OutDir)/kyra.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	<References>
-	</References>
 	<Files>
 		<File
-			RelativePath="..\..\engines\kyra\animator_hof.cpp"
-			>
+			RelativePath="..\..\engines\kyra\animator_hof.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\kyra\animator_lok.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\animator_lok.cpp"
-			>
+			RelativePath="..\..\engines\kyra\animator_lok.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\animator_lok.h"
-			>
+			RelativePath="..\..\engines\kyra\animator_mr.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\animator_mr.cpp"
-			>
+			RelativePath="..\..\engines\kyra\animator_v2.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\animator_v2.cpp"
-			>
+			RelativePath="..\..\engines\kyra\debugger.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\debugger.cpp"
-			>
+			RelativePath="..\..\engines\kyra\debugger.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\debugger.h"
-			>
+			RelativePath="..\..\engines\kyra\detection.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\detection.cpp"
-			>
+			RelativePath="..\..\engines\kyra\gui.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\gui.cpp"
-			>
+			RelativePath="..\..\engines\kyra\gui.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\gui.h"
-			>
+			RelativePath="..\..\engines\kyra\gui_hof.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\gui_hof.cpp"
-			>
+			RelativePath="..\..\engines\kyra\gui_hof.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\gui_hof.h"
-			>
+			RelativePath="..\..\engines\kyra\gui_lok.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\gui_lok.cpp"
-			>
+			RelativePath="..\..\engines\kyra\gui_lok.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\gui_lok.h"
-			>
+			RelativePath="..\..\engines\kyra\gui_lol.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\gui_lol.cpp"
-			>
+			RelativePath="..\..\engines\kyra\gui_lol.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\gui_lol.h"
-			>
+			RelativePath="..\..\engines\kyra\gui_mr.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\gui_mr.cpp"
-			>
+			RelativePath="..\..\engines\kyra\gui_mr.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\gui_mr.h"
-			>
+			RelativePath="..\..\engines\kyra\gui_v2.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\gui_v2.cpp"
-			>
+			RelativePath="..\..\engines\kyra\gui_v2.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\gui_v2.h"
-			>
+			RelativePath="..\..\engines\kyra\items_hof.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\items_hof.cpp"
-			>
+			RelativePath="..\..\engines\kyra\items_lok.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\items_lok.cpp"
-			>
+			RelativePath="..\..\engines\kyra\items_lol.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\items_lol.cpp"
-			>
+			RelativePath="..\..\engines\kyra\items_mr.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\items_mr.cpp"
-			>
+			RelativePath="..\..\engines\kyra\items_v2.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\items_v2.cpp"
-			>
+			RelativePath="..\..\engines\kyra\kyra_hof.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\kyra_hof.cpp"
-			>
+			RelativePath="..\..\engines\kyra\kyra_hof.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\kyra_hof.h"
-			>
+			RelativePath="..\..\engines\kyra\kyra_lok.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\kyra_lok.cpp"
-			>
+			RelativePath="..\..\engines\kyra\kyra_lok.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\kyra_lok.h"
-			>
+			RelativePath="..\..\engines\kyra\kyra_mr.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\kyra_mr.cpp"
-			>
+			RelativePath="..\..\engines\kyra\kyra_mr.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\kyra_mr.h"
-			>
+			RelativePath="..\..\engines\kyra\kyra_v1.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\kyra_v1.cpp"
-			>
+			RelativePath="..\..\engines\kyra\kyra_v1.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\kyra_v1.h"
-			>
+			RelativePath="..\..\engines\kyra\kyra_v2.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\kyra_v2.cpp"
-			>
+			RelativePath="..\..\engines\kyra\kyra_v2.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\kyra_v2.h"
-			>
+			RelativePath="..\..\engines\kyra\lol.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\lol.cpp"
-			>
+			RelativePath="..\..\engines\kyra\lol.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\lol.h"
-			>
+			RelativePath="..\..\engines\kyra\resource.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\resource.cpp"
-			>
+			RelativePath="..\..\engines\kyra\resource.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\resource.h"
-			>
+			RelativePath="..\..\engines\kyra\resource_intern.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\resource_intern.cpp"
-			>
+			RelativePath="..\..\engines\kyra\resource_intern.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\resource_intern.h"
-			>
+			RelativePath="..\..\engines\kyra\saveload.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\saveload.cpp"
-			>
+			RelativePath="..\..\engines\kyra\saveload_hof.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\saveload_hof.cpp"
-			>
+			RelativePath="..\..\engines\kyra\saveload_lok.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\saveload_lok.cpp"
-			>
+			RelativePath="..\..\engines\kyra\saveload_mr.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\saveload_mr.cpp"
-			>
+			RelativePath="..\..\engines\kyra\scene_hof.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\scene_hof.cpp"
-			>
+			RelativePath="..\..\engines\kyra\scene_lok.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\scene_lok.cpp"
-			>
+			RelativePath="..\..\engines\kyra\scene_lol.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\scene_lol.cpp"
-			>
+			RelativePath="..\..\engines\kyra\scene_mr.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\scene_mr.cpp"
-			>
+			RelativePath="..\..\engines\kyra\scene_v1.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\scene_v1.cpp"
-			>
+			RelativePath="..\..\engines\kyra\scene_v2.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\scene_v2.cpp"
-			>
+			RelativePath="..\..\engines\kyra\screen.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\screen.cpp"
-			>
+			RelativePath="..\..\engines\kyra\screen.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\screen.h"
-			>
+			RelativePath="..\..\engines\kyra\screen_hof.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\screen_hof.cpp"
-			>
+			RelativePath="..\..\engines\kyra\screen_hof.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\screen_hof.h"
-			>
+			RelativePath="..\..\engines\kyra\screen_lok.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\screen_lok.cpp"
-			>
+			RelativePath="..\..\engines\kyra\screen_lok.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\screen_lok.h"
-			>
+			RelativePath="..\..\engines\kyra\screen_lol.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\screen_lol.cpp"
-			>
+			RelativePath="..\..\engines\kyra\screen_lol.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\screen_lol.h"
-			>
+			RelativePath="..\..\engines\kyra\screen_mr.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\screen_mr.cpp"
-			>
+			RelativePath="..\..\engines\kyra\screen_mr.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\screen_mr.h"
-			>
+			RelativePath="..\..\engines\kyra\screen_v2.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\screen_v2.cpp"
-			>
+			RelativePath="..\..\engines\kyra\screen_v2.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\screen_v2.h"
-			>
+			RelativePath="..\..\engines\kyra\script.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\script.cpp"
-			>
+			RelativePath="..\..\engines\kyra\script.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\script.h"
-			>
+			RelativePath="..\..\engines\kyra\script_hof.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\script_hof.cpp"
-			>
+			RelativePath="..\..\engines\kyra\script_lok.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\script_lok.cpp"
-			>
+			RelativePath="..\..\engines\kyra\script_lol.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\script_lol.cpp"
-			>
+			RelativePath="..\..\engines\kyra\script_mr.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\script_mr.cpp"
-			>
+			RelativePath="..\..\engines\kyra\script_tim.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\script_tim.cpp"
-			>
+			RelativePath="..\..\engines\kyra\script_tim.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\script_tim.h"
-			>
+			RelativePath="..\..\engines\kyra\script_v1.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\script_v1.cpp"
-			>
+			RelativePath="..\..\engines\kyra\script_v2.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\script_v2.cpp"
-			>
+			RelativePath="..\..\engines\kyra\seqplayer.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\seqplayer.cpp"
-			>
+			RelativePath="..\..\engines\kyra\seqplayer.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\seqplayer.h"
-			>
+			RelativePath="..\..\engines\kyra\sequences_hof.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\sequences_hof.cpp"
-			>
+			RelativePath="..\..\engines\kyra\sequences_lok.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\sequences_lok.cpp"
-			>
+			RelativePath="..\..\engines\kyra\sequences_lol.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\sequences_lol.cpp"
-			>
+			RelativePath="..\..\engines\kyra\sequences_mr.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\sequences_mr.cpp"
-			>
+			RelativePath="..\..\engines\kyra\sequences_v2.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\sequences_v2.cpp"
-			>
+			RelativePath="..\..\engines\kyra\sound.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\sound.cpp"
-			>
+			RelativePath="..\..\engines\kyra\sound.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\sound.h"
-			>
+			RelativePath="..\..\engines\kyra\sound_adlib.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\sound_adlib.cpp"
-			>
+			RelativePath="..\..\engines\kyra\sound_digital.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\sound_digital.cpp"
-			>
+			RelativePath="..\..\engines\kyra\sound_lok.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\sound_lok.cpp"
-			>
+			RelativePath="..\..\engines\kyra\sound_midi.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\sound_midi.cpp"
-			>
+			RelativePath="..\..\engines\kyra\sound_towns.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\sound_towns.cpp"
-			>
+			RelativePath="..\..\engines\kyra\sprites.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\sprites.cpp"
-			>
+			RelativePath="..\..\engines\kyra\sprites.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\sprites.h"
-			>
+			RelativePath="..\..\engines\kyra\staticres.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\staticres.cpp"
-			>
+			RelativePath="..\..\engines\kyra\text.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\text.cpp"
-			>
+			RelativePath="..\..\engines\kyra\text.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\text.h"
-			>
+			RelativePath="..\..\engines\kyra\text_hof.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\text_hof.cpp"
-			>
+			RelativePath="..\..\engines\kyra\text_hof.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\text_hof.h"
-			>
+			RelativePath="..\..\engines\kyra\text_lok.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\text_lok.cpp"
-			>
+			RelativePath="..\..\engines\kyra\text_lol.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\text_lol.cpp"
-			>
+			RelativePath="..\..\engines\kyra\text_lol.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\text_lol.h"
-			>
+			RelativePath="..\..\engines\kyra\text_mr.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\text_mr.cpp"
-			>
+			RelativePath="..\..\engines\kyra\text_mr.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\text_mr.h"
-			>
+			RelativePath="..\..\engines\kyra\timer.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\timer.cpp"
-			>
+			RelativePath="..\..\engines\kyra\timer.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\timer.h"
-			>
+			RelativePath="..\..\engines\kyra\timer_hof.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\timer_hof.cpp"
-			>
+			RelativePath="..\..\engines\kyra\timer_lok.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\timer_lok.cpp"
-			>
+			RelativePath="..\..\engines\kyra\timer_lol.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\timer_mr.cpp"
-			>
+			RelativePath="..\..\engines\kyra\timer_mr.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\util.cpp"
-			>
+			RelativePath="..\..\engines\kyra\util.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\util.h"
-			>
+			RelativePath="..\..\engines\kyra\util.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\vqa.cpp"
-			>
+			RelativePath="..\..\engines\kyra\vqa.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\vqa.h"
-			>
+			RelativePath="..\..\engines\kyra\vqa.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\wsamovie.cpp"
-			>
+			RelativePath="..\..\engines\kyra\wsamovie.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\wsamovie.h"
-			>
+			RelativePath="..\..\engines\kyra\wsamovie.h">
 		</File>
 	</Files>
 	<Globals>
diff --git a/dists/msvc7/lure.vcproj b/dists/msvc7/lure.vcproj
index 21d5f89c35..af6c4ebc23 100644
--- a/dists/msvc7/lure.vcproj
+++ b/dists/msvc7/lure.vcproj
@@ -4,40 +4,18 @@
 	Version="7,00"
 	Name="lure"
 	ProjectGUID="{1A1CA028-61B5-4A6C-A918-F5D8721AB1AC}"
-	#RootNamespace="lure"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
+	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
-			Name="Win32"
-		/>
+			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"
-			/>
+			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
@@ -58,36 +36,24 @@
 				WarnAsError="TRUE"
 				SuppressStartupBanner="FALSE"
 				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				DebugInformationFormat="4"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/lure.lib"
-			/>
+				OutputFile="$(OutDir)/lure.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
@@ -95,23 +61,7 @@
 			IntermediateDirectory="lure_Release"
 			ConfigurationType="4"
 			CharacterSet="2"
-			WholeProgramOptimization="TRUE"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
+			WholeProgramOptimization="TRUE">
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
@@ -132,216 +82,158 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
 				WarnAsError="TRUE"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				DebugInformationFormat="0"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/lure.lib"
-			/>
+				OutputFile="$(OutDir)/lure.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	<References>
-	</References>
 	<Files>
 		<File
-			RelativePath="..\..\engines\lure\animseq.cpp"
-			>
+			RelativePath="..\..\engines\lure\animseq.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\lure\animseq.h"
-			>
+			RelativePath="..\..\engines\lure\animseq.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\lure\debugger.cpp"
-			>
+			RelativePath="..\..\engines\lure\debugger.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\lure\debugger.h"
-			>
+			RelativePath="..\..\engines\lure\debugger.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\lure\decode.cpp"
-			>
+			RelativePath="..\..\engines\lure\decode.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\lure\decode.h"
-			>
+			RelativePath="..\..\engines\lure\decode.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\lure\detection.cpp"
-			>
+			RelativePath="..\..\engines\lure\detection.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\lure\disk.cpp"
-			>
+			RelativePath="..\..\engines\lure\disk.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\lure\disk.h"
-			>
+			RelativePath="..\..\engines\lure\disk.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\lure\events.cpp"
-			>
+			RelativePath="..\..\engines\lure\events.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\lure\events.h"
-			>
+			RelativePath="..\..\engines\lure\events.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\lure\fights.cpp"
-			>
+			RelativePath="..\..\engines\lure\fights.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\lure\fights.h"
-			>
+			RelativePath="..\..\engines\lure\fights.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\lure\game.cpp"
-			>
+			RelativePath="..\..\engines\lure\game.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\lure\game.h"
-			>
+			RelativePath="..\..\engines\lure\game.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\lure\hotspots.cpp"
-			>
+			RelativePath="..\..\engines\lure\hotspots.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\lure\hotspots.h"
-			>
+			RelativePath="..\..\engines\lure\hotspots.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\lure\intro.cpp"
-			>
+			RelativePath="..\..\engines\lure\intro.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\lure\intro.h"
-			>
+			RelativePath="..\..\engines\lure\intro.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\lure\lure.cpp"
-			>
+			RelativePath="..\..\engines\lure\lure.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\lure\lure.h"
-			>
+			RelativePath="..\..\engines\lure\lure.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\lure\luredefs.h"
-			>
+			RelativePath="..\..\engines\lure\luredefs.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\lure\memory.cpp"
-			>
+			RelativePath="..\..\engines\lure\memory.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\lure\memory.h"
-			>
+			RelativePath="..\..\engines\lure\memory.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\lure\menu.cpp"
-			>
+			RelativePath="..\..\engines\lure\menu.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\lure\menu.h"
-			>
+			RelativePath="..\..\engines\lure\menu.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\lure\palette.cpp"
-			>
+			RelativePath="..\..\engines\lure\palette.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\lure\palette.h"
-			>
+			RelativePath="..\..\engines\lure\palette.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\lure\res.cpp"
-			>
+			RelativePath="..\..\engines\lure\res.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\lure\res.h"
-			>
+			RelativePath="..\..\engines\lure\res.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\lure\res_struct.cpp"
-			>
+			RelativePath="..\..\engines\lure\res_struct.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\lure\res_struct.h"
-			>
+			RelativePath="..\..\engines\lure\res_struct.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\lure\room.cpp"
-			>
+			RelativePath="..\..\engines\lure\room.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\lure\room.h"
-			>
+			RelativePath="..\..\engines\lure\room.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\lure\screen.cpp"
-			>
+			RelativePath="..\..\engines\lure\screen.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\lure\screen.h"
-			>
+			RelativePath="..\..\engines\lure\screen.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\lure\scripts.cpp"
-			>
+			RelativePath="..\..\engines\lure\scripts.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\lure\scripts.h"
-			>
+			RelativePath="..\..\engines\lure\scripts.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\lure\sound.cpp"
-			>
+			RelativePath="..\..\engines\lure\sound.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\lure\sound.h"
-			>
+			RelativePath="..\..\engines\lure\sound.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\lure\strings.cpp"
-			>
+			RelativePath="..\..\engines\lure\strings.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\lure\strings.h"
-			>
+			RelativePath="..\..\engines\lure\strings.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\lure\surface.cpp"
-			>
+			RelativePath="..\..\engines\lure\surface.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\lure\surface.h"
-			>
+			RelativePath="..\..\engines\lure\surface.h">
 		</File>
 	</Files>
 	<Globals>
diff --git a/dists/msvc7/m4.vcproj b/dists/msvc7/m4.vcproj
index b1ce88452c..d4c700db0e 100644
--- a/dists/msvc7/m4.vcproj
+++ b/dists/msvc7/m4.vcproj
@@ -4,40 +4,18 @@
 	Version="7,00"
 	Name="m4"
 	ProjectGUID="{6D576A24-B9CE-11DC-BC77-8D2856D89593}"
-	#RootNamespace="m4"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
+	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
-			Name="Win32"
-		/>
+			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"
-			/>
+			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
@@ -58,36 +36,24 @@
 				WarnAsError="TRUE"
 				SuppressStartupBanner="FALSE"
 				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				DebugInformationFormat="4"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/m4.lib"
-			/>
+				OutputFile="$(OutDir)/m4.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
@@ -95,23 +61,7 @@
 			IntermediateDirectory="m4_Release"
 			ConfigurationType="4"
 			CharacterSet="2"
-			WholeProgramOptimization="TRUE"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
+			WholeProgramOptimization="TRUE">
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
@@ -132,272 +82,200 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
 				WarnAsError="TRUE"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				DebugInformationFormat="0"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/m4.lib"
-			/>
+				OutputFile="$(OutDir)/m4.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	<References>
-	</References>
 	<Files>
 		<File
-			RelativePath="..\..\engines\m4\actor.cpp"
-			>
+			RelativePath="..\..\engines\m4\actor.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\actor.h"
-			>
+			RelativePath="..\..\engines\m4\actor.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\animation.cpp"
-			>
+			RelativePath="..\..\engines\m4\animation.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\animation.h"
-			>
+			RelativePath="..\..\engines\m4\animation.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\assets.cpp"
-			>
+			RelativePath="..\..\engines\m4\assets.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\assets.h"
-			>
+			RelativePath="..\..\engines\m4\assets.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\burger_data.h"
-			>
+			RelativePath="..\..\engines\m4\burger_data.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\compression.cpp"
-			>
+			RelativePath="..\..\engines\m4\compression.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\compression.h"
-			>
+			RelativePath="..\..\engines\m4\compression.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\console.cpp"
-			>
+			RelativePath="..\..\engines\m4\console.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\console.h"
-			>
+			RelativePath="..\..\engines\m4\console.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\converse.cpp"
-			>
+			RelativePath="..\..\engines\m4\converse.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\converse.h"
-			>
+			RelativePath="..\..\engines\m4\converse.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\detection.cpp"
-			>
+			RelativePath="..\..\engines\m4\detection.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\events.cpp"
-			>
+			RelativePath="..\..\engines\m4\events.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\events.h"
-			>
+			RelativePath="..\..\engines\m4\events.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\font.cpp"
-			>
+			RelativePath="..\..\engines\m4\font.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\font.h"
-			>
+			RelativePath="..\..\engines\m4\font.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\globals.cpp"
-			>
+			RelativePath="..\..\engines\m4\globals.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\globals.h"
-			>
+			RelativePath="..\..\engines\m4\globals.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\graphics.cpp"
-			>
+			RelativePath="..\..\engines\m4\graphics.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\graphics.h"
-			>
+			RelativePath="..\..\engines\m4\graphics.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\gui.cpp"
-			>
+			RelativePath="..\..\engines\m4\gui.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\gui.h"
-			>
+			RelativePath="..\..\engines\m4\gui.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\hotspot.cpp"
-			>
+			RelativePath="..\..\engines\m4\hotspot.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\hotspot.h"
-			>
+			RelativePath="..\..\engines\m4\hotspot.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\m4.cpp"
-			>
+			RelativePath="..\..\engines\m4\m4.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\m4.h"
-			>
+			RelativePath="..\..\engines\m4\m4.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\m4_menus.cpp"
-			>
+			RelativePath="..\..\engines\m4\m4_menus.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\m4_menus.h"
-			>
+			RelativePath="..\..\engines\m4\m4_menus.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\m4_views.cpp"
-			>
+			RelativePath="..\..\engines\m4\m4_views.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\m4_views.h"
-			>
+			RelativePath="..\..\engines\m4\m4_views.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\mads_anim.cpp"
-			>
+			RelativePath="..\..\engines\m4\mads_anim.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\mads_anim.h"
-			>
+			RelativePath="..\..\engines\m4\mads_anim.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\mads_menus.cpp"
-			>
+			RelativePath="..\..\engines\m4\mads_menus.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\mads_menus.h"
-			>
+			RelativePath="..\..\engines\m4\mads_menus.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\midi.cpp"
-			>
+			RelativePath="..\..\engines\m4\midi.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\midi.h"
-			>
+			RelativePath="..\..\engines\m4\midi.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\rails.cpp"
-			>
+			RelativePath="..\..\engines\m4\rails.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\rails.h"
-			>
+			RelativePath="..\..\engines\m4\rails.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\resource.cpp"
-			>
+			RelativePath="..\..\engines\m4\resource.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\resource.h"
-			>
+			RelativePath="..\..\engines\m4\resource.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\saveload.cpp"
-			>
+			RelativePath="..\..\engines\m4\saveload.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\saveload.h"
-			>
+			RelativePath="..\..\engines\m4\saveload.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\scene.cpp"
-			>
+			RelativePath="..\..\engines\m4\scene.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\scene.h"
-			>
+			RelativePath="..\..\engines\m4\scene.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\script.cpp"
-			>
+			RelativePath="..\..\engines\m4\script.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\script.h"
-			>
+			RelativePath="..\..\engines\m4\script.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\sound.cpp"
-			>
+			RelativePath="..\..\engines\m4\sound.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\sound.h"
-			>
+			RelativePath="..\..\engines\m4\sound.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\sprite.cpp"
-			>
+			RelativePath="..\..\engines\m4\sprite.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\sprite.h"
-			>
+			RelativePath="..\..\engines\m4\sprite.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\viewmgr.cpp"
-			>
+			RelativePath="..\..\engines\m4\viewmgr.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\viewmgr.h"
-			>
+			RelativePath="..\..\engines\m4\viewmgr.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\woodscript.cpp"
-			>
+			RelativePath="..\..\engines\m4\woodscript.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\woodscript.h"
-			>
+			RelativePath="..\..\engines\m4\woodscript.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\ws_machine.cpp"
-			>
+			RelativePath="..\..\engines\m4\ws_machine.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\m4\ws_sequence.cpp"
-			>
+			RelativePath="..\..\engines\m4\ws_sequence.cpp">
 		</File>
 	</Files>
 	<Globals>
diff --git a/dists/msvc7/made.vcproj b/dists/msvc7/made.vcproj
index 1122bfe3fb..922658c318 100644
--- a/dists/msvc7/made.vcproj
+++ b/dists/msvc7/made.vcproj
@@ -4,40 +4,18 @@
 	Version="7,00"
 	Name="made"
 	ProjectGUID="{E29B5D40-08F7-11DD-BD0B-0800200C9A66}"
-	#RootNamespace="made"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
+	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
-			Name="Win32"
-		/>
+			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"
-			/>
+			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
@@ -58,36 +36,24 @@
 				WarnAsError="TRUE"
 				SuppressStartupBanner="FALSE"
 				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				DebugInformationFormat="4"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/made.lib"
-			/>
+				OutputFile="$(OutDir)/made.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
@@ -95,23 +61,7 @@
 			IntermediateDirectory="made_Release"
 			ConfigurationType="4"
 			CharacterSet="2"
-			WholeProgramOptimization="TRUE"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
+			WholeProgramOptimization="TRUE">
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
@@ -132,140 +82,101 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
 				WarnAsError="TRUE"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				DebugInformationFormat="0"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/made.lib"
-			/>
+				OutputFile="$(OutDir)/made.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	<References>
-	</References>
 	<Files>
 		<File
-			RelativePath="..\..\engines\made\database.cpp"
-			>
+			RelativePath="..\..\engines\made\database.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\made\database.h"
-			>
+			RelativePath="..\..\engines\made\database.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\made\detection.cpp"
-			>
+			RelativePath="..\..\engines\made\detection.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\made\graphics.cpp"
-			>
+			RelativePath="..\..\engines\made\graphics.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\made\graphics.h"
-			>
+			RelativePath="..\..\engines\made\graphics.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\made\made.cpp"
-			>
+			RelativePath="..\..\engines\made\made.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\made\made.h"
-			>
+			RelativePath="..\..\engines\made\made.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\made\music.cpp"
-			>
+			RelativePath="..\..\engines\made\music.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\made\music.h"
-			>
+			RelativePath="..\..\engines\made\music.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\made\pmvplayer.cpp"
-			>
+			RelativePath="..\..\engines\made\pmvplayer.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\made\pmvplayer.h"
-			>
+			RelativePath="..\..\engines\made\pmvplayer.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\made\redreader.cpp"
-			>
+			RelativePath="..\..\engines\made\redreader.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\made\redreader.h"
-			>
+			RelativePath="..\..\engines\made\redreader.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\made\resource.cpp"
-			>
+			RelativePath="..\..\engines\made\resource.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\made\resource.h"
-			>
+			RelativePath="..\..\engines\made\resource.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\made\screen.cpp"
-			>
+			RelativePath="..\..\engines\made\screen.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\made\screen.h"
-			>
+			RelativePath="..\..\engines\made\screen.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\made\screenfx.cpp"
-			>
+			RelativePath="..\..\engines\made\screenfx.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\made\screenfx.h"
-			>
+			RelativePath="..\..\engines\made\screenfx.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\made\script.cpp"
-			>
+			RelativePath="..\..\engines\made\script.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\made\script.h"
-			>
+			RelativePath="..\..\engines\made\script.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\made\scriptfuncs.cpp"
-			>
+			RelativePath="..\..\engines\made\scriptfuncs.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\made\scriptfuncs.h"
-			>
+			RelativePath="..\..\engines\made\scriptfuncs.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\made\sound.cpp"
-			>
+			RelativePath="..\..\engines\made\sound.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\made\sound.h"
-			>
+			RelativePath="..\..\engines\made\sound.h">
 		</File>
 	</Files>
 	<Globals>
diff --git a/dists/msvc7/parallaction.vcproj b/dists/msvc7/parallaction.vcproj
index 927e220a8a..61fc741160 100644
--- a/dists/msvc7/parallaction.vcproj
+++ b/dists/msvc7/parallaction.vcproj
@@ -4,40 +4,18 @@
 	Version="7,00"
 	Name="parallaction"
 	ProjectGUID="{0068957B-E2E1-4988-8C87-D541D84DAF20}"
-	#RootNamespace="parallaction"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
+	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
-			Name="Win32"
-		/>
+			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"
-			/>
+			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
@@ -58,36 +36,24 @@
 				WarnAsError="TRUE"
 				SuppressStartupBanner="FALSE"
 				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				DebugInformationFormat="4"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/parallaction.lib"
-			/>
+				OutputFile="$(OutDir)/parallaction.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
@@ -95,23 +61,7 @@
 			IntermediateDirectory="parallaction_Release"
 			ConfigurationType="4"
 			CharacterSet="2"
-			WholeProgramOptimization="TRUE"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
+			WholeProgramOptimization="TRUE">
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
@@ -132,208 +82,152 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
 				WarnAsError="TRUE"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				DebugInformationFormat="0"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/parallaction.lib"
-			/>
+				OutputFile="$(OutDir)/parallaction.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	<References>
-	</References>
 	<Files>
 		<File
-			RelativePath="..\..\engines\parallaction\balloons.cpp"
-			>
+			RelativePath="..\..\engines\parallaction\balloons.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\callables_br.cpp"
-			>
+			RelativePath="..\..\engines\parallaction\callables_br.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\callables_ns.cpp"
-			>
+			RelativePath="..\..\engines\parallaction\callables_ns.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\debug.cpp"
-			>
+			RelativePath="..\..\engines\parallaction\debug.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\debug.h"
-			>
+			RelativePath="..\..\engines\parallaction\debug.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\detection.cpp"
-			>
+			RelativePath="..\..\engines\parallaction\detection.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\dialogue.cpp"
-			>
+			RelativePath="..\..\engines\parallaction\dialogue.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\disk.h"
-			>
+			RelativePath="..\..\engines\parallaction\disk.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\disk_br.cpp"
-			>
+			RelativePath="..\..\engines\parallaction\disk_br.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\disk_ns.cpp"
-			>
+			RelativePath="..\..\engines\parallaction\disk_ns.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\exec.h"
-			>
+			RelativePath="..\..\engines\parallaction\exec.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\exec_br.cpp"
-			>
+			RelativePath="..\..\engines\parallaction\exec_br.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\exec_ns.cpp"
-			>
+			RelativePath="..\..\engines\parallaction\exec_ns.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\font.cpp"
-			>
+			RelativePath="..\..\engines\parallaction\font.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\gfxbase.cpp"
-			>
+			RelativePath="..\..\engines\parallaction\gfxbase.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\graphics.cpp"
-			>
+			RelativePath="..\..\engines\parallaction\graphics.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\graphics.h"
-			>
+			RelativePath="..\..\engines\parallaction\graphics.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\gui.cpp"
-			>
+			RelativePath="..\..\engines\parallaction\gui.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\gui.h"
-			>
+			RelativePath="..\..\engines\parallaction\gui.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\gui_br.cpp"
-			>
+			RelativePath="..\..\engines\parallaction\gui_br.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\gui_ns.cpp"
-			>
+			RelativePath="..\..\engines\parallaction\gui_ns.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\input.cpp"
-			>
+			RelativePath="..\..\engines\parallaction\input.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\input.h"
-			>
+			RelativePath="..\..\engines\parallaction\input.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\inventory.cpp"
-			>
+			RelativePath="..\..\engines\parallaction\inventory.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\inventory.h"
-			>
+			RelativePath="..\..\engines\parallaction\inventory.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\objects.cpp"
-			>
+			RelativePath="..\..\engines\parallaction\objects.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\objects.h"
-			>
+			RelativePath="..\..\engines\parallaction\objects.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\parallaction.cpp"
-			>
+			RelativePath="..\..\engines\parallaction\parallaction.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\parallaction.h"
-			>
+			RelativePath="..\..\engines\parallaction\parallaction.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\parallaction_br.cpp"
-			>
+			RelativePath="..\..\engines\parallaction\parallaction_br.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\parallaction_ns.cpp"
-			>
+			RelativePath="..\..\engines\parallaction\parallaction_ns.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\parser.cpp"
-			>
+			RelativePath="..\..\engines\parallaction\parser.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\parser.h"
-			>
+			RelativePath="..\..\engines\parallaction\parser.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\parser_br.cpp"
-			>
+			RelativePath="..\..\engines\parallaction\parser_br.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\parser_ns.cpp"
-			>
+			RelativePath="..\..\engines\parallaction\parser_ns.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\saveload.cpp"
-			>
+			RelativePath="..\..\engines\parallaction\saveload.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\saveload.h"
-			>
+			RelativePath="..\..\engines\parallaction\saveload.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\sound.cpp"
-			>
+			RelativePath="..\..\engines\parallaction\sound.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\sound.h"
-			>
+			RelativePath="..\..\engines\parallaction\sound.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\staticres.cpp"
-			>
+			RelativePath="..\..\engines\parallaction\staticres.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\walk.cpp"
-			>
+			RelativePath="..\..\engines\parallaction\walk.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\walk.h"
-			>
+			RelativePath="..\..\engines\parallaction\walk.h">
 		</File>
 	</Files>
 	<Globals>
diff --git a/dists/msvc7/queen.vcproj b/dists/msvc7/queen.vcproj
index 6dc566c0fe..afc0aa17e3 100644
--- a/dists/msvc7/queen.vcproj
+++ b/dists/msvc7/queen.vcproj
@@ -4,40 +4,18 @@
 	Version="7,00"
 	Name="queen"
 	ProjectGUID="{6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7}"
-	#RootNamespace="queen"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
+	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
-			Name="Win32"
-		/>
+			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"
-			/>
+			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
@@ -58,36 +36,24 @@
 				WarnAsError="TRUE"
 				SuppressStartupBanner="FALSE"
 				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				DebugInformationFormat="4"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/queen.lib"
-			/>
+				OutputFile="$(OutDir)/queen.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
@@ -95,23 +61,7 @@
 			IntermediateDirectory="queen_Release"
 			ConfigurationType="4"
 			CharacterSet="2"
-			WholeProgramOptimization="TRUE"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
+			WholeProgramOptimization="TRUE">
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
@@ -132,204 +82,149 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
 				WarnAsError="TRUE"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				DebugInformationFormat="0"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/queen.lib"
-			/>
+				OutputFile="$(OutDir)/queen.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	<References>
-	</References>
 	<Files>
 		<File
-			RelativePath="..\..\engines\queen\bankman.cpp"
-			>
+			RelativePath="..\..\engines\queen\bankman.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\queen\bankman.h"
-			>
+			RelativePath="..\..\engines\queen\bankman.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\queen\command.cpp"
-			>
+			RelativePath="..\..\engines\queen\command.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\queen\command.h"
-			>
+			RelativePath="..\..\engines\queen\command.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\queen\credits.cpp"
-			>
+			RelativePath="..\..\engines\queen\credits.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\queen\credits.h"
-			>
+			RelativePath="..\..\engines\queen\credits.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\queen\cutaway.cpp"
-			>
+			RelativePath="..\..\engines\queen\cutaway.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\queen\cutaway.h"
-			>
+			RelativePath="..\..\engines\queen\cutaway.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\queen\debug.cpp"
-			>
+			RelativePath="..\..\engines\queen\debug.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\queen\debug.h"
-			>
+			RelativePath="..\..\engines\queen\debug.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\queen\defs.h"
-			>
+			RelativePath="..\..\engines\queen\defs.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\queen\display.cpp"
-			>
+			RelativePath="..\..\engines\queen\display.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\queen\display.h"
-			>
+			RelativePath="..\..\engines\queen\display.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\queen\graphics.cpp"
-			>
+			RelativePath="..\..\engines\queen\graphics.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\queen\graphics.h"
-			>
+			RelativePath="..\..\engines\queen\graphics.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\queen\grid.cpp"
-			>
+			RelativePath="..\..\engines\queen\grid.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\queen\grid.h"
-			>
+			RelativePath="..\..\engines\queen\grid.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\queen\input.cpp"
-			>
+			RelativePath="..\..\engines\queen\input.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\queen\input.h"
-			>
+			RelativePath="..\..\engines\queen\input.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\queen\journal.cpp"
-			>
+			RelativePath="..\..\engines\queen\journal.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\queen\journal.h"
-			>
+			RelativePath="..\..\engines\queen\journal.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\queen\logic.cpp"
-			>
+			RelativePath="..\..\engines\queen\logic.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\queen\logic.h"
-			>
+			RelativePath="..\..\engines\queen\logic.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\queen\midiadlib.cpp"
-			>
+			RelativePath="..\..\engines\queen\midiadlib.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\queen\music.cpp"
-			>
+			RelativePath="..\..\engines\queen\music.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\queen\music.h"
-			>
+			RelativePath="..\..\engines\queen\music.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\queen\musicdata.cpp"
-			>
+			RelativePath="..\..\engines\queen\musicdata.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\queen\queen.cpp"
-			>
+			RelativePath="..\..\engines\queen\queen.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\queen\queen.h"
-			>
+			RelativePath="..\..\engines\queen\queen.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\queen\resource.cpp"
-			>
+			RelativePath="..\..\engines\queen\resource.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\queen\resource.h"
-			>
+			RelativePath="..\..\engines\queen\resource.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\queen\restables.cpp"
-			>
+			RelativePath="..\..\engines\queen\restables.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\queen\sound.cpp"
-			>
+			RelativePath="..\..\engines\queen\sound.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\queen\sound.h"
-			>
+			RelativePath="..\..\engines\queen\sound.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\queen\state.cpp"
-			>
+			RelativePath="..\..\engines\queen\state.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\queen\state.h"
-			>
+			RelativePath="..\..\engines\queen\state.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\queen\structs.h"
-			>
+			RelativePath="..\..\engines\queen\structs.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\queen\talk.cpp"
-			>
+			RelativePath="..\..\engines\queen\talk.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\queen\talk.h"
-			>
+			RelativePath="..\..\engines\queen\talk.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\queen\walk.cpp"
-			>
+			RelativePath="..\..\engines\queen\walk.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\queen\walk.h"
-			>
+			RelativePath="..\..\engines\queen\walk.h">
 		</File>
 	</Files>
 	<Globals>
diff --git a/dists/msvc7/saga.vcproj b/dists/msvc7/saga.vcproj
index 19ee5ed6d5..0542622602 100644
--- a/dists/msvc7/saga.vcproj
+++ b/dists/msvc7/saga.vcproj
@@ -4,40 +4,18 @@
 	Version="7,00"
 	Name="saga"
 	ProjectGUID="{676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}"
-	#RootNamespace="saga"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
+	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
-			Name="Win32"
-		/>
+			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"
-			/>
+			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
@@ -58,36 +36,24 @@
 				WarnAsError="TRUE"
 				SuppressStartupBanner="FALSE"
 				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				DebugInformationFormat="4"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/saga.lib"
-			/>
+				OutputFile="$(OutDir)/saga.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
@@ -95,23 +61,7 @@
 			IntermediateDirectory="saga_Release"
 			ConfigurationType="4"
 			CharacterSet="2"
-			WholeProgramOptimization="TRUE"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
+			WholeProgramOptimization="TRUE">
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
@@ -132,284 +82,209 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
 				WarnAsError="TRUE"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				DebugInformationFormat="0"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/saga.lib"
-			/>
+				OutputFile="$(OutDir)/saga.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	<References>
-	</References>
 	<Files>
 		<File
-			RelativePath="..\..\engines\saga\actor.cpp"
-			>
+			RelativePath="..\..\engines\saga\actor.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\actor.h"
-			>
+			RelativePath="..\..\engines\saga\actor.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\actor_path.cpp"
-			>
+			RelativePath="..\..\engines\saga\actor_path.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\actor_walk.cpp"
-			>
+			RelativePath="..\..\engines\saga\actor_walk.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\animation.cpp"
-			>
+			RelativePath="..\..\engines\saga\animation.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\animation.h"
-			>
+			RelativePath="..\..\engines\saga\animation.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\console.cpp"
-			>
+			RelativePath="..\..\engines\saga\console.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\console.h"
-			>
+			RelativePath="..\..\engines\saga\console.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\detection.cpp"
-			>
+			RelativePath="..\..\engines\saga\detection.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\detection_tables.h"
-			>
+			RelativePath="..\..\engines\saga\detection_tables.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\displayinfo.h"
-			>
+			RelativePath="..\..\engines\saga\displayinfo.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\events.cpp"
-			>
+			RelativePath="..\..\engines\saga\events.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\events.h"
-			>
+			RelativePath="..\..\engines\saga\events.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\font.cpp"
-			>
+			RelativePath="..\..\engines\saga\font.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\font.h"
-			>
+			RelativePath="..\..\engines\saga\font.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\font_map.cpp"
-			>
+			RelativePath="..\..\engines\saga\font_map.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\gfx.cpp"
-			>
+			RelativePath="..\..\engines\saga\gfx.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\gfx.h"
-			>
+			RelativePath="..\..\engines\saga\gfx.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\image.cpp"
-			>
+			RelativePath="..\..\engines\saga\image.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\input.cpp"
-			>
+			RelativePath="..\..\engines\saga\input.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\interface.cpp"
-			>
+			RelativePath="..\..\engines\saga\interface.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\interface.h"
-			>
+			RelativePath="..\..\engines\saga\interface.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\introproc_fta2.cpp"
-			>
+			RelativePath="..\..\engines\saga\introproc_fta2.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\introproc_ihnm.cpp"
-			>
+			RelativePath="..\..\engines\saga\introproc_ihnm.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\introproc_ite.cpp"
-			>
+			RelativePath="..\..\engines\saga\introproc_ite.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\isomap.cpp"
-			>
+			RelativePath="..\..\engines\saga\isomap.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\isomap.h"
-			>
+			RelativePath="..\..\engines\saga\isomap.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\itedata.cpp"
-			>
+			RelativePath="..\..\engines\saga\itedata.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\itedata.h"
-			>
+			RelativePath="..\..\engines\saga\itedata.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\list.h"
-			>
+			RelativePath="..\..\engines\saga\list.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\music.cpp"
-			>
+			RelativePath="..\..\engines\saga\music.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\music.h"
-			>
+			RelativePath="..\..\engines\saga\music.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\objectmap.cpp"
-			>
+			RelativePath="..\..\engines\saga\objectmap.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\objectmap.h"
-			>
+			RelativePath="..\..\engines\saga\objectmap.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\palanim.cpp"
-			>
+			RelativePath="..\..\engines\saga\palanim.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\palanim.h"
-			>
+			RelativePath="..\..\engines\saga\palanim.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\puzzle.cpp"
-			>
+			RelativePath="..\..\engines\saga\puzzle.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\puzzle.h"
-			>
+			RelativePath="..\..\engines\saga\puzzle.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\render.cpp"
-			>
+			RelativePath="..\..\engines\saga\render.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\render.h"
-			>
+			RelativePath="..\..\engines\saga\render.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\resource.cpp"
-			>
+			RelativePath="..\..\engines\saga\resource.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\resource.h"
-			>
+			RelativePath="..\..\engines\saga\resource.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\resource_hrs.cpp"
-			>
+			RelativePath="..\..\engines\saga\resource_hrs.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\resource_res.cpp"
-			>
+			RelativePath="..\..\engines\saga\resource_res.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\resource_rsc.cpp"
-			>
+			RelativePath="..\..\engines\saga\resource_rsc.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\saga.cpp"
-			>
+			RelativePath="..\..\engines\saga\saga.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\saga.h"
-			>
+			RelativePath="..\..\engines\saga\saga.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\saveload.cpp"
-			>
+			RelativePath="..\..\engines\saga\saveload.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\scene.cpp"
-			>
+			RelativePath="..\..\engines\saga\scene.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\scene.h"
-			>
+			RelativePath="..\..\engines\saga\scene.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\script.cpp"
-			>
+			RelativePath="..\..\engines\saga\script.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\script.h"
-			>
+			RelativePath="..\..\engines\saga\script.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\sfuncs.cpp"
-			>
+			RelativePath="..\..\engines\saga\sfuncs.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\sfuncs_ihnm.cpp"
-			>
+			RelativePath="..\..\engines\saga\sfuncs_ihnm.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\sndres.cpp"
-			>
+			RelativePath="..\..\engines\saga\sndres.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\sndres.h"
-			>
+			RelativePath="..\..\engines\saga\sndres.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\sound.cpp"
-			>
+			RelativePath="..\..\engines\saga\sound.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\sound.h"
-			>
+			RelativePath="..\..\engines\saga\sound.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\sprite.cpp"
-			>
+			RelativePath="..\..\engines\saga\sprite.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\sprite.h"
-			>
+			RelativePath="..\..\engines\saga\sprite.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\sthread.cpp"
-			>
+			RelativePath="..\..\engines\saga\sthread.cpp">
 		</File>
 	</Files>
 	<Globals>
diff --git a/dists/msvc7/sci.vcproj b/dists/msvc7/sci.vcproj
index 1cb207b551..9a85b3b991 100644
--- a/dists/msvc7/sci.vcproj
+++ b/dists/msvc7/sci.vcproj
@@ -4,40 +4,18 @@
 	Version="7,00"
 	Name="sci"
 	ProjectGUID="{53F17B2B-0412-4EC3-A999-ED0537BB5223}"
-	#RootNamespace="sci"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
+	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
-			Name="Win32"
-		/>
+			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"
-			/>
+			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
@@ -58,36 +36,24 @@
 				WarnAsError="FALSE"
 				SuppressStartupBanner="FALSE"
 				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"
-			/>
+				DebugInformationFormat="4"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/sci.lib"
-			/>
+				OutputFile="$(OutDir)/sci.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
@@ -95,23 +61,7 @@
 			IntermediateDirectory="sci_Release"
 			ConfigurationType="4"
 			CharacterSet="2"
-			WholeProgramOptimization="TRUE"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
+			WholeProgramOptimization="TRUE">
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
@@ -132,612 +82,458 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
 				WarnAsError="TRUE"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				DebugInformationFormat="0"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/sci.lib"
-			/>
+				OutputFile="$(OutDir)/sci.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	<References>
-	</References>
 	<Files>
 		<Filter
-			Name="engine"
-			>
+			Name="engine">
 			<File
-				RelativePath="..\..\engines\sci\engine\game.cpp"
-				>
+				RelativePath="..\..\engines\sci\engine\aatree.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\engine\gc.cpp"
-				>
+				RelativePath="..\..\engines\sci\engine\aatree.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\engine\gc.h"
-				>
+				RelativePath="..\..\engines\sci\engine\game.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\engine\grammar.cpp"
-				>
+				RelativePath="..\..\engines\sci\engine\gc.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\engine\heap.cpp"
-				>
+				RelativePath="..\..\engines\sci\engine\gc.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\engine\heap.h"
-				>
+				RelativePath="..\..\engines\sci\engine\grammar.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\engine\int_hashmap.cpp"
-				>
+				RelativePath="..\..\engines\sci\engine\heap.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\engine\int_hashmap.h"
-				>
+				RelativePath="..\..\engines\sci\engine\heap.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\engine\kernel.cpp"
-				>
+				RelativePath="..\..\engines\sci\engine\int_hashmap.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\engine\kernel_types.h"
-				>
+				RelativePath="..\..\engines\sci\engine\int_hashmap.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\engine\kevent.cpp"
-				>
+				RelativePath="..\..\engines\sci\engine\kernel.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\engine\kfile.cpp"
-				>
+				RelativePath="..\..\engines\sci\engine\kernel_types.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\engine\kgraphics.cpp"
-				>
+				RelativePath="..\..\engines\sci\engine\kevent.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\engine\klists.cpp"
-				>
+				RelativePath="..\..\engines\sci\engine\kfile.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\engine\kmath.cpp"
-				>
+				RelativePath="..\..\engines\sci\engine\kgraphics.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\engine\kmenu.cpp"
-				>
+				RelativePath="..\..\engines\sci\engine\klists.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\engine\kmovement.cpp"
-				>
+				RelativePath="..\..\engines\sci\engine\kmath.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\engine\kpathing.cpp"
-				>
+				RelativePath="..\..\engines\sci\engine\kmenu.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\engine\kscripts.cpp"
-				>
+				RelativePath="..\..\engines\sci\engine\kmovement.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\engine\ksound.cpp"
-				>
+				RelativePath="..\..\engines\sci\engine\kpathing.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\engine\kstring.cpp"
-				>
+				RelativePath="..\..\engines\sci\engine\kscripts.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\engine\message.cpp"
-				>
+				RelativePath="..\..\engines\sci\engine\ksound.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\engine\message.h"
-				>
+				RelativePath="..\..\engines\sci\engine\kstring.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\engine\said.cpp"
-				>
+				RelativePath="..\..\engines\sci\engine\message.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\engine\savegame.cpp"
-				>
+				RelativePath="..\..\engines\sci\engine\message.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\engine\sci_graphics.h"
-				>
+				RelativePath="..\..\engines\sci\engine\said.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\engine\scriptconsole.cpp"
-				>
+				RelativePath="..\..\engines\sci\engine\savegame.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\engine\scriptdebug.cpp"
-				>
+				RelativePath="..\..\engines\sci\engine\sci_graphics.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\engine\seg_manager.cpp"
-				>
+				RelativePath="..\..\engines\sci\engine\scriptconsole.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\engine\seg_manager.h"
-				>
+				RelativePath="..\..\engines\sci\engine\scriptdebug.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\engine\sys_strings.cpp"
-				>
+				RelativePath="..\..\engines\sci\engine\seg_manager.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\engine\vm.cpp"
-				>
+				RelativePath="..\..\engines\sci\engine\seg_manager.h">
+			</File>
+			<File
+				RelativePath="..\..\engines\sci\engine\sys_strings.cpp">
+			</File>
+			<File
+				RelativePath="..\..\engines\sci\engine\vm.cpp">
 			</File>
 		</Filter>
 		<Filter
-			Name="gfx"
-			>
+			Name="gfx">
 			<File
-				RelativePath="..\..\engines\sci\gfx\antialias.cpp"
-				>
+				RelativePath="..\..\engines\sci\gfx\antialias.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\gfx\font-5x8.cpp"
-				>
+				RelativePath="..\..\engines\sci\gfx\font-5x8.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\gfx\font-6x10.cpp"
-				>
+				RelativePath="..\..\engines\sci\gfx\font-6x10.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\gfx\font.cpp"
-				>
+				RelativePath="..\..\engines\sci\gfx\font.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_driver.cpp"
-				>
+				RelativePath="..\..\engines\sci\gfx\gfx_driver.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_driver.h"
-				>
+				RelativePath="..\..\engines\sci\gfx\gfx_driver.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_options.h"
-				>
+				RelativePath="..\..\engines\sci\gfx\gfx_options.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_res_options.cpp"
-				>
+				RelativePath="..\..\engines\sci\gfx\gfx_res_options.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_res_options.h"
-				>
+				RelativePath="..\..\engines\sci\gfx\gfx_res_options.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_resmgr.h"
-				>
+				RelativePath="..\..\engines\sci\gfx\gfx_resmgr.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_resource.cpp"
-				>
+				RelativePath="..\..\engines\sci\gfx\gfx_resource.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_resource.h"
-				>
+				RelativePath="..\..\engines\sci\gfx\gfx_resource.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_state_internal.h"
-				>
+				RelativePath="..\..\engines\sci\gfx\gfx_state_internal.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_support.cpp"
-				>
+				RelativePath="..\..\engines\sci\gfx\gfx_support.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_system.h"
-				>
+				RelativePath="..\..\engines\sci\gfx\gfx_system.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_tools.cpp"
-				>
+				RelativePath="..\..\engines\sci\gfx\gfx_tools.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_tools.h"
-				>
+				RelativePath="..\..\engines\sci\gfx\gfx_tools.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\gfx\gfx_widgets.h"
-				>
+				RelativePath="..\..\engines\sci\gfx\gfx_widgets.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\gfx\menubar.cpp"
-				>
+				RelativePath="..\..\engines\sci\gfx\menubar.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\gfx\operations.cpp"
-				>
+				RelativePath="..\..\engines\sci\gfx\operations.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\gfx\resmgr.cpp"
-				>
+				RelativePath="..\..\engines\sci\gfx\resmgr.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\gfx\sbtree.cpp"
-				>
+				RelativePath="..\..\engines\sci\gfx\sbtree.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\gfx\sbtree.h"
-				>
+				RelativePath="..\..\engines\sci\gfx\sbtree.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\gfx\sci_widgets.cpp"
-				>
+				RelativePath="..\..\engines\sci\gfx\sci_widgets.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\gfx\widgets.cpp"
-				>
+				RelativePath="..\..\engines\sci\gfx\widgets.cpp">
 			</File>
 			<Filter
-				Name="resource"
-				>
+				Name="resource">
 				<File
-					RelativePath="..\..\engines\sci\gfx\resource\sci_cursor_0.cpp"
-					>
+					RelativePath="..\..\engines\sci\gfx\resource\sci_cursor_0.cpp">
 				</File>
 				<File
-					RelativePath="..\..\engines\sci\gfx\resource\sci_font.cpp"
-					>
+					RelativePath="..\..\engines\sci\gfx\resource\sci_font.cpp">
 				</File>
 				<File
-					RelativePath="..\..\engines\sci\gfx\resource\sci_pal_1.cpp"
-					>
+					RelativePath="..\..\engines\sci\gfx\resource\sci_pal_1.cpp">
 				</File>
 				<File
-					RelativePath="..\..\engines\sci\gfx\resource\sci_pic_0.cpp"
-					>
+					RelativePath="..\..\engines\sci\gfx\resource\sci_pic_0.cpp">
 				</File>
 				<File
-					RelativePath="..\..\engines\sci\gfx\resource\sci_resmgr.cpp"
-					>
+					RelativePath="..\..\engines\sci\gfx\resource\sci_resmgr.cpp">
 				</File>
 				<File
-					RelativePath="..\..\engines\sci\gfx\resource\sci_view_0.cpp"
-					>
+					RelativePath="..\..\engines\sci\gfx\resource\sci_view_0.cpp">
 				</File>
 				<File
-					RelativePath="..\..\engines\sci\gfx\resource\sci_view_1.cpp"
-					>
+					RelativePath="..\..\engines\sci\gfx\resource\sci_view_1.cpp">
 				</File>
 			</Filter>
 		</Filter>
 		<Filter
-			Name="scicore"
-			>
-			<File
-				RelativePath="..\..\engines\sci\scicore\aatree.cpp"
-				>
-			</File>
+			Name="scicore">
 			<File
-				RelativePath="..\..\engines\sci\scicore\decompress0.cpp"
-				>
+				RelativePath="..\..\engines\sci\scicore\decompress0.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\scicore\decompress01.cpp"
-				>
+				RelativePath="..\..\engines\sci\scicore\decompress01.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\scicore\decompress1.cpp"
-				>
+				RelativePath="..\..\engines\sci\scicore\decompress1.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\scicore\decompress11.cpp"
-				>
+				RelativePath="..\..\engines\sci\scicore\decompress11.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\scicore\resource.cpp"
-				>
+				RelativePath="..\..\engines\sci\scicore\resource.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\scicore\resource_map.cpp"
-				>
+				RelativePath="..\..\engines\sci\scicore\resource_map.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\scicore\resource_patch.cpp"
-				>
+				RelativePath="..\..\engines\sci\scicore\resource_patch.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\scicore\sci_memory.cpp"
-				>
+				RelativePath="..\..\engines\sci\scicore\sci_memory.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\scicore\sciconsole.cpp"
-				>
+				RelativePath="..\..\engines\sci\scicore\sciconsole.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\scicore\script.cpp"
-				>
+				RelativePath="..\..\engines\sci\scicore\script.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\scicore\versions.cpp"
-				>
+				RelativePath="..\..\engines\sci\scicore\versions.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\scicore\vocab.cpp"
-				>
+				RelativePath="..\..\engines\sci\scicore\vocab.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\scicore\vocab_debug.cpp"
-				>
+				RelativePath="..\..\engines\sci\scicore\vocab_debug.cpp">
 			</File>
 		</Filter>
 		<Filter
-			Name="sfx"
-			>
+			Name="sfx">
 			<File
-				RelativePath="..\..\engines\sci\sfx\adlib.cpp"
-				>
+				RelativePath="..\..\engines\sci\sfx\adlib.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\sfx\adlib.h"
-				>
+				RelativePath="..\..\engines\sci\sfx\adlib.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\sfx\core.cpp"
-				>
+				RelativePath="..\..\engines\sci\sfx\core.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\sfx\device.h"
-				>
+				RelativePath="..\..\engines\sci\sfx\device.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\sfx\iterator.cpp"
-				>
+				RelativePath="..\..\engines\sci\sfx\iterator.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\sfx\mixer.h"
-				>
+				RelativePath="..\..\engines\sci\sfx\mixer.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\sfx\pcm-iterator.cpp"
-				>
+				RelativePath="..\..\engines\sci\sfx\pcm-iterator.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\sfx\pcm_device.cpp"
-				>
+				RelativePath="..\..\engines\sci\sfx\pcm_device.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\sfx\sequencer.h"
-				>
+				RelativePath="..\..\engines\sci\sfx\sequencer.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\sfx\softseq.h"
-				>
+				RelativePath="..\..\engines\sci\sfx\softseq.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\sfx\songlib.cpp"
-				>
+				RelativePath="..\..\engines\sci\sfx\songlib.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\sfx\time.cpp"
-				>
+				RelativePath="..\..\engines\sci\sfx\time.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\sfx\timer.cpp"
-				>
+				RelativePath="..\..\engines\sci\sfx\timer.cpp">
 			</File>
 			<Filter
-				Name="device"
-				>
+				Name="device">
 				<File
-					RelativePath="..\..\engines\sci\sfx\device\devices.cpp"
-					>
+					RelativePath="..\..\engines\sci\sfx\device\devices.cpp">
 				</File>
 			</Filter>
 			<Filter
-				Name="mixer"
-				>
+				Name="mixer">
 				<File
-					RelativePath="..\..\engines\sci\sfx\mixer\soft.cpp"
-					>
+					RelativePath="..\..\engines\sci\sfx\mixer\soft.cpp">
 				</File>
 			</Filter>
 			<Filter
-				Name="player"
-				>
+				Name="player">
 				<File
-					RelativePath="..\..\engines\sci\sfx\player\players.cpp"
-					>
+					RelativePath="..\..\engines\sci\sfx\player\players.cpp">
 				</File>
 				<File
-					RelativePath="..\..\engines\sci\sfx\player\polled.cpp"
-					>
+					RelativePath="..\..\engines\sci\sfx\player\polled.cpp">
 				</File>
 				<File
-					RelativePath="..\..\engines\sci\sfx\player\realtime.cpp"
-					>
+					RelativePath="..\..\engines\sci\sfx\player\realtime.cpp">
 				</File>
 			</Filter>
 			<Filter
-				Name="seq"
-				>
+				Name="seq">
 				<File
-					RelativePath="..\..\engines\sci\sfx\seq\sequencers.cpp"
-					>
+					RelativePath="..\..\engines\sci\sfx\seq\sequencers.cpp">
 				</File>
 			</Filter>
 			<Filter
-				Name="softseq"
-				>
+				Name="softseq">
 				<File
-					RelativePath="..\..\engines\sci\sfx\softseq\amiga.cpp"
-					>
+					RelativePath="..\..\engines\sci\sfx\softseq\amiga.cpp">
 				</File>
 				<File
-					RelativePath="..\..\engines\sci\sfx\softseq\opl2.cpp"
-					>
+					RelativePath="..\..\engines\sci\sfx\softseq\opl2.cpp">
 				</File>
 				<File
-					RelativePath="..\..\engines\sci\sfx\softseq\pcspeaker.cpp"
-					>
+					RelativePath="..\..\engines\sci\sfx\softseq\pcspeaker.cpp">
 				</File>
 				<File
-					RelativePath="..\..\engines\sci\sfx\softseq\SN76496.cpp"
-					>
+					RelativePath="..\..\engines\sci\sfx\softseq\SN76496.cpp">
 				</File>
 				<File
-					RelativePath="..\..\engines\sci\sfx\softseq\softsequencers.cpp"
-					>
+					RelativePath="..\..\engines\sci\sfx\softseq\softsequencers.cpp">
 				</File>
 			</Filter>
 		</Filter>
 		<Filter
-			Name="include"
-			>
+			Name="include">
 			<File
-				RelativePath="..\..\engines\sci\include\aatree.h"
-				>
+				RelativePath="..\..\engines\sci\include\aatree.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\include\engine.h"
-				>
+				RelativePath="..\..\engines\sci\include\engine.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\include\event.h"
-				>
+				RelativePath="..\..\engines\sci\include\event.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\include\heapmgr.h"
-				>
+				RelativePath="..\..\engines\sci\include\heapmgr.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\include\kdebug.h"
-				>
+				RelativePath="..\..\engines\sci\include\kdebug.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\include\kernel.h"
-				>
+				RelativePath="..\..\engines\sci\include\kernel.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\include\list.h"
-				>
+				RelativePath="..\..\engines\sci\include\list.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\include\menubar.h"
-				>
+				RelativePath="..\..\engines\sci\include\menubar.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\include\sci_memory.h"
-				>
+				RelativePath="..\..\engines\sci\include\sci_memory.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\include\sci_midi.h"
-				>
+				RelativePath="..\..\engines\sci\include\sci_midi.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\include\sci_widgets.h"
-				>
+				RelativePath="..\..\engines\sci\include\sci_widgets.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\include\sciconsole.h"
-				>
+				RelativePath="..\..\engines\sci\include\sciconsole.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\include\sciresource.h"
-				>
+				RelativePath="..\..\engines\sci\include\sciresource.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\include\scitypes.h"
-				>
+				RelativePath="..\..\engines\sci\include\scitypes.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\include\script.h"
-				>
+				RelativePath="..\..\engines\sci\include\script.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\include\sys_strings.h"
-				>
+				RelativePath="..\..\engines\sci\include\sys_strings.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\include\uinput.h"
-				>
+				RelativePath="..\..\engines\sci\include\uinput.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\include\versions.h"
-				>
+				RelativePath="..\..\engines\sci\include\versions.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\include\vm.h"
-				>
+				RelativePath="..\..\engines\sci\include\vm.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\include\vm_types.h"
-				>
+				RelativePath="..\..\engines\sci\include\vm_types.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\include\vocabulary.h"
-				>
+				RelativePath="..\..\engines\sci\include\vocabulary.h">
 			</File>
 		</Filter>
 		<File
-			RelativePath="..\..\engines\sci\console.cpp"
-			>
+			RelativePath="..\..\engines\sci\console.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sci\console.h"
-			>
+			RelativePath="..\..\engines\sci\console.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\sci\detection.cpp"
-			>
+			RelativePath="..\..\engines\sci\detection.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sci\exereader.cpp"
-			>
+			RelativePath="..\..\engines\sci\exereader.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sci\exereader.h"
-			>
+			RelativePath="..\..\engines\sci\exereader.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\sci\sci.cpp"
-			>
+			RelativePath="..\..\engines\sci\sci.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sci\sci.h"
-			>
+			RelativePath="..\..\engines\sci\sci.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\sci\tools.cpp"
-			>
+			RelativePath="..\..\engines\sci\tools.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sci\tools.h"
-			>
+			RelativePath="..\..\engines\sci\tools.h">
 		</File>
 	</Files>
 	<Globals>
diff --git a/dists/msvc7/scumm.vcproj b/dists/msvc7/scumm.vcproj
index f49c747a62..1766f4e211 100644
--- a/dists/msvc7/scumm.vcproj
+++ b/dists/msvc7/scumm.vcproj
@@ -4,40 +4,18 @@
 	Version="7,00"
 	Name="scumm"
 	ProjectGUID="{B6AFD548-63D2-40CD-A652-E87095AFCBAF}"
-	#RootNamespace="scumm"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
+	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
-			Name="Win32"
-		/>
+			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"
-			/>
+			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
@@ -58,36 +36,24 @@
 				WarnAsError="TRUE"
 				SuppressStartupBanner="FALSE"
 				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				DebugInformationFormat="4"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/scumm.lib"
-			/>
+				OutputFile="$(OutDir)/scumm.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
@@ -95,23 +61,7 @@
 			IntermediateDirectory="scumm_Release"
 			ConfigurationType="4"
 			CharacterSet="2"
-			WholeProgramOptimization="TRUE"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
+			WholeProgramOptimization="TRUE">
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
@@ -132,668 +82,497 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
 				WarnAsError="TRUE"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				DebugInformationFormat="0"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/scumm.lib"
-			/>
+				OutputFile="$(OutDir)/scumm.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	<References>
-	</References>
 	<Files>
 		<Filter
-			Name="smush"
-			>
+			Name="smush">
 			<File
-				RelativePath="..\..\engines\scumm\smush\channel.cpp"
-				>
+				RelativePath="..\..\engines\scumm\smush\channel.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\smush\channel.h"
-				>
+				RelativePath="..\..\engines\scumm\smush\channel.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\smush\chunk_type.h"
-				>
+				RelativePath="..\..\engines\scumm\smush\chunk_type.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\smush\codec1.cpp"
-				>
+				RelativePath="..\..\engines\scumm\smush\codec1.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\smush\codec37.cpp"
-				>
+				RelativePath="..\..\engines\scumm\smush\codec37.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\smush\codec37.h"
-				>
+				RelativePath="..\..\engines\scumm\smush\codec37.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\smush\codec47.cpp"
-				>
+				RelativePath="..\..\engines\scumm\smush\codec47.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\smush\codec47.h"
-				>
+				RelativePath="..\..\engines\scumm\smush\codec47.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\smush\imuse_channel.cpp"
-				>
+				RelativePath="..\..\engines\scumm\smush\imuse_channel.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\smush\saud_channel.cpp"
-				>
+				RelativePath="..\..\engines\scumm\smush\saud_channel.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\smush\smush_font.cpp"
-				>
+				RelativePath="..\..\engines\scumm\smush\smush_font.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\smush\smush_font.h"
-				>
+				RelativePath="..\..\engines\scumm\smush\smush_font.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\smush\smush_mixer.cpp"
-				>
+				RelativePath="..\..\engines\scumm\smush\smush_mixer.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\smush\smush_mixer.h"
-				>
+				RelativePath="..\..\engines\scumm\smush\smush_mixer.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\smush\smush_player.cpp"
-				>
+				RelativePath="..\..\engines\scumm\smush\smush_player.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\smush\smush_player.h"
-				>
+				RelativePath="..\..\engines\scumm\smush\smush_player.h">
 			</File>
 		</Filter>
 		<Filter
-			Name="imuse_digi"
-			>
+			Name="imuse_digi">
 			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse.cpp"
-				>
+				RelativePath="..\..\engines\scumm\imuse_digi\dimuse.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse.h"
-				>
+				RelativePath="..\..\engines\scumm\imuse_digi\dimuse.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_bndmgr.cpp"
-				>
+				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_bndmgr.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_bndmgr.h"
-				>
+				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_bndmgr.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_codecs.cpp"
-				>
+				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_codecs.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_music.cpp"
-				>
+				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_music.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_script.cpp"
-				>
+				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_script.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_sndmgr.cpp"
-				>
+				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_sndmgr.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_sndmgr.h"
-				>
+				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_sndmgr.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_tables.cpp"
-				>
+				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_tables.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_tables.h"
-				>
+				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_tables.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_track.cpp"
-				>
+				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_track.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_track.h"
-				>
+				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_track.h">
 			</File>
 		</Filter>
 		<Filter
-			Name="insane"
-			>
+			Name="insane">
 			<File
-				RelativePath="..\..\engines\scumm\insane\insane.cpp"
-				>
+				RelativePath="..\..\engines\scumm\insane\insane.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\insane\insane.h"
-				>
+				RelativePath="..\..\engines\scumm\insane\insane.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\insane\insane_ben.cpp"
-				>
+				RelativePath="..\..\engines\scumm\insane\insane_ben.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\insane\insane_enemy.cpp"
-				>
+				RelativePath="..\..\engines\scumm\insane\insane_enemy.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\insane\insane_iact.cpp"
-				>
+				RelativePath="..\..\engines\scumm\insane\insane_iact.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\insane\insane_scenes.cpp"
-				>
+				RelativePath="..\..\engines\scumm\insane\insane_scenes.cpp">
 			</File>
 		</Filter>
 		<Filter
-			Name="he"
-			>
+			Name="he">
 			<File
-				RelativePath="..\..\engines\scumm\he\animation_he.cpp"
-				>
+				RelativePath="..\..\engines\scumm\he\animation_he.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\he\animation_he.h"
-				>
+				RelativePath="..\..\engines\scumm\he\animation_he.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\he\cup_player_he.cpp"
-				>
+				RelativePath="..\..\engines\scumm\he\cup_player_he.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\he\cup_player_he.h"
-				>
+				RelativePath="..\..\engines\scumm\he\cup_player_he.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\he\floodfill_he.cpp"
-				>
+				RelativePath="..\..\engines\scumm\he\floodfill_he.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\he\floodfill_he.h"
-				>
+				RelativePath="..\..\engines\scumm\he\floodfill_he.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\he\intern_he.h"
-				>
+				RelativePath="..\..\engines\scumm\he\intern_he.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\he\logic_he.cpp"
-				>
+				RelativePath="..\..\engines\scumm\he\logic_he.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\he\logic_he.h"
-				>
+				RelativePath="..\..\engines\scumm\he\logic_he.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\he\palette_he.cpp"
-				>
+				RelativePath="..\..\engines\scumm\he\palette_he.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\he\resource_he.cpp"
-				>
+				RelativePath="..\..\engines\scumm\he\resource_he.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\he\resource_he.h"
-				>
+				RelativePath="..\..\engines\scumm\he\resource_he.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\he\script_v100he.cpp"
-				>
+				RelativePath="..\..\engines\scumm\he\script_v100he.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\he\script_v60he.cpp"
-				>
+				RelativePath="..\..\engines\scumm\he\script_v60he.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\he\script_v70he.cpp"
-				>
+				RelativePath="..\..\engines\scumm\he\script_v70he.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\he\script_v71he.cpp"
-				>
+				RelativePath="..\..\engines\scumm\he\script_v71he.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\he\script_v72he.cpp"
-				>
+				RelativePath="..\..\engines\scumm\he\script_v72he.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\he\script_v80he.cpp"
-				>
+				RelativePath="..\..\engines\scumm\he\script_v80he.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\he\script_v90he.cpp"
-				>
+				RelativePath="..\..\engines\scumm\he\script_v90he.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\he\sound_he.cpp"
-				>
+				RelativePath="..\..\engines\scumm\he\sound_he.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\he\sound_he.h"
-				>
+				RelativePath="..\..\engines\scumm\he\sound_he.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\he\sprite_he.cpp"
-				>
+				RelativePath="..\..\engines\scumm\he\sprite_he.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\he\sprite_he.h"
-				>
+				RelativePath="..\..\engines\scumm\he\sprite_he.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\he\wiz_he.cpp"
-				>
+				RelativePath="..\..\engines\scumm\he\wiz_he.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\he\wiz_he.h"
-				>
+				RelativePath="..\..\engines\scumm\he\wiz_he.h">
 			</File>
 		</Filter>
 		<Filter
-			Name="imuse"
-			>
+			Name="imuse">
 			<File
-				RelativePath="..\..\engines\scumm\imuse\imuse.cpp"
-				>
+				RelativePath="..\..\engines\scumm\imuse\imuse.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\imuse\imuse.h"
-				>
+				RelativePath="..\..\engines\scumm\imuse\imuse.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\imuse\imuse_internal.h"
-				>
+				RelativePath="..\..\engines\scumm\imuse\imuse_internal.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\imuse\imuse_part.cpp"
-				>
+				RelativePath="..\..\engines\scumm\imuse\imuse_part.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\imuse\imuse_player.cpp"
-				>
+				RelativePath="..\..\engines\scumm\imuse\imuse_player.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\imuse\instrument.cpp"
-				>
+				RelativePath="..\..\engines\scumm\imuse\instrument.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\imuse\instrument.h"
-				>
+				RelativePath="..\..\engines\scumm\imuse\instrument.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\imuse\sysex.h"
-				>
+				RelativePath="..\..\engines\scumm\imuse\sysex.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\imuse\sysex_samnmax.cpp"
-				>
+				RelativePath="..\..\engines\scumm\imuse\sysex_samnmax.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\scumm\imuse\sysex_scumm.cpp"
-				>
+				RelativePath="..\..\engines\scumm\imuse\sysex_scumm.cpp">
 			</File>
 		</Filter>
 		<File
-			RelativePath="..\..\engines\scumm\actor.cpp"
-			>
+			RelativePath="..\..\engines\scumm\actor.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\actor.h"
-			>
+			RelativePath="..\..\engines\scumm\actor.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\akos.cpp"
-			>
+			RelativePath="..\..\engines\scumm\akos.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\akos.h"
-			>
+			RelativePath="..\..\engines\scumm\akos.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\base-costume.cpp"
-			>
+			RelativePath="..\..\engines\scumm\base-costume.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\base-costume.h"
-			>
+			RelativePath="..\..\engines\scumm\base-costume.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\bomp.cpp"
-			>
+			RelativePath="..\..\engines\scumm\bomp.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\bomp.h"
-			>
+			RelativePath="..\..\engines\scumm\bomp.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\boxes.cpp"
-			>
+			RelativePath="..\..\engines\scumm\boxes.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\boxes.h"
-			>
+			RelativePath="..\..\engines\scumm\boxes.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\camera.cpp"
-			>
+			RelativePath="..\..\engines\scumm\camera.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\charset-fontdata.cpp"
-			>
+			RelativePath="..\..\engines\scumm\charset-fontdata.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\charset.cpp"
-			>
+			RelativePath="..\..\engines\scumm\charset.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\charset.h"
-			>
+			RelativePath="..\..\engines\scumm\charset.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\costume.cpp"
-			>
+			RelativePath="..\..\engines\scumm\costume.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\costume.h"
-			>
+			RelativePath="..\..\engines\scumm\costume.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\cursor.cpp"
-			>
+			RelativePath="..\..\engines\scumm\cursor.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\debugger.cpp"
-			>
+			RelativePath="..\..\engines\scumm\debugger.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\debugger.h"
-			>
+			RelativePath="..\..\engines\scumm\debugger.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\detection.cpp"
-			>
+			RelativePath="..\..\engines\scumm\detection.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\detection.h"
-			>
+			RelativePath="..\..\engines\scumm\detection.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\detection_tables.h"
-			>
+			RelativePath="..\..\engines\scumm\detection_tables.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\dialogs.cpp"
-			>
+			RelativePath="..\..\engines\scumm\dialogs.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\dialogs.h"
-			>
+			RelativePath="..\..\engines\scumm\dialogs.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\file.cpp"
-			>
+			RelativePath="..\..\engines\scumm\file.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\file.h"
-			>
+			RelativePath="..\..\engines\scumm\file.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\file_nes.cpp"
-			>
+			RelativePath="..\..\engines\scumm\file_nes.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\file_nes.h"
-			>
+			RelativePath="..\..\engines\scumm\file_nes.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\gfx.cpp"
-			>
+			RelativePath="..\..\engines\scumm\gfx.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\gfx.h"
-			>
+			RelativePath="..\..\engines\scumm\gfx.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\help.cpp"
-			>
+			RelativePath="..\..\engines\scumm\help.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\help.h"
-			>
+			RelativePath="..\..\engines\scumm\help.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\input.cpp"
-			>
+			RelativePath="..\..\engines\scumm\input.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\intern.h"
-			>
+			RelativePath="..\..\engines\scumm\intern.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\midiparser_eup.cpp"
-			>
+			RelativePath="..\..\engines\scumm\midiparser_eup.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\midiparser_ro.cpp"
-			>
+			RelativePath="..\..\engines\scumm\midiparser_ro.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\music.h"
-			>
+			RelativePath="..\..\engines\scumm\music.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\nut_renderer.cpp"
-			>
+			RelativePath="..\..\engines\scumm\nut_renderer.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\nut_renderer.h"
-			>
+			RelativePath="..\..\engines\scumm\nut_renderer.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\object.cpp"
-			>
+			RelativePath="..\..\engines\scumm\object.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\object.h"
-			>
+			RelativePath="..\..\engines\scumm\object.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\palette.cpp"
-			>
+			RelativePath="..\..\engines\scumm\palette.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\player_mod.cpp"
-			>
+			RelativePath="..\..\engines\scumm\player_mod.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\player_mod.h"
-			>
+			RelativePath="..\..\engines\scumm\player_mod.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\player_nes.cpp"
-			>
+			RelativePath="..\..\engines\scumm\player_nes.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\player_nes.h"
-			>
+			RelativePath="..\..\engines\scumm\player_nes.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\player_v1.cpp"
-			>
+			RelativePath="..\..\engines\scumm\player_v1.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\player_v1.h"
-			>
+			RelativePath="..\..\engines\scumm\player_v1.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\player_v2.cpp"
-			>
+			RelativePath="..\..\engines\scumm\player_v2.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\player_v2.h"
-			>
+			RelativePath="..\..\engines\scumm\player_v2.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\player_v2a.cpp"
-			>
+			RelativePath="..\..\engines\scumm\player_v2a.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\player_v2a.h"
-			>
+			RelativePath="..\..\engines\scumm\player_v2a.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\player_v3a.cpp"
-			>
+			RelativePath="..\..\engines\scumm\player_v3a.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\player_v3a.h"
-			>
+			RelativePath="..\..\engines\scumm\player_v3a.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\resource.cpp"
-			>
+			RelativePath="..\..\engines\scumm\resource.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\resource.h"
-			>
+			RelativePath="..\..\engines\scumm\resource.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\resource_v2.cpp"
-			>
+			RelativePath="..\..\engines\scumm\resource_v2.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\resource_v3.cpp"
-			>
+			RelativePath="..\..\engines\scumm\resource_v3.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\resource_v4.cpp"
-			>
+			RelativePath="..\..\engines\scumm\resource_v4.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\room.cpp"
-			>
+			RelativePath="..\..\engines\scumm\room.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\saveload.cpp"
-			>
+			RelativePath="..\..\engines\scumm\saveload.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\saveload.h"
-			>
+			RelativePath="..\..\engines\scumm\saveload.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\script.cpp"
-			>
+			RelativePath="..\..\engines\scumm\script.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\script.h"
-			>
+			RelativePath="..\..\engines\scumm\script.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\script_v0.cpp"
-			>
+			RelativePath="..\..\engines\scumm\script_v0.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\script_v2.cpp"
-			>
+			RelativePath="..\..\engines\scumm\script_v2.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\script_v5.cpp"
-			>
+			RelativePath="..\..\engines\scumm\script_v5.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\script_v6.cpp"
-			>
+			RelativePath="..\..\engines\scumm\script_v6.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\script_v8.cpp"
-			>
+			RelativePath="..\..\engines\scumm\script_v8.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\scumm-md5.h"
-			>
+			RelativePath="..\..\engines\scumm\scumm-md5.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\scumm.cpp"
-			>
+			RelativePath="..\..\engines\scumm\scumm.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\scumm.h"
-			>
+			RelativePath="..\..\engines\scumm\scumm.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\sound.cpp"
-			>
+			RelativePath="..\..\engines\scumm\sound.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\sound.h"
-			>
+			RelativePath="..\..\engines\scumm\sound.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\string.cpp"
-			>
+			RelativePath="..\..\engines\scumm\string.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\usage_bits.cpp"
-			>
+			RelativePath="..\..\engines\scumm\usage_bits.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\usage_bits.h"
-			>
+			RelativePath="..\..\engines\scumm\usage_bits.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\util.cpp"
-			>
+			RelativePath="..\..\engines\scumm\util.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\util.h"
-			>
+			RelativePath="..\..\engines\scumm\util.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\vars.cpp"
-			>
+			RelativePath="..\..\engines\scumm\vars.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\verbs.cpp"
-			>
+			RelativePath="..\..\engines\scumm\verbs.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\verbs.h"
-			>
+			RelativePath="..\..\engines\scumm\verbs.h">
 		</File>
 	</Files>
 	<Globals>
diff --git a/dists/msvc7/scummvm.sln b/dists/msvc7/scummvm.sln
index 5002bea71c..7c3010df07 100644
--- a/dists/msvc7/scummvm.sln
+++ b/dists/msvc7/scummvm.sln
@@ -1,5 +1,4 @@
 Microsoft Visual Studio Solution File, Format Version 7.00
-# Visual Studio 2005
 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}
@@ -179,4 +178,8 @@ Global
 	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
index 2359f0ca26..9c0c24d0b5 100644
--- a/dists/msvc7/scummvm.vcproj
+++ b/dists/msvc7/scummvm.vcproj
@@ -4,40 +4,18 @@
 	Version="7,00"
 	Name="scummvm"
 	ProjectGUID="{8434CB15-D08F-427D-9E6D-581AE5B28440}"
-	#RootNamespace="scummvm"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
+	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
-			Name="Win32"
-		/>
+			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"
-			/>
+			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
@@ -59,17 +37,9 @@
 				WarnAsError="TRUE"
 				SuppressStartupBanner="FALSE"
 				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				DebugInformationFormat="4"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				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"
@@ -80,31 +50,19 @@
 				ProgramDatabaseFile="$(OutDir)/scummvm.pdb"
 				SubSystem="1"
 				EntryPointSymbol="WinMainCRTStartup"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
+				TargetMachine="1"/>
 			<Tool
-				Name="VCMIDLTool"
-			/>
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCAppVerifierTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
@@ -112,23 +70,7 @@
 			IntermediateDirectory="scummvm_Release"
 			ConfigurationType="1"
 			CharacterSet="2"
-			WholeProgramOptimization="TRUE"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
+			WholeProgramOptimization="TRUE">
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
@@ -151,17 +93,9 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
 				WarnAsError="TRUE"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				DebugInformationFormat="0"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				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"
@@ -174,1416 +108,1060 @@
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
 				EntryPointSymbol="WinMainCRTStartup"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
+				TargetMachine="1"/>
 			<Tool
-				Name="VCMIDLTool"
-			/>
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCAppVerifierTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	<References>
-	</References>
 	<Files>
 		<Filter
-			Name="base"
-			>
+			Name="base">
 			<File
-				RelativePath="..\..\base\commandLine.cpp"
-				>
+				RelativePath="..\..\base\commandLine.cpp">
 			</File>
 			<File
-				RelativePath="..\..\base\commandLine.h"
-				>
+				RelativePath="..\..\base\commandLine.h">
 			</File>
 			<File
-				RelativePath="..\..\base\internal_version.h"
-				>
+				RelativePath="..\..\base\internal_version.h">
 			</File>
 			<File
-				RelativePath="..\..\base\main.cpp"
-				>
+				RelativePath="..\..\base\main.cpp">
 			</File>
 			<File
-				RelativePath="..\..\base\main.h"
-				>
+				RelativePath="..\..\base\main.h">
 			</File>
 			<File
-				RelativePath="..\..\base\plugins.cpp"
-				>
+				RelativePath="..\..\base\plugins.cpp">
 			</File>
 			<File
-				RelativePath="..\..\base\plugins.h"
-				>
+				RelativePath="..\..\base\plugins.h">
 			</File>
 			<File
-				RelativePath="..\..\base\version.cpp"
-				>
+				RelativePath="..\..\base\version.cpp">
 			</File>
 			<File
-				RelativePath="..\..\base\version.h"
-				>
+				RelativePath="..\..\base\version.h">
 			</File>
 		</Filter>
 		<Filter
-			Name="common"
-			>
+			Name="common">
 			<File
-				RelativePath="..\..\common\algorithm.h"
-				>
+				RelativePath="..\..\common\algorithm.h">
 			</File>
 			<File
-				RelativePath="..\..\common\archive.cpp"
-				>
+				RelativePath="..\..\common\archive.cpp">
 			</File>
 			<File
-				RelativePath="..\..\common\archive.h"
-				>
+				RelativePath="..\..\common\archive.h">
 			</File>
 			<File
-				RelativePath="..\..\common\array.h"
-				>
+				RelativePath="..\..\common\array.h">
 			</File>
 			<File
-				RelativePath="..\..\common\config-file.cpp"
-				>
+				RelativePath="..\..\common\config-file.cpp">
 			</File>
 			<File
-				RelativePath="..\..\common\config-file.h"
-				>
+				RelativePath="..\..\common\config-file.h">
 			</File>
 			<File
-				RelativePath="..\..\common\config-manager.cpp"
-				>
+				RelativePath="..\..\common\config-manager.cpp">
 			</File>
 			<File
-				RelativePath="..\..\common\config-manager.h"
-				>
+				RelativePath="..\..\common\config-manager.h">
 			</File>
 			<File
-				RelativePath="..\..\common\debug.cpp"
-				>
+				RelativePath="..\..\common\debug.cpp">
 			</File>
 			<File
-				RelativePath="..\..\common\debug.h"
-				>
+				RelativePath="..\..\common\debug.h">
 			</File>
 			<File
-				RelativePath="..\..\common\endian.h"
-				>
+				RelativePath="..\..\common\endian.h">
 			</File>
 			<File
-				RelativePath="..\..\common\error.h"
-				>
+				RelativePath="..\..\common\error.h">
 			</File>
 			<File
-				RelativePath="..\..\common\events.h"
-				>
+				RelativePath="..\..\common\events.h">
 			</File>
 			<File
-				RelativePath="..\..\common\file.cpp"
-				>
+				RelativePath="..\..\common\file.cpp">
 			</File>
 			<File
-				RelativePath="..\..\common\file.h"
-				>
+				RelativePath="..\..\common\file.h">
 			</File>
 			<File
-				RelativePath="..\..\common\frac.h"
-				>
+				RelativePath="..\..\common\frac.h">
 			</File>
 			<File
-				RelativePath="..\..\common\fs.cpp"
-				>
+				RelativePath="..\..\common\fs.cpp">
 			</File>
 			<File
-				RelativePath="..\..\common\fs.h"
-				>
+				RelativePath="..\..\common\fs.h">
 			</File>
 			<File
-				RelativePath="..\..\common\func.h"
-				>
+				RelativePath="..\..\common\func.h">
 			</File>
 			<File
-				RelativePath="..\..\common\hash-str.h"
-				>
+				RelativePath="..\..\common\hash-str.h">
 			</File>
 			<File
-				RelativePath="..\..\common\hashmap.cpp"
-				>
+				RelativePath="..\..\common\hashmap.cpp">
 			</File>
 			<File
-				RelativePath="..\..\common\hashmap.h"
-				>
+				RelativePath="..\..\common\hashmap.h">
 			</File>
 			<File
-				RelativePath="..\..\common\iff_container.h"
-				>
+				RelativePath="..\..\common\iff_container.h">
 			</File>
 			<File
-				RelativePath="..\..\common\keyboard.h"
-				>
+				RelativePath="..\..\common\keyboard.h">
 			</File>
 			<File
-				RelativePath="..\..\common\list.h"
-				>
+				RelativePath="..\..\common\list.h">
 			</File>
 			<File
-				RelativePath="..\..\common\md5.cpp"
-				>
+				RelativePath="..\..\common\md5.cpp">
 			</File>
 			<File
-				RelativePath="..\..\common\md5.h"
-				>
+				RelativePath="..\..\common\md5.h">
 			</File>
 			<File
-				RelativePath="..\..\common\memorypool.cpp"
-				>
+				RelativePath="..\..\common\memorypool.cpp">
 			</File>
 			<File
-				RelativePath="..\..\common\memorypool.h"
-				>
+				RelativePath="..\..\common\memorypool.h">
 			</File>
 			<File
-				RelativePath="..\..\common\mutex.cpp"
-				>
+				RelativePath="..\..\common\mutex.cpp">
 			</File>
 			<File
-				RelativePath="..\..\common\mutex.h"
-				>
+				RelativePath="..\..\common\mutex.h">
 			</File>
 			<File
-				RelativePath="..\..\common\noncopyable.h"
-				>
+				RelativePath="..\..\common\noncopyable.h">
 			</File>
 			<File
-				RelativePath="..\..\common\pack-end.h"
-				>
+				RelativePath="..\..\common\pack-end.h">
 			</File>
 			<File
-				RelativePath="..\..\common\pack-start.h"
-				>
+				RelativePath="..\..\common\pack-start.h">
 			</File>
 			<File
-				RelativePath="..\..\common\ptr.h"
-				>
+				RelativePath="..\..\common\ptr.h">
 			</File>
 			<File
-				RelativePath="..\..\common\queue.h"
-				>
+				RelativePath="..\..\common\queue.h">
 			</File>
 			<File
-				RelativePath="..\..\common\rect.h"
-				>
+				RelativePath="..\..\common\rect.h">
 			</File>
 			<File
-				RelativePath="..\..\common\savefile.h"
-				>
+				RelativePath="..\..\common\savefile.h">
 			</File>
 			<File
-				RelativePath="..\..\common\scummsys.h"
-				>
+				RelativePath="..\..\common\scummsys.h">
 			</File>
 			<File
-				RelativePath="..\..\common\singleton.h"
-				>
+				RelativePath="..\..\common\singleton.h">
 			</File>
 			<File
-				RelativePath="..\..\common\stack.h"
-				>
+				RelativePath="..\..\common\stack.h">
 			</File>
 			<File
-				RelativePath="..\..\common\str.cpp"
-				>
+				RelativePath="..\..\common\str.cpp">
 			</File>
 			<File
-				RelativePath="..\..\common\str.h"
-				>
+				RelativePath="..\..\common\str.h">
 			</File>
 			<File
-				RelativePath="..\..\common\stream.cpp"
-				>
+				RelativePath="..\..\common\stream.cpp">
 			</File>
 			<File
-				RelativePath="..\..\common\stream.h"
-				>
+				RelativePath="..\..\common\stream.h">
 			</File>
 			<File
-				RelativePath="..\..\common\system.cpp"
-				>
+				RelativePath="..\..\common\system.cpp">
 			</File>
 			<File
-				RelativePath="..\..\common\system.h"
-				>
+				RelativePath="..\..\common\system.h">
 			</File>
 			<File
-				RelativePath="..\..\common\timer.h"
-				>
+				RelativePath="..\..\common\timer.h">
 			</File>
 			<File
-				RelativePath="..\..\common\unarj.cpp"
-				>
+				RelativePath="..\..\common\unarj.cpp">
 			</File>
 			<File
-				RelativePath="..\..\common\unarj.h"
-				>
+				RelativePath="..\..\common\unarj.h">
 			</File>
 			<File
-				RelativePath="..\..\common\unzip.cpp"
-				>
+				RelativePath="..\..\common\unzip.cpp">
 			</File>
 			<File
-				RelativePath="..\..\common\unzip.h"
-				>
+				RelativePath="..\..\common\unzip.h">
 			</File>
 			<File
-				RelativePath="..\..\common\util.cpp"
-				>
+				RelativePath="..\..\common\util.cpp">
 			</File>
 			<File
-				RelativePath="..\..\common\util.h"
-				>
+				RelativePath="..\..\common\util.h">
 			</File>
 			<File
-				RelativePath="..\..\common\xmlparser.cpp"
-				>
+				RelativePath="..\..\common\xmlparser.cpp">
 			</File>
 			<File
-				RelativePath="..\..\common\xmlparser.h"
-				>
+				RelativePath="..\..\common\xmlparser.h">
 			</File>
 			<File
-				RelativePath="..\..\common\zlib.cpp"
-				>
+				RelativePath="..\..\common\zlib.cpp">
 			</File>
 			<File
-				RelativePath="..\..\common\zlib.h"
-				>
+				RelativePath="..\..\common\zlib.h">
 			</File>
 		</Filter>
 		<Filter
-			Name="sound"
-			>
+			Name="sound">
 			<File
-				RelativePath="..\..\sound\adpcm.cpp"
-				>
+				RelativePath="..\..\sound\adpcm.cpp">
 			</File>
 			<File
-				RelativePath="..\..\sound\adpcm.h"
-				>
+				RelativePath="..\..\sound\adpcm.h">
 			</File>
 			<File
-				RelativePath="..\..\sound\aiff.cpp"
-				>
+				RelativePath="..\..\sound\aiff.cpp">
 			</File>
 			<File
-				RelativePath="..\..\sound\aiff.h"
-				>
+				RelativePath="..\..\sound\aiff.h">
 			</File>
 			<File
-				RelativePath="..\..\sound\audiocd.cpp"
-				>
+				RelativePath="..\..\sound\audiocd.cpp">
 			</File>
 			<File
-				RelativePath="..\..\sound\audiocd.h"
-				>
+				RelativePath="..\..\sound\audiocd.h">
 			</File>
 			<File
-				RelativePath="..\..\sound\audiostream.cpp"
-				>
+				RelativePath="..\..\sound\audiostream.cpp">
 			</File>
 			<File
-				RelativePath="..\..\sound\audiostream.h"
-				>
+				RelativePath="..\..\sound\audiostream.h">
 			</File>
 			<File
-				RelativePath="..\..\sound\flac.cpp"
-				>
+				RelativePath="..\..\sound\flac.cpp">
 			</File>
 			<File
-				RelativePath="..\..\sound\flac.h"
-				>
+				RelativePath="..\..\sound\flac.h">
 			</File>
 			<File
-				RelativePath="..\..\sound\fmopl.cpp"
-				>
+				RelativePath="..\..\sound\fmopl.cpp">
 			</File>
 			<File
-				RelativePath="..\..\sound\fmopl.h"
-				>
+				RelativePath="..\..\sound\fmopl.h">
 			</File>
 			<File
-				RelativePath="..\..\sound\iff.cpp"
-				>
+				RelativePath="..\..\sound\iff.cpp">
 				<FileConfiguration
-					Name="Debug|Win32"
-					>
+					Name="Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
 						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
+						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
-					>
+					Name="Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
 						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
+						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\sound\iff.h"
-				>
+				RelativePath="..\..\sound\iff.h">
 			</File>
 			<File
-				RelativePath="..\..\sound\mididrv.cpp"
-				>
+				RelativePath="..\..\sound\mididrv.cpp">
 			</File>
 			<File
-				RelativePath="..\..\sound\mididrv.h"
-				>
+				RelativePath="..\..\sound\mididrv.h">
 			</File>
 			<File
-				RelativePath="..\..\sound\midiparser.cpp"
-				>
+				RelativePath="..\..\sound\midiparser.cpp">
 			</File>
 			<File
-				RelativePath="..\..\sound\midiparser.h"
-				>
+				RelativePath="..\..\sound\midiparser.h">
 			</File>
 			<File
-				RelativePath="..\..\sound\midiparser_smf.cpp"
-				>
+				RelativePath="..\..\sound\midiparser_smf.cpp">
 			</File>
 			<File
-				RelativePath="..\..\sound\midiparser_xmidi.cpp"
-				>
+				RelativePath="..\..\sound\midiparser_xmidi.cpp">
 			</File>
 			<File
-				RelativePath="..\..\sound\mixer.cpp"
-				>
+				RelativePath="..\..\sound\mixer.cpp">
 			</File>
 			<File
-				RelativePath="..\..\sound\mixer.h"
-				>
+				RelativePath="..\..\sound\mixer.h">
 			</File>
 			<File
-				RelativePath="..\..\sound\mixer_intern.h"
-				>
+				RelativePath="..\..\sound\mixer_intern.h">
 			</File>
 			<File
-				RelativePath="..\..\sound\mp3.cpp"
-				>
+				RelativePath="..\..\sound\mp3.cpp">
 			</File>
 			<File
-				RelativePath="..\..\sound\mp3.h"
-				>
+				RelativePath="..\..\sound\mp3.h">
 			</File>
 			<File
-				RelativePath="..\..\sound\mpu401.cpp"
-				>
+				RelativePath="..\..\sound\mpu401.cpp">
 			</File>
 			<File
-				RelativePath="..\..\sound\mpu401.h"
-				>
+				RelativePath="..\..\sound\mpu401.h">
 			</File>
 			<File
-				RelativePath="..\..\sound\musicplugin.cpp"
-				>
+				RelativePath="..\..\sound\musicplugin.cpp">
 			</File>
 			<File
-				RelativePath="..\..\sound\musicplugin.h"
-				>
+				RelativePath="..\..\sound\musicplugin.h">
 			</File>
 			<File
-				RelativePath="..\..\sound\null.cpp"
-				>
+				RelativePath="..\..\sound\null.cpp">
 			</File>
 			<File
-				RelativePath="..\..\sound\rate.cpp"
-				>
+				RelativePath="..\..\sound\rate.cpp">
 			</File>
 			<File
-				RelativePath="..\..\sound\rate.h"
-				>
+				RelativePath="..\..\sound\rate.h">
 			</File>
 			<File
-				RelativePath="..\..\sound\shorten.cpp"
-				>
+				RelativePath="..\..\sound\shorten.cpp">
 			</File>
 			<File
-				RelativePath="..\..\sound\shorten.h"
-				>
+				RelativePath="..\..\sound\shorten.h">
 			</File>
 			<File
-				RelativePath="..\..\sound\voc.cpp"
-				>
+				RelativePath="..\..\sound\voc.cpp">
 			</File>
 			<File
-				RelativePath="..\..\sound\voc.h"
-				>
+				RelativePath="..\..\sound\voc.h">
 			</File>
 			<File
-				RelativePath="..\..\sound\vorbis.cpp"
-				>
+				RelativePath="..\..\sound\vorbis.cpp">
 			</File>
 			<File
-				RelativePath="..\..\sound\vorbis.h"
-				>
+				RelativePath="..\..\sound\vorbis.h">
 			</File>
 			<File
-				RelativePath="..\..\sound\wave.cpp"
-				>
+				RelativePath="..\..\sound\wave.cpp">
 			</File>
 			<File
-				RelativePath="..\..\sound\wave.h"
-				>
+				RelativePath="..\..\sound\wave.h">
 			</File>
 			<Filter
-				Name="softhsynth"
-				>
+				Name="softhsynth">
 				<File
-					RelativePath="..\..\sound\softsynth\adlib.cpp"
-					>
+					RelativePath="..\..\sound\softsynth\adlib.cpp">
 					<FileConfiguration
-						Name="Debug|Win32"
-						>
+						Name="Debug|Win32">
 						<Tool
 							Name="VCCLCompilerTool"
 							ObjectFile="$(IntDir)/$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc"
-						/>
+							XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
-						>
+						Name="Release|Win32">
 						<Tool
 							Name="VCCLCompilerTool"
 							ObjectFile="$(IntDir)/$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc"
-						/>
+							XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\sound\softsynth\emumidi.h"
-					>
+					RelativePath="..\..\sound\softsynth\emumidi.h">
 				</File>
 				<File
-					RelativePath="..\..\sound\softsynth\fluidsynth.cpp"
-					>
+					RelativePath="..\..\sound\softsynth\fluidsynth.cpp">
 				</File>
 				<File
-					RelativePath="..\..\sound\softsynth\mt32.cpp"
-					>
+					RelativePath="..\..\sound\softsynth\mt32.cpp">
 					<FileConfiguration
-						Name="Debug|Win32"
-						>
+						Name="Debug|Win32">
 						<Tool
 							Name="VCCLCompilerTool"
 							ObjectFile="$(IntDir)/$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc"
-						/>
+							XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
-						>
+						Name="Release|Win32">
 						<Tool
 							Name="VCCLCompilerTool"
 							ObjectFile="$(IntDir)/$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc"
-						/>
+							XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\sound\softsynth\pcspk.cpp"
-					>
+					RelativePath="..\..\sound\softsynth\pcspk.cpp">
 				</File>
 				<File
-					RelativePath="..\..\sound\softsynth\pcspk.h"
-					>
+					RelativePath="..\..\sound\softsynth\pcspk.h">
 				</File>
 				<File
-					RelativePath="..\..\sound\softsynth\ym2612.cpp"
-					>
+					RelativePath="..\..\sound\softsynth\ym2612.cpp">
 					<FileConfiguration
-						Name="Debug|Win32"
-						>
+						Name="Debug|Win32">
 						<Tool
 							Name="VCCLCompilerTool"
 							ObjectFile="$(IntDir)/$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc"
-						/>
+							XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
-						>
+						Name="Release|Win32">
 						<Tool
 							Name="VCCLCompilerTool"
 							ObjectFile="$(IntDir)/$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc"
-						/>
+							XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\sound\softsynth\ym2612.h"
-					>
+					RelativePath="..\..\sound\softsynth\ym2612.h">
 				</File>
 				<Filter
-					Name="mt32"
-					>
+					Name="mt32">
 					<File
-						RelativePath="..\..\sound\softsynth\mt32\freeverb.cpp"
-						>
+						RelativePath="..\..\sound\softsynth\mt32\freeverb.cpp">
 					</File>
 					<File
-						RelativePath="..\..\sound\softsynth\mt32\freeverb.h"
-						>
+						RelativePath="..\..\sound\softsynth\mt32\freeverb.h">
 					</File>
 					<File
-						RelativePath="..\..\sound\softsynth\mt32\i386.cpp"
-						>
+						RelativePath="..\..\sound\softsynth\mt32\i386.cpp">
 					</File>
 					<File
-						RelativePath="..\..\sound\softsynth\mt32\i386.h"
-						>
+						RelativePath="..\..\sound\softsynth\mt32\i386.h">
 					</File>
 					<File
-						RelativePath="..\..\sound\softsynth\mt32\mt32_file.cpp"
-						>
+						RelativePath="..\..\sound\softsynth\mt32\mt32_file.cpp">
 					</File>
 					<File
-						RelativePath="..\..\sound\softsynth\mt32\mt32_file.h"
-						>
+						RelativePath="..\..\sound\softsynth\mt32\mt32_file.h">
 					</File>
 					<File
-						RelativePath="..\..\sound\softsynth\mt32\mt32emu.h"
-						>
+						RelativePath="..\..\sound\softsynth\mt32\mt32emu.h">
 					</File>
 					<File
-						RelativePath="..\..\sound\softsynth\mt32\part.cpp"
-						>
+						RelativePath="..\..\sound\softsynth\mt32\part.cpp">
 					</File>
 					<File
-						RelativePath="..\..\sound\softsynth\mt32\part.h"
-						>
+						RelativePath="..\..\sound\softsynth\mt32\part.h">
 					</File>
 					<File
-						RelativePath="..\..\sound\softsynth\mt32\partial.cpp"
-						>
+						RelativePath="..\..\sound\softsynth\mt32\partial.cpp">
 					</File>
 					<File
-						RelativePath="..\..\sound\softsynth\mt32\partial.h"
-						>
+						RelativePath="..\..\sound\softsynth\mt32\partial.h">
 					</File>
 					<File
-						RelativePath="..\..\sound\softsynth\mt32\partialManager.cpp"
-						>
+						RelativePath="..\..\sound\softsynth\mt32\partialManager.cpp">
 					</File>
 					<File
-						RelativePath="..\..\sound\softsynth\mt32\partialManager.h"
-						>
+						RelativePath="..\..\sound\softsynth\mt32\partialManager.h">
 					</File>
 					<File
-						RelativePath="..\..\sound\softsynth\mt32\structures.h"
-						>
+						RelativePath="..\..\sound\softsynth\mt32\structures.h">
 					</File>
 					<File
-						RelativePath="..\..\sound\softsynth\mt32\synth.cpp"
-						>
+						RelativePath="..\..\sound\softsynth\mt32\synth.cpp">
 					</File>
 					<File
-						RelativePath="..\..\sound\softsynth\mt32\synth.h"
-						>
+						RelativePath="..\..\sound\softsynth\mt32\synth.h">
 					</File>
 					<File
-						RelativePath="..\..\sound\softsynth\mt32\tables.cpp"
-						>
+						RelativePath="..\..\sound\softsynth\mt32\tables.cpp">
 					</File>
 					<File
-						RelativePath="..\..\sound\softsynth\mt32\tables.h"
-						>
+						RelativePath="..\..\sound\softsynth\mt32\tables.h">
 					</File>
 				</Filter>
 			</Filter>
 			<Filter
-				Name="mods"
-				>
+				Name="mods">
 				<File
-					RelativePath="..\..\sound\mods\infogrames.cpp"
-					>
+					RelativePath="..\..\sound\mods\infogrames.cpp">
 				</File>
 				<File
-					RelativePath="..\..\sound\mods\infogrames.h"
-					>
+					RelativePath="..\..\sound\mods\infogrames.h">
 				</File>
 				<File
-					RelativePath="..\..\sound\mods\module.cpp"
-					>
+					RelativePath="..\..\sound\mods\module.cpp">
 				</File>
 				<File
-					RelativePath="..\..\sound\mods\module.h"
-					>
+					RelativePath="..\..\sound\mods\module.h">
 				</File>
 				<File
-					RelativePath="..\..\sound\mods\paula.cpp"
-					>
+					RelativePath="..\..\sound\mods\paula.cpp">
 				</File>
 				<File
-					RelativePath="..\..\sound\mods\paula.h"
-					>
+					RelativePath="..\..\sound\mods\paula.h">
 				</File>
 				<File
-					RelativePath="..\..\sound\mods\protracker.cpp"
-					>
+					RelativePath="..\..\sound\mods\protracker.cpp">
 				</File>
 				<File
-					RelativePath="..\..\sound\mods\protracker.h"
-					>
+					RelativePath="..\..\sound\mods\protracker.h">
 				</File>
 				<File
-					RelativePath="..\..\sound\mods\rjp1.cpp"
-					>
+					RelativePath="..\..\sound\mods\rjp1.cpp">
 				</File>
 				<File
-					RelativePath="..\..\sound\mods\rjp1.h"
-					>
+					RelativePath="..\..\sound\mods\rjp1.h">
 				</File>
 				<File
-					RelativePath="..\..\sound\mods\soundfx.cpp"
-					>
+					RelativePath="..\..\sound\mods\soundfx.cpp">
 				</File>
 				<File
-					RelativePath="..\..\sound\mods\soundfx.h"
-					>
+					RelativePath="..\..\sound\mods\soundfx.h">
 				</File>
 			</Filter>
 		</Filter>
 		<Filter
-			Name="txt"
-			>
+			Name="txt">
 			<File
-				RelativePath="..\..\COPYING"
-				>
+				RelativePath="..\..\COPYING">
 			</File>
 			<File
-				RelativePath="..\..\NEWS"
-				>
+				RelativePath="..\..\NEWS">
 			</File>
 			<File
-				RelativePath="..\..\README"
-				>
+				RelativePath="..\..\README">
 			</File>
 			<File
-				RelativePath="..\..\TODO"
-				>
+				RelativePath="..\..\TODO">
 			</File>
 		</Filter>
 		<Filter
 			Name="rsc"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-			>
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
 			<File
-				RelativePath="..\..\icons\scummvm.ico"
-				>
+				RelativePath="..\..\icons\scummvm.ico">
 			</File>
 			<File
-				RelativePath="..\..\dists\scummvm.rc"
-				>
+				RelativePath="..\..\dists\scummvm.rc">
 			</File>
 		</Filter>
 		<Filter
-			Name="backends"
-			>
+			Name="backends">
 			<File
-				RelativePath="..\..\backends\base-backend.cpp"
-				>
+				RelativePath="..\..\backends\base-backend.cpp">
 			</File>
 			<File
-				RelativePath="..\..\backends\base-backend.h"
-				>
+				RelativePath="..\..\backends\base-backend.h">
 			</File>
 			<Filter
-				Name="sdl"
-				>
+				Name="sdl">
 				<File
-					RelativePath="..\..\backends\platform\sdl\events.cpp"
-					>
+					RelativePath="..\..\backends\platform\sdl\events.cpp">
 				</File>
 				<File
-					RelativePath="..\..\backends\platform\sdl\graphics.cpp"
-					>
+					RelativePath="..\..\backends\platform\sdl\graphics.cpp">
 				</File>
 				<File
-					RelativePath="..\..\backends\platform\sdl\main.cpp"
-					>
+					RelativePath="..\..\backends\platform\sdl\main.cpp">
 					<FileConfiguration
-						Name="Debug|Win32"
-						>
+						Name="Debug|Win32">
 						<Tool
 							Name="VCCLCompilerTool"
 							ObjectFile="$(IntDir)\$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-						/>
+							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
-						>
+						Name="Release|Win32">
 						<Tool
 							Name="VCCLCompilerTool"
 							ObjectFile="$(IntDir)\$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-						/>
+							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\backends\platform\sdl\sdl.cpp"
-					>
+					RelativePath="..\..\backends\platform\sdl\sdl.cpp">
 				</File>
 				<File
-					RelativePath="..\..\backends\platform\sdl\sdl.h"
-					>
+					RelativePath="..\..\backends\platform\sdl\sdl.h">
 				</File>
 			</Filter>
 			<Filter
-				Name="fs"
-				>
+				Name="fs">
 				<File
-					RelativePath="..\..\backends\fs\abstract-fs.cpp"
-					>
+					RelativePath="..\..\backends\fs\abstract-fs.cpp">
 				</File>
 				<File
-					RelativePath="..\..\backends\fs\abstract-fs.h"
-					>
+					RelativePath="..\..\backends\fs\abstract-fs.h">
 				</File>
 				<File
-					RelativePath="..\..\backends\fs\fs-factory.h"
-					>
+					RelativePath="..\..\backends\fs\fs-factory.h">
 				</File>
 				<File
-					RelativePath="..\..\backends\fs\stdiostream.cpp"
-					>
+					RelativePath="..\..\backends\fs\stdiostream.cpp">
 				</File>
 				<File
-					RelativePath="..\..\backends\fs\stdiostream.h"
-					>
+					RelativePath="..\..\backends\fs\stdiostream.h">
 				</File>
 				<Filter
-					Name="windows"
-					>
+					Name="windows">
 					<File
-						RelativePath="..\..\backends\fs\windows\windows-fs-factory.cpp"
-						>
+						RelativePath="..\..\backends\fs\windows\windows-fs-factory.cpp">
 					</File>
 					<File
-						RelativePath="..\..\backends\fs\windows\windows-fs-factory.h"
-						>
+						RelativePath="..\..\backends\fs\windows\windows-fs-factory.h">
 					</File>
 				</Filter>
 			</Filter>
 			<Filter
-				Name="midi"
-				>
+				Name="midi">
 				<File
-					RelativePath="..\..\backends\midi\windows.cpp"
-					>
+					RelativePath="..\..\backends\midi\windows.cpp">
 				</File>
 			</Filter>
 			<Filter
-				Name="timer"
-				>
+				Name="timer">
 				<File
-					RelativePath="..\..\backends\timer\default\default-timer.cpp"
-					>
+					RelativePath="..\..\backends\timer\default\default-timer.cpp">
 				</File>
 				<File
-					RelativePath="..\..\backends\timer\default\default-timer.h"
-					>
+					RelativePath="..\..\backends\timer\default\default-timer.h">
 				</File>
 			</Filter>
 			<Filter
-				Name="saves"
-				>
+				Name="saves">
 				<File
-					RelativePath="..\..\backends\saves\default\default-saves.cpp"
-					>
+					RelativePath="..\..\backends\saves\default\default-saves.cpp">
 				</File>
 				<File
-					RelativePath="..\..\backends\saves\default\default-saves.h"
-					>
+					RelativePath="..\..\backends\saves\default\default-saves.h">
 				</File>
 				<File
-					RelativePath="..\..\backends\saves\savefile.cpp"
-					>
+					RelativePath="..\..\backends\saves\savefile.cpp">
 				</File>
 			</Filter>
 			<Filter
-				Name="events"
-				>
+				Name="events">
 				<Filter
-					Name="default"
-					>
+					Name="default">
 					<File
-						RelativePath="..\..\backends\events\default\default-events.cpp"
-						>
+						RelativePath="..\..\backends\events\default\default-events.cpp">
 					</File>
 					<File
-						RelativePath="..\..\backends\events\default\default-events.h"
-						>
+						RelativePath="..\..\backends\events\default\default-events.h">
 					</File>
 				</Filter>
 			</Filter>
 		</Filter>
 		<Filter
-			Name="gui"
-			>
+			Name="gui">
 			<File
-				RelativePath="..\..\gui\about.cpp"
-				>
+				RelativePath="..\..\gui\about.cpp">
 			</File>
 			<File
-				RelativePath="..\..\gui\about.h"
-				>
+				RelativePath="..\..\gui\about.h">
 			</File>
 			<File
-				RelativePath="..\..\gui\browser.cpp"
-				>
+				RelativePath="..\..\gui\browser.cpp">
 			</File>
 			<File
-				RelativePath="..\..\gui\browser.h"
-				>
+				RelativePath="..\..\gui\browser.h">
 			</File>
 			<File
-				RelativePath="..\..\gui\chooser.cpp"
-				>
+				RelativePath="..\..\gui\chooser.cpp">
 			</File>
 			<File
-				RelativePath="..\..\gui\chooser.h"
-				>
+				RelativePath="..\..\gui\chooser.h">
 			</File>
 			<File
-				RelativePath="..\..\gui\console.cpp"
-				>
+				RelativePath="..\..\gui\console.cpp">
 			</File>
 			<File
-				RelativePath="..\..\gui\console.h"
-				>
+				RelativePath="..\..\gui\console.h">
 			</File>
 			<File
-				RelativePath="..\..\gui\credits.h"
-				>
+				RelativePath="..\..\gui\credits.h">
 			</File>
 			<File
-				RelativePath="..\..\gui\debugger.cpp"
-				>
+				RelativePath="..\..\gui\debugger.cpp">
 			</File>
 			<File
-				RelativePath="..\..\gui\debugger.h"
-				>
+				RelativePath="..\..\gui\debugger.h">
 			</File>
 			<File
-				RelativePath="..\..\gui\dialog.cpp"
-				>
+				RelativePath="..\..\gui\dialog.cpp">
 			</File>
 			<File
-				RelativePath="..\..\gui\dialog.h"
-				>
+				RelativePath="..\..\gui\dialog.h">
 			</File>
 			<File
-				RelativePath="..\..\gui\editable.cpp"
-				>
+				RelativePath="..\..\gui\editable.cpp">
 			</File>
 			<File
-				RelativePath="..\..\gui\editable.h"
-				>
+				RelativePath="..\..\gui\editable.h">
 			</File>
 			<File
-				RelativePath="..\..\gui\EditTextWidget.cpp"
-				>
+				RelativePath="..\..\gui\EditTextWidget.cpp">
 			</File>
 			<File
-				RelativePath="..\..\gui\EditTextWidget.h"
-				>
+				RelativePath="..\..\gui\EditTextWidget.h">
 			</File>
 			<File
-				RelativePath="..\..\gui\GuiManager.cpp"
-				>
+				RelativePath="..\..\gui\GuiManager.cpp">
 			</File>
 			<File
-				RelativePath="..\..\gui\GuiManager.h"
-				>
+				RelativePath="..\..\gui\GuiManager.h">
 			</File>
 			<File
-				RelativePath="..\..\gui\Key.cpp"
-				>
+				RelativePath="..\..\gui\Key.cpp">
 			</File>
 			<File
-				RelativePath="..\..\gui\Key.h"
-				>
+				RelativePath="..\..\gui\Key.h">
 			</File>
 			<File
-				RelativePath="..\..\gui\launcher.cpp"
-				>
+				RelativePath="..\..\gui\launcher.cpp">
 			</File>
 			<File
-				RelativePath="..\..\gui\launcher.h"
-				>
+				RelativePath="..\..\gui\launcher.h">
 			</File>
 			<File
-				RelativePath="..\..\gui\ListWidget.cpp"
-				>
+				RelativePath="..\..\gui\ListWidget.cpp">
 			</File>
 			<File
-				RelativePath="..\..\gui\ListWidget.h"
-				>
+				RelativePath="..\..\gui\ListWidget.h">
 			</File>
 			<File
-				RelativePath="..\..\gui\massadd.cpp"
-				>
+				RelativePath="..\..\gui\massadd.cpp">
 			</File>
 			<File
-				RelativePath="..\..\gui\massadd.h"
-				>
+				RelativePath="..\..\gui\massadd.h">
 			</File>
 			<File
-				RelativePath="..\..\gui\message.cpp"
-				>
+				RelativePath="..\..\gui\message.cpp">
 			</File>
 			<File
-				RelativePath="..\..\gui\message.h"
-				>
+				RelativePath="..\..\gui\message.h">
 			</File>
 			<File
-				RelativePath="..\..\gui\object.cpp"
-				>
+				RelativePath="..\..\gui\object.cpp">
 			</File>
 			<File
-				RelativePath="..\..\gui\object.h"
-				>
+				RelativePath="..\..\gui\object.h">
 			</File>
 			<File
-				RelativePath="..\..\gui\options.cpp"
-				>
+				RelativePath="..\..\gui\options.cpp">
 			</File>
 			<File
-				RelativePath="..\..\gui\options.h"
-				>
+				RelativePath="..\..\gui\options.h">
 			</File>
 			<File
-				RelativePath="..\..\gui\PopUpWidget.cpp"
-				>
+				RelativePath="..\..\gui\PopUpWidget.cpp">
 			</File>
 			<File
-				RelativePath="..\..\gui\PopUpWidget.h"
-				>
+				RelativePath="..\..\gui\PopUpWidget.h">
 			</File>
 			<File
-				RelativePath="..\..\gui\saveload.cpp"
-				>
+				RelativePath="..\..\gui\saveload.cpp">
 			</File>
 			<File
-				RelativePath="..\..\gui\saveload.h"
-				>
+				RelativePath="..\..\gui\saveload.h">
 			</File>
 			<File
-				RelativePath="..\..\gui\ScrollBarWidget.cpp"
-				>
+				RelativePath="..\..\gui\ScrollBarWidget.cpp">
 			</File>
 			<File
-				RelativePath="..\..\gui\ScrollBarWidget.h"
-				>
+				RelativePath="..\..\gui\ScrollBarWidget.h">
 			</File>
 			<File
-				RelativePath="..\..\gui\TabWidget.cpp"
-				>
+				RelativePath="..\..\gui\TabWidget.cpp">
 			</File>
 			<File
-				RelativePath="..\..\gui\TabWidget.h"
-				>
+				RelativePath="..\..\gui\TabWidget.h">
 			</File>
 			<File
-				RelativePath="..\..\gui\themebrowser.cpp"
-				>
+				RelativePath="..\..\gui\themebrowser.cpp">
 			</File>
 			<File
-				RelativePath="..\..\gui\themebrowser.h"
-				>
+				RelativePath="..\..\gui\themebrowser.h">
 			</File>
 			<File
-				RelativePath="..\..\gui\ThemeEngine.cpp"
-				>
+				RelativePath="..\..\gui\ThemeEngine.cpp">
 			</File>
 			<File
-				RelativePath="..\..\gui\ThemeEngine.h"
-				>
+				RelativePath="..\..\gui\ThemeEngine.h">
 			</File>
 			<File
-				RelativePath="..\..\gui\ThemeEval.cpp"
-				>
+				RelativePath="..\..\gui\ThemeEval.cpp">
 			</File>
 			<File
-				RelativePath="..\..\gui\ThemeLayout.cpp"
-				>
+				RelativePath="..\..\gui\ThemeLayout.cpp">
 			</File>
 			<File
-				RelativePath="..\..\gui\ThemeLayout.h"
-				>
+				RelativePath="..\..\gui\ThemeLayout.h">
 			</File>
 			<File
-				RelativePath="..\..\gui\ThemeParser.cpp"
-				>
+				RelativePath="..\..\gui\ThemeParser.cpp">
 			</File>
 			<File
-				RelativePath="..\..\gui\ThemeParser.h"
-				>
+				RelativePath="..\..\gui\ThemeParser.h">
 				<FileConfiguration
-					Name="Debug|Win32"
-					>
+					Name="Debug|Win32">
 					<Tool
-						Name="VCCustomBuildTool"
-					/>
+						Name="VCCustomBuildTool"/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\gui\widget.cpp"
-				>
+				RelativePath="..\..\gui\widget.cpp">
 			</File>
 			<File
-				RelativePath="..\..\gui\widget.h"
-				>
+				RelativePath="..\..\gui\widget.h">
 			</File>
 		</Filter>
 		<Filter
-			Name="graphics"
-			>
+			Name="graphics">
 			<File
-				RelativePath="..\..\graphics\colormasks.h"
-				>
+				RelativePath="..\..\graphics\colormasks.h">
 			</File>
 			<File
-				RelativePath="..\..\graphics\cursorman.cpp"
-				>
+				RelativePath="..\..\graphics\cursorman.cpp">
 			</File>
 			<File
-				RelativePath="..\..\graphics\cursorman.h"
-				>
+				RelativePath="..\..\graphics\cursorman.h">
 			</File>
 			<File
-				RelativePath="..\..\graphics\dither.cpp"
-				>
+				RelativePath="..\..\graphics\dither.cpp">
 			</File>
 			<File
-				RelativePath="..\..\graphics\dither.h"
-				>
+				RelativePath="..\..\graphics\dither.h">
 			</File>
 			<File
-				RelativePath="..\..\graphics\font.cpp"
-				>
+				RelativePath="..\..\graphics\font.cpp">
 			</File>
 			<File
-				RelativePath="..\..\graphics\font.h"
-				>
+				RelativePath="..\..\graphics\font.h">
 			</File>
 			<File
-				RelativePath="..\..\graphics\fontman.cpp"
-				>
+				RelativePath="..\..\graphics\fontman.cpp">
 			</File>
 			<File
-				RelativePath="..\..\graphics\fontman.h"
-				>
+				RelativePath="..\..\graphics\fontman.h">
 			</File>
 			<File
-				RelativePath="..\..\graphics\iff.cpp"
-				>
+				RelativePath="..\..\graphics\iff.cpp">
 			</File>
 			<File
-				RelativePath="..\..\graphics\iff.h"
-				>
+				RelativePath="..\..\graphics\iff.h">
 			</File>
 			<File
-				RelativePath="..\..\graphics\imagedec.cpp"
-				>
+				RelativePath="..\..\graphics\imagedec.cpp">
 			</File>
 			<File
-				RelativePath="..\..\graphics\imagedec.h"
-				>
+				RelativePath="..\..\graphics\imagedec.h">
 			</File>
 			<File
-				RelativePath="..\..\graphics\primitives.cpp"
-				>
+				RelativePath="..\..\graphics\primitives.cpp">
 			</File>
 			<File
-				RelativePath="..\..\graphics\primitives.h"
-				>
+				RelativePath="..\..\graphics\primitives.h">
 			</File>
 			<File
-				RelativePath="..\..\graphics\scaler.cpp"
-				>
+				RelativePath="..\..\graphics\scaler.cpp">
 			</File>
 			<File
-				RelativePath="..\..\graphics\scaler.h"
-				>
+				RelativePath="..\..\graphics\scaler.h">
 			</File>
 			<File
-				RelativePath="..\..\graphics\surface.cpp"
-				>
+				RelativePath="..\..\graphics\surface.cpp">
 			</File>
 			<File
-				RelativePath="..\..\graphics\surface.h"
-				>
+				RelativePath="..\..\graphics\surface.h">
 			</File>
 			<File
-				RelativePath="..\..\graphics\thumbnail.cpp"
-				>
+				RelativePath="..\..\graphics\thumbnail.cpp">
 			</File>
 			<File
-				RelativePath="..\..\graphics\thumbnail.h"
-				>
+				RelativePath="..\..\graphics\thumbnail.h">
 			</File>
 			<File
-				RelativePath="..\..\graphics\VectorRenderer.cpp"
-				>
+				RelativePath="..\..\graphics\VectorRenderer.cpp">
 			</File>
 			<File
-				RelativePath="..\..\graphics\VectorRenderer.h"
-				>
+				RelativePath="..\..\graphics\VectorRenderer.h">
 			</File>
 			<File
-				RelativePath="..\..\graphics\VectorRendererSpec.cpp"
-				>
+				RelativePath="..\..\graphics\VectorRendererSpec.cpp">
 			</File>
 			<File
-				RelativePath="..\..\graphics\VectorRendererSpec.h"
-				>
+				RelativePath="..\..\graphics\VectorRendererSpec.h">
 			</File>
 			<Filter
-				Name="scaler"
-				>
+				Name="scaler">
 				<File
-					RelativePath="..\..\graphics\scaler\2xsai.cpp"
-					>
+					RelativePath="..\..\graphics\scaler\2xsai.cpp">
 				</File>
 				<File
-					RelativePath="..\..\graphics\scaler\aspect.cpp"
-					>
+					RelativePath="..\..\graphics\scaler\aspect.cpp">
 				</File>
 				<File
-					RelativePath="..\..\graphics\scaler\hq2x.cpp"
-					>
+					RelativePath="..\..\graphics\scaler\hq2x.cpp">
 				</File>
 				<File
-					RelativePath="..\..\graphics\scaler\hq2x.h"
-					>
+					RelativePath="..\..\graphics\scaler\hq2x.h">
 				</File>
 				<File
-					RelativePath="..\..\graphics\scaler\hq2x_i386.asm"
-					>
+					RelativePath="..\..\graphics\scaler\hq2x_i386.asm">
 					<FileConfiguration
-						Name="Debug|Win32"
-						>
+						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"
-						/>
+							Outputs="$(OutDir)\$(InputName).obj"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
-						>
+						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"
-						/>
+							Outputs="$(OutDir)\$(InputName).obj"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\graphics\scaler\hq3x.cpp"
-					>
+					RelativePath="..\..\graphics\scaler\hq3x.cpp">
 				</File>
 				<File
-					RelativePath="..\..\graphics\scaler\hq3x.h"
-					>
+					RelativePath="..\..\graphics\scaler\hq3x.h">
 				</File>
 				<File
-					RelativePath="..\..\graphics\scaler\hq3x_i386.asm"
-					>
+					RelativePath="..\..\graphics\scaler\hq3x_i386.asm">
 					<FileConfiguration
-						Name="Debug|Win32"
-						>
+						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"
-						/>
+							Outputs="$(OutDir)\$(InputName).obj"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
-						>
+						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"
-						/>
+							Outputs="$(OutDir)\$(InputName).obj"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\graphics\scaler\intern.h"
-					>
+					RelativePath="..\..\graphics\scaler\intern.h">
 				</File>
 				<File
-					RelativePath="..\..\graphics\scaler\scale2x.cpp"
-					>
+					RelativePath="..\..\graphics\scaler\scale2x.cpp">
 				</File>
 				<File
-					RelativePath="..\..\graphics\scaler\scale2x.h"
-					>
+					RelativePath="..\..\graphics\scaler\scale2x.h">
 				</File>
 				<File
-					RelativePath="..\..\graphics\scaler\scale3x.cpp"
-					>
+					RelativePath="..\..\graphics\scaler\scale3x.cpp">
 				</File>
 				<File
-					RelativePath="..\..\graphics\scaler\scale3x.h"
-					>
+					RelativePath="..\..\graphics\scaler\scale3x.h">
 				</File>
 				<File
-					RelativePath="..\..\graphics\scaler\scalebit.cpp"
-					>
+					RelativePath="..\..\graphics\scaler\scalebit.cpp">
 				</File>
 				<File
-					RelativePath="..\..\graphics\scaler\scalebit.h"
-					>
+					RelativePath="..\..\graphics\scaler\scalebit.h">
 				</File>
 				<File
-					RelativePath="..\..\graphics\scaler\thumbnail_intern.cpp"
-					>
+					RelativePath="..\..\graphics\scaler\thumbnail_intern.cpp">
 				</File>
 			</Filter>
 			<Filter
-				Name="fonts"
-				>
+				Name="fonts">
 				<File
-					RelativePath="..\..\graphics\fonts\consolefont.cpp"
-					>
+					RelativePath="..\..\graphics\fonts\consolefont.cpp">
 				</File>
 				<File
-					RelativePath="..\..\graphics\fonts\newfont.cpp"
-					>
+					RelativePath="..\..\graphics\fonts\newfont.cpp">
 				</File>
 				<File
-					RelativePath="..\..\graphics\fonts\newfont_big.cpp"
-					>
+					RelativePath="..\..\graphics\fonts\newfont_big.cpp">
 				</File>
 				<File
-					RelativePath="..\..\graphics\fonts\scummfont.cpp"
-					>
+					RelativePath="..\..\graphics\fonts\scummfont.cpp">
 				</File>
 			</Filter>
 			<Filter
-				Name="video"
-				>
+				Name="video">
 				<File
-					RelativePath="..\..\graphics\video\dxa_player.cpp"
-					>
+					RelativePath="..\..\graphics\video\dxa_player.cpp">
 				</File>
 				<File
-					RelativePath="..\..\graphics\video\dxa_player.h"
-					>
+					RelativePath="..\..\graphics\video\dxa_player.h">
 				</File>
 				<File
-					RelativePath="..\..\graphics\video\flic_player.cpp"
-					>
+					RelativePath="..\..\graphics\video\flic_player.cpp">
 				</File>
 				<File
-					RelativePath="..\..\graphics\video\flic_player.h"
-					>
+					RelativePath="..\..\graphics\video\flic_player.h">
 				</File>
 				<File
-					RelativePath="..\..\graphics\video\mpeg_player.cpp"
-					>
+					RelativePath="..\..\graphics\video\mpeg_player.cpp">
 				</File>
 				<File
-					RelativePath="..\..\graphics\video\mpeg_player.h"
-					>
+					RelativePath="..\..\graphics\video\mpeg_player.h">
 				</File>
 				<File
-					RelativePath="..\..\graphics\video\smk_player.cpp"
-					>
+					RelativePath="..\..\graphics\video\smk_player.cpp">
 				</File>
 				<File
-					RelativePath="..\..\graphics\video\smk_player.h"
-					>
+					RelativePath="..\..\graphics\video\smk_player.h">
 				</File>
 				<File
-					RelativePath="..\..\graphics\video\video_player.cpp"
-					>
+					RelativePath="..\..\graphics\video\video_player.cpp">
 				</File>
 				<File
-					RelativePath="..\..\graphics\video\video_player.h"
-					>
+					RelativePath="..\..\graphics\video\video_player.h">
 				</File>
 			</Filter>
 		</Filter>
 		<Filter
-			Name="engines"
-			>
+			Name="engines">
 			<File
-				RelativePath="..\..\engines\advancedDetector.cpp"
-				>
+				RelativePath="..\..\engines\advancedDetector.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\advancedDetector.h"
-				>
+				RelativePath="..\..\engines\advancedDetector.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\dialogs.cpp"
-				>
+				RelativePath="..\..\engines\dialogs.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\dialogs.h"
-				>
+				RelativePath="..\..\engines\dialogs.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\engine.cpp"
-				>
+				RelativePath="..\..\engines\engine.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\engine.h"
-				>
+				RelativePath="..\..\engines\engine.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\game.cpp"
-				>
+				RelativePath="..\..\engines\game.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\game.h"
-				>
+				RelativePath="..\..\engines\game.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\metaengine.h"
-				>
+				RelativePath="..\..\engines\metaengine.h">
 			</File>
 		</Filter>
 	</Files>
diff --git a/dists/msvc7/sky.vcproj b/dists/msvc7/sky.vcproj
index e427102720..4e3842c993 100644
--- a/dists/msvc7/sky.vcproj
+++ b/dists/msvc7/sky.vcproj
@@ -4,40 +4,18 @@
 	Version="7,00"
 	Name="sky"
 	ProjectGUID="{B5527758-2F51-4CCD-AAE1-B0E28654BD6A}"
-	#RootNamespace="sky"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
+	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
-			Name="Win32"
-		/>
+			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"
-			/>
+			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
@@ -58,36 +36,24 @@
 				WarnAsError="TRUE"
 				SuppressStartupBanner="FALSE"
 				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				DebugInformationFormat="4"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/sky.lib"
-			/>
+				OutputFile="$(OutDir)/sky.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
@@ -95,23 +61,7 @@
 			IntermediateDirectory="sky_Release"
 			ConfigurationType="4"
 			CharacterSet="2"
-			WholeProgramOptimization="TRUE"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
+			WholeProgramOptimization="TRUE">
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
@@ -132,220 +82,161 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
 				WarnAsError="TRUE"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				DebugInformationFormat="0"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/sky.lib"
-			/>
+				OutputFile="$(OutDir)/sky.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	<References>
-	</References>
 	<Files>
 		<Filter
-			Name="music"
-			>
+			Name="music">
 			<File
-				RelativePath="..\..\engines\sky\music\adlibchannel.cpp"
-				>
+				RelativePath="..\..\engines\sky\music\adlibchannel.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sky\music\adlibchannel.h"
-				>
+				RelativePath="..\..\engines\sky\music\adlibchannel.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sky\music\adlibmusic.cpp"
-				>
+				RelativePath="..\..\engines\sky\music\adlibmusic.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sky\music\adlibmusic.h"
-				>
+				RelativePath="..\..\engines\sky\music\adlibmusic.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sky\music\gmchannel.cpp"
-				>
+				RelativePath="..\..\engines\sky\music\gmchannel.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sky\music\gmchannel.h"
-				>
+				RelativePath="..\..\engines\sky\music\gmchannel.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sky\music\gmmusic.cpp"
-				>
+				RelativePath="..\..\engines\sky\music\gmmusic.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sky\music\gmmusic.h"
-				>
+				RelativePath="..\..\engines\sky\music\gmmusic.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sky\music\mt32music.cpp"
-				>
+				RelativePath="..\..\engines\sky\music\mt32music.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sky\music\mt32music.h"
-				>
+				RelativePath="..\..\engines\sky\music\mt32music.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sky\music\musicbase.cpp"
-				>
+				RelativePath="..\..\engines\sky\music\musicbase.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sky\music\musicbase.h"
-				>
+				RelativePath="..\..\engines\sky\music\musicbase.h">
 			</File>
 		</Filter>
 		<File
-			RelativePath="..\..\engines\sky\autoroute.cpp"
-			>
+			RelativePath="..\..\engines\sky\autoroute.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sky\autoroute.h"
-			>
+			RelativePath="..\..\engines\sky\autoroute.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\sky\compact.cpp"
-			>
+			RelativePath="..\..\engines\sky\compact.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sky\compact.h"
-			>
+			RelativePath="..\..\engines\sky\compact.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\sky\control.cpp"
-			>
+			RelativePath="..\..\engines\sky\control.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sky\control.h"
-			>
+			RelativePath="..\..\engines\sky\control.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\sky\debug.cpp"
-			>
+			RelativePath="..\..\engines\sky\debug.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sky\debug.h"
-			>
+			RelativePath="..\..\engines\sky\debug.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\sky\detection.cpp"
-			>
+			RelativePath="..\..\engines\sky\detection.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sky\disk.cpp"
-			>
+			RelativePath="..\..\engines\sky\disk.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sky\disk.h"
-			>
+			RelativePath="..\..\engines\sky\disk.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\sky\grid.cpp"
-			>
+			RelativePath="..\..\engines\sky\grid.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sky\grid.h"
-			>
+			RelativePath="..\..\engines\sky\grid.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\sky\hufftext.cpp"
-			>
+			RelativePath="..\..\engines\sky\hufftext.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sky\intro.cpp"
-			>
+			RelativePath="..\..\engines\sky\intro.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sky\intro.h"
-			>
+			RelativePath="..\..\engines\sky\intro.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\sky\logic.cpp"
-			>
+			RelativePath="..\..\engines\sky\logic.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sky\logic.h"
-			>
+			RelativePath="..\..\engines\sky\logic.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\sky\mouse.cpp"
-			>
+			RelativePath="..\..\engines\sky\mouse.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sky\mouse.h"
-			>
+			RelativePath="..\..\engines\sky\mouse.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\sky\rnc_deco.cpp"
-			>
+			RelativePath="..\..\engines\sky\rnc_deco.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sky\rnc_deco.h"
-			>
+			RelativePath="..\..\engines\sky\rnc_deco.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\sky\screen.cpp"
-			>
+			RelativePath="..\..\engines\sky\screen.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sky\screen.h"
-			>
+			RelativePath="..\..\engines\sky\screen.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\sky\sky.cpp"
-			>
+			RelativePath="..\..\engines\sky\sky.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sky\sky.h"
-			>
+			RelativePath="..\..\engines\sky\sky.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\sky\skydefs.h"
-			>
+			RelativePath="..\..\engines\sky\skydefs.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\sky\sound.cpp"
-			>
+			RelativePath="..\..\engines\sky\sound.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sky\sound.h"
-			>
+			RelativePath="..\..\engines\sky\sound.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\sky\struc.h"
-			>
+			RelativePath="..\..\engines\sky\struc.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\sky\text.cpp"
-			>
+			RelativePath="..\..\engines\sky\text.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sky\text.h"
-			>
+			RelativePath="..\..\engines\sky\text.h">
 		</File>
 	</Files>
 	<Globals>
diff --git a/dists/msvc7/sword1.vcproj b/dists/msvc7/sword1.vcproj
index e25b67b8b4..998f43a02b 100644
--- a/dists/msvc7/sword1.vcproj
+++ b/dists/msvc7/sword1.vcproj
@@ -4,40 +4,18 @@
 	Version="7,00"
 	Name="sword1"
 	ProjectGUID="{C8AAE83E-198B-4ECA-A877-166827953979}"
-	#RootNamespace="sword1"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
+	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
-			Name="Win32"
-		/>
+			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"
-			/>
+			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
@@ -58,36 +36,24 @@
 				WarnAsError="TRUE"
 				SuppressStartupBanner="FALSE"
 				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				DebugInformationFormat="4"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/sword1.lib"
-			/>
+				OutputFile="$(OutDir)/sword1.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
@@ -95,23 +61,7 @@
 			IntermediateDirectory="sword1_Release"
 			ConfigurationType="4"
 			CharacterSet="2"
-			WholeProgramOptimization="TRUE"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
+			WholeProgramOptimization="TRUE">
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
@@ -132,192 +82,140 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
 				WarnAsError="TRUE"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				DebugInformationFormat="0"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/sword1.lib"
-			/>
+				OutputFile="$(OutDir)/sword1.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	<References>
-	</References>
 	<Files>
 		<File
-			RelativePath="..\..\engines\sword1\animation.cpp"
-			>
+			RelativePath="..\..\engines\sword1\animation.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword1\animation.h"
-			>
+			RelativePath="..\..\engines\sword1\animation.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword1\collision.h"
-			>
+			RelativePath="..\..\engines\sword1\collision.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword1\control.cpp"
-			>
+			RelativePath="..\..\engines\sword1\control.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword1\control.h"
-			>
+			RelativePath="..\..\engines\sword1\control.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword1\debug.cpp"
-			>
+			RelativePath="..\..\engines\sword1\debug.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword1\debug.h"
-			>
+			RelativePath="..\..\engines\sword1\debug.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword1\detection.cpp"
-			>
+			RelativePath="..\..\engines\sword1\detection.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword1\eventman.cpp"
-			>
+			RelativePath="..\..\engines\sword1\eventman.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword1\eventman.h"
-			>
+			RelativePath="..\..\engines\sword1\eventman.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword1\logic.cpp"
-			>
+			RelativePath="..\..\engines\sword1\logic.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword1\logic.h"
-			>
+			RelativePath="..\..\engines\sword1\logic.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword1\memman.cpp"
-			>
+			RelativePath="..\..\engines\sword1\memman.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword1\memman.h"
-			>
+			RelativePath="..\..\engines\sword1\memman.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword1\menu.cpp"
-			>
+			RelativePath="..\..\engines\sword1\menu.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword1\menu.h"
-			>
+			RelativePath="..\..\engines\sword1\menu.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword1\mouse.cpp"
-			>
+			RelativePath="..\..\engines\sword1\mouse.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword1\mouse.h"
-			>
+			RelativePath="..\..\engines\sword1\mouse.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword1\music.cpp"
-			>
+			RelativePath="..\..\engines\sword1\music.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword1\music.h"
-			>
+			RelativePath="..\..\engines\sword1\music.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword1\object.h"
-			>
+			RelativePath="..\..\engines\sword1\object.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword1\objectman.cpp"
-			>
+			RelativePath="..\..\engines\sword1\objectman.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword1\objectman.h"
-			>
+			RelativePath="..\..\engines\sword1\objectman.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword1\resman.cpp"
-			>
+			RelativePath="..\..\engines\sword1\resman.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword1\resman.h"
-			>
+			RelativePath="..\..\engines\sword1\resman.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword1\router.cpp"
-			>
+			RelativePath="..\..\engines\sword1\router.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword1\router.h"
-			>
+			RelativePath="..\..\engines\sword1\router.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword1\screen.cpp"
-			>
+			RelativePath="..\..\engines\sword1\screen.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword1\screen.h"
-			>
+			RelativePath="..\..\engines\sword1\screen.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword1\sound.cpp"
-			>
+			RelativePath="..\..\engines\sword1\sound.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword1\sound.h"
-			>
+			RelativePath="..\..\engines\sword1\sound.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword1\staticres.cpp"
-			>
+			RelativePath="..\..\engines\sword1\staticres.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword1\sword1.cpp"
-			>
+			RelativePath="..\..\engines\sword1\sword1.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword1\sword1.h"
-			>
+			RelativePath="..\..\engines\sword1\sword1.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword1\sworddefs.h"
-			>
+			RelativePath="..\..\engines\sword1\sworddefs.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword1\swordres.h"
-			>
+			RelativePath="..\..\engines\sword1\swordres.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword1\text.cpp"
-			>
+			RelativePath="..\..\engines\sword1\text.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword1\text.h"
-			>
+			RelativePath="..\..\engines\sword1\text.h">
 		</File>
 	</Files>
 	<Globals>
diff --git a/dists/msvc7/sword2.vcproj b/dists/msvc7/sword2.vcproj
index 81d82bcf83..5da67dda34 100644
--- a/dists/msvc7/sword2.vcproj
+++ b/dists/msvc7/sword2.vcproj
@@ -4,40 +4,18 @@
 	Version="7,00"
 	Name="sword2"
 	ProjectGUID="{6CC3E421-779D-4E80-8100-520886A0F9FF}"
-	#RootNamespace="sword2"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
+	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
-			Name="Win32"
-		/>
+			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"
-			/>
+			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
@@ -58,36 +36,24 @@
 				WarnAsError="TRUE"
 				SuppressStartupBanner="FALSE"
 				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				DebugInformationFormat="4"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/sword2.lib"
-			/>
+				OutputFile="$(OutDir)/sword2.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
@@ -95,23 +61,7 @@
 			IntermediateDirectory="sword2_Release"
 			ConfigurationType="4"
 			CharacterSet="2"
-			WholeProgramOptimization="TRUE"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
+			WholeProgramOptimization="TRUE">
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
@@ -132,236 +82,173 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
 				WarnAsError="TRUE"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				DebugInformationFormat="0"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/sword2.lib"
-			/>
+				OutputFile="$(OutDir)/sword2.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	<References>
-	</References>
 	<Files>
 		<File
-			RelativePath="..\..\engines\sword2\animation.cpp"
-			>
+			RelativePath="..\..\engines\sword2\animation.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\animation.h"
-			>
+			RelativePath="..\..\engines\sword2\animation.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\anims.cpp"
-			>
+			RelativePath="..\..\engines\sword2\anims.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\console.cpp"
-			>
+			RelativePath="..\..\engines\sword2\console.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\console.h"
-			>
+			RelativePath="..\..\engines\sword2\console.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\controls.cpp"
-			>
+			RelativePath="..\..\engines\sword2\controls.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\controls.h"
-			>
+			RelativePath="..\..\engines\sword2\controls.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\debug.cpp"
-			>
+			RelativePath="..\..\engines\sword2\debug.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\debug.h"
-			>
+			RelativePath="..\..\engines\sword2\debug.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\defs.h"
-			>
+			RelativePath="..\..\engines\sword2\defs.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\events.cpp"
-			>
+			RelativePath="..\..\engines\sword2\events.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\function.cpp"
-			>
+			RelativePath="..\..\engines\sword2\function.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\header.h"
-			>
+			RelativePath="..\..\engines\sword2\header.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\icons.cpp"
-			>
+			RelativePath="..\..\engines\sword2\icons.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\interpreter.cpp"
-			>
+			RelativePath="..\..\engines\sword2\interpreter.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\interpreter.h"
-			>
+			RelativePath="..\..\engines\sword2\interpreter.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\layers.cpp"
-			>
+			RelativePath="..\..\engines\sword2\layers.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\logic.cpp"
-			>
+			RelativePath="..\..\engines\sword2\logic.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\logic.h"
-			>
+			RelativePath="..\..\engines\sword2\logic.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\maketext.cpp"
-			>
+			RelativePath="..\..\engines\sword2\maketext.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\maketext.h"
-			>
+			RelativePath="..\..\engines\sword2\maketext.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\memory.cpp"
-			>
+			RelativePath="..\..\engines\sword2\memory.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\memory.h"
-			>
+			RelativePath="..\..\engines\sword2\memory.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\menu.cpp"
-			>
+			RelativePath="..\..\engines\sword2\menu.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\mouse.cpp"
-			>
+			RelativePath="..\..\engines\sword2\mouse.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\mouse.h"
-			>
+			RelativePath="..\..\engines\sword2\mouse.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\music.cpp"
-			>
+			RelativePath="..\..\engines\sword2\music.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\object.h"
-			>
+			RelativePath="..\..\engines\sword2\object.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\palette.cpp"
-			>
+			RelativePath="..\..\engines\sword2\palette.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\protocol.cpp"
-			>
+			RelativePath="..\..\engines\sword2\protocol.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\render.cpp"
-			>
+			RelativePath="..\..\engines\sword2\render.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\resman.cpp"
-			>
+			RelativePath="..\..\engines\sword2\resman.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\resman.h"
-			>
+			RelativePath="..\..\engines\sword2\resman.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\router.cpp"
-			>
+			RelativePath="..\..\engines\sword2\router.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\router.h"
-			>
+			RelativePath="..\..\engines\sword2\router.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\saveload.cpp"
-			>
+			RelativePath="..\..\engines\sword2\saveload.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\saveload.h"
-			>
+			RelativePath="..\..\engines\sword2\saveload.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\screen.cpp"
-			>
+			RelativePath="..\..\engines\sword2\screen.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\screen.h"
-			>
+			RelativePath="..\..\engines\sword2\screen.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\scroll.cpp"
-			>
+			RelativePath="..\..\engines\sword2\scroll.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\sound.cpp"
-			>
+			RelativePath="..\..\engines\sword2\sound.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\sound.h"
-			>
+			RelativePath="..\..\engines\sword2\sound.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\speech.cpp"
-			>
+			RelativePath="..\..\engines\sword2\speech.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\sprite.cpp"
-			>
+			RelativePath="..\..\engines\sword2\sprite.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\startup.cpp"
-			>
+			RelativePath="..\..\engines\sword2\startup.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\sword2.cpp"
-			>
+			RelativePath="..\..\engines\sword2\sword2.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\sword2.h"
-			>
+			RelativePath="..\..\engines\sword2\sword2.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\sync.cpp"
-			>
+			RelativePath="..\..\engines\sword2\sync.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\walker.cpp"
-			>
+			RelativePath="..\..\engines\sword2\walker.cpp">
 		</File>
 	</Files>
 	<Globals>
diff --git a/dists/msvc7/tinsel.vcproj b/dists/msvc7/tinsel.vcproj
index fd7679d3df..33d3b9797b 100644
--- a/dists/msvc7/tinsel.vcproj
+++ b/dists/msvc7/tinsel.vcproj
@@ -164,8 +164,6 @@
 			/>
 		</Configuration>
 	</Configurations>
-	<References>
-	</References>
 	<Files>
 		<File
 			RelativePath="..\..\engines\tinsel\actors.cpp"
diff --git a/dists/msvc7/touche.vcproj b/dists/msvc7/touche.vcproj
index 4c64efdd94..52fc1d2d91 100644
--- a/dists/msvc7/touche.vcproj
+++ b/dists/msvc7/touche.vcproj
@@ -4,40 +4,18 @@
 	Version="7,00"
 	Name="touche"
 	ProjectGUID="{D4986356-D0BB-4981-924A-854157BDF11F}"
-	#RootNamespace="touche"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
+	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
-			Name="Win32"
-		/>
+			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"
-			/>
+			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
@@ -58,36 +36,24 @@
 				WarnAsError="TRUE"
 				SuppressStartupBanner="FALSE"
 				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				DebugInformationFormat="4"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/touche.lib"
-			/>
+				OutputFile="$(OutDir)/touche.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
@@ -95,23 +61,7 @@
 			IntermediateDirectory="touche_Release"
 			ConfigurationType="4"
 			CharacterSet="2"
-			WholeProgramOptimization="TRUE"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
+			WholeProgramOptimization="TRUE">
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
@@ -132,88 +82,62 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
 				WarnAsError="TRUE"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				DebugInformationFormat="0"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/touche.lib"
-			/>
+				OutputFile="$(OutDir)/touche.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	<References>
-	</References>
 	<Files>
 		<File
-			RelativePath="..\..\engines\touche\detection.cpp"
-			>
+			RelativePath="..\..\engines\touche\detection.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\touche\graphics.cpp"
-			>
+			RelativePath="..\..\engines\touche\graphics.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\touche\graphics.h"
-			>
+			RelativePath="..\..\engines\touche\graphics.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\touche\menu.cpp"
-			>
+			RelativePath="..\..\engines\touche\menu.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\touche\midi.cpp"
-			>
+			RelativePath="..\..\engines\touche\midi.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\touche\midi.h"
-			>
+			RelativePath="..\..\engines\touche\midi.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\touche\opcodes.cpp"
-			>
+			RelativePath="..\..\engines\touche\opcodes.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\touche\resource.cpp"
-			>
+			RelativePath="..\..\engines\touche\resource.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\touche\saveload.cpp"
-			>
+			RelativePath="..\..\engines\touche\saveload.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\touche\staticres.cpp"
-			>
+			RelativePath="..\..\engines\touche\staticres.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\touche\touche.cpp"
-			>
+			RelativePath="..\..\engines\touche\touche.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\touche\touche.h"
-			>
+			RelativePath="..\..\engines\touche\touche.h">
 		</File>
 	</Files>
 	<Globals>
diff --git a/dists/msvc7/tucker.vcproj b/dists/msvc7/tucker.vcproj
index c4bd3510b3..10084b59c2 100644
--- a/dists/msvc7/tucker.vcproj
+++ b/dists/msvc7/tucker.vcproj
@@ -4,40 +4,18 @@
 	Version="7,00"
 	Name="tucker"
 	ProjectGUID="{FF064FD0-AF6E-11DD-AD8B-0800200C9A66}"
-	#RootNamespace="tucker"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
+	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
-			Name="Win32"
-		/>
+			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"
-			/>
+			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
@@ -58,36 +36,24 @@
 				WarnAsError="TRUE"
 				SuppressStartupBanner="FALSE"
 				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				DebugInformationFormat="4"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/tucker.lib"
-			/>
+				OutputFile="$(OutDir)/tucker.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
@@ -95,23 +61,7 @@
 			IntermediateDirectory="tucker_Release"
 			ConfigurationType="4"
 			CharacterSet="2"
-			WholeProgramOptimization="TRUE"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
+			WholeProgramOptimization="TRUE">
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
@@ -132,80 +82,56 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
 				WarnAsError="TRUE"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				DebugInformationFormat="0"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/tucker.lib"
-			/>
+				OutputFile="$(OutDir)/tucker.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 		</Configuration>
 	</Configurations>
-	<References>
-	</References>
 	<Files>
 		<File
-			RelativePath="..\..\engines\tucker\detection.cpp"
-			>
+			RelativePath="..\..\engines\tucker\detection.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\tucker\graphics.cpp"
-			>
+			RelativePath="..\..\engines\tucker\graphics.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\tucker\graphics.h"
-			>
+			RelativePath="..\..\engines\tucker\graphics.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\tucker\locations.cpp"
-			>
+			RelativePath="..\..\engines\tucker\locations.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\tucker\resource.cpp"
-			>
+			RelativePath="..\..\engines\tucker\resource.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\tucker\saveload.cpp"
-			>
+			RelativePath="..\..\engines\tucker\saveload.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\tucker\sequences.cpp"
-			>
+			RelativePath="..\..\engines\tucker\sequences.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\tucker\staticres.cpp"
-			>
+			RelativePath="..\..\engines\tucker\staticres.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\tucker\tucker.cpp"
-			>
+			RelativePath="..\..\engines\tucker\tucker.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\tucker\tucker.h"
-			>
+			RelativePath="..\..\engines\tucker\tucker.h">
 		</File>
 	</Files>
 	<Globals>