diff --git a/import/OpenXDK/include/xboxkrnl/xboxkrnl.h b/import/OpenXDK/include/xboxkrnl/xboxkrnl.h
index 5f1af9889..3b075636a 100644
--- a/import/OpenXDK/include/xboxkrnl/xboxkrnl.h
+++ b/import/OpenXDK/include/xboxkrnl/xboxkrnl.h
@@ -12,6 +12,9 @@
 #ifndef XBOXKRNL_H
 #define XBOXKRNL_H
 
+namespace xboxkrnl
+{
+
 // ******************************************************************
 // * dll import/export
 // ******************************************************************
@@ -2707,6 +2710,8 @@ typedef struct _IDE_CHANNEL_OBJECT
 // ******************************************************************
 #include "xbox.h"
 
+};
+
 #endif
 
 
diff --git a/src/common/EmuEEPROM.cpp b/src/common/EmuEEPROM.cpp
index e222e704a..9166c2225 100644
--- a/src/common/EmuEEPROM.cpp
+++ b/src/common/EmuEEPROM.cpp
@@ -27,12 +27,8 @@
 #define LOG_PREFIX CXBXR_MODULE::EEPR
 #define LOG_PREFIX_INIT CXBXR_MODULE::INIT
 
-// prevent name collisions
-namespace xboxkrnl
-{
-	#include <xboxkrnl/xboxkrnl.h> // For XC_VALUE_INDEX and XBOX_EEPROM
-};
 
+#include <xboxkrnl/xboxkrnl.h> // For XC_VALUE_INDEX and XBOX_EEPROM
 #include <stdio.h> // For printf
 #include <shlobj.h> // For HANDLE, CreateFile, CreateFileMapping, MapViewOfFile
 #include <random>
diff --git a/src/common/EmuEEPROM.h b/src/common/EmuEEPROM.h
index 6d46dfbda..835f948f9 100644
--- a/src/common/EmuEEPROM.h
+++ b/src/common/EmuEEPROM.h
@@ -27,13 +27,10 @@
 #ifndef EMU_EEPROM_H
 #define EMU_EEPROM_H
 
-// prevent name collisions
-namespace xboxkrnl
-{
+
 #undef _WIN32 // Compile-in REG_DWORD and friends, since we lack a <windows> include here
 #include <xboxkrnl/xboxkrnl.h> // For XC_VALUE_INDEX and XBOX_EEPROM
 #define _WIN32
-};
 
 #define EEPROM_SIZE sizeof(xboxkrnl::XBOX_EEPROM)
 
diff --git a/src/common/input/InputManager.cpp b/src/common/input/InputManager.cpp
index 013eaae06..826399a9f 100644
--- a/src/common/input/InputManager.cpp
+++ b/src/common/input/InputManager.cpp
@@ -35,12 +35,8 @@
 #define _XBOXKRNL_DEFEXTRN_
 #define LOG_PREFIX CXBXR_MODULE::INPSYS
 
-// prevent name collisions
-namespace xboxkrnl
-{
-#include <xboxkrnl/xboxkrnl.h> // For PKINTERRUPT, etc.
-};
 
+#include <xboxkrnl/xboxkrnl.h> // For PKINTERRUPT, etc.
 #include "SdlJoystick.h"
 #include "XInputPad.h"
 #include "DInputKeyboardMouse.h"
diff --git a/src/common/xbe/Xbe.cpp b/src/common/xbe/Xbe.cpp
index 8602b682e..a555f5faa 100644
--- a/src/common/xbe/Xbe.cpp
+++ b/src/common/xbe/Xbe.cpp
@@ -26,12 +26,8 @@
 // *
 // ******************************************************************
 
-// prevent name collisions
-namespace xboxkrnl
-{
-	#include <xboxkrnl/xboxkrnl.h>
-};
 
+#include <xboxkrnl/xboxkrnl.h>
 #include "common\xbe\Xbe.h"
 #include "common\util\CxbxUtil.h" // For RoundUp
 #include <filesystem> // filesystem related functions available on C++ 17
diff --git a/src/common/xdvdfs-tools/buffered_io.cpp b/src/common/xdvdfs-tools/buffered_io.cpp
index 11e4037bf..dd0779db1 100644
--- a/src/common/xdvdfs-tools/buffered_io.cpp
+++ b/src/common/xdvdfs-tools/buffered_io.cpp
@@ -1,12 +1,12 @@
 // This is an open source non-commercial project. Dear PVS-Studio, please check it.
 // PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
 
