normalize header guards to {tu_name}_H_ (#87)

i previously had a bad habit of using double underscores in include
guard macro names, which are implementation-reserved per
the C++98 standard (see 17.4.3.1.2 Global names).

Co-authored-by: Pheenoh <pheenoh@gmail.com>

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"
 

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"
 

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"
 

include/JSystem/J3DGraphAnimator/J3DAnimation.h

@@ -1,5 +1,5 @@
-#ifndef __J3DANIMATION_H_
-#define __J3DANIMATION_H_
+#ifndef J3DANIMATION_H_
+#define J3DANIMATION_H_
 
 #include "global.h"
 

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"
 

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"
 

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"
 

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"
 

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"
 

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"

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"

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"

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"
 

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"
 

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"

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"

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"

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"

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"

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"

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"
 

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"
 

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"

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"
 

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"

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"

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"

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"
 

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"

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"

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"

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"
 

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"

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"
 

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"

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"

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"

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"
 

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"

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"

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"

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"

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"

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"

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"

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"
 

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"
 

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"
 

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

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"

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"
 

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"

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"

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"

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"

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"

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 {

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

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
 

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"
 

include/Z2AudioLib/Z2SoundMgr/Z2SoundMgr.h

@@ -1,5 +1,5 @@
-#ifndef __Z2SOUNDMGR_H__
-#define __Z2SOUNDMGR_H__
+#ifndef Z2SOUNDMGR_H_
+#define Z2SOUNDMGR_H_
 
 class Z2SoundMgr;
 

include/ar/AR.h

@@ -1,5 +1,5 @@
-#ifndef __AR_H__
-#define __AR_H__
+#ifndef AR_H_
+#define AR_H_
 
 #include "dolphin/types.h"
 

include/ar/ARQ.h

@@ -1,5 +1,5 @@
-#ifndef __ARQ_H__
-#define __ARQ_H__
+#ifndef ARQ_H_
+#define ARQ_H_
 
 #include "dolphin/types.h"
 

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"

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"

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)

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"

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"

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"
 

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"
 

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"

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"

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"

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

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 {};