Standardize include guards, clang-format headers

.vscode/extensions.json

@@ -1,6 +1,7 @@
 {
   "recommendations": [
     "ms-vscode.cpptools",
-    "xaver.clang-format"
+    "xaver.clang-format",
+    "akiramiyakoda.cppincludeguard"
   ]
 }

.vscode/settings.json

@@ -14,4 +14,25 @@
   "files.autoSave": "onFocusChange",
   "files.insertFinalNewline": true,
   "files.trimFinalNewlines": true,
+  "C/C++ Include Guard.Macro Type": "Filename",
+  "C/C++ Include Guard.Prefix": "_",
+  "C/C++ Include Guard.Suffix": "",
+  "C/C++ Include Guard.Comment Style": "Line",
+  "C/C++ Include Guard.Subfolder Prefixes": [
+    {
+      "folderPath": "include/dolphin",
+      "prefix": "DOLPHIN_"
+    },
+    {
+      "folderPath": "include/musyx",
+      "prefix": "MUSYX_"
+    },
+    {
+      "folderPath": "include/rstl",
+      "prefix": "RSTL_"
+    }
+  ],
+  "C/C++ Include Guard.Auto Update Path Allowlist": [
+    "include"
+  ],
 }

include/Collision/CCollidableAABox.hpp

@@ -1,5 +1,5 @@
-#ifndef _CCOLLIDABLEAABOX_HPP
-#define _CCOLLIDABLEAABOX_HPP
+#ifndef _CCOLLIDABLEAABOX
+#define _CCOLLIDABLEAABOX
 
 #include "types.h"
 
@@ -24,4 +24,4 @@ private:
 };
 CHECK_SIZEOF(CCollidableAABox, 0x28)
 
-#endif
+#endif // _CCOLLIDABLEAABOX

include/Collision/CCollidableSphere.hpp

@@ -1,5 +1,5 @@
-#ifndef _CCOLLIDABLESPHERE_HPP
-#define _CCOLLIDABLESPHERE_HPP
+#ifndef _CCOLLIDABLESPHERE
+#define _CCOLLIDABLESPHERE
 
 #include "types.h"
 
@@ -24,4 +24,4 @@ private:
 };
 CHECK_SIZEOF(CCollidableSphere, 0x20)
 
-#endif
+#endif // _CCOLLIDABLESPHERE

include/Collision/CCollisionInfo.hpp

@@ -1,5 +1,5 @@
-#ifndef _CCOLLISIONINFO_HPP
-#define _CCOLLISIONINFO_HPP
+#ifndef _CCOLLISIONINFO
+#define _CCOLLISIONINFO
 
 #include "types.h"
 
@@ -15,16 +15,16 @@ public:
     kI_Invalid,
     kI_Valid,
   };
-  enum ESwapMaterials {
-    kSM_Swap
-  };
+  enum ESwapMaterials { kSM_Swap };
 
   CCollisionInfo(EInvalid valid = kI_Invalid);
-  CCollisionInfo(const CVector3f& point, const CMaterialList& leftMat, const CMaterialList& rightMat, const CVector3f& normal);
-  CCollisionInfo(const CVector3f& point, const CMaterialList& leftMat, const CMaterialList& rightMat, const CVector3f& leftNormal,
-                 const CVector3f& rightNormal);
-  CCollisionInfo(const CAABox& aabox, const CMaterialList& leftMat, const CMaterialList& rightMat, const CVector3f& leftNormal,
+  CCollisionInfo(const CVector3f& point, const CMaterialList& leftMat,
+                 const CMaterialList& rightMat, const CVector3f& normal);
+  CCollisionInfo(const CVector3f& point, const CMaterialList& leftMat,
+                 const CMaterialList& rightMat, const CVector3f& leftNormal,
                  const CVector3f& rightNormal);
+  CCollisionInfo(const CAABox& aabox, const CMaterialList& leftMat, const CMaterialList& rightMat,
+                 const CVector3f& leftNormal, const CVector3f& rightNormal);
   CCollisionInfo(const CCollisionInfo& other, ESwapMaterials swap)
   : x0_point(other.x0_point)
   , xc_extentX(other.xc_extentX)
@@ -61,4 +61,4 @@ private:
 };
 CHECK_SIZEOF(CCollisionInfo, 0x60)
 
-#endif
+#endif // _CCOLLISIONINFO

include/Collision/CCollisionPrimitive.hpp

@@ -1,5 +1,5 @@
-#ifndef _CCOLLISIONPRIMITIVE_HPP
-#define _CCOLLISIONPRIMITIVE_HPP
+#ifndef _CCOLLISIONPRIMITIVE
+#define _CCOLLISIONPRIMITIVE
 
 #include "types.h"
 
@@ -33,4 +33,4 @@ CHECK_SIZEOF(CCollisionPrimitive, 0x10)
 
 inline CCollisionPrimitive::~CCollisionPrimitive() {}
 
-#endif
+#endif // _CCOLLISIONPRIMITIVE

include/Collision/CMRay.hpp

@@ -1,5 +1,5 @@
-#ifndef __CMRAY_HPP__
-#define __CMRAY_HPP__
+#ifndef _CMRAY
+#define _CMRAY
 
 #include "Kyoto/Math/CVector3f.hpp"
 
@@ -19,4 +19,4 @@ private:
   CVector3f mDir;
 };
 
-#endif // __CMRAY_HPP__
+#endif // _CMRAY

include/Collision/CMaterialFilter.hpp

@@ -1,5 +1,5 @@
-#ifndef _CMATERIALFILTER_HPP
-#define _CMATERIALFILTER_HPP
+#ifndef _CMATERIALFILTER
+#define _CMATERIALFILTER
 
 #include "types.h"
 
@@ -7,6 +7,7 @@
 
 class CMaterialFilter {
   static const CMaterialFilter skPassEverything;
+
 public:
   enum EFilterType {
     kFT_Always,
@@ -39,4 +40,4 @@ private:
 };
 CHECK_SIZEOF(CMaterialFilter, 0x18)
 
-#endif
+#endif // _CMATERIALFILTER

include/Collision/CMaterialList.hpp

@@ -1,5 +1,5 @@
-#ifndef _CMATERIALLIST_HPP
-#define _CMATERIALLIST_HPP
+#ifndef _CMATERIALLIST
+#define _CMATERIALLIST
 
 #include "types.h"
 
@@ -129,4 +129,4 @@ private:
 };
 CHECK_SIZEOF(CMaterialList, 0x8)
 
-#endif
+#endif // _CMATERIALLIST

include/Collision/COBBox.hpp

@@ -1,5 +1,5 @@
-#ifndef __COBBOX_HPP__
-#define __COBBOX_HPP__
+#ifndef _COBBOX
+#define _COBBOX
 
 #include "Kyoto/Math/CAABox.hpp"
 #include "Kyoto/Math/CTransform4f.hpp"
@@ -19,9 +19,10 @@ public:
   bool LineIntersectsBox(const CMRay& ray, float& penetration) const;
   bool AABoxIntersectsBox(const CAABox& box) const;
   bool OBBIntersectsBox(const COBBox& box) const;
+
 private:
   CTransform4f mTransform;
   CVector3f mExtents;
 };
 
-#endif // __COBBOX_HPP__
+#endif // _COBBOX

include/Collision/CRayCastResult.hpp

@@ -1,5 +1,5 @@
-#ifndef _CRAYCASTRESULT_HPP
-#define _CRAYCASTRESULT_HPP
+#ifndef _CRAYCASTRESULT
+#define _CRAYCASTRESULT
 
 #include "types.h"
 
@@ -33,4 +33,4 @@ private:
 };
 CHECK_SIZEOF(CRayCastResult, 0x30)
 
