1 files changed, 13 insertions, 6 deletions
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index e26677079..af224166a 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -38,6 +38,7 @@ set(SRCS
             hle/applets/swkbd.cpp
             hle/kernel/address_arbiter.cpp
             hle/kernel/client_port.cpp
+            hle/kernel/client_session.cpp
             hle/kernel/event.cpp
             hle/kernel/kernel.cpp
             hle/kernel/memory.cpp
@@ -46,14 +47,15 @@ set(SRCS
             hle/kernel/resource_limit.cpp
             hle/kernel/semaphore.cpp
             hle/kernel/server_port.cpp
-            hle/kernel/session.cpp
+            hle/kernel/server_session.cpp
             hle/kernel/shared_memory.cpp
             hle/kernel/thread.cpp
             hle/kernel/timer.cpp
             hle/kernel/vm_manager.cpp
             hle/service/ac_u.cpp
-            hle/service/act_a.cpp
-            hle/service/act_u.cpp
+            hle/service/act/act.cpp
+            hle/service/act/act_a.cpp
+            hle/service/act/act_u.cpp
             hle/service/am/am.cpp
             hle/service/am/am_app.cpp
             hle/service/am/am_net.cpp
@@ -73,6 +75,7 @@ set(SRCS
             hle/service/cam/cam_s.cpp
             hle/service/cam/cam_u.cpp
             hle/service/cecd/cecd.cpp
+            hle/service/cecd/cecd_ndm.cpp
             hle/service/cecd/cecd_s.cpp
             hle/service/cecd/cecd_u.cpp
             hle/service/cfg/cfg.cpp
@@ -194,12 +197,14 @@ set(HEADERS
             hle/config_mem.h
             hle/function_wrappers.h
             hle/hle.h
+            hle/ipc.h
             hle/applets/applet.h
             hle/applets/erreula.h
             hle/applets/mii_selector.h
             hle/applets/swkbd.h
             hle/kernel/address_arbiter.h
             hle/kernel/client_port.h
+            hle/kernel/client_session.h
             hle/kernel/event.h
             hle/kernel/kernel.h
             hle/kernel/memory.h
@@ -208,15 +213,16 @@ set(HEADERS
             hle/kernel/resource_limit.h
             hle/kernel/semaphore.h
             hle/kernel/server_port.h
-            hle/kernel/session.h
+            hle/kernel/server_session.h
             hle/kernel/shared_memory.h
             hle/kernel/thread.h
             hle/kernel/timer.h
             hle/kernel/vm_manager.h
             hle/result.h
             hle/service/ac_u.h
-            hle/service/act_a.h
-            hle/service/act_u.h
+            hle/service/act/act.h
+            hle/service/act/act_a.h
+            hle/service/act/act_u.h
             hle/service/am/am.h
             hle/service/am/am_app.h
             hle/service/am/am_net.h
@@ -236,6 +242,7 @@ set(HEADERS
             hle/service/cam/cam_s.h
             hle/service/cam/cam_u.h
             hle/service/cecd/cecd.h
+            hle/service/cecd/cecd_ndm.h
             hle/service/cecd/cecd_s.h
             hle/service/cecd/cecd_u.h
             hle/service/cfg/cfg.h