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

45 files changed, 67 insertions, 49 deletions

diff --git a/include/JSystem/J2DGraph/J2DPrint.h b/include/JSystem/J2DGraph/J2DPrint.h
index 234f1c0c29..be06e01c26 100644
--- a/include/JSystem/J2DGraph/J2DPrint.h
+++ b/include/JSystem/J2DGraph/J2DPrint.h
@@ -2,7 +2,7 @@
 #define J2DPRINT_H
 
 #include "JSystem/J2DGraph/J2DTextBox.h"
-#include <stdarg.h>
+#include <stdarg>
 
 class JUTFont;
 class J2DPrint;
diff --git a/include/JSystem/J3DGraphBase/J3DMaterial.h b/include/JSystem/J3DGraphBase/J3DMaterial.h
index dcb74c1f46..462849c843 100644
--- a/include/JSystem/J3DGraphBase/J3DMaterial.h
+++ b/include/JSystem/J3DGraphBase/J3DMaterial.h
@@ -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;
diff --git a/include/JSystem/J3DGraphBase/J3DPacket.h b/include/JSystem/J3DGraphBase/J3DPacket.h
index 92b817ec23..c5ff05c350 100644
--- a/include/JSystem/J3DGraphBase/J3DPacket.h
+++ b/include/JSystem/J3DGraphBase/J3DPacket.h
@@ -3,7 +3,7 @@
 
 #include "JSystem/J3DGraphBase/J3DSys.h"
 #include "dolphin/gd/GDBase.h"
-#include <stdint.h>
+#include <stdint>
 
 class J3DMatPacket;
 
diff --git a/include/JSystem/J3DGraphBase/J3DTexture.h b/include/JSystem/J3DGraphBase/J3DTexture.h
index 72a165645b..f046a75262 100644
--- a/include/JSystem/J3DGraphBase/J3DTexture.h
+++ b/include/JSystem/J3DGraphBase/J3DTexture.h
@@ -5,7 +5,7 @@
 #include "JSystem/J3DAssert.h"
 #include "JSystem/JUtility/JUTTexture.h"
 #include "global.h"
