diff --git a/src/Common/Error.cpp b/src/Common/Error.cpp
index 68927081c..95ce91867 100644
--- a/src/Common/Error.cpp
+++ b/src/Common/Error.cpp
@@ -34,7 +34,7 @@
 
 #include "Common/Error.h"
 
-#include <string.h>
+#include <cstring>
 
 // clear the current error (returns false if error was fatal)
 bool Error::ClearError()
diff --git a/src/Common/Exe.cpp b/src/Common/Exe.cpp
index 2fb4177e2..c887c61c5 100644
--- a/src/Common/Exe.cpp
+++ b/src/Common/Exe.cpp
@@ -33,7 +33,7 @@
 // ******************************************************************
 #include "Exe.h"
 
-#include <stdio.h>
+#include <cstdio>
 #include <memory.h>
 
 // construct via Exe file
diff --git a/src/Common/Win32/EmuShared.cpp b/src/Common/Win32/EmuShared.cpp
index f5d6b5e57..5525d46f3 100644
--- a/src/Common/Win32/EmuShared.cpp
+++ b/src/Common/Win32/EmuShared.cpp
@@ -40,7 +40,7 @@
 
 #undef FIELD_OFFSET     // prevent macro redefinition warnings
 #include <windows.h>
-#include <stdio.h>
+#include <cstdio>
 
 // ******************************************************************
 // * exported globals
diff --git a/src/Common/Win32/XBController.h b/src/Common/Win32/XBController.h
index 6e5d5dcfc..2b06a6647 100644
--- a/src/Common/Win32/XBController.h
+++ b/src/Common/Win32/XBController.h
@@ -38,8 +38,8 @@
 #include "Common/Error.h"
 #include "Mutex.h"
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #include <windows.h>
 
 #include "CxbxKrnl/EmuXTL.h"
diff --git a/src/Common/Win32/XBVideo.cpp b/src/Common/Win32/XBVideo.cpp
index 564325dcd..1091c54bb 100644
--- a/src/Common/Win32/XBVideo.cpp
+++ b/src/Common/Win32/XBVideo.cpp
@@ -33,7 +33,7 @@
 // ******************************************************************
 #include "XBVideo.h"
 
-#include <stdio.h>
+#include <cstdio>
 
 // ******************************************************************
 // * func: XBVideo::XBVideo
diff --git a/src/Common/Xbe.cpp b/src/Common/Xbe.cpp
index ecf4520aa..e689dd095 100644
--- a/src/Common/Xbe.cpp
+++ b/src/Common/Xbe.cpp
@@ -36,10 +36,10 @@
 #include "CxbxUtil.h"
 
 #include <memory.h>
-#include <locale.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
+#include <clocale>
+#include <cstdlib>
+#include <cstring>
+#include <ctime>
 
 // construct via Xbe file
 Xbe::Xbe(const char *x_szFilename)
diff --git a/src/Common/Xbe.h b/src/Common/Xbe.h
index 9a5ed8884..fcea19d2f 100644
--- a/src/Common/Xbe.h
+++ b/src/Common/Xbe.h
@@ -36,7 +36,7 @@
 
 #include "Common/Error.h"
 
-#include <stdio.h>
+#include <cstdio>
 
 // Xbe (Xbox Executable) file object
 class Xbe : public Error
diff --git a/src/Cxbe/Main.cpp b/src/Cxbe/Main.cpp
index 39c7eb07d..398dd8a5f 100644
--- a/src/Cxbe/Main.cpp
+++ b/src/Cxbe/Main.cpp
@@ -35,7 +35,7 @@
 #include "../Common/Exe.h"
 #include "../Common/Xbe.h"
 
-#include <string.h>
+#include <cstring>
 
 // static global(s)
 static void ShowUsage();
diff --git a/src/Cxbx/DlgControllerConfig.cpp b/src/Cxbx/DlgControllerConfig.cpp
index d0eeaf46e..2dca3c073 100644
--- a/src/Cxbx/DlgControllerConfig.cpp
+++ b/src/Cxbx/DlgControllerConfig.cpp
@@ -38,7 +38,7 @@
 #include "ResCxbx.h"
 
 #include <dinput.h>
