diff --git a/include/JSystem/JAudio2/JASWaveArcLoader.h b/include/JSystem/JAudio2/JASWaveArcLoader.h
index 2d7e55e0aa..95fb0280b0 100644
--- a/include/JSystem/JAudio2/JASWaveArcLoader.h
+++ b/include/JSystem/JAudio2/JASWaveArcLoader.h
@@ -5,7 +5,6 @@
 #include "dolphin/types.h"
 #include "global.h"
 
-#include "MSL_C/MSL_Common/Src/string.h"
 #include "dolphin/os/OSMutex.h"
 
 #include "JSystem/JAudio2/JASDvdThread.h"
diff --git a/include/JSystem/JUtility/JUTFont.h b/include/JSystem/JUtility/JUTFont.h
index d1d88b1417..4cb04da538 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/string.h"
 #include "dolphin/gx/GX.h"
 #include "dolphin/types.h"
 
diff --git a/include/MSL_C/MSL_Common/Src/wchar_io.h b/include/MSL_C/MSL_Common/Src/wchar_io.h
index d42110c016..be6fb63783 100644
--- a/include/MSL_C/MSL_Common/Src/wchar_io.h
+++ b/include/MSL_C/MSL_Common/Src/wchar_io.h
@@ -3,7 +3,9 @@
 
 #include "MSL_C/MSL_Common/Src/ansi_files.h"
 
+#ifndef __cplusplus
 typedef unsigned short wchar_t;
+#endif
 
 int fwide(FILE* file, int mode);
 
diff --git a/include/MSL_C/stdlib.h b/include/MSL_C/stdlib.h
new file mode 100644
index 0000000000..0a0532aa40
--- /dev/null
+++ b/include/MSL_C/stdlib.h
@@ -0,0 +1,10 @@
+#ifndef MSL_STDLIB_H_
+#define MSL_STDLIB_H_
+
+#include "MSL_C/MSL_Common/Src/abort_exit.h"
+#include "MSL_C/MSL_Common/Src/alloc.h"
+#include "MSL_C/MSL_Common/Src/arith.h"
+#include "MSL_C/MSL_Common/Src/mbstring.h"
+#include "MSL_C/MSL_Common/Src/strtoul.h"
+
+#endif
diff --git a/include/MSL_C/string.h b/include/MSL_C/string.h
index 21cb9c7274..ea08c98fa4 100644
--- a/include/MSL_C/string.h
+++ b/include/MSL_C/string.h
@@ -1,23 +1,8 @@
 #ifndef MSL_STRING_H_
 #define MSL_STRING_H_
 
-#include "MSL_C/MSL_Common/Src/stddef.h"
+#include "MSL_C/MSL_Common/Src/extras.h"
+#include "MSL_C/MSL_Common/Src/mem.h"
+#include "MSL_C/MSL_Common/Src/string.h"
 
-
-// TODO: move to MSL_C/
-extern "C" {
-void memcpy(void*, const void*, size_t);
-void* memset(void* dest, int ch, size_t count);
-char* strrchr(const char* s, int c);
-char* strchr(const char* s, int c);
-int strncmp(const char* s1, const char* s2, size_t 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, size_t n);
-char* strcpy(char* dest, const char* source);
-size_t strlen(const char* s);
-int tolower(int);
-}
-
-#endif
\ No newline at end of file
+#endif
diff --git a/include/d/save/d_save.h b/include/d/save/d_save.h
index 46d8d8dc28..8acbe2582c 100644
--- a/include/d/save/d_save.h
+++ b/include/d/save/d_save.h
@@ -1,7 +1,7 @@
 #ifndef D_SAVE_D_SAVE_H
 #define D_SAVE_D_SAVE_H
 
-#include "MSL_C/MSL_Common/Src/string.h"
+#include "MSL_C/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 b0937bf24b..12079a2282 100644
--- a/include/init.h
+++ b/include/init.h
@@ -1,7 +1,6 @@
 #ifndef INIT_H
 #define INIT_H
 
-#include "MSL_C/MSL_Common/Src/string.h"
 #include "dolphin/types.h"
 
 #ifdef __cplusplus
diff --git a/libs/JSystem/J2DGraph/J2DManage.cpp b/libs/JSystem/J2DGraph/J2DManage.cpp
index bf7f07717a..60318ed15c 100644
--- a/libs/JSystem/J2DGraph/J2DManage.cpp
+++ b/libs/JSystem/J2DGraph/J2DManage.cpp
@@ -4,7 +4,7 @@
 //
 
 #include "JSystem/J2DGraph/J2DManage.h"
-#include "MSL_C/MSL_Common/Src/string.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
diff --git a/libs/JSystem/J2DGraph/J2DPrint.cpp b/libs/JSystem/J2DGraph/J2DPrint.cpp
index 6dcde38036..dea6720967 100644
--- a/libs/JSystem/J2DGraph/J2DPrint.cpp
+++ b/libs/JSystem/J2DGraph/J2DPrint.cpp
@@ -5,6 +5,7 @@
 
 #include "JSystem/J2DGraph/J2DPrint.h"
 #include "MSL_C/stdio.h"
