diff --git a/cmake/compile_definitions/common.cmake b/cmake/compile_definitions/common.cmake
index c5f13d975e8..9d2a3f6b905 100644
--- a/cmake/compile_definitions/common.cmake
+++ b/cmake/compile_definitions/common.cmake
@@ -48,13 +48,9 @@ list(APPEND PLATFORM_TARGET_FILES ${NVENC_SOURCES})
 configure_file("${CMAKE_SOURCE_DIR}/src/version.h.in" version.h @ONLY)
 include_directories("${CMAKE_CURRENT_BINARY_DIR}")  # required for importing version.h
 
-file(GLOB_RECURSE INPUT_SOURCES
-        ${CMAKE_SOURCE_DIR}/src/input/*.h
-        ${CMAKE_SOURCE_DIR}/src/input/*.cpp)
-
-file(GLOB_RECURSE SERVER_SOURCES
-        ${CMAKE_SOURCE_DIR}/src/server/*.h
-        ${CMAKE_SOURCE_DIR}/src/server/*.cpp)
+file(GLOB_RECURSE COMMON_SOURCES
+        ${CMAKE_SOURCE_DIR}/src/**)
+list(FILTER COMMON_SOURCES EXCLUDE REGEX "${CMAKE_SOURCE_DIR}/src/platform/.*")
 
 set(SUNSHINE_TARGET_FILES
         "${CMAKE_SOURCE_DIR}/third-party/nanors/rs.c"
@@ -64,44 +60,7 @@ set(SUNSHINE_TARGET_FILES
         "${CMAKE_SOURCE_DIR}/third-party/moonlight-common-c/src/RtspParser.c"
         "${CMAKE_SOURCE_DIR}/third-party/moonlight-common-c/src/Video.h"
         "${CMAKE_SOURCE_DIR}/third-party/tray/src/tray.h"
-        "${CMAKE_SOURCE_DIR}/src/cbs.cpp"
-        "${CMAKE_SOURCE_DIR}/src/utility.h"
-        "${CMAKE_SOURCE_DIR}/src/uuid.h"
-        "${CMAKE_SOURCE_DIR}/src/config.h"
-        "${CMAKE_SOURCE_DIR}/src/config.cpp"
-        "${CMAKE_SOURCE_DIR}/src/entry_handler.cpp"
-        "${CMAKE_SOURCE_DIR}/src/entry_handler.h"
-        "${CMAKE_SOURCE_DIR}/src/file_handler.cpp"
-        "${CMAKE_SOURCE_DIR}/src/file_handler.h"
-        "${CMAKE_SOURCE_DIR}/src/globals.cpp"
-        "${CMAKE_SOURCE_DIR}/src/globals.h"
-        "${CMAKE_SOURCE_DIR}/src/logging.cpp"
-        "${CMAKE_SOURCE_DIR}/src/logging.h"
-        "${CMAKE_SOURCE_DIR}/src/main.cpp"
-        "${CMAKE_SOURCE_DIR}/src/main.h"
-        "${CMAKE_SOURCE_DIR}/src/stream.cpp"
-        "${CMAKE_SOURCE_DIR}/src/stream.h"
-        "${CMAKE_SOURCE_DIR}/src/video.cpp"
-        "${CMAKE_SOURCE_DIR}/src/video.h"
-        "${CMAKE_SOURCE_DIR}/src/video_colorspace.cpp"
-        "${CMAKE_SOURCE_DIR}/src/video_colorspace.h"
-        "${CMAKE_SOURCE_DIR}/src/audio.cpp"
-        "${CMAKE_SOURCE_DIR}/src/audio.h"
-        "${CMAKE_SOURCE_DIR}/src/platform/common.h"
-        "${CMAKE_SOURCE_DIR}/src/process.cpp"
-        "${CMAKE_SOURCE_DIR}/src/process.h"
-        "${CMAKE_SOURCE_DIR}/src/move_by_copy.h"
-        "${CMAKE_SOURCE_DIR}/src/system_tray.cpp"
-        "${CMAKE_SOURCE_DIR}/src/system_tray.h"
-        "${CMAKE_SOURCE_DIR}/src/task_pool.h"
-        "${CMAKE_SOURCE_DIR}/src/thread_pool.h"
-        "${CMAKE_SOURCE_DIR}/src/thread_safe.h"
-        "${CMAKE_SOURCE_DIR}/src/sync.h"
-        "${CMAKE_SOURCE_DIR}/src/round_robin.h"
-        "${CMAKE_SOURCE_DIR}/src/stat_trackers.h"
-        "${CMAKE_SOURCE_DIR}/src/stat_trackers.cpp"
-        ${INPUT_SOURCES}
-        ${SERVER_SOURCES}
+        ${COMMON_SOURCES}
         ${PLATFORM_TARGET_FILES})
 
 if(NOT SUNSHINE_ASSETS_DIR_DEF)