-#include <stdio.h>
+#include <cstdio>
 
 /*! windows dialog procedure */
 static INT_PTR CALLBACK DlgControllerConfigProc(HWND hWndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
diff --git a/src/Cxbx/EmuExe.cpp b/src/Cxbx/EmuExe.cpp
index 3e9432005..dc220f053 100644
--- a/src/Cxbx/EmuExe.cpp
+++ b/src/Cxbx/EmuExe.cpp
@@ -37,7 +37,7 @@
 #include "CxbxUtil.h"
 #include "CxbxKrnl/CxbxKrnl.h"
 
-#include <stdio.h>
+#include <cstdio>
 
 // ******************************************************************
 // * constructor
diff --git a/src/Cxbx/WndAbout.cpp b/src/Cxbx/WndAbout.cpp
index 7540e282c..71025f402 100644
--- a/src/Cxbx/WndAbout.cpp
+++ b/src/Cxbx/WndAbout.cpp
@@ -35,7 +35,7 @@
 #include "ResCxbx.h"
 #include "jpegdec/jpegdec.h"
 
-#include <stdio.h>
+#include <cstdio>
 
 WndAbout::WndAbout(HINSTANCE x_hInstance, HWND x_parent) : Wnd(x_hInstance)
 {
diff --git a/src/Cxbx/jpegdec/jpegdec.cpp b/src/Cxbx/jpegdec/jpegdec.cpp
index 564bf6d0f..2c2d743de 100644
--- a/src/Cxbx/jpegdec/jpegdec.cpp
+++ b/src/Cxbx/jpegdec/jpegdec.cpp
@@ -33,7 +33,7 @@
 // ******************************************************************
 #include "jpegdec.h"
 
-#include <stdio.h>
+#include <cstdio>
 #include <malloc.h>
 
 extern "C"
diff --git a/src/CxbxKrnl/CxbxKrnl.cpp b/src/CxbxKrnl/CxbxKrnl.cpp
index f0fcfe9c0..5ece52caf 100644
--- a/src/CxbxKrnl/CxbxKrnl.cpp
+++ b/src/CxbxKrnl/CxbxKrnl.cpp
@@ -48,7 +48,7 @@ namespace xboxkrnl
 #include "HLEIntercept.h"
 
 #include <shlobj.h>
-#include <locale.h>
+#include <clocale>
 
 /* prevent name collisions */
 namespace NtDll
diff --git a/src/CxbxKrnl/EmuD3D8.cpp b/src/CxbxKrnl/EmuD3D8.cpp
index fb059215a..dc7a9d1b1 100644
--- a/src/CxbxKrnl/EmuD3D8.cpp
+++ b/src/CxbxKrnl/EmuD3D8.cpp
@@ -52,7 +52,7 @@ namespace xboxkrnl
 #include "ResCxbxDll.h"
 
 #include <process.h>
-#include <locale.h>
+#include <clocale>
 
 // Global(s)
 HWND                                g_hEmuWindow   = NULL; // rendering window
diff --git a/src/CxbxKrnl/EmuD3D8/VertexBuffer.cpp b/src/CxbxKrnl/EmuD3D8/VertexBuffer.cpp
index 0f500b162..40eedaede 100644
--- a/src/CxbxKrnl/EmuD3D8/VertexBuffer.cpp
+++ b/src/CxbxKrnl/EmuD3D8/VertexBuffer.cpp
@@ -40,7 +40,7 @@
 #include "CxbxKrnl/EmuXTL.h"
 #include "CxbxKrnl/ResourceTracker.h"
 
-#include <time.h>
+#include <ctime>
 
 #define VERTEX_BUFFER_CACHE_SIZE 64
 #define MAX_STREAM_NOT_USED_TIME (2 * CLOCKS_PER_SEC) // TODO: Trim the not used time
diff --git a/src/CxbxKrnl/EmuD3D8/VertexBuffer.h b/src/CxbxKrnl/EmuD3D8/VertexBuffer.h
index f71ff185f..c1cbf0aa4 100644
--- a/src/CxbxKrnl/EmuD3D8/VertexBuffer.h
+++ b/src/CxbxKrnl/EmuD3D8/VertexBuffer.h
@@ -35,7 +35,7 @@
 #define VERTEXBUFFER_H
 
 #include "Cxbx.h"
-//#include <time.h> // Conflict with io.h
+//#include <ctime> // Conflict with io.h
 
 #define MAX_NBR_STREAMS 16
 
diff --git a/src/CxbxKrnl/EmuDSound.cpp b/src/CxbxKrnl/EmuDSound.cpp
index b53aa9c8a..ecf38135d 100644
--- a/src/CxbxKrnl/EmuDSound.cpp
+++ b/src/CxbxKrnl/EmuDSound.cpp
@@ -50,7 +50,7 @@ namespace xboxkrnl
 #include <mmreg.h>
 #include <msacm.h>
 #include <process.h>
-#include <locale.h>
+#include <clocale>
 
 XTL::X_CMcpxStream::_vtbl XTL::X_CMcpxStream::vtbl =
 {
diff --git a/src/CxbxKrnl/EmuFS.cpp b/src/CxbxKrnl/EmuFS.cpp
index b4fdcd982..b9046a8a2 100644
--- a/src/CxbxKrnl/EmuFS.cpp
+++ b/src/CxbxKrnl/EmuFS.cpp
@@ -46,7 +46,7 @@ namespace xboxkrnl
 
 #undef FIELD_OFFSET     // prevent macro redefinition warnings
 #include <windows.h>
-#include <stdio.h>
+#include <cstdio>
 
 // automatically insert after this many EmuFS() swaps
 uint32 EmuAutoSleepRate = -1;
diff --git a/src/CxbxKrnl/EmuFile.h b/src/CxbxKrnl/EmuFile.h
index 8eb542ca2..e38e08518 100644
--- a/src/CxbxKrnl/EmuFile.h
+++ b/src/CxbxKrnl/EmuFile.h
@@ -42,7 +42,7 @@ namespace xboxkrnl
     #include <xboxkrnl/xboxkrnl.h>
 };
 
-#include <stdio.h>
+#include <cstdio>
 
 // ******************************************************************
 // * prevent name collisions
diff --git a/src/CxbxKrnl/EmuKrnl.cpp b/src/CxbxKrnl/EmuKrnl.cpp
index a524b1697..1b6e060a8 100644
--- a/src/CxbxKrnl/EmuKrnl.cpp
+++ b/src/CxbxKrnl/EmuKrnl.cpp
@@ -40,9 +40,9 @@ namespace xboxkrnl
     #include <xboxkrnl/xboxkrnl.h>
 };
 
-#include <stdio.h>
-#include <ctype.h>
-#include <locale.h>
+#include <cstdio>
+#include <cctype>
+#include <clocale>
 #include <process.h>
 
 // prevent name collisions
diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5849.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5849.inl
index e6c972400..b317b611f 100644
--- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5849.inl
+++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5849.inl
@@ -1170,7 +1170,7 @@ OOVPATable D3D8_1_0_5849[] =
         "EmuIDirect3DTexture8_GetSurfaceLevel2"
         #endif
     },