-#include <stdint.h>
+#include <stdint>
 
 /**
  * @ingroup jsystem-j3d
diff --git a/include/JSystem/JAudio2/JAISeqDataMgr.h b/include/JSystem/JAudio2/JAISeqDataMgr.h
index 510f1f4905..c207f0878c 100644
--- a/include/JSystem/JAudio2/JAISeqDataMgr.h
+++ b/include/JSystem/JAudio2/JAISeqDataMgr.h
@@ -2,7 +2,7 @@
 #define JAISEQDATAMGR_H
 
 #include "JSystem/JAudio2/JAISound.h"
-#include <stdint.h>
+#include <stdint>
 
 /**
  * @ingroup jsystem-jaudio
diff --git a/include/JSystem/JAudio2/JASGadget.h b/include/JSystem/JAudio2/JASGadget.h
index 5c3e9f5542..718ce02069 100644
--- a/include/JSystem/JAudio2/JASGadget.h
+++ b/include/JSystem/JAudio2/JASGadget.h
@@ -2,7 +2,7 @@
 #define JASGADGET_H
 
 #include "JSystem/JUtility/JUTAssert.h"
-#include "string.h"
+#include <string>
 
 /**
  * @ingroup jsystem-jaudio
diff --git a/include/JSystem/JAudio2/JAUSectionHeap.h b/include/JSystem/JAudio2/JAUSectionHeap.h
index 25eee17d55..a7535500a4 100644
--- a/include/JSystem/JAudio2/JAUSectionHeap.h
+++ b/include/JSystem/JAudio2/JAUSectionHeap.h
@@ -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;
diff --git a/include/JSystem/JAudio2/JAUStreamAramMgr.h b/include/JSystem/JAudio2/JAUStreamAramMgr.h
index da44e02e6f..d33306d323 100644
--- a/include/JSystem/JAudio2/JAUStreamAramMgr.h
+++ b/include/JSystem/JAudio2/JAUStreamAramMgr.h
@@ -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
diff --git a/include/JSystem/JGadget/linklist.h b/include/JSystem/JGadget/linklist.h
index 47a438ddb8..8d0f7c43b1 100644
--- a/include/JSystem/JGadget/linklist.h
+++ b/include/JSystem/JGadget/linklist.h
@@ -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 {
diff --git a/include/JSystem/JGadget/search.h b/include/JSystem/JGadget/search.h
index 555cf63cd7..bbc5c9ce6c 100644
--- a/include/JSystem/JGadget/search.h
+++ b/include/JSystem/JGadget/search.h
@@ -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 {
diff --git a/include/JSystem/JGadget/std-streambuf.h b/include/JSystem/JGadget/std-streambuf.h
index 06ac0e36e7..d6bf291415 100644
--- a/include/JSystem/JGadget/std-streambuf.h
+++ b/include/JSystem/JGadget/std-streambuf.h
@@ -2,7 +2,7 @@
 #define JGADGET_STD_STREAMBUF_H
 
 #include <dolphin/types.h>
-#include <string.h>
+#include <string>
 
 namespace JGadget {
 template <typename T>
diff --git a/include/JSystem/JGadget/std-vector.h b/include/JSystem/JGadget/std-vector.h
index 652ea7c3a3..4e74855e55 100644
--- a/include/JSystem/JGadget/std-vector.h
+++ b/include/JSystem/JGadget/std-vector.h
@@ -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 {
diff --git a/include/JSystem/JGeometry.h b/include/JSystem/JGeometry.h
index c90d3bdc81..c13d838082 100644
--- a/include/JSystem/JGeometry.h
+++ b/include/JSystem/JGeometry.h
@@ -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>
diff --git a/include/JSystem/JHostIO/JORMContext.h b/include/JSystem/JHostIO/JORMContext.h
index 0db8cf22a6..f16ffdd57d 100644
--- a/include/JSystem/JHostIO/JORMContext.h
+++ b/include/JSystem/JHostIO/JORMContext.h
@@ -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"
 
diff --git a/include/JSystem/JKernel/JKRExpHeap.h b/include/JSystem/JKernel/JKRExpHeap.h
index 1535ba757b..f7739ada1d 100644
--- a/include/JSystem/JKernel/JKRExpHeap.h
+++ b/include/JSystem/JKernel/JKRExpHeap.h
@@ -2,7 +2,7 @@
 #define JKREXPHEAP_H
 
 #include "JSystem/JKernel/JKRHeap.h"
-#include <stdint.h>
+#include <stdint>
 
 /**
  * @ingroup jsystem-jkernel
diff --git a/include/JSystem/JKernel/JKRHeap.h b/include/JSystem/JKernel/JKRHeap.h
index ec9ca10497..e0162fc595 100644
--- a/include/JSystem/JKernel/JKRHeap.h
+++ b/include/JSystem/JKernel/JKRHeap.h
@@ -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);
 
diff --git a/include/JSystem/JMath/JMATrigonometric.h b/include/JSystem/JMath/JMATrigonometric.h
index 276ea2399e..8b15f6624e 100644
--- a/include/JSystem/JMath/JMATrigonometric.h
+++ b/include/JSystem/JMath/JMATrigonometric.h
@@ -2,7 +2,7 @@
 #define JMATRIGONOMETRIC_H
 
 #include "dolphin/types.h"
-#include <utility.h>
+#include <utility>
 
 namespace JMath {
 template<typename T>
diff --git a/include/JSystem/JMath/JMath.h b/include/JSystem/JMath/JMath.h
index 35cde38bef..c6f26c771f 100644
--- a/include/JSystem/JMath/JMath.h
+++ b/include/JSystem/JMath/JMath.h
@@ -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);
diff --git a/include/JSystem/JMessage/processor.h b/include/JSystem/JMessage/processor.h
index feb5be25c4..cfb20c2c46 100644
--- a/include/JSystem/JMessage/processor.h
+++ b/include/JSystem/JMessage/processor.h
@@ -2,7 +2,7 @@
 #define JMESSAGE_PROCESSOR_H
 
 #include "JSystem/JMessage/resource.h"
-#include <algorithm.h>
+#include <algorithm>
 #include "global.h"
 
 namespace JMessage {
diff --git a/include/JSystem/JParticle/JPAEmitter.h b/include/JSystem/JParticle/JPAEmitter.h
index 9ce16e8f22..c47cd538d6 100644
--- a/include/JSystem/JParticle/JPAEmitter.h
+++ b/include/JSystem/JParticle/JPAEmitter.h
@@ -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"
diff --git a/include/JSystem/JStudio/JStudio/functionvalue.h b/include/JSystem/JStudio/JStudio/functionvalue.h
index 74f89eb2d7..f2f51ae923 100644
--- a/include/JSystem/JStudio/JStudio/functionvalue.h
+++ b/include/JSystem/JStudio/JStudio/functionvalue.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"
diff --git a/include/JSystem/JStudio/JStudio/jstudio-math.h b/include/JSystem/JStudio/JStudio/jstudio-math.h
index 109d17230d..d902c218fa 100644
--- a/include/JSystem/JStudio/JStudio/jstudio-math.h
+++ b/include/JSystem/JStudio/JStudio/jstudio-math.h
@@ -2,7 +2,7 @@
 #define JSTUDIO_MATH_H
 
 #include "dolphin/mtx.h"
-#include <math.h>
+#include <math>
 
 namespace JStudio {
 namespace math {
diff --git a/include/JSystem/JStudio/JStudio/jstudio-object.h b/include/JSystem/JStudio/JStudio/jstudio-object.h
index 6bca78c4c0..653ffc9474 100644
--- a/include/JSystem/JStudio/JStudio/jstudio-object.h
+++ b/include/JSystem/JStudio/JStudio/jstudio-object.h
@@ -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;
 
diff --git a/include/JSystem/JSupport/JSupport.h b/include/JSystem/JSupport/JSupport.h
index 717fd9b7b0..bdd2960543 100644
--- a/include/JSystem/JSupport/JSupport.h
+++ b/include/JSystem/JSupport/JSupport.h
@@ -2,7 +2,7 @@
 #define JSUPPORT_H
 
 #include <dolphin/dolphin.h>
-#include <stdint.h>
+#include <stdint>
 
 /**
 * @ingroup jsystem-jsupport
diff --git a/include/JSystem/JUtility/JUTConsole.h b/include/JSystem/JUtility/JUTConsole.h
index 6f9194b837..7b852eb0a0 100644
--- a/include/JSystem/JUtility/JUTConsole.h
+++ b/include/JSystem/JUtility/JUTConsole.h
@@ -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
diff --git a/include/JSystem/JUtility/JUTDirectPrint.h b/include/JSystem/JUtility/JUTDirectPrint.h
index d856510ff3..aeff790f55 100644
--- a/include/JSystem/JUtility/JUTDirectPrint.h
+++ b/include/JSystem/JUtility/JUTDirectPrint.h
@@ -2,7 +2,7 @@
 #define JUTDIRECTPRINT_H
 
 #include "JSystem/JUtility/TColor.h"
-#include <stdarg.h>
+#include <stdarg>
 
 /**
 * @ingroup jsystem-jutility
diff --git a/include/JSystem/JUtility/JUTException.h b/include/JSystem/JUtility/JUTException.h
index 197936ed81..29849460e9 100644
--- a/include/JSystem/JUtility/JUTException.h
+++ b/include/JSystem/JUtility/JUTException.h
@@ -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"
diff --git a/include/JSystem/JUtility/JUTFont.h b/include/JSystem/JUtility/JUTFont.h
index 7b3639d6af..193a3ac3fd 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.h"
+#include <string>
 
 /**
 * @ingroup jsystem-jutility
diff --git a/include/JSystem/JUtility/JUTTexture.h b/include/JSystem/JUtility/JUTTexture.h
index 2fc24af2c2..d83be32158 100644
--- a/include/JSystem/JUtility/JUTTexture.h
+++ b/include/JSystem/JUtility/JUTTexture.h
@@ -2,7 +2,7 @@
 #define JUTTEXTURE_H
 
 #include <dolphin/gx.h>
-#include <stdint.h>
+#include <stdint>
 
 class JUTPalette;
 
diff --git a/include/SSystem/SComponent/c_m3d.h b/include/SSystem/SComponent/c_m3d.h
index 6634100209..a8045c74a7 100644
--- a/include/SSystem/SComponent/c_m3d.h
+++ b/include/SSystem/SComponent/c_m3d.h
@@ -1,7 +1,7 @@
 #ifndef C_M3D_H_
 #define C_M3D_H_
 
-#include <math.h>
+#include <math>
 #include "dolphin/mtx.h"
 
 class cM3dGAab;
diff --git a/include/SSystem/SComponent/c_math.h b/include/SSystem/SComponent/c_math.h
index c525dfa7e4..0203b4e2f1 100644
--- a/include/SSystem/SComponent/c_math.h
+++ b/include/SSystem/SComponent/c_math.h
@@ -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);
diff --git a/include/SSystem/SComponent/c_xyz.h b/include/SSystem/SComponent/c_xyz.h
index be2bf76935..838949cb13 100644
--- a/include/SSystem/SComponent/c_xyz.h
+++ b/include/SSystem/SComponent/c_xyz.h
@@ -2,7 +2,7 @@
 #define C_XYZ_H
 
 #include "dolphin/mtx.h"
-#include <math.h>
+#include <math>
 
 struct cXyz : Vec {
     static const cXyz Zero;
diff --git a/include/d/actor/d_a_obj_dust.h b/include/d/actor/d_a_obj_dust.h
index 8adb5133b8..8f00781e8c 100644
--- a/include/d/actor/d_a_obj_dust.h
+++ b/include/d/actor/d_a_obj_dust.h
@@ -11,7 +11,7 @@
 #include "d/d_resorce.h"
 #include "d/d_s_play.h"
 
-#include <math.h>
+#include <math>
 
 /**
  * @ingroup actors-objects
diff --git a/include/d/d_menu_dmap_map.h b/include/d/d_menu_dmap_map.h
index ca8b26f15e..311448c72b 100644
--- a/include/d/d_menu_dmap_map.h
+++ b/include/d/d_menu_dmap_map.h
@@ -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:
diff --git a/include/d/d_resorce.h b/include/d/d_resorce.h
index db8efde952..86722f7bf9 100644
--- a/include/d/d_resorce.h
+++ b/include/d/d_resorce.h
@@ -42,7 +42,9 @@ public:
         return --mCount;
     }
 
+#ifdef __MWERKS__
     static const int NAME_MAX = 9;
+#endif
 
 private:
     /* 0x00 */ char mArchiveName[11];
