Add guards around std library headers (#3013)

* Last fix for standard compiler error * adding define guards around headers * rename cmath.h and climits.h to cmath and climits respectively * renaming cstdarg.h to cstdarg * renaming cstdlib.h to cstdlib * renaming cstring.h to cstring * renaming cstdio.h to cstdio * renaming cmath locale ctype * renaming stdarg string and va_list * renaming cstddef * renaming stdio stddef stdlib * renaming algorithm, functional, iterator, memory, and utility * renaming bitset, cstdint, limits, and stdint * renaming new and type_traits * update quote includes for standard library headers to angle bracket includes
2026-06-08 11:47:03 -04:00 · 2026-01-05 06:50:45 -05:00
parent 8561613852
commit ea53712c30
342 changed files with 422 additions and 398 deletions
@@ -2,7 +2,7 @@
 #define J2DPRINT_H

 #include "JSystem/J2DGraph/J2DTextBox.h"
-#include <stdarg.h>
+#include <stdarg>

 class JUTFont;
 class J2DPrint;
@@ -4,7 +4,7 @@
 #include "JSystem/J3DGraphBase/J3DMatBlock.h"
 #include "JSystem/J3DGraphBase/J3DPacket.h"
 #include "JSystem/J3DGraphBase/J3DShape.h"
-#include <stdint.h>
+#include <stdint>

 class J3DJoint;
 class J3DMaterialAnm;
@@ -3,7 +3,7 @@

 #include "JSystem/J3DGraphBase/J3DSys.h"
 #include "dolphin/gd/GDBase.h"
-#include <stdint.h>
+#include <stdint>

 class J3DMatPacket;

@@ -5,7 +5,7 @@
 #include "JSystem/J3DAssert.h"
 #include "JSystem/JUtility/JUTTexture.h"
 #include "global.h"
-#include <stdint.h>
+#include <stdint>

 /**
 * @ingroup jsystem-j3d
@@ -2,7 +2,7 @@
 #define JAISEQDATAMGR_H

 #include "JSystem/JAudio2/JAISound.h"
-#include <stdint.h>
+#include <stdint>

 /**
 * @ingroup jsystem-jaudio
@@ -2,7 +2,7 @@
 #define JASGADGET_H

 #include "JSystem/JUtility/JUTAssert.h"
-#include "string.h"
+#include <string>

 /**
 * @ingroup jsystem-jaudio
@@ -4,7 +4,7 @@
 #include "JSystem/JAudio2/JAUBankTable.h"
 #include "JSystem/JAudio2/JAUSeqDataBlockMgr.h"
 #include "JSystem/JKernel/JKRDisposer.h"
-#include "bitset.h"
+#include <bitset>

 class JAISeqData;
 class JAISeqDataMgr;
@@ -5,8 +5,8 @@
 #include "JSystem/JAudio2/JASAramStream.h"
 #include "JSystem/JAudio2/JASHeapCtrl.h"
 #include "JSystem/JUtility/JUTAssert.h"
-#include "bitset.h"
-#include <stdint.h>
+#include <bitset>
+#include <stdint>

 /**
 * @ingroup jsystem-jaudio
@@ -4,7 +4,7 @@
 #include "JSystem/JUtility/JUTAssert.h"
 #include "JSystem/JGadget/define.h"
 #include "JSystem/JGadget/search.h"
-#include <iterator.h>
+#include <iterator>


 namespace JGadget {
@@ -2,9 +2,9 @@
 #define JGADGET_SEARCH_H

 #include <dolphin/types.h>
-#include <iterator.h>
-#include <functional.h>
-#include <algorithm.h>
+#include <iterator>
+#include <functional>
+#include <algorithm>

 namespace JGadget {
 namespace search {
@@ -2,7 +2,7 @@
 #define JGADGET_STD_STREAMBUF_H

 #include <dolphin/types.h>
-#include <string.h>
+#include <string>

 namespace JGadget {
 template <typename T>
@@ -2,9 +2,9 @@
 #define STD_VECTOR_H

 #include "JSystem/JGadget/std-memory.h"
-#include <algorithm.h>
-#include <msl_memory.h>
-#include <stdint.h>
+#include <algorithm>
+#include <memory>
+#include <stdint>

 namespace JGadget {
 namespace vector {
@@ -2,9 +2,14 @@
 #define JGEOMETRY_H

 #include "dolphin/mtx.h"
-#include <math.h>
+#include <cmath>
 #include "JSystem/JMath/JMath.h"

+#ifndef __MWERKS__
+#include <limits>
+#define FLT_EPSILON std::numeric_limits<float>::epsilon()
+#endif
+
 namespace JGeometry {

 template<typename T>
@@ -2,7 +2,7 @@
 #define JORMCONTEXT_H

 #include <dolphin/dolphin.h>
-#include <stdint.h>
+#include <stdint>
 #include "JSystem/JHostIO/JORReflexible.h"
 #include "JSystem/JSupport/JSUMemoryStream.h"

@@ -2,7 +2,7 @@
 #define JKREXPHEAP_H

 #include "JSystem/JKernel/JKRHeap.h"
-#include <stdint.h>
+#include <stdint>

 /**
 * @ingroup jsystem-jkernel
@@ -204,9 +204,11 @@ void* operator new[](size_t size, JKRHeap* heap, int alignment);
 void operator delete(void* ptr);
 void operator delete[](void* ptr);

+#ifdef __MWERKS__
 inline void* operator new(size_t size, void* ptr) {
    return ptr;
 }
+#endif

 void JKRDefaultMemoryErrorRoutine(void* heap, u32 size, int alignment);

@@ -2,7 +2,7 @@
 #define JMATRIGONOMETRIC_H

 #include "dolphin/types.h"
-#include <utility.h>
+#include <utility>

 namespace JMath {
 template<typename T>
@@ -2,7 +2,7 @@
 #define JMATH_H

 #include "dolphin/mtx.h"
-#include <math.h>
+#include <math>

 void JMAMTXApplyScale(const Mtx, Mtx, f32, f32, f32);
 void JMAEulerToQuat(s16 param_0, s16 param_1, s16 param_2, Quaternion* param_3);
@@ -2,7 +2,7 @@
 #define JMESSAGE_PROCESSOR_H

 #include "JSystem/JMessage/resource.h"
-#include <algorithm.h>
+#include <algorithm>
 #include "global.h"

 namespace JMessage {
@@ -2,7 +2,7 @@
 #define JPAEMITTER_H

 #include <dolphin/gx.h>
-#include <stdint.h>
+#include <stdint>
 #include "JSystem/JParticle/JPAResource.h"
 #include "JSystem/JParticle/JPAList.h"
 #include "JSystem/JParticle/JPARandom.h"
@@ -1,7 +1,7 @@
 #ifndef FUNCTIONVALUE_H
 #define FUNCTIONVALUE_H

-#include <math.h>
+#include <math>
 #include "JSystem/JGadget/std-vector.h"
 #include "JSystem/JGadget/define.h"
 #include "JSystem/JGadget/search.h"
@@ -2,7 +2,7 @@
 #define JSTUDIO_MATH_H

 #include "dolphin/mtx.h"
-#include <math.h>
+#include <math>

 namespace JStudio {
 namespace math {
@@ -3,8 +3,8 @@

 #include "JSystem/JStudio/JStudio/jstudio-control.h"
 #include "global.h"
-#include <limits.h>
-#include <math.h>
+#include <limits>
+#include <math>

 typedef struct _GXColor GXColor;

@@ -2,7 +2,7 @@
 #define JSUPPORT_H

 #include <dolphin/dolphin.h>
-#include <stdint.h>
+#include <stdint>

 /**
 * @ingroup jsystem-jsupport
@@ -4,7 +4,7 @@
 #include "JSystem/JGadget/linklist.h"
 #include "JSystem/JKernel/JKRDisposer.h"
 #include "JSystem/JUtility/JUTFont.h"
-#include <stdarg.h>
+#include <stdarg>

 /**
 * @ingroup jsystem-jutility
@@ -2,7 +2,7 @@
 #define JUTDIRECTPRINT_H

 #include "JSystem/JUtility/TColor.h"
-#include <stdarg.h>
+#include <stdarg>

 /**
 * @ingroup jsystem-jutility
@@ -3,7 +3,7 @@

 #include "JSystem/JKernel/JKRThread.h"
 #include "JSystem/JUtility/JUTGamePad.h"
-#include <stdarg.h>
+#include <stdarg>
 #include <dolphin/gx.h>
 #include <dolphin/os.h>
 #include "global.h"
@@ -2,7 +2,7 @@
 #define JUTFONT_H

 #include "JSystem/JUtility/TColor.h"
-#include "string.h"
+#include <string>

 /**
 * @ingroup jsystem-jutility
@@ -2,7 +2,7 @@
 #define JUTTEXTURE_H

 #include <dolphin/gx.h>
-#include <stdint.h>
+#include <stdint>

 class JUTPalette;

@@ -1,7 +1,7 @@
 #ifndef C_M3D_H_
 #define C_M3D_H_

-#include <math.h>
+#include <math>
 #include "dolphin/mtx.h"

 class cM3dGAab;
@@ -3,6 +3,13 @@

 #include "JSystem/JMath/JMATrigonometric.h"

+#ifndef __MWERKS__
+#include <limits>
+#ifndef FLT_MAX
+#define FLT_MAX std::numeric_limits<float>::max()
+#endif
+#endif
+
 s16 cM_rad2s(float rad);
 u16 U_GetAtanTable(float, float);
 s16 cM_atan2s(float y, float x);
@@ -2,7 +2,7 @@
 #define C_XYZ_H

 #include "dolphin/mtx.h"
-#include <math.h>
+#include <math>

 struct cXyz : Vec {
    static const cXyz Zero;
@@ -11,7 +11,7 @@
 #include "d/d_resorce.h"
 #include "d/d_s_play.h"

-#include <math.h>
+#include <math>

 /**
 * @ingroup actors-objects
@@ -2,7 +2,7 @@
 #define D_MENU_D_MENU_DMAP_MAP_H

 #include "d/d_menu_dmap.h"
-#include <math.h>
+#include <math>

 class dMenu_DmapMap_c {
 public:
@@ -42,7 +42,9 @@ public:
        return --mCount;
    }

+#ifdef __MWERKS__
    static const int NAME_MAX = 9;
+#endif

 private:
    /* 0x00 */ char mArchiveName[11];
@@ -1,7 +1,7 @@
 #ifndef D_SAVE_D_SAVE_H
 #define D_SAVE_D_SAVE_H

-#include "string.h"
+#include <string>
 #include "SSystem/SComponent/c_xyz.h"
 #include <dolphin/os.h>
 #include "global.h"
@@ -5,13 +5,13 @@
 #include "weak_bss_1109_to_1009.h" // IWYU pragma: export

 // Fixes weak .data
-#include "cmath.h" // IWYU pragma: export
+#include <cmath> // IWYU pragma: export
 #include "JSystem/J3DGraphBase/J3DMatBlock.h" // IWYU pragma: export
 #include "Z2AudioLib/Z2Calc.h" // IWYU pragma: export

 // Fixes weak function ordering
-#include "math.h" // IWYU pragma: export
-#include "cstring.h" // IWYU pragma: export
+#include <math> // IWYU pragma: export
+#include <cstring> // IWYU pragma: export
 #include "JSystem/JKernel/JKRDisposer.h" // IWYU pragma: export
 #include "JSystem/J3DGraphBase/J3DPacket.h" // IWYU pragma: export
 #include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h" // IWYU pragma: export
@@ -1,7 +1,7 @@
 #ifndef _DOLPHIN_OS_H_
 #define _DOLPHIN_OS_H_

-#include <cstdio.h>
+#include <cstdio>

 #ifdef __REVOLUTION_SDK__
 #include <revolution/os.h>
@@ -82,7 +82,7 @@ typedef unsigned int uint;
 #define __REGISTER
 #endif

-#include <cstddef.h>
+#include <cstddef>

 #endif
 #endif
@@ -6,7 +6,7 @@
 #include "JSystem/JFramework/JFWDisplay.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "CaptureScreen.h"
-#include <string.h>
+#include <string>

 void fapGm_After();
 void fapGm_Create();
@@ -50,9 +50,11 @@
 // Necessary for debug matches.
 #define UNUSED(x) ((void)(x))

+#ifdef __MWERKS__
 #ifndef decltype
 #define decltype __decltype__
 #endif
+#endif

 #define _SDA_BASE_(dummy) 0
 #define _SDA2_BASE_(dummy) 0
@@ -2,7 +2,7 @@
 #define M_DO_M_DO_HOSTIO_H

 #include "JSystem/JHostIO/JORReflexible.h"
-#include <string.h>
+#include <string>

 class mDoHIO_child_c {
 public:
@@ -1,7 +1,7 @@
 #ifndef _REVOLUTION_OS_H_
 #define _REVOLUTION_OS_H_

-#include <cstdio.h>
+#include <cstdio>

 #include <revolution/types.h>
 #include <revolution/gx/GXStruct.h>
@@ -79,6 +79,6 @@ typedef unsigned int uint;
 #define __REGISTER
 #endif

-#include <cstddef.h>
+#include <cstddef>

 #endif
@@ -1,7 +1,7 @@
 #ifndef CONTEXT_BTE_H
 #define CONTEXT_BTE_H

-#include <stdint.h>
+#include <stdint>

 // taken from https://github.com/doldecomp/sdk_2009-12-11/blob/main/include/context_bte.h

@@ -8,7 +8,7 @@
 #include "JSystem/JKernel/JKRExpHeap.h"
 #include "JSystem/JKernel/JKRFileCache.h"
 #include "JSystem/JUtility/JUTConsole.h"
-#include <stdio.h>
+#include <stdio>
 #include "m_Do/m_Do_dvd_thread.h"
 #include "m_Do/m_Do_ext.h"

@@ -2,7 +2,7 @@

 #include "JSystem/J2DGraph/J2DManage.h"
 #include "JSystem/JSupport/JSUInputStream.h"
-#include "string.h"
+#include <string>

 void* J2DDataManage::get(char const* name) {
    for (J2DataManageLink* link = mList; link != NULL; link = link->mNext) {
@@ -5,7 +5,7 @@
 #include "JSystem/J2DGraph/J2DScreen.h"
 #include "JSystem/JSupport/JSupport.h"
 #include "JSystem/JUtility/JUTResource.h"
-#include "string.h"
+#include <string>
 #include "dolphin/types.h"

 J2DMaterialFactory::J2DMaterialFactory(J2DMaterialBlock const& param_0) {
@@ -3,8 +3,8 @@
 #include "JSystem/J2DGraph/J2DPrint.h"
 #include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTFont.h"
-#include <stdio.h>
-#include <stdlib.h>
+#include <stdio>
+#include <stdlib>

 char* J2DPrint::mStrBuff;

@@ -6,7 +6,7 @@

 #include "JSystem/J2DGraph/J2DTevs.h"
 #include "JSystem/J2DGraph/J2DMatBlock.h"
-#include <math.h>
+#include <math>
 #include "dolphin/gx.h"

 void J2DTexMtx::load(u32 mtxIdx) {
@@ -3,7 +3,7 @@
 #include "JSystem/J3DGraphAnimator/J3DSkinDeform.h"
 #include "JSystem/J3DGraphAnimator/J3DModel.h"
 #include "JSystem/JKernel/JKRHeap.h"
-#include <string.h>
+#include <string>

 J3DSkinNList::J3DSkinNList() {
    field_0x0 = NULL;
@@ -5,7 +5,7 @@
 #include "JSystem/J3DGraphBase/J3DSys.h"
 #include "JSystem/J3DGraphBase/J3DTransform.h"
 #include "global.h"
-#include <string.h>
+#include <string>

 inline void loadMatColors(const J3DGXColor* color) {
    J3DGDWriteXFCmdHdr(0x100C, 2);
@@ -7,7 +7,7 @@
 #include "JSystem/J3DGraphBase/J3DShapeMtx.h"
 #include "JSystem/JKernel/JKRHeap.h"
 #include <dolphin/os.h>
-#include "string.h"
+#include <string>
 #include "global.h"

 J3DError J3DDisplayListObj::newDisplayList(u32 maxSize) {
@@ -2,8 +2,8 @@

 #include "JSystem/J3DGraphBase/J3DShapeDraw.h"
 #include "JSystem/JKernel/JKRHeap.h"
-#include <string.h>
-#include <stdint.h>
+#include <string>
+#include <stdint>
 #include <dolphin/gx.h>

 u32 J3DShapeDraw::countVertex(u32 stride) {
@@ -4,7 +4,7 @@
 #include "JSystem/J3DGraphAnimator/J3DJointTree.h"
 #include "JSystem/J3DGraphBase/J3DSys.h"
 #include "JSystem/JKernel/JKRHeap.h"
-#include <string.h>
+#include <string>

 J3DVertexData::J3DVertexData() {
    mVtxNum = 0;
@@ -9,7 +9,7 @@
 #include "JSystem/JSupport/JSupport.h"
 #include "JSystem/JKernel/JKRHeap.h"
 #include "dolphin/os.h"
-#include "string.h"
+#include <string>

 void* J3DClusterLoaderDataBase::load(const void* i_data) {
    const JUTDataFileHeader* fileHeader = (JUTDataFileHeader*)i_data;
@@ -1,7 +1,7 @@
 #include "JSystem/JSystem.h" // IWYU pragma: keep

 #include "JSystem/J3DU/J3DUClipper.h"
-#include <math.h>
+#include <math>

 void J3DUClipper::init() {
    mNear = 1.0f;
@@ -1,7 +1,7 @@
 #include "JSystem/JSystem.h" // IWYU pragma: keep

 #include "JSystem/JAHostIO/JAHioUtil.h"
-#include "stdio.h"
+#include <stdio>

 char JAHioUtil::mStringBuffer[256];

@@ -5,7 +5,7 @@
 #include "JSystem/JAWExtSystem/JAWGraphContext.h"
 #include "JSystem/JAWExtSystem/JAWWindow.h"
 #include "JSystem/JUtility/JUTGamePad.h"
-#include "algorithm.h"
+#include <algorithm>

 JGadget::TList<JAWWindow*> JAWExtSystem::sPage[128];
 JAWExtSystem::TSystemInterface JAWExtSystem::sInterface;
@@ -16,7 +16,7 @@
 #include "JSystem/JUtility/JUTAssert.h"
 #include "dolphin/ai.h"
 #include <dolphin/os.h>
-#include <stdint.h>
+#include <stdint>

 s16* JASDriver::sDmaDacBuffer[3];

@@ -10,7 +10,7 @@
 #include "JSystem/JAudio2/JASReport.h"
 #include "JSystem/JKernel/JKRSolidHeap.h"
 #include "dolphin/dsp.h"
-#include "stdint.h"
+#include <stdint>

 JASAudioThread::JASAudioThread(int stackSize, int msgCount, u32 threadPriority)
    : 
@@ -4,7 +4,7 @@
 #include "JSystem/JAudio2/JASMutex.h"
 #include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
-#include "stdint.h"
+#include <stdint>

 JASBasicWaveBank::JASBasicWaveBank() {
    mWaveTable = NULL;
@@ -1,8 +1,8 @@
 #include "JSystem/JSystem.h" // IWYU pragma: keep

 #include "JSystem/JAudio2/JASCalc.h"
-#include <math.h>
-#include <limits.h>
+#include <math>
+#include <limits>

 void JASCalc::imixcopy(const s16* s1, const s16* s2, s16* dst, u32 n) {
    for (n; n != 0; n--) {
@@ -8,7 +8,7 @@
 #include "JSystem/JAudio2/JASCalc.h"
 #include "JSystem/JAudio2/JASMutex.h"
 #include "JSystem/JKernel/JKRHeap.h"
-#include <stdio.h>
+#include <stdio>

 static OSMutex sMutex;

@@ -1,7 +1,7 @@
 #include "JSystem/JSystem.h" // IWYU pragma: keep

 #include "JSystem/JAudio2/JASSimpleWaveBank.h"
-#include "stdint.h"
+#include <stdint>

 JASSimpleWaveBank::JASSimpleWaveBank() {
    mWaveTable = NULL;
@@ -5,9 +5,9 @@
 #include "JSystem/JAudio2/JASTaskThread.h"
 #include "JSystem/JAudio2/JASMutex.h"
 #include "JSystem/JKernel/JKRDvdAramRipper.h"
-#include "string.h"
+#include <string>
 #include "dolphin/os.h"
-#include <stdint.h>
+#include <stdint>

 JASHeap* JASWaveArcLoader::sAramHeap;

@@ -9,7 +9,7 @@
 #include "dolphin/gx.h"
 #include <dolphin/vi.h>
 #include "global.h"
-#include "stdint.h"
+#include <stdint>

 void JFWDisplay::ctor_subroutine(bool enableAlpha) {
    mEnableAlpha = enableAlpha;
@@ -2,7 +2,7 @@

 #include "JSystem/JGadget/binary.h"
 #include "JSystem/JGadget/define.h"
-#include <stdint.h>
+#include <stdint>

 #if DEBUG
 static void dummyString() {
@@ -3,7 +3,7 @@
 #include "JSystem/JGadget/define.h"

 #define MSL_USE_INLINES 1
-#include <ctype.h>
+#include <ctype>

 JGadget_outMessage::JGadget_outMessage(MessageFunc fn, const char* file, int line) {
    mMsgFunc = fn;
@@ -2,7 +2,7 @@

 #include "JSystem/JGadget/std-stream.h"
 #include "JSystem/JGadget/define.h"
-#include <ctype.h>
+#include <ctype>
 #include <float.h>

 namespace JGadget {
@@ -2,7 +2,7 @@

 #include "JSystem/JGadget/std-streambuf.h"
 #include "JSystem/JUtility/JUTAssert.h"
-#include <algorithm.h>
+#include <algorithm>

 namespace JGadget {
 TStreamBuffer::~TStreamBuffer() {}
@@ -1,6 +1,6 @@
 #include "JSystem/JSystem.h" // IWYU pragma: keep

-#include <algorithm.h>
+#include <algorithm>

 static void dummy() {
    u32 a = 0;
@@ -4,7 +4,7 @@
 #include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JHostIO/JHIRMcc.h"
 #include <revolution/hio2.h>
-#include <string.h>
+#include <string>

 void JHIReport(const char* fmt, ...) {}

@@ -5,7 +5,7 @@
 #include "JSystem/JHostIO/JORFile.h"
 #include "JSystem/JHostIO/JORHostInfo.h"
 #include "JSystem/JSupport/JSUMemoryStream.h"
-#include <string.h>
+#include <string>

 void JOREventCallbackListNode::JORAppend() {
    JORServer* pServer = JORServer::getInstance();
@@ -8,7 +8,7 @@
 #include "JSystem/JUtility/JUTException.h"
 #include "dolphin/ar.h"
 #include <dolphin/os.h>
-#include "string.h"
+#include <string>

 #if PLATFORM_GCN
 const u32 stack_size = 0xc00;
@@ -7,8 +7,8 @@
 #include "JSystem/JKernel/JKRDvdFile.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "JSystem/JUtility/JUTException.h"
-#include <math.h>
-#include "string.h"
+#include <math>
+#include <string>

 JKRAramArchive::JKRAramArchive() {}

@@ -3,7 +3,7 @@
 #include "JSystem/JKernel/JKRAramHeap.h"
 #include "JSystem/JKernel/JKRHeap.h"
 #include "global.h"
-#include <climits.h>
+#include <climits>

 JSUList<JKRAramBlock> JKRAramHeap::sAramList;

@@ -4,7 +4,7 @@
 #include "JSystem/JKernel/JKRAramPiece.h"
 #include "JSystem/JSupport/JSUFileStream.h"
 #include "JSystem/JUtility/JUTException.h"
-#include <stdint.h>
+#include <stdint>

 #if PLATFORM_GCN
 const u32 stack_size = 0xc00;
@@ -2,8 +2,8 @@

 #include "JSystem/JKernel/JKRArchive.h"
 #include "JSystem/JKernel/JKRHeap.h"
-#include "ctype.h"
-#include "string.h"
+#include <ctype>
+#include <string>

 u32 JKRArchive::sCurrentDirID;

@@ -10,9 +10,9 @@
 #include "JSystem/JKernel/JKRMemArchive.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "JSystem/JUtility/JUTException.h"
-#include <math.h>
-#include "string.h"
-#include <stdint.h>
+#include <math>
+#include <string>
+#include <stdint>

 JKRCompArchive::JKRCompArchive(s32 entryNum, JKRArchive::EMountDirection eMountDirection)
    : JKRArchive(entryNum, MOUNT_COMP) {
@@ -11,7 +11,7 @@
 #include <dolphin/os.h>
 #include "dolphin/vi.h"
 #include "global.h"
-#include "string.h"
+#include <string>

 static int JKRDecompressFromDVDToAram(JKRDvdFile*, u32, u32, u32, u32, u32, u32*);
 static int decompSZS_subroutine(u8*, u32);
@@ -6,10 +6,10 @@
 #include "JSystem/JKernel/JKRDvdRipper.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "JSystem/JUtility/JUTException.h"
-#include <math.h>
-#include "string.h"
+#include <math>
+#include <string>
 #include "global.h"
-#include <stdint.h>
+#include <stdint>

 JKRDvdArchive::JKRDvdArchive(s32 entryNum, JKRArchive::EMountDirection mountDirection)
    : JKRArchive(entryNum, MOUNT_DVD) {
@@ -3,7 +3,7 @@
 #include "JSystem/JKernel/JKRDvdFile.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "JSystem/JUtility/JUTException.h"
-#include "stdint.h"
+#include <stdint>

 JSUList<JKRDvdFile> JKRDvdFile::sDvdList;

@@ -8,10 +8,10 @@
 #include "JSystem/JKernel/JKRDvdFile.h"
 #include "JSystem/JKernel/JKRDecomp.h"
 #include "JSystem/JUtility/JUTException.h"
-#include "string.h"
+#include <string>
 #include <dolphin/os.h>
 #include "dolphin/vi.h"
-#include <stdint.h>
+#include <stdint>

 static int JKRDecompressFromDVD(JKRDvdFile*, void*, u32, u32, u32, u32, u32*);
 static int decompSZS_subroutine(u8*, u8*);
@@ -9,7 +9,7 @@
 #include "JSystem/JSupport/JSupport.h"
 #include "JSystem/JUtility/JUTConsole.h"
 #include "JSystem/JUtility/JUTException.h"
-#include <stdlib.h>
+#include <stdlib>

 JKRExpHeap* JKRExpHeap::createRoot(int maxHeaps, bool errorFlag) {
    JKRExpHeap* heap = NULL;
@@ -6,8 +6,8 @@
 #include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"

-#include "ctype.h"
-#include "string.h"
+#include <ctype>
+#include <string>
 #include "global.h"

 JKRFileCache* JKRFileCache::mount(const char* path, JKRHeap* heap, const char* param_3) {
@@ -4,8 +4,8 @@

 #define MSL_USE_INLINES 1  // needed to inline tolower call. not inlined elsewhere in the repo

-#include "string.h"
-#include "ctype.h"
+#include <string>
+#include <ctype>
 #include "global.h"

 JKRFileLoader* JKRFileLoader::sCurrentVolume;
@@ -8,8 +8,8 @@
 #include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "JSystem/JUtility/JUTException.h"
-#include <stdint.h>
-#include <string.h>
+#include <stdint>
+#include <string>

 #if DEBUG
 u8 JKRValue_DEBUGFILL_NOTUSE = 0xFD;
@@ -5,9 +5,9 @@
 #include "JSystem/JKernel/JKRDvdRipper.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "JSystem/JUtility/JUTException.h"
-#include "string.h"
+#include <string>
 #include "global.h"
-#include <stdint.h>
+#include <stdint>

 JKRMemArchive::JKRMemArchive(s32 entryNum, JKRArchive::EMountDirection mountDirection)
    : JKRArchive(entryNum, MOUNT_MEM) {
@@ -5,8 +5,8 @@
 #include "JSystem/JUtility/JUTAssert.h"
 #include "JSystem/JUtility/JUTConsole.h"
 #include "global.h"
-#include <stdint.h>
-#include <stdlib.h>
+#include <stdint>
+#include <stdlib>

 JKRSolidHeap* JKRSolidHeap::create(u32 size, JKRHeap* heap, bool useErrorHandler) {
    if (!heap) {
@@ -3,9 +3,9 @@
 #include "JSystem/JKernel/JKRThread.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "JSystem/JUtility/JUTConsole.h"
-#include <stdio.h>
+#include <stdio>
 #include "global.h"
-#include <stdint.h>
+#include <stdint>

 JSUList<JKRThread> JKRThread::sThreadList(0);

@@ -2,7 +2,7 @@

 // don't include header until this "zero" mess is figured out
 // #include "JSystem/JMath/JMATrigonometric.h"
-#include <math.h>
+#include <math>
 #include "global.h"

 static f32 dummy() {
@@ -3,7 +3,7 @@
 #include "JSystem/JMessage/processor.h"
 #include "JSystem/JMessage/control.h"
 #include "JSystem/JUtility/JUTAssert.h"
-#include <cstdint.h>
+#include <cstdint>

 JMessage::TReference::~TReference() {}

@@ -3,8 +3,8 @@
 #include "JSystem/JMessage/resource.h"
 #include "JSystem/JGadget/search.h"
 #include "JSystem/JGadget/define.h"
-#include <algorithm.h>
-#include <string.h>
+#include <algorithm>
+#include <string>

 u16 JMessage::TResource::toMessageIndex_messageID(u32 uMsgID, u32 upperHalf, bool* pbValid) const {
    if (!oParse_TBlock_messageID_.getRaw()) {
@@ -3,7 +3,7 @@
 #include "JSystem/JParticle/JPAResourceManager.h"
 #include "JSystem/JParticle/JPADynamicsBlock.h"
 #include "JSystem/JParticle/JPAResource.h"
-#include "string.h"
+#include <string>

 struct JPAResourceLoader {
    JPAResourceLoader(u8 const*, JPAResourceManager*);
@@ -1,7 +1,7 @@
 #include "JSystem/JSystem.h" // IWYU pragma: keep

 #include "JSystem/JStage/JSGCamera.h"
-#include <limits.h>
+#include <limits>

 JStage::TCamera::~TCamera() {}

@@ -1,7 +1,7 @@
 #include "JSystem/JSystem.h" // IWYU pragma: keep

 #include "JSystem/JStage/JSGFog.h"
-#include <limits.h>
+#include <limits>

 JStage::TFog::~TFog() {}

@@ -1,9 +1,9 @@
 #include "JSystem/JSystem.h" // IWYU pragma: keep

 #include "JSystem/JStudio/JStudio/ctb.h"
-#include "iterator.h"
-#include "string.h"
-#include <algorithm.h>
+#include <iterator>
+#include <string>
+#include <algorithm>

 JStudio::ctb::TObject::~TObject() {}

@@ -5,9 +5,9 @@
 #include "JSystem/JUtility/JUTException.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "JSystem/JGadget/linklist.h"
-#include <math.h>
-#include <stdlib.h>
-#include <limits.h>
+#include <math>
+#include <stdlib>
+#include <limits>

 namespace JStudio {

@@ -2,7 +2,7 @@

 #include "JSystem/JStudio/JStudio/fvb.h"
 #include "JSystem/JUtility/JUTException.h"
-#include <string.h>
+#include <string>

 namespace JStudio {
 namespace fvb {
--- a/Show More
+++ b/Show More