-    // IDirect3DDevice8::SetLight//(OOVPA*)&IDirect3DDevice8_SetLight_1_0_5558,
+    // IDirect3DDevice8::SetLight
     {
 
         (OOVPA*)&IDirect3DDevice8_SetLight_1_0_5558,
diff --git a/src/CxbxKrnl/HLEIntercept.cpp b/src/CxbxKrnl/HLEIntercept.cpp
index af71524ed..d0cf82782 100644
--- a/src/CxbxKrnl/HLEIntercept.cpp
+++ b/src/CxbxKrnl/HLEIntercept.cpp
@@ -198,7 +198,7 @@ void EmuHLEIntercept(Xbe::LibraryVersion *pLibraryVersion, Xbe::Header *pXbeHead
                 if(BuildVersion == 5659) { BuildVersion = 5558; }
                 if(BuildVersion == 5788) { BuildVersion = 5558; }
                 if(BuildVersion == 5028) { BuildVersion = 4627; }
-                if(BuildVersion == 5933) { BuildVersion = 5849; }   // These XDK versions are pretty mutch the same
+                if(BuildVersion == 5933) { BuildVersion = 5849; }   // These XDK versions are pretty much the same
                 /*
                 if(BuildVersion == 3944) { BuildVersion = 3925; }
                 if(BuildVersion == 4039) { BuildVersion = 4034; }
@@ -273,7 +273,7 @@ void EmuHLEIntercept(Xbe::LibraryVersion *pLibraryVersion, Xbe::Header *pXbeHead
                                 ProcessHeapOffs = 0x51;
                                 RtlCreateHeapOffs = 0x4A;
                             }
-                            if(BuildVersion >= 5233)
+                            else if(BuildVersion >= 5233)
                             {
                                 pFunc = EmuLocateFunction((OOVPA*)&XapiInitProcess_1_0_5233, lower, upper);
                                 ProcessHeapOffs = 0x51;