diff --git a/Cxbe.vcproj b/Cxbe.vcproj
index 277bede18..7c454913d 100644
--- a/Cxbe.vcproj
+++ b/Cxbe.vcproj
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.00"
+	Version="7.10"
 	Name="Cxbe"
 	SccProjectName=""
 	SccLocalPath="">
@@ -20,9 +20,10 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
+				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="Include,Include/Core/,Include/Standard,Include/Standard/Cxbe,Include/Win32/,Include/Win32/CxbxKrnl/"
-				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				StringPooling="TRUE"
 				RuntimeLibrary="4"
 				EnableFunctionLevelLinking="TRUE"
@@ -38,16 +39,16 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="odbc32.lib odbccp32.lib"
 				OutputFile=".\Bin/Cxbe.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				ProgramDatabaseFile=".\Bin/Cxbe.pdb"
-				SubSystem="1"/>
+				SubSystem="1"
+				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
-				TypeLibraryName=".\Bin/Cxbe.tlb"/>
+				TypeLibraryName=".\Bin/Cxbe.tlb"
+				HeaderFileName=""/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@@ -60,8 +61,14 @@
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
 				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
@@ -75,7 +82,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="Include,Include/Core/,Include/Standard,Include/Standard/Cxbe,Include/Win32/,Include/Win32/CxbxKrnl/"
-				PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="5"
 				UsePrecompiledHeader="2"
@@ -92,19 +99,19 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="odbc32.lib odbccp32.lib"
 				OutputFile=".\Bin/Debug/Cxbe.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\Bin/Debug/Cxbe.pdb"
 				GenerateMapFile="TRUE"
 				MapFileName=".\Bin/Debug/Cxbe.map"
-				SubSystem="1"/>
+				SubSystem="1"
+				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
-				TypeLibraryName=".\Bin/Debug/Cxbe.tlb"/>
+				TypeLibraryName=".\Bin/Debug/Cxbe.tlb"
+				HeaderFileName=""/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@@ -117,22 +124,30 @@
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
 				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Bin"
 			Filter="">
 			<File
-				RelativePath=".\Bin\Cxbe.exe">
+				RelativePath="Bin\Cxbe.exe">
 			</File>
 			<Filter
 				Name="Debug"
 				Filter="">
 				<File
-					RelativePath=".\Bin\Debug\Cxbe.exe">
+					RelativePath="Bin\Debug\Cxbe.exe">
 				</File>
 			</Filter>
 		</Filter>
@@ -140,60 +155,150 @@
 			Name="Doc"
 			Filter="">
 			<File
-				RelativePath=".\Doc\Changelog.txt">
+				RelativePath="Doc\Changelog.txt">
 			</File>
 			<File
-				RelativePath=".\Doc\Input.txt">
+				RelativePath="Doc\Input.txt">
 			</File>
 			<File
-				RelativePath=".\Doc\RemovedCode.txt">
+				RelativePath="Doc\RemovedCode.txt">
 			</File>
 			<File
-				RelativePath=".\Doc\Thanks.txt">
+				RelativePath="Doc\Thanks.txt">
 			</File>
 			<File
-				RelativePath=".\Doc\Todo.txt">
+				RelativePath="Doc\Todo.txt">
 			</File>
 		</Filter>
 		<Filter
 			Name="Include"
 			Filter="">
 			<File
-				RelativePath=".\Include\Win32\AlignPosfix1.h">
+				RelativePath="Include\Win32\AlignPosfix1.h">
 			</File>
 			<File
-				RelativePath=".\Include\Win32\AlignPrefix1.h">
+				RelativePath="Include\Win32\AlignPrefix1.h">
 			</File>
 			<File
-				RelativePath=".\Include\Cxbx.h">
+				RelativePath="Include\Cxbx.h">
 			</File>
 			<File
-				RelativePath=".\Include\Core\Error.h">
+				RelativePath="Include\Core\Error.h">
 			</File>
 			<File
-				RelativePath=".\Include\Core\Exe.h">
+				RelativePath="Include\Core\Exe.h">
 			</File>
 			<File
-				RelativePath=".\Include\Core\Xbe.h">
+				RelativePath="Include\Core\Xbe.h">
 			</File>
 		</Filter>
 		<Filter
 			Name="Source"
 			Filter="">
 			<File
-				RelativePath=".\Source\Core\Error.cpp">
+				RelativePath="Source\Core\Error.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"
+						BrowseInformation="1"/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\Source\Core\Exe.cpp">
+				RelativePath="Source\Core\Exe.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"
+						BrowseInformation="1"/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\Source\Standard\Cxbe\Main.cpp">
+				RelativePath="Source\Standard\Cxbe\Main.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"
+						BrowseInformation="1"/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\Source\Core\OpenXDK.cpp">
+				RelativePath="Source\Core\OpenXDK.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"
+						BrowseInformation="1"/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\Source\Core\Xbe.cpp">
+				RelativePath="Source\Core\Xbe.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"
+						BrowseInformation="1"/>
+				</FileConfiguration>
 			</File>
 		</Filter>
 		<Filter
