diff --git a/libctru/source/allocator/linear.cpp b/libctru/source/allocator/linear.cpp
index b0a4b27..b160e7f 100644
--- a/libctru/source/allocator/linear.cpp
+++ b/libctru/source/allocator/linear.cpp
@@ -1,4 +1,4 @@
-#include <3ds.h>
+#include <3ds/types.h>
 #include <3ds/util/rbtree.h>
 
 #include "mem_pool.h"
diff --git a/libctru/source/allocator/mem_pool.h b/libctru/source/allocator/mem_pool.h
index 97ca60b..87013e6 100644
--- a/libctru/source/allocator/mem_pool.h
+++ b/libctru/source/allocator/mem_pool.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <3ds.h>
+#include <3ds/types.h>
 #include <stdlib.h>
 
 struct MemChunk
diff --git a/libctru/source/gfx.c b/libctru/source/gfx.c
index 578cc32..6f9b94f 100644
--- a/libctru/source/gfx.c
+++ b/libctru/source/gfx.c
@@ -1,7 +1,10 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <3ds.h>
+#include <3ds/types.h>
+#include <3ds/gfx.h>
+#include <3ds/svc.h>
+#include <3ds/linear.h>
 
 GSP_FramebufferInfo topFramebufferInfo, bottomFramebufferInfo;
 
diff --git a/libctru/source/gpu/gpu.c b/libctru/source/gpu/gpu.c
index 97d14db..ccde474 100644
--- a/libctru/source/gpu/gpu.c
+++ b/libctru/source/gpu/gpu.c
@@ -4,7 +4,10 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <3ds.h>
+#include <3ds/types.h>
+#include <3ds/gpu/gpu.h>
+#include <3ds/gpu/gx.h>
+#include <3ds/gpu/shdr.h>
 
 u32* gpuCmdBuf;
 u32 gpuCmdBufSize;
diff --git a/libctru/source/gpu/shdr.c b/libctru/source/gpu/shdr.c
index a9d2de5..47ac389 100644
--- a/libctru/source/gpu/shdr.c
+++ b/libctru/source/gpu/shdr.c
@@ -4,8 +4,9 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <3ds.h>
-
+#include <3ds/types.h>
+#include <3ds/gpu/gpu.h>
+#include <3ds/gpu/shdr.h>
 
 //please don't feed this an invalid SHBIN
 DVLB_s* SHDR_ParseSHBIN(u32* shbinData, u32 shbinSize)
diff --git a/libctru/source/initSystem.c b/libctru/source/initSystem.c
index 039f862..7d6c222 100644
--- a/libctru/source/initSystem.c
+++ b/libctru/source/initSystem.c
@@ -1,6 +1,7 @@
 #include <sys/iosupport.h>
 #include <string.h>
-#include <3ds.h>
+#include <3ds/types.h>
+#include <3ds/svc.h>
 
 // System globals we define here
 int __system_argc;
diff --git a/libctru/source/os.c b/libctru/source/os.c
index e2677ed..f622105 100644
--- a/libctru/source/os.c
+++ b/libctru/source/os.c
@@ -1,4 +1,7 @@
-#include <3ds.h>
+#include <3ds/types.h>
+#include <3ds/os.h>
+#include <3ds/svc.h>
+
 
 #define TICKS_PER_MSEC 268123.480
 
diff --git a/libctru/source/sdmc_dev.c b/libctru/source/sdmc_dev.c
index 1450574..27efc49 100644
--- a/libctru/source/sdmc_dev.c
+++ b/libctru/source/sdmc_dev.c
@@ -6,7 +6,11 @@
 #include <sys/param.h>
 
 #include <string.h>
