diff --git a/include/JSystem/J2DGraph/J2DPicture/J2DPicture.h b/include/JSystem/J2DGraph/J2DPicture/J2DPicture.h
index 1355ccc76..ad5188f3f 100644
--- a/include/JSystem/J2DGraph/J2DPicture/J2DPicture.h
+++ b/include/JSystem/J2DGraph/J2DPicture/J2DPicture.h
@@ -1,5 +1,5 @@
-#ifndef __J2DPICTURE_H_
-#define __J2DPICTURE_H_
+#ifndef J2DPICTURE_H_
+#define J2DPICTURE_H_
 
 #include "global.h"
 
diff --git a/include/JSystem/J2DGraph/J2DScreen/J2DScreen.h b/include/JSystem/J2DGraph/J2DScreen/J2DScreen.h
index c917c070f..2aa7891c1 100644
--- a/include/JSystem/J2DGraph/J2DScreen/J2DScreen.h
+++ b/include/JSystem/J2DGraph/J2DScreen/J2DScreen.h
@@ -1,5 +1,5 @@
-#ifndef __J2DSCREEN_H_
-#define __J2DSCREEN_H_
+#ifndef J2DSCREEN_H_
+#define J2DSCREEN_H_
 
 #include "global.h"
 
diff --git a/include/JSystem/J2DGraph/J2DTextBox/J2DTextBox.h b/include/JSystem/J2DGraph/J2DTextBox/J2DTextBox.h
index d5055148f..619ba33c4 100644
--- a/include/JSystem/J2DGraph/J2DTextBox/J2DTextBox.h
+++ b/include/JSystem/J2DGraph/J2DTextBox/J2DTextBox.h
@@ -1,5 +1,5 @@
-#ifndef __J2DTEXTBOX_H_
-#define __J2DTEXTBOX_H_
+#ifndef J2DTEXTBOX_H_
+#define J2DTEXTBOX_H_
 
 #include "global.h"
 
diff --git a/include/JSystem/J3DGraphAnimator/J3DAnimation.h b/include/JSystem/J3DGraphAnimator/J3DAnimation.h
index e8f6f7729..52cd6572c 100644
--- a/include/JSystem/J3DGraphAnimator/J3DAnimation.h
+++ b/include/JSystem/J3DGraphAnimator/J3DAnimation.h
@@ -1,5 +1,5 @@
-#ifndef __J3DANIMATION_H_
-#define __J3DANIMATION_H_
+#ifndef J3DANIMATION_H_
+#define J3DANIMATION_H_
 
 #include "global.h"
 
diff --git a/include/JSystem/JGadget/binary.h b/include/JSystem/JGadget/binary.h
index cec6523e1..8b947587a 100644
--- a/include/JSystem/JGadget/binary.h
+++ b/include/JSystem/JGadget/binary.h
@@ -1,5 +1,5 @@
-#ifndef JSYSTEM_JGADGET_BINARY_H
-#define JSYSTEM_JGADGET_BINARY_H
+#ifndef JSYSTEM_JGADGET_BINARY_H_
+#define JSYSTEM_JGADGET_BINARY_H_
 
 #include "dolphin/types.h"
 
diff --git a/include/JSystem/JGadget/linklist.h b/include/JSystem/JGadget/linklist.h
index 9984a3adc..63e05e34a 100644
--- a/include/JSystem/JGadget/linklist.h
+++ b/include/JSystem/JGadget/linklist.h
@@ -1,5 +1,5 @@
-#ifndef JSYSTEM_JGADGET_LINKLIST_H
-#define JSYSTEM_JGADGET_LINKLIST_H
+#ifndef JSYSTEM_JGADGET_LINKLIST_H_
+#define JSYSTEM_JGADGET_LINKLIST_H_
 
 #include "dolphin/types.h"
 
diff --git a/include/JSystem/JKernel/JKRAram/JKRAram.h b/include/JSystem/JKernel/JKRAram/JKRAram.h
index 59180e497..0663bce48 100644
--- a/include/JSystem/JKernel/JKRAram/JKRAram.h
+++ b/include/JSystem/JKernel/JKRAram/JKRAram.h
@@ -1,5 +1,5 @@
-#ifndef __JKRARAM_H__
-#define __JKRARAM_H__
+#ifndef JKRARAM_H_
+#define JKRARAM_H_
 
 #include "JSystem/JKernel/JKRAramHeap/JKRAramHeap.h"
 #include "JSystem/JKernel/JKRDvdRipper/JKRDvdRipper.h"
diff --git a/include/JSystem/JKernel/JKRAramArchive/JKRAramArchive.h b/include/JSystem/JKernel/JKRAramArchive/JKRAramArchive.h
index b591f8822..2f177df27 100644
--- a/include/JSystem/JKernel/JKRAramArchive/JKRAramArchive.h
+++ b/include/JSystem/JKernel/JKRAramArchive/JKRAramArchive.h
@@ -1,5 +1,5 @@
-#ifndef __JKRARAMARCHIVE_H__
-#define __JKRARAMARCHIVE_H__
+#ifndef JKRARAMARCHIVE_H_
+#define JKRARAMARCHIVE_H_
 
 #include "JSystem/JKernel/JKRArchive/JKRArchive.h"
 #include "dolphin/types.h"
diff --git a/include/JSystem/JKernel/JKRAramBlock/JKRAramBlock.h b/include/JSystem/JKernel/JKRAramBlock/JKRAramBlock.h
index a850898be..97f0c12bc 100644
--- a/include/JSystem/JKernel/JKRAramBlock/JKRAramBlock.h
+++ b/include/JSystem/JKernel/JKRAramBlock/JKRAramBlock.h
@@ -1,5 +1,5 @@
-#ifndef __JKRARAMBLOCK_H__
-#define __JKRARAMBLOCK_H__
+#ifndef JKRARAMBLOCK_H_
+#define JKRARAMBLOCK_H_
 
 #include "JSystem/JSupport/JSUList/JSUList.h"
 #include "dolphin/types.h"
diff --git a/include/JSystem/JKernel/JKRAramHeap/JKRAramHeap.h b/include/JSystem/JKernel/JKRAramHeap/JKRAramHeap.h
index 78b8c892d..04d25469c 100644
--- a/include/JSystem/JKernel/JKRAramHeap/JKRAramHeap.h
+++ b/include/JSystem/JKernel/JKRAramHeap/JKRAramHeap.h
@@ -1,5 +1,5 @@
-#ifndef __JKRARAMHEAP_H__
-#define __JKRARAMHEAP_H__
+#ifndef JKRARAMHEAP_H_
+#define JKRARAMHEAP_H_
 
 #include "JSystem/JKernel/JKRDisposer/JKRDisposer.h"
 #include "dolphin/types.h"
diff --git a/include/JSystem/JKernel/JKRAramPiece/JKRAramPiece.h b/include/JSystem/JKernel/JKRAramPiece/JKRAramPiece.h
index b44b30865..a407f7a55 100644
--- a/include/JSystem/JKernel/JKRAramPiece/JKRAramPiece.h
+++ b/include/JSystem/JKernel/JKRAramPiece/JKRAramPiece.h
@@ -1,5 +1,5 @@
-#ifndef __JKRARAMPIECE_H__
-#define __JKRARAMPIECE_H__
+#ifndef JKRARAMPIECE_H_
+#define JKRARAMPIECE_H_
 
 #include "JSystem/JSupport/JSUList/JSUList.h"
 #include "ar/ARQ.h"
diff --git a/include/JSystem/JKernel/JKRAramStream/JKRAramStream.h b/include/JSystem/JKernel/JKRAramStream/JKRAramStream.h
index 3b8966e88..b34431630 100644
--- a/include/JSystem/JKernel/JKRAramStream/JKRAramStream.h
+++ b/include/JSystem/JKernel/JKRAramStream/JKRAramStream.h
@@ -1,5 +1,5 @@
-#ifndef __JKRARAMSTREAM_H__
-#define __JKRARAMSTREAM_H__
+#ifndef JKRARAMSTREAM_H_
+#define JKRARAMSTREAM_H_
 
 #include "JSystem/JKernel/JKRThread/JKRThread.h"
 #include "JSystem/JSupport/JSUFileInputStream/JSUFileInputStream.h"
diff --git a/include/JSystem/JKernel/JKRArchive/JKRArchive.h b/include/JSystem/JKernel/JKRArchive/JKRArchive.h
index c5333bdbd..36ae93a05 100644
--- a/include/JSystem/JKernel/JKRArchive/JKRArchive.h
+++ b/include/JSystem/JKernel/JKRArchive/JKRArchive.h
@@ -1,5 +1,5 @@
-#ifndef __JKRARCHIVEPUB_H__
-#define __JKRARCHIVEPUB_H__
+#ifndef JKRARCHIVEPUB_H_
+#define JKRARCHIVEPUB_H_
 
 #include "JSystem/JKernel/JKRDecomp/JKRDecomp.h"
 #include "JSystem/JKernel/JKRFileLoader/JKRFileLoader.h"
diff --git a/include/JSystem/JKernel/JKRAssertHeap/JKRAssertHeap.h b/include/JSystem/JKernel/JKRAssertHeap/JKRAssertHeap.h
index c97484f7a..69d762479 100644
--- a/include/JSystem/JKernel/JKRAssertHeap/JKRAssertHeap.h
+++ b/include/JSystem/JKernel/JKRAssertHeap/JKRAssertHeap.h
@@ -1,5 +1,5 @@
-#ifndef __JKRASSERTHEAP_H__
-#define __JKRASSERTHEAP_H__
+#ifndef JKRASSERTHEAP_H_
+#define JKRASSERTHEAP_H_
 
 #include "JSystem/JKernel/JKRHeap/JKRHeap.h"
 #include "dolphin/types.h"
diff --git a/include/JSystem/JKernel/JKRCompArchive/JKRCompArchive.h b/include/JSystem/JKernel/JKRCompArchive/JKRCompArchive.h
index e15ab2647..29e6d9a10 100644
--- a/include/JSystem/JKernel/JKRCompArchive/JKRCompArchive.h
+++ b/include/JSystem/JKernel/JKRCompArchive/JKRCompArchive.h
@@ -1,5 +1,5 @@
-#ifndef __JKRCOMPARCHIVE_H__
-#define __JKRCOMPARCHIVE_H__
+#ifndef JKRCOMPARCHIVE_H_
+#define JKRCOMPARCHIVE_H_
 
 #include "JSystem/JKernel/JKRArchive/JKRArchive.h"
 #include "dolphin/types.h"
diff --git a/include/JSystem/JKernel/JKRCompression.h b/include/JSystem/JKernel/JKRCompression.h
index 9ad850d85..7877fbd7d 100644
--- a/include/JSystem/JKernel/JKRCompression.h
+++ b/include/JSystem/JKernel/JKRCompression.h
@@ -1,5 +1,5 @@
-#ifndef __JKRCOMPREESION_H__
-#define __JKRCOMPREESION_H__
+#ifndef JKRCOMPREESION_H_
+#define JKRCOMPREESION_H_
 
 #include "JSystem/JKernel/SArc.h"
 #include "dolphin/types.h"