-// prevent name collisions
+
+#include <xboxkrnl/xboxkrnl.h> //#include <stdtypes.h>
+#include "buffered_io.h"
+
 namespace xboxkrnl
 {
-#include <xboxkrnl/xboxkrnl.h> //#include <stdtypes.h>
-
-#include "buffered_io.h"
 
 PBYTE GetSectorBuffered(
 		PCDIO_READ This,
diff --git a/src/common/xdvdfs-tools/buffered_io.h b/src/common/xdvdfs-tools/buffered_io.h
index 09bc9c778..a8520b4ad 100644
--- a/src/common/xdvdfs-tools/buffered_io.h
+++ b/src/common/xdvdfs-tools/buffered_io.h
@@ -7,6 +7,9 @@
 extern "C" {
 #endif
 
+namespace xboxkrnl
+{
+
 #define BOOL BOOLEAN
 #define LPSTR LPCH
 
@@ -44,8 +47,10 @@ extern void ReleaseBufferedSector(
 				PCDIO_READ This,
 				DWORD SectorNumber);
 
+};
+
 #ifdef __cplusplus
 }
 #endif
 
-#endif // __BUFFERED_IO_H__
\ No newline at end of file
+#endif // __BUFFERED_IO_H__
diff --git a/src/common/xdvdfs-tools/xdvdfs.h b/src/common/xdvdfs-tools/xdvdfs.h
index aef1c9b0c..031cf278b 100644
--- a/src/common/xdvdfs-tools/xdvdfs.h
+++ b/src/common/xdvdfs-tools/xdvdfs.h
@@ -5,7 +5,9 @@
 
 #include <xboxkrnl/xboxkrnl.h> //#include <stdtypes.h>
 
-#include "buffered_io.h"
+#include "buffered_io.h"
+
+using namespace xboxkrnl;
 
 CONST CHAR *XDVDFS_Signature = "MICROSOFT*XBOX*MEDIA";
 
diff --git a/src/core/hle/D3D8/Direct3D9/Direct3D9.cpp b/src/core/hle/D3D8/Direct3D9/Direct3D9.cpp
index 934e4497b..d5c23da46 100644
--- a/src/core/hle/D3D8/Direct3D9/Direct3D9.cpp
+++ b/src/core/hle/D3D8/Direct3D9/Direct3D9.cpp
@@ -35,12 +35,8 @@
 #include <condition_variable>
 #include <stack>
 
-// prevent name collisions
-namespace xboxkrnl
-{
-    #include <xboxkrnl\xboxkrnl.h>
-};
 
+#include <xboxkrnl\xboxkrnl.h>
 #include "common\util\CxbxUtil.h"
 #include "CxbxVersion.h"
 #include "core\kernel\init\CxbxKrnl.h"
diff --git a/src/core/hle/DSOUND/DirectSound/DSStream_PacketManager.cpp b/src/core/hle/DSOUND/DirectSound/DSStream_PacketManager.cpp
index e6d6f8b8f..bd76a4bdf 100644
--- a/src/core/hle/DSOUND/DirectSound/DSStream_PacketManager.cpp
+++ b/src/core/hle/DSOUND/DirectSound/DSStream_PacketManager.cpp
@@ -26,11 +26,8 @@
 // ******************************************************************
 #define LOG_PREFIX CXBXR_MODULE::DSSTREAM
 
-// prevent name collisions
-namespace xboxkrnl {
-    #include <xboxkrnl/xboxkrnl.h>
-};
 
+#include <xboxkrnl/xboxkrnl.h>
 #include <dsound.h>
 #include "DirectSoundGlobal.hpp"
 
diff --git a/src/core/hle/DSOUND/DirectSound/DirectSound.cpp b/src/core/hle/DSOUND/DirectSound/DirectSound.cpp
index 737350c76..b7d0eb510 100644
--- a/src/core/hle/DSOUND/DirectSound/DirectSound.cpp
+++ b/src/core/hle/DSOUND/DirectSound/DirectSound.cpp
@@ -28,11 +28,8 @@
 // ******************************************************************
 #define LOG_PREFIX CXBXR_MODULE::DSOUND
 
-// prevent name collisions
-namespace xboxkrnl {
-    #include <xboxkrnl/xboxkrnl.h>
-};
 
+#include <xboxkrnl/xboxkrnl.h>
 #include <dsound.h>
 #include "DirectSoundGlobal.hpp" // Global variables
 
diff --git a/src/core/hle/DSOUND/DirectSound/DirectSound3DCalculator.cpp b/src/core/hle/DSOUND/DirectSound/DirectSound3DCalculator.cpp
index 76d405783..9eef5e143 100644
--- a/src/core/hle/DSOUND/DirectSound/DirectSound3DCalculator.cpp
+++ b/src/core/hle/DSOUND/DirectSound/DirectSound3DCalculator.cpp
@@ -27,11 +27,8 @@
 // ******************************************************************
 #define LOG_PREFIX CXBXR_MODULE::DS3DCALC
 
-// prevent name collisions
-namespace xboxkrnl {
-    #include <xboxkrnl/xboxkrnl.h>
-};
 
+#include <xboxkrnl/xboxkrnl.h>
 #include <dsound.h>
 #include "DirectSoundGlobal.hpp" // Global variables
 
diff --git a/src/core/hle/DSOUND/DirectSound/DirectSoundBuffer.cpp b/src/core/hle/DSOUND/DirectSound/DirectSoundBuffer.cpp
index 747ceb330..bddfc052b 100644
--- a/src/core/hle/DSOUND/DirectSound/DirectSoundBuffer.cpp
+++ b/src/core/hle/DSOUND/DirectSound/DirectSoundBuffer.cpp
@@ -28,11 +28,8 @@
 // ******************************************************************
 #define LOG_PREFIX CXBXR_MODULE::DSBUFFER
 
-// prevent name collisions
-namespace xboxkrnl {
-    #include <xboxkrnl/xboxkrnl.h>
-};
 
+#include <xboxkrnl/xboxkrnl.h>
 #include <dsound.h>
 #include "DirectSoundGlobal.hpp" // Global variables
 
diff --git a/src/core/hle/DSOUND/DirectSound/DirectSoundGlobal.cpp b/src/core/hle/DSOUND/DirectSound/DirectSoundGlobal.cpp
index a3f2e052f..934d9d86e 100644
--- a/src/core/hle/DSOUND/DirectSound/DirectSoundGlobal.cpp
+++ b/src/core/hle/DSOUND/DirectSound/DirectSoundGlobal.cpp
@@ -25,11 +25,8 @@
 // *
 // ******************************************************************
 
-// prevent name collisions
-namespace xboxkrnl {
-    #include <xboxkrnl/xboxkrnl.h>
-};
 
+#include <xboxkrnl/xboxkrnl.h>
 #include <dsound.h>
 #include "DirectSoundGlobal.hpp"
 
diff --git a/src/core/hle/DSOUND/DirectSound/DirectSoundStream.cpp b/src/core/hle/DSOUND/DirectSound/DirectSoundStream.cpp
index 0e1164873..8fa47282d 100644
--- a/src/core/hle/DSOUND/DirectSound/DirectSoundStream.cpp
+++ b/src/core/hle/DSOUND/DirectSound/DirectSoundStream.cpp
@@ -28,11 +28,8 @@
 // ******************************************************************
 #define LOG_PREFIX CXBXR_MODULE::DSSTREAM
 
-// prevent name collisions
-namespace xboxkrnl {
-    #include <xboxkrnl/xboxkrnl.h>
-};
 
+#include <xboxkrnl/xboxkrnl.h>
 #include <dsound.h>
 #include "DirectSoundGlobal.hpp" // Global variables
 
diff --git a/src/core/hle/DSOUND/DirectSound/XFileMediaObject.cpp b/src/core/hle/DSOUND/DirectSound/XFileMediaObject.cpp
index 170f7b3c2..305797618 100644
--- a/src/core/hle/DSOUND/DirectSound/XFileMediaObject.cpp
+++ b/src/core/hle/DSOUND/DirectSound/XFileMediaObject.cpp
@@ -27,11 +27,8 @@
 // ******************************************************************
 #define LOG_PREFIX CXBXR_MODULE::XMO
 
-// prevent name collisions
-namespace xboxkrnl {
-    #include <xboxkrnl/xboxkrnl.h>
-};
 
+#include <xboxkrnl/xboxkrnl.h>
 #include <dsound.h>
 #include "DirectSoundGlobal.hpp" // Global variables
 
diff --git a/src/core/hle/XACTENG/XactEng.cpp b/src/core/hle/XACTENG/XactEng.cpp
index 4e6b8ca5f..141e65d68 100644
--- a/src/core/hle/XACTENG/XactEng.cpp
+++ b/src/core/hle/XACTENG/XactEng.cpp
@@ -27,12 +27,8 @@
 
 #define LOG_PREFIX CXBXR_MODULE::XACT
 
-// prevent name collisions
-namespace xboxkrnl
-{
-    #include <xboxkrnl/xboxkrnl.h>
-};
 
+#include <xboxkrnl/xboxkrnl.h>
 #include "core\kernel\init\CxbxKrnl.h"
 #include "common\Logging.h"
 #include "core\kernel\support\Emu.h"
diff --git a/src/core/hle/XAPI/Xapi.cpp b/src/core/hle/XAPI/Xapi.cpp
index dfb91e013..24ad1e347 100644
--- a/src/core/hle/XAPI/Xapi.cpp
+++ b/src/core/hle/XAPI/Xapi.cpp
@@ -27,13 +27,10 @@
 
 #define LOG_PREFIX CXBXR_MODULE::XAPI
 
-#undef FIELD_OFFSET     // prevent macro redefinition warnings
-/* prevent name collisions */
-namespace xboxkrnl
-{
-	#include <xboxkrnl\xboxkrnl.h>
-};
+#undef FIELD_OFFSET     // prevent macro redefinition warnings
 
+
+#include <xboxkrnl\xboxkrnl.h>
 #include "common\input\SdlJoystick.h"
 #include "common\input\InputManager.h"
 #include <Shlwapi.h>
diff --git a/src/core/kernel/exports/EmuKrnl.cpp b/src/core/kernel/exports/EmuKrnl.cpp
index a0d473fe4..bd41bee0b 100644
--- a/src/core/kernel/exports/EmuKrnl.cpp
+++ b/src/core/kernel/exports/EmuKrnl.cpp
@@ -26,13 +26,9 @@
 // ******************************************************************
 
 #define LOG_PREFIX CXBXR_MODULE::KRNL
+
 
-// prevent name collisions
-namespace xboxkrnl
-{
-    #include <xboxkrnl/xboxkrnl.h>
-};
-
+#include <xboxkrnl/xboxkrnl.h>
 #include <cstdio>
 #include <cctype>
 #include <clocale>
diff --git a/src/core/kernel/exports/EmuKrnlAv.cpp b/src/core/kernel/exports/EmuKrnlAv.cpp
index 33f69c397..c363555e6 100644
--- a/src/core/kernel/exports/EmuKrnlAv.cpp
+++ b/src/core/kernel/exports/EmuKrnlAv.cpp
@@ -28,12 +28,8 @@
 
 #define LOG_PREFIX CXBXR_MODULE::AV
 
-// prevent name collisions
-namespace xboxkrnl
-{
-	#include <xboxkrnl/xboxkrnl.h> // For AvGetSavedDataAddress, etc.
-};
 
+#include <xboxkrnl/xboxkrnl.h> // For AvGetSavedDataAddress, etc.
 #include "Logging.h" // For LOG_FUNC()
 #include "EmuKrnlLogging.h"
 
diff --git a/src/core/kernel/exports/EmuKrnlDbg.cpp b/src/core/kernel/exports/EmuKrnlDbg.cpp
index 18893828e..4b65578e6 100644
--- a/src/core/kernel/exports/EmuKrnlDbg.cpp
+++ b/src/core/kernel/exports/EmuKrnlDbg.cpp
@@ -28,12 +28,8 @@
 
 #define LOG_PREFIX CXBXR_MODULE::DBG
 
-// prevent name collisions
-namespace xboxkrnl
-{
-#include <xboxkrnl/xboxkrnl.h> // For DbgPrint, etc.
-};
 
+#include <xboxkrnl/xboxkrnl.h> // For DbgPrint, etc.
 #include "Logging.h" // For LOG_FUNC()
 #include "EmuKrnlLogging.h"
 
diff --git a/src/core/kernel/exports/EmuKrnlEx.cpp b/src/core/kernel/exports/EmuKrnlEx.cpp
index 5f185ed5a..16bc3bdea 100644
--- a/src/core/kernel/exports/EmuKrnlEx.cpp
+++ b/src/core/kernel/exports/EmuKrnlEx.cpp
@@ -28,12 +28,8 @@
 
 #define LOG_PREFIX CXBXR_MODULE::EX
 
-// prevent name collisions
-namespace xboxkrnl
-{
-	#include <xboxkrnl/xboxkrnl.h> // For ExAllocatePool, etc.
-};
 
+#include <xboxkrnl/xboxkrnl.h> // For ExAllocatePool, etc.
 #include "Logging.h" // For LOG_FUNC()
 #include "EmuEEPROM.h" // For EmuFindEEPROMInfo, EEPROM, XboxFactoryGameRegion
 #include "EmuKrnlLogging.h"
diff --git a/src/core/kernel/exports/EmuKrnlFs.cpp b/src/core/kernel/exports/EmuKrnlFs.cpp
index 4365a2596..c57199a84 100644
--- a/src/core/kernel/exports/EmuKrnlFs.cpp
+++ b/src/core/kernel/exports/EmuKrnlFs.cpp
@@ -28,12 +28,7 @@
 
 #define LOG_PREFIX CXBXR_MODULE::FSC
 
-// prevent name collisions
-namespace xboxkrnl
-{
 #include <xboxkrnl/xboxkrnl.h> // For FscGetCacheSize, etc.
-};
-
 #include "Logging.h" // For LOG_FUNC()
 #include "EmuKrnlLogging.h"
 
diff --git a/src/core/kernel/exports/EmuKrnlHal.cpp b/src/core/kernel/exports/EmuKrnlHal.cpp
index d1a204123..ed6597353 100644
--- a/src/core/kernel/exports/EmuKrnlHal.cpp
+++ b/src/core/kernel/exports/EmuKrnlHal.cpp
@@ -28,12 +28,8 @@
 
 #define LOG_PREFIX CXBXR_MODULE::HAL
 
-// prevent name collisions
-namespace xboxkrnl
-{
-#include <xboxkrnl/xboxkrnl.h> // For HalReadSMCTrayState, etc.
-};
 
+#include <xboxkrnl/xboxkrnl.h> // For HalReadSMCTrayState, etc.
 #include <Shlwapi.h> // For PathRemoveFileSpec()
 #include "Logging.h" // For LOG_FUNC()
 #include "EmuKrnl.h" // For InitializeListHead(), etc.
diff --git a/src/core/kernel/exports/EmuKrnlIo.cpp b/src/core/kernel/exports/EmuKrnlIo.cpp
index 64732e885..0a77cec5a 100644
--- a/src/core/kernel/exports/EmuKrnlIo.cpp
+++ b/src/core/kernel/exports/EmuKrnlIo.cpp
@@ -28,12 +28,8 @@
 
 #define LOG_PREFIX CXBXR_MODULE::IO
 
-// prevent name collisions
-namespace xboxkrnl
-{
-#include <xboxkrnl/xboxkrnl.h> // For IoCompletionObjectType, etc.
-};
 
+#include <xboxkrnl/xboxkrnl.h> // For IoCompletionObjectType, etc.
 #include "Logging.h" // For LOG_FUNC()
 #include "EmuKrnlLogging.h"
 #include "core\kernel\init\CxbxKrnl.h" // For CxbxKrnlCleanup
diff --git a/src/core/kernel/exports/EmuKrnlKd.cpp b/src/core/kernel/exports/EmuKrnlKd.cpp
index f628cd884..7a07ae8da 100644
--- a/src/core/kernel/exports/EmuKrnlKd.cpp
+++ b/src/core/kernel/exports/EmuKrnlKd.cpp
@@ -28,12 +28,8 @@
 
 #define LOG_PREFIX CXBXR_MODULE::KD
 
-// prevent name collisions
-namespace xboxkrnl
-{
-#include <xboxkrnl/xboxkrnl.h> // For KdDebuggerEnabled, etc.
-};
-
+
+#include <xboxkrnl/xboxkrnl.h> // For KdDebuggerEnabled, etc.
 #include "Logging.h"
 
 // ******************************************************************
diff --git a/src/core/kernel/exports/EmuKrnlKe.cpp b/src/core/kernel/exports/EmuKrnlKe.cpp
index 51afe5a67..3bc8cdb28 100644
--- a/src/core/kernel/exports/EmuKrnlKe.cpp
+++ b/src/core/kernel/exports/EmuKrnlKe.cpp
@@ -64,12 +64,8 @@ the said software).
 
 #define LOG_PREFIX CXBXR_MODULE::KE
 
-// prevent name collisions
-namespace xboxkrnl
-{
-#include <xboxkrnl/xboxkrnl.h> // For KeBugCheck, etc.
-};
 
+#include <xboxkrnl/xboxkrnl.h> // For KeBugCheck, etc.
 #include "Logging.h" // For LOG_FUNC()
 #include "EmuKrnlLogging.h"
 
diff --git a/src/core/kernel/exports/EmuKrnlKi.cpp b/src/core/kernel/exports/EmuKrnlKi.cpp
index d4a52e433..fac4564b1 100644
--- a/src/core/kernel/exports/EmuKrnlKi.cpp
+++ b/src/core/kernel/exports/EmuKrnlKi.cpp
@@ -78,12 +78,8 @@ the said software).
 
 #define LOG_PREFIX CXBXR_MODULE::KI
 
