diff --git a/Source/hoc-clk/sysmodule/src/board/board.cpp b/Source/hoc-clk/sysmodule/src/board/board.cpp
index 82dc6d27..54530d7f 100644
--- a/Source/hoc-clk/sysmodule/src/board/board.cpp
+++ b/Source/hoc-clk/sysmodule/src/board/board.cpp
@@ -46,7 +46,7 @@
 #include "board_load.hpp"
 #include "board_misc.hpp"
 #include "board_volt.hpp"
-#include <ipc_server.h>
+#include <ipc_server.hpp>
 #include <lockable_mutex.h>
 #include "../mapping/mem_map.hpp"
 #include "../soc/dram_mrr.hpp"
diff --git a/Source/hoc-clk/sysmodule/src/board/board_freq.cpp b/Source/hoc-clk/sysmodule/src/board/board_freq.cpp
index 77ebd46b..780d67fb 100644
--- a/Source/hoc-clk/sysmodule/src/board/board_freq.cpp
+++ b/Source/hoc-clk/sysmodule/src/board/board_freq.cpp
@@ -40,7 +40,7 @@
 #include "../soc/pllmb.hpp"
 #include "board.hpp"
 #include "board_name.hpp"
-#include <ipc_server.h>
+#include <ipc_server.hpp>
 #include <lockable_mutex.h>
 #include <switch.hpp>
 
diff --git a/Source/hoc-clk/sysmodule/src/board/board_freq.hpp b/Source/hoc-clk/sysmodule/src/board/board_freq.hpp
index b0a91b6f..0b21a9c6 100644
--- a/Source/hoc-clk/sysmodule/src/board/board_freq.hpp
+++ b/Source/hoc-clk/sysmodule/src/board/board_freq.hpp
@@ -33,7 +33,7 @@
 
 #include "../file/errors.hpp"
 #include "../hos/apm_ext.h"
-#include <ipc_server.h>
+#include <ipc_server.hpp>
 #include <lockable_mutex.h>
 
 
diff --git a/Source/hoc-clk/sysmodule/src/board/board_load.cpp b/Source/hoc-clk/sysmodule/src/board/board_load.cpp
index 6d693383..bf7a2dec 100644
--- a/Source/hoc-clk/sysmodule/src/board/board_load.cpp
+++ b/Source/hoc-clk/sysmodule/src/board/board_load.cpp
@@ -40,7 +40,7 @@
 #include "../hos/apm_ext.h"
 #include "board.hpp"
 #include "board_misc.hpp"
-#include <ipc_server.h>
+#include <ipc_server.hpp>
 #include <lockable_mutex.h>
 
 using namespace nx;
diff --git a/Source/hoc-clk/sysmodule/src/board/board_profile.cpp b/Source/hoc-clk/sysmodule/src/board/board_profile.cpp
index eadeba8a..38818877 100644
--- a/Source/hoc-clk/sysmodule/src/board/board_profile.cpp
+++ b/Source/hoc-clk/sysmodule/src/board/board_profile.cpp
@@ -32,7 +32,7 @@
 
 #include "../hos/apm_ext.h"
 #include "board.hpp"
