diff --git a/rpcs3/CMakeLists.txt b/rpcs3/CMakeLists.txt
index da57710b9f..010b200c49 100644
--- a/rpcs3/CMakeLists.txt
+++ b/rpcs3/CMakeLists.txt
@@ -52,39 +52,7 @@ gen_git_version(${CMAKE_CURRENT_SOURCE_DIR})
 
 if (NOT ANDROID)
     # Build rpcs3_lib
-    add_library(rpcs3_lib STATIC
-        display_sleep_control.cpp
-        headless_application.cpp
-        main_application.cpp
-        module_verifier.cpp
-        rpcs3.cpp
-        rpcs3_version.cpp
-        stb_image.cpp
-        stdafx.cpp
-
-        Input/basic_keyboard_handler.cpp
-        Input/basic_mouse_handler.cpp
-        Input/ds3_pad_handler.cpp
-        Input/ds4_pad_handler.cpp
-        Input/dualsense_pad_handler.cpp
-        Input/evdev_joystick_handler.cpp
-        Input/evdev_gun_handler.cpp
-        Input/gui_pad_thread.cpp
-        Input/hid_pad_handler.cpp
-        Input/keyboard_pad_handler.cpp
-        Input/mm_joystick_handler.cpp
-        Input/pad_thread.cpp
-        Input/product_info.cpp
-        Input/ps_move_calibration.cpp
-        Input/ps_move_config.cpp
-        Input/ps_move_handler.cpp
-        Input/ps_move_tracker.cpp
-        Input/raw_mouse_config.cpp
-        Input/raw_mouse_handler.cpp
-        Input/sdl_pad_handler.cpp
-        Input/skateboard_pad_handler.cpp
-        Input/xinput_pad_handler.cpp
-    )
+    add_library(rpcs3_lib STATIC)
 
     if(WIN32)
         target_compile_definitions(rpcs3_lib PRIVATE UNICODE _UNICODE)
diff --git a/rpcs3/rpcs3.vcxproj b/rpcs3/rpcs3.vcxproj
index 6540926d9c..771d60ba2a 100644
--- a/rpcs3/rpcs3.vcxproj
+++ b/rpcs3/rpcs3.vcxproj
@@ -2166,6 +2166,10 @@
     <None Include="..\Utilities\git-version-gen.cmd" />
     <None Include="update_helper.sh" />
   </ItemGroup>
+  <ItemGroup>
+    <Text Include="CMakeLists.txt" />
+    <Text Include="rpcs3qt\CMakeLists.txt" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />
   <ProjectExtensions>
diff --git a/rpcs3/rpcs3.vcxproj.filters b/rpcs3/rpcs3.vcxproj.filters
index 6d368a1a1f..cc7e9486f4 100644
--- a/rpcs3/rpcs3.vcxproj.filters
+++ b/rpcs3/rpcs3.vcxproj.filters
@@ -1900,4 +1900,12 @@
       <Filter>CI</Filter>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <Text Include="rpcs3qt\CMakeLists.txt">
+      <Filter>buildfiles\cmake</Filter>
+    </Text>
+    <Text Include="CMakeLists.txt">
+      <Filter>buildfiles\cmake</Filter>
+    </Text>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/rpcs3/rpcs3qt/CMakeLists.txt b/rpcs3/rpcs3qt/CMakeLists.txt
index 68fa4b9e76..25b48e5f28 100644
--- a/rpcs3/rpcs3qt/CMakeLists.txt
+++ b/rpcs3/rpcs3qt/CMakeLists.txt
@@ -131,6 +131,38 @@ add_library(rpcs3_ui STATIC
     shortcut_dialog.ui
     welcome_dialog.ui
 
+    ../display_sleep_control.cpp
+    ../headless_application.cpp
+    ../main_application.cpp
+    ../module_verifier.cpp
+    ../rpcs3.cpp
+    ../rpcs3_version.cpp
+    ../stb_image.cpp
+    ../stdafx.cpp
+
+    ../Input/basic_keyboard_handler.cpp
+    ../Input/basic_mouse_handler.cpp
+    ../Input/ds3_pad_handler.cpp
+    ../Input/ds4_pad_handler.cpp
+    ../Input/dualsense_pad_handler.cpp
+    ../Input/evdev_joystick_handler.cpp
+    ../Input/evdev_gun_handler.cpp
+    ../Input/gui_pad_thread.cpp
+    ../Input/hid_pad_handler.cpp
+    ../Input/keyboard_pad_handler.cpp
+    ../Input/mm_joystick_handler.cpp
+    ../Input/pad_thread.cpp
+    ../Input/product_info.cpp
+    ../Input/ps_move_calibration.cpp
+    ../Input/ps_move_config.cpp
+    ../Input/ps_move_handler.cpp
+    ../Input/ps_move_tracker.cpp
+    ../Input/raw_mouse_config.cpp
+    ../Input/raw_mouse_handler.cpp
+    ../Input/sdl_pad_handler.cpp
+    ../Input/skateboard_pad_handler.cpp
+    ../Input/xinput_pad_handler.cpp
+
     "../resources.qrc"
 )