5 files changed, 13 insertions, 7 deletions
diff --git a/include/battle_tower.h b/include/battle_tower.h
index 25b439c1b..a3bd3b6e8 100644
--- a/include/battle_tower.h
+++ b/include/battle_tower.h
@@ -2,5 +2,6 @@
 #define GUARD_BATTLE_TOWER_H
 
 u16 sub_8164FCC(u8, u8);
+void sub_81659DC(void *a0, void *a1);
 
 #endif //GUARD_BATTLE_TOWER_H
diff --git a/include/gba/gba.h b/include/gba/gba.h
index 42ae3cdde..19b65dbca 100644
--- a/include/gba/gba.h
+++ b/include/gba/gba.h
@@ -7,5 +7,6 @@
 #include "gba/multiboot.h"
 #include "gba/syscall.h"
 #include "gba/macro.h"
+#include "gba/libc.h"
 
 #endif // GUARD_GBA_GBA_H
diff --git a/include/gba/libc.h b/include/gba/libc.h
new file mode 100644
index 000000000..9ed82ac28
--- /dev/null
+++ b/include/gba/libc.h
@@ -0,0 +1,10 @@
+#ifndef GUARD_LIBC_H
+#define GUARD_LIBC_H
+
+void *memset(void *dst, int val, size_t size);
+void *memcpy(void *dst, const void *src, size_t size);
+int strcmp(const char *s1, const char *s2);
+char *strcpy(char *dst0, const char *src0);
+#define abs(x) ((x) >= 0 ? (x) : -(x))
+
+#endif //GUARD_LIBC_H
diff --git a/include/global.h b/include/global.h
index ad4f23c2b..f3c58a3d8 100644
--- a/include/global.h
+++ b/include/global.h
@@ -11,13 +11,6 @@
 #define asm_comment(x) asm volatile("@ -- " x " -- ")
 #define asm_unified(x) asm(".syntax unified\n" x "\n.syntax divided")
 
-#if defined (__APPLE__) || defined (__CYGWIN__)
-void *memset(void *, int, size_t);
-void *memcpy(void *, const void *, size_t);
-int strcmp(const char *s1, const char *s2);
-char* strcpy(char *dst0, const char *src0);
-#endif // __APPLE__
-
 #define ARRAY_COUNT(array) (sizeof(array) / sizeof((array)[0]))
 
 // useful math macros
diff --git a/include/mystery_event_script.h b/include/mystery_event_script.h
index ab23a8d00..1fad6c485 100644
--- a/include/mystery_event_script.h
+++ b/include/mystery_event_script.h
@@ -4,5 +4,6 @@
 u32 RunMysteryEventScript(u8 *);
 void SetMysteryEventScriptStatus(u32 val);
 u16 GetRecordMixingGift(void);
+u16 sub_81539D4(void);
 
 #endif // GUARD_MYSTERY_EVENT_SCRIPT_H