diff --git a/include/d/d_save.h b/include/d/d_save.h
index fff3db0a7a..b99d904023 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.h"
+#include <string>
 #include "SSystem/SComponent/c_xyz.h"
 #include <dolphin/os.h>
 #include "global.h"
diff --git a/include/d/dolzel_base.pch b/include/d/dolzel_base.pch
index ddbcc3da7d..c49cbbb2ba 100644
--- a/include/d/dolzel_base.pch
+++ b/include/d/dolzel_base.pch
@@ -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
diff --git a/include/dolphin/os.h b/include/dolphin/os.h
index 1abc59108f..f9bd33ab5b 100644
--- a/include/dolphin/os.h
+++ b/include/dolphin/os.h
@@ -1,7 +1,7 @@
 #ifndef _DOLPHIN_OS_H_
 #define _DOLPHIN_OS_H_
 
-#include <cstdio.h>
+#include <cstdio>
 
 #ifdef __REVOLUTION_SDK__
 #include <revolution/os.h>
diff --git a/include/dolphin/types.h b/include/dolphin/types.h
index 53ba266cbe..8411e10999 100644
--- a/include/dolphin/types.h
+++ b/include/dolphin/types.h
@@ -82,7 +82,7 @@ typedef unsigned int uint;
 #define __REGISTER
 #endif
 