diff --git a/include/JSystem/JKernel/JKRDecomp/JKRDecomp.h b/include/JSystem/JKernel/JKRDecomp/JKRDecomp.h
index 593883085..62126a4a4 100644
--- a/include/JSystem/JKernel/JKRDecomp/JKRDecomp.h
+++ b/include/JSystem/JKernel/JKRDecomp/JKRDecomp.h
@@ -1,5 +1,5 @@
-#ifndef __JKRDECOMP_H__
-#define __JKRDECOMP_H__
+#ifndef JKRDECOMP_H_
+#define JKRDECOMP_H_
 
 #include "JSystem/JKernel/JKRCompression.h"
 #include "JSystem/JKernel/JKRThread/JKRThread.h"
diff --git a/include/JSystem/JKernel/JKRDisposer/JKRDisposer.h b/include/JSystem/JKernel/JKRDisposer/JKRDisposer.h
index bd3731717..2f5d10608 100644
--- a/include/JSystem/JKernel/JKRDisposer/JKRDisposer.h
+++ b/include/JSystem/JKernel/JKRDisposer/JKRDisposer.h
@@ -1,5 +1,5 @@
-#ifndef __JKRDISPOSER_H__
-#define __JKRDISPOSER_H__
+#ifndef JKRDISPOSER_H_
+#define JKRDISPOSER_H_
 
 #include "JSystem/JSupport/JSUList/JSUList.h"
 #include "dolphin/types.h"
diff --git a/include/JSystem/JKernel/JKRDvdAramRipper/JKRDvdAramRipper.h b/include/JSystem/JKernel/JKRDvdAramRipper/JKRDvdAramRipper.h
index e90e669ea..9a4af0df9 100644
--- a/include/JSystem/JKernel/JKRDvdAramRipper/JKRDvdAramRipper.h
+++ b/include/JSystem/JKernel/JKRDvdAramRipper/JKRDvdAramRipper.h
@@ -1,5 +1,5 @@
-#ifndef __JKRDVDARAMRIPPER_H__
-#define __JKRDVDARAMRIPPER_H__
+#ifndef JKRDVDARAMRIPPER_H_
+#define JKRDVDARAMRIPPER_H_
 
 #include "JSystem/JKernel/JKRDvdRipper/JKRDvdRipper.h"
 #include "JSystem/JSupport/JSUFileInputStream/JSUFileInputStream.h"
diff --git a/include/JSystem/JKernel/JKRDvdArchive/JKRDvdArchive.h b/include/JSystem/JKernel/JKRDvdArchive/JKRDvdArchive.h
index 8ca3b8620..a9c2d5c5c 100644
--- a/include/JSystem/JKernel/JKRDvdArchive/JKRDvdArchive.h
+++ b/include/JSystem/JKernel/JKRDvdArchive/JKRDvdArchive.h
@@ -1,5 +1,5 @@
-#ifndef __JKRDVDARCHIVE_H__
-#define __JKRDVDARCHIVE_H__
+#ifndef JKRDVDARCHIVE_H_
+#define JKRDVDARCHIVE_H_
 
 #include "JSystem/JKernel/JKRArchive/JKRArchive.h"
 #include "dolphin/types.h"
diff --git a/include/JSystem/JKernel/JKRDvdFile/JKRDvdFile.h b/include/JSystem/JKernel/JKRDvdFile/JKRDvdFile.h
index ae2d03b52..770dd9213 100644
--- a/include/JSystem/JKernel/JKRDvdFile/JKRDvdFile.h
+++ b/include/JSystem/JKernel/JKRDvdFile/JKRDvdFile.h
@@ -1,5 +1,5 @@
-#ifndef __JKRDVDFILE_H__
-#define __JKRDVDFILE_H__
+#ifndef JKRDVDFILE_H_
+#define JKRDVDFILE_H_
 
 #include "JSystem/JKernel/JKRFile/JKRFile.h"
 #include "dolphin/types.h"
diff --git a/include/JSystem/JKernel/JKRDvdRipper/JKRDvdRipper.h b/include/JSystem/JKernel/JKRDvdRipper/JKRDvdRipper.h
index 71a3c9f3c..ac70ed65d 100644
--- a/include/JSystem/JKernel/JKRDvdRipper/JKRDvdRipper.h
+++ b/include/JSystem/JKernel/JKRDvdRipper/JKRDvdRipper.h
@@ -1,5 +1,5 @@
-#ifndef __JKRDVDRIPPER_H__
-#define __JKRDVDRIPPER_H__
+#ifndef JKRDVDRIPPER_H_
+#define JKRDVDRIPPER_H_
 
 #include "JSystem/JKernel/JKRDecomp/JKRDecomp.h"
 #include "dolphin/types.h"
diff --git a/include/JSystem/JKernel/JKRExpHeap/JKRExpHeap.h b/include/JSystem/JKernel/JKRExpHeap/JKRExpHeap.h
index 6486c9f6d..719c77bfb 100644
--- a/include/JSystem/JKernel/JKRExpHeap/JKRExpHeap.h
+++ b/include/JSystem/JKernel/JKRExpHeap/JKRExpHeap.h
@@ -1,5 +1,5 @@
-#ifndef __JKREXPHEAP_H__
-#define __JKREXPHEAP_H__
+#ifndef JKREXPHEAP_H_
+#define JKREXPHEAP_H_
 
 #include "JSystem/JKernel/JKRHeap/JKRHeap.h"
 #include "dolphin/types.h"
diff --git a/include/JSystem/JKernel/JKRFile/JKRFile.h b/include/JSystem/JKernel/JKRFile/JKRFile.h
index 8566139d8..9f08f45d9 100644
--- a/include/JSystem/JKernel/JKRFile/JKRFile.h
+++ b/include/JSystem/JKernel/JKRFile/JKRFile.h
@@ -1,5 +1,5 @@
-#ifndef __JKRFILE_H__
-#define __JKRFILE_H__
+#ifndef JKRFILE_H_
+#define JKRFILE_H_
 
 #include "JSystem/JKernel/JKRDisposer/JKRDisposer.h"
 #include "dolphin/types.h"
diff --git a/include/JSystem/JKernel/JKRFileCache/JKRFileCache.h b/include/JSystem/JKernel/JKRFileCache/JKRFileCache.h
index 7e582c525..a2a8dadd9 100644
--- a/include/JSystem/JKernel/JKRFileCache/JKRFileCache.h
+++ b/include/JSystem/JKernel/JKRFileCache/JKRFileCache.h
@@ -1,5 +1,5 @@
-#ifndef __JKRFILECACHE_H__
-#define __JKRFILECACHE_H__
+#ifndef JKRFILECACHE_H_
+#define JKRFILECACHE_H_
 
 #include "JSystem/JKernel/JKRFileLoader/JKRFileLoader.h"
 #include "dolphin/types.h"
diff --git a/include/JSystem/JKernel/JKRFileFinder/JKRFileFinder.h b/include/JSystem/JKernel/JKRFileFinder/JKRFileFinder.h
index dafbb1e78..27ee4fd37 100644
--- a/include/JSystem/JKernel/JKRFileFinder/JKRFileFinder.h
+++ b/include/JSystem/JKernel/JKRFileFinder/JKRFileFinder.h
@@ -1,5 +1,5 @@
-#ifndef __JKRFILEFINDER_H__
-#define __JKRFILEFINDER_H__
+#ifndef JKRFILEFINDER_H_
+#define JKRFILEFINDER_H_
 
 #include "dolphin/types.h"
 #include "dvd/dvd.h"
diff --git a/include/JSystem/JKernel/JKRFileLoader/JKRFileLoader.h b/include/JSystem/JKernel/JKRFileLoader/JKRFileLoader.h
index 7f09d9b6f..10ba6779c 100644
--- a/include/JSystem/JKernel/JKRFileLoader/JKRFileLoader.h
+++ b/include/JSystem/JKernel/JKRFileLoader/JKRFileLoader.h
@@ -1,5 +1,5 @@
-#ifndef __JKRFILELOADER_H__
-#define __JKRFILELOADER_H__
+#ifndef JKRFILELOADER_H_
+#define JKRFILELOADER_H_
 
 #include "JSystem/JKernel/JKRDisposer/JKRDisposer.h"
 #include "dolphin/types.h"
diff --git a/include/JSystem/JKernel/JKRHeap/JKRHeap.h b/include/JSystem/JKernel/JKRHeap/JKRHeap.h
index 58724932b..3c37e0f24 100644
--- a/include/JSystem/JKernel/JKRHeap/JKRHeap.h
+++ b/include/JSystem/JKernel/JKRHeap/JKRHeap.h
@@ -1,5 +1,5 @@
-#ifndef __JKRHEAP_H__
-#define __JKRHEAP_H__
+#ifndef JKRHEAP_H_
+#define JKRHEAP_H_
 
 #include "JSystem/JKernel/JKRDisposer/JKRDisposer.h"
 #include "dolphin/types.h"
diff --git a/include/JSystem/JKernel/JKRMemArchive/JKRMemArchive.h b/include/JSystem/JKernel/JKRMemArchive/JKRMemArchive.h
index e0bbc859e..3cda450a4 100644
--- a/include/JSystem/JKernel/JKRMemArchive/JKRMemArchive.h
+++ b/include/JSystem/JKernel/JKRMemArchive/JKRMemArchive.h
@@ -1,5 +1,5 @@
-#ifndef __JKRMEMARCHIVE_H__
-#define __JKRMEMARCHIVE_H__
+#ifndef JKRMEMARCHIVE_H_
+#define JKRMEMARCHIVE_H_
 
 #include "JSystem/JKernel/JKRArchive/JKRArchive.h"
 #include "dolphin/types.h"
diff --git a/include/JSystem/JKernel/JKRSolidHeap/JKRSolidHeap.h b/include/JSystem/JKernel/JKRSolidHeap/JKRSolidHeap.h
index bab096891..b7ff5ed41 100644
--- a/include/JSystem/JKernel/JKRSolidHeap/JKRSolidHeap.h
+++ b/include/JSystem/JKernel/JKRSolidHeap/JKRSolidHeap.h
@@ -1,5 +1,5 @@
-#ifndef __JKRSOLIDHEAP_H__
-#define __JKRSOLIDHEAP_H__
+#ifndef JKRSOLIDHEAP_H_
+#define JKRSOLIDHEAP_H_
 
 #include "JSystem/JKernel/JKRHeap/JKRHeap.h"
 #include "dolphin/types.h"
diff --git a/include/JSystem/JKernel/JKRThread/JKRThread.h b/include/JSystem/JKernel/JKRThread/JKRThread.h
index 126825693..daeed1579 100644
--- a/include/JSystem/JKernel/JKRThread/JKRThread.h
+++ b/include/JSystem/JKernel/JKRThread/JKRThread.h
@@ -1,5 +1,5 @@
-#ifndef __JKRTHREAD_H__
-#define __JKRTHREAD_H__
+#ifndef JKRTHREAD_H_
+#define JKRTHREAD_H_
 
 #include "JSystem/JKernel/JKRDisposer/JKRDisposer.h"
 #include "dolphin/types.h"
