diff --git a/src/Common/CxbxDebugger.cpp b/src/Common/CxbxDebugger.cpp
index 76673a685..b0f940156 100644
--- a/src/Common/CxbxDebugger.cpp
+++ b/src/Common/CxbxDebugger.cpp
@@ -32,7 +32,7 @@
 // *
 // ******************************************************************
 
-#include "Cxbx.h"
+#include "CxbxCommon.h"
 #include "CxbxKrnl/EmuShared.h"
 #include "CxbxDebugger.h"
 
diff --git a/src/Common/EmuEEPROM.cpp b/src/Common/EmuEEPROM.cpp
index d12b537cf..1a0f78c29 100644
--- a/src/Common/EmuEEPROM.cpp
+++ b/src/Common/EmuEEPROM.cpp
@@ -44,7 +44,7 @@ namespace xboxkrnl
 #include <stdio.h> // For printf
 #include <shlobj.h> // For HANDLE, CreateFile, CreateFileMapping, MapViewOfFile
 
-#include "Cxbx.h" // For DbgPrintf
+#include "CxbxCommon.h" // For DbgPrintf
 #include "EmuEEPROM.h" // For EEPROMInfo, EEPROMInfos
 #include "..\CxbxKrnl\Emu.h" // For EmuWarning
 #include "..\..\src\devices\LED.h" // For SetLEDSequence
diff --git a/src/Common/Error.h b/src/Common/Error.h
index 428015ec2..07b071700 100644
--- a/src/Common/Error.h
+++ b/src/Common/Error.h
@@ -34,7 +34,7 @@
 #ifndef ERROR_H
 #define ERROR_H
 
-#include "Cxbx.h"
+#include "CxbxCommon.h"
 
 #include <string>
 
diff --git a/src/Common/Logging.h b/src/Common/Logging.h
index 5f5e7bff3..def3b4a51 100644
--- a/src/Common/Logging.h
+++ b/src/Common/Logging.h
@@ -40,7 +40,7 @@
 #include <sstream> // For std::stringstream
 #include <iostream> // For std::cout
 #include <iomanip> // For std::setw
-#include "Cxbx.h" // For g_bPrintfOn
+#include "CxbxCommon.h" // For g_bPrintfOn
 
 
 //
diff --git a/src/Common/Win32/XBAudio.h b/src/Common/Win32/XBAudio.h
index d4d28436c..850d8d892 100644
--- a/src/Common/Win32/XBAudio.h
+++ b/src/Common/Win32/XBAudio.h
@@ -34,7 +34,7 @@
 #ifndef XBAUDIO_H
 #define XBAUDIO_H
 
-#include "Cxbx.h"
+#include "CxbxCommon.h"
 #include "Common/Error.h"
 #include "Mutex.h"
 
diff --git a/src/Common/Win32/XBVideo.h b/src/Common/Win32/XBVideo.h
index 43630e44d..834065249 100644
--- a/src/Common/Win32/XBVideo.h
+++ b/src/Common/Win32/XBVideo.h
@@ -34,7 +34,7 @@
 #ifndef XBVIDEO_H
 #define XBVIDEO_H
 
-#include "Cxbx.h"
+#include "CxbxCommon.h"
 #include "Common/Error.h"
 #include "Mutex.h"
 
diff --git a/src/Cxbx/CxbxXbdm.cpp b/src/Cxbx/CxbxXbdm.cpp
index c25878876..e8804dfc9 100644
--- a/src/Cxbx/CxbxXbdm.cpp
+++ b/src/Cxbx/CxbxXbdm.cpp
@@ -42,7 +42,7 @@
 #include <cctype>
 #include <clocale>
 