diff --git a/Cxbx.opt b/Cxbx.opt
index 768c70343..e0db64028 100644
Binary files a/Cxbx.opt and b/Cxbx.opt differ
diff --git a/Cxbx.sln b/Cxbx.sln
index 4864b7768..0948e5102 100644
--- a/Cxbx.sln
+++ b/Cxbx.sln
@@ -1,31 +1,35 @@
-Microsoft Visual Studio Solution File, Format Version 7.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cxbe", "Cxbe.vcproj", "{3A94CDEB-4EBF-45EF-A9C6-8873DD2A55C0}"
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cxbe", "Cxbe.vcproj", "{7BA1906A-C382-4C3F-90F4-8A5A73E637D2}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cxbx", "Cxbx.vcproj", "{186FDF0D-7099-41FB-9DEC-08BDA6296079}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cxbx", "Cxbx.vcproj", "{B37D8D33-9DE5-4CE1-81B5-DF100AA63DDB}"
+	ProjectSection(ProjectDependencies) = postProject
+		{93E3D9EB-480F-4F9E-BE6F-8CC05EB0D81A} = {93E3D9EB-480F-4F9E-BE6F-8CC05EB0D81A}
+	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CxbxKrnl", "CxbxKrnl.vcproj", "{B4B1DFA1-D5DA-4942-BE29-87BC6A433858}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CxbxKrnl", "CxbxKrnl.vcproj", "{93E3D9EB-480F-4F9E-BE6F-8CC05EB0D81A}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
-		ConfigName.0 = Debug
-		ConfigName.1 = Release
-	EndGlobalSection
-	GlobalSection(ProjectDependencies) = postSolution
-		{186FDF0D-7099-41FB-9DEC-08BDA6296079}.0 = {B4B1DFA1-D5DA-4942-BE29-87BC6A433858}
+		Debug = Debug
+		Release = Release
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
-		{3A94CDEB-4EBF-45EF-A9C6-8873DD2A55C0}.Debug.ActiveCfg = Debug|Win32
-		{3A94CDEB-4EBF-45EF-A9C6-8873DD2A55C0}.Debug.Build.0 = Debug|Win32
-		{3A94CDEB-4EBF-45EF-A9C6-8873DD2A55C0}.Release.ActiveCfg = Release|Win32
-		{3A94CDEB-4EBF-45EF-A9C6-8873DD2A55C0}.Release.Build.0 = Release|Win32
-		{186FDF0D-7099-41FB-9DEC-08BDA6296079}.Debug.ActiveCfg = Debug|Win32
-		{186FDF0D-7099-41FB-9DEC-08BDA6296079}.Debug.Build.0 = Debug|Win32
-		{186FDF0D-7099-41FB-9DEC-08BDA6296079}.Release.ActiveCfg = Release|Win32
-		{186FDF0D-7099-41FB-9DEC-08BDA6296079}.Release.Build.0 = Release|Win32
-		{B4B1DFA1-D5DA-4942-BE29-87BC6A433858}.Debug.ActiveCfg = Debug|Win32
-		{B4B1DFA1-D5DA-4942-BE29-87BC6A433858}.Debug.Build.0 = Debug|Win32
-		{B4B1DFA1-D5DA-4942-BE29-87BC6A433858}.Release.ActiveCfg = Release|Win32
-		{B4B1DFA1-D5DA-4942-BE29-87BC6A433858}.Release.Build.0 = Release|Win32
+		{7BA1906A-C382-4C3F-90F4-8A5A73E637D2}.Debug.ActiveCfg = Debug|Win32
+		{7BA1906A-C382-4C3F-90F4-8A5A73E637D2}.Debug.Build.0 = Debug|Win32
+		{7BA1906A-C382-4C3F-90F4-8A5A73E637D2}.Release.ActiveCfg = Release|Win32
+		{7BA1906A-C382-4C3F-90F4-8A5A73E637D2}.Release.Build.0 = Release|Win32
+		{B37D8D33-9DE5-4CE1-81B5-DF100AA63DDB}.Debug.ActiveCfg = Debug|Win32
+		{B37D8D33-9DE5-4CE1-81B5-DF100AA63DDB}.Debug.Build.0 = Debug|Win32
+		{B37D8D33-9DE5-4CE1-81B5-DF100AA63DDB}.Release.ActiveCfg = Release|Win32
+		{B37D8D33-9DE5-4CE1-81B5-DF100AA63DDB}.Release.Build.0 = Release|Win32
+		{93E3D9EB-480F-4F9E-BE6F-8CC05EB0D81A}.Debug.ActiveCfg = Debug|Win32
+		{93E3D9EB-480F-4F9E-BE6F-8CC05EB0D81A}.Debug.Build.0 = Debug|Win32
+		{93E3D9EB-480F-4F9E-BE6F-8CC05EB0D81A}.Release.ActiveCfg = Release|Win32
+		{93E3D9EB-480F-4F9E-BE6F-8CC05EB0D81A}.Release.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection
diff --git a/Cxbx.suo b/Cxbx.suo
index d26124ccc..3f6626eac 100644
Binary files a/Cxbx.suo and b/Cxbx.suo differ
diff --git a/Cxbx.vcproj b/Cxbx.vcproj
index b38b00b0d..86aa7a650 100644
--- a/Cxbx.vcproj
+++ b/Cxbx.vcproj
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.00"
+	Version="7.10"
 	Name="Cxbx"
 	SccProjectName=""
 	SccLocalPath="">
@@ -10,6 +10,75 @@
 			Name="Win32"/>
 	</Platforms>
 	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\Bin\Debug"
+			IntermediateDirectory=".\Bin\Debug"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="Include,Include/Core/,Include/Win32/,Include/Win32/Cxbxkrnl,Include/Win32/Cxbx"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile=".\Bin\Debug/Cxbx.pch"
+				AssemblerListingLocation=".\Bin\Debug/"
+				ObjectFile=".\Bin\Debug/"
+				ProgramDataBaseFileName=".\Bin\Debug/"
+				BrowseInformation="1"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="3"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="d3d8.lib dinput8.lib dxguid.lib odbc32.lib odbccp32.lib"
+				OutputFile=".\Bin\Debug/Cxbx.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile=".\Bin\Debug/Cxbx.pdb"
+				GenerateMapFile="TRUE"
+				MapFileName=".\Bin\Debug/Cxbx.map"
+				SubSystem="2"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Bin\Debug/Cxbx.tlb"
+				HeaderFileName=""/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+				AdditionalIncludeDirectories="Include\Win32\Cxbx"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\Bin"
@@ -20,9 +89,10 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
+				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="Include,Include/Core/,Include/Win32/,Include/Win32/Cxbxkrnl,Include/Win32/Cxbx"
-				PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
@@ -32,6 +102,7 @@
 				ObjectFile=".\Bin/"
 				ProgramDataBaseFileName=".\Bin/"
 				BrowseInformation="1"
+				BrowseInformationFile=".\Bin/"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				CompileAs="0"/>
@@ -39,21 +110,22 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
 				AdditionalDependencies="d3d8.lib dinput8.lib dxguid.lib odbc32.lib odbccp32.lib"
 				OutputFile=".\Bin/Cxbx.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				GenerateMapFile="TRUE"
 				MapFileName=".\Bin/Cxbx.map"
-				SubSystem="2"/>
+				SubSystem="2"
+				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="NDEBUG"
 				MkTypLibCompatible="TRUE"
 				SuppressStartupBanner="TRUE"
 				TargetEnvironment="1"
-				TypeLibraryName=".\Bin/Cxbx.tlb"/>
+				TypeLibraryName=".\Bin/Cxbx.tlb"
+				HeaderFileName=""/>
 			<Tool
 				Name="VCPostBuildEventTool"
 				CommandLine="cd PostBuild