+#include "MSL_C/stdlib.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
@@ -49,8 +50,6 @@ extern "C" void _restgpr_25();
 extern "C" void _restgpr_26();
 extern "C" void _restgpr_28();
 extern "C" void _restgpr_29();
-extern "C" void strtol();
-extern "C" void strtoul();
 extern "C" u8 sSystemHeap__7JKRHeap[4];
 
 //
diff --git a/libs/JSystem/J2DGraph/J2DTextBox.cpp b/libs/JSystem/J2DGraph/J2DTextBox.cpp
index edc385fbd1..10fdc19796 100644
--- a/libs/JSystem/J2DGraph/J2DTextBox.cpp
+++ b/libs/JSystem/J2DGraph/J2DTextBox.cpp
@@ -5,7 +5,7 @@
 
 #include "JSystem/J2DGraph/J2DTextBox.h"
 #include "JSystem/J2DGraph/J2DPrint.h"
-#include "MSL_C/MSL_Common/Src/string.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
diff --git a/libs/JSystem/J3DGraphBase/J3DPacket.cpp b/libs/JSystem/J3DGraphBase/J3DPacket.cpp
index 85f799d080..87770b6c21 100644
--- a/libs/JSystem/J3DGraphBase/J3DPacket.cpp
+++ b/libs/JSystem/J3DGraphBase/J3DPacket.cpp
@@ -12,7 +12,7 @@
 #include "JSystem/J3DGraphBase/J3DSys.h"
 #include "JSystem/J3DGraphBase/J3DVertex.h"
 #include "JSystem/JKernel/JKRHeap.h"
-#include "MSL_C/MSL_Common/Src/string.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/gx/GX.h"
 #include "dolphin/os/OSCache.h"
diff --git a/libs/JSystem/J3DGraphBase/J3DShapeDraw.cpp b/libs/JSystem/J3DGraphBase/J3DShapeDraw.cpp
index 94b407be05..64f0bb02ae 100644
--- a/libs/JSystem/J3DGraphBase/J3DShapeDraw.cpp
+++ b/libs/JSystem/J3DGraphBase/J3DShapeDraw.cpp
@@ -5,7 +5,7 @@
 
 #include "JSystem/J3DGraphBase/J3DShapeDraw.h"
 #include "JSystem/JKernel/JKRHeap.h"
-#include "MSL_C/MSL_Common/Src/string.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/gx/GX.h"
 #include "dolphin/os/OSCache.h"
diff --git a/libs/JSystem/J3DGraphBase/J3DVertex.cpp b/libs/JSystem/J3DGraphBase/J3DVertex.cpp
index 1356041e34..6d3e4e4ba5 100644
--- a/libs/JSystem/J3DGraphBase/J3DVertex.cpp
+++ b/libs/JSystem/J3DGraphBase/J3DVertex.cpp
@@ -7,6 +7,7 @@
 #include "JSystem/J3DGraphAnimator/J3DJointTree.h"
 #include "JSystem/J3DGraphBase/J3DSys.h"
 #include "JSystem/JKernel/JKRHeap.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/os/OSCache.h"
 #include "dolphin/types.h"
diff --git a/libs/JSystem/JAudio2/JASWaveArcLoader.cpp b/libs/JSystem/JAudio2/JASWaveArcLoader.cpp
index af19d207c4..5d6d4325d1 100644
--- a/libs/JSystem/JAudio2/JASWaveArcLoader.cpp
+++ b/libs/JSystem/JAudio2/JASWaveArcLoader.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "JSystem/JAudio2/JASWaveArcLoader.h"
+#include "MSL_C/string.h"
 
 //
 // Forward References:
diff --git a/libs/JSystem/JAudio2/JAUSectionHeap.cpp b/libs/JSystem/JAudio2/JAUSectionHeap.cpp
index d794f1cc67..62cc69dfd8 100644
--- a/libs/JSystem/JAudio2/JAUSectionHeap.cpp
+++ b/libs/JSystem/JAudio2/JAUSectionHeap.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "JSystem/JAudio2/JAUSectionHeap.h"
+#include "MSL_C/stdlib.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
@@ -282,7 +283,6 @@ extern "C" void _restgpr_26();
 extern "C" void _restgpr_27();
 extern "C" void _restgpr_28();
 extern "C" void _restgpr_29();
-extern "C" void abort();
 extern "C" void fprintf();
 extern "C" extern void* __vt__11JASBankList[3 + 1 /* padding */];
 extern "C" extern void* __vt__7JASBank[5];
@@ -290,7 +290,6 @@ extern "C" extern void* __vt__12JASVoiceBank[5 + 1 /* padding */];
 extern "C" extern void* __vt__13JAISeqDataMgr[6];
 extern "C" extern void* __vt__16JAIStreamDataMgr[4 + 1 /* padding */];
 extern "C" extern void* __vt__32JAUStreamDataMgr_StreamFileTable[4];
