Moved header files from ctr/ to 3ds/.

examples/arm11u/source/main.c

@@ -1,13 +1,10 @@
-#include <stdlib.h>
+#include <3ds/types.h>
-#include <stdio.h>
+#include <3ds/srv.h>
-#include <string.h>
+#include <3ds/APT.h>
-#include <ctr/types.h>
+#include <3ds/GSP.h>
-#include <ctr/srv.h>
+#include <3ds/GX.h>
-#include <ctr/APT.h>
+#include <3ds/HID.h>
-#include <ctr/GSP.h>
+#include <3ds/svc.h>
-#include <ctr/GX.h>
-#include <ctr/HID.h>
-#include <ctr/svc.h>
 #include "costable.h"
 
 u8* gspHeap;

examples/gpu/source/main.c

@@ -1,15 +1,12 @@
-#include <stdlib.h>
+#include <3ds/types.h>
-#include <stdio.h>
+#include <3ds/srv.h>
-#include <string.h>
+#include <3ds/APT.h>
-#include <ctr/types.h>
+#include <3ds/GSP.h>
-#include <ctr/srv.h>
+#include <3ds/GX.h>
-#include <ctr/APT.h>
+#include <3ds/GPU.h>
-#include <ctr/GSP.h>
+#include <3ds/HID.h>
-#include <ctr/GX.h>
+#include <3ds/SHDR.h>
-#include <ctr/GPU.h>
+#include <3ds/svc.h>
-#include <ctr/HID.h>
-#include <ctr/SHDR.h>
-#include <ctr/svc.h>
 #include "costable.h"
 #include "test_shbin.h"
 

examples/sdmc/source/main.c

@@ -1,14 +1,11 @@
-#include <stdlib.h>
+#include <3ds/types.h>
-#include <stdio.h>
+#include <3ds/srv.h>
-#include <string.h>
+#include <3ds/APT.h>
-#include <ctr/types.h>
+#include <3ds/GSP.h>
-#include <ctr/srv.h>
+#include <3ds/GX.h>
-#include <ctr/APT.h>
+#include <3ds/HID.h>
-#include <ctr/GSP.h>
+#include <3ds/FS.h>
-#include <ctr/GX.h>
+#include <3ds/svc.h>
-#include <ctr/HID.h>
-#include <ctr/FS.h>
-#include <ctr/svc.h>
 #include "costable.h"
 
 u8* gspHeap;

libctru/source/AC.c

@@ -1,11 +1,8 @@
 #include <stdlib.h>
-#include <stdio.h>
+#include <3ds/types.h>
-#include <string.h>
+#include <3ds/AC.h>
-#include <ctr/types.h>
+#include <3ds/svc.h>
-
+#include <3ds/srv.h>
-#include <ctr/AC.h>
-#include <ctr/svc.h>
-#include <ctr/srv.h>
 
 Result ACU_cmd1(Handle servhandle, u32 *ptr)//Unknown what this cmd does at the time of writing. (ptr=0x200-byte outbuf)
 {

libctru/source/APT.c

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

libctru/source/CFGNOR.c

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

libctru/source/CSND.c

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

libctru/source/FS.c

@@ -1,9 +1,7 @@
-#include <stdlib.h>
+#include <3ds/types.h>
-#include <stdio.h>
+#include <3ds/FS.h>
-#include <string.h>
+#include <3ds/svc.h>
-#include <ctr/types.h>
+
-#include <ctr/FS.h>
-#include <ctr/svc.h>
 
 Result FSUSER_Initialize(Handle handle)
 {

libctru/source/GPU.c

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

libctru/source/GSP.c

@@ -1,10 +1,8 @@
 #include <stdlib.h>
-#include <stdio.h>
+#include <3ds/types.h>
-#include <string.h>
+#include <3ds/GSP.h>
-#include <ctr/types.h>
+#include <3ds/svc.h>
-#include <ctr/GSP.h>
+#include <3ds/srv.h>
-#include <ctr/svc.h>
-#include <ctr/srv.h>
 
 Handle gspGpuHandle=0;
 

libctru/source/GX.c

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

libctru/source/HID.c

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

libctru/source/HTTPC.c

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

libctru/source/IR.c

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

libctru/source/OS.c

@@ -1,9 +1,7 @@
-#include <stdlib.h>
+#include <3ds/types.h>
-#include <stdio.h>
+#include <3ds/svc.h>
-#include <string.h>
+#include <3ds/OS.h>
-#include <ctr/types.h>
+
-#include <ctr/svc.h>
-#include <ctr/OS.h>
 
 u32 OS_ConvertVaddr2Physaddr(u32 vaddr)
 {

libctru/source/SHDR.c

@@ -1,12 +1,11 @@
 #include <stdlib.h>
-#include <stdio.h>
+#include <3ds/types.h>
-#include <string.h>
+#include <3ds/GSP.h>
-#include <ctr/types.h>
+#include <3ds/GX.h>
-#include <ctr/GSP.h>
+#include <3ds/GPU.h>
-#include <ctr/GX.h>
+#include <3ds/SHDR.h>
-#include <ctr/GPU.h>
+#include <3ds/svc.h>
-#include <ctr/SHDR.h>
+
-#include <ctr/svc.h>
 
 //please don't feed this an invalid SHBIN
 DVLB_s* SHDR_ParseSHBIN(u32* shbinData, u32 shbinSize)

libctru/source/SOC.c

@@ -1,11 +1,7 @@
-#include <unistd.h>
+#include <3ds/types.h>
-#include <stdlib.h>
+#include <3ds/svc.h>
-#include <stdint.h>
+#include <3ds/srv.h>
-#include <string.h>
+#include <3ds/SOC.h>
-#include <ctr/types.h>
-#include <ctr/svc.h>
-#include <ctr/srv.h>
-#include <ctr/SOC.h>
 
 #include <sys/socket.h>
 #include <netinet/in.h>

libctru/source/gpuResetSequence.c

@@ -1,7 +1,4 @@
-#include <stdlib.h>
+#include <3ds/types.h>
-#include <stdio.h>
-#include <string.h>
-#include <ctr/types.h>
 
 u32 gpuResetSequence[]=
 	{0x000F01D4, 0x00000001,

libctru/source/srv.c

@@ -1,9 +1,6 @@
-#include <stdlib.h>
+#include <3ds/types.h>
-#include <stdio.h>
+#include <3ds/srv.h>
-#include <string.h>
+#include <3ds/svc.h>
-#include <ctr/types.h>
-#include <ctr/srv.h>
-#include <ctr/svc.h>
 
 Handle srvHandle=0;