diff --git a/nx/include/switch.h b/nx/include/switch.h
index 984c3791..2e51182e 100644
--- a/nx/include/switch.h
+++ b/nx/include/switch.h
@@ -14,6 +14,9 @@ extern "C" {
 
 #include "switch/nro.h"
 
+#include "switch/arm/tls.h"
+#include "switch/arm/cache.h"
+
 #include "switch/kernel/svc.h"
 #include "switch/kernel/tmem.h"
 #include "switch/kernel/shmem.h"
@@ -25,10 +28,7 @@ extern "C" {
 #include "switch/kernel/detect.h"
 #include "switch/kernel/random.h"
 #include "switch/kernel/jit.h"
-
-#include "switch/arm/tls.h"
-#include "switch/arm/cache.h"
-#include "switch/ipc.h"
+#include "switch/kernel/ipc.h"
 
 #include "switch/services/sm.h"
 #include "switch/services/fs.h"
diff --git a/nx/include/switch/ipc.h b/nx/include/switch/kernel/ipc.h
similarity index 100%
rename from nx/include/switch/ipc.h
rename to nx/include/switch/kernel/ipc.h
diff --git a/nx/include/switch/services/sm.h b/nx/include/switch/services/sm.h
index 6fcecdd7..cc592700 100644
--- a/nx/include/switch/services/sm.h
+++ b/nx/include/switch/services/sm.h
@@ -8,7 +8,7 @@
 #pragma once
 #include "../types.h"
 #include "../kernel/svc.h"
-#include "../ipc.h"
+#include "../kernel/ipc.h"
 
 /// Service type.
 typedef enum {
diff --git a/nx/source/gfx/binder.c b/nx/source/gfx/binder.c
index f5b7a5d5..5a0fb71d 100644
--- a/nx/source/gfx/binder.c
+++ b/nx/source/gfx/binder.c
@@ -1,7 +1,7 @@
 #include <string.h>
 #include "types.h"
 #include "result.h"
-#include "ipc.h"
+#include "kernel/ipc.h"
 #include "kernel/detect.h"
 #include "gfx/binder.h"
 
diff --git a/nx/source/services/apm.c b/nx/source/services/apm.c
index 8e3c6716..6cb5e578 100644
--- a/nx/source/services/apm.c
+++ b/nx/source/services/apm.c
@@ -1,6 +1,6 @@
 #include "types.h"
 #include "result.h"
-#include "ipc.h"
+#include "kernel/ipc.h"
 #include "services/apm.h"
 #include "services/sm.h"
 
diff --git a/nx/source/services/applet.c b/nx/source/services/applet.c
index 56d4fae3..d2e41d9f 100644
--- a/nx/source/services/applet.c
+++ b/nx/source/services/applet.c
@@ -1,7 +1,7 @@
 #include <string.h>
 #include "types.h"
 #include "result.h"
-#include "ipc.h"
+#include "kernel/ipc.h"
 #include "services/fatal.h"
 #include "services/applet.h"
 #include "services/apm.h"
diff --git a/nx/source/services/audin.c b/nx/source/services/audin.c
index e61326f5..5b2c6abc 100644
--- a/nx/source/services/audin.c
+++ b/nx/source/services/audin.c
@@ -1,7 +1,7 @@
 #include <string.h>
 #include "types.h"
 #include "result.h"
-#include "ipc.h"
+#include "kernel/ipc.h"
 #include "services/audin.h"
 #include "services/sm.h"
 
diff --git a/nx/source/services/audout.c b/nx/source/services/audout.c
index 3c5389d2..bd12e900 100644
--- a/nx/source/services/audout.c
+++ b/nx/source/services/audout.c
@@ -1,7 +1,7 @@
 #include <string.h>
 #include "types.h"
 #include "result.h"
-#include "ipc.h"
+#include "kernel/ipc.h"
 #include "services/audout.h"
 #include "services/sm.h"
 
diff --git a/nx/source/services/bsd.c b/nx/source/services/bsd.c
index d6d7ee6b..f3a92a6f 100644
--- a/nx/source/services/bsd.c
+++ b/nx/source/services/bsd.c
@@ -14,11 +14,11 @@
 
 #include "types.h"
 #include "result.h"
-#include "ipc.h"
-#include "services/bsd.h"
-#include "services/sm.h"
+#include "kernel/ipc.h"
 #include "kernel/shmem.h"
 #include "kernel/rwlock.h"
+#include "services/bsd.h"
+#include "services/sm.h"
 
 __thread Result g_bsdResult;
 __thread int g_bsdErrno;
diff --git a/nx/source/services/fatal.c b/nx/source/services/fatal.c
index 99dbc0cc..43aad860 100644
--- a/nx/source/services/fatal.c
+++ b/nx/source/services/fatal.c
@@ -1,11 +1,11 @@
 // Copyright 2017 plutoo
 #include "types.h"
 #include "result.h"
-#include "ipc.h"
-#include "services/fatal.h"
-#include "services/sm.h"
+#include "kernel/ipc.h"
 #include "kernel/detect.h"
 #include "kernel/svc.h"
+#include "services/fatal.h"
+#include "services/sm.h"
 
 void fatalSimple(Result err) {
     Result rc = 0;
diff --git a/nx/source/services/fs.c b/nx/source/services/fs.c
index 013a5779..0b81e196 100644
--- a/nx/source/services/fs.c
+++ b/nx/source/services/fs.c
@@ -2,7 +2,7 @@
 #include <string.h>
 #include "types.h"
 #include "result.h"
-#include "ipc.h"
+#include "kernel/ipc.h"
 #include "services/fs.h"
 #include "services/sm.h"
 
diff --git a/nx/source/services/hid.c b/nx/source/services/hid.c
index e1c821c8..3cca0303 100644
--- a/nx/source/services/hid.c
+++ b/nx/source/services/hid.c
@@ -1,7 +1,7 @@
 #include <string.h>
 #include "types.h"
 #include "result.h"
-#include "ipc.h"
+#include "kernel/ipc.h"
 #include "services/applet.h"
 #include "services/hid.h"
 #include "services/sm.h"
diff --git a/nx/source/services/irs.c b/nx/source/services/irs.c
index ac216e36..18c8a4a6 100644
--- a/nx/source/services/irs.c
+++ b/nx/source/services/irs.c
@@ -1,13 +1,13 @@
 #include <string.h>
 #include "types.h"
 #include "result.h"
-#include "ipc.h"
+#include "kernel/ipc.h"
+#include "kernel/shmem.h"
+#include "kernel/tmem.h"
 #include "services/applet.h"
 #include "services/irs.h"
 #include "services/hid.h"
 #include "services/sm.h"
-#include "kernel/shmem.h"
-#include "kernel/tmem.h"
 
 typedef struct {
     bool initialized;
diff --git a/nx/source/services/nv.c b/nx/source/services/nv.c
index ddbbe397..980ef684 100644
--- a/nx/source/services/nv.c
+++ b/nx/source/services/nv.c
@@ -1,7 +1,7 @@
 #include <string.h>
 #include "types.h"
 #include "result.h"
-#include "ipc.h"
+#include "kernel/ipc.h"
 #include "services/applet.h"
 #include "gfx/ioctl.h"
 #include "services/nv.h"
diff --git a/nx/source/services/pm.c b/nx/source/services/pm.c
index fe61ad40..b781e53b 100644
--- a/nx/source/services/pm.c
+++ b/nx/source/services/pm.c
@@ -1,7 +1,7 @@
 // Copyright 2017 plutoo
 #include "types.h"
 #include "result.h"
-#include "ipc.h"
+#include "kernel/ipc.h"
 #include "services/pm.h"
 #include "services/sm.h"
 
diff --git a/nx/source/services/set.c b/nx/source/services/set.c
index ff207aed..e5130249 100644
--- a/nx/source/services/set.c
+++ b/nx/source/services/set.c
@@ -7,7 +7,7 @@
  */
 #include "types.h"
 #include "result.h"
-#include "ipc.h"
+#include "kernel/ipc.h"
 #include "kernel/detect.h"
 #include "services/set.h"
 #include "services/sm.h"
diff --git a/nx/source/services/sfdnsres.c b/nx/source/services/sfdnsres.c
index 143cf07c..63924862 100644
--- a/nx/source/services/sfdnsres.c
+++ b/nx/source/services/sfdnsres.c
@@ -1,6 +1,6 @@
 #include "types.h"
 #include "result.h"
-#include "ipc.h"
+#include "kernel/ipc.h"
 #include "services/sm.h"
 #include "services/sfdnsres.h"
 
diff --git a/nx/source/services/sm.c b/nx/source/services/sm.c
index c232d968..00472e1a 100644
--- a/nx/source/services/sm.c
+++ b/nx/source/services/sm.c
@@ -1,7 +1,7 @@
 // Copyright 2017 plutoo
 #include "types.h"
 #include "result.h"
-#include "ipc.h"
+#include "kernel/ipc.h"
 #include "services/fatal.h"
 #include "services/sm.h"
 
diff --git a/nx/source/services/time.c b/nx/source/services/time.c
index 67cc89c0..4f65cd9c 100644
--- a/nx/source/services/time.c
+++ b/nx/source/services/time.c
@@ -1,7 +1,7 @@
 #include <string.h>
 #include "types.h"
 #include "result.h"
-#include "ipc.h"
+#include "kernel/ipc.h"
 #include "services/time.h"
 #include "services/sm.h"
 
diff --git a/nx/source/services/usb.c b/nx/source/services/usb.c
index 01f7099b..6cd913a9 100644
--- a/nx/source/services/usb.c
+++ b/nx/source/services/usb.c
@@ -1,8 +1,8 @@
 #include <string.h>
 #include "types.h"
 #include "result.h"
-#include "ipc.h"
 #include "arm/cache.h"
+#include "kernel/ipc.h"
 #include "kernel/detect.h"
 #include "services/usb.h"
 #include "services/sm.h"
diff --git a/nx/source/services/vi.c b/nx/source/services/vi.c
index 6802c946..0a6a67c1 100644
--- a/nx/source/services/vi.c
+++ b/nx/source/services/vi.c
@@ -1,9 +1,9 @@
 #include <string.h>
 #include "types.h"
 #include "result.h"
-#include "ipc.h"
 #include "services/applet.h"
 #include "services/vi.h"
+#include "kernel/ipc.h"
 #include "kernel/detect.h"
 
 static Service g_viSrv;