diff --git a/build/win32/Cxbe_vc10.vcxproj b/build/win32/Cxbe.vcxproj
similarity index 97%
rename from build/win32/Cxbe_vc10.vcxproj
rename to build/win32/Cxbe.vcxproj
index c02972968..f20b52399 100644
--- a/build/win32/Cxbe_vc10.vcxproj
+++ b/build/win32/Cxbe.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -13,17 +13,20 @@
   <PropertyGroup Label="Globals">
     <ProjectName>Cxbe</ProjectName>
     <ProjectGuid>{028D5D8F-072C-4308-9095-4EF1EA6B83B0}</ProjectGuid>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/build/win32/Cxbe_vc10.vcproj b/build/win32/Cxbe_vc10.vcproj
deleted file mode 100644
index d7e674c5b..000000000
--- a/build/win32/Cxbe_vc10.vcproj
+++ /dev/null
@@ -1,347 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="Cxbe"
-	ProjectGUID="{028D5D8F-072C-4308-9095-4EF1EA6B83B0}"
-	TargetFrameworkVersion="0"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\..\..\bin\release"
-			IntermediateDirectory=".\..\..\bin\release"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\..\..\bin\release/Cxbe.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\src,..\..\src\Common\Win32,..\..\src\Win32"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\..\..\bin\release/Cxbe.pch"
-				AssemblerListingLocation=".\..\..\bin\release/"
-				ObjectFile=".\..\..\bin\release/"
-				ProgramDataBaseFileName=".\..\..\bin\release/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile=".\..\..\bin\release/Cxbe.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ProgramDatabaseFile=".\..\..\bin\release/Cxbe.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\..\..\bin\release/Cxbe.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\..\bin\debug"
-			IntermediateDirectory=".\..\..\bin\debug"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\..\..\bin\debug/Cxbe.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\src,..\..\src\Common\Win32"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile=".\..\..\bin\debug/Cxbe.pch"
-				AssemblerListingLocation=".\..\..\bin\debug/"
-				ObjectFile=".\..\..\bin\debug/"
-				ProgramDataBaseFileName=".\..\..\bin\debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile=".\..\..\bin\debug/Cxbe.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\..\..\bin\debug/Cxbe.pdb"
-				GenerateMapFile="true"
-				MapFileName=".\..\..\bin\debug/Cxbe.map"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\..\..\bin\debug/Cxbe.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Include"
-			>
-			<File
-				RelativePath="..\..\src\Common\Win32\AlignPosfix1.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Win32\AlignPrefix1.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Cxbx.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Error.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Exe.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Xbe.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Source"
-			>
-			<File
-				RelativePath="..\..\src\Common\Error.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Exe.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\Cxbe\Main.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\OpenXDK.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Xbe.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/build/win32/Cxbe_vc9.vcproj b/build/win32/Cxbe_vc9.vcproj
deleted file mode 100644
index d7e674c5b..000000000
--- a/build/win32/Cxbe_vc9.vcproj
+++ /dev/null
@@ -1,347 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="Cxbe"
-	ProjectGUID="{028D5D8F-072C-4308-9095-4EF1EA6B83B0}"
-	TargetFrameworkVersion="0"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\..\..\bin\release"
-			IntermediateDirectory=".\..\..\bin\release"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\..\..\bin\release/Cxbe.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\src,..\..\src\Common\Win32,..\..\src\Win32"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\..\..\bin\release/Cxbe.pch"
-				AssemblerListingLocation=".\..\..\bin\release/"
-				ObjectFile=".\..\..\bin\release/"
-				ProgramDataBaseFileName=".\..\..\bin\release/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile=".\..\..\bin\release/Cxbe.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ProgramDatabaseFile=".\..\..\bin\release/Cxbe.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\..\..\bin\release/Cxbe.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\..\bin\debug"
-			IntermediateDirectory=".\..\..\bin\debug"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\..\..\bin\debug/Cxbe.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\src,..\..\src\Common\Win32"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile=".\..\..\bin\debug/Cxbe.pch"
-				AssemblerListingLocation=".\..\..\bin\debug/"
-				ObjectFile=".\..\..\bin\debug/"
-				ProgramDataBaseFileName=".\..\..\bin\debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile=".\..\..\bin\debug/Cxbe.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\..\..\bin\debug/Cxbe.pdb"
-				GenerateMapFile="true"
-				MapFileName=".\..\..\bin\debug/Cxbe.map"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\..\..\bin\debug/Cxbe.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Include"
-			>
-			<File
-				RelativePath="..\..\src\Common\Win32\AlignPosfix1.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Win32\AlignPrefix1.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Cxbx.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Error.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Exe.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Xbe.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Source"
-			>
-			<File
-				RelativePath="..\..\src\Common\Error.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Exe.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\Cxbe\Main.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\OpenXDK.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Xbe.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/build/win32/Cxbx_vc10.sln b/build/win32/Cxbx.sln
similarity index 91%
rename from build/win32/Cxbx_vc10.sln
rename to build/win32/Cxbx.sln
index 767eefcbc..3582acace 100644
--- a/build/win32/Cxbx_vc10.sln
+++ b/build/win32/Cxbx.sln
@@ -1,18 +1,18 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cxbe", "Cxbe_vc10.vcxproj", "{028D5D8F-072C-4308-9095-4EF1EA6B83B0}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cxbe", "Cxbe.vcxproj", "{028D5D8F-072C-4308-9095-4EF1EA6B83B0}"
 	ProjectSection(ProjectDependencies) = postProject
 		{22592F16-CC5F-45CB-A40A-022FF6FCC146} = {22592F16-CC5F-45CB-A40A-022FF6FCC146}
 		{E7A72D3D-5810-4078-A243-348B59726365} = {E7A72D3D-5810-4078-A243-348B59726365}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cxbx", "Cxbx_vc10.vcxproj", "{E7A72D3D-5810-4078-A243-348B59726365}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cxbx", "Cxbx.vcxproj", "{E7A72D3D-5810-4078-A243-348B59726365}"
 	ProjectSection(ProjectDependencies) = postProject
 		{22592F16-CC5F-45CB-A40A-022FF6FCC146} = {22592F16-CC5F-45CB-A40A-022FF6FCC146}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CxbxKrnl", "CxbxKrnl_vc10.vcxproj", "{22592F16-CC5F-45CB-A40A-022FF6FCC146}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CxbxKrnl", "CxbxKrnl.vcxproj", "{22592F16-CC5F-45CB-A40A-022FF6FCC146}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/build/win32/Cxbx_vc10.vcxproj b/build/win32/Cxbx.vcxproj
