diff --git a/Cxbx.dsp b/Cxbx.dsp
index 0315e3397..0abcc514c 100644
--- a/Cxbx.dsp
+++ b/Cxbx.dsp
@@ -130,7 +130,7 @@ SOURCE=.\Include\Core\Exe.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\Include\Win32\CxbxKrnl\Kernel.h
+SOURCE=.\Include\Win32\CxbxKrnl\CxbxKrnl.h
 # End Source File
 # Begin Source File
 
diff --git a/Cxbx.vcproj b/Cxbx.vcproj
index 160ffed4c..633d8f450 100644
--- a/Cxbx.vcproj
+++ b/Cxbx.vcproj
@@ -104,6 +104,7 @@ upxCxbx.bat
 				OutputFile=".\Bin\Debug/Cxbx.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\Bin\Debug/Cxbx.pdb"
 				SubSystem="2"/>
@@ -153,7 +154,7 @@ upxCxbx.bat
 				RelativePath=".\Include\Core\Exe.h">
 			</File>
 			<File
-				RelativePath=".\Include\Win32\CxbxKrnl\Kernel.h">
+				RelativePath=".\Include\Win32\CxbxKrnl\CxbxKrnl.h">
 			</File>
 			<File
 				RelativePath=".\Include\Win32\Cxbx\Prolog.h">
diff --git a/CxbxKrnl.dsp b/CxbxKrnl.dsp
index 32c7cd816..2521bf019 100644
--- a/CxbxKrnl.dsp
+++ b/CxbxKrnl.dsp
@@ -104,7 +104,7 @@ LINK32=link.exe
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\Include\Win32\CxbxKrnl\Kernel.h
+SOURCE=.\Include\Win32\CxbxKrnl\CxbxKrnl.h
 # End Source File
 # Begin Source File
 
@@ -120,7 +120,7 @@ SOURCE=.\Include\Win32\CxbxKrnl\xntdll.h
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\Source\Win32\CxbxKrnl\Kernel.cpp
+SOURCE=.\Source\Win32\CxbxKrnl\CxbxKrnl.cpp
 # End Source File
 # Begin Source File
 
diff --git a/CxbxKrnl.vcproj b/CxbxKrnl.vcproj
index 8b2a26207..09b08f8fd 100644
--- a/CxbxKrnl.vcproj
+++ b/CxbxKrnl.vcproj
@@ -131,7 +131,7 @@
 			Name="Include"
 			Filter="">
 			<File
-				RelativePath=".\Include\Win32\CxbxKrnl\Kernel.h">
+				RelativePath=".\Include\Win32\CxbxKrnl\CxbxKrnl.h">
 			</File>
 			<File
 				RelativePath=".\Include\Win32\CxbxKrnl\xntdll.h">
@@ -141,7 +141,7 @@
 			Name="Source"
 			Filter="">
 			<File
-				RelativePath=".\Source\Win32\CxbxKrnl\Kernel.cpp">
+				RelativePath=".\Source\Win32\CxbxKrnl\CxbxKrnl.cpp">
 			</File>
 			<File
 				RelativePath=".\Source\Win32\CxbxKrnl\KernelThunk.cpp">
diff --git a/Include/Win32/CxbxKrnl/Kernel.h b/Include/Win32/CxbxKrnl/CxbxKrnl.h
similarity index 97%
rename from Include/Win32/CxbxKrnl/Kernel.h
rename to Include/Win32/CxbxKrnl/CxbxKrnl.h
index 6a2ca0989..ce58c8ae1 100644
--- a/Include/Win32/CxbxKrnl/Kernel.h
+++ b/Include/Win32/CxbxKrnl/CxbxKrnl.h
@@ -7,7 +7,7 @@
 // *  `88bo,__,o,    oP"``"Yo,  _88o,,od8P   oP"``"Yo,  
 // *    "YUMMMMMP",m"       "Mm,""YUMMMP" ,m"       "Mm,
 // *
-// *   Cxbx->Win32->CxbxKrnl->Kernel.h
+// *   Cxbx->Win32->CxbxKrnl->CxbxKrnl.h
 // *
 // *  This file is part of the Cxbx project.
 // *
@@ -31,8 +31,8 @@
 // *  All rights reserved
 // *
 // ******************************************************************
-#ifndef KERNEL_H
-#define KERNEL_H
+#ifndef CXBXKRNL_H
+#define CXBXKRNL_H
 
 // ******************************************************************
 // * namespace used to avoid collisions with ntdll and win32
diff --git a/Source/Win32/Cxbx/EmuExe.cpp b/Source/Win32/Cxbx/EmuExe.cpp
index 0c606b717..e2a45a794 100644
--- a/Source/Win32/Cxbx/EmuExe.cpp
+++ b/Source/Win32/Cxbx/EmuExe.cpp
@@ -35,7 +35,7 @@
 
 #include "EmuExe.h"
 #include "Prolog.h"
-#include "Kernel.h"
+#include "CxbxKrnl.h"
 
 #undef FIELD_OFFSET     // prevent macro redefinition warnings
 #include <windows.h>
diff --git a/Source/Win32/Cxbx/WndMain.cpp b/Source/Win32/Cxbx/WndMain.cpp
index 9d92a2fc0..0ee860c1f 100644
--- a/Source/Win32/Cxbx/WndMain.cpp
+++ b/Source/Win32/Cxbx/WndMain.cpp
@@ -33,7 +33,7 @@
 // ******************************************************************
 #include "Cxbx.h"
 #include "EmuExe.h"
-#include "Kernel.h"
+#include "CxbxKrnl.h"
 #include "WndMain.h"
 #include "WndAbout.h"
 
diff --git a/Source/Win32/CxbxKrnl/Kernel.cpp b/Source/Win32/CxbxKrnl/CxbxKrnl.cpp
similarity index 99%
rename from Source/Win32/CxbxKrnl/Kernel.cpp
rename to Source/Win32/CxbxKrnl/CxbxKrnl.cpp
index 04c127211..fc590fea8 100644
--- a/Source/Win32/CxbxKrnl/Kernel.cpp
+++ b/Source/Win32/CxbxKrnl/CxbxKrnl.cpp
@@ -7,7 +7,7 @@
 // *  `88bo,__,o,    oP"``"Yo,  _88o,,od8P   oP"``"Yo,  
 // *    "YUMMMMMP",m"       "Mm,""YUMMMP" ,m"       "Mm,
 // *
-// *   Cxbx->Win32->CxbxKrnl->Kernel.cpp
+// *   Cxbx->Win32->CxbxKrnl->CxbxKrnl.cpp
 // *
 // *  This file is part of the Cxbx project.
 // *
@@ -35,7 +35,7 @@
 
 #define CXBXKRNL_INTERNAL
 #define _XBOXKRNL_LOCAL_
-#include "Kernel.h"
+#include "CxbxKrnl.h"
 
 #include <stdio.h>
 
diff --git a/Source/Win32/CxbxKrnl/KernelThunk.cpp b/Source/Win32/CxbxKrnl/KernelThunk.cpp
index 4cd94b034..4eda0aad9 100644
--- a/Source/Win32/CxbxKrnl/KernelThunk.cpp
+++ b/Source/Win32/CxbxKrnl/KernelThunk.cpp
@@ -35,7 +35,7 @@
 
 #define CXBXKRNL_INTERNAL
 #define _XBOXKRNL_LOCAL_
-#include "Kernel.h"
+#include "CxbxKrnl.h"
 
 // ******************************************************************
 // * NOTE: