diff --git a/CMakeLists.txt b/CMakeLists.txt
index 414c9dd149..0bdfe17939 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -493,6 +493,8 @@ add_library(Common STATIC
 	Common/Math/math_util.h
 	Common/Profiler/Profiler.cpp
 	Common/Profiler/Profiler.h
+	Common/System/Display.cpp
+	Common/System/Display.h
 	Common/Thread/Executor.cpp
 	Common/Thread/Executor.h
 	Common/Thread/PrioritizedWorkQueue.cpp
@@ -1010,8 +1012,6 @@ endif()
 
 add_library(native STATIC
 	${nativeExtra}
-	ext/native/base/display.cpp
-	ext/native/base/display.h
 	ext/native/file/fd_util.cpp
 	ext/native/file/fd_util.h
 	ext/native/file/file_util.cpp
diff --git a/Common/Common.vcxproj.filters b/Common/Common.vcxproj.filters
index 1df3526c49..483144fcab 100644
--- a/Common/Common.vcxproj.filters
+++ b/Common/Common.vcxproj.filters
@@ -513,6 +513,9 @@
     <Filter Include="Profiler">
       <UniqueIdentifier>{8321632b-8fc5-4a67-adb7-126a328d50eb}</UniqueIdentifier>
     </Filter>
+    <Filter Include="System">
+      <UniqueIdentifier>{89ddf0bd-3fc4-4a69-87a7-b82cfc412e0a}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <Text Include="..\ext\libpng17\CMakeLists.txt">
diff --git a/ext/native/base/display.cpp b/Common/System/Display.cpp
similarity index 97%
rename from ext/native/base/display.cpp
rename to Common/System/Display.cpp
index f90784b819..0e9c1ffb62 100644
--- a/ext/native/base/display.cpp
+++ b/Common/System/Display.cpp
@@ -1,4 +1,4 @@
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "Common/Math/math_util.h"
 
 int dp_xres;
diff --git a/ext/native/base/display.h b/Common/System/Display.h
similarity index 100%
rename from ext/native/base/display.h
rename to Common/System/Display.h
diff --git a/Common/Vulkan/VulkanContext.cpp b/Common/Vulkan/VulkanContext.cpp
index 17fe8bb496..7e0338936d 100644
--- a/Common/Vulkan/VulkanContext.cpp
+++ b/Common/Vulkan/VulkanContext.cpp
@@ -5,7 +5,7 @@
 #include <cstring>
 #include <iostream>
 
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "Common/Log.h"
 #include "Common/Vulkan/VulkanContext.h"
 #include "Common/Vulkan/VulkanDebug.h"
diff --git a/Core/Config.cpp b/Core/Config.cpp
index a1a3b31d34..89aeb90706 100644
--- a/Core/Config.cpp
+++ b/Core/Config.cpp
@@ -24,7 +24,7 @@
 
 #include "ppsspp_config.h"
 
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "base/NativeApp.h"
 #include "gfx_es2/gpu_features.h"
 #include "net/http_client.h"
diff --git a/Core/Core.cpp b/Core/Core.cpp
index e79e08e48d..9748441e1a 100644
--- a/Core/Core.cpp
+++ b/Core/Core.cpp
@@ -23,7 +23,7 @@
 #include <condition_variable>
 
 #include "base/NativeApp.h"
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "Common/TimeUtil.h"
 #include "Common/Thread/ThreadUtil.h"
 #include "Common/Profiler/Profiler.h"
diff --git a/GPU/Common/GPUStateUtils.cpp b/GPU/Common/GPUStateUtils.cpp
index 62cd71757a..8ccf5b2764 100644
--- a/GPU/Common/GPUStateUtils.cpp
+++ b/GPU/Common/GPUStateUtils.cpp
@@ -18,7 +18,7 @@
 #include <algorithm>
 #include <limits>
 
-#include "base/display.h"
+#include "Common/System/Display.h"
 
 #include "Common/StringUtils.h"
 #include "Core/Config.h"
diff --git a/GPU/Common/PresentationCommon.cpp b/GPU/Common/PresentationCommon.cpp
index 0d74e0c661..d80394f55f 100644
--- a/GPU/Common/PresentationCommon.cpp
+++ b/GPU/Common/PresentationCommon.cpp
@@ -19,7 +19,7 @@
 #include <set>
 #include <cstdint>
 
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "base/NativeApp.h"
 #include "thin3d/thin3d.h"
 
diff --git a/GPU/Common/ShaderUniforms.cpp b/GPU/Common/ShaderUniforms.cpp
index f266721050..46f6a93855 100644
--- a/GPU/Common/ShaderUniforms.cpp
+++ b/GPU/Common/ShaderUniforms.cpp
@@ -2,7 +2,7 @@
 #include <cmath>
 
 #include "ShaderUniforms.h"
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "Common/Data/Convert/SmallDataConvert.h"
 #include "Common/Math/lin/matrix4x4.h"
 #include "Common/Math/math_util.h"
diff --git a/GPU/D3D11/FramebufferManagerD3D11.cpp b/GPU/D3D11/FramebufferManagerD3D11.cpp
index 83a2beab65..f4d4854049 100644
--- a/GPU/D3D11/FramebufferManagerD3D11.cpp
+++ b/GPU/D3D11/FramebufferManagerD3D11.cpp
@@ -19,7 +19,7 @@
 #include <d3d11.h>
 #include <D3Dcompiler.h>
 
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "Common/Math/lin/matrix4x4.h"
 #include "ext/native/thin3d/thin3d.h"
 
diff --git a/GPU/Software/SoftGpu.cpp b/GPU/Software/SoftGpu.cpp
index 33de98f955..6dd2fcd78f 100644
--- a/GPU/Software/SoftGpu.cpp
+++ b/GPU/Software/SoftGpu.cpp
@@ -15,7 +15,7 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "gfx_es2/gpu_features.h"
 
 #include "GPU/GPUState.h"
diff --git a/GPU/Vulkan/FramebufferManagerVulkan.cpp b/GPU/Vulkan/FramebufferManagerVulkan.cpp
index eec77859cb..41e47ae259 100644
--- a/GPU/Vulkan/FramebufferManagerVulkan.cpp
+++ b/GPU/Vulkan/FramebufferManagerVulkan.cpp
@@ -19,7 +19,7 @@
 
 #include "Common/Profiler/Profiler.h"
 
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "Common/Math/lin/matrix4x4.h"
 #include "Common/Data/Convert/SmallDataConvert.h"
 #include "ext/native/thin3d/thin3d.h"
diff --git a/Qt/QtMain.h b/Qt/QtMain.h
index 2fce102089..3a1cd3a750 100644
--- a/Qt/QtMain.h
+++ b/Qt/QtMain.h
@@ -22,7 +22,7 @@ QTM_USE_NAMESPACE
 #include <atomic>
 #include <thread>
 
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "Common/TimeUtil.h"
 #include "file/zip_read.h"
 #include "gfx/gl_common.h"
diff --git a/Qt/mainwindow.cpp b/Qt/mainwindow.cpp
index 544eaa93ed..fe48956f2e 100644
--- a/Qt/mainwindow.cpp
+++ b/Qt/mainwindow.cpp
@@ -7,7 +7,7 @@
 #include <QFileDialog>
 #include <QMessageBox>
 
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "base/NativeApp.h"
 #include "Core/MIPS/MIPSDebugInterface.h"
 #include "Core/Debugger/SymbolMap.h"
diff --git a/SDL/SDLGLGraphicsContext.cpp b/SDL/SDLGLGraphicsContext.cpp
index b5650590b7..2d41fd1c4f 100644
--- a/SDL/SDLGLGraphicsContext.cpp
+++ b/SDL/SDLGLGraphicsContext.cpp
@@ -4,7 +4,7 @@
 #include "Core/ConfigValues.h"
 #include "Core/System.h"
 #include "base/NativeApp.h"
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "gfx_es2/gpu_features.h"
 #include "thin3d/thin3d_create.h"
 
diff --git a/SDL/SDLMain.cpp b/SDL/SDLMain.cpp
index ffa534c3af..37b3ad12af 100644
--- a/SDL/SDLMain.cpp
+++ b/SDL/SDLMain.cpp
@@ -20,7 +20,7 @@ SDLJoystick *joystick = NULL;
 #include <thread>
 #include <locale>
 
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "base/NativeApp.h"
 #include "ext/glslang/glslang/Public/ShaderLang.h"
 #include "image/png_load.h"
diff --git a/SDL/SDLVulkanGraphicsContext.cpp b/SDL/SDLVulkanGraphicsContext.cpp
index 9bc9bf925b..77bb943ecc 100644
--- a/SDL/SDLVulkanGraphicsContext.cpp
+++ b/SDL/SDLVulkanGraphicsContext.cpp
@@ -1,7 +1,7 @@
 #include "Core/Config.h"
 #include "Core/ConfigValues.h"
 #include "base/NativeApp.h"
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "thin3d/thin3d.h"
 #include "thin3d/thin3d_create.h"
 #include "thin3d/VulkanRenderManager.h"
diff --git a/UI/ComboKeyMappingScreen.cpp b/UI/ComboKeyMappingScreen.cpp
index e407df4625..672b760df8 100644
--- a/UI/ComboKeyMappingScreen.cpp
+++ b/UI/ComboKeyMappingScreen.cpp
@@ -15,7 +15,7 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "gfx_es2/draw_buffer.h"
 #include "gfx/texture_atlas.h"
 #include "ui/ui_context.h"
diff --git a/UI/ControlMappingScreen.cpp b/UI/ControlMappingScreen.cpp
index 542a542f38..518d805292 100644
--- a/UI/ControlMappingScreen.cpp
+++ b/UI/ControlMappingScreen.cpp
@@ -19,7 +19,7 @@
 #include <deque>
 #include <mutex>
 
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "base/NativeApp.h"
 #include "gfx/texture_atlas.h"
 #include "ui/root.h"
diff --git a/UI/DevScreens.cpp b/UI/DevScreens.cpp
index 0423002a36..7f7bf849fd 100644
--- a/UI/DevScreens.cpp
+++ b/UI/DevScreens.cpp
@@ -18,7 +18,7 @@
 #include <algorithm>
 
 #include "ppsspp_config.h"
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "base/NativeApp.h"
 #include "gfx_es2/gpu_features.h"
 #include "Common/Data/Text/I18n.h"
diff --git a/UI/DisplayLayoutScreen.cpp b/UI/DisplayLayoutScreen.cpp
index 4ae30dd4ad..1df7c0d072 100644
--- a/UI/DisplayLayoutScreen.cpp
+++ b/UI/DisplayLayoutScreen.cpp
@@ -18,7 +18,7 @@
 #include <algorithm>
 #include <vector>
 
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "base/NativeApp.h"
 #include "gfx/texture_atlas.h"
 #include "gfx_es2/draw_buffer.h"
diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp
index b848d699bc..1856580ce8 100644
--- a/UI/EmuScreen.cpp
+++ b/UI/EmuScreen.cpp
@@ -19,7 +19,7 @@
 
 #include <algorithm>
 
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "base/NativeApp.h"
 #include "Common/Profiler/Profiler.h"
 
diff --git a/UI/GPUDriverTestScreen.h b/UI/GPUDriverTestScreen.h
index a241e81bae..0f5de4a8b0 100644
--- a/UI/GPUDriverTestScreen.h
+++ b/UI/GPUDriverTestScreen.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "ui/ui_context.h"
 #include "ui/view.h"
 #include "ui/viewgroup.h"
diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp
index 9804387f7e..77ed61bed0 100644
--- a/UI/GameSettingsScreen.cpp
+++ b/UI/GameSettingsScreen.cpp
@@ -19,7 +19,7 @@
 
 #include <algorithm>
 
-#include "base/display.h"  // Only to check screen aspect ratio with pixel_yres/pixel_xres
+#include "Common/System/Display.h"  // Only to check screen aspect ratio with pixel_yres/pixel_xres
 #include "base/NativeApp.h"
 
 #include "Common/Data/Color/RGBAUtil.h"
diff --git a/UI/GamepadEmu.cpp b/UI/GamepadEmu.cpp
index 0277c34592..8b4d4b8b4a 100644
--- a/UI/GamepadEmu.cpp
+++ b/UI/GamepadEmu.cpp
@@ -18,7 +18,7 @@
 #include <algorithm>
 
 #include "Common/Data/Color/RGBAUtil.h"
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "base/NativeApp.h"
 #include "gfx/texture_atlas.h"
 #include "Common/Math/math_util.h"
diff --git a/UI/MainScreen.cpp b/UI/MainScreen.cpp
index 645a4255cd..04aa540a49 100644
--- a/UI/MainScreen.cpp
+++ b/UI/MainScreen.cpp
@@ -20,7 +20,7 @@
 
 #include "ppsspp_config.h"
 
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "base/NativeApp.h"
 #include "gfx/texture_atlas.h"
 #include "gfx_es2/draw_buffer.h"
diff --git a/UI/MiscScreens.cpp b/UI/MiscScreens.cpp
index 5a861c3d58..86bc8360b2 100644
--- a/UI/MiscScreens.cpp
+++ b/UI/MiscScreens.cpp
@@ -21,7 +21,7 @@
 #include <functional>
 
 #include "base/NativeApp.h"
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "gfx_es2/draw_buffer.h"
 #include "Common/Math/curves.h"
 #include "ui/ui_context.h"
diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp
index 0eb2977cbc..b4bd291126 100644
--- a/UI/NativeApp.cpp
+++ b/UI/NativeApp.cpp
@@ -43,7 +43,7 @@
 #include "Windows/CaptureDevice.h"
 #endif
 
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "base/NativeApp.h"
 #include "net/http_client.h"
 #include "net/resolve.h"
diff --git a/UI/ReportScreen.cpp b/UI/ReportScreen.cpp
index 59765847f0..bf63825722 100644
--- a/UI/ReportScreen.cpp
+++ b/UI/ReportScreen.cpp
@@ -17,7 +17,7 @@
 
 #include <string>
 
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "base/NativeApp.h"
 // TODO: For text align flags, probably shouldn't be in gfx_es2/...
 #include "gfx_es2/draw_buffer.h"
diff --git a/UWP/CommonUWP/CommonUWP.vcxproj b/UWP/CommonUWP/CommonUWP.vcxproj
index 9156bfa093..af2508dc88 100644
--- a/UWP/CommonUWP/CommonUWP.vcxproj
+++ b/UWP/CommonUWP/CommonUWP.vcxproj
@@ -453,6 +453,7 @@
     <ClInclude Include="..\..\Common\StringUtils.h" />
     <ClInclude Include="..\..\Common\Swap.h" />
     <ClInclude Include="..\..\Common\SysError.h" />
+    <ClInclude Include="..\..\Common\System\Display.h" />
     <ClInclude Include="..\..\Common\ThreadPools.h" />
     <ClInclude Include="..\..\Common\ThreadSafeList.h" />
     <ClInclude Include="..\..\Common\Thread\Executor.h" />
@@ -529,6 +530,7 @@
     <ClCompile Include="..\..\Common\SysError.cpp" />
     <ClCompile Include="..\..\Common\OSVersion.cpp" />
     <ClCompile Include="..\..\Common\StringUtils.cpp" />
+    <ClCompile Include="..\..\Common\System\Display.cpp" />
     <ClCompile Include="..\..\Common\ThreadPools.cpp" />
     <ClCompile Include="..\..\Common\Thread\Executor.cpp" />
     <ClCompile Include="..\..\Common\Thread\PrioritizedWorkQueue.cpp" />
diff --git a/UWP/CommonUWP/CommonUWP.vcxproj.filters b/UWP/CommonUWP/CommonUWP.vcxproj.filters
index 58ec4db297..189cf456c9 100644
--- a/UWP/CommonUWP/CommonUWP.vcxproj.filters
+++ b/UWP/CommonUWP/CommonUWP.vcxproj.filters
@@ -61,6 +61,9 @@
     <Filter Include="Profiler">
       <UniqueIdentifier>{6673c122-d7ed-4ccc-969a-12d317ee1f93}</UniqueIdentifier>
     </Filter>
+    <Filter Include="System">
+      <UniqueIdentifier>{661f7d9d-5922-48d6-88ea-2f24bb57419f}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\Common\ABI.cpp" />
@@ -246,6 +249,9 @@
     <ClCompile Include="..\..\Common\Profiler\Profiler.cpp">
       <Filter>Profiler</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\Common\System\Display.cpp">
+      <Filter>System</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="targetver.h" />
@@ -437,6 +443,9 @@
     <ClInclude Include="..\..\Common\Profiler\Profiler.h">
       <Filter>Profiler</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\Common\System\Display.h">
+      <Filter>System</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Text Include="..\..\ext\libpng17\CMakeLists.txt">
diff --git a/UWP/PPSSPP_UWPMain.cpp b/UWP/PPSSPP_UWPMain.cpp
index 6188606368..6f48714b88 100644
--- a/UWP/PPSSPP_UWPMain.cpp
+++ b/UWP/PPSSPP_UWPMain.cpp
@@ -7,7 +7,7 @@
 #include "file/file_util.h"
 #include "net/http_client.h"
 #include "net/resolve.h"
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "thin3d/thin3d_create.h"
 
 #include "Common/Common.h"
diff --git a/Windows/Debugger/CtrlDisAsmView.cpp b/Windows/Debugger/CtrlDisAsmView.cpp
index c37127f0dc..e26f9644d8 100644
--- a/Windows/Debugger/CtrlDisAsmView.cpp
+++ b/Windows/Debugger/CtrlDisAsmView.cpp
@@ -22,7 +22,7 @@
 #include "Common/CommonWindows.h"
 #include "Common/Data/Encoding/Utf8.h"
 #include "ext/xxhash.h"
-#include "base/display.h"
+#include "Common/System/Display.h"
 
 #include <CommDlg.h>
 #include <tchar.h>
diff --git a/Windows/Debugger/CtrlMemView.cpp b/Windows/Debugger/CtrlMemView.cpp
index 4dda0822e1..7ae71ef331 100644
--- a/Windows/Debugger/CtrlMemView.cpp
+++ b/Windows/Debugger/CtrlMemView.cpp
@@ -9,7 +9,7 @@
 #include "Windows/W32Util/Misc.h"
 #include "Windows/InputBox.h"
 #include "Windows/main.h"
-#include "base/display.h"
+#include "Common/System/Display.h"
 
 #include "Debugger_Disasm.h"
 #include "DebuggerShared.h"
diff --git a/Windows/Debugger/CtrlRegisterList.cpp b/Windows/Debugger/CtrlRegisterList.cpp
index 791838cdd3..02992e5f28 100644
--- a/Windows/Debugger/CtrlRegisterList.cpp
+++ b/Windows/Debugger/CtrlRegisterList.cpp
@@ -3,7 +3,7 @@
 #include <math.h>
 #include <tchar.h>
 
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "Common/Data/Encoding/Utf8.h"
 #include "Windows/resource.h"
 #include "Core/MemMap.h"
diff --git a/Windows/Debugger/Debugger_MemoryDlg.cpp b/Windows/Debugger/Debugger_MemoryDlg.cpp
index 9604616f01..3302786160 100644
--- a/Windows/Debugger/Debugger_MemoryDlg.cpp
+++ b/Windows/Debugger/Debugger_MemoryDlg.cpp
@@ -4,7 +4,7 @@
 #include <windowsx.h>
 #include "..\resource.h"
 
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "Common/Data/Encoding/Utf8.h"
 
 #include "Core/Debugger/SymbolMap.h"
diff --git a/Windows/GEDebugger/CtrlDisplayListView.cpp b/Windows/GEDebugger/CtrlDisplayListView.cpp
index 741ca4b3af..78b3373a5e 100644
--- a/Windows/GEDebugger/CtrlDisplayListView.cpp
+++ b/Windows/GEDebugger/CtrlDisplayListView.cpp
@@ -1,4 +1,4 @@
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "Windows/GEDebugger/CtrlDisplayListView.h"
 #include "Windows/GEDebugger/GEDebugger.h"
 #include "Windows/InputBox.h"
diff --git a/Windows/GPU/D3D11Context.cpp b/Windows/GPU/D3D11Context.cpp
index 9ced64d60c..32d158c54e 100644
--- a/Windows/GPU/D3D11Context.cpp
+++ b/Windows/GPU/D3D11Context.cpp
@@ -5,7 +5,7 @@
 #include <WinError.h>
 
 #include "Common/Log.h"
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "Common/Data/Encoding/Utf8.h"
 #include "Common/Data/Text/I18n.h"
 
diff --git a/Windows/GPU/D3D9Context.cpp b/Windows/GPU/D3D9Context.cpp
index be91557b47..daeb0fd86b 100644
--- a/Windows/GPU/D3D9Context.cpp
+++ b/Windows/GPU/D3D9Context.cpp
@@ -5,7 +5,7 @@
 
 #include "gfx/d3d9_state.h"
 
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "Common/Data/Encoding/Utf8.h"
 #include "Common/Data/Text/I18n.h"
 
diff --git a/Windows/MainWindow.cpp b/Windows/MainWindow.cpp
index 3178e1adfe..560073b65e 100644
--- a/Windows/MainWindow.cpp
+++ b/Windows/MainWindow.cpp
@@ -31,7 +31,7 @@
 #include <map>
 #include <string>
 
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "base/NativeApp.h"
 #include "Common/TimeUtil.h"
 #include "Common/StringUtils.h"
diff --git a/Windows/RawInput.cpp b/Windows/RawInput.cpp
index 9d7f9ba79a..6f8071058f 100644
--- a/Windows/RawInput.cpp
+++ b/Windows/RawInput.cpp
@@ -20,7 +20,7 @@
 #include <vector>
 
 #include "base/NativeApp.h"
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "Common/Input/InputState.h"
 #include "Common/Log.h"
 #include "Windows/RawInput.h"
diff --git a/Windows/TouchInputHandler.cpp b/Windows/TouchInputHandler.cpp
index b052ed3fa9..1066e04c85 100644
--- a/Windows/TouchInputHandler.cpp
+++ b/Windows/TouchInputHandler.cpp
@@ -4,7 +4,7 @@
 
 #include <algorithm>
 
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "base/NativeApp.h"
 
 #include "Common/CommonWindows.h"
diff --git a/Windows/WindowsHost.cpp b/Windows/WindowsHost.cpp
index 3269917f10..02d28ff3d6 100644
--- a/Windows/WindowsHost.cpp
+++ b/Windows/WindowsHost.cpp
@@ -32,7 +32,7 @@
 #pragma warning(pop)
 
 // native stuff
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "base/NativeApp.h"
 #include "file/file_util.h"
 #include "Common/Input/InputState.h"
diff --git a/Windows/main.cpp b/Windows/main.cpp
index 5d5464f284..c05d717714 100644
--- a/Windows/main.cpp
+++ b/Windows/main.cpp
@@ -31,7 +31,7 @@
 #include <ShlObj.h>
 #include <mmsystem.h>
 
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "base/NativeApp.h"
 #include "Common/File/VFS/VFS.h"
 #include "Common/File/VFS/AssetReader.h"
diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index 9ef7d2b702..2277a40f41 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -102,7 +102,6 @@ ARCH_FILES := \
 endif
 
 NATIVE_FILES :=\
-  $(SRC)/ext/native/base/display.cpp \
   $(SRC)/ext/native/file/fd_util.cpp \
   $(SRC)/ext/native/file/file_util.cpp \
   $(SRC)/ext/native/net/http_client.cpp \
@@ -278,6 +277,7 @@ EXEC_AND_LIB_FILES := \
   $(SRC)/Common/Math/lin/vec3.cpp.arm \
   $(SRC)/Common/Math/lin/matrix4x4.cpp.arm \
   $(SRC)/Common/Profiler/Profiler.cpp \
+  $(SRC)/Common/System/Display.cpp \
   $(SRC)/Common/Thread/Executor.cpp \
   $(SRC)/Common/Thread/PrioritizedWorkQueue.cpp \
   $(SRC)/Common/Thread/ThreadPool.cpp \
diff --git a/android/jni/AndroidJavaGLContext.cpp b/android/jni/AndroidJavaGLContext.cpp
index ffd5564494..d11feaf5a9 100644
--- a/android/jni/AndroidJavaGLContext.cpp
+++ b/android/jni/AndroidJavaGLContext.cpp
@@ -1,5 +1,5 @@
 #include "AndroidJavaGLContext.h"
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "base/NativeApp.h"
 #include "gfx_es2/gpu_features.h"
 #include "Common/Log.h"
diff --git a/android/jni/AndroidVulkanContext.cpp b/android/jni/AndroidVulkanContext.cpp
index 49eb548c2d..6de6dc5cf7 100644
--- a/android/jni/AndroidVulkanContext.cpp
+++ b/android/jni/AndroidVulkanContext.cpp
@@ -1,6 +1,6 @@
 #include "AndroidVulkanContext.h"
 #include "base/NativeApp.h"
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "Common/Log.h"
 #include "Common/Vulkan/VulkanContext.h"
 #include "Common/Vulkan/VulkanDebug.h"
diff --git a/android/jni/TestRunner.cpp b/android/jni/TestRunner.cpp
index b7ca679ed5..8bc9809d7b 100644
--- a/android/jni/TestRunner.cpp
+++ b/android/jni/TestRunner.cpp
@@ -26,7 +26,7 @@
 #include <iostream>
 
 #include "ppsspp_config.h"
-#include "base/display.h"
+#include "Common/System/Display.h"
 
 #include "Common/FileUtil.h"
 #include "Common/Log.h"
diff --git a/android/jni/app-android.cpp b/android/jni/app-android.cpp
index 57e2d4c7c6..e60f6bc01c 100644
--- a/android/jni/app-android.cpp
+++ b/android/jni/app-android.cpp
@@ -49,7 +49,7 @@ struct JNIEnv {};
 #define JNI_VERSION_1_6 16
 #endif
 
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "base/NativeApp.h"
 #include "Common/Thread/ThreadUtil.h"
 #include "Common/File/VFS/VFS.h"
diff --git a/ext/native/gfx_es2/draw_buffer.cpp b/ext/native/gfx_es2/draw_buffer.cpp
index a5c0e5a7a6..a31f938584 100644
--- a/ext/native/gfx_es2/draw_buffer.cpp
+++ b/ext/native/gfx_es2/draw_buffer.cpp
@@ -3,7 +3,7 @@
 #include <vector>
 #include <stddef.h>
 
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "Common/Math/math_util.h"
 #include "gfx/texture_atlas.h"
 #include "gfx/gl_debug_log.h"
diff --git a/ext/native/gfx_es2/draw_text.cpp b/ext/native/gfx_es2/draw_text.cpp
index c8d5d374d1..b1fae13c8e 100644
--- a/ext/native/gfx_es2/draw_text.cpp
+++ b/ext/native/gfx_es2/draw_text.cpp
@@ -1,4 +1,4 @@
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "thin3d/thin3d.h"
 #include "Common/Data/Hash/Hash.h"
 #include "Common/Data/Text/WrapText.h"
diff --git a/ext/native/gfx_es2/draw_text_android.cpp b/ext/native/gfx_es2/draw_text_android.cpp
index c824c0cd48..c19f859cf7 100644
--- a/ext/native/gfx_es2/draw_text_android.cpp
+++ b/ext/native/gfx_es2/draw_text_android.cpp
@@ -1,4 +1,4 @@
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "thin3d/thin3d.h"
 #include "Common/Data/Hash/Hash.h"
 #include "Common/Data/Text/WrapText.h"
diff --git a/ext/native/gfx_es2/draw_text_qt.cpp b/ext/native/gfx_es2/draw_text_qt.cpp
index f522e2c993..56b8c6e56c 100644
--- a/ext/native/gfx_es2/draw_text_qt.cpp
+++ b/ext/native/gfx_es2/draw_text_qt.cpp
@@ -1,4 +1,4 @@
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "thin3d/thin3d.h"
 #include "Common/Data/Hash/Hash.h"
 #include "Common/Data/Text/WrapText.h"
diff --git a/ext/native/gfx_es2/draw_text_uwp.cpp b/ext/native/gfx_es2/draw_text_uwp.cpp
index 3171b01608..71e88f0fd5 100644
--- a/ext/native/gfx_es2/draw_text_uwp.cpp
+++ b/ext/native/gfx_es2/draw_text_uwp.cpp
@@ -1,4 +1,4 @@
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "thin3d/thin3d.h"
 #include "Common/Data/Hash/Hash.h"
 #include "Common/Data/Text/WrapText.h"
diff --git a/ext/native/gfx_es2/draw_text_win.cpp b/ext/native/gfx_es2/draw_text_win.cpp
index 320d2968f3..1767d71cfa 100644
--- a/ext/native/gfx_es2/draw_text_win.cpp
+++ b/ext/native/gfx_es2/draw_text_win.cpp
@@ -1,4 +1,4 @@
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "thin3d/thin3d.h"
 #include "Common/Data/Hash/Hash.h"
 #include "Common/Data/Text/WrapText.h"
diff --git a/ext/native/native.vcxproj b/ext/native/native.vcxproj
index 7a4d64981e..7e8a930e49 100644
--- a/ext/native/native.vcxproj
+++ b/ext/native/native.vcxproj
@@ -360,22 +360,10 @@
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <None Include="..\..\ios\main.mm">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
-    </None>
     <None Include="Android.mk" />
     <None Include="tools\CMakeLists.txt" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\Qt\QtMain.h" />
-    <ClInclude Include="base\display.h" />
     <ClInclude Include="base\NativeApp.h" />
     <ClInclude Include="file\fd_util.h" />
     <ClInclude Include="file\file_util.h" />
@@ -424,27 +412,6 @@
     <ClInclude Include="ui\viewgroup.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="base\display.cpp" />
-    <ClCompile Include="..\..\SDL\SDLMain.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\Qt\QtMain.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="file\fd_util.cpp" />
     <ClCompile Include="file\file_util.cpp" />
     <ClCompile Include="gfx\d3d9_shader.cpp" />
diff --git a/ext/native/native.vcxproj.filters b/ext/native/native.vcxproj.filters
index e11d74cf0e..76060179e4 100644
--- a/ext/native/native.vcxproj.filters
+++ b/ext/native/native.vcxproj.filters
@@ -5,9 +5,6 @@
     <None Include="tools\CMakeLists.txt">
       <Filter>tools</Filter>
     </None>
-    <None Include="..\..\ios\main.mm">
-      <Filter>base</Filter>
-    </None>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="gfx\gl_debug_log.h">
@@ -37,9 +34,6 @@
     <ClInclude Include="base\NativeApp.h">
       <Filter>base</Filter>
     </ClInclude>
-    <ClInclude Include="base\display.h">
-      <Filter>base</Filter>
-    </ClInclude>
     <ClInclude Include="ui\ui.h">
       <Filter>ui</Filter>
     </ClInclude>
@@ -127,9 +121,6 @@
     <ClInclude Include="ui\ui_tween.h">
       <Filter>ui</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Qt\QtMain.h">
-      <Filter>base</Filter>
-    </ClInclude>
     <ClInclude Include="thin3d\GLRenderManager.h">
       <Filter>thin3d</Filter>
     </ClInclude>
@@ -180,9 +171,6 @@
     <ClCompile Include="file\file_util.cpp">
       <Filter>file</Filter>
     </ClCompile>
-    <ClCompile Include="base\display.cpp">
-      <Filter>base</Filter>
-    </ClCompile>
     <ClCompile Include="ui\ui.cpp">
       <Filter>ui</Filter>
     </ClCompile>
@@ -240,12 +228,6 @@
     <ClCompile Include="net\http_server.cpp">
       <Filter>net</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\SDL\SDLMain.cpp">
-      <Filter>base</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Qt\QtMain.cpp">
-      <Filter>base</Filter>
-    </ClCompile>
     <ClCompile Include="thin3d\thin3d_vulkan.cpp">
       <Filter>thin3d</Filter>
     </ClCompile>
diff --git a/ext/native/thin3d/VulkanRenderManager.h b/ext/native/thin3d/VulkanRenderManager.h
index 60a99d4cc3..653fbae850 100644
--- a/ext/native/thin3d/VulkanRenderManager.h
+++ b/ext/native/thin3d/VulkanRenderManager.h
@@ -10,7 +10,7 @@
 #include <mutex>
 #include <thread>
 
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "Common/Vulkan/VulkanContext.h"
 #include "Common/Data/Convert/SmallDataConvert.h"
 #include "Common/Math/math_util.h"
diff --git a/ext/native/thin3d/thin3d.cpp b/ext/native/thin3d/thin3d.cpp
index aabb1d818b..f15e96fa93 100644
--- a/ext/native/thin3d/thin3d.cpp
+++ b/ext/native/thin3d/thin3d.cpp
@@ -2,7 +2,7 @@
 #include <cstring>
 #include <cstdint>
 
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "thin3d/thin3d.h"
 #include "Common/Log.h"
 #include "Common/ColorConv.h"
diff --git a/ext/native/thin3d/thin3d_d3d11.cpp b/ext/native/thin3d/thin3d_d3d11.cpp
index a374e484e1..d39813667f 100644
--- a/ext/native/thin3d/thin3d_d3d11.cpp
+++ b/ext/native/thin3d/thin3d_d3d11.cpp
@@ -6,7 +6,7 @@
 #else
 #include "thin3d/d3d11_loader.h"
 #endif
-#include "base/display.h"
+#include "Common/System/Display.h"
 
 #include "Common/Data/Convert/SmallDataConvert.h"
 #include "Common/Data/Encoding/Utf8.h"
diff --git a/ext/native/thin3d/thin3d_vulkan.cpp b/ext/native/thin3d/thin3d_vulkan.cpp
index 7195bc7bf4..2060f2d978 100644
--- a/ext/native/thin3d/thin3d_vulkan.cpp
+++ b/ext/native/thin3d/thin3d_vulkan.cpp
@@ -20,7 +20,7 @@
 #include <string>
 #include <map>
 
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "image/zim_load.h"
 #include "Common/Math/lin/matrix4x4.h"
 #include "Common/Data/Convert/SmallDataConvert.h"
diff --git a/ext/native/ui/screen.cpp b/ext/native/ui/screen.cpp
index 86b1dc02c4..97f5f2c567 100644
--- a/ext/native/ui/screen.cpp
+++ b/ext/native/ui/screen.cpp
@@ -1,4 +1,4 @@
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "Common/Input/InputState.h"
 #include "ui/root.h"
 #include "ui/screen.h"
diff --git a/ext/native/ui/ui_context.cpp b/ext/native/ui/ui_context.cpp
index 6b4aa25cd4..052332f0bd 100644
--- a/ext/native/ui/ui_context.cpp
+++ b/ext/native/ui/ui_context.cpp
@@ -2,7 +2,7 @@
 
 #include <algorithm>
 
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "base/NativeApp.h"
 #include "ui/ui.h"
 #include "ui/view.h"
diff --git a/ext/native/ui/ui_screen.cpp b/ext/native/ui/ui_screen.cpp
index 3e96d79c39..8ba6eb2bb0 100644
--- a/ext/native/ui/ui_screen.cpp
+++ b/ext/native/ui/ui_screen.cpp
@@ -2,7 +2,7 @@
 #include <map>
 #include <sstream>
 
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "Common/Input/InputState.h"
 #include "Common/Input/KeyCodes.h"
 #include "Common/Math/curves.h"
diff --git a/ios/DisplayManager.mm b/ios/DisplayManager.mm
index 495353a6df..e3ae0a7b66 100644
--- a/ios/DisplayManager.mm
+++ b/ios/DisplayManager.mm
@@ -8,7 +8,7 @@
 #import "DisplayManager.h"
 #import "ViewController.h"
 #import "AppDelegate.h"
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "base/NativeApp.h"
 #include "Core/System.h"
 #import <AVFoundation/AVFoundation.h>
diff --git a/ios/PPSSPPUIApplication.mm b/ios/PPSSPPUIApplication.mm
index 65a24d3c64..4beb622c44 100644
--- a/ios/PPSSPPUIApplication.mm
+++ b/ios/PPSSPPUIApplication.mm
@@ -12,7 +12,7 @@
 #import <Foundation/NSObjCRuntime.h>
 #import <GLKit/GLKit.h>
 
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "base/NativeApp.h"
 #include "Common/TimeUtil.h"
 #include "file/zip_read.h"
diff --git a/ios/ViewController.mm b/ios/ViewController.mm
index 1bd8087ae0..6e702ba12c 100644
--- a/ios/ViewController.mm
+++ b/ios/ViewController.mm
@@ -12,7 +12,7 @@
 #import <GLKit/GLKit.h>
 #include <cassert>
 
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "base/NativeApp.h"
 #include "file/zip_read.h"
 #include "net/resolve.h"
diff --git a/libretro/Makefile.common b/libretro/Makefile.common
index 71095ccea5..d0a534c6c9 100644
--- a/libretro/Makefile.common
+++ b/libretro/Makefile.common
@@ -170,6 +170,7 @@ SOURCES_CXX += \
 	$(COMMONDIR)/Thread/ThreadUtil.cpp \
 	$(COMMONDIR)/Thread/ThreadPool.cpp \
 	$(COMMONDIR)/Thread/PrioritizedWorkQueue.cpp \
+	$(COMMONDIR)/System/Display.cpp \
 	$(COMMONDIR)/Input/GestureDetector.cpp \
 	$(COMMONDIR)/Input/InputState.cpp \
 	$(COMMONDIR)/Buffer.cpp \
@@ -242,7 +243,6 @@ SOURCES_CXX += \
 	$(GPUDIR)/GLES/ShaderManagerGLES.cpp \
 	$(GPUDIR)/GLES/StateMappingGLES.cpp \
 	$(GPUDIR)/GLES/StencilBufferGLES.cpp \
-	$(EXTDIR)/native/base/display.cpp \
 	$(EXTDIR)/glslang/OGLCompilersDLL/InitializeDll.cpp \
 	$(EXTDIR)/glslang/glslang/GenericCodeGen/CodeGen.cpp \
 	$(EXTDIR)/glslang/glslang/GenericCodeGen/Link.cpp \
diff --git a/libretro/libretro.cpp b/libretro/libretro.cpp
index 1a6e82ae49..219432057e 100644
--- a/libretro/libretro.cpp
+++ b/libretro/libretro.cpp
@@ -3,11 +3,22 @@
 #include <thread>
 #include <atomic>
 #include <vector>
-#include <stdlib.h>
+#include <cstdlib>
 
+#include "base/NativeApp.h"
+
+#include "Common/Log.h"
+#include "Common/LogManager.h"
+#include "Common/System/Display.h"
 #include "Common/TimeUtil.h"
 #include "Common/FileUtil.h"
 #include "Common/Serialize/Serializer.h"
+#include "Common/ConsoleListener.h"
+#include "Common/Input/InputState.h"
+#include "Common/Thread/ThreadUtil.h"
+#include "Common/File/VFS/VFS.h"
+#include "Common/File/VFS/AssetReader.h"
+
 #include "Core/Config.h"
 #include "Core/ConfigValues.h"
 #include "Core/Core.h"
@@ -18,18 +29,11 @@
 #include "Core/Host.h"
 #include "Core/MemMap.h"
 #include "Core/System.h"
-#include "Log.h"
-#include "LogManager.h"
-#include "ConsoleListener.h"
-#include "Common/File/VFS/VFS.h"
-#include "Common/File/VFS/AssetReader.h"
+
 #include "GPU/GPUState.h"
 #include "GPU/GPUInterface.h"
 #include "GPU/Common/FramebufferManagerCommon.h"
 #include "GPU/Common/TextureScalerCommon.h"
-#include "Common/Input/InputState.h"
-#include "base/NativeApp.h"
-#include "Common/Thread/ThreadUtil.h"
 
 #include "libretro/libretro.h"
 #include "libretro/LibretroGraphicsContext.h"