-#endif
+#endif // _CRAYCASTRESULT

include/GuiSys/CGuiSys.hpp

@@ -1,5 +1,5 @@
-#ifndef _CGUISYS_HPP
-#define _CGUISYS_HPP
+#ifndef _CGUISYS
+#define _CGUISYS
 
 #include "types.h"
 
@@ -31,4 +31,4 @@ private:
   static CGuiSys* spGuiSys;
 };
 
-#endif
+#endif // _CGUISYS

include/Kyoto/Alloc/AllocatorCommon.hpp

@@ -1,8 +1,7 @@
-#ifndef __ALLOCATORCOMMON_HPP__
-#define __ALLOCATORCOMMON_HPP__
-
+#ifndef _ALLOCATORCOMMON
+#define _ALLOCATORCOMMON
 
 static const int kPointerSize = sizeof(void*);
 static const int kPointerBits = kPointerSize * 8;
 
-#endif // __ALLOCATORCOMMON_HPP__
+#endif // _ALLOCATORCOMMON

include/Kyoto/Alloc/CCallStack.hpp

@@ -1,5 +1,5 @@
-#ifndef __CCALLSTACK_HPP__
-#define __CCALLSTACK_HPP__
+#ifndef _CCALLSTACK
+#define _CCALLSTACK
 
 class CCallStack {
 public:
@@ -7,9 +7,10 @@ public:
 
   const char* GetFileAndLineText() const;
   const char* GetTypeText() const;
+
 private:
   const char* x0_line;
   const char* x4_type;
 };
 
-#endif // __CCALLSTACK_HPP__
+#endif // _CCALLSTACK

include/Kyoto/Alloc/CCircularBuffer.hpp

@@ -1,5 +1,5 @@
-#ifndef __CCIRCULARBUFFER_HPP__
-#define __CCIRCULARBUFFER_HPP__
+#ifndef _CCIRCULARBUFFER
+#define _CCIRCULARBUFFER
 
 #include <types.h>
 
@@ -21,4 +21,5 @@ private:
   s32 x10_nextFreeAddr;
   s32 x14_;
 };
-#endif // __CCIRCULARBUFFER_HPP__
+
+#endif // _CCIRCULARBUFFER

include/Kyoto/Alloc/CGameAllocator.hpp

@@ -1,5 +1,5 @@
-#ifndef __CGAMEALLOCATOR_HPP__
-#define __CGAMEALLOCATOR_HPP__
+#ifndef _CGAMEALLOCATOR
+#define _CGAMEALLOCATOR
 
 #include <Kyoto/Alloc/CMediumAllocPool.hpp>
 #include <Kyoto/Alloc/IAllocator.hpp>
@@ -133,4 +133,4 @@ private:
   uint xbc_;
 };
 
-#endif // __CGAMEALLOCATOR_HPP__
+#endif // _CGAMEALLOCATOR

include/Kyoto/Alloc/CMediumAllocPool.hpp

@@ -1,5 +1,5 @@
-#ifndef __CMEDIUMALLOCPOOL_HPP__
-#define __CMEDIUMALLOCPOOL_HPP__
+#ifndef _CMEDIUMALLOCPOOL
+#define _CMEDIUMALLOCPOOL
 
 #include <rstl/list.hpp>
 
@@ -31,4 +31,4 @@ public:
   uint GetNumAllocs();
 };
 
-#endif // __CMEDIUMALLOCPOOL_HPP__
+#endif // _CMEDIUMALLOCPOOL

include/Kyoto/Alloc/CMemory.hpp

@@ -1,5 +1,5 @@
-#ifndef _CMEMORY_HPP
-#define _CMEMORY_HPP
+#ifndef _CMEMORY
+#define _CMEMORY
 
 #include "types.h"
 
@@ -18,4 +18,4 @@ inline void* operator new(size_t n, void* ptr) { return ptr; };
 inline void operator delete(void* ptr) { CMemory::Free(ptr); }
 inline void operator delete[](void* ptr) { CMemory::Free(ptr); }
 
-#endif
+#endif // _CMEMORY

include/Kyoto/Alloc/CSmallAllocPool.hpp

@@ -1,5 +1,5 @@
-#ifndef __CSMALLALLOCPOOL_HPP__
-#define __CSMALLALLOCPOOL_HPP__
+#ifndef _CSMALLALLOCPOOL
+#define _CSMALLALLOCPOOL
 
 #include <types.h>
 
@@ -13,12 +13,17 @@ public:
   bool Free(const void* ptr);
 
   bool PtrWithinPool(const void* ptr) const {
-    return u32((reinterpret_cast< const u8* >(ptr) - reinterpret_cast< u8* >(x0_mainData)) / 4) < x8_numBlocks;
+    return u32((reinterpret_cast< const u8* >(ptr) - reinterpret_cast< u8* >(x0_mainData)) / 4) <
+           x8_numBlocks;
   }
 
-  uint GetIndexFromPtr(const void* ptr) const { return ((const u8*)ptr - x0_mainData) / kPointerSize; }
+  uint GetIndexFromPtr(const void* ptr) const {
+    return ((const u8*)ptr - x0_mainData) / kPointerSize;
+  }
   long GetEntryValue(uint idx) const { return (long)*((u8*)x4_bookKeeping + idx); }
-  u8* GetPtrFromIndex(unsigned int idx) const { return static_cast< u8* >(x0_mainData) + (idx << 3); }
+  u8* GetPtrFromIndex(unsigned int idx) const {
+    return static_cast< u8* >(x0_mainData) + (idx << 3);
+  }
 
   uint GetNumBlocksAvailable() const { return x18_numBlocksAvailable; }
   uint GetTotalEntries() const { return x8_numBlocks; }
@@ -26,7 +31,6 @@ public:
   uint GetNumAllocs() const { return x1c_numAllocs; }
 
 private:
-
   void* x0_mainData;
   void* x4_bookKeeping;
   int x8_numBlocks;
@@ -36,4 +40,5 @@ private:
   uint x18_numBlocksAvailable;
   uint x1c_numAllocs;
 };
-#endif // __CSMALLALLOCPOOL_HPP__
+
+#endif // _CSMALLALLOCPOOL

include/Kyoto/Alloc/IAllocator.hpp

@@ -1,5 +1,5 @@
-#ifndef _IALLOCATOR_HPP
-#define _IALLOCATOR_HPP
+#ifndef _IALLOCATOR
+#define _IALLOCATOR
 
 #include "Kyoto/Alloc/CMemory.hpp"
 #include "types.h"
@@ -95,4 +95,4 @@ public:
   virtual SMetrics GetMetrics() const = 0;
 };
 
-#endif
+#endif // _IALLOCATOR

include/Kyoto/Animation/CPASAnimParmData.hpp

@@ -1,5 +1,5 @@
-#ifndef _CPASANIMPARMDATA_HPP
-#define _CPASANIMPARMDATA_HPP
+#ifndef _CPASANIMPARMDATA
+#define _CPASANIMPARMDATA
 
 #include "Kyoto/Animation/CPASAnimState.hpp"
 
@@ -36,4 +36,4 @@ public:
   }
 };
 
-#endif // _CPASANIMPARMDATA_HPP
+#endif // _CPASANIMPARMDATA

include/Kyoto/Animation/CPASAnimState.hpp

@@ -1,10 +1,10 @@
-#ifndef _CPASANIMSTATE_HPP
-#define _CPASANIMSTATE_HPP
+#ifndef _CPASANIMSTATE
+#define _CPASANIMSTATE
 
 #include "types.h"
 
-#include "rstl/vector.hpp"
 #include "rstl/reserved_vector.hpp"
