diff --git a/Source/Core/Core/Src/SConscript b/Source/Core/Core/Src/SConscript
index a926baaa45..45a289b431 100644
--- a/Source/Core/Core/Src/SConscript
+++ b/Source/Core/Core/Src/SConscript
@@ -16,7 +16,6 @@ files = ["Console.cpp",
          "State.cpp",
          "Tracer.cpp",
          "PluginManager.cpp",
-         "InputManager.cpp",
          "VolumeHandler.cpp",
          "Boot/Boot.cpp",
          "Boot/Boot_BIOSEmu.cpp",
diff --git a/Source/Core/Core/Src/InputManager.cpp b/Source/Core/InputCommon/Src/InputManager.cpp
similarity index 100%
rename from Source/Core/Core/Src/InputManager.cpp
rename to Source/Core/InputCommon/Src/InputManager.cpp
diff --git a/Source/Core/Core/Src/InputManager.h b/Source/Core/InputCommon/Src/InputManager.h
similarity index 100%
rename from Source/Core/Core/Src/InputManager.h
rename to Source/Core/InputCommon/Src/InputManager.h
diff --git a/Source/Core/InputCommon/Src/SConscript b/Source/Core/InputCommon/Src/SConscript
index e5fe35e802..e5eeff99b5 100644
--- a/Source/Core/InputCommon/Src/SConscript
+++ b/Source/Core/InputCommon/Src/SConscript
@@ -5,6 +5,7 @@ Import('env')
 files = [
 	'EventHandler.cpp',
 	'InputCommon.cpp',
+        "InputManager.cpp",
 	]
 
 env_inputcommon = env.Clone()