-extern "C" extern void* __files[80];
 extern "C" extern u8 data_80450B50[4];
 extern "C" extern u8 data_80450B54[4];
 extern "C" extern u8 data_80450B58[4];
diff --git a/libs/JSystem/JKernel/JKRAramArchive.cpp b/libs/JSystem/JKernel/JKRAramArchive.cpp
index b6482fc77c..5b2cb23561 100644
--- a/libs/JSystem/JKernel/JKRAramArchive.cpp
+++ b/libs/JSystem/JKernel/JKRAramArchive.cpp
@@ -9,8 +9,8 @@
 #include "JSystem/JKernel/JKRDvdRipper.h"
 #include "JSystem/JKernel/JKRFile.h"
 #include "JSystem/JUtility/JUTException.h"
-#include "MSL_C/MSL_Common/Src/string.h"
 #include "MSL_C/math.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/os/OSCache.h"
 
diff --git a/libs/JSystem/JKernel/JKRArchivePri.cpp b/libs/JSystem/JKernel/JKRArchivePri.cpp
index 988c461361..7743207cce 100644
--- a/libs/JSystem/JKernel/JKRArchivePri.cpp
+++ b/libs/JSystem/JKernel/JKRArchivePri.cpp
@@ -6,7 +6,7 @@
 #include "JSystem/JKernel/JKRArchive.h"
 #include "JSystem/JKernel/JKRHeap.h"
 #include "MSL_C/MSL_Common/Src/ctype.h"
-#include "MSL_C/MSL_Common/Src/string.h"
+#include "MSL_C/string.h"
 
 /* ############################################################################################## */
 /* 80451420-80451428 000920 0004+04 1/1 5/5 0/0 .sbss            sCurrentDirID__10JKRArchive */
diff --git a/libs/JSystem/JKernel/JKRCompArchive.cpp b/libs/JSystem/JKernel/JKRCompArchive.cpp
index 8597e6727e..9626f9eed3 100644
--- a/libs/JSystem/JKernel/JKRCompArchive.cpp
+++ b/libs/JSystem/JKernel/JKRCompArchive.cpp
@@ -9,8 +9,8 @@
 #include "JSystem/JKernel/JKRDvdArchive.h"
 #include "JSystem/JKernel/JKRMemArchive.h"
 #include "JSystem/JUtility/JUTException.h"
-#include "MSL_C/MSL_Common/Src/string.h"
 #include "MSL_C/math.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 
 //
diff --git a/libs/JSystem/JKernel/JKRDvdRipper.cpp b/libs/JSystem/JKernel/JKRDvdRipper.cpp
index 405214c384..59fa399fd1 100644
--- a/libs/JSystem/JKernel/JKRDvdRipper.cpp
+++ b/libs/JSystem/JKernel/JKRDvdRipper.cpp
@@ -6,7 +6,7 @@
 #include "JSystem/JKernel/JKRDvdRipper.h"
 #include "JSystem/JKernel/JKRDvdFile.h"
 #include "JSystem/JUtility/JUTException.h"
-#include "MSL_C/MSL_Common/Src/string.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/os/OSCache.h"
 #include "global.h"
diff --git a/libs/JSystem/JKernel/JKRFileCache.cpp b/libs/JSystem/JKernel/JKRFileCache.cpp
index 24da35f07f..d77e26ddcd 100644
--- a/libs/JSystem/JKernel/JKRFileCache.cpp
+++ b/libs/JSystem/JKernel/JKRFileCache.cpp
@@ -8,7 +8,7 @@
 #include "JSystem/JKernel/JKRFileFinder.h"
 #include "JSystem/JKernel/JKRHeap.h"
 #include "MSL_C/MSL_Common/Src/ctype.h"
-#include "MSL_C/MSL_Common/Src/string.h"
+#include "MSL_C/string.h"
 #include "global.h"
 
 /* 802D49B4-802D4AB4 2CF2F4 0100+00 0/0 2/2 0/0 .text mount__12JKRFileCacheFPCcP7JKRHeapPCc */
diff --git a/libs/JSystem/JKernel/JKRFileLoader.cpp b/libs/JSystem/JKernel/JKRFileLoader.cpp
index c019a58b0c..c12ac92585 100644
--- a/libs/JSystem/JKernel/JKRFileLoader.cpp
+++ b/libs/JSystem/JKernel/JKRFileLoader.cpp
@@ -4,7 +4,7 @@
 //
 
 #include "JSystem/JKernel/JKRFileLoader.h"
-#include "MSL_C/MSL_Common/Src/string.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "global.h"
 
diff --git a/libs/JSystem/JKernel/JKRMemArchive.cpp b/libs/JSystem/JKernel/JKRMemArchive.cpp
index 5ec3502403..c4c3edf333 100644
--- a/libs/JSystem/JKernel/JKRMemArchive.cpp
+++ b/libs/JSystem/JKernel/JKRMemArchive.cpp
@@ -7,7 +7,7 @@
 #include "JSystem/JKernel/JKRDvdRipper.h"
 #include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTException.h"