+#include "rstl/vector.hpp"
 
 namespace pas {
 enum EAnimationState {
@@ -53,8 +53,7 @@ public:
     f32 m_float;
     bool m_bool;
   };
-  CPASAnimParm(const CPASAnimParm& other)
-  : x0_value(other.x0_value), x4_type(other.x4_type) {}
+  CPASAnimParm(const CPASAnimParm& other) : x0_value(other.x0_value), x4_type(other.x4_type) {}
 
   static CPASAnimParm FromEnum(s32 val);
   static CPASAnimParm FromBool(bool val);
@@ -96,6 +95,7 @@ private:
 class CPASAnimState {
 public:
   CPASAnimParm GetAnimParmData(int, unsigned int) const;
+
 private:
   pas::EAnimationState x0_id;
   rstl::vector< CPASParmInfo > x4_parms;
@@ -104,4 +104,4 @@ private:
 };
 CHECK_SIZEOF(CPASAnimState, 0x34)
 
-#endif
+#endif // _CPASANIMSTATE

include/Kyoto/Animation/CPASDatabase.hpp

@@ -1,12 +1,12 @@
-#ifndef _CPASDATABASE_HPP
-#define _CPASDATABASE_HPP
+#ifndef _CPASDATABASE
+#define _CPASDATABASE
 
 #include "types.h"
 
 #include "Kyoto/Animation/CPASAnimState.hpp"
 
-#include "rstl/vector.hpp"
 #include "rstl/pair.hpp"
+#include "rstl/vector.hpp"
 
 class CPASAnimParmData;
 class CRandom16;
@@ -22,4 +22,4 @@ public:
 };
 CHECK_SIZEOF(CPASDatabase, 0x14)
 
-#endif
+#endif // _CPASDATABASE

include/Kyoto/Animation/CSkinnedModel.hpp

@@ -1,5 +1,5 @@
-#ifndef _CSKINNEDMODEL_HPP
-#define _CSKINNEDMODEL_HPP
+#ifndef _CSKINNEDMODEL
+#define _CSKINNEDMODEL
 
 #include "types.h"
 
@@ -11,4 +11,4 @@ private:
   // TODO
 };
 
-#endif
+#endif // _CSKINNEDMODEL

include/Kyoto/Audio/CAudioSys.hpp

@@ -1,5 +1,5 @@
-#ifndef _CAUDIOSYS_HPP
-#define _CAUDIOSYS_HPP
+#ifndef _CAUDIOSYS
+#define _CAUDIOSYS
 
 #include "types.h"
 
@@ -28,4 +28,4 @@ public:
   static const u8 kMaxVolume;
 };
 
-#endif
+#endif // _CAUDIOSYS

include/Kyoto/Audio/CDSPStreamManager.hpp

@@ -1,5 +1,5 @@
-#ifndef _CDSPSTREAMMANAGER_HPP
-#define _CDSPSTREAMMANAGER_HPP
+#ifndef _CDSPSTREAMMANAGER
+#define _CDSPSTREAMMANAGER
 
 #include "types.h"
 
@@ -9,4 +9,4 @@ public:
   static void Shutdown();
 };
 
-#endif
+#endif // _CDSPSTREAMMANAGER

include/Kyoto/Audio/CSfxHandle.hpp

@@ -1,5 +1,5 @@
-#ifndef _CSFXHANDLE_HPP
-#define _CSFXHANDLE_HPP
+#ifndef _CSFXHANDLE
+#define _CSFXHANDLE
 
 #include "types.h"
 
@@ -22,4 +22,4 @@ private:
 };
 CHECK_SIZEOF(CSfxHandle, 0x4)
 
-#endif
+#endif // _CSFXHANDLE

include/Kyoto/Audio/CSfxManager.hpp

@@ -1,5 +1,5 @@
-#ifndef _CSFXMANAGER_HPP
-#define _CSFXMANAGER_HPP
+#ifndef _CSFXMANAGER
+#define _CSFXMANAGER
 
 #include "types.h"
 
@@ -28,8 +28,9 @@ public:
 
   static void PitchBend(CSfxHandle handle, int pitch);
 
-  static CSfxHandle SfxStart(u16 id, u8 vol, u8 pan, bool useAcoustics, s16 prio, bool looped, s32 areaId);
+  static CSfxHandle SfxStart(u16 id, u8 vol, u8 pan, bool useAcoustics, s16 prio, bool looped,
+                             s32 areaId);
   static bool IsPlaying(const CSfxHandle& handle);
 };
 
-#endif
+#endif // _CSFXMANAGER

include/Kyoto/Audio/CStreamAudioManager.hpp

@@ -1,5 +1,5 @@
-#ifndef _CSTREAMAUDIOMANAGER_HPP
-#define _CSTREAMAUDIOMANAGER_HPP
+#ifndef _CSTREAMAUDIOMANAGER
+#define _CSTREAMAUDIOMANAGER
 
 #include "types.h"
 
@@ -12,4 +12,4 @@ public:
 private:
 };
 
-#endif
+#endif // _CSTREAMAUDIOMANAGER

include/Kyoto/Audio/g721.h

@@ -1,5 +1,5 @@
-#ifndef _g721_h
-#define _g721_h
+#ifndef _G721
+#define _G721
 
 struct g72x_state {
   long yl;   /* Locked or steady state step size multiplier. */
@@ -31,4 +31,4 @@ void g72x_init_state(struct g72x_state* state_ptr);
 
 int g721_decoder(int i, struct g72x_state* state_ptr);
 
-#endif
+#endif // _G721

include/Kyoto/Basics/CBasics.hpp

@@ -1,11 +1,11 @@
-#ifndef _CBASICS_HPP
-#define _CBASICS_HPP
+#ifndef _CBASICS
+#define _CBASICS
 
 #include "types.h"
 
 namespace CBasics {
 void Init();
 char* Stringize(const char* fmt, ...);
-};
+}; // namespace CBasics
 
-#endif
+#endif // _CBASICS

include/Kyoto/Basics/CCast.hpp

@@ -1,5 +1,5 @@
-#ifndef __CCAST_HPP__
-#define __CCAST_HPP__
+#ifndef _CCAST
+#define _CCAST
 
 #include "types.h"
 
@@ -43,4 +43,4 @@ inline s16 FtoS(f32 in) { return static_cast< s16 >(in); }
 #endif
 } // namespace CCast
 
-#endif
+#endif // _CCAST

include/Kyoto/Basics/COsContext.hpp

@@ -1,5 +1,5 @@
-#ifndef _COSCONTEXT_HPP
-#define _COSCONTEXT_HPP
+#ifndef _COSCONTEXT
+#define _COSCONTEXT
 
 #include <stddef.h>
 
@@ -21,6 +21,7 @@ public:
 
   bool IsPressed() const { return x4_down; }
   bool JustPressed() const { return x4_unk && x4_down; }
+
 private:
   int x0_key;
   short x4_down : 1;
@@ -51,6 +52,7 @@ public:
 
   static void SetProgressiveMode(bool progressive) { mProgressiveMode = progressive; }
   static bool GetProgressiveMode() { return mProgressiveMode; }
+
 private:
   int x0_right;
   int x4_bottom;
@@ -68,4 +70,4 @@ private:
 };
 CHECK_SIZEOF(COsContext, 0x6c)
 
-#endif
+#endif // _COSCONTEXT

include/Kyoto/Basics/CStopwatch.hpp

@@ -1,5 +1,5 @@
-#ifndef _CSTOPWATCH_HPP
-#define _CSTOPWATCH_HPP
+#ifndef _CSTOPWATCH
+#define _CSTOPWATCH
 
 #include "types.h"
 