@@ -71,83 +143,29 @@ upxCxbx.bat
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\Bin\Debug"
-			IntermediateDirectory=".\Bin\Debug"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="Include,Include/Core/,Include/Win32/,Include/Win32/Cxbxkrnl,Include/Win32/Cxbx"
-				PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Bin\Debug/Cxbx.pch"
-				AssemblerListingLocation=".\Bin\Debug/"
-				ObjectFile=".\Bin\Debug/"
-				ProgramDataBaseFileName=".\Bin\Debug/"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="3"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="d3d8.lib dinput8.lib dxguid.lib odbc32.lib odbccp32.lib"
-				OutputFile=".\Bin\Debug/Cxbx.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\Bin\Debug/Cxbx.pdb"
-				GenerateMapFile="TRUE"
-				MapFileName=".\Bin\Debug/Cxbx.map"
-				SubSystem="2"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Bin\Debug/Cxbx.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-				AdditionalIncludeDirectories="Include\Win32\Cxbx"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
 				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Bin"
 			Filter="">
 			<File
-				RelativePath=".\Bin\Cxbx.exe">
+				RelativePath="Bin\Cxbx.exe">
 			</File>
 			<Filter
 				Name="Debug"
 				Filter="">
 				<File
-					RelativePath=".\Bin\Debug\Cxbx.exe">
+					RelativePath="Bin\Debug\Cxbx.exe">
 				</File>
 			</Filter>
 		</Filter>
@@ -155,175 +173,462 @@ upxCxbx.bat
 			Name="Doc"
 			Filter="">
 			<File
-				RelativePath=".\Doc\Changelog.txt">
+				RelativePath="Doc\Changelog.txt">
 			</File>
 			<File
-				RelativePath=".\Doc\Input.txt">
+				RelativePath="Doc\Input.txt">
 			</File>
 			<File
-				RelativePath=".\Doc\RemovedCode.txt">
+				RelativePath="Doc\RemovedCode.txt">
 			</File>
 			<File
-				RelativePath=".\Doc\Thanks.txt">
+				RelativePath="Doc\Thanks.txt">
 			</File>
 			<File
-				RelativePath=".\Doc\Todo.txt">
+				RelativePath="Doc\Todo.txt">
 			</File>
 		</Filter>
 		<Filter
 			Name="Include"
 			Filter="">
 			<File
-				RelativePath=".\Include\Win32\AlignPosfix1.h">
+				RelativePath="Include\Win32\AlignPosfix1.h">
 			</File>
 			<File
-				RelativePath=".\Include\Win32\AlignPrefix1.h">
+				RelativePath="Include\Win32\AlignPrefix1.h">
 			</File>
 			<File
-				RelativePath=".\Include\Cxbx.h">
+				RelativePath="Include\Cxbx.h">
 			</File>
 			<File
-				RelativePath=".\Include\Win32\Cxbx\DlgControllerConfig.h">
+				RelativePath="Include\Win32\Cxbx\DlgControllerConfig.h">
 			</File>
 			<File
-				RelativePath=".\Include\Win32\Cxbx\DlgVideoConfig.h">
+				RelativePath="Include\Win32\Cxbx\DlgVideoConfig.h">
 			</File>
 			<File
-				RelativePath=".\Include\Win32\CxbxKrnl\Emu.h">
+				RelativePath="Include\Win32\CxbxKrnl\Emu.h">
 			</File>
 			<File
-				RelativePath=".\Include\Win32\CxbxKrnl\EmuD3D8.h">
+				RelativePath="Include\Win32\CxbxKrnl\EmuD3D8.h">
 			</File>
 			<File
-				RelativePath=".\Include\Win32\CxbxKrnl\EmuDInput.h">
+				RelativePath="Include\Win32\CxbxKrnl\EmuDInput.h">
 			</File>
 			<File
-				RelativePath=".\Include\Win32\CxbxKrnl\EmuDSound.h">
+				RelativePath="Include\Win32\CxbxKrnl\EmuDSound.h">
 			</File>
 			<File
-				RelativePath=".\Include\Win32\Cxbx\EmuExe.h">
+				RelativePath="Include\Win32\Cxbx\EmuExe.h">
 			</File>
 			<File
-				RelativePath=".\Include\Win32\CxbxKrnl\EmuShared.h">
+				RelativePath="Include\Win32\CxbxKrnl\EmuShared.h">
 			</File>
 			<File
-				RelativePath=".\Include\Win32\CxbxKrnl\EmuXG.h">
+				RelativePath="Include\Win32\CxbxKrnl\EmuXapi.h">
 			</File>
 			<File
-				RelativePath=".\Include\Win32\CxbxKrnl\EmuXOnline.h">
+				RelativePath="Include\Win32\CxbxKrnl\EmuXG.h">
 			</File>
 			<File
-				RelativePath=".\Include\Win32\CxbxKrnl\EmuXTL.h">
+				RelativePath="Include\Win32\CxbxKrnl\EmuXOnline.h">
 			</File>
 			<File
-				RelativePath=".\Include\Win32\CxbxKrnl\EmuXapi.h">
+				RelativePath="Include\Win32\CxbxKrnl\EmuXTL.h">
 			</File>
 			<File
-				RelativePath=".\Include\Core\Exe.h">
+				RelativePath="Include\Core\Exe.h">
 			</File>
 			<File
-				RelativePath=".\Include\Win32\Mutex.h">
+				RelativePath="Include\Win32\Mutex.h">
 			</File>
 			<File
-				RelativePath=".\Include\Win32\Cxbx\Prolog.h">
+				RelativePath="Include\Win32\Cxbx\Prolog.h">
 			</File>
 			<File
-				RelativePath=".\Include\Win32\Cxbx\Wnd.h">
+				RelativePath="Include\Win32\Cxbx\Wnd.h">
 			</File>
 			<File
-				RelativePath=".\Include\Win32\Cxbx\WndAbout.h">
+				RelativePath="Include\Win32\Cxbx\WndAbout.h">
 			</File>
 			<File
-				RelativePath=".\Include\Win32\Cxbx\WndMain.h">
+				RelativePath="Include\Win32\Cxbx\WndMain.h">
 			</File>
 			<File
-				RelativePath=".\Include\Win32\XBController.h">
+				RelativePath="Include\Win32\XBController.h">
 			</File>
 			<File
-				RelativePath=".\Include\Win32\XBVideo.h">
+				RelativePath="Include\Core\Xbe.h">
 			</File>
 			<File
-				RelativePath=".\Include\Core\Xbe.h">
+				RelativePath="Include\Win32\XBVideo.h">
 			</File>
 		</Filter>
 		<Filter
 			Name="Resource"
 			Filter="">
 			<File
-				RelativePath=".\Resource\About.bmp">
+				RelativePath="Resource\About.bmp">
 			</File>
 			<File
-				RelativePath=".\Resource\Cxbx.ico">
+				RelativePath="Resource\Cxbx.ico">
 			</File>
 			<File
