diff --git a/CMakeLists.txt b/CMakeLists.txt
index e24d56111..07b3d027a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -100,7 +100,6 @@ set(CMAKE_CXX_STANDARD 11)
 #      Option       Description                                                     Def.
 #      ------       -----------                                                     ----
 option(RELEASE      "Release build"                                                 OFF)
-option(USB          "USB support"                                                   OFF)
 option(DYNAREC      "Dynamic recompiler"                                            ON)
 option(FLUIDSYNTH   "FluidSynth"                                                    ON)
 option(MUNT         "MUNT"                                                          ON)
diff --git a/src/cpu/CMakeLists.txt b/src/cpu/CMakeLists.txt
index b1825ef7a..20452bf88 100644
--- a/src/cpu/CMakeLists.txt
+++ b/src/cpu/CMakeLists.txt
@@ -13,13 +13,8 @@
 #           Copyright 2020,2021 David Hrdlička.
 #
 
-set(cpu_SOURCES cpu.c cpu_table.c fpu.c x86.c 808x.c 386.c 386_common.c 386_dynarec.c x86seg.c x87.c x87_timings.c)
-
-if (DYNAREC)
-    set(cpu_SOURCES ${cpu_SOURCES} 386_dynarec_ops.c)
-endif()
-
-add_library(cpu OBJECT ${cpu_SOURCES})
+add_library(cpu OBJECT cpu.c cpu_table.c fpu.c x86.c 808x.c 386.c 386_common.c
+    386_dynarec.c x86seg.c x87.c x87_timings.c)
 
 if(AMD_K5)
     target_compile_definitions(cpu PRIVATE USE_AMD_K5)
@@ -30,6 +25,8 @@ if(CYRIX_6X86)
 endif()
 
 if(DYNAREC)
+    target_sources(cpu PRIVATE 386_dynarec_ops.c)
+
     add_library(cgt OBJECT codegen_timing_486.c codegen_timing_686.c
         codegen_timing_common.c codegen_timing_k6.c
         codegen_timing_pentium.c codegen_timing_p6.c