Renamed instances of msl_c -> MSL_C because

69 files changed, 13 insertions, 557 deletions

diff --git a/include/JSystem/J2DGraph/J2DPrint.h b/include/JSystem/J2DGraph/J2DPrint.h
index 4ce1e6acc0..d3a929b176 100644
--- a/include/JSystem/J2DGraph/J2DPrint.h
+++ b/include/JSystem/J2DGraph/J2DPrint.h
@@ -3,7 +3,7 @@
 
 #include "JSystem/J2DGraph/J2DTextBox.h"
 #include "JSystem/JUtility/TColor.h"
-#include "msl_c/MSL_Common/Src/printf.h"
+#include "MSL_C/MSL_Common/Src/printf.h"
 #include "dolphin/types.h"
 
 class J2DPrint {
diff --git a/include/JSystem/JUtility/JUTFont.h b/include/JSystem/JUtility/JUTFont.h
index 31de42a124..73580e83a7 100644
--- a/include/JSystem/JUtility/JUTFont.h
+++ b/include/JSystem/JUtility/JUTFont.h
@@ -2,7 +2,7 @@
 #define JUTFONT_H
 
 #include "JSystem/JUtility/TColor.h"
-#include "msl_c/MSL_Common/Src/string.h"
+#include "MSL_C/MSL_Common/Src/string.h"
 #include "dolphin/gx/GX.h"
 #include "dolphin/types.h"
 
diff --git a/include/MSL_C/MSL_Common/Src/char_io.h b/include/MSL_C/MSL_Common/Src/char_io.h
index 49a65ef8e2..7363bc22cd 100644
--- a/include/MSL_C/MSL_Common/Src/char_io.h
+++ b/include/MSL_C/MSL_Common/Src/char_io.h
@@ -1,7 +1,7 @@
 #ifndef MSL_COMMON_SRC_CHAR_IO_H
 #define MSL_COMMON_SRC_CHAR_IO_H
 
-#include "msl_c/MSL_Common/Src/ansi_files.h"
+#include "MSL_C/MSL_Common/Src/ansi_files.h"
 #include "dolphin/types.h"
 
 extern "C" int fputs(const char*, FILE*);
diff --git a/include/MSL_C/math.h b/include/MSL_C/math.h
index 991b8c6ce0..0de55c166d 100644
--- a/include/MSL_C/math.h
+++ b/include/MSL_C/math.h
@@ -1,7 +1,7 @@
 #ifndef MSL_MATH_H_
 #define MSL_MATH_H_
 
-#include "msl_c/MSL_Common/Src/float.h"
+#include "MSL_C/MSL_Common/Src/float.h"
 #include "dolphin/types.h"
 
 extern "C" {
diff --git a/include/MSL_C/string.h b/include/MSL_C/string.h
index ba74386deb..bbf8425561 100644
--- a/include/MSL_C/string.h
+++ b/include/MSL_C/string.h
@@ -4,7 +4,7 @@
 #include "Runtime.PPCEABI.H/__va_arg.h"
 #include "dolphin/types.h"
 
-// TODO: move to msl_c/
+// TODO: move to MSL_C/
 extern "C" {
 void memcpy(void*, const void*, s32);
 void* memset(void* dest, int ch, u32 count);
diff --git a/include/SSystem/SComponent/c_lib.h b/include/SSystem/SComponent/c_lib.h
index 890e8ea64c..6a3c1b295a 100644
--- a/include/SSystem/SComponent/c_lib.h
+++ b/include/SSystem/SComponent/c_lib.h
@@ -4,7 +4,7 @@
 #include "SSystem/SComponent/c_xyz.h"
 #include "dolphin/mtx/mtx.h"
 #include "dolphin/types.h"
-#include "msl_c/math.h"
+#include "MSL_C/math.h"
 
 inline bool cLib_IsZero(f32 f) {
     return fabsf(f) < 8e-11f;
diff --git a/include/SSystem/SComponent/c_m3d.h b/include/SSystem/SComponent/c_m3d.h
index 7f3113dd41..54f17b81cc 100644
--- a/include/SSystem/SComponent/c_m3d.h
+++ b/include/SSystem/SComponent/c_m3d.h
@@ -2,7 +2,7 @@
 #define C_M3D_H_
 
 #include "dolphin/types.h"
-#include "msl_c/math.h"
+#include "MSL_C/math.h"
 
 class cM3dGAab;
 class cM3dGCps;
diff --git a/include/SSystem/SComponent/c_xyz.h b/include/SSystem/SComponent/c_xyz.h
index bf9c092b8a..395540d746 100644
--- a/include/SSystem/SComponent/c_xyz.h
+++ b/include/SSystem/SComponent/c_xyz.h
@@ -3,7 +3,7 @@
 
 #include "dolphin/mtx/vec.h"
 #include "global.h"
-#include "msl_c/math.h"
+#include "MSL_C/math.h"
 
 struct cXyz : Vec {
     static const cXyz Zero;
diff --git a/include/d/save/d_save.h b/include/d/save/d_save.h
index 9c44102538..ea631aa5ef 100644
--- a/include/d/save/d_save.h
+++ b/include/d/save/d_save.h
@@ -1,8 +1,8 @@
 #ifndef D_SAVE_D_SAVE_H
 #define D_SAVE_D_SAVE_H
 
-#include "msl_c/MSL_Common/Src/printf.h"
-#include "msl_c/MSL_Common/Src/string.h"
+#include "MSL_C/MSL_Common/Src/printf.h"
+#include "MSL_C/MSL_Common/Src/string.h"
 #include "SSystem/SComponent/c_xyz.h"
 #include "dolphin/os/OS.h"
 #include "dolphin/types.h"
diff --git a/include/init.h b/include/init.h
index a112dfdc59..43827476d9 100644
--- a/include/init.h
+++ b/include/init.h
@@ -1,7 +1,7 @@
 #ifndef INIT_H
 #define INIT_H
 
-#include "msl_c/MSL_Common/Src/string.h"
+#include "MSL_C/MSL_Common/Src/string.h"
 #include "dolphin/types.h"
 
 #endif /* INIT_H */
diff --git a/include/m_Do/m_Do_printf.h b/include/m_Do/m_Do_printf.h
index 728a746356..ac80fa3050 100644
--- a/include/m_Do/m_Do_printf.h
+++ b/include/m_Do/m_Do_printf.h
@@ -1,8 +1,8 @@
 #ifndef M_DO_M_DO_PRINTF_H
 #define M_DO_M_DO_PRINTF_H
 
-#include "msl_c/MSL_Common/Src/char_io.h"
-#include "msl_c/MSL_Common/Src/printf.h"
+#include "MSL_C/MSL_Common/Src/char_io.h"
+#include "MSL_C/MSL_Common/Src/printf.h"
 #include "Runtime.PPCEABI.H/__va_arg.h"
 #include "dolphin/types.h"
 #include "m_Do/m_Do_main.h"
diff --git a/include/msl_c/MSL_Common/Src/FILE_POS.h b/include/msl_c/MSL_Common/Src/FILE_POS.h
deleted file mode 100644
index ca2e0688d8..0000000000
--- a/include/msl_c/MSL_Common/Src/FILE_POS.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef MSL_COMMON_SRC_FILE_POS_H
-#define MSL_COMMON_SRC_FILE_POS_H
-
-#include "dolphin/types.h"
-
-#endif /* MSL_COMMON_SRC_FILE_POS_H */
diff --git a/include/msl_c/MSL_Common/Src/abort_exit.h b/include/msl_c/MSL_Common/Src/abort_exit.h
deleted file mode 100644
index 2313c639cb..0000000000
--- a/include/msl_c/MSL_Common/Src/abort_exit.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef MSL_COMMON_SRC_ABORT_EXIT_H
-#define MSL_COMMON_SRC_ABORT_EXIT_H
-
-#include "dolphin/types.h"
-
-#endif /* MSL_COMMON_SRC_ABORT_EXIT_H */
diff --git a/include/msl_c/MSL_Common/Src/alloc.h b/include/msl_c/MSL_Common/Src/alloc.h
deleted file mode 100644
index c66afbcf9a..0000000000
--- a/include/msl_c/MSL_Common/Src/alloc.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef MSL_COMMON_SRC_ALLOC_H
-#define MSL_COMMON_SRC_ALLOC_H
-
-#include "dolphin/types.h"
-
-#endif /* MSL_COMMON_SRC_ALLOC_H */
diff --git a/include/msl_c/MSL_Common/Src/ansi_files.h b/include/msl_c/MSL_Common/Src/ansi_files.h
deleted file mode 100644
index 684a827853..0000000000
--- a/include/msl_c/MSL_Common/Src/ansi_files.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef MSL_COMMON_SRC_ANSI_FILES_H
-#define MSL_COMMON_SRC_ANSI_FILES_H
-
-#include "dolphin/types.h"
-
-struct FILE {
-    /* 0x00 */ u32 handle;
-    /* 0x04 */ u32 file_mode;
-    /* 0x08 */ u32 file_state;
-    /* 0x0C */ u8 flag;
-    /* 0x0D */ char char_buffer;
-    /* 0x0E */ char char_buffer_2;
-    /* 0x0F */ char ungetc_buffer[2];
-    /* 0x12 */ u16 ungetc_wide_buffer[2];
-    /* 0x18 */ u32 position;
-    /* 0x1C */ u8* buffer;
-    /* 0x20 */ u32 buffer_size;
-    /* 0x24 */ u8* buffer_ptr;
-    /* 0x28 */ u32 buffer_length;
-    /* 0x2C */ u32 buffer_alignment;
-    /* 0x30 */ u32 buffer_length2;
-    /* 0x34 */ u32 buffer_position;
-    /* 0x38 */ void* position_fn;
-    /* 0x3C */ void* read_fn;
-    /* 0x40 */ void* write_fn;
-    /* 0x44 */ void* close_fn;
-    /* 0x48 */ void* unknown;
-    /* 0x4C */ struct FILE* next_file;
-};
-
-struct files {
-    FILE stdin;
-    FILE stdout;
-    FILE stderr;
-    FILE empty;
-};
-
-extern files __files;
-
-#endif /* MSL_COMMON_SRC_ANSI_FILES_H */
diff --git a/include/msl_c/MSL_Common/Src/arith.h b/include/msl_c/MSL_Common/Src/arith.h
deleted file mode 100644
index 83ad47056a..0000000000
--- a/include/msl_c/MSL_Common/Src/arith.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef MSL_COMMON_SRC_ARITH_H
-#define MSL_COMMON_SRC_ARITH_H
-
-#include "dolphin/types.h"
-
-#endif /* MSL_COMMON_SRC_ARITH_H */
diff --git a/include/msl_c/MSL_Common/Src/buffer_io.h b/include/msl_c/MSL_Common/Src/buffer_io.h
deleted file mode 100644
index a1b8998825..0000000000
--- a/include/msl_c/MSL_Common/Src/buffer_io.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef MSL_COMMON_SRC_BUFFER_IO_H
-#define MSL_COMMON_SRC_BUFFER_IO_H
-
-#include "dolphin/types.h"
-
-#endif /* MSL_COMMON_SRC_BUFFER_IO_H */
diff --git a/include/msl_c/MSL_Common/Src/char_io.h b/include/msl_c/MSL_Common/Src/char_io.h
deleted file mode 100644
index 49a65ef8e2..0000000000
--- a/include/msl_c/MSL_Common/Src/char_io.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef MSL_COMMON_SRC_CHAR_IO_H
-#define MSL_COMMON_SRC_CHAR_IO_H
-
-#include "msl_c/MSL_Common/Src/ansi_files.h"
-#include "dolphin/types.h"
-
-extern "C" int fputs(const char*, FILE*);
-
-#endif /* MSL_COMMON_SRC_CHAR_IO_H */
diff --git a/include/msl_c/MSL_Common/Src/ctype.h b/include/msl_c/MSL_Common/Src/ctype.h
deleted file mode 100644
index f59c75d820..0000000000
--- a/include/msl_c/MSL_Common/Src/ctype.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef MSL_COMMON_SRC_CTYPE_H
-#define MSL_COMMON_SRC_CTYPE_H
-
-#include "dolphin/types.h"
-
-extern "C" {
-int tolower(int);
-};
-
-#endif /* MSL_COMMON_SRC_CTYPE_H */
diff --git a/include/msl_c/MSL_Common/Src/direct_io.h b/include/msl_c/MSL_Common/Src/direct_io.h
deleted file mode 100644
index 078da82b33..0000000000
--- a/include/msl_c/MSL_Common/Src/direct_io.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef MSL_COMMON_SRC_DIRECT_IO_H
-#define MSL_COMMON_SRC_DIRECT_IO_H
-
-#include "dolphin/types.h"
-
-#endif /* MSL_COMMON_SRC_DIRECT_IO_H */
diff --git a/include/msl_c/MSL_Common/Src/errno.h b/include/msl_c/MSL_Common/Src/errno.h
deleted file mode 100644
index 4e3eb9a430..0000000000
--- a/include/msl_c/MSL_Common/Src/errno.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef MSL_COMMON_SRC_ERRNO_H
-#define MSL_COMMON_SRC_ERRNO_H
-
-#include "dolphin/types.h"
-
-#endif /* MSL_COMMON_SRC_ERRNO_H */
diff --git a/include/msl_c/MSL_Common/Src/extras.h b/include/msl_c/MSL_Common/Src/extras.h
deleted file mode 100644
index 6e96e650b7..0000000000
--- a/include/msl_c/MSL_Common/Src/extras.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef MSL_COMMON_SRC_EXTRAS_H
-#define MSL_COMMON_SRC_EXTRAS_H
-
-#include "dolphin/types.h"
-
-#endif /* MSL_COMMON_SRC_EXTRAS_H */
diff --git a/include/msl_c/MSL_Common/Src/file_io.h b/include/msl_c/MSL_Common/Src/file_io.h
deleted file mode 100644
index 5bde365a92..0000000000
--- a/include/msl_c/MSL_Common/Src/file_io.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef MSL_COMMON_SRC_FILE_IO_H
-#define MSL_COMMON_SRC_FILE_IO_H
-
-#include "dolphin/types.h"
-
-#endif /* MSL_COMMON_SRC_FILE_IO_H */
diff --git a/include/msl_c/MSL_Common/Src/float.h b/include/msl_c/MSL_Common/Src/float.h
deleted file mode 100644
index 9a39ae5743..0000000000
--- a/include/msl_c/MSL_Common/Src/float.h
+++ /dev/null
@@ -1,48 +0,0 @@
-#ifndef MSL_COMMON_SRC_FLOAT_H
-#define MSL_COMMON_SRC_FLOAT_H
-
-#include "dolphin/types.h"
-
-#define FP_SNAN 0
-#define FP_QNAN 1
-#define FP_INFINITE 2
-#define FP_ZERO 3
-#define FP_NORMAL 4
-#define FP_SUBNORMAL 5
-
-#define FP_NAN FP_QNAN
-
-#define fpclassify(x) ((sizeof(x) == sizeof(float)) ? __fpclassifyf(x) : __fpclassifyd(x))
-#define signbit(x) ((sizeof(x) == sizeof(float)) ? __signbitf(x) : __signbitd(x))
-
-#define __signbitf(x) ((*(u8*)&(x)) & 0x80)
-
-// TODO: OK?
-#define __signbitd(x) ((*(u8*)&(x)) & 0x80)
-
-inline int __fpclassifyf(float __value) {
-    u32 integer = *(u32*)&__value;
-
-    switch (integer & 0x7f800000) {
-    case 0x7f800000:
-        if ((integer & 0x7fffff) != 0) {
-            return FP_QNAN;
-        }
-        return FP_INFINITE;
-
-    case 0:
-        if ((integer & 0x7fffff) != 0) {
-            return FP_SUBNORMAL;
-        }
-        return FP_ZERO;
-    }
-
-    return FP_NORMAL;
-}
-
-inline int __fpclassifyd(double __value) {
-    // TODO:
-    return FP_INFINITE;
-}
-
-#endif /* MSL_COMMON_SRC_FLOAT_H */
diff --git a/include/msl_c/MSL_Common/Src/mbstring.h b/include/msl_c/MSL_Common/Src/mbstring.h
deleted file mode 100644
index 22fa9c5bfc..0000000000
--- a/include/msl_c/MSL_Common/Src/mbstring.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef MSL_COMMON_SRC_MBSTRING_H
-#define MSL_COMMON_SRC_MBSTRING_H
-
-#include "dolphin/types.h"
-
-#endif /* MSL_COMMON_SRC_MBSTRING_H */
diff --git a/include/msl_c/MSL_Common/Src/mem.h b/include/msl_c/MSL_Common/Src/mem.h
deleted file mode 100644
index e47536e0b7..0000000000
--- a/include/msl_c/MSL_Common/Src/mem.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef MSL_COMMON_SRC_MEM_H
-#define MSL_COMMON_SRC_MEM_H
-
-#include "dolphin/types.h"
-
-extern "C" int memcmp(const void*, const void*, size_t);
-
-#endif /* MSL_COMMON_SRC_MEM_H */
diff --git a/include/msl_c/MSL_Common/Src/mem_funcs.h b/include/msl_c/MSL_Common/Src/mem_funcs.h
deleted file mode 100644
index 0bb1d80808..0000000000
--- a/include/msl_c/MSL_Common/Src/mem_funcs.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef MSL_COMMON_SRC_MEM_FUNCS_H
-#define MSL_COMMON_SRC_MEM_FUNCS_H
-
-#include "dolphin/types.h"
-
-#endif /* MSL_COMMON_SRC_MEM_FUNCS_H */
diff --git a/include/msl_c/MSL_Common/Src/misc_io.h b/include/msl_c/MSL_Common/Src/misc_io.h
deleted file mode 100644
index d78ebc4647..0000000000
--- a/include/msl_c/MSL_Common/Src/misc_io.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef MSL_COMMON_SRC_MISC_IO_H
-#define MSL_COMMON_SRC_MISC_IO_H
-
-#include "dolphin/types.h"
-
-#endif /* MSL_COMMON_SRC_MISC_IO_H */
diff --git a/include/msl_c/MSL_Common/Src/printf.h b/include/msl_c/MSL_Common/Src/printf.h
deleted file mode 100644
index 206517c803..0000000000
--- a/include/msl_c/MSL_Common/Src/printf.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef MSL_COMMON_SRC_PRINTF_H
-#define MSL_COMMON_SRC_PRINTF_H
-
-#include "Runtime.PPCEABI.H/__va_arg.h"
-#include "dolphin/types.h"
-
-extern "C" size_t sprintf(const char*, const char*, ...);
-extern "C" size_t snprintf(const char*, size_t, const char*, ...);
-extern "C" size_t vsnprintf(char*, size_t, const char*, va_list);
-extern "C" size_t vprintf(const char*, va_list);
-extern "C" size_t printf(const char*, ...);
-
-#endif /* MSL_COMMON_SRC_PRINTF_H */
diff --git a/include/msl_c/MSL_Common/Src/scanf.h b/include/msl_c/MSL_Common/Src/scanf.h
deleted file mode 100644
index febd050a26..0000000000
--- a/include/msl_c/MSL_Common/Src/scanf.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef MSL_COMMON_SRC_SCANF_H
-#define MSL_COMMON_SRC_SCANF_H
-
-#include "dolphin/types.h"
-
-#endif /* MSL_COMMON_SRC_SCANF_H */
diff --git a/include/msl_c/MSL_Common/Src/signal.h b/include/msl_c/MSL_Common/Src/signal.h
deleted file mode 100644
index b477c030b8..0000000000
--- a/include/msl_c/MSL_Common/Src/signal.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef MSL_COMMON_SRC_SIGNAL_H
-#define MSL_COMMON_SRC_SIGNAL_H
-
-#include "dolphin/types.h"
-
-#endif /* MSL_COMMON_SRC_SIGNAL_H */
diff --git a/include/msl_c/MSL_Common/Src/string.h b/include/msl_c/MSL_Common/Src/string.h
deleted file mode 100644
index 38c7f3e7ea..0000000000
--- a/include/msl_c/MSL_Common/Src/string.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef MSL_COMMON_SRC_STRING_H
-#define MSL_COMMON_SRC_STRING_H
-
-#include "dolphin/types.h"
-
-extern "C" {
-void* memcpy(void*, const void*, s32);
-void* memset(void*, int, u32);
-char* strrchr(const char*, int);
-char* strchr(const char*, int);
-int strncmp(const char*, const char*, u32);
-int strcmp(const char*, const char*);
-char* strcat(char*, const char*);
-char* strncpy(char*, const char*, u32);
-char* strcpy(char*, const char*);
-u32 strlen(const char*);
-
-int stricmp(const char*, const char*);
-};
-
-#endif /* MSL_COMMON_SRC_STRING_H */
diff --git a/include/msl_c/MSL_Common/Src/strtoul.h b/include/msl_c/MSL_Common/Src/strtoul.h
deleted file mode 100644
index 117de10b57..0000000000
--- a/include/msl_c/MSL_Common/Src/strtoul.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef MSL_COMMON_SRC_STRTOUL_H
-#define MSL_COMMON_SRC_STRTOUL_H
-
-#include "dolphin/types.h"
-
-#endif /* MSL_COMMON_SRC_STRTOUL_H */
diff --git a/include/msl_c/MSL_Common/Src/wchar_io.h b/include/msl_c/MSL_Common/Src/wchar_io.h
deleted file mode 100644
index ba643b03fa..0000000000
--- a/include/msl_c/MSL_Common/Src/wchar_io.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef MSL_COMMON_SRC_WCHAR_IO_H
-#define MSL_COMMON_SRC_WCHAR_IO_H
-
-#include "dolphin/types.h"
-
-#endif /* MSL_COMMON_SRC_WCHAR_IO_H */
diff --git a/include/msl_c/MSL_Common_Embedded/Src/ansi_fp.h b/include/msl_c/MSL_Common_Embedded/Src/ansi_fp.h
deleted file mode 100644
index cf26db8d31..0000000000
--- a/include/msl_c/MSL_Common_Embedded/Src/ansi_fp.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef MSL_COMMON_EMBEDDED_SRC_ANSI_FP_H
-#define MSL_COMMON_EMBEDDED_SRC_ANSI_FP_H
-
-#include "dolphin/types.h"
-
-#endif /* MSL_COMMON_EMBEDDED_SRC_ANSI_FP_H */
diff --git a/include/msl_c/Math/Double_precision/e_acos.h b/include/msl_c/Math/Double_precision/e_acos.h
deleted file mode 100644
index f38187c7ae..0000000000
--- a/include/msl_c/Math/Double_precision/e_acos.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef MATH_DOUBLE_PRECISION_E_ACOS_H
-#define MATH_DOUBLE_PRECISION_E_ACOS_H
-
-#include "dolphin/types.h"
-
-#endif /* MATH_DOUBLE_PRECISION_E_ACOS_H */
diff --git a/include/msl_c/Math/Double_precision/e_asin.h b/include/msl_c/Math/Double_precision/e_asin.h
deleted file mode 100644
index 3edf8c4bef..0000000000
--- a/include/msl_c/Math/Double_precision/e_asin.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef MATH_DOUBLE_PRECISION_E_ASIN_H
-#define MATH_DOUBLE_PRECISION_E_ASIN_H
-
-#include "dolphin/types.h"
-
-#endif /* MATH_DOUBLE_PRECISION_E_ASIN_H */
diff --git a/include/msl_c/Math/Double_precision/e_atan2.h b/include/msl_c/Math/Double_precision/e_atan2.h
deleted file mode 100644
index 952d6ab7c2..0000000000
--- a/include/msl_c/Math/Double_precision/e_atan2.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef MATH_DOUBLE_PRECISION_E_ATAN2_H
-#define MATH_DOUBLE_PRECISION_E_ATAN2_H
-
-#include "dolphin/types.h"
-
-#endif /* MATH_DOUBLE_PRECISION_E_ATAN2_H */
diff --git a/include/msl_c/Math/Double_precision/e_exp.h b/include/msl_c/Math/Double_precision/e_exp.h
deleted file mode 100644
index c2436675e0..0000000000
--- a/include/msl_c/Math/Double_precision/e_exp.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef MATH_DOUBLE_PRECISION_E_EXP_H
-#define MATH_DOUBLE_PRECISION_E_EXP_H
-
-#include "dolphin/types.h"
-
-#endif /* MATH_DOUBLE_PRECISION_E_EXP_H */
diff --git a/include/msl_c/Math/Double_precision/e_fmod.h b/include/msl_c/Math/Double_precision/e_fmod.h
deleted file mode 100644
index 3777d15aa7..0000000000
--- a/include/msl_c/Math/Double_precision/e_fmod.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef MATH_DOUBLE_PRECISION_E_FMOD_H
-#define MATH_DOUBLE_PRECISION_E_FMOD_H
-
-#include "dolphin/types.h"
-
-#endif /* MATH_DOUBLE_PRECISION_E_FMOD_H */
diff --git a/include/msl_c/Math/Double_precision/e_pow.h b/include/msl_c/Math/Double_precision/e_pow.h
deleted file mode 100644
index 0cec144a48..0000000000
--- a/include/msl_c/Math/Double_precision/e_pow.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef MATH_DOUBLE_PRECISION_E_POW_H
-#define MATH_DOUBLE_PRECISION_E_POW_H
-
-#include "dolphin/types.h"
-
-#endif /* MATH_DOUBLE_PRECISION_E_POW_H */
diff --git a/include/msl_c/Math/Double_precision/e_rem_pio2.h b/include/msl_c/Math/Double_precision/e_rem_pio2.h
deleted file mode 100644
index 9d9f292ec4..0000000000
--- a/include/msl_c/Math/Double_precision/e_rem_pio2.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef MATH_DOUBLE_PRECISION_E_REM_PIO2_H
-#define MATH_DOUBLE_PRECISION_E_REM_PIO2_H
-
-#include "dolphin/types.h"
-
-#endif /* MATH_DOUBLE_PRECISION_E_REM_PIO2_H */
diff --git a/include/msl_c/Math/Double_precision/e_sqrt.h b/include/msl_c/Math/Double_precision/e_sqrt.h
deleted file mode 100644
index 4e96b2a141..0000000000
--- a/include/msl_c/Math/Double_precision/e_sqrt.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef MATH_DOUBLE_PRECISION_E_SQRT_H
-#define MATH_DOUBLE_PRECISION_E_SQRT_H
-
-#include "dolphin/types.h"
-
-#endif /* MATH_DOUBLE_PRECISION_E_SQRT_H */
diff --git a/include/msl_c/Math/Double_precision/k_cos.h b/include/msl_c/Math/Double_precision/k_cos.h
deleted file mode 100644
index feb38811c6..0000000000
--- a/include/msl_c/Math/Double_precision/k_cos.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef MATH_DOUBLE_PRECISION_K_COS_H
-#define MATH_DOUBLE_PRECISION_K_COS_H
-
-#include "dolphin/types.h"
-
-#endif /* MATH_DOUBLE_PRECISION_K_COS_H */
diff --git a/include/msl_c/Math/Double_precision/k_rem_pio2.h b/include/msl_c/Math/Double_precision/k_rem_pio2.h
deleted file mode 100644
index 82ec8406b8..0000000000
--- a/include/msl_c/Math/Double_precision/k_rem_pio2.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef MATH_DOUBLE_PRECISION_K_REM_PIO2_H
-#define MATH_DOUBLE_PRECISION_K_REM_PIO2_H
-
-#include "dolphin/types.h"
-
-#endif /* MATH_DOUBLE_PRECISION_K_REM_PIO2_H */
diff --git a/include/msl_c/Math/Double_precision/k_sin.h b/include/msl_c/Math/Double_precision/k_sin.h
deleted file mode 100644
index 938b840a31..0000000000
--- a/include/msl_c/Math/Double_precision/k_sin.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef MATH_DOUBLE_PRECISION_K_SIN_H
-#define MATH_DOUBLE_PRECISION_K_SIN_H
-
-#include "dolphin/types.h"
-
-#endif /* MATH_DOUBLE_PRECISION_K_SIN_H */
diff --git a/include/msl_c/Math/Double_precision/k_tan.h b/include/msl_c/Math/Double_precision/k_tan.h
deleted file mode 100644
index c483f52336..0000000000
--- a/include/msl_c/Math/Double_precision/k_tan.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef MATH_DOUBLE_PRECISION_K_TAN_H
-#define MATH_DOUBLE_PRECISION_K_TAN_H
-
-#include "dolphin/types.h"
-
-#endif /* MATH_DOUBLE_PRECISION_K_TAN_H */
diff --git a/include/msl_c/Math/Double_precision/s_atan.h b/include/msl_c/Math/Double_precision/s_atan.h
deleted file mode 100644
index 72f309ddc9..0000000000
--- a/include/msl_c/Math/Double_precision/s_atan.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef MATH_DOUBLE_PRECISION_S_ATAN_H
-#define MATH_DOUBLE_PRECISION_S_ATAN_H
-
-#include "dolphin/types.h"
-
-#endif /* MATH_DOUBLE_PRECISION_S_ATAN_H */
diff --git a/include/msl_c/Math/Double_precision/s_ceil.h b/include/msl_c/Math/Double_precision/s_ceil.h
deleted file mode 100644
index 4979134a8c..0000000000
--- a/include/msl_c/Math/Double_precision/s_ceil.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef MATH_DOUBLE_PRECISION_S_CEIL_H
-#define MATH_DOUBLE_PRECISION_S_CEIL_H
-
-#include "dolphin/types.h"
-
-#endif /* MATH_DOUBLE_PRECISION_S_CEIL_H */
diff --git a/include/msl_c/Math/Double_precision/s_copysign.h b/include/msl_c/Math/Double_precision/s_copysign.h
deleted file mode 100644
index 3036ebaf04..0000000000
--- a/include/msl_c/Math/Double_precision/s_copysign.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef MATH_DOUBLE_PRECISION_S_COPYSIGN_H
-#define MATH_DOUBLE_PRECISION_S_COPYSIGN_H
-
-#include "dolphin/types.h"
-
-#endif /* MATH_DOUBLE_PRECISION_S_COPYSIGN_H */
diff --git a/include/msl_c/Math/Double_precision/s_cos.h b/include/msl_c/Math/Double_precision/s_cos.h
deleted file mode 100644
index 54d6285d7d..0000000000
--- a/include/msl_c/Math/Double_precision/s_cos.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef MATH_DOUBLE_PRECISION_S_COS_H
-#define MATH_DOUBLE_PRECISION_S_COS_H
-
-#include "dolphin/types.h"
-
-#endif /* MATH_DOUBLE_PRECISION_S_COS_H */
diff --git a/include/msl_c/Math/Double_precision/s_floor.h b/include/msl_c/Math/Double_precision/s_floor.h
deleted file mode 100644
index 2d22c8f0fe..0000000000
--- a/include/msl_c/Math/Double_precision/s_floor.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef MATH_DOUBLE_PRECISION_S_FLOOR_H
-#define MATH_DOUBLE_PRECISION_S_FLOOR_H
-
-#include "dolphin/types.h"
-
-#endif /* MATH_DOUBLE_PRECISION_S_FLOOR_H */
diff --git a/include/msl_c/Math/Double_precision/s_frexp.h b/include/msl_c/Math/Double_precision/s_frexp.h
deleted file mode 100644
index f50267e446..0000000000
--- a/include/msl_c/Math/Double_precision/s_frexp.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef MATH_DOUBLE_PRECISION_S_FREXP_H
-#define MATH_DOUBLE_PRECISION_S_FREXP_H
-
-#include "dolphin/types.h"
-
-#endif /* MATH_DOUBLE_PRECISION_S_FREXP_H */
diff --git a/include/msl_c/Math/Double_precision/s_ldexp.h b/include/msl_c/Math/Double_precision/s_ldexp.h
deleted file mode 100644
index f3af0dc6b2..0000000000
--- a/include/msl_c/Math/Double_precision/s_ldexp.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef MATH_DOUBLE_PRECISION_S_LDEXP_H
-#define MATH_DOUBLE_PRECISION_S_LDEXP_H
-
-#include "dolphin/types.h"
-
-#endif /* MATH_DOUBLE_PRECISION_S_LDEXP_H */
diff --git a/include/msl_c/Math/Double_precision/s_modf.h b/include/msl_c/Math/Double_precision/s_modf.h
deleted file mode 100644
index d0a5cd5f40..0000000000
--- a/include/msl_c/Math/Double_precision/s_modf.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef MATH_DOUBLE_PRECISION_S_MODF_H
-#define MATH_DOUBLE_PRECISION_S_MODF_H
-
-#include "dolphin/types.h"
-
-#endif /* MATH_DOUBLE_PRECISION_S_MODF_H */
diff --git a/include/msl_c/Math/Double_precision/s_sin.h b/include/msl_c/Math/Double_precision/s_sin.h
deleted file mode 100644
index f262363638..0000000000
--- a/include/msl_c/Math/Double_precision/s_sin.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef MATH_DOUBLE_PRECISION_S_SIN_H
-#define MATH_DOUBLE_PRECISION_S_SIN_H
-
-#include "dolphin/types.h"
-
-#endif /* MATH_DOUBLE_PRECISION_S_SIN_H */
diff --git a/include/msl_c/Math/Double_precision/s_tan.h b/include/msl_c/Math/Double_precision/s_tan.h
deleted file mode 100644
index c517f1fb51..0000000000
--- a/include/msl_c/Math/Double_precision/s_tan.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef MATH_DOUBLE_PRECISION_S_TAN_H
-#define MATH_DOUBLE_PRECISION_S_TAN_H
-
-#include "dolphin/types.h"
-
-#endif /* MATH_DOUBLE_PRECISION_S_TAN_H */
diff --git a/include/msl_c/Math/Double_precision/w_acos.h b/include/msl_c/Math/Double_precision/w_acos.h
deleted file mode 100644
index f7e1741410..0000000000
--- a/include/msl_c/Math/Double_precision/w_acos.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef MATH_DOUBLE_PRECISION_W_ACOS_H
-#define MATH_DOUBLE_PRECISION_W_ACOS_H
-
-#include "dolphin/types.h"
-
-#endif /* MATH_DOUBLE_PRECISION_W_ACOS_H */
diff --git a/include/msl_c/Math/Double_precision/w_asin.h b/include/msl_c/Math/Double_precision/w_asin.h
deleted file mode 100644
index 2d1418d0b5..0000000000
--- a/include/msl_c/Math/Double_precision/w_asin.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef MATH_DOUBLE_PRECISION_W_ASIN_H
-#define MATH_DOUBLE_PRECISION_W_ASIN_H
-
-#include "dolphin/types.h"
-
-#endif /* MATH_DOUBLE_PRECISION_W_ASIN_H */
diff --git a/include/msl_c/Math/Double_precision/w_atan2.h b/include/msl_c/Math/Double_precision/w_atan2.h
deleted file mode 100644
index 20b3609762..0000000000
--- a/include/msl_c/Math/Double_precision/w_atan2.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef MATH_DOUBLE_PRECISION_W_ATAN2_H
-#define MATH_DOUBLE_PRECISION_W_ATAN2_H
-
-#include "dolphin/types.h"
-
-#endif /* MATH_DOUBLE_PRECISION_W_ATAN2_H */
diff --git a/include/msl_c/Math/Double_precision/w_exp.h b/include/msl_c/Math/Double_precision/w_exp.h
deleted file mode 100644
index 06288628ea..0000000000
--- a/include/msl_c/Math/Double_precision/w_exp.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef MATH_DOUBLE_PRECISION_W_EXP_H
-#define MATH_DOUBLE_PRECISION_W_EXP_H
-
-#include "dolphin/types.h"
-
-#endif /* MATH_DOUBLE_PRECISION_W_EXP_H */
diff --git a/include/msl_c/Math/Double_precision/w_fmod.h b/include/msl_c/Math/Double_precision/w_fmod.h
deleted file mode 100644
index 0533db226b..0000000000
--- a/include/msl_c/Math/Double_precision/w_fmod.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef MATH_DOUBLE_PRECISION_W_FMOD_H
-#define MATH_DOUBLE_PRECISION_W_FMOD_H
-
-#include "dolphin/types.h"
-
-double fmod(double, double);
-
-#endif /* MATH_DOUBLE_PRECISION_W_FMOD_H */
diff --git a/include/msl_c/Math/Double_precision/w_pow.h b/include/msl_c/Math/Double_precision/w_pow.h
deleted file mode 100644
index 57667d71a4..0000000000
--- a/include/msl_c/Math/Double_precision/w_pow.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef MATH_DOUBLE_PRECISION_W_POW_H
-#define MATH_DOUBLE_PRECISION_W_POW_H
-
-#include "dolphin/types.h"
-
-#endif /* MATH_DOUBLE_PRECISION_W_POW_H */
diff --git a/include/msl_c/Math/Double_precision/w_sqrt.h b/include/msl_c/Math/Double_precision/w_sqrt.h
deleted file mode 100644
index ea36d743fd..0000000000
--- a/include/msl_c/Math/Double_precision/w_sqrt.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef MATH_DOUBLE_PRECISION_W_SQRT_H
-#define MATH_DOUBLE_PRECISION_W_SQRT_H
-
-#include "dolphin/types.h"
-
-#endif /* MATH_DOUBLE_PRECISION_W_SQRT_H */
diff --git a/include/msl_c/PPC_EABI/Src/critical_regions.gamecube.h b/include/msl_c/PPC_EABI/Src/critical_regions.gamecube.h
deleted file mode 100644
index 86768e9d1a..0000000000
--- a/include/msl_c/PPC_EABI/Src/critical_regions.gamecube.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef PPC_EABI_SRC_CRITICAL_REGIONSGAMECUBE_H
-#define PPC_EABI_SRC_CRITICAL_REGIONSGAMECUBE_H
-
-#include "dolphin/types.h"
-
-#endif /* PPC_EABI_SRC_CRITICAL_REGIONSGAMECUBE_H */
diff --git a/include/msl_c/PPC_EABI/Src/math_ppc.h b/include/msl_c/PPC_EABI/Src/math_ppc.h
deleted file mode 100644
index 71a44b5f95..0000000000
--- a/include/msl_c/PPC_EABI/Src/math_ppc.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef PPC_EABI_SRC_MATH_PPC_H
-#define PPC_EABI_SRC_MATH_PPC_H
-
-#include "dolphin/types.h"
-
-#endif /* PPC_EABI_SRC_MATH_PPC_H */
diff --git a/include/msl_c/PPC_EABI/Src/uart_console_io_gcn.h b/include/msl_c/PPC_EABI/Src/uart_console_io_gcn.h
deleted file mode 100644
index 8a31c97783..0000000000
--- a/include/msl_c/PPC_EABI/Src/uart_console_io_gcn.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef PPC_EABI_SRC_UART_CONSOLE_IO_GCN_H
-#define PPC_EABI_SRC_UART_CONSOLE_IO_GCN_H
-
-#include "dolphin/types.h"
-
-#endif /* PPC_EABI_SRC_UART_CONSOLE_IO_GCN_H */
diff --git a/include/msl_c/math.h b/include/msl_c/math.h
deleted file mode 100644
index 991b8c6ce0..0000000000
--- a/include/msl_c/math.h
+++ /dev/null
@@ -1,72 +0,0 @@
-#ifndef MSL_MATH_H_
-#define MSL_MATH_H_
-
-#include "msl_c/MSL_Common/Src/float.h"
-#include "dolphin/types.h"
-
-extern "C" {
-s32 abs(s32);
-f64 acos(f64);
-f32 acosf(f32);
-f64 asin(f64);
-f64 atan(f64);
-f64 atan2(f64);
-f64 ceil(f64);
-f64 copysign(f64, f64);
-f64 cos(f64);
-f32 cosf(f32);
-f64 exp(f64);
-
-extern f32 __fabsf(f32);
-inline f64 fabs(f64 f) {
-    return __fabsf(f);
-}
-inline f64 fabsf2(f32 f) {
-    return __fabsf(f);
-}
-inline f32 fabsf(f32 f) {
-    return fabsf2(f);
-}
-
-f64 floor(f64);
-f64 fmod(f64, f64);
-inline f32 fmodf(f32 f1, f32 f2) {
-    return fmod(f1, f2);
-}
-
-f64 frexp(f64, s32*);
-f64 ldexp(f64, s32);
-f64 modf(f64, f64*);
-f64 pow(f64, f64);
-f64 sin(f64);
-f32 sinf(f32);
-f64 sqrt(f64);
-f64 tan(f64);
-f32 tanf(f32);
-
-extern f32 __float_nan[4];
-extern f32 __float_epsilon[4];
-extern f32 __float_max[4];
-
-inline f64 sqrt_step(f64 tmpd, f32 mag) {
-    return tmpd * 0.5 * (3.0 - mag * (tmpd * tmpd));
-}
-
-inline f32 sqrtf(f32 mag) {
-    if (mag > 0.0f) {
-        f64 tmpd = __frsqrte(mag);
-        tmpd = sqrt_step(tmpd, mag);
-        tmpd = sqrt_step(tmpd, mag);
-        tmpd = sqrt_step(tmpd, mag);
-        return mag * tmpd;
-    } else if (mag < 0.0) {
-        return __float_nan[0];
-    } else if (fpclassify(mag) == 1) {
-        return __float_nan[0];
-    } else {
-        return mag;
-    }
-}
-}
-
-#endif
diff --git a/include/msl_c/string.h b/include/msl_c/string.h
deleted file mode 100644
index ba74386deb..0000000000
--- a/include/msl_c/string.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef MSL_STRING_H_
-#define MSL_STRING_H_
-
-#include "Runtime.PPCEABI.H/__va_arg.h"
-#include "dolphin/types.h"
-
-// TODO: move to msl_c/
-extern "C" {
-void memcpy(void*, const void*, s32);
-void* memset(void* dest, int ch, u32 count);
-char* strrchr(const char* s, int c);
-char* strchr(const char* s, int c);
-int strncmp(const char* s1, const char* s2, u32 n);
-int strcmp(const char* s1, const char* s2);
-int stricmp(const char*, const char*);
-char* strcat(char* dest, const char* source);
-char* strncpy(char* dest, const char* source, u32 n);
-char* strcpy(char* dest, const char* source);
-u32 strlen(const char* s);
-int tolower(int);
-int sprintf(char*, const char*, ...);
-int printf(const char*, ...);
-int snprintf(char*, u32, const char*, ...);
-size_t vsnprintf(char* buffer, size_t buffer_size, const char* format, va_list args);
-}
-
-#endif
\ No newline at end of file