-#include "MSL_C/MSL_Common/Src/string.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 
 //
diff --git a/libs/JSystem/JMessage/resource.cpp b/libs/JSystem/JMessage/resource.cpp
index ad6c49503a..795b9fc121 100644
--- a/libs/JSystem/JMessage/resource.cpp
+++ b/libs/JSystem/JMessage/resource.cpp
@@ -5,7 +5,7 @@
 
 #include "JSystem/JMessage/resource.h"
 #include "JSystem/JGadget/binary.h"
-#include "MSL_C/MSL_Common/Src/mem.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 
 //
diff --git a/libs/JSystem/JParticle/JPAResourceManager.cpp b/libs/JSystem/JParticle/JPAResourceManager.cpp
index ad0ceb8786..0334495374 100644
--- a/libs/JSystem/JParticle/JPAResourceManager.cpp
+++ b/libs/JSystem/JParticle/JPAResourceManager.cpp
@@ -6,7 +6,7 @@
 #include "JSystem/JParticle/JPAResourceManager.h"
 #include "JSystem/JParticle/JPADynamicsBlock.h"
 #include "JSystem/JParticle/JPAResource.h"
-#include "MSL_C/MSL_Common/Src/string.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
diff --git a/libs/JSystem/JStudio/JStudio/functionvalue.cpp b/libs/JSystem/JStudio/JStudio/functionvalue.cpp
index eb41a55d3c..d51fd487fa 100644
--- a/libs/JSystem/JStudio/JStudio/functionvalue.cpp
+++ b/libs/JSystem/JStudio/JStudio/functionvalue.cpp
@@ -6,6 +6,7 @@
 #include "JSystem/JStudio/JStudio/functionvalue.h"
 #include "JSystem/JUtility/JUTException.h"
 #include "MSL_C/math.h"
+#include "MSL_C/stdlib.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
@@ -179,7 +180,6 @@ extern "C" void _savefpr_29();
 extern "C" void _restfpr_29();
 extern "C" void _savegpr_29();
 extern "C" void _restgpr_29();
-extern "C" void div();
 
 /* ############################################################################################## */
 /* 803C48E0-803C4900 021A00 0020+00 2/2 1/1 0/0 .data __vt__Q27JStudio22TFunctionValue_hermite */
diff --git a/libs/JSystem/JSupport/JSUMemoryStream.cpp b/libs/JSystem/JSupport/JSUMemoryStream.cpp
index 7b4e6f5812..093be5330a 100644
--- a/libs/JSystem/JSupport/JSUMemoryStream.cpp
+++ b/libs/JSystem/JSupport/JSUMemoryStream.cpp
@@ -4,7 +4,7 @@
 //
 
 #include "JSystem/JSupport/JSUMemoryStream.h"