@@ -9,10 +9,7 @@ class CStopwatch {
 public:
   class CSWData {
   public:
-    CSWData()
-    : x0_timerFreq(0)
-    , x8_timerFreqO1M(0)
-    , x10_timerPeriod(0.f) {}
+    CSWData() : x0_timerFreq(0), x8_timerFreqO1M(0), x10_timerPeriod(0.f) {}
 
     bool Initialize();
     void Wait(f32) const;
@@ -45,6 +42,7 @@ public:
   }
 
   static void Wait(f32);
+
 private:
   static CSWData mData;
   static CStopwatch mGlobalTimer;
@@ -52,4 +50,4 @@ private:
   s64 x0_startTime;
 };
 
-#endif
+#endif // _CSTOPWATCH

include/Kyoto/Basics/RAssertDolphin.hpp

@@ -1,5 +1,5 @@
-#ifndef _RASSERTDOLPHIN_HPP
-#define _RASSERTDOLPHIN_HPP
+#ifndef _RASSERTDOLPHIN
+#define _RASSERTDOLPHIN
 
 #include "types.h"
 
@@ -9,4 +9,4 @@ void rs_debugger_printf(const char* format, ...);
 void ErrorHandler(OSError code, OSContext* context, int, int);
 void SetErrorHandlers();
 
-#endif
+#endif // _RASSERTDOLPHIN

include/Kyoto/CARAMManager.hpp

@@ -1,5 +1,5 @@
-#ifndef _CARAMMANAGER_HPP
-#define _CARAMMANAGER_HPP
+#ifndef _CARAMMANAGER
+#define _CARAMMANAGER
 
 #include "types.h"
 
@@ -14,4 +14,4 @@ private:
   static u32 mPreInitializeAlloc;
 };
 
-#endif
+#endif // _CARAMMANAGER

include/Kyoto/CARAMToken.hpp

@@ -1,5 +1,5 @@
-#ifndef _CARAMTOKEN_HPP
-#define _CARAMTOKEN_HPP
+#ifndef _CARAMTOKEN
+#define _CARAMTOKEN
 
 #include "types.h"
 
@@ -8,4 +8,4 @@ public:
   static void UpdateAllDMAs();
 };
 
-#endif
+#endif // _CARAMTOKEN

include/Kyoto/CCrc32.hpp

@@ -1,5 +1,5 @@
-#ifndef __CCRC32_HPP__
-#define __CCRC32_HPP__
+#ifndef _CCRC32
+#define _CCRC32
 #include "types.h"
 
 class CCRC32 {
@@ -7,4 +7,4 @@ public:
   static uint Calculate(const void* data, uint length);
 };
 
-#endif // __CCRC32_HPP__
+#endif // _CCRC32

include/Kyoto/CDvdFile.hpp

@@ -1,5 +1,5 @@
-#ifndef _CDVDFILE_HPP
-#define _CDVDFILE_HPP
+#ifndef _CDVDFILE
+#define _CDVDFILE
 
 #include "types.h"
 
@@ -11,4 +11,4 @@ private:
   u8 pad[0x28];
 };
 
-#endif
+#endif // _CDVDFILE

include/Kyoto/CFactoryMgr.hpp

@@ -1,5 +1,5 @@
-#ifndef _CFACTORYMGR_HPP
-#define _CFACTORYMGR_HPP
+#ifndef _CFACTORYMGR
+#define _CFACTORYMGR
 
 #include "types.h"
 
@@ -27,4 +27,4 @@ private:
 CFactoryFnReturn FStringTableFactory(const SObjectTag& tag, CInputStream& in,
                                      const CVParamTransfer& xfer);
 
-#endif
+#endif // _CFACTORYMGR

include/Kyoto/CFrameDelayedKiller.hpp

@@ -1,5 +1,5 @@
-#ifndef _CFRAMEDELAYEDKILLER_HPP
-#define _CFRAMEDELAYEDKILLER_HPP
+#ifndef _CFRAMEDELAYEDKILLER
+#define _CFRAMEDELAYEDKILLER
 
 #include "types.h"
 
@@ -9,4 +9,4 @@ public:
   static void ShutDown();
 };
 
-#endif
+#endif // _CFRAMEDELAYEDKILLER

include/Kyoto/CMemoryCardSys.hpp

@@ -1,5 +1,5 @@
-#ifndef _CMEMORYCARDSYS_HPP
-#define _CMEMORYCARDSYS_HPP
+#ifndef _CMEMORYCARDSYS
+#define _CMEMORYCARDSYS
 
 #include "types.h"
 
@@ -14,4 +14,4 @@ private:
   // TODO
 };
 
-#endif
+#endif // _CMEMORYCARDSYS

include/Kyoto/CMemorySys.hpp

@@ -1,5 +1,5 @@
-#ifndef _CMEMORY_SYS_HPP
-#define _CMEMORY_SYS_HPP
+#ifndef _CMEMORYSYS
+#define _CMEMORYSYS
 
 #include "types.h"
 
@@ -17,4 +17,4 @@ private:
   u8 x0_unk;
 };
 
-#endif
+#endif // _CMEMORYSYS

include/Kyoto/CObjectReference.hpp

@@ -1,5 +1,5 @@
-#ifndef __COBJECTREFERENCE_HPP__
-#define __COBJECTREFERENCE_HPP__
+#ifndef _COBJECTREFERENCE
+#define _COBJECTREFERENCE
 
 #include <Kyoto/CVParamTransfer.hpp>
 #include <Kyoto/SObjectTag.hpp>
@@ -21,6 +21,7 @@ public:
                    CVParamTransfer xfer);
 
   bool IsLoaded() const { return x10_object != nullptr; }
+
 private:
   u16 x0_refCount;
   bool x2_locked : 1;
@@ -30,4 +31,4 @@ private:
   IObj* x10_object;
   CVParamTransfer x14_params;
 };
-#endif // __COBJECTREFERENCE_HPP__
+#endif // _COBJECTREFERENCE

include/Kyoto/CPakFile.hpp

@@ -1,5 +1,5 @@
-#ifndef _CPAKFILE_HPP
-#define _CPAKFILE_HPP
+#ifndef _CPAKFILE
+#define _CPAKFILE
 
 #include "types.h"
 
@@ -35,4 +35,4 @@ private:
   mutable int x84_currentSeek;
 };
 
-#endif
+#endif // _CPAKFILE

include/Kyoto/CRandom16.hpp

@@ -1,5 +1,5 @@
-#ifndef __CRANDOM16_HPP__
-#define __CRANDOM16_HPP__
+#ifndef _CRANDOM16
+#define _CRANDOM16
 
 #include "types.h"
 
@@ -36,4 +36,4 @@ private:
   uint mSeed;
 };
 
-#endif // __CRANDOM16_HPP__
+#endif // _CRANDOM16

include/Kyoto/CResFactory.hpp

@@ -1,5 +1,5 @@
-#ifndef _CRESFACTORY_HPP
-#define _CRESFACTORY_HPP
+#ifndef _CRESFACTORY
+#define _CRESFACTORY
 
 #include "types.h"
 
@@ -52,4 +52,4 @@ CHECK_SIZEOF(CResFactory, 0xc8);
 
 extern CResFactory* gpResourceFactory;
 
-#endif
+#endif // _CRESFACTORY

include/Kyoto/CResLoader.hpp

@@ -1,5 +1,5 @@
-#ifndef _CRESLOADER_HPP
-#define _CRESLOADER_HPP
+#ifndef _CRESLOADER
+#define _CRESLOADER
 
 #include "types.h"
 
@@ -37,4 +37,4 @@ private:
   bool x54_forwardSeek;
 };
 
-#endif
+#endif // _CRESLOADER

include/Kyoto/CSimplePool.hpp

@@ -1,5 +1,5 @@
-#ifndef _CSIMPLEPOOL_HPP
-#define _CSIMPLEPOOL_HPP
+#ifndef _CSIMPLEPOOL
+#define _CSIMPLEPOOL
 
 #include "types.h"
 