-#include <3ds.h>
+#include <3ds/types.h>
+#include <3ds/sdmc.h>
+#include <3ds/services/fs.h>
+
+
 
 /*! @internal
  *
diff --git a/libctru/source/services/ac.c b/libctru/source/services/ac.c
index 9e957c3..3579a21 100644
--- a/libctru/source/services/ac.c
+++ b/libctru/source/services/ac.c
@@ -1,5 +1,8 @@
 #include <stdlib.h>
-#include <3ds.h>
+#include <3ds/types.h>
+#include <3ds/svc.h>
+#include <3ds/srv.h>
+#include <3ds/services/ac.h>
 
 static Handle acHandle;
 
diff --git a/libctru/source/services/am.c b/libctru/source/services/am.c
index dc16ba9..4105e89 100644
--- a/libctru/source/services/am.c
+++ b/libctru/source/services/am.c
@@ -1,5 +1,8 @@
 #include <stdlib.h>
-#include <3ds.h>
+#include <3ds/types.h>
+#include <3ds/svc.h>
+#include <3ds/srv.h>
+#include <3ds/services/am.h>
 
 static Handle amHandle = 0;
 
diff --git a/libctru/source/services/apt.c b/libctru/source/services/apt.c
index 242abc1..c6ea5f0 100644
--- a/libctru/source/services/apt.c
+++ b/libctru/source/services/apt.c
@@ -4,7 +4,12 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <3ds.h>
+#include <3ds/types.h>
+#include <3ds/svc.h>
+#include <3ds/srv.h>
+#include <3ds/services/apt.h>
+#include <3ds/services/gsp.h>
+
 
 #define APT_HANDLER_STACKSIZE (0x1000)
 
diff --git a/libctru/source/services/cfgnor.c b/libctru/source/services/cfgnor.c
index 2041b99..e467655 100644
--- a/libctru/source/services/cfgnor.c
+++ b/libctru/source/services/cfgnor.c
@@ -1,5 +1,8 @@
 #include <stdlib.h>
-#include <3ds.h>
+#include <3ds/types.h>
+#include <3ds/svc.h>
+#include <3ds/srv.h>
+#include <3ds/services/cfgnor.h>
 
 Handle CFGNOR_handle = 0;
 
diff --git a/libctru/source/services/cfgu.c b/libctru/source/services/cfgu.c
index 14ac5c4..c28a6cc 100644
--- a/libctru/source/services/cfgu.c
+++ b/libctru/source/services/cfgu.c
@@ -1,5 +1,8 @@
 #include <stdlib.h>
-#include <3ds.h>
+#include <3ds/types.h>
+#include <3ds/svc.h>
+#include <3ds/srv.h>
+#include <3ds/services/cfgu.h>
 
 static Handle CFGU_handle = 0;
 
diff --git a/libctru/source/services/csnd.c b/libctru/source/services/csnd.c
index 77b1686..52f95ec 100644
--- a/libctru/source/services/csnd.c
+++ b/libctru/source/services/csnd.c
@@ -1,6 +1,10 @@
 #include <stdlib.h>
 #include <string.h>
-#include <3ds.h>
+#include <3ds/types.h>
+#include <3ds/svc.h>
+#include <3ds/srv.h>
+#include <3ds/os.h>
+#include <3ds/services/csnd.h>
 
 //See here regarding CSND shared-mem commands, etc: http://3dbrew.org/wiki/CSND_Shared_Memory
 
diff --git a/libctru/source/services/fs.c b/libctru/source/services/fs.c
index 6c75a51..cec30d1 100644
--- a/libctru/source/services/fs.c
+++ b/libctru/source/services/fs.c
@@ -1,5 +1,8 @@
 #include <string.h>
-#include <3ds.h>
+#include <3ds/types.h>
+#include <3ds/svc.h>
+#include <3ds/srv.h>
+#include <3ds/services/fs.h>
 
 /*! @internal
  *
diff --git a/libctru/source/services/gsp.c b/libctru/source/services/gsp.c
index 7240fbc..9a88c3a 100644
--- a/libctru/source/services/gsp.c
+++ b/libctru/source/services/gsp.c
@@ -4,7 +4,10 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <3ds.h>
+#include <3ds/types.h>
+#include <3ds/svc.h>
+#include <3ds/srv.h>
+#include <3ds/services/gsp.h>
 
 #define GSP_EVENT_STACK_SIZE 0x1000
 
diff --git a/libctru/source/services/gx.c b/libctru/source/services/gx.c
index 3e79fa0..4257710 100644
--- a/libctru/source/services/gx.c
+++ b/libctru/source/services/gx.c
@@ -3,7 +3,11 @@
 */
 
 #include <stdlib.h>
-#include <3ds.h>
+#include <3ds/types.h>
+#include <3ds/svc.h>
+#include <3ds/srv.h>
+#include <3ds/gpu/gx.h>
+#include <3ds/services/gsp.h>
 
 u32* gxCmdBuf;
 
diff --git a/libctru/source/services/hid.c b/libctru/source/services/hid.c
index d48f30c..384daad 100644
--- a/libctru/source/services/hid.c
+++ b/libctru/source/services/hid.c
@@ -3,7 +3,12 @@
 */
 #include <stdlib.h>
 #include <string.h>
-#include <3ds.h>
+#include <3ds/types.h>
+#include <3ds/svc.h>
+#include <3ds/srv.h>
+#include <3ds/services/apt.h>
+#include <3ds/services/hid.h>
+#include <3ds/services/irrst.h>
 
 Handle hidHandle;
 Handle hidMemHandle;
