diff --git a/include/JSystem/JAudio2/JASGadget.h b/include/JSystem/JAudio2/JASGadget.h
index 7167399718..d590f884b3 100644
--- a/include/JSystem/JAudio2/JASGadget.h
+++ b/include/JSystem/JAudio2/JASGadget.h
@@ -2,6 +2,7 @@
 #define JASGADGET_H
 
 #include "JSystem/JUtility/JUTAssert.h"
+#include <cstring>
 #include <string>
 
 #ifdef __MWERKS__
diff --git a/include/JSystem/JUtility/JUTFont.h b/include/JSystem/JUtility/JUTFont.h
index 42fa47fb57..2718132048 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 <string>
+#include <cstring>
 #include "dusk/endian.h"
 
 /**
diff --git a/include/SSystem/SComponent/c_cc_d.h b/include/SSystem/SComponent/c_cc_d.h
index 2393e9c13d..f80c33b823 100644
--- a/include/SSystem/SComponent/c_cc_d.h
+++ b/include/SSystem/SComponent/c_cc_d.h
@@ -62,8 +62,8 @@ enum cCcD_ObjAtType {
     /* 0x10000000 */ AT_TYPE_10000000 = (1 << 28),
     /* 0x10000000 */ AT_TYPE_20000000 = (1 << 29),
     /* 0x40000000 */ AT_TYPE_WOLF_CUT_TURN = (1 << 30),