-// prevent name collisions
-namespace xboxkrnl
-{
-#include <xboxkrnl/xboxkrnl.h> // For KeBugCheck, etc.
-};
 
+#include <xboxkrnl/xboxkrnl.h> // For KeBugCheck, etc.
 #include "Logging.h" // For LOG_FUNC()
 #include "EmuKrnl.h" // for the list support functions
 #include "EmuKrnlKi.h"
diff --git a/src/core/kernel/exports/EmuKrnlLogging.cpp b/src/core/kernel/exports/EmuKrnlLogging.cpp
index 22d074213..f85a6fd4d 100644
--- a/src/core/kernel/exports/EmuKrnlLogging.cpp
+++ b/src/core/kernel/exports/EmuKrnlLogging.cpp
@@ -27,13 +27,8 @@
 
 #define LOG_PREFIX CXBXR_MODULE::LOG
 
-// prevent name collisions
-namespace xboxkrnl
-{
+
 #include <xboxkrnl/xboxkrnl.h>
-};
-
-
 #include "Logging.h"
 #include "EmuKrnlLogging.h"
 #include "core\kernel\init\CxbxKrnl.h"
diff --git a/src/core/kernel/exports/EmuKrnlMm.cpp b/src/core/kernel/exports/EmuKrnlMm.cpp
index f1104d2c3..12232b130 100644
--- a/src/core/kernel/exports/EmuKrnlMm.cpp
+++ b/src/core/kernel/exports/EmuKrnlMm.cpp
@@ -29,12 +29,8 @@
 
 #define LOG_PREFIX CXBXR_MODULE::MM
 