-#include "MSL_C/MSL_Common/Src/string.h"
+#include "MSL_C/string.h"
 
 /* 802DC520-802DC534 2D6E60 0014+00 0/0 3/3 0/0 .text setBuffer__20JSUMemoryInputStreamFPCvl */
 void JSUMemoryInputStream::setBuffer(void const* pBuffer, s32 length) {
diff --git a/libs/JSystem/JUtility/JUTException.cpp b/libs/JSystem/JUtility/JUTException.cpp
index c949afb07d..a8a28998cf 100644
--- a/libs/JSystem/JUtility/JUTException.cpp
+++ b/libs/JSystem/JUtility/JUTException.cpp
@@ -7,8 +7,9 @@
 #include "JSystem/JUtility/JUTConsole.h"
 #include "JSystem/JUtility/JUTDirectFile.h"
 #include "JSystem/JUtility/JUTDirectPrint.h"
-#include "MSL_C/MSL_Common/Src/float.h"
+#include "MSL_C/float.h"
 #include "MSL_C/stdio.h"
+#include "MSL_C/stdlib.h"
 #include "Runtime.PPCEABI.H/__va_arg.h"
 #include "dol2asm.h"
 
@@ -61,7 +62,6 @@ extern "C" void fopen__13JUTDirectFileFPCc();
 extern "C" void fclose__13JUTDirectFileFv();
 extern "C" void fgets__13JUTDirectFileFPvi();
 extern "C" void print__10JUTConsoleFPCc();
-extern "C" long int strtol(const char* str, char** endptr, int base);
 extern "C" void __ct__13JUTDirectFileFv();
 extern "C" void __dt__13JUTDirectFileFv();
 extern "C" void _savegpr_16();
diff --git a/libs/JSystem/JUtility/JUTNameTab.cpp b/libs/JSystem/JUtility/JUTNameTab.cpp
index 00cc32b420..ca2ff4ea1b 100644
--- a/libs/JSystem/JUtility/JUTNameTab.cpp
+++ b/libs/JSystem/JUtility/JUTNameTab.cpp
@@ -4,7 +4,7 @@
 //
 
 #include "JSystem/JUtility/JUTNameTab.h"
-#include "MSL_C/MSL_Common/Src/string.h"
+#include "MSL_C/string.h"
 
 JUTNameTab::JUTNameTab() {
     setResource(NULL);
diff --git a/libs/SSystem/SComponent/c_lib.cpp b/libs/SSystem/SComponent/c_lib.cpp
index f789657c2b..54dfcd6c91 100644
--- a/libs/SSystem/SComponent/c_lib.cpp
+++ b/libs/SSystem/SComponent/c_lib.cpp
@@ -5,8 +5,8 @@
 
 #include "SSystem/SComponent/c_lib.h"
 #include "JSystem/JMath/JMath.h"
-#include "MSL_C/MSL_Common/Src/string.h"
 #include "MSL_C/math.h"
+#include "MSL_C/string.h"
 #include "SSystem/SComponent/c_math.h"
 #include "SSystem/SComponent/c_xyz.h"
 #include "dol2asm.h"
diff --git a/libs/Z2AudioLib/Z2AudioMgr.cpp b/libs/Z2AudioLib/Z2AudioMgr.cpp
index 905cb2b887..9356e2a86f 100644
--- a/libs/Z2AudioLib/Z2AudioMgr.cpp
+++ b/libs/Z2AudioLib/Z2AudioMgr.cpp
@@ -5,6 +5,7 @@
 
 #include "Z2AudioLib/Z2AudioMgr.h"
 #include "JSystem/JAudio2/JASDriverIF.h"
+#include "MSL_C/stdlib.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
@@ -212,7 +213,6 @@ extern "C" void _restgpr_24();
 extern "C" void _restgpr_25();
 extern "C" void _restgpr_28();
 extern "C" void _restgpr_29();
-extern "C" void abort();
 extern "C" void fprintf();
 extern "C" extern void* __vt__12JAUSoundInfo[4 + 1 /* padding */];
 extern "C" extern void* __vt__16JAIStreamAramMgr[5];
@@ -220,7 +220,6 @@ extern "C" extern void* __vt__16JAIStreamDataMgr[4 + 1 /* padding */];
 extern "C" extern void* __vt__17JAUAudioArcLoader[17 + 1 /* padding */];
 extern "C" extern void* __vt__16Z2AudioArcLoader[17 + 1 /* padding */];
 extern "C" extern void* __vt__11Z2SoundInfo[20];
-extern "C" extern void* __files[80];
 extern "C" extern u8 data_804341C4[16 + 4 /* padding */];
 extern "C" extern u8 data_804341E4[16 + 4 /* padding */];
 extern "C" f32 VOL_BGM_DEFAULT__7Z2Param;
diff --git a/libs/dolphin/ar/ar.c b/libs/dolphin/ar/ar.c
index 6f11a21f84..4dad7a2f07 100644
--- a/libs/dolphin/ar/ar.c
+++ b/libs/dolphin/ar/ar.c
@@ -4,7 +4,7 @@
 //
 
 #include "dolphin/ar/ar.h"
-#include "MSL_C/MSL_Common/Src/string.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/base/PPCArch.h"
 #include "dolphin/dsp/dsp.h"
diff --git a/libs/dolphin/card/CARDBlock.c b/libs/dolphin/card/CARDBlock.c
index 011489d080..40ca946fde 100644
--- a/libs/dolphin/card/CARDBlock.c
+++ b/libs/dolphin/card/CARDBlock.c
@@ -4,7 +4,7 @@
 //
 
 #include "dolphin/card/CARDBlock.h"
-#include "MSL_C/MSL_Common/Src/string.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/card/card.h"
 #include "dolphin/dsp/dsp.h"
diff --git a/libs/dolphin/card/CARDCheck.c b/libs/dolphin/card/CARDCheck.c
index abd98491a7..a35974e8d6 100644
--- a/libs/dolphin/card/CARDCheck.c
+++ b/libs/dolphin/card/CARDCheck.c
@@ -4,7 +4,7 @@
 //
 
 #include "dolphin/card/CARDCheck.h"
-#include "MSL_C/MSL_Common/Src/string.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/card/card.h"
 #include "dolphin/dsp/dsp.h"
diff --git a/libs/dolphin/card/CARDCreate.c b/libs/dolphin/card/CARDCreate.c
index 01caf4025c..d391d501ec 100644
--- a/libs/dolphin/card/CARDCreate.c
+++ b/libs/dolphin/card/CARDCreate.c
@@ -4,8 +4,7 @@
 //
 
 #include "dolphin/card/CARDCreate.h"
-#include "MSL_C/MSL_Common/Src/mem.h"
-#include "MSL_C/MSL_Common/Src/string.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/card/card.h"
 #include "dolphin/dsp/dsp.h"
diff --git a/libs/dolphin/card/CARDDir.c b/libs/dolphin/card/CARDDir.c
index 87d776574c..68d15bf9e6 100644
--- a/libs/dolphin/card/CARDDir.c
+++ b/libs/dolphin/card/CARDDir.c
@@ -4,7 +4,7 @@
 //
 
 #include "dolphin/card/CARDDir.h"
-#include "MSL_C/MSL_Common/Src/string.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/card/card.h"
 #include "dolphin/dsp/dsp.h"
diff --git a/libs/dolphin/card/CARDFormat.c b/libs/dolphin/card/CARDFormat.c
index d633512260..9532329bf7 100644
--- a/libs/dolphin/card/CARDFormat.c
+++ b/libs/dolphin/card/CARDFormat.c
@@ -4,7 +4,7 @@
 //
 
 #include "dolphin/card/CARDFormat.h"
-#include "MSL_C/MSL_Common/Src/string.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/card/card.h"
 #include "dolphin/dsp/dsp.h"
diff --git a/libs/dolphin/card/CARDOpen.c b/libs/dolphin/card/CARDOpen.c
index 2321c21542..0a2d9fbde1 100644
--- a/libs/dolphin/card/CARDOpen.c
+++ b/libs/dolphin/card/CARDOpen.c
@@ -4,7 +4,7 @@
 //
 
 #include "dolphin/card/CARDOpen.h"
-#include "MSL_C/MSL_Common/Src/mem.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/card/card.h"
 #include "dolphin/dsp/dsp.h"
diff --git a/libs/dolphin/dvd/dvd.c b/libs/dolphin/dvd/dvd.c
index 668e8a363d..db30119490 100644
--- a/libs/dolphin/dvd/dvd.c
+++ b/libs/dolphin/dvd/dvd.c
@@ -4,8 +4,7 @@
 //
 
 #include "dolphin/dvd/dvd.h"
-#include "MSL_C/MSL_Common/Src/mem.h"
-#include "MSL_C/MSL_Common/Src/string.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/dvd/dvdlow.h"
 #include "dolphin/os/OS.h"
diff --git a/libs/dolphin/dvd/dvdidutils.c b/libs/dolphin/dvd/dvdidutils.c
index de95f3e481..21dd68a8f4 100644
--- a/libs/dolphin/dvd/dvdidutils.c
+++ b/libs/dolphin/dvd/dvdidutils.c
@@ -1,5 +1,5 @@
 #include "dolphin/dvd/dvdidutils.h"
-#include "MSL_C/MSL_Common/Src/string.h"
+#include "MSL_C/string.h"
 #include "dolphin/dvd/dvd.h"
 
 /* 8034BC04-8034BCFC 346544 00F8+00 0/0 1/1 0/0 .text            DVDCompareDiskID */
diff --git a/libs/dolphin/dvd/fstload.c b/libs/dolphin/dvd/fstload.c
index d39425eae6..50e45f4d5e 100644
--- a/libs/dolphin/dvd/fstload.c
+++ b/libs/dolphin/dvd/fstload.c
@@ -4,7 +4,7 @@
 //
 
 #include "dolphin/dvd/fstload.h"
-#include "MSL_C/MSL_Common/Src/string.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/dvd/dvd.h"
 #include "dolphin/os/OS.h"
diff --git a/libs/dolphin/pad/Pad.c b/libs/dolphin/pad/Pad.c
index 9716ad03b6..11235c960b 100644
--- a/libs/dolphin/pad/Pad.c
+++ b/libs/dolphin/pad/Pad.c
@@ -4,7 +4,7 @@
 //
 
 #include "dolphin/pad/Pad.h"
-#include "MSL_C/MSL_Common/Src/string.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/si/SIBios.h"
 #include "dolphin/si/SISamplingRate.h"
diff --git a/rel/d/a/d_a_bg/d_a_bg.cpp b/rel/d/a/d_a_bg/d_a_bg.cpp
index 8ed960569f..87498d584e 100644
--- a/rel/d/a/d_a_bg/d_a_bg.cpp
+++ b/rel/d/a/d_a_bg/d_a_bg.cpp
@@ -4,7 +4,7 @@
 //
 
 #include "rel/d/a/d_a_bg/d_a_bg.h"
-#include "MSL_C/MSL_Common/Src/mem.h"
+#include "MSL_C/string.h"
 #include "d/bg/d_bg_w_kcol.h"
 #include "d/com/d_com_inf_game.h"
 #include "d/com/d_com_static.h"
diff --git a/src/__start.c b/src/__start.c
index a022ef7430..5bc6f38431 100644
--- a/src/__start.c
+++ b/src/__start.c
@@ -1,3 +1,4 @@
+#include "MSL_C/stdlib.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 #include "init.h"
@@ -20,7 +21,6 @@ void OSInit();
 void OSResetSystem(s32, s32, s32);
 void __init_user();
 void DBInit();
-void exit();
 void InitMetroTRK();
 void InitMetroTRK_BBA();
 extern u8 data_804516D0;
diff --git a/src/c/c_dylink.cpp b/src/c/c_dylink.cpp
index ecc51364b2..fcf5b640c3 100644
--- a/src/c/c_dylink.cpp
+++ b/src/c/c_dylink.cpp
@@ -6,7 +6,7 @@
 #include "DynamicLink.h"
 #include "JSystem/JKernel/JKRArchive.h"
 #include "JSystem/JKernel/JKRSolidHeap.h"
-#include "MSL_C/MSL_Common/Src/string.h"
+#include "MSL_C/string.h"
 #include "d/com/d_com_inf_game.h"
 #include "d/d_procname.h"
 #include "dol2asm.h"
diff --git a/src/d/d_eye_hl.cpp b/src/d/d_eye_hl.cpp
index ba658e20b2..73abec2c13 100644
--- a/src/d/d_eye_hl.cpp
+++ b/src/d/d_eye_hl.cpp
@@ -4,7 +4,7 @@
  */
 
 #include "d/d_eye_hl.h"
-#include "MSL_C/MSL_Common/Src/string.h"
+#include "MSL_C/string.h"
 #include "d/com/d_com_inf_game.h"
 #include "dolphin/os/OS.h"
 #include "dol2asm.h"
diff --git a/src/d/d_resorce.cpp b/src/d/d_resorce.cpp
index 59e5e98dcd..cc186865e5 100644
--- a/src/d/d_resorce.cpp
+++ b/src/d/d_resorce.cpp
@@ -12,8 +12,8 @@
 #include "JSystem/J3DGraphLoader/J3DClusterLoader.h"
 #include "JSystem/J3DGraphLoader/J3DModelLoader.h"
 #include "JSystem/JKernel/JKRSolidHeap.h"
-#include "MSL_C/MSL_Common/Src/extras.h"
 #include "MSL_C/stdio.h"
+#include "MSL_C/string.h"
 #include "d/com/d_com_inf_game.h"
 #include "dol2asm.h"
 #include "dolphin/mtx/mtx.h"
@@ -149,7 +149,6 @@ extern "C" void _restgpr_26();
 extern "C" void _restgpr_27();
 extern "C" void _restgpr_28();
 extern "C" void _restgpr_29();
-extern "C" void memcmp();
 extern "C" extern void* __vt__14J3DMaterialAnm[4];
 extern "C" u8 now__14mDoMtx_stack_c[48];
 extern "C" u8 mFrameBufferTimg__13mDoGph_gInf_c[4];
diff --git a/src/d/kankyo/d_kankyo.cpp b/src/d/kankyo/d_kankyo.cpp
index 111de41c9d..7237f3678c 100644
--- a/src/d/kankyo/d_kankyo.cpp
+++ b/src/d/kankyo/d_kankyo.cpp
@@ -4,7 +4,7 @@
 //
 
 #include "d/kankyo/d_kankyo.h"
-#include "MSL_C/MSL_Common/Src/mem.h"
+#include "MSL_C/string.h"
 #include "SSystem/SComponent/c_counter.h"
 #include "SSystem/SComponent/c_math.h"
 #include "d/com/d_com_inf_game.h"
diff --git a/src/d/kankyo/d_kankyo_rain.cpp b/src/d/kankyo/d_kankyo_rain.cpp
index b803a409a9..8630e948e1 100644
--- a/src/d/kankyo/d_kankyo_rain.cpp
+++ b/src/d/kankyo/d_kankyo_rain.cpp
@@ -5,6 +5,7 @@
 
 #include "d/kankyo/d_kankyo_rain.h"
 #include "MSL_C/math.h"
+#include "MSL_C/string.h"
 #include "d/com/d_com_inf_game.h"
 #include "d/d_demo.h"
 #include "dol2asm.h"
@@ -169,7 +170,6 @@ extern "C" void _restgpr_26();
 extern "C" void _restgpr_27();
 extern "C" void _restgpr_28();
 extern "C" void _restgpr_29();
-extern "C" void memcmp();
 extern "C" extern void* __vt__14dBgS_ObjGndChk[12 + 1 /* padding */];
 extern "C" extern void* __vt__19dKankyo_star_Packet[5];
 extern "C" extern void* __vt__19dKankyo_snow_Packet[5];
diff --git a/src/d/kankyo/d_kankyo_wether.cpp b/src/d/kankyo/d_kankyo_wether.cpp
index 19d038f3c2..0839605f1a 100644
--- a/src/d/kankyo/d_kankyo_wether.cpp
+++ b/src/d/kankyo/d_kankyo_wether.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "d/kankyo/d_kankyo_wether.h"
+#include "MSL_C/string.h"
 #include "Z2AudioLib/Z2EnvSeMgr.h"
 #include "d/com/d_com_inf_game.h"
 #include "d/kankyo/d_kankyo.h"
@@ -210,7 +211,6 @@ extern "C" void _restgpr_25();
 extern "C" void _restgpr_26();
 extern "C" void _restgpr_28();
 extern "C" void _restgpr_29();
-extern "C" void memcmp();
 extern "C" extern void* __vt__9J3DPacket[5];
 extern "C" extern dScnKy_env_light_c g_env_light;
 extern "C" extern Z2EnvSeMgr g_mEnvSeMgr;
diff --git a/src/d/menu/d_menu_collect.cpp b/src/d/menu/d_menu_collect.cpp
index a8fc4babdc..a37283bc79 100644
--- a/src/d/menu/d_menu_collect.cpp
+++ b/src/d/menu/d_menu_collect.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "d/menu/d_menu_collect.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
diff --git a/src/d/menu/d_menu_dmap.cpp b/src/d/menu/d_menu_dmap.cpp
index bd0fb53db6..450dbd1ff6 100644
--- a/src/d/menu/d_menu_dmap.cpp
+++ b/src/d/menu/d_menu_dmap.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "d/menu/d_menu_dmap.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
diff --git a/src/d/menu/d_menu_fmap.cpp b/src/d/menu/d_menu_fmap.cpp
index 86a506e0bb..87bd3ccac6 100644
--- a/src/d/menu/d_menu_fmap.cpp
+++ b/src/d/menu/d_menu_fmap.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "d/menu/d_menu_fmap.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
diff --git a/src/d/menu/d_menu_insect.cpp b/src/d/menu/d_menu_insect.cpp
index d2eae18a4a..f54dbafc1f 100644
--- a/src/d/menu/d_menu_insect.cpp
+++ b/src/d/menu/d_menu_insect.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "d/menu/d_menu_insect.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
diff --git a/src/d/menu/d_menu_letter.cpp b/src/d/menu/d_menu_letter.cpp
index eb1c4af279..56c6f57215 100644
--- a/src/d/menu/d_menu_letter.cpp
+++ b/src/d/menu/d_menu_letter.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "d/menu/d_menu_letter.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
diff --git a/src/d/menu/d_menu_option.cpp b/src/d/menu/d_menu_option.cpp
index 4aaf5028dc..97bd179e30 100644
--- a/src/d/menu/d_menu_option.cpp
+++ b/src/d/menu/d_menu_option.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "d/menu/d_menu_option.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
diff --git a/src/d/menu/d_menu_ring.cpp b/src/d/menu/d_menu_ring.cpp
index fdab7a3d83..e31c1a152f 100644
--- a/src/d/menu/d_menu_ring.cpp
+++ b/src/d/menu/d_menu_ring.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "d/menu/d_menu_ring.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
diff --git a/src/d/menu/d_menu_skill.cpp b/src/d/menu/d_menu_skill.cpp
index 4eb93188d5..9ba5bb7c10 100644
--- a/src/d/menu/d_menu_skill.cpp
+++ b/src/d/menu/d_menu_skill.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "d/menu/d_menu_skill.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
diff --git a/src/d/s/d_s_room.cpp b/src/d/s/d_s_room.cpp
index a0c978719b..5ea2c86a5a 100644
--- a/src/d/s/d_s_room.cpp
+++ b/src/d/s/d_s_room.cpp
@@ -5,6 +5,7 @@
 
 #include "d/s/d_s_room.h"
 #include "MSL_C/stdio.h"
+#include "MSL_C/string.h"
 #include "d/com/d_com_inf_game.h"
 #include "d/d_procname.h"
 #include "d/s/d_s_play.h"
@@ -104,7 +105,6 @@ extern "C" void _restgpr_25();
 extern "C" void _restgpr_27();
 extern "C" void _restgpr_28();
 extern "C" void _restgpr_29();
-extern "C" void strnicmp();
 // extern "C" extern void* g_fopScn_Method[5 + 1 /* padding */];
 // extern "C" extern void* g_fpcNd_Method[5 + 1 /* padding */];
 extern "C" u8 mStatus__20dStage_roomControl_c[65792];
diff --git a/src/init.c b/src/init.c
index f7e09b8a94..5faa950a12 100644
--- a/src/init.c
+++ b/src/init.c
@@ -4,6 +4,8 @@
 //
 
 #include "init.h"
+#include "MSL_C/stdlib.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
@@ -39,7 +41,6 @@ void __OSCacheInit();
 void OSResetSystem(s32, s32, s32);
 void __init_user();
 void DBInit();
-void exit();
 void TRK_fill_mem(void* dst, int val, size_t n);
 void InitMetroTRK();
 void InitMetroTRK_BBA();
diff --git a/src/m_Do/m_Do_MemCard.cpp b/src/m_Do/m_Do_MemCard.cpp
index aaa62569b5..5f39fed768 100644
--- a/src/m_Do/m_Do_MemCard.cpp
+++ b/src/m_Do/m_Do_MemCard.cpp
@@ -6,7 +6,7 @@
 #include "m_Do/m_Do_MemCard.h"
 #include "JSystem/JKernel/JKRThread.h"
 #include "JSystem/JGadget/binary.h"
-#include "MSL_C/MSL_Common/Src/string.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 #include "m_Do/m_Do_ext.h"