diff --git a/Source/hoc-clk/sysmodule/src/ipc/ipc_service.cpp b/Source/hoc-clk/sysmodule/src/ipc/ipc_service.cpp
index 8295ea24..4d6f9ca9 100644
--- a/Source/hoc-clk/sysmodule/src/ipc/ipc_service.cpp
+++ b/Source/hoc-clk/sysmodule/src/ipc/ipc_service.cpp
@@ -28,6 +28,7 @@
 #include <i2c.h>
 #include <max17050.h>
 #include <switch.h>
+#include <switch.hpp>
 #include <tmp451.h>
 
 #include "../file/config.hpp"
@@ -39,6 +40,9 @@
 #include "ipc_service.hpp"
 #include <ipc_server.hpp>
 #include <lockable_mutex.h>
+
+using namespace nx;
+
 namespace ipcService {
 
     namespace {
@@ -270,7 +274,7 @@ namespace ipcService {
 
     void Initialize() {
         std::int32_t priority;
-        Result rc = svcGetThreadPriority(&priority, CUR_THREAD_HANDLE);
+        Result rc = svc::GetThreadPriority(&priority, CUR_THREAD_HANDLE);
         ASSERT_RESULT_OK(rc, "svcGetThreadPriority");
         rc = ipcServerInit(&gServer, HOCCLK_IPC_SERVICE_NAME, 42);
         ASSERT_RESULT_OK(rc, "ipcServerInit");
@@ -281,7 +285,7 @@ namespace ipcService {
 
     void Exit() {
         SetRunning(false);
-        Result rc = threadClose(&gThread);
+        Result rc = thread::Close(&gThread);
         ASSERT_RESULT_OK(rc, "threadClose");
         rc = ipcServerExit(&gServer);
         ASSERT_RESULT_OK(rc, "ipcServerExit");
@@ -296,11 +300,11 @@ namespace ipcService {
         gRunning = running;
 
         if (running) {
-            Result rc = threadStart(&gThread);
+            Result rc = thread::Start(&gThread);
             ASSERT_RESULT_OK(rc, "threadStart");
         } else {
-            svcCancelSynchronization(gThread.handle);
-            threadWaitForExit(&gThread);
+            svc::CancelSynchronization(gThread.handle);
+            thread::WaitForExit(&gThread);
         }
     }