-				RelativePath=".\Resource\Cxbx.rc">
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCResourceCompilerTool"
-						AdditionalIncludeDirectories="Include\Win32\Cxbx;Resource;$(NoInherit)"/>
-				</FileConfiguration>
+				RelativePath="Resource\Cxbx.rc">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCResourceCompilerTool"
-						AdditionalIncludeDirectories="Include\Win32\Cxbx;Resource;$(NoInherit)"/>
+						PreprocessorDefinitions=""
+						AdditionalIncludeDirectories="Resource"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCResourceCompilerTool"
+						PreprocessorDefinitions=""
+						AdditionalIncludeDirectories="Resource"/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\Resource\Logo.bmp">
+				RelativePath="Resource\Logo.bmp">
 			</File>
 			<File
-				RelativePath=".\Resource\Splash.bmp">
+				RelativePath="Resource\Splash.bmp">
 			</File>
 		</Filter>
 		<Filter
 			Name="Source"
 			Filter="">
 			<File
-				RelativePath=".\Source\Win32\Cxbx\DlgControllerConfig.cpp">
+				RelativePath="Source\Win32\Cxbx\DlgControllerConfig.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"
+						BrowseInformation="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BrowseInformation="1"/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\Source\Win32\Cxbx\DlgVideoConfig.cpp">
+				RelativePath="Source\Win32\Cxbx\DlgVideoConfig.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"
+						BrowseInformation="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BrowseInformation="1"/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\Source\Win32\Cxbx\EmuExe.cpp">
+				RelativePath="Source\Win32\Cxbx\EmuExe.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"
+						BrowseInformation="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BrowseInformation="1"/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\Source\Core\Error.cpp">
+				RelativePath="Source\Core\Error.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"
+						BrowseInformation="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BrowseInformation="1"/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\Source\Core\Exe.cpp">
+				RelativePath="Source\Core\Exe.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"
+						BrowseInformation="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BrowseInformation="1"/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\Source\Win32\Mutex.cpp">
+				RelativePath="Source\Win32\Mutex.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"
+						BrowseInformation="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BrowseInformation="1"/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\Source\Core\OpenXDK.cpp">
+				RelativePath="Source\Core\OpenXDK.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"
+						BrowseInformation="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BrowseInformation="1"/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\Source\Win32\Cxbx\Prolog.cpp">
+				RelativePath="Source\Win32\Cxbx\Prolog.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"
+						BrowseInformation="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BrowseInformation="1"/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\Source\Win32\Cxbx\WinMain.cpp">
+				RelativePath="Source\Win32\Cxbx\WinMain.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"
+						BrowseInformation="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BrowseInformation="1"/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\Source\Win32\Cxbx\Wnd.cpp">
+				RelativePath="Source\Win32\Cxbx\Wnd.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"
+						BrowseInformation="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BrowseInformation="1"/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\Source\Win32\Cxbx\WndAbout.cpp">
+				RelativePath="Source\Win32\Cxbx\WndAbout.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"
+						BrowseInformation="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BrowseInformation="1"/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\Source\Win32\Cxbx\WndMain.cpp">
+				RelativePath="Source\Win32\Cxbx\WndMain.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"
+						BrowseInformation="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BrowseInformation="1"/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\Source\Win32\XBController.cpp">
+				RelativePath="Source\Win32\XBController.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"
+						BrowseInformation="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BrowseInformation="1"/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\Source\Win32\XBVideo.cpp">
+				RelativePath="Source\Core\Xbe.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"
+						BrowseInformation="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BrowseInformation="1"/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\Source\Core\Xbe.cpp">
+				RelativePath="Source\Win32\XBVideo.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"
+						BrowseInformation="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BrowseInformation="1"/>
+				</FileConfiguration>
 			</File>
 		</Filter>
 	</Files>
diff --git a/CxbxKrnl.vcproj b/CxbxKrnl.vcproj
index bbf3c11da..ef7fcf97d 100644
--- a/CxbxKrnl.vcproj
+++ b/CxbxKrnl.vcproj
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.00"
+	Version="7.10"
 	Name="CxbxKrnl"
 	SccProjectName=""
 	SccLocalPath="">
@@ -10,6 +10,75 @@
 			Name="Win32"/>
 	</Platforms>
 	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\Bin"
+			IntermediateDirectory=".\Bin"
+			ConfigurationType="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="Include,Include/Core/,Include/Win32/,Include/Win32/Cxbx,Include/Win32/CxbxKrnl,Include/Win32/CxbxKrnl/HLEDataBase"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;CXBXKRNL_EXPORTS"
+				StringPooling="TRUE"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="TRUE"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile=".\Bin/CxbxKrnl.pch"
+				AssemblerListingLocation=".\Bin/"
+				ObjectFile=".\Bin/"
+				ProgramDataBaseFileName=".\Bin/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ws2_32.lib dsound.lib winmm.lib ddraw.lib d3dx8.lib d3d8.lib dinput8.lib dxguid.lib odbc32.lib odbccp32.lib"
+				OutputFile="Bin/Cxbx.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="Lib"
+				ProgramDatabaseFile=".\Bin/Cxbx.pdb"
+				GenerateMapFile="TRUE"
+				MapFileName=".\Bin/Cxbx.map"
+				ImportLibrary=".\Bin/Cxbx.lib"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Bin/CxbxKrnl.tlb"
+				HeaderFileName=""/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+				AdditionalIncludeDirectories="Include\Win32\CxbxKrnl"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\Bin\Debug"
@@ -39,24 +108,25 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
 				AdditionalDependencies="ws2_32.lib dsound.lib winmm.lib ddraw.lib d3dx8.lib d3d8.lib dinput8.lib dxguid.lib odbc32.lib odbccp32.lib"
 				OutputFile=".\Bin\Debug/CxbxKrnl.dll"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="Lib"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\Bin\Debug/CxbxKrnl.pdb"
 				GenerateMapFile="TRUE"
 				MapFileName=".\Bin\Debug/CxbxKrnl.map"
-				ImportLibrary=".\Bin\Debug/CxbxKrnl.lib"/>
+				ImportLibrary=".\Bin\Debug/CxbxKrnl.lib"
+				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="_DEBUG"
 				MkTypLibCompatible="TRUE"
 				SuppressStartupBanner="TRUE"
 				TargetEnvironment="1"