@@ -37,4 +37,4 @@ CHECK_SIZEOF(CSimplePool, 0x20)
 
 extern CSimplePool* gpSimplePool;
 
-#endif
+#endif // _CSIMPLEPOOL

include/Kyoto/CTimeProvider.hpp

@@ -1,5 +1,5 @@
-#ifndef __CTIMEPROVIDER_HPP__
-#define __CTIMEPROVIDER_HPP__
+#ifndef _CTIMEPROVIDER
+#define _CTIMEPROVIDER
 
 #include <types.h>
 
@@ -17,4 +17,4 @@ private:
   CTimeProvider* x8_lastProvider;
 };
 
-#endif // __CTIMEPROVIDER_HPP__
+#endif // _CTIMEPROVIDER

include/Kyoto/CToken.hpp

@@ -1,10 +1,10 @@
-#ifndef _CTOKEN_HPP
-#define _CTOKEN_HPP
+#ifndef _CTOKEN
+#define _CTOKEN
 
 #include "types.h"
 
-#include "Kyoto/IObj.hpp"
 #include "Kyoto/CObjectReference.hpp"
+#include "Kyoto/IObj.hpp"
 
 class CObjectReference;
 
@@ -20,9 +20,10 @@ public:
   CObjOwnerDerivedFromIObjUntyped* GetObj();
   void Lock();
   bool IsLoaded() const { return x0_objRef->IsLoaded(); }
+
 private:
   CObjectReference* x0_objRef;
   bool x4_lockHeld;
 };
 
-#endif
+#endif // _CTOKEN

include/Kyoto/CVParamTransfer.hpp

@@ -1,9 +1,10 @@
-#ifndef __CVPARAMTRANSFER_HPP__
-#define __CVPARAMTRANSFER_HPP__
+#ifndef _CVPARAMTRANSFER
+#define _CVPARAMTRANSFER
 
 #include <rstl/rc_ptr.hpp>
 
 class IObj;
+
 class CVParamTransfer {
 public:
   static CVParamTransfer Null();
@@ -12,4 +13,4 @@ private:
   rstl::rc_ptr< unkptr > x0_;
 };
 
-#endif // __CVPARAMTRANSFER_HPP__
+#endif // _CVPARAMTRANSFER

include/Kyoto/Graphics/CColor.hpp

@@ -1,5 +1,5 @@
-#ifndef __CCOLOR_HPP__
-#define __CCOLOR_HPP__
+#ifndef _CCOLOR
+#define _CCOLOR
 
 #include "types.h"
 
@@ -80,4 +80,4 @@ CHECK_SIZEOF(CColor, 0x4)
 #pragma cpp_extensions off
 #endif
 
-#endif // __CCOLOR_HPP__
+#endif // _CCOLOR

include/Kyoto/Graphics/CCubeMaterial.hpp

@@ -1,5 +1,5 @@
-#ifndef _CCUBEMATERIAL_HPP
-#define _CCUBEMATERIAL_HPP
+#ifndef _CCUBEMATERIAL
+#define _CCUBEMATERIAL
 
 #include "types.h"
 
@@ -16,4 +16,4 @@ private:
   static CVector3f sViewingFrom;
 };
 
-#endif
+#endif // _CCUBEMATERIAL

include/Kyoto/Graphics/CGX.hpp

@@ -1,5 +1,5 @@
-#ifndef _CGX_HPP
-#define _CGX_HPP
+#ifndef _CGX
+#define _CGX
 
 #include "types.h"
 
@@ -168,4 +168,4 @@ private:
   static SGXState sGXState;
 };
 
-#endif
+#endif // _CGX

include/Kyoto/Graphics/CGraphics.hpp

@@ -1,5 +1,5 @@
-#ifndef _CGRAPHICS_HPP
-#define _CGRAPHICS_HPP
+#ifndef _CGRAPHICS
+#define _CGRAPHICS
 
 #include "types.h"
 
@@ -65,4 +65,4 @@ private:
   static CTransform4f mModelMatrix;
 };
 
-#endif
+#endif // _CGRAPHICS

include/Kyoto/Graphics/CGraphicsSys.hpp

@@ -1,5 +1,5 @@
-#ifndef _CGRAPHICSSYS_HPP
-#define _CGRAPHICSSYS_HPP
+#ifndef _CGRAPHICSSYS
+#define _CGRAPHICSSYS
 
 #include "types.h"
 
@@ -12,4 +12,4 @@ private:
   uint pad;
 };
 
-#endif
+#endif // _CGRAPHICSSYS

include/Kyoto/Graphics/CLight.hpp

@@ -1,5 +1,5 @@
-#ifndef __CLIGHT_HPP__
-#define __CLIGHT_HPP__
+#ifndef _CLIGHT
+#define _CLIGHT
 
 #include "Kyoto/Graphics/CColor.hpp"
 #include "Kyoto/Math/CVector3f.hpp"
@@ -19,6 +19,7 @@ class CLight {
   static const CVector3f kDefaultDirection;
 
   float CalculateLightRadius() const;
+
 public:
   CLight(ELightType type, const CVector3f& position, const CVector3f& direction,
          const CColor& color, float cutoff);
@@ -79,4 +80,4 @@ private:
 };
 CHECK_SIZEOF(CLight, 0x50)
 
-#endif // __CLIGHT_HPP__
+#endif // _CLIGHT

include/Kyoto/Graphics/CModelFlags.hpp

@@ -1,5 +1,5 @@
-#ifndef _CMODELFLAGS_HPP
-#define _CMODELFLAGS_HPP
+#ifndef _CMODELFLAGS
+#define _CMODELFLAGS
 
 #include "types.h"
 
@@ -104,4 +104,4 @@ private:
 };
 CHECK_SIZEOF(CModelFlags, 0x8)
 
-#endif
+#endif // _CMODELFLAGS

include/Kyoto/Graphics/CTevCombiners.hpp

@@ -1,5 +1,5 @@
-#ifndef _CTEVCOMBINERS_HPP
-#define _CTEVCOMBINERS_HPP
+#ifndef _CTEVCOMBINERS
+#define _CTEVCOMBINERS
 
 #include "types.h"
 
@@ -99,4 +99,4 @@ extern CTevCombiners::CTevPass CTevPass_805a5ebc;
 // TODO move to CGraphics
 extern CTevCombiners::CTevPass* PTR_skPassThru_805a8828;
 
-#endif
+#endif // _CTEVCOMBINERS

include/Kyoto/Graphics/CTexture.hpp

@@ -1,5 +1,5 @@
-#ifndef _CTEXTURE_HPP
-#define _CTEXTURE_HPP
+#ifndef _CTEXTURE
+#define _CTEXTURE
 
 #include "types.h"
 
@@ -29,6 +29,7 @@ public:
 
   s16 GetWidth() const { return mWidth; }
   s16 GetHeight() const { return mHeight; }
+
 private:
   u32 mTexelFormat; // TODO: Enum
   s16 mWidth;
@@ -36,4 +37,4 @@ private:
   u8 pad[0x60];
 };
 
-#endif
+#endif // _CTEXTURE

include/Kyoto/IObj.hpp

@@ -1,5 +1,5 @@
-#ifndef _IOBJ_HPP
-#define _IOBJ_HPP
+#ifndef _IOBJ
+#define _IOBJ
 
 #include "types.h"
 
@@ -45,4 +45,4 @@ private:
   TObjOwnerDerivedFromIObj(const rstl::auto_ptr< T >& obj) : CObjOwnerDerivedFromIObjUntyped(obj) {}
 };
 
-#endif
+#endif // _IOBJ

include/Kyoto/IObjectStore.hpp