diff --git a/include/JSystem/JKernel/SArc.h b/include/JSystem/JKernel/SArc.h
index 22ed94253..2ad23f2eb 100644
--- a/include/JSystem/JKernel/SArc.h
+++ b/include/JSystem/JKernel/SArc.h
@@ -1,5 +1,5 @@
-#ifndef __SARC_H__
-#define __SARC_H__
+#ifndef SARC_H_
+#define SARC_H_
 
 #include "dolphin/types.h"
 
diff --git a/include/JSystem/JMath/random.h b/include/JSystem/JMath/random.h
index ae45b427c..16ba20829 100644
--- a/include/JSystem/JMath/random.h
+++ b/include/JSystem/JMath/random.h
@@ -1,5 +1,5 @@
-#ifndef __JSYSTEM_JMATH_RANDOM_H__
-#define __JSYSTEM_JMATH_RANDOM_H__
+#ifndef JSYSTEM_JMATH_RANDOM_H_
+#define JSYSTEM_JMATH_RANDOM_H_
 
 #include "dolphin/types.h"
 
diff --git a/include/JSystem/JMessage/control/control.h b/include/JSystem/JMessage/control/control.h
index 0f4c5c2b0..86545d041 100644
--- a/include/JSystem/JMessage/control/control.h
+++ b/include/JSystem/JMessage/control/control.h
@@ -1,5 +1,5 @@
-#ifndef __CONTROL_H_
-#define __CONTROL_H_
+#ifndef CONTROL_H_
+#define CONTROL_H_
 
 #include "dolphin/types.h"
 
diff --git a/include/JSystem/JStudio/stb.h b/include/JSystem/JStudio/stb.h
index 047bc9710..f3c084a38 100644
--- a/include/JSystem/JStudio/stb.h
+++ b/include/JSystem/JStudio/stb.h
@@ -1,5 +1,5 @@
-#ifndef JSYSTEM_OBJECTID_H
-#define JSYSTEM_OBJECTID_H
+#ifndef JSYSTEM_OBJECTID_H_
+#define JSYSTEM_OBJECTID_H_
 
 #include "JSystem/JGadget/binary.h"
 #include "JSystem/JGadget/linklist.h"
diff --git a/include/JSystem/JSupport/JSUFileInputStream/JSUFileInputStream.h b/include/JSystem/JSupport/JSUFileInputStream/JSUFileInputStream.h
index 6221b56d7..103adcb95 100644
--- a/include/JSystem/JSupport/JSUFileInputStream/JSUFileInputStream.h
+++ b/include/JSystem/JSupport/JSUFileInputStream/JSUFileInputStream.h
@@ -1,5 +1,5 @@
-#ifndef __JSUFILEINPUTSTREAM_H__
-#define __JSUFILEINPUTSTREAM_H__
+#ifndef JSUFILEINPUTSTREAM_H_
+#define JSUFILEINPUTSTREAM_H_
 
 #include "JSystem/JSupport/JSURandomInputStream/JSURandomInputStream.h"
 #include "dolphin/types.h"
diff --git a/include/JSystem/JSupport/JSUInputStream.h b/include/JSystem/JSupport/JSUInputStream.h
index 389c4864b..96f64f858 100644
--- a/include/JSystem/JSupport/JSUInputStream.h
+++ b/include/JSystem/JSupport/JSUInputStream.h
@@ -1,5 +1,5 @@
-#ifndef __JSUINPUTSTREAM_H__
-#define __JSUINPUTSTREAM_H__
+#ifndef JSUINPUTSTREAM_H_
+#define JSUINPUTSTREAM_H_
 
 #include "JSystem/JSupport/JSUIosBase.h"
 #include "dolphin/types.h"
diff --git a/include/JSystem/JSupport/JSUIosBase.h b/include/JSystem/JSupport/JSUIosBase.h
index a39028e24..f0ebcf989 100644
--- a/include/JSystem/JSupport/JSUIosBase.h
+++ b/include/JSystem/JSupport/JSUIosBase.h
@@ -1,5 +1,5 @@
-#ifndef __JSUIOSBASE_H__
-#define __JSUIOSBASE_H__
+#ifndef JSUIOSBASE_H_
+#define JSUIOSBASE_H_
 
 #include "dolphin/types.h"
 
diff --git a/include/JSystem/JSupport/JSUList/JSUList.h b/include/JSystem/JSupport/JSUList/JSUList.h
index bafa94384..8b449aa3d 100644
--- a/include/JSystem/JSupport/JSUList/JSUList.h
+++ b/include/JSystem/JSupport/JSUList/JSUList.h
@@ -1,5 +1,5 @@
-#ifndef __JSULIST_H__
-#define __JSULIST_H__
+#ifndef JSULIST_H_
+#define JSULIST_H_
 
 #include "dolphin/types.h"
 
diff --git a/include/JSystem/JSupport/JSURandomInputStream/JSURandomInputStream.h b/include/JSystem/JSupport/JSURandomInputStream/JSURandomInputStream.h
index b47c400a9..713c72323 100644
--- a/include/JSystem/JSupport/JSURandomInputStream/JSURandomInputStream.h
+++ b/include/JSystem/JSupport/JSURandomInputStream/JSURandomInputStream.h
@@ -1,5 +1,5 @@
-#ifndef __JSURANDOMINPUTSTREAM_H__
-#define __JSURANDOMINPUTSTREAM_H__
+#ifndef JSURANDOMINPUTSTREAM_H_
+#define JSURANDOMINPUTSTREAM_H_
 
 #include "JSystem/JSupport/JSUInputStream.h"
 #include "dolphin/types.h"
diff --git a/include/JSystem/JUtility/JUTFont/JUTFont.h b/include/JSystem/JUtility/JUTFont/JUTFont.h
index c4a0d6f61..e919a8cdb 100644
--- a/include/JSystem/JUtility/JUTFont/JUTFont.h
+++ b/include/JSystem/JUtility/JUTFont/JUTFont.h
@@ -1,5 +1,5 @@
-#ifndef JSYSTEM_JUTILITY_JUTFONT_H
-#define JSYSTEM_JUTILITY_JUTFONT_H
+#ifndef JSYSTEM_JUTILITY_JUTFONT_H_
+#define JSYSTEM_JUTILITY_JUTFONT_H_
 
 #include "global.h"
 #include "gx/GX.h"
diff --git a/include/JSystem/JUtility/JUTGamePad/JUTGamePad.h b/include/JSystem/JUtility/JUTGamePad/JUTGamePad.h
index ec56f569d..fd2aa35f7 100644
--- a/include/JSystem/JUtility/JUTGamePad/JUTGamePad.h
+++ b/include/JSystem/JUtility/JUTGamePad/JUTGamePad.h
@@ -1,5 +1,5 @@
-#ifndef __JSYSTEM_JUTILITY_JUTGAMEPAD__
-#define __JSYSTEM_JUTILITY_JUTGAMEPAD__
+#ifndef JSYSTEM_JUTILITY_JUTGAMEPAD_
+#define JSYSTEM_JUTILITY_JUTGAMEPAD_
 
 #include "JSystem/JKernel/JKRDisposer/JKRDisposer.h"
 #include "JSystem/JSupport/JSUList/JSUList.h"
diff --git a/include/JSystem/JUtility/JUTResFont.h b/include/JSystem/JUtility/JUTResFont.h
index 24bd39c02..4c22898d7 100644
--- a/include/JSystem/JUtility/JUTResFont.h
+++ b/include/JSystem/JUtility/JUTResFont.h
@@ -1,5 +1,5 @@
-#ifndef JSYSTEM_JUTILITY_JUT_RES_FONT
-#define JSYSTEM_JUTILITY_JUT_RES_FONT
+#ifndef JSYSTEM_JUTILITY_JUT_RES_FONT_
+#define JSYSTEM_JUTILITY_JUT_RES_FONT_
 
 #include "JSystem/JKernel/JKRHeap/JKRHeap.h"
 #include "JSystem/JUtility/JUTFont/JUTFont.h"
diff --git a/include/JSystem/JUtility/JUTVideo/JUTVideo.h b/include/JSystem/JUtility/JUTVideo/JUTVideo.h
index 8c47e79da..9f48fec32 100644
--- a/include/JSystem/JUtility/JUTVideo/JUTVideo.h
+++ b/include/JSystem/JUtility/JUTVideo/JUTVideo.h
@@ -1,5 +1,5 @@
-#ifndef __JUTILITY_JUTVIDEO_JUTVIDEO_H__
-#define __JUTILITY_JUTVIDEO_JUTVIDEO_H__
+#ifndef JUTILITY_JUTVIDEO_JUTVIDEO_H_
+#define JUTILITY_JUTVIDEO_JUTVIDEO_H_
 
 #include "gx/GX.h"
 #include "os/OS.h"
diff --git a/include/JSystem/JUtility/JUTXfb/JUTXfb.h b/include/JSystem/JUtility/JUTXfb/JUTXfb.h
index fbfdb7156..3eeb729fe 100644
--- a/include/JSystem/JUtility/JUTXfb/JUTXfb.h
+++ b/include/JSystem/JUtility/JUTXfb/JUTXfb.h
@@ -1,5 +1,5 @@
-#ifndef __JUTILITY_JUTXFB_JUTXFB_H__
-#define __JUTILITY_JUTXFB_JUTXFB_H__
+#ifndef JUTILITY_JUTXFB_JUTXFB_H_
+#define JUTILITY_JUTXFB_JUTXFB_H_
 
 #include "JSystem/JKernel/JKRHeap/JKRHeap.h"
 #include "dolphin/types.h"
diff --git a/include/SComponent/c_API_controller_pad.h b/include/SComponent/c_API_controller_pad.h
index b200ba825..69dc4f0a9 100644
--- a/include/SComponent/c_API_controller_pad.h
+++ b/include/SComponent/c_API_controller_pad.h
@@ -1,5 +1,5 @@
-#ifndef __C_API_CONTROLLER_PAD__
-#define __C_API_CONTROLLER_PAD__
+#ifndef C_API_CONTROLLER_PAD_
+#define C_API_CONTROLLER_PAD_
 
 #include "global.h"
 
diff --git a/include/SComponent/c_API_graphic.h b/include/SComponent/c_API_graphic.h
index addd8ce84..b9efb89bd 100644
--- a/include/SComponent/c_API_graphic.h
+++ b/include/SComponent/c_API_graphic.h
@@ -1,5 +1,5 @@
-#ifndef __C_API_GRAPHIC_H_
-#define __C_API_GRAPHIC_H_
+#ifndef C_API_GRAPHIC_H_
+#define C_API_GRAPHIC_H_
 
 #include "global.h"
 
diff --git a/include/SComponent/c_angle.h b/include/SComponent/c_angle.h
index 09a99e038..3bd70377c 100644
--- a/include/SComponent/c_angle.h
+++ b/include/SComponent/c_angle.h
@@ -1,5 +1,5 @@
-#ifndef __C_ANGLE_H_
-#define __C_ANGLE_H_
+#ifndef C_ANGLE_H_
+#define C_ANGLE_H_
 
 #include "SComponent/c_xyz.h"
 #include "global.h"