-// prevent name collisions
-namespace xboxkrnl
-{
-	#include <xboxkrnl/xboxkrnl.h> // For MmGlobalData, etc.
-};
 
+#include <xboxkrnl/xboxkrnl.h> // For MmGlobalData, etc.
 #include "Logging.h" // For LOG_FUNC()
 #include "EmuKrnl.h" // For DefaultLaunchDataPage
 #include "EmuKrnlLogging.h"
diff --git a/src/core/kernel/exports/EmuKrnlNt.cpp b/src/core/kernel/exports/EmuKrnlNt.cpp
index f3ed7c211..c8ae0aa44 100644
--- a/src/core/kernel/exports/EmuKrnlNt.cpp
+++ b/src/core/kernel/exports/EmuKrnlNt.cpp
@@ -28,12 +28,8 @@
 
 #define LOG_PREFIX CXBXR_MODULE::NT
 
-// prevent name collisions
-namespace xboxkrnl
-{
-#include <xboxkrnl/xboxkrnl.h> // For NtAllocateVirtualMemory, etc.
-};
 
+#include <xboxkrnl/xboxkrnl.h> // For NtAllocateVirtualMemory, etc.
 #include "Logging.h" // For LOG_FUNC()
 #include "EmuKrnlLogging.h"
 
diff --git a/src/core/kernel/exports/EmuKrnlOb.cpp b/src/core/kernel/exports/EmuKrnlOb.cpp
index 87400d476..2795383de 100644
--- a/src/core/kernel/exports/EmuKrnlOb.cpp
+++ b/src/core/kernel/exports/EmuKrnlOb.cpp
@@ -28,12 +28,8 @@
 
 #define LOG_PREFIX CXBXR_MODULE::OB
 
