diff --git a/Source/Core/InputCommon/CMakeLists.txt b/Source/Core/InputCommon/CMakeLists.txt
index a3df1a2d22..df8fa6423c 100644
--- a/Source/Core/InputCommon/CMakeLists.txt
+++ b/Source/Core/InputCommon/CMakeLists.txt
@@ -1,27 +1,50 @@
 add_library(inputcommon
   InputConfig.cpp
+  InputConfig.h
   InputProfile.cpp
+  InputProfile.h
   ControllerEmu/ControllerEmu.cpp
+  ControllerEmu/ControllerEmu.h
   ControllerEmu/StickGate.cpp
+  ControllerEmu/StickGate.h
   ControllerEmu/Control/Control.cpp
+  ControllerEmu/Control/Control.h
   ControllerEmu/Control/Input.cpp
+  ControllerEmu/Control/Input.h
   ControllerEmu/Control/Output.cpp
+  ControllerEmu/Control/Output.h
   ControllerEmu/ControlGroup/AnalogStick.cpp
+  ControllerEmu/ControlGroup/AnalogStick.h
   ControllerEmu/ControlGroup/Attachments.cpp
+  ControllerEmu/ControlGroup/Attachments.h
   ControllerEmu/ControlGroup/Buttons.cpp
+  ControllerEmu/ControlGroup/Buttons.h
   ControllerEmu/ControlGroup/ControlGroup.cpp
+  ControllerEmu/ControlGroup/ControlGroup.h
   ControllerEmu/ControlGroup/Cursor.cpp
+  ControllerEmu/ControlGroup/Cursor.h
   ControllerEmu/ControlGroup/Force.cpp
+  ControllerEmu/ControlGroup/Force.h
   ControllerEmu/ControlGroup/MixedTriggers.cpp
+  ControllerEmu/ControlGroup/MixedTriggers.h
   ControllerEmu/ControlGroup/ModifySettingsButton.cpp
+  ControllerEmu/ControlGroup/ModifySettingsButton.h
   ControllerEmu/ControlGroup/Slider.cpp
+  ControllerEmu/ControlGroup/Slider.h
   ControllerEmu/ControlGroup/Tilt.cpp
+  ControllerEmu/ControlGroup/Tilt.h
   ControllerEmu/ControlGroup/Triggers.cpp
+  ControllerEmu/ControlGroup/Triggers.h
   ControllerEmu/Setting/NumericSetting.cpp
+  ControllerEmu/Setting/NumericSetting.h
   ControllerInterface/ControllerInterface.cpp
+  ControllerInterface/ControllerInterface.h
   ControllerInterface/Device.cpp
+  ControllerInterface/Device.h
   ControlReference/ControlReference.cpp
+  ControlReference/ControlReference.h
   ControlReference/ExpressionParser.cpp
+  ControlReference/ExpressionParser.h
 )
 
 target_link_libraries(inputcommon PUBLIC
@@ -31,20 +54,35 @@ target_link_libraries(inputcommon PUBLIC
 if(WIN32)
   target_sources(inputcommon PRIVATE
     ControllerInterface/DInput/DInput.cpp
+    ControllerInterface/DInput/DInput.h
+    ControllerInterface/DInput/DInput8.h
     ControllerInterface/DInput/DInputJoystick.cpp
+    ControllerInterface/DInput/DInputJoystick.h
     ControllerInterface/DInput/DInputKeyboardMouse.cpp
+    ControllerInterface/DInput/DInputKeyboardMouse.h
+    ControllerInterface/DInput/NamedKeys.h
     ControllerInterface/DInput/XInputFilter.cpp
+    ControllerInterface/DInput/XInputFilter.h
     ControllerInterface/Win32/Win32.cpp
+    ControllerInterface/Win32/Win32.h
     ControllerInterface/XInput/XInput.cpp
+    ControllerInterface/XInput/XInput.h
     ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp
+    ControllerInterface/ForceFeedback/ForceFeedbackDevice.h
   )
 elseif(APPLE)
   target_sources(inputcommon PRIVATE
+    ControllerInterface/OSX/OSX.h
     ControllerInterface/OSX/OSX.mm
+    ControllerInterface/OSX/OSXJoystick.h
     ControllerInterface/OSX/OSXJoystick.mm
+    ControllerInterface/OSX/RunLoopStopper.h
+    ControllerInterface/Quartz/Quartz.h
     ControllerInterface/Quartz/Quartz.mm
+    ControllerInterface/Quartz/QuartzKeyboardAndMouse.h
     ControllerInterface/Quartz/QuartzKeyboardAndMouse.mm
     ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp
+    ControllerInterface/ForceFeedback/ForceFeedbackDevice.h
   )
   target_link_libraries(inputcommon PRIVATE
     ${COREFOUNDATION_LIBRARY}
@@ -56,6 +94,7 @@ elseif(APPLE)
 elseif(X11_FOUND)
   target_sources(inputcommon PRIVATE
     ControllerInterface/Xlib/XInput2.cpp
+    ControllerInterface/Xlib/XInput2.h
   )
   target_link_libraries(inputcommon PUBLIC
     ${X11_LIBRARIES}
@@ -65,13 +104,17 @@ elseif(ANDROID)
   target_compile_definitions(inputcommon PRIVATE -DCIFACE_USE_ANDROID)
   target_sources(inputcommon PRIVATE
     ControllerInterface/Android/Android.cpp
+    ControllerInterface/Android/Android.h
   )
 endif()
 
 if(ANDROID)
   target_sources(inputcommon PRIVATE GCAdapter_Android.cpp)
 else()
-  target_sources(inputcommon PRIVATE GCAdapter.cpp)
+  target_sources(inputcommon PRIVATE
+    GCAdapter.cpp
+    GCAdapter.h
+  )
   target_link_libraries(inputcommon PUBLIC ${LIBUSB_LIBRARIES})
 endif()
 
@@ -79,6 +122,7 @@ if(LIBEVDEV_FOUND AND LIBUDEV_FOUND)
   target_sources(inputcommon
   PRIVATE
     ControllerInterface/evdev/evdev.cpp
+    ControllerInterface/evdev/evdev.h
   )
   target_include_directories(inputcommon
   PRIVATE
@@ -95,6 +139,7 @@ endif()
 if(UNIX)
   target_sources(inputcommon PRIVATE
     ControllerInterface/Pipes/Pipes.cpp
+    ControllerInterface/Pipes/Pipes.h
   )
 endif()
 
@@ -115,7 +160,10 @@ if(ENABLE_SDL)
     endif()
   endif()
   if(SDL_TARGET AND TARGET ${SDL_TARGET})
-    target_sources(inputcommon PRIVATE ControllerInterface/SDL/SDL.cpp)
+    target_sources(inputcommon PRIVATE
+      ControllerInterface/SDL/SDL.cpp
+      ControllerInterface/SDL/SDL.h
+    )
     target_link_libraries(inputcommon PRIVATE ${SDL_TARGET})
     target_compile_definitions(inputcommon PRIVATE "CIFACE_USE_SDL=1")
   else()