-#include "Cxbx.h"
+#include "CxbxCommon.h"
 #include "Logging.h"
 
 namespace xbdm {
diff --git a/src/CxbxKrnl/DbgConsole.h b/src/CxbxKrnl/DbgConsole.h
index 90e0379f8..589f2ca70 100644
--- a/src/CxbxKrnl/DbgConsole.h
+++ b/src/CxbxKrnl/DbgConsole.h
@@ -34,7 +34,7 @@
 #ifndef DBGCONSOLE_H
 #define DBGCONSOLE_H
 
-#include "Cxbx.h"
+#include "CxbxCommon.h"
 
 // debug console input
 class DbgConsole
diff --git a/src/CxbxKrnl/EmuD3D8/PixelShader.h b/src/CxbxKrnl/EmuD3D8/PixelShader.h
index 28a80a604..9d7364eda 100644
--- a/src/CxbxKrnl/EmuD3D8/PixelShader.h
+++ b/src/CxbxKrnl/EmuD3D8/PixelShader.h
@@ -36,7 +36,7 @@
 
 #pragma once
 
-#include "Cxbx.h"
+#include "CxbxCommon.h"
 
 // dump pixel shader definition to file
 void DumpPixelShaderDefToFile( X_D3DPIXELSHADERDEF* pPSDef, const char* pszCode );
diff --git a/src/CxbxKrnl/EmuD3D8/VertexBuffer.h b/src/CxbxKrnl/EmuD3D8/VertexBuffer.h
index ab3a89f52..38bb60ad2 100755
--- a/src/CxbxKrnl/EmuD3D8/VertexBuffer.h
+++ b/src/CxbxKrnl/EmuD3D8/VertexBuffer.h
@@ -34,7 +34,7 @@
 #ifndef VERTEXBUFFER_H
 #define VERTEXBUFFER_H
 
-#include "Cxbx.h"
+#include "CxbxCommon.h"
 //#include <ctime> // Conflict with io.h
 
 #define MAX_NBR_STREAMS 16
@@ -126,4 +126,4 @@ extern VOID EmuUpdateActiveTexture();
 
 extern DWORD g_dwPrimPerFrame;
  
-#endif
\ No newline at end of file
+#endif
diff --git a/src/CxbxKrnl/EmuD3D8/VertexShader.h b/src/CxbxKrnl/EmuD3D8/VertexShader.h
index fff149950..525192b37 100644
--- a/src/CxbxKrnl/EmuD3D8/VertexShader.h
+++ b/src/CxbxKrnl/EmuD3D8/VertexShader.h
@@ -34,7 +34,7 @@
 #ifndef VERTEXSHADER_H
 #define VERTEXSHADER_H
 
-#include "Cxbx.h"
+#include "CxbxCommon.h"
 
 // nv2a microcode header
 typedef struct
diff --git a/src/CxbxKrnl/EmuShared.h b/src/CxbxKrnl/EmuShared.h
index 95a3f29b1..d9e31e50f 100644
--- a/src/CxbxKrnl/EmuShared.h
+++ b/src/CxbxKrnl/EmuShared.h
@@ -34,7 +34,7 @@
 #ifndef EMUSHARED_H
 #define EMUSHARED_H
 
-#include "Cxbx.h"
+#include "CxbxCommon.h"
 #include "Common/Win32/XBController.h"
 #include "Common/Win32/XBVideo.h"
 #include "Common/Win32/XBAudio.h"
diff --git a/src/CxbxKrnl/EmuX86.h b/src/CxbxKrnl/EmuX86.h
index 6b2423c5a..f739a873e 100644
--- a/src/CxbxKrnl/EmuX86.h
+++ b/src/CxbxKrnl/EmuX86.h
@@ -34,7 +34,7 @@
 #ifndef EMUX86_H
 #define EMUX86_H
 
-#include "Cxbx.h"
+#include "CxbxCommon.h"
 #include <cstdint>
 #include <windows.h>
 
diff --git a/src/CxbxKrnl/KernelThunk.cpp b/src/CxbxKrnl/KernelThunk.cpp
index 644003f92..9c836519a 100644
--- a/src/CxbxKrnl/KernelThunk.cpp
+++ b/src/CxbxKrnl/KernelThunk.cpp
@@ -41,7 +41,7 @@ namespace xboxkrnl
     #include <xboxkrnl/xboxkrnl.h>
 };
 
-#include "Cxbx.h" // For CxbxKrnl_KernelThunkTable
+#include "CxbxCommon.h" // For CxbxKrnl_KernelThunkTable
 #include "CxbxKrnl.h" // For UINT
 
 #define FUNC(f) f
diff --git a/src/CxbxKrnl/ResourceTracker.h b/src/CxbxKrnl/ResourceTracker.h
index 799bfd833..887b48830 100644
--- a/src/CxbxKrnl/ResourceTracker.h
+++ b/src/CxbxKrnl/ResourceTracker.h
@@ -34,7 +34,7 @@
 #ifndef RESOURCETRACKER_H
 #define RESOURCETRACKER_H
 
-#include "Cxbx.h"
+#include "CxbxCommon.h"
 #include "Common/Win32/Mutex.h"
 
 extern class ResourceTracker : public Mutex
diff --git a/src/devices/video/EmuNV2A_PTIMER.cpp b/src/devices/video/EmuNV2A_PTIMER.cpp
index 6ba4c5d5e..1cd8b6a09 100644
--- a/src/devices/video/EmuNV2A_PTIMER.cpp
+++ b/src/devices/video/EmuNV2A_PTIMER.cpp
@@ -39,7 +39,7 @@
 // *
 // ******************************************************************
 
-#include "Cxbx.h"
+#include "CxbxCommon.h"
 
 /* PTIMER - time measurement and time-based alarms */
 static uint64_t ptimer_get_clock(NV2AState * d)
diff --git a/src/devices/video/nv2a.h b/src/devices/video/nv2a.h
index 62d54f60d..6d732f628 100644
--- a/src/devices/video/nv2a.h
+++ b/src/devices/video/nv2a.h
@@ -40,7 +40,7 @@
 #include "glib_compat.h" // For GHashTable, g_hash_table_new, g_hash_table_lookup, g_hash_table_insert
 #endif
 
-#include "Cxbx.h" // For xbaddr
+#include "CxbxCommon.h" // For xbaddr
 #include "devices\PCIDevice.h" // For PCIDevice
 
 #include <queue>