diff --git a/libctru/source/services/httpc.c b/libctru/source/services/httpc.c
index 00cb8a7..e299b8d 100644
--- a/libctru/source/services/httpc.c
+++ b/libctru/source/services/httpc.c
@@ -1,5 +1,8 @@
 #include <string.h>
-#include <3ds.h>
+#include <3ds/types.h>
+#include <3ds/svc.h>
+#include <3ds/srv.h>
+#include <3ds/services/httpc.h>
 
 Handle __httpc_servhandle = 0;
 
diff --git a/libctru/source/services/ir.c b/libctru/source/services/ir.c
index 22ec39a..874319b 100644
--- a/libctru/source/services/ir.c
+++ b/libctru/source/services/ir.c
@@ -1,6 +1,9 @@
 #include <stdlib.h>
 #include <string.h>
-#include <3ds.h>
+#include <3ds/types.h>
+#include <3ds/svc.h>
+#include <3ds/srv.h>
+#include <3ds/services/ir.h>
 
 static Handle iru_handle=0;
 static Handle iru_sharedmem_handle=0;
diff --git a/libctru/source/services/irrst.c b/libctru/source/services/irrst.c
index c7a54ff..1536640 100644
--- a/libctru/source/services/irrst.c
+++ b/libctru/source/services/irrst.c
@@ -3,7 +3,10 @@
 */
 #include <stdlib.h>
 #include <string.h>
-#include <3ds.h>
+#include <3ds/types.h>
+#include <3ds/svc.h>
+#include <3ds/srv.h>
+#include <3ds/services/irrst.h>
 
 Handle irrstHandle;
 Handle irrstMemHandle;
diff --git a/libctru/source/services/mic.c b/libctru/source/services/mic.c
index 463f94d..da30a8d 100644
--- a/libctru/source/services/mic.c
+++ b/libctru/source/services/mic.c
@@ -1,6 +1,9 @@
 #include <stdlib.h>
 #include <string.h>
-#include <3ds.h>
+#include <3ds/types.h>
+#include <3ds/svc.h>
+#include <3ds/srv.h>
+#include <3ds/services/mic.h>
 
 //See also: http://3dbrew.org/wiki/MIC_Services
 
diff --git a/libctru/source/services/mvd.c b/libctru/source/services/mvd.c
index ac3190f..89fd732 100644
--- a/libctru/source/services/mvd.c
+++ b/libctru/source/services/mvd.c
@@ -4,7 +4,12 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <3ds.h>
+#include <3ds/types.h>
+#include <3ds/svc.h>
+#include <3ds/srv.h>
+#include <3ds/os.h>
+#include <3ds/linear.h>
+#include <3ds/services/mvd.h>
 
 Handle mvdstdHandle;
 static u32 mvdstdInitialized = 0;
diff --git a/libctru/source/services/ns.c b/libctru/source/services/ns.c
index ffd7294..7b36552 100644
--- a/libctru/source/services/ns.c
+++ b/libctru/source/services/ns.c
@@ -1,5 +1,8 @@
 #include <stdlib.h>
-#include <3ds.h>
+#include <3ds/types.h>
+#include <3ds/svc.h>
+#include <3ds/srv.h>
+#include <3ds/services/ns.h>
 
 static Handle nsHandle;
 
diff --git a/libctru/source/services/pm.c b/libctru/source/services/pm.c
index 6c74ed2..7a5fdfd 100644
--- a/libctru/source/services/pm.c
+++ b/libctru/source/services/pm.c
@@ -1,6 +1,9 @@
 #include <stdlib.h>
 #include <string.h>
-#include <3ds.h>
+#include <3ds/types.h>
+#include <3ds/svc.h>
+#include <3ds/srv.h>
+#include <3ds/services/pm.h>
 
 static Handle pmHandle;
 
diff --git a/libctru/source/services/ps.c b/libctru/source/services/ps.c
index 6ea4fb2..f850954 100644
--- a/libctru/source/services/ps.c
+++ b/libctru/source/services/ps.c
@@ -1,11 +1,14 @@
 #include <stdlib.h>
-#include <3ds.h>
+#include <3ds/types.h>
+#include <3ds/svc.h>
+#include <3ds/srv.h>
+#include <3ds/services/ps.h>
 
 static Handle psHandle;
 
 Result psInit()
 {
-	return srvGetServiceHandle(&psHandle, "ps:ps");	
+	return srvGetServiceHandle(&psHandle, "ps:ps");
 }
 
 Result psExit()