-// prevent name collisions
-namespace xboxkrnl
-{
-#include <xboxkrnl/xboxkrnl.h> // For ObDirectoryObjectType, etc.
-};
 
+#include <xboxkrnl/xboxkrnl.h> // For ObDirectoryObjectType, etc.
 #include "Logging.h" // For LOG_FUNC()
 #include "EmuKrnlLogging.h"
 #include "core\kernel\init\CxbxKrnl.h" // For CxbxKrnlCleanup
diff --git a/src/core/kernel/exports/EmuKrnlPhy.cpp b/src/core/kernel/exports/EmuKrnlPhy.cpp
index 135d9d76b..08750d03f 100644
--- a/src/core/kernel/exports/EmuKrnlPhy.cpp
+++ b/src/core/kernel/exports/EmuKrnlPhy.cpp
@@ -25,11 +25,8 @@
 // *
 // ******************************************************************
 
-// prevent name collisions
-namespace xboxkrnl
-{
-    #include <xboxkrnl/xboxkrnl.h>
-};
+
+#include <xboxkrnl/xboxkrnl.h>
 
 #define LOG_PREFIX CXBXR_MODULE::KRNL
 
diff --git a/src/core/kernel/exports/EmuKrnlPs.cpp b/src/core/kernel/exports/EmuKrnlPs.cpp
index b9600e63d..6366fc484 100644
--- a/src/core/kernel/exports/EmuKrnlPs.cpp
+++ b/src/core/kernel/exports/EmuKrnlPs.cpp
@@ -29,12 +29,8 @@
 #define LOG_PREFIX CXBXR_MODULE::PS
 #include <common\util\CxbxUtil.h>
 