-				TypeLibraryName=".\Bin\Debug/CxbxKrnl.tlb"/>
+				TypeLibraryName=".\Bin\Debug/CxbxKrnl.tlb"
+				HeaderFileName=""/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@@ -71,82 +141,29 @@
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Bin"
-			IntermediateDirectory=".\Bin"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="Include,Include/Core/,Include/Win32/,Include/Win32/Cxbx,Include/Win32/CxbxKrnl,Include/Win32/CxbxKrnl/HLEDataBase"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;CXBXKRNL_EXPORTS"
-				StringPooling="TRUE"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Bin/CxbxKrnl.pch"
-				AssemblerListingLocation=".\Bin/"
-				ObjectFile=".\Bin/"
-				ProgramDataBaseFileName=".\Bin/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="ws2_32.lib dsound.lib winmm.lib ddraw.lib d3dx8.lib d3d8.lib dinput8.lib dxguid.lib odbc32.lib odbccp32.lib"
-				OutputFile="Bin/Cxbx.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="Lib"
-				ProgramDatabaseFile=".\Bin/Cxbx.pdb"
-				GenerateMapFile="TRUE"
-				MapFileName=".\Bin/Cxbx.map"
-				ImportLibrary=".\Bin/Cxbx.lib"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Bin/CxbxKrnl.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-				AdditionalIncludeDirectories="Include\Win32\CxbxKrnl"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
 				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Bin"
 			Filter="">
 			<File
-				RelativePath=".\Bin\Cxbx.dll">
+				RelativePath="Bin\Cxbx.dll">
 			</File>
 			<Filter
 				Name="Debug"
 				Filter="">
 				<File
-					RelativePath=".\Bin\Debug\Cxbx.dll">
+					RelativePath="Bin\Debug\Cxbx.dll">
 				</File>
 			</Filter>
 		</Filter>
@@ -154,168 +171,174 @@
 			Name="Doc"
 			Filter="">
 			<File
-				RelativePath=".\Doc\Changelog.txt">
+				RelativePath="Doc\Changelog.txt">
 			</File>
 			<File
-				RelativePath=".\Doc\Input.txt">
+				RelativePath="Doc\Input.txt">
 			</File>
 			<File
-				RelativePath=".\Doc\RemovedCode.txt">
+				RelativePath="Doc\RemovedCode.txt">
 			</File>
 			<File
-				RelativePath=".\Doc\Thanks.txt">
+				RelativePath="Doc\Thanks.txt">
 			</File>
 			<File
-				RelativePath=".\Doc\Todo.txt">
+				RelativePath="Doc\Todo.txt">
 			</File>
 		</Filter>
 		<Filter
 			Name="Include"
 			Filter="">
 			<File
-				RelativePath=".\Include\Win32\AlignPosfix1.h">
+				RelativePath="Include\Win32\AlignPosfix1.h">
 			</File>
 			<File
-				RelativePath=".\Include\Win32\AlignPrefix1.h">
+				RelativePath="Include\Win32\AlignPrefix1.h">
 			</File>
 			<File
-				RelativePath=".\Include\Cxbx.h">
+				RelativePath="Include\Cxbx.h">
 			</File>
 			<File
-				RelativePath=".\Include\Win32\CxbxKrnl\Emu.h">
+				RelativePath="Include\Win32\CxbxKrnl\Emu.h">
 			</File>
 			<File
-				RelativePath=".\Include\Win32\CxbxKrnl\EmuD3D8.h">
+				RelativePath="Include\Win32\CxbxKrnl\EmuD3D8.h">
 			</File>
 			<File
-				RelativePath=".\Include\Win32\CxbxKrnl\EmuD3D8Types.h">
+				RelativePath="Include\Win32\CxbxKrnl\EmuD3D8Types.h">
 			</File>
 			<File
-				RelativePath=".\Include\Win32\CxbxKrnl\EmuDInput.h">
+				RelativePath="Include\Win32\CxbxKrnl\EmuDInput.h">
 			</File>
 			<File
-				RelativePath=".\Include\Win32\CxbxKrnl\EmuDSound.h">
+				RelativePath="Include\Win32\CxbxKrnl\EmuDSound.h">
 			</File>
 			<File
-				RelativePath=".\Include\Win32\CxbxKrnl\EmuFS.h">
+				RelativePath="Include\Win32\CxbxKrnl\EmuFile.h">
 			</File>
 			<File
-				RelativePath=".\Include\Win32\CxbxKrnl\EmuFile.h">
+				RelativePath="Include\Win32\CxbxKrnl\EmuFS.h">
 			</File>
 			<File
-				RelativePath=".\Include\Win32\CxbxKrnl\EmuLDT.h">
+				RelativePath="Include\Win32\CxbxKrnl\EmuLDT.h">
 			</File>
 			<File
-				RelativePath=".\Include\Win32\CxbxKrnl\EmuNtDll.h">
+				RelativePath="Include\Win32\CxbxKrnl\EmuNtDll.h">
 			</File>
 			<File
-				RelativePath=".\Include\Win32\CxbxKrnl\EmuShared.h">
+				RelativePath="Include\Win32\CxbxKrnl\EmuShared.h">
 			</File>
 			<File
-				RelativePath=".\Include\Win32\CxbxKrnl\EmuXG.h">
+				RelativePath="Include\Win32\CxbxKrnl\EmuXapi.h">
 			</File>
 			<File
-				RelativePath=".\Include\Win32\CxbxKrnl\EmuXOnline.h">
+				RelativePath="Include\Win32\CxbxKrnl\EmuXG.h">
 			</File>
 			<File
-				RelativePath=".\Include\Win32\CxbxKrnl\EmuXTL.h">
+				RelativePath="Include\Win32\CxbxKrnl\EmuXOnline.h">
 			</File>
 			<File
-				RelativePath=".\Include\Win32\CxbxKrnl\EmuXapi.h">
+				RelativePath="Include\Win32\CxbxKrnl\EmuXTL.h">
 			</File>
 			<File
-				RelativePath=".\Include\Win32\CxbxKrnl\HLEDataBase.h">
+				RelativePath="Include\Win32\CxbxKrnl\HLEDataBase.h">
 			</File>
 			<File
-				RelativePath=".\Include\Win32\Mutex.h">
+				RelativePath="Include\Win32\Mutex.h">
 			</File>
 			<File
-				RelativePath=".\Include\Win32\CxbxKrnl\OOVPA.h">
+				RelativePath="Include\Win32\CxbxKrnl\OOVPA.h">
 			</File>
 			<File
-				RelativePath=".\Include\Win32\XBController.h">
+				RelativePath="Include\Win32\XBController.h">
 			</File>
 			<File
-				RelativePath=".\Include\Win32\XBVideo.h">
+				RelativePath="Include\Core\Xbe.h">
 			</File>
 			<File
