diff --git a/nx/include/switch/gfx/binder.h b/nx/include/switch/gfx/binder.h
index 9c427842..44e87cde 100644
--- a/nx/include/switch/gfx/binder.h
+++ b/nx/include/switch/gfx/binder.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "types.h"
+#include "../types.h"
 
 #define BINDER_FIRST_CALL_TRANSACTION 0x1
 
diff --git a/nx/include/switch/gfx/buffer_producer.h b/nx/include/switch/gfx/buffer_producer.h
index 860b9bc5..3edfeb28 100644
--- a/nx/include/switch/gfx/buffer_producer.h
+++ b/nx/include/switch/gfx/buffer_producer.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "gfx/nvioctl.h"
+#include "../gfx/nvioctl.h"
 
 typedef struct {
     u32 is_valid;
diff --git a/nx/include/switch/gfx/gfx.h b/nx/include/switch/gfx/gfx.h
index 1e8f3ae0..8c2cfe81 100644
--- a/nx/include/switch/gfx/gfx.h
+++ b/nx/include/switch/gfx/gfx.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "types.h"
+#include "../types.h"
 
 /// Converts red, green, blue, and alpha components to packed RGBA8.
 #define RGBA8(r,g,b,a)  (((r)&0xff)|(((g)&0xff)<<8)|(((b)&0xff)<<16)|(((a)&0xff)<<24))
diff --git a/nx/include/switch/gfx/nvgfx.h b/nx/include/switch/gfx/nvgfx.h
index 971203b1..6d8a9f68 100644
--- a/nx/include/switch/gfx/nvgfx.h
+++ b/nx/include/switch/gfx/nvgfx.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "types.h"
+#include "../types.h"
 
 Result nvgfxInitialize(void);
 void nvgfxExit(void);
diff --git a/nx/include/switch/gfx/nvioctl.h b/nx/include/switch/gfx/nvioctl.h
index 5b128d33..24c75e0c 100644
--- a/nx/include/switch/gfx/nvioctl.h
+++ b/nx/include/switch/gfx/nvioctl.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "types.h"
+#include "../types.h"
 
 typedef struct {
     u32 arch;                           // 0x120 (NVGPU_GPU_ARCH_GM200)
diff --git a/nx/include/switch/gfx/parcel.h b/nx/include/switch/gfx/parcel.h
index 6c5a6cae..e208a81a 100644
--- a/nx/include/switch/gfx/parcel.h
+++ b/nx/include/switch/gfx/parcel.h
@@ -1,6 +1,6 @@
 #pragma once
-#include "result.h"
-#include "gfx/binder.h"
+#include "../result.h"
+#include "../gfx/binder.h"
 
 typedef struct {
     u8 payload[0x400];
diff --git a/nx/include/switch/kernel/detect.h b/nx/include/switch/kernel/detect.h
index d8055327..83aa7072 100644
--- a/nx/include/switch/kernel/detect.h
+++ b/nx/include/switch/kernel/detect.h
@@ -1,6 +1,6 @@
 // Copyright 2017 plutoo
 #pragma once
-#include "types.h"
+#include "../types.h"
 
 bool kernelAbove200(void);
 bool kernelAbove300(void);
diff --git a/nx/include/switch/kernel/jit.h b/nx/include/switch/kernel/jit.h
index f5753409..4a87e1d4 100644
--- a/nx/include/switch/kernel/jit.h
+++ b/nx/include/switch/kernel/jit.h
@@ -1,6 +1,6 @@
 // Copyright 2018 plutoo
 #pragma once
-#include "types.h"
+#include "../types.h"
 
 typedef enum {
     JitType_CodeMemory,
diff --git a/nx/include/switch/kernel/mutex.h b/nx/include/switch/kernel/mutex.h
index 4dde2c27..036f4683 100644
--- a/nx/include/switch/kernel/mutex.h
+++ b/nx/include/switch/kernel/mutex.h
@@ -1,7 +1,7 @@
 // Copyright 2017 plutoo
 #pragma once
 #include <sys/lock.h>
-#include "types.h" // not needed in this file, still including it
+#include "../types.h" // not needed in this file, still including it
 
 typedef _LOCK_T Mutex;
 typedef _LOCK_RECURSIVE_T RMutex;
diff --git a/nx/include/switch/kernel/random.h b/nx/include/switch/kernel/random.h
index 786d5365..643e3259 100644
--- a/nx/include/switch/kernel/random.h
+++ b/nx/include/switch/kernel/random.h
@@ -1,6 +1,6 @@
 // Copyright 2018 plutoo
 #pragma once
-#include "types.h"
+#include "../types.h"
 
 void randomGet(u8* buf, size_t len);
 u64  randomGet64(void);
diff --git a/nx/include/switch/kernel/rwlock.h b/nx/include/switch/kernel/rwlock.h
index d889cf06..c4dc97bf 100644
--- a/nx/include/switch/kernel/rwlock.h
+++ b/nx/include/switch/kernel/rwlock.h
@@ -1,6 +1,6 @@
 // Copyright 2018 plutoo
 #pragma once
-#include "kernel/mutex.h"
+#include "../kernel/mutex.h"
 
 typedef struct {
     RMutex r;
diff --git a/nx/include/switch/kernel/shmem.h b/nx/include/switch/kernel/shmem.h
index 733121d9..25c77681 100644
--- a/nx/include/switch/kernel/shmem.h
+++ b/nx/include/switch/kernel/shmem.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "types.h"
+#include "../types.h"
 
 typedef struct {
     Handle      handle;
diff --git a/nx/include/switch/kernel/svc.h b/nx/include/switch/kernel/svc.h
index 71c67066..159eb291 100644
--- a/nx/include/switch/kernel/svc.h
+++ b/nx/include/switch/kernel/svc.h
@@ -3,7 +3,7 @@
  * @brief Syscall wrappers.
  */
 #pragma once
-#include "types.h"
+#include "../types.h"
 
 /// Pseudo handle for the current process
 #define CUR_PROCESS_HANDLE 0xFFFF8001
diff --git a/nx/include/switch/kernel/thread.h b/nx/include/switch/kernel/thread.h
index a05aa0f9..b80d13fd 100644
--- a/nx/include/switch/kernel/thread.h
+++ b/nx/include/switch/kernel/thread.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "types.h"
+#include "../types.h"
 
 typedef struct {
     Handle     handle;
diff --git a/nx/include/switch/kernel/tmem.h b/nx/include/switch/kernel/tmem.h
index 5836b926..0fda4686 100644
--- a/nx/include/switch/kernel/tmem.h
+++ b/nx/include/switch/kernel/tmem.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "types.h"
+#include "../types.h"
 
 typedef struct {
     Handle      handle;
diff --git a/nx/include/switch/kernel/virtmem.h b/nx/include/switch/kernel/virtmem.h
index d52e75a7..a41161e2 100644
--- a/nx/include/switch/kernel/virtmem.h
+++ b/nx/include/switch/kernel/virtmem.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "types.h"
+#include "../types.h"
 
 void* virtmemReserve(size_t size);
 void  virtmemFree(void* addr, size_t size);
diff --git a/nx/include/switch/runtime/devices/console.h b/nx/include/switch/runtime/devices/console.h
index 6b9982a8..f0a30a07 100644
--- a/nx/include/switch/runtime/devices/console.h
+++ b/nx/include/switch/runtime/devices/console.h
@@ -15,7 +15,7 @@
  * @endcode
  */
 #pragma once
-#include "types.h"
+#include "../../types.h"
 
 #define CONSOLE_ESC(x) "\x1b[" #x
 #define CONSOLE_RESET   CONSOLE_ESC(0m)
diff --git a/nx/include/switch/runtime/devices/fs_dev.h b/nx/include/switch/runtime/devices/fs_dev.h
index 9bba6ab9..f4b8b8c7 100644
--- a/nx/include/switch/runtime/devices/fs_dev.h
+++ b/nx/include/switch/runtime/devices/fs_dev.h
@@ -3,7 +3,7 @@
  * @brief FS driver.
  */
 #pragma once
-#include "services/fs.h"
+#include "../../services/fs.h"
 
 //NOTE: This is currently not usable.
 
diff --git a/nx/include/switch/runtime/devices/usb_comms.h b/nx/include/switch/runtime/devices/usb_comms.h
index 8516f3eb..6b0883ca 100644
--- a/nx/include/switch/runtime/devices/usb_comms.h
+++ b/nx/include/switch/runtime/devices/usb_comms.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "types.h"
+#include "../../types.h"
 
 Result usbCommsInitialize(void);
 void usbCommsExit(void);
diff --git a/nx/include/switch/runtime/env.h b/nx/include/switch/runtime/env.h
index 309b089f..4c98aeba 100644
--- a/nx/include/switch/runtime/env.h
+++ b/nx/include/switch/runtime/env.h
@@ -1,6 +1,6 @@
 // Copyright 2018 plutoo
 #pragma once
-#include "types.h"
+#include "../types.h"
 
 typedef struct {
     u32 Key;
diff --git a/nx/include/switch/runtime/util/utf.h b/nx/include/switch/runtime/util/utf.h
index d80edde0..40865b0a 100644
--- a/nx/include/switch/runtime/util/utf.h
+++ b/nx/include/switch/runtime/util/utf.h
@@ -4,7 +4,7 @@
  */
 #pragma once
 #include <sys/types.h>
-#include "types.h"
+#include "../../types.h"
 
 /** Convert a UTF-8 sequence into a UTF-32 codepoint
  *
diff --git a/nx/include/switch/services/acc.h b/nx/include/switch/services/acc.h
index 9d2dbedb..ef83d85e 100644
--- a/nx/include/switch/services/acc.h
+++ b/nx/include/switch/services/acc.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "types.h"
+#include "../types.h"
 
 Result accountInitialize(void);
 void accountExit(void);
diff --git a/nx/include/switch/services/apm.h b/nx/include/switch/services/apm.h
index 376855c8..56548d8e 100644
--- a/nx/include/switch/services/apm.h
+++ b/nx/include/switch/services/apm.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "types.h"
+#include "../types.h"
 
 /// These are used internally by applet.
 
diff --git a/nx/include/switch/services/applet.h b/nx/include/switch/services/applet.h
index 8c515c73..dcd5d1df 100644
--- a/nx/include/switch/services/applet.h
+++ b/nx/include/switch/services/applet.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "types.h"
+#include "../types.h"
 
 typedef enum {
     AppletType_None = -2,
diff --git a/nx/include/switch/services/bsd.h b/nx/include/switch/services/bsd.h
index 881f52ad..b6ba45fb 100644
--- a/nx/include/switch/services/bsd.h
+++ b/nx/include/switch/services/bsd.h
@@ -1,6 +1,6 @@
 #pragma once
-#include "types.h"
-#include "kernel/tmem.h"
+#include "../types.h"
+#include "../kernel/tmem.h"
 
 /// Configuration structure for bsdInitalize
 typedef struct  {
diff --git a/nx/include/switch/services/fatal.h b/nx/include/switch/services/fatal.h
index 3a092e18..82c460fe 100644
--- a/nx/include/switch/services/fatal.h
+++ b/nx/include/switch/services/fatal.h
@@ -1,4 +1,4 @@
 #pragma once
-#include "types.h"
+#include "../types.h"
 
 __attribute__((noreturn)) void fatalSimple(Result err);
diff --git a/nx/include/switch/services/fs.h b/nx/include/switch/services/fs.h
index 6aa2ebaa..43419a59 100644
--- a/nx/include/switch/services/fs.h
+++ b/nx/include/switch/services/fs.h
@@ -1,7 +1,7 @@
 // Copyright 2017 plutoo
 #pragma once
-#include "types.h"
-#include "services/sm.h"
+#include "../types.h"
+#include "../services/sm.h"
 
 // We use wrapped handles for type safety.
 
diff --git a/nx/include/switch/services/hid.h b/nx/include/switch/services/hid.h
index 4a0c40c5..6cd5582c 100644
--- a/nx/include/switch/services/hid.h
+++ b/nx/include/switch/services/hid.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <assert.h>
-#include "types.h"
-#include "services/sm.h"
+#include "../types.h"
+#include "../services/sm.h"
 
 // Begin enums and output structs
 
diff --git a/nx/include/switch/services/nv.h b/nx/include/switch/services/nv.h
index b17d7d51..bd69402e 100644
--- a/nx/include/switch/services/nv.h
+++ b/nx/include/switch/services/nv.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "types.h"
+#include "../types.h"
 
 typedef enum {
 	NVSERVTYPE_Default = -1,
diff --git a/nx/include/switch/services/pm.h b/nx/include/switch/services/pm.h
index a0972af2..e51c5053 100644
--- a/nx/include/switch/services/pm.h
+++ b/nx/include/switch/services/pm.h
@@ -1,7 +1,7 @@
-#pragma once
-#include "types.h"
-
 // Copyright 2017 plutoo
+#pragma once
+#include "../types.h"
+
 Result pmdmntInitialize(void);
 Result pmdmntStartProcess(u64 pid);
 Result pmdmntGetTitlePid(u64* pid_out, u64 title_id);
diff --git a/nx/include/switch/services/sm.h b/nx/include/switch/services/sm.h
index ce85da62..e31e47f3 100644
--- a/nx/include/switch/services/sm.h
+++ b/nx/include/switch/services/sm.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "types.h"
-#include "kernel/svc.h"
-#include "ipc.h"
+#include "../types.h"
+#include "../kernel/svc.h"
+#include "../ipc.h"
 
 typedef enum {
     ServiceType_Uninitialized,
diff --git a/nx/include/switch/services/usb.h b/nx/include/switch/services/usb.h
index 936697d8..c6597d8d 100644
--- a/nx/include/switch/services/usb.h
+++ b/nx/include/switch/services/usb.h
@@ -1,6 +1,6 @@
 #pragma once
-#include "types.h"
-#include "services/sm.h"
+#include "../types.h"
+#include "../services/sm.h"
 
 /// usb:ds Switch-as-device<>host USB comms, see also here: http://switchbrew.org/index.php?title=USB_services
 
diff --git a/nx/include/switch/services/vi.h b/nx/include/switch/services/vi.h
index 556d6565..6b24ea76 100644
--- a/nx/include/switch/services/vi.h
+++ b/nx/include/switch/services/vi.h
@@ -1,6 +1,6 @@
 #pragma once
-#include "types.h"
-#include "services/sm.h"
+#include "../types.h"
+#include "../services/sm.h"
 
 typedef struct {
     u64  display_id;