similarity index 98%
rename from build/win32/Cxbx_vc10.vcxproj
rename to build/win32/Cxbx.vcxproj
index 74462a833..b5277b65c 100644
--- a/build/win32/Cxbx_vc10.vcxproj
+++ b/build/win32/Cxbx.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -13,17 +13,20 @@
   <PropertyGroup Label="Globals">
     <ProjectName>Cxbx</ProjectName>
     <ProjectGuid>{E7A72D3D-5810-4078-A243-348B59726365}</ProjectGuid>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -91,6 +94,7 @@
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -134,6 +138,7 @@
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
diff --git a/build/win32/CxbxKrnl_vc10.vcxproj b/build/win32/CxbxKrnl.vcxproj
similarity index 99%
rename from build/win32/CxbxKrnl_vc10.vcxproj
rename to build/win32/CxbxKrnl.vcxproj
index a9f061e5b..db0f4ee00 100644
--- a/build/win32/CxbxKrnl_vc10.vcxproj
+++ b/build/win32/CxbxKrnl.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -13,17 +13,20 @@
   <PropertyGroup Label="Globals">
     <ProjectName>CxbxKrnl</ProjectName>
     <ProjectGuid>{22592F16-CC5F-45CB-A40A-022FF6FCC146}</ProjectGuid>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -86,6 +89,7 @@
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -128,6 +132,7 @@
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
diff --git a/build/win32/CxbxKrnl_vc10.vcproj b/build/win32/CxbxKrnl_vc10.vcproj
deleted file mode 100644
index 8ae641f2f..000000000
--- a/build/win32/CxbxKrnl_vc10.vcproj
+++ /dev/null
@@ -1,1979 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="CxbxKrnl"
-	ProjectGUID="{22592F16-CC5F-45CB-A40A-022FF6FCC146}"
-	TargetFrameworkVersion="0"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\..\..\bin\release"
-			IntermediateDirectory=".\..\..\bin\release"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\..\..\bin\release/CxbxKrnl.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\import\OpenXDK,..\..\src,..\..\src\Common,..\..\src\Common\Win32,..\..\import\OpenXDK\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;CXBXKRNL_EXPORTS;_CRT_SECURE_NO_WARNINGS"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\..\..\bin\release/CxbxKrnl.pch"
-				AssemblerListingLocation=".\..\..\bin\release/"
-				ObjectFile=".\..\..\bin\release/"
-				ProgramDataBaseFileName=".\..\..\bin\release/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-				AdditionalIncludeDirectories="Include\Win32\CxbxKrnl"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="dxerr8.lib xinput.lib ws2_32.lib dsound.lib winmm.lib ddraw.lib d3dx8.lib d3d8.lib dinput8.lib dxguid.lib odbc32.lib odbccp32.lib"
-				OutputFile="..\..\bin\release\Cxbx.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				IgnoreDefaultLibraryNames="libci.lib"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary=".\..\..\bin\release/Cxbx.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\..\..\bin\release/CxbxKrnl.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\..\bin\debug"
-			IntermediateDirectory=".\..\..\bin\debug"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\..\..\bin\debug/CxbxKrnl.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\src\Common,..\..\import\OpenXDK\include,..\..\src,..\..\src\Common\Win32"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;CXBXKRNL_EXPORTS;_CRT_SECURE_NO_WARNINGS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile=".\..\..\bin\debug/CxbxKrnl.pch"
-				AssemblerListingLocation=".\..\..\bin\debug/"
-				ObjectFile=".\..\..\bin\debug/"
-				ProgramDataBaseFileName=".\..\..\bin\debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-				AdditionalIncludeDirectories="Include\Win32\CxbxKrnl"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="dxerr8.lib xinput.lib ws2_32.lib dsound.lib winmm.lib ddraw.lib d3dx8.lib d3d8.lib dinput8.lib dxguid.lib odbc32.lib odbccp32.lib dbghelp.lib"
-				OutputFile=".\..\..\bin\debug/CxbxKrnl.dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				IgnoreDefaultLibraryNames="libci.lib"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\..\..\bin\debug/CxbxKrnl.pdb"
-				GenerateMapFile="true"
-				MapFileName=".\..\..\bin\debug/CxbxKrnl.map"
-				StackReserveSize="8000000"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary=".\..\..\bin\debug/CxbxKrnl.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\..\..\bin\debug/CxbxKrnl.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Include"
-			>
-			<File
-				RelativePath="..\..\src\Common\Win32\AlignPosfix1.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Win32\AlignPrefix1.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Cxbx.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\CxbxKrnl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\DbgConsole.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\Emu.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuAlloc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuD3D8.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuD3D8Types.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuDInput.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuDSound.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuFile.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuFS.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuLDT.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuNtDll.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuShared.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuXactEng.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuXapi.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuXG.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuXInput.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuXOnline.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuXTL.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Error.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Exe.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\HLEDataBase.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\HLEIntercept.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Win32\Mutex.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\OOVPA.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\ResourceTracker.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Win32\XBController.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Xbe.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Win32\XBVideo.h"
-				>
-			</File>
-			<Filter
-				Name="HLEDataBase (h)"
-				>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.3925.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.4034.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.4134.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.4361.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.4432.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.4627.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.5233.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.5558.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.5849.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\D3D8LTCG.1.0.5849.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.3936.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.4134.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.4361.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.4432.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.4627.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.5233.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.5849.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\XactEng.1.0.4627.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.3911.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.4034.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.4134.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.4361.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.4432.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.4627.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.5233.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.5558.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.5849.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.3911.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.4034.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.4361.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.4432.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.4627.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.5233.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.5558.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.5849.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\XNet.1.0.3911.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\XOnline.1.0.4361.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\XOnline.1.0.4627.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\XOnline.1.0.5233.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\XOnline.1.0.5849.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="EmuD3D8 (h)"
-				>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\EmuD3D8\Convert.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\EmuD3D8\PixelShader.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\EmuD3D8\PushBuffer.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\EmuD3D8\State.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\EmuD3D8\VertexBuffer.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\EmuD3D8\VertexShader.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="EmuXBAudio (h)"
-				>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\EmuXBAudio\uXboxAdpcmDecoder.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\EmuXBAudio\XboxAdpcm.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\EmuXBAudio\XSoundBank.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\EmuXBAudio\XWaveBank.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Resource"
-			>
-			<File
-				RelativePath="..\..\resource\Cxbx.ico"
-				>
-			</File>
-			<File
-				RelativePath="..\..\resource\CxbxDll.rc"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						PreprocessorDefinitions=""
-						AdditionalIncludeDirectories="\cxbx\git\cxbx-ds\resource"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						PreprocessorDefinitions=""
-						AdditionalIncludeDirectories="\cxbx\git\cxbx-ds\resource"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Source"
-			>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\CxbxKrnl.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\DbgConsole.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\Emu.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuAlloc.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuD3D8.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuDInput.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuDSound.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuFile.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuFS.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuKrnl.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuLDT.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuNtDll.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Win32\EmuShared.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuXactEng.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuXapi.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuXG.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuXInput.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuXOnline.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Error.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\HLEDataBase.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\HLEIntercept.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\KernelThunk.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Win32\Mutex.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\OpenXDK.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\ResourceTracker.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Win32\XBController.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Xbe.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Win32\XBVideo.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<Filter
-				Name="HLEDataBase (inl)"
-				>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.3925.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.4034.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.4134.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.4361.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.4432.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.4627.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.5233.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.5558.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.5849.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\D3D8LTCG.1.0.5849.inl"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.3936.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.4134.inl"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.4361.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.4432.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.4627.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.5233.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.5558.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.5849.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\XactEng.1.0.4627.inl"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.3911.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.4034.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.4134.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.4361.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.4432.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.4627.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.5233.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.5558.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.5849.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.3911.inl"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.4034.inl"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.4361.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.4432.inl"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.4627.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.5233.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.5558.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.5849.inl"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\XNet.1.0.3911.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\XOnline.1.0.4361.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\XOnline.1.0.4627.inl"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\XOnline.1.0.5233.inl"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\XOnline.1.0.5849.inl"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="EmuD3D8 (cpp)"
-				>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\EmuD3D8\Convert.cpp"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\EmuD3D8\PixelShader.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\EmuD3D8\PushBuffer.cpp"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\EmuD3D8\State.cpp"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\EmuD3D8\VertexBuffer.cpp"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\EmuD3D8\VertexShader.cpp"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-			</Filter>
-			<Filter
-				Name="EmuXBAudio (cpp)"
-				>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\EmuXBAudio\uXboxAdpcmDecoder.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\EmuXBAudio\XboxAdpcm.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\EmuXBAudio\XSoundBank.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\EmuXBAudio\XWaveBank.cpp"
-					>
-				</File>
-			</Filter>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/build/win32/CxbxKrnl_vc9.vcproj b/build/win32/CxbxKrnl_vc9.vcproj
deleted file mode 100644
index 8ae641f2f..000000000
--- a/build/win32/CxbxKrnl_vc9.vcproj
+++ /dev/null
@@ -1,1979 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="CxbxKrnl"
-	ProjectGUID="{22592F16-CC5F-45CB-A40A-022FF6FCC146}"
-	TargetFrameworkVersion="0"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\..\..\bin\release"
-			IntermediateDirectory=".\..\..\bin\release"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\..\..\bin\release/CxbxKrnl.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\import\OpenXDK,..\..\src,..\..\src\Common,..\..\src\Common\Win32,..\..\import\OpenXDK\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;CXBXKRNL_EXPORTS;_CRT_SECURE_NO_WARNINGS"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\..\..\bin\release/CxbxKrnl.pch"
-				AssemblerListingLocation=".\..\..\bin\release/"
-				ObjectFile=".\..\..\bin\release/"
-				ProgramDataBaseFileName=".\..\..\bin\release/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-				AdditionalIncludeDirectories="Include\Win32\CxbxKrnl"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="dxerr8.lib xinput.lib ws2_32.lib dsound.lib winmm.lib ddraw.lib d3dx8.lib d3d8.lib dinput8.lib dxguid.lib odbc32.lib odbccp32.lib"
-				OutputFile="..\..\bin\release\Cxbx.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				IgnoreDefaultLibraryNames="libci.lib"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary=".\..\..\bin\release/Cxbx.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\..\..\bin\release/CxbxKrnl.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\..\bin\debug"
-			IntermediateDirectory=".\..\..\bin\debug"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\..\..\bin\debug/CxbxKrnl.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\src\Common,..\..\import\OpenXDK\include,..\..\src,..\..\src\Common\Win32"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;CXBXKRNL_EXPORTS;_CRT_SECURE_NO_WARNINGS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile=".\..\..\bin\debug/CxbxKrnl.pch"
-				AssemblerListingLocation=".\..\..\bin\debug/"
-				ObjectFile=".\..\..\bin\debug/"
-				ProgramDataBaseFileName=".\..\..\bin\debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-				AdditionalIncludeDirectories="Include\Win32\CxbxKrnl"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="dxerr8.lib xinput.lib ws2_32.lib dsound.lib winmm.lib ddraw.lib d3dx8.lib d3d8.lib dinput8.lib dxguid.lib odbc32.lib odbccp32.lib dbghelp.lib"
-				OutputFile=".\..\..\bin\debug/CxbxKrnl.dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				IgnoreDefaultLibraryNames="libci.lib"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\..\..\bin\debug/CxbxKrnl.pdb"
-				GenerateMapFile="true"
-				MapFileName=".\..\..\bin\debug/CxbxKrnl.map"
-				StackReserveSize="8000000"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary=".\..\..\bin\debug/CxbxKrnl.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\..\..\bin\debug/CxbxKrnl.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Include"
-			>
-			<File
-				RelativePath="..\..\src\Common\Win32\AlignPosfix1.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Win32\AlignPrefix1.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Cxbx.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\CxbxKrnl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\DbgConsole.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\Emu.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuAlloc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuD3D8.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuD3D8Types.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuDInput.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuDSound.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuFile.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuFS.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuLDT.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuNtDll.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuShared.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuXactEng.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuXapi.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuXG.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuXInput.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuXOnline.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuXTL.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Error.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Exe.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\HLEDataBase.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\HLEIntercept.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Win32\Mutex.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\OOVPA.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\ResourceTracker.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Win32\XBController.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Xbe.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Win32\XBVideo.h"
-				>
-			</File>
-			<Filter
-				Name="HLEDataBase (h)"
-				>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.3925.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.4034.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.4134.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.4361.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.4432.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.4627.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.5233.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.5558.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.5849.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\D3D8LTCG.1.0.5849.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.3936.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.4134.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.4361.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.4432.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.4627.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.5233.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.5849.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\XactEng.1.0.4627.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.3911.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.4034.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.4134.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.4361.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.4432.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.4627.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.5233.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.5558.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.5849.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.3911.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.4034.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.4361.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.4432.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.4627.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.5233.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.5558.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.5849.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\XNet.1.0.3911.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\XOnline.1.0.4361.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\XOnline.1.0.4627.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\XOnline.1.0.5233.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\XOnline.1.0.5849.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="EmuD3D8 (h)"
-				>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\EmuD3D8\Convert.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\EmuD3D8\PixelShader.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\EmuD3D8\PushBuffer.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\EmuD3D8\State.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\EmuD3D8\VertexBuffer.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\EmuD3D8\VertexShader.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="EmuXBAudio (h)"
-				>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\EmuXBAudio\uXboxAdpcmDecoder.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\EmuXBAudio\XboxAdpcm.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\EmuXBAudio\XSoundBank.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\EmuXBAudio\XWaveBank.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Resource"
-			>
-			<File
-				RelativePath="..\..\resource\Cxbx.ico"
-				>
-			</File>
-			<File
-				RelativePath="..\..\resource\CxbxDll.rc"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						PreprocessorDefinitions=""
-						AdditionalIncludeDirectories="\cxbx\git\cxbx-ds\resource"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						PreprocessorDefinitions=""
-						AdditionalIncludeDirectories="\cxbx\git\cxbx-ds\resource"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Source"
-			>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\CxbxKrnl.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\DbgConsole.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\Emu.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuAlloc.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuD3D8.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuDInput.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuDSound.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuFile.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuFS.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuKrnl.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuLDT.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuNtDll.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Win32\EmuShared.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuXactEng.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuXapi.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuXG.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuXInput.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuXOnline.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Error.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\HLEDataBase.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\HLEIntercept.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\KernelThunk.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Win32\Mutex.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\OpenXDK.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\ResourceTracker.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Win32\XBController.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Xbe.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Win32\XBVideo.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<Filter
-				Name="HLEDataBase (inl)"
-				>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.3925.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.4034.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.4134.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.4361.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.4432.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.4627.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.5233.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.5558.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\D3D8.1.0.5849.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\D3D8LTCG.1.0.5849.inl"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.3936.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.4134.inl"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.4361.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.4432.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.4627.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.5233.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.5558.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\DSound.1.0.5849.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\XactEng.1.0.4627.inl"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.3911.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.4034.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.4134.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.4361.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.4432.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.4627.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.5233.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.5558.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\Xapi.1.0.5849.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.3911.inl"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.4034.inl"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.4361.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.4432.inl"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.4627.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.5233.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.5558.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\XG.1.0.5849.inl"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\XNet.1.0.3911.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\XOnline.1.0.4361.inl"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\XOnline.1.0.4627.inl"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\XOnline.1.0.5233.inl"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\HLEDataBase\XOnline.1.0.5849.inl"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="EmuD3D8 (cpp)"
-				>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\EmuD3D8\Convert.cpp"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\EmuD3D8\PixelShader.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\EmuD3D8\PushBuffer.cpp"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\EmuD3D8\State.cpp"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\EmuD3D8\VertexBuffer.cpp"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\EmuD3D8\VertexShader.cpp"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-			</Filter>
-			<Filter
-				Name="EmuXBAudio (cpp)"
-				>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\EmuXBAudio\uXboxAdpcmDecoder.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\EmuXBAudio\XboxAdpcm.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\EmuXBAudio\XSoundBank.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\CxbxKrnl\EmuXBAudio\XWaveBank.cpp"
-					>
-				</File>
-			</Filter>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/build/win32/Cxbx_vc10.vcproj b/build/win32/Cxbx_vc10.vcproj
deleted file mode 100644
index 493bf7f9d..000000000
--- a/build/win32/Cxbx_vc10.vcproj
+++ /dev/null
@@ -1,783 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="Cxbx"
-	ProjectGUID="{E7A72D3D-5810-4078-A243-348B59726365}"
-	TargetFrameworkVersion="0"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\..\bin\debug"
-			IntermediateDirectory=".\..\..\bin\debug"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\..\..\bin\debug/Cxbx.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\src\Common,..\..\src,..\..\src\Common\Win32"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile=".\..\..\bin\debug/Cxbx.pch"
-				AssemblerListingLocation=".\..\..\bin\debug/"
-				ObjectFile=".\..\..\bin\debug/"
-				ProgramDataBaseFileName=".\..\..\bin\debug/"
-				BrowseInformation="1"
-				BrowseInformationFile=".\..\..\bin\debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-				AdditionalIncludeDirectories="Include\Win32\Cxbx"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libjpeg.lib d3d8.lib dinput8.lib dxguid.lib odbc32.lib odbccp32.lib"
-				OutputFile=".\..\..\bin\debug/Cxbx.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\import\libjpeg\win32\lib"
-				IgnoreDefaultLibraryNames="msvcrt"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\..\..\bin\debug/Cxbx.pdb"
-				GenerateMapFile="true"
-				MapFileName=".\..\..\bin\debug/Cxbx.map"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\..\..\bin\debug/Cxbx.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\..\..\bin\release"
-			IntermediateDirectory=".\..\..\bin\release"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\..\..\bin\release/Cxbx.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\src,..\..\src\Common,..\..\src\Common\Win32"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\..\..\bin\release/Cxbx.pch"
-				AssemblerListingLocation=".\..\..\bin\release/"
-				ObjectFile=".\..\..\bin\release/"
-				ProgramDataBaseFileName=".\..\..\bin\release/"
-				BrowseInformation="1"
-				BrowseInformationFile=".\..\..\bin\release/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-				AdditionalIncludeDirectories="Include\Win32\Cxbx"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libjpeg.lib d3d8.lib dinput8.lib dxguid.lib odbc32.lib odbccp32.lib"
-				OutputFile=".\..\..\bin\release/Cxbx.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\import\libjpeg\win32\lib"
-				IgnoreDefaultLibraryNames=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\..\..\bin\release/Cxbx.pdb"
-				GenerateMapFile="true"
-				MapFileName=".\..\..\bin\release/Cxbx.map"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\..\..\bin\release/Cxbx.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Include"
-			>
-			<File
-				RelativePath="..\..\src\Common\Win32\AlignPosfix1.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Win32\AlignPrefix1.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuD3D8\Convert.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Cxbx.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\CxbxKrnl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Cxbx\DlgControllerConfig.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Cxbx\DlgVideoConfig.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\Emu.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuD3D8.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuD3D8Types.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuDInput.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuDSound.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Cxbx\EmuExe.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuShared.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuXapi.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuXG.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuXOnline.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuXTL.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Error.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Exe.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Win32\Mutex.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Cxbx\Prolog.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuD3D8\PushBuffer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuD3D8\State.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuD3D8\VertexBuffer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuD3D8\VertexShader.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Cxbx\Wnd.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Cxbx\WndAbout.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Cxbx\WndMain.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Win32\XBController.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Xbe.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Win32\XBVideo.h"
-				>
-			</File>
-			<Filter
-				Name="jpegdec (h)"
-				>
-				<File
-					RelativePath="..\..\src\Cxbx\jpegdec\jconfig.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\Cxbx\jpegdec\jmorecfg.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\Cxbx\jpegdec\jpegdec.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\Cxbx\jpegdec\jpeglib.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Resource"
-			>
-			<File
-				RelativePath="..\..\resource\About.jpg"
-				>
-			</File>
-			<File
-				RelativePath="..\..\resource\Cxbx.ico"
-				>
-			</File>
-			<File
-				RelativePath="..\..\resource\Cxbx.rc"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						PreprocessorDefinitions=""
-						AdditionalIncludeDirectories="\cxbx\git\cxbx-ds\resource"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						PreprocessorDefinitions=""
-						AdditionalIncludeDirectories="\cxbx\git\cxbx-ds\resource"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\resource\Logo.bmp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\resource\Splash.jpg"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Source"
-			>
-			<File
-				RelativePath="..\..\src\Cxbx\DlgControllerConfig.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\Cxbx\DlgVideoConfig.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\Cxbx\EmuExe.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Error.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Exe.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Win32\Mutex.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\OpenXDK.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\Cxbx\Prolog.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\Cxbx\WinMain.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\Cxbx\Wnd.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\Cxbx\WndAbout.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\Cxbx\WndMain.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Win32\XBController.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Xbe.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Win32\XBVideo.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<Filter
-				Name="jpegdec (cpp)"
-				>
-				<File
-					RelativePath="..\..\src\Cxbx\jpegdec\jpegdec.cpp"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-			</Filter>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/build/win32/Cxbx_vc9.sln b/build/win32/Cxbx_vc9.sln
deleted file mode 100644
index e321497de..000000000
--- a/build/win32/Cxbx_vc9.sln
+++ /dev/null
@@ -1,35 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual C++ Express 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cxbe", "Cxbe_vc9.vcproj", "{028D5D8F-072C-4308-9095-4EF1EA6B83B0}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cxbx", "Cxbx_vc9.vcproj", "{E7A72D3D-5810-4078-A243-348B59726365}"
-	ProjectSection(ProjectDependencies) = postProject
-		{22592F16-CC5F-45CB-A40A-022FF6FCC146} = {22592F16-CC5F-45CB-A40A-022FF6FCC146}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CxbxKrnl", "CxbxKrnl_vc9.vcproj", "{22592F16-CC5F-45CB-A40A-022FF6FCC146}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{028D5D8F-072C-4308-9095-4EF1EA6B83B0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{028D5D8F-072C-4308-9095-4EF1EA6B83B0}.Debug|Win32.Build.0 = Debug|Win32
-		{028D5D8F-072C-4308-9095-4EF1EA6B83B0}.Release|Win32.ActiveCfg = Release|Win32
-		{028D5D8F-072C-4308-9095-4EF1EA6B83B0}.Release|Win32.Build.0 = Release|Win32
-		{E7A72D3D-5810-4078-A243-348B59726365}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E7A72D3D-5810-4078-A243-348B59726365}.Debug|Win32.Build.0 = Debug|Win32
-		{E7A72D3D-5810-4078-A243-348B59726365}.Release|Win32.ActiveCfg = Release|Win32
-		{E7A72D3D-5810-4078-A243-348B59726365}.Release|Win32.Build.0 = Release|Win32
-		{22592F16-CC5F-45CB-A40A-022FF6FCC146}.Debug|Win32.ActiveCfg = Debug|Win32
-		{22592F16-CC5F-45CB-A40A-022FF6FCC146}.Debug|Win32.Build.0 = Debug|Win32
-		{22592F16-CC5F-45CB-A40A-022FF6FCC146}.Release|Win32.ActiveCfg = Release|Win32
-		{22592F16-CC5F-45CB-A40A-022FF6FCC146}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/build/win32/Cxbx_vc9.vcproj b/build/win32/Cxbx_vc9.vcproj
deleted file mode 100644
index 493bf7f9d..000000000
--- a/build/win32/Cxbx_vc9.vcproj
+++ /dev/null
@@ -1,783 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="Cxbx"
-	ProjectGUID="{E7A72D3D-5810-4078-A243-348B59726365}"
-	TargetFrameworkVersion="0"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\..\bin\debug"
-			IntermediateDirectory=".\..\..\bin\debug"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\..\..\bin\debug/Cxbx.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\src\Common,..\..\src,..\..\src\Common\Win32"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile=".\..\..\bin\debug/Cxbx.pch"
-				AssemblerListingLocation=".\..\..\bin\debug/"
-				ObjectFile=".\..\..\bin\debug/"
-				ProgramDataBaseFileName=".\..\..\bin\debug/"
-				BrowseInformation="1"
-				BrowseInformationFile=".\..\..\bin\debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-				AdditionalIncludeDirectories="Include\Win32\Cxbx"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libjpeg.lib d3d8.lib dinput8.lib dxguid.lib odbc32.lib odbccp32.lib"
-				OutputFile=".\..\..\bin\debug/Cxbx.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\import\libjpeg\win32\lib"
-				IgnoreDefaultLibraryNames="msvcrt"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\..\..\bin\debug/Cxbx.pdb"
-				GenerateMapFile="true"
-				MapFileName=".\..\..\bin\debug/Cxbx.map"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\..\..\bin\debug/Cxbx.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\..\..\bin\release"
-			IntermediateDirectory=".\..\..\bin\release"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\..\..\bin\release/Cxbx.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\src,..\..\src\Common,..\..\src\Common\Win32"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\..\..\bin\release/Cxbx.pch"
-				AssemblerListingLocation=".\..\..\bin\release/"
-				ObjectFile=".\..\..\bin\release/"
-				ProgramDataBaseFileName=".\..\..\bin\release/"
-				BrowseInformation="1"
-				BrowseInformationFile=".\..\..\bin\release/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-				AdditionalIncludeDirectories="Include\Win32\Cxbx"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libjpeg.lib d3d8.lib dinput8.lib dxguid.lib odbc32.lib odbccp32.lib"
-				OutputFile=".\..\..\bin\release/Cxbx.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\import\libjpeg\win32\lib"
-				IgnoreDefaultLibraryNames=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\..\..\bin\release/Cxbx.pdb"
-				GenerateMapFile="true"
-				MapFileName=".\..\..\bin\release/Cxbx.map"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\..\..\bin\release/Cxbx.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Include"
-			>
-			<File
-				RelativePath="..\..\src\Common\Win32\AlignPosfix1.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Win32\AlignPrefix1.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuD3D8\Convert.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Cxbx.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\CxbxKrnl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Cxbx\DlgControllerConfig.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Cxbx\DlgVideoConfig.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\Emu.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuD3D8.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuD3D8Types.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuDInput.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuDSound.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Cxbx\EmuExe.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuShared.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuXapi.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuXG.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuXOnline.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuXTL.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Error.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Exe.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Win32\Mutex.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Cxbx\Prolog.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuD3D8\PushBuffer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuD3D8\State.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuD3D8\VertexBuffer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CxbxKrnl\EmuD3D8\VertexShader.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Cxbx\Wnd.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Cxbx\WndAbout.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Cxbx\WndMain.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Win32\XBController.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Xbe.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Win32\XBVideo.h"
-				>
-			</File>
-			<Filter
-				Name="jpegdec (h)"
-				>
-				<File
-					RelativePath="..\..\src\Cxbx\jpegdec\jconfig.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\Cxbx\jpegdec\jmorecfg.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\Cxbx\jpegdec\jpegdec.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\Cxbx\jpegdec\jpeglib.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Resource"
-			>
-			<File
-				RelativePath="..\..\resource\About.jpg"
-				>
-			</File>
-			<File
-				RelativePath="..\..\resource\Cxbx.ico"
-				>
-			</File>
-			<File
-				RelativePath="..\..\resource\Cxbx.rc"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						PreprocessorDefinitions=""
-						AdditionalIncludeDirectories="\cxbx\git\cxbx-ds\resource"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						PreprocessorDefinitions=""
-						AdditionalIncludeDirectories="\cxbx\git\cxbx-ds\resource"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\resource\Logo.bmp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\resource\Splash.jpg"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Source"
-			>
-			<File
-				RelativePath="..\..\src\Cxbx\DlgControllerConfig.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\Cxbx\DlgVideoConfig.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\Cxbx\EmuExe.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Error.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Exe.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Win32\Mutex.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\OpenXDK.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\Cxbx\Prolog.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\Cxbx\WinMain.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\Cxbx\Wnd.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\Cxbx\WndAbout.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\Cxbx\WndMain.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Win32\XBController.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Xbe.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\Common\Win32\XBVideo.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<Filter
-				Name="jpegdec (cpp)"
-				>
-				<File
-					RelativePath="..\..\src\Cxbx\jpegdec\jpegdec.cpp"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-			</Filter>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.4361.inl b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.4361.inl
index 1b7b95ebf..7a2fea32d 100644
--- a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.4361.inl
+++ b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.4361.inl
@@ -286,7 +286,7 @@ OOVPATable XOnline_1_0_4361[] =
     {
         (OOVPA*)&socket_1_0_4361,
 
-        MFPtoFP<XTL::EmuThis>(XTL::EmuThis::Emusocket),
+        MFPtoFP<XTL::EmuThis>(&XTL::EmuThis::Emusocket),
 
         #ifdef _DEBUG_TRACE
         "Emusocket"
@@ -296,7 +296,7 @@ OOVPATable XOnline_1_0_4361[] =
     {
         (OOVPA*)&bind_1_0_4361,
 
-        MFPtoFP<XTL::EmuThis>(XTL::EmuThis::Emubind),
+        MFPtoFP<XTL::EmuThis>(&XTL::EmuThis::Emubind),
 
         #ifdef _DEBUG_TRACE
         "Emubind"
@@ -306,7 +306,7 @@ OOVPATable XOnline_1_0_4361[] =
     {
         (OOVPA*)&listen_1_0_4361,
 
-        MFPtoFP<XTL::EmuThis>(XTL::EmuThis::Emulisten),
+        MFPtoFP<XTL::EmuThis>(&XTL::EmuThis::Emulisten),
 
         #ifdef _DEBUG_TRACE
         "Emulisten"
@@ -316,7 +316,7 @@ OOVPATable XOnline_1_0_4361[] =
     {
         (OOVPA*)&ioctlsocket_1_0_4361,
 
-        MFPtoFP<XTL::EmuThis>(XTL::EmuThis::Emuioctlsocket),
+        MFPtoFP<XTL::EmuThis>(&XTL::EmuThis::Emuioctlsocket),
 
         #ifdef _DEBUG_TRACE
         "Emuioctlsocket"
diff --git a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.4627.inl b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.4627.inl
index 3ecbfa483..469ec9edc 100644
--- a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.4627.inl
+++ b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.4627.inl
@@ -147,7 +147,7 @@ OOVPATable XOnline_1_0_4627[] =
     {
         (OOVPA*)&socket_1_0_4361,
 
-        MFPtoFP<XTL::EmuThis>(XTL::EmuThis::Emusocket),
+        MFPtoFP<XTL::EmuThis>(&XTL::EmuThis::Emusocket),
 
         #ifdef _DEBUG_TRACE
         "Emusocket"
@@ -157,7 +157,7 @@ OOVPATable XOnline_1_0_4627[] =
     {
         (OOVPA*)&bind_1_0_4361,
 
-        MFPtoFP<XTL::EmuThis>(XTL::EmuThis::Emubind),
+        MFPtoFP<XTL::EmuThis>(&XTL::EmuThis::Emubind),
 
         #ifdef _DEBUG_TRACE
         "Emubind"
@@ -167,7 +167,7 @@ OOVPATable XOnline_1_0_4627[] =
     {
         (OOVPA*)&listen_1_0_4361,
 
-        MFPtoFP<XTL::EmuThis>(XTL::EmuThis::Emulisten),
+        MFPtoFP<XTL::EmuThis>(&XTL::EmuThis::Emulisten),
 
         #ifdef _DEBUG_TRACE
         "Emulisten"
@@ -177,7 +177,7 @@ OOVPATable XOnline_1_0_4627[] =
     {
         (OOVPA*)&ioctlsocket_1_0_4361,
 
-        MFPtoFP<XTL::EmuThis>(XTL::EmuThis::Emuioctlsocket),
+        MFPtoFP<XTL::EmuThis>(&XTL::EmuThis::Emuioctlsocket),
 
         #ifdef _DEBUG_TRACE
         "Emuioctlsocket"
diff --git a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5233.inl b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5233.inl
index eece83103..07f309079 100644
--- a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5233.inl
+++ b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5233.inl
@@ -172,7 +172,7 @@ OOVPATable XOnline_1_0_5233[] =
     {
         (OOVPA*)&bind_1_0_4361,
 
-        MFPtoFP<XTL::EmuThis>(XTL::EmuThis::Emubind),
+        MFPtoFP<XTL::EmuThis>(&XTL::EmuThis::Emubind),
 
         #ifdef _DEBUG_TRACE
         "Emubind"
@@ -192,7 +192,7 @@ OOVPATable XOnline_1_0_5233[] =
     {
         (OOVPA*)&ioctlsocket_1_0_4361,
 
-        MFPtoFP<XTL::EmuThis>(XTL::EmuThis::Emuioctlsocket),
+        MFPtoFP<XTL::EmuThis>(&XTL::EmuThis::Emuioctlsocket),
 
         #ifdef _DEBUG_TRACE
         "Emuioctlsocket"