diff --git a/Source/Core/InputCommon/InputCommon.vcxproj.filters b/Source/Core/InputCommon/InputCommon.vcxproj.filters
diff --git a/Source/Core/UICommon/GameFile.cpp b/Source/Core/UICommon/GameFile.cpp
@@ -26,9 +26,9 @@
 #include "Common/ChunkFile.h"
 #include "Common/CommonPaths.h"
 #include "Common/CommonTypes.h"
-#include "Common/File.h"
 #include "Common/FileUtil.h"
 #include "Common/HttpRequest.h"
+#include "Common/IOFile.h"
 #include "Common/Image.h"
 #include "Common/IniFile.h"
 #include "Common/MsgHandler.h"

diff --git a/Source/Core/UICommon/GameFileCache.cpp b/Source/Core/UICommon/GameFileCache.cpp
@@ -17,9 +17,9 @@
 
 #include "Common/ChunkFile.h"
 #include "Common/CommonTypes.h"
-#include "Common/File.h"
 #include "Common/FileSearch.h"
 #include "Common/FileUtil.h"
+#include "Common/IOFile.h"
 
 #include "DiscIO/DirectoryBlob.h"
 

diff --git a/Source/Core/UICommon/UICommon.vcxproj b/Source/Core/UICommon/UICommon.vcxproj
diff --git a/Source/Core/UpdaterCommon/UpdaterCommon.vcxproj b/Source/Core/UpdaterCommon/UpdaterCommon.vcxproj
diff --git a/Source/Core/VideoBackends/D3D/CMakeLists.txt b/Source/Core/VideoBackends/D3D/CMakeLists.txt
@@ -1,25 +1,25 @@
 add_library(videod3d
-  BoundingBox.cpp
-  BoundingBox.h
   D3DBase.cpp
   D3DBase.h
+  D3DBoundingBox.cpp
+  D3DBoundingBox.h
+  D3DMain.cpp
+  D3DNativeVertexFormat.cpp
+  D3DPerfQuery.cpp
+  D3DPerfQuery.h
+  D3DRender.cpp
+  D3DRender.h
   D3DState.cpp
   D3DState.h
+  D3DSwapChain.cpp
+  D3DVertexManager.cpp
+  D3DVertexManager.h
   DXPipeline.cpp
   DXPipeline.h
   DXShader.cpp
   DXShader.h
   DXTexture.cpp
   DXTexture.h
-  main.cpp
-  NativeVertexFormat.cpp
-  PerfQuery.cpp
-  PerfQuery.h
-  Render.cpp
-  Render.h
-  SwapChain.cpp
-  VertexManager.cpp
-  VertexManager.h
   VideoBackend.h
 )
 

diff --git a/Source/Core/VideoBackends/D3D/D3D.vcxproj b/Source/Core/VideoBackends/D3D/D3D.vcxproj
diff --git a/Source/Core/VideoBackends/D3D/D3D.vcxproj.filters b/Source/Core/VideoBackends/D3D/D3D.vcxproj.filters
diff --git a/Source/Core/VideoBackends/D3D/D3DBase.cpp b/Source/Core/VideoBackends/D3D/D3DBase.cpp
@@ -15,7 +15,7 @@
 #include "Core/ConfigManager.h"
 #include "VideoBackends/D3D/D3DState.h"
 #include "VideoBackends/D3D/DXTexture.h"
-#include "VideoBackends/D3DCommon/Common.h"
+#include "VideoBackends/D3DCommon/D3DCommon.h"
 #include "VideoCommon/VideoConfig.h"
 
 namespace DX11

diff --git a/...ce/Core/VideoBackends/D3D/BoundingBox.cpp → ...Core/VideoBackends/D3D/D3DBoundingBox.cpp b/...ce/Core/VideoBackends/D3D/BoundingBox.cpp → ...Core/VideoBackends/D3D/D3DBoundingBox.cpp
@@ -2,11 +2,11 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "VideoBackends/D3D/BoundingBox.h"
+#include "VideoBackends/D3D/D3DBoundingBox.h"
 #include "Common/CommonTypes.h"
 #include "Common/MsgHandler.h"
 #include "VideoBackends/D3D/D3DState.h"
-#include "VideoBackends/D3DCommon/Common.h"
+#include "VideoBackends/D3DCommon/D3DCommon.h"
 #include "VideoCommon/VideoConfig.h"
 
 namespace DX11

diff --git a/Source/Core/VideoBackends/D3D/BoundingBox.h → ...e/Core/VideoBackends/D3D/D3DBoundingBox.h b/Source/Core/VideoBackends/D3D/BoundingBox.h → ...e/Core/VideoBackends/D3D/D3DBoundingBox.h
diff --git a/Source/Core/VideoBackends/D3D/main.cpp → Source/Core/VideoBackends/D3D/D3DMain.cpp b/Source/Core/VideoBackends/D3D/main.cpp → Source/Core/VideoBackends/D3D/D3DMain.cpp
@@ -10,14 +10,14 @@
 #include "Common/MsgHandler.h"
 #include "Common/StringUtil.h"
 
-#include "VideoBackends/D3D/BoundingBox.h"
 #include "VideoBackends/D3D/D3DBase.h"
-#include "VideoBackends/D3D/PerfQuery.h"
-#include "VideoBackends/D3D/Render.h"
-#include "VideoBackends/D3D/SwapChain.h"
-#include "VideoBackends/D3D/VertexManager.h"
+#include "VideoBackends/D3D/D3DBoundingBox.h"
+#include "VideoBackends/D3D/D3DPerfQuery.h"
+#include "VideoBackends/D3D/D3DRender.h"
+#include "VideoBackends/D3D/D3DSwapChain.h"
+#include "VideoBackends/D3D/D3DVertexManager.h"
 #include "VideoBackends/D3D/VideoBackend.h"
-#include "VideoBackends/D3DCommon/Common.h"
+#include "VideoBackends/D3DCommon/D3DCommon.h"
 
 #include "VideoCommon/FramebufferManager.h"
 #include "VideoCommon/ShaderCache.h"

diff --git a/.../VideoBackends/D3D/NativeVertexFormat.cpp → ...deoBackends/D3D/D3DNativeVertexFormat.cpp b/.../VideoBackends/D3D/NativeVertexFormat.cpp → ...deoBackends/D3D/D3DNativeVertexFormat.cpp
@@ -5,10 +5,10 @@
 #include <array>
 
 #include "VideoBackends/D3D/D3DBase.h"
+#include "VideoBackends/D3D/D3DRender.h"
 #include "VideoBackends/D3D/D3DState.h"
+#include "VideoBackends/D3D/D3DVertexManager.h"
 #include "VideoBackends/D3D/DXShader.h"
-#include "VideoBackends/D3D/Render.h"
-#include "VideoBackends/D3D/VertexManager.h"
 #include "VideoCommon/NativeVertexFormat.h"
 
 namespace DX11

diff --git a/Source/Core/VideoBackends/D3D/PerfQuery.cpp → ...e/Core/VideoBackends/D3D/D3DPerfQuery.cpp b/Source/Core/VideoBackends/D3D/PerfQuery.cpp → ...e/Core/VideoBackends/D3D/D3DPerfQuery.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "VideoBackends/D3D/PerfQuery.h"
+#include "VideoBackends/D3D/D3DPerfQuery.h"
 
 #include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"

diff --git a/Source/Core/VideoBackends/D3D/PerfQuery.h → Source/Core/VideoBackends/D3D/D3DPerfQuery.h b/Source/Core/VideoBackends/D3D/PerfQuery.h → Source/Core/VideoBackends/D3D/D3DPerfQuery.h
diff --git a/Source/Core/VideoBackends/D3D/Render.cpp → Source/Core/VideoBackends/D3D/D3DRender.cpp b/Source/Core/VideoBackends/D3D/Render.cpp → Source/Core/VideoBackends/D3D/D3DRender.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "VideoBackends/D3D/Render.h"
+#include "VideoBackends/D3D/D3DRender.h"
 
 #include <algorithm>
 #include <array>
@@ -21,13 +21,13 @@
 
 #include "Core/Core.h"
 
-#include "VideoBackends/D3D/BoundingBox.h"
 #include "VideoBackends/D3D/D3DBase.h"
+#include "VideoBackends/D3D/D3DBoundingBox.h"
 #include "VideoBackends/D3D/D3DState.h"
+#include "VideoBackends/D3D/D3DSwapChain.h"
 #include "VideoBackends/D3D/DXPipeline.h"
 #include "VideoBackends/D3D/DXShader.h"
 #include "VideoBackends/D3D/DXTexture.h"
-#include "VideoBackends/D3D/SwapChain.h"
 
 #include "VideoCommon/BPFunctions.h"
 #include "VideoCommon/FramebufferManager.h"

diff --git a/Source/Core/VideoBackends/D3D/Render.h → Source/Core/VideoBackends/D3D/D3DRender.h b/Source/Core/VideoBackends/D3D/Render.h → Source/Core/VideoBackends/D3D/D3DRender.h
diff --git a/Source/Core/VideoBackends/D3D/D3DState.cpp b/Source/Core/VideoBackends/D3D/D3DState.cpp
@@ -13,7 +13,7 @@
 #include "VideoBackends/D3D/D3DBase.h"
 #include "VideoBackends/D3D/D3DState.h"
 #include "VideoBackends/D3D/DXTexture.h"