diff --git a/include/SComponent/c_bg_s_chk.h b/include/SComponent/c_bg_s_chk.h
index 0d6016e4f..f0f1772b0 100644
--- a/include/SComponent/c_bg_s_chk.h
+++ b/include/SComponent/c_bg_s_chk.h
@@ -1,5 +1,5 @@
-#ifndef __C_BG_S_CHK_H_
-#define __C_BG_S_CHK_H_
+#ifndef C_BG_S_CHK_H_
+#define C_BG_S_CHK_H_
 
 #include "global.h"
 
diff --git a/include/SComponent/c_bg_s_gnd_chk.h b/include/SComponent/c_bg_s_gnd_chk.h
index c0f040685..533416f22 100644
--- a/include/SComponent/c_bg_s_gnd_chk.h
+++ b/include/SComponent/c_bg_s_gnd_chk.h
@@ -1,5 +1,5 @@
-#ifndef __C_BG_S_GND_CHK_H_
-#define __C_BG_S_GND_CHK_H_
+#ifndef C_BG_S_GND_CHK_H_
+#define C_BG_S_GND_CHK_H_
 
 #include "SComponent/c_xyz.h"
 #include "global.h"
diff --git a/include/SComponent/c_bg_s_lin_chk.h b/include/SComponent/c_bg_s_lin_chk.h
index 91e28b3a5..2279cf6f6 100644
--- a/include/SComponent/c_bg_s_lin_chk.h
+++ b/include/SComponent/c_bg_s_lin_chk.h
@@ -1,5 +1,5 @@
-#ifndef __C_BG_S_LIN_CHK_H_
-#define __C_BG_S_LIN_CHK_H_
+#ifndef C_BG_S_LIN_CHK_H_
+#define C_BG_S_LIN_CHK_H_
 
 #include "SComponent/c_xyz.h"
 #include "global.h"
diff --git a/include/SComponent/c_bg_s_shdw_draw.h b/include/SComponent/c_bg_s_shdw_draw.h
index df209720e..a87597bf9 100644
--- a/include/SComponent/c_bg_s_shdw_draw.h
+++ b/include/SComponent/c_bg_s_shdw_draw.h
@@ -1,5 +1,5 @@
-#ifndef __C_BG_S_SHDW_DRAW_H_
-#define __C_BG_S_SHDW_DRAW_H_
+#ifndef C_BG_S_SHDW_DRAW_H_
+#define C_BG_S_SHDW_DRAW_H_
 
 #include "SComponent/c_m3d_g_pla.h"
 #include "SComponent/c_xyz.h"
diff --git a/include/SComponent/c_bg_w.h b/include/SComponent/c_bg_w.h
index 7ac9034b9..ed34c756b 100644
--- a/include/SComponent/c_bg_w.h
+++ b/include/SComponent/c_bg_w.h
@@ -1,5 +1,5 @@
-#ifndef SCOMPONENT_C_BG_W_H
-#define SCOMPONENT_C_BG_W_H
+#ifndef SCOMPONENT_C_BG_W_H_
+#define SCOMPONENT_C_BG_W_H_
 
 #include "global.h"
 
diff --git a/include/SComponent/c_cc_d/c_cc_d.h b/include/SComponent/c_cc_d/c_cc_d.h
index 441dbab97..ff091cff8 100644
--- a/include/SComponent/c_cc_d/c_cc_d.h
+++ b/include/SComponent/c_cc_d/c_cc_d.h
@@ -1,5 +1,5 @@
-#ifndef __C_CC_D_H_
-#define __C_CC_D_H_
+#ifndef C_CC_D_H_
+#define C_CC_D_H_
 
 #include "SComponent/c_m3d/c_m3d.h"
 #include "global.h"
diff --git a/include/SComponent/c_cc_s/c_cc_s.h b/include/SComponent/c_cc_s/c_cc_s.h
index eee254b99..da2704509 100644
--- a/include/SComponent/c_cc_s/c_cc_s.h
+++ b/include/SComponent/c_cc_s/c_cc_s.h
@@ -1,5 +1,5 @@
-#ifndef __C_CC_S_H_
-#define __C_CC_S_H_
+#ifndef C_CC_S_H_
+#define C_CC_S_H_
 
 #include "SComponent/c_cc_d/c_cc_d.h"
 #include "global.h"
diff --git a/include/SComponent/c_lib.h b/include/SComponent/c_lib.h
index 8483ed424..32beae0d3 100644
--- a/include/SComponent/c_lib.h
+++ b/include/SComponent/c_lib.h
@@ -1,5 +1,5 @@
-#ifndef __C_LIB_H_
-#define __C_LIB_H_
+#ifndef C_LIB_H_
+#define C_LIB_H_
 
 #include "SComponent/c_xyz.h"
 #include "global.h"
diff --git a/include/SComponent/c_list.h b/include/SComponent/c_list.h
index 8069ed827..648d34701 100644
--- a/include/SComponent/c_list.h
+++ b/include/SComponent/c_list.h
@@ -1,6 +1,6 @@
 
-#ifndef SCOMPONENT_C_LIST_H
-#define SCOMPONENT_C_LIST_H
+#ifndef SCOMPONENT_C_LIST_H_
+#define SCOMPONENT_C_LIST_H_
 
 #include "SComponent/c_node.h"
 
diff --git a/include/SComponent/c_list_iter.h b/include/SComponent/c_list_iter.h
index a2d0404cf..6a55edc2e 100644
--- a/include/SComponent/c_list_iter.h
+++ b/include/SComponent/c_list_iter.h
@@ -1,6 +1,6 @@
 
-#ifndef SCOMPONENT_C_LIST_ITER_H
-#define SCOMPONENT_C_LIST_ITER_H
+#ifndef SCOMPONENT_C_LIST_ITER_H_
+#define SCOMPONENT_C_LIST_ITER_H_
 
 #include "SComponent/c_list.h"
 #include "SComponent/c_node_iter.h"
diff --git a/include/SComponent/c_m2d.h b/include/SComponent/c_m2d.h
index 5023a29d7..2454f5afb 100644
--- a/include/SComponent/c_m2d.h
+++ b/include/SComponent/c_m2d.h
@@ -1,5 +1,5 @@
-#ifndef __C_M2D_H_
-#define __C_M2D_H_
+#ifndef C_M2D_H_
+#define C_M2D_H_
 
 #include "global.h"
 
diff --git a/include/SComponent/c_m3d.h b/include/SComponent/c_m3d.h
index a9ab86909..c3c56e93a 100644
--- a/include/SComponent/c_m3d.h
+++ b/include/SComponent/c_m3d.h
@@ -1,5 +1,5 @@
-#ifndef __C_M3D_H_
-#define __C_M3D_H_
+#ifndef C_M3D_H_
+#define C_M3D_H_
 
 #include "SComponent/c_m3d_g_aab.h"
 #include "SComponent/c_m3d_g_cps.h"
diff --git a/include/SComponent/c_m3d/c_m3d.h b/include/SComponent/c_m3d/c_m3d.h
index c448bb5e4..622e68a5b 100644
--- a/include/SComponent/c_m3d/c_m3d.h
+++ b/include/SComponent/c_m3d/c_m3d.h
@@ -1,5 +1,5 @@
-#ifndef __C_M3D_H_
-#define __C_M3D_H_
+#ifndef C_M3D_H_
+#define C_M3D_H_
 
 #include "SComponent/c_xyz/c_xyz.h"
 #include "global.h"
diff --git a/include/SComponent/c_m3d_g_aab.h b/include/SComponent/c_m3d_g_aab.h
index 1f3bc776c..d0735f1c1 100644
--- a/include/SComponent/c_m3d_g_aab.h
+++ b/include/SComponent/c_m3d_g_aab.h
@@ -1,5 +1,5 @@
-#ifndef __C_M3D_G_AAB_H_
-#define __C_M3D_G_AAB_H_
+#ifndef C_M3D_G_AAB_H_
+#define C_M3D_G_AAB_H_
 
 #include "SComponent/c_xyz.h"
 #include "global.h"
diff --git a/include/SComponent/c_m3d_g_cir.h b/include/SComponent/c_m3d_g_cir.h
index 8b0b2fa7b..254c9cdb8 100644
--- a/include/SComponent/c_m3d_g_cir.h
+++ b/include/SComponent/c_m3d_g_cir.h
@@ -1,5 +1,5 @@
-#ifndef __C_M3D_G_CIR_H_
-#define __C_M3D_G_CIR_H_
+#ifndef C_M3D_G_CIR_H_
+#define C_M3D_G_CIR_H_
 
 #include "global.h"
 
diff --git a/include/SComponent/c_m3d_g_cps.h b/include/SComponent/c_m3d_g_cps.h
index f7c6070e2..abb3dc975 100644
--- a/include/SComponent/c_m3d_g_cps.h
+++ b/include/SComponent/c_m3d_g_cps.h
@@ -1,5 +1,5 @@
-#ifndef __C_M3D_G_CPS_H_
-#define __C_M3D_G_CPS_H_
+#ifndef C_M3D_G_CPS_H_
+#define C_M3D_G_CPS_H_
 
 #include "SComponent/c_xyz.h"
 #include "global.h"
diff --git a/include/SComponent/c_m3d_g_cyl.h b/include/SComponent/c_m3d_g_cyl.h
index bcf7e2514..47ba855db 100644
--- a/include/SComponent/c_m3d_g_cyl.h
+++ b/include/SComponent/c_m3d_g_cyl.h
@@ -1,5 +1,5 @@
-#ifndef __C_M3D_G_CYL_H_
-#define __C_M3D_G_CYL_H_
+#ifndef C_M3D_G_CYL_H_
+#define C_M3D_G_CYL_H_
 
 #include "SComponent/c_xyz.h"
 #include "global.h"
diff --git a/include/SComponent/c_m3d_g_lin.h b/include/SComponent/c_m3d_g_lin.h
index 830a1b7fd..4c37a9d24 100644
--- a/include/SComponent/c_m3d_g_lin.h
+++ b/include/SComponent/c_m3d_g_lin.h
@@ -1,5 +1,5 @@
-#ifndef __C_M3D_G_LIN_H_
-#define __C_M3D_G_LIN_H_
+#ifndef C_M3D_G_LIN_H_
+#define C_M3D_G_LIN_H_
 
 #include "SComponent/c_xyz.h"
 #include "global.h"
diff --git a/include/SComponent/c_m3d_g_pla.h b/include/SComponent/c_m3d_g_pla.h
index 865080aff..9a7042ab1 100644
--- a/include/SComponent/c_m3d_g_pla.h
+++ b/include/SComponent/c_m3d_g_pla.h
@@ -1,5 +1,5 @@
-#ifndef __C_M3C_G_PLA_H_
-#define __C_M3C_G_PLA_H_
+#ifndef C_M3C_G_PLA_H_
+#define C_M3C_G_PLA_H_
 
 #include "SComponent/c_xyz.h"
 #include "global.h"
diff --git a/include/SComponent/c_m3d_g_sph.h b/include/SComponent/c_m3d_g_sph.h
index f606cb63d..07021ee1d 100644
--- a/include/SComponent/c_m3d_g_sph.h
+++ b/include/SComponent/c_m3d_g_sph.h
@@ -1,5 +1,5 @@
-#ifndef __C_M3D_G_SPH_H_
-#define __C_M3D_G_SPH_H_
+#ifndef C_M3D_G_SPH_H_
+#define C_M3D_G_SPH_H_
 
 #include "SComponent/c_m3d_g_cyl.h"
 #include "SComponent/c_xyz.h"
