diff --git a/CMakeLists.txt b/CMakeLists.txt
index 568dbb1f51..29d2a45cc6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -433,6 +433,11 @@ add_library(Common STATIC
 	Common/Crypto/sha1.h
 	Common/Crypto/sha256.cpp
 	Common/Crypto/sha256.h
+	Common/Input/GestureDetector.cpp
+	Common/Input/GestureDetector.h
+	Common/Input/KeyCodes.h
+	Common/Input/InputState.cpp
+	Common/Input/InputState.h
 	Common/Thread/Executor.cpp
 	Common/Thread/Executor.h
 	Common/Thread/PrioritizedWorkQueue.cpp
@@ -1008,11 +1013,6 @@ add_library(native STATIC
 	ext/native/image/zim_load.h
 	ext/native/image/zim_save.cpp
 	ext/native/image/zim_save.h
-	ext/native/input/gesture_detector.cpp
-	ext/native/input/gesture_detector.h
-	ext/native/input/keycodes.h
-	ext/native/input/input_state.h
-	ext/native/input/input_state.cpp
 	ext/native/json/json_reader.h
 	ext/native/json/json_reader.cpp
 	ext/native/json/json_writer.h
diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj
index d631d484a8..8f64506e1f 100644
--- a/Common/Common.vcxproj
+++ b/Common/Common.vcxproj
@@ -360,6 +360,9 @@
     <ClInclude Include="BitSet.h" />
     <ClInclude Include="Buffer.h" />
     <ClInclude Include="FakeEmitter.h" />
+    <ClInclude Include="Input\GestureDetector.h" />
+    <ClInclude Include="Input\InputState.h" />
+    <ClInclude Include="Input\KeyCodes.h" />
     <ClInclude Include="Serialize\SerializeDeque.h" />
     <ClInclude Include="Serialize\SerializeFuncs.h" />
     <ClInclude Include="ColorConvNEON.h" />
@@ -611,6 +614,8 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="Input\GestureDetector.cpp" />
+    <ClCompile Include="Input\InputState.cpp" />
     <ClCompile Include="Log.cpp" />
     <ClCompile Include="Serialize\Serializer.cpp" />
     <ClCompile Include="ColorConv.cpp" />
diff --git a/Common/Common.vcxproj.filters b/Common/Common.vcxproj.filters
index a021e84b0c..b32b1da778 100644
--- a/Common/Common.vcxproj.filters
+++ b/Common/Common.vcxproj.filters
@@ -128,6 +128,15 @@
     <ClInclude Include="Thread\Executor.h">
       <Filter>Thread</Filter>
     </ClInclude>
+    <ClInclude Include="Input\GestureDetector.h">
+      <Filter>Input</Filter>
+    </ClInclude>
+    <ClInclude Include="Input\InputState.h">
+      <Filter>Input</Filter>
+    </ClInclude>
+    <ClInclude Include="Input\KeyCodes.h">
+      <Filter>Input</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="ABI.cpp" />
@@ -255,6 +264,12 @@
     <ClCompile Include="Thread\Executor.cpp">
       <Filter>Thread</Filter>
     </ClCompile>
+    <ClCompile Include="Input\GestureDetector.cpp">
+      <Filter>Input</Filter>
+    </ClCompile>
+    <ClCompile Include="Input\InputState.cpp">
+      <Filter>Input</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Crypto">
@@ -281,6 +296,9 @@
     <Filter Include="Thread">
       <UniqueIdentifier>{41bcd391-8641-432c-ae4a-ab03812df762}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Input">
+      <UniqueIdentifier>{fd0bac4f-e3e2-4201-8902-2d19b50d5bf7}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <Text Include="..\ext\libpng17\CMakeLists.txt">
diff --git a/ext/native/input/gesture_detector.cpp b/Common/Input/GestureDetector.cpp
similarity index 98%
rename from ext/native/input/gesture_detector.cpp
rename to Common/Input/GestureDetector.cpp
index d73f4f9090..cab29e1b1a 100644
--- a/ext/native/input/gesture_detector.cpp
+++ b/Common/Input/GestureDetector.cpp
@@ -3,7 +3,7 @@
 // Zoom gesture a la http://www.zdnet.com/blog/burnette/how-to-use-multi-touch-in-android-2-part-6-implementing-the-pinch-zoom-gesture/1847
 
 #include "Common/TimeUtil.h"
-#include "input/gesture_detector.h"
+#include "Common/Input/GestureDetector.h"
 
 const float estimatedInertiaDamping = 0.75f;
 
diff --git a/ext/native/input/gesture_detector.h b/Common/Input/GestureDetector.h
similarity index 96%
rename from ext/native/input/gesture_detector.h
rename to Common/Input/GestureDetector.h
index 783843cee3..908f960769 100644
--- a/ext/native/input/gesture_detector.h
+++ b/Common/Input/GestureDetector.h
@@ -1,4 +1,4 @@
-#include "input/input_state.h"
+#include "Common/Input/InputState.h"
 #include "math/geom2d.h"
 
 // Mainly for detecting (multi-)touch gestures but also useable for left button mouse dragging etc.
diff --git a/ext/native/input/input_state.cpp b/Common/Input/InputState.cpp
similarity index 96%
rename from ext/native/input/input_state.cpp
rename to Common/Input/InputState.cpp
index 8c28473f1d..90fc9b6a1a 100644
--- a/ext/native/input/input_state.cpp
+++ b/Common/Input/InputState.cpp
@@ -1,5 +1,5 @@
-#include "input/input_state.h"
-#include "input/keycodes.h"
+#include "Common/Input/InputState.h"
+#include "Common/Input/KeyCodes.h"
 #include <vector>
 
 const char *GetDeviceName(int deviceId) {
diff --git a/ext/native/input/input_state.h b/Common/Input/InputState.h
similarity index 99%
rename from ext/native/input/input_state.h
rename to Common/Input/InputState.h
index 2ce502f860..175d6786df 100644
--- a/ext/native/input/input_state.h
+++ b/Common/Input/InputState.h
@@ -8,7 +8,7 @@
 #include <mutex>
 
 #include "math/lin/vec3.h"
-#include "input/keycodes.h"
+#include "Common/Input/KeyCodes.h"
 
 // Default device IDs
 
diff --git a/ext/native/input/keycodes.h b/Common/Input/KeyCodes.h
similarity index 100%
rename from ext/native/input/keycodes.h
rename to Common/Input/KeyCodes.h
diff --git a/Common/KeyMap.cpp b/Common/KeyMap.cpp
index 99d3bf4f05..2a3fb0bb81 100644
--- a/Common/KeyMap.cpp
+++ b/Common/KeyMap.cpp
@@ -26,7 +26,7 @@
 
 #include "base/NativeApp.h"
 #include "file/ini_file.h"
-#include "input/input_state.h"
+#include "Common/Input/InputState.h"
 #include "ppsspp_config.h"
 
 #include "Common/Log.h"
diff --git a/Common/KeyMap.h b/Common/KeyMap.h
index 86883a9e98..a0afd74797 100644
--- a/Common/KeyMap.h
+++ b/Common/KeyMap.h
@@ -21,8 +21,8 @@
 #include <map>
 #include <vector>
 #include <set>
-#include "input/input_state.h" // KeyDef
-#include "input/keycodes.h"     // keyboard keys
+#include "Common/Input/InputState.h" // KeyDef
+#include "Common/Input/KeyCodes.h"     // keyboard keys
 #include "../Core/HLE/sceCtrl.h"   // psp keys
 
 #define KEYMAP_ERROR_KEY_ALREADY_USED -1
diff --git a/Qt/QtMain.h b/Qt/QtMain.h
index 50e0396734..82123fc990 100644
--- a/Qt/QtMain.h
+++ b/Qt/QtMain.h
@@ -27,8 +27,8 @@ QTM_USE_NAMESPACE
 #include "file/zip_read.h"
 #include "gfx/gl_common.h"
 #include "gfx_es2/gpu_features.h"
-#include "input/input_state.h"
-#include "input/keycodes.h"
+#include "Common/Input/InputState.h"
+#include "Common/Input/KeyCodes.h"
 #include "thin3d/thin3d.h"
 #include "base/NativeApp.h"
 #include "net/resolve.h"
diff --git a/SDL/SDLJoystick.h b/SDL/SDLJoystick.h
index 970b105199..5b4d67f1ab 100644
--- a/SDL/SDLJoystick.h
+++ b/SDL/SDLJoystick.h
@@ -7,8 +7,8 @@
 #include "SDL_thread.h"
 #endif
 
-#include "input/input_state.h"
-#include "input/keycodes.h"
+#include "Common/Input/InputState.h"
+#include "Common/Input/KeyCodes.h"
 #include "net/resolve.h"
 #include "base/NativeApp.h"
 
diff --git a/SDL/SDLMain.cpp b/SDL/SDLMain.cpp
index 348162d9d3..f0ab1df43a 100644
--- a/SDL/SDLMain.cpp
+++ b/SDL/SDLMain.cpp
@@ -24,8 +24,8 @@ SDLJoystick *joystick = NULL;
 #include "Common/TimeUtil.h"
 #include "ext/glslang/glslang/Public/ShaderLang.h"
 #include "image/png_load.h"
-#include "input/input_state.h"
-#include "input/keycodes.h"
+#include "Common/Input/InputState.h"
+#include "Common/Input/KeyCodes.h"
 #include "net/resolve.h"
 #include "NKCodeFromSDL.h"
 #include "util/const_map.h"
diff --git a/UI/ControlMappingScreen.cpp b/UI/ControlMappingScreen.cpp
index 1cf93ebb44..07205f10ea 100644
--- a/UI/ControlMappingScreen.cpp
+++ b/UI/ControlMappingScreen.cpp
@@ -23,8 +23,8 @@
 #include "base/display.h"
 #include "gfx/texture_atlas.h"
 #include "i18n/i18n.h"
-#include "input/keycodes.h"
-#include "input/input_state.h"
+#include "Common/Input/KeyCodes.h"
+#include "Common/Input/InputState.h"
 #include "ui/root.h"
 #include "ui/ui.h"
 #include "ui/ui_context.h"
diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp
index ba3cd45976..48c45e557f 100644
--- a/UI/EmuScreen.cpp
+++ b/UI/EmuScreen.cpp
@@ -26,7 +26,7 @@
 #include "gfx_es2/gpu_features.h"
 #include "gfx_es2/draw_text.h"
 
-#include "input/input_state.h"
+#include "Common/Input/InputState.h"
 #include "math/curves.h"
 #include "ui/root.h"
 #include "ui/ui.h"
diff --git a/UI/EmuScreen.h b/UI/EmuScreen.h
index 9279944c6e..b4504e611c 100644
--- a/UI/EmuScreen.h
+++ b/UI/EmuScreen.h
@@ -21,7 +21,7 @@
 #include <vector>
 #include <list>
 
-#include "input/keycodes.h"
+#include "Common/Input/KeyCodes.h"
 #include "ui/screen.h"
 #include "ui/ui_screen.h"
 #include "ui/ui_tween.h"
diff --git a/UI/GamepadEmu.h b/UI/GamepadEmu.h
index 57c2c41ecb..fd2fe9c7d3 100644
--- a/UI/GamepadEmu.h
+++ b/UI/GamepadEmu.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "input/input_state.h"
+#include "Common/Input/InputState.h"
 #include "gfx_es2/draw_buffer.h"
 
 #include "ui/view.h"
diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp
index 57cfbea75d..dd11226078 100644
--- a/UI/NativeApp.cpp
+++ b/UI/NativeApp.cpp
@@ -53,7 +53,7 @@
 #include "gfx_es2/draw_text.h"
 #include "gfx_es2/gpu_features.h"
 #include "i18n/i18n.h"
-#include "input/input_state.h"
+#include "Common/Input/InputState.h"
 #include "math/fast/fast_math.h"
 #include "math/math_util.h"
 #include "math/lin/matrix4x4.h"
diff --git a/UWP/App.cpp b/UWP/App.cpp
index 586d679581..ee26dd40a0 100644
--- a/UWP/App.cpp
+++ b/UWP/App.cpp
@@ -5,8 +5,8 @@
 
 #include <mutex>
 
-#include "input/input_state.h"
 #include "base/NativeApp.h"
+#include "Common/Input/InputState.h"
 #include "Core/System.h"
 #include "Core/Core.h"
 
diff --git a/UWP/CommonUWP/CommonUWP.vcxproj b/UWP/CommonUWP/CommonUWP.vcxproj
index 3febada63d..c57672cdde 100644
--- a/UWP/CommonUWP/CommonUWP.vcxproj
+++ b/UWP/CommonUWP/CommonUWP.vcxproj
@@ -386,6 +386,9 @@
     <ClInclude Include="..\..\Common\BitScan.h" />
     <ClInclude Include="..\..\Common\BitSet.h" />
     <ClInclude Include="..\..\Common\Buffer.h" />
+    <ClInclude Include="..\..\Common\Input\GestureDetector.h" />
+    <ClInclude Include="..\..\Common\Input\InputState.h" />
+    <ClInclude Include="..\..\Common\Input\KeyCodes.h" />
     <ClInclude Include="..\..\Common\Serialize\Serializer.h" />
     <ClInclude Include="..\..\Common\Serialize\SerializeDeque.h" />
     <ClInclude Include="..\..\Common\Serialize\SerializeFuncs.h" />
@@ -422,6 +425,10 @@
     <ClInclude Include="..\..\Common\SysError.h" />
     <ClInclude Include="..\..\Common\ThreadPools.h" />
     <ClInclude Include="..\..\Common\ThreadSafeList.h" />
+    <ClInclude Include="..\..\Common\Thread\Executor.h" />
+    <ClInclude Include="..\..\Common\Thread\PrioritizedWorkQueue.h" />
+    <ClInclude Include="..\..\Common\Thread\ThreadPool.h" />
+    <ClInclude Include="..\..\Common\Thread\ThreadUtil.h" />
     <ClInclude Include="..\..\Common\Thunk.h" />
     <ClInclude Include="..\..\Common\Timer.h" />
     <ClInclude Include="..\..\Common\TimeUtil.h" />
@@ -442,6 +449,8 @@
     <ClCompile Include="..\..\Common\ArmCPUDetect.cpp" />
     <ClCompile Include="..\..\Common\ArmEmitter.cpp" />
     <ClCompile Include="..\..\Common\Buffer.cpp" />
+    <ClCompile Include="..\..\Common\Input\GestureDetector.cpp" />
+    <ClCompile Include="..\..\Common\Input\InputState.cpp" />
     <ClCompile Include="..\..\Common\Serialize\Serializer.cpp" />
     <ClCompile Include="..\..\Common\ColorConv.cpp" />
     <ClCompile Include="..\..\Common\ColorConvNEON.cpp" />
@@ -466,6 +475,10 @@
     <ClCompile Include="..\..\Common\OSVersion.cpp" />
     <ClCompile Include="..\..\Common\StringUtils.cpp" />
     <ClCompile Include="..\..\Common\ThreadPools.cpp" />
+    <ClCompile Include="..\..\Common\Thread\Executor.cpp" />
+    <ClCompile Include="..\..\Common\Thread\PrioritizedWorkQueue.cpp" />
+    <ClCompile Include="..\..\Common\Thread\ThreadPool.cpp" />
+    <ClCompile Include="..\..\Common\Thread\ThreadUtil.cpp" />
     <ClCompile Include="..\..\Common\Thunk.cpp" />
     <ClCompile Include="..\..\Common\Timer.cpp" />
     <ClCompile Include="..\..\Common\TimeUtil.cpp" />
diff --git a/UWP/CommonUWP/CommonUWP.vcxproj.filters b/UWP/CommonUWP/CommonUWP.vcxproj.filters
index 8df0d99656..1d396b672e 100644
--- a/UWP/CommonUWP/CommonUWP.vcxproj.filters
+++ b/UWP/CommonUWP/CommonUWP.vcxproj.filters
@@ -10,6 +10,12 @@
     <Filter Include="ext\libpng17">
       <UniqueIdentifier>{b0ac485c-3153-4708-b098-f5a518a95b79}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Thread">
+      <UniqueIdentifier>{819c6967-1ed6-4fec-8415-a018ae524180}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Input">
+      <UniqueIdentifier>{7368a8e7-cf29-49e9-87be-f1e69771555e}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\Common\ABI.cpp" />
@@ -100,6 +106,24 @@
     <ClCompile Include="..\..\ext\libpng17\pngwutil.c">
       <Filter>ext\libpng17</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\Common\Input\GestureDetector.cpp">
+      <Filter>Input</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Common\Input\InputState.cpp">
+      <Filter>Input</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Common\Thread\Executor.cpp">
+      <Filter>Thread</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Common\Thread\PrioritizedWorkQueue.cpp">
+      <Filter>Thread</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Common\Thread\ThreadPool.cpp">
+      <Filter>Thread</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Common\Thread\ThreadUtil.cpp">
+      <Filter>Thread</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="targetver.h" />
@@ -178,6 +202,27 @@
     <ClInclude Include="..\..\ext\libpng17\pngstruct.h">
       <Filter>ext\libpng17</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\Common\Input\GestureDetector.h">
+      <Filter>Input</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Common\Input\InputState.h">
+      <Filter>Input</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Common\Input\KeyCodes.h">
+      <Filter>Input</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Common\Thread\Executor.h">
+      <Filter>Thread</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Common\Thread\PrioritizedWorkQueue.h">
+      <Filter>Thread</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Common\Thread\ThreadPool.h">
+      <Filter>Thread</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Common\Thread\ThreadUtil.h">
+      <Filter>Thread</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Text Include="..\..\ext\libpng17\CMakeLists.txt">
diff --git a/UWP/NKCodeFromWindowsSystem.h b/UWP/NKCodeFromWindowsSystem.h
index 470a72456a..94905fb699 100644
--- a/UWP/NKCodeFromWindowsSystem.h
+++ b/UWP/NKCodeFromWindowsSystem.h
@@ -2,6 +2,6 @@
 
 #include <map>
 
-#include "input/keycodes.h"
+#include "Common/Input/KeyCodes.h"
 
 extern std::map<Windows::System::VirtualKey, int> virtualKeyCodeToNKCode;
\ No newline at end of file
diff --git a/UWP/NativeUWP/NativeUWP.vcxproj b/UWP/NativeUWP/NativeUWP.vcxproj
index 808814c28c..d622fc813c 100644
--- a/UWP/NativeUWP/NativeUWP.vcxproj
+++ b/UWP/NativeUWP/NativeUWP.vcxproj
@@ -402,9 +402,6 @@
     <ClInclude Include="..\..\ext\native\i18n\i18n.h" />
     <ClInclude Include="..\..\ext\native\image\png_load.h" />
     <ClInclude Include="..\..\ext\native\image\zim_load.h" />
-    <ClInclude Include="..\..\ext\native\input\gesture_detector.h" />
-    <ClInclude Include="..\..\ext\native\input\input_state.h" />
-    <ClInclude Include="..\..\ext\native\input\keycodes.h" />
     <ClInclude Include="..\..\ext\native\math\curves.h" />
     <ClInclude Include="..\..\ext\native\math\dataconv.h" />
     <ClInclude Include="..\..\ext\native\math\expression_parser.h" />
@@ -464,8 +461,6 @@
     <ClCompile Include="..\..\ext\native\i18n\i18n.cpp" />
     <ClCompile Include="..\..\ext\native\image\png_load.cpp" />
     <ClCompile Include="..\..\ext\native\image\zim_load.cpp" />
-    <ClCompile Include="..\..\ext\native\input\gesture_detector.cpp" />
-    <ClCompile Include="..\..\ext\native\input\input_state.cpp" />
     <ClCompile Include="..\..\ext\native\math\curves.cpp" />
     <ClCompile Include="..\..\ext\native\math\dataconv.cpp" />
     <ClCompile Include="..\..\ext\native\math\expression_parser.cpp" />
diff --git a/UWP/NativeUWP/NativeUWP.vcxproj.filters b/UWP/NativeUWP/NativeUWP.vcxproj.filters
index cd0b7803cb..66c9bf1ea3 100644
--- a/UWP/NativeUWP/NativeUWP.vcxproj.filters
+++ b/UWP/NativeUWP/NativeUWP.vcxproj.filters
@@ -94,12 +94,6 @@
     <ClCompile Include="..\..\ext\native\file\zip_read.cpp">
       <Filter>file</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\ext\native\input\gesture_detector.cpp">
-      <Filter>input</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\input\input_state.cpp">
-      <Filter>input</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\ext\native\ui\root.cpp">
       <Filter>ui</Filter>
     </ClCompile>
@@ -268,15 +262,6 @@
     <ClInclude Include="..\..\ext\native\file\zip_read.h">
       <Filter>file</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\ext\native\input\gesture_detector.h">
-      <Filter>input</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\native\input\input_state.h">
-      <Filter>input</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\native\input\keycodes.h">
-      <Filter>input</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\ext\native\ui\root.h">
       <Filter>ui</Filter>
     </ClInclude>
diff --git a/UWP/PPSSPP_UWPMain.cpp b/UWP/PPSSPP_UWPMain.cpp
index 8777ced8a7..8ddddcce9a 100644
--- a/UWP/PPSSPP_UWPMain.cpp
+++ b/UWP/PPSSPP_UWPMain.cpp
@@ -4,7 +4,7 @@
 #include <mutex>
 
 #include "base/NativeApp.h"
-#include "input/input_state.h"
+#include "Common/Input/InputState.h"
 #include "file/vfs.h"
 #include "file/zip_read.h"
 #include "file/file_util.h"
diff --git a/UWP/PPSSPP_UWPMain.h b/UWP/PPSSPP_UWPMain.h
index 3b38deeb3d..ed720e8a98 100644
--- a/UWP/PPSSPP_UWPMain.h
+++ b/UWP/PPSSPP_UWPMain.h
@@ -3,7 +3,7 @@
 #include <mutex>
 
 #include "thin3d/thin3d.h"
-#include "input/input_state.h"
+#include "Common/Input/InputState.h"
 
 #include "Common/GraphicsContext.h"
 #include "Common/DeviceResources.h"
diff --git a/UWP/UWPHost.cpp b/UWP/UWPHost.cpp
index b78e8ac055..d7526a9e2c 100644
--- a/UWP/UWPHost.cpp
+++ b/UWP/UWPHost.cpp
@@ -21,7 +21,7 @@
 
 #include "file/file_util.h"
 #include "base/NativeApp.h"
-#include "input/input_state.h"
+#include "Common/Input/InputState.h"
 
 #include "Common/StringUtils.h"
 #include "Core/Core.h"
diff --git a/Windows/DinputDevice.cpp b/Windows/DinputDevice.cpp
index 5d89e4ab54..8d57cd19c5 100644
--- a/Windows/DinputDevice.cpp
+++ b/Windows/DinputDevice.cpp
@@ -23,9 +23,9 @@
 #include "Core/HLE/sceCtrl.h"
 #include "DinputDevice.h"
 #include "Core/Config.h"
-#include "input/input_state.h"
+#include "Common/Input/InputState.h"
 #include "base/NativeApp.h"
-#include "input/keycodes.h"
+#include "Common/Input/KeyCodes.h"
 #include "Core/Reporting.h"
 #include "Xinput.h"
 #pragma comment(lib,"dinput8.lib")
diff --git a/Windows/EmuThread.cpp b/Windows/EmuThread.cpp
index 80ac516978..7c3a878435 100644
--- a/Windows/EmuThread.cpp
+++ b/Windows/EmuThread.cpp
@@ -4,7 +4,7 @@
 
 #include "base/NativeApp.h"
 #include "i18n/i18n.h"
-#include "input/input_state.h"
+#include "Common/Input/InputState.h"
 #include "util/text/utf8.h"
 
 #include "Common/Log.h"
diff --git a/Windows/InputDevice.cpp b/Windows/InputDevice.cpp
index 57b571bce3..28e6c2d379 100644
--- a/Windows/InputDevice.cpp
+++ b/Windows/InputDevice.cpp
@@ -19,7 +19,7 @@
 #include <thread>
 #include <atomic>
 
-#include "input/input_state.h"
+#include "Common/Input/InputState.h"
 #include "Common/Thread/ThreadUtil.h"
 #include "Core/Config.h"
 #include "Core/Host.h"
diff --git a/Windows/MainWindow.cpp b/Windows/MainWindow.cpp
index fe1d1ee828..2f3545d5d7 100644
--- a/Windows/MainWindow.cpp
+++ b/Windows/MainWindow.cpp
@@ -37,8 +37,8 @@
 #include "Common/TimeUtil.h"
 #include "Common/StringUtils.h"
 #include "i18n/i18n.h"
-#include "input/input_state.h"
-#include "input/keycodes.h"
+#include "Common/Input/InputState.h"
+#include "Common/Input/KeyCodes.h"
 #include "Common/Thread/ThreadUtil.h"
 #include "util/text/utf8.h"
 
diff --git a/Windows/RawInput.cpp b/Windows/RawInput.cpp
index 861fa393cd..9d7f9ba79a 100644
--- a/Windows/RawInput.cpp
+++ b/Windows/RawInput.cpp
@@ -21,7 +21,7 @@
 
 #include "base/NativeApp.h"
 #include "base/display.h"
-#include "input/input_state.h"
+#include "Common/Input/InputState.h"
 #include "Common/Log.h"
 #include "Windows/RawInput.h"
 #include "Windows/MainWindow.h"
diff --git a/Windows/WindowsHost.cpp b/Windows/WindowsHost.cpp
index e34f744f3b..4442fd4d19 100644
--- a/Windows/WindowsHost.cpp
+++ b/Windows/WindowsHost.cpp
@@ -35,8 +35,8 @@
 #include "base/display.h"
 #include "base/NativeApp.h"
 #include "file/file_util.h"
-#include "input/input_state.h"
-#include "input/keycodes.h"
+#include "Common/Input/InputState.h"
+#include "Common/Input/KeyCodes.h"
 #include "util/text/utf8.h"
 
 #include "Common/StringUtils.h"
diff --git a/Windows/XinputDevice.cpp b/Windows/XinputDevice.cpp
index 4693dd6e24..17f8da078d 100644
--- a/Windows/XinputDevice.cpp
+++ b/Windows/XinputDevice.cpp
@@ -8,8 +8,8 @@
 #include "Common/CommonWindows.h"
 #include "Common/KeyMap.h"
 #include "Common/Log.h"
-#include "input/input_state.h"
-#include "input/keycodes.h"
+#include "Common/Input/InputState.h"
+#include "Common/Input/KeyCodes.h"
 #include "XinputDevice.h"
 #include "Core/Core.h"
 #include "Core/HLE/sceCtrl.h"
diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index bb51dbe08b..00b311b8a8 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -237,6 +237,8 @@ EXEC_AND_LIB_FILES := \
   $(SRC)/Common/Thread/PrioritizedWorkQueue.cpp \
   $(SRC)/Common/Thread/ThreadPool.cpp \
   $(SRC)/Common/Thread/ThreadUtil.cpp \
+  $(SRC)/Common/Input/GestureDetector.cpp \
+  $(SRC)/Common/Input/InputState.cpp \
   $(SRC)/Common/Serialize/Serializer.cpp \
   $(SRC)/Common/ColorConv.cpp \
   $(SRC)/Common/ExceptionHandlerSetup.cpp \
diff --git a/android/jni/app-android.cpp b/android/jni/app-android.cpp
index b665eedee3..981f1ec979 100644
--- a/android/jni/app-android.cpp
+++ b/android/jni/app-android.cpp
@@ -53,8 +53,8 @@ struct JNIEnv {};
 #include "base/NativeApp.h"
 #include "Common/Thread/ThreadUtil.h"
 #include "file/zip_read.h"
-#include "input/input_state.h"
-#include "input/keycodes.h"
+#include "Common/Input/InputState.h"
+#include "Common/Input/KeyCodes.h"
 #include "profiler/profiler.h"
 #include "math/math_util.h"
 #include "net/resolve.h"
diff --git a/ext/native/Android.mk b/ext/native/Android.mk
index 59a328aa0d..7469bb066a 100644
--- a/ext/native/Android.mk
+++ b/ext/native/Android.mk
@@ -21,8 +21,6 @@ LOCAL_SRC_FILES :=\
     json/json_reader.cpp \
     json/json_writer.cpp \
     i18n/i18n.cpp \
-    input/gesture_detector.cpp \
-    input/input_state.cpp \
     math/fast/fast_math.c \
     math/fast/fast_matrix.c \
     math/dataconv.cpp \
diff --git a/ext/native/base/NativeApp.h b/ext/native/base/NativeApp.h
index d109d1138c..3242bfa019 100644
--- a/ext/native/base/NativeApp.h
+++ b/ext/native/base/NativeApp.h
@@ -10,7 +10,7 @@
 // from the framework, which exposes the native JNI api which is a bit
 // more complicated.
 
-// These are defined in input/input_state.h.
+// These are defined in Common/Input/InputState.cpp
 struct TouchInput;
 struct KeyInput;
 struct AxisInput;
diff --git a/ext/native/input/CMakeLists.txt b/ext/native/input/CMakeLists.txt
deleted file mode 100644
index 266cff4ba7..0000000000
--- a/ext/native/input/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-set(SRCS
-	input_state.cpp
-	gesture_detector.cpp)
-
-set(SRCS ${SRCS})
-
-add_library(input STATIC ${SRCS})
-target_link_libraries(input general gfx)
-target_link_libraries(input general file)
-
-if(UNIX)
-  add_definitions(-fPIC)
-endif(UNIX)
diff --git a/ext/native/native.vcxproj b/ext/native/native.vcxproj
index 5395a1ffc2..3bf1ea67e9 100644
--- a/ext/native/native.vcxproj
+++ b/ext/native/native.vcxproj
@@ -424,9 +424,6 @@
     <ClInclude Include="image\png_load.h" />
     <ClInclude Include="image\zim_load.h" />
     <ClInclude Include="image\zim_save.h" />
-    <ClInclude Include="input\gesture_detector.h" />
-    <ClInclude Include="input\input_state.h" />
-    <ClInclude Include="input\keycodes.h" />
     <ClInclude Include="json\json_writer.h" />
     <ClInclude Include="math\curves.h" />
     <ClInclude Include="math\dataconv.h" />
@@ -531,8 +528,6 @@
     <ClCompile Include="image\png_load.cpp" />
     <ClCompile Include="image\zim_load.cpp" />
     <ClCompile Include="image\zim_save.cpp" />
-    <ClCompile Include="input\gesture_detector.cpp" />
-    <ClCompile Include="input\input_state.cpp" />
     <ClCompile Include="json\json_writer.cpp" />
     <ClCompile Include="math\curves.cpp" />
     <ClCompile Include="math\expression_parser.cpp" />
diff --git a/ext/native/native.vcxproj.filters b/ext/native/native.vcxproj.filters
index f06b11c078..44381c85cb 100644
--- a/ext/native/native.vcxproj.filters
+++ b/ext/native/native.vcxproj.filters
@@ -50,9 +50,6 @@
     <ClInclude Include="profiler\profiler.h">
       <Filter>profiler</Filter>
     </ClInclude>
-    <ClInclude Include="input\input_state.h">
-      <Filter>input</Filter>
-    </ClInclude>
     <ClInclude Include="file\chunk_file.h">
       <Filter>file</Filter>
     </ClInclude>
@@ -68,9 +65,6 @@
     <ClInclude Include="math\math_util.h">
       <Filter>math</Filter>
     </ClInclude>
-    <ClInclude Include="input\gesture_detector.h">
-      <Filter>input</Filter>
-    </ClInclude>
     <ClInclude Include="base\colorutil.h">
       <Filter>base</Filter>
     </ClInclude>
@@ -182,9 +176,6 @@
     <ClInclude Include="gfx\gl_common.h">
       <Filter>gfx</Filter>
     </ClInclude>
-    <ClInclude Include="input\keycodes.h">
-      <Filter>input</Filter>
-    </ClInclude>
     <ClInclude Include="file\free.h">
       <Filter>file</Filter>
     </ClInclude>
@@ -301,9 +292,6 @@
     <ClCompile Include="gfx\texture_atlas.cpp">
       <Filter>gfx</Filter>
     </ClCompile>
-    <ClCompile Include="input\gesture_detector.cpp">
-      <Filter>input</Filter>
-    </ClCompile>
     <ClCompile Include="base\colorutil.cpp">
       <Filter>base</Filter>
     </ClCompile>
@@ -373,9 +361,6 @@
     <ClCompile Include="math\expression_parser.cpp">
       <Filter>math</Filter>
     </ClCompile>
-    <ClCompile Include="input\input_state.cpp">
-      <Filter>input</Filter>
-    </ClCompile>
     <ClCompile Include="gfx_es2\draw_text.cpp">
       <Filter>gfx</Filter>
     </ClCompile>
@@ -507,9 +492,6 @@
     <Filter Include="profiler">
       <UniqueIdentifier>{c57b41dd-cc33-46ac-b479-19676455ae54}</UniqueIdentifier>
     </Filter>
-    <Filter Include="input">
-      <UniqueIdentifier>{4ba4474c-b80f-40da-95e8-2de57eb1b327}</UniqueIdentifier>
-    </Filter>
     <Filter Include="file">
       <UniqueIdentifier>{49afd06e-eb44-41ac-b038-e109e444a834}</UniqueIdentifier>
     </Filter>
diff --git a/ext/native/ui/root.h b/ext/native/ui/root.h
index 0944373e27..052ced4f33 100644
--- a/ext/native/ui/root.h
+++ b/ext/native/ui/root.h
@@ -3,7 +3,7 @@
 #include <functional>
 
 #include "ui/ui_context.h"
-#include "input/input_state.h"
+#include "Common/Input/InputState.h"
 
 namespace UI {
 
diff --git a/ext/native/ui/screen.cpp b/ext/native/ui/screen.cpp
index 696d1986b6..86b1dc02c4 100644
--- a/ext/native/ui/screen.cpp
+++ b/ext/native/ui/screen.cpp
@@ -1,5 +1,5 @@
 #include "base/display.h"
-#include "input/input_state.h"
+#include "Common/Input/InputState.h"
 #include "ui/root.h"
 #include "ui/screen.h"
 #include "ui/ui.h"
diff --git a/ext/native/ui/screen.h b/ext/native/ui/screen.h
index f0c696a6de..e6a1ae33d1 100644
--- a/ext/native/ui/screen.h
+++ b/ext/native/ui/screen.h
@@ -17,7 +17,7 @@
 #include <mutex>
 
 #include "base/NativeApp.h"
-#include "input/input_state.h"
+#include "Common/Input/InputState.h"
 
 #include "Common/Common.h"
 
diff --git a/ext/native/ui/ui.h b/ext/native/ui/ui.h
index f3e2ff327f..3e891a9a28 100644
--- a/ext/native/ui/ui.h
+++ b/ext/native/ui/ui.h
@@ -27,7 +27,7 @@
 #include <vector>
 
 #include "gfx_es2/draw_buffer.h"
-#include "input/input_state.h"
+#include "Common/Input/InputState.h"
 
 class UIContext;
 
diff --git a/ext/native/ui/ui_screen.cpp b/ext/native/ui/ui_screen.cpp
index e46344a41a..7a692f9bc2 100644
--- a/ext/native/ui/ui_screen.cpp
+++ b/ext/native/ui/ui_screen.cpp
@@ -3,8 +3,8 @@
 #include <sstream>
 
 #include "base/display.h"
-#include "input/input_state.h"
-#include "input/keycodes.h"
+#include "Common/Input/InputState.h"
+#include "Common/Input/KeyCodes.h"
 #include "math/curves.h"
 #include "ui/ui_screen.h"
 #include "ui/ui_context.h"
diff --git a/ext/native/ui/view.cpp b/ext/native/ui/view.cpp
index ce79dfc516..7e261a5c7d 100644
--- a/ext/native/ui/view.cpp
+++ b/ext/native/ui/view.cpp
@@ -1,8 +1,8 @@
 #include <algorithm>
 #include <mutex>
 
-#include "input/input_state.h"
-#include "input/keycodes.h"
+#include "Common/Input/InputState.h"
+#include "Common/Input/KeyCodes.h"
 #include "gfx_es2/draw_buffer.h"
 #include "gfx/texture_atlas.h"
 #include "util/text/utf8.h"
diff --git a/ext/native/ui/viewgroup.cpp b/ext/native/ui/viewgroup.cpp
index ecec7a1019..2ceae3146a 100644
--- a/ext/native/ui/viewgroup.cpp
+++ b/ext/native/ui/viewgroup.cpp
@@ -3,7 +3,7 @@
 #include <set>
 #include <mutex>
 
-#include "input/keycodes.h"
+#include "Common/Input/KeyCodes.h"
 #include "math/curves.h"
 #include "ui/ui_context.h"
 #include "ui/ui_tween.h"
diff --git a/ext/native/ui/viewgroup.h b/ext/native/ui/viewgroup.h
index 0eb3f39328..d61305b2e9 100644
--- a/ext/native/ui/viewgroup.h
+++ b/ext/native/ui/viewgroup.h
@@ -6,7 +6,7 @@
 #include <mutex>
 
 #include "math/geom2d.h"
-#include "input/gesture_detector.h"
+#include "Common/Input/GestureDetector.h"
 #include "ui/view.h"
 
 namespace UI {
diff --git a/ios/PPSSPPUIApplication.mm b/ios/PPSSPPUIApplication.mm
index c410c8156d..14576fdc95 100644
--- a/ios/PPSSPPUIApplication.mm
+++ b/ios/PPSSPPUIApplication.mm
@@ -15,11 +15,11 @@
 #include "base/display.h"
 #include "Common/TimeUtil.h"
 #include "file/zip_read.h"
-#include "input/input_state.h"
+#include "Common/Input/InputState.h"
 #include "net/resolve.h"
 #include "ui/screen.h"
 #include "thin3d/thin3d.h"
-#include "input/keycodes.h"
+#include "Common/Input/KeyCodes.h"
 #include "gfx_es2/gpu_features.h"
 
 #import "ios/AppDelegate.h"
diff --git a/ios/SmartKeyboardMap.cpp b/ios/SmartKeyboardMap.cpp
index 785e8fafad..43d8e5b46e 100644
--- a/ios/SmartKeyboardMap.cpp
+++ b/ios/SmartKeyboardMap.cpp
@@ -7,7 +7,7 @@
 //
 
 #include "SmartKeyboardMap.hpp"
-#include "input/keycodes.h"
+#include "Common/Input/KeyCodes.h"
 
 int getSmartKeyboardMap(int keycode) {
     switch(keycode) {
diff --git a/ios/ViewController.mm b/ios/ViewController.mm
index fb86872c7c..769c9d53a5 100644
--- a/ios/ViewController.mm
+++ b/ios/ViewController.mm
@@ -15,13 +15,13 @@
 #include "base/display.h"
 #include "Common/TimeUtil.h"
 #include "file/zip_read.h"
-#include "input/input_state.h"
+#include "Common/Input/InputState.h"
 #include "net/resolve.h"
 #include "ui/screen.h"
 #include "thin3d/thin3d.h"
 #include "thin3d/thin3d_create.h"
 #include "thin3d/GLRenderManager.h"
-#include "input/keycodes.h"
+#include "Common/Input/KeyCodes.h"
 #include "gfx_es2/gpu_features.h"
 
 #include "Core/Config.h"
diff --git a/libretro/Makefile.common b/libretro/Makefile.common
index dfb91b445c..d561afe40e 100644
--- a/libretro/Makefile.common
+++ b/libretro/Makefile.common
@@ -148,6 +148,8 @@ SOURCES_CXX += \
 	$(COMMONDIR)/Thread/ThreadUtil.cpp \
 	$(COMMONDIR)/Thread/ThreadPool.cpp \
 	$(COMMONDIR)/Thread/PrioritizedWorkQueue.cpp \
+	$(COMMONDIR)/Input/GestureDetector.cpp \
+	$(COMMONDIR)/Input/InputState.cpp \
 	$(COMMONDIR)/Buffer.cpp \
 	$(COMMONDIR)/ConsoleListener.cpp \
 	$(COMMONDIR)/ExceptionHandlerSetup.cpp \
@@ -299,8 +301,6 @@ SOURCES_CXX += $(NATIVEDIR)/math/dataconv.cpp \
 	       $(NATIVEDIR)/i18n/i18n.cpp \
 	       $(NATIVEDIR)/image/zim_load.cpp \
 	       $(NATIVEDIR)/image/png_load.cpp \
-	       $(NATIVEDIR)/input/gesture_detector.cpp \
-	       $(NATIVEDIR)/input/input_state.cpp \
 	       $(NATIVEDIR)/math/curves.cpp \
 	       $(NATIVEDIR)/math/expression_parser.cpp \
 	       $(NATIVEDIR)/math/lin/matrix4x4.cpp \
diff --git a/libretro/libretro.cpp b/libretro/libretro.cpp
index 6f5ba59245..4e71ad7000 100644
--- a/libretro/libretro.cpp
+++ b/libretro/libretro.cpp
@@ -27,7 +27,7 @@
 #include "GPU/GPUInterface.h"
 #include "GPU/Common/FramebufferManagerCommon.h"
 #include "GPU/Common/TextureScalerCommon.h"
-#include "input/input_state.h"
+#include "Common/Input/InputState.h"
 #include "base/NativeApp.h"
 #include "Common/Thread/ThreadUtil.h"
 
diff --git a/unittest/UnitTest.cpp b/unittest/UnitTest.cpp
index 57225020da..74ce2a2dc1 100644
--- a/unittest/UnitTest.cpp
+++ b/unittest/UnitTest.cpp
@@ -35,7 +35,7 @@
 
 #include "ppsspp_config.h"
 #include "base/NativeApp.h"
-#include "input/input_state.h"
+#include "Common/Input/InputState.h"
 #include "ext/disarm.h"
 #include "math/math_util.h"
 #include "util/text/parsers.h"