@@ -1,7 +1,8 @@
-#ifndef _IOBJECTSTORE_HPP
-#define _IOBJECTSTORE_HPP
+#ifndef _IOBJECTSTORE
+#define _IOBJECTSTORE
 
 #include "types.h"
+
 #include "Kyoto/CToken.hpp"
 
 #include "rstl/auto_ptr.hpp"
@@ -20,4 +21,4 @@ public:
   virtual void ObjectUnreferenced(const SObjectTag& tag) = 0;
 };
 
-#endif
+#endif // _IOBJECTSTORE

include/Kyoto/Input/CControllerAxis.hpp

@@ -1,5 +1,5 @@
-#ifndef __CCONTROLLERAXIS_HPP__
-#define __CCONTROLLERAXIS_HPP__
+#ifndef _CCONTROLLERAXIS
+#define _CCONTROLLERAXIS
 
 class CControllerAxis {
 public:
@@ -14,4 +14,4 @@ public:
   float x4_absolute;
 };
 
-#endif // __CCONTROLLERAXIS_HPP__
+#endif // _CCONTROLLERAXIS

include/Kyoto/Input/CControllerButton.hpp

@@ -1,5 +1,5 @@
-#ifndef __CCONTROLLERBUTTON_HPP__
-#define __CCONTROLLERBUTTON_HPP__
+#ifndef _CCONTROLLERBUTTON
+#define _CCONTROLLERBUTTON
 
 class CControllerButton {
 public:
@@ -17,4 +17,4 @@ private:
   uchar x2_releaseEvent;
 };
 
-#endif // __CCONTROLLERBUTTON_HPP__
+#endif // _CCONTROLLERBUTTON

include/Kyoto/Input/CControllerGamepadData.hpp

@@ -1,5 +1,5 @@
-#ifndef __CCONTROLLERGAMEPADDATA_HPP__
-#define __CCONTROLLERGAMEPADDATA_HPP__
+#ifndef _CCONTROLLERGAMEPADDATA
+#define _CCONTROLLERGAMEPADDATA
 
 #include "Kyoto/Input/CControllerAxis.hpp"
 #include "Kyoto/Input/CControllerButton.hpp"
@@ -28,4 +28,4 @@ private:
   CControllerButton x34_buttons[12];
 };
 
-#endif // __CCONTROLLERGAMEPADDATA_HPP__
+#endif // _CCONTROLLERGAMEPADDATA

include/Kyoto/Input/CDolphinController.hpp

@@ -1,5 +1,5 @@
-#ifndef __CDOLPHINCONTROLLER_HPP__
-#define __CDOLPHINCONTROLLER_HPP__
+#ifndef _CDOLPHINCONTROLLER
+#define _CDOLPHINCONTROLLER
 
 #include "Kyoto/Input/IController.hpp"
 
@@ -38,4 +38,4 @@ private:
   u32 x1cc_;
 };
 
-#endif // __CDOLPHINCONTROLLER_HPP__
+#endif // _CDOLPHINCONTROLLER

include/Kyoto/Input/CFinalInput.hpp

@@ -1,17 +1,19 @@
-#ifndef __CFINALINPUT_HPP__
-#define __CFINALINPUT_HPP__
+#ifndef _CFINALINPUT
+#define _CFINALINPUT
 
 #include <types.h>
+
 #ifdef __MWERKS__
 #pragma cpp_extensions on
 #endif
 
 class CControllerGamepadData;
 class COsContext;
-class CFinalInput {
 
+class CFinalInput {
   static const float kInput_AnalogOnThreshhold;
   static const float kInput_AnalogTriggerOnThreshhold;
+
 public:
   CFinalInput();
   CFinalInput(int channel, float dt, const CControllerGamepadData& data, float leftDif,
@@ -103,4 +105,4 @@ private:
 #pragma cpp_extensions reset
 #endif
 
-#endif // __CFINALINPUT_HPP__
+#endif // _CFINALINPUT

include/Kyoto/Input/CRumbleGenerator.hpp

@@ -1,5 +1,5 @@
-#ifndef _CRUMBLEGENERATOR_HPP
-#define _CRUMBLEGENERATOR_HPP
+#ifndef _CRUMBLEGENERATOR
+#define _CRUMBLEGENERATOR
 
 #include "types.h"
 
@@ -15,4 +15,4 @@ private:
   bool xf0_24_disabled : 1;
 };
 
-#endif
+#endif // _CRUMBLEGENERATOR

include/Kyoto/Input/CRumbleVoice.hpp

@@ -1,5 +1,5 @@
-#ifndef _CRUMBLEVOICE_HPP
-#define _CRUMBLEVOICE_HPP
+#ifndef _CRUMBLEVOICE
+#define _CRUMBLEVOICE
 
 #include "types.h"
 
@@ -93,4 +93,4 @@ private:
   s16 CreateRumbleHandle(u16 idx);
 };
 
-#endif
+#endif // _CRUMBLEVOICE

include/Kyoto/Input/IController.hpp

@@ -1,5 +1,5 @@
-#ifndef __ICONTROLLER_HPP__
-#define __ICONTROLLER_HPP__
+#ifndef _ICONTROLLER
+#define _ICONTROLLER
 
 #include <types.h>
 
@@ -26,4 +26,4 @@ public:
   static IController* Create(const COsContext& ctx);
 };
 
-#endif // __ICONTROLLER_HPP__
+#endif // _ICONTROLLER

include/Kyoto/Input/InputTypes.hpp

@@ -1,5 +1,5 @@
-#ifndef __INPUTTYPES_HPP__
-#define __INPUTTYPES_HPP__
+#ifndef _INPUTTYPES
+#define _INPUTTYPES
 
 #include <dolphin/pad.h>
 
@@ -36,4 +36,4 @@ enum EButton {
 
 enum EAnalogButton { kBA_Left, kBA_Right, kBA_MAX };
 
-#endif // __INPUTTYPES_HPP__
+#endif // _INPUTTYPES

include/Kyoto/Math/CAABox.hpp

@@ -1,5 +1,5 @@
-#ifndef __CAABOX_HPP__
-#define __CAABOX_HPP__
+#ifndef _CAABOX
+#define _CAABOX
 
 #include "Kyoto/Math/CVector3f.hpp"
 
@@ -104,4 +104,4 @@ private:
 };
 CHECK_SIZEOF(CAABox, 0x18)
 
-#endif // __CAABOX_HPP__
+#endif // _CAABOX

include/Kyoto/Math/CAbsAngle.hpp

@@ -1,5 +1,5 @@
-#ifndef _CABSANGLE_HPP
-#define _CABSANGLE_HPP
+#ifndef _CABSANGLE
+#define _CABSANGLE
 
 #include "types.h"
 
@@ -48,4 +48,4 @@ CHECK_SIZEOF(CAbsAngle, 0x4)
 
 static inline f32 cosine(const CAbsAngle& angle) { return cos(angle.AsRadians()); }
 
-#endif
+#endif // _CABSANGLE

include/Kyoto/Math/CFrustumPlanes.hpp

@@ -1,5 +1,5 @@
-#ifndef _CFRUSTUMPLANES_HPP
-#define _CFRUSTUMPLANES_HPP
+#ifndef _CFRUSTUMPLANES
+#define _CFRUSTUMPLANES
 
 #include "types.h"
 
@@ -30,4 +30,4 @@ private:
   rstl::reserved_vector< CPlane, 6 > x0_planes;
 };
 
-#endif
+#endif // _CFRUSTUMPLANES

include/Kyoto/Math/CLine.hpp

@@ -1,5 +1,5 @@
-#ifndef _CLINE_HPP
-#define _CLINE_HPP
+#ifndef _CLINE
+#define _CLINE
 
 #include "types.h"
 
