diff --git a/include/alloca.h b/include/alloca.h
index d7f0f268aa..4e8720f7e8 100644
--- a/include/alloca.h
+++ b/include/alloca.h
@@ -1,5 +1,5 @@
-#ifndef _ALLOCA_H_
-#define _ALLOCA_H_
+#ifndef ALLOCA_H
+#define ALLOCA_H
 
 void* alloca(u32);
 #define alloca  __builtin_alloca
diff --git a/include/color.h b/include/color.h
index 17102b6bba..014e7accf2 100644
--- a/include/color.h
+++ b/include/color.h
@@ -1,5 +1,5 @@
-#ifndef _COLOR_H_
-#define _COLOR_H_
+#ifndef COLOR_H
+#define COLOR_H
 
 typedef struct {
     u8 r, g, b;
diff --git a/include/command_macros_base.h b/include/command_macros_base.h
index c0d2ac4e89..b6154b8632 100644
--- a/include/command_macros_base.h
+++ b/include/command_macros_base.h
@@ -1,5 +1,5 @@
-#ifndef _COMMAND_MACROS_BASE_H_
-#define _COMMAND_MACROS_BASE_H_
+#ifndef COMMAND_MACROS_BASE_H
+#define COMMAND_MACROS_BASE_H
 
 /**
  * Command Base macros intended for use in designing of more specific command macros
diff --git a/include/fp.h b/include/fp.h
index 7fac5bfc10..c733be914c 100644
--- a/include/fp.h
+++ b/include/fp.h
@@ -1,5 +1,5 @@
-#ifndef _FP_H_
-#define _FP_H_
+#ifndef FP_H
+#define FP_H
 #include "ultra64.h"
 
 extern f32 qNaN0x3FFFFF;
diff --git a/include/functions.h b/include/functions.h
index 606b8e6d1c..880efeb5dd 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -1,5 +1,5 @@
-#ifndef _FUNCTIONS_H_
-#define _FUNCTIONS_H_
+#ifndef FUNCTIONS_H
+#define FUNCTIONS_H
 
 #include "z64.h"
 
diff --git a/include/global.h b/include/global.h
index c70da948f9..9ab8e14b38 100644
--- a/include/global.h
+++ b/include/global.h
@@ -1,5 +1,5 @@
-#ifndef _GLOBAL_H_
-#define _GLOBAL_H_
+#ifndef GLOBAL_H
+#define GLOBAL_H
 
 #include "functions.h"
 #include "variables.h"
diff --git a/include/ichain.h b/include/ichain.h
index 8b11121911..aa20090f4f 100644
--- a/include/ichain.h
+++ b/include/ichain.h
@@ -1,5 +1,5 @@
-#ifndef _ICHAIN_H_
-#define _ICHAIN_H_
+#ifndef ICHAIN_H
+#define ICHAIN_H
 
 typedef struct {
     u32 cont:   1;
diff --git a/include/macros.h b/include/macros.h
index ca85e79026..3b95b33d74 100644
--- a/include/macros.h
+++ b/include/macros.h
@@ -1,5 +1,5 @@
-#ifndef _MACROS_H_
-#define _MACROS_H_
+#ifndef MACROS_H
+#define MACROS_H
 
 #define ARRAY_COUNT(arr) (s32)(sizeof(arr) / sizeof(arr[0]))
 #define ARRAY_COUNTU(arr) (u32)(sizeof(arr) / sizeof(arr[0]))
diff --git a/include/math.h b/include/math.h
index b0df65e56d..bceffad224 100644
--- a/include/math.h
+++ b/include/math.h
@@ -1,5 +1,5 @@
-#ifndef _MATH_H_
-#define _MATH_H_
+#ifndef MATH_H
+#define MATH_H
 
 #include "ultra64/types.h"
 
diff --git a/include/regs.h b/include/regs.h
index 6fcc1ae344..7b30363079 100644
--- a/include/regs.h
+++ b/include/regs.h
@@ -1,5 +1,5 @@
-#ifndef _REGS_H_
-#define _REGS_H_
+#ifndef REGS_H
+#define REGS_H
 
 #define REG_GROUPS 29 // number of REG groups, i.e. REG, SREG, OREG, etc.
 #define REG_PAGES 6
diff --git a/include/segment_symbols.h b/include/segment_symbols.h
index 5344244ebb..ac6d99dc2f 100644
--- a/include/segment_symbols.h
+++ b/include/segment_symbols.h
@@ -1,5 +1,5 @@
-#ifndef _SEGMENT_SYMBOLS_H_
-#define _SEGMENT_SYMBOLS_H_
+#ifndef SEGMENT_SYMBOLS_H
+#define SEGMENT_SYMBOLS_H
 
 #include "z64.h"
 
diff --git a/include/stdarg.h b/include/stdarg.h
index 0cd0fa1f44..0744dfa609 100644
--- a/include/stdarg.h
+++ b/include/stdarg.h
@@ -1,5 +1,5 @@
-#ifndef _STDARG_H_
-#define _STDARG_H_
+#ifndef STDARG_H
+#define STDARG_H
 
 // When building with GCC, use the official vaarg macros to avoid warnings
 // and possibly bad codegen.
diff --git a/include/stdbool.h b/include/stdbool.h
index 519806b310..4495977a90 100644
--- a/include/stdbool.h
+++ b/include/stdbool.h
@@ -1,5 +1,5 @@
-#ifndef _STDBOOL
-#define _STDBOOL
+#ifndef STDBOOL_H
+#define STDBOOL_H
 
 #define __bool_true_false_are_defined 1
 
@@ -11,4 +11,4 @@
 
 #endif /* __cplusplus */
 
-#endif /* _STDBOOL */
+#endif /* STDBOOL */
diff --git a/include/stddef.h b/include/stddef.h
index 16bd97a1d7..7a481e97ed 100644
--- a/include/stddef.h
+++ b/include/stddef.h
@@ -1,5 +1,5 @@
-#ifndef _STDDEF_H_
-#define _STDDEF_H_
+#ifndef STDDEF_H
+#define STDDEF_H
 
 #define NULL ((void*)0)
 
diff --git a/include/stdlib.h b/include/stdlib.h
index 5f014cb37c..75657d8dbd 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -1,5 +1,5 @@
-#ifndef _STDLIB_H_
-#define _STDLIB_H_
+#ifndef STDLIB_H
+#define STDLIB_H
 
 #include "ultra64.h"
 
diff --git a/include/ultra64.h b/include/ultra64.h
index 2625e37ae8..5cda203a17 100644
--- a/include/ultra64.h
+++ b/include/ultra64.h
@@ -1,5 +1,5 @@
-#ifndef _ULTRA64_H_
-#define _ULTRA64_H_
+#ifndef ULTRA64_H
+#define ULTRA64_H
 
 #include "stddef.h"
 #include "stdbool.h"
diff --git a/include/ultra64/abi.h b/include/ultra64/abi.h
index c3652c487d..49d5397628 100644
--- a/include/ultra64/abi.h
+++ b/include/ultra64/abi.h
@@ -1,5 +1,5 @@
-#ifndef _ULTRA64_ABI_H_
-#define _ULTRA64_ABI_H_
+#ifndef ULTRA64_ABI_H
+#define ULTRA64_ABI_H
 
 /* Audio commands: */
 /*
@@ -528,4 +528,4 @@ typedef short ENVMIX_STATE[40];
         _a->words.w1 = _SHIFTL(pitchAccu, 0, 16);                       \
 }
 
-#endif /* _ULTRA64_ABI_H_ */
+#endif /* ULTRA64_ABI_H */
diff --git a/include/ultra64/controller.h b/include/ultra64/controller.h
index b587996f9e..38f7fffeba 100644
--- a/include/ultra64/controller.h
+++ b/include/ultra64/controller.h
@@ -1,5 +1,5 @@
-#ifndef _ULTRA64_CONTROLLER_H_
-#define _ULTRA64_CONTROLLER_H_
+#ifndef ULTRA64_CONTROLLER_H
+#define ULTRA64_CONTROLLER_H
 
 #include "ultra64.h"
 #include "ultra64/message.h"
diff --git a/include/ultra64/convert.h b/include/ultra64/convert.h
index e68a56576e..13679fc5b0 100644
--- a/include/ultra64/convert.h
+++ b/include/ultra64/convert.h
@@ -1,5 +1,5 @@
-#ifndef _ULTRA64_CONVERT_H_
-#define _ULTRA64_CONVERT_H_
+#ifndef ULTRA64_CONVERT_H
+#define ULTRA64_CONVERT_H
 
 #define OS_CLOCK_RATE           62500000LL
 #define OS_CPU_COUNTER          (OS_CLOCK_RATE*3/4)
diff --git a/include/ultra64/gbi.h b/include/ultra64/gbi.h
index 8c389d30e3..5134e14baf 100644
--- a/include/ultra64/gbi.h
+++ b/include/ultra64/gbi.h
@@ -1,7 +1,7 @@
 #include "ultra64/mbi.h"
 
-#ifndef _ULTRA64_GBI_H_
-#define _ULTRA64_GBI_H_
+#ifndef ULTRA64_GBI_H
+#define ULTRA64_GBI_H
 
 /* To enable Fast3DEX grucode support, define F3DEX_GBI. */
 
diff --git a/include/ultra64/gs2dex.h b/include/ultra64/gs2dex.h
index 64c3d5ea0d..5c0bc71758 100644
--- a/include/ultra64/gs2dex.h
+++ b/include/ultra64/gs2dex.h
@@ -1,5 +1,5 @@
-#ifndef	_GS2DEX_H_
-#define	_GS2DEX_H_
+#ifndef	GS2DEX_H
+#define	GS2DEX_H
 
 #ifdef _LANGUAGE_C_PLUS_PLUS
 extern "C" {
@@ -374,6 +374,6 @@ extern	void	guS2DInitBg(uObjBg *);
 #ifdef _LANGUAGE_C_PLUS_PLUS
 }
 #endif
-#endif /* _GS2DEX_H_ */
+#endif /* GS2DEX_H */
 
 /*======== End of gs2dex.h ========*/
diff --git a/include/ultra64/gu.h b/include/ultra64/gu.h
index 43b3339793..8fc9e0291e 100644
--- a/include/ultra64/gu.h
+++ b/include/ultra64/gu.h
@@ -1,5 +1,5 @@
-#ifndef _ULTRA64_GU_H_
-#define _ULTRA64_GU_H_
+#ifndef ULTRA64_GU_H
+#define ULTRA64_GU_H
 
 #define GU_PI 3.1415926
 
diff --git a/include/ultra64/hardware.h b/include/ultra64/hardware.h
index bd006c21db..48247b4734 100644
--- a/include/ultra64/hardware.h
+++ b/include/ultra64/hardware.h
@@ -1,5 +1,5 @@
-#ifndef _ULTRA64_HARDWARE_H_
-#define _ULTRA64_HARDWARE_H_
+#ifndef ULTRA64_HARDWARE_H
+#define ULTRA64_HARDWARE_H
 
 #define HW_REG(reg, type) *(volatile type*)((reg) | 0xa0000000)
 
diff --git a/include/ultra64/internal.h b/include/ultra64/internal.h
index 15a2739624..e6c9732995 100644
--- a/include/ultra64/internal.h
+++ b/include/ultra64/internal.h
@@ -1,5 +1,5 @@
-#ifndef _ULTRA64_INTERNAL_H_
-#define _ULTRA64_INTERNAL_H_
+#ifndef ULTRA64_INTERNAL_H
+#define ULTRA64_INTERNAL_H
 
 typedef struct {
     /* 0x00 */ u32 initialized;
diff --git a/include/ultra64/interrupt.h b/include/ultra64/interrupt.h
index 0516bcc9a3..7c669c170f 100644
--- a/include/ultra64/interrupt.h
+++ b/include/ultra64/interrupt.h
@@ -1,5 +1,5 @@
-#ifndef _ULTRA64_INTERRUPT_H_
-#define _ULTRA64_INTERRUPT_H_
+#ifndef ULTRA64_INTERRUPT_H
+#define ULTRA64_INTERRUPT_H
 
 typedef u32 OSIntMask;
 
diff --git a/include/ultra64/mbi.h b/include/ultra64/mbi.h
index 4c0ace8537..7d6e07a4ff 100644
--- a/include/ultra64/mbi.h
+++ b/include/ultra64/mbi.h
@@ -1,5 +1,5 @@
-#ifndef _ULTRA64_MBI_H_
-#define _ULTRA64_MBI_H_
+#ifndef ULTRA64_MBI_H
+#define ULTRA64_MBI_H
 
 /*
  * Header file for the Media Binary Interface
diff --git a/include/ultra64/message.h b/include/ultra64/message.h
index 3f52482d83..e89a638383 100644
--- a/include/ultra64/message.h
+++ b/include/ultra64/message.h
@@ -1,5 +1,5 @@
-#ifndef _ULTRA64_MESSAGE_H_
-#define _ULTRA64_MESSAGE_H_
+#ifndef ULTRA64_MESSAGE_H
+#define ULTRA64_MESSAGE_H
 
 #include "ultra64/types.h"
 
diff --git a/include/ultra64/pfs.h b/include/ultra64/pfs.h
index e86a2b738c..b122733309 100644
--- a/include/ultra64/pfs.h
+++ b/include/ultra64/pfs.h
@@ -1,5 +1,5 @@
-#ifndef _ULTRA64_PFS_H_
-#define _ULTRA64_PFS_H_
+#ifndef ULTRA64_PFS_H
+#define ULTRA64_PFS_H
 
 #include "ultra64.h"
 
diff --git a/include/ultra64/pi.h b/include/ultra64/pi.h
index d28dbc12d3..528ced8d19 100644
--- a/include/ultra64/pi.h
+++ b/include/ultra64/pi.h
@@ -1,5 +1,5 @@
-#ifndef _ULTRA64_PI_H_
-#define _ULTRA64_PI_H_
+#ifndef ULTRA64_PI_H
+#define ULTRA64_PI_H
 
 typedef struct {
     /* 0x00 */ u32 errStatus;
diff --git a/include/ultra64/printf.h b/include/ultra64/printf.h
index 6498507822..bf51f02935 100644
--- a/include/ultra64/printf.h
+++ b/include/ultra64/printf.h
@@ -1,5 +1,5 @@
-#ifndef _ULTRA64_PRINTF_H_
-#define _ULTRA64_PRINTF_H_
+#ifndef ULTRA64_PRINTF_H
+#define ULTRA64_PRINTF_H
 #include "stdarg.h"
 
 typedef struct {
diff --git a/include/ultra64/rcp.h b/include/ultra64/rcp.h
index 6bd778ccfa..59daff91e7 100644
--- a/include/ultra64/rcp.h
+++ b/include/ultra64/rcp.h
@@ -1,5 +1,5 @@
-#ifndef _ULTRA64_RCP_H_
-#define _ULTRA64_RCP_H_
+#ifndef ULTRA64_RCP_H
+#define ULTRA64_RCP_H
 
 #define VI_NTSC_CLOCK       48681812        /* Hz = 48.681812 MHz */
 #define VI_PAL_CLOCK        49656530        /* Hz = 49.656530 MHz */
diff --git a/include/ultra64/rdp.h b/include/ultra64/rdp.h
index 25aad6f9b3..5360511f0a 100644
--- a/include/ultra64/rdp.h
+++ b/include/ultra64/rdp.h
@@ -1,5 +1,5 @@
-#ifndef _ULTRA64_RDP_H_
-#define _ULTRA64_RDP_H_
+#ifndef ULTRA64_RDP_H
+#define ULTRA64_RDP_H
 
 /* DP Command Registers */
 
diff --git a/include/ultra64/rsp.h b/include/ultra64/rsp.h
index bc70ed938b..dcc9dadc74 100644
--- a/include/ultra64/rsp.h
+++ b/include/ultra64/rsp.h
@@ -1,5 +1,5 @@
-#ifndef _ULTRA64_RSP_H_
-#define _ULTRA64_RSP_H_
+#ifndef ULTRA64_RSP_H
+#define ULTRA64_RSP_H
 
 /* SP Status Flags */
 #define SP_STATUS_HALT          0x001
diff --git a/include/ultra64/sptask.h b/include/ultra64/sptask.h
index 90a9626bb9..14e32614bc 100644
--- a/include/ultra64/sptask.h
+++ b/include/ultra64/sptask.h
@@ -1,5 +1,5 @@
-#ifndef _ULTRA64_SPTASK_H_
-#define _ULTRA64_SPTASK_H_
+#ifndef ULTRA64_SPTASK_H
+#define ULTRA64_SPTASK_H
 
 /* Task Types */
 #define M_NULTASK 0
diff --git a/include/ultra64/thread.h b/include/ultra64/thread.h
index bea9dc8c96..3d826a79e8 100644
--- a/include/ultra64/thread.h
+++ b/include/ultra64/thread.h
@@ -1,5 +1,5 @@
-#ifndef _ULTRA64_THREAD_H_
-#define _ULTRA64_THREAD_H_
+#ifndef ULTRA64_THREAD_H
+#define ULTRA64_THREAD_H
 
 #define OS_PRIORITY_MAX      255
 #define OS_PRIORITY_VIMGR    254
diff --git a/include/ultra64/time.h b/include/ultra64/time.h
index 8f2b7ce720..f75b1901ac 100644
--- a/include/ultra64/time.h
+++ b/include/ultra64/time.h
@@ -1,5 +1,5 @@
-#ifndef _ULTRA64_TIME_H_
-#define _ULTRA64_TIME_H_
+#ifndef ULTRA64_TIME_H
+#define ULTRA64_TIME_H
 
 #include "ultra64/message.h"
 
diff --git a/include/ultra64/types.h b/include/ultra64/types.h
index bb1415d6e9..4545e98ba0 100644
--- a/include/ultra64/types.h
+++ b/include/ultra64/types.h
@@ -1,5 +1,5 @@
-#ifndef _ULTRA64_TYPES_H_
-#define _ULTRA64_TYPES_H_
+#ifndef ULTRA64_TYPES_H
+#define ULTRA64_TYPES_H
 
 typedef signed char            s8;
 typedef unsigned char          u8;
diff --git a/include/ultra64/vi.h b/include/ultra64/vi.h
index 7830873613..ad8c1e761e 100644
--- a/include/ultra64/vi.h
+++ b/include/ultra64/vi.h
@@ -1,5 +1,5 @@
-#ifndef _ULTRA64_VI_H_
-#define _ULTRA64_VI_H_
+#ifndef ULTRA64_VI_H
+#define ULTRA64_VI_H
 
 /* Special Features */
 #define OS_VI_GAMMA_ON          0x0001
diff --git a/include/unk.h b/include/unk.h
index 9a7c60978f..e28f2bd8cd 100644
--- a/include/unk.h
+++ b/include/unk.h
@@ -1,5 +1,5 @@
-#ifndef _UNK_H_
-#define _UNK_H_
+#ifndef UNK_H
+#define UNK_H
 
 #define UNK_TYPE s32
 #define UNK_TYPE1 s8
diff --git a/include/variables.h b/include/variables.h
index 0596c93ac1..bf552a29b3 100644
--- a/include/variables.h
+++ b/include/variables.h
@@ -1,5 +1,5 @@
-#ifndef _VARIABLES_H_
-#define _VARIABLES_H_
+#ifndef VARIABLES_H
+#define VARIABLES_H
 
 #include "z64.h"
 #include "segment_symbols.h"
diff --git a/include/z64.h b/include/z64.h
index 75169d4503..24f404df2f 100644
--- a/include/z64.h
+++ b/include/z64.h
@@ -1,5 +1,5 @@
-#ifndef _Z64_H_
-#define _Z64_H_
+#ifndef Z64_H
+#define Z64_H
 
 #include "ultra64.h"
 #include "ultra64/gs2dex.h"
diff --git a/include/z64actor.h b/include/z64actor.h
index 4d3a5b8399..f7b7490fb4 100644
--- a/include/z64actor.h
+++ b/include/z64actor.h
@@ -1,5 +1,5 @@
-#ifndef _Z64ACTOR_H_
-#define _Z64ACTOR_H_
+#ifndef Z64ACTOR_H
+#define Z64ACTOR_H
 
 #include "z64dma.h"
 #include "z64animation.h"
diff --git a/include/z64animation.h b/include/z64animation.h
index 1db74c9055..e96eb0afe5 100755
--- a/include/z64animation.h
+++ b/include/z64animation.h
@@ -1,5 +1,5 @@
-#ifndef _Z64_ANIMATION_H
-#define _Z64_ANIMATION_H
+#ifndef Z64_ANIMATION_H
+#define Z64_ANIMATION_H
 
 #include "ultra64.h"
 #include "z64dma.h"
diff --git a/include/z64audio.h b/include/z64audio.h
index 7284e2f4e5..9eaef0fa6b 100644
--- a/include/z64audio.h
+++ b/include/z64audio.h
@@ -1,5 +1,5 @@
-#ifndef _Z64_AUDIO_H_
-#define _Z64_AUDIO_H_
+#ifndef Z64_AUDIO_H
+#define Z64_AUDIO_H
 
 #define MK_CMD(b0,b1,b2,b3) ((((b0) & 0xFF) << 0x18) | (((b1) & 0xFF) << 0x10) | (((b2) & 0xFF) << 0x8) | (((b3) & 0xFF) << 0))
 
diff --git a/include/z64bgcheck.h b/include/z64bgcheck.h
index a3b25fb6b9..87c8e246a2 100644
--- a/include/z64bgcheck.h
+++ b/include/z64bgcheck.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BGCHECK_
-#define _Z_BGCHECK_
+#ifndef Z_BGCHECK_H
+#define Z_BGCHECK_H
 
 struct GlobalContext;
 struct Actor;
diff --git a/include/z64camera.h b/include/z64camera.h
index 5c529e300f..1c4cc3f3c2 100644
--- a/include/z64camera.h
+++ b/include/z64camera.h
@@ -1,5 +1,5 @@
-#ifndef _Z64CAMERA_H_
-#define _Z64CAMERA_H_
+#ifndef Z64CAMERA_H
+#define Z64CAMERA_H
 
 #include "ultra64.h"
 #include "z64cutscene.h"
diff --git a/include/z64collision_check.h b/include/z64collision_check.h
index f42c12f72a..c05dd701b0 100644
--- a/include/z64collision_check.h
+++ b/include/z64collision_check.h
@@ -1,5 +1,5 @@
-#ifndef _Z_COLLISION_CHECK_H_
-#define _Z_COLLISION_CHECK_H_
+#ifndef Z_COLLISION_CHECK_H
+#define Z_COLLISION_CHECK_H
 
 #define COLLISION_CHECK_AT_MAX 50
 #define COLLISION_CHECK_AC_MAX 60
diff --git a/include/z64cutscene.h b/include/z64cutscene.h
index be14066fc5..ff51103838 100644
--- a/include/z64cutscene.h
+++ b/include/z64cutscene.h
@@ -1,5 +1,5 @@
-#ifndef _Z64CUTSCENE_H_
-#define _Z64CUTSCENE_H_
+#ifndef Z64CUTSCENE_H
+#define Z64CUTSCENE_H
 
 #include "ultra64.h"
 
diff --git a/include/z64cutscene_commands.h b/include/z64cutscene_commands.h
index 0a6f8a2d0c..de3ad2fea0 100644
--- a/include/z64cutscene_commands.h
+++ b/include/z64cutscene_commands.h
@@ -1,5 +1,5 @@
-#ifndef _Z64CUTSCENE_COMMANDS_H_
-#define _Z64CUTSCENE_COMMANDS_H_
+#ifndef Z64CUTSCENE_COMMANDS_H
+#define Z64CUTSCENE_COMMANDS_H
 
 #include "command_macros_base.h"
 #include "z64cutscene.h"
diff --git a/include/z64dma.h b/include/z64dma.h
index f5106438af..ee2fac03f5 100755
--- a/include/z64dma.h
+++ b/include/z64dma.h
@@ -1,5 +1,5 @@
-#ifndef _Z64_DMA_H_
-#define _Z64_DMA_H_
+#ifndef Z64_DMA_H
+#define Z64_DMA_H
 
 #include "ultra64.h"
 
diff --git a/include/z64effect.h b/include/z64effect.h
index 48ce257314..79875f900c 100644
--- a/include/z64effect.h
+++ b/include/z64effect.h
@@ -1,5 +1,5 @@
-#ifndef _Z64EFFECT_H_
-#define _Z64EFFECT_H_
+#ifndef Z64EFFECT_H
+#define Z64EFFECT_H
 
 #include "color.h"
 
diff --git a/include/z64interface.h b/include/z64interface.h
index 3dc5834074..de3913abae 100644
--- a/include/z64interface.h
+++ b/include/z64interface.h
@@ -1,5 +1,5 @@
-#ifndef _Z64INTERFACE_H_
-#define _Z64INTERFACE_H_
+#ifndef Z64INTERFACE_H
+#define Z64INTERFACE_H
 
 /**
  * Button HUD Positions (Upper Left)
diff --git a/include/z64item.h b/include/z64item.h
index 869fb1b557..05b2a24b2a 100644
--- a/include/z64item.h
+++ b/include/z64item.h
@@ -1,5 +1,5 @@
-#ifndef _Z64ITEM_H_
-#define _Z64ITEM_H_
+#ifndef Z64ITEM_H
+#define Z64ITEM_H
 
 typedef enum {
     /* 0x00 */ EQUIP_SWORD,
diff --git a/include/z64light.h b/include/z64light.h
index c20cb8153e..079418d883 100644
--- a/include/z64light.h
+++ b/include/z64light.h
@@ -1,5 +1,5 @@
-#ifndef _Z64LIGHT_H_
-#define _Z64LIGHT_H_
+#ifndef Z64LIGHT_H
+#define Z64LIGHT_H
 
 #include "ultra64.h"
 #include "ultra64/gbi.h"
diff --git a/include/z64map_mark.h b/include/z64map_mark.h
index cfd2e32303..d862197840 100644
--- a/include/z64map_mark.h
+++ b/include/z64map_mark.h
@@ -1,5 +1,5 @@
-#ifndef _Z64MAP_MARK_H_
-#define _Z64MAP_MARK_H_
+#ifndef Z64MAP_MARK_H
+#define Z64MAP_MARK_H
 
 #include "ultra64.h"
 
diff --git a/include/z64math.h b/include/z64math.h
index 1b38a7ba48..2b4ae68d31 100644
--- a/include/z64math.h
+++ b/include/z64math.h
@@ -1,5 +1,5 @@
-#ifndef _Z64MATH_H_
-#define _Z64MATH_H_
+#ifndef Z64MATH_H
+#define Z64MATH_H
 
 #include "ultra64.h"
 
diff --git a/include/z64object.h b/include/z64object.h
index 06356a6700..8add3b7a63 100644
--- a/include/z64object.h
+++ b/include/z64object.h
@@ -1,5 +1,5 @@
-#ifndef _Z64OBJECT_H_
-#define _Z64OBJECT_H_
+#ifndef Z64OBJECT_H
+#define Z64OBJECT_H
 
 #define OBJECT_EXCHANGE_BANK_MAX 19
 
diff --git a/include/z64player.h b/include/z64player.h
index 7d9285084c..b762961bb3 100644
--- a/include/z64player.h
+++ b/include/z64player.h
@@ -1,5 +1,5 @@
-#ifndef _Z64PLAYER_H_
-#define _Z64PLAYER_H_
+#ifndef Z64PLAYER_H
+#define Z64PLAYER_H
 
 #include "z64actor.h"
 
diff --git a/include/z64save.h b/include/z64save.h
index 2469abbd9c..5771d6ffba 100644
--- a/include/z64save.h
+++ b/include/z64save.h
@@ -1,5 +1,5 @@
-#ifndef _Z64SAVE_H_
-#define _Z64SAVE_H_
+#ifndef Z64SAVE_H
+#define Z64SAVE_H
 
 #include "ultra64.h"
 #include "z64math.h"
diff --git a/include/z64scene.h b/include/z64scene.h
index 10e795ccd5..3ffac37e7a 100644
--- a/include/z64scene.h
+++ b/include/z64scene.h
@@ -1,5 +1,5 @@
-#ifndef _Z64SCENE_H_
-#define _Z64SCENE_H_
+#ifndef Z64SCENE_H
+#define Z64SCENE_H
 
 #include "command_macros_base.h"
 
diff --git a/include/z64transition.h b/include/z64transition.h
index 563bd7eb23..8ac8ec0065 100644
--- a/include/z64transition.h
+++ b/include/z64transition.h
@@ -1,4 +1,5 @@
-#ifndef _Z64TRANSITION_H_
+#ifndef Z64TRANSITION_H
+#define Z64TRANSITION_H
 
 #include "ultra64.h"
 #include "color.h"
diff --git a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.h b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.h
index 27836b4341..822d87fecc 100644
--- a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.h
+++ b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.h
@@ -1,5 +1,5 @@
-#ifndef _Z_ARMS_HOOK_H_
-#define _Z_ARMS_HOOK_H_
+#ifndef Z_ARMS_HOOK_H
+#define Z_ARMS_HOOK_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.h b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.h
index 7b06af54b1..f5b2d3f63a 100644
--- a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.h
+++ b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.h
@@ -1,5 +1,5 @@
-#ifndef _Z_ARROW_FIRE_H_
-#define _Z_ARROW_FIRE_H_
+#ifndef Z_ARROW_FIRE_H
+#define Z_ARROW_FIRE_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.h b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.h
index 5986a110b3..b326f7c43e 100644
--- a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.h
+++ b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.h
@@ -1,5 +1,5 @@
-#ifndef _Z_ARROW_ICE_H_
-#define _Z_ARROW_ICE_H_
+#ifndef Z_ARROW_ICE_H
+#define Z_ARROW_ICE_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.h b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.h
index 8eee250aab..79db3621a6 100644
--- a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.h
+++ b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.h
@@ -1,5 +1,5 @@
-#ifndef _Z_ARROW_LIGHT_H_
-#define _Z_ARROW_LIGHT_H_
+#ifndef Z_ARROW_LIGHT_H
+#define Z_ARROW_LIGHT_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.h b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.h
index aa9f2c06cf..e21fe6c964 100644
--- a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.h
+++ b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_BDAN_OBJECTS_H_
-#define _Z_BG_BDAN_OBJECTS_H_
+#ifndef Z_BG_BDAN_OBJECTS_H
+#define Z_BG_BDAN_OBJECTS_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.h b/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.h
index e365d18051..629643c7e0 100644
--- a/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.h
+++ b/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_BDAN_SWITCH_H_
-#define _Z_BG_BDAN_SWITCH_H_
+#ifndef Z_BG_BDAN_SWITCH_H
+#define Z_BG_BDAN_SWITCH_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.h b/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.h
index fa5a4ed54b..41a395a383 100644
--- a/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.h
+++ b/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_BOM_GUARD_H_
-#define _Z_BG_BOM_GUARD_H_
+#ifndef Z_BG_BOM_GUARD_H
+#define Z_BG_BOM_GUARD_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.h b/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.h
index c003f5fc9b..68e17e0287 100644
--- a/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.h
+++ b/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_BOMBWALL_H_
-#define _Z_BG_BOMBWALL_H_
+#ifndef Z_BG_BOMBWALL_H
+#define Z_BG_BOMBWALL_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.h b/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.h
index 13f38e5cb6..0a5b7a5121 100644
--- a/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.h
+++ b/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_BOWL_WALL_H_
-#define _Z_BG_BOWL_WALL_H_
+#ifndef Z_BG_BOWL_WALL_H
+#define Z_BG_BOWL_WALL_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h
index 9be99eb56f..43fd4ee930 100644
--- a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h
+++ b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_BREAKWALL_H_
-#define _Z_BG_BREAKWALL_H_
+#ifndef Z_BG_BREAKWALL_H
+#define Z_BG_BREAKWALL_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.h b/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.h
index c13d80b8a7..33ab8be8a3 100644
--- a/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.h
+++ b/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_DDAN_JD_H_
-#define _Z_BG_DDAN_JD_H_
+#ifndef Z_BG_DDAN_JD_H
+#define Z_BG_DDAN_JD_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.h b/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.h
index 708e44b3fe..12048002b4 100644
--- a/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.h
+++ b/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_DDAN_KD_H_
-#define _Z_BG_DDAN_KD_H_
+#ifndef Z_BG_DDAN_KD_H
+#define Z_BG_DDAN_KD_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.h b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.h
index 2df0cb9f91..41994be8a2 100644
--- a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.h
+++ b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_DODOAGO_H_
-#define _Z_BG_DODOAGO_H_
+#ifndef Z_BG_DODOAGO_H
+#define Z_BG_DODOAGO_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h
index 1ff179c14f..59abc6065c 100644
--- a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h
+++ b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_DY_YOSEIZO_H_
-#define _Z_BG_DY_YOSEIZO_H_
+#ifndef Z_BG_DY_YOSEIZO_H
+#define Z_BG_DY_YOSEIZO_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.h b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.h
index e438becb39..79ba15e6d3 100644
--- a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.h
+++ b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_GANON_OTYUKA_H_
-#define _Z_BG_GANON_OTYUKA_H_
+#ifndef Z_BG_GANON_OTYUKA_H
+#define Z_BG_GANON_OTYUKA_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.h b/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.h
index 88a1582f7c..4f93b6778b 100644
--- a/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.h
+++ b/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_GATE_SHUTTER_H_
-#define _Z_BG_GATE_SHUTTER_H_
+#ifndef Z_BG_GATE_SHUTTER_H
+#define Z_BG_GATE_SHUTTER_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.h b/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.h
index 0810f219f3..f0e74dbaf4 100644
--- a/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.h
+++ b/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_GJYO_BRIDGE_H_
-#define _Z_BG_GJYO_BRIDGE_H_
+#ifndef Z_BG_GJYO_BRIDGE_H
+#define Z_BG_GJYO_BRIDGE_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.h b/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.h
index 11a58885c2..6e1936e355 100644
--- a/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.h
+++ b/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_GND_DARKMEIRO_H_
-#define _Z_BG_GND_DARKMEIRO_H_
+#ifndef Z_BG_GND_DARKMEIRO_H
+#define Z_BG_GND_DARKMEIRO_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.h b/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.h
index 0a8c086751..1a9a55ffe9 100644
--- a/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.h
+++ b/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_GND_FIREMEIRO_H_
-#define _Z_BG_GND_FIREMEIRO_H_
+#ifndef Z_BG_GND_FIREMEIRO_H
+#define Z_BG_GND_FIREMEIRO_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.h b/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.h
index 0ac894e625..0010de14a9 100644
--- a/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.h
+++ b/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_GND_ICEBLOCK_H_
-#define _Z_BG_GND_ICEBLOCK_H_
+#ifndef Z_BG_GND_ICEBLOCK_H
+#define Z_BG_GND_ICEBLOCK_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.h b/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.h
index 2f1dd5e811..32da8fa085 100644
--- a/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.h
+++ b/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_GND_NISEKABE_H_
-#define _Z_BG_GND_NISEKABE_H_
+#ifndef Z_BG_GND_NISEKABE_H
+#define Z_BG_GND_NISEKABE_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.h b/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.h
index 449e6cf411..1d7024fff8 100644
--- a/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.h
+++ b/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_GND_SOULMEIRO_H_
-#define _Z_BG_GND_SOULMEIRO_H_
+#ifndef Z_BG_GND_SOULMEIRO_H
+#define Z_BG_GND_SOULMEIRO_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.h b/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.h
index 0bc242c3f9..20d71be2b6 100644
--- a/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.h
+++ b/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_HAKA_H_
-#define _Z_BG_HAKA_H_
+#ifndef Z_BG_HAKA_H
+#define Z_BG_HAKA_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.h b/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.h
index 9dbf6d2631..005cdefc29 100644
--- a/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.h
+++ b/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_HAKA_GATE_H_
-#define _Z_BG_HAKA_GATE_H_
+#ifndef Z_BG_HAKA_GATE_H
+#define Z_BG_HAKA_GATE_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.h b/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.h
index e3ea9bca61..dff12e313a 100644
--- a/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.h
+++ b/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_HAKA_HUTA_H_
-#define _Z_BG_HAKA_HUTA_H_
+#ifndef Z_BG_HAKA_HUTA_H
+#define Z_BG_HAKA_HUTA_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.h b/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.h
index 5f5d230339..dabde490e6 100644
--- a/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.h
+++ b/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_HAKA_MEGANE_H_
-#define _Z_BG_HAKA_MEGANE_H_
+#ifndef Z_BG_HAKA_MEGANE_H
+#define Z_BG_HAKA_MEGANE_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.h b/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.h
index 166c560ef9..18a0ba2389 100644
--- a/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.h
+++ b/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_HAKA_MEGANEBG_H_
-#define _Z_BG_HAKA_MEGANEBG_H_
+#ifndef Z_BG_HAKA_MEGANEBG_H
+#define Z_BG_HAKA_MEGANEBG_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.h b/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.h
index 7286d0cac8..2d97b47947 100644
--- a/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.h
+++ b/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_HAKA_SGAMI_H_
-#define _Z_BG_HAKA_SGAMI_H_
+#ifndef Z_BG_HAKA_SGAMI_H
+#define Z_BG_HAKA_SGAMI_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.h b/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.h
index 48fa710c18..255c4c7d96 100644
--- a/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.h
+++ b/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_HAKA_SHIP_H_
-#define _Z_BG_HAKA_SHIP_H_
+#ifndef Z_BG_HAKA_SHIP_H
+#define Z_BG_HAKA_SHIP_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.h b/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.h
index 1231e64416..f3024a086e 100644
--- a/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.h
+++ b/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_HAKA_TRAP_H_
-#define _Z_BG_HAKA_TRAP_H_
+#ifndef Z_BG_HAKA_TRAP_H
+#define Z_BG_HAKA_TRAP_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.h b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.h
index 7d4e976e93..7d13044e3a 100644
--- a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.h
+++ b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_HAKA_TUBO_H_
-#define _Z_BG_HAKA_TUBO_H_
+#ifndef Z_BG_HAKA_TUBO_H
+#define Z_BG_HAKA_TUBO_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.h b/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.h
index 367589ba33..0374215158 100644
--- a/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.h
+++ b/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_HAKA_WATER_H_
-#define _Z_BG_HAKA_WATER_H_
+#ifndef Z_BG_HAKA_WATER_H
+#define Z_BG_HAKA_WATER_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.h b/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.h
index 6583778393..eafdcc8881 100644
--- a/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.h
+++ b/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_HAKA_ZOU_H_
-#define _Z_BG_HAKA_ZOU_H_
+#ifndef Z_BG_HAKA_ZOU_H
+#define Z_BG_HAKA_ZOU_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.h b/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.h
index dfe459a75f..e816bcf7a4 100644
--- a/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.h
+++ b/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_HEAVY_BLOCK_H_
-#define _Z_BG_HEAVY_BLOCK_H_
+#ifndef Z_BG_HEAVY_BLOCK_H
+#define Z_BG_HEAVY_BLOCK_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.h b/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.h
index 72def49776..de3b647b77 100644
--- a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.h
+++ b/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_HIDAN_CURTAIN_H_
-#define _Z_BG_HIDAN_CURTAIN_H_
+#ifndef Z_BG_HIDAN_CURTAIN_H
+#define Z_BG_HIDAN_CURTAIN_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.h b/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.h
index 2b65324c84..53d740114e 100644
--- a/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.h
+++ b/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_HIDAN_DALM_H_
-#define _Z_BG_HIDAN_DALM_H_
+#ifndef Z_BG_HIDAN_DALM_H
+#define Z_BG_HIDAN_DALM_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.h b/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.h
index 0f27e509bb..8ea5aedfe1 100644
--- a/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.h
+++ b/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_HIDAN_FIREWALL_H_
-#define _Z_BG_HIDAN_FIREWALL_H_
+#ifndef Z_BG_HIDAN_FIREWALL_H
+#define Z_BG_HIDAN_FIREWALL_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.h b/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.h
index 790dd7cff8..b18da3e95f 100644
--- a/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.h
+++ b/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_HIDAN_FSLIFT_H_
-#define _Z_BG_HIDAN_FSLIFT_H_
+#ifndef Z_BG_HIDAN_FSLIFT_H
+#define Z_BG_HIDAN_FSLIFT_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.h b/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.h
index 8b4495d1a6..c0fd6db5f0 100644
--- a/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.h
+++ b/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_HIDAN_FWBIG_H_
-#define _Z_BG_HIDAN_FWBIG_H_
+#ifndef Z_BG_HIDAN_FWBIG_H
+#define Z_BG_HIDAN_FWBIG_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.h b/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.h
index ab66dfa96c..223ac6278f 100644
--- a/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.h
+++ b/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_HIDAN_HAMSTEP_H_
-#define _Z_BG_HIDAN_HAMSTEP_H_
+#ifndef Z_BG_HIDAN_HAMSTEP_H
+#define Z_BG_HIDAN_HAMSTEP_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.h b/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.h
index 9a71c2037e..3333f5bc4f 100644
--- a/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.h
+++ b/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_HIDAN_HROCK_H_
-#define _Z_BG_HIDAN_HROCK_H_
+#ifndef Z_BG_HIDAN_HROCK_H
+#define Z_BG_HIDAN_HROCK_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.h b/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.h
index f10c1fc528..5507726ae9 100644
--- a/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.h
+++ b/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_HIDAN_KOUSI_H_
-#define _Z_BG_HIDAN_KOUSI_H_
+#ifndef Z_BG_HIDAN_KOUSI_H
+#define Z_BG_HIDAN_KOUSI_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.h b/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.h
index 7688f07c5f..5b59c09ebe 100644
--- a/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.h
+++ b/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_HIDAN_KOWARERUKABE_H_
-#define _Z_BG_HIDAN_KOWARERUKABE_H_
+#ifndef Z_BG_HIDAN_KOWARERUKABE_H
+#define Z_BG_HIDAN_KOWARERUKABE_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.h b/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.h
index 6ed52691a2..a65c4234ea 100644
--- a/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.h
+++ b/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_HIDAN_ROCK_H_
-#define _Z_BG_HIDAN_ROCK_H_
+#ifndef Z_BG_HIDAN_ROCK_H
+#define Z_BG_HIDAN_ROCK_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.h b/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.h
index fc015c6002..cfbd5d3e5e 100644
--- a/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.h
+++ b/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_HIDAN_RSEKIZOU_H_
-#define _Z_BG_HIDAN_RSEKIZOU_H_
+#ifndef Z_BG_HIDAN_RSEKIZOU_H
+#define Z_BG_HIDAN_RSEKIZOU_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.h b/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.h
index 9dca031099..c059f57cbc 100644
--- a/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.h
+++ b/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_HIDAN_SEKIZOU_H_
-#define _Z_BG_HIDAN_SEKIZOU_H_
+#ifndef Z_BG_HIDAN_SEKIZOU_H
+#define Z_BG_HIDAN_SEKIZOU_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.h b/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.h
index 7d45bedb53..f31999c3bb 100644
--- a/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.h
+++ b/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_HIDAN_SIMA_H_
-#define _Z_BG_HIDAN_SIMA_H_
+#ifndef Z_BG_HIDAN_SIMA_H
+#define Z_BG_HIDAN_SIMA_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.h b/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.h
index 5a63426fe8..9147c8c769 100644
--- a/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.h
+++ b/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_HIDAN_SYOKU_H_
-#define _Z_BG_HIDAN_SYOKU_H_
+#ifndef Z_BG_HIDAN_SYOKU_H
+#define Z_BG_HIDAN_SYOKU_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.h b/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.h
index b38faf3958..ef9872823f 100644
--- a/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.h
+++ b/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_ICE_OBJECTS_H_
-#define _Z_BG_ICE_OBJECTS_H_
+#ifndef Z_BG_ICE_OBJECTS_H
+#define Z_BG_ICE_OBJECTS_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.h b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.h
index a667c4790e..6f67f274e5 100644
--- a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.h
+++ b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_ICE_SHELTER_H_
-#define _Z_BG_ICE_SHELTER_H_
+#ifndef Z_BG_ICE_SHELTER_H
+#define Z_BG_ICE_SHELTER_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.h b/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.h
index 6dc0bc9a17..68ac83f102 100644
--- a/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.h
+++ b/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_ICE_SHUTTER_H_
-#define _Z_BG_ICE_SHUTTER_H_
+#ifndef Z_BG_ICE_SHUTTER_H
+#define Z_BG_ICE_SHUTTER_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.h b/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.h
index 28751ce16a..aff6417dfb 100644
--- a/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.h
+++ b/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_ICE_TURARA_H_
-#define _Z_BG_ICE_TURARA_H_
+#ifndef Z_BG_ICE_TURARA_H
+#define Z_BG_ICE_TURARA_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.h b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.h
index 3b832286b8..ba6e294d47 100644
--- a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.h
+++ b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_INGATE_H_
-#define _Z_BG_INGATE_H_
+#ifndef Z_BG_INGATE_H
+#define Z_BG_INGATE_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.h b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.h
index c226d66c43..fbcc7afc03 100644
--- a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.h
+++ b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_JYA_1FLIFT_H_
-#define _Z_BG_JYA_1FLIFT_H_
+#ifndef Z_BG_JYA_1FLIFT_H
+#define Z_BG_JYA_1FLIFT_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.h b/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.h
index c7724396c3..e15a42fe88 100644
--- a/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.h
+++ b/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_JYA_AMISHUTTER_H_
-#define _Z_BG_JYA_AMISHUTTER_H_
+#ifndef Z_BG_JYA_AMISHUTTER_H
+#define Z_BG_JYA_AMISHUTTER_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.h b/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.h
index a60ad009f0..298d956927 100644
--- a/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.h
+++ b/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_JYA_BIGMIRROR_H_
-#define _Z_BG_JYA_BIGMIRROR_H_
+#ifndef Z_BG_JYA_BIGMIRROR_H
+#define Z_BG_JYA_BIGMIRROR_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.h b/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.h
index 3e08d23c90..2d58de5c12 100644
--- a/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.h
+++ b/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_JYA_BLOCK_H_
-#define _Z_BG_JYA_BLOCK_H_
+#ifndef Z_BG_JYA_BLOCK_H
+#define Z_BG_JYA_BLOCK_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.h b/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.h
index 56b0e92a81..aa91448f3d 100644
--- a/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.h
+++ b/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_JYA_BOMBCHUIWA_H_
-#define _Z_BG_JYA_BOMBCHUIWA_H_
+#ifndef Z_BG_JYA_BOMBCHUIWA_H
+#define Z_BG_JYA_BOMBCHUIWA_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.h b/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.h
index 19d83b8cf3..879291f87c 100644
--- a/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.h
+++ b/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_JYA_BOMBIWA_H_
-#define _Z_BG_JYA_BOMBIWA_H_
+#ifndef Z_BG_JYA_BOMBIWA_H
+#define Z_BG_JYA_BOMBIWA_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.h b/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.h
index b5bfd0a761..f9ad1e6c5b 100644
--- a/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.h
+++ b/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_JYA_COBRA_H_
-#define _Z_BG_JYA_COBRA_H_
+#ifndef Z_BG_JYA_COBRA_H
+#define Z_BG_JYA_COBRA_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.h b/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.h
index e257eb43d6..803f30d95c 100644
--- a/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.h
+++ b/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_JYA_GOROIWA_H_
-#define _Z_BG_JYA_GOROIWA_H_
+#ifndef Z_BG_JYA_GOROIWA_H
+#define Z_BG_JYA_GOROIWA_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.h b/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.h
index 09a00c54bc..6cdcf6ee5d 100644
--- a/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.h
+++ b/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_JYA_HAHENIRON_H_
-#define _Z_BG_JYA_HAHENIRON_H_
+#ifndef Z_BG_JYA_HAHENIRON_H
+#define Z_BG_JYA_HAHENIRON_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.h b/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.h
index 1c65faee0d..1abdd4be19 100644
--- a/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.h
+++ b/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_JYA_IRONOBJ_H_
-#define _Z_BG_JYA_IRONOBJ_H_
+#ifndef Z_BG_JYA_IRONOBJ_H
+#define Z_BG_JYA_IRONOBJ_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.h b/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.h
index 050b4dd96b..b57f51838b 100644
--- a/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.h
+++ b/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_JYA_KANAAMI_H_
-#define _Z_BG_JYA_KANAAMI_H_
+#ifndef Z_BG_JYA_KANAAMI_H
+#define Z_BG_JYA_KANAAMI_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.h b/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.h
index 1eaa7d3f3f..2b5bc918f5 100644
--- a/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.h
+++ b/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_JYA_LIFT_H_
-#define _Z_BG_JYA_LIFT_H_
+#ifndef Z_BG_JYA_LIFT_H
+#define Z_BG_JYA_LIFT_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.h b/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.h
index f0741ce9c0..f4a859c31f 100644
--- a/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.h
+++ b/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_JYA_MEGAMI_H_
-#define _Z_BG_JYA_MEGAMI_H_
+#ifndef Z_BG_JYA_MEGAMI_H
+#define Z_BG_JYA_MEGAMI_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.h b/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.h
index 041539701e..d2cb8ff973 100644
--- a/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.h
+++ b/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_JYA_ZURERUKABE_H_
-#define _Z_BG_JYA_ZURERUKABE_H_
+#ifndef Z_BG_JYA_ZURERUKABE_H
+#define Z_BG_JYA_ZURERUKABE_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.h b/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.h
index 5bdc0b87eb..cf27ca1827 100644
--- a/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.h
+++ b/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_MENKURI_EYE_H_
-#define _Z_BG_MENKURI_EYE_H_
+#ifndef Z_BG_MENKURI_EYE_H
+#define Z_BG_MENKURI_EYE_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.h b/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.h
index af892a437a..c65b08d6e9 100644
--- a/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.h
+++ b/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_MENKURI_KAITEN_H_
-#define _Z_BG_MENKURI_KAITEN_H_
+#ifndef Z_BG_MENKURI_KAITEN_H
+#define Z_BG_MENKURI_KAITEN_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.h b/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.h
index 3554168611..f7cb56a5bf 100644
--- a/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.h
+++ b/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_MENKURI_NISEKABE_H_
-#define _Z_BG_MENKURI_NISEKABE_H_
+#ifndef Z_BG_MENKURI_NISEKABE_H
+#define Z_BG_MENKURI_NISEKABE_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.h b/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.h
index 85617dd28b..b4172f8d57 100644
--- a/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.h
+++ b/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_MIZU_BWALL_H_
-#define _Z_BG_MIZU_BWALL_H_
+#ifndef Z_BG_MIZU_BWALL_H
+#define Z_BG_MIZU_BWALL_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.h b/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.h
index 02e249c061..bf17eeac26 100644
--- a/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.h
+++ b/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_MIZU_MOVEBG_H_
-#define _Z_BG_MIZU_MOVEBG_H_
+#ifndef Z_BG_MIZU_MOVEBG_H
+#define Z_BG_MIZU_MOVEBG_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.h b/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.h
index f7fe99dfd5..1889da3006 100644
--- a/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.h
+++ b/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_MIZU_SHUTTER_H_
-#define _Z_BG_MIZU_SHUTTER_H_
+#ifndef Z_BG_MIZU_SHUTTER_H
+#define Z_BG_MIZU_SHUTTER_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.h b/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.h
index 8eaf7624d6..528a9386be 100644
--- a/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.h
+++ b/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_MIZU_UZU_H_
-#define _Z_BG_MIZU_UZU_H_
+#ifndef Z_BG_MIZU_UZU_H
+#define Z_BG_MIZU_UZU_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.h b/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.h
index 710af4e95f..cb9d96bca6 100644
--- a/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.h
+++ b/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_MIZU_WATER_H_
-#define _Z_BG_MIZU_WATER_H_
+#ifndef Z_BG_MIZU_WATER_H
+#define Z_BG_MIZU_WATER_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.h b/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.h
index 7245083f9c..dd5964ed4f 100644
--- a/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.h
+++ b/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_MJIN_H_
-#define _Z_BG_MJIN_H_
+#ifndef Z_BG_MJIN_H
+#define Z_BG_MJIN_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.h b/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.h
index 7ff0f1a3ea..7f18e8b0c6 100644
--- a/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.h
+++ b/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_MORI_BIGST_H_
-#define _Z_BG_MORI_BIGST_H_
+#ifndef Z_BG_MORI_BIGST_H
+#define Z_BG_MORI_BIGST_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.h b/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.h
index d72ff865f7..6c202bb222 100644
--- a/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.h
+++ b/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_MORI_ELEVATOR_H_
-#define _Z_BG_MORI_ELEVATOR_H_
+#ifndef Z_BG_MORI_ELEVATOR_H
+#define Z_BG_MORI_ELEVATOR_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.h b/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.h
index 030d007832..55c07ca922 100644
--- a/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.h
+++ b/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_MORI_HASHIGO_H_
-#define _Z_BG_MORI_HASHIGO_H_
+#ifndef Z_BG_MORI_HASHIGO_H
+#define Z_BG_MORI_HASHIGO_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.h b/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.h
index 8129c1af16..447acdab96 100644
--- a/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.h
+++ b/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_MORI_HASHIRA4_H_
-#define _Z_BG_MORI_HASHIRA4_H_
+#ifndef Z_BG_MORI_HASHIRA4_H
+#define Z_BG_MORI_HASHIRA4_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.h b/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.h
index aec6b50c10..a8187138c6 100644
--- a/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.h
+++ b/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_MORI_HINERI_H_
-#define _Z_BG_MORI_HINERI_H_
+#ifndef Z_BG_MORI_HINERI_H
+#define Z_BG_MORI_HINERI_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.h b/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.h
index ddb601291d..be90323379 100644
--- a/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.h
+++ b/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_MORI_IDOMIZU_H_
-#define _Z_BG_MORI_IDOMIZU_H_
+#ifndef Z_BG_MORI_IDOMIZU_H
+#define Z_BG_MORI_IDOMIZU_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.h b/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.h
index 9d39f85107..aa52d21a4c 100644
--- a/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.h
+++ b/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_MORI_KAITENKABE_H_
-#define _Z_BG_MORI_KAITENKABE_H_
+#ifndef Z_BG_MORI_KAITENKABE_H
+#define Z_BG_MORI_KAITENKABE_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.h b/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.h
index 16654540f4..305e48a0a3 100644
--- a/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.h
+++ b/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_MORI_RAKKATENJO_H_
-#define _Z_BG_MORI_RAKKATENJO_H_
+#ifndef Z_BG_MORI_RAKKATENJO_H
+#define Z_BG_MORI_RAKKATENJO_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.h b/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.h
index d0d90feec3..3023774f94 100644
--- a/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.h
+++ b/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_PO_EVENT_H_
-#define _Z_BG_PO_EVENT_H_
+#ifndef Z_BG_PO_EVENT_H
+#define Z_BG_PO_EVENT_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.h b/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.h
index 159e13d5a5..8bb84f0fe5 100644
--- a/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.h
+++ b/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_PO_SYOKUDAI_H_
-#define _Z_BG_PO_SYOKUDAI_H_
+#ifndef Z_BG_PO_SYOKUDAI_H
+#define Z_BG_PO_SYOKUDAI_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.h b/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.h
index cb62c73e22..31b8aac83b 100644
--- a/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.h
+++ b/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_PUSHBOX_H_
-#define _Z_BG_PUSHBOX_H_
+#ifndef Z_BG_PUSHBOX_H
+#define Z_BG_PUSHBOX_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.h b/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.h
index 6b42a9716e..fa39ad76cd 100644
--- a/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.h
+++ b/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_RELAY_OBJECTS_H_
-#define _Z_BG_RELAY_OBJECTS_H_
+#ifndef Z_BG_RELAY_OBJECTS_H
+#define Z_BG_RELAY_OBJECTS_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.h b/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.h
index fa62d54e38..de282476d9 100644
--- a/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.h
+++ b/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_SPOT00_BREAK_H
-#define _Z_BG_SPOT00_BREAK_H_
+#ifndef Z_BG_SPOT00_BREAK_H
+#define Z_BG_SPOT00_BREAK_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.h b/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.h
index a238d6f6dc..71d41f9ad2 100644
--- a/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.h
+++ b/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_SPOT00_HANEBASI_H_
-#define _Z_BG_SPOT00_HANEBASI_H_
+#ifndef Z_BG_SPOT00_HANEBASI_H
+#define Z_BG_SPOT00_HANEBASI_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.h b/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.h
index 1aefad5fe1..ba0ece2727 100644
--- a/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.h
+++ b/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_SPOT01_FUSYA_H_
-#define _Z_BG_SPOT01_FUSYA_H_
+#ifndef Z_BG_SPOT01_FUSYA_H
+#define Z_BG_SPOT01_FUSYA_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.h b/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.h
index 990433c44f..f3779352f0 100644
--- a/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.h
+++ b/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_SPOT01_IDOHASHIRA_H_
-#define _Z_BG_SPOT01_IDOHASHIRA_H_
+#ifndef Z_BG_SPOT01_IDOHASHIRA_H
+#define Z_BG_SPOT01_IDOHASHIRA_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.h b/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.h
index f494ccc0af..35087146e1 100644
--- a/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.h
+++ b/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_SPOT01_IDOMIZU_H_
-#define _Z_BG_SPOT01_IDOMIZU_H_
+#ifndef Z_BG_SPOT01_IDOMIZU_H
+#define Z_BG_SPOT01_IDOMIZU_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.h b/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.h
index d0dd0f5212..9356c2a976 100644
--- a/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.h
+++ b/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_SPOT01_IDOSOKO_H_
-#define _Z_BG_SPOT01_IDOSOKO_H_
+#ifndef Z_BG_SPOT01_IDOSOKO_H
+#define Z_BG_SPOT01_IDOSOKO_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.h b/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.h
index 077c57afaa..0ee7d814ef 100644
--- a/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.h
+++ b/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_SPOT01_OBJECTS2_H_
-#define _Z_BG_SPOT01_OBJECTS2_H_
+#ifndef Z_BG_SPOT01_OBJECTS2_H
+#define Z_BG_SPOT01_OBJECTS2_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.h b/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.h
index 64f6625994..89bbf7d5e9 100644
--- a/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.h
+++ b/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_SPOT02_OBJECTS_H_
-#define _Z_BG_SPOT02_OBJECTS_H_
+#ifndef Z_BG_SPOT02_OBJECTS_H
+#define Z_BG_SPOT02_OBJECTS_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.h b/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.h
index afb1367cfd..405ad96968 100644
--- a/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.h
+++ b/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_SPOT03_TAKI_H_
-#define _Z_BG_SPOT03_TAKI_H_
+#ifndef Z_BG_SPOT03_TAKI_H
+#define Z_BG_SPOT03_TAKI_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.h b/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.h
index cd06c03cad..1dc53b792d 100644
--- a/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.h
+++ b/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_SPOT05_SOKO_H_
-#define _Z_BG_SPOT05_SOKO_H_
+#ifndef Z_BG_SPOT05_SOKO_H
+#define Z_BG_SPOT05_SOKO_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.h b/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.h
index a78b988f1a..2deb727b05 100644
--- a/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.h
+++ b/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_SPOT06_OBJECTS_H_
-#define _Z_BG_SPOT06_OBJECTS_H_
+#ifndef Z_BG_SPOT06_OBJECTS_H
+#define Z_BG_SPOT06_OBJECTS_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.h b/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.h
index 9f68b32eac..c033c68fb6 100644
--- a/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.h
+++ b/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_SPOT07_TAKI_H_
-#define _Z_BG_SPOT07_TAKI_H_
+#ifndef Z_BG_SPOT07_TAKI_H
+#define Z_BG_SPOT07_TAKI_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.h b/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.h
index 98ea353527..3be139505d 100644
--- a/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.h
+++ b/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_SPOT08_BAKUDANKABE_H_
-#define _Z_BG_SPOT08_BAKUDANKABE_H_
+#ifndef Z_BG_SPOT08_BAKUDANKABE_H
+#define Z_BG_SPOT08_BAKUDANKABE_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.h b/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.h
index 6c91f516b8..2fc0b2a722 100644
--- a/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.h
+++ b/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_SPOT08_ICEBLOCK_H_
-#define _Z_BG_SPOT08_ICEBLOCK_H_
+#ifndef Z_BG_SPOT08_ICEBLOCK_H
+#define Z_BG_SPOT08_ICEBLOCK_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.h b/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.h
index e25bd199fb..a09ce32eda 100644
--- a/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.h
+++ b/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_SPOT09_OBJ_H_
-#define _Z_BG_SPOT09_OBJ_H_
+#ifndef Z_BG_SPOT09_OBJ_H
+#define Z_BG_SPOT09_OBJ_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.h b/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.h
index a1649f0b8e..b18f5c084b 100644
--- a/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.h
+++ b/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_SPOT11_BAKUDANKABE_H_
-#define _Z_BG_SPOT11_BAKUDANKABE_H_
+#ifndef Z_BG_SPOT11_BAKUDANKABE_H
+#define Z_BG_SPOT11_BAKUDANKABE_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.h b/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.h
index ee980bfb05..a1e18e87ab 100644
--- a/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.h
+++ b/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_SPOT11_OASIS_H_
-#define _Z_BG_SPOT11_OASIS_H_
+#ifndef Z_BG_SPOT11_OASIS_H
+#define Z_BG_SPOT11_OASIS_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.h b/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.h
index 3dd0f24584..361873d25d 100644
--- a/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.h
+++ b/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_SPOT12_GATE_H_
-#define _Z_BG_SPOT12_GATE_H_
+#ifndef Z_BG_SPOT12_GATE_H
+#define Z_BG_SPOT12_GATE_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.h b/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.h
index a1fbaaac3e..b8c8ef7390 100644
--- a/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.h
+++ b/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_SPOT12_SAKU_H_
-#define _Z_BG_SPOT12_SAKU_H_
+#ifndef Z_BG_SPOT12_SAKU_H
+#define Z_BG_SPOT12_SAKU_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.h b/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.h
index 09ca21df82..d1e8e86b79 100644
--- a/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.h
+++ b/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_SPOT15_RRBOX_H_
-#define _Z_BG_SPOT15_RRBOX_H_
+#ifndef Z_BG_SPOT15_RRBOX_H
+#define Z_BG_SPOT15_RRBOX_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.h b/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.h
index bc423e3cac..d722b80e94 100644
--- a/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.h
+++ b/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_SPOT15_SAKU_H_
-#define _Z_BG_SPOT15_SAKU_H_
+#ifndef Z_BG_SPOT15_SAKU_H
+#define Z_BG_SPOT15_SAKU_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.h b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.h
index e14ee09980..924a0b1f7a 100644
--- a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.h
+++ b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_SPOT16_BOMBSTONE_H_
-#define _Z_BG_SPOT16_BOMBSTONE_H_
+#ifndef Z_BG_SPOT16_BOMBSTONE_H
+#define Z_BG_SPOT16_BOMBSTONE_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.h b/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.h
index e854db83bd..051e45cf58 100644
--- a/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.h
+++ b/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_SPOT16_DOUGHNUT_H_
-#define _Z_BG_SPOT16_DOUGHNUT_H_
+#ifndef Z_BG_SPOT16_DOUGHNUT_H
+#define Z_BG_SPOT16_DOUGHNUT_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.h b/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.h
index 2a2fbf48ba..8928435408 100644
--- a/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.h
+++ b/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_SPOT17_BAKUDANKABE_H_
-#define _Z_BG_SPOT17_BAKUDANKABE_H_
+#ifndef Z_BG_SPOT17_BAKUDANKABE_H
+#define Z_BG_SPOT17_BAKUDANKABE_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.h b/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.h
index c18f5c5713..6a44fa14cf 100644
--- a/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.h
+++ b/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_SPOT17_FUNEN_H_
-#define _Z_BG_SPOT17_FUNEN_H_
+#ifndef Z_BG_SPOT17_FUNEN_H
+#define Z_BG_SPOT17_FUNEN_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.h b/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.h
index a23d3f51ce..74aaa72b98 100644
--- a/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.h
+++ b/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_SPOT18_BASKET_H_
-#define _Z_BG_SPOT18_BASKET_H_
+#ifndef Z_BG_SPOT18_BASKET_H
+#define Z_BG_SPOT18_BASKET_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.h b/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.h
index bff2006325..1150611cd2 100644
--- a/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.h
+++ b/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_SPOT18_FUTA_H_
-#define _Z_BG_SPOT18_FUTA_H_
+#ifndef Z_BG_SPOT18_FUTA_H
+#define Z_BG_SPOT18_FUTA_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.h b/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.h
index 2ac7330681..ee257022e4 100644
--- a/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.h
+++ b/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_SPOT18_OBJ_H_
-#define _Z_BG_SPOT18_OBJ_H_
+#ifndef Z_BG_SPOT18_OBJ_H
+#define Z_BG_SPOT18_OBJ_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.h b/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.h
index 0e1f66e1a0..b24857b976 100644
--- a/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.h
+++ b/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_SPOT18_SHUTTER_H_
-#define _Z_BG_SPOT18_SHUTTER_H_
+#ifndef Z_BG_SPOT18_SHUTTER_H
+#define Z_BG_SPOT18_SHUTTER_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.h b/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.h
index b5acee66bd..04c9dcab66 100644
--- a/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.h
+++ b/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_SST_FLOOR_H_
-#define _Z_BG_SST_FLOOR_H_
+#ifndef Z_BG_SST_FLOOR_H
+#define Z_BG_SST_FLOOR_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.h b/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.h
index 5199d0cba1..865068b12b 100644
--- a/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.h
+++ b/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_TOKI_HIKARI_H_
-#define _Z_BG_TOKI_HIKARI_H_
+#ifndef Z_BG_TOKI_HIKARI_H
+#define Z_BG_TOKI_HIKARI_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.h b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.h
index e6f177bc79..1891110e72 100644
--- a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.h
+++ b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_TOKI_SWD_H_
-#define _Z_BG_TOKI_SWD_H_
+#ifndef Z_BG_TOKI_SWD_H
+#define Z_BG_TOKI_SWD_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.h b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.h
index 749c717f35..7c704067ee 100644
--- a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.h
+++ b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_TREEMOUTH_H_
-#define _Z_BG_TREEMOUTH_H_
+#ifndef Z_BG_TREEMOUTH_H
+#define Z_BG_TREEMOUTH_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.h b/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.h
index ecda8ef438..19142ec4c8 100644
--- a/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.h
+++ b/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_UMAJUMP_H_
-#define _Z_BG_UMAJUMP_H_
+#ifndef Z_BG_UMAJUMP_H
+#define Z_BG_UMAJUMP_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.h b/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.h
index ae3930b350..42fdf5cfb5 100644
--- a/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.h
+++ b/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_VB_SIMA_H_
-#define _Z_BG_VB_SIMA_H_
+#ifndef Z_BG_VB_SIMA_H
+#define Z_BG_VB_SIMA_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.h b/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.h
index 115ebda933..4ffe1fad42 100644
--- a/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.h
+++ b/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_YDAN_HASI_H_
-#define _Z_BG_YDAN_HASI_H_
+#ifndef Z_BG_YDAN_HASI_H
+#define Z_BG_YDAN_HASI_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.h b/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.h
index 7c14f6a3b8..48aeb5df8e 100644
--- a/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.h
+++ b/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_YDAN_MARUTA_H_
-#define _Z_BG_YDAN_MARUTA_H_
+#ifndef Z_BG_YDAN_MARUTA_H
+#define Z_BG_YDAN_MARUTA_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.h b/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.h
index 0273346e41..65f1faa8f1 100644
--- a/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.h
+++ b/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_YDAN_SP_H_
-#define _Z_BG_YDAN_SP_H_
+#ifndef Z_BG_YDAN_SP_H
+#define Z_BG_YDAN_SP_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.h b/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.h
index 17b87f4f9f..63cf24ea5c 100644
--- a/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.h
+++ b/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BG_ZG_H_
-#define _Z_BG_ZG_H_
+#ifndef Z_BG_ZG_H
+#define Z_BG_ZG_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.h b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.h
index f903b5620f..62aefe8cc0 100644
--- a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.h
+++ b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BOSS_DODONGO_H_
-#define _Z_BOSS_DODONGO_H_
+#ifndef Z_BOSS_DODONGO_H
+#define Z_BOSS_DODONGO_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.h b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.h
index 55c88f52f6..ea24fd346e 100644
--- a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.h
+++ b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BOSS_FD_H_
-#define _Z_BOSS_FD_H_
+#ifndef Z_BOSS_FD_H
+#define Z_BOSS_FD_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.h b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.h
index f3fd07d461..afafdbba32 100644
--- a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.h
+++ b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BOSS_FD2_H_
-#define _Z_BOSS_FD2_H_
+#ifndef Z_BOSS_FD2_H
+#define Z_BOSS_FD2_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.h b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.h
index b6f7dea341..3b63be243a 100644
--- a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.h
+++ b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BOSS_GANON_H_
-#define _Z_BOSS_GANON_H_
+#ifndef Z_BOSS_GANON_H
+#define Z_BOSS_GANON_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.h b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.h
index 1f5435fb41..3d26252311 100644
--- a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.h
+++ b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BOSS_GANON2_H_
-#define _Z_BOSS_GANON2_H_
+#ifndef Z_BOSS_GANON2_H
+#define Z_BOSS_GANON2_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.h b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.h
index b8970626df..8b0616baca 100644
--- a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.h
+++ b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BOSS_GANONDROF_H_
-#define _Z_BOSS_GANONDROF_H_
+#ifndef Z_BOSS_GANONDROF_H
+#define Z_BOSS_GANONDROF_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.h b/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.h
index ed21d0f1dd..22143f1c67 100644
--- a/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.h
+++ b/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BOSS_GOMA_H_
-#define _Z_BOSS_GOMA_H_
+#ifndef Z_BOSS_GOMA_H
+#define Z_BOSS_GOMA_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.h b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.h
index 8c643084ab..d676d447e9 100644
--- a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.h
+++ b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BOSS_MO_H_
-#define _Z_BOSS_MO_H_
+#ifndef Z_BOSS_MO_H
+#define Z_BOSS_MO_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.h b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.h
index ac4589e462..8b2b311d6e 100644
--- a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.h
+++ b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BOSS_SST_H_
-#define _Z_BOSS_SST_H_
+#ifndef Z_BOSS_SST_H
+#define Z_BOSS_SST_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.h b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.h
index 0f9e871d3d..575997c267 100644
--- a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.h
+++ b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BOSS_TW_H_
-#define _Z_BOSS_TW_H_
+#ifndef Z_BOSS_TW_H
+#define Z_BOSS_TW_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Boss_Va/z_boss_va.h b/src/overlays/actors/ovl_Boss_Va/z_boss_va.h
index f0fddccf36..5d5b1b4338 100644
--- a/src/overlays/actors/ovl_Boss_Va/z_boss_va.h
+++ b/src/overlays/actors/ovl_Boss_Va/z_boss_va.h
@@ -1,5 +1,5 @@
-#ifndef _Z_BOSS_VA_H_
-#define _Z_BOSS_VA_H_
+#ifndef Z_BOSS_VA_H
+#define Z_BOSS_VA_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Demo_6K/z_demo_6k.h b/src/overlays/actors/ovl_Demo_6K/z_demo_6k.h
index 567db6e8ea..f144bb9f86 100644
--- a/src/overlays/actors/ovl_Demo_6K/z_demo_6k.h
+++ b/src/overlays/actors/ovl_Demo_6K/z_demo_6k.h
@@ -1,5 +1,5 @@
-#ifndef _Z_DEMO_6K_H_
-#define _Z_DEMO_6K_H_
+#ifndef Z_DEMO_6K_H
+#define Z_DEMO_6K_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Demo_Du/z_demo_du.h b/src/overlays/actors/ovl_Demo_Du/z_demo_du.h
index f0ac0d2a6f..12e509ff7e 100644
--- a/src/overlays/actors/ovl_Demo_Du/z_demo_du.h
+++ b/src/overlays/actors/ovl_Demo_Du/z_demo_du.h
@@ -1,5 +1,5 @@
-#ifndef _Z_DEMO_DU_H_
-#define _Z_DEMO_DU_H_
+#ifndef Z_DEMO_DU_H
+#define Z_DEMO_DU_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.h b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.h
index 6111e012cd..4ba2e29538 100644
--- a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.h
+++ b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.h
@@ -1,5 +1,5 @@
-#ifndef _Z_DEMO_EC_H_
-#define _Z_DEMO_EC_H_
+#ifndef Z_DEMO_EC_H
+#define Z_DEMO_EC_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.h b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.h
index e884042a36..5434b1d368 100644
--- a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.h
+++ b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.h
@@ -1,5 +1,5 @@
-#ifndef _Z_DEMO_EFFECT_H_
-#define _Z_DEMO_EFFECT_H_
+#ifndef Z_DEMO_EFFECT_H
+#define Z_DEMO_EFFECT_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.h b/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.h
index fe2fd153c5..9a446b7c01 100644
--- a/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.h
+++ b/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.h
@@ -1,5 +1,5 @@
-#ifndef _Z_DEMO_EXT_H_
-#define _Z_DEMO_EXT_H_
+#ifndef Z_DEMO_EXT_H
+#define Z_DEMO_EXT_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.h b/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.h
index 5b9ea0aaf1..a16705a83e 100644
--- a/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.h
+++ b/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.h
@@ -1,5 +1,5 @@
-#ifndef _Z_DEMO_GEFF_H_
-#define _Z_DEMO_GEFF_H_
+#ifndef Z_DEMO_GEFF_H
+#define Z_DEMO_GEFF_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.h b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.h
index 57eaaee9d7..0ff2f1bfbc 100644
--- a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.h
+++ b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.h
@@ -1,5 +1,5 @@
-#ifndef _Z_DEMO_GJ_H_
-#define _Z_DEMO_GJ_H_
+#ifndef Z_DEMO_GJ_H
+#define Z_DEMO_GJ_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Demo_Go/z_demo_go.h b/src/overlays/actors/ovl_Demo_Go/z_demo_go.h
index 1055815779..688a8a99c2 100644
--- a/src/overlays/actors/ovl_Demo_Go/z_demo_go.h
+++ b/src/overlays/actors/ovl_Demo_Go/z_demo_go.h
@@ -1,5 +1,5 @@
-#ifndef _Z_DEMO_GO_H_
-#define _Z_DEMO_GO_H_
+#ifndef Z_DEMO_GO_H
+#define Z_DEMO_GO_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.h b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.h
index 6e6abe5a57..842e3ff463 100644
--- a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.h
+++ b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.h
@@ -1,5 +1,5 @@
-#ifndef _Z_DEMO_GT_H_
-#define _Z_DEMO_GT_H_
+#ifndef Z_DEMO_GT_H
+#define Z_DEMO_GT_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.h b/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.h
index a98a1cd2bf..24fe5d0942 100644
--- a/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.h
+++ b/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.h
@@ -1,5 +1,5 @@
-#ifndef _Z_DEMO_IK_H_
-#define _Z_DEMO_IK_H_
+#ifndef Z_DEMO_IK_H
+#define Z_DEMO_IK_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Demo_Im/z_demo_im.h b/src/overlays/actors/ovl_Demo_Im/z_demo_im.h
index aa3ce3e0be..3832d11d2d 100644
--- a/src/overlays/actors/ovl_Demo_Im/z_demo_im.h
+++ b/src/overlays/actors/ovl_Demo_Im/z_demo_im.h
@@ -1,5 +1,5 @@
-#ifndef _Z_DEMO_IM_H_
-#define _Z_DEMO_IM_H_
+#ifndef Z_DEMO_IM_H
+#define Z_DEMO_IM_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h
index 57f2d625d0..efc63ab73f 100644
--- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h
+++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h
@@ -1,5 +1,5 @@
-#ifndef _Z_DEMO_KANKYO_H_
-#define _Z_DEMO_KANKYO_H_
+#ifndef Z_DEMO_KANKYO_H
+#define Z_DEMO_KANKYO_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.h b/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.h
index 4aa389eb44..b8e85058d7 100644
--- a/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.h
+++ b/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.h
@@ -1,5 +1,5 @@
-#ifndef _Z_DEMO_KEKKAI_H_
-#define _Z_DEMO_KEKKAI_H_
+#ifndef Z_DEMO_KEKKAI_H
+#define Z_DEMO_KEKKAI_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.h b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.h
index 373f0e8643..dd3fe27db6 100644
--- a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.h
+++ b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.h
@@ -1,5 +1,5 @@
-#ifndef _Z_DEMO_SA_H_
-#define _Z_DEMO_SA_H_
+#ifndef Z_DEMO_SA_H
+#define Z_DEMO_SA_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.h b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.h
index 4eb809a30a..563d8b31ee 100644
--- a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.h
+++ b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.h
@@ -1,5 +1,5 @@
-#ifndef _Z_DEMO_SHD_H_
-#define _Z_DEMO_SHD_H_
+#ifndef Z_DEMO_SHD_H
+#define Z_DEMO_SHD_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.h b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.h
index ff2c7465b1..d34056ab8f 100644
--- a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.h
+++ b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.h
@@ -1,5 +1,5 @@
-#ifndef _Z_DEMO_TRE_LGT_H_
-#define _Z_DEMO_TRE_LGT_H_
+#ifndef Z_DEMO_TRE_LGT_H
+#define Z_DEMO_TRE_LGT_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Door_Ana/z_door_ana.h b/src/overlays/actors/ovl_Door_Ana/z_door_ana.h
index aaf1b52a99..3ad932b624 100644
--- a/src/overlays/actors/ovl_Door_Ana/z_door_ana.h
+++ b/src/overlays/actors/ovl_Door_Ana/z_door_ana.h
@@ -1,5 +1,5 @@
-#ifndef _Z_DOOR_ANA_H_
-#define _Z_DOOR_ANA_H_
+#ifndef Z_DOOR_ANA_H
+#define Z_DOOR_ANA_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.h b/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.h
index e1dd70a90e..3c6fac3947 100644
--- a/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.h
+++ b/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.h
@@ -1,5 +1,5 @@
-#ifndef _Z_DOOR_GERUDO_H_
-#define _Z_DOOR_GERUDO_H_
+#ifndef Z_DOOR_GERUDO_H
+#define Z_DOOR_GERUDO_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Door_Killer/z_door_killer.h b/src/overlays/actors/ovl_Door_Killer/z_door_killer.h
index 6c3bd843ca..246552f13c 100644
--- a/src/overlays/actors/ovl_Door_Killer/z_door_killer.h
+++ b/src/overlays/actors/ovl_Door_Killer/z_door_killer.h
@@ -1,5 +1,5 @@
-#ifndef _Z_DOOR_KILLER_H_
-#define _Z_DOOR_KILLER_H_
+#ifndef Z_DOOR_KILLER_H
+#define Z_DOOR_KILLER_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.h b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.h
index 16f45263b8..d9a17f07bf 100644
--- a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.h
+++ b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.h
@@ -1,5 +1,5 @@
-#ifndef _Z_DOOR_SHUTTER_H_
-#define _Z_DOOR_SHUTTER_H_
+#ifndef Z_DOOR_SHUTTER_H
+#define Z_DOOR_SHUTTER_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Door_Toki/z_door_toki.h b/src/overlays/actors/ovl_Door_Toki/z_door_toki.h
index 4769acd9f4..35d4d4f91c 100644
--- a/src/overlays/actors/ovl_Door_Toki/z_door_toki.h
+++ b/src/overlays/actors/ovl_Door_Toki/z_door_toki.h
@@ -1,5 +1,5 @@
-#ifndef _Z_DOOR_TOKI_H_
-#define _Z_DOOR_TOKI_H_
+#ifndef Z_DOOR_TOKI_H
+#define Z_DOOR_TOKI_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h
index e9b75b7e42..4f335c81d3 100644
--- a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h
+++ b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h
@@ -1,5 +1,5 @@
-#ifndef _Z_DOOR_WARP1_H_
-#define _Z_DOOR_WARP1_H_
+#ifndef Z_DOOR_WARP1_H
+#define Z_DOOR_WARP1_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.h b/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.h
index ed3939921e..6b201cf5df 100644
--- a/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.h
+++ b/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EFC_ERUPC_H_
-#define _Z_EFC_ERUPC_H_
+#ifndef Z_EFC_ERUPC_H
+#define Z_EFC_ERUPC_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.h b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.h
index 3ee91fbd38..a53866e555 100644
--- a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.h
+++ b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EFF_DUST_H_
-#define _Z_EFF_DUST_H_
+#ifndef Z_EFF_DUST_H
+#define Z_EFF_DUST_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.h b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.h
index 900aeb68b3..1e7fe65a6a 100644
--- a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.h
+++ b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.h
@@ -1,5 +1,5 @@
-#ifndef _Z_ELF_MSG_H_
-#define _Z_ELF_MSG_H_
+#ifndef Z_ELF_MSG_H
+#define Z_ELF_MSG_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.h b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.h
index a61b47799e..741e72cbb6 100644
--- a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.h
+++ b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.h
@@ -1,5 +1,5 @@
-#ifndef _Z_ELF_MSG2_H_
-#define _Z_ELF_MSG2_H_
+#ifndef Z_ELF_MSG2_H
+#define Z_ELF_MSG2_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Am/z_en_am.h b/src/overlays/actors/ovl_En_Am/z_en_am.h
index fd4cc4d20d..6cb4c40ecd 100644
--- a/src/overlays/actors/ovl_En_Am/z_en_am.h
+++ b/src/overlays/actors/ovl_En_Am/z_en_am.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_AM_H_
-#define _Z_EN_AM_H_
+#ifndef Z_EN_AM_H
+#define Z_EN_AM_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Ani/z_en_ani.h b/src/overlays/actors/ovl_En_Ani/z_en_ani.h
index afd29966bc..6ab185cb8b 100644
--- a/src/overlays/actors/ovl_En_Ani/z_en_ani.h
+++ b/src/overlays/actors/ovl_En_Ani/z_en_ani.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_ANI_H_
-#define _Z_EN_ANI_H_
+#ifndef Z_EN_ANI_H
+#define Z_EN_ANI_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Anubice/z_en_anubice.h b/src/overlays/actors/ovl_En_Anubice/z_en_anubice.h
index 6e60d60e8d..68f29fafc5 100644
--- a/src/overlays/actors/ovl_En_Anubice/z_en_anubice.h
+++ b/src/overlays/actors/ovl_En_Anubice/z_en_anubice.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_ANUBICE_H_
-#define _Z_EN_ANUBICE_H_
+#ifndef Z_EN_ANUBICE_H
+#define Z_EN_ANUBICE_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.h b/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.h
index db1e5ea2c0..1ea831ffc4 100644
--- a/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.h
+++ b/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_ANUBICE_FIRE_H_
-#define _Z_EN_ANUBICE_FIRE_H_
+#ifndef Z_EN_ANUBICE_FIRE_H
+#define Z_EN_ANUBICE_FIRE_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.h b/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.h
index 6c2dc04455..45dabd96f6 100644
--- a/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.h
+++ b/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_ANUBICE_TAG_H_
-#define _Z_EN_ANUBICE_TAG_H_
+#ifndef Z_EN_ANUBICE_TAG_H
+#define Z_EN_ANUBICE_TAG_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Arow_Trap/z_en_arow_trap.h b/src/overlays/actors/ovl_En_Arow_Trap/z_en_arow_trap.h
index d7a4c0b709..e29f84d2b2 100644
--- a/src/overlays/actors/ovl_En_Arow_Trap/z_en_arow_trap.h
+++ b/src/overlays/actors/ovl_En_Arow_Trap/z_en_arow_trap.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_AROW_TRAP_H_
-#define _Z_EN_AROW_TRAP_H_
+#ifndef Z_EN_AROW_TRAP_H
+#define Z_EN_AROW_TRAP_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.h b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.h
index 8f0bfc87eb..2cb30afcc7 100644
--- a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.h
+++ b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_ARROW_H_
-#define _Z_EN_ARROW_H_
+#ifndef Z_EN_ARROW_H
+#define Z_EN_ARROW_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.h b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.h
index e510594806..746ecb23c0 100644
--- a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.h
+++ b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_ATTACK_NIW_H_
-#define _Z_EN_ATTACK_NIW_H_
+#ifndef Z_EN_ATTACK_NIW_H
+#define Z_EN_ATTACK_NIW_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Ba/z_en_ba.h b/src/overlays/actors/ovl_En_Ba/z_en_ba.h
index 921b8926a6..008ec9597f 100644
--- a/src/overlays/actors/ovl_En_Ba/z_en_ba.h
+++ b/src/overlays/actors/ovl_En_Ba/z_en_ba.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_BA_H_
-#define _Z_EN_BA_H_
+#ifndef Z_EN_BA_H
+#define Z_EN_BA_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Bb/z_en_bb.h b/src/overlays/actors/ovl_En_Bb/z_en_bb.h
index 4f83cd36e9..e12306fd2c 100644
--- a/src/overlays/actors/ovl_En_Bb/z_en_bb.h
+++ b/src/overlays/actors/ovl_En_Bb/z_en_bb.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_BB_H_
-#define _Z_EN_BB_H_
+#ifndef Z_EN_BB_H
+#define Z_EN_BB_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.h b/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.h
index 7fc1d35c2b..190de9b49b 100644
--- a/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.h
+++ b/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_BDFIRE_H_
-#define _Z_EN_BDFIRE_H_
+#ifndef Z_EN_BDFIRE_H
+#define Z_EN_BDFIRE_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.h b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.h
index 430871202a..2044a18653 100644
--- a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.h
+++ b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_BIGOKUTA_H_
-#define _Z_EN_BIGOKUTA_H_
+#ifndef Z_EN_BIGOKUTA_H
+#define Z_EN_BIGOKUTA_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Bili/z_en_bili.h b/src/overlays/actors/ovl_En_Bili/z_en_bili.h
index 5e85b5cdf9..5e5f6815f7 100644
--- a/src/overlays/actors/ovl_En_Bili/z_en_bili.h
+++ b/src/overlays/actors/ovl_En_Bili/z_en_bili.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_BILI_H_
-#define _Z_EN_BILI_H_
+#ifndef Z_EN_BILI_H
+#define Z_EN_BILI_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Bird/z_en_bird.h b/src/overlays/actors/ovl_En_Bird/z_en_bird.h
index d76e4b29e2..bd5c232982 100644
--- a/src/overlays/actors/ovl_En_Bird/z_en_bird.h
+++ b/src/overlays/actors/ovl_En_Bird/z_en_bird.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_BIRD_H_
-#define _Z_EN_BIRD_H_
+#ifndef Z_EN_BIRD_H
+#define Z_EN_BIRD_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.h b/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.h
index b21a471d08..ada8f21dee 100644
--- a/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.h
+++ b/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_BLKOBJ_H_
-#define _Z_EN_BLKOBJ_H_
+#ifndef Z_EN_BLKOBJ_H
+#define Z_EN_BLKOBJ_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Bom/z_en_bom.h b/src/overlays/actors/ovl_En_Bom/z_en_bom.h
index 58a1823ec0..f6d6f88559 100644
--- a/src/overlays/actors/ovl_En_Bom/z_en_bom.h
+++ b/src/overlays/actors/ovl_En_Bom/z_en_bom.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_BOM_H_
-#define _Z_EN_BOM_H_
+#ifndef Z_EN_BOM_H
+#define Z_EN_BOM_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h
index e46056267f..83b6217cde 100644
--- a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h
+++ b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_BOM_BOWL_MAN_H_
-#define _Z_EN_BOM_BOWL_MAN_H_
+#ifndef Z_EN_BOM_BOWL_MAN_H
+#define Z_EN_BOM_BOWL_MAN_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.h b/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.h
index 1d51217206..af5d8d3e1b 100644
--- a/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.h
+++ b/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_BOM_BOWL_PIT_H_
-#define _Z_EN_BOM_BOWL_PIT_H_
+#ifndef Z_EN_BOM_BOWL_PIT_H
+#define Z_EN_BOM_BOWL_PIT_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.h b/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.h
index 221d6ea94d..b18232ad35 100644
--- a/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.h
+++ b/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_BOM_CHU_H_
-#define _Z_EN_BOM_CHU_H_
+#ifndef Z_EN_BOM_CHU_H
+#define Z_EN_BOM_CHU_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.h b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.h
index 5c09e933e1..e33880451c 100644
--- a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.h
+++ b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_BOMBF_H_
-#define _Z_EN_BOMBF_H_
+#ifndef Z_EN_BOMBF_H
+#define Z_EN_BOMBF_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Boom/z_en_boom.h b/src/overlays/actors/ovl_En_Boom/z_en_boom.h
index 8b18c50d07..cb93b27ddf 100644
--- a/src/overlays/actors/ovl_En_Boom/z_en_boom.h
+++ b/src/overlays/actors/ovl_En_Boom/z_en_boom.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_BOOM_H_
-#define _Z_EN_BOOM_H_
+#ifndef Z_EN_BOOM_H
+#define Z_EN_BOOM_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Box/z_en_box.h b/src/overlays/actors/ovl_En_Box/z_en_box.h
index c7927842c4..f6e698ed53 100644
--- a/src/overlays/actors/ovl_En_Box/z_en_box.h
+++ b/src/overlays/actors/ovl_En_Box/z_en_box.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_BOX_H_
-#define _Z_EN_BOX_H_
+#ifndef Z_EN_BOX_H
+#define Z_EN_BOX_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Brob/z_en_brob.h b/src/overlays/actors/ovl_En_Brob/z_en_brob.h
index 2229ab2b96..4f71d489ef 100644
--- a/src/overlays/actors/ovl_En_Brob/z_en_brob.h
+++ b/src/overlays/actors/ovl_En_Brob/z_en_brob.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_BROB_H_
-#define _Z_EN_BROB_H_
+#ifndef Z_EN_BROB_H
+#define Z_EN_BROB_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.h b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.h
index 83b1b81de5..37594d694a 100644
--- a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.h
+++ b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_BUBBLE_H_
-#define _Z_EN_BUBBLE_H_
+#ifndef Z_EN_BUBBLE_H
+#define Z_EN_BUBBLE_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Butte/z_en_butte.h b/src/overlays/actors/ovl_En_Butte/z_en_butte.h
index cd18955df6..9443e5081b 100644
--- a/src/overlays/actors/ovl_En_Butte/z_en_butte.h
+++ b/src/overlays/actors/ovl_En_Butte/z_en_butte.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_BUTTE_H_
-#define _Z_EN_BUTTE_H_
+#ifndef Z_EN_BUTTE_H
+#define Z_EN_BUTTE_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Bw/z_en_bw.h b/src/overlays/actors/ovl_En_Bw/z_en_bw.h
index 5f61c1491e..3f0ae5ea9f 100644
--- a/src/overlays/actors/ovl_En_Bw/z_en_bw.h
+++ b/src/overlays/actors/ovl_En_Bw/z_en_bw.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_BW_H_
-#define _Z_EN_BW_H_
+#ifndef Z_EN_BW_H
+#define Z_EN_BW_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Bx/z_en_bx.h b/src/overlays/actors/ovl_En_Bx/z_en_bx.h
index b776fe95ca..189349a0f1 100644
--- a/src/overlays/actors/ovl_En_Bx/z_en_bx.h
+++ b/src/overlays/actors/ovl_En_Bx/z_en_bx.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_BX_H_
-#define _Z_EN_BX_H_
+#ifndef Z_EN_BX_H
+#define Z_EN_BX_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Changer/z_en_changer.h b/src/overlays/actors/ovl_En_Changer/z_en_changer.h
index e083b50ef3..6b5560e565 100644
--- a/src/overlays/actors/ovl_En_Changer/z_en_changer.h
+++ b/src/overlays/actors/ovl_En_Changer/z_en_changer.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_CHANGER_H_
-#define _Z_EN_CHANGER_H_
+#ifndef Z_EN_CHANGER_H
+#define Z_EN_CHANGER_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h
index e45187e292..707fbb4a5d 100644
--- a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h
+++ b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_CLEAR_TAG_H_
-#define _Z_EN_CLEAR_TAG_H_
+#ifndef Z_EN_CLEAR_TAG_H
+#define Z_EN_CLEAR_TAG_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Cow/z_en_cow.h b/src/overlays/actors/ovl_En_Cow/z_en_cow.h
index 5d4920c88c..ccb165bf72 100644
--- a/src/overlays/actors/ovl_En_Cow/z_en_cow.h
+++ b/src/overlays/actors/ovl_En_Cow/z_en_cow.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_COW_H_
-#define _Z_EN_COW_H_
+#ifndef Z_EN_COW_H
+#define Z_EN_COW_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Crow/z_en_crow.h b/src/overlays/actors/ovl_En_Crow/z_en_crow.h
index 68375de28f..59447f9cef 100644
--- a/src/overlays/actors/ovl_En_Crow/z_en_crow.h
+++ b/src/overlays/actors/ovl_En_Crow/z_en_crow.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_CROW_H_
-#define _Z_EN_CROW_H_
+#ifndef Z_EN_CROW_H
+#define Z_EN_CROW_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Cs/z_en_cs.h b/src/overlays/actors/ovl_En_Cs/z_en_cs.h
index 7d449cf354..6b2b0d109f 100644
--- a/src/overlays/actors/ovl_En_Cs/z_en_cs.h
+++ b/src/overlays/actors/ovl_En_Cs/z_en_cs.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_CS_H_
-#define _Z_EN_CS_H_
+#ifndef Z_EN_CS_H
+#define Z_EN_CS_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.h b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.h
index 6aed3f6281..f76c9756cd 100644
--- a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.h
+++ b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_DAIKU_H_
-#define _Z_EN_DAIKU_H_
+#ifndef Z_EN_DAIKU_H
+#define Z_EN_DAIKU_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.h b/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.h
index 41325c7022..ebb5187c2b 100644
--- a/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.h
+++ b/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_DAIKU_KAKARIKO_H_
-#define _Z_EN_DAIKU_KAKARIKO_H_
+#ifndef Z_EN_DAIKU_KAKARIKO_H
+#define Z_EN_DAIKU_KAKARIKO_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.h b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.h
index 93068e84d5..fa80ce82dd 100644
--- a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.h
+++ b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_DEKUBABA_H_
-#define _Z_EN_DEKUBABA_H_
+#ifndef Z_EN_DEKUBABA_H
+#define Z_EN_DEKUBABA_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.h b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.h
index 23e0209c10..f80727ac73 100644
--- a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.h
+++ b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_DEKUNUTS_H_
-#define _Z_EN_DEKUNUTS_H_
+#ifndef Z_EN_DEKUNUTS_H
+#define Z_EN_DEKUNUTS_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Dh/z_en_dh.h b/src/overlays/actors/ovl_En_Dh/z_en_dh.h
index 580bd901de..2e82654476 100644
--- a/src/overlays/actors/ovl_En_Dh/z_en_dh.h
+++ b/src/overlays/actors/ovl_En_Dh/z_en_dh.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_DH_H_
-#define _Z_EN_DH_H_
+#ifndef Z_EN_DH_H
+#define Z_EN_DH_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Dha/z_en_dha.h b/src/overlays/actors/ovl_En_Dha/z_en_dha.h
index 070e7e7d3a..7bc146f92a 100644
--- a/src/overlays/actors/ovl_En_Dha/z_en_dha.h
+++ b/src/overlays/actors/ovl_En_Dha/z_en_dha.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_DHA_H_
-#define _Z_EN_DHA_H_
+#ifndef Z_EN_DHA_H
+#define Z_EN_DHA_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.h b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.h
index 003eb463a0..ee361adaac 100644
--- a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.h
+++ b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_DIVING_GAME_H_
-#define _Z_EN_DIVING_GAME_H_
+#ifndef Z_EN_DIVING_GAME_H
+#define Z_EN_DIVING_GAME_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Dns/z_en_dns.h b/src/overlays/actors/ovl_En_Dns/z_en_dns.h
index ed98402b6f..90bd3d0955 100644
--- a/src/overlays/actors/ovl_En_Dns/z_en_dns.h
+++ b/src/overlays/actors/ovl_En_Dns/z_en_dns.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_DNS_H_
-#define _Z_EN_DNS_H_
+#ifndef Z_EN_DNS_H
+#define Z_EN_DNS_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.h b/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.h
index 25fa93f3bf..c2f3b9cdcb 100644
--- a/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.h
+++ b/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_DNT_DEMO_H_
-#define _Z_EN_DNT_DEMO_H_
+#ifndef Z_EN_DNT_DEMO_H
+#define Z_EN_DNT_DEMO_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.h b/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.h
index 9b09332f22..1d809c3090 100644
--- a/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.h
+++ b/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_DNT_JIJI_H_
-#define _Z_EN_DNT_JIJI_H_
+#ifndef Z_EN_DNT_JIJI_H
+#define Z_EN_DNT_JIJI_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.h b/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.h
index 999596bf55..d94da9e101 100644
--- a/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.h
+++ b/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_DNT_NOMAL_H_
-#define _Z_EN_DNT_NOMAL_H_
+#ifndef Z_EN_DNT_NOMAL_H
+#define Z_EN_DNT_NOMAL_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.h b/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.h
index f0b3db0a59..2ca10bd5f6 100644
--- a/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.h
+++ b/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_DODOJR_H_
-#define _Z_EN_DODOJR_H_
+#ifndef Z_EN_DODOJR_H
+#define Z_EN_DODOJR_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.h b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.h
index 6e9797a595..31fb245015 100644
--- a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.h
+++ b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_DODONGO_H_
-#define _Z_EN_DODONGO_H_
+#ifndef Z_EN_DODONGO_H
+#define Z_EN_DODONGO_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Dog/z_en_dog.h b/src/overlays/actors/ovl_En_Dog/z_en_dog.h
index d7560c87d4..afaf027aa6 100644
--- a/src/overlays/actors/ovl_En_Dog/z_en_dog.h
+++ b/src/overlays/actors/ovl_En_Dog/z_en_dog.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_DOG_H_
-#define _Z_EN_DOG_H_
+#ifndef Z_EN_DOG_H
+#define Z_EN_DOG_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Door/z_en_door.h b/src/overlays/actors/ovl_En_Door/z_en_door.h
index 365befb813..94909cb36e 100644
--- a/src/overlays/actors/ovl_En_Door/z_en_door.h
+++ b/src/overlays/actors/ovl_En_Door/z_en_door.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_DOOR_H_
-#define _Z_EN_DOOR_H_
+#ifndef Z_EN_DOOR_H
+#define Z_EN_DOOR_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Ds/z_en_ds.h b/src/overlays/actors/ovl_En_Ds/z_en_ds.h
index d83d9d4482..035332f48a 100644
--- a/src/overlays/actors/ovl_En_Ds/z_en_ds.h
+++ b/src/overlays/actors/ovl_En_Ds/z_en_ds.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_DS_H_
-#define _Z_EN_DS_H_
+#ifndef Z_EN_DS_H
+#define Z_EN_DS_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Du/z_en_du.h b/src/overlays/actors/ovl_En_Du/z_en_du.h
index ca30366851..b5045b5ab2 100644
--- a/src/overlays/actors/ovl_En_Du/z_en_du.h
+++ b/src/overlays/actors/ovl_En_Du/z_en_du.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_DU_H_
-#define _Z_EN_DU_H_
+#ifndef Z_EN_DU_H
+#define Z_EN_DU_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.h b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.h
index 74e0981267..4cb282ac61 100644
--- a/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.h
+++ b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_DY_EXTRA_H_
-#define _Z_EN_DY_EXTRA_H_
+#ifndef Z_EN_DY_EXTRA_H
+#define Z_EN_DY_EXTRA_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Eg/z_en_eg.h b/src/overlays/actors/ovl_En_Eg/z_en_eg.h
index ffad8cf064..86b3898ced 100644
--- a/src/overlays/actors/ovl_En_Eg/z_en_eg.h
+++ b/src/overlays/actors/ovl_En_Eg/z_en_eg.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_EG_H_
-#define _Z_EN_EG_H_
+#ifndef Z_EN_EG_H
+#define Z_EN_EG_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.h b/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.h
index 0d5caf77c0..fbd1529969 100644
--- a/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.h
+++ b/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_EIYER_H_
-#define _Z_EN_EIYER_H_
+#ifndef Z_EN_EIYER_H
+#define Z_EN_EIYER_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Elf/z_en_elf.h b/src/overlays/actors/ovl_En_Elf/z_en_elf.h
index d4542bdca8..1aaa029c79 100644
--- a/src/overlays/actors/ovl_En_Elf/z_en_elf.h
+++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_ELF_H_
-#define _Z_EN_ELF_H_
+#ifndef Z_EN_ELF_H
+#define Z_EN_ELF_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.h b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.h
index fb6359ddea..2df4b11b46 100644
--- a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.h
+++ b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_ENCOUNT1_H_
-#define _Z_EN_ENCOUNT1_H_
+#ifndef Z_EN_ENCOUNT1_H
+#define Z_EN_ENCOUNT1_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.h b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.h
index 1c9ff3cdc8..302affd9a3 100644
--- a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.h
+++ b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_ENCOUNT2_H_
-#define _Z_EN_ENCOUNT2_H_
+#ifndef Z_EN_ENCOUNT2_H
+#define Z_EN_ENCOUNT2_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.h b/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.h
index 5c3daacab0..5dff368592 100644
--- a/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.h
+++ b/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_EX_ITEM_H_
-#define _Z_EN_EX_ITEM_H_
+#ifndef Z_EN_EX_ITEM_H
+#define Z_EN_EX_ITEM_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.h b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.h
index 0932bb8d50..2625aa3b60 100644
--- a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.h
+++ b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_EX_RUPPY_H_
-#define _Z_EN_EX_RUPPY_H_
+#ifndef Z_EN_EX_RUPPY_H
+#define Z_EN_EX_RUPPY_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Fd/z_en_fd.h b/src/overlays/actors/ovl_En_Fd/z_en_fd.h
index 529b6237c0..a00b622c92 100644
--- a/src/overlays/actors/ovl_En_Fd/z_en_fd.h
+++ b/src/overlays/actors/ovl_En_Fd/z_en_fd.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_FD_H_
-#define _Z_EN_FD_H_
+#ifndef Z_EN_FD_H
+#define Z_EN_FD_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.h b/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.h
index 71e0772522..7de1c53fec 100644
--- a/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.h
+++ b/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_FD_FIRE_H_
-#define _Z_EN_FD_FIRE_H_
+#ifndef Z_EN_FD_FIRE_H
+#define Z_EN_FD_FIRE_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.h b/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.h
index d362c81643..8bc564a3fc 100644
--- a/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.h
+++ b/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_FHG_FIRE_H_
-#define _Z_EN_FHG_FIRE_H_
+#ifndef Z_EN_FHG_FIRE_H
+#define Z_EN_FHG_FIRE_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.h b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.h
index 9c6d032413..8dfb334d1d 100644
--- a/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.h
+++ b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_FIRE_ROCK_H_
-#define _Z_EN_FIRE_ROCK_H_
+#ifndef Z_EN_FIRE_ROCK_H
+#define Z_EN_FIRE_ROCK_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.h b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.h
index 6de97149a6..0241d4ebd6 100644
--- a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.h
+++ b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_FIREFLY_H_
-#define _Z_EN_FIREFLY_H_
+#ifndef Z_EN_FIREFLY_H
+#define Z_EN_FIREFLY_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Fish/z_en_fish.h b/src/overlays/actors/ovl_En_Fish/z_en_fish.h
index 3165aa79e7..911f79a451 100644
--- a/src/overlays/actors/ovl_En_Fish/z_en_fish.h
+++ b/src/overlays/actors/ovl_En_Fish/z_en_fish.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_FISH_H_
-#define _Z_EN_FISH_H_
+#ifndef Z_EN_FISH_H
+#define Z_EN_FISH_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.h b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.h
index 38ebf5a57d..52f98fc9f5 100644
--- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.h
+++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_FLOORMAS_H_
-#define _Z_EN_FLOORMAS_H_
+#ifndef Z_EN_FLOORMAS_H
+#define Z_EN_FLOORMAS_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Fr/z_en_fr.h b/src/overlays/actors/ovl_En_Fr/z_en_fr.h
index 3d04997de4..53676ceb53 100644
--- a/src/overlays/actors/ovl_En_Fr/z_en_fr.h
+++ b/src/overlays/actors/ovl_En_Fr/z_en_fr.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_FR_H_
-#define _Z_EN_FR_H_
+#ifndef Z_EN_FR_H
+#define Z_EN_FR_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Fu/z_en_fu.h b/src/overlays/actors/ovl_En_Fu/z_en_fu.h
index eb97d4a7a2..b9de1a1cf2 100644
--- a/src/overlays/actors/ovl_En_Fu/z_en_fu.h
+++ b/src/overlays/actors/ovl_En_Fu/z_en_fu.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_FU_H_
-#define _Z_EN_FU_H_
+#ifndef Z_EN_FU_H
+#define Z_EN_FU_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Fw/z_en_fw.h b/src/overlays/actors/ovl_En_Fw/z_en_fw.h
index 0e17c129b0..f7d245e5e4 100644
--- a/src/overlays/actors/ovl_En_Fw/z_en_fw.h
+++ b/src/overlays/actors/ovl_En_Fw/z_en_fw.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_FW_H_
-#define _Z_EN_FW_H_
+#ifndef Z_EN_FW_H
+#define Z_EN_FW_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Fz/z_en_fz.h b/src/overlays/actors/ovl_En_Fz/z_en_fz.h
index bc2243ad07..536d2525f4 100644
--- a/src/overlays/actors/ovl_En_Fz/z_en_fz.h
+++ b/src/overlays/actors/ovl_En_Fz/z_en_fz.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_FZ_H_
-#define _Z_EN_FZ_H_
+#ifndef Z_EN_FZ_H
+#define Z_EN_FZ_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.h b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.h
index ee9fd6bdbd..dba5b09c02 100644
--- a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.h
+++ b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_G_SWITCH_H_
-#define _Z_EN_G_SWITCH_H_
+#ifndef Z_EN_G_SWITCH_H
+#define Z_EN_G_SWITCH_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.h b/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.h
index a3b9257cec..3b416e59eb 100644
--- a/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.h
+++ b/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_GANON_MANT_H_
-#define _Z_EN_GANON_MANT_H_
+#ifndef Z_EN_GANON_MANT_H
+#define Z_EN_GANON_MANT_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.h b/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.h
index bed38dd7e5..0c301bddca 100644
--- a/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.h
+++ b/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_GANON_ORGAN_H_
-#define _Z_EN_GANON_ORGAN_H_
+#ifndef Z_EN_GANON_ORGAN_H
+#define Z_EN_GANON_ORGAN_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Gb/z_en_gb.h b/src/overlays/actors/ovl_En_Gb/z_en_gb.h
index d8b8a071a5..5de160ff24 100644
--- a/src/overlays/actors/ovl_En_Gb/z_en_gb.h
+++ b/src/overlays/actors/ovl_En_Gb/z_en_gb.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_GB_H_
-#define _Z_EN_GB_H_
+#ifndef Z_EN_GB_H
+#define Z_EN_GB_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.h b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.h
index c7913a26fc..84a96be510 100644
--- a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.h
+++ b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_GE1_H_
-#define _Z_EN_GE1_H_
+#ifndef Z_EN_GE1_H
+#define Z_EN_GE1_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.h b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.h
index 2ac7f3ed68..b9d08f0bb6 100644
--- a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.h
+++ b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_GE2_H_
-#define _Z_EN_GE2_H_
+#ifndef Z_EN_GE2_H
+#define Z_EN_GE2_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.h b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.h
index cab020b6c8..f292c9968a 100644
--- a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.h
+++ b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_GE3_H_
-#define _Z_EN_GE3_H_
+#ifndef Z_EN_GE3_H
+#define Z_EN_GE3_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.h b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.h
index 773ea6987a..b4c3c3e846 100644
--- a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.h
+++ b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_GELDB_H_
-#define _Z_EN_GELDB_H_
+#ifndef Z_EN_GELDB_H
+#define Z_EN_GELDB_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_GirlA/z_en_girla.h b/src/overlays/actors/ovl_En_GirlA/z_en_girla.h
index ea26eba531..1fdc18929c 100644
--- a/src/overlays/actors/ovl_En_GirlA/z_en_girla.h
+++ b/src/overlays/actors/ovl_En_GirlA/z_en_girla.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_GIRLA_H_
-#define _Z_EN_GIRLA_H_
+#ifndef Z_EN_GIRLA_H
+#define Z_EN_GIRLA_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Gm/z_en_gm.h b/src/overlays/actors/ovl_En_Gm/z_en_gm.h
index 01ac62f3f7..94e454e4f0 100644
--- a/src/overlays/actors/ovl_En_Gm/z_en_gm.h
+++ b/src/overlays/actors/ovl_En_Gm/z_en_gm.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_GM_H_
-#define _Z_EN_GM_H_
+#ifndef Z_EN_GM_H
+#define Z_EN_GM_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Go/z_en_go.h b/src/overlays/actors/ovl_En_Go/z_en_go.h
index 50084dbbbe..c62d10ec3f 100644
--- a/src/overlays/actors/ovl_En_Go/z_en_go.h
+++ b/src/overlays/actors/ovl_En_Go/z_en_go.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_GO_H_
-#define _Z_EN_GO_H_
+#ifndef Z_EN_GO_H
+#define Z_EN_GO_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Go2/z_en_go2.h b/src/overlays/actors/ovl_En_Go2/z_en_go2.h
index 011bc0776d..d31eb76787 100644
--- a/src/overlays/actors/ovl_En_Go2/z_en_go2.h
+++ b/src/overlays/actors/ovl_En_Go2/z_en_go2.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_GO2_H_
-#define _Z_EN_GO2_H_
+#ifndef Z_EN_GO2_H
+#define Z_EN_GO2_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Goma/z_en_goma.h b/src/overlays/actors/ovl_En_Goma/z_en_goma.h
index e504400a43..493cf69969 100644
--- a/src/overlays/actors/ovl_En_Goma/z_en_goma.h
+++ b/src/overlays/actors/ovl_En_Goma/z_en_goma.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_GOMA_H_
-#define _Z_EN_GOMA_H_
+#ifndef Z_EN_GOMA_H
+#define Z_EN_GOMA_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.h b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.h
index b119c3daf3..0f36f7a42a 100644
--- a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.h
+++ b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_GOROIWA_H_
-#define _Z_EN_GOROIWA_H_
+#ifndef Z_EN_GOROIWA_H
+#define Z_EN_GOROIWA_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Gs/z_en_gs.h b/src/overlays/actors/ovl_En_Gs/z_en_gs.h
index e37cb810ad..cc95e3ee01 100644
--- a/src/overlays/actors/ovl_En_Gs/z_en_gs.h
+++ b/src/overlays/actors/ovl_En_Gs/z_en_gs.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_GS_H_
-#define _Z_EN_GS_H_
+#ifndef Z_EN_GS_H
+#define Z_EN_GS_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Guest/z_en_guest.h b/src/overlays/actors/ovl_En_Guest/z_en_guest.h
index 01e5323173..a86caa6130 100644
--- a/src/overlays/actors/ovl_En_Guest/z_en_guest.h
+++ b/src/overlays/actors/ovl_En_Guest/z_en_guest.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_GUEST_H_
-#define _Z_EN_GUEST_H_
+#ifndef Z_EN_GUEST_H
+#define Z_EN_GUEST_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Hata/z_en_hata.h b/src/overlays/actors/ovl_En_Hata/z_en_hata.h
index e26835e556..f208b1e019 100644
--- a/src/overlays/actors/ovl_En_Hata/z_en_hata.h
+++ b/src/overlays/actors/ovl_En_Hata/z_en_hata.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_HATA_H_
-#define _Z_EN_HATA_H_
+#ifndef Z_EN_HATA_H
+#define Z_EN_HATA_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.h b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.h
index ccd7141c30..af1e4c9d01 100644
--- a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.h
+++ b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_HEISHI1_H_
-#define _Z_EN_HEISHI1_H_
+#ifndef Z_EN_HEISHI1_H
+#define Z_EN_HEISHI1_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.h b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.h
index d6f7275568..86a7e05393 100644
--- a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.h
+++ b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_HEISHI2_H_
-#define _Z_EN_HEISHI2_H_
+#ifndef Z_EN_HEISHI2_H
+#define Z_EN_HEISHI2_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.h b/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.h
index 25e5bc1bf9..824e721ca0 100644
--- a/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.h
+++ b/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_HEISHI3_H_
-#define _Z_EN_HEISHI3_H_
+#ifndef Z_EN_HEISHI3_H
+#define Z_EN_HEISHI3_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.h b/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.h
index 8d8140910f..7af01e3fb1 100644
--- a/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.h
+++ b/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_HEISHI4_H_
-#define _Z_EN_HEISHI4_H_
+#ifndef Z_EN_HEISHI4_H
+#define Z_EN_HEISHI4_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.h b/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.h
index 4ba5047c62..f474591b31 100644
--- a/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.h
+++ b/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_HINTNUTS_H_
-#define _Z_EN_HINTNUTS_H_
+#ifndef Z_EN_HINTNUTS_H
+#define Z_EN_HINTNUTS_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Holl/z_en_holl.h b/src/overlays/actors/ovl_En_Holl/z_en_holl.h
index 387110c4fc..b163d0fecc 100644
--- a/src/overlays/actors/ovl_En_Holl/z_en_holl.h
+++ b/src/overlays/actors/ovl_En_Holl/z_en_holl.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_HOLL_H_
-#define _Z_EN_HOLL_H_
+#ifndef Z_EN_HOLL_H
+#define Z_EN_HOLL_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.h b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.h
index b3346b0ecf..73e3cdf073 100644
--- a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.h
+++ b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_HONOTRAP_H_
-#define _Z_EN_HONOTRAP_H_
+#ifndef Z_EN_HONOTRAP_H
+#define Z_EN_HONOTRAP_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Horse/z_en_horse.h b/src/overlays/actors/ovl_En_Horse/z_en_horse.h
index 93ad7092b5..8d18cb0632 100644
--- a/src/overlays/actors/ovl_En_Horse/z_en_horse.h
+++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_HORSE_H_
-#define _Z_EN_HORSE_H_
+#ifndef Z_EN_HORSE_H
+#define Z_EN_HORSE_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.h b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.h
index 7dcf36db43..0828d27054 100644
--- a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.h
+++ b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_HORSE_GAME_CHECK_H_
-#define _Z_EN_HORSE_GAME_CHECK_H_
+#ifndef Z_EN_HORSE_GAME_CHECK_H
+#define Z_EN_HORSE_GAME_CHECK_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.h b/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.h
index c3d874621a..5ba82c5777 100644
--- a/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.h
+++ b/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_HORSE_GANON_H_
-#define _Z_EN_HORSE_GANON_H_
+#ifndef Z_EN_HORSE_GANON_H
+#define Z_EN_HORSE_GANON_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.h b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.h
index 5038b6e752..3d8e4d2f00 100644
--- a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.h
+++ b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_HORSE_LINK_CHILD_H_
-#define _Z_EN_HORSE_LINK_CHILD_H_
+#ifndef Z_EN_HORSE_LINK_CHILD_H
+#define Z_EN_HORSE_LINK_CHILD_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.h b/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.h
index ee3e546efb..00eff0c1f8 100644
--- a/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.h
+++ b/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_HORSE_NORMAL_H_
-#define _Z_EN_HORSE_NORMAL_H_
+#ifndef Z_EN_HORSE_NORMAL_H
+#define Z_EN_HORSE_NORMAL_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.h b/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.h
index df7424b8c3..c3b63ae8d9 100644
--- a/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.h
+++ b/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_HORSE_ZELDA_H_
-#define _Z_EN_HORSE_ZELDA_H_
+#ifndef Z_EN_HORSE_ZELDA_H
+#define Z_EN_HORSE_ZELDA_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Hs/z_en_hs.h b/src/overlays/actors/ovl_En_Hs/z_en_hs.h
index 4317250b25..4a6576ddc5 100644
--- a/src/overlays/actors/ovl_En_Hs/z_en_hs.h
+++ b/src/overlays/actors/ovl_En_Hs/z_en_hs.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_HS_H_
-#define _Z_EN_HS_H_
+#ifndef Z_EN_HS_H
+#define Z_EN_HS_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.h b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.h
index 74a3670622..e006b91f75 100644
--- a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.h
+++ b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_HS2_H_
-#define _Z_EN_HS2_H_
+#ifndef Z_EN_HS2_H
+#define Z_EN_HS2_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Hy/z_en_hy.h b/src/overlays/actors/ovl_En_Hy/z_en_hy.h
index 30dca8643f..ec2164e48b 100644
--- a/src/overlays/actors/ovl_En_Hy/z_en_hy.h
+++ b/src/overlays/actors/ovl_En_Hy/z_en_hy.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_HY_H_
-#define _Z_EN_HY_H_
+#ifndef Z_EN_HY_H
+#define Z_EN_HY_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.h b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.h
index 9b8aa81c98..8c6b8df3cc 100644
--- a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.h
+++ b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_ICE_HONO_H_
-#define _Z_EN_ICE_HONO_H_
+#ifndef Z_EN_ICE_HONO_H
+#define Z_EN_ICE_HONO_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Ik/z_en_ik.h b/src/overlays/actors/ovl_En_Ik/z_en_ik.h
index 409a05f11b..6c45cd43b0 100644
--- a/src/overlays/actors/ovl_En_Ik/z_en_ik.h
+++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_IK_H_
-#define _Z_EN_IK_H_
+#ifndef Z_EN_IK_H
+#define Z_EN_IK_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_In/z_en_in.h b/src/overlays/actors/ovl_En_In/z_en_in.h
index bc47bca9db..19d7f026b7 100644
--- a/src/overlays/actors/ovl_En_In/z_en_in.h
+++ b/src/overlays/actors/ovl_En_In/z_en_in.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_IN_H_
-#define _Z_EN_IN_H_
+#ifndef Z_EN_IN_H
+#define Z_EN_IN_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Insect/z_en_insect.h b/src/overlays/actors/ovl_En_Insect/z_en_insect.h
index 8811c1d6de..3755fead19 100644
--- a/src/overlays/actors/ovl_En_Insect/z_en_insect.h
+++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_INSECT_H_
-#define _Z_EN_INSECT_H_
+#ifndef Z_EN_INSECT_H
+#define Z_EN_INSECT_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.h b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.h
index 7fc919bdad..e1566db3c4 100644
--- a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.h
+++ b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_ISHI_H_
-#define _Z_EN_ISHI_H_
+#ifndef Z_EN_ISHI_H
+#define Z_EN_ISHI_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_It/z_en_it.h b/src/overlays/actors/ovl_En_It/z_en_it.h
index 6a2445df0e..fb150fcb0d 100644
--- a/src/overlays/actors/ovl_En_It/z_en_it.h
+++ b/src/overlays/actors/ovl_En_It/z_en_it.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_IT_H_
-#define _Z_EN_IT_H_
+#ifndef Z_EN_IT_H
+#define Z_EN_IT_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Jj/z_en_jj.h b/src/overlays/actors/ovl_En_Jj/z_en_jj.h
index 75a061081d..3733cc976a 100644
--- a/src/overlays/actors/ovl_En_Jj/z_en_jj.h
+++ b/src/overlays/actors/ovl_En_Jj/z_en_jj.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_JJ_H_
-#define _Z_EN_JJ_H_
+#ifndef Z_EN_JJ_H
+#define Z_EN_JJ_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Js/z_en_js.h b/src/overlays/actors/ovl_En_Js/z_en_js.h
index 0f6383791c..7653b15d3c 100644
--- a/src/overlays/actors/ovl_En_Js/z_en_js.h
+++ b/src/overlays/actors/ovl_En_Js/z_en_js.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_JS_H_
-#define _Z_EN_JS_H_
+#ifndef Z_EN_JS_H
+#define Z_EN_JS_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.h b/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.h
index f570e5cea8..f9d85b6d06 100644
--- a/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.h
+++ b/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_JSJUTAN_H_
-#define _Z_EN_JSJUTAN_H_
+#ifndef Z_EN_JSJUTAN_H
+#define Z_EN_JSJUTAN_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.h b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.h
index d77317b742..aeb13ebcb6 100644
--- a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.h
+++ b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_KAKASI_H_
-#define _Z_EN_KAKASI_H_
+#ifndef Z_EN_KAKASI_H
+#define Z_EN_KAKASI_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.h b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.h
index 84af592458..a917e7e2e9 100644
--- a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.h
+++ b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_KAKASI2_H_
-#define _Z_EN_KAKASI2_H_
+#ifndef Z_EN_KAKASI2_H
+#define Z_EN_KAKASI2_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.h b/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.h
index e99ca591db..a5c68445a0 100644
--- a/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.h
+++ b/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_KAKASI3_H_
-#define _Z_EN_KAKASI3_H_
+#ifndef Z_EN_KAKASI3_H
+#define Z_EN_KAKASI3_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.h b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.h
index 17966d253f..15e8781750 100644
--- a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.h
+++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_KANBAN_H_
-#define _Z_EN_KANBAN_H_
+#ifndef Z_EN_KANBAN_H
+#define Z_EN_KANBAN_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.h b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.h
index 28509e9f4b..b0f5c83473 100644
--- a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.h
+++ b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_KAREBABA_H_
-#define _Z_EN_KAREBABA_H_
+#ifndef Z_EN_KAREBABA_H
+#define Z_EN_KAREBABA_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Ko/z_en_ko.h b/src/overlays/actors/ovl_En_Ko/z_en_ko.h
index d684004023..c4fa8a8162 100644
--- a/src/overlays/actors/ovl_En_Ko/z_en_ko.h
+++ b/src/overlays/actors/ovl_En_Ko/z_en_ko.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_KO_H_
-#define _Z_EN_KO_H_
+#ifndef Z_EN_KO_H
+#define Z_EN_KO_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.h b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.h
index bf0732cd81..0d46a0e1f6 100644
--- a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.h
+++ b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_KUSA_H_
-#define _Z_EN_KUSA_H_
+#ifndef Z_EN_KUSA_H
+#define Z_EN_KUSA_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Kz/z_en_kz.h b/src/overlays/actors/ovl_En_Kz/z_en_kz.h
index 549b378574..67491aceea 100644
--- a/src/overlays/actors/ovl_En_Kz/z_en_kz.h
+++ b/src/overlays/actors/ovl_En_Kz/z_en_kz.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_KZ_H_
-#define _Z_EN_KZ_H_
+#ifndef Z_EN_KZ_H
+#define Z_EN_KZ_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Light/z_en_light.h b/src/overlays/actors/ovl_En_Light/z_en_light.h
index 3cc056baff..1cbf786b00 100644
--- a/src/overlays/actors/ovl_En_Light/z_en_light.h
+++ b/src/overlays/actors/ovl_En_Light/z_en_light.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_LIGHT_H_
-#define _Z_EN_LIGHT_H_
+#ifndef Z_EN_LIGHT_H
+#define Z_EN_LIGHT_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.h b/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.h
index 294f2448ff..e24afd44e1 100644
--- a/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.h
+++ b/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_LIGHTBOX_H_
-#define _Z_EN_LIGHTBOX_H_
+#ifndef Z_EN_LIGHTBOX_H
+#define Z_EN_LIGHTBOX_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.h b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.h
index 432e9bc0ca..10d3e3fef7 100644
--- a/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.h
+++ b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_M_FIRE1_H_
-#define _Z_EN_M_FIRE1_H_
+#ifndef Z_EN_M_FIRE1_H
+#define Z_EN_M_FIRE1_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.h b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.h
index 438738f50b..92f1bdbf45 100644
--- a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.h
+++ b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_M_THUNDER_H_
-#define _Z_EN_M_THUNDER_H_
+#ifndef Z_EN_M_THUNDER_H
+#define Z_EN_M_THUNDER_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.h b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.h
index c88b5a5e84..ee68c0b882 100644
--- a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.h
+++ b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_MA1_H_
-#define _Z_EN_MA1_H_
+#ifndef Z_EN_MA1_H
+#define Z_EN_MA1_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.h b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.h
index aea5323fbe..ee954ee9e3 100644
--- a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.h
+++ b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_MA2_H_
-#define _Z_EN_MA2_H_
+#ifndef Z_EN_MA2_H
+#define Z_EN_MA2_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.h b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.h
index 13f9385adf..6a9ff10b92 100644
--- a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.h
+++ b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_MA3_H_
-#define _Z_EN_MA3_H_
+#ifndef Z_EN_MA3_H
+#define Z_EN_MA3_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Mag/z_en_mag.h b/src/overlays/actors/ovl_En_Mag/z_en_mag.h
index aa100594a3..a9f1b9d144 100644
--- a/src/overlays/actors/ovl_En_Mag/z_en_mag.h
+++ b/src/overlays/actors/ovl_En_Mag/z_en_mag.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_MAG_H_
-#define _Z_EN_MAG_H_
+#ifndef Z_EN_MAG_H
+#define Z_EN_MAG_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Mb/z_en_mb.h b/src/overlays/actors/ovl_En_Mb/z_en_mb.h
index ab4ca20f88..5ddb628fca 100644
--- a/src/overlays/actors/ovl_En_Mb/z_en_mb.h
+++ b/src/overlays/actors/ovl_En_Mb/z_en_mb.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_MB_H_
-#define _Z_EN_MB_H_
+#ifndef Z_EN_MB_H
+#define Z_EN_MB_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Md/z_en_md.h b/src/overlays/actors/ovl_En_Md/z_en_md.h
index 7d186407ec..064cc61efe 100644
--- a/src/overlays/actors/ovl_En_Md/z_en_md.h
+++ b/src/overlays/actors/ovl_En_Md/z_en_md.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_MD_H_
-#define _Z_EN_MD_H_
+#ifndef Z_EN_MD_H
+#define Z_EN_MD_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Mk/z_en_mk.h b/src/overlays/actors/ovl_En_Mk/z_en_mk.h
index e7b00359ed..6c8ba12ca2 100644
--- a/src/overlays/actors/ovl_En_Mk/z_en_mk.h
+++ b/src/overlays/actors/ovl_En_Mk/z_en_mk.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_MK_H_
-#define _Z_EN_MK_H_
+#ifndef Z_EN_MK_H
+#define Z_EN_MK_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Mm/z_en_mm.h b/src/overlays/actors/ovl_En_Mm/z_en_mm.h
index e3e30c7861..5dec76bb0a 100644
--- a/src/overlays/actors/ovl_En_Mm/z_en_mm.h
+++ b/src/overlays/actors/ovl_En_Mm/z_en_mm.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_MM_H_
-#define _Z_EN_MM_H_
+#ifndef Z_EN_MM_H
+#define Z_EN_MM_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.h b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.h
index ef62f6070f..9fb3df3e82 100644
--- a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.h
+++ b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_MM2_H_
-#define _Z_EN_MM2_H_
+#ifndef Z_EN_MM2_H
+#define Z_EN_MM2_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Ms/z_en_ms.h b/src/overlays/actors/ovl_En_Ms/z_en_ms.h
index 588d410679..a3d3dc7d58 100644
--- a/src/overlays/actors/ovl_En_Ms/z_en_ms.h
+++ b/src/overlays/actors/ovl_En_Ms/z_en_ms.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_MS_H_
-#define _Z_EN_MS_H_
+#ifndef Z_EN_MS_H
+#define Z_EN_MS_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Mu/z_en_mu.h b/src/overlays/actors/ovl_En_Mu/z_en_mu.h
index 15fd3757b7..089045ebf8 100644
--- a/src/overlays/actors/ovl_En_Mu/z_en_mu.h
+++ b/src/overlays/actors/ovl_En_Mu/z_en_mu.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_MU_H_
-#define _Z_EN_MU_H_
+#ifndef Z_EN_MU_H
+#define Z_EN_MU_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Nb/z_en_nb.h b/src/overlays/actors/ovl_En_Nb/z_en_nb.h
index 388428dc4e..f0e66ac4ec 100644
--- a/src/overlays/actors/ovl_En_Nb/z_en_nb.h
+++ b/src/overlays/actors/ovl_En_Nb/z_en_nb.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_NB_H_
-#define _Z_EN_NB_H_
+#ifndef Z_EN_NB_H
+#define Z_EN_NB_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Niw/z_en_niw.h b/src/overlays/actors/ovl_En_Niw/z_en_niw.h
index 352c50f56c..d027324968 100644
--- a/src/overlays/actors/ovl_En_Niw/z_en_niw.h
+++ b/src/overlays/actors/ovl_En_Niw/z_en_niw.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_NIW_H_
-#define _Z_EN_NIW_H_
+#ifndef Z_EN_NIW_H
+#define Z_EN_NIW_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.h b/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.h
index 1697936b7e..d931973c37 100644
--- a/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.h
+++ b/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_NIW_GIRL_H_
-#define _Z_EN_NIW_GIRL_H_
+#ifndef Z_EN_NIW_GIRL_H
+#define Z_EN_NIW_GIRL_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.h b/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.h
index d667040ba1..57ba86f2d7 100644
--- a/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.h
+++ b/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_NIW_LADY_H_
-#define _Z_EN_NIW_LADY_H_
+#ifndef Z_EN_NIW_LADY_H
+#define Z_EN_NIW_LADY_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.h b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.h
index 3afefda232..5c4c099284 100644
--- a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.h
+++ b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_NUTSBALL_H_
-#define _Z_EN_NUTSBALL_H_
+#ifndef Z_EN_NUTSBALL_H
+#define Z_EN_NUTSBALL_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.h b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.h
index 928d81dfd8..0597ce76c2 100644
--- a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.h
+++ b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_NWC_H_
-#define _Z_EN_NWC_H_
+#ifndef Z_EN_NWC_H
+#define Z_EN_NWC_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Ny/z_en_ny.h b/src/overlays/actors/ovl_En_Ny/z_en_ny.h
index 689bb9f8c0..fd93efcdbf 100644
--- a/src/overlays/actors/ovl_En_Ny/z_en_ny.h
+++ b/src/overlays/actors/ovl_En_Ny/z_en_ny.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_NY_H_
-#define _Z_EN_NY_H_
+#ifndef Z_EN_NY_H
+#define Z_EN_NY_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_OE2/z_en_oe2.h b/src/overlays/actors/ovl_En_OE2/z_en_oe2.h
index 53410817ea..b12b8a0a6f 100644
--- a/src/overlays/actors/ovl_En_OE2/z_en_oe2.h
+++ b/src/overlays/actors/ovl_En_OE2/z_en_oe2.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_OE2_H_
-#define _Z_EN_OE2_H_
+#ifndef Z_EN_OE2_H
+#define Z_EN_OE2_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.h b/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.h
index b92ef372dd..8320217117 100644
--- a/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.h
+++ b/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_OKARINA_EFFECT_H_
-#define _Z_EN_OKARINA_EFFECT_H_
+#ifndef Z_EN_OKARINA_EFFECT_H
+#define Z_EN_OKARINA_EFFECT_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.h b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.h
index 0a09d619a7..124f19b66a 100644
--- a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.h
+++ b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_OKARINA_TAG_H_
-#define _Z_EN_OKARINA_TAG_H_
+#ifndef Z_EN_OKARINA_TAG_H
+#define Z_EN_OKARINA_TAG_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.h b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.h
index 111deec9e4..88beeaa1aa 100644
--- a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.h
+++ b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_OKUTA_H_
-#define _Z_EN_OKUTA_H_
+#ifndef Z_EN_OKUTA_H
+#define Z_EN_OKUTA_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h
index c094316561..1dddce504f 100644
--- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h
+++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_OSSAN_H_
-#define _Z_EN_OSSAN_H_
+#ifndef Z_EN_OSSAN_H
+#define Z_EN_OSSAN_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Owl/z_en_owl.h b/src/overlays/actors/ovl_En_Owl/z_en_owl.h
index 351c9fa4c7..d83e52819c 100644
--- a/src/overlays/actors/ovl_En_Owl/z_en_owl.h
+++ b/src/overlays/actors/ovl_En_Owl/z_en_owl.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_OWL_H_
-#define _Z_EN_OWL_H_
+#ifndef Z_EN_OWL_H
+#define Z_EN_OWL_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Part/z_en_part.h b/src/overlays/actors/ovl_En_Part/z_en_part.h
index e73b8ebfe4..8beb516a3b 100644
--- a/src/overlays/actors/ovl_En_Part/z_en_part.h
+++ b/src/overlays/actors/ovl_En_Part/z_en_part.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_PART_H_
-#define _Z_EN_PART_H_
+#ifndef Z_EN_PART_H
+#define Z_EN_PART_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.h b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.h
index 3382ebbb91..726b47ad44 100644
--- a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.h
+++ b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_PEEHAT_H_
-#define _Z_EN_PEEHAT_H_
+#ifndef Z_EN_PEEHAT_H
+#define Z_EN_PEEHAT_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.h b/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.h
index 3f563b1e64..a0c84fa21f 100644
--- a/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.h
+++ b/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_PO_DESERT_H_
-#define _Z_EN_PO_DESERT_H_
+#ifndef Z_EN_PO_DESERT_H
+#define Z_EN_PO_DESERT_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.h b/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.h
index 2f872960a6..384b1bbdcb 100644
--- a/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.h
+++ b/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_PO_FIELD_H_
-#define _Z_EN_PO_FIELD_H_
+#ifndef Z_EN_PO_FIELD_H
+#define Z_EN_PO_FIELD_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.h b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.h
index 04ebaaf367..5f26aba8bb 100644
--- a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.h
+++ b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_PO_RELAY_H_
-#define _Z_EN_PO_RELAY_H_
+#ifndef Z_EN_PO_RELAY_H
+#define Z_EN_PO_RELAY_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h
index e4d752d44a..2b3b7446a9 100644
--- a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h
+++ b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_PO_SISTERS_H_
-#define _Z_EN_PO_SISTERS_H_
+#ifndef Z_EN_PO_SISTERS_H
+#define Z_EN_PO_SISTERS_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Poh/z_en_poh.h b/src/overlays/actors/ovl_En_Poh/z_en_poh.h
index ed6b567301..724ade9e1e 100644
--- a/src/overlays/actors/ovl_En_Poh/z_en_poh.h
+++ b/src/overlays/actors/ovl_En_Poh/z_en_poh.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_POH_H_
-#define _Z_EN_POH_H_
+#ifndef Z_EN_POH_H
+#define Z_EN_POH_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.h b/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.h
index 147f84c97c..0aa0aaaf4b 100644
--- a/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.h
+++ b/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_PU_BOX_H_
-#define _Z_EN_PU_BOX_H_
+#ifndef Z_EN_PU_BOX_H
+#define Z_EN_PU_BOX_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Rd/z_en_rd.h b/src/overlays/actors/ovl_En_Rd/z_en_rd.h
index cabd9e622c..f679f08abe 100644
--- a/src/overlays/actors/ovl_En_Rd/z_en_rd.h
+++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_RD_H_
-#define _Z_EN_RD_H_
+#ifndef Z_EN_RD_H
+#define Z_EN_RD_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.h b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.h
index 312df5195e..397ff92f61 100644
--- a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.h
+++ b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_REEBA_H_
-#define _Z_EN_REEBA_H_
+#ifndef Z_EN_REEBA_H
+#define Z_EN_REEBA_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.h b/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.h
index e23016605f..48cdec740a 100644
--- a/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.h
+++ b/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_RIVER_SOUND_H_
-#define _Z_EN_RIVER_SOUND_H_
+#ifndef Z_EN_RIVER_SOUND_H
+#define Z_EN_RIVER_SOUND_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Rl/z_en_rl.h b/src/overlays/actors/ovl_En_Rl/z_en_rl.h
index 6d4839a1ab..84a698dcda 100644
--- a/src/overlays/actors/ovl_En_Rl/z_en_rl.h
+++ b/src/overlays/actors/ovl_En_Rl/z_en_rl.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_RL_H_
-#define _Z_EN_RL_H_
+#ifndef Z_EN_RL_H
+#define Z_EN_RL_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Rr/z_en_rr.h b/src/overlays/actors/ovl_En_Rr/z_en_rr.h
index 853e649d57..2991723a46 100644
--- a/src/overlays/actors/ovl_En_Rr/z_en_rr.h
+++ b/src/overlays/actors/ovl_En_Rr/z_en_rr.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_RR_H_
-#define _Z_EN_RR_H_
+#ifndef Z_EN_RR_H
+#define Z_EN_RR_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h
index 486d2aaa35..7d6ed62699 100644
--- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h
+++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_RU1_H_
-#define _Z_EN_RU1_H_
+#ifndef Z_EN_RU1_H
+#define Z_EN_RU1_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.h b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.h
index 9875783f0f..bb3865ce65 100644
--- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.h
+++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_RU2_H_
-#define _Z_EN_RU2_H_
+#ifndef Z_EN_RU2_H
+#define Z_EN_RU2_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Sa/z_en_sa.h b/src/overlays/actors/ovl_En_Sa/z_en_sa.h
index 239a9dbeaa..872b50f820 100644
--- a/src/overlays/actors/ovl_En_Sa/z_en_sa.h
+++ b/src/overlays/actors/ovl_En_Sa/z_en_sa.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_SA_H_
-#define _Z_EN_SA_H_
+#ifndef Z_EN_SA_H
+#define Z_EN_SA_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Sb/z_en_sb.h b/src/overlays/actors/ovl_En_Sb/z_en_sb.h
index fa68b4b706..587474395f 100644
--- a/src/overlays/actors/ovl_En_Sb/z_en_sb.h
+++ b/src/overlays/actors/ovl_En_Sb/z_en_sb.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_SB_H_
-#define _Z_EN_SB_H_
+#ifndef Z_EN_SB_H
+#define Z_EN_SB_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.h b/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.h
index 43b72eccab..d0b53e008d 100644
--- a/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.h
+++ b/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.h
@@ -1,5 +1,5 @@
-#ifndef _Z_ITEM_SCENE_CHANGE_H_
-#define _Z_ITEM_SCENE_CHANGE_H_
+#ifndef Z_ITEM_SCENE_CHANGE_H
+#define Z_ITEM_SCENE_CHANGE_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Sda/z_en_sda.h b/src/overlays/actors/ovl_En_Sda/z_en_sda.h
index 5ce5ca3723..4dd2abd3a6 100644
--- a/src/overlays/actors/ovl_En_Sda/z_en_sda.h
+++ b/src/overlays/actors/ovl_En_Sda/z_en_sda.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_SDA_H_
-#define _Z_EN_SDA_H_
+#ifndef Z_EN_SDA_H
+#define Z_EN_SDA_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.h b/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.h
index 0e35d0033f..0b314e0cf9 100644
--- a/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.h
+++ b/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_SHOPNUTS_H_
-#define _Z_EN_SHOPNUTS_H_
+#ifndef Z_EN_SHOPNUTS_H
+#define Z_EN_SHOPNUTS_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Si/z_en_si.h b/src/overlays/actors/ovl_En_Si/z_en_si.h
index 5e86f5041c..b6dec1237c 100644
--- a/src/overlays/actors/ovl_En_Si/z_en_si.h
+++ b/src/overlays/actors/ovl_En_Si/z_en_si.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_SI_H_
-#define _Z_EN_SI_H_
+#ifndef Z_EN_SI_H
+#define Z_EN_SI_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.h b/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.h
index 8ac7186cf4..32bad16b76 100644
--- a/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.h
+++ b/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_SIOFUKI_H_
-#define _Z_EN_SIOFUKI_H_
+#ifndef Z_EN_SIOFUKI_H
+#define Z_EN_SIOFUKI_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Skb/z_en_skb.h b/src/overlays/actors/ovl_En_Skb/z_en_skb.h
index 46c62a4822..142b589c93 100644
--- a/src/overlays/actors/ovl_En_Skb/z_en_skb.h
+++ b/src/overlays/actors/ovl_En_Skb/z_en_skb.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_SKB_H_
-#define _Z_EN_SKB_H_
+#ifndef Z_EN_SKB_H
+#define Z_EN_SKB_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Skj/z_en_skj.h b/src/overlays/actors/ovl_En_Skj/z_en_skj.h
index ca6863057e..29bd8e8f07 100644
--- a/src/overlays/actors/ovl_En_Skj/z_en_skj.h
+++ b/src/overlays/actors/ovl_En_Skj/z_en_skj.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_SKJ_H_
-#define _Z_EN_SKJ_H_
+#ifndef Z_EN_SKJ_H
+#define Z_EN_SKJ_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.h b/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.h
index 0ea5680f2b..1c4f444946 100644
--- a/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.h
+++ b/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_SKJNEEDLE_H_
-#define _Z_EN_SKJNEEDLE_H_
+#ifndef Z_EN_SKJNEEDLE_H
+#define Z_EN_SKJNEEDLE_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.h b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.h
index 01f0717015..1cb04e59ce 100644
--- a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.h
+++ b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_SSH_H_
-#define _Z_EN_SSH_H_
+#ifndef Z_EN_SSH_H
+#define Z_EN_SSH_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_St/z_en_st.h b/src/overlays/actors/ovl_En_St/z_en_st.h
index 9cd0bbefea..d6feb1106a 100644
--- a/src/overlays/actors/ovl_En_St/z_en_st.h
+++ b/src/overlays/actors/ovl_En_St/z_en_st.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_ST_H_
-#define _Z_EN_ST_H_
+#ifndef Z_EN_ST_H
+#define Z_EN_ST_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Sth/z_en_sth.h b/src/overlays/actors/ovl_En_Sth/z_en_sth.h
index 515e33ac8e..ce90fbfdd1 100644
--- a/src/overlays/actors/ovl_En_Sth/z_en_sth.h
+++ b/src/overlays/actors/ovl_En_Sth/z_en_sth.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_STH_H_
-#define _Z_EN_STH_H_
+#ifndef Z_EN_STH_H
+#define Z_EN_STH_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Stream/z_en_stream.h b/src/overlays/actors/ovl_En_Stream/z_en_stream.h
index fd5ed179c4..228fff4de0 100644
--- a/src/overlays/actors/ovl_En_Stream/z_en_stream.h
+++ b/src/overlays/actors/ovl_En_Stream/z_en_stream.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_STREAM_H_
-#define _Z_EN_STREAM_H_
+#ifndef Z_EN_STREAM_H
+#define Z_EN_STREAM_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Sw/z_en_sw.h b/src/overlays/actors/ovl_En_Sw/z_en_sw.h
index c853d12fe2..452fc5e758 100644
--- a/src/overlays/actors/ovl_En_Sw/z_en_sw.h
+++ b/src/overlays/actors/ovl_En_Sw/z_en_sw.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_SW_H_
-#define _Z_EN_SW_H_
+#ifndef Z_EN_SW_H
+#define Z_EN_SW_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.h b/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.h
index 283a5fcf47..11657fdb03 100644
--- a/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.h
+++ b/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_SYATEKI_ITM_H_
-#define _Z_EN_SYATEKI_ITM_H_
+#ifndef Z_EN_SYATEKI_ITM_H
+#define Z_EN_SYATEKI_ITM_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.h b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.h
index 07d4297e1e..d82cdf9c75 100644
--- a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.h
+++ b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_SYATEKI_MAN_H_
-#define _Z_EN_SYATEKI_MAN_H_
+#ifndef Z_EN_SYATEKI_MAN_H
+#define Z_EN_SYATEKI_MAN_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.h b/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.h
index 601496f8f8..6a6398a6f1 100644
--- a/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.h
+++ b/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_SYATEKI_NIW_H_
-#define _Z_EN_SYATEKI_NIW_H_
+#ifndef Z_EN_SYATEKI_NIW_H
+#define Z_EN_SYATEKI_NIW_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Ta/z_en_ta.h b/src/overlays/actors/ovl_En_Ta/z_en_ta.h
index e7b8f3a2d2..94f3adc314 100644
--- a/src/overlays/actors/ovl_En_Ta/z_en_ta.h
+++ b/src/overlays/actors/ovl_En_Ta/z_en_ta.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_TA_H_
-#define _Z_EN_TA_H_
+#ifndef Z_EN_TA_H
+#define Z_EN_TA_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.h b/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.h
index 3862c5e288..dc48850e86 100644
--- a/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.h
+++ b/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_TAKARA_MAN_H_
-#define _Z_EN_TAKARA_MAN_H_
+#ifndef Z_EN_TAKARA_MAN_H
+#define Z_EN_TAKARA_MAN_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Tana/z_en_tana.h b/src/overlays/actors/ovl_En_Tana/z_en_tana.h
index d9f0031839..763d1303c6 100644
--- a/src/overlays/actors/ovl_En_Tana/z_en_tana.h
+++ b/src/overlays/actors/ovl_En_Tana/z_en_tana.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_TANA_H_
-#define _Z_EN_TANA_H_
+#ifndef Z_EN_TANA_H
+#define Z_EN_TANA_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Test/z_en_test.h b/src/overlays/actors/ovl_En_Test/z_en_test.h
index 89df48e344..93263e2367 100644
--- a/src/overlays/actors/ovl_En_Test/z_en_test.h
+++ b/src/overlays/actors/ovl_En_Test/z_en_test.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_TEST_H_
-#define _Z_EN_TEST_H_
+#ifndef Z_EN_TEST_H
+#define Z_EN_TEST_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Tg/z_en_tg.h b/src/overlays/actors/ovl_En_Tg/z_en_tg.h
index a731550906..fc6ff7f496 100644
--- a/src/overlays/actors/ovl_En_Tg/z_en_tg.h
+++ b/src/overlays/actors/ovl_En_Tg/z_en_tg.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_TG_H_
-#define _Z_EN_TG_H_
+#ifndef Z_EN_TG_H
+#define Z_EN_TG_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Tite/z_en_tite.h b/src/overlays/actors/ovl_En_Tite/z_en_tite.h
index aaa5aeb6d3..308d0b4c31 100755
--- a/src/overlays/actors/ovl_En_Tite/z_en_tite.h
+++ b/src/overlays/actors/ovl_En_Tite/z_en_tite.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_TITE_H_
-#define _Z_EN_TITE_H_
+#ifndef Z_EN_TITE_H
+#define Z_EN_TITE_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Tk/z_en_tk.h b/src/overlays/actors/ovl_En_Tk/z_en_tk.h
index e52e3802ec..cf871ce3b4 100644
--- a/src/overlays/actors/ovl_En_Tk/z_en_tk.h
+++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_TK_H_
-#define _Z_EN_TK_H_
+#ifndef Z_EN_TK_H
+#define Z_EN_TK_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Torch/z_en_torch.h b/src/overlays/actors/ovl_En_Torch/z_en_torch.h
index bd9c527b75..78be1fb2dd 100644
--- a/src/overlays/actors/ovl_En_Torch/z_en_torch.h
+++ b/src/overlays/actors/ovl_En_Torch/z_en_torch.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_TORCH_H_
-#define _Z_EN_TORCH_H_
+#ifndef Z_EN_TORCH_H
+#define Z_EN_TORCH_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.h b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.h
index 4bf41e28d6..d96b08527e 100644
--- a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.h
+++ b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_TORCH2_H_
-#define _Z_EN_TORCH2_H_
+#ifndef Z_EN_TORCH2_H
+#define Z_EN_TORCH2_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Toryo/z_en_toryo.h b/src/overlays/actors/ovl_En_Toryo/z_en_toryo.h
index 4cd1ec92cb..b6963f5016 100644
--- a/src/overlays/actors/ovl_En_Toryo/z_en_toryo.h
+++ b/src/overlays/actors/ovl_En_Toryo/z_en_toryo.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_TORYO_H_
-#define _Z_EN_TORYO_H_
+#ifndef Z_EN_TORYO_H
+#define Z_EN_TORYO_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Tp/z_en_tp.h b/src/overlays/actors/ovl_En_Tp/z_en_tp.h
index be833bc6d7..c466304c71 100644
--- a/src/overlays/actors/ovl_En_Tp/z_en_tp.h
+++ b/src/overlays/actors/ovl_En_Tp/z_en_tp.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_TP_H_
-#define _Z_EN_TP_H_
+#ifndef Z_EN_TP_H
+#define Z_EN_TP_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Tr/z_en_tr.h b/src/overlays/actors/ovl_En_Tr/z_en_tr.h
index 8cda5c429c..4e890b3fb2 100644
--- a/src/overlays/actors/ovl_En_Tr/z_en_tr.h
+++ b/src/overlays/actors/ovl_En_Tr/z_en_tr.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_TR_H_
-#define _Z_EN_TR_H_
+#ifndef Z_EN_TR_H
+#define Z_EN_TR_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Trap/z_en_trap.h b/src/overlays/actors/ovl_En_Trap/z_en_trap.h
index 2703dfc549..6f69707aca 100644
--- a/src/overlays/actors/ovl_En_Trap/z_en_trap.h
+++ b/src/overlays/actors/ovl_En_Trap/z_en_trap.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_TRAP_H_
-#define _Z_EN_TRAP_H_
+#ifndef Z_EN_TRAP_H
+#define Z_EN_TRAP_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.h b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.h
index 9ec4b7a233..d15ab4816f 100644
--- a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.h
+++ b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_TUBO_TRAP_H_
-#define _Z_EN_TUBO_TRAP_H_
+#ifndef Z_EN_TUBO_TRAP_H
+#define Z_EN_TUBO_TRAP_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Vali/z_en_vali.h b/src/overlays/actors/ovl_En_Vali/z_en_vali.h
index 791fba9495..9c98ca3fc6 100644
--- a/src/overlays/actors/ovl_En_Vali/z_en_vali.h
+++ b/src/overlays/actors/ovl_En_Vali/z_en_vali.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_VALI_H_
-#define _Z_EN_VALI_H_
+#ifndef Z_EN_VALI_H
+#define Z_EN_VALI_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Vase/z_en_vase.h b/src/overlays/actors/ovl_En_Vase/z_en_vase.h
index e14aa10808..57ee0d5779 100644
--- a/src/overlays/actors/ovl_En_Vase/z_en_vase.h
+++ b/src/overlays/actors/ovl_En_Vase/z_en_vase.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_VASE_H_
-#define _Z_EN_VASE_H_
+#ifndef Z_EN_VASE_H
+#define Z_EN_VASE_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.h b/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.h
index 10d63d9ae0..8675b440c4 100644
--- a/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.h
+++ b/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_VB_BALL_H_
-#define _Z_EN_VB_BALL_H_
+#ifndef Z_EN_VB_BALL_H
+#define Z_EN_VB_BALL_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.h b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.h
index 0e3d5991a8..c9a4a041a8 100644
--- a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.h
+++ b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_VIEWER_H_
-#define _Z_EN_VIEWER_H_
+#ifndef Z_EN_VIEWER_H
+#define Z_EN_VIEWER_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Vm/z_en_vm.h b/src/overlays/actors/ovl_En_Vm/z_en_vm.h
index f21a26d131..b7bd00e8c7 100644
--- a/src/overlays/actors/ovl_En_Vm/z_en_vm.h
+++ b/src/overlays/actors/ovl_En_Vm/z_en_vm.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_VM_H_
-#define _Z_EN_VM_H_
+#ifndef Z_EN_VM_H
+#define Z_EN_VM_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.h b/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.h
index 9a9911a2e4..e1de7c8818 100644
--- a/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.h
+++ b/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_WALL_TUBO_H_
-#define _Z_EN_WALL_TUBO_H_
+#ifndef Z_EN_WALL_TUBO_H
+#define Z_EN_WALL_TUBO_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.h b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.h
index a13f6db554..fde6f4bb48 100644
--- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.h
+++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_WALLMAS_H_
-#define _Z_EN_WALLMAS_H_
+#ifndef Z_EN_WALLMAS_H
+#define Z_EN_WALLMAS_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.h b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.h
index 54e95a1ab9..791bf67f9c 100644
--- a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.h
+++ b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_WEATHER_TAG_H_
-#define _Z_EN_WEATHER_TAG_H_
+#ifndef Z_EN_WEATHER_TAG_H
+#define Z_EN_WEATHER_TAG_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.h b/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.h
index 5ddfb478dd..77874b31ec 100644
--- a/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.h
+++ b/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_WEIYER_H_
-#define _Z_EN_WEIYER_H_
+#ifndef Z_EN_WEIYER_H
+#define Z_EN_WEIYER_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Wf/z_en_wf.h b/src/overlays/actors/ovl_En_Wf/z_en_wf.h
index c81d7e1754..e863f8d28e 100644
--- a/src/overlays/actors/ovl_En_Wf/z_en_wf.h
+++ b/src/overlays/actors/ovl_En_Wf/z_en_wf.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_WF_H_
-#define _Z_EN_WF_H_
+#ifndef Z_EN_WF_H
+#define Z_EN_WF_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.h b/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.h
index 3c2a6b82b1..fc2f2e8167 100644
--- a/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.h
+++ b/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_WONDER_ITEM_H_
-#define _Z_EN_WONDER_ITEM_H_
+#ifndef Z_EN_WONDER_ITEM_H
+#define Z_EN_WONDER_ITEM_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.h b/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.h
index 1964272f6b..50b370b31d 100644
--- a/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.h
+++ b/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_WONDER_TALK_H_
-#define _Z_EN_WONDER_TALK_H_
+#ifndef Z_EN_WONDER_TALK_H
+#define Z_EN_WONDER_TALK_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.h b/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.h
index 10fdc79f22..5e450998ea 100644
--- a/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.h
+++ b/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_WONDER_TALK2_H_
-#define _Z_EN_WONDER_TALK2_H_
+#ifndef Z_EN_WONDER_TALK2_H
+#define Z_EN_WONDER_TALK2_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.h b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.h
index 6d425d1a96..85ec12a5b8 100644
--- a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.h
+++ b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_WOOD02_H_
-#define _Z_EN_WOOD02_H_
+#ifndef Z_EN_WOOD02_H
+#define Z_EN_WOOD02_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Xc/z_en_xc.h b/src/overlays/actors/ovl_En_Xc/z_en_xc.h
index f44e2e771e..59813e733e 100644
--- a/src/overlays/actors/ovl_En_Xc/z_en_xc.h
+++ b/src/overlays/actors/ovl_En_Xc/z_en_xc.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_XC_H_
-#define _Z_EN_XC_H_
+#ifndef Z_EN_XC_H
+#define Z_EN_XC_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.h b/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.h
index 3690fbf07f..363fd9cc73 100644
--- a/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.h
+++ b/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_YABUSAME_MARK_H_
-#define _Z_EN_YABUSAME_MARK_H_
+#ifndef Z_EN_YABUSAME_MARK_H
+#define Z_EN_YABUSAME_MARK_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.h b/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.h
index 7e76f4efca..c1e6b00aee 100644
--- a/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.h
+++ b/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_YUKABYUN_H_
-#define _Z_EN_YUKABYUN_H_
+#ifndef Z_EN_YUKABYUN_H
+#define Z_EN_YUKABYUN_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Zf/z_en_zf.h b/src/overlays/actors/ovl_En_Zf/z_en_zf.h
index a1a661259a..12114e31e5 100644
--- a/src/overlays/actors/ovl_En_Zf/z_en_zf.h
+++ b/src/overlays/actors/ovl_En_Zf/z_en_zf.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_ZF_H_
-#define _Z_EN_ZF_H_
+#ifndef Z_EN_ZF_H
+#define Z_EN_ZF_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.h b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.h
index 420c310723..cfbbefc8b2 100644
--- a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.h
+++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_ZL1_H_
-#define _Z_EN_ZL1_H_
+#ifndef Z_EN_ZL1_H
+#define Z_EN_ZL1_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.h b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.h
index 5dd52343e0..acc850b9fc 100644
--- a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.h
+++ b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_ZL2_H_
-#define _Z_EN_ZL2_H_
+#ifndef Z_EN_ZL2_H
+#define Z_EN_ZL2_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.h b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.h
index 31823aa8fd..cf30576c37 100644
--- a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.h
+++ b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_ZL3_H_
-#define _Z_EN_ZL3_H_
+#ifndef Z_EN_ZL3_H
+#define Z_EN_ZL3_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.h b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.h
index db22424964..ace675ddcd 100644
--- a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.h
+++ b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_ZL4_H_
-#define _Z_EN_ZL4_H_
+#ifndef Z_EN_ZL4_H
+#define Z_EN_ZL4_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_Zo/z_en_zo.h b/src/overlays/actors/ovl_En_Zo/z_en_zo.h
index e2608f5954..ba6eebb30c 100644
--- a/src/overlays/actors/ovl_En_Zo/z_en_zo.h
+++ b/src/overlays/actors/ovl_En_Zo/z_en_zo.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_ZO_H_
-#define _Z_EN_ZO_H_
+#ifndef Z_EN_ZO_H
+#define Z_EN_ZO_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_En_fHG/z_en_fhg.h b/src/overlays/actors/ovl_En_fHG/z_en_fhg.h
index ee19577940..fa22bfdace 100644
--- a/src/overlays/actors/ovl_En_fHG/z_en_fhg.h
+++ b/src/overlays/actors/ovl_En_fHG/z_en_fhg.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EN_FHG_H_
-#define _Z_EN_FHG_H_
+#ifndef Z_EN_FHG_H
+#define Z_EN_FHG_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_End_Title/z_end_title.h b/src/overlays/actors/ovl_End_Title/z_end_title.h
index a99c6a9253..9897c0fbf2 100644
--- a/src/overlays/actors/ovl_End_Title/z_end_title.h
+++ b/src/overlays/actors/ovl_End_Title/z_end_title.h
@@ -1,5 +1,5 @@
-#ifndef _Z_END_TITLE_H_
-#define _Z_END_TITLE_H_
+#ifndef Z_END_TITLE_H
+#define Z_END_TITLE_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Fishing/z_fishing.h b/src/overlays/actors/ovl_Fishing/z_fishing.h
index ed2ed73f2b..58483652c6 100644
--- a/src/overlays/actors/ovl_Fishing/z_fishing.h
+++ b/src/overlays/actors/ovl_Fishing/z_fishing.h
@@ -1,5 +1,5 @@
-#ifndef _Z_FISHING_H_
-#define _Z_FISHING_H_
+#ifndef Z_FISHING_H
+#define Z_FISHING_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.h b/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.h
index b6ec3bfa88..432a7ef499 100644
--- a/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.h
+++ b/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.h
@@ -1,5 +1,5 @@
-#ifndef _Z_ITEM_B_HEART_H_
-#define _Z_ITEM_B_HEART_H_
+#ifndef Z_ITEM_B_HEART_H
+#define Z_ITEM_B_HEART_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h
index 2ef63e8715..d72c64ea98 100644
--- a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h
+++ b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h
@@ -1,5 +1,5 @@
-#ifndef _Z_ITEM_ETC_H_
-#define _Z_ITEM_ETC_H_
+#ifndef Z_ITEM_ETC_H
+#define Z_ITEM_ETC_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.h b/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.h
index 7ee0e3c868..0845653abc 100644
--- a/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.h
+++ b/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.h
@@ -1,5 +1,5 @@
-#ifndef _Z_ITEM_INBOX_H_
-#define _Z_ITEM_INBOX_H_
+#ifndef Z_ITEM_INBOX_H
+#define Z_ITEM_INBOX_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.h b/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.h
index d5cd542641..f653ae443f 100644
--- a/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.h
+++ b/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.h
@@ -1,5 +1,5 @@
-#ifndef _Z_ITEM_OCARINA_H_
-#define _Z_ITEM_OCARINA_H_
+#ifndef Z_ITEM_OCARINA_H
+#define Z_ITEM_OCARINA_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Item_Shield/z_item_shield.h b/src/overlays/actors/ovl_Item_Shield/z_item_shield.h
index 91e6b85caf..7daf0d0131 100644
--- a/src/overlays/actors/ovl_Item_Shield/z_item_shield.h
+++ b/src/overlays/actors/ovl_Item_Shield/z_item_shield.h
@@ -1,5 +1,5 @@
-#ifndef _Z_ITEM_SHIELD_H_
-#define _Z_ITEM_SHIELD_H_
+#ifndef Z_ITEM_SHIELD_H
+#define Z_ITEM_SHIELD_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.h b/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.h
index 29ef65a96b..3d7ef82298 100644
--- a/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.h
+++ b/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.h
@@ -1,5 +1,5 @@
-#ifndef _Z_MAGIC_DARK_H_
-#define _Z_MAGIC_DARK_H_
+#ifndef Z_MAGIC_DARK_H
+#define Z_MAGIC_DARK_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.h b/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.h
index 8e4a8b2f5b..4a9cb5188c 100644
--- a/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.h
+++ b/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.h
@@ -1,5 +1,5 @@
-#ifndef _Z_MAGIC_FIRE_H_
-#define _Z_MAGIC_FIRE_H_
+#ifndef Z_MAGIC_FIRE_H
+#define Z_MAGIC_FIRE_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.h b/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.h
index e680d30e3c..25b3e7d70a 100644
--- a/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.h
+++ b/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.h
@@ -1,5 +1,5 @@
-#ifndef _Z_MAGIC_WIND_H_
-#define _Z_MAGIC_WIND_H_
+#ifndef Z_MAGIC_WIND_H
+#define Z_MAGIC_WIND_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.h b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.h
index 776105e0c3..0f645cb4f8 100644
--- a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.h
+++ b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.h
@@ -1,5 +1,5 @@
-#ifndef _Z_MIR_RAY_H_
-#define _Z_MIR_RAY_H_
+#ifndef Z_MIR_RAY_H
+#define Z_MIR_RAY_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h
index ed5d29a182..aca116f15e 100644
--- a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h
+++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h
@@ -1,5 +1,5 @@
-#ifndef _Z_OBJ_BEAN_H_
-#define _Z_OBJ_BEAN_H_
+#ifndef Z_OBJ_BEAN_H
+#define Z_OBJ_BEAN_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.h b/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.h
index 19517b1146..f6ff149e9d 100644
--- a/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.h
+++ b/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.h
@@ -1,5 +1,5 @@
-#ifndef _Z_OBJ_BLOCKSTOP_H_
-#define _Z_OBJ_BLOCKSTOP_H_
+#ifndef Z_OBJ_BLOCKSTOP_H
+#define Z_OBJ_BLOCKSTOP_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.h b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.h
index 00dc97e83b..33597276b0 100644
--- a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.h
+++ b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.h
@@ -1,5 +1,5 @@
-#ifndef _Z_OBJ_BOMBIWA_H_
-#define _Z_OBJ_BOMBIWA_H_
+#ifndef Z_OBJ_BOMBIWA_H
+#define Z_OBJ_BOMBIWA_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h
index 0de431eb51..bb690b0b6d 100644
--- a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h
+++ b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h
@@ -1,5 +1,5 @@
-#ifndef _Z_OBJ_COMB_H_
-#define _Z_OBJ_COMB_H_
+#ifndef Z_OBJ_COMB_H
+#define Z_OBJ_COMB_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.h b/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.h
index 7f59964ffe..88818776a2 100644
--- a/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.h
+++ b/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.h
@@ -1,5 +1,5 @@
-#ifndef _Z_OBJ_DEKUJR_H_
-#define _Z_OBJ_DEKUJR_H_
+#ifndef Z_OBJ_DEKUJR_H
+#define Z_OBJ_DEKUJR_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.h b/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.h
index 01f66df011..735355f508 100644
--- a/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.h
+++ b/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.h
@@ -1,5 +1,5 @@
-#ifndef _Z_OBJ_ELEVATOR_H_
-#define _Z_OBJ_ELEVATOR_H_
+#ifndef Z_OBJ_ELEVATOR_H
+#define Z_OBJ_ELEVATOR_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.h b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.h
index c562b513fb..a897177f64 100644
--- a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.h
+++ b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.h
@@ -1,5 +1,5 @@
-#ifndef _Z_OBJ_HAMISHI_H_
-#define _Z_OBJ_HAMISHI_H_
+#ifndef Z_OBJ_HAMISHI_H
+#define Z_OBJ_HAMISHI_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.h b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.h
index 4a9896f75d..7fdd3bfa89 100644
--- a/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.h
+++ b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.h
@@ -1,5 +1,5 @@
-#ifndef _Z_OBJ_HANA_H_
-#define _Z_OBJ_HANA_H_
+#ifndef Z_OBJ_HANA_H
+#define Z_OBJ_HANA_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.h b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.h
index fedd9e43d7..ee43e0cad8 100644
--- a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.h
+++ b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.h
@@ -1,5 +1,5 @@
-#ifndef _Z_OBJ_HSBLOCK_H_
-#define _Z_OBJ_HSBLOCK_H_
+#ifndef Z_OBJ_HSBLOCK_H
+#define Z_OBJ_HSBLOCK_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h
index bb9ef5fbd8..cb1c3e5bf3 100644
--- a/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h
+++ b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h
@@ -1,5 +1,5 @@
-#ifndef _Z_OBJ_ICE_POLY_H_
-#define _Z_OBJ_ICE_POLY_H_
+#ifndef Z_OBJ_ICE_POLY_H
+#define Z_OBJ_ICE_POLY_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.h b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.h
index 3aee21e77f..1e5d3d48b6 100644
--- a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.h
+++ b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.h
@@ -1,5 +1,5 @@
-#ifndef _Z_OBJ_KIBAKO_H_
-#define _Z_OBJ_KIBAKO_H_
+#ifndef Z_OBJ_KIBAKO_H
+#define Z_OBJ_KIBAKO_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.h b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.h
index e37ddf7e21..04b980a99c 100644
--- a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.h
+++ b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.h
@@ -1,5 +1,5 @@
-#ifndef _Z_OBJ_KIBAKO2_H_
-#define _Z_OBJ_KIBAKO2_H_
+#ifndef Z_OBJ_KIBAKO2_H
+#define Z_OBJ_KIBAKO2_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.h b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.h
index 34ff71afdf..0bbf06a1fc 100644
--- a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.h
+++ b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.h
@@ -1,5 +1,5 @@
-#ifndef _Z_OBJ_LIFT_H_
-#define _Z_OBJ_LIFT_H_
+#ifndef Z_OBJ_LIFT_H
+#define Z_OBJ_LIFT_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.h b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.h
index dd2529d0e8..eace5a9054 100644
--- a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.h
+++ b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.h
@@ -1,5 +1,5 @@
-#ifndef _Z_OBJ_LIGHTSWITCH_H_
-#define _Z_OBJ_LIGHTSWITCH_H_
+#ifndef Z_OBJ_LIGHTSWITCH_H
+#define Z_OBJ_LIGHTSWITCH_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.h b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.h
index 103bb3d1ab..3d7ebd0864 100644
--- a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.h
+++ b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.h
@@ -1,5 +1,5 @@
-#ifndef _Z_OBJ_MAKEKINSUTA_H_
-#define _Z_OBJ_MAKEKINSUTA_H_
+#ifndef Z_OBJ_MAKEKINSUTA_H
+#define Z_OBJ_MAKEKINSUTA_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.h b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.h
index dbd9f5fe4a..16dc3ba470 100644
--- a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.h
+++ b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.h
@@ -1,5 +1,5 @@
-#ifndef _Z_OBJ_MAKEOSHIHIKI_H_
-#define _Z_OBJ_MAKEOSHIHIKI_H_
+#ifndef Z_OBJ_MAKEOSHIHIKI_H
+#define Z_OBJ_MAKEOSHIHIKI_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.h b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.h
index 01b9816ddc..e7c83d94bf 100644
--- a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.h
+++ b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.h
@@ -1,5 +1,5 @@
-#ifndef _Z_OBJ_MURE_H_
-#define _Z_OBJ_MURE_H_
+#ifndef Z_OBJ_MURE_H
+#define Z_OBJ_MURE_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.h b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.h
index fc994e2658..c89e0139f4 100644
--- a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.h
+++ b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.h
@@ -1,5 +1,5 @@
-#ifndef _Z_OBJ_MURE2_H_
-#define _Z_OBJ_MURE2_H_
+#ifndef Z_OBJ_MURE2_H
+#define Z_OBJ_MURE2_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.h b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.h
index 77652c3c9b..b4e71c1b9b 100644
--- a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.h
+++ b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.h
@@ -1,5 +1,5 @@
-#ifndef _Z_OBJ_MURE3_H_
-#define _Z_OBJ_MURE3_H_
+#ifndef Z_OBJ_MURE3_H
+#define Z_OBJ_MURE3_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h
index 3dbdac46c2..33098f64b6 100644
--- a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h
+++ b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h
@@ -1,5 +1,5 @@
-#ifndef _Z_OBJ_OSHIHIKI_H_
-#define _Z_OBJ_OSHIHIKI_H_
+#ifndef Z_OBJ_OSHIHIKI_H
+#define Z_OBJ_OSHIHIKI_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.h b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.h
index c7da2b5f5d..6c31a11b5f 100644
--- a/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.h
+++ b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.h
@@ -1,5 +1,5 @@
-#ifndef _Z_OBJ_ROOMTIMER_H_
-#define _Z_OBJ_ROOMTIMER_H_
+#ifndef Z_OBJ_ROOMTIMER_H
+#define Z_OBJ_ROOMTIMER_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.h b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.h
index 3e0b9e01d2..3a44c8af26 100644
--- a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.h
+++ b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.h
@@ -1,5 +1,5 @@
-#ifndef _Z_OBJ_SWITCH_H_
-#define _Z_OBJ_SWITCH_H_
+#ifndef Z_OBJ_SWITCH_H
+#define Z_OBJ_SWITCH_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.h b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.h
index 555209f205..8c4e1b7d16 100644
--- a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.h
+++ b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.h
@@ -1,5 +1,5 @@
-#ifndef _Z_OBJ_SYOKUDAI_H_
-#define _Z_OBJ_SYOKUDAI_H_
+#ifndef Z_OBJ_SYOKUDAI_H
+#define Z_OBJ_SYOKUDAI_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.h b/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.h
index 3d7df8a0d9..7b890b1cb2 100644
--- a/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.h
+++ b/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.h
@@ -1,5 +1,5 @@
-#ifndef _Z_OBJ_TIMEBLOCK_H_
-#define _Z_OBJ_TIMEBLOCK_H_
+#ifndef Z_OBJ_TIMEBLOCK_H
+#define Z_OBJ_TIMEBLOCK_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.h b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.h
index c3a955b378..c8abce6503 100644
--- a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.h
+++ b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.h
@@ -1,5 +1,5 @@
-#ifndef _Z_OBJ_TSUBO_H_
-#define _Z_OBJ_TSUBO_H_
+#ifndef Z_OBJ_TSUBO_H
+#define Z_OBJ_TSUBO_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.h b/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.h
index 6fc1792192..9b9dd991ee 100644
--- a/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.h
+++ b/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.h
@@ -1,5 +1,5 @@
-#ifndef _Z_OBJ_WARP2BLOCK_H_
-#define _Z_OBJ_WARP2BLOCK_H_
+#ifndef Z_OBJ_WARP2BLOCK_H
+#define Z_OBJ_WARP2BLOCK_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.h b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.h
index 9b7048f981..aaa4efdc85 100644
--- a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.h
+++ b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.h
@@ -1,5 +1,5 @@
-#ifndef _Z_OBJECT_KANKYO_H_
-#define _Z_OBJECT_KANKYO_H_
+#ifndef Z_OBJECT_KANKYO_H
+#define Z_OBJECT_KANKYO_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.h b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.h
index 1588fb3e34..a63890e53a 100644
--- a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.h
+++ b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.h
@@ -1,5 +1,5 @@
-#ifndef _Z_OCEFF_SPOT_H_
-#define _Z_OCEFF_SPOT_H_
+#ifndef Z_OCEFF_SPOT_H
+#define Z_OCEFF_SPOT_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.h b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.h
index a8d717fd01..a566d5896f 100644
--- a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.h
+++ b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.h
@@ -1,5 +1,5 @@
-#ifndef _Z_OCEFF_STORM_H_
-#define _Z_OCEFF_STORM_H_
+#ifndef Z_OCEFF_STORM_H
+#define Z_OCEFF_STORM_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.h b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.h
index b209d6c21b..589120a296 100644
--- a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.h
+++ b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.h
@@ -1,5 +1,5 @@
-#ifndef _Z_OCEFF_WIPE_H_
-#define _Z_OCEFF_WIPE_H_
+#ifndef Z_OCEFF_WIPE_H
+#define Z_OCEFF_WIPE_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.h b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.h
index 33daa7f08c..d94a0fc58f 100644
--- a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.h
+++ b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.h
@@ -1,5 +1,5 @@
-#ifndef _Z_OCEFF_WIPE2_H_
-#define _Z_OCEFF_WIPE2_H_
+#ifndef Z_OCEFF_WIPE2_H
+#define Z_OCEFF_WIPE2_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.h b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.h
index e5547197ab..a5bc2bbe4c 100644
--- a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.h
+++ b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.h
@@ -1,5 +1,5 @@
-#ifndef _Z_OCEFF_WIPE3_H_
-#define _Z_OCEFF_WIPE3_H_
+#ifndef Z_OCEFF_WIPE3_H
+#define Z_OCEFF_WIPE3_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.h b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.h
index 50b18b2428..87af675469 100644
--- a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.h
+++ b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.h
@@ -1,5 +1,5 @@
-#ifndef _Z_OCEFF_WIPE4_H_
-#define _Z_OCEFF_WIPE4_H_
+#ifndef Z_OCEFF_WIPE4_H
+#define Z_OCEFF_WIPE4_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h
index 321f9a5aea..19fd705f88 100644
--- a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h
+++ b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h
@@ -1,5 +1,5 @@
-#ifndef _Z_SHOT_SUN_H_
-#define _Z_SHOT_SUN_H_
+#ifndef Z_SHOT_SUN_H
+#define Z_SHOT_SUN_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/actors/ovl_kaleido_scope/z_kaleido_scope.h b/src/overlays/actors/ovl_kaleido_scope/z_kaleido_scope.h
index 7b2eb579ac..2e15591917 100644
--- a/src/overlays/actors/ovl_kaleido_scope/z_kaleido_scope.h
+++ b/src/overlays/actors/ovl_kaleido_scope/z_kaleido_scope.h
@@ -1,5 +1,5 @@
-#ifndef _Z_KALEIDO_SCOPE_H_
-#define _Z_KALEIDO_SCOPE_H_
+#ifndef Z_KALEIDO_SCOPE_H
+#define Z_KALEIDO_SCOPE_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.h b/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.h
index f086f0c7e4..a22d3092db 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EFF_SS_BLAST_H_
-#define _Z_EFF_SS_BLAST_H_
+#ifndef Z_EFF_SS_BLAST_H
+#define Z_EFF_SS_BLAST_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.h b/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.h
index 95416414bc..1f7abc2f95 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EFF_SS_BOMB_H_
-#define _Z_EFF_SS_BOMB_H_
+#ifndef Z_EFF_SS_BOMB_H
+#define Z_EFF_SS_BOMB_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.h b/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.h
index 4c2412d30e..454303b50b 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EFF_SS_BOMB2_H_
-#define _Z_EFF_SS_BOMB2_H_
+#ifndef Z_EFF_SS_BOMB2_H
+#define Z_EFF_SS_BOMB2_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.h b/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.h
index fef1d59e23..c8a77cfb3e 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EFF_SS_BUBBLE_H_
-#define _Z_EFF_SS_BUBBLE_H_
+#ifndef Z_EFF_SS_BUBBLE_H
+#define Z_EFF_SS_BUBBLE_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.h b/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.h
index 905eb391b2..44f891a2e8 100644
--- a/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.h
+++ b/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EFF_SS_D_FIRE_H_
-#define _Z_EFF_SS_D_FIRE_H_
+#ifndef Z_EFF_SS_D_FIRE_H
+#define Z_EFF_SS_D_FIRE_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.h b/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.h
index cf6f349282..69f890b8fd 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EFF_SS_DEAD_DB_H_
-#define _Z_EFF_SS_DEAD_DB_H_
+#ifndef Z_EFF_SS_DEAD_DB_H
+#define Z_EFF_SS_DEAD_DB_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.h b/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.h
index c3b2c39064..3b3281cde4 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EFF_SS_DEAD_DD_H_
-#define _Z_EFF_SS_DEAD_DD_H_
+#ifndef Z_EFF_SS_DEAD_DD_H
+#define Z_EFF_SS_DEAD_DD_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.h b/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.h
index a7eb941be7..d6a9b9afb8 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EFF_SS_DEAD_DS_H_
-#define _Z_EFF_SS_DEAD_DS_H_
+#ifndef Z_EFF_SS_DEAD_DS_H
+#define Z_EFF_SS_DEAD_DS_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h b/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h
index 87cbcb76d5..624159f3d2 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EFF_SS_DEAD_SOUND_H_
-#define _Z_EFF_SS_DEAD_SOUND_H_
+#ifndef Z_EFF_SS_DEAD_SOUND_H
+#define Z_EFF_SS_DEAD_SOUND_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.h b/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.h
index 9383066565..d7629b3b44 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EFF_SS_DT_BUBBLE_H_
-#define _Z_EFF_SS_DT_BUBBLE_H_
+#ifndef Z_EFF_SS_DT_BUBBLE_H
+#define Z_EFF_SS_DT_BUBBLE_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.h b/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.h
index 912909632c..a56bc38f52 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EFF_SS_DUST_H_
-#define _Z_EFF_SS_DUST_H_
+#ifndef Z_EFF_SS_DUST_H
+#define Z_EFF_SS_DUST_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.h b/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.h
index c23fe43030..bf8839be95 100644
--- a/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.h
+++ b/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EFF_SS_EN_FIRE_H_
-#define _Z_EFF_SS_EN_FIRE_H_
+#ifndef Z_EFF_SS_EN_FIRE_H
+#define Z_EFF_SS_EN_FIRE_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.h b/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.h
index b3a352b5cb..985e37b84d 100644
--- a/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.h
+++ b/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EFF_SS_EN_ICE_H_
-#define _Z_EFF_SS_EN_ICE_H_
+#ifndef Z_EFF_SS_EN_ICE_H
+#define Z_EFF_SS_EN_ICE_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.h b/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.h
index a62f82272d..cc05775c21 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EFF_SS_EXTRA_H_
-#define _Z_EFF_SS_EXTRA_H_
+#ifndef Z_EFF_SS_EXTRA_H
+#define Z_EFF_SS_EXTRA_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.h b/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.h
index d4d9df8166..01709c6aac 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EFF_SS_FCIRCLE_H_
-#define _Z_EFF_SS_FCIRCLE_H_
+#ifndef Z_EFF_SS_FCIRCLE_H
+#define Z_EFF_SS_FCIRCLE_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h b/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h
index 5c33ba2307..4a56d0b9f8 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EFF_SS_FHGFLASH_h_
-#define _Z_EFF_SS_FHGFLASH_h_
+#ifndef Z_EFF_SS_FHGFLASH_H
+#define Z_EFF_SS_FHGFLASH_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.h b/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.h
index 3d209d0721..424d769f12 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EFF_SS_FIRE_TAIL_H_
-#define _Z_EFF_SS_FIRE_TAIL_H_
+#ifndef Z_EFF_SS_FIRE_TAIL_H
+#define Z_EFF_SS_FIRE_TAIL_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.h b/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.h
index 2155a4c54d..1fb6af2f2e 100644
--- a/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.h
+++ b/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EFF_SS_G_FIRE_H_
-#define _Z_EFF_SS_G_FIRE_H_
+#ifndef Z_EFF_SS_G_FIRE_H
+#define Z_EFF_SS_G_FIRE_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.h b/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.h
index 845c6aeb1a..a63e567e5e 100644
--- a/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.h
+++ b/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EFF_SS_G_MAGMA_H_
-#define _Z_EFF_SS_G_MAGMA_H_
+#ifndef Z_EFF_SS_G_MAGMA_H
+#define Z_EFF_SS_G_MAGMA_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.h b/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.h
index 9bd0e89925..d1993832c9 100644
--- a/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.h
+++ b/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EFF_SS_G_MAGMA2_H_
-#define _Z_EFF_SS_G_MAGMA2_H_
+#ifndef Z_EFF_SS_G_MAGMA2_H
+#define Z_EFF_SS_G_MAGMA2_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.h b/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.h
index a012d09957..afe8e89e10 100644
--- a/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.h
+++ b/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EFF_SS_G_RIPPLE_H_
-#define _Z_EFF_SS_G_RIPPLE_H_
+#ifndef Z_EFF_SS_G_RIPPLE_H
+#define Z_EFF_SS_G_RIPPLE_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.h b/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.h
index d3d75b5e3a..a4a22cef1f 100644
--- a/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.h
+++ b/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EFF_SS_G_SPK_H_
-#define _Z_EFF_SS_G_SPK_H_
+#ifndef Z_EFF_SS_G_SPK_H
+#define Z_EFF_SS_G_SPK_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.h b/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.h
index ef6c065b3a..b761ce332e 100644
--- a/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.h
+++ b/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EFF_SS_G_SPLASH_H_
-#define _Z_EFF_SS_G_SPLASH_H_
+#ifndef Z_EFF_SS_G_SPLASH_H
+#define Z_EFF_SS_G_SPLASH_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h b/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h
index 24e62bc03e..9906994317 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EFF_SS_HAHEN_H_
-#define _Z_EFF_SS_HAHEN_H_
+#ifndef Z_EFF_SS_HAHEN_H
+#define Z_EFF_SS_HAHEN_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h b/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h
index 23a94b1472..74f8e7f80b 100644
--- a/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h
+++ b/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EFF_SS_HITMARK_H_
-#define _Z_EFF_SS_HITMARK_H_
+#ifndef Z_EFF_SS_HITMARK_H
+#define Z_EFF_SS_HITMARK_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.h b/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.h
index dbe6d57420..2a697d74e3 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EFF_SS_ICE_PIECE_H_
-#define _Z_EFF_SS_ICE_PIECE_H_
+#ifndef Z_EFF_SS_ICE_PIECE_H
+#define Z_EFF_SS_ICE_PIECE_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.h b/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.h
index d7b44d9a56..08fc6f7451 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EFF_SS_ICE_SMOKE_H_
-#define _Z_EFF_SS_ICE_SMOKE_H_
+#ifndef Z_EFF_SS_ICE_SMOKE_H
+#define Z_EFF_SS_ICE_SMOKE_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.h b/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.h
index 281f786079..e8b2c617ca 100644
--- a/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.h
+++ b/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EFF_SS_K_FIRE_H_
-#define _Z_EFF_SS_K_FIRE_H_
+#ifndef Z_EFF_SS_K_FIRE_H
+#define Z_EFF_SS_K_FIRE_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h b/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h
index 9bd6bf6aa8..17a4c8da1a 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EFF_SS_KAKERA_H_
-#define _Z_EFF_SS_KAKERA_H_
+#ifndef Z_EFF_SS_KAKERA_H
+#define Z_EFF_SS_KAKERA_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.h b/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.h
index 2a94edf076..290fec68d2 100644
--- a/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.h
+++ b/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EFF_SS_KIRAKIRA_H_
-#define _Z_EFF_SS_KIRAKIRA_H_
+#ifndef Z_EFF_SS_KIRAKIRA_H
+#define Z_EFF_SS_KIRAKIRA_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.h b/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.h
index a02f56dc28..758f2cce65 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EFF_SS_LIGHTNING_H_
-#define _Z_EFF_SS_LIGHTNING_H_
+#ifndef Z_EFF_SS_LIGHTNING_H
+#define Z_EFF_SS_LIGHTNING_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.h b/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.h
index 075562b8bc..321fd334e6 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EFF_SS_SIBUKI_H_
-#define _Z_EFF_SS_SIBUKI_H_
+#ifndef Z_EFF_SS_SIBUKI_H
+#define Z_EFF_SS_SIBUKI_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.h b/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.h
index a6b9b1fd46..c0201fba0c 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EFF_SS_SIBUKI2_H_
-#define _Z_EFF_SS_SIBUKI2_H_
+#ifndef Z_EFF_SS_SIBUKI2_H
+#define Z_EFF_SS_SIBUKI2_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.h b/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.h
index ff0dc746d3..e29ca6e3f6 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EFF_SS_SOLDERSRCHBALL_H_
-#define _Z_EFF_SS_SOLDERSRCHBALL_H_
+#ifndef Z_EFF_SS_SOLDERSRCHBALL_H
+#define Z_EFF_SS_SOLDERSRCHBALL_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.h b/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.h
index 2da77cbe9e..a3df5491c6 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EFF_SS_STICK_H_
-#define _Z_EFF_SS_STICK_H_
+#ifndef Z_EFF_SS_STICK_H
+#define Z_EFF_SS_STICK_H
 
 #include "ultra64.h"
 #include "global.h"
diff --git a/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h b/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h
index 26b6c86962..680345014f 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h
@@ -1,5 +1,5 @@
-#ifndef _Z_EFF_SS_STONE1_H_
-#define _Z_EFF_SS_STONE1_H_
+#ifndef Z_EFF_SS_STONE1_H
+#define Z_EFF_SS_STONE1_H
 
 #include "ultra64.h"
 #include "global.h"