-				RelativePath=".\Include\Core\Xbe.h">
+				RelativePath="Include\Win32\XBVideo.h">
 			</File>
 			<Filter
 				Name="HLEDataBase (h)"
 				Filter="">
 				<File
-					RelativePath=".\Include\Win32\CxbxKrnl\HLEDataBase\D3D8.1.0.3925.h">
+					RelativePath="Include\Win32\CxbxKrnl\HLEDataBase\D3D8.1.0.3925.h">
 				</File>
 				<File
-					RelativePath=".\Include\Win32\CxbxKrnl\HLEDataBase\D3D8.1.0.4034.h">
+					RelativePath="Include\Win32\CxbxKrnl\HLEDataBase\D3D8.1.0.4034.h">
 				</File>
 				<File
-					RelativePath=".\Include\Win32\CxbxKrnl\HLEDataBase\D3D8.1.0.4134.h">
+					RelativePath="Include\Win32\CxbxKrnl\HLEDataBase\D3D8.1.0.4134.h">
 				</File>
 				<File
-					RelativePath=".\Include\Win32\CxbxKrnl\HLEDataBase\D3D8.1.0.4361.h">
+					RelativePath="Include\Win32\CxbxKrnl\HLEDataBase\D3D8.1.0.4361.h">
 				</File>
 				<File
-					RelativePath=".\Include\Win32\CxbxKrnl\HLEDataBase\D3D8.1.0.4432.h">
+					RelativePath="Include\Win32\CxbxKrnl\HLEDataBase\D3D8.1.0.4432.h">
 				</File>
 				<File
-					RelativePath=".\Include\Win32\CxbxKrnl\HLEDataBase\D3D8.1.0.4627.h">
+					RelativePath="Include\Win32\CxbxKrnl\HLEDataBase\D3D8.1.0.4627.h">
 				</File>
 				<File
-					RelativePath=".\Include\Win32\CxbxKrnl\HLEDataBase\DSound.1.0.3936.h">
+					RelativePath="Include\Win32\CxbxKrnl\HLEDataBase\DSound.1.0.3936.h">
 				</File>
 				<File
-					RelativePath=".\Include\Win32\CxbxKrnl\HLEDataBase\DSound.1.0.4361.h">
+					RelativePath="Include\Win32\CxbxKrnl\HLEDataBase\DSound.1.0.4361.h">
 				</File>
 				<File
-					RelativePath=".\Include\Win32\CxbxKrnl\HLEDataBase\DSound.1.0.4627.h">
+					RelativePath="Include\Win32\CxbxKrnl\HLEDataBase\DSound.1.0.4432.h">
 				</File>
 				<File
-					RelativePath=".\Include\Win32\CxbxKrnl\HLEDataBase\XG.1.0.4361.h">
+					RelativePath="Include\Win32\CxbxKrnl\HLEDataBase\DSound.1.0.4627.h">
 				</File>
 				<File
-					RelativePath=".\Include\Win32\CxbxKrnl\HLEDataBase\XG.1.0.4627.h">
+					RelativePath="Include\Win32\CxbxKrnl\HLEDataBase\Xapi.1.0.3911.h">
 				</File>
 				<File
-					RelativePath=".\Include\Win32\CxbxKrnl\HLEDataBase\XNet.1.0.3911.h">
+					RelativePath="Include\Win32\CxbxKrnl\HLEDataBase\Xapi.1.0.4034.h">
 				</File>
 				<File
-					RelativePath=".\Include\Win32\CxbxKrnl\HLEDataBase\XOnline.1.0.4361.h">
+					RelativePath="Include\Win32\CxbxKrnl\HLEDataBase\Xapi.1.0.4134.h">
 				</File>
 				<File
-					RelativePath=".\Include\Win32\CxbxKrnl\HLEDataBase\Xapi.1.0.3911.h">
+					RelativePath="Include\Win32\CxbxKrnl\HLEDataBase\Xapi.1.0.4361.h">
 				</File>
 				<File
-					RelativePath=".\Include\Win32\CxbxKrnl\HLEDataBase\Xapi.1.0.4034.h">
+					RelativePath="Include\Win32\CxbxKrnl\HLEDataBase\Xapi.1.0.4432.h">
 				</File>
 				<File
-					RelativePath=".\Include\Win32\CxbxKrnl\HLEDataBase\Xapi.1.0.4134.h">
+					RelativePath="Include\Win32\CxbxKrnl\HLEDataBase\Xapi.1.0.4627.h">
 				</File>
 				<File
-					RelativePath=".\Include\Win32\CxbxKrnl\HLEDataBase\Xapi.1.0.4361.h">
+					RelativePath="Include\Win32\CxbxKrnl\HLEDataBase\XG.1.0.4361.h">
 				</File>
 				<File
-					RelativePath=".\Include\Win32\CxbxKrnl\HLEDataBase\Xapi.1.0.4432.h">
+					RelativePath="Include\Win32\CxbxKrnl\HLEDataBase\XG.1.0.4627.h">
 				</File>
 				<File
-					RelativePath=".\Include\Win32\CxbxKrnl\HLEDataBase\Xapi.1.0.4627.h">
+					RelativePath="Include\Win32\CxbxKrnl\HLEDataBase\XNet.1.0.3911.h">
+				</File>
+				<File
+					RelativePath="Include\Win32\CxbxKrnl\HLEDataBase\XOnline.1.0.4361.h">
 				</File>
 			</Filter>
 			<Filter
 				Name="EmuD3D8 (h)"
 				Filter="">
 				<File
-					RelativePath=".\Include\Win32\CxbxKrnl\EmuD3D8\Convert.h">
+					RelativePath="Include\Win32\CxbxKrnl\EmuD3D8\Convert.h">
 				</File>
 				<File
-					RelativePath=".\Include\Win32\CxbxKrnl\EmuD3D8\PushBuffer.h">
+					RelativePath="Include\Win32\CxbxKrnl\EmuD3D8\PushBuffer.h">
 				</File>
 				<File
-					RelativePath=".\Include\Win32\CxbxKrnl\EmuD3D8\VertexBuffer.h">
+					RelativePath="Include\Win32\CxbxKrnl\EmuD3D8\State.h">
 				</File>
 				<File
-					RelativePath=".\Include\Win32\CxbxKrnl\EmuD3D8\VertexShader.h">
+					RelativePath="Include\Win32\CxbxKrnl\EmuD3D8\VertexBuffer.h">
+				</File>
+				<File
+					RelativePath="Include\Win32\CxbxKrnl\EmuD3D8\VertexShader.h">
 				</File>
 			</Filter>
 		</Filter>
@@ -323,21 +346,23 @@
 			Name="Resource"
 			Filter="">
 			<File
