diff --git a/src/citra_qt/CMakeLists.txt b/src/citra_qt/CMakeLists.txt
index 21b85e5b8..2b9d4b93c 100644
--- a/src/citra_qt/CMakeLists.txt
+++ b/src/citra_qt/CMakeLists.txt
@@ -1,8 +1,8 @@
 set(SRCS
             bootmanager.cpp
             callstack.cpp
-            disasm.cpp
-            cpu_regs.cpp
+            disassembler.cpp
+            registers.cpp
             hotkeys.cpp
             main.cpp
             ramview.cpp
@@ -11,8 +11,8 @@ set(SRCS
 
 qt4_wrap_ui(UI_HDRS
                     callstack.ui
-                    disasm.ui
-                    cpu_regs.ui
+                    disassembler.ui
+                    registers.ui
                     hotkeys.ui
                     main.ui
                     config/controller_config.ui)
@@ -20,8 +20,8 @@ qt4_wrap_ui(UI_HDRS
 qt4_wrap_cpp(MOC_SRCS
                         bootmanager.hxx
                         callstack.hxx
-                        disasm.hxx
-                        cpu_regs.hxx
+                        disassembler.hxx
+                        registers.hxx
                         hotkeys.hxx
                         main.hxx
                         ramview.hxx
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 6cf0e61c8..738144927 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -11,6 +11,7 @@ set(SRCS    break_points.cpp
             misc.cpp
             msg_handler.cpp
             string_util.cpp
+            symbols.cpp
             thread.cpp
             timer.cpp
             utf8.cpp
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 9cfb9b1c8..3ba3afa70 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -17,7 +17,15 @@ set(SRCS    core.cpp
             elf/elf_reader.cpp
             file_sys/directory_file_system.cpp
             file_sys/meta_file_system.cpp
+            hle/hle.cpp
+            hle/syscall.cpp
+            hle/service/apt.cpp
+            hle/service/gsp.cpp
+            hle/service/hid.cpp
+            hle/service/service.cpp
+            hle/service/srv.cpp
             hw/hw.cpp
-            hw/hw_lcd.cpp)
+            hw/lcd.cpp
+            hw/ndma.cpp)
 
 add_library(core STATIC ${SRCS})