-// prevent name collisions
-namespace xboxkrnl
-{
-#include <xboxkrnl/xboxkrnl.h> // For PsCreateSystemThreadEx, etc.
-};
 
+#include <xboxkrnl/xboxkrnl.h> // For PsCreateSystemThreadEx, etc.
 #include <process.h> // For __beginthreadex(), etc.
 #include <float.h> // For _controlfp constants
 
diff --git a/src/core/kernel/exports/EmuKrnlRtl.cpp b/src/core/kernel/exports/EmuKrnlRtl.cpp
index fb133c8cf..e6bbbe941 100644
--- a/src/core/kernel/exports/EmuKrnlRtl.cpp
+++ b/src/core/kernel/exports/EmuKrnlRtl.cpp
@@ -29,12 +29,8 @@
 #define LOG_PREFIX CXBXR_MODULE::RTL
 #define CHECK_ALIGNMENT(size, alignment) (((size) % (alignment)) == 0) // For RtlFillMemoryUlong
 
-// prevent name collisions
-namespace xboxkrnl
-{
-#include <xboxkrnl/xboxkrnl.h> // For RtlAnsiStringToUnicodeString, etc.
-};
 
+#include <xboxkrnl/xboxkrnl.h> // For RtlAnsiStringToUnicodeString, etc.
 #include "Logging.h" // For LOG_FUNC()
 #include "EmuKrnlLogging.h"
 
diff --git a/src/core/kernel/exports/EmuKrnlXbox.cpp b/src/core/kernel/exports/EmuKrnlXbox.cpp
index 3dc83576f..516751522 100644
--- a/src/core/kernel/exports/EmuKrnlXbox.cpp
+++ b/src/core/kernel/exports/EmuKrnlXbox.cpp
@@ -28,12 +28,8 @@
 
 #define LOG_PREFIX CXBXR_MODULE::XBOX
 
-// prevent name collisions
-namespace xboxkrnl
-{
-#include <xboxkrnl/xboxkrnl.h> // For XboxEEPROMKey, etc.
-};
-
+
+#include <xboxkrnl/xboxkrnl.h> // For XboxEEPROMKey, etc.
 #include "Logging.h"
 
 // Certificate Key
diff --git a/src/core/kernel/exports/EmuKrnlXc.cpp b/src/core/kernel/exports/EmuKrnlXc.cpp
index c1d16b3ec..7d9bd6f49 100644
--- a/src/core/kernel/exports/EmuKrnlXc.cpp
+++ b/src/core/kernel/exports/EmuKrnlXc.cpp
@@ -30,12 +30,8 @@
 
 #define LOG_PREFIX CXBXR_MODULE::XC
 
-// prevent name collisions
-namespace xboxkrnl
-{
-	#include <xboxkrnl/xboxkrnl.h> // For XcSHAInit, etc.
-};
 
+#include <xboxkrnl/xboxkrnl.h> // For XcSHAInit, etc.
 #include "Logging.h" // For LOG_FUNC()
 #include "EmuKrnlLogging.h"
 #include "common\crypto\EmuSha.h" // For A_SHAInit, etc.
diff --git a/src/core/kernel/exports/EmuKrnlXe.cpp b/src/core/kernel/exports/EmuKrnlXe.cpp
index 2f5ea699a..7bade4501 100644
--- a/src/core/kernel/exports/EmuKrnlXe.cpp
+++ b/src/core/kernel/exports/EmuKrnlXe.cpp
@@ -28,12 +28,8 @@
 
 #define LOG_PREFIX CXBXR_MODULE::XE
 