-				RelativePath=".\Resource\Cxbx.ico">
+				RelativePath="Resource\Cxbx.ico">
 			</File>
 			<File
-				RelativePath=".\Resource\CxbxDll.rc">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCResourceCompilerTool"
-						AdditionalIncludeDirectories="Include\Win32\CxbxKrnl;Resource;$(NoInherit)"/>
-				</FileConfiguration>
+				RelativePath="Resource\CxbxDll.rc">
 				<FileConfiguration
 					Name="Release|Win32">
 					<Tool
 						Name="VCResourceCompilerTool"
-						AdditionalIncludeDirectories="Include\Win32\CxbxKrnl;Resource;$(NoInherit)"/>
+						PreprocessorDefinitions=""
+						AdditionalIncludeDirectories="Resource"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCResourceCompilerTool"
+						PreprocessorDefinitions=""
+						AdditionalIncludeDirectories="Resource"/>
 				</FileConfiguration>
 			</File>
 		</Filter>
@@ -345,137 +370,809 @@
 			Name="Source"
 			Filter="">
 			<File
-				RelativePath=".\Source\Win32\CxbxKrnl\Emu.cpp">
+				RelativePath="Source\Win32\CxbxKrnl\Emu.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;CXBXKRNL_EXPORTS;$(NoInherit)"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;CXBXKRNL_EXPORTS;$(NoInherit)"
+						BasicRuntimeChecks="3"
+						BrowseInformation="1"/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\Source\Win32\CxbxKrnl\EmuD3D8.cpp">
+				RelativePath="Source\Win32\CxbxKrnl\EmuD3D8.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;CXBXKRNL_EXPORTS;$(NoInherit)"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;CXBXKRNL_EXPORTS;$(NoInherit)"
+						BasicRuntimeChecks="3"
+						BrowseInformation="1"/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\Source\Win32\CxbxKrnl\EmuDInput.cpp">
+				RelativePath="Source\Win32\CxbxKrnl\EmuDInput.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;CXBXKRNL_EXPORTS;$(NoInherit)"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;CXBXKRNL_EXPORTS;$(NoInherit)"
+						BasicRuntimeChecks="3"
+						BrowseInformation="1"/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\Source\Win32\CxbxKrnl\EmuDSound.cpp">
+				RelativePath="Source\Win32\CxbxKrnl\EmuDSound.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;CXBXKRNL_EXPORTS;$(NoInherit)"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;CXBXKRNL_EXPORTS;$(NoInherit)"
+						BasicRuntimeChecks="3"
+						BrowseInformation="1"/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\Source\Win32\CxbxKrnl\EmuFS.cpp">
+				RelativePath="Source\Win32\CxbxKrnl\EmuFile.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;CXBXKRNL_EXPORTS;$(NoInherit)"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;CXBXKRNL_EXPORTS;$(NoInherit)"
+						BasicRuntimeChecks="3"
+						BrowseInformation="1"/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\Source\Win32\CxbxKrnl\EmuFile.cpp">
+				RelativePath="Source\Win32\CxbxKrnl\EmuFS.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;CXBXKRNL_EXPORTS;$(NoInherit)"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;CXBXKRNL_EXPORTS;$(NoInherit)"
+						BasicRuntimeChecks="3"
+						BrowseInformation="1"/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\Source\Win32\CxbxKrnl\EmuKrnl.cpp">
+				RelativePath="Source\Win32\CxbxKrnl\EmuKrnl.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;CXBXKRNL_EXPORTS;$(NoInherit)"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;CXBXKRNL_EXPORTS;$(NoInherit)"
+						BasicRuntimeChecks="3"
+						BrowseInformation="1"/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\Source\Win32\CxbxKrnl\EmuLDT.cpp">
+				RelativePath="Source\Win32\CxbxKrnl\EmuLDT.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;CXBXKRNL_EXPORTS;$(NoInherit)"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;CXBXKRNL_EXPORTS;$(NoInherit)"
+						BasicRuntimeChecks="3"
+						BrowseInformation="1"/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\Source\Win32\CxbxKrnl\EmuNtDll.cpp">
+				RelativePath="Source\Win32\CxbxKrnl\EmuNtDll.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;CXBXKRNL_EXPORTS;$(NoInherit)"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;CXBXKRNL_EXPORTS;$(NoInherit)"
+						BasicRuntimeChecks="3"
+						BrowseInformation="1"/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\Source\Win32\EmuShared.cpp">
+				RelativePath="Source\Win32\EmuShared.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;CXBXKRNL_EXPORTS;$(NoInherit)"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;CXBXKRNL_EXPORTS;$(NoInherit)"
+						BasicRuntimeChecks="3"
+						BrowseInformation="1"/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\Source\Win32\CxbxKrnl\EmuXG.cpp">
+				RelativePath="Source\Win32\CxbxKrnl\EmuXapi.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;CXBXKRNL_EXPORTS;$(NoInherit)"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;CXBXKRNL_EXPORTS;$(NoInherit)"
+						BasicRuntimeChecks="3"
+						BrowseInformation="1"/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\Source\Win32\CxbxKrnl\EmuXOnline.cpp">
+				RelativePath="Source\Win32\CxbxKrnl\EmuXG.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;CXBXKRNL_EXPORTS;$(NoInherit)"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;CXBXKRNL_EXPORTS;$(NoInherit)"
+						BasicRuntimeChecks="3"
+						BrowseInformation="1"/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\Source\Win32\CxbxKrnl\EmuXapi.cpp">
+				RelativePath="Source\Win32\CxbxKrnl\EmuXOnline.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;CXBXKRNL_EXPORTS;$(NoInherit)"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;CXBXKRNL_EXPORTS;$(NoInherit)"
+						BasicRuntimeChecks="3"
+						BrowseInformation="1"/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\Source\Core\Error.cpp">
+				RelativePath="Source\Core\Error.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;CXBXKRNL_EXPORTS;$(NoInherit)"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;CXBXKRNL_EXPORTS;$(NoInherit)"
+						BasicRuntimeChecks="3"
+						BrowseInformation="1"/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\Source\Win32\CxbxKrnl\HLEDataBase.cpp">
+				RelativePath="Source\Win32\CxbxKrnl\HLEDataBase.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;CXBXKRNL_EXPORTS;$(NoInherit)"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;CXBXKRNL_EXPORTS;$(NoInherit)"
+						BasicRuntimeChecks="3"
+						BrowseInformation="1"/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\Source\Win32\CxbxKrnl\KernelThunk.cpp">
+				RelativePath="Source\Win32\CxbxKrnl\KernelThunk.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;CXBXKRNL_EXPORTS;$(NoInherit)"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;CXBXKRNL_EXPORTS;$(NoInherit)"
+						BasicRuntimeChecks="3"
+						BrowseInformation="1"/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\Source\Win32\Mutex.cpp">
+				RelativePath="Source\Win32\Mutex.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;CXBXKRNL_EXPORTS;$(NoInherit)"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;CXBXKRNL_EXPORTS;$(NoInherit)"
+						BasicRuntimeChecks="3"
+						BrowseInformation="1"/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\Source\Win32\XBController.cpp">
+				RelativePath="Source\Win32\XBController.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;CXBXKRNL_EXPORTS;$(NoInherit)"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;CXBXKRNL_EXPORTS;$(NoInherit)"
+						BasicRuntimeChecks="3"
+						BrowseInformation="1"/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\Source\Win32\XBVideo.cpp">
+				RelativePath="Source\Win32\XBVideo.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;CXBXKRNL_EXPORTS;$(NoInherit)"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;CXBXKRNL_EXPORTS;$(NoInherit)"
+						BasicRuntimeChecks="3"
+						BrowseInformation="1"/>
+				</FileConfiguration>
 			</File>
 			<Filter
 				Name="HLEDataBase (inl)"
 				Filter="">
 				<File
