diff --git a/Cxbx.sln b/Cxbx.sln
index d934c240d..b1d25311b 100644
--- a/Cxbx.sln
+++ b/Cxbx.sln
@@ -1,9 +1,9 @@
 Microsoft Visual Studio Solution File, Format Version 7.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cxbe", "Cxbe.vcproj", "{81E3463B-94CA-4EA7-8EDF-CE83C202E095}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cxbe", "Cxbe.vcproj", "{2BEF8939-0056-4B8E-96EB-06BA582345F0}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cxbx", "Cxbx.vcproj", "{ED7337E9-6814-41BF-A2EB-F0A67AD966F7}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cxbx", "Cxbx.vcproj", "{A0663801-ED2D-4DB0-A282-00407B2270AD}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CxbxKrnl", "CxbxKrnl.vcproj", "{68DBE644-1D09-4C63-B19C-FA68FE6E6F35}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CxbxKrnl", "CxbxKrnl.vcproj", "{75779893-83CE-407E-900B-8CAE51E19618}"
 EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
@@ -11,21 +11,21 @@ Global
 		ConfigName.1 = Release
 	EndGlobalSection
 	GlobalSection(ProjectDependencies) = postSolution
-		{ED7337E9-6814-41BF-A2EB-F0A67AD966F7}.0 = {68DBE644-1D09-4C63-B19C-FA68FE6E6F35}
+		{A0663801-ED2D-4DB0-A282-00407B2270AD}.0 = {75779893-83CE-407E-900B-8CAE51E19618}
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
-		{81E3463B-94CA-4EA7-8EDF-CE83C202E095}.Debug.ActiveCfg = Debug|Win32
-		{81E3463B-94CA-4EA7-8EDF-CE83C202E095}.Debug.Build.0 = Debug|Win32
-		{81E3463B-94CA-4EA7-8EDF-CE83C202E095}.Release.ActiveCfg = Release|Win32
-		{81E3463B-94CA-4EA7-8EDF-CE83C202E095}.Release.Build.0 = Release|Win32
-		{ED7337E9-6814-41BF-A2EB-F0A67AD966F7}.Debug.ActiveCfg = Debug|Win32
-		{ED7337E9-6814-41BF-A2EB-F0A67AD966F7}.Debug.Build.0 = Debug|Win32
-		{ED7337E9-6814-41BF-A2EB-F0A67AD966F7}.Release.ActiveCfg = Release|Win32
-		{ED7337E9-6814-41BF-A2EB-F0A67AD966F7}.Release.Build.0 = Release|Win32
-		{68DBE644-1D09-4C63-B19C-FA68FE6E6F35}.Debug.ActiveCfg = Debug|Win32
-		{68DBE644-1D09-4C63-B19C-FA68FE6E6F35}.Debug.Build.0 = Debug|Win32
-		{68DBE644-1D09-4C63-B19C-FA68FE6E6F35}.Release.ActiveCfg = Release|Win32
-		{68DBE644-1D09-4C63-B19C-FA68FE6E6F35}.Release.Build.0 = Release|Win32
+		{2BEF8939-0056-4B8E-96EB-06BA582345F0}.Debug.ActiveCfg = Debug|Win32
+		{2BEF8939-0056-4B8E-96EB-06BA582345F0}.Debug.Build.0 = Debug|Win32
+		{2BEF8939-0056-4B8E-96EB-06BA582345F0}.Release.ActiveCfg = Release|Win32
+		{2BEF8939-0056-4B8E-96EB-06BA582345F0}.Release.Build.0 = Release|Win32
+		{A0663801-ED2D-4DB0-A282-00407B2270AD}.Debug.ActiveCfg = Debug|Win32
+		{A0663801-ED2D-4DB0-A282-00407B2270AD}.Debug.Build.0 = Debug|Win32
+		{A0663801-ED2D-4DB0-A282-00407B2270AD}.Release.ActiveCfg = Release|Win32
+		{A0663801-ED2D-4DB0-A282-00407B2270AD}.Release.Build.0 = Release|Win32
+		{75779893-83CE-407E-900B-8CAE51E19618}.Debug.ActiveCfg = Debug|Win32
+		{75779893-83CE-407E-900B-8CAE51E19618}.Debug.Build.0 = Debug|Win32
+		{75779893-83CE-407E-900B-8CAE51E19618}.Release.ActiveCfg = Release|Win32
+		{75779893-83CE-407E-900B-8CAE51E19618}.Release.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection
diff --git a/Cxbx.vcproj b/Cxbx.vcproj
index 68f8827f1..866896847 100644
--- a/Cxbx.vcproj
+++ b/Cxbx.vcproj
@@ -193,6 +193,9 @@ upxCxbx.bat
 			<File
 				RelativePath=".\Include\Win32\CxbxKrnl\EmuShared.h">
 			</File>
+			<File
+				RelativePath=".\Include\Win32\CxbxKrnl\EmuXapi.h">
+			</File>
 			<File
 				RelativePath=".\Include\Core\Error.h">
 			</File>
diff --git a/CxbxKrnl.vcproj b/CxbxKrnl.vcproj
index 7372ccd10..2a4a26b78 100644
--- a/CxbxKrnl.vcproj
+++ b/CxbxKrnl.vcproj
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="d3d8.lib dinput8.lib dxguid.lib ntdll.lib odbc32.lib odbccp32.lib"
+				AdditionalDependencies="d3d8.lib dinput8.lib dxguid.lib odbc32.lib odbccp32.lib"
 				OutputFile=".\Bin\Debug/CxbxKrnl.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
@@ -101,12 +101,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="d3d8.lib dinput8.lib dxguid.lib ntdll.lib odbc32.lib odbccp32.lib"
+				AdditionalDependencies="d3d8.lib dinput8.lib dxguid.lib odbc32.lib odbccp32.lib"
 				OutputFile="Bin/Cxbx.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="Lib"
-				IgnoreDefaultLibraryNames="libc"
+				IgnoreDefaultLibraryNames="lbc"
 				ProgramDatabaseFile=".\Bin/Cxbx.pdb"
 				ImportLibrary=".\Bin/Cxbx.lib"/>
 			<Tool
@@ -316,6 +316,9 @@
 			<File
 				RelativePath=".\Source\Win32\CxbxKrnl\EmuXapi.cpp">
 			</File>
+			<File
+				RelativePath=".\Source\Core\Error.cpp">
+			</File>
 			<File
 				RelativePath=".\Source\Win32\CxbxKrnl\HLEDataBase.cpp">
 			</File>