diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 63fd5916..f181ff55 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,6 +2,5 @@ include_directories(.)
 
 add_subdirectory(backend_x64)
 add_subdirectory(common)
-add_subdirectory(daggen)
 add_subdirectory(frontend_arm)
 add_subdirectory(tests)
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 3a1a58fa..ab005f27 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -1,4 +1,6 @@
 set(SRCS
+    logging/log.cpp
+    memory_util.cpp
     string_util.cpp
     x64/abi.cpp
     x64/cpu_detect.cpp
@@ -6,14 +8,19 @@ set(SRCS
     )
 
 set(HEADERS
+    assert.h
+    bit_set.h
     bit_util.h
+    code_block.h
     common_types.h
+    logging/log.h
+    memory_util.h
     mp.h
     string_util.h
     x64/abi.h
     x64/cpu_detect.h
     x64/emitter.h
-    assert.h logging/log.h logging/log.cpp bit_set.h memory_util.h memory_util.cpp code_block.h)
+    )
 
 source_group(common FILES ${SRCS} ${HEADERS})
 add_library(dynarmic_common STATIC ${SRCS} ${HEADERS})
diff --git a/src/frontend_arm/CMakeLists.txt b/src/frontend_arm/CMakeLists.txt
index 2f1f06a9..8084337d 100644
--- a/src/frontend_arm/CMakeLists.txt
+++ b/src/frontend_arm/CMakeLists.txt
@@ -1,5 +1,7 @@
 set(SRCS
     arm_disassembler.cpp
+    ir/ir.cpp
+    ir_emitter.cpp
     )
 
 set(HEADERS
@@ -9,12 +11,11 @@ set(HEADERS
     decoder/decoder_detail.h
     decoder/thumb1.h
     frontend_arm.h
-    ir/ir.cpp
     ir/ir.h
-    ir_emitter.cpp
+    ir/opcodes.h
     ir_emitter.h
     translate_thumb.h
-    ir/opcodes.h)
+    )
 
 source_group(frontend_arm FILES ${SRCS} ${HEADERS})
 add_library(dynarmic_frontend_arm STATIC ${SRCS} ${HEADERS})
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 61dd8795..824354e3 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -1,8 +1,9 @@
 set(SRCS
+    arm/fuzz_thumb.cpp
     arm/test_arm_disassembler.cpp
-    main.cpp
     arm/test_thumb_instructions.cpp
-    arm/fuzz_thumb.cpp)
+    main.cpp
+    )
 
 set(HEADERS
     )