diff --git a/Source/Core/Core/CMakeLists.txt b/Source/Core/Core/CMakeLists.txt
diff --git a/Source/Core/DiscIO/CMakeLists.txt b/Source/Core/DiscIO/CMakeLists.txt
@@ -1,26 +1,48 @@
 add_library(discio
   Blob.cpp
+  Blob.h
   CISOBlob.cpp
-  WbfsBlob.cpp
+  CISOBlob.h
   CompressedBlob.cpp
+  CompressedBlob.h
   DirectoryBlob.cpp
+  DirectoryBlob.h
   DiscExtractor.cpp
+  DiscExtractor.h
   DiscScrubber.cpp
+  DiscScrubber.h
   DriveBlob.cpp
+  DriveBlob.h
   Enums.cpp
+  Enums.h
   FileBlob.cpp
+  FileBlob.h
   FileSystemGCWii.cpp
+  FileSystemGCWii.h
   Filesystem.cpp
+  Filesystem.h
   NANDImporter.cpp
+  NANDImporter.h
   TGCBlob.cpp
+  TGCBlob.h
   Volume.cpp
+  Volume.h
   VolumeFileBlobReader.cpp
+  VolumeFileBlobReader.h
   VolumeGC.cpp
+  VolumeGC.h
   VolumeVerifier.cpp
+  VolumeVerifier.h
   VolumeWad.cpp
+  VolumeWad.h
   VolumeWii.cpp
+  VolumeWii.h
+  WbfsBlob.cpp
+  WbfsBlob.h
   WiiSaveBanner.cpp
+  WiiSaveBanner.h
   WiiWad.cpp
+  WiiWad.h
 )
 
 target_link_libraries(discio

diff --git a/Source/Core/DolphinNoGUI/CMakeLists.txt b/Source/Core/DolphinNoGUI/CMakeLists.txt
@@ -1,5 +1,6 @@
 add_executable(dolphin-nogui
   Platform.cpp
+  Platform.h
   PlatformHeadless.cpp
   MainNoGUI.cpp
 )

diff --git a/Source/Core/DolphinQt/CMakeLists.txt b/Source/Core/DolphinQt/CMakeLists.txt
@@ -11,130 +11,250 @@ set(CMAKE_AUTOMOC ON)
 
 add_executable(dolphin-emu
   AboutDialog.cpp
+  AboutDialog.h
   CheatsManager.cpp
+  CheatsManager.h
   DiscordHandler.cpp
+  DiscordHandler.h
   DiscordJoinRequestDialog.cpp
+  DiscordJoinRequestDialog.h
   FIFO/FIFOPlayerWindow.cpp
+  FIFO/FIFOPlayerWindow.h
   FIFO/FIFOAnalyzer.cpp
-  HotkeyScheduler.cpp
+  FIFO/FIFOAnalyzer.h
   Host.cpp
+  Host.h
+  HotkeyScheduler.cpp
+  HotkeyScheduler.h
   Main.cpp
   MainWindow.cpp
+  MainWindow.h
   MenuBar.cpp
+  MenuBar.h
   RenderWidget.cpp
+  RenderWidget.h
   Resources.cpp
+  Resources.h
   SearchBar.cpp
+  SearchBar.h
   Settings.cpp
+  Settings.h
   ToolBar.cpp
+  ToolBar.h
   Translation.cpp
+  Translation.h
   WiiUpdate.cpp
   WiiUpdate.h
-  Config/CheatCodeEditor.cpp
   Config/ARCodeWidget.cpp
+  Config/ARCodeWidget.h
+  Config/CheatCodeEditor.cpp
+  Config/CheatCodeEditor.h
   Config/CheatWarningWidget.cpp
+  Config/CheatWarningWidget.h
   Config/ControllersWindow.cpp
+  Config/ControllersWindow.h
   Config/FilesystemWidget.cpp
+  Config/FilesystemWidget.h
   Config/GameConfigEdit.cpp
+  Config/GameConfigEdit.h
   Config/GameConfigHighlighter.cpp
+  Config/GameConfigHighlighter.h
   Config/GameConfigWidget.cpp
+  Config/GameConfigWidget.h
   Config/GeckoCodeWidget.cpp
+  Config/GeckoCodeWidget.h
   Config/Graphics/AdvancedWidget.cpp
+  Config/Graphics/AdvancedWidget.h
   Config/Graphics/EnhancementsWidget.cpp
+  Config/Graphics/EnhancementsWidget.h
   Config/Graphics/GeneralWidget.cpp
-  Config/Graphics/HacksWidget.cpp
+  Config/Graphics/GeneralWidget.h
   Config/Graphics/GraphicsBool.cpp
+  Config/Graphics/GraphicsBool.h
   Config/Graphics/GraphicsChoice.cpp
+  Config/Graphics/GraphicsChoice.h
   Config/Graphics/GraphicsRadio.cpp
+  Config/Graphics/GraphicsRadio.h
   Config/Graphics/GraphicsSlider.cpp
+  Config/Graphics/GraphicsSlider.h
   Config/Graphics/GraphicsWidget.cpp
+  Config/Graphics/GraphicsWidget.h
   Config/Graphics/GraphicsWindow.cpp
+  Config/Graphics/GraphicsWindow.h
+  Config/Graphics/HacksWidget.cpp
+  Config/Graphics/HacksWidget.h
   Config/Graphics/PostProcessingConfigWindow.cpp
+  Config/Graphics/PostProcessingConfigWindow.h
   Config/Graphics/SoftwareRendererWidget.cpp
+  Config/Graphics/SoftwareRendererWidget.h
   Config/InfoWidget.cpp
+  Config/InfoWidget.h
   Config/LogConfigWidget.cpp
+  Config/LogConfigWidget.h
   Config/LogWidget.cpp
+  Config/LogWidget.h
   Config/Mapping/GCKeyboardEmu.cpp
+  Config/Mapping/GCKeyboardEmu.h
   Config/Mapping/GCMicrophone.cpp
+  Config/Mapping/GCMicrophone.h
   Config/Mapping/GCPadEmu.cpp
+  Config/Mapping/GCPadEmu.h
   Config/Mapping/GCPadWiiUConfigDialog.cpp
+  Config/Mapping/GCPadWiiUConfigDialog.h
   Config/Mapping/Hotkey3D.cpp
+  Config/Mapping/Hotkey3D.h
   Config/Mapping/HotkeyControllerProfile.cpp
+  Config/Mapping/HotkeyControllerProfile.h
   Config/Mapping/HotkeyDebugging.cpp
+  Config/Mapping/HotkeyDebugging.h
   Config/Mapping/HotkeyGeneral.cpp
+  Config/Mapping/HotkeyGeneral.h
   Config/Mapping/HotkeyGraphics.cpp
+  Config/Mapping/HotkeyGraphics.h
   Config/Mapping/HotkeyStates.cpp
+  Config/Mapping/HotkeyStates.h
   Config/Mapping/HotkeyStatesOther.cpp
+  Config/Mapping/HotkeyStatesOther.h
   Config/Mapping/HotkeyTAS.cpp
+  Config/Mapping/HotkeyTAS.h
   Config/Mapping/HotkeyWii.cpp
+  Config/Mapping/HotkeyWii.h
   Config/Mapping/IOWindow.cpp
   Config/Mapping/MappingButton.cpp
+  Config/Mapping/MappingButton.h
   Config/Mapping/MappingCommon.cpp
+  Config/Mapping/MappingCommon.h
   Config/Mapping/MappingIndicator.cpp
+  Config/Mapping/MappingIndicator.h
   Config/Mapping/MappingNumeric.cpp
+  Config/Mapping/MappingNumeric.h
   Config/Mapping/MappingWidget.cpp
+  Config/Mapping/MappingWidget.h
   Config/Mapping/MappingWindow.cpp
+  Config/Mapping/MappingWindow.h
   Config/Mapping/WiimoteEmuExtension.cpp
+  Config/Mapping/WiimoteEmuExtension.h
   Config/Mapping/WiimoteEmuGeneral.cpp
+  Config/Mapping/WiimoteEmuGeneral.h
   Config/Mapping/WiimoteEmuMotionControl.cpp
+  Config/Mapping/WiimoteEmuMotionControl.h
   Config/NewPatchDialog.cpp
+  Config/NewPatchDialog.h
   Config/PatchesWidget.cpp
+  Config/PatchesWidget.h
   Config/PropertiesDialog.cpp
+  Config/PropertiesDialog.h
   Config/SettingsWindow.cpp
+  Config/SettingsWindow.h
   Config/VerifyWidget.cpp
+  Config/VerifyWidget.h
   Debugger/BreakpointWidget.cpp
+  Debugger/BreakpointWidget.h
   Debugger/CodeViewWidget.cpp
+  Debugger/CodeViewWidget.h
   Debugger/CodeWidget.cpp
+  Debugger/CodeWidget.h
   Debugger/JITWidget.cpp
+  Debugger/JITWidget.h
   Debugger/MemoryViewWidget.cpp
+  Debugger/MemoryViewWidget.h
   Debugger/MemoryWidget.cpp
+  Debugger/MemoryWidget.h
   Debugger/NewBreakpointDialog.cpp
+  Debugger/NewBreakpointDialog.h
   Debugger/PatchInstructionDialog.cpp
+  Debugger/PatchInstructionDialog.h
   Debugger/RegisterColumn.cpp
+  Debugger/RegisterColumn.h
   Debugger/RegisterWidget.cpp
+  Debugger/RegisterWidget.h
   Debugger/WatchWidget.cpp
+  Debugger/WatchWidget.h
   GameList/GameList.cpp
+  GameList/GameList.h
   GameList/GameListModel.cpp
+  GameList/GameListModel.h
   GameList/GameTracker.cpp
+  GameList/GameTracker.h
   GameList/GridProxyModel.cpp
+  GameList/GridProxyModel.h
   GameList/ListProxyModel.cpp
+  GameList/ListProxyModel.h
   GCMemcardManager.cpp
+  GCMemcardManager.h
   QtUtils/BlockUserInputFilter.cpp
+  QtUtils/BlockUserInputFilter.h
   NetPlay/ChunkedProgressDialog.cpp
+  NetPlay/ChunkedProgressDialog.h
   NetPlay/GameListDialog.cpp
+  NetPlay/GameListDialog.h
   NetPlay/MD5Dialog.cpp
+  NetPlay/MD5Dialog.h
   NetPlay/NetPlayBrowser.cpp
+  NetPlay/NetPlayBrowser.h
   NetPlay/NetPlayDialog.cpp
+  NetPlay/NetPlayDialog.h
   NetPlay/NetPlaySetupDialog.cpp
+  NetPlay/NetPlaySetupDialog.h
   NetPlay/PadMappingDialog.cpp
+  NetPlay/PadMappingDialog.h
   QtUtils/DoubleClickEventFilter.cpp
+  QtUtils/DoubleClickEventFilter.h
   QtUtils/ElidedButton.cpp
+  QtUtils/ElidedButton.h
   QtUtils/FlowLayout.cpp
+  QtUtils/FlowLayout.h
   QtUtils/ModalMessageBox.cpp
+  QtUtils/ModalMessageBox.h
   QtUtils/ImageConverter.cpp
+  QtUtils/ImageConverter.h
   QtUtils/WindowActivationEventFilter.cpp
+  QtUtils/WindowActivationEventFilter.h
   QtUtils/WinIconHelper.cpp
+  QtUtils/WinIconHelper.h
   QtUtils/WrapInScrollArea.cpp
+  QtUtils/WrapInScrollArea.h
   QtUtils/AspectRatioWidget.cpp
+  QtUtils/AspectRatioWidget.h
   ResourcePackManager.cpp
+  ResourcePackManager.h
   Settings/AdvancedPane.cpp
+  Settings/AdvancedPane.h
   Settings/AudioPane.cpp
+  Settings/AudioPane.h
   Settings/GameCubePane.cpp
+  Settings/GameCubePane.h
   Settings/GeneralPane.cpp
+  Settings/GeneralPane.h
   Settings/InterfacePane.cpp
+  Settings/InterfacePane.h
   Settings/PathPane.cpp
+  Settings/PathPane.h
   Settings/WiiPane.cpp
+  Settings/WiiPane.h
   Settings/USBDeviceAddToWhitelistDialog.cpp
+  Settings/USBDeviceAddToWhitelistDialog.h
   TAS/GCTASInputWindow.cpp
+  TAS/GCTASInputWindow.h
   TAS/WiiTASInputWindow.cpp
+  TAS/WiiTASInputWindow.h
   TAS/TASCheckBox.cpp
+  TAS/TASCheckBox.h
   TAS/TASInputWindow.cpp
+  TAS/TASInputWindow.h
   TAS/StickWidget.cpp
+  TAS/StickWidget.h
   TAS/IRWidget.cpp
+  TAS/IRWidget.h
   Updater.cpp
+  Updater.h
 )
 
 if (NOT WIN32)
-  target_sources(dolphin-emu PRIVATE QtUtils/SignalDaemon.cpp)
+  target_sources(dolphin-emu PRIVATE
+    QtUtils/SignalDaemon.cpp
+    QtUtils/SignalDaemon.h
+  )
 endif()
 
 target_compile_definitions(dolphin-emu

diff --git 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,20 +104,25 @@ 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()
 
 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()

diff --git a/Source/Core/UICommon/CMakeLists.txt b/Source/Core/UICommon/CMakeLists.txt
@@ -1,17 +1,30 @@
 add_library(uicommon
   AutoUpdate.cpp
+  AutoUpdate.h
   CommandLineParse.cpp
+  CommandLineParse.h
   Disassembler.cpp
+  Disassembler.h
   DiscordPresence.cpp
+  DiscordPresence.h
   GameFile.cpp
+  GameFile.h
   GameFileCache.cpp
+  GameFileCache.h
   NetPlayIndex.cpp
+  NetPlayIndex.h
   ResourcePack/Manager.cpp
+  ResourcePack/Manager.h
   ResourcePack/Manifest.cpp
+  ResourcePack/Manifest.h
   ResourcePack/ResourcePack.cpp
+  ResourcePack/ResourcePack.h
   UICommon.cpp
+  UICommon.h
   USBUtils.cpp
+  USBUtils.h
   VideoUtils.cpp
+  VideoUtils.h
 )
 
 target_link_libraries(uicommon

diff --git a/Source/Core/UpdaterCommon/CMakeLists.txt b/Source/Core/UpdaterCommon/CMakeLists.txt
@@ -1,9 +1,13 @@
 add_library(updatercommon
-  UpdaterCommon.cpp)
-
+  UI.h
+  UpdaterCommon.cpp
+  UpdaterCommon.h
+)
+
 target_link_libraries(updatercommon PRIVATE
   uicommon
   mbedtls
   z
   ed25519
-  cpp-optparse)
+  cpp-optparse
+)
diff --git a/Source/Core/VideoBackends/Null/CMakeLists.txt b/Source/Core/VideoBackends/Null/CMakeLists.txt
@@ -1,8 +1,14 @@
 add_library(videonull
   NullBackend.cpp
   NullTexture.cpp
+  NullTexture.h
+  PerfQuery.h
   Render.cpp
+  Render.h
+  TextureCache.h
   VertexManager.cpp
+  VertexManager.h
+  VideoBackend.h
 )
 
 target_link_libraries(videonull

diff --git a/Source/Core/VideoBackends/OGL/CMakeLists.txt b/Source/Core/VideoBackends/OGL/CMakeLists.txt
@@ -1,16 +1,28 @@
 add_library(videoogl
   BoundingBox.cpp
+  BoundingBox.h
+  GPUTimer.h
   main.cpp
   NativeVertexFormat.cpp
   OGLPipeline.cpp
+  OGLPipeline.h
   OGLShader.cpp
+  OGLShader.h
   OGLTexture.cpp
+  OGLTexture.h
   PerfQuery.cpp
+  PerfQuery.h
   ProgramShaderCache.cpp
+  ProgramShaderCache.h
   Render.cpp
+  Render.h
   SamplerCache.cpp
+  SamplerCache.h
   StreamBuffer.cpp
+  StreamBuffer.h
   VertexManager.cpp
+  VertexManager.h
+  VideoBackend.h
 )
 
 target_link_libraries(videoogl

diff --git a/Source/Core/VideoBackends/Software/CMakeLists.txt b/Source/Core/VideoBackends/Software/CMakeLists.txt
@@ -1,19 +1,37 @@
 add_library(videosoftware
   Clipper.cpp
+  Clipper.h
+  CopyRegion.h
   DebugUtil.cpp
+  DebugUtil.h
   EfbCopy.cpp
+  EfbCopy.h
   EfbInterface.cpp
+  EfbInterface.h
+  NativeVertexFormat.h
   Rasterizer.cpp
+  Rasterizer.h
+  SetupUnit.cpp
+  SetupUnit.h
+  SWmain.cpp
   SWOGLWindow.cpp
+  SWOGLWindow.h
   SWRenderer.cpp
+  SWRenderer.h
   SWTexture.cpp
+  SWTexture.h
   SWVertexLoader.cpp
-  SWmain.cpp
-  SetupUnit.cpp
+  SWVertexLoader.h
   Tev.cpp
+  Tev.h
   TextureEncoder.cpp
+  TextureEncoder.h
   TextureSampler.cpp
+  TextureSampler.h
   TransformUnit.cpp
+  TransformUnit.h
+  Vec3.h
+  VideoBackend.h
 )
 
 target_link_libraries(videosoftware

diff --git a/Source/Core/VideoBackends/Vulkan/CMakeLists.txt b/Source/Core/VideoBackends/Vulkan/CMakeLists.txt
@@ -1,22 +1,40 @@
 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
   VKPipeline.cpp
+  VKPipeline.h
   VKShader.cpp
+  VKShader.h
   VKTexture.cpp
+  VKTexture.h
   VulkanContext.cpp
+  VulkanContext.h
   VulkanLoader.cpp
-  main.cpp
+  VulkanLoader.h
 )
 
 target_link_libraries(videovulkan

diff --git a/Source/Core/VideoCommon/CMakeLists.txt b/Source/Core/VideoCommon/CMakeLists.txt
@@ -1,64 +1,131 @@
 add_library(videocommon
   AbstractFramebuffer.cpp
+  AbstractFramebuffer.h
+  AbstractShader.h
   AbstractStagingTexture.cpp
+  AbstractStagingTexture.h
   AbstractTexture.cpp
+  AbstractTexture.h
   AsyncRequests.cpp
+  AsyncRequests.h
   AsyncShaderCompiler.cpp
+  AsyncShaderCompiler.h
   BoundingBox.cpp
+  BoundingBox.h
   BPFunctions.cpp
+  BPFunctions.h
   BPMemory.cpp
+  BPMemory.h
   BPStructs.cpp
-  CPMemory.cpp
+  BPStructs.h
   CommandProcessor.cpp
+  CommandProcessor.h
+  ConstantManager.h
+  CPMemory.cpp
+  CPMemory.h
   DriverDetails.cpp
+  DriverDetails.h
   Fifo.cpp
+  Fifo.h
   FPSCounter.cpp
+  FPSCounter.h
   FramebufferManager.cpp
+  FramebufferManager.h
   FramebufferShaderGen.cpp
+  FramebufferShaderGen.h
   GeometryShaderGen.cpp
+  GeometryShaderGen.h
   GeometryShaderManager.cpp
+  GeometryShaderManager.h
   HiresTextures.cpp
+  HiresTextures.h
   HiresTextures_DDSLoader.cpp
   ImageWrite.cpp
+  ImageWrite.h
   IndexGenerator.cpp
+  IndexGenerator.h
   LightingShaderGen.cpp
+  LightingShaderGen.h
+  LookUpTables.h
+  NativeVertexFormat.h
   NetPlayChatUI.cpp
+  NetPlayChatUI.h
   NetPlayGolfUI.cpp
+  NetPlayGolfUI.h
   OnScreenDisplay.cpp
+  OnScreenDisplay.h
   OpcodeDecoding.cpp
+  OpcodeDecoding.h
   PerfQueryBase.cpp
+  PerfQueryBase.h
   PixelEngine.cpp
+  PixelEngine.h
   PixelShaderGen.cpp
+  PixelShaderGen.h
   PixelShaderManager.cpp
+  PixelShaderManager.h
   PostProcessing.cpp
+  PostProcessing.h
   RenderBase.cpp
+  RenderBase.h
   RenderState.cpp
+  RenderState.h
+  SamplerCommon.h
   ShaderCache.cpp
+  ShaderCache.h
   ShaderGenCommon.cpp
+  ShaderGenCommon.h
   Statistics.cpp
-  UberShaderCommon.cpp
-  UberShaderPixel.cpp
-  UberShaderVertex.cpp
+  Statistics.h
   TextureCacheBase.cpp
+  TextureCacheBase.h
   TextureConfig.cpp
+  TextureConfig.h
   TextureConversionShader.cpp
+  TextureConversionShader.h
   TextureConverterShaderGen.cpp
+  TextureConverterShaderGen.h
+  TextureDecoder.h
   TextureDecoder_Common.cpp
+  TextureDecoder_Util.h
+  UberShaderCommon.cpp
+  UberShaderCommon.h
+  UberShaderPixel.cpp
+  UberShaderPixel.h
+  UberShaderVertex.cpp
+  UberShaderVertex.h
   VertexLoader.cpp
+  VertexLoader.h
   VertexLoaderBase.cpp
+  VertexLoaderBase.h
   VertexLoaderManager.cpp
+  VertexLoaderManager.h
+  VertexLoaderUtils.h
   VertexLoader_Color.cpp
+  VertexLoader_Color.h
   VertexLoader_Normal.cpp
+  VertexLoader_Normal.h
   VertexLoader_Position.cpp
+  VertexLoader_Position.h
   VertexLoader_TextCoord.cpp
+  VertexLoader_TextCoord.h
   VertexManagerBase.cpp
+  VertexManagerBase.h
   VertexShaderGen.cpp
+  VertexShaderGen.h
   VertexShaderManager.cpp
+  VertexShaderManager.h
   VideoBackendBase.cpp
+  VideoBackendBase.h
+  VideoCommon.h
   VideoConfig.cpp
+  VideoConfig.h
   VideoState.cpp
+  VideoState.h
   XFMemory.cpp
+  XFMemory.h
   XFStructs.cpp
+  XFStructs.h
 )
 
 target_link_libraries(videocommon
@@ -74,10 +141,12 @@ if(_M_X86)
   target_sources(videocommon PRIVATE
     TextureDecoder_x64.cpp
     VertexLoaderX64.cpp
+    VertexLoaderX64.h
   )
 elseif(_M_ARM_64)
   target_sources(videocommon PRIVATE
     VertexLoaderARM64.cpp
+    VertexLoaderARM64.h
     TextureDecoder_Generic.cpp
   )
 else()
@@ -87,7 +156,10 @@ else()
 endif()
 
 if(FFmpeg_FOUND)
-  target_sources(videocommon PRIVATE AVIDump.cpp)
+  target_sources(videocommon PRIVATE
+    AVIDump.cpp
+    AVIDump.h
+  )
   target_link_libraries(videocommon PRIVATE
     FFmpeg::avcodec
     FFmpeg::avformat