@@ -17,7 +20,7 @@ Result PS_EncryptDecryptAes(u32 size, u8* in, u8* out, u32 aes_algo, u32 key_typ
 {
 	Result ret = 0;
 	u32 *cmdbuf = getThreadCommandBuffer();
-	
+
 	u32 *_iv = (u32*)iv;
 
 	cmdbuf[0] = 0x000401C4;
@@ -32,14 +35,14 @@ Result PS_EncryptDecryptAes(u32 size, u8* in, u8* out, u32 aes_algo, u32 key_typ
 	cmdbuf[9] = (u32)in;
 	cmdbuf[10] = (size << 0x8) | 0x14;
 	cmdbuf[11] = (u32)out;
-	
+
 	if((ret = svcSendSyncRequest(psHandle))!=0)return ret;
 
 	_iv[0] = cmdbuf[2];
 	_iv[1] = cmdbuf[3];
 	_iv[2] = cmdbuf[4];
 	_iv[3] = cmdbuf[5];
-	
+
 	return (Result)cmdbuf[1];
 }
 
@@ -47,7 +50,7 @@ Result PS_EncryptSignDecryptVerifyAesCcm(u8* in, u32 in_size, u8* out, u32 out_s
 {
 	Result ret = 0;
 	u32 *cmdbuf = getThreadCommandBuffer();
-	
+
 	u32 *_nonce = (u32*)nonce;
 
 	cmdbuf[0] = 0x00050284;
@@ -65,9 +68,9 @@ Result PS_EncryptSignDecryptVerifyAesCcm(u8* in, u32 in_size, u8* out, u32 out_s
 	cmdbuf[9] = (u32)in;
 	cmdbuf[10] = (out_size << 0x8) | 0x14;
 	cmdbuf[11] = (u32)out;
-	
+
 	if((ret = svcSendSyncRequest(psHandle))!=0)return ret;
-	
+
 	return (Result)cmdbuf[1];
 }
 
@@ -75,13 +78,13 @@ Result PS_GetLocalFriendCodeSeed(u64* seed)
 {
 	Result ret = 0;
 	u32 *cmdbuf = getThreadCommandBuffer();
-	
+
 	cmdbuf[0] = 0x000A0000;
-	
+
 	if((ret = svcSendSyncRequest(psHandle))!=0)return ret;
 
 	*seed = (u64)cmdbuf[2] | (u64)cmdbuf[3] << 32;
-	
+
 	return (Result)cmdbuf[1];
 }
 
@@ -89,12 +92,12 @@ Result PS_GetDeviceId(u32* device_id)
 {
 	Result ret = 0;
 	u32 *cmdbuf = getThreadCommandBuffer();
-	
+
 	cmdbuf[0] = 0x000B0000;
-	
+
 	if((ret = svcSendSyncRequest(psHandle))!=0)return ret;
 
 	*device_id = cmdbuf[2];
-	
+
 	return (Result)cmdbuf[1];
-}
\ No newline at end of file
+}
diff --git a/libctru/source/services/ptm.c b/libctru/source/services/ptm.c
index e9abfb6..1c30206 100644
--- a/libctru/source/services/ptm.c
+++ b/libctru/source/services/ptm.c
@@ -1,5 +1,9 @@
 #include <stdlib.h>
-#include <3ds.h>
+#include <3ds/types.h>
+#include <3ds/svc.h>
+#include <3ds/srv.h>
+#include <3ds/services/ptm.h>
+
 
 static Handle ptmHandle;
 
diff --git a/libctru/source/services/soc/soc_common.h b/libctru/source/services/soc/soc_common.h
index f5cfe96..5cf5dee 100644
--- a/libctru/source/services/soc/soc_common.h
+++ b/libctru/source/services/soc/soc_common.h
@@ -1,7 +1,10 @@
 #pragma once
 
 #include <string.h>
-#include <3ds.h>
+#include <3ds/types.h>
+#include <3ds/svc.h>
+#include <3ds/srv.h>
+#include <3ds/services/soc.h>
 
 extern Handle	SOCU_handle;
 extern int	SOCU_errno;
diff --git a/libctru/source/srv.c b/libctru/source/srv.c
index ad6e510..8f9d524 100644
--- a/libctru/source/srv.c
+++ b/libctru/source/srv.c
@@ -3,7 +3,9 @@
 */
 
 #include <string.h>
-#include <3ds.h>
+#include <3ds/types.h>
+#include <3ds/srv.h>
+#include <3ds/svc.h>
 
 
 /*