-// prevent name collisions
-namespace xboxkrnl
-{
-#include <xboxkrnl/xboxkrnl.h> // For XeImageFileName, etc.
-};
 
+#include <xboxkrnl/xboxkrnl.h> // For XeImageFileName, etc.
 #include "core\kernel\init\CxbxKrnl.h" // For CxbxKrnl_Xbe
 #include "Logging.h" // For LOG_FUNC()
 #include "EmuKrnlLogging.h"
diff --git a/src/core/kernel/exports/KernelThunk.cpp b/src/core/kernel/exports/KernelThunk.cpp
index 25180eb54..edbd1247b 100644
--- a/src/core/kernel/exports/KernelThunk.cpp
+++ b/src/core/kernel/exports/KernelThunk.cpp
@@ -25,12 +25,8 @@
 // *
 // ******************************************************************
 
-// prevent name collisions
-namespace xboxkrnl
-{
-    #include <xboxkrnl/xboxkrnl.h>
-};
 
+#include <xboxkrnl/xboxkrnl.h>
 #include "Cxbx.h" // For CxbxKrnl_KernelThunkTable
 #include "core\kernel\init\CxbxKrnl.h" // For UINT
 
diff --git a/src/core/kernel/init/CxbxKrnl.cpp b/src/core/kernel/init/CxbxKrnl.cpp
index f7c5acac4..d72d3fca1 100644
--- a/src/core/kernel/init/CxbxKrnl.cpp
+++ b/src/core/kernel/init/CxbxKrnl.cpp
@@ -28,12 +28,8 @@
 #define LOG_PREFIX CXBXR_MODULE::CXBXR
 #define LOG_PREFIX_INIT CXBXR_MODULE::INIT
 
-/* prevent name collisions */
-namespace xboxkrnl
-{
-    #include <xboxkrnl/xboxkrnl.h>
-};
 
+#include <xboxkrnl/xboxkrnl.h>
 #include "gui/resource/ResCxbx.h"
 #include "core\kernel\init\CxbxKrnl.h"
 #include "common\xbdm\CxbxXbdm.h" // For Cxbx_LibXbdmThunkTable
diff --git a/src/core/kernel/memory-manager/PhysicalMemory.h b/src/core/kernel/memory-manager/PhysicalMemory.h
index d4a1f4d17..d930486d8 100644
--- a/src/core/kernel/memory-manager/PhysicalMemory.h
+++ b/src/core/kernel/memory-manager/PhysicalMemory.h
@@ -29,11 +29,7 @@
 #define PHYSICAL_MEMORY_H
 
 
-namespace xboxkrnl
-{
-	#include <xboxkrnl/xboxkrnl.h>
-};
-
+#include <xboxkrnl/xboxkrnl.h>
 #include "core\kernel\support\Emu.h"
 #include "core\kernel\init\CxbxKrnl.h"
 #include <windows.h>
diff --git a/src/core/kernel/support/Emu.cpp b/src/core/kernel/support/Emu.cpp
index 68a4ceafb..a6ffd4654 100644
--- a/src/core/kernel/support/Emu.cpp
+++ b/src/core/kernel/support/Emu.cpp
@@ -27,12 +27,8 @@
 
 #define LOG_PREFIX CXBXR_MODULE::X86
 
-// prevent name collisions
-namespace xboxkrnl
-{
-    #include <xboxkrnl\xboxkrnl.h>
-};
 
+#include <xboxkrnl\xboxkrnl.h>
 #include "core\kernel\init\CxbxKrnl.h"
 #include "Emu.h"
 #include "devices\x86\EmuX86.h"
diff --git a/src/core/kernel/support/EmuFS.cpp b/src/core/kernel/support/EmuFS.cpp
index eae02cf53..c1d8217b7 100644
--- a/src/core/kernel/support/EmuFS.cpp
+++ b/src/core/kernel/support/EmuFS.cpp
@@ -27,12 +27,8 @@
 
 #define LOG_PREFIX CXBXR_MODULE::FS
 
-// prevent name collisions
-namespace xboxkrnl
-{
-#include <xboxkrnl/xboxkrnl.h>
-};
 
+#include <xboxkrnl/xboxkrnl.h>
 #include "core\kernel\exports\EmuKrnl.h" // For InitializeListHead(), etc.
 #include "core\kernel\exports\EmuKrnlKe.h"
 #include "core\kernel\support\EmuFS.h" // For fs_instruction_t
diff --git a/src/core/kernel/support/EmuFile.h b/src/core/kernel/support/EmuFile.h
index 757968372..147c9bd9a 100644
--- a/src/core/kernel/support/EmuFile.h
+++ b/src/core/kernel/support/EmuFile.h
@@ -24,14 +24,8 @@
 #ifndef EMUFILE_H
 #define EMUFILE_H
 
-// ******************************************************************
-// * prevent name collisions
-// ******************************************************************
-namespace xboxkrnl
-{
-    #include <xboxkrnl/xboxkrnl.h>
-};
 
+#include <xboxkrnl/xboxkrnl.h>
 #include <vector>
 #include <cstdio>
 #include <string>
