Remove "z64" prefix from all headers (#2518)

* z64 - a

* z64 - b

* z64 - c

* z64 - d

* z64 - e

* z64 - f

* z64 - g

* z64 - h

* z64 - i

* z64 - l

* z64 - m

* z64 - o

* z64 - p

* z64 - q

* z64 - r

* z64 - s

* z64 - t

* z64 - v

* restore file

* fix merge

* fix merge

---------

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

76 files changed, 219 insertions, 217 deletions

diff --git a/include/z64actor.h b/include/actor.h
index 14defad5e..985f32abb 100644
--- a/include/z64actor.h
+++ b/include/actor.h
@@ -1,11 +1,11 @@
-#ifndef Z64ACTOR_H
-#define Z64ACTOR_H
+#ifndef ACTOR_H
+#define ACTOR_H
 
 #include "color.h"
-#include "z64actor_profile.h"
-#include "z64animation.h"
-#include "z64math.h"
-#include "z64collision_check.h"
+#include "actor_profile.h"
+#include "animation.h"
+#include "z_math.h"
+#include "collision_check.h"
 
 #define ACTOR_NUMBER_MAX 200
 
diff --git a/include/z64actor_profile.h b/include/actor_profile.h
index 82ec9f957..d02ce03cf 100644
--- a/include/z64actor_profile.h
+++ b/include/actor_profile.h
@@ -1,5 +1,5 @@
-#ifndef Z64ACTOR_PROFILE_H
-#define Z64ACTOR_PROFILE_H
+#ifndef ACTOR_PROFILE_H
+#define ACTOR_PROFILE_H
 
 #include "ultra64.h"
 
diff --git a/include/z64animation.h b/include/animation.h
index a085da5dd..fdf14843b 100644
--- a/include/z64animation.h
+++ b/include/animation.h
@@ -1,10 +1,10 @@
-#ifndef Z64_ANIMATION_H
-#define Z64_ANIMATION_H
+#ifndef ANIMATION_H
+#define ANIMATION_H
 
 #include "avoid_ub.h"
 #include "ultra64.h"
-#include "z64dma.h"
-#include "z64math.h"
+#include "dma.h"
+#include "z_math.h"
 
 struct PlayState;
 struct Actor;
diff --git a/include/z64animation_legacy.h b/include/animation_legacy.h
index 066a8faa3..5b5c0399f 100644
--- a/include/z64animation_legacy.h
+++ b/include/animation_legacy.h
@@ -1,8 +1,8 @@
-#ifndef Z64_ANIMATION_LEGACY_H
-#define Z64_ANIMATION_LEGACY_H
+#ifndef ANIMATION_LEGACY_H
+#define ANIMATION_LEGACY_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct LegacyLimb {
     /* 0x000 */ Gfx* dList;
diff --git a/include/z64audio.h b/include/audio.h
index 308c220d7..2dbf10750 100644
--- a/include/z64audio.h
+++ b/include/audio.h
@@ -1,9 +1,9 @@
-#ifndef Z64_AUDIO_H
-#define Z64_AUDIO_H
+#ifndef AUDIO_H
+#define AUDIO_H
 
 #include "ultra64.h"
 #include "sequence.h"
-#include "z64math.h"
+#include "z_math.h"
 
 struct GfxPrint;
 
diff --git a/include/audio/soundfont_file.h b/include/audio/soundfont_file.h
index 945642977..3de459509 100644
--- a/include/audio/soundfont_file.h
+++ b/include/audio/soundfont_file.h
@@ -4,7 +4,7 @@
 #include "stdbool.h"
 #include "alignment.h"
 #include "attributes.h"
-#include "z64audio.h"
+#include "audio.h"
 
 // Envelope definitions
 
diff --git a/include/audiomgr.h b/include/audiomgr.h
index b518c976a..66a905026 100644
--- a/include/audiomgr.h
+++ b/include/audiomgr.h
@@ -2,7 +2,7 @@
 #define AUDIOMGR_H
 
 #include "sched.h"
-#include "z64audio.h"
+#include "audio.h"
 
 typedef enum AudioMgrDebugLevel {
     /* 0 */ AUDIOMGR_DEBUG_LEVEL_NONE,
diff --git a/include/z64bgcheck.h b/include/bgcheck.h
index eb7e9155d..13b857058 100644
--- a/include/z64bgcheck.h
+++ b/include/bgcheck.h
@@ -1,8 +1,8 @@
-#ifndef Z64BGCHECK_H
-#define Z64BGCHECK_H
+#ifndef BGCHECK_H
+#define BGCHECK_H
 
 #include "ultra64/ultratypes.h"
-#include "z64math.h"
+#include "z_math.h"
 
 struct PlayState;
 struct Actor;
diff --git a/include/z64camera.h b/include/camera.h
index 2fcbffdf5..9d4783de0 100644
--- a/include/z64camera.h
+++ b/include/camera.h
@@ -1,9 +1,9 @@
-#ifndef Z64CAMERA_H
-#define Z64CAMERA_H
+#ifndef CAMERA_H
+#define CAMERA_H
 
 #include "ultra64.h"
-#include "z64cutscene.h"
-#include "z64math.h"
+#include "cutscene.h"
+#include "z_math.h"
 
 struct CollisionContext;
 struct View;
diff --git a/include/z64collision_check.h b/include/collision_check.h
index 4a15431ac..ddcafb24e 100644
--- a/include/z64collision_check.h
+++ b/include/collision_check.h
@@ -1,8 +1,8 @@
-#ifndef Z64COLLISION_CHECK_H
-#define Z64COLLISION_CHECK_H
+#ifndef COLLISION_CHECK_H
+#define COLLISION_CHECK_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 #define COLLISION_CHECK_AT_MAX 50
 #define COLLISION_CHECK_AC_MAX 60
diff --git a/include/console_logo_state.h b/include/console_logo_state.h
index 09b7d6654..da9509b72 100644
--- a/include/console_logo_state.h
+++ b/include/console_logo_state.h
@@ -2,9 +2,9 @@
 #define CONSOLE_LOGO_STATE_H
 
 #include "ultra64.h"
-#include "z64game.h"
-#include "z64sram.h"
-#include "z64view.h"
+#include "game.h"
+#include "sram.h"
+#include "view.h"
 
 typedef struct ConsoleLogoState {
     /* 0x0000 */ GameState state;
diff --git a/include/z64curve.h b/include/curve.h
index 3ca0eac13..8779b04b4 100644
--- a/include/z64curve.h
+++ b/include/curve.h
@@ -1,5 +1,5 @@
-#ifndef Z64_CURVE_H
-#define Z64_CURVE_H
+#ifndef CURVE_H
+#define CURVE_H
 
 #include "ultra64.h"
 
diff --git a/include/z64cutscene.h b/include/cutscene.h
index f8aed368d..e3bf4a1c8 100644
--- a/include/z64cutscene.h
+++ b/include/cutscene.h
@@ -1,8 +1,8 @@
-#ifndef Z64CUTSCENE_H
-#define Z64CUTSCENE_H
+#ifndef CUTSCENE_H
+#define CUTSCENE_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 struct PlayState;
 
diff --git a/include/z64cutscene_commands.h b/include/cutscene_commands.h
index f0c8146cd..14ec25c49 100644
--- a/include/z64cutscene_commands.h
+++ b/include/cutscene_commands.h
@@ -1,8 +1,8 @@
-#ifndef Z64CUTSCENE_COMMANDS_H
-#define Z64CUTSCENE_COMMANDS_H
+#ifndef CUTSCENE_COMMANDS_H
+#define CUTSCENE_COMMANDS_H
 
 #include "command_macros_base.h"
-#include "z64cutscene.h"
+#include "cutscene.h"
 
 /**
  * Cutscene scripts are arrays of `CutsceneData` words, including bit-packed integers and floats.
diff --git a/include/z64cutscene_flags.h b/include/cutscene_flags.h
index 5a3c7c2a7..a6e34762a 100644
--- a/include/z64cutscene_flags.h
+++ b/include/cutscene_flags.h
@@ -1,5 +1,5 @@
-#ifndef Z64CUTSCENE_FLAGS_H
-#define Z64CUTSCENE_FLAGS_H
+#ifndef CUTSCENE_FLAGS_H
+#define CUTSCENE_FLAGS_H
 
 #include "ultra64.h"
 
diff --git a/include/z64cutscene_spline.h b/include/cutscene_spline.h
index 3a7394945..00a815a61 100644
--- a/include/z64cutscene_spline.h
+++ b/include/cutscene_spline.h
@@ -1,8 +1,8 @@
-#ifndef Z64CUTSCENE_SPLINE_H
-#define Z64CUTSCENE_SPLINE_H
+#ifndef CUTSCENE_SPLINE_H
+#define CUTSCENE_SPLINE_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 union CutsceneCameraPoint;
 
diff --git a/include/db_camera.h b/include/db_camera.h
index 81d8515d0..fd11f56fd 100644
--- a/include/db_camera.h
+++ b/include/db_camera.h
@@ -2,8 +2,8 @@
 #define DB_CAMERA_H
 
 #include "ultra64.h"
-#include "z64cutscene.h"
-#include "z64math.h"
+#include "cutscene.h"
+#include "z_math.h"
 
 struct Camera;
 
diff --git a/include/z64debug.h b/include/debug.h
index 0e2c7334e..9c12f8242 100644
--- a/include/z64debug.h
+++ b/include/debug.h
@@ -1,5 +1,5 @@
-#ifndef Z64DEBUG_H
-#define Z64DEBUG_H
+#ifndef DEBUG_H
+#define DEBUG_H
 
 #include "ultra64.h"
 
diff --git a/include/z64debug_display.h b/include/debug_display.h
index 9cb119806..0623224fe 100644
--- a/include/z64debug_display.h
+++ b/include/debug_display.h
@@ -1,8 +1,8 @@
-#ifndef Z64_DEBUG_DISPLAY_H
-#define Z64_DEBUG_DISPLAY_H
+#ifndef DEBUG_DISPLAY_H
+#define DEBUG_DISPLAY_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 #include "color.h"
 
 struct GraphicsContext;
diff --git a/include/z64dma.h b/include/dma.h
index 10968517b..83a79619c 100755
--- a/include/z64dma.h
+++ b/include/dma.h
@@ -1,5 +1,5 @@
-#ifndef Z64_DMA_H
-#define Z64_DMA_H
+#ifndef DMA_H
+#define DMA_H
 
 #include "ultra64.h"
 #include "alignment.h"
diff --git a/include/z64draw.h b/include/draw.h
index 95c5aa234..66658817e 100644
--- a/include/z64draw.h
+++ b/include/draw.h
@@ -1,5 +1,5 @@
-#ifndef Z64_DRAW_H
-#define Z64_DRAW_H
+#ifndef DRAW_H
+#define DRAW_H
 
 #include "ultra64.h"
 
diff --git a/include/z64effect.h b/include/effect.h
index 0c07cc512..060b6cd09 100644
--- a/include/z64effect.h
+++ b/include/effect.h
@@ -1,10 +1,10 @@
-#ifndef Z64EFFECT_H
-#define Z64EFFECT_H
+#ifndef EFFECT_H
+#define EFFECT_H
 
 #include "color.h"
 #include "romfile.h"
-#include "z64light.h"
-#include "z64math.h"
+#include "light.h"
+#include "z_math.h"
 
 struct Actor;
 struct GraphicsContext;
diff --git a/include/z64environment.h b/include/environment.h
index 4c4bc770c..6c23dfb33 100644
--- a/include/z64environment.h
+++ b/include/environment.h
@@ -1,9 +1,9 @@
-#ifndef _Z64ENVIRONMENT_H_
-#define _Z64ENVIRONMENT_H_
+#ifndef ENVIRONMENT_H_
+#define ENVIRONMENT_H_
 
-#include "z64math.h"
-#include "z64light.h"
-#include "z64dma.h"
+#include "z_math.h"
+#include "light.h"
+#include "dma.h"
 
 struct GameOverContext;
 struct MessageContext;
diff --git a/include/z64face_reaction.h b/include/face_reaction.h
index 274340ebc..7dc89f864 100644
--- a/include/z64face_reaction.h
+++ b/include/face_reaction.h
@@ -1,5 +1,5 @@
-#ifndef Z64FACE_REACTION_H
-#define Z64FACE_REACTION_H
+#ifndef FACE_REACTION_H
+#define FACE_REACTION_H
 
 #include "ultra64.h"
 
diff --git a/include/file_select_state.h b/include/file_select_state.h
index 0a831caa0..6dc7cfadc 100644
--- a/include/file_select_state.h
+++ b/include/file_select_state.h
@@ -2,12 +2,12 @@
 #define FILE_SELECT_STATE_H
 
 #include "ultra64.h"
-#include "z64environment.h"
-#include "z64game.h"
-#include "z64message.h"
-#include "z64skybox.h"
-#include "z64sram.h"
-#include "z64view.h"
+#include "environment.h"
+#include "game.h"
+#include "message.h"
+#include "skybox.h"
+#include "sram.h"
+#include "view.h"
 
 typedef struct FileSelectState {
     /* 0x00000 */ GameState state;
diff --git a/include/z64font.h b/include/font.h
index 72f97fddd..b379d32e1 100644
--- a/include/z64font.h
+++ b/include/font.h
@@ -1,5 +1,5 @@
-#ifndef Z64FONT_H
-#define Z64FONT_H
+#ifndef FONT_H
+#define FONT_H
 
 #include "ultra64.h"
 
diff --git a/include/z64frame_advance.h b/include/frame_advance.h
index edefb0b47..0736b09d5 100644
--- a/include/z64frame_advance.h
+++ b/include/frame_advance.h
@@ -1,5 +1,5 @@
-#ifndef Z64FRAME_ADVANCE_H
-#define Z64FRAME_ADVANCE_H
+#ifndef FRAME_ADVANCE_H
+#define FRAME_ADVANCE_H
 
 #include "ultra64.h"
 
diff --git a/include/z64game.h b/include/game.h
index aaf70be32..d15a3fcdc 100644
--- a/include/z64game.h
+++ b/include/game.h
@@ -1,5 +1,5 @@
-#ifndef Z64GAME_H
-#define Z64GAME_H
+#ifndef GAME_H
+#define GAME_H
 // This file is named "game" after game.c for now, this may change later with the system name
 
 #include "ultra64/ultratypes.h"
diff --git a/include/z64game_over.h b/include/game_over.h
index 03697c1f5..e91ad0413 100644
--- a/include/z64game_over.h
+++ b/include/game_over.h
@@ -1,5 +1,5 @@
-#ifndef Z64GAME_OVER_H
-#define Z64GAME_OVER_H
+#ifndef GAME_OVER_H
+#define GAME_OVER_H
 
 #include "ultra64.h"
 
diff --git a/include/z64horse.h b/include/horse.h
index d58de4b6d..e3e5502a8 100644
--- a/include/z64horse.h
+++ b/include/horse.h
@@ -1,8 +1,8 @@
-#ifndef Z64HORSE_H
-#define Z64HORSE_H
+#ifndef HORSE_H
+#define HORSE_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 struct PlayState;
 struct Actor;
diff --git a/include/z64interface.h b/include/interface.h
index bfa3bffeb..84834b3df 100644
--- a/include/z64interface.h
+++ b/include/interface.h
@@ -1,9 +1,9 @@
-#ifndef Z64INTERFACE_H
-#define Z64INTERFACE_H
+#ifndef INTERFACE_H
+#define INTERFACE_H
 
 #include "ultra64.h"
-#include "z64dma.h"
-#include "z64view.h"
+#include "dma.h"
+#include "view.h"
 
 struct PlayState;
 
diff --git a/include/z64inventory.h b/include/inventory.h
index 8c1a5a90d..3ad5c1bbb 100644
--- a/include/z64inventory.h
+++ b/include/inventory.h
@@ -1,8 +1,8 @@
-#ifndef Z64INVENTORY_H
-#define Z64INVENTORY_H
+#ifndef INVENTORY_H
+#define INVENTORY_H
 
 #include "ultra64.h"
-#include "z64item.h"
+#include "item.h"
 
 struct PlayState;
 
diff --git a/include/z64item.h b/include/item.h
index 60344f326..f5d4a530a 100644
--- a/include/z64item.h
+++ b/include/item.h
@@ -1,5 +1,5 @@
-#ifndef Z64ITEM_H
-#define Z64ITEM_H
+#ifndef ITEM_H
+#define ITEM_H
 
 // Note that z_kaleido_scope.c assumes that the dimensions and texture format here also matches the dimensions and
 // texture format for MAP_NAME_TEX1_*
diff --git a/include/z64lifemeter.h b/include/lifemeter.h
index 29b2656b8..d88ae6902 100644
--- a/include/z64lifemeter.h
+++ b/include/lifemeter.h
@@ -1,5 +1,5 @@
-#ifndef Z64LIFEMETER_H
-#define Z64LIFEMETER_H
+#ifndef LIFEMETER_H
+#define LIFEMETER_H
 
 #include "ultra64/ultratypes.h"
 
diff --git a/include/z64light.h b/include/light.h
index ff6f732e1..fa4a306b6 100644
--- a/include/z64light.h
+++ b/include/light.h
@@ -1,9 +1,9 @@
-#ifndef Z64LIGHT_H
-#define Z64LIGHT_H
+#ifndef LIGHT_H
+#define LIGHT_H
 
 #include "ultra64.h"
 #include "ultra64/gbi.h"
-#include "z64math.h"
+#include "z_math.h"
 
 struct GraphicsContext;
 struct PlayState;
diff --git a/include/z64map_mark.h b/include/map_mark.h
index b56649111..2f22ee0f5 100644
--- a/include/z64map_mark.h
+++ b/include/map_mark.h
@@ -1,5 +1,5 @@
-#ifndef Z64MAP_MARK_H
-#define Z64MAP_MARK_H
+#ifndef MAP_MARK_H
+#define MAP_MARK_H
 
 #include "ultra64.h"
 
diff --git a/include/map_select_state.h b/include/map_select_state.h
index d2a6b43d1..01e57dd1d 100644
--- a/include/map_select_state.h
+++ b/include/map_select_state.h
@@ -2,8 +2,8 @@
 #define MAP_SELECT_STATE_H
 
 #include "ultra64.h"
-#include "z64game.h"
-#include "z64view.h"
+#include "game.h"
+#include "view.h"
 
 struct MapSelectState;
 
diff --git a/include/z64message.h b/include/message.h
index 3dfa196d9..3948f2dd0 100644
--- a/include/z64message.h
+++ b/include/message.h
@@ -1,9 +1,9 @@
-#ifndef Z64MESSAGE_H
-#define Z64MESSAGE_H
+#ifndef MESSAGE_H
+#define MESSAGE_H
 
-#include "z64view.h"
+#include "view.h"
 #include "versions.h"
-#include "z64font.h"
+#include "font.h"
 
 struct OcarinaStaff;
 struct Actor;
diff --git a/include/message_data_fmt.h b/include/message_data_fmt.h
index ac798d934..375ac281e 100644
--- a/include/message_data_fmt.h
+++ b/include/message_data_fmt.h
@@ -1,8 +1,8 @@
 #ifndef MESSAGE_DATA_FMT_H
 #define MESSAGE_DATA_FMT_H
 
-#include "z64save.h" // For highscores
-#include "z64item.h" // For item ids
+#include "save.h" // For highscores
+#include "item.h" // For item ids
 #include "sfx.h" // For sfx ids
 
 /*
diff --git a/include/n64dd.h b/include/n64dd.h
index 6a353c317..f7a3f649c 100644
--- a/include/n64dd.h
+++ b/include/n64dd.h
@@ -3,9 +3,9 @@
 
 #include "ultra64.h"
 #include "ultra64/leo.h"
-#include "z64pause.h"
-#include "z64scene.h"
-#include "z64map_mark.h"
+#include "pause.h"
+#include "scene.h"
+#include "map_mark.h"
 #include "versions.h"
 
 struct Font;
diff --git a/include/z64object.h b/include/object.h
index 016eda00d..e40e67112 100644
--- a/include/z64object.h
+++ b/include/object.h
@@ -1,8 +1,8 @@
-#ifndef Z64OBJECT_H
-#define Z64OBJECT_H
+#ifndef OBJECT_H
+#define OBJECT_H
 
 #include "ultra64.h"
-#include "z64dma.h"
+#include "dma.h"
 
 struct PlayState;
 
diff --git a/include/z64ocarina.h b/include/ocarina.h
index d00ef01f2..b3d502836 100644
--- a/include/z64ocarina.h
+++ b/include/ocarina.h
@@ -1,5 +1,5 @@
-#ifndef Z64OCARINA_H
-#define Z64OCARINA_H
+#ifndef OCARINA_H
+#define OCARINA_H
 
 #include "ultra64.h"
 
diff --git a/include/z64olib.h b/include/olib.h
index 1b704b0e6..88b918987 100644
--- a/include/z64olib.h
+++ b/include/olib.h
@@ -1,7 +1,7 @@
-#ifndef Z64OLIB_H
-#define Z64OLIB_H
+#ifndef OLIB_H
+#define OLIB_H
 
-#include "z64math.h"
+#include "z_math.h"
 
 f32 OLib_Vec3fDist(Vec3f* a, Vec3f* b);
 f32 OLib_Vec3fDistXZ(Vec3f* a, Vec3f* b);
diff --git a/include/z64path.h b/include/path.h
index 0f9243974..56918762d 100644
--- a/include/z64path.h
+++ b/include/path.h
@@ -1,8 +1,8 @@
-#ifndef Z64PATH_H
-#define Z64PATH_H
+#ifndef PATH_H
+#define PATH_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 struct PlayState;
 struct Actor;
diff --git a/include/z64pause.h b/include/pause.h
index 24f53a93d..f8a54fc5d 100644
--- a/include/z64pause.h
+++ b/include/pause.h
@@ -1,9 +1,9 @@
-#ifndef Z64PAUSE_H
-#define Z64PAUSE_H
+#ifndef PAUSE_H
+#define PAUSE_H
 
-#include "z64animation.h"
-#include "z64message.h"
-#include "z64view.h"
+#include "animation.h"
+#include "message.h"
+#include "view.h"
 
 struct OcarinaStaff;
 struct PlayState;
diff --git a/include/z64play.h b/include/play_state.h
index 4853ac8f4..fa5e4839f 100644
--- a/include/z64play.h
+++ b/include/play_state.h
@@ -1,30 +1,30 @@
-#ifndef Z64PLAY_H
-#define Z64PLAY_H
+#ifndef PLAY_STATE_H
+#define PLAY_STATE_H
 
 #include "ultra64.h"
 
 #include "prerender.h"
 #include "transition_tile.h"
-#include "z64actor.h"
-#include "z64bgcheck.h"
-#include "z64camera.h"
-#include "z64cutscene.h"
-#include "z64environment.h"
-#include "z64frame_advance.h"
-#include "z64game.h"
-#include "z64game_over.h"
-#include "z64interface.h"
-#include "z64light.h"
-#include "z64message.h"
-#include "z64object.h"
-#include "z64pause.h"
-#include "z64room.h"
-#include "z64scene.h"
-#include "z64sfx_source.h"
-#include "z64skybox.h"
-#include "z64sram.h"
-#include "z64transition.h"
-#include "z64view.h"
+#include "actor.h"
+#include "bgcheck.h"
+#include "camera.h"
+#include "cutscene.h"
+#include "environment.h"
+#include "frame_advance.h"
+#include "game.h"
+#include "game_over.h"
+#include "interface.h"
+#include "light.h"
+#include "message.h"
+#include "object.h"
+#include "pause.h"
+#include "room.h"
+#include "scene.h"
+#include "sfx_source.h"
+#include "skybox.h"
+#include "sram.h"
+#include "transition.h"
+#include "view.h"
 
 union Color_RGBA8_u32;
 struct Path;
diff --git a/include/z64player.h b/include/player.h
index fdc8fa135..74a129a25 100644
--- a/include/z64player.h
+++ b/include/player.h
@@ -1,7 +1,7 @@
-#ifndef Z64PLAYER_H
-#define Z64PLAYER_H
+#ifndef PLAYER_H
+#define PLAYER_H
 
-#include "z64actor.h"
+#include "actor.h"
 #include "alignment.h"
 #include "face_change.h"
 
diff --git a/include/prenmi_state.h b/include/prenmi_state.h
index 3710425ca..950eb94de 100644
--- a/include/prenmi_state.h
+++ b/include/prenmi_state.h
@@ -2,7 +2,7 @@
 #define PRENMI_STATE_H
 
 #include "ultra64.h"
-#include "z64game.h"
+#include "game.h"
 
 typedef struct PreNMIState {
     /* 0x00 */ GameState state;
diff --git a/include/quake.h b/include/quake.h
index 0d97a5bf4..c6259c767 100644
--- a/include/quake.h
+++ b/include/quake.h
@@ -1,8 +1,8 @@
 #ifndef QUAKE_H
 #define QUAKE_H
 
-#include "z64camera.h"
-#include "z64math.h"
+#include "camera.h"
+#include "z_math.h"
 
 typedef struct ShakeInfo {
     /* 0x00 */ Vec3f atOffset;
diff --git a/include/z64quest_hint.h b/include/quest_hint.h
index b592a07c3..71d909b3f 100644
--- a/include/z64quest_hint.h
+++ b/include/quest_hint.h
@@ -1,5 +1,5 @@
-#ifndef Z64QUEST_HINT_H
-#define Z64QUEST_HINT_H
+#ifndef QUEST_HINT_H
+#define QUEST_HINT_H
 
 #include "ultra64.h"
 
diff --git a/include/z64quest_hint_commands.h b/include/quest_hint_commands.h
index 8b9951016..8ce19aa7d 100644
--- a/include/z64quest_hint_commands.h
+++ b/include/quest_hint_commands.h
@@ -1,5 +1,5 @@
-#ifndef Z64QUEST_HINT_COMMANDS_H
-#define Z64QUEST_HINT_COMMANDS_H
+#ifndef QUEST_HINT_COMMANDS_H
+#define QUEST_HINT_COMMANDS_H
 
 #include "ultra64.h"
 
diff --git a/include/z64room.h b/include/room.h
index 72c6f0982..836b94b31 100644
--- a/include/z64room.h
+++ b/include/room.h
@@ -1,9 +1,9 @@
-#ifndef Z64ROOM_H
-#define Z64ROOM_H
+#ifndef ROOM_H
+#define ROOM_H
 
 #include "ultra64.h"
-#include "z64dma.h"
-#include "z64math.h"
+#include "dma.h"
+#include "z_math.h"
 
 struct Input;
 struct PlayState;
diff --git a/include/sample_state.h b/include/sample_state.h
index b568a83f9..adf9e2a46 100644
--- a/include/sample_state.h
+++ b/include/sample_state.h
@@ -2,8 +2,8 @@
 #define SAMPLE_STATE_H
 
 #include "ultra64.h"
-#include "z64game.h"
-#include "z64view.h"
+#include "game.h"
+#include "view.h"
 
 typedef struct SampleState {
     /* 0x0000 */ GameState state;
diff --git a/include/z64save.h b/include/save.h
index 71b141405..a4e99546f 100644
--- a/include/z64save.h
+++ b/include/save.h
@@ -1,10 +1,10 @@
-#ifndef Z64SAVE_H
-#define Z64SAVE_H
+#ifndef SAVE_H
+#define SAVE_H
 
 #include "ultra64.h"
 #include "versions.h"
-#include "z64inventory.h"
-#include "z64math.h"
+#include "inventory.h"
+#include "z_math.h"
 
 typedef enum ZTargetSetting {
     /* 0 */ Z_TARGET_SETTING_SWITCH,
diff --git a/include/z64scene.h b/include/scene.h
index 09b342c04..8e5b1a100 100644
--- a/include/z64scene.h
+++ b/include/scene.h
@@ -1,13 +1,13 @@
-#ifndef Z64SCENE_H
-#define Z64SCENE_H
+#ifndef SCENE_H
+#define SCENE_H
 
 #include "avoid_ub.h"
 #include "ultra64.h"
-#include "z64bgcheck.h"
-#include "z64environment.h"
-#include "z64light.h"
-#include "z64math.h"
-#include "z64path.h"
+#include "bgcheck.h"
+#include "environment.h"
+#include "light.h"
+#include "z_math.h"
+#include "path.h"
 
 #include "command_macros_base.h"
 
diff --git a/include/setup_state.h b/include/setup_state.h
index 863b71401..2ec4c1000 100644
--- a/include/setup_state.h
+++ b/include/setup_state.h
@@ -1,7 +1,7 @@
 #ifndef SETUP_STATE_H
 #define SETUP_STATE_H
 
-#include "z64game.h"
+#include "game.h"
 
 typedef struct SetupState {
     /* 0x00 */ GameState state;
diff --git a/include/sfx.h b/include/sfx.h
index f7d86d87a..91f24c1c8 100644
--- a/include/sfx.h
+++ b/include/sfx.h
@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 #include "versions.h"
-#include "z64math.h"
+#include "z_math.h"
 #include "assert.h"
 
 #define MAX_CHANNELS_PER_BANK 3
diff --git a/include/z64sfx_source.h b/include/sfx_source.h
index 0034bc90a..62011872e 100644
--- a/include/z64sfx_source.h
+++ b/include/sfx_source.h
@@ -1,8 +1,8 @@
-#ifndef Z64SFX_SOURCE_H
-#define Z64SFX_SOURCE_H
+#ifndef SFX_SOURCE_H
+#define SFX_SOURCE_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 struct PlayState;
 
diff --git a/include/z64skin.h b/include/skin.h
index 641a98092..8843e5a23 100644
--- a/include/z64skin.h
+++ b/include/skin.h
@@ -1,7 +1,7 @@
-#ifndef Z64_SKIN_H
-#define Z64_SKIN_H
+#ifndef SKIN_H
+#define SKIN_H
 
-#include "z64animation.h"
+#include "animation.h"
 
 struct Actor;
 struct GraphicsContext;
diff --git a/include/z64skin_matrix.h b/include/skin_matrix.h
index 647790abf..a2ba0255f 100644
--- a/include/z64skin_matrix.h
+++ b/include/skin_matrix.h
@@ -1,8 +1,8 @@
-#ifndef Z64SKIN_MATRIX_H
-#define Z64SKIN_MATRIX_H
+#ifndef SKIN_MATRIX_H
+#define SKIN_MATRIX_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 struct GraphicsContext;
 
diff --git a/include/z64skybox.h b/include/skybox.h
index 60b3bbb7d..1e1b3f12c 100644
--- a/include/z64skybox.h
+++ b/include/skybox.h
@@ -1,11 +1,11 @@
-#ifndef Z64_SKYBOX_H
-#define Z64_SKYBOX_H
+#ifndef SKYBOX_H
+#define SKYBOX_H
 
 #include "ultra64/ultratypes.h"
 #include "ultra64/gbi.h"
 
 #include "romfile.h"
-#include "z64math.h"
+#include "z_math.h"
 
 struct GameState;
 struct GraphicsContext;
diff --git a/include/z64sram.h b/include/sram.h
index f1d05b777..f683be8a0 100644
--- a/include/z64sram.h
+++ b/include/sram.h
@@ -1,5 +1,5 @@
-#ifndef Z64SRAM_H
-#define Z64SRAM_H
+#ifndef SRAM_H
+#define SRAM_H
 
 #include "ultra64/ultratypes.h"
 
diff --git a/include/z64ss_sram.h b/include/ss_sram.h
index 416844626..7a87c90fd 100644
--- a/include/z64ss_sram.h
+++ b/include/ss_sram.h
@@ -1,5 +1,5 @@
-#ifndef Z64SS_SRAM_H
-#define Z64SS_SRAM_H
+#ifndef SS_SRAM_H
+#define SS_SRAM_H
 
 #include "stddef.h"
 #include "ultra64/ultratypes.h"
diff --git a/include/sys_math3d.h b/include/sys_math3d.h
index deeb093f4..11f699c17 100644
--- a/include/sys_math3d.h
+++ b/include/sys_math3d.h
@@ -2,7 +2,7 @@
 #define SYS_MATH3D_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 struct PlayState;
 
diff --git a/include/sys_matrix.h b/include/sys_matrix.h
index 2708af81e..3af75a18d 100644
--- a/include/sys_matrix.h
+++ b/include/sys_matrix.h
@@ -1,7 +1,7 @@
 #ifndef SYS_MATRIX_H
 #define SYS_MATRIX_H
 
-#include "z64math.h"
+#include "z_math.h"
 
 struct GraphicsContext;
 struct GameState;
diff --git a/include/z64thread.h b/include/thread.h
index c4ab827b4..c3e52a407 100644
--- a/include/z64thread.h
+++ b/include/thread.h
@@ -1,5 +1,5 @@
-#ifndef Z64THREAD_H
-#define Z64THREAD_H
+#ifndef THREAD_H
+#define THREAD_H
 
 #include "ultra64.h"
 
diff --git a/include/title_setup_state.h b/include/title_setup_state.h
index 30219872a..3d6a52445 100644
--- a/include/title_setup_state.h
+++ b/include/title_setup_state.h
@@ -1,8 +1,8 @@
 #ifndef TITLE_SETUP_STATE_H
 #define TITLE_SETUP_STATE_H
 
-#include "z64game.h"
-#include "z64view.h"
+#include "game.h"
+#include "view.h"
 
 typedef struct TitleSetupState {
     /* 0x0000 */ GameState state;
diff --git a/include/z64transition.h b/include/transition.h
index f867aed09..ae7d32951 100644
--- a/include/z64transition.h
+++ b/include/transition.h
@@ -1,5 +1,5 @@
-#ifndef Z64TRANSITION_H
-#define Z64TRANSITION_H
+#ifndef TRANSITION_H
+#define TRANSITION_H
 
 #include "ultra64/ultratypes.h"
 #include "ultra64/gbi.h"
@@ -7,7 +7,7 @@
 #include "transition_fade.h"
 #include "transition_triforce.h"
 #include "transition_wipe.h"
-#include "z64transition_instances.h"
+#include "transition_instances.h"
 
 #define TRANS_TRIGGER_OFF 0 // transition is not active
 #define TRANS_TRIGGER_START 20 // start transition (exiting an area)
diff --git a/include/z64transition_instances.h b/include/transition_instances.h
index cc35add03..08e467271 100644
--- a/include/z64transition_instances.h
+++ b/include/transition_instances.h
@@ -1,5 +1,5 @@
-#ifndef Z64TRANSITION_INSTANCES_H
-#define Z64TRANSITION_INSTANCES_H
+#ifndef TRANSITION_INSTANCES_H
+#define TRANSITION_INSTANCES_H
 
 typedef enum TransitionInstanceType {
     /* 1 */ TRANS_INSTANCE_TYPE_FILL_OUT = 1,
diff --git a/include/z64view.h b/include/view.h
index 83bdf0fe8..b2dadd3db 100644
--- a/include/z64view.h
+++ b/include/view.h
@@ -1,9 +1,9 @@
-#ifndef Z64VIEW_H
-#define Z64VIEW_H
+#ifndef VIEW_H
+#define VIEW_H
 
 #include "avoid_ub.h"
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 struct GraphicsContext;
 
diff --git a/include/z64vis.h b/include/vis.h
index 86e286c32..52b1f0a69 100644
--- a/include/z64vis.h
+++ b/include/vis.h
@@ -1,5 +1,5 @@
-#ifndef Z64_VIS_H
-#define Z64_VIS_H
+#ifndef VIS_H
+#define VIS_H
 
 #include "ultra64.h"
 #include "color.h"
diff --git a/include/z_actor_dlftbls.h b/include/z_actor_dlftbls.h
index e9e2dc7d9..cabfc9191 100644
--- a/include/z_actor_dlftbls.h
+++ b/include/z_actor_dlftbls.h
@@ -2,7 +2,7 @@
 #define Z_ACTOR_DLFTBLS_H
 
 #include "romfile.h"
-#include "z64actor_profile.h"
+#include "actor_profile.h"
 
 /**
  * @see ACTOROVL_ALLOC_ABSOLUTE
diff --git a/include/z_en_a_obj.h b/include/z_en_a_obj.h
index bd65f88f1..7db18aaf9 100644
--- a/include/z_en_a_obj.h
+++ b/include/z_en_a_obj.h
@@ -2,7 +2,7 @@
 #define Z_EN_A_OBJ_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 // Only A_OBJ_SIGNPOST_OBLONG and A_OBJ_SIGNPOST_ARROW are used in room files.
 typedef enum AObjType {
diff --git a/include/z_en_item00.h b/include/z_en_item00.h
index 483f666f5..4eb1ae735 100644
--- a/include/z_en_item00.h
+++ b/include/z_en_item00.h
@@ -2,7 +2,7 @@
 #define Z_EN_ITEM00_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 typedef enum Item00Type {
     /* 0x00 */ ITEM00_RUPEE_GREEN,
diff --git a/include/z_lib.h b/include/z_lib.h
index 24fa80691..c2e36e7cc 100644
--- a/include/z_lib.h
+++ b/include/z_lib.h
@@ -3,7 +3,7 @@
 
 #include "stddef.h"
 #include "libu64/pad.h"
-#include "z64math.h"
+#include "z_math.h"
 #include "color.h"
 
 void Lib_MemSet(u8* dest, size_t len, u8 val);
diff --git a/include/z64math.h b/include/z_math.h
index 187d95b25..ebe364d88 100644
--- a/include/z64math.h
+++ b/include/z_math.h
@@ -1,5 +1,7 @@
-#ifndef Z64MATH_H
-#define Z64MATH_H
+#ifndef Z_MATH_H
+#define Z_MATH_H
+
+// This file has a z_ prefix to indicate that it is the game-side math header, not libc
 
 #include "math.h"
 #include "ultra64.h"