diff --git a/include/SComponent/c_m3d_g_tri.h b/include/SComponent/c_m3d_g_tri.h
index 1b74ee4d5..c22783ed5 100644
--- a/include/SComponent/c_m3d_g_tri.h
+++ b/include/SComponent/c_m3d_g_tri.h
@@ -1,5 +1,5 @@
-#ifndef __C_M3D_G_TRI_H_
-#define __C_M3D_G_TRI_H_
+#ifndef C_M3D_G_TRI_H_
+#define C_M3D_G_TRI_H_
 
 #include "SComponent/c_m3d_g_cyl.h"
 #include "SComponent/c_m3d_g_pla.h"
diff --git a/include/SComponent/c_malloc.h b/include/SComponent/c_malloc.h
index 498b9164a..3107faae1 100644
--- a/include/SComponent/c_malloc.h
+++ b/include/SComponent/c_malloc.h
@@ -1,5 +1,5 @@
-#ifndef __C_MALLOC_H_
-#define __C_MALLOC_H_
+#ifndef C_MALLOC_H_
+#define C_MALLOC_H_
 
 #include "JSystem/JKernel/JKRHeap/JKRHeap.h"
 #include "global.h"
diff --git a/include/SComponent/c_math.h b/include/SComponent/c_math.h
index 78886d4d3..bf9b94e54 100644
--- a/include/SComponent/c_math.h
+++ b/include/SComponent/c_math.h
@@ -1,5 +1,5 @@
-#ifndef __C_MATH_H_
-#define __C_MATH_H_
+#ifndef C_MATH_H_
+#define C_MATH_H_
 
 #include "global.h"
 
diff --git a/include/SComponent/c_node.h b/include/SComponent/c_node.h
index d2ac01d3b..f120e3ec7 100644
--- a/include/SComponent/c_node.h
+++ b/include/SComponent/c_node.h
@@ -1,6 +1,6 @@
 
-#ifndef SCOMPONENT_C_NODE_H
-#define SCOMPONENT_C_NODE_H
+#ifndef SCOMPONENT_C_NODE_H_
+#define SCOMPONENT_C_NODE_H_
 
 #include "global.h"
 
diff --git a/include/SComponent/c_node_iter.h b/include/SComponent/c_node_iter.h
index 2a5839038..2813803c7 100644
--- a/include/SComponent/c_node_iter.h
+++ b/include/SComponent/c_node_iter.h
@@ -1,6 +1,6 @@
 
-#ifndef SCOMPONENT_C_NODE_ITER_H
-#define SCOMPONENT_C_NODE_ITER_H
+#ifndef SCOMPONENT_C_NODE_ITER_H_
+#define SCOMPONENT_C_NODE_ITER_H_
 
 #include "SComponent/c_node.h"
 
diff --git a/include/SComponent/c_phase.h b/include/SComponent/c_phase.h
index c08ee5b9e..91737ced0 100644
--- a/include/SComponent/c_phase.h
+++ b/include/SComponent/c_phase.h
@@ -1,6 +1,6 @@
 
-#ifndef SCOMPONENT_C_PHASE_H
-#define SCOMPONENT_C_PHASE_H
+#ifndef SCOMPONENT_C_PHASE_H_
+#define SCOMPONENT_C_PHASE_H_
 
 typedef int (*cPhs__Handler)(void*);
 
diff --git a/include/SComponent/c_request.h b/include/SComponent/c_request.h
index fbb5c801d..485c572c2 100644
--- a/include/SComponent/c_request.h
+++ b/include/SComponent/c_request.h
@@ -1,5 +1,5 @@
-#ifndef __C_REQUEST_H_
-#define __C_REQUEST_H_
+#ifndef C_REQUEST_H_
+#define C_REQUEST_H_
 
 #include "f/f_pc/f_pc_base.h"
 #include "global.h"
diff --git a/include/SComponent/c_sxyz.h b/include/SComponent/c_sxyz.h
index d96d57cec..2839bb39a 100644
--- a/include/SComponent/c_sxyz.h
+++ b/include/SComponent/c_sxyz.h
@@ -1,5 +1,5 @@
-#ifndef __C_SXYZ_H_
-#define __C_SXYZ_H_
+#ifndef C_SXYZ_H_
+#define C_SXYZ_H_
 
 #include "global.h"
 
diff --git a/include/SComponent/c_tag.h b/include/SComponent/c_tag.h
index 2e862bd22..8facd1d8c 100644
--- a/include/SComponent/c_tag.h
+++ b/include/SComponent/c_tag.h
@@ -1,6 +1,6 @@
 
-#ifndef SCOMPONENT_C_TAG_H
-#define SCOMPONENT_C_TAG_H
+#ifndef SCOMPONENT_C_TAG_H_
+#define SCOMPONENT_C_TAG_H_
 
 #include "SComponent/c_list.h"
 #include "SComponent/c_node.h"
diff --git a/include/SComponent/c_tag_iter.h b/include/SComponent/c_tag_iter.h
index 5fbe940b4..d179b6916 100644
--- a/include/SComponent/c_tag_iter.h
+++ b/include/SComponent/c_tag_iter.h
@@ -1,6 +1,6 @@
 
-#ifndef SCOMPONENT_C_TAG_ITER_H
-#define SCOMPONENT_C_TAG_ITER_H
+#ifndef SCOMPONENT_C_TAG_ITER_H_
+#define SCOMPONENT_C_TAG_ITER_H_
 
 #include "SComponent/c_node_iter.h"
 #include "SComponent/c_tag.h"
diff --git a/include/SComponent/c_tree.h b/include/SComponent/c_tree.h
index a657f2ecf..e97c6100b 100644
--- a/include/SComponent/c_tree.h
+++ b/include/SComponent/c_tree.h
@@ -1,6 +1,6 @@
 
-#ifndef SCOMPONENT_C_TREE_H
-#define SCOMPONENT_C_TREE_H
+#ifndef SCOMPONENT_C_TREE_H_
+#define SCOMPONENT_C_TREE_H_
 
 #include "SComponent/c_list.h"
 #include "SComponent/c_node.h"
diff --git a/include/SComponent/c_tree_iter.h b/include/SComponent/c_tree_iter.h
index 0c33fb5d1..7cf639ffe 100644
--- a/include/SComponent/c_tree_iter.h
+++ b/include/SComponent/c_tree_iter.h
@@ -1,6 +1,6 @@
 
-#ifndef SCOMPONENT_C_TREE_ITER_H
-#define SCOMPONENT_C_TREE_ITER_H
+#ifndef SCOMPONENT_C_TREE_ITER_H_
+#define SCOMPONENT_C_TREE_ITER_H_
 
 #include "SComponent/c_node_iter.h"
 #include "SComponent/c_tree.h"
diff --git a/include/SComponent/c_xyz.h b/include/SComponent/c_xyz.h
index 57f7a47a8..784100b25 100644
--- a/include/SComponent/c_xyz.h
+++ b/include/SComponent/c_xyz.h
@@ -1,5 +1,5 @@
-#ifndef __C_XYZ_H_
-#define __C_XYZ_H_
+#ifndef C_XYZ_H_
+#define C_XYZ_H_
 
 #include "SComponent/c_math.h"
 #include "global.h"