-					RelativePath=".\Source\Win32\CxbxKrnl\HLEDataBase\D3D8.1.0.3925.inl">
+					RelativePath="Source\Win32\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=".\Source\Win32\CxbxKrnl\HLEDataBase\D3D8.1.0.4034.inl">
+					RelativePath="Source\Win32\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=".\Source\Win32\CxbxKrnl\HLEDataBase\D3D8.1.0.4134.inl">
+					RelativePath="Source\Win32\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=".\Source\Win32\CxbxKrnl\HLEDataBase\D3D8.1.0.4361.inl">
+					RelativePath="Source\Win32\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=".\Source\Win32\CxbxKrnl\HLEDataBase\D3D8.1.0.4432.inl">
+					RelativePath="Source\Win32\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=".\Source\Win32\CxbxKrnl\HLEDataBase\D3D8.1.0.4627.inl">
+					RelativePath="Source\Win32\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=".\Source\Win32\CxbxKrnl\HLEDataBase\DSound.1.0.3936.inl">
+					RelativePath="Source\Win32\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=".\Source\Win32\CxbxKrnl\HLEDataBase\DSound.1.0.4361.inl">
+					RelativePath="Source\Win32\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=".\Source\Win32\CxbxKrnl\HLEDataBase\DSound.1.0.4627.inl">
+					RelativePath="Source\Win32\CxbxKrnl\HLEDataBase\DSound.1.0.4432.inl">
+					<FileConfiguration
+						Name="Debug|Win32"
+						ExcludedFromBuild="TRUE">
+						<Tool
+							Name="VCCustomBuildTool"/>
+					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\Source\Win32\CxbxKrnl\HLEDataBase\XG.1.0.4361.inl">
+					RelativePath="Source\Win32\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=".\Source\Win32\CxbxKrnl\HLEDataBase\XG.1.0.4627.inl">
+					RelativePath="Source\Win32\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=".\Source\Win32\CxbxKrnl\HLEDataBase\XNet.1.0.3911.inl">
+					RelativePath="Source\Win32\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=".\Source\Win32\CxbxKrnl\HLEDataBase\XOnline.1.0.4361.inl">
+					RelativePath="Source\Win32\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=".\Source\Win32\CxbxKrnl\HLEDataBase\Xapi.1.0.3911.inl">
+					RelativePath="Source\Win32\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=".\Source\Win32\CxbxKrnl\HLEDataBase\Xapi.1.0.4034.inl">
+					RelativePath="Source\Win32\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=".\Source\Win32\CxbxKrnl\HLEDataBase\Xapi.1.0.4134.inl">
+					RelativePath="Source\Win32\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=".\Source\Win32\CxbxKrnl\HLEDataBase\Xapi.1.0.4361.inl">
+					RelativePath="Source\Win32\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=".\Source\Win32\CxbxKrnl\HLEDataBase\Xapi.1.0.4432.inl">
+					RelativePath="Source\Win32\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=".\Source\Win32\CxbxKrnl\HLEDataBase\Xapi.1.0.4627.inl">
+					RelativePath="Source\Win32\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="Source\Win32\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>
 			</Filter>
 			<Filter
 				Name="EmuD3D8 (cpp)"
 				Filter="">
 				<File
-					RelativePath=".\Source\Win32\CxbxKrnl\EmuD3D8\Convert.cpp">
+					RelativePath="Source\Win32\CxbxKrnl\EmuD3D8\Convert.cpp">
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;CXBXKRNL_EXPORTS;$(NoInherit)"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;CXBXKRNL_EXPORTS;$(NoInherit)"
+							BasicRuntimeChecks="3"
+							BrowseInformation="1"/>
+					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\Source\Win32\CxbxKrnl\EmuD3D8\PushBuffer.cpp">
+					RelativePath="Source\Win32\CxbxKrnl\EmuD3D8\PushBuffer.cpp">
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;CXBXKRNL_EXPORTS;$(NoInherit)"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;CXBXKRNL_EXPORTS;$(NoInherit)"
+							BasicRuntimeChecks="3"
+							BrowseInformation="1"/>
+					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\Source\Win32\CxbxKrnl\EmuD3D8\VertexBuffer.cpp">
+					RelativePath="Source\Win32\CxbxKrnl\EmuD3D8\State.cpp">
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;CXBXKRNL_EXPORTS;$(NoInherit)"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;CXBXKRNL_EXPORTS;$(NoInherit)"
+							BasicRuntimeChecks="3"
+							BrowseInformation="1"/>
+					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\Source\Win32\CxbxKrnl\EmuD3D8\VertexShader.cpp">
+					RelativePath="Source\Win32\CxbxKrnl\EmuD3D8\VertexBuffer.cpp">
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;CXBXKRNL_EXPORTS;$(NoInherit)"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;CXBXKRNL_EXPORTS;$(NoInherit)"
+							BasicRuntimeChecks="3"
+							BrowseInformation="1"/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="Source\Win32\CxbxKrnl\EmuD3D8\VertexShader.cpp">
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="2"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;CXBXKRNL_EXPORTS;$(NoInherit)"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							Optimization="0"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;CXBXKRNL_EXPORTS;$(NoInherit)"
+							BasicRuntimeChecks="3"
+							BrowseInformation="1"/>
+					</FileConfiguration>
 				</File>
 			</Filter>
 		</Filter>