diff --git a/src/devices/EmuNVNet.cpp b/src/devices/EmuNVNet.cpp
index 9c060360a..b638fcbfd 100644
--- a/src/devices/EmuNVNet.cpp
+++ b/src/devices/EmuNVNet.cpp
@@ -32,12 +32,8 @@
 
 #define LOG_PREFIX CXBXR_MODULE::NET
 
-// prevent name collisions
-namespace xboxkrnl
-{
-	#include <xboxkrnl/xboxkrnl.h> // For PKINTERRUPT, etc.
-};
 
+#include <xboxkrnl/xboxkrnl.h> // For PKINTERRUPT, etc.
 #include <WinSock2.h> 
 #include "core\kernel\init\CxbxKrnl.h"
 #include "core\kernel\support\Emu.h"
diff --git a/src/devices/SMCDevice.cpp b/src/devices/SMCDevice.cpp
index 278aad931..08d66bd14 100644
--- a/src/devices/SMCDevice.cpp
+++ b/src/devices/SMCDevice.cpp
@@ -27,12 +27,8 @@
 
 #define LOG_PREFIX CXBXR_MODULE::SMC
 
-/* prevent name collisions */
-namespace xboxkrnl
-{
-#include <xboxkrnl/xboxkrnl.h> // For xbox.h:AV_PACK_HDTV
-};
 
+#include <xboxkrnl/xboxkrnl.h> // For xbox.h:AV_PACK_HDTV
 #include "core\kernel\init\CxbxKrnl.h"
 #include "EmuShared.h"
 
diff --git a/src/devices/usb/Hub.cpp b/src/devices/usb/Hub.cpp
index 97f0865ed..572a3e206 100644
--- a/src/devices/usb/Hub.cpp
+++ b/src/devices/usb/Hub.cpp
@@ -54,13 +54,9 @@
 
 
 #define LOG_PREFIX CXBXR_MODULE::HUB
-
-// prevent name collisions
-namespace xboxkrnl
-{
-	#include <xboxkrnl/xboxkrnl.h> // For PKINTERRUPT, etc.
-};
 
+
+#include <xboxkrnl/xboxkrnl.h> // For PKINTERRUPT, etc.
 #include <cstring> // For memcpy
 #include "OHCI.h"
 #include "Hub.h"
diff --git a/src/devices/usb/OHCI.cpp b/src/devices/usb/OHCI.cpp
index 4b8a40526..0d7f10da1 100644
--- a/src/devices/usb/OHCI.cpp
+++ b/src/devices/usb/OHCI.cpp
@@ -51,12 +51,8 @@
 
 #define LOG_PREFIX CXBXR_MODULE::OHCI
 
-/* prevent name collisions */
-namespace xboxkrnl
-{
-	#include <xboxkrnl/xboxkrnl.h>
-};
 
+#include <xboxkrnl/xboxkrnl.h>
 #include "OHCI.h"
 #include "core\kernel\exports\EmuKrnl.h"  // For HalSystemInterrupt
 #include "common\util\CxbxUtil.h"
diff --git a/src/devices/usb/USBDevice.cpp b/src/devices/usb/USBDevice.cpp
index cb3371894..63523d1aa 100644
--- a/src/devices/usb/USBDevice.cpp
+++ b/src/devices/usb/USBDevice.cpp
@@ -56,13 +56,9 @@
 
 
 #define LOG_PREFIX CXBXR_MODULE::USB
-
-// prevent name collisions
-namespace xboxkrnl
-{
-	#include <xboxkrnl/xboxkrnl.h> // For PKINTERRUPT, etc.
-};
 
+
+#include <xboxkrnl/xboxkrnl.h> // For PKINTERRUPT, etc.
 #include <cstring>
 #include "USBDevice.h"
 #include "OHCI.h"
diff --git a/src/devices/usb/XidGamepad.cpp b/src/devices/usb/XidGamepad.cpp
index 22997f4fb..11597ba0c 100644
--- a/src/devices/usb/XidGamepad.cpp
+++ b/src/devices/usb/XidGamepad.cpp
@@ -52,12 +52,8 @@
 
 #define LOG_PREFIX CXBXR_MODULE::XIDCTRL
 
-// prevent name collisions
-namespace xboxkrnl
-{
-	#include <xboxkrnl/xboxkrnl.h> // For PKINTERRUPT, etc.
-};
 
+#include <xboxkrnl/xboxkrnl.h> // For PKINTERRUPT, etc.
 #include <cstring>
 #include "XidGamepad.h"
 #include "USBDevice.h"
diff --git a/src/devices/video/nv2a.cpp b/src/devices/video/nv2a.cpp
index 02e935d2f..30d6ba6ea 100644
--- a/src/devices/video/nv2a.cpp
+++ b/src/devices/video/nv2a.cpp
@@ -37,11 +37,8 @@
 
 #define LOG_PREFIX CXBXR_MODULE::NV2A
 
-// prevent name collisions
-namespace xboxkrnl
-{
+
 #include <xboxkrnl\xboxkrnl.h> // For PKINTERRUPT, etc.
-};
 
 #ifdef _MSC_VER                         // Check if MS Visual C compiler
 #  pragma comment(lib, "opengl32.lib")  // Compiler-specific directive to avoid manually configuration