diff --git a/include/SComponent/c_xyz/c_xyz.h b/include/SComponent/c_xyz/c_xyz.h
index c70f940b4..5b9e18b35 100644
--- a/include/SComponent/c_xyz/c_xyz.h
+++ b/include/SComponent/c_xyz/c_xyz.h
@@ -1,5 +1,5 @@
-#ifndef __C_XYZ_H_
-#define __C_XYZ_H_
+#ifndef C_XYZ_H_
+#define C_XYZ_H_
 #include "global.h"
 
 class cXyz {
diff --git a/include/Z2AudioLib/Z2AudioMgr/Z2AudioMgr.h b/include/Z2AudioLib/Z2AudioMgr/Z2AudioMgr.h
index f708e5639..801690192 100644
--- a/include/Z2AudioLib/Z2AudioMgr/Z2AudioMgr.h
+++ b/include/Z2AudioLib/Z2AudioMgr/Z2AudioMgr.h
@@ -1,5 +1,5 @@
-#ifndef __Z2AUDIOMGR_H__
-#define __Z2AUDIOMGR_H__
+#ifndef Z2AUDIOMGR_H_
+#define Z2AUDIOMGR_H_
 
 extern "C" {
 void Z2AudioMgr_NS_setOutputMode(void*, unsigned long);
diff --git a/include/Z2AudioLib/Z2EnvSeMgr/Z2EnvSeMgr.h b/include/Z2AudioLib/Z2EnvSeMgr/Z2EnvSeMgr.h
index e9de0133e..7dddeba34 100644
--- a/include/Z2AudioLib/Z2EnvSeMgr/Z2EnvSeMgr.h
+++ b/include/Z2AudioLib/Z2EnvSeMgr/Z2EnvSeMgr.h
@@ -1,5 +1,5 @@
-#ifndef __Z2ENVSEMGR_H__
-#define __Z2ENVSEMGR_H__
+#ifndef Z2ENVSEMGR_H_
+#define Z2ENVSEMGR_H_
 
 extern void* lbl_80450B3C;  // Z2EnvSeMgr sInstance
 
diff --git a/include/Z2AudioLib/Z2Param/Z2Param.h b/include/Z2AudioLib/Z2Param/Z2Param.h
index c4f1a5dea..5f78ee807 100644
--- a/include/Z2AudioLib/Z2Param/Z2Param.h
+++ b/include/Z2AudioLib/Z2Param/Z2Param.h
@@ -1,5 +1,5 @@
-#ifndef __Z2PARAM_H__
-#define __Z2PARAM_H__
+#ifndef Z2PARAM_H_
+#define Z2PARAM_H_
 
 #include "dolphin/types.h"
 
diff --git a/include/Z2AudioLib/Z2SoundMgr/Z2SoundMgr.h b/include/Z2AudioLib/Z2SoundMgr/Z2SoundMgr.h
index 93ad7926d..dd0a79327 100644
--- a/include/Z2AudioLib/Z2SoundMgr/Z2SoundMgr.h
+++ b/include/Z2AudioLib/Z2SoundMgr/Z2SoundMgr.h
@@ -1,5 +1,5 @@
-#ifndef __Z2SOUNDMGR_H__
-#define __Z2SOUNDMGR_H__
+#ifndef Z2SOUNDMGR_H_
+#define Z2SOUNDMGR_H_
 
 class Z2SoundMgr;
 
diff --git a/include/ar/AR.h b/include/ar/AR.h
index 8ea72847e..86d8189b0 100644
--- a/include/ar/AR.h
+++ b/include/ar/AR.h
@@ -1,5 +1,5 @@
-#ifndef __AR_H__
-#define __AR_H__
+#ifndef AR_H_
+#define AR_H_
 
 #include "dolphin/types.h"
 
diff --git a/include/ar/ARQ.h b/include/ar/ARQ.h
index e18f8976b..13ea2869e 100644
--- a/include/ar/ARQ.h
+++ b/include/ar/ARQ.h
@@ -1,5 +1,5 @@
-#ifndef __ARQ_H__
-#define __ARQ_H__
+#ifndef ARQ_H_
+#define ARQ_H_
 
 #include "dolphin/types.h"
 
diff --git a/include/d/d_attention/d_attention.h b/include/d/d_attention/d_attention.h
index caf0a2d4f..a7fd8f18b 100644
--- a/include/d/d_attention/d_attention.h
+++ b/include/d/d_attention/d_attention.h
@@ -1,5 +1,5 @@
-#ifndef __D_ATTENTION_H_
-#define __D_ATTENTION_H_
+#ifndef D_ATTENTION_H_
+#define D_ATTENTION_H_
 
 #include "SComponent/c_angle.h"
 #include "SComponent/c_xyz/c_xyz.h"
diff --git a/include/d/d_bg/d_bg_s/d_bg_s.h b/include/d/d_bg/d_bg_s/d_bg_s.h
index b1683a8df..0e591f226 100644
--- a/include/d/d_bg/d_bg_s/d_bg_s.h
+++ b/include/d/d_bg/d_bg_s/d_bg_s.h
@@ -1,5 +1,5 @@
-#ifndef __D_BG_S_H_
-#define __D_BG_S_H_
+#ifndef D_BG_S_H_
+#define D_BG_S_H_
 
 #include "d/d_bg/d_bg_w/d_bg_w_base/d_bg_w_base.h"
 #include "global.h"
diff --git a/include/d/d_bg/d_bg_w/d_bg_w_base/d_bg_w_base.h b/include/d/d_bg/d_bg_w/d_bg_w_base/d_bg_w_base.h
index 887517159..cf5d9f3f1 100644
--- a/include/d/d_bg/d_bg_w/d_bg_w_base/d_bg_w_base.h
+++ b/include/d/d_bg/d_bg_w/d_bg_w_base/d_bg_w_base.h
@@ -1,5 +1,5 @@
-#ifndef __D_BG_W_BASE_H_
-#define __D_BG_W_BASE_H_
+#ifndef D_BG_W_BASE_H_
+#define D_BG_W_BASE_H_
 
 #include "global.h"
 #pragma pack(push, 1)
diff --git a/include/d/d_cc/d_cc_s/d_cc_s.h b/include/d/d_cc/d_cc_s/d_cc_s.h
index b577cdd54..640ee88e0 100644
--- a/include/d/d_cc/d_cc_s/d_cc_s.h
+++ b/include/d/d_cc/d_cc_s/d_cc_s.h
@@ -1,5 +1,5 @@
-#ifndef __D_CC_S_H_
-#define __D_CC_S_H_
+#ifndef D_CC_S_H_
+#define D_CC_S_H_
 
 #include "SComponent/c_cc_s/c_cc_s.h"
 #include "d/d_cc/d_cc_mass_s/d_cc_mass_s.h"
diff --git a/include/d/d_com/d_com_inf_game/d_com_inf_game.h b/include/d/d_com/d_com_inf_game/d_com_inf_game.h
index 0cf015ec7..16acdf252 100644
--- a/include/d/d_com/d_com_inf_game/d_com_inf_game.h
+++ b/include/d/d_com/d_com_inf_game/d_com_inf_game.h
@@ -1,5 +1,5 @@
-#ifndef __D_COM_INF_GAME_H_
-#define __D_COM_INF_GAME_H_
+#ifndef D_COM_INF_GAME_H_
+#define D_COM_INF_GAME_H_
 
 #include "SComponent/c_xyz/c_xyz.h"
 #include "d/d_attention/d_attention.h"
diff --git a/include/d/d_event/d_event/d_event.h b/include/d/d_event/d_event/d_event.h
index d01fa7436..730d06b56 100644
--- a/include/d/d_event/d_event/d_event.h
+++ b/include/d/d_event/d_event/d_event.h
@@ -1,5 +1,5 @@
-#ifndef __D_EVENT_H_
-#define __D_EVENT_H_
+#ifndef D_EVENT_H_
+#define D_EVENT_H_
 
 #include "dolphin/types.h"
 
diff --git a/include/d/d_event/d_event_data/d_event_data.h b/include/d/d_event/d_event_data/d_event_data.h
index 47fbb6c7d..47f4fb326 100644
--- a/include/d/d_event/d_event_data/d_event_data.h
+++ b/include/d/d_event/d_event_data/d_event_data.h
@@ -1,5 +1,5 @@
-#ifndef __D_EVENT_DATA_H_
-#define __D_EVENT_DATA_H_
+#ifndef D_EVENT_DATA_H_
+#define D_EVENT_DATA_H_
 
 #include "global.h"
 
diff --git a/include/d/d_event/d_event_manager/d_event_manager.h b/include/d/d_event/d_event_manager/d_event_manager.h
index 9b2949ba6..a1dcbe905 100644
--- a/include/d/d_event/d_event_manager/d_event_manager.h
+++ b/include/d/d_event/d_event_manager/d_event_manager.h
@@ -1,5 +1,5 @@
-#ifndef __D_EVENT_MANAGER_H_
-#define __D_EVENT_MANAGER_H_
+#ifndef D_EVENT_MANAGER_H_
+#define D_EVENT_MANAGER_H_
 
 #include "d/d_event/d_event_data/d_event_data.h"
 #include "dolphin/types.h"
diff --git a/include/d/d_meter2/d_meter2_info/d_meter2_info.h b/include/d/d_meter2/d_meter2_info/d_meter2_info.h
index 5238aa141..ab0607fc6 100644
--- a/include/d/d_meter2/d_meter2_info/d_meter2_info.h
+++ b/include/d/d_meter2/d_meter2_info/d_meter2_info.h
@@ -1,5 +1,5 @@
-#ifndef __D_METER2_INFO_H_
-#define __D_METER2_INFO_H_
+#ifndef D_METER2_INFO_H_
+#define D_METER2_INFO_H_
 
 #include "JSystem/J2DGraph/J2DPicture/J2DPicture.h"
 #include "JSystem/J2DGraph/J2DScreen/J2DScreen.h"
diff --git a/include/d/d_save/d_save/d_save.h b/include/d/d_save/d_save/d_save.h
index adbe7868d..abefb974a 100644
--- a/include/d/d_save/d_save/d_save.h
+++ b/include/d/d_save/d_save/d_save.h
@@ -1,5 +1,5 @@
-#ifndef __D_SAVE_H_
-#define __D_SAVE_H_
+#ifndef D_SAVE_H_
+#define D_SAVE_H_
 
 #include "SComponent/c_xyz/c_xyz.h"
 #include "d/d_meter2/d_meter2_info/d_meter2_info.h"
diff --git a/include/d/d_save/d_save_init/d_save_init.h b/include/d/d_save/d_save_init/d_save_init.h
index ec2217cee..6f0b76c31 100644
--- a/include/d/d_save/d_save_init/d_save_init.h
+++ b/include/d/d_save/d_save_init/d_save_init.h
@@ -1,5 +1,5 @@
-#ifndef __D_SAVE_INIT_H__
-#define __D_SAVE_INIT_H__
+#ifndef D_SAVE_INIT_H_
+#define D_SAVE_INIT_H_
 
 extern "C" {
 void setInitEventBit();
diff --git a/include/d/d_stage/d_stage.h b/include/d/d_stage/d_stage.h
index c193d5cae..b1f79d000 100644
--- a/include/d/d_stage/d_stage.h
+++ b/include/d/d_stage/d_stage.h
@@ -1,5 +1,5 @@
-#ifndef __D_STAGE_H_
-#define __D_STAGE_H_
+#ifndef D_STAGE_H_
+#define D_STAGE_H_
 #include "global.h"
 
 class stage_arrow_class {};
diff --git a/include/d/d_vibration/d_vibration.h b/include/d/d_vibration/d_vibration.h
index 878cc418a..15e210716 100644
--- a/include/d/d_vibration/d_vibration.h
+++ b/include/d/d_vibration/d_vibration.h
@@ -1,5 +1,5 @@
-#ifndef __D_VIBRATION_H_
-#define __D_VIBRATION_H_
+#ifndef D_VIBRATION_H_
+#define D_VIBRATION_H_
 
 #include "global.h"
 
diff --git a/include/dolphin/types.h b/include/dolphin/types.h
index ae7b607c0..87de0f113 100644
--- a/include/dolphin/types.h
+++ b/include/dolphin/types.h
@@ -1,5 +1,5 @@
-#ifndef __TYPES_H__
-#define __TYPES_H__
+#ifndef TYPES_H_
+#define TYPES_H_
 
 typedef signed char s8;
 typedef signed short s16;
diff --git a/include/dvd/dvd.h b/include/dvd/dvd.h
index 6a973f80a..e88d5709f 100644
--- a/include/dvd/dvd.h
+++ b/include/dvd/dvd.h
@@ -1,5 +1,5 @@
-#ifndef __DVD_H__
-#define __DVD_H__
+#ifndef DVD_H_
+#define DVD_H_
 
 #include "dolphin/types.h"
 
diff --git a/include/f/f_op/f_op_actor_tag.h b/include/f/f_op/f_op_actor_tag.h
index 1a52a62ae..40c4aa325 100644
--- a/include/f/f_op/f_op_actor_tag.h
+++ b/include/f/f_op/f_op_actor_tag.h
@@ -1,5 +1,5 @@
-#ifndef F_OP_ACTOR_TAG_H
-#define F_OP_ACTOR_TAG_H
+#ifndef F_OP_ACTOR_TAG_H_
+#define F_OP_ACTOR_TAG_H_
 
 #include "SComponent/c_tag.h"
 #include "global.h"
diff --git a/include/f/f_pc/f_pc_base.h b/include/f/f_pc/f_pc_base.h
index 5e07fe6bf..667e910c1 100644
--- a/include/f/f_pc/f_pc_base.h
+++ b/include/f/f_pc/f_pc_base.h
@@ -1,6 +1,6 @@
 
-#ifndef F_PC_BASE_H
-#define F_PC_BASE_H
+#ifndef F_PC_BASE_H_
+#define F_PC_BASE_H_
 
 #include "SComponent/c_tag.h"
 #include "global.h"
diff --git a/include/f/f_pc/f_pc_create_iter.h b/include/f/f_pc/f_pc_create_iter.h
index cd8a93c68..daa2cbdbf 100644
--- a/include/f/f_pc/f_pc_create_iter.h
+++ b/include/f/f_pc/f_pc_create_iter.h
@@ -1,6 +1,6 @@
 
-#ifndef F_PC_CREATE_ITER_H
-#define F_PC_CREATE_ITER_H
+#ifndef F_PC_CREATE_ITER_H_
+#define F_PC_CREATE_ITER_H_
 
 #include "SComponent/c_list_iter.h"
 #include "SComponent/c_tag_iter.h"
diff --git a/include/f/f_pc/f_pc_create_req.h b/include/f/f_pc/f_pc_create_req.h
index b81bcb6a3..c39141c0a 100644
--- a/include/f/f_pc/f_pc_create_req.h
+++ b/include/f/f_pc/f_pc_create_req.h
@@ -1,6 +1,6 @@
 
-#ifndef F_PC_CREATE_REQ_H
-#define F_PC_CREATE_REQ_H
+#ifndef F_PC_CREATE_REQ_H_
+#define F_PC_CREATE_REQ_H_
 
 #include "SComponent/c_phase.h"
 #include "SComponent/c_tag.h"
diff --git a/include/f/f_pc/f_pc_create_tag.h b/include/f/f_pc/f_pc_create_tag.h
index 2ecedad58..ec982e166 100644
--- a/include/f/f_pc/f_pc_create_tag.h
+++ b/include/f/f_pc/f_pc_create_tag.h
@@ -1,6 +1,6 @@
 
-#ifndef F_PC_CREATE_TAG_H
-#define F_PC_CREATE_TAG_H
+#ifndef F_PC_CREATE_TAG_H_
+#define F_PC_CREATE_TAG_H_
 
 #include "SComponent/c_tag.h"
 #include "global.h"
diff --git a/include/f/f_pc/f_pc_creator.h b/include/f/f_pc/f_pc_creator.h
index 4f57c584e..ad2dd420d 100644
--- a/include/f/f_pc/f_pc_creator.h
+++ b/include/f/f_pc/f_pc_creator.h
@@ -1,6 +1,6 @@
 
-#ifndef F_PC_CREATOR_H
-#define F_PC_CREATOR_H
+#ifndef F_PC_CREATOR_H_
+#define F_PC_CREATOR_H_
 
 #include "global.h"
 
diff --git a/include/f/f_pc/f_pc_delete_tag.h b/include/f/f_pc/f_pc_delete_tag.h
index 51ce151c6..66e7634fa 100644
--- a/include/f/f_pc/f_pc_delete_tag.h
+++ b/include/f/f_pc/f_pc_delete_tag.h
@@ -1,6 +1,6 @@
 
-#ifndef F_PC_DELETE_TAG_H
-#define F_PC_DELETE_TAG_H
+#ifndef F_PC_DELETE_TAG_H_
+#define F_PC_DELETE_TAG_H_
 
 #include "SComponent/c_tag.h"
 #include "f/f_pc/f_pc_layer.h"
diff --git a/include/f/f_pc/f_pc_deletor.h b/include/f/f_pc/f_pc_deletor.h
index f87d88484..c48d37c34 100644
--- a/include/f/f_pc/f_pc_deletor.h
+++ b/include/f/f_pc/f_pc_deletor.h
@@ -1,6 +1,6 @@
 
-#ifndef F_PC_DELETOR_H
-#define F_PC_DELETOR_H
+#ifndef F_PC_DELETOR_H_
+#define F_PC_DELETOR_H_
 
 #include "f/f_pc/f_pc_base.h"
 
diff --git a/include/f/f_pc/f_pc_draw.h b/include/f/f_pc/f_pc_draw.h
index 603f69ea9..37db6a8df 100644
--- a/include/f/f_pc/f_pc_draw.h
+++ b/include/f/f_pc/f_pc_draw.h
@@ -1,5 +1,5 @@
-#ifndef F_PC_DRAW_H
-#define F_PC_DRAW_H
+#ifndef F_PC_DRAW_H_
+#define F_PC_DRAW_H_
 
 #include "SComponent/c_node_iter.h"
 #include "f/f_pc/f_pc_base.h"
diff --git a/include/f/f_pc/f_pc_draw_priority.h b/include/f/f_pc/f_pc_draw_priority.h
index dcdfe189a..ab925db65 100644
--- a/include/f/f_pc/f_pc_draw_priority.h
+++ b/include/f/f_pc/f_pc_draw_priority.h
@@ -1,6 +1,6 @@
 
-#ifndef F_PC_DRAW_PRIORITY_H
-#define F_PC_DRAW_PRIORITY_H
+#ifndef F_PC_DRAW_PRIORITY_H_
+#define F_PC_DRAW_PRIORITY_H_
 
 #include "global.h"
 
diff --git a/include/f/f_pc/f_pc_executor.h b/include/f/f_pc/f_pc_executor.h
index 839b15506..d8d24b673 100644
--- a/include/f/f_pc/f_pc_executor.h
+++ b/include/f/f_pc/f_pc_executor.h
@@ -1,6 +1,6 @@
 
-#ifndef F_PC_EXECUTOR_H
-#define F_PC_EXECUTOR_H
+#ifndef F_PC_EXECUTOR_H_
+#define F_PC_EXECUTOR_H_
 
 #include "SComponent/c_node_iter.h"
 #include "f/f_pc/f_pc_base.h"
diff --git a/include/f/f_pc/f_pc_fstcreate_req.h b/include/f/f_pc/f_pc_fstcreate_req.h
index adadb40e3..bc9c4524b 100644
--- a/include/f/f_pc/f_pc_fstcreate_req.h
+++ b/include/f/f_pc/f_pc_fstcreate_req.h
@@ -1,5 +1,5 @@
-#ifndef F_PC_FSTCREATE_REQ_H
-#define F_PC_FSTCREATE_REQ_H
+#ifndef F_PC_FSTCREATE_REQ_H_
+#define F_PC_FSTCREATE_REQ_H_
 
 #include "f/f_pc/f_pc_base.h"
 #include "f/f_pc/f_pc_create_req.h"
diff --git a/include/f/f_pc/f_pc_layer.h b/include/f/f_pc/f_pc_layer.h
index 2a89c7ad0..17f3fbcaa 100644
--- a/include/f/f_pc/f_pc_layer.h
+++ b/include/f/f_pc/f_pc_layer.h
@@ -1,6 +1,6 @@
 
-#ifndef F_PC_LAYER_H
-#define F_PC_LAYER_H
+#ifndef F_PC_LAYER_H_
+#define F_PC_LAYER_H_
 
 #include "SComponent/c_node.h"
 #include "SComponent/c_tag.h"
diff --git a/include/f/f_pc/f_pc_layer_iter.h b/include/f/f_pc/f_pc_layer_iter.h
index ecf06d31d..d6c279001 100644
--- a/include/f/f_pc/f_pc_layer_iter.h
+++ b/include/f/f_pc/f_pc_layer_iter.h
@@ -1,5 +1,5 @@
-#ifndef F_PC_LAYER_ITER_H
-#define F_PC_LAYER_ITER_H
+#ifndef F_PC_LAYER_ITER_H_
+#define F_PC_LAYER_ITER_H_
 
 #include "SComponent/c_node_iter.h"
 #include "f/f_pc/f_pc_layer.h"
diff --git a/include/f/f_pc/f_pc_layer_tag.h b/include/f/f_pc/f_pc_layer_tag.h
index df6090415..fab56db93 100644
--- a/include/f/f_pc/f_pc_layer_tag.h
+++ b/include/f/f_pc/f_pc_layer_tag.h
@@ -1,6 +1,6 @@
 
-#ifndef F_PC_LAYER_TAG_H
-#define F_PC_LAYER_TAG_H
+#ifndef F_PC_LAYER_TAG_H_
+#define F_PC_LAYER_TAG_H_
 
 #include "SComponent/c_tag.h"
 #include "f/f_pc/f_pc_layer.h"
diff --git a/include/f/f_pc/f_pc_leaf.h b/include/f/f_pc/f_pc_leaf.h
index 717ced9db..6f25fee3a 100644
--- a/include/f/f_pc/f_pc_leaf.h
+++ b/include/f/f_pc/f_pc_leaf.h
@@ -1,6 +1,6 @@
 
-#ifndef F_PC_LEAF_H
-#define F_PC_LEAF_H
+#ifndef F_PC_LEAF_H_
+#define F_PC_LEAF_H_
 
 #include "f/f_pc/f_pc_base.h"
 #include "f/f_pc/f_pc_draw_priority.h"
diff --git a/include/f/f_pc/f_pc_line.h b/include/f/f_pc/f_pc_line.h
index e1f3a59cc..240c8412c 100644
--- a/include/f/f_pc/f_pc_line.h
+++ b/include/f/f_pc/f_pc_line.h
@@ -1,5 +1,5 @@
-#ifndef F_PC_LINE_H
-#define F_PC_LINE_H
+#ifndef F_PC_LINE_H_
+#define F_PC_LINE_H_
 
 extern "C" {
 
diff --git a/include/f/f_pc/f_pc_line_iter.h b/include/f/f_pc/f_pc_line_iter.h
index 5fe61af25..11d22b0c4 100644
--- a/include/f/f_pc/f_pc_line_iter.h
+++ b/include/f/f_pc/f_pc_line_iter.h
@@ -1,6 +1,6 @@
 
-#ifndef F_PC_LINE_ITER_H
-#define F_PC_LINE_ITER_H
+#ifndef F_PC_LINE_ITER_H_
+#define F_PC_LINE_ITER_H_
 
 #include "SComponent/c_node_iter.h"
 
diff --git a/include/f/f_pc/f_pc_line_tag.h b/include/f/f_pc/f_pc_line_tag.h
index df229b0ab..c3f75057d 100644
--- a/include/f/f_pc/f_pc_line_tag.h
+++ b/include/f/f_pc/f_pc_line_tag.h
@@ -1,6 +1,6 @@
 
-#ifndef F_PC_LINE_TAG_H
-#define F_PC_LINE_TAG_H
+#ifndef F_PC_LINE_TAG_H_
+#define F_PC_LINE_TAG_H_
 
 #include "SComponent/c_tag.h"
 #include "global.h"
diff --git a/include/f/f_pc/f_pc_load.h b/include/f/f_pc/f_pc_load.h
index 156b18251..2ebb31a7b 100644
--- a/include/f/f_pc/f_pc_load.h
+++ b/include/f/f_pc/f_pc_load.h
@@ -1,6 +1,6 @@
 
-#ifndef F_PC_LOAD_H
-#define F_PC_LOAD_H
+#ifndef F_PC_LOAD_H_
+#define F_PC_LOAD_H_
 
 #include "global.h"
 
diff --git a/include/f/f_pc/f_pc_manager.h b/include/f/f_pc/f_pc_manager.h
index 54ee0a14e..311fec586 100644
--- a/include/f/f_pc/f_pc_manager.h
+++ b/include/f/f_pc/f_pc_manager.h
@@ -1,5 +1,5 @@
-#ifndef F_PC_MANAGER_H
-#define F_PC_MANAGER_H
+#ifndef F_PC_MANAGER_H_
+#define F_PC_MANAGER_H_
 
 #include "SComponent/c_node_iter.h"
 #include "SComponent/c_tag.h"
diff --git a/include/f/f_pc/f_pc_method.h b/include/f/f_pc/f_pc_method.h
index 9eccf4e79..7ee5cac14 100644
--- a/include/f/f_pc/f_pc_method.h
+++ b/include/f/f_pc/f_pc_method.h
@@ -1,6 +1,6 @@
 
-#ifndef F_PC_METHOD_H
-#define F_PC_METHOD_H
+#ifndef F_PC_METHOD_H_
+#define F_PC_METHOD_H_
 
 #include "global.h"
 
diff --git a/include/f/f_pc/f_pc_method_iter.h b/include/f/f_pc/f_pc_method_iter.h
index 50543bb8f..083424dc1 100644
--- a/include/f/f_pc/f_pc_method_iter.h
+++ b/include/f/f_pc/f_pc_method_iter.h
@@ -1,6 +1,6 @@
 
-#ifndef F_PC_METHOD_ITER_H
-#define F_PC_METHOD_ITER_H
+#ifndef F_PC_METHOD_ITER_H_
+#define F_PC_METHOD_ITER_H_
 
 #include "SComponent/c_list_iter.h"
 #include "global.h"
diff --git a/include/f/f_pc/f_pc_method_tag.h b/include/f/f_pc/f_pc_method_tag.h
index 7104329c8..dcb4af3d9 100644
--- a/include/f/f_pc/f_pc_method_tag.h
+++ b/include/f/f_pc/f_pc_method_tag.h
@@ -1,6 +1,6 @@
 
-#ifndef F_PC_METHOD_TAG_H
-#define F_PC_METHOD_TAG_H
+#ifndef F_PC_METHOD_TAG_H_
+#define F_PC_METHOD_TAG_H_
 
 #include "SComponent/c_tag.h"
 #include "global.h"
diff --git a/include/f/f_pc/f_pc_node.h b/include/f/f_pc/f_pc_node.h
index 6f63e3ac1..b5d1eb14e 100644
--- a/include/f/f_pc/f_pc_node.h
+++ b/include/f/f_pc/f_pc_node.h
@@ -1,6 +1,6 @@
 
-#ifndef F_PC_NODE_H
-#define F_PC_NODE_H
+#ifndef F_PC_NODE_H_
+#define F_PC_NODE_H_
 
 #include "f/f_pc/f_pc_base.h"
 #include "f/f_pc/f_pc_layer.h"
diff --git a/include/f/f_pc/f_pc_node_req.h b/include/f/f_pc/f_pc_node_req.h
index c4710a924..e40a628b0 100644
--- a/include/f/f_pc/f_pc_node_req.h
+++ b/include/f/f_pc/f_pc_node_req.h
@@ -1,5 +1,5 @@
-#ifndef F_PC_NODE_REQ_H
-#define F_PC_NODE_REQ_H
+#ifndef F_PC_NODE_REQ_H_
+#define F_PC_NODE_REQ_H_
 
 #include "SComponent/c_phase.h"
 #include "f/f_pc/f_pc_method.h"
diff --git a/include/f/f_pc/f_pc_pause.h b/include/f/f_pc/f_pc_pause.h
index 2d22e3de8..66867875d 100644
--- a/include/f/f_pc/f_pc_pause.h
+++ b/include/f/f_pc/f_pc_pause.h
@@ -1,5 +1,5 @@
-#ifndef F_PC_PAUSE
-#define F_PC_PAUSE
+#ifndef F_PC_PAUSE_
+#define F_PC_PAUSE_
 
 #include "f/f_pc/f_pc_base.h"
 #include "f/f_pc/f_pc_node.h"
diff --git a/include/f/f_pc/f_pc_priority.h b/include/f/f_pc/f_pc_priority.h
index f1093404a..c47e178d0 100644
--- a/include/f/f_pc/f_pc_priority.h
+++ b/include/f/f_pc/f_pc_priority.h
@@ -1,6 +1,6 @@
 
-#ifndef F_PC_PRIORITY_H
-#define F_PC_PRIORITY_H
+#ifndef F_PC_PRIORITY_H_
+#define F_PC_PRIORITY_H_
 
 #include "SComponent/c_tag.h"
 #include "f/f_pc/f_pc_method_tag.h"
diff --git a/include/f/f_pc/f_pc_profile.h b/include/f/f_pc/f_pc_profile.h
index f7fdb7c4e..3baf6773d 100644
--- a/include/f/f_pc/f_pc_profile.h
+++ b/include/f/f_pc/f_pc_profile.h
@@ -1,6 +1,6 @@
 
-#ifndef F_PC_PROFILE_H
-#define F_PC_PROFILE_H
+#ifndef F_PC_PROFILE_H_
+#define F_PC_PROFILE_H_
 
 #include "f/f_pc/f_pc_method.h"
 #include "global.h"
diff --git a/include/f/f_pc/f_pc_searcher.h b/include/f/f_pc/f_pc_searcher.h
index 3191c2156..30f743b3f 100644
--- a/include/f/f_pc/f_pc_searcher.h
+++ b/include/f/f_pc/f_pc_searcher.h
@@ -1,6 +1,6 @@
 
-#ifndef F_PC_SEARCHER_H
-#define F_PC_SEARCHER_H
+#ifndef F_PC_SEARCHER_H_
+#define F_PC_SEARCHER_H_
 
 #include "f/f_pc/f_pc_base.h"
 #include "global.h"
diff --git a/include/f/f_pc/f_pc_stdcreate_req.h b/include/f/f_pc/f_pc_stdcreate_req.h
index d6255219d..7358aaffa 100644
--- a/include/f/f_pc/f_pc_stdcreate_req.h
+++ b/include/f/f_pc/f_pc_stdcreate_req.h
@@ -1,5 +1,5 @@
-#ifndef F_PC_STDCREATE_H
-#define F_PC_STDCREATE_H
+#ifndef F_PC_STDCREATE_H_
+#define F_PC_STDCREATE_H_
 
 #include "f/f_pc/f_pc_create_req.h"
 #include "f/f_pc/f_pc_layer.h"
diff --git a/include/gx/GX.h b/include/gx/GX.h
index 0886d761e..0c019b0ef 100644
--- a/include/gx/GX.h
+++ b/include/gx/GX.h
@@ -1,5 +1,5 @@
-#ifndef __GX_H__
-#define __GX_H__
+#ifndef GX_H_
+#define GX_H_
 
 #include "dolphin/types.h"
 
diff --git a/include/m_Do/m_Do_Reset/m_Do_Reset.h b/include/m_Do/m_Do_Reset/m_Do_Reset.h
index 31aff4572..a0971be7f 100644
--- a/include/m_Do/m_Do_Reset/m_Do_Reset.h
+++ b/include/m_Do/m_Do_Reset/m_Do_Reset.h
@@ -1,5 +1,5 @@
-#ifndef __M_DO_RESET_H__
-#define __M_DO_RESET_H__
+#ifndef M_DO_RESET_H_
+#define M_DO_RESET_H_
 
 #include "JSystem/JUtility/JUTXfb/JUTXfb.h"
 #include "dolphin/types.h"
diff --git a/include/m_Do/m_Do_controller_pad/m_Do_controller_pad.h b/include/m_Do/m_Do_controller_pad/m_Do_controller_pad.h
index 9e0c3ccbe..b93b20e23 100644
--- a/include/m_Do/m_Do_controller_pad/m_Do_controller_pad.h
+++ b/include/m_Do/m_Do_controller_pad/m_Do_controller_pad.h
@@ -1,5 +1,5 @@
-#ifndef __M_DO_CONTROLLER_PAD_H_
-#define __M_DO_CONTROLLER_PAD_H_
+#ifndef M_DO_CONTROLLER_PAD_H_
+#define M_DO_CONTROLLER_PAD_H_
 
 #include "JSystem/JUtility/JUTGamePad/JUTGamePad.h"
 #include "SComponent/c_API_controller_pad.h"
diff --git a/include/m_Do/m_Do_ext/m_Do_ext.h b/include/m_Do/m_Do_ext/m_Do_ext.h
index 35148f639..ac0913ce8 100644
--- a/include/m_Do/m_Do_ext/m_Do_ext.h
+++ b/include/m_Do/m_Do_ext/m_Do_ext.h
@@ -1,5 +1,5 @@
-#ifndef __M_DO_EXT_H_
-#define __M_DO_EXT_H_
+#ifndef M_DO_EXT_H_
+#define M_DO_EXT_H_
 
 #include "JSystem/J3DGraphAnimator/J3DAnimation.h"
 #include "JSystem/JKernel/JKRExpHeap/JKRExpHeap.h"
diff --git a/include/m_Do/m_Do_graphic/m_Do_graphic.h b/include/m_Do/m_Do_graphic/m_Do_graphic.h
index 5a04b8bcd..8cd7b338b 100644
--- a/include/m_Do/m_Do_graphic/m_Do_graphic.h
+++ b/include/m_Do/m_Do_graphic/m_Do_graphic.h
@@ -1,5 +1,5 @@
-#ifndef __M_DO_GRAPHIC_H__
-#define __M_DO_GRAPHIC_H__
+#ifndef M_DO_GRAPHIC_H_
+#define M_DO_GRAPHIC_H_
 
 #include "global.h"
 
diff --git a/include/m_Do/m_Do_machine/m_Do_machine.h b/include/m_Do/m_Do_machine/m_Do_machine.h
index 2e53b6afd..fe00ce246 100644
--- a/include/m_Do/m_Do_machine/m_Do_machine.h
+++ b/include/m_Do/m_Do_machine/m_Do_machine.h
@@ -1,5 +1,5 @@
-#ifndef __M_DO_MACHINE_H__
-#define __M_DO_MACHINE_H__
+#ifndef M_DO_MACHINE_H_
+#define M_DO_MACHINE_H_
 
 #include "global.h"
 
diff --git a/include/mtx_vec.h b/include/mtx_vec.h
index af9ac0f74..bb08bc7a6 100644
--- a/include/mtx_vec.h
+++ b/include/mtx_vec.h
@@ -1,5 +1,5 @@
-#ifndef __MTX_VEC_H_
-#define __MTX_VEC_H_
+#ifndef MTX_VEC_H_
+#define MTX_VEC_H_
 
 #include "dolphin/types.h"
 
diff --git a/include/mwcc.h b/include/mwcc.h
index 07c5536be..c353c7ed9 100644
--- a/include/mwcc.h
+++ b/include/mwcc.h
@@ -1,5 +1,5 @@
-#ifndef _MWCC_H_
-#define _MWCC_H_
+#ifndef MWCC_H_
+#define MWCC_H_
 
 extern "C" {
 void _savegpr_14(void);
diff --git a/include/os/OS.h b/include/os/OS.h
index c500d96f6..959dc550b 100644
--- a/include/os/OS.h
+++ b/include/os/OS.h
@@ -1,8 +1,8 @@
 // at some point: we should split this up into various OS/... headers. but not
 // yet, since barely any files include this atm.
 
-#ifndef __OS_H__
-#define __OS_H__
+#ifndef OS_H_
+#define OS_H_
 
 #include "dolphin/types.h"
 
diff --git a/include/pad/pad.h b/include/pad/pad.h
index d926bc598..34c305030 100644
--- a/include/pad/pad.h
+++ b/include/pad/pad.h
@@ -1,5 +1,5 @@
-#ifndef __PAD_H__
-#define __PAD_H__
+#ifndef PAD_H_
+#define PAD_H_
 #include "global.h"
 
 typedef enum PADMask {
diff --git a/include/vi/VI.h b/include/vi/VI.h
index e284e538a..acc5b3eb9 100644
--- a/include/vi/VI.h
+++ b/include/vi/VI.h
@@ -1,5 +1,5 @@
-#ifndef __VI_H__
-#define __VI_H__
+#ifndef VI_H_
+#define VI_H_
 
 #include "dolphin/types.h"