-    /* 0x80000000 */ AT_TYPE_WOLF_ATTACK = (1 << 31),
-    /* 0xD8000000 */ AT_TYPE_UNK = 0xD8000000
+    /* 0x80000000 */ AT_TYPE_WOLF_ATTACK = (1u << 31),
+    /* 0xD8000000 */ AT_TYPE_UNK = 0xD8000000u
 };
 
 struct cCcD_SrcTriAttr {
@@ -120,16 +120,16 @@ public:
 STATIC_ASSERT(0x40 == sizeof(cCcD_DivideArea));
 
 struct cCcD_SrcObjCommonBase {
-    /* 0x0 */ s32 mSPrm;
+    /* 0x0 */ u32 mSPrm;
 };
 
 struct cCcD_SrcObjTg {
-    /* 0x0 */ s32 mType;
+    /* 0x0 */ u32 mType;
     /* 0x4 */ cCcD_SrcObjCommonBase mBase;
 };  // Size: 0x8
 
 struct cCcD_SrcObjAt {
-    /* 0x0 */ s32 mType;
+    /* 0x0 */ u32 mType;
     /* 0x4 */ u8 mAtp;
     /* 0x8 */ cCcD_SrcObjCommonBase mBase;
 };  // Size: 0xC
diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h
index 213408e023..098749397d 100644
--- a/include/d/d_com_inf_game.h
+++ b/include/d/d_com_inf_game.h
@@ -1038,10 +1038,6 @@ extern GXColor g_clearColor;
 extern GXColor g_whiteColor;
 extern GXColor g_saftyWhiteColor;
 
-inline void dComIfG_ct() {
-    g_dComIfG_gameInfo.ct();
-}
-
 int dComLbG_PhaseHandler(request_of_phase_process_class*, request_of_phase_process_fn*,
                          void*);
 BOOL dComIfG_resetToOpening(scene_class* scene);
@@ -1064,144 +1060,6 @@ int dComIfG_TimerReStart(int);
 int dComIfG_TimerEnd(int i_mode, int param_1);
 void dComIfGs_onStageBossEnemy(int i_stageNo);
 
-inline void dComIfG_setBrightness(u8 brightness) {
-    g_dComIfG_gameInfo.mFadeBrightness = brightness;
-}
-
-inline int dComIfG_getTimerMode() {
-    return g_dComIfG_gameInfo.play.getTimerMode();
-}
-
-inline void dComIfG_setTimerMode(int mode) {
-    return g_dComIfG_gameInfo.play.setTimerMode(mode);
-}
-
-inline dTimer_c* dComIfG_getTimerPtr() {
-    return g_dComIfG_gameInfo.play.getTimerPtr();
-}
-
-inline void dComIfG_setTimerPtr(dTimer_c* i_ptr) {
-    g_dComIfG_gameInfo.play.setTimerPtr(i_ptr);
-}
-
-inline void dComIfG_setTimerType(u8 i_type) {
-    g_dComIfG_gameInfo.play.setTimerType(i_type);
-}
-
-inline u8 dComIfG_getTimerType() {
-    return g_dComIfG_gameInfo.play.getTimerType();
-}
-
-inline int dComIfG_getTimerLimitTimeMs() {
-    return g_dComIfG_gameInfo.play.getTimerLimitTimeMs();
-}
-
-inline void dComIfG_setTimerLimitTimeMs(int i_time) {
-    g_dComIfG_gameInfo.play.setTimerLimitTimeMs(i_time);
-}
-
-inline BOOL dComIfG_isDebugMode() {
-    return g_dComIfG_gameInfo.mIsDebugMode;
-}
-
-/**
- * Attempts to add a new Object Resource Archive (*.arc) into the Resource Control.
- * @param i_arcName Name of archive to be added
- * @param i_mountDirection The direction to mount the archive. mDoDvd_MOUNT_DIRECTION_HEAD or
- * mDoDvd_MOUNT_DIRECTION_TAIL
- * @param i_heap Pointer to heap to load resources into
- * @return TRUE if successful, FALSE otherwise
- */
-inline int dComIfG_setObjectRes(const char* i_arcName, u8 i_mountDirection, JKRHeap* i_heap) {
-    return g_dComIfG_gameInfo.mResControl.setObjectRes(i_arcName, i_mountDirection, i_heap);
-}
-
-inline int dComIfG_setObjectRes(const char* i_arcName, void* i_archiveRes, u32 i_bufferSize) {
-    return g_dComIfG_gameInfo.mResControl.setObjectRes(i_arcName, i_archiveRes, i_bufferSize, NULL);
-}
-
-/**
- * Attempts to add a new Stage Resource Archive (*.arc) into the Resource Control.
- * @param i_arcName Name of archive to be added
- * @param i_heap Pointer to heap to load resources into
- * @return TRUE if successful, FALSE otherwise
- */
-inline int dComIfG_setStageRes(const char* i_arcName, JKRHeap* i_heap) {
-    return g_dComIfG_gameInfo.mResControl.setStageRes(i_arcName, i_heap);
-}
-
-inline int dComIfG_syncObjectRes(const char* i_arcName) {
-    return g_dComIfG_gameInfo.mResControl.syncObjectRes(i_arcName);
-}
-
-inline int dComIfG_syncStageRes(const char* i_arcName) {
-    return g_dComIfG_gameInfo.mResControl.syncStageRes(i_arcName);
-}
-
-inline int dComIfG_deleteObjectResMain(const char* i_arcName) {
-    return g_dComIfG_gameInfo.mResControl.deleteObjectRes(i_arcName);
-}
-
-inline int dComIfG_deleteStageRes(const char* i_arcName) {
-    return g_dComIfG_gameInfo.mResControl.deleteStageRes(i_arcName);
-}
-
-inline void* dComIfG_getStageRes(const char* i_arcName, const char* i_resName) {
-    return g_dComIfG_gameInfo.mResControl.getStageRes(i_arcName, i_resName);
-}
-
-inline void* dComIfG_getObjectRes(const char* i_arcName, const char* i_resName) {
-    return g_dComIfG_gameInfo.mResControl.getObjectRes(i_arcName, i_resName);
-}
-
-inline void* dComIfG_getObjectRes(const char* i_arcName, int i_index) {
-    return g_dComIfG_gameInfo.mResControl.getObjectRes(i_arcName, i_index);
-}
-
-inline void dComIfG_dumpResControl() {
-    g_dComIfG_gameInfo.mResControl.dump();
-}
-
-inline dBgS& dComIfG_Bgsp() {
-    return g_dComIfG_gameInfo.play.mBgs;
-}
-
-inline dCcS* dComIfG_Ccsp() {
-    return &g_dComIfG_gameInfo.play.mCcs;
-}
-
-inline dCcS& dComIfG_Ccsp2() {
-    return g_dComIfG_gameInfo.play.mCcs;
-}
-
-inline dRes_info_c* dComIfG_getObjectResInfo(const char* i_arcName) {
-    return g_dComIfG_gameInfo.mResControl.getObjectResInfo(i_arcName);
-}
-
-inline dRes_info_c* dComIfG_getStageResInfo(const char* i_arcName) {
-    return g_dComIfG_gameInfo.mResControl.getStageResInfo(i_arcName);
-}
-
-inline int dComIfG_syncAllObjectRes() {
-    return g_dComIfG_gameInfo.mResControl.syncAllObjectRes();
-}
-
-inline void* dComIfG_getObjectIDRes(const char* i_arcName, u16 i_resID) {
-    return g_dComIfG_gameInfo.mResControl.getObjectIDRes(i_arcName, i_resID);
-}
-
-inline u8 dComIfG_getBrightness() {
-    return g_dComIfG_gameInfo.mFadeBrightness;
-}
-
-inline int dComIfG_getObjctResName2Index(const char* i_arcName, const char* i_resName) {
-    return g_dComIfG_gameInfo.mResControl.getObjectResName2Index(i_arcName, i_resName);
-}
-
-inline u32 dComIfG_getTrigB(u32 i_padNo) {
-    return mDoCPd_c::getTrig(i_padNo) & PAD_BUTTON_B;
-}
-
 u8 dComIfGs_getMixItemIndex(int i_no);
 void dComIfGs_setSelectItemIndex(int i_no, u8 item_index);
 void dComIfGs_setMixItemIndex(int i_no, u8 item_index);
@@ -1217,7 +1075,7 @@ cXyz& dComIfGs_getWarpPlayerPos();
 const char* dComIfGs_getWarpStageName();
 s16 dComIfGs_getWarpPlayerAngleY();
 s8 dComIfGs_getWarpRoomNo();
-bool dComIfGs_getWarpMarkFlag();
+// dComIfGs_getWarpMarkFlag declared below
 BOOL dComIfGs_isOneZoneSwitch(int i_swBit, int i_roomNo);
 BOOL dComIfGs_isOneZoneItem(int i_swBit, int i_roomNo);
 BOOL dComIfGs_isZoneSwitch(int, int);
@@ -2835,11 +2693,6 @@ inline void dComIfGp_event_setGtItm(u8 i_itemNo) {
     g_dComIfG_gameInfo.play.getEvent()->setGtItm(i_itemNo);
 }
 
-inline int dComIfGp_evmng_getMyActIdx(int i_staffId, char** i_actions, int i_actionNum,
-                                      BOOL param_3, BOOL param_4) {
-    return dComIfGp_getPEvtManager()->getMyActIdx(i_staffId, i_actions, i_actionNum, param_3, param_4);
-}
-
 inline dEvent_manager_c& dComIfGp_getEventManager() {
     return g_dComIfG_gameInfo.play.getEvtManager();
 }
diff --git a/include/d/d_save.h b/include/d/d_save.h
index a0e29d9dd7..abb77dd69c 100644
--- a/include/d/d_save.h
+++ b/include/d/d_save.h
@@ -1,7 +1,7 @@
 #ifndef D_SAVE_D_SAVE_H
 #define D_SAVE_D_SAVE_H
 
-#include <string>
+#include <cstring>
 #include "SSystem/SComponent/c_xyz.h"
 #include <dolphin/os.h>
 #include "global.h"
diff --git a/include/f_ap/f_ap_game.h b/include/f_ap/f_ap_game.h
index 79bbb1b24f..83f5909a29 100644
--- a/include/f_ap/f_ap_game.h
+++ b/include/f_ap/f_ap_game.h
@@ -6,7 +6,7 @@
 #include "JSystem/JFramework/JFWDisplay.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "CaptureScreen.h"
-#include <string>
+#include <cstring>
 
 void fapGm_After();
 void fapGm_Create();
diff --git a/include/global.h b/include/global.h
index 59ff1f530e..8c9cfe3d7d 100644
--- a/include/global.h
+++ b/include/global.h
@@ -195,4 +195,9 @@ static const float INF = 2000000000.0f;
 #define FABSF std::fabsf
 #endif
 
+#ifndef __MWERKS__
+#include <cmath>
+using std::isnan;
+#endif
+
 #endif
diff --git a/src/JSystem/J2DGraph/J2DManage.cpp b/src/JSystem/J2DGraph/J2DManage.cpp
index 19a04db031..a7ac40503f 100644
--- a/src/JSystem/J2DGraph/J2DManage.cpp
+++ b/src/JSystem/J2DGraph/J2DManage.cpp
@@ -2,7 +2,7 @@
 
 #include "JSystem/J2DGraph/J2DManage.h"
 #include "JSystem/JSupport/JSUInputStream.h"
-#include <string>
+#include <cstring>
 
 void* J2DDataManage::get(char const* name) {
     J2DataManageLink* link;
diff --git a/src/JSystem/J2DGraph/J2DMaterialFactory.cpp b/src/JSystem/J2DGraph/J2DMaterialFactory.cpp
index 1b22ce0243..c8c9fc65f7 100644
--- a/src/JSystem/J2DGraph/J2DMaterialFactory.cpp
+++ b/src/JSystem/J2DGraph/J2DMaterialFactory.cpp
@@ -5,7 +5,7 @@
 #include "JSystem/J2DGraph/J2DScreen.h"
 #include "JSystem/JSupport/JSupport.h"
 #include "JSystem/JUtility/JUTResource.h"
-#include <string>
+#include <cstring>
 #include <dolphin/types.h>
 
 J2DMaterialFactory::J2DMaterialFactory(J2DMaterialBlock const& param_0) {
diff --git a/src/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp b/src/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp
index ff464a3642..f461b437a4 100644
--- a/src/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp
+++ b/src/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp
@@ -4,7 +4,7 @@
 #include "JSystem/J3DGraphAnimator/J3DAnimation.h"
 #include "JSystem/J3DGraphAnimator/J3DModel.h"
 #include "JSystem/JKernel/JKRHeap.h"
-#include <string>
+#include <cstring>
 
 J3DSkinNList::J3DSkinNList() {
     field_0x0 = NULL;
diff --git a/src/JSystem/J3DGraphBase/J3DMatBlock.cpp b/src/JSystem/J3DGraphBase/J3DMatBlock.cpp
index 21a8bf5789..004189a89b 100644
--- a/src/JSystem/J3DGraphBase/J3DMatBlock.cpp
+++ b/src/JSystem/J3DGraphBase/J3DMatBlock.cpp
@@ -5,7 +5,7 @@
 #include "JSystem/J3DGraphBase/J3DSys.h"
 #include "JSystem/J3DGraphBase/J3DTransform.h"
 #include "global.h"
-#include <string>
+#include <cstring>
 
 inline void loadMatColors(const J3DGXColor* color) {
     J3DGDWriteXFCmdHdr(0x100C, 2);
diff --git a/src/JSystem/J3DGraphBase/J3DPacket.cpp b/src/JSystem/J3DGraphBase/J3DPacket.cpp
index 173061882c..5eb6e77392 100644
--- a/src/JSystem/J3DGraphBase/J3DPacket.cpp
+++ b/src/JSystem/J3DGraphBase/J3DPacket.cpp
@@ -7,7 +7,7 @@
 #include "JSystem/J3DGraphBase/J3DShapeMtx.h"
 #include "JSystem/JKernel/JKRHeap.h"
 #include <dolphin/os.h>
-#include <string>
+#include <cstring>
 #include "global.h"
 
 J3DError J3DDisplayListObj::newDisplayList(u32 maxSize) {
diff --git a/src/JSystem/J3DGraphBase/J3DShapeDraw.cpp b/src/JSystem/J3DGraphBase/J3DShapeDraw.cpp
index e001a8a8b9..94d4534a82 100644
--- a/src/JSystem/J3DGraphBase/J3DShapeDraw.cpp
+++ b/src/JSystem/J3DGraphBase/J3DShapeDraw.cpp
@@ -2,7 +2,7 @@
 
 #include "JSystem/J3DGraphBase/J3DShapeDraw.h"
 #include "JSystem/JKernel/JKRHeap.h"
-#include <string>
+#include <cstring>
 #include <stdint.h>
 #include <dolphin/gx.h>
 
diff --git a/src/JSystem/J3DGraphBase/J3DVertex.cpp b/src/JSystem/J3DGraphBase/J3DVertex.cpp
index d455f27c8c..478ff42b0e 100644
--- a/src/JSystem/J3DGraphBase/J3DVertex.cpp
+++ b/src/JSystem/J3DGraphBase/J3DVertex.cpp
@@ -4,7 +4,7 @@
 #include "JSystem/J3DGraphAnimator/J3DJointTree.h"
 #include "JSystem/J3DGraphBase/J3DSys.h"
 #include "JSystem/JKernel/JKRHeap.h"
-#include <string>
+#include <cstring>
 
 J3DVertexData::J3DVertexData() {
     mVtxNum = 0;
diff --git a/src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp b/src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp
index 42fa13bc5a..df8a808deb 100644
--- a/src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp
+++ b/src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp
@@ -9,7 +9,7 @@
 #include "JSystem/JSupport/JSupport.h"
 #include "JSystem/JKernel/JKRHeap.h"
 #include <dolphin/os.h>
-#include <string>
+#include <cstring>
 
 void* J3DClusterLoaderDataBase::load(const void* i_data) {
     J3D_ASSERT_NULLPTR(41, i_data);
diff --git a/src/JSystem/JAudio2/JASWaveArcLoader.cpp b/src/JSystem/JAudio2/JASWaveArcLoader.cpp
index c2b7400444..277933fdb6 100644
--- a/src/JSystem/JAudio2/JASWaveArcLoader.cpp
+++ b/src/JSystem/JAudio2/JASWaveArcLoader.cpp
@@ -5,7 +5,7 @@
 #include "JSystem/JAudio2/JASTaskThread.h"
 #include "JSystem/JAudio2/JASMutex.h"
 #include "JSystem/JKernel/JKRDvdAramRipper.h"
-#include <string>
+#include <cstring>
 #include <dolphin/os.h>
 #include <stdint.h>
 
diff --git a/src/JSystem/JHostIO/JHIMccBuf.cpp b/src/JSystem/JHostIO/JHIMccBuf.cpp
index f71f9fc0fa..f013947e26 100644
--- a/src/JSystem/JHostIO/JHIMccBuf.cpp
+++ b/src/JSystem/JHostIO/JHIMccBuf.cpp
@@ -4,7 +4,7 @@
 #include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JHostIO/JHIRMcc.h"
 #include <revolution/hio2.h>
-#include <string>
+#include <cstring>
 
 void JHIReport(const char* fmt, ...) {}
 
diff --git a/src/JSystem/JHostIO/JORServer.cpp b/src/JSystem/JHostIO/JORServer.cpp
index f6423ffebd..3883252ce1 100644
--- a/src/JSystem/JHostIO/JORServer.cpp
+++ b/src/JSystem/JHostIO/JORServer.cpp
@@ -5,7 +5,7 @@
 #include "JSystem/JHostIO/JORFile.h"
 #include "JSystem/JHostIO/JORHostInfo.h"
 #include "JSystem/JSupport/JSUMemoryStream.h"
-#include <string>
+#include <cstring>
 
 void JOREventCallbackListNode::JORAppend() {
     JORServer* pServer = JORServer::getInstance();
diff --git a/src/JSystem/JKernel/JKRAram.cpp b/src/JSystem/JKernel/JKRAram.cpp
index a69ac99fba..a16a0ffb0b 100644
--- a/src/JSystem/JKernel/JKRAram.cpp
+++ b/src/JSystem/JKernel/JKRAram.cpp
@@ -8,7 +8,7 @@
 #include "JSystem/JUtility/JUTException.h"
 #include <dolphin/ar.h>
 #include <dolphin/os.h>
-#include <string>
+#include <cstring>
 
 #if PLATFORM_GCN
 const u32 stack_size = 0xc00;
diff --git a/src/JSystem/JKernel/JKRAramArchive.cpp b/src/JSystem/JKernel/JKRAramArchive.cpp
index fe7c9bbb84..f13f7fcbac 100644
--- a/src/JSystem/JKernel/JKRAramArchive.cpp
+++ b/src/JSystem/JKernel/JKRAramArchive.cpp
@@ -8,7 +8,7 @@
 #include "JSystem/JUtility/JUTAssert.h"
 #include "JSystem/JUtility/JUTException.h"
 #include <cmath>
-#include <string>
+#include <cstring>
 
 JKRAramArchive::JKRAramArchive() {}
 
diff --git a/src/JSystem/JKernel/JKRArchivePri.cpp b/src/JSystem/JKernel/JKRArchivePri.cpp
index 21ad688a44..ae1793bfc3 100644
--- a/src/JSystem/JKernel/JKRArchivePri.cpp
+++ b/src/JSystem/JKernel/JKRArchivePri.cpp
@@ -3,7 +3,7 @@
 #include "JSystem/JKernel/JKRArchive.h"
 #include "JSystem/JKernel/JKRHeap.h"
 #include <cctype>
-#include <string>
+#include <cstring>
 
 #if TARGET_PC
 #include <cassert>
diff --git a/src/JSystem/JKernel/JKRCompArchive.cpp b/src/JSystem/JKernel/JKRCompArchive.cpp
index 7c5217684b..56450bcd15 100644
--- a/src/JSystem/JKernel/JKRCompArchive.cpp
+++ b/src/JSystem/JKernel/JKRCompArchive.cpp
@@ -11,7 +11,7 @@
 #include "JSystem/JUtility/JUTAssert.h"
 #include "JSystem/JUtility/JUTException.h"
 #include <cmath>
-#include <string>
+#include <cstring>
 #include <stdint.h>
 
 JKRCompArchive::JKRCompArchive(s32 entryNum, JKRArchive::EMountDirection eMountDirection)
diff --git a/src/JSystem/JKernel/JKRDvdAramRipper.cpp b/src/JSystem/JKernel/JKRDvdAramRipper.cpp
index 714ad8aae8..2ab9b6497b 100644
--- a/src/JSystem/JKernel/JKRDvdAramRipper.cpp
+++ b/src/JSystem/JKernel/JKRDvdAramRipper.cpp
@@ -11,7 +11,7 @@
 #include <dolphin/os.h>
 #include <dolphin/vi.h>
 #include "global.h"
-#include <string>
+#include <cstring>
 
 static int JKRDecompressFromDVDToAram(JKRDvdFile*, u32, u32, u32, u32, u32, u32*);
 static int decompSZS_subroutine(u8*, u32);
diff --git a/src/JSystem/JKernel/JKRDvdArchive.cpp b/src/JSystem/JKernel/JKRDvdArchive.cpp
index dd4d504868..77f0553844 100644
--- a/src/JSystem/JKernel/JKRDvdArchive.cpp
+++ b/src/JSystem/JKernel/JKRDvdArchive.cpp
@@ -7,7 +7,7 @@
 #include "JSystem/JUtility/JUTAssert.h"
 #include "JSystem/JUtility/JUTException.h"
 #include <cmath>
-#include <string>
+#include <cstring>
 #include "global.h"
 #include <stdint.h>
 
diff --git a/src/JSystem/JKernel/JKRDvdRipper.cpp b/src/JSystem/JKernel/JKRDvdRipper.cpp
index 0017119c2b..caa3b0ef88 100644
--- a/src/JSystem/JKernel/JKRDvdRipper.cpp
+++ b/src/JSystem/JKernel/JKRDvdRipper.cpp
@@ -8,7 +8,7 @@
 #include "JSystem/JKernel/JKRDvdFile.h"
 #include "JSystem/JKernel/JKRDecomp.h"
 #include "JSystem/JUtility/JUTException.h"
-#include <string>
+#include <cstring>
 #include <dolphin/os.h>
 #include <dolphin/vi.h>
 #include <stdint.h>
diff --git a/src/JSystem/JKernel/JKRFileCache.cpp b/src/JSystem/JKernel/JKRFileCache.cpp
index 1dc3a719ef..d0162d95e5 100644
--- a/src/JSystem/JKernel/JKRFileCache.cpp
+++ b/src/JSystem/JKernel/JKRFileCache.cpp
@@ -7,7 +7,7 @@
 #include "JSystem/JUtility/JUTAssert.h"
 
 #include <cctype>
-#include <string>
+#include <cstring>
 #include "global.h"
 
 JKRFileCache* JKRFileCache::mount(const char* path, JKRHeap* heap, const char* param_3) {
diff --git a/src/JSystem/JKernel/JKRFileLoader.cpp b/src/JSystem/JKernel/JKRFileLoader.cpp
index 26790f87b6..6bb460e93a 100644
--- a/src/JSystem/JKernel/JKRFileLoader.cpp
+++ b/src/JSystem/JKernel/JKRFileLoader.cpp
@@ -4,7 +4,7 @@
 
 #define MSL_USE_INLINES 1  // needed to inline tolower call. not inlined elsewhere in the repo
 
-#include <string>
+#include <cstring>
 #include <cctype>
 #include "global.h"
 
diff --git a/src/JSystem/JKernel/JKRHeap.cpp b/src/JSystem/JKernel/JKRHeap.cpp
index 606ff3def9..0778122787 100644
--- a/src/JSystem/JKernel/JKRHeap.cpp
+++ b/src/JSystem/JKernel/JKRHeap.cpp
@@ -15,7 +15,7 @@
 #include <cstdio>
 #include <cstdlib>
 #endif
-#include <string>
+#include <cstring>
 #include <dolphin/os.h>
 
 #if DEBUG
diff --git a/src/JSystem/JKernel/JKRMemArchive.cpp b/src/JSystem/JKernel/JKRMemArchive.cpp
index 44ae510a92..028139746c 100644
--- a/src/JSystem/JKernel/JKRMemArchive.cpp
+++ b/src/JSystem/JKernel/JKRMemArchive.cpp
@@ -5,7 +5,7 @@
 #include "JSystem/JKernel/JKRDvdRipper.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "JSystem/JUtility/JUTException.h"
-#include <string>
+#include <cstring>
 #include "global.h"
 #include <stdint.h>
 
diff --git a/src/JSystem/JMessage/resource.cpp b/src/JSystem/JMessage/resource.cpp
index 04387050c2..5bda061497 100644
--- a/src/JSystem/JMessage/resource.cpp
+++ b/src/JSystem/JMessage/resource.cpp
@@ -4,7 +4,7 @@
 #include "JSystem/JGadget/search.h"
 #include "JSystem/JGadget/define.h"
 #include <algorithm>
-#include <string>
+#include <cstring>
 
 u16 JMessage::TResource::toMessageIndex_messageID(u32 uMsgID, u32 upperHalf, bool* pbValid) const {
     if (!oParse_TBlock_messageID_.getRaw()) {
diff --git a/src/JSystem/JParticle/JPAResourceManager.cpp b/src/JSystem/JParticle/JPAResourceManager.cpp
index e382a39110..9ea2dff128 100644
--- a/src/JSystem/JParticle/JPAResourceManager.cpp
+++ b/src/JSystem/JParticle/JPAResourceManager.cpp
@@ -3,7 +3,7 @@
 #include "JSystem/JParticle/JPAResourceManager.h"
 #include "JSystem/JParticle/JPADynamicsBlock.h"
 #include "JSystem/JParticle/JPAResource.h"
-#include <string>
+#include <cstring>
 
 struct JPAResourceLoader {
     JPAResourceLoader(u8 const*, JPAResourceManager*);
diff --git a/src/JSystem/JStudio/JStudio/ctb.cpp b/src/JSystem/JStudio/JStudio/ctb.cpp
index a28752af7a..5a2c0c11cb 100644
--- a/src/JSystem/JStudio/JStudio/ctb.cpp
+++ b/src/JSystem/JStudio/JStudio/ctb.cpp
@@ -2,7 +2,7 @@
 
 #include "JSystem/JStudio/JStudio/ctb.h"
 #include <iterator>
-#include <string>
+#include <cstring>
 #include <algorithm>
 
 JStudio::ctb::TObject::~TObject() {}
diff --git a/src/JSystem/JStudio/JStudio/fvb.cpp b/src/JSystem/JStudio/JStudio/fvb.cpp
index 94721909c4..1f8b68b4a2 100644
--- a/src/JSystem/JStudio/JStudio/fvb.cpp
+++ b/src/JSystem/JStudio/JStudio/fvb.cpp
@@ -2,7 +2,7 @@
 
 #include "JSystem/JStudio/JStudio/fvb.h"
 #include "JSystem/JUtility/JUTException.h"
-#include <string>
+#include <cstring>
 
 namespace JStudio {
 namespace fvb {
diff --git a/src/JSystem/JStudio/JStudio/jstudio-control.cpp b/src/JSystem/JStudio/JStudio/jstudio-control.cpp
index 38fe394ea0..dd11fe431b 100644
--- a/src/JSystem/JStudio/JStudio/jstudio-control.cpp
+++ b/src/JSystem/JStudio/JStudio/jstudio-control.cpp
@@ -7,7 +7,7 @@
 #include "JSystem/JStudio/JStudio/jstudio-control.h"
 #include "JSystem/JStudio/JStudio/jstudio-math.h"
 #include "JSystem/JStudio/JStudio/jstudio-data.h"
-#include <string>
+#include <cstring>
 
 JStudio::TControl::TControl() {
     mTransformOnSet = false;
diff --git a/src/JSystem/JStudio/JStudio/stb.cpp b/src/JSystem/JStudio/JStudio/stb.cpp
index b2dbddbd6d..424bc4e3fb 100644
--- a/src/JSystem/JStudio/JStudio/stb.cpp
+++ b/src/JSystem/JStudio/JStudio/stb.cpp
@@ -4,7 +4,7 @@
 #include "JSystem/JStudio/JStudio/jstudio-object.h"
 #include "JSystem/JUtility/JUTException.h"
 #include <algorithm>
-#include <string>
+#include <cstring>
 
 namespace JStudio {
 namespace stb {
diff --git a/src/JSystem/JSupport/JSUMemoryStream.cpp b/src/JSystem/JSupport/JSUMemoryStream.cpp
index 54cc513fe9..c2bd1f8032 100644
--- a/src/JSystem/JSupport/JSUMemoryStream.cpp
+++ b/src/JSystem/JSupport/JSUMemoryStream.cpp
@@ -1,7 +1,7 @@
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JSupport/JSUMemoryStream.h"
-#include <string>
+#include <cstring>
 
 void JSUMemoryInputStream::setBuffer(void const* pBuffer, s32 length) {
     mBuffer = pBuffer;
diff --git a/src/JSystem/JSupport/JSUOutputStream.cpp b/src/JSystem/JSupport/JSUOutputStream.cpp
index 132b143c5d..dec0976ad3 100644
--- a/src/JSystem/JSupport/JSUOutputStream.cpp
+++ b/src/JSystem/JSupport/JSUOutputStream.cpp
@@ -3,7 +3,7 @@
 #include "JSystem/JSupport/JSUOutputStream.h"
 #include "JSystem/JSupport/JSURandomOutputStream.h"
 #include <dolphin/dolphin.h>
-#include <string>
+#include <cstring>
 
 JSUOutputStream::~JSUOutputStream() {
     if (!isGood()) {
diff --git a/src/JSystem/JUtility/JUTDbPrint.cpp b/src/JSystem/JUtility/JUTDbPrint.cpp
index c037db9b2c..fea630ced3 100644
--- a/src/JSystem/JUtility/JUTDbPrint.cpp
+++ b/src/JSystem/JUtility/JUTDbPrint.cpp
@@ -4,6 +4,7 @@
 #include "JSystem/J2DGraph/J2DOrthoGraph.h"
 #include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTVideo.h"
+#include <cstdarg>
 #include <cstdio>
 #include <cstring>
 
diff --git a/src/JSystem/JUtility/JUTNameTab.cpp b/src/JSystem/JUtility/JUTNameTab.cpp
index 3b6ed448e0..8b1cdbdf71 100644
--- a/src/JSystem/JUtility/JUTNameTab.cpp
+++ b/src/JSystem/JUtility/JUTNameTab.cpp
@@ -1,7 +1,7 @@
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JUtility/JUTNameTab.h"
-#include <string>
+#include <cstring>
 
 JUTNameTab::JUTNameTab() {
     setResource(NULL);
diff --git a/src/JSystem/JUtility/JUTResource.cpp b/src/JSystem/JUtility/JUTResource.cpp
index 3c80c471d6..cc0258face 100644
--- a/src/JSystem/JUtility/JUTResource.cpp
+++ b/src/JSystem/JUtility/JUTResource.cpp
@@ -3,7 +3,7 @@
 #include "JSystem/JUtility/JUTResource.h"
 #include "JSystem/JKernel/JKRArchive.h"
 #include "JSystem/JSupport/JSUInputStream.h"
-#include <string>
+#include <cstring>
 
 void* JUTResReference::getResource(JSUInputStream* stream, u32 resType, JKRArchive* archive) {
     stream->read(mType);
diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstring b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstring
index c55307fb71..b7c2e53a2a 100644
--- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstring
+++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstring
@@ -26,6 +26,22 @@ size_t strlen(const char* str);
 
 #ifdef __cplusplus
 };
+
+namespace std {
+using ::memcpy;
+using ::memset;
+using ::memcmp;
+using ::memchr;
+using ::memmove;
+using ::strrchr;
+using ::strchr;
+using ::strlen;
+using ::strncmp;
+using ::strcmp;
+using ::strcat;
+using ::strncpy;
+using ::strcpy;
+} // namespace std
 #endif
 
 #endif /* _MSL_COMMON_STRING_H */
diff --git a/src/SSystem/SComponent/c_lib.cpp b/src/SSystem/SComponent/c_lib.cpp
index 4440acbc07..6441d6ceb8 100644
--- a/src/SSystem/SComponent/c_lib.cpp
+++ b/src/SSystem/SComponent/c_lib.cpp
@@ -4,7 +4,7 @@
  */
 
 #include "SSystem/SComponent/c_lib.h"
-#include <string>
+#include <cstring>
 #include "SSystem/SComponent/c_math.h"
 
 /**
diff --git a/src/d/actor/d_a_alink.cpp b/src/d/actor/d_a_alink.cpp
index 8977c2c076..a2b5a11f6d 100644
--- a/src/d/actor/d_a_alink.cpp
+++ b/src/d/actor/d_a_alink.cpp
@@ -1467,7 +1467,7 @@ static f32 l_ladderAnmBaseTransY = 102.00054168701172f;
 
 static dCcD_SrcCyl l_cylSrc = {
     {
-        {0, {{AT_TYPE_WOLF_ATTACK, 3, 0x1A}, {(s32)0xD8FFFDFF, 5}, 0x73}},
+        {0, {{AT_TYPE_WOLF_ATTACK, 3, 0x1A}, {0xD8FFFDFF, 5}, 0x73}},
         {dCcD_SE_WOLF_BITE, 3, 1, 0, {1}},
         {dCcD_SE_NONE, 6, 0, 0, {0}},
         {0},
@@ -1483,7 +1483,7 @@ static dCcD_SrcCyl l_cylSrc = {
 
 static dCcD_SrcSph l_sphSrc = {
     {
-        {0, {{AT_TYPE_NORMAL_SWORD, 3, 0x1A}, {(s32)0xD8FBFDFF, 5}, 0x73}},
+        {0, {{AT_TYPE_NORMAL_SWORD, 3, 0x1A}, {0xD8FBFDFF, 5}, 0x73}},
         {dCcD_SE_SWORD, 3, 1, 0, {1}},
         {dCcD_SE_NONE, 6, 0, 0, {0}},
         {0},
@@ -4640,7 +4640,7 @@ void daAlink_c::playerInit() {
     }
 }
 
-void dummy(fopAc_ac_c* i_this) {
+static void dummy(fopAc_ac_c* i_this) {
     fopAcM_RegisterCreateID(i_this, "ALINK");
 }
 
diff --git a/src/d/actor/d_a_e_bg.cpp b/src/d/actor/d_a_e_bg.cpp
index 1f1514bed6..be19dfcae2 100644
--- a/src/d/actor/d_a_e_bg.cpp
+++ b/src/d/actor/d_a_e_bg.cpp
@@ -44,7 +44,7 @@ void daE_BG_HIO_c::genMessage(JORMContext* ctx) {
 namespace {
 dCcD_SrcSph cc_bg_src = {
     {
-        {0x0, {{0x0, 0x0, 0x0}, {(s32)0xD8FBFDFF, 0x03}, 0x75}}, // mObj
+        {0x0, {{0x0, 0x0, 0x0}, {0xD8FBFDFF, 0x03}, 0x75}}, // mObj
         {dCcD_SE_METAL, 0x0, 0x0, 0x0, 0x0}, // mGObjAt
         {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x2}, // mGObjTg
         {0x0}, // mGObjCo
diff --git a/src/d/actor/d_a_e_dk.cpp b/src/d/actor/d_a_e_dk.cpp
index a21506dcba..6efac3410b 100644
--- a/src/d/actor/d_a_e_dk.cpp
+++ b/src/d/actor/d_a_e_dk.cpp
@@ -46,7 +46,7 @@ enum E_DK_RES_FILE_ID {
 namespace {
 static dCcD_SrcSph cc_dk_src = {
     { // mObjInf
-        { 0x0, { { 0, 0, { 0 } }, { (s32)0xd8fbbddf, { 3 } }, { { 0x75 } } } }, // mObj
+        { 0x0, { { 0, 0, { 0 } }, { 0xd8fbbddf, { 3 } }, { { 0x75 } } } }, // mObj
         { 0x09, 0, 0, 0, { 0 } }, // mGObjAt
         { 0x00, 0x00, 0x00, 0x00, { 5 } }, // mGObjTg
         { { 0 } }, // mGObjCo
diff --git a/src/d/actor/d_a_e_gb.cpp b/src/d/actor/d_a_e_gb.cpp
index bb1305d96e..4850460450 100644
--- a/src/d/actor/d_a_e_gb.cpp
+++ b/src/d/actor/d_a_e_gb.cpp
@@ -394,7 +394,7 @@ static void e_gb_damage(e_gb_class* i_this) {
 
     i_this->invulnerabilityTimer = 35;
     switch (i_this->mode) {
-    case 0:
+    case 0: {
         i_this->mode = 1;
         s16 angleDiff = i_this->angleYTarget - actor->current.angle.y;
         if (angleDiff < 0) {
@@ -413,6 +413,7 @@ static void e_gb_damage(e_gb_class* i_this) {
         actor->speed.y = fabsf(actor->current.pos.y - i_this->currentPosTarget.y) * 0.2f;
         actor->speed.z = fabsf(actor->current.pos.z - i_this->currentPosTarget.z) * 0.2f;
         i_this->timer[0] = KREG_S(7) + 15;
+    }
         // fallthrough
     case 1:
         if (i_this->timer[0] == 0) {
diff --git a/src/d/actor/d_a_e_hm.cpp b/src/d/actor/d_a_e_hm.cpp
index 9b0acb6496..fbb5294625 100644
--- a/src/d/actor/d_a_e_hm.cpp
+++ b/src/d/actor/d_a_e_hm.cpp
@@ -94,7 +94,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
 void daE_HM_c::initCcCylinder() {
     static const dCcD_SrcSph ccShpSrc = {
         {
-            {0x0, {{0x2, 0x1, 0xd}, {(s32)0xD8FBFDFF, 0x43}, 0x75}},  // mObj
+            {0x0, {{0x2, 0x1, 0xd}, {0xD8FBFDFF, 0x43}, 0x75}},  // mObj
             {dCcD_SE_STONE, 0x0, 0x0, 0x0, 0x0},                  // mGObjAt
             {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0},                   // mGObjTg
             {0x0},                                                // mGObjCo
diff --git a/src/d/actor/d_a_e_hp.cpp b/src/d/actor/d_a_e_hp.cpp
index 49d563fec3..a1f202489a 100644
--- a/src/d/actor/d_a_e_hp.cpp
+++ b/src/d/actor/d_a_e_hp.cpp
@@ -31,7 +31,7 @@ public:
 namespace {
 static dCcD_SrcCyl cc_hp_src = {
     {
-        {0, {{0x0, 0x0, 0x0}, {(s32)0xd8000000, 0x3}, 0x0}},
+        {0, {{0x0, 0x0, 0x0}, {0xd8000000, 0x3}, 0x0}},
         {dCcD_SE_13, 0, 0, 0, {0}},
         {dCcD_SE_NONE, 0, 0, 0, {6}},
         {0},
@@ -47,7 +47,7 @@ static dCcD_SrcCyl cc_hp_src = {
 
 static dCcD_SrcSph cc_lamp_src = {
     {
-        {0x0, {{0x0, 0x0, 0x0}, {(s32)0xD8FBFDFF, 0x43}, 0x75}},  // mObj
+        {0x0, {{0x0, 0x0, 0x0}, {0xD8FBFDFF, 0x43}, 0x75}},  // mObj
         {dCcD_SE_13, 0x0, 0x0, 0x0, 0x0},                         // mGObjAt
         {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x6},                       // mGObjTg
         {0x0},                                                    // mGObjCo
diff --git a/src/d/actor/d_a_e_hz.cpp b/src/d/actor/d_a_e_hz.cpp
index de65faf8da..217f3a2664 100644
--- a/src/d/actor/d_a_e_hz.cpp
+++ b/src/d/actor/d_a_e_hz.cpp
@@ -2016,7 +2016,7 @@ int daE_HZ_c::create() {
 
     static dCcD_SrcSph cc_sph_src2 = {
         {
-            {0x0, {{AT_TYPE_CSTATUE_SWING, 0x1, 0x0}, {(s32)0xd8fafdff, 0x3}, 0x75}},   // mObj
+            {0x0, {{AT_TYPE_CSTATUE_SWING, 0x1, 0x0}, {0xd8fafdff, 0x3}, 0x75}},   // mObj
             {dCcD_SE_METAL, 0x0, 0x0, 0x0, 0x0},                                        // mGObjAt
             {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x2},                                         // mGObjTg
             {0x0},                                                                      // mGObjCo
diff --git a/src/d/actor/d_a_e_kr.cpp b/src/d/actor/d_a_e_kr.cpp
index 4001092815..c32921568b 100644
--- a/src/d/actor/d_a_e_kr.cpp
+++ b/src/d/actor/d_a_e_kr.cpp
@@ -2258,7 +2258,7 @@ static int daE_Kr_Create(fopAc_ac_c* i_this) {
     };
     static dCcD_SrcSph head_tg_sph_src = {
         {
-            {0x0, {{0x0, 0x1, 0x0}, {(s32)0xd8fbfdff, 0x3}, 0x0}},  // mObj
+            {0x0, {{0x0, 0x1, 0x0}, {0xd8fbfdff, 0x3}, 0x0}},  // mObj
             {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0},                     // mGObjAt
             {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x2},                     // mGObjTg
             {0x0},                                                  // mGObjCo
@@ -2270,7 +2270,7 @@ static int daE_Kr_Create(fopAc_ac_c* i_this) {
 
     static dCcD_SrcSph body_tg_sph_src = {
         {
-            {0x0, {{0x0, 0x1, 0x0}, {(s32)0xd8fbfdff, 0x3}, 0x0}},  // mObj
+            {0x0, {{0x0, 0x1, 0x0}, {0xd8fbfdff, 0x3}, 0x0}},  // mObj
             {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0},                // mGObjAt
             {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x2},                // mGObjTg
             {0x0},                                             // mGObjCo
diff --git a/src/d/actor/d_a_e_sh.cpp b/src/d/actor/d_a_e_sh.cpp
index a2d7722926..b05c57eef8 100644
--- a/src/d/actor/d_a_e_sh.cpp
+++ b/src/d/actor/d_a_e_sh.cpp
@@ -1160,7 +1160,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
 static int daE_SH_Create(fopAc_ac_c* i_this) {
     static dCcD_SrcSph cc_sph_src = {
         {
-            {0x0, {{0x0, 0x0, 0x0}, {(s32)0xd8fbfdff, 0x3}, 0x75}}, // mObj
+            {0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x3}, 0x75}}, // mObj
             {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt
             {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x2}, // mGObjTg
             {0x0}, // mGObjCo
diff --git a/src/d/actor/d_a_e_yd.cpp b/src/d/actor/d_a_e_yd.cpp
index bd54664088..3146abf018 100644
--- a/src/d/actor/d_a_e_yd.cpp
+++ b/src/d/actor/d_a_e_yd.cpp
@@ -1361,7 +1361,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
 static int daE_YD_Create(fopAc_ac_c* i_this) {
     static dCcD_SrcSph cc_sph_src = {
         {
-            {0x0, {{0x0, 0x0, 0xd}, {(s32)0xd8fbfdff, 0x3}, 0x25}}, // mObj
+            {0x0, {{0x0, 0x0, 0xd}, {0xd8fbfdff, 0x3}, 0x25}}, // mObj
             {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt
             {dCcD_SE_STONE, 0x0, 0x0, 0x0, 0x2}, // mGObjTg
             {0x0}, // mGObjCo
@@ -1383,7 +1383,7 @@ static int daE_YD_Create(fopAc_ac_c* i_this) {
     };
     static dCcD_SrcSph kuki_sph_src = {
         {
-            {0x0, {{0x0, 0x0, 0xd}, {(s32)0xd8fbfdff, 0x3}, 0x0}}, // mObj
+            {0x0, {{0x0, 0x0, 0xd}, {0xd8fbfdff, 0x3}, 0x0}}, // mObj
             {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt
             {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x2}, // mGObjTg
             {0x0}, // mGObjCo
diff --git a/src/d/actor/d_a_e_yr.cpp b/src/d/actor/d_a_e_yr.cpp
index a5dfd55d9d..4484918107 100644
--- a/src/d/actor/d_a_e_yr.cpp
+++ b/src/d/actor/d_a_e_yr.cpp
@@ -2416,7 +2416,7 @@ static int daE_Yr_Create(fopAc_ac_c* i_this) {
 
     static dCcD_SrcSph head_tg_sph_src = {
         {
-            {0x0, {{0x0, 0x1, 0x0}, {(s32)0xd8fbfdff, 0x3}, 0x0}}, // mObj
+            {0x0, {{0x0, 0x1, 0x0}, {0xd8fbfdff, 0x3}, 0x0}}, // mObj
             {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt
             {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x2}, // mGObjTg
             {0x0}, // mGObjCo
@@ -2428,7 +2428,7 @@ static int daE_Yr_Create(fopAc_ac_c* i_this) {
 
     static dCcD_SrcSph body_tg_sph_src = {
         {
-            {0x0, {{0x0, 0x1, 0x0}, {(s32)0xd8fbfdff, 0x3}, 0x0}}, // mObj
+            {0x0, {{0x0, 0x1, 0x0}, {0xd8fbfdff, 0x3}, 0x0}}, // mObj
             {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt
             {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x2}, // mGObjTg
             {0x0}, // mGObjCo
diff --git a/src/d/actor/d_a_grass.cpp b/src/d/actor/d_a_grass.cpp
index 33a079524c..04992b39b5 100644
--- a/src/d/actor/d_a_grass.cpp
+++ b/src/d/actor/d_a_grass.cpp
@@ -10,7 +10,7 @@
 #include "SSystem/SComponent/c_math.h"
 #include "d/d_com_inf_game.h"
 #include "Z2AudioLib/Z2Instances.h"
-#include <string>
+#include <cstring>
 
 #include "d/actor/d_grass.inc" // IWYU pragma: keep
 #include "d/actor/d_flower.inc"
diff --git a/src/d/actor/d_a_obj_hakai_brl.cpp b/src/d/actor/d_a_obj_hakai_brl.cpp
index 756ee528ab..1b71ca265c 100644
--- a/src/d/actor/d_a_obj_hakai_brl.cpp
+++ b/src/d/actor/d_a_obj_hakai_brl.cpp
@@ -84,7 +84,7 @@ int daObjHBarrel_c::execute() {
 
 dCcD_SrcCyl const daObjHBarrel_c::s_CcDCyl = {
     {
-        {0x0, {{0x0, 0x0, 0xd}, {(s32)0xd8fafdff, 0x11}, 0x79}},  // mObj
+        {0x0, {{0x0, 0x0, 0xd}, {0xd8fafdff, 0x11}, 0x79}},  // mObj
         {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0},                  // mGObjAt
         {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x5},                  // mGObjTg
         {0x0},                                               // mGObjCo
diff --git a/src/d/actor/d_a_obj_kbacket.cpp b/src/d/actor/d_a_obj_kbacket.cpp
index 0176da95ec..2abed0f54b 100644
--- a/src/d/actor/d_a_obj_kbacket.cpp
+++ b/src/d/actor/d_a_obj_kbacket.cpp
@@ -22,7 +22,7 @@ const daObj_KBacket_HIOParam daObj_KBacket_Param_c::m = {
 };
 
 static const dCcD_SrcGObjInf l_ccDObjData = {
-    {0x0, {{0x0, 0x0, 0x0}, {(s32)0xd8fbfdff, 0x0}, 0x79}}, // mObj
+    {0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x0}, 0x79}}, // mObj
     {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt
     {dCcD_SE_STONE, 0x0, 0x0, 0x0, 0x0}, // mGObjTg
     {0x0}, // mGObjCo
diff --git a/src/d/actor/d_a_obj_klift00.cpp b/src/d/actor/d_a_obj_klift00.cpp
index 221e4f8812..c802bc9b6f 100644
--- a/src/d/actor/d_a_obj_klift00.cpp
+++ b/src/d/actor/d_a_obj_klift00.cpp
@@ -78,7 +78,7 @@ static const char* l_arcName = "K_lift00";
 
 static dCcD_SrcSph l_cc_sph_src = {
     {
-        {0x0, {{0x0, 0x0, 0x0}, {(s32)0xd8fbfdff, 0x11}, 0x79}}, // mObj
+        {0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x11}, 0x79}}, // mObj
         {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt
         {dCcD_SE_NONE, 0x5, 0x0, 0x0, 0x2}, // mGObjTg
         {0x0}, // mGObjCo
diff --git a/src/d/actor/d_a_obj_wood_statue.cpp b/src/d/actor/d_a_obj_wood_statue.cpp
index bcbf449891..23bcad36f7 100644
--- a/src/d/actor/d_a_obj_wood_statue.cpp
+++ b/src/d/actor/d_a_obj_wood_statue.cpp
@@ -14,7 +14,7 @@
 
 const static dCcD_SrcCyl l_cyl_src = {
     {
-        {0x0, {{0x0, 0x0, 0x0}, {-1, 0x11}, 0x59}}, // mObj
+        {0x0, {{0x0, 0x0, 0x0}, {0xFFFFFFFF, 0x11}, 0x59}}, // mObj
         {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt
         {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x4}, // mGObjTg
         {0x0}, // mGObjCo
diff --git a/src/d/actor/d_a_tag_kmsg.cpp b/src/d/actor/d_a_tag_kmsg.cpp
index 1588e5a9c2..8c2d036149 100644
--- a/src/d/actor/d_a_tag_kmsg.cpp
+++ b/src/d/actor/d_a_tag_kmsg.cpp
@@ -4,7 +4,7 @@
 #include "d/actor/d_a_npc.h"
 #include "d/actor/d_a_player.h"
 #include "SSystem/SComponent/c_counter.h"
-#include <string>
+#include <cstring>
 
 struct EventListItem {
     char* mEventName;
diff --git a/src/d/d_envse.cpp b/src/d/d_envse.cpp
index df9a133bec..734ed221e7 100644
--- a/src/d/d_envse.cpp
+++ b/src/d/d_envse.cpp
@@ -9,7 +9,7 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_path.h"
 #include "f_op/f_op_camera_mng.h"
-#include <string>
+#include <cstring>
 
 static int dEnvSe_Draw(dEnvSe_c* i_this) {
     return 1;
diff --git a/src/d/d_error_msg.cpp b/src/d/d_error_msg.cpp
index ffde521eaf..4259e7f08c 100644
--- a/src/d/d_error_msg.cpp
+++ b/src/d/d_error_msg.cpp
@@ -5,7 +5,7 @@
 
 #include "d/dolzel.h" // IWYU pragma: keep
 
-#include <string>
+#include <cstring>
 #include "JSystem/J2DGraph/J2DOrthoGraph.h"
 #include "JSystem/J2DGraph/J2DPicture.h"
 #include "JSystem/J2DGraph/J2DTextBox.h"
diff --git a/src/d/d_event_manager.cpp b/src/d/d_event_manager.cpp
index 41b31b5837..8b2291b124 100644
--- a/src/d/d_event_manager.cpp
+++ b/src/d/d_event_manager.cpp
@@ -13,7 +13,7 @@
 #include "d/d_demo.h"
 #include "d/d_s_play.h"
 #include "SSystem/SComponent/c_counter.h"
-#include <string>
+#include <cstring>
 
 #if DEBUG
 static dEvM_HIO_c l_HIO;
diff --git a/src/d/d_kankyo_wether.cpp b/src/d/d_kankyo_wether.cpp
index 8acb561fde..0e0617639d 100644
--- a/src/d/d_kankyo_wether.cpp
+++ b/src/d/d_kankyo_wether.cpp
@@ -12,7 +12,7 @@
 #include "d/d_kankyo.h"
 #include "d/d_kankyo_rain.h"
 #include "f_op/f_op_camera_mng.h"
-#include <string>
+#include <cstring>
 #include "m_Do/m_Do_audio.h"
 
 static void dKyw_pntlight_set(WIND_INFLUENCE* pntwind);
diff --git a/src/d/d_menu_option.cpp b/src/d/d_menu_option.cpp
index b398a06789..ac3dbd949b 100644
--- a/src/d/d_menu_option.cpp
+++ b/src/d/d_menu_option.cpp
@@ -22,7 +22,7 @@
 #include "f_op/f_op_msg_mng.h"
 #include "m_Do/m_Do_controller_pad.h"
 #include "m_Do/m_Do_graphic.h"
-#include <string>
+#include <cstring>
 
 typedef void (dMenu_Option_c::*initFunc)();
 static initFunc init[] = {
diff --git a/src/d/d_menu_ring.cpp b/src/d/d_menu_ring.cpp
index de1a5ab3a0..efb8e0c4fd 100644
--- a/src/d/d_menu_ring.cpp
+++ b/src/d/d_menu_ring.cpp
@@ -25,7 +25,7 @@
 #include "d/d_msg_string.h"
 #include "m_Do/m_Do_controller_pad.h"
 #include "m_Do/m_Do_graphic.h"
-#include <string>
+#include <cstring>
 
 #include <cstdio>
 
diff --git a/src/d/d_meter2_draw.cpp b/src/d/d_meter2_draw.cpp
index 80a1af9b98..5d945fa5fc 100644
--- a/src/d/d_meter2_draw.cpp
+++ b/src/d/d_meter2_draw.cpp
@@ -20,7 +20,7 @@
 #include "d/d_msg_class.h"
 #include "d/d_msg_object.h"
 #include "d/d_pane_class.h"
-#include <string>
+#include <cstring>
 
 dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap* mp_heap) {
     OS_REPORT("enter dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap *mp_heap)\n");
diff --git a/src/d/d_msg_scrn_3select.cpp b/src/d/d_msg_scrn_3select.cpp
index 525c619fe2..8f7862d2f5 100644
--- a/src/d/d_msg_scrn_3select.cpp
+++ b/src/d/d_msg_scrn_3select.cpp
@@ -10,7 +10,7 @@
 #include "JSystem/J2DGraph/J2DGrafContext.h"
 #include "JSystem/J2DGraph/J2DScreen.h"
 #include "JSystem/J2DGraph/J2DTextBox.h"
-#include <string>
+#include <cstring>
 #include "d/d_com_inf_game.h"
 #include "d/d_select_cursor.h"
 #include "d/d_msg_object.h"
diff --git a/src/d/d_msg_scrn_base.cpp b/src/d/d_msg_scrn_base.cpp
index 43651004d3..84899c2824 100644
--- a/src/d/d_msg_scrn_base.cpp
+++ b/src/d/d_msg_scrn_base.cpp
@@ -6,7 +6,7 @@
 #include "d/d_msg_object.h"
 #include "d/d_msg_out_font.h"
 #include "d/d_pane_class.h"
-#include <string>
+#include <cstring>
 
 dMsgScrnBase_c::dMsgScrnBase_c() {
     init();
diff --git a/src/d/d_resorce.cpp b/src/d/d_resorce.cpp
index 109394e0ec..fe2b2e37ef 100644
--- a/src/d/d_resorce.cpp
+++ b/src/d/d_resorce.cpp
@@ -20,7 +20,7 @@
 #include <cstring>
 
 #ifndef __MWERKS__
-#include <string>
+#include <cstring>
 #include "dusk/extras.h"
 #endif
 
diff --git a/src/dusk/stubs.cpp b/src/dusk/stubs.cpp
index 4520362881..bf5026b6e0 100644
--- a/src/dusk/stubs.cpp
+++ b/src/dusk/stubs.cpp
@@ -692,7 +692,10 @@ void DSPSendMailToDSP(u32 mail) {
 }
 
 #pragma mark Z2Audio
-#include <Z2AudioLib/Z2AudioCS.h>
+class Z2AudioCS {
+public:
+    void extensionProcess(s32, s32);
+};
 void Z2AudioCS::extensionProcess(s32, s32) {
     puts("Z2AudioMgr::play is a stub");
 }
diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp
index 28b5b6abfa..2bc28c2014 100644
--- a/src/f_op/f_op_actor_mng.cpp
+++ b/src/f_op/f_op_actor_mng.cpp
@@ -776,7 +776,7 @@ bool fopAcM_addAngleY(fopAc_ac_c* i_actor, s16 i_target, s16 i_step) {
     return cLib_chaseAngleS(&angle->y, i_target, i_step);
 }
 
-void dummy(fopAc_ac_c* i_actor) {
+static void dummy(fopAc_ac_c* i_actor) {
     fopAcM_SetSpeedF(i_actor, 10.0f);
 }
 
diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp
index beeeb94c90..e54eeca215 100644
--- a/src/m_Do/m_Do_main.cpp
+++ b/src/m_Do/m_Do_main.cpp
@@ -6,9 +6,10 @@
 
 #include "m_Do/m_Do_main.h"
 #include <dolphin/vi.h>
-#include <string>
+#include <cstring>
 #include "DynamicLink.h"
 #include "JSystem/JAudio2/JASAudioThread.h"
+#include "JSystem/JAudio2/JAUSectionHeap.h"
 #include "JSystem/JAudio2/JAUSoundTable.h"
 #include "JSystem/JFramework/JFWSystem.h"
 #include "JSystem/JHostIO/JORServer.h"
@@ -256,6 +257,7 @@ JHIComPortManager<T>* JHIComPortManager<T>::instance = nullptr;
 template <>
 JHIComPortManager<JHICmnMem>* JHIComPortManager<JHICmnMem>::instance = nullptr;
 
+#ifdef __MWERKS__
 template<>
 Z2WolfHowlMgr* JASGlobalInstance<Z2WolfHowlMgr>::sInstance JAS_GLOBAL_INSTANCE_INIT;
 
@@ -324,8 +326,4 @@ JASAudioThread* JASGlobalInstance<JASAudioThread>::sInstance JAS_GLOBAL_INSTANCE
 
 template<>
 JASDefaultBankTable* JASGlobalInstance<JASDefaultBankTable>::sInstance JAS_GLOBAL_INSTANCE_INIT;
-
-#ifndef __MWERKS__
-template<>
-JAUSectionHeap* JASGlobalInstance<JAUSectionHeap>::sInstance JAS_GLOBAL_INSTANCE_INIT;
-#endif
+#endif // __MWERKS__