-#include <ipc_server.h>
+#include <ipc_server.hpp>
 #include <lockable_mutex.h>
 
 namespace board {
diff --git a/Source/hoc-clk/sysmodule/src/board/board_sensor.cpp b/Source/hoc-clk/sysmodule/src/board/board_sensor.cpp
index 896732a0..fe9f44a3 100644
--- a/Source/hoc-clk/sysmodule/src/board/board_sensor.cpp
+++ b/Source/hoc-clk/sysmodule/src/board/board_sensor.cpp
@@ -41,7 +41,7 @@
 #include "../tsensor/bq24193.hpp"
 #include "../tsensor/soctherm.hpp"
 #include "board.hpp"
-#include <ipc_server.h>
+#include <ipc_server.hpp>
 #include <lockable_mutex.h>
 
 
diff --git a/Source/hoc-clk/sysmodule/src/file/config.cpp b/Source/hoc-clk/sysmodule/src/file/config.cpp
index 92eb9053..a10861f6 100644
--- a/Source/hoc-clk/sysmodule/src/file/config.cpp
+++ b/Source/hoc-clk/sysmodule/src/file/config.cpp
@@ -44,7 +44,7 @@
 #include "errors.hpp"
 #include "file_utils.hpp"
 #include <initializer_list>
-#include <ipc_server.h>
+#include <ipc_server.hpp>
 #include <lockable_mutex.h>
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/Source/hoc-clk/sysmodule/src/file/file_utils.cpp b/Source/hoc-clk/sysmodule/src/file/file_utils.cpp
index 9d049d7b..3beab7ca 100644
--- a/Source/hoc-clk/sysmodule/src/file/file_utils.cpp
+++ b/Source/hoc-clk/sysmodule/src/file/file_utils.cpp
@@ -30,7 +30,7 @@
 
 #include "../hos/apm_ext.h"
 #include "file_utils.hpp"
-#include <ipc_server.h>
+#include <ipc_server.hpp>
 #include <lockable_mutex.h>
 
 extern "C" void __libnx_init_time(void);
diff --git a/Source/hoc-clk/sysmodule/src/ipc/ipc_server.c b/Source/hoc-clk/sysmodule/src/ipc/ipc_server.cpp
similarity index 81%
rename from Source/hoc-clk/sysmodule/src/ipc/ipc_server.c
rename to Source/hoc-clk/sysmodule/src/ipc/ipc_server.cpp
index 340d9b18..25f03881 100644
--- a/Source/hoc-clk/sysmodule/src/ipc/ipc_server.c
+++ b/Source/hoc-clk/sysmodule/src/ipc/ipc_server.cpp
@@ -26,18 +26,20 @@
 
 #include <string.h>
 
-#include "ipc_server.h"
+#include "ipc_server.hpp"
+
+using namespace nx;
 
 Result ipcServerInit(IpcServer *server, const char *name, u32 max_sessions) {
     if (max_sessions < 1 || max_sessions > (MAX_WAIT_OBJECTS - 1)) {
         return MAKERESULT(Module_Libnx, LibnxError_BadInput);
     }
 
-    server->srvName = smEncodeName(name);
+    server->srvName = sm::EncodeName(name);
     server->max = max_sessions + 1;
     server->count = 0;
 
-    Result rc = smRegisterService(&server->handles[0], server->srvName, false, max_sessions);
+    Result rc = sm::RegisterService(&server->handles[0], server->srvName, false, max_sessions);
     if (R_SUCCEEDED(rc)) {
         server->count = 1;
     }
@@ -46,10 +48,10 @@ Result ipcServerInit(IpcServer *server, const char *name, u32 max_sessions) {
 
 Result ipcServerExit(IpcServer *server) {
     for (u32 i = 0; i < server->count; i++) {
-        svcCloseHandle(server->handles[i]);
+        svc::CloseHandle(server->handles[i]);
     }
     server->count = 0;
-    return smUnregisterService(server->srvName);
+    return sm::UnregisterService(server->srvName);
 }
 
 static Result _ipcServerAddSession(IpcServer *server, Handle session) {
@@ -67,7 +69,7 @@ static Result _ipcServerDeleteSession(IpcServer *server, u32 index) {
         return MAKERESULT(Module_Libnx, LibnxError_BadInput);
     }
 
-    svcCloseHandle(server->handles[index]);
+    svc::CloseHandle(server->handles[index]);
 
     for (u32 j = index; j < (server->count - 1); j++) {
         server->handles[j] = server->handles[j + 1];
@@ -77,15 +79,15 @@ static Result _ipcServerDeleteSession(IpcServer *server, u32 index) {
 }
 
 static Result _ipcServerParseRequest(IpcServerRequest *r) {
-    u8 *base = armGetTls();
+    u8 *base = (u8*)armGetTls();
 
-    r->hipc = hipcParseRequest(base);
+    r->hipc = hipc::ParseRequest(base);
     r->data.cmdId = 0;
     r->data.size = 0;
     r->data.ptr = NULL;
 
     if (r->hipc.meta.type == CmifCommandType_Request) {
-        IpcServerRawHeader *header = cmifGetAlignedDataStart(r->hipc.data.data_words, base);
+        IpcServerRawHeader *header = (IpcServerRawHeader*)cmif::GetAlignedDataStart(r->hipc.data.data_words, base);
         size_t dataSize = r->hipc.meta.num_data_words * 4;
 
         if (!header || dataSize < sizeof(IpcServerRawHeader) || header->magic != CMIF_IN_HEADER_MAGIC) {
@@ -103,11 +105,11 @@ static Result _ipcServerParseRequest(IpcServerRequest *r) {
 }
 
 static void _ipcServerPrepareResponse(Result rc, void *data, size_t dataSize) {
-    u8 *base = armGetTls();
+    u8 *base = (u8*)arm::GetTls();
     HipcRequest hipc =
-        hipcMakeRequestInline(base, .type = CmifCommandType_Request, .num_data_words = (sizeof(IpcServerRawHeader) + dataSize + 0x10) / 4, );
+        hipcMakeRequestInline(base, .type = CmifCommandType_Request, .num_data_words = (u32)(sizeof(IpcServerRawHeader) + dataSize + 0x10) / 4, );
 
-    IpcServerRawHeader *rawHeader = cmifGetAlignedDataStart(hipc.data_words, base);
+    IpcServerRawHeader *rawHeader = (IpcServerRawHeader*)cmif::GetAlignedDataStart(hipc.data_words, base);
     rawHeader->magic = CMIF_OUT_HEADER_MAGIC;
     rawHeader->result = rc;
 
@@ -118,9 +120,9 @@ static void _ipcServerPrepareResponse(Result rc, void *data, size_t dataSize) {
 
 static Result _ipcServerProcessNewSession(IpcServer *server) {
     Handle session;
-    Result rc = svcAcceptSession(&session, server->handles[0]);
+    Result rc = svc::AcceptSession(&session, server->handles[0]);
     if (R_SUCCEEDED(rc) && R_FAILED(rc = _ipcServerAddSession(server, session))) {
-        svcCloseHandle(session);
+        svc::CloseHandle(session);
     }
     return rc;
 }
@@ -132,7 +134,7 @@ static Result _ipcServerProcessSession(IpcServer *server, IpcServerRequestHandle
     u8 data[IPC_SERVER_EXT_RESPONSE_MAX_DATA_SIZE];
     bool close = false;
 
-    Result rc = svcReplyAndReceive(&unusedIndex, &server->handles[handleIndex], 1, 0, UINT64_MAX);
+    Result rc = svc::ReplyAndReceive(&unusedIndex, &server->handles[handleIndex], 1, 0, UINT64_MAX);
     if (R_SUCCEEDED(rc)) {
         rc = _ipcServerParseRequest(&r);
     }
@@ -166,9 +168,9 @@ static Result _ipcServerProcessSession(IpcServer *server, IpcServerRequestHandle
 
 Result ipcServerProcess(IpcServer *server, IpcServerRequestHandler handler, void *userdata) {
     s32 handleIndex = -1;
-    Result rc = svcWaitSynchronization(&handleIndex, server->handles, server->count, UINT64_MAX);
+    Result rc = svc::WaitSynchronization(&handleIndex, server->handles, server->count, UINT64_MAX);
 
-    if (R_SUCCEEDED(rc) && (handleIndex < 0 || handleIndex >= server->count)) {
+    if (R_SUCCEEDED(rc) && (handleIndex < 0 || handleIndex >= (s32)server->count)) {
         rc = MAKERESULT(Module_Libnx, LibnxError_NotFound);
     }
 
diff --git a/Source/hoc-clk/sysmodule/src/ipc/ipc_server.h b/Source/hoc-clk/sysmodule/src/ipc/ipc_server.hpp
similarity index 99%
rename from Source/hoc-clk/sysmodule/src/ipc/ipc_server.h
rename to Source/hoc-clk/sysmodule/src/ipc/ipc_server.hpp
index 7b5a24c8..1357eb14 100644
--- a/Source/hoc-clk/sysmodule/src/ipc/ipc_server.h
+++ b/Source/hoc-clk/sysmodule/src/ipc/ipc_server.hpp
@@ -31,6 +31,7 @@ extern "C" {
 #endif
 
 #include <switch.h>
+#include <switch.hpp>
 
 #define IPC_SERVER_EXT_RESPONSE_MAX_DATA_SIZE (0x100 - 0x10 - sizeof(IpcServerRawHeader))
 
diff --git a/Source/hoc-clk/sysmodule/src/ipc/ipc_service.cpp b/Source/hoc-clk/sysmodule/src/ipc/ipc_service.cpp
index 81247151..8295ea24 100644
--- a/Source/hoc-clk/sysmodule/src/ipc/ipc_service.cpp
+++ b/Source/hoc-clk/sysmodule/src/ipc/ipc_service.cpp
@@ -37,7 +37,7 @@
 #include "../hos/apm_ext.h"
 #include "../mgr/clock_manager.hpp"
 #include "ipc_service.hpp"
-#include <ipc_server.h>
+#include <ipc_server.hpp>
 #include <lockable_mutex.h>
 namespace ipcService {
 
diff --git a/Source/hoc-clk/sysmodule/src/mapping/mem_map.cpp b/Source/hoc-clk/sysmodule/src/mapping/mem_map.cpp
index 0f807665..b303c040 100644
--- a/Source/hoc-clk/sysmodule/src/mapping/mem_map.cpp
+++ b/Source/hoc-clk/sysmodule/src/mapping/mem_map.cpp
@@ -16,15 +16,18 @@
  */
 
 #include <switch.h>
+#include <switch.hpp>
 
 #include "../file/file_utils.hpp"
 
+using namespace nx;
+
 Result QueryMemoryMapping(u64 *virtaddr, u64 physaddr, u64 size) {
     if (hosversionAtLeast(10, 0, 0)) {
         u64 out_size;
-        return svcQueryMemoryMapping(virtaddr, &out_size, physaddr, size);
+        return svc::QueryMemoryMapping(virtaddr, &out_size, physaddr, size);
     } else {
-        return svcLegacyQueryIoMapping(virtaddr, physaddr, size);
+        return svc::LegacyQueryIoMapping(virtaddr, physaddr, size);
     }
 }
 
diff --git a/Source/hoc-clk/sysmodule/src/soc/t210.cpp b/Source/hoc-clk/sysmodule/src/soc/t210.cpp
index f664fda9..20be3485 100644
--- a/Source/hoc-clk/sysmodule/src/soc/t210.cpp
+++ b/Source/hoc-clk/sysmodule/src/soc/t210.cpp
@@ -177,9 +177,9 @@ static u32 _actmon_dev_get_count_avg(actmon_dev_t dev) {
 static inline Result _svcQueryMemoryMappingFallback(u64 *virtaddr, u64 physaddr, u64 size) {
     if (hosversionAtLeast(10, 0, 0)) {
         u64 out_size;
-        return svcQueryMemoryMapping(virtaddr, &out_size, physaddr, size);
+        return svc::QueryMemoryMapping(virtaddr, &out_size, physaddr, size);
     } else {
-        return svcLegacyQueryIoMapping(virtaddr, physaddr, size);
+        return svc::LegacyQueryIoMapping(virtaddr, physaddr, size);
     }
 }