-#include "VideoBackends/D3DCommon/Common.h"
+#include "VideoBackends/D3DCommon/D3DCommon.h"
 #include "VideoCommon/VideoConfig.h"
 
 namespace DX11

diff --git a/Source/Core/VideoBackends/D3D/SwapChain.cpp → ...e/Core/VideoBackends/D3D/D3DSwapChain.cpp b/Source/Core/VideoBackends/D3D/SwapChain.cpp → ...e/Core/VideoBackends/D3D/D3DSwapChain.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "VideoBackends/D3D/SwapChain.h"
+#include "VideoBackends/D3D/D3DSwapChain.h"
 #include "VideoBackends/D3D/DXTexture.h"
 
 namespace DX11

diff --git a/Source/Core/VideoBackends/D3D/SwapChain.h → Source/Core/VideoBackends/D3D/D3DSwapChain.h b/Source/Core/VideoBackends/D3D/SwapChain.h → Source/Core/VideoBackends/D3D/D3DSwapChain.h
diff --git a/.../Core/VideoBackends/D3D/VertexManager.cpp → ...re/VideoBackends/D3D/D3DVertexManager.cpp b/.../Core/VideoBackends/D3D/VertexManager.cpp → ...re/VideoBackends/D3D/D3DVertexManager.cpp
@@ -2,19 +2,19 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "VideoBackends/D3D/VertexManager.h"
+#include "VideoBackends/D3D/D3DVertexManager.h"
 
 #include <d3d11.h>
 
 #include "Common/Align.h"
 #include "Common/Assert.h"
 #include "Common/CommonTypes.h"
 
-#include "VideoBackends/D3D/BoundingBox.h"
 #include "VideoBackends/D3D/D3DBase.h"
+#include "VideoBackends/D3D/D3DBoundingBox.h"
+#include "VideoBackends/D3D/D3DRender.h"
 #include "VideoBackends/D3D/D3DState.h"
-#include "VideoBackends/D3D/Render.h"
-#include "VideoBackends/D3DCommon/Common.h"
+#include "VideoBackends/D3DCommon/D3DCommon.h"
 
 #include "VideoCommon/BoundingBox.h"
 #include "VideoCommon/GeometryShaderManager.h"

diff --git a/...ce/Core/VideoBackends/D3D/VertexManager.h → ...Core/VideoBackends/D3D/D3DVertexManager.h b/...ce/Core/VideoBackends/D3D/VertexManager.h → ...Core/VideoBackends/D3D/D3DVertexManager.h
diff --git a/Source/Core/VideoBackends/D3D/DXPipeline.cpp b/Source/Core/VideoBackends/D3D/DXPipeline.cpp
@@ -6,12 +6,12 @@
 #include "Common/Logging/Log.h"
 
 #include "VideoBackends/D3D/D3DBase.h"
+#include "VideoBackends/D3D/D3DRender.h"
 #include "VideoBackends/D3D/D3DState.h"
+#include "VideoBackends/D3D/D3DVertexManager.h"
 #include "VideoBackends/D3D/DXPipeline.h"
 #include "VideoBackends/D3D/DXShader.h"
 #include "VideoBackends/D3D/DXTexture.h"
-#include "VideoBackends/D3D/Render.h"
-#include "VideoBackends/D3D/VertexManager.h"
 #include "VideoCommon/VideoConfig.h"
 
 namespace DX11

diff --git a/Source/Core/VideoBackends/D3D/DXTexture.cpp b/Source/Core/VideoBackends/D3D/DXTexture.cpp
@@ -11,7 +11,7 @@
 
 #include "VideoBackends/D3D/D3DState.h"
 #include "VideoBackends/D3D/DXTexture.h"
-#include "VideoBackends/D3DCommon/Common.h"
+#include "VideoBackends/D3DCommon/D3DCommon.h"
 #include "VideoCommon/VideoConfig.h"
 
 namespace DX11

diff --git a/Source/Core/VideoBackends/D3D12/CMakeLists.txt b/Source/Core/VideoBackends/D3D12/CMakeLists.txt
@@ -1,30 +1,30 @@
 add_library(videod3d12
-  BoundingBox.cpp
-  BoundingBox.h
+  D3D12BoundingBox.cpp
+  D3D12BoundingBox.h
+  D3D12PerfQuery.cpp
+  D3D12PerfQuery.h
+  D3D12Renderer.cpp
+  D3D12Renderer.h
+  D3D12StreamBuffer.cpp
+  D3D12StreamBuffer.h
+  D3D12SwapChain.cpp
+  D3D12SwapChain.h
+  D3D12VertexManager.cpp
+  D3D12VertexManager.h
   DescriptorAllocator.cpp
   DescriptorAllocator.h
   DescriptorHeapManager.cpp
   DescriptorHeapManager.h
-  DXContext.cpp
-  DXContext.h
-  DXPipeline.cpp
-  DXPipeline.h
-  DXShader.cpp
-  DXShader.h
-  DXTexture.cpp
-  DXTexture.h
-  DXVertexFormat.cpp
-  DXVertexFormat.h
-  PerfQuery.cpp
-  PerfQuery.h
-  Renderer.cpp
-  Renderer.h
-  StreamBuffer.cpp
-  StreamBuffer.h
-  SwapChain.cpp
-  SwapChain.h
-  VertexManager.cpp
-  VertexManager.h
+  DX12Context.cpp
+  DX12Context.h
+  DX12Pipeline.cpp
+  DX12Pipeline.h
+  DX12Shader.cpp
+  DX12Shader.h
+  DX12Texture.cpp
+  DX12Texture.h
+  DX12VertexFormat.cpp
+  DX12VertexFormat.h
   VideoBackend.cpp
   VideoBackend.h
 )

diff --git a/Source/Core/VideoBackends/D3D12/Common.h b/Source/Core/VideoBackends/D3D12/Common.h
@@ -7,7 +7,7 @@
 #include <wrl/client.h>
 
 #include "Common/MsgHandler.h"
