stop polluting 3ds headers with extra system headers

libctru/include/3ds/services/fs.h

@@ -1,5 +1,4 @@
 #pragma once
-#include <string.h>
 #include <3ds/types.h>
 
 /*! @file FS.h
@@ -128,25 +127,11 @@ typedef struct
   u64 fileSize;        //!< file size
 } FS_dirent;
 
-/*! Create an FS_path from a type and data pointer.
- *
- *  @param[in] type Path type.
- *  @param[in] path Pointer to path data.
- *
- *  @returns FS_path
- *
- *  @sa FS_pathType
- */
-static inline FS_path
-FS_makePath(FS_pathType type,
-            const char  *path)
-{
-	return (FS_path){type, strlen(path)+1, (const u8*)path};
-}
-
 Result fsInit(void);
 Result fsExit(void);
 
+FS_path FS_makePath(FS_pathType type, const char  *path);
+
 Result FSUSER_Initialize(Handle* handle);
 Result FSUSER_OpenArchive(Handle* handle, FS_archive* archive);
 Result FSUSER_OpenDirectory(Handle* handle, Handle* out, FS_archive archive, FS_path dirLowPath);

libctru/include/3ds/types.h

@@ -4,7 +4,6 @@
 
 #pragma once
 
-#include <stdlib.h>
 #include <stdint.h>
 #include <stdbool.h>
 #include <stddef.h>

libctru/source/allocator/linear.cpp

@@ -1,5 +1,6 @@
 #include <3ds.h>
 #include <3ds/util/rbtree.h>
+
 #include "mem_pool.h"
 
 extern u32 __linear_heap, __linear_heap_size;

libctru/source/allocator/mem_pool.h

@@ -1,5 +1,6 @@
 #pragma once
 #include <3ds.h>
+#include <stdlib.h>
 
 struct MemChunk
 {

libctru/source/sdmc_dev.c

@@ -2,6 +2,7 @@
 #include <errno.h>
 #include <unistd.h>
 #include <sys/iosupport.h>
+#include <string.h>
 #include <3ds.h>
 
 /*! @internal

libctru/source/services/fs.c

@@ -14,6 +14,22 @@ static Handle fsuHandle;
 // used to determine whether or not we should do FSUSER_Initialize on fsuHandle
 Handle __get_handle_from_list(char* name);
 
+/*! Create an FS_path from a type and data pointer.
+ *
+ *  @param[in] type Path type.
+ *  @param[in] path Pointer to path data.
+ *
+ *  @returns FS_path
+ *
+ *  @sa FS_pathType
+ */
+FS_path
+FS_makePath(FS_pathType type,
+            const char  *path)
+{
+	return (FS_path){type, strlen(path)+1, (const u8*)path};
+}
+
 /*! Initialize FS service
  *
  *  @returns error

libctru/source/services/httpc.c

@@ -1,3 +1,4 @@
+#include <string.h>
 #include <3ds.h>
 
 Handle __httpc_servhandle = 0;

libctru/source/services/pm.c

@@ -1,4 +1,5 @@
 #include <stdlib.h>
+#include <string.h>
 #include <3ds.h>
 
 static Handle pmHandle;

libctru/source/services/soc/soc_common.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <string.h>
 #include <3ds.h>
 
 extern Handle	SOCU_handle;