diff --git a/build/win32/Cxbx.vcxproj b/build/win32/Cxbx.vcxproj
index e4d5c8c7e..e0f319c2a 100644
--- a/build/win32/Cxbx.vcxproj
+++ b/build/win32/Cxbx.vcxproj
@@ -241,7 +241,7 @@
     <ClInclude Include="..\..\src\CxbxKrnl\EmuX86.h" />
     <ClInclude Include="..\..\src\core\HLE\XACTENG\XactEng.h" />
     <ClInclude Include="..\..\src\core\HLE\XAPI\Xapi.h" />
-    <ClInclude Include="..\..\src\CxbxKrnl\EmuXG.h" />
+    <ClInclude Include="..\..\src\core\HLE\XGRAPHIC\XGraphic.h" />
     <ClInclude Include="..\..\src\core\HLE\XAPI\OHCI\XInput\XInput.h" />
     <ClInclude Include="..\..\src\core\HLE\XONLINE\XOnline.h" />
     <ClInclude Include="..\..\src\CxbxKrnl\EmuXTL.h" />
@@ -468,7 +468,7 @@
     <ClCompile Include="..\..\src\CxbxKrnl\EmuX86.cpp" />
     <ClCompile Include="..\..\src\core\HLE\XACTENG\XactEng.cpp" />
     <ClCompile Include="..\..\src\core\HLE\XAPI\Xapi.cpp" />
-    <ClCompile Include="..\..\src\CxbxKrnl\EmuXG.cpp">
+    <ClCompile Include="..\..\src\core\HLE\XGRAPHIC\XGraphic.cpp">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
diff --git a/build/win32/Cxbx.vcxproj.filters b/build/win32/Cxbx.vcxproj.filters
index 825350c51..58137604f 100644
--- a/build/win32/Cxbx.vcxproj.filters
+++ b/build/win32/Cxbx.vcxproj.filters
@@ -136,8 +136,8 @@
     <ClCompile Include="..\..\src\core\HLE\XAPI\Xapi.cpp">
       <Filter>core\HLE\XAPI</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\CxbxKrnl\EmuXG.cpp">
-      <Filter>Emulator</Filter>
+    <ClCompile Include="..\..\src\core\HLE\XGRAPHIC\XGraphic.cpp">
+      <Filter>core\HLE\XGRAPHIC</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\core\HLE\XAPI\OHCI\XInput\XInput.cpp">
       <Filter>core\HLE\XAPI\OHCI\XInput</Filter>
@@ -410,8 +410,8 @@
     <ClInclude Include="..\..\src\core\HLE\XAPI\Xapi.h">
       <Filter>core\HLE\XAPI</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\CxbxKrnl\EmuXG.h">
-      <Filter>Emulator</Filter>
+    <ClInclude Include="..\..\src\core\HLE\XGRAPHIC\XGraphic.h">
+      <Filter>core\HLE\XGRAPHIC</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\core\HLE\XAPI\OHCI\XInput\XInput.h">
       <Filter>core\HLE\XAPI\OHCI\XInput</Filter>
@@ -792,6 +792,9 @@
     <Filter Include="core\HLE\XONLINE">
       <UniqueIdentifier>{c6ea372d-ae98-46eb-917f-009302c000c5}</UniqueIdentifier>
     </Filter>
+    <Filter Include="core\HLE\XGRAPHIC">
+      <UniqueIdentifier>{c494f79e-ff8e-4b45-b1c3-1da0b4b9ee49}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\resource\Cxbx.rc">
diff --git a/src/CxbxKrnl/EmuXTL.h b/src/CxbxKrnl/EmuXTL.h
index 5624bbb6d..a54c8a288 100644
--- a/src/CxbxKrnl/EmuXTL.h
+++ b/src/CxbxKrnl/EmuXTL.h
@@ -49,7 +49,7 @@ namespace XTL
     #include "core/HLE/XAPI/OHCI/XInput/DInput.h"
     #include "core/HLE/DSound/DirectSound/DirectSound.hpp"
     #include "core/HLE/XONLINE/XOnline.h"
-    #include "EmuXG.h"
+    #include "core/HLE/XGRAPHIC/XGraphic.h"
 	#include "core/HLE/XACTENG/XactEng.h"
 	#include "core/HLE/XAPI/OHCI/XInput/XInput.h"
 }
diff --git a/src/CxbxKrnl/EmuXG.cpp b/src/core/HLE/XGRAPHIC/XGraphic.cpp
similarity index 97%
rename from src/CxbxKrnl/EmuXG.cpp
rename to src/core/HLE/XGRAPHIC/XGraphic.cpp
index 2a1575a9c..c095cdaa7 100644
--- a/src/CxbxKrnl/EmuXG.cpp
+++ b/src/core/HLE/XGRAPHIC/XGraphic.cpp
@@ -9,7 +9,7 @@
 // *  `88bo,__,o,    oP"``"Yo,  _88o,,od8P   oP"``"Yo,
 // *    "YUMMMMMP",m"       "Mm,""YUMMMP" ,m"       "Mm,
 // *
-// *   Cxbx->Win32->CxbxKrnl->EmuXG.cpp
+// *   core->HLE->XGRAPHIC->XGraphic.cpp
 // *
 // *  This file is part of the Cxbx project.
 // *
@@ -40,11 +40,11 @@
 #undef FIELD_OFFSET     // prevent macro redefinition warnings
 #include <windows.h>
 
-#include "Emu.h"
-#include "EmuFS.h"
-#include "Logging.h"
-#include "EmuXTL.h"
-#include "EmuD3D8Logging.h" // for log rendering of X_D3DFORMAT, etc.
+#include "CxbxKrnl/Emu.h"
+#include "CxbxKrnl/EmuFS.h"
+#include "Common/Logging.h"
+#include "CxbxKrnl/EmuXTL.h"
+#include "CxbxKrnl/EmuD3D8Logging.h" // for log rendering of X_D3DFORMAT, etc.
 
 // ******************************************************************
 // * patch: XGIsSwizzledFormat
diff --git a/src/CxbxKrnl/EmuXG.h b/src/core/HLE/XGRAPHIC/XGraphic.h
similarity index 97%
rename from src/CxbxKrnl/EmuXG.h
rename to src/core/HLE/XGRAPHIC/XGraphic.h
index d9ee7780f..0aa8290f7 100644
--- a/src/CxbxKrnl/EmuXG.h
+++ b/src/core/HLE/XGRAPHIC/XGraphic.h
@@ -7,7 +7,7 @@
 // *  `88bo,__,o,    oP"``"Yo,  _88o,,od8P   oP"``"Yo,
 // *    "YUMMMMMP",m"       "Mm,""YUMMMP" ,m"       "Mm,
 // *
-// *   Cxbx->Win32->CxbxKrnl->EmuXG.h
+// *   core->HLE->XGRAPHIC->XGraphic.h
 // *
 // *  This file is part of the Cxbx project.
 // *
@@ -31,8 +31,8 @@
 // *  All rights reserved
 // *
 // ******************************************************************
-#ifndef EMUXG_H
-#define EMUXG_H
+#ifndef XGRAPHIC_H
+#define XGRAPHIC_H
 
 typedef struct _XGPOINT3D
 {