-#include "VideoBackends/D3DCommon/Common.h"
+#include "VideoBackends/D3DCommon/D3DCommon.h"
 
 namespace DX12
 {

diff --git a/Source/Core/VideoBackends/D3D12/D3D12.vcxproj b/Source/Core/VideoBackends/D3D12/D3D12.vcxproj
diff --git a/Source/Core/VideoBackends/D3D12/D3D12.vcxproj.filters b/Source/Core/VideoBackends/D3D12/D3D12.vcxproj.filters
diff --git a/.../Core/VideoBackends/D3D12/BoundingBox.cpp → .../VideoBackends/D3D12/D3D12BoundingBox.cpp b/.../Core/VideoBackends/D3D12/BoundingBox.cpp → .../VideoBackends/D3D12/D3D12BoundingBox.cpp
@@ -2,10 +2,10 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "VideoBackends/D3D12/BoundingBox.h"
+#include "VideoBackends/D3D12/D3D12BoundingBox.h"
 #include "Common/Logging/Log.h"
-#include "VideoBackends/D3D12/DXContext.h"
-#include "VideoBackends/D3D12/Renderer.h"
+#include "VideoBackends/D3D12/D3D12Renderer.h"
+#include "VideoBackends/D3D12/DX12Context.h"
 
 namespace DX12
 {

diff --git a/...ce/Core/VideoBackends/D3D12/BoundingBox.h → ...re/VideoBackends/D3D12/D3D12BoundingBox.h b/...ce/Core/VideoBackends/D3D12/BoundingBox.h → ...re/VideoBackends/D3D12/D3D12BoundingBox.h
@@ -5,8 +5,8 @@
 #pragma once
 #include <memory>
 #include "VideoBackends/D3D12/Common.h"
+#include "VideoBackends/D3D12/D3D12StreamBuffer.h"
 #include "VideoBackends/D3D12/DescriptorHeapManager.h"
-#include "VideoBackends/D3D12/StreamBuffer.h"
 
 namespace DX12
 {

diff --git a/...ce/Core/VideoBackends/D3D12/PerfQuery.cpp → ...re/VideoBackends/D3D12/D3D12PerfQuery.cpp b/...ce/Core/VideoBackends/D3D12/PerfQuery.cpp → ...re/VideoBackends/D3D12/D3D12PerfQuery.cpp
@@ -2,15 +2,15 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "VideoBackends/D3D12/PerfQuery.h"
+#include "VideoBackends/D3D12/D3D12PerfQuery.h"
 
 #include <algorithm>
 
 #include "Common/Assert.h"
 #include "Common/Logging/Log.h"
 #include "VideoBackends/D3D12/Common.h"
-#include "VideoBackends/D3D12/DXContext.h"
-#include "VideoBackends/D3D12/Renderer.h"
+#include "VideoBackends/D3D12/D3D12Renderer.h"
+#include "VideoBackends/D3D12/DX12Context.h"
 #include "VideoCommon/VideoCommon.h"
 
 namespace DX12

diff --git a/Source/Core/VideoBackends/D3D12/PerfQuery.h → ...Core/VideoBackends/D3D12/D3D12PerfQuery.h b/Source/Core/VideoBackends/D3D12/PerfQuery.h → ...Core/VideoBackends/D3D12/D3D12PerfQuery.h
@@ -5,7 +5,7 @@
 #pragma once
 
 #include <array>
-#include "VideoBackends/D3D12/DXContext.h"
+#include "VideoBackends/D3D12/DX12Context.h"
 #include "VideoCommon/PerfQueryBase.h"
 
 namespace DX12

diff --git a/Source/Core/VideoBackends/D3D12/Renderer.cpp → ...ore/VideoBackends/D3D12/D3D12Renderer.cpp b/Source/Core/VideoBackends/D3D12/Renderer.cpp → ...ore/VideoBackends/D3D12/D3D12Renderer.cpp
@@ -4,17 +4,17 @@
 
 #include "Common/Logging/Log.h"
 
-#include "VideoBackends/D3D12/BoundingBox.h"
 #include "VideoBackends/D3D12/Common.h"
-#include "VideoBackends/D3D12/DXContext.h"
-#include "VideoBackends/D3D12/DXPipeline.h"
-#include "VideoBackends/D3D12/DXShader.h"
-#include "VideoBackends/D3D12/DXTexture.h"
-#include "VideoBackends/D3D12/DXVertexFormat.h"
+#include "VideoBackends/D3D12/D3D12BoundingBox.h"
+#include "VideoBackends/D3D12/D3D12PerfQuery.h"
+#include "VideoBackends/D3D12/D3D12Renderer.h"
+#include "VideoBackends/D3D12/D3D12SwapChain.h"
+#include "VideoBackends/D3D12/DX12Context.h"
+#include "VideoBackends/D3D12/DX12Pipeline.h"
+#include "VideoBackends/D3D12/DX12Shader.h"
+#include "VideoBackends/D3D12/DX12Texture.h"
+#include "VideoBackends/D3D12/DX12VertexFormat.h"
 #include "VideoBackends/D3D12/DescriptorHeapManager.h"
-#include "VideoBackends/D3D12/PerfQuery.h"
-#include "VideoBackends/D3D12/Renderer.h"
-#include "VideoBackends/D3D12/SwapChain.h"
 #include "VideoCommon/VideoConfig.h"
 
 namespace DX12

diff --git a/Source/Core/VideoBackends/D3D12/Renderer.h → .../Core/VideoBackends/D3D12/D3D12Renderer.h b/Source/Core/VideoBackends/D3D12/Renderer.h → .../Core/VideoBackends/D3D12/D3D12Renderer.h
@@ -5,6 +5,7 @@
 #pragma once
 
 #include <d3d12.h>
+#include "VideoBackends/D3D12/DescriptorAllocator.h"
 #include "VideoBackends/D3D12/DescriptorHeapManager.h"
 #include "VideoCommon/RenderBase.h"
 

diff --git a/...Core/VideoBackends/D3D12/StreamBuffer.cpp → ...VideoBackends/D3D12/D3D12StreamBuffer.cpp b/...Core/VideoBackends/D3D12/StreamBuffer.cpp → ...VideoBackends/D3D12/D3D12StreamBuffer.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "VideoBackends/D3D12/StreamBuffer.h"
+#include "VideoBackends/D3D12/D3D12StreamBuffer.h"
 
 #include <algorithm>
 #include <functional>
@@ -11,7 +11,7 @@
 #include "Common/Assert.h"
 #include "Common/MsgHandler.h"
 
-#include "VideoBackends/D3D12/DXContext.h"
+#include "VideoBackends/D3D12/DX12Context.h"
 
 namespace DX12
 {

diff --git a/...e/Core/VideoBackends/D3D12/StreamBuffer.h → ...e/VideoBackends/D3D12/D3D12StreamBuffer.h b/...e/Core/VideoBackends/D3D12/StreamBuffer.h → ...e/VideoBackends/D3D12/D3D12StreamBuffer.h
diff --git a/...ce/Core/VideoBackends/D3D12/SwapChain.cpp → ...re/VideoBackends/D3D12/D3D12SwapChain.cpp b/...ce/Core/VideoBackends/D3D12/SwapChain.cpp → ...re/VideoBackends/D3D12/D3D12SwapChain.cpp
@@ -2,9 +2,9 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "VideoBackends/D3D12/SwapChain.h"
-#include "VideoBackends/D3D12/DXContext.h"
-#include "VideoBackends/D3D12/DXTexture.h"
+#include "VideoBackends/D3D12/D3D12SwapChain.h"
+#include "VideoBackends/D3D12/DX12Context.h"
+#include "VideoBackends/D3D12/DX12Texture.h"
 
 namespace DX12
 {

diff --git a/Source/Core/VideoBackends/D3D12/SwapChain.h → ...Core/VideoBackends/D3D12/D3D12SwapChain.h b/Source/Core/VideoBackends/D3D12/SwapChain.h → ...Core/VideoBackends/D3D12/D3D12SwapChain.h
diff --git a/...ore/VideoBackends/D3D12/VertexManager.cpp → ...ideoBackends/D3D12/D3D12VertexManager.cpp b/...ore/VideoBackends/D3D12/VertexManager.cpp → ...ideoBackends/D3D12/D3D12VertexManager.cpp
@@ -4,16 +4,16 @@
 
 #include "Common/CommonTypes.h"
 
-#include "VideoBackends/D3D12/VertexManager.h"
+#include "VideoBackends/D3D12/D3D12VertexManager.h"
 
 #include "Common/Align.h"
 #include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"
 #include "Common/MsgHandler.h"
 
-#include "VideoBackends/D3D12/DXContext.h"
-#include "VideoBackends/D3D12/Renderer.h"
-#include "VideoBackends/D3D12/StreamBuffer.h"
+#include "VideoBackends/D3D12/D3D12Renderer.h"
+#include "VideoBackends/D3D12/D3D12StreamBuffer.h"
+#include "VideoBackends/D3D12/DX12Context.h"
 
 #include "VideoCommon/GeometryShaderManager.h"
 #include "VideoCommon/IndexGenerator.h"

diff --git a/.../Core/VideoBackends/D3D12/VertexManager.h → .../VideoBackends/D3D12/D3D12VertexManager.h b/.../Core/VideoBackends/D3D12/VertexManager.h → .../VideoBackends/D3D12/D3D12VertexManager.h
@@ -5,8 +5,8 @@
 #pragma once
 
 #include <memory>
+#include "VideoBackends/D3D12/D3D12StreamBuffer.h"
 #include "VideoBackends/D3D12/DescriptorHeapManager.h"
-#include "VideoBackends/D3D12/StreamBuffer.h"
 #include "VideoCommon/VertexManagerBase.h"
 
 namespace DX12

diff --git a/...ce/Core/VideoBackends/D3D12/DXContext.cpp → .../Core/VideoBackends/D3D12/DX12Context.cpp b/...ce/Core/VideoBackends/D3D12/DXContext.cpp → .../Core/VideoBackends/D3D12/DX12Context.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "VideoBackends/D3D12/DXContext.h"
+#include "VideoBackends/D3D12/DX12Context.h"
 
 #include <algorithm>
 #include <array>
@@ -14,8 +14,8 @@
 #include "Common/DynamicLibrary.h"
 #include "Common/StringUtil.h"
 #include "VideoBackends/D3D12/Common.h"
+#include "VideoBackends/D3D12/D3D12StreamBuffer.h"
 #include "VideoBackends/D3D12/DescriptorHeapManager.h"
-#include "VideoBackends/D3D12/StreamBuffer.h"
 #include "VideoCommon/VideoConfig.h"
 
 namespace DX12

diff --git a/Source/Core/VideoBackends/D3D12/DXContext.h → ...ce/Core/VideoBackends/D3D12/DX12Context.h b/Source/Core/VideoBackends/D3D12/DXContext.h → ...ce/Core/VideoBackends/D3D12/DX12Context.h
@@ -9,9 +9,9 @@
 
 #include "Common/CommonTypes.h"
 #include "VideoBackends/D3D12/Common.h"
+#include "VideoBackends/D3D12/D3D12StreamBuffer.h"
 #include "VideoBackends/D3D12/DescriptorAllocator.h"
 #include "VideoBackends/D3D12/DescriptorHeapManager.h"
-#include "VideoBackends/D3D12/StreamBuffer.h"
 
 struct IDXGIFactory;
 

diff --git a/...e/Core/VideoBackends/D3D12/DXPipeline.cpp → ...Core/VideoBackends/D3D12/DX12Pipeline.cpp b/...e/Core/VideoBackends/D3D12/DXPipeline.cpp → ...Core/VideoBackends/D3D12/DX12Pipeline.cpp
@@ -6,11 +6,11 @@
 #include "Common/MsgHandler.h"
 
 #include "VideoBackends/D3D12/Common.h"
-#include "VideoBackends/D3D12/DXContext.h"
-#include "VideoBackends/D3D12/DXPipeline.h"
-#include "VideoBackends/D3D12/DXShader.h"
-#include "VideoBackends/D3D12/DXTexture.h"
-#include "VideoBackends/D3D12/DXVertexFormat.h"
+#include "VideoBackends/D3D12/DX12Context.h"
+#include "VideoBackends/D3D12/DX12Pipeline.h"
+#include "VideoBackends/D3D12/DX12Shader.h"
+#include "VideoBackends/D3D12/DX12Texture.h"
+#include "VideoBackends/D3D12/DX12VertexFormat.h"
 
 namespace DX12
 {

diff --git a/Source/Core/VideoBackends/D3D12/DXPipeline.h → ...e/Core/VideoBackends/D3D12/DX12Pipeline.h b/Source/Core/VideoBackends/D3D12/DXPipeline.h → ...e/Core/VideoBackends/D3D12/DX12Pipeline.h
diff --git a/Source/Core/VideoBackends/D3D12/DXShader.cpp → ...e/Core/VideoBackends/D3D12/DX12Shader.cpp b/Source/Core/VideoBackends/D3D12/DXShader.cpp → ...e/Core/VideoBackends/D3D12/DX12Shader.cpp
@@ -2,9 +2,9 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "VideoBackends/D3D12/DXShader.h"
+#include "VideoBackends/D3D12/DX12Shader.h"
 #include "VideoBackends/D3D12/Common.h"
-#include "VideoBackends/D3D12/DXContext.h"
+#include "VideoBackends/D3D12/DX12Context.h"
 
 namespace DX12
 {

diff --git a/Source/Core/VideoBackends/D3D12/DXShader.h → Source/Core/VideoBackends/D3D12/DX12Shader.h b/Source/Core/VideoBackends/D3D12/DXShader.h → Source/Core/VideoBackends/D3D12/DX12Shader.h
diff --git a/...ce/Core/VideoBackends/D3D12/DXTexture.cpp → .../Core/VideoBackends/D3D12/DX12Texture.cpp b/...ce/Core/VideoBackends/D3D12/DXTexture.cpp → .../Core/VideoBackends/D3D12/DX12Texture.cpp
@@ -2,14 +2,14 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "VideoBackends/D3D12/DXTexture.h"
+#include "VideoBackends/D3D12/DX12Texture.h"
 #include "Common/Align.h"
 #include "Common/Assert.h"
 #include "VideoBackends/D3D12/Common.h"
-#include "VideoBackends/D3D12/DXContext.h"
+#include "VideoBackends/D3D12/D3D12Renderer.h"
+#include "VideoBackends/D3D12/D3D12StreamBuffer.h"
+#include "VideoBackends/D3D12/DX12Context.h"
 #include "VideoBackends/D3D12/DescriptorHeapManager.h"
-#include "VideoBackends/D3D12/Renderer.h"
-#include "VideoBackends/D3D12/StreamBuffer.h"
 
 namespace DX12
 {

diff --git a/Source/Core/VideoBackends/D3D12/DXTexture.h → ...ce/Core/VideoBackends/D3D12/DX12Texture.h b/Source/Core/VideoBackends/D3D12/DXTexture.h → ...ce/Core/VideoBackends/D3D12/DX12Texture.h
diff --git a/...re/VideoBackends/D3D12/DXVertexFormat.cpp → .../VideoBackends/D3D12/DX12VertexFormat.cpp b/...re/VideoBackends/D3D12/DXVertexFormat.cpp → .../VideoBackends/D3D12/DX12VertexFormat.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "VideoBackends/D3D12/DXVertexFormat.h"
+#include "VideoBackends/D3D12/DX12VertexFormat.h"
 
 #include "Common/Assert.h"
 

diff --git a/...Core/VideoBackends/D3D12/DXVertexFormat.h → ...re/VideoBackends/D3D12/DX12VertexFormat.h b/...Core/VideoBackends/D3D12/DXVertexFormat.h → ...re/VideoBackends/D3D12/DX12VertexFormat.h
diff --git a/Source/Core/VideoBackends/D3D12/DescriptorAllocator.cpp b/Source/Core/VideoBackends/D3D12/DescriptorAllocator.cpp
@@ -3,7 +3,7 @@
 // Refer to the license.txt file included.
 
 #include "VideoBackends/D3D12/DescriptorAllocator.h"
-#include "VideoBackends/D3D12/DXContext.h"
+#include "VideoBackends/D3D12/DX12Context.h"
 
 namespace DX12
 {

diff --git a/Source/Core/VideoBackends/D3D12/DescriptorHeapManager.cpp b/Source/Core/VideoBackends/D3D12/DescriptorHeapManager.cpp
@@ -4,7 +4,7 @@
 
 #include "VideoBackends/D3D12/DescriptorHeapManager.h"
 #include "Common/Assert.h"
-#include "VideoBackends/D3D12/DXContext.h"
+#include "VideoBackends/D3D12/DX12Context.h"
 #include "VideoCommon/VideoConfig.h"
 
 namespace DX12

diff --git a/Source/Core/VideoBackends/D3D12/VideoBackend.cpp b/Source/Core/VideoBackends/D3D12/VideoBackend.cpp
@@ -10,11 +10,11 @@
 #include "Core/ConfigManager.h"
 
 #include "VideoBackends/D3D12/Common.h"
-#include "VideoBackends/D3D12/DXContext.h"
-#include "VideoBackends/D3D12/PerfQuery.h"
-#include "VideoBackends/D3D12/Renderer.h"
-#include "VideoBackends/D3D12/SwapChain.h"
-#include "VideoBackends/D3D12/VertexManager.h"
+#include "VideoBackends/D3D12/D3D12PerfQuery.h"
+#include "VideoBackends/D3D12/D3D12Renderer.h"
+#include "VideoBackends/D3D12/D3D12SwapChain.h"
+#include "VideoBackends/D3D12/D3D12VertexManager.h"
+#include "VideoBackends/D3D12/DX12Context.h"
 #include "VideoBackends/D3D12/VideoBackend.h"
 
 #include "VideoCommon/FramebufferManager.h"

diff --git a/Source/Core/VideoBackends/D3DCommon/CMakeLists.txt b/Source/Core/VideoBackends/D3DCommon/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_library(videod3dcommon
-  Common.cpp
-  Common.h
+  D3DCommon.cpp
+  D3DCommon.h
   Shader.cpp
   Shader.h
   SwapChain.cpp

diff --git a/...e/Core/VideoBackends/D3DCommon/Common.cpp → ...ore/VideoBackends/D3DCommon/D3DCommon.cpp b/...e/Core/VideoBackends/D3DCommon/Common.cpp → ...ore/VideoBackends/D3DCommon/D3DCommon.cpp
@@ -11,7 +11,7 @@
 #include "Common/DynamicLibrary.h"
 #include "Common/MsgHandler.h"
 #include "Common/StringUtil.h"
-#include "VideoBackends/D3DCommon/Common.h"
+#include "VideoBackends/D3DCommon/D3DCommon.h"
 #include "VideoCommon/TextureConfig.h"
 #include "VideoCommon/VideoConfig.h"
 

diff --git a/Source/Core/VideoBackends/D3DCommon/Common.h → .../Core/VideoBackends/D3DCommon/D3DCommon.h b/Source/Core/VideoBackends/D3DCommon/Common.h → .../Core/VideoBackends/D3DCommon/D3DCommon.h
diff --git a/Source/Core/VideoBackends/D3DCommon/D3DCommon.vcxproj.filters b/Source/Core/VideoBackends/D3DCommon/D3DCommon.vcxproj.filters
diff --git a/Source/Core/VideoBackends/D3DCommon/Shader.h b/Source/Core/VideoBackends/D3DCommon/Shader.h
@@ -6,7 +6,7 @@
 
 #include <optional>
 #include <string_view>
-#include "VideoBackends/D3DCommon/Common.h"
+#include "VideoBackends/D3DCommon/D3DCommon.h"
 #include "VideoCommon/AbstractShader.h"
 
 namespace D3DCommon

diff --git a/Source/Core/VideoBackends/D3DCommon/SwapChain.h b/Source/Core/VideoBackends/D3DCommon/SwapChain.h
@@ -9,7 +9,7 @@
 
 #include "Common/CommonTypes.h"
 #include "Common/WindowSystemInfo.h"
-#include "VideoBackends/D3DCommon/Common.h"
+#include "VideoBackends/D3DCommon/D3DCommon.h"
 #include "VideoCommon/TextureConfig.h"
 
 namespace D3DCommon

diff --git a/Source/Core/VideoBackends/Null/CMakeLists.txt b/Source/Core/VideoBackends/Null/CMakeLists.txt
@@ -1,13 +1,13 @@
 add_library(videonull
   NullBackend.cpp
+  NullRender.cpp
+  NullRender.h
   NullTexture.cpp
   NullTexture.h
+  NullVertexManager.cpp
+  NullVertexManager.h
   PerfQuery.h
-  Render.cpp
-  Render.h
   TextureCache.h
-  VertexManager.cpp
-  VertexManager.h
   VideoBackend.h
 )
 

diff --git a/Source/Core/VideoBackends/Null/Null.vcxproj b/Source/Core/VideoBackends/Null/Null.vcxproj
diff --git a/Source/Core/VideoBackends/Null/NullBackend.cpp b/Source/Core/VideoBackends/Null/NullBackend.cpp
@@ -7,10 +7,10 @@
 // This backend tries not to do anything in the backend,
 // but everything in VideoCommon.
 
+#include "VideoBackends/Null/NullRender.h"
+#include "VideoBackends/Null/NullVertexManager.h"
 #include "VideoBackends/Null/PerfQuery.h"
-#include "VideoBackends/Null/Render.h"
 #include "VideoBackends/Null/TextureCache.h"
-#include "VideoBackends/Null/VertexManager.h"
 #include "VideoBackends/Null/VideoBackend.h"
 
 #include "Common/Common.h"

diff --git a/Source/Core/VideoBackends/Null/Render.cpp → ...ce/Core/VideoBackends/Null/NullRender.cpp b/Source/Core/VideoBackends/Null/Render.cpp → ...ce/Core/VideoBackends/Null/NullRender.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "VideoBackends/Null/Render.h"
+#include "VideoBackends/Null/NullRender.h"
 
 #include "VideoBackends/Null/NullTexture.h"
 

diff --git a/Source/Core/VideoBackends/Null/Render.h → Source/Core/VideoBackends/Null/NullRender.h b/Source/Core/VideoBackends/Null/Render.h → Source/Core/VideoBackends/Null/NullRender.h
diff --git a/...Core/VideoBackends/Null/VertexManager.cpp → .../VideoBackends/Null/NullVertexManager.cpp b/...Core/VideoBackends/Null/VertexManager.cpp → .../VideoBackends/Null/NullVertexManager.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "VideoBackends/Null/VertexManager.h"
+#include "VideoBackends/Null/NullVertexManager.h"
 
 namespace Null
 {

diff --git a/...e/Core/VideoBackends/Null/VertexManager.h → ...re/VideoBackends/Null/NullVertexManager.h b/...e/Core/VideoBackends/Null/VertexManager.h → ...re/VideoBackends/Null/NullVertexManager.h
diff --git a/Source/Core/VideoBackends/OGL/CMakeLists.txt b/Source/Core/VideoBackends/OGL/CMakeLists.txt
@@ -1,27 +1,27 @@
 add_library(videoogl
-  BoundingBox.cpp
-  BoundingBox.h
   GPUTimer.h
-  main.cpp
-  NativeVertexFormat.cpp
+  OGLBoundingBox.cpp
+  OGLBoundingBox.h
+  OGLMain.cpp
+  OGLNativeVertexFormat.cpp
+  OGLPerfQuery.cpp
+  OGLPerfQuery.h
   OGLPipeline.cpp
   OGLPipeline.h
+  OGLRender.cpp
+  OGLRender.h
   OGLShader.cpp
   OGLShader.h
+  OGLStreamBuffer.cpp
+  OGLStreamBuffer.h
   OGLTexture.cpp
   OGLTexture.h
-  PerfQuery.cpp
-  PerfQuery.h
+  OGLVertexManager.cpp
+  OGLVertexManager.h
   ProgramShaderCache.cpp
   ProgramShaderCache.h
-  Render.cpp
-  Render.h
   SamplerCache.cpp
   SamplerCache.h
-  StreamBuffer.cpp
-  StreamBuffer.h
-  VertexManager.cpp
-  VertexManager.h
   VideoBackend.h
 )
 

diff --git a/Source/Core/VideoBackends/OGL/OGL.vcxproj b/Source/Core/VideoBackends/OGL/OGL.vcxproj
diff --git a/Source/Core/VideoBackends/OGL/OGL.vcxproj.filters b/Source/Core/VideoBackends/OGL/OGL.vcxproj.filters
diff --git a/...ce/Core/VideoBackends/OGL/BoundingBox.cpp → ...Core/VideoBackends/OGL/OGLBoundingBox.cpp b/...ce/Core/VideoBackends/OGL/BoundingBox.cpp → ...Core/VideoBackends/OGL/OGLBoundingBox.cpp
@@ -6,8 +6,8 @@
 
 #include "Common/GL/GLUtil.h"
 
-#include "VideoBackends/OGL/BoundingBox.h"
-#include "VideoBackends/OGL/Render.h"
+#include "VideoBackends/OGL/OGLBoundingBox.h"
+#include "VideoBackends/OGL/OGLRender.h"
 
 #include "VideoCommon/DriverDetails.h"
 #include "VideoCommon/VideoConfig.h"

diff --git a/Source/Core/VideoBackends/OGL/BoundingBox.h → ...e/Core/VideoBackends/OGL/OGLBoundingBox.h b/Source/Core/VideoBackends/OGL/BoundingBox.h → ...e/Core/VideoBackends/OGL/OGLBoundingBox.h
diff --git a/Source/Core/VideoBackends/OGL/main.cpp → Source/Core/VideoBackends/OGL/OGLMain.cpp b/Source/Core/VideoBackends/OGL/main.cpp → Source/Core/VideoBackends/OGL/OGLMain.cpp
@@ -45,12 +45,12 @@ Make AA apply instantly during gameplay if possible
 
 #include "Core/Config/GraphicsSettings.h"
 
-#include "VideoBackends/OGL/BoundingBox.h"
-#include "VideoBackends/OGL/PerfQuery.h"
+#include "VideoBackends/OGL/OGLBoundingBox.h"
+#include "VideoBackends/OGL/OGLPerfQuery.h"
+#include "VideoBackends/OGL/OGLRender.h"
+#include "VideoBackends/OGL/OGLVertexManager.h"
 #include "VideoBackends/OGL/ProgramShaderCache.h"
-#include "VideoBackends/OGL/Render.h"
 #include "VideoBackends/OGL/SamplerCache.h"
-#include "VideoBackends/OGL/VertexManager.h"
 #include "VideoBackends/OGL/VideoBackend.h"
 
 #include "VideoCommon/FramebufferManager.h"

diff --git a/.../VideoBackends/OGL/NativeVertexFormat.cpp → ...deoBackends/OGL/OGLNativeVertexFormat.cpp b/.../VideoBackends/OGL/NativeVertexFormat.cpp → ...deoBackends/OGL/OGLNativeVertexFormat.cpp
@@ -6,9 +6,9 @@
 #include "Common/GL/GLUtil.h"
 #include "Common/MsgHandler.h"
 
+#include "VideoBackends/OGL/OGLRender.h"
+#include "VideoBackends/OGL/OGLVertexManager.h"
 #include "VideoBackends/OGL/ProgramShaderCache.h"
-#include "VideoBackends/OGL/Render.h"
-#include "VideoBackends/OGL/VertexManager.h"
 
 #include "VideoCommon/NativeVertexFormat.h"
 #include "VideoCommon/VertexShaderGen.h"

diff --git a/Source/Core/VideoBackends/OGL/PerfQuery.cpp → ...e/Core/VideoBackends/OGL/OGLPerfQuery.cpp b/Source/Core/VideoBackends/OGL/PerfQuery.cpp → ...e/Core/VideoBackends/OGL/OGLPerfQuery.cpp
@@ -2,14 +2,14 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "VideoBackends/OGL/PerfQuery.h"
+#include "VideoBackends/OGL/OGLPerfQuery.h"
 
 #include <memory>
 
 #include "Common/CommonTypes.h"
 #include "Common/GL/GLExtensions/GLExtensions.h"
 
-#include "VideoBackends/OGL/Render.h"
+#include "VideoBackends/OGL/OGLRender.h"
 #include "VideoCommon/VideoCommon.h"
 #include "VideoCommon/VideoConfig.h"
 

diff --git a/Source/Core/VideoBackends/OGL/PerfQuery.h → Source/Core/VideoBackends/OGL/OGLPerfQuery.h b/Source/Core/VideoBackends/OGL/PerfQuery.h → Source/Core/VideoBackends/OGL/OGLPerfQuery.h
diff --git a/Source/Core/VideoBackends/OGL/OGLPipeline.cpp b/Source/Core/VideoBackends/OGL/OGLPipeline.cpp
@@ -5,10 +5,10 @@
 #include "Common/Assert.h"
 
 #include "VideoBackends/OGL/OGLPipeline.h"
+#include "VideoBackends/OGL/OGLRender.h"
 #include "VideoBackends/OGL/OGLShader.h"
+#include "VideoBackends/OGL/OGLVertexManager.h"
 #include "VideoBackends/OGL/ProgramShaderCache.h"
-#include "VideoBackends/OGL/Render.h"
-#include "VideoBackends/OGL/VertexManager.h"
 #include "VideoCommon/VideoConfig.h"
 
 namespace OGL

diff --git a/Source/Core/VideoBackends/OGL/Render.cpp → Source/Core/VideoBackends/OGL/OGLRender.cpp b/Source/Core/VideoBackends/OGL/Render.cpp → Source/Core/VideoBackends/OGL/OGLRender.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "VideoBackends/OGL/Render.h"
+#include "VideoBackends/OGL/OGLRender.h"
 
 #include <algorithm>
 #include <cinttypes>
@@ -22,13 +22,13 @@
 
 #include "Core/Config/GraphicsSettings.h"
 
-#include "VideoBackends/OGL/BoundingBox.h"
+#include "VideoBackends/OGL/OGLBoundingBox.h"
 #include "VideoBackends/OGL/OGLPipeline.h"
 #include "VideoBackends/OGL/OGLShader.h"
 #include "VideoBackends/OGL/OGLTexture.h"
+#include "VideoBackends/OGL/OGLVertexManager.h"
 #include "VideoBackends/OGL/ProgramShaderCache.h"
 #include "VideoBackends/OGL/SamplerCache.h"
-#include "VideoBackends/OGL/VertexManager.h"
 
 #include "VideoCommon/BPFunctions.h"
 #include "VideoCommon/DriverDetails.h"

diff --git a/Source/Core/VideoBackends/OGL/Render.h → Source/Core/VideoBackends/OGL/OGLRender.h b/Source/Core/VideoBackends/OGL/Render.h → Source/Core/VideoBackends/OGL/OGLRender.h
diff --git a/...e/Core/VideoBackends/OGL/StreamBuffer.cpp → ...ore/VideoBackends/OGL/OGLStreamBuffer.cpp b/...e/Core/VideoBackends/OGL/StreamBuffer.cpp → ...ore/VideoBackends/OGL/OGLStreamBuffer.cpp
@@ -2,14 +2,14 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "VideoBackends/OGL/StreamBuffer.h"
+#include "VideoBackends/OGL/OGLStreamBuffer.h"
 
 #include "Common/Align.h"
 #include "Common/GL/GLUtil.h"
 #include "Common/MathUtil.h"
 #include "Common/MemoryUtil.h"
 
-#include "VideoBackends/OGL/Render.h"
+#include "VideoBackends/OGL/OGLRender.h"
 
 #include "VideoCommon/DriverDetails.h"
 #include "VideoCommon/OnScreenDisplay.h"

diff --git a/Source/Core/VideoBackends/OGL/StreamBuffer.h → .../Core/VideoBackends/OGL/OGLStreamBuffer.h b/Source/Core/VideoBackends/OGL/StreamBuffer.h → .../Core/VideoBackends/OGL/OGLStreamBuffer.h
diff --git a/.../Core/VideoBackends/OGL/VertexManager.cpp → ...re/VideoBackends/OGL/OGLVertexManager.cpp b/.../Core/VideoBackends/OGL/VertexManager.cpp → ...re/VideoBackends/OGL/OGLVertexManager.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "VideoBackends/OGL/VertexManager.h"
+#include "VideoBackends/OGL/OGLVertexManager.h"
 
 #include <fstream>
 #include <memory>
@@ -14,9 +14,9 @@
 #include "Common/GL/GLExtensions/GLExtensions.h"
 
 #include "VideoBackends/OGL/OGLPipeline.h"
+#include "VideoBackends/OGL/OGLRender.h"
+#include "VideoBackends/OGL/OGLStreamBuffer.h"
 #include "VideoBackends/OGL/ProgramShaderCache.h"
-#include "VideoBackends/OGL/Render.h"
-#include "VideoBackends/OGL/StreamBuffer.h"
 
 #include "VideoCommon/IndexGenerator.h"
 #include "VideoCommon/Statistics.h"

diff --git a/...ce/Core/VideoBackends/OGL/VertexManager.h → ...Core/VideoBackends/OGL/OGLVertexManager.h b/...ce/Core/VideoBackends/OGL/VertexManager.h → ...Core/VideoBackends/OGL/OGLVertexManager.h
diff --git a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp
@@ -21,10 +21,10 @@
 
 #include "Core/ConfigManager.h"
 
+#include "VideoBackends/OGL/OGLRender.h"
 #include "VideoBackends/OGL/OGLShader.h"
-#include "VideoBackends/OGL/Render.h"
-#include "VideoBackends/OGL/StreamBuffer.h"
-#include "VideoBackends/OGL/VertexManager.h"
+#include "VideoBackends/OGL/OGLStreamBuffer.h"
+#include "VideoBackends/OGL/OGLVertexManager.h"
 
 #include "VideoCommon/AsyncShaderCompiler.h"
 #include "VideoCommon/GeometryShaderManager.h"

diff --git a/Source/Core/VideoBackends/OGL/SamplerCache.cpp b/Source/Core/VideoBackends/OGL/SamplerCache.cpp
@@ -3,7 +3,7 @@
 // Refer to the license.txt file included.
 
 #include "VideoBackends/OGL/SamplerCache.h"
-#include "VideoBackends/OGL/Render.h"
+#include "VideoBackends/OGL/OGLRender.h"
 
 #include <memory>
 

diff --git a/Source/Core/VideoBackends/OGL/SamplerCache.h b/Source/Core/VideoBackends/OGL/SamplerCache.h
@@ -10,7 +10,7 @@
 
 #include "Common/CommonTypes.h"
 #include "Common/GL/GLUtil.h"
-#include "VideoBackends/OGL/Render.h"
+#include "VideoBackends/OGL/OGLRender.h"
 
 namespace OGL
 {

diff --git a/Source/Core/VideoBackends/Software/Software.vcxproj b/Source/Core/VideoBackends/Software/Software.vcxproj
diff --git a/Source/Core/VideoBackends/Vulkan/CMakeLists.txt b/Source/Core/VideoBackends/Vulkan/CMakeLists.txt
@@ -1,36 +1,36 @@
 add_library(videovulkan
-  BoundingBox.cpp
-  BoundingBox.h
   CommandBufferManager.cpp
   CommandBufferManager.h
   Constants.h
-  main.cpp
   ObjectCache.cpp
   ObjectCache.h
-  PerfQuery.cpp
-  PerfQuery.h
-  Renderer.cpp
-  Renderer.h
   ShaderCompiler.cpp
   ShaderCompiler.h
-  StateTracker.cpp
-  StateTracker.h
   StagingBuffer.cpp
   StagingBuffer.h
-  StreamBuffer.cpp
-  StreamBuffer.h
-  SwapChain.cpp
-  SwapChain.h
-  VertexFormat.cpp
-  VertexFormat.h
-  VertexManager.cpp
-  VertexManager.h
+  StateTracker.cpp
+  StateTracker.h
+  VKBoundingBox.cpp
+  VKBoundingBox.h
+  VKMain.cpp
+  VKPerfQuery.cpp
+  VKPerfQuery.h
   VKPipeline.cpp
   VKPipeline.h
+  VKRenderer.cpp
+  VKRenderer.h
   VKShader.cpp
   VKShader.h
+  VKStreamBuffer.cpp
+  VKStreamBuffer.h
+  VKSwapChain.cpp
+  VKSwapChain.h
   VKTexture.cpp
   VKTexture.h
+  VKVertexFormat.cpp
+  VKVertexFormat.h
+  VKVertexManager.cpp
+  VKVertexManager.h
   VulkanContext.cpp
   VulkanContext.h
   VulkanLoader.cpp

diff --git a/Source/Core/VideoBackends/Vulkan/ObjectCache.cpp b/Source/Core/VideoBackends/Vulkan/ObjectCache.cpp
@@ -18,9 +18,9 @@
 
 #include "VideoBackends/Vulkan/CommandBufferManager.h"
 #include "VideoBackends/Vulkan/ShaderCompiler.h"
-#include "VideoBackends/Vulkan/StreamBuffer.h"
+#include "VideoBackends/Vulkan/VKStreamBuffer.h"
 #include "VideoBackends/Vulkan/VKTexture.h"
-#include "VideoBackends/Vulkan/VertexFormat.h"
+#include "VideoBackends/Vulkan/VKVertexFormat.h"
 #include "VideoBackends/Vulkan/VulkanContext.h"
 #include "VideoCommon/VideoCommon.h"
 

diff --git a/Source/Core/VideoBackends/Vulkan/StateTracker.cpp b/Source/Core/VideoBackends/Vulkan/StateTracker.cpp
@@ -8,11 +8,11 @@
 
 #include "VideoBackends/Vulkan/CommandBufferManager.h"
 #include "VideoBackends/Vulkan/ObjectCache.h"
-#include "VideoBackends/Vulkan/Renderer.h"
 #include "VideoBackends/Vulkan/VKPipeline.h"
+#include "VideoBackends/Vulkan/VKRenderer.h"
 #include "VideoBackends/Vulkan/VKShader.h"
 #include "VideoBackends/Vulkan/VKTexture.h"
-#include "VideoBackends/Vulkan/VertexFormat.h"
+#include "VideoBackends/Vulkan/VKVertexFormat.h"
 #include "VideoBackends/Vulkan/VulkanContext.h"
 
 namespace Vulkan

diff --git a/...Core/VideoBackends/Vulkan/BoundingBox.cpp → ...re/VideoBackends/Vulkan/VKBoundingBox.cpp b/...Core/VideoBackends/Vulkan/BoundingBox.cpp → ...re/VideoBackends/Vulkan/VKBoundingBox.cpp
@@ -7,12 +7,12 @@
 #include "Common/Assert.h"
 #include "Common/Logging/Log.h"
 
-#include "VideoBackends/Vulkan/BoundingBox.h"
 #include "VideoBackends/Vulkan/CommandBufferManager.h"
 #include "VideoBackends/Vulkan/ObjectCache.h"
-#include "VideoBackends/Vulkan/Renderer.h"
 #include "VideoBackends/Vulkan/StagingBuffer.h"
 #include "VideoBackends/Vulkan/StateTracker.h"
+#include "VideoBackends/Vulkan/VKBoundingBox.h"
+#include "VideoBackends/Vulkan/VKRenderer.h"
 #include "VideoBackends/Vulkan/VulkanContext.h"
 
 namespace Vulkan

diff --git a/...e/Core/VideoBackends/Vulkan/BoundingBox.h → ...Core/VideoBackends/Vulkan/VKBoundingBox.h b/...e/Core/VideoBackends/Vulkan/BoundingBox.h → ...Core/VideoBackends/Vulkan/VKBoundingBox.h
diff --git a/Source/Core/VideoBackends/Vulkan/main.cpp → Source/Core/VideoBackends/Vulkan/VKMain.cpp b/Source/Core/VideoBackends/Vulkan/main.cpp → Source/Core/VideoBackends/Vulkan/VKMain.cpp
@@ -10,11 +10,11 @@
 #include "VideoBackends/Vulkan/CommandBufferManager.h"
 #include "VideoBackends/Vulkan/Constants.h"
 #include "VideoBackends/Vulkan/ObjectCache.h"
-#include "VideoBackends/Vulkan/PerfQuery.h"
-#include "VideoBackends/Vulkan/Renderer.h"
 #include "VideoBackends/Vulkan/StateTracker.h"
-#include "VideoBackends/Vulkan/SwapChain.h"
-#include "VideoBackends/Vulkan/VertexManager.h"
+#include "VideoBackends/Vulkan/VKPerfQuery.h"
+#include "VideoBackends/Vulkan/VKRenderer.h"
+#include "VideoBackends/Vulkan/VKSwapChain.h"
+#include "VideoBackends/Vulkan/VKVertexManager.h"
 #include "VideoBackends/Vulkan/VideoBackend.h"
 #include "VideoBackends/Vulkan/VulkanContext.h"
 

diff --git a/...e/Core/VideoBackends/Vulkan/PerfQuery.cpp → ...Core/VideoBackends/Vulkan/VKPerfQuery.cpp b/...e/Core/VideoBackends/Vulkan/PerfQuery.cpp → ...Core/VideoBackends/Vulkan/VKPerfQuery.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "VideoBackends/Vulkan/PerfQuery.h"
+#include "VideoBackends/Vulkan/VKPerfQuery.h"
 
 #include <algorithm>
 #include <cstring>
@@ -13,8 +13,8 @@
 #include "Common/MsgHandler.h"
 
 #include "VideoBackends/Vulkan/CommandBufferManager.h"
-#include "VideoBackends/Vulkan/Renderer.h"
 #include "VideoBackends/Vulkan/StateTracker.h"
+#include "VideoBackends/Vulkan/VKRenderer.h"
 #include "VideoBackends/Vulkan/VulkanContext.h"
 #include "VideoCommon/VideoCommon.h"
 

diff --git a/Source/Core/VideoBackends/Vulkan/PerfQuery.h → ...e/Core/VideoBackends/Vulkan/VKPerfQuery.h b/Source/Core/VideoBackends/Vulkan/PerfQuery.h → ...e/Core/VideoBackends/Vulkan/VKPerfQuery.h
diff --git a/Source/Core/VideoBackends/Vulkan/VKPipeline.cpp b/Source/Core/VideoBackends/Vulkan/VKPipeline.cpp
@@ -12,7 +12,7 @@
 #include "VideoBackends/Vulkan/ObjectCache.h"
 #include "VideoBackends/Vulkan/VKShader.h"
 #include "VideoBackends/Vulkan/VKTexture.h"
-#include "VideoBackends/Vulkan/VertexFormat.h"
+#include "VideoBackends/Vulkan/VKVertexFormat.h"
 #include "VideoBackends/Vulkan/VulkanContext.h"
 
 namespace Vulkan

diff --git a/...ce/Core/VideoBackends/Vulkan/Renderer.cpp → .../Core/VideoBackends/Vulkan/VKRenderer.cpp b/...ce/Core/VideoBackends/Vulkan/Renderer.cpp → .../Core/VideoBackends/Vulkan/VKRenderer.cpp
@@ -16,18 +16,18 @@
 
 #include "Core/Core.h"
 
-#include "VideoBackends/Vulkan/BoundingBox.h"
 #include "VideoBackends/Vulkan/CommandBufferManager.h"
 #include "VideoBackends/Vulkan/ObjectCache.h"
-#include "VideoBackends/Vulkan/PerfQuery.h"
-#include "VideoBackends/Vulkan/Renderer.h"
 #include "VideoBackends/Vulkan/StateTracker.h"
-#include "VideoBackends/Vulkan/StreamBuffer.h"
-#include "VideoBackends/Vulkan/SwapChain.h"
+#include "VideoBackends/Vulkan/VKBoundingBox.h"
+#include "VideoBackends/Vulkan/VKPerfQuery.h"
 #include "VideoBackends/Vulkan/VKPipeline.h"
+#include "VideoBackends/Vulkan/VKRenderer.h"
 #include "VideoBackends/Vulkan/VKShader.h"
+#include "VideoBackends/Vulkan/VKStreamBuffer.h"
+#include "VideoBackends/Vulkan/VKSwapChain.h"
 #include "VideoBackends/Vulkan/VKTexture.h"
-#include "VideoBackends/Vulkan/VertexFormat.h"
+#include "VideoBackends/Vulkan/VKVertexFormat.h"
 #include "VideoBackends/Vulkan/VulkanContext.h"
 
 #include "VideoCommon/DriverDetails.h"

diff --git a/Source/Core/VideoBackends/Vulkan/Renderer.h → ...ce/Core/VideoBackends/Vulkan/VKRenderer.h b/Source/Core/VideoBackends/Vulkan/Renderer.h → ...ce/Core/VideoBackends/Vulkan/VKRenderer.h
diff --git a/...ore/VideoBackends/Vulkan/StreamBuffer.cpp → ...e/VideoBackends/Vulkan/VKStreamBuffer.cpp b/...ore/VideoBackends/Vulkan/StreamBuffer.cpp → ...e/VideoBackends/Vulkan/VKStreamBuffer.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "VideoBackends/Vulkan/StreamBuffer.h"
+#include "VideoBackends/Vulkan/VKStreamBuffer.h"
 
 #include <algorithm>
 #include <cstdint>

diff --git a/.../Core/VideoBackends/Vulkan/StreamBuffer.h → ...ore/VideoBackends/Vulkan/VKStreamBuffer.h b/.../Core/VideoBackends/Vulkan/StreamBuffer.h → ...ore/VideoBackends/Vulkan/VKStreamBuffer.h
diff --git a/...e/Core/VideoBackends/Vulkan/SwapChain.cpp → ...Core/VideoBackends/Vulkan/VKSwapChain.cpp b/...e/Core/VideoBackends/Vulkan/SwapChain.cpp → ...Core/VideoBackends/Vulkan/VKSwapChain.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "VideoBackends/Vulkan/SwapChain.h"
+#include "VideoBackends/Vulkan/VKSwapChain.h"
 
 #include <algorithm>
 #include <cstdint>

diff --git a/Source/Core/VideoBackends/Vulkan/SwapChain.h → ...e/Core/VideoBackends/Vulkan/VKSwapChain.h b/Source/Core/VideoBackends/Vulkan/SwapChain.h → ...e/Core/VideoBackends/Vulkan/VKSwapChain.h
diff --git a/Source/Core/VideoBackends/Vulkan/VKTexture.cpp b/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
@@ -14,10 +14,10 @@
 
 #include "VideoBackends/Vulkan/CommandBufferManager.h"
 #include "VideoBackends/Vulkan/ObjectCache.h"
-#include "VideoBackends/Vulkan/Renderer.h"
 #include "VideoBackends/Vulkan/StagingBuffer.h"
 #include "VideoBackends/Vulkan/StateTracker.h"
-#include "VideoBackends/Vulkan/StreamBuffer.h"
+#include "VideoBackends/Vulkan/VKRenderer.h"
+#include "VideoBackends/Vulkan/VKStreamBuffer.h"
 #include "VideoBackends/Vulkan/VKTexture.h"
 #include "VideoBackends/Vulkan/VulkanContext.h"
 

diff --git a/...ore/VideoBackends/Vulkan/VertexFormat.cpp → ...e/VideoBackends/Vulkan/VKVertexFormat.cpp b/...ore/VideoBackends/Vulkan/VertexFormat.cpp → ...e/VideoBackends/Vulkan/VKVertexFormat.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "VideoBackends/Vulkan/VertexFormat.h"
+#include "VideoBackends/Vulkan/VKVertexFormat.h"
 
 #include "Common/Assert.h"
 

diff --git a/.../Core/VideoBackends/Vulkan/VertexFormat.h → ...ore/VideoBackends/Vulkan/VKVertexFormat.h b/.../Core/VideoBackends/Vulkan/VertexFormat.h → ...ore/VideoBackends/Vulkan/VKVertexFormat.h
diff --git a/...re/VideoBackends/Vulkan/VertexManager.cpp → .../VideoBackends/Vulkan/VKVertexManager.cpp b/...re/VideoBackends/Vulkan/VertexManager.cpp → .../VideoBackends/Vulkan/VKVertexManager.cpp
@@ -2,18 +2,18 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "VideoBackends/Vulkan/VertexManager.h"
+#include "VideoBackends/Vulkan/VKVertexManager.h"
 
 #include "Common/Align.h"
 #include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"
 #include "Common/MsgHandler.h"
 
 #include "VideoBackends/Vulkan/CommandBufferManager.h"
-#include "VideoBackends/Vulkan/Renderer.h"
 #include "VideoBackends/Vulkan/StateTracker.h"
-#include "VideoBackends/Vulkan/StreamBuffer.h"
-#include "VideoBackends/Vulkan/VertexFormat.h"
+#include "VideoBackends/Vulkan/VKRenderer.h"
+#include "VideoBackends/Vulkan/VKStreamBuffer.h"
+#include "VideoBackends/Vulkan/VKVertexFormat.h"
 #include "VideoBackends/Vulkan/VulkanContext.h"
 
 #include "VideoCommon/GeometryShaderManager.h"

diff --git a/...Core/VideoBackends/Vulkan/VertexManager.h → ...re/VideoBackends/Vulkan/VKVertexManager.h b/...Core/VideoBackends/Vulkan/VertexManager.h → ...re/VideoBackends/Vulkan/VKVertexManager.h
diff --git a/Source/Core/VideoBackends/Vulkan/Vulkan.vcxproj b/Source/Core/VideoBackends/Vulkan/Vulkan.vcxproj
diff --git a/Source/Core/VideoCommon/HiresTextures.cpp b/Source/Core/VideoCommon/HiresTextures.cpp
@@ -18,10 +18,10 @@
 #include <fmt/format.h>
 
 #include "Common/CommonPaths.h"
-#include "Common/File.h"
 #include "Common/FileSearch.h"
 #include "Common/FileUtil.h"
 #include "Common/Flag.h"
+#include "Common/IOFile.h"
 #include "Common/Image.h"
 #include "Common/Logging/Log.h"
 #include "Common/MemoryUtil.h"

diff --git a/Source/Core/VideoCommon/HiresTextures_DDSLoader.cpp b/Source/Core/VideoCommon/HiresTextures_DDSLoader.cpp
@@ -11,7 +11,7 @@
 #include <functional>
 
 #include "Common/Align.h"
-#include "Common/File.h"
+#include "Common/IOFile.h"
 #include "Common/Logging/Log.h"
 #include "Common/Swap.h"
 #include "VideoCommon/VideoConfig.h"

diff --git a/Source/Core/VideoCommon/RenderBase.cpp b/Source/Core/VideoCommon/RenderBase.cpp
@@ -39,11 +39,11 @@
 #include "Common/Thread.h"
 #include "Common/Timer.h"
 
-#include "Core/Analytics.h"
 #include "Core/Config/NetplaySettings.h"
 #include "Core/Config/SYSCONFSettings.h"
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
+#include "Core/DolphinAnalytics.h"
 #include "Core/FifoPlayer/FifoRecorder.h"
 #include "Core/FreeLookConfig.h"
 #include "Core/HW/SystemTimers.h"

diff --git a/Source/Core/VideoCommon/ShaderCache.h b/Source/Core/VideoCommon/ShaderCache.h
@@ -15,7 +15,7 @@
 #include <utility>
 
 #include "Common/CommonTypes.h"
-#include "Common/File.h"
+#include "Common/IOFile.h"
 #include "Common/LinearDiskCache.h"
 
 #include "VideoCommon/AbstractPipeline.h"

diff --git a/Source/Core/VideoCommon/VertexManagerBase.cpp b/Source/Core/VideoCommon/VertexManagerBase.cpp
@@ -14,8 +14,8 @@
 #include "Common/Logging/Log.h"
 #include "Common/MathUtil.h"
 
-#include "Core/Analytics.h"
 #include "Core/ConfigManager.h"
+#include "Core/DolphinAnalytics.h"
 
 #include "VideoCommon/BPMemory.h"
 #include "VideoCommon/BoundingBox.h"

diff --git a/Source/Core/VideoCommon/VideoCommon.vcxproj b/Source/Core/VideoCommon/VideoCommon.vcxproj
diff --git a/Source/Core/VideoCommon/VideoCommon.vcxproj.filters b/Source/Core/VideoCommon/VideoCommon.vcxproj.filters
diff --git a/Source/Core/WinUpdater/WinUpdater.vcxproj b/Source/Core/WinUpdater/WinUpdater.vcxproj
@@ -24,14 +24,27 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ProjectReference Include="$(CoreDir)Common\Common.vcxproj">
-      <Project>{2e6c348c-c75c-4d94-8d1e-9c1fcbf3efe4}</Project>
+    <ProjectReference Include="$(CoreDir)DolphinLib.vcxproj">
+      <Project>{D79392F7-06D6-4B4B-A39F-4D587C215D3A}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(CoreDir)UpdaterCommon\UpdaterCommon.vcxproj">
-      <Project>{B001D13E-7EAB-4689-842D-801E5ACFFAC5}</Project>
+    <ProjectReference Include="$(ExternalsDir)cpp-optparse\cpp-optparse.vcxproj">
+      <Project>{c636d9d1-82fe-42b5-9987-63b7d4836341}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(ExternalsDir)curl\curl.vcxproj">
+      <Project>{bb00605c-125f-4a21-b33b-7bf418322dcb}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(ExternalsDir)ed25519\ed25519.vcxproj">
+      <Project>{5bdf4b91-1491-4fb0-bc27-78e9a8e97dc3}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(ExternalsDir)mbedtls\mbedTLS.vcxproj">
+      <Project>{bdb6578b-0691-4e80-a46c-df21639fd3b8}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(ExternalsDir)zlib\zlib.vcxproj">
+      <Project>{ff213b23-2c26-4214-9f88-85271e557e87}</Project>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\UpdaterCommon\UpdaterCommon.cpp" />
     <ClCompile Include="Main.cpp" />
     <ClCompile Include="WinUI.cpp" />
   </ItemGroup>

diff --git a/Source/DSPTool/DSPTool.vcxproj b/Source/DSPTool/DSPTool.vcxproj
@@ -35,11 +35,8 @@
     <Text Include="CMakeLists.txt" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(CoreDir)Common\Common.vcxproj">
-      <Project>{2e6c348c-c75c-4d94-8d1e-9c1fcbf3efe4}</Project>
-    </ProjectReference>
-    <ProjectReference Include="$(CoreDir)Core\Core.vcxproj">
-      <Project>{e54cf649-140e-4255-81a5-30a673c1fb36}</Project>
+    <ProjectReference Include="$(CoreDir)DolphinLib.vcxproj">
+      <Project>{D79392F7-06D6-4B4B-A39F-4D587C215D3A}</Project>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

diff --git a/Source/UnitTests/UnitTests.vcxproj b/Source/UnitTests/UnitTests.vcxproj
@@ -82,31 +82,14 @@
     <Text Include="CMakeLists.txt" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(CoreDir)Core\Core.vcxproj">
-      <Project>{E54CF649-140E-4255-81A5-30A673C1FB36}</Project>
+    <ProjectReference Include="$(CoreDir)DolphinLib.vcxproj">
+      <Project>{D79392F7-06D6-4B4B-A39F-4D587C215D3A}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(CoreDir)UICommon\UICommon.vcxproj">
-      <Project>{604c8368-f34a-4d55-82c8-cc92a0c13254}</Project>
-    </ProjectReference>
-    <ProjectReference Include="$(CoreDir)VideoBackends\D3D\D3D.vcxproj">
-      <Project>{96020103-4ba5-4fd2-b4aa-5b6d24492d4e}</Project>
-    </ProjectReference>
-    <ProjectReference Include="$(CoreDir)VideoBackends\D3D12\D3D12.vcxproj">
-      <Project>{570215b7-e32f-4438-95ae-c8d955f9fca3}</Project>
-    </ProjectReference>
-    <ProjectReference Include="$(CoreDir)VideoBackends\Null\Null.vcxproj">
-      <Project>{53A5391B-737E-49A8-BC8F-312ADA00736F}</Project>
-    </ProjectReference>
-    <ProjectReference Include="$(CoreDir)VideoBackends\OGL\OGL.vcxproj" Condition="'$(Platform)'!='ARM64'">
-      <Project>{ec1a314c-5588-4506-9c1e-2e58e5817f75}</Project>
-    </ProjectReference>
-    <ProjectReference Include="$(CoreDir)VideoBackends\Software\Software.vcxproj" Condition="'$(Platform)'!='ARM64'">
-      <Project>{a4c423aa-f57c-46c7-a172-d1a777017d29}</Project>
-    </ProjectReference>
-    <ProjectReference Include="$(CoreDir)VideoBackends\Vulkan\Vulkan.vcxproj">
-      <Project>{29F29A19-F141-45AD-9679-5A2923B49DA3}</Project>
+    <ProjectReference Include="$(DolphinRootDir)Languages\Languages.vcxproj">
+      <Project>{0e033be3-2e08-428e-9ae9-bc673efa12b5}</Project>
     </ProjectReference>
   </ItemGroup>
+  <Import Project="$(ExternalsDir)ExternalsReferenceAll.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>