Use xboxkrnl namespace inside xboxkrnl header file

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
 
 

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>

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)
 

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"

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

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,

src/common/xdvdfs-tools/buffered_io.h

@@ -7,6 +7,9 @@
 extern "C" {
 #endif
 
+namespace xboxkrnl
+{
+
 #define BOOL BOOLEAN
 #define LPSTR LPCH
 
@@ -44,6 +47,8 @@ extern void ReleaseBufferedSector(
 				PCDIO_READ This,
 				DWORD SectorNumber);
 
+};
+
 #ifdef __cplusplus
 }
 #endif

src/common/xdvdfs-tools/xdvdfs.h

@@ -7,6 +7,8 @@
 
 #include "buffered_io.h"
 
+using namespace xboxkrnl;
+
 CONST CHAR *XDVDFS_Signature = "MICROSOFT*XBOX*MEDIA";
 
 //-- Defines ------------------------------------------------------------------

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"

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"
 

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
 

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
 

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
 

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"
 

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
 

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
 

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"

src/core/hle/XAPI/Xapi.cpp

@@ -28,12 +28,9 @@
 #define LOG_PREFIX CXBXR_MODULE::XAPI
 
 #undef FIELD_OFFSET     // prevent macro redefinition warnings
-/* prevent name collisions */
-namespace xboxkrnl
-{
-	#include <xboxkrnl\xboxkrnl.h>
-};
 
+
+#include <xboxkrnl\xboxkrnl.h>
 #include "common\input\SdlJoystick.h"
 #include "common\input\InputManager.h"
 #include <Shlwapi.h>

src/core/kernel/exports/EmuKrnl.cpp

@@ -27,12 +27,8 @@
 
 #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>

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"
 

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"
 

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"

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"
 

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.

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

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"
 
 // ******************************************************************

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"
 

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"

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"

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"

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"
 

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

src/core/kernel/exports/EmuKrnlPhy.cpp

@@ -25,11 +25,8 @@
 // *
 // ******************************************************************
 
-// prevent name collisions
+
-namespace xboxkrnl
-{
 #include <xboxkrnl/xboxkrnl.h>
-};
 
 #define LOG_PREFIX CXBXR_MODULE::KRNL
 

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
 

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"
 

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

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.

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"

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
 

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

src/core/kernel/memory-manager/PhysicalMemory.h

@@ -29,11 +29,7 @@
 #define PHYSICAL_MEMORY_H
 
 
-namespace xboxkrnl
-{
 #include <xboxkrnl/xboxkrnl.h>
-};
-
 #include "core\kernel\support\Emu.h"
 #include "core\kernel\init\CxbxKrnl.h"
 #include <windows.h>

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"

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

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>

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"

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"
 

src/devices/usb/Hub.cpp

@@ -55,12 +55,8 @@
 
 #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"

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"

src/devices/usb/USBDevice.cpp

@@ -57,12 +57,8 @@
 
 #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"

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"

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