standard compiler compatibility changes (#3040)

* move math to cmath

* replace stdarg to cstdarg

* change stdint to stdint.h

* minor fixes

* change stdio to cstdio

* change stdlib to stdlib

* renamed ctype to cctype

* fix missing argument for UNSET_FLAG

44 files changed, 66 insertions, 54 deletions

diff --git a/src/JSystem/J2DGraph/J2DPrint.cpp b/src/JSystem/J2DGraph/J2DPrint.cpp
index a155a2e62f..b6c8876aee 100644
--- a/src/JSystem/J2DGraph/J2DPrint.cpp
+++ b/src/JSystem/J2DGraph/J2DPrint.cpp
@@ -3,8 +3,8 @@
 #include "JSystem/J2DGraph/J2DPrint.h"
 #include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTFont.h"
-#include <stdio>
-#include <stdlib>
+#include <cstdio>
+#include <cstdlib>
 
 char* J2DPrint::mStrBuff;
 
diff --git a/src/JSystem/J2DGraph/J2DTevs.cpp b/src/JSystem/J2DGraph/J2DTevs.cpp
index 68469cc0fa..88d1c1c69b 100644
--- a/src/JSystem/J2DGraph/J2DTevs.cpp
+++ b/src/JSystem/J2DGraph/J2DTevs.cpp
@@ -6,7 +6,7 @@
 
 #include "JSystem/J2DGraph/J2DTevs.h"
 #include "JSystem/J2DGraph/J2DMaterial.h"
-#include <math>
+#include <cmath>
 #include "dolphin/gx.h"
 
 void J2DTexMtx::load(u32 mtxIdx) {
diff --git a/src/JSystem/J3DGraphBase/J3DShapeDraw.cpp b/src/JSystem/J3DGraphBase/J3DShapeDraw.cpp
index 50bd2ac793..e001a8a8b9 100644
--- a/src/JSystem/J3DGraphBase/J3DShapeDraw.cpp
+++ b/src/JSystem/J3DGraphBase/J3DShapeDraw.cpp
@@ -3,7 +3,7 @@
 #include "JSystem/J3DGraphBase/J3DShapeDraw.h"
 #include "JSystem/JKernel/JKRHeap.h"
 #include <string>
-#include <stdint>
+#include <stdint.h>
 #include <dolphin/gx.h>
 
 u32 J3DShapeDraw::countVertex(u32 stride) {
diff --git a/src/JSystem/J3DU/J3DUClipper.cpp b/src/JSystem/J3DU/J3DUClipper.cpp
index 350d67e36a..38a27dd8ff 100644
--- a/src/JSystem/J3DU/J3DUClipper.cpp
+++ b/src/JSystem/J3DU/J3DUClipper.cpp
@@ -1,7 +1,7 @@
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/J3DU/J3DUClipper.h"
-#include <math>
+#include <cmath>
 
 void J3DUClipper::init() {
     mNear = 1.0f;
diff --git a/src/JSystem/JAHostIO/JAHioUtil.cpp b/src/JSystem/JAHostIO/JAHioUtil.cpp
index 8bc18b763d..11c5fd4b52 100644
--- a/src/JSystem/JAHostIO/JAHioUtil.cpp
+++ b/src/JSystem/JAHostIO/JAHioUtil.cpp
@@ -1,7 +1,7 @@
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JAHostIO/JAHioUtil.h"
-#include <stdio>
+#include <cstdio>
 
 char JAHioUtil::mStringBuffer[256];
 
diff --git a/src/JSystem/JAudio2/JASAiCtrl.cpp b/src/JSystem/JAudio2/JASAiCtrl.cpp
index 9beb08f0bd..662e5e6df4 100644
--- a/src/JSystem/JAudio2/JASAiCtrl.cpp
+++ b/src/JSystem/JAudio2/JASAiCtrl.cpp
@@ -16,7 +16,7 @@
 #include "JSystem/JUtility/JUTAssert.h"
 #include "dolphin/ai.h"
 #include <dolphin/os.h>
-#include <stdint>
+#include <stdint.h>
 
 s16* JASDriver::sDmaDacBuffer[3];
 
diff --git a/src/JSystem/JAudio2/JASAudioThread.cpp b/src/JSystem/JAudio2/JASAudioThread.cpp
index e74ba52e9a..4cf66d5abf 100644
--- a/src/JSystem/JAudio2/JASAudioThread.cpp
+++ b/src/JSystem/JAudio2/JASAudioThread.cpp
@@ -10,7 +10,7 @@
 #include "JSystem/JAudio2/JASReport.h"
 #include "JSystem/JKernel/JKRSolidHeap.h"
 #include "dolphin/dsp.h"
-#include <stdint>
+#include <stdint.h>
 
 JASAudioThread::JASAudioThread(int stackSize, int msgCount, u32 threadPriority)
     : 
diff --git a/src/JSystem/JAudio2/JASBasicWaveBank.cpp b/src/JSystem/JAudio2/JASBasicWaveBank.cpp
index ad11ba25d2..a6134046be 100644
--- a/src/JSystem/JAudio2/JASBasicWaveBank.cpp
+++ b/src/JSystem/JAudio2/JASBasicWaveBank.cpp
@@ -4,7 +4,7 @@
 #include "JSystem/JAudio2/JASMutex.h"
 #include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
-#include <stdint>
+#include <stdint.h>
 
 JASBasicWaveBank::JASBasicWaveBank() {
     mWaveTable = NULL;
diff --git a/src/JSystem/JAudio2/JASCalc.cpp b/src/JSystem/JAudio2/JASCalc.cpp
index b4ef0d66be..9c3d7f1412 100644
--- a/src/JSystem/JAudio2/JASCalc.cpp
+++ b/src/JSystem/JAudio2/JASCalc.cpp
@@ -1,7 +1,7 @@
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JAudio2/JASCalc.h"
-#include <math>
+#include <cmath>
 #include <limits>
 
 void JASCalc::imixcopy(const s16* s1, const s16* s2, s16* dst, u32 n) {
diff --git a/src/JSystem/JAudio2/JASReport.cpp b/src/JSystem/JAudio2/JASReport.cpp
index 941338ba3a..be97131868 100644
--- a/src/JSystem/JAudio2/JASReport.cpp
+++ b/src/JSystem/JAudio2/JASReport.cpp
@@ -8,7 +8,7 @@
 #include "JSystem/JAudio2/JASCalc.h"
 #include "JSystem/JAudio2/JASMutex.h"
 #include "JSystem/JKernel/JKRHeap.h"
-#include <stdio>
+#include <cstdio>
 
 static OSMutex sMutex;
 
diff --git a/src/JSystem/JAudio2/JASSimpleWaveBank.cpp b/src/JSystem/JAudio2/JASSimpleWaveBank.cpp
index a105fe7c37..9bc0bbf31d 100644
--- a/src/JSystem/JAudio2/JASSimpleWaveBank.cpp
+++ b/src/JSystem/JAudio2/JASSimpleWaveBank.cpp
@@ -1,7 +1,7 @@
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JAudio2/JASSimpleWaveBank.h"
-#include <stdint>
+#include <stdint.h>
 
 JASSimpleWaveBank::JASSimpleWaveBank() {
     mWaveTable = NULL;
diff --git a/src/JSystem/JAudio2/JASWaveArcLoader.cpp b/src/JSystem/JAudio2/JASWaveArcLoader.cpp
index 9672a087ae..37086c0d4e 100644
--- a/src/JSystem/JAudio2/JASWaveArcLoader.cpp
+++ b/src/JSystem/JAudio2/JASWaveArcLoader.cpp
@@ -7,7 +7,7 @@
 #include "JSystem/JKernel/JKRDvdAramRipper.h"
 #include <string>
 #include "dolphin/os.h"
-#include <stdint>
+#include <stdint.h>
 
 JASHeap* JASWaveArcLoader::sAramHeap;
 
diff --git a/src/JSystem/JFramework/JFWDisplay.cpp b/src/JSystem/JFramework/JFWDisplay.cpp
index e3785d6782..0392ffdb0b 100644
--- a/src/JSystem/JFramework/JFWDisplay.cpp
+++ b/src/JSystem/JFramework/JFWDisplay.cpp
@@ -9,7 +9,7 @@
 #include "dolphin/gx.h"
 #include <dolphin/vi.h>
 #include "global.h"
-#include <stdint>
+#include <stdint.h>
 
 void JFWDisplay::ctor_subroutine(bool enableAlpha) {
     mEnableAlpha = enableAlpha;
diff --git a/src/JSystem/JGadget/binary.cpp b/src/JSystem/JGadget/binary.cpp
index af49191265..cde00093f2 100644
--- a/src/JSystem/JGadget/binary.cpp
+++ b/src/JSystem/JGadget/binary.cpp
@@ -2,7 +2,7 @@
 
 #include "JSystem/JGadget/binary.h"
 #include "JSystem/JGadget/define.h"
-#include <stdint>
+#include <stdint.h>
 
 #if DEBUG
 static void dummyString() {
diff --git a/src/JSystem/JGadget/define.cpp b/src/JSystem/JGadget/define.cpp
index 84b1914f17..a613126499 100644
--- a/src/JSystem/JGadget/define.cpp
+++ b/src/JSystem/JGadget/define.cpp
@@ -3,7 +3,7 @@
 #include "JSystem/JGadget/define.h"
 
 #define MSL_USE_INLINES 1
-#include <ctype>
+#include <cctype>
 
 JGadget_outMessage::JGadget_outMessage(MessageFunc fn, const char* file, int line) {
     mMsgFunc = fn;
diff --git a/src/JSystem/JGadget/std-stream.cpp b/src/JSystem/JGadget/std-stream.cpp
index 3ce2def24d..4fe582f8f6 100644
--- a/src/JSystem/JGadget/std-stream.cpp
+++ b/src/JSystem/JGadget/std-stream.cpp
@@ -2,7 +2,7 @@
 
 #include "JSystem/JGadget/std-stream.h"
 #include "JSystem/JGadget/define.h"
-#include <ctype>
+#include <cctype>
 #include <float.h>
 
 namespace JGadget {
diff --git a/src/JSystem/JKernel/JKRAramArchive.cpp b/src/JSystem/JKernel/JKRAramArchive.cpp
index 35817fe158..811978caa0 100644
--- a/src/JSystem/JKernel/JKRAramArchive.cpp
+++ b/src/JSystem/JKernel/JKRAramArchive.cpp
@@ -7,7 +7,7 @@
 #include "JSystem/JKernel/JKRDvdFile.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "JSystem/JUtility/JUTException.h"
-#include <math>
+#include <cmath>
 #include <string>
 
 JKRAramArchive::JKRAramArchive() {}
diff --git a/src/JSystem/JKernel/JKRAramStream.cpp b/src/JSystem/JKernel/JKRAramStream.cpp
index d126b08b5d..94b9ca91fc 100644
--- a/src/JSystem/JKernel/JKRAramStream.cpp
+++ b/src/JSystem/JKernel/JKRAramStream.cpp
@@ -4,7 +4,7 @@
 #include "JSystem/JKernel/JKRAramPiece.h"
 #include "JSystem/JSupport/JSUFileStream.h"
 #include "JSystem/JUtility/JUTException.h"
-#include <stdint>
+#include <stdint.h>
 
 #if PLATFORM_GCN
 const u32 stack_size = 0xc00;
diff --git a/src/JSystem/JKernel/JKRArchivePri.cpp b/src/JSystem/JKernel/JKRArchivePri.cpp
index 5dff53f00b..375e297c37 100644
--- a/src/JSystem/JKernel/JKRArchivePri.cpp
+++ b/src/JSystem/JKernel/JKRArchivePri.cpp
@@ -2,7 +2,7 @@
 
 #include "JSystem/JKernel/JKRArchive.h"
 #include "JSystem/JKernel/JKRHeap.h"
-#include <ctype>
+#include <cctype>
 #include <string>
 
 u32 JKRArchive::sCurrentDirID;
diff --git a/src/JSystem/JKernel/JKRCompArchive.cpp b/src/JSystem/JKernel/JKRCompArchive.cpp
index 5e9eb638e6..8a1577f592 100644
--- a/src/JSystem/JKernel/JKRCompArchive.cpp
+++ b/src/JSystem/JKernel/JKRCompArchive.cpp
@@ -10,9 +10,9 @@
 #include "JSystem/JKernel/JKRMemArchive.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "JSystem/JUtility/JUTException.h"
-#include <math>
+#include <cmath>
 #include <string>
-#include <stdint>
+#include <stdint.h>
 
 JKRCompArchive::JKRCompArchive(s32 entryNum, JKRArchive::EMountDirection eMountDirection)
     : JKRArchive(entryNum, MOUNT_COMP) {
diff --git a/src/JSystem/JKernel/JKRDvdArchive.cpp b/src/JSystem/JKernel/JKRDvdArchive.cpp
index 0a74ca8c01..ed88d791e7 100644
--- a/src/JSystem/JKernel/JKRDvdArchive.cpp
+++ b/src/JSystem/JKernel/JKRDvdArchive.cpp
@@ -6,10 +6,10 @@
 #include "JSystem/JKernel/JKRDvdRipper.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "JSystem/JUtility/JUTException.h"
-#include <math>
+#include <cmath>
 #include <string>
 #include "global.h"
-#include <stdint>
+#include <stdint.h>
 
 JKRDvdArchive::JKRDvdArchive(s32 entryNum, JKRArchive::EMountDirection mountDirection)
     : JKRArchive(entryNum, MOUNT_DVD) {
diff --git a/src/JSystem/JKernel/JKRDvdFile.cpp b/src/JSystem/JKernel/JKRDvdFile.cpp
index 172827e520..07bd9505a5 100644
--- a/src/JSystem/JKernel/JKRDvdFile.cpp
+++ b/src/JSystem/JKernel/JKRDvdFile.cpp
@@ -3,7 +3,7 @@
 #include "JSystem/JKernel/JKRDvdFile.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "JSystem/JUtility/JUTException.h"
-#include <stdint>
+#include <stdint.h>
 
 JSUList<JKRDvdFile> JKRDvdFile::sDvdList;
 
diff --git a/src/JSystem/JKernel/JKRDvdRipper.cpp b/src/JSystem/JKernel/JKRDvdRipper.cpp
index 877d10d740..fc792c50cd 100644
--- a/src/JSystem/JKernel/JKRDvdRipper.cpp
+++ b/src/JSystem/JKernel/JKRDvdRipper.cpp
@@ -11,7 +11,7 @@
 #include <string>
 #include <dolphin/os.h>
 #include "dolphin/vi.h"
-#include <stdint>
+#include <stdint.h>
 
 static int JKRDecompressFromDVD(JKRDvdFile*, void*, u32, u32, u32, u32, u32*);
 static int decompSZS_subroutine(u8*, u8*);
diff --git a/src/JSystem/JKernel/JKRExpHeap.cpp b/src/JSystem/JKernel/JKRExpHeap.cpp
index 9f1109d12a..1c6d16c1a9 100644
--- a/src/JSystem/JKernel/JKRExpHeap.cpp
+++ b/src/JSystem/JKernel/JKRExpHeap.cpp
@@ -9,7 +9,7 @@
 #include "JSystem/JSupport/JSupport.h"
 #include "JSystem/JUtility/JUTConsole.h"
 #include "JSystem/JUtility/JUTException.h"
-#include <stdlib>
+#include <cstdlib>
 
 JKRExpHeap* JKRExpHeap::createRoot(int maxHeaps, bool errorFlag) {
     JKRExpHeap* heap = NULL;
diff --git a/src/JSystem/JKernel/JKRFileCache.cpp b/src/JSystem/JKernel/JKRFileCache.cpp
index 2c764a7024..1dc3a719ef 100644
--- a/src/JSystem/JKernel/JKRFileCache.cpp
+++ b/src/JSystem/JKernel/JKRFileCache.cpp
@@ -6,7 +6,7 @@
 #include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 
-#include <ctype>
+#include <cctype>
 #include <string>
 #include "global.h"
 
diff --git a/src/JSystem/JKernel/JKRFileLoader.cpp b/src/JSystem/JKernel/JKRFileLoader.cpp
index cf756ee279..26790f87b6 100644
--- a/src/JSystem/JKernel/JKRFileLoader.cpp
+++ b/src/JSystem/JKernel/JKRFileLoader.cpp
@@ -5,7 +5,7 @@
 #define MSL_USE_INLINES 1  // needed to inline tolower call. not inlined elsewhere in the repo
 
 #include <string>
-#include <ctype>
+#include <cctype>
 #include "global.h"
 
 JKRFileLoader* JKRFileLoader::sCurrentVolume;
diff --git a/src/JSystem/JKernel/JKRHeap.cpp b/src/JSystem/JKernel/JKRHeap.cpp
index b805901b78..e4337db174 100644
--- a/src/JSystem/JKernel/JKRHeap.cpp
+++ b/src/JSystem/JKernel/JKRHeap.cpp
@@ -8,7 +8,7 @@
 #include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "JSystem/JUtility/JUTException.h"
-#include <stdint>
+#include <stdint.h>
 #include <string>
 
 #if DEBUG
diff --git a/src/JSystem/JKernel/JKRMemArchive.cpp b/src/JSystem/JKernel/JKRMemArchive.cpp
index 505329847c..0c0ef4887c 100644
--- a/src/JSystem/JKernel/JKRMemArchive.cpp
+++ b/src/JSystem/JKernel/JKRMemArchive.cpp
@@ -7,7 +7,7 @@
 #include "JSystem/JUtility/JUTException.h"
 #include <string>
 #include "global.h"
-#include <stdint>
+#include <stdint.h>
 
 JKRMemArchive::JKRMemArchive(s32 entryNum, JKRArchive::EMountDirection mountDirection)
     : JKRArchive(entryNum, MOUNT_MEM) {
diff --git a/src/JSystem/JKernel/JKRSolidHeap.cpp b/src/JSystem/JKernel/JKRSolidHeap.cpp
index 593f4b78ac..01ead7728b 100644
--- a/src/JSystem/JKernel/JKRSolidHeap.cpp
+++ b/src/JSystem/JKernel/JKRSolidHeap.cpp
@@ -5,8 +5,8 @@
 #include "JSystem/JUtility/JUTAssert.h"
 #include "JSystem/JUtility/JUTConsole.h"
 #include "global.h"
-#include <stdint>
-#include <stdlib>
+#include <stdint.h>
+#include <cstdlib>
 
 JKRSolidHeap* JKRSolidHeap::create(u32 size, JKRHeap* heap, bool useErrorHandler) {
     if (!heap) {
diff --git a/src/JSystem/JKernel/JKRThread.cpp b/src/JSystem/JKernel/JKRThread.cpp
index 0392beef0f..fa38270a2d 100644
--- a/src/JSystem/JKernel/JKRThread.cpp
+++ b/src/JSystem/JKernel/JKRThread.cpp
@@ -3,9 +3,9 @@
 #include "JSystem/JKernel/JKRThread.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "JSystem/JUtility/JUTConsole.h"
-#include <stdio>
+#include <cstdio>
 #include "global.h"
-#include <stdint>
+#include <stdint.h>
 
 JSUList<JKRThread> JKRThread::sThreadList(0);
 
diff --git a/src/JSystem/JMath/JMATrigonometric.cpp b/src/JSystem/JMath/JMATrigonometric.cpp
index 2fc14cb13e..5d394ac9c2 100644
--- a/src/JSystem/JMath/JMATrigonometric.cpp
+++ b/src/JSystem/JMath/JMATrigonometric.cpp
@@ -1,7 +1,7 @@
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JMath/JMATrigonometric.h"
-#include <math>
+#include <cmath>
 #include "global.h"
 
 static f32 dummy() {
diff --git a/src/JSystem/JStudio/JStudio/functionvalue.cpp b/src/JSystem/JStudio/JStudio/functionvalue.cpp
index 7d891a47d6..174a459b62 100644
--- a/src/JSystem/JStudio/JStudio/functionvalue.cpp
+++ b/src/JSystem/JStudio/JStudio/functionvalue.cpp
@@ -5,8 +5,8 @@
 #include "JSystem/JUtility/JUTException.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "JSystem/JGadget/linklist.h"
-#include <math>
-#include <stdlib>
+#include <cmath>
+#include <cstdlib>
 #include <limits>
 
 namespace JStudio {
@@ -291,7 +291,11 @@ f64 TFunctionValue_composite::composite_index(TVector_pointer<TFunctionValue*> c
         }
         break;
     case 1: {
+#ifdef __MWERKS__
         div_t dt = div(index, size - 1);
+#else
+        div_t dt = div((int)index, (int)size - 1);
+#endif
         index = dt.rem;
         if (index < 0) {
             index = size + index;
@@ -304,7 +308,11 @@ f64 TFunctionValue_composite::composite_index(TVector_pointer<TFunctionValue*> c
             index = 0;
         } else {
             u32 uVar3 = (u32)(size - 2) * 2;
+#ifdef __MWERKS__
             div_t dt2 = div(index, uVar3);
+#else
+            div_t dt2 = div((int)index, (int)uVar3);
+#endif
             index = dt2.rem;
             if (index < 0) {
                 index += uVar3;
@@ -315,8 +323,12 @@ f64 TFunctionValue_composite::composite_index(TVector_pointer<TFunctionValue*> c
         }
         break;
     }
-   
+
+#ifdef __MWERKS__
     std::advance_pointer(local_148, index + 1);
+#else
+    std::advance(local_148, index + 1);
+#endif
     pFront = *local_148;
     return pFront->getValue(param_3);
 }
diff --git a/src/JSystem/JStudio/JStudio/jstudio-math.cpp b/src/JSystem/JStudio/JStudio/jstudio-math.cpp
index d6e31f7a9c..119cd4c554 100644
--- a/src/JSystem/JStudio/JStudio/jstudio-math.cpp
+++ b/src/JSystem/JStudio/JStudio/jstudio-math.cpp
@@ -3,7 +3,7 @@
 #include "JSystem/JStudio/JStudio/jstudio-math.h"
 #include "JSystem/JGeometry.h"
 #include "JSystem/TPosition3.h"
-#include <math>
+#include <cmath>
 
 void JStudio::math::getRotation_xyz(MtxP param_1, f32 x, f32 y, f32 z) {
     f32 cosx = cosf(DEG_TO_RAD(x));
diff --git a/src/JSystem/JStudio/JStudio/stb-data-parse.cpp b/src/JSystem/JStudio/JStudio/stb-data-parse.cpp
index a5d0136d2b..e9ab233d33 100644
--- a/src/JSystem/JStudio/JStudio/stb-data-parse.cpp
+++ b/src/JSystem/JStudio/JStudio/stb-data-parse.cpp
@@ -3,7 +3,7 @@
 #include "JSystem/JStudio/JStudio/stb-data-parse.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "dolphin/os.h"
-#include <stdint>
+#include <stdint.h>
 
 namespace JStudio {
 namespace stb {
diff --git a/src/JSystem/JUtility/JUTAssert.cpp b/src/JSystem/JUtility/JUTAssert.cpp
index 9916b8e4c8..bf26d0ae99 100644
--- a/src/JSystem/JUtility/JUTAssert.cpp
+++ b/src/JSystem/JUtility/JUTAssert.cpp
@@ -4,7 +4,7 @@
 #include "JSystem/JUtility/JUTConsole.h"
 #include "JSystem/JUtility/JUTDbPrint.h"
 #include "JSystem/JUtility/JUTDirectPrint.h"
-#include <stdio>
+#include <cstdio>
 #include <dolphin/vi.h>
 
 namespace JUTAssertion {
diff --git a/src/JSystem/JUtility/JUTCacheFont.cpp b/src/JSystem/JUtility/JUTCacheFont.cpp
index 9054c6ec77..3292adc78b 100644
--- a/src/JSystem/JUtility/JUTCacheFont.cpp
+++ b/src/JSystem/JUtility/JUTCacheFont.cpp
@@ -6,7 +6,7 @@
 #include "JSystem/JUtility/JUTConsole.h"
 #include "JSystem/JKernel/JKRAram.h"
 #include "dolphin/gx.h"
-#include <stdint>
+#include <stdint.h>
 
 JUTCacheFont::JUTCacheFont(ResFONT const* p_fontRes, u32 cacheSize, JKRHeap* p_heap) {
     initialize_state();
diff --git a/src/JSystem/JUtility/JUTConsole.cpp b/src/JSystem/JUtility/JUTConsole.cpp
index 98f8404211..c3389cb95e 100644
--- a/src/JSystem/JUtility/JUTConsole.cpp
+++ b/src/JSystem/JUtility/JUTConsole.cpp
@@ -7,7 +7,7 @@
 #include "JSystem/JUtility/JUTDirectPrint.h"
 #include "JSystem/JUtility/JUTVideo.h"
 #include <dolphin/vi.h>
-#include <stdio>
+#include <cstdio>
 #include "global.h"
 
 JUTConsoleManager* JUTConsoleManager::sManager;
diff --git a/src/JSystem/JUtility/JUTDbPrint.cpp b/src/JSystem/JUtility/JUTDbPrint.cpp
index f137c13dd5..9adab8141b 100644
--- a/src/JSystem/JUtility/JUTDbPrint.cpp
+++ b/src/JSystem/JUtility/JUTDbPrint.cpp
@@ -4,7 +4,7 @@
 #include "JSystem/J2DGraph/J2DOrthoGraph.h"
 #include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTVideo.h"
-#include <stdio>
+#include <cstdio>
 
 JUTDbPrint::JUTDbPrint(JUTFont* pFont, JKRHeap* pHeap) {
     mFont = pFont;
diff --git a/src/JSystem/JUtility/JUTDirectFile.cpp b/src/JSystem/JUtility/JUTDirectFile.cpp
index a60a90c5ec..ce2c4354d5 100644
--- a/src/JSystem/JUtility/JUTDirectFile.cpp
+++ b/src/JSystem/JUtility/JUTDirectFile.cpp
@@ -3,7 +3,7 @@
 #include "JSystem/JUtility/JUTDirectFile.h"
 #include <dolphin/os.h>
 #include "global.h"
-#include <stdint>
+#include <stdint.h>
 
 int JUTDirectFile::fetch32byte() {
 	mToRead = mLength - ALIGN_PREV(mPos, DVD_MIN_TRANSFER_SIZE);
diff --git a/src/JSystem/JUtility/JUTDirectPrint.cpp b/src/JSystem/JUtility/JUTDirectPrint.cpp
index 6a9fa75d1e..b317f18efe 100644
--- a/src/JSystem/JUtility/JUTDirectPrint.cpp
+++ b/src/JSystem/JUtility/JUTDirectPrint.cpp
@@ -1,7 +1,7 @@
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JUtility/JUTDirectPrint.h"
-#include <stdio>
+#include <cstdio>
 #include <dolphin/os.h>
 #include "global.h"
 
diff --git a/src/JSystem/JUtility/JUTException.cpp b/src/JSystem/JUtility/JUTException.cpp
index 5a2c6289a5..19c3fafe0e 100644
--- a/src/JSystem/JUtility/JUTException.cpp
+++ b/src/JSystem/JUtility/JUTException.cpp
@@ -4,11 +4,11 @@
 #include "JSystem/JUtility/JUTConsole.h"
 #include "JSystem/JUtility/JUTDirectPrint.h"
 #include "JSystem/JUtility/JUTDirectFile.h"
-#include <math>
-#include <stdio>
-#include <stdlib>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
 #include <dolphin/dolphin.h>
-#include <stdint>
+#include <stdint.h>
 
 OSMessageQueue JUTException::sMessageQueue = {0};
 
diff --git a/src/JSystem/JUtility/JUTGamePad.cpp b/src/JSystem/JUtility/JUTGamePad.cpp
index 2330d538f2..1918268afc 100644
--- a/src/JSystem/JUtility/JUTGamePad.cpp
+++ b/src/JSystem/JUtility/JUTGamePad.cpp
@@ -1,7 +1,7 @@
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JUtility/JUTGamePad.h"
-#include <math>
+#include <cmath>
 
 u32 JUTGamePad::CRumble::sChannelMask[4] = {
     PAD_CHAN0_BIT,
diff --git a/src/JSystem/JUtility/JUTGraphFifo.cpp b/src/JSystem/JUtility/JUTGraphFifo.cpp
index 06d47d6a11..a30a0aeace 100644
--- a/src/JSystem/JUtility/JUTGraphFifo.cpp
+++ b/src/JSystem/JUtility/JUTGraphFifo.cpp
@@ -2,7 +2,7 @@
 
 #include "JSystem/JUtility/JUTGraphFifo.h"
 #include "JSystem/JKernel/JKRHeap.h"
-#include <stdint>
+#include <stdint.h>
 
 static bool data_804514B8;
 
diff --git a/src/JSystem/JUtility/JUTProcBar.cpp b/src/JSystem/JUtility/JUTProcBar.cpp
index 6de3753989..20fb99c827 100644
--- a/src/JSystem/JUtility/JUTProcBar.cpp
+++ b/src/JSystem/JUtility/JUTProcBar.cpp
@@ -4,7 +4,7 @@
 #include "JSystem/J2DGraph/J2DOrthoGraph.h"
 #include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTVideo.h"
-#include <stdint>
+#include <stdint.h>
 
 JUTProcBar::JUTProcBar() {
     mVisible = true;