Reorganize includes

libctru/include/3ds.h

@@ -9,21 +9,23 @@ extern "C" {
 #include <3ds/svc.h>
 #include <3ds/srv.h>
 #include <3ds/os.h>
-#include <3ds/AC.h>
-#include <3ds/APT.h>
-#include <3ds/CFGNOR.h>
-#include <3ds/CSND.h>
-#include <3ds/FS.h>
 #include <3ds/gfx.h>
-#include <3ds/GSP.h>
-#include <3ds/GX.h>
-#include <3ds/GPU.h>
-#include <3ds/HID.h>
-#include <3ds/HTTPC.h>
-#include <3ds/IR.h>
-#include <3ds/PTM.h>
-#include <3ds/SHDR.h>
-#include <3ds/SOC.h>
+
+#include <3ds/services/ac.h>
+#include <3ds/services/apt.h>
+#include <3ds/services/cfgnor.h>
+#include <3ds/services/csnd.h>
+#include <3ds/services/fs.h>
+#include <3ds/services/gsp.h>
+#include <3ds/services/hid.h>
+#include <3ds/services/httpc.h>
+#include <3ds/services/ir.h>
+#include <3ds/services/ptm.h>
+#include <3ds/services/soc.h>
+
+#include <3ds/gpu/gx.h>
+#include <3ds/gpu/gpu.h>
+#include <3ds/gpu/shdr.h>
 
 #ifdef __cplusplus
 }

libctru/source/gfx.c

@@ -1,12 +1,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-
-#include <3ds/types.h>
-#include <3ds/GSP.h>
-#include <3ds/GX.h>
-#include <3ds/svc.h>
-#include <3ds/gfx.h>
+#include <3ds.h>
 
 GSP_FramebufferInfo topFramebufferInfo, bottomFramebufferInfo;
 

libctru/source/gpu/gpu.c

@@ -4,11 +4,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <3ds/types.h>
-#include <3ds/GSP.h>
-#include <3ds/GX.h>
-#include <3ds/GPU.h>
-#include <3ds/svc.h>
+#include <3ds.h>
 
 u32* gpuCmdBuf;
 u32 gpuCmdBufSize;

libctru/source/gpu/shdr.c

@@ -4,12 +4,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <3ds/types.h>
-#include <3ds/GSP.h>
-#include <3ds/GX.h>
-#include <3ds/GPU.h>
-#include <3ds/SHDR.h>
-#include <3ds/svc.h>
+#include <3ds.h>
 
 
 //please don't feed this an invalid SHBIN

libctru/source/initSystem.c

@@ -1,7 +1,6 @@
 #include <sys/iosupport.h>
-#include <3ds/types.h>
-#include <3ds/svc.h>
 #include <string.h>
+#include <3ds.h>
 
 // System globals we define here
 int __system_argc;

libctru/source/os.c

@@ -1,6 +1,4 @@
-#include <3ds/types.h>
-#include <3ds/svc.h>
-#include <3ds/os.h>
+#include <3ds.h>
 
 u32 osConvertVirtToPhys(u32 vaddr)
 {

libctru/source/services/ac.c

@@ -1,8 +1,5 @@
 #include <stdlib.h>
-#include <3ds/types.h>
-#include <3ds/AC.h>
-#include <3ds/svc.h>
-#include <3ds/srv.h>
+#include <3ds.h>
 
 static Handle acHandle;
 

libctru/source/services/apt.c

@@ -4,11 +4,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <3ds/types.h>
-#include <3ds/srv.h>
-#include <3ds/APT.h>
-#include <3ds/GSP.h>
-#include <3ds/svc.h>
+#include <3ds.h>
 
 #define APT_HANDLER_STACKSIZE (0x1000)
 

libctru/source/services/cfgnor.c

@@ -1,8 +1,5 @@
 #include <stdlib.h>
-#include <3ds/types.h>
-#include <3ds/svc.h>
-#include <3ds/srv.h>
-#include <3ds/CFGNOR.h>
+#include <3ds.h>
 
 Handle CFGNOR_handle = 0;
 

libctru/source/services/csnd.c

@@ -1,10 +1,6 @@
 #include <stdlib.h>
 #include <string.h>
-#include <3ds/types.h>
-#include <3ds/os.h>
-#include <3ds/svc.h>
-#include <3ds/srv.h>
-#include <3ds/CSND.h>
+#include <3ds.h>
 
 //See here regarding CSND shared-mem commands, etc: http://3dbrew.org/wiki/CSND_Shared_Memory
 

libctru/source/services/gsp.c

@@ -4,10 +4,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <3ds/types.h>
-#include <3ds/GSP.h>
-#include <3ds/svc.h>
-#include <3ds/srv.h>
+#include <3ds.h>
 
 #define GSP_EVENT_STACK_SIZE 0x1000
 

libctru/source/services/gx.c

@@ -3,10 +3,7 @@
 */
 
 #include <stdlib.h>
-#include <3ds/types.h>
-#include <3ds/GSP.h>
-#include <3ds/GX.h>
-#include <3ds/svc.h>
+#include <3ds.h>
 
 Result GX_RequestDma(u32* gxbuf, u32* src, u32* dst, u32 length)
 {

libctru/source/services/hid.c

@@ -3,10 +3,7 @@
 */
 #include <stdlib.h>
 #include <string.h>
-#include <3ds/types.h>
-#include <3ds/HID.h>
-#include <3ds/srv.h>
-#include <3ds/svc.h>
+#include <3ds.h>
 
 Handle hidHandle;
 Handle hidMemHandle;

libctru/source/services/httpc.c

@@ -1,7 +1,5 @@
 #include <string.h>
-#include <3ds/types.h>
-#include <3ds/HTTPC.h>
-#include <3ds/svc.h>
+#include <3ds.h>
 
 Result HTTPC_Initialize(Handle handle)
 {

libctru/source/services/ir.c

@@ -1,9 +1,6 @@
 #include <stdlib.h>
 #include <string.h>
-#include <3ds/types.h>
-#include <3ds/svc.h>
-#include <3ds/srv.h>
-#include <3ds/IR.h>
+#include <3ds.h>
 
 static Handle iru_handle=0;
 static Handle iru_sharedmem_handle=0;

libctru/source/services/ptm.c

@@ -1,8 +1,5 @@
 #include <stdlib.h>
-#include <3ds/types.h>
-#include <3ds/svc.h>
-#include <3ds/srv.h>
-#include <3ds/PTM.h>
+#include <3ds.h>
 
 static Handle ptmHandle;
 

libctru/source/services/soc.c

@@ -1,8 +1,3 @@
-#include <3ds/types.h>
-#include <3ds/svc.h>
-#include <3ds/srv.h>
-#include <3ds/SOC.h>
-
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netdb.h>
@@ -10,6 +5,7 @@
 #include <stdarg.h>
 #include <errno.h>
 #include <string.h>
+#include <3ds.h>
 
 Handle SOCU_handle = 0;
 static int SOCU_errno = 0;

libctru/source/srv.c

@@ -3,9 +3,7 @@
 */
 
 #include <string.h>
-#include <3ds/types.h>
-#include <3ds/srv.h>
-#include <3ds/svc.h>
+#include <3ds.h>
 
 
 /*