@@ -18,4 +18,4 @@ private:
   CUnitVector3f xc_dir;
 };
 
-#endif
+#endif // _CLINE

include/Kyoto/Math/CLineSeg.hpp

@@ -1,17 +1,16 @@
-#ifndef _CLINESEG_HPP
-#define _CLINESEG_HPP
+#ifndef _CLINESEG
+#define _CLINESEG
 
 #include "types.h"
 
+#include "Kyoto/Math/CLine.hpp"
 #include "Kyoto/Math/CUnitVector3f.hpp"
 #include "Kyoto/Math/CVector3f.hpp"
-#include "Kyoto/Math/CLine.hpp"
 
 class CLineSeg : public CLine {
 public:
   CLineSeg(const CVector3f& start, const CVector3f& end)
-  : CLine(start, (end - start).AsNormalized())
-  , x18_end(end) {}
+  : CLine(start, (end - start).AsNormalized()), x18_end(end) {}
 
   const CVector3f& GetEndPoint() const { return x18_end; }
 
@@ -20,4 +19,4 @@ private:
 };
 CHECK_SIZEOF(CLineSeg, 0x24)
 
-#endif
+#endif // _CLINESEG

include/Kyoto/Math/CMath.hpp

@@ -1,5 +1,5 @@
-#ifndef _CMATH_HPP
-#define _CMATH_HPP
+#ifndef _CMATH
+#define _CMATH
 
 #include "types.h"
 
@@ -73,4 +73,4 @@ public:
   // Swap<f>__5CMathFRfRf weak
 };
 
-#endif
+#endif // _CMATH

include/Kyoto/Math/CMatrix3f.hpp

@@ -1,5 +1,5 @@
-#ifndef _CMATRIX3F_HPP
-#define _CMATRIX3F_HPP
+#ifndef _CMATRIX3F
+#define _CMATRIX3F
 
 #include "types.h"
 
@@ -7,11 +7,13 @@
 
 class CMatrix3f {
   static const CMatrix3f sIdentity;
+
 public:
   CMatrix3f(const CMatrix3f&);
   const CMatrix3f& operator=(const CMatrix3f& other);
 
   static const CMatrix3f& Identity() { return sIdentity; }
+
 private:
   // TODO maybe individual f32s
   CVector3f m0;
@@ -20,4 +22,4 @@ private:
 };
 CHECK_SIZEOF(CMatrix3f, 0x24);
 
-#endif
+#endif // _CMATRIX3F

include/Kyoto/Math/CMatrix4f.hpp

@@ -1,5 +1,5 @@
-#ifndef _CMATRIX4F_HPP
-#define _CMATRIX4F_HPP
+#ifndef _CMATRIX4F
+#define _CMATRIX4F
 
 #include "types.h"
 
@@ -24,4 +24,4 @@ private:
 };
 CHECK_SIZEOF(CMatrix4f, 0x40);
 
-#endif
+#endif // _CMATRIX4F

include/Kyoto/Math/CNUQuaternion.hpp

@@ -1,5 +1,5 @@
-#ifndef _CNUQUATERNION_HPP
-#define _CNUQUATERNION_HPP
+#ifndef _CNUQUATERNION
+#define _CNUQUATERNION
 
 #include "types.h"
 
@@ -10,6 +10,7 @@ public:
 
   static CNUQuaternion BuildFromMatrix3f(const CMatrix3f& matrix);
   static CNUQuaternion BuildFromQuaternion(const CQuaternion& quat);
+
 private:
   f32 w;
   f32 x;
@@ -17,4 +18,4 @@ private:
   f32 z;
 };
 
-#endif
+#endif // _CNUQUATERNION

include/Kyoto/Math/CPlane.hpp

@@ -1,5 +1,5 @@
-#ifndef _CPLANE_HPP
-#define _CPLANE_HPP
+#ifndef _CPLANE
+#define _CPLANE
 
 #include "types.h"
 
@@ -25,4 +25,4 @@ private:
 };
 CHECK_SIZEOF(CPlane, 0x10)
 
-#endif
+#endif // _CPLANE

include/Kyoto/Math/CQuaternion.hpp

@@ -1,5 +1,5 @@
-#ifndef _CQUATERNION_HPP
-#define _CQUATERNION_HPP
+#ifndef _CQUATERNION
+#define _CQUATERNION
 
 #include "types.h"
 
@@ -69,4 +69,4 @@ private:
   static const CQuaternion sNoRotation;
 };
 
-#endif
+#endif // _CQUATERNION

include/Kyoto/Math/CRelAngle.hpp

@@ -1,5 +1,5 @@
-#ifndef _CRELANGLE_HPP
-#define _CRELANGLE_HPP
+#ifndef _CRELANGLE
+#define _CRELANGLE
 
 #include "types.h"
 
@@ -45,4 +45,4 @@ CHECK_SIZEOF(CRelAngle, 0x4)
 // __dv__FRC9CRelAnglef
 // sine__FRC9CRelAngle
 
-#endif
+#endif // _CRELANGLE

include/Kyoto/Math/CSphere.hpp

@@ -1,10 +1,10 @@
-#ifndef _CSPHERE_HPP
-#define _CSPHERE_HPP
+#ifndef _CSPHERE
+#define _CSPHERE
 
 #include "types.h"
 
-#include "Kyoto/Math/CVector3f.hpp"
 #include "Kyoto/Math/CUnitVector3f.hpp"
+#include "Kyoto/Math/CVector3f.hpp"
 
 class CSphere {
 public:
@@ -18,4 +18,4 @@ private:
 };
 CHECK_SIZEOF(CSphere, 0x10)
 
-#endif
+#endif // _CSPHERE

include/Kyoto/Math/CTransform4f.hpp

@@ -1,5 +1,5 @@
-#ifndef __CTRANSFORM4F_HPP__
-#define __CTRANSFORM4F_HPP__
+#ifndef _CTRANSFORM4F
+#define _CTRANSFORM4F
 
 #include "types.h"
 
@@ -115,4 +115,4 @@ inline bool operator==(const CTransform4f& lhs, const CTransform4f& rhs);
 
 CHECK_SIZEOF(CTransform4f, 0x30)
 
-#endif // __CTRANSFORM4F_HPP__
+#endif // _CTRANSFORM4F

include/Kyoto/Math/CTri.hpp

@@ -1,5 +1,5 @@
-#ifndef _CTRI_HPP
-#define _CTRI_HPP
+#ifndef _CTRI
+#define _CTRI
 
 #include "types.h"
 
@@ -24,4 +24,4 @@ private:
 };
 CHECK_SIZEOF(CTri, 0x34)
 
-#endif
+#endif // _CTRI

include/Kyoto/Math/CUnitVector3f.hpp

@@ -1,5 +1,5 @@
-#ifndef _CUNITVECTOR3F_HPP
-#define _CUNITVECTOR3F_HPP
+#ifndef _CUNITVECTOR3F
+#define _CUNITVECTOR3F
 
 #include "types.h"
 
@@ -13,4 +13,4 @@ public:
 };
 CHECK_SIZEOF(CUnitVector3f, 0xc)
 
-#endif
+#endif // _CUNITVECTOR3F

include/Kyoto/Math/CVector2f.hpp

