diff --git a/Common/ConsoleListener.h b/Common/ConsoleListener.h
index 95691cf24c..29b57abf7a 100644
--- a/Common/ConsoleListener.h
+++ b/Common/ConsoleListener.h
@@ -23,8 +23,7 @@
 #include "CommonWindows.h"
 #endif
 
-class ConsoleListener : public LogListener
-{
+class ConsoleListener : public LogListener {
 public:
 	ConsoleListener();
 	~ConsoleListener();
diff --git a/Core/Core.cpp b/Core/Core.cpp
index 5153b2e4b7..f27c7dfdf7 100644
--- a/Core/Core.cpp
+++ b/Core/Core.cpp
@@ -32,10 +32,8 @@
 #include "Core/MIPS/MIPS.h"
 
 #ifdef _WIN32
-#ifndef _XBOX
-#include "Windows/OpenGLBase.h"
-#include "Windows/D3D9Base.h"
-#endif
+#include "Windows/GPU/WindowsGLContext.h"
+#include "Windows/GPU/D3D9Context.h"
 #include "Windows/InputDevice.h"
 #endif
 
diff --git a/GPU/GLES/GLES_GPU.cpp b/GPU/GLES/GLES_GPU.cpp
index 646bad6061..dd5c4f75a6 100644
--- a/GPU/GLES/GLES_GPU.cpp
+++ b/GPU/GLES/GLES_GPU.cpp
@@ -46,7 +46,7 @@
 #include "Core/HLE/sceGe.h"
 
 #ifdef _WIN32
-#include "Windows/OpenGLBase.h"
+#include "Windows/GPU/WindowsGLContext.h"
 #endif
 
 enum {
diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp
index 12f5e09745..19d2f489c9 100644
--- a/UI/NativeApp.cpp
+++ b/UI/NativeApp.cpp
@@ -37,7 +37,7 @@
 #if defined(_WIN32)
 #include "Windows/DSoundStream.h"
 #include "Windows/MainWindow.h"
-#include "Windows/D3D9Base.h"
+#include "Windows/GPU/D3D9Context.h"
 #endif
 
 #include "base/display.h"
diff --git a/Windows/D3D9Base.cpp b/Windows/GPU/D3D9Context.cpp
similarity index 99%
rename from Windows/D3D9Base.cpp
rename to Windows/GPU/D3D9Context.cpp
index 8110576b3a..d19b3f8d12 100644
--- a/Windows/D3D9Base.cpp
+++ b/Windows/GPU/D3D9Context.cpp
@@ -11,7 +11,7 @@
 
 #include "Core/Config.h"
 #include "Core/Reporting.h"
-#include "Windows/D3D9Base.h"
+#include "Windows/GPU/D3D9Context.h"
 #include "Windows/W32Util/Misc.h"
 #include "thin3d/thin3d.h"
 #include "thin3d/d3dx9_loader.h"
diff --git a/Windows/D3D9Base.h b/Windows/GPU/D3D9Context.h
similarity index 99%
rename from Windows/D3D9Base.h
rename to Windows/GPU/D3D9Context.h
index 716402cc14..470aac96a4 100644
--- a/Windows/D3D9Base.h
+++ b/Windows/GPU/D3D9Context.h
@@ -10,4 +10,5 @@ bool D3D9_Init(HWND window, bool windowed, std::string *error_message);
 void D3D9_Shutdown();
 void D3D9_Resize(HWND window);
 void D3D9_SwapBuffers();
+
 Thin3DContext *D3D9_CreateThin3DContext();
\ No newline at end of file
diff --git a/Windows/OpenGLBase.cpp b/Windows/GPU/WindowsGLContext.cpp
similarity index 99%
rename from Windows/OpenGLBase.cpp
rename to Windows/GPU/WindowsGLContext.cpp
index 7f387ddbec..a59e6edefe 100644
--- a/Windows/OpenGLBase.cpp
+++ b/Windows/GPU/WindowsGLContext.cpp
@@ -29,7 +29,7 @@
 #include "UI/OnScreenDisplay.h"
 
 #include "Windows/W32Util/Misc.h"
-#include "Windows/OpenGLBase.h"
+#include "Windows/GPU/WindowsGLContext.h"
 
 static HDC hDC;     // Private GDI Device Context
 static HGLRC hRC;   // Permanent Rendering Context
diff --git a/Windows/OpenGLBase.h b/Windows/GPU/WindowsGLContext.h
similarity index 100%
rename from Windows/OpenGLBase.h
rename to Windows/GPU/WindowsGLContext.h
diff --git a/Windows/MainWindow.cpp b/Windows/MainWindow.cpp
index ed1bc1907f..d5933d1000 100644
--- a/Windows/MainWindow.cpp
+++ b/Windows/MainWindow.cpp
@@ -43,7 +43,7 @@
 #include "Core/Config.h"
 #include "Core/Debugger/SymbolMap.h"
 #include "Windows/InputBox.h"
-#include "Windows/OpenGLBase.h"
+#include "Windows/GPU/WindowsGLContext.h"
 #include "Windows/Debugger/Debugger_Disasm.h"
 #include "Windows/Debugger/Debugger_MemoryDlg.h"
 #include "Windows/GEDebugger/GEDebugger.h"
diff --git a/Windows/PPSSPP.vcxproj b/Windows/PPSSPP.vcxproj
index 9fb8a6964c..4f1ff2e4a7 100644
--- a/Windows/PPSSPP.vcxproj
+++ b/Windows/PPSSPP.vcxproj
@@ -294,7 +294,7 @@
       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
       </ForcedIncludeFiles>
     </ClCompile>
-    <ClCompile Include="D3D9Base.cpp" />
+    <ClCompile Include="GPU\D3D9Context.cpp" />
     <ClCompile Include="Debugger\BreakpointWindow.cpp" />
     <ClCompile Include="Debugger\CtrlDisAsmView.cpp" />
     <ClCompile Include="Debugger\CtrlMemView.cpp" />
@@ -332,7 +332,7 @@
     <ClCompile Include="W32Util\TabControl.cpp" />
     <ClCompile Include="MainWindow.cpp" />
     <ClCompile Include="DSoundStream.cpp" />
-    <ClCompile Include="OpenGLBase.cpp" />
+    <ClCompile Include="GPU\WindowsGLContext.cpp" />
     <ClCompile Include="WindowsHost.cpp" />
     <ClCompile Include="Globals.cpp" />
     <ClCompile Include="main.cpp" />
@@ -349,7 +349,7 @@
     <ClInclude Include="..\android\jni\Arm64EmitterTest.h" />
     <ClInclude Include="..\android\jni\TestRunner.h" />
     <ClInclude Include="..\ios\ViewController.h" />
-    <ClInclude Include="D3D9Base.h" />
+    <ClInclude Include="GPU\D3D9Context.h" />
     <ClInclude Include="Debugger\BreakpointWindow.h" />
     <ClInclude Include="Debugger\CtrlDisAsmView.h" />
     <ClInclude Include="Debugger\CtrlMemView.h" />
@@ -381,7 +381,7 @@
     <ClInclude Include="InputBox.h" />
     <ClInclude Include="MainWindow.h" />
     <ClInclude Include="DSoundStream.h" />
-    <ClInclude Include="OpenGLBase.h" />
+    <ClInclude Include="GPU\WindowsGLContext.h" />
     <ClInclude Include="WindowsHost.h" />
     <ClInclude Include="..\Globals.h" />
     <ClInclude Include="main.h" />
diff --git a/Windows/PPSSPP.vcxproj.filters b/Windows/PPSSPP.vcxproj.filters
index 560e50ad6e..9bdd231c22 100644
--- a/Windows/PPSSPP.vcxproj.filters
+++ b/Windows/PPSSPP.vcxproj.filters
@@ -64,12 +64,6 @@
     <ClCompile Include="DSoundStream.cpp">
       <Filter>Windows\System</Filter>
     </ClCompile>
-    <ClCompile Include="D3D9Base.cpp">
-      <Filter>Windows\System</Filter>
-    </ClCompile>
-    <ClCompile Include="OpenGLBase.cpp">
-      <Filter>Windows\System</Filter>
-    </ClCompile>
     <ClCompile Include="WindowsHost.cpp">
       <Filter>Windows\System</Filter>
     </ClCompile>
@@ -152,6 +146,12 @@
     <ClCompile Include="MainWindow.cpp">
       <Filter>Windows\UI</Filter>
     </ClCompile>
+    <ClCompile Include="GPU\D3D9Context.cpp">
+      <Filter>Windows\System</Filter>
+    </ClCompile>
+    <ClCompile Include="GPU\WindowsGLContext.cpp">
+      <Filter>Windows\System</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Debugger\CtrlDisAsmView.h">
@@ -187,12 +187,6 @@
     <ClInclude Include="DSoundStream.h">
       <Filter>Windows\System</Filter>
     </ClInclude>
-    <ClInclude Include="D3D9Base.h">
-      <Filter>Windows\System</Filter>
-    </ClInclude>
-    <ClInclude Include="OpenGLBase.h">
-      <Filter>Windows\System</Filter>
-    </ClInclude>
     <ClInclude Include="WindowsHost.h">
       <Filter>Windows\System</Filter>
     </ClInclude>
@@ -275,6 +269,12 @@
     <ClInclude Include="MainWindow.h">
       <Filter>Windows\UI</Filter>
     </ClInclude>
+    <ClInclude Include="GPU\D3D9Context.h">
+      <Filter>Windows\System</Filter>
+    </ClInclude>
+    <ClInclude Include="GPU\WindowsGLContext.h">
+      <Filter>Windows\System</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="icon1.ico">
diff --git a/Windows/WindowsHost.cpp b/Windows/WindowsHost.cpp
index c087779169..c0b2770c33 100644
--- a/Windows/WindowsHost.cpp
+++ b/Windows/WindowsHost.cpp
@@ -42,8 +42,8 @@
 #include "Windows/DSoundStream.h"
 #include "Windows/WindowsHost.h"
 #include "Windows/MainWindow.h"
-#include "Windows/OpenGLBase.h"
-#include "Windows/D3D9Base.h"
+#include "Windows/GPU/WindowsGLContext.h"
+#include "Windows/GPU/D3D9Context.h"
 
 #include "Windows/Debugger/DebuggerShared.h"
 #include "Windows/Debugger/Debugger_Disasm.h"
diff --git a/headless/Headless.cpp b/headless/Headless.cpp
index 92490cc4ac..80def43fb3 100644
--- a/headless/Headless.cpp
+++ b/headless/Headless.cpp
@@ -25,7 +25,7 @@
 #include "Compare.h"
 #include "StubHost.h"
 #ifdef _WIN32
-#include "Windows/OpenGLBase.h"
+#include "Windows/GPU/WindowsGLContext.h"
 #include "WindowsHeadlessHost.h"
 #include "WindowsHeadlessHostDx9.h"
 #endif
diff --git a/headless/WindowsHeadlessHost.cpp b/headless/WindowsHeadlessHost.cpp
index 0342ce6d5f..ade06ed123 100644
--- a/headless/WindowsHeadlessHost.cpp
+++ b/headless/WindowsHeadlessHost.cpp
@@ -26,7 +26,7 @@
 #include "Core/System.h"
 #include "GPU/Common/GPUDebugInterface.h"
 #include "GPU/GPUState.h"
-#include "Windows/OpenGLBase.h"
+#include "Windows/GPU/WindowsGLContext.h"
 
 #include "base/logging.h"
 #include "gfx/gl_common.h"