From 40dfc07e540e9b32504cd04b94920041f08b5229 Mon Sep 17 00:00:00 2001
From: chaoskagami <chaos.kagami@gmail.com>
Date: Mon, 3 Oct 2016 21:52:15 -0400
Subject: [PATCH] More loader cleanup

---
 external/loader/source/internal.h |  8 --------
 external/loader/source/interp.c   |  4 +++-
 external/loader/source/loader.c   |  4 +++-
 external/loader/source/logger.c   |  4 +++-
 external/loader/source/memory.c   | 13 +------------
 external/loader/source/memory.h   |  2 --
 external/loader/source/patcher.c  |  4 +++-
 external/loader/source/statics.c  |  2 +-
 8 files changed, 14 insertions(+), 27 deletions(-)
 delete mode 100644 external/loader/source/internal.h

diff --git a/external/loader/source/internal.h b/external/loader/source/internal.h
deleted file mode 100644
index ba61b2b..0000000
--- a/external/loader/source/internal.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef __INTERNAL_H
-#define __INTERNAL_H
-
-// These are libc builtins, so there's no need to carry an implementation here.
-void *memcpy(void *dest, const void *src, size_t len);
-size_t strlen(const char *string);
-
-#endif
diff --git a/external/loader/source/interp.c b/external/loader/source/interp.c
index e706cf8..e1c5001 100644
--- a/external/loader/source/interp.c
+++ b/external/loader/source/interp.c
@@ -4,7 +4,9 @@
 #include "patcher.h"
 #include "exheader.h"
 #include "fsldr.h"
-#include "internal.h"
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include "memory.h"
 #include "logger.h"
 
diff --git a/external/loader/source/loader.c b/external/loader/source/loader.c
index b753db4..23041c8 100644
--- a/external/loader/source/loader.c
+++ b/external/loader/source/loader.c
@@ -6,7 +6,9 @@
 #include "pxipm.h"
 #include "srvsys.h"
 #include <lzss.c>
-#include "internal.h"
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include "logger.h"
 
 // TODO - a lot of this is unecessarily verbose and shitty. Clean it up to be
diff --git a/external/loader/source/logger.c b/external/loader/source/logger.c
index f576273..6ff8856 100644
--- a/external/loader/source/logger.c
+++ b/external/loader/source/logger.c
@@ -1,7 +1,9 @@
 #include <3ds.h>
 #include "patcher.h"
 #include "fsldr.h"
-#include "internal.h"
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include "memory.h"
 
 #ifndef PATH_MAX
diff --git a/external/loader/source/memory.c b/external/loader/source/memory.c
index ab3d931..416492b 100644
--- a/external/loader/source/memory.c
+++ b/external/loader/source/memory.c
@@ -2,7 +2,7 @@
 #include <string.h>
 #include "patcher.h"
 #include "fsldr.h"
-#include "internal.h"
+#include <string.h>
 
 #ifndef PATH_MAX
 #define PATH_MAX 255
@@ -63,14 +63,3 @@ patchMemory(u8 *start, u32 size, const void *pattern, u32 patSize, int offset, c
 
     return i;
 }
-
-size_t
-strnlen(const char *string, size_t maxlen)
-{
-    size_t size;
-
-    for (size = 0; *string && size < maxlen; string++, size++)
-        ;
-
-    return size;
-}
diff --git a/external/loader/source/memory.h b/external/loader/source/memory.h
index f0c81e5..ec1f49f 100644
--- a/external/loader/source/memory.h
+++ b/external/loader/source/memory.h
@@ -1,9 +1,7 @@
 #ifndef __MEMORY_H
 #define __MEMORY_H
 
-//int memcmp(const void *buf1, const void *buf2, u32 size);
 u8 *memfind(u8 *startPos, u32 size, const void *pattern, u32 patternSize);
 u32 patchMemory(u8 *start, u32 size, const void *pattern, u32 patSize, int offset, const void *replace, u32 repSize, u32 count);
-size_t strnlen(const char *string, size_t maxlen);
 
 #endif
diff --git a/external/loader/source/patcher.c b/external/loader/source/patcher.c
index a94c2e8..0024bc7 100644
--- a/external/loader/source/patcher.c
+++ b/external/loader/source/patcher.c
@@ -3,7 +3,9 @@
 #include "patcher.h"
 #include "exheader.h"
 #include "fsldr.h"
-#include "internal.h"
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
 #include "memory.h"
 #include "logger.h"
 #include <patch_format.h>
diff --git a/external/loader/source/statics.c b/external/loader/source/statics.c
index 856f92f..e4c5dcd 100644
--- a/external/loader/source/statics.c
+++ b/external/loader/source/statics.c
@@ -5,7 +5,7 @@
 #include "fsreg.h"
 #include "pxipm.h"
 #include "srvsys.h"
-#include "internal.h"
+#include <string.h>
 #include "logger.h"
 
 extern char* fake_heap_start;
-- 
2.39.5