-#include <cstddef.h>
+#include <cstddef>
 
 #endif
 #endif
diff --git a/include/f_ap/f_ap_game.h b/include/f_ap/f_ap_game.h
index 836554ba50..360b4c5a07 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.h>
+#include <string>
 
 void fapGm_After();
 void fapGm_Create();
diff --git a/include/global.h b/include/global.h
index ab207f43d3..cf8e285c23 100644
--- a/include/global.h
+++ b/include/global.h
@@ -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
diff --git a/include/m_Do/m_Do_hostIO.h b/include/m_Do/m_Do_hostIO.h
index 643143cd45..4542ff4ab9 100644
--- a/include/m_Do/m_Do_hostIO.h
+++ b/include/m_Do/m_Do_hostIO.h
@@ -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:
diff --git a/include/revolution/os.h b/include/revolution/os.h
index 351615ee52..703891f29b 100644
--- a/include/revolution/os.h
+++ b/include/revolution/os.h
@@ -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>
diff --git a/include/revolution/types.h b/include/revolution/types.h
index 65fbba9203..2434b54085 100644
--- a/include/revolution/types.h
+++ b/include/revolution/types.h
@@ -79,6 +79,6 @@ typedef unsigned int uint;
 #define __REGISTER
 #endif
 
-#include <cstddef.h>
+#include <cstddef>
 
 #endif
diff --git a/include/revolution/wpad/bte.h b/include/revolution/wpad/bte.h
index 1751d8998b..c816fa8baf 100644
--- a/include/revolution/wpad/bte.h
+++ b/include/revolution/wpad/bte.h
@@ -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