@@ -1,10 +1,11 @@
-#ifndef __CVECTOR2F_HPP__
-#define __CVECTOR2F_HPP__
+#ifndef _CVECTOR2F
+#define _CVECTOR2F
 
 #include "types.h"
 
 class CVector2f {
   static const CVector2f skZeroVector;
+
 public:
   CVector2f(f32 x, f32 y);
   f32 GetX() const { return mX; }
@@ -23,6 +24,7 @@ public:
 
   static float GetAngleDiff(const CVector2f& a, const CVector2f& b);
   static float Dot(const CVector2f& a, const CVector2f& b);
+
 private:
   f32 mX;
   f32 mY;
@@ -35,4 +37,4 @@ CVector2f operator*(const CVector2f& lhs, const float& rhs);
 CVector2f operator*(const float& lhs, const CVector2f& rhs);
 CVector2f operator/(const CVector2f& lhs, const float& rhs);
 
-#endif // __CVECTOR3F_HPP__
+#endif // _CVECTOR2F

include/Kyoto/Math/CVector2i.hpp

@@ -1,5 +1,5 @@
-#ifndef _CVECTOR2I_HPP
-#define _CVECTOR2I_HPP
+#ifndef _CVECTOR2I
+#define _CVECTOR2I
 
 #include "types.h"
 
@@ -9,6 +9,7 @@ public:
 
   int GetX() const { return mX; }
   int GetY() const { return mY; }
+
 private:
   int mX;
   int mY;
@@ -19,4 +20,5 @@ CVector2i operator+(const CVector2i& lhs, const CVector2i& rhs);
 bool operator==(const CVector2i& lhs, const CVector2i& rhs);
 CVector2i operator*(const CVector2i& lhs, int rhs);
 CVector2i operator/(const CVector2i& lhs, int rhs);
-#endif
+
+#endif // _CVECTOR2I

include/Kyoto/Math/CVector3d.hpp

@@ -1,6 +1,5 @@
-#ifndef __CVECTOR3D_HPP__
-#define __CVECTOR3D_HPP__
-
+#ifndef _CVECTOR3D
+#define _CVECTOR3D
 
 #include "Kyoto/Math/CVector3f.hpp"
 
@@ -21,7 +20,6 @@ public:
   static double Dot(const CVector3d& a, const CVector3d& b);
   static CVector3d Cross(const CVector3d& a, const CVector3d& b);
 
-
 private:
   double mX;
   double mY;
@@ -30,4 +28,4 @@ private:
 
 CVector3d operator+(const CVector3d& other);
 
-#endif // __CVECTOR3D_HPP__
+#endif // _CVECTOR3D

include/Kyoto/Math/CVector3f.hpp

@@ -1,5 +1,5 @@
-#ifndef __CVECTOR3F_HPP__
-#define __CVECTOR3F_HPP__
+#ifndef _CVECTOR3F
+#define _CVECTOR3F
 
 #include "types.h"
 
@@ -162,4 +162,4 @@ inline CVector3f operator-(const CVector3f& vec) {
   return CVector3f(-vec.GetX(), -vec.GetY(), -vec.GetZ());
 }
 
-#endif // __CVECTOR3F_HPP__
+#endif // _CVECTOR3F

include/Kyoto/Math/CVector3i.hpp

@@ -1,5 +1,5 @@
-#ifndef __CVECTOR3I_HPP__
-#define __CVECTOR3I_HPP__
+#ifndef _CVECTOR3I
+#define _CVECTOR3I
 
 class CVector3i {
 public:
@@ -11,4 +11,4 @@ private:
   int mZ;
 };
 
-#endif // __CVECTOR3I_HPP__
+#endif // _CVECTOR3I

include/Kyoto/Math/CloseEnough.hpp

@@ -1,5 +1,5 @@
-#ifndef __CLOSEENOUGH_HPP__
-#define __CLOSEENOUGH_HPP__
+#ifndef _CLOSEENOUGH
+#define _CLOSEENOUGH
 
 #include "types.h"
 
@@ -26,4 +26,4 @@ inline bool close_enough(double a, double b, double epsilon = Double::Epsilon())
   return fabs(a - b) < epsilon;
 }
 
-#endif // __CLOSEENOUGH_HPP__
+#endif // _CLOSEENOUGH

include/Kyoto/Particles/CElementGen.hpp

@@ -1,10 +1,10 @@
-#ifndef _CELEMENTGEN_HPP
-#define _CELEMENTGEN_HPP
+#ifndef _CELEMENTGEN
+#define _CELEMENTGEN
 
 #include "types.h"
 
-#include "Kyoto/TToken.hpp"
 #include "Kyoto/Particles/CParticleGen.hpp"
+#include "Kyoto/TToken.hpp"
 
 class CGenDescription;
 
@@ -14,7 +14,8 @@ public:
   enum EOptionalSystemFlags { kOSF_None, kOSF_One, kOSF_Two };
   enum LightType { kLT_None = 0, kLT_Custom = 1, kLT_Directional = 2, kLT_Spot = 3 };
 
-  CElementGen(TToken<CGenDescription>, EModelOrientationType = kMOT_Normal, EOptionalSystemFlags = kOSF_One);
+  CElementGen(TToken< CGenDescription >, EModelOrientationType = kMOT_Normal,
+              EOptionalSystemFlags = kOSF_One);
   ~CElementGen();
 
   virtual void Update(double);
@@ -52,4 +53,4 @@ private:
 };
 CHECK_SIZEOF(CElementGen, 0x340)
 
-#endif
+#endif // _CELEMENTGEN

include/Kyoto/Particles/CGenDescription.hpp

@@ -1,12 +1,13 @@
-#ifndef __CGENDESCRIPTION_HPP__
-#define __CGENDESCRIPTION_HPP__
+#ifndef _CGENDESCRIPTION
+#define _CGENDESCRIPTION
 
 class CGenDescription {
 public:
   CGenDescription();
   ~CGenDescription();
+
 private:
   char data[0x12c];
 };
 
-#endif // __CGENDESCRIPTION_HPP__
+#endif // _CGENDESCRIPTION

include/Kyoto/Particles/CParticleGen.hpp

@@ -1,5 +1,5 @@
-#ifndef _CPARTICLEGEN_HPP
-#define _CPARTICLEGEN_HPP
+#ifndef _CPARTICLEGEN
+#define _CPARTICLEGEN
 
 #include "Kyoto/Graphics/CColor.hpp"
 #include "Kyoto/Graphics/CLight.hpp"
@@ -40,4 +40,4 @@ public:
   virtual uint Get4CharId() const = 0;
 };
 
-#endif // _CPARTICLEGEN_HPP
+#endif // _CPARTICLEGEN

include/Kyoto/Particles/CParticleGlobals.hpp

@@ -1,5 +1,5 @@
-#ifndef __CPARTICLEGLOBALS_HPP__
-#define __CPARTICLEGLOBALS_HPP__
+#ifndef _CPARTICLEGLOBALS
+#define _CPARTICLEGLOBALS
 
 class CParticleGlobals {
 public:
@@ -8,4 +8,4 @@ public:
   static void UpdateParticleLifetimeTweenValues(int time);
 };
 
-#endif // __CPARTICLEGLOBALS_HPP__
+#endif // _CPARTICLEGLOBALS

include/Kyoto/Particles/CWarp.hpp

@@ -1,8 +1,10 @@
-#ifndef __CWARP_HPP__
-#define __CWARP_HPP__
+#ifndef _CWARP
+#define _CWARP
 
 #include "rstl/vector.hpp"
+
 class CParticle;
+
 class CWarp {
 public:
   virtual ~CWarp();
@@ -13,4 +15,4 @@ public:
   virtual int Get4CharID() = 0;
 };
 
-#endif // __CWARP_HPP__
+#endif // _CWARP

include/Kyoto/SObjectTag.hpp

@@ -1,5 +1,5 @@
-#ifndef __SOBJECTTAG_HPP__
-#define __SOBJECTTAG_HPP__
+#ifndef _SOBJECTTAG
+#define _SOBJECTTAG
 
 #define kInvalidAssetId 0xFFFFFFFFu
 
@@ -17,4 +17,4 @@ struct SObjectTag {
   static const char* Type2Text(FourCC type);
 };
 
-#endif
+#endif // _SOBJECTTAG