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

src/DynamicLink.cpp

@@ -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"
 

src/JSystem/J2DGraph/J2DManage.cpp

@@ -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) {

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.h"
+#include <string>
 #include "dolphin/types.h"
 
 J2DMaterialFactory::J2DMaterialFactory(J2DMaterialBlock const& param_0) {

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.h>
-#include <stdlib.h>
+#include <stdio>
+#include <stdlib>
 
 char* J2DPrint::mStrBuff;
 

src/JSystem/J2DGraph/J2DTevs.cpp

@@ -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) {

src/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp

@@ -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;

src/JSystem/J3DGraphBase/J3DMatBlock.cpp

@@ -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);

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.h"
+#include <string>
 #include "global.h"
 
 J3DError J3DDisplayListObj::newDisplayList(u32 maxSize) {

src/JSystem/J3DGraphBase/J3DShapeDraw.cpp

@@ -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) {

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.h>
+#include <string>
 
 J3DVertexData::J3DVertexData() {
     mVtxNum = 0;

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.h"
+#include <string>
 
 void* J3DClusterLoaderDataBase::load(const void* i_data) {
     const JUTDataFileHeader* fileHeader = (JUTDataFileHeader*)i_data;

src/JSystem/J3DU/J3DUClipper.cpp

@@ -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;

src/JSystem/JAHostIO/JAHioUtil.cpp

@@ -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];
 

src/JSystem/JAWExtSystem/JAWExtSystem.cpp

@@ -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;

src/JSystem/JAudio2/JASAiCtrl.cpp

@@ -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];
 

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.h"
+#include <stdint>
 
 JASAudioThread::JASAudioThread(int stackSize, int msgCount, u32 threadPriority)
     : 

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.h"
+#include <stdint>
 
 JASBasicWaveBank::JASBasicWaveBank() {
     mWaveTable = NULL;

src/JSystem/JAudio2/JASCalc.cpp

@@ -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--) {

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.h>
+#include <stdio>
 
 static OSMutex sMutex;
 

src/JSystem/JAudio2/JASSimpleWaveBank.cpp

@@ -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;

src/JSystem/JAudio2/JASWaveArcLoader.cpp

@@ -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;
 

src/JSystem/JFramework/JFWDisplay.cpp

@@ -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;

src/JSystem/JGadget/binary.cpp

@@ -2,7 +2,7 @@
 
 #include "JSystem/JGadget/binary.h"
 #include "JSystem/JGadget/define.h"
-#include <stdint.h>
+#include <stdint>
 
 #if DEBUG
 static void dummyString() {

src/JSystem/JGadget/define.cpp

@@ -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;

src/JSystem/JGadget/std-stream.cpp

@@ -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 {

src/JSystem/JGadget/std-streambuf.cpp

@@ -2,7 +2,7 @@
 
 #include "JSystem/JGadget/std-streambuf.h"
 #include "JSystem/JUtility/JUTAssert.h"
-#include <algorithm.h>
+#include <algorithm>
 
 namespace JGadget {
 TStreamBuffer::~TStreamBuffer() {}

src/JSystem/JGadget/std-string.cpp

@@ -1,6 +1,6 @@
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
-#include <algorithm.h>
+#include <algorithm>
 
 static void dummy() {
     u32 a = 0;

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.h>
+#include <string>
 
 void JHIReport(const char* fmt, ...) {}
 

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.h>
+#include <string>
 
 void JOREventCallbackListNode::JORAppend() {
     JORServer* pServer = JORServer::getInstance();

src/JSystem/JKernel/JKRAram.cpp

@@ -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;

src/JSystem/JKernel/JKRAramArchive.cpp

@@ -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() {}
 

src/JSystem/JKernel/JKRAramHeap.cpp

@@ -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;
 

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.h>
+#include <stdint>
 
 #if PLATFORM_GCN
 const u32 stack_size = 0xc00;

src/JSystem/JKernel/JKRArchivePri.cpp

@@ -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;
 

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.h>
-#include "string.h"
-#include <stdint.h>
+#include <math>
+#include <string>
+#include <stdint>
 
 JKRCompArchive::JKRCompArchive(s32 entryNum, JKRArchive::EMountDirection eMountDirection)
     : JKRArchive(entryNum, MOUNT_COMP) {

src/JSystem/JKernel/JKRDvdAramRipper.cpp

@@ -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);

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.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) {

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.h"
+#include <stdint>
 
 JSUList<JKRDvdFile> JKRDvdFile::sDvdList;
 

src/JSystem/JKernel/JKRDvdRipper.cpp

@@ -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*);

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.h>
+#include <stdlib>
 
 JKRExpHeap* JKRExpHeap::createRoot(int maxHeaps, bool errorFlag) {
     JKRExpHeap* heap = NULL;

src/JSystem/JKernel/JKRFileCache.cpp

@@ -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) {

src/JSystem/JKernel/JKRFileLoader.cpp

@@ -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;

src/JSystem/JKernel/JKRHeap.cpp

@@ -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;

src/JSystem/JKernel/JKRMemArchive.cpp

@@ -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) {

src/JSystem/JKernel/JKRSolidHeap.cpp

@@ -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) {

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.h>
+#include <stdio>
 #include "global.h"
-#include <stdint.h>
+#include <stdint>
 
 JSUList<JKRThread> JKRThread::sThreadList(0);
 

src/JSystem/JMath/JMATrigonometric.cpp

@@ -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() {

src/JSystem/JMessage/processor.cpp

@@ -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() {}
 

src/JSystem/JMessage/resource.cpp

@@ -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()) {

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.h"
+#include <string>
 
 struct JPAResourceLoader {
     JPAResourceLoader(u8 const*, JPAResourceManager*);

src/JSystem/JStage/JSGCamera.cpp

@@ -1,7 +1,7 @@
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JStage/JSGCamera.h"
-#include <limits.h>
+#include <limits>
 
 JStage::TCamera::~TCamera() {}
 

src/JSystem/JStage/JSGFog.cpp

@@ -1,7 +1,7 @@
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JStage/JSGFog.h"
-#include <limits.h>
+#include <limits>
 
 JStage::TFog::~TFog() {}
 

src/JSystem/JStudio/JStudio/ctb.cpp

@@ -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() {}
 

src/JSystem/JStudio/JStudio/functionvalue.cpp

@@ -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 {
 

src/JSystem/JStudio/JStudio/fvb.cpp

@@ -2,7 +2,7 @@
 
 #include "JSystem/JStudio/JStudio/fvb.h"
 #include "JSystem/JUtility/JUTException.h"
-#include <string.h>
+#include <string>
 
 namespace JStudio {
 namespace fvb {

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.h"
+#include <string>
 
 JStudio::TControl::TControl() {
     mTransformOnSet = false;

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.h>
+#include <math>
 
 void JStudio::math::getRotation_xyz(MtxP param_1, f32 x, f32 y, f32 z) {
     f32 cosx = cosf(DEG_TO_RAD(x));

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.h"
+#include <stdint>
 
 namespace JStudio {
 namespace stb {

src/JSystem/JStudio/JStudio/stb.cpp

@@ -3,8 +3,8 @@
 #include "JSystem/JStudio/JStudio/stb.h"
 #include "JSystem/JStudio/JStudio/jstudio-object.h"
 #include "JSystem/JUtility/JUTException.h"
-#include <algorithm.h>
-#include <string.h>
+#include <algorithm>
+#include <string>
 
 namespace JStudio {
 namespace stb {

src/JSystem/JSupport/JSUMemoryStream.cpp

@@ -1,7 +1,7 @@
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JSupport/JSUMemoryStream.h"
-#include "string.h"
+#include <string>
 
 void JSUMemoryInputStream::setBuffer(void const* pBuffer, s32 length) {
     mBuffer = pBuffer;

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.h>
+#include <string>
 
 JSUOutputStream::~JSUOutputStream() {
     if (!isGood()) {

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.h>
+#include <stdio>
 #include <dolphin/vi.h>
 
 bool sAssertVisible = true;

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.h"
+#include <stdint>
 
 JUTCacheFont::JUTCacheFont(ResFONT const* p_fontRes, u32 cacheSize, JKRHeap* p_heap) {
     initialize_state();

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.h>
+#include <stdio>
 #include "global.h"
 
 JUTConsoleManager* JUTConsoleManager::sManager;

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.h>
+#include <stdio>
 
 JUTDbPrint::JUTDbPrint(JUTFont* pFont, JKRHeap* pHeap) {
     mFont = pFont;

src/JSystem/JUtility/JUTDirectFile.cpp

@@ -3,7 +3,7 @@
 #include "JSystem/JUtility/JUTDirectFile.h"
 #include <dolphin/os.h>
 #include "global.h"
-#include <stdint.h>
+#include <stdint>
 
 int JUTDirectFile::fetch32byte() {
 	mToRead = mLength - ALIGN_PREV(mPos, DVD_MIN_TRANSFER_SIZE);

src/JSystem/JUtility/JUTDirectPrint.cpp

@@ -1,7 +1,7 @@
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JUtility/JUTDirectPrint.h"
-#include <stdio.h>
+#include <stdio>
 #include <dolphin/os.h>
 #include "global.h"
 

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.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <math>
+#include <stdio>
+#include <stdlib>
 #include <dolphin/dolphin.h>
-#include <stdint.h>
+#include <stdint>
 
 OSMessageQueue JUTException::sMessageQueue = {0};
 

src/JSystem/JUtility/JUTGamePad.cpp

@@ -1,7 +1,7 @@
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JUtility/JUTGamePad.h"
-#include <math.h>
+#include <math>
 
 u32 JUTGamePad::CRumble::sChannelMask[4] = {
     PAD_CHAN0_BIT,

src/JSystem/JUtility/JUTGraphFifo.cpp

@@ -2,7 +2,7 @@
 
 #include "JSystem/JUtility/JUTGraphFifo.h"
 #include "JSystem/JKernel/JKRHeap.h"
-#include "stdint.h"
+#include <stdint>
 
 static bool data_804514B8;
 

src/JSystem/JUtility/JUTNameTab.cpp

@@ -1,7 +1,7 @@
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JUtility/JUTNameTab.h"
-#include "string.h"
+#include <string>
 
 JUTNameTab::JUTNameTab() {
     setResource(NULL);

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.h>
+#include <stdint>
 
 JUTProcBar::JUTProcBar() {
     mVisible = true;

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.h"
+#include <string>
 
 void* JUTResReference::getResource(JSUInputStream* stream, u32 resType, JKRArchive* archive) {
     stream->read(&mType, 1);

src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/algorithm

@@ -1,9 +1,9 @@
 #ifndef MSL_ALGORITHM_H_
 #define MSL_ALGORITHM_H_
 
-#include <iterator.h>
-#include <string.h>
-#include <functional.h>
+#include <iterator>
+#include <string>
+#include <functional>
 #include "global.h"
 
 namespace std {

src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/bitset

@@ -1,9 +1,9 @@
 #ifndef MSL_BITSET_H_
 #define MSL_BITSET_H_
 
-#include "stdio.h"
-#include "stdlib.h"
-#include "algorithm.h"
+#include <stdio>
+#include <stdlib>
+#include <algorithm>
 
 namespace std {
 // TODO: where does this go?

src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/iterator

@@ -1,7 +1,7 @@
 #ifndef MSL_ITERATOR_H_
 #define MSL_ITERATOR_H_
 
-#include <stddef.h>
+#include <stddef>
 
 namespace std {
 struct input_iterator_tag {};

src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/limits

@@ -1,7 +1,7 @@
 #ifndef _MSL_LIMITS_H
 #define _MSL_LIMITS_H
 
-#include <climits.h>
+#include <climits>
 #include <float.h>
 
 namespace std {

src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/new

@@ -1,7 +1,7 @@
 #ifndef STD_NEW_H_
 #define STD_NEW_H_
 
-#include <stdio.h>
+#include <stdio>
 
 inline void* (operator new)(size_t, void *ptr) { return ptr; }
 

src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/stdint

@@ -1,7 +1,7 @@
 #ifndef MSL_STDINT_H_
 #define MSL_STDINT_H_
 
-#include <cstdint.h>
+#include <cstdint>
 
 #ifdef __cplusplus
     using std::uint8_t;

src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/type_traits

@@ -1,7 +1,7 @@
 #ifndef MSL_TYPE_TRAITS_H_
 #define MSL_TYPE_TRAITS_H_
 
-#include <stddef.h>
+#include <stddef>
 
 namespace std {
     // helper class

src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ansi_files.h

@@ -1,7 +1,7 @@
 #ifndef _MSL_COMMON_ANSI_FILES_H
 #define _MSL_COMMON_ANSI_FILES_H
 
-#include <cstddef.h>
+#include <cstddef>
 
 #ifdef __cplusplus
 extern "C" {

src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/buffer_io.h

@@ -1,7 +1,7 @@
 #ifndef _MSL_COMMON_BUFFER_IO_H
 #define _MSL_COMMON_BUFFER_IO_H
 
-#include <cstdio.h>
+#include <cstdio>
 
 enum { __align_buffer, __dont_align_buffer };
 

src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdarg

@@ -1,6 +1,6 @@
 #ifndef _MSL_CSTDARG_H_
 #define _MSL_CSTDARG_H_
 
-#include <va_list.h>
+#include <va_list>
 
 #endif

src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdio

@@ -6,8 +6,8 @@
 #include <printf.h>
 #include <extras.h>
 #include <scanf.h>
-#include <va_list.h>
-#include <cstddef.h>
+#include <va_list>
+#include <cstddef>
 
 #define stdin (&__files._stdin)
 #define stdout (&__files._stdout)

src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstring

@@ -1,7 +1,7 @@
 #ifndef _MSL_CSTRING_H
 #define _MSL_CSTRING_H
 
-#include <cstddef.h>
+#include <cstddef>
 #include <ansi_files.h>
 #include <extras.h>
 

src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ctype

@@ -34,7 +34,7 @@ extern unsigned char __upper_map[];
 // added underscore to avoid naming conflicts
 inline int _tolower(int c) { return (c == -1 ? -1 : (int)__lower_map[(unsigned char)c]); }
 #else
-#include <locale.h>
+#include <locale>
 
 extern const unsigned char __lower_mapC[0x100];
 extern const unsigned char __upper_mapC[0x100];

src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/extras.h

@@ -1,7 +1,7 @@
 #ifndef _MSL_COMMON_EXTRAS_H
 #define _MSL_COMMON_EXTRAS_H
 
-#include <cstddef.h>
+#include <cstddef>
 
 #ifdef __cplusplus
 extern "C" {

src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/locale

@@ -1,7 +1,7 @@
 #ifndef _MSL_LOCALE_H
 #define _MSL_LOCALE_H
 
-#include <cstddef.h>
+#include <cstddef>
 
 typedef int (*__decode_mbyte) (wchar_t*, const char*,  size_t);
 typedef int (*__encode_mbyte) (char*, wchar_t);

src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/math

@@ -1,7 +1,7 @@
 #ifndef MSL_MATH_H_
 #define MSL_MATH_H_
 
-#include <cmath.h>
+#include <cmath>
 
 namespace std {
 template<typename T>

src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/mem_funcs.h

@@ -1,7 +1,7 @@
 #ifndef _MSL_COMMON_MEM_FUNCS_H
 #define _MSL_COMMON_MEM_FUNCS_H
 
-#include <cstddef.h>
+#include <cstddef>
 
 #ifdef __cplusplus
 extern "C" {

src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/printf.h

@@ -2,7 +2,7 @@
 #define _MSL_COMMON_PRINTF_H
 
 #include <ansi_files.h>
-#include <cstdarg.h>
+#include <cstdarg>
 
 #ifdef __cplusplus
 extern "C" {

src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdarg

@@ -1,7 +1,7 @@
 #ifndef _MSL_STDARG_H_
 #define _MSL_STDARG_H_
 
-#include <cstdarg.h>
+#include <cstdarg>
 
 #ifdef __cplusplus
 extern "C" {