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>

97 files changed, 281 insertions, 281 deletions

diff --git a/src/code/audio_thread_manager.c b/src/code/audio_thread_manager.c
index 57f530a4b..01b0072d9 100644
--- a/src/code/audio_thread_manager.c
+++ b/src/code/audio_thread_manager.c
@@ -11,7 +11,7 @@
 #include "regs.h"
 #include "speed_meter.h"
 #include "translation.h"
-#include "z64dma.h"
+#include "dma.h"
 
 void AudioMgr_NotifyTaskDone(AudioMgr* audioMgr) {
     AudioTask* task = audioMgr->rspTask;
diff --git a/src/code/code_n64dd_800AD410.c b/src/code/code_n64dd_800AD410.c
index 979a95afb..1509b7223 100644
--- a/src/code/code_n64dd_800AD410.c
+++ b/src/code/code_n64dd_800AD410.c
@@ -1,5 +1,5 @@
 #include "ultra64.h"
-#include "z64dma.h"
+#include "dma.h"
 #include "segment_symbols.h"
 #include "n64dd.h"
 
diff --git a/src/code/code_n64dd_800AD4C0.c b/src/code/code_n64dd_800AD4C0.c
index 4c4e0db0e..4b2d17e72 100644
--- a/src/code/code_n64dd_800AD4C0.c
+++ b/src/code/code_n64dd_800AD4C0.c
@@ -2,9 +2,9 @@
 #include "n64dd.h"
 #include "regs.h"
 #include "segmented_address.h"
-#include "z64actor.h"
-#include "z64cutscene.h"
-#include "z64save.h"
+#include "actor.h"
+#include "cutscene.h"
+#include "save.h"
 
 n64ddStruct_800FEE70_pointers D_800FEE70 = {
     func_801C7C1C,
diff --git a/src/code/db_camera.c b/src/code/db_camera.c
index a275cae52..34599c9a1 100644
--- a/src/code/db_camera.c
+++ b/src/code/db_camera.c
@@ -10,14 +10,14 @@
 #include "regs.h"
 #include "sfx.h"
 #include "z_lib.h"
-#include "z64camera.h"
-#include "z64cutscene.h"
-#include "z64cutscene_spline.h"
-#include "z64debug.h"
-#include "z64debug_display.h"
-#include "z64olib.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "camera.h"
+#include "cutscene.h"
+#include "cutscene_spline.h"
+#include "debug.h"
+#include "debug_display.h"
+#include "olib.h"
+#include "play_state.h"
+#include "save.h"
 
 #define DEBUG_CAM_CONTROLLER_PORT 2
 
diff --git a/src/code/fault_gc.c b/src/code/fault_gc.c
index b2bb9d13d..e7afa4ec8 100644
--- a/src/code/fault_gc.c
+++ b/src/code/fault_gc.c
@@ -56,7 +56,7 @@
 #include "stackcheck.h"
 #include "terminal.h"
 #include "translation.h"
-#include "z64thread.h"
+#include "thread.h"
 
 void Fault_Init(void);
 void Fault_SetOsSyncPrintfEnabled(u32 enabled);
diff --git a/src/code/fault_n64.c b/src/code/fault_n64.c
index 75fc704b9..2d31b0f32 100644
--- a/src/code/fault_n64.c
+++ b/src/code/fault_n64.c
@@ -10,7 +10,7 @@
 #include "stack.h"
 #include "stackcheck.h"
 #include "terminal.h"
-#include "z64thread.h"
+#include "thread.h"
 #include "translation.h"
 
 #pragma increment_block_number "ntsc-1.0:144 ntsc-1.1:144 ntsc-1.2:144 pal-1.0:144 pal-1.1:144"
diff --git a/src/code/flg_set.c b/src/code/flg_set.c
index efc044074..f102d702c 100644
--- a/src/code/flg_set.c
+++ b/src/code/flg_set.c
@@ -5,8 +5,8 @@
 #include "gfx.h"
 #include "gfxalloc.h"
 #include "controller.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "save.h"
 
 typedef struct FlagSetEntry {
     /* 0x00 */ u16* value;
diff --git a/src/code/game.c b/src/code/game.c
index 5b80355cb..1f4ff8cdb 100644
--- a/src/code/game.c
+++ b/src/code/game.c
@@ -26,11 +26,11 @@
 #include "versions.h"
 #include "vi_mode.h"
 #include "zelda_arena.h"
-#include "z64debug.h"
-#include "z64dma.h"
-#include "z64game.h"
-#include "z64play.h"
-#include "z64vis.h"
+#include "debug.h"
+#include "dma.h"
+#include "game.h"
+#include "play_state.h"
+#include "vis.h"
 
 #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128"
 
diff --git a/src/code/graph.c b/src/code/graph.c
index 8a4646808..56fc7af60 100644
--- a/src/code/graph.c
+++ b/src/code/graph.c
@@ -26,9 +26,9 @@
 #include "versions.h"
 #include "vi_mode.h"
 #include "z_game_dlftbls.h"
-#include "z64audio.h"
-#include "z64save.h"
-#include "z64play.h"
+#include "audio.h"
+#include "save.h"
+#include "play_state.h"
 
 #define GFXPOOL_HEAD_MAGIC 0x1234
 #define GFXPOOL_TAIL_MAGIC 0x5678
diff --git a/src/code/irqmgr.c b/src/code/irqmgr.c
index ced883f7a..bb9fc7841 100644
--- a/src/code/irqmgr.c
+++ b/src/code/irqmgr.c
@@ -40,7 +40,7 @@
 #include "terminal.h"
 #include "translation.h"
 #include "versions.h"
-#include "z64thread.h"
+#include "thread.h"
 
 vu32 gIrqMgrResetStatus = IRQ_RESET_STATUS_IDLE;
 volatile OSTime sIrqMgrResetTime = 0;
diff --git a/src/code/main.c b/src/code/main.c
index 902e624aa..e137cff75 100644
--- a/src/code/main.c
+++ b/src/code/main.c
@@ -40,8 +40,8 @@ extern struct IrqMgr gIrqMgr;
 #include "cic6105.h"
 #include "n64dd.h"
 #endif
-#include "z64debug.h"
-#include "z64thread.h"
+#include "debug.h"
+#include "thread.h"
 
 #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
                                "ique-cn:0 ntsc-1.0:51 ntsc-1.1:51 ntsc-1.2:51 pal-1.0:49 pal-1.1:49"
diff --git a/src/code/object_table.c b/src/code/object_table.c
index 9ed6a1f44..3bb45a007 100644
--- a/src/code/object_table.c
+++ b/src/code/object_table.c
@@ -2,7 +2,7 @@
 #include "segment_symbols.h"
 #include "romfile.h"
 #include "ultra64.h"
-#include "z64object.h"
+#include "object.h"
 
 s16 gLinkObjectIds[] = { OBJECT_LINK_BOY, OBJECT_LINK_CHILD };
 
diff --git a/src/code/sched.c b/src/code/sched.c
index c573bf97f..fe1d14a0c 100644
--- a/src/code/sched.c
+++ b/src/code/sched.c
@@ -52,7 +52,7 @@
 #include "translation.h"
 #include "versions.h"
 #include "vi_mode.h"
-#include "z64thread.h"
+#include "thread.h"
 
 #define RSP_DONE_MSG 667
 #define RDP_DONE_MSG 668
diff --git a/src/code/speed_meter.c b/src/code/speed_meter.c
index bb3624fa8..0216275f1 100644
--- a/src/code/speed_meter.c
+++ b/src/code/speed_meter.c
@@ -9,8 +9,8 @@
 #include "speed_meter.h"
 #include "terminal.h"
 #include "zelda_arena.h"
-#include "z64game.h"
-#include "z64view.h"
+#include "game.h"
+#include "view.h"
 
 /**
  * How much time the audio update on the audio thread (`AudioThread_Update`) took in total, between scheduling the last
diff --git a/src/code/sys_math3d.c b/src/code/sys_math3d.c
index f27ee6a34..5f41973ff 100644
--- a/src/code/sys_math3d.c
+++ b/src/code/sys_math3d.c
@@ -5,7 +5,7 @@
 #include "translation.h"
 #include "ultra64.h"
 #include "z_lib.h"
-#include "z64math.h"
+#include "z_math.h"
 
 #pragma increment_block_number "gc-eu:76 gc-eu-mq:76 gc-jp:76 gc-jp-ce:76 gc-jp-mq:76 gc-us:76 gc-us-mq:76 ique-cn:66" \
                                "ntsc-1.0:64 ntsc-1.1:64 ntsc-1.2:64 pal-1.0:64 pal-1.1:64"
diff --git a/src/code/sys_math3d_draw.c b/src/code/sys_math3d_draw.c
index 7781a79e2..2b8776ec6 100644
--- a/src/code/sys_math3d_draw.c
+++ b/src/code/sys_math3d_draw.c
@@ -1,5 +1,5 @@
 #include "sys_math3d.h"
-#include "z64play.h"
+#include "play_state.h"
 
 void Math3D_DrawSphere(PlayState* play, Sphere16* sph) {
 }
diff --git a/src/code/sys_math_atan.c b/src/code/sys_math_atan.c
index 0c99eaced..2e344d391 100644
--- a/src/code/sys_math_atan.c
+++ b/src/code/sys_math_atan.c
@@ -1,6 +1,6 @@
 #include "array_count.h"
 #include "sys_math.h"
-#include "z64math.h"
+#include "z_math.h"
 
 static u16 sAtan2Tbl[] = {
     0x0000, 0x000A, 0x0014, 0x001F, 0x0029, 0x0033, 0x003D, 0x0047, 0x0051, 0x005C, 0x0066, 0x0070, 0x007A, 0x0084,
diff --git a/src/code/sys_matrix.c b/src/code/sys_matrix.c
index 2ca488260..b773d20e4 100644
--- a/src/code/sys_matrix.c
+++ b/src/code/sys_matrix.c
@@ -7,8 +7,8 @@
 #include "sys_matrix.h"
 #include "ultra64.h"
 #include "z_lib.h"
-#include "z64game.h"
-#include "z64skin_matrix.h"
+#include "game.h"
+#include "skin_matrix.h"
 
 // clang-format off
 Mtx gIdentityMtx = gdSPDefMtx(
diff --git a/src/code/title_setup.c b/src/code/title_setup.c
index 027202247..c4020bbd1 100644
--- a/src/code/title_setup.c
+++ b/src/code/title_setup.c
@@ -2,7 +2,7 @@
 #include "setup_state.h"
 #include "printf.h"
 #include "translation.h"
-#include "z64save.h"
+#include "save.h"
 
 void Setup_InitImpl(SetupState* this) {
     PRINTF(T("ゼルダ共通データ初期化\n", "Zelda common data initialization\n"));
diff --git a/src/code/z_actor.c b/src/code/z_actor.c
index 15138b3e5..5a0fe9b1c 100644
--- a/src/code/z_actor.c
+++ b/src/code/z_actor.c
@@ -19,14 +19,14 @@
 #include "z_actor_dlftbls.h"
 #include "z_lib.h"
 #include "zelda_arena.h"
-#include "z64actor.h"
-#include "z64audio.h"
-#include "z64effect.h"
-#include "z64light.h"
-#include "z64horse.h"
-#include "z64play.h"
-#include "z64save.h"
-#include "z64skin_matrix.h"
+#include "actor.h"
+#include "audio.h"
+#include "effect.h"
+#include "light.h"
+#include "horse.h"
+#include "play_state.h"
+#include "save.h"
+#include "skin_matrix.h"
 
 #include "overlays/actors/ovl_Arms_Hook/z_arms_hook.h"
 #include "overlays/actors/ovl_En_Part/z_en_part.h"
diff --git a/src/code/z_bg_collect.c b/src/code/z_bg_collect.c
index 68966b74f..01114d835 100644
--- a/src/code/z_bg_collect.c
+++ b/src/code/z_bg_collect.c
@@ -2,10 +2,10 @@
 #include "terminal.h"
 #include "translation.h"
 #include "ultra64.h"
-#include "z64actor.h"
-#include "z64bgcheck.h"
-#include "z64player.h"
-#include "z64skin_matrix.h"
+#include "actor.h"
+#include "bgcheck.h"
+#include "player.h"
+#include "skin_matrix.h"
 
 /**
  * Update the `carriedActor`'s position based on the dynapoly actor identified by `bgId`.
diff --git a/src/code/z_bg_item.c b/src/code/z_bg_item.c
index 43c32eb55..33cb0fbe8 100644
--- a/src/code/z_bg_item.c
+++ b/src/code/z_bg_item.c
@@ -1,7 +1,7 @@
 #include "z_lib.h"
-#include "z64actor.h"
-#include "z64bgcheck.h"
-#include "z64play.h"
+#include "actor.h"
+#include "bgcheck.h"
+#include "play_state.h"
 
 /**
  * @param transformFlags How other actors standing on the dynapoly actor's collision move when the dynapoly actor moves.
diff --git a/src/code/z_bgcheck.c b/src/code/z_bgcheck.c
index 65ff40ee4..9e71fa628 100644
--- a/src/code/z_bgcheck.c
+++ b/src/code/z_bgcheck.c
@@ -9,10 +9,10 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64bgcheck.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64skin_matrix.h"
+#include "bgcheck.h"
+#include "play_state.h"
+#include "player.h"
+#include "skin_matrix.h"
 
 #pragma increment_block_number "ntsc-1.0:144 ntsc-1.1:144 ntsc-1.2:144"
 
diff --git a/src/code/z_camera.c b/src/code/z_camera.c
index e23e17a04..36c3f0b15 100644
--- a/src/code/z_camera.c
+++ b/src/code/z_camera.c
@@ -17,13 +17,13 @@
 #include "ultra64.h"
 #include "z_lib.h"
 #include "zelda_arena.h"
-#include "z64audio.h"
-#include "z64cutscene_spline.h"
-#include "z64debug.h"
-#include "z64olib.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "audio.h"
+#include "cutscene_spline.h"
+#include "debug.h"
+#include "olib.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 #include "overlays/actors/ovl_En_Horse/z_en_horse.h"
 
 #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
diff --git a/src/code/z_cheap_proc.inc.c b/src/code/z_cheap_proc.inc.c
index e922c0832..2daaa9760 100644
--- a/src/code/z_cheap_proc.inc.c
+++ b/src/code/z_cheap_proc.inc.c
@@ -1,7 +1,7 @@
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "sys_matrix.h"
-#include "z64play.h"
+#include "play_state.h"
 
 void Gfx_DrawDListOpa(PlayState* play, Gfx* dlist) {
     OPEN_DISPS(play->state.gfxCtx, "../z_cheap_proc.c", 214);
diff --git a/src/code/z_collision_btltbls.c b/src/code/z_collision_btltbls.c
index 5c2a210bc..5b305764e 100644
--- a/src/code/z_collision_btltbls.c
+++ b/src/code/z_collision_btltbls.c
@@ -1,7 +1,7 @@
 #include "array_count.h"
 #include "printf.h"
 #include "translation.h"
-#include "z64collision_check.h"
+#include "collision_check.h"
 
 static DamageTable sDamageTablePresets[] = {
     { {
diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c
index 283a9b2fb..158948a2e 100644
--- a/src/code/z_collision_check.c
+++ b/src/code/z_collision_check.c
@@ -7,11 +7,11 @@
 #include "terminal.h"
 #include "translation.h"
 #include "versions.h"
-#include "z64collision_check.h"
-#include "z64effect.h"
-#include "z64frame_advance.h"
+#include "collision_check.h"
+#include "effect.h"
+#include "frame_advance.h"
 #include "zelda_arena.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #include "overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h"
 #include "z_lib.h"
diff --git a/src/code/z_common_data.c b/src/code/z_common_data.c
index 18bfafbc3..1dfd4d241 100644
--- a/src/code/z_common_data.c
+++ b/src/code/z_common_data.c
@@ -3,9 +3,9 @@
 #include "sequence.h"
 #include "versions.h"
 #include "z_locale.h"
-#include "z64environment.h"
-#include "z64save.h"
-#include "z64transition.h"
+#include "environment.h"
+#include "save.h"
+#include "transition.h"
 
 #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
                                "ntsc-1.0:0 ntsc-1.1:0 ntsc-1.2:0 pal-1.0:0 pal-1.1:0"
diff --git a/src/code/z_construct.c b/src/code/z_construct.c
index aa92850b3..fd34ce673 100644
--- a/src/code/z_construct.c
+++ b/src/code/z_construct.c
@@ -4,11 +4,11 @@
 #include "segment_symbols.h"
 #include "translation.h"
 #include "versions.h"
-#include "z64lifemeter.h"
-#include "z64interface.h"
-#include "z64ocarina.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "lifemeter.h"
+#include "interface.h"
+#include "ocarina.h"
+#include "play_state.h"
+#include "save.h"
 
 void Interface_Destroy(PlayState* play) {
     Map_Destroy(play);
diff --git a/src/code/z_cutscene_spline.c b/src/code/z_cutscene_spline.c
index 137f9f544..6ff03fdf9 100644
--- a/src/code/z_cutscene_spline.c
+++ b/src/code/z_cutscene_spline.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
-#include "z64math.h"
-#include "z64camera.h"
-#include "z64cutscene_spline.h"
+#include "z_math.h"
+#include "camera.h"
+#include "cutscene_spline.h"
 
 // The code in this file is very similar to a spline system used in Super Mario 64 for cutscene camera movement
 
diff --git a/src/code/z_debug.c b/src/code/z_debug.c
index d5804cd7e..6de85056c 100644
--- a/src/code/z_debug.c
+++ b/src/code/z_debug.c
@@ -9,7 +9,7 @@
 #include "regs.h"
 #include "rumble.h"
 #include "ultra64.h"
-#include "z64debug.h"
+#include "debug.h"
 
 typedef struct DebugCamTextBufferEntry {
     /* 0x0 */ u8 x;
diff --git a/src/code/z_debug_display.c b/src/code/z_debug_display.c
index 9d15663a6..1481e22fe 100644
--- a/src/code/z_debug_display.c
+++ b/src/code/z_debug_display.c
@@ -1,8 +1,8 @@
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "sys_matrix.h"
-#include "z64play.h"
-#include "z64debug_display.h"
+#include "play_state.h"
+#include "debug_display.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/code/z_demo.c b/src/code/z_demo.c
index ee6f23203..5adc6ca48 100644
--- a/src/code/z_demo.c
+++ b/src/code/z_demo.c
@@ -21,14 +21,14 @@
 #include "sfx.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64camera.h"
-#include "z64cutscene.h"
-#include "z64cutscene_flags.h"
-#include "z64ocarina.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "audio.h"
+#include "camera.h"
+#include "cutscene.h"
+#include "cutscene_flags.h"
+#include "ocarina.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/scenes/indoors/tokinoma/tokinoma_scene.h"
 
diff --git a/src/code/z_draw.c b/src/code/z_draw.c
index 4cb14f017..f2c600f6a 100644
--- a/src/code/z_draw.c
+++ b/src/code/z_draw.c
@@ -1,8 +1,8 @@
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "sys_matrix.h"
-#include "z64draw.h"
-#include "z64play.h"
+#include "draw.h"
+#include "play_state.h"
 
 #include "assets/objects/object_gi_key/object_gi_key.h"
 #include "assets/objects/object_gi_jewel/object_gi_jewel.h"
diff --git a/src/code/z_eff_blure.c b/src/code/z_eff_blure.c
index 6e2023b67..a5df80322 100644
--- a/src/code/z_eff_blure.c
+++ b/src/code/z_eff_blure.c
@@ -6,8 +6,8 @@
 #include "sys_matrix.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64skin_matrix.h"
+#include "effect.h"
+#include "skin_matrix.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/code/z_eff_shield_particle.c b/src/code/z_eff_shield_particle.c
index 865bd8ec9..051731fd8 100644
--- a/src/code/z_eff_shield_particle.c
+++ b/src/code/z_eff_shield_particle.c
@@ -5,10 +5,10 @@
 #include "printf.h"
 #include "terminal.h"
 #include "translation.h"
-#include "z64effect.h"
-#include "z64light.h"
-#include "z64play.h"
-#include "z64skin_matrix.h"
+#include "effect.h"
+#include "light.h"
+#include "play_state.h"
+#include "skin_matrix.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/code/z_eff_spark.c b/src/code/z_eff_spark.c
index 57ce3d9ba..ae6a84c47 100644
--- a/src/code/z_eff_spark.c
+++ b/src/code/z_eff_spark.c
@@ -5,9 +5,9 @@
 #include "printf.h"
 #include "sys_matrix.h"
 #include "translation.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64skin_matrix.h"
+#include "effect.h"
+#include "play_state.h"
+#include "skin_matrix.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/code/z_eff_ss_dead.c b/src/code/z_eff_ss_dead.c
index c75273872..b29cb0a32 100644
--- a/src/code/z_eff_ss_dead.c
+++ b/src/code/z_eff_ss_dead.c
@@ -1,6 +1,6 @@
 #include "gfx.h"
 #include "z_lib.h"
-#include "z64play.h"
+#include "play_state.h"
 
 void func_80026230(PlayState* play, Color_RGBA8* color, s16 arg2, s16 arg3) {
     f32 cos;
diff --git a/src/code/z_effect.c b/src/code/z_effect.c
index c0a39cc4b..a725cd317 100644
--- a/src/code/z_effect.c
+++ b/src/code/z_effect.c
@@ -1,9 +1,9 @@
 #include "gfx.h"
 #include "printf.h"
 #include "translation.h"
-#include "z64effect.h"
-#include "z64frame_advance.h"
-#include "z64play.h"
+#include "effect.h"
+#include "frame_advance.h"
+#include "play_state.h"
 
 EffectContext sEffectContext;
 
diff --git a/src/code/z_effect_soft_sprite.c b/src/code/z_effect_soft_sprite.c
index 061b6d70d..363367a85 100644
--- a/src/code/z_effect_soft_sprite.c
+++ b/src/code/z_effect_soft_sprite.c
@@ -5,9 +5,9 @@
 #include "terminal.h"
 #include "translation.h"
 #include "zelda_arena.h"
-#include "z64frame_advance.h"
-#include "z64effect.h"
-#include "z64play.h"
+#include "frame_advance.h"
+#include "effect.h"
+#include "play_state.h"
 
 EffectSsInfo sEffectSsInfo = { 0 }; // "EffectSS2Info"
 
diff --git a/src/code/z_effect_soft_sprite_dlftbls.c b/src/code/z_effect_soft_sprite_dlftbls.c
index 7c9e228f6..7a5f7e4e4 100644
--- a/src/code/z_effect_soft_sprite_dlftbls.c
+++ b/src/code/z_effect_soft_sprite_dlftbls.c
@@ -1,5 +1,5 @@
 #include "segment_symbols.h"
-#include "z64effect.h"
+#include "effect.h"
 
 // Linker symbol declarations (used in the table below)
 #define DEFINE_EFFECT_SS(name, _1) DECLARE_OVERLAY_SEGMENT(name)
diff --git a/src/code/z_effect_soft_sprite_old_init.c b/src/code/z_effect_soft_sprite_old_init.c
index 1654ab3d0..fea010214 100644
--- a/src/code/z_effect_soft_sprite_old_init.c
+++ b/src/code/z_effect_soft_sprite_old_init.c
@@ -7,10 +7,10 @@
 #include "segmented_address.h"
 #include "sfx.h"
 #include "z_lib.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64skin_matrix.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
+#include "skin_matrix.h"
 
 #include "overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.h"
 #include "overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.h"
diff --git a/src/code/z_elf_message.c b/src/code/z_elf_message.c
index c06248f26..9eef37ef6 100644
--- a/src/code/z_elf_message.c
+++ b/src/code/z_elf_message.c
@@ -1,10 +1,10 @@
 #include "rand.h"
 #include "translation.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64quest_hint.h"
-#include "z64quest_hint_commands.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "player.h"
+#include "quest_hint.h"
+#include "quest_hint_commands.h"
+#include "save.h"
 
 QuestHintCmd sChildSariaQuestHints[] = {
     QUEST_HINT_STRENGTH_UPG(SKIP, 0, false, 3),
diff --git a/src/code/z_en_a_keep.c b/src/code/z_en_a_keep.c
index 9b2bf7c0b..12d31b4f0 100644
--- a/src/code/z_en_a_keep.c
+++ b/src/code/z_en_a_keep.c
@@ -4,7 +4,7 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_d_hsblock/object_d_hsblock.h"
diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c
index f0c627b25..43668baeb 100644
--- a/src/code/z_en_item00.c
+++ b/src/code/z_en_item00.c
@@ -12,12 +12,12 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64draw.h"
-#include "z64effect.h"
-#include "z64item.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "draw.h"
+#include "effect.h"
+#include "item.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/code/z_env_flags.c b/src/code/z_env_flags.c
index 164ff1dde..858061d4f 100644
--- a/src/code/z_env_flags.c
+++ b/src/code/z_env_flags.c
@@ -1,7 +1,7 @@
 #include "array_count.h"
 #include "ultra64.h"
-#include "z64cutscene_flags.h"
-#include "z64play.h"
+#include "cutscene_flags.h"
+#include "play_state.h"
 
 void CutsceneFlags_UnsetAll(PlayState* play) {
     u8 i;
diff --git a/src/code/z_face_reaction.c b/src/code/z_face_reaction.c
index ea6313a76..470c454b7 100644
--- a/src/code/z_face_reaction.c
+++ b/src/code/z_face_reaction.c
@@ -1,6 +1,6 @@
 #include "ultra64.h"
-#include "z64face_reaction.h"
-#include "z64player.h"
+#include "face_reaction.h"
+#include "player.h"
 
 u16 sMaskReactionSetTextIds[MASK_REACTION_SET_MAX][PLAYER_MASK_MAX] = {
     // MASK_REACTION_SET_CARPENTER_BOSS
diff --git a/src/code/z_fbdemo.c b/src/code/z_fbdemo.c
index 2621f1c12..b37c4aeb3 100644
--- a/src/code/z_fbdemo.c
+++ b/src/code/z_fbdemo.c
@@ -16,8 +16,8 @@
 #include "libu64/debug.h"
 #include "gfx.h"
 #include "printf.h"
-#include "z64math.h"
-#include "z64transition_instances.h"
+#include "z_math.h"
+#include "transition_instances.h"
 
 // color framebuffer
 extern u16 D_0F000000[];
diff --git a/src/code/z_fbdemo_circle.c b/src/code/z_fbdemo_circle.c
index d8aa81df0..0a7dabdd6 100644
--- a/src/code/z_fbdemo_circle.c
+++ b/src/code/z_fbdemo_circle.c
@@ -3,7 +3,7 @@
 #include "color.h"
 #include "gfx.h"
 #include "sfx.h"
-#include "z64transition.h"
+#include "transition.h"
 
 typedef enum TransitionCircleDirection {
     /* 0 */ TRANS_CIRCLE_DIR_IN,
diff --git a/src/code/z_fbdemo_fade.c b/src/code/z_fbdemo_fade.c
index 1be97d5f5..4798a225a 100644
--- a/src/code/z_fbdemo_fade.c
+++ b/src/code/z_fbdemo_fade.c
@@ -6,8 +6,8 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64save.h"
-#include "z64transition_instances.h"
+#include "save.h"
+#include "transition_instances.h"
 
 typedef enum TransitionFadeDirection {
     /* 0 */ TRANS_FADE_DIR_IN,
diff --git a/src/code/z_fbdemo_triforce.c b/src/code/z_fbdemo_triforce.c
index 6624a4373..b1a5b2e67 100644
--- a/src/code/z_fbdemo_triforce.c
+++ b/src/code/z_fbdemo_triforce.c
@@ -1,8 +1,8 @@
 #include "transition_triforce.h"
 
 #include "printf.h"
-#include "z64math.h"
-#include "z64transition_instances.h"
+#include "z_math.h"
+#include "transition_instances.h"
 
 #include "assets/code/fbdemo_triforce/code.c"
 
diff --git a/src/code/z_fbdemo_wipe1.c b/src/code/z_fbdemo_wipe1.c
index 25b45e7e2..6a5dd62e5 100644
--- a/src/code/z_fbdemo_wipe1.c
+++ b/src/code/z_fbdemo_wipe1.c
@@ -1,8 +1,8 @@
 #include "transition_wipe.h"
 
 #include "gfx.h"
-#include "z64save.h"
-#include "z64transition_instances.h"
+#include "save.h"
+#include "transition_instances.h"
 
 typedef enum TransitionWipeDirection {
     /* 0 */ TRANS_WIPE_DIR_IN,
diff --git a/src/code/z_fcurve_data.c b/src/code/z_fcurve_data.c
index a1950a568..774f4137f 100644
--- a/src/code/z_fcurve_data.c
+++ b/src/code/z_fcurve_data.c
@@ -2,7 +2,7 @@
  * File: z_fcurve_data.c
  * Description: Interpolation functions for use with Curve SkelAnime
  */
-#include "z64curve.h"
+#include "curve.h"
 
 #define FCURVE_INTERP_CUBIC 0  // Interpolate using a Hermite cubic spline
 #define FCURVE_INTERP_NONE 1   // Return the value at the left endpoint instead of interpolating
diff --git a/src/code/z_fcurve_data_skelanime.c b/src/code/z_fcurve_data_skelanime.c
index e5d1f1fbb..da1325ee1 100644
--- a/src/code/z_fcurve_data_skelanime.c
+++ b/src/code/z_fcurve_data_skelanime.c
@@ -32,9 +32,9 @@
 #include "sys_matrix.h"
 #include "translation.h"
 #include "zelda_arena.h"
-#include "z64actor.h"
-#include "z64curve.h"
-#include "z64play.h"
+#include "actor.h"
+#include "curve.h"
+#include "play_state.h"
 
 void SkelCurve_Clear(SkelCurve* skelCurve) {
     skelCurve->limbCount = 0;
diff --git a/src/code/z_frame_advance.c b/src/code/z_frame_advance.c
index 6ca410a75..05d839539 100644
--- a/src/code/z_frame_advance.c
+++ b/src/code/z_frame_advance.c
@@ -1,4 +1,4 @@
-#include "z64frame_advance.h"
+#include "frame_advance.h"
 
 #include "stdbool.h"
 
diff --git a/src/code/z_game_dlftbls.c b/src/code/z_game_dlftbls.c
index 57efe90df..84fca6ba6 100644
--- a/src/code/z_game_dlftbls.c
+++ b/src/code/z_game_dlftbls.c
@@ -5,7 +5,7 @@
 #include "setup_state.h"
 #include "title_setup_state.h"
 #include "z_game_dlftbls.h"
-#include "z64play.h"
+#include "play_state.h"
 
 // Linker symbol declarations (used in the table below)
 #define DEFINE_GAMESTATE(typeName, enumName, name) DECLARE_OVERLAY_SEGMENT(name)
diff --git a/src/code/z_game_over.c b/src/code/z_game_over.c
index f73616116..12d94eaa3 100644
--- a/src/code/z_game_over.c
+++ b/src/code/z_game_over.c
@@ -4,9 +4,9 @@
 #include "rumble.h"
 #include "sequence.h"
 #include "versions.h"
-#include "z64game_over.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "game_over.h"
+#include "play_state.h"
+#include "save.h"
 
 void GameOver_Init(PlayState* play) {
     play->gameOverCtx.state = GAMEOVER_INACTIVE;
diff --git a/src/code/z_horse.c b/src/code/z_horse.c
index d61af32e7..ab556c3d1 100644
--- a/src/code/z_horse.c
+++ b/src/code/z_horse.c
@@ -4,10 +4,10 @@
 #include "printf.h"
 #include "regs.h"
 #include "translation.h"
-#include "z64horse.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "horse.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 #include "overlays/actors/ovl_En_Horse/z_en_horse.h"
 
 /**
diff --git a/src/code/z_inventory.c b/src/code/z_inventory.c
index c31d4d926..8ae2bcbf2 100644
--- a/src/code/z_inventory.c
+++ b/src/code/z_inventory.c
@@ -1,9 +1,9 @@
 #include "ultra64.h"
 #include "printf.h"
 #include "translation.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/textures/icon_item_static/icon_item_static.h"
 #include "assets/textures/icon_item_24_static/icon_item_24_static.h"
diff --git a/src/code/z_kaleido_manager.c b/src/code/z_kaleido_manager.c
index d9bca732e..63bc6e0fd 100644
--- a/src/code/z_kaleido_manager.c
+++ b/src/code/z_kaleido_manager.c
@@ -6,7 +6,7 @@
 #include "segment_symbols.h"
 #include "terminal.h"
 #include "translation.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #define KALEIDO_OVERLAY(name, nameString) \
     { NULL, ROM_FILE(ovl_##name), _ovl_##name##SegmentStart, _ovl_##name##SegmentEnd, 0, nameString, }
diff --git a/src/code/z_kaleido_scope_call.c b/src/code/z_kaleido_scope_call.c
index 1e225eb67..73d3b20db 100644
--- a/src/code/z_kaleido_scope_call.c
+++ b/src/code/z_kaleido_scope_call.c
@@ -8,7 +8,7 @@
 #include "regs.h"
 #include "terminal.h"
 #include "translation.h"
-#include "z64play.h"
+#include "play_state.h"
 
 void (*sKaleidoScopeUpdateFunc)(PlayState* play);
 void (*sKaleidoScopeDrawFunc)(PlayState* play);
diff --git a/src/code/z_kaleido_setup.c b/src/code/z_kaleido_setup.c
index 6401f3fef..b3ef53164 100644
--- a/src/code/z_kaleido_setup.c
+++ b/src/code/z_kaleido_setup.c
@@ -5,9 +5,9 @@
 #endif
 #include "printf.h"
 #include "regs.h"
-#include "z64audio.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "audio.h"
+#include "play_state.h"
+#include "save.h"
 
 /*
  * The following three arrays are effectively unused.
diff --git a/src/code/z_kanfont.c b/src/code/z_kanfont.c
index 89f5bbd3b..280bfa3df 100644
--- a/src/code/z_kanfont.c
+++ b/src/code/z_kanfont.c
@@ -4,9 +4,9 @@
 #include "segment_symbols.h"
 #include "translation.h"
 #include "versions.h"
-#include "z64dma.h"
-#include "z64font.h"
-#include "z64message.h"
+#include "dma.h"
+#include "font.h"
+#include "message.h"
 
 /**
  * Loads a texture from kanji for the requested `character` into the character texture buffer
diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c
index 41c7bf75d..bdb35093b 100644
--- a/src/code/z_kankyo.c
+++ b/src/code/z_kankyo.c
@@ -24,13 +24,13 @@
 #include "translation.h"
 #include "versions.h"
 #include "z_lib.h"
-#include "z64audio.h"
-#include "z64cutscene.h"
-#include "z64frame_advance.h"
-#include "z64environment.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "audio.h"
+#include "cutscene.h"
+#include "frame_advance.h"
+#include "environment.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h"
diff --git a/src/code/z_lifemeter.c b/src/code/z_lifemeter.c
index cab9737ff..8ebefa7e6 100644
--- a/src/code/z_lifemeter.c
+++ b/src/code/z_lifemeter.c
@@ -3,10 +3,10 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64lifemeter.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "lifemeter.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/textures/parameter_static/parameter_static.h"
 
diff --git a/src/code/z_lights.c b/src/code/z_lights.c
index d0b003f77..4059faaca 100644
--- a/src/code/z_lights.c
+++ b/src/code/z_lights.c
@@ -3,8 +3,8 @@
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "sys_matrix.h"
-#include "z64light.h"
-#include "z64play.h"
+#include "light.h"
+#include "play_state.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/code/z_map_data.c b/src/code/z_map_data.c
index 502eb43c3..f2c204c07 100644
--- a/src/code/z_map_data.c
+++ b/src/code/z_map_data.c
@@ -1,5 +1,5 @@
 #include "map.h"
-#include "z64save.h"
+#include "save.h"
 
 static s16 sFloorTexIndexOffset[10][8] = {
     { 0, 0, 0, 0, 2, 4, 6, 8 }, { 0, 0, 0, 0, 0, 0, 0, 2 },
diff --git a/src/code/z_map_exp.c b/src/code/z_map_exp.c
index e46c70bd1..ba6cb77f0 100644
--- a/src/code/z_map_exp.c
+++ b/src/code/z_map_exp.c
@@ -12,10 +12,10 @@
 #include "sys_matrix.h"
 #include "terminal.h"
 #include "translation.h"
-#include "z64map_mark.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "map_mark.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/textures/parameter_static/parameter_static.h"
diff --git a/src/code/z_map_mark.c b/src/code/z_map_mark.c
index 402d942d6..5abc554de 100644
--- a/src/code/z_map_mark.c
+++ b/src/code/z_map_mark.c
@@ -10,9 +10,9 @@
 #include "segment_symbols.h"
 #include "terminal.h"
 #include "translation.h"
-#include "z64map_mark.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "map_mark.h"
+#include "play_state.h"
+#include "save.h"
 
 #include "assets/textures/parameter_static/parameter_static.h"
 
diff --git a/src/code/z_message.c b/src/code/z_message.c
index 1d6fee156..1fc06d740 100644
--- a/src/code/z_message.c
+++ b/src/code/z_message.c
@@ -18,11 +18,11 @@
 #include "terminal.h"
 #include "translation.h"
 #include "versions.h"
-#include "z64audio.h"
-#include "z64ocarina.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "audio.h"
+#include "ocarina.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/textures/parameter_static/parameter_static.h"
 
diff --git a/src/code/z_olib.c b/src/code/z_olib.c
index 66c767f68..1ee420025 100644
--- a/src/code/z_olib.c
+++ b/src/code/z_olib.c
@@ -1,6 +1,6 @@
-#include "z64math.h"
+#include "z_math.h"
 #include "libc64/math64.h"
-#include "z64olib.h"
+#include "olib.h"
 #include "z_lib.h"
 
 /**
diff --git a/src/code/z_onepointdemo.c b/src/code/z_onepointdemo.c
index 94c3bc9e1..12dc2d256 100644
--- a/src/code/z_onepointdemo.c
+++ b/src/code/z_onepointdemo.c
@@ -9,10 +9,10 @@
 #include "terminal.h"
 #include "versions.h"
 #include "z_lib.h"
-#include "z64olib.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "olib.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 #include "overlays/actors/ovl_En_Sw/z_en_sw.h"
 
 static s16 sDisableAttention = false;
diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c
index 6ae3959c8..7c9780288 100644
--- a/src/code/z_parameter.c
+++ b/src/code/z_parameter.c
@@ -17,13 +17,13 @@
 #include "terminal.h"
 #include "translation.h"
 #include "versions.h"
-#include "z64audio.h"
-#include "z64lifemeter.h"
-#include "z64horse.h"
-#include "z64ocarina.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "audio.h"
+#include "lifemeter.h"
+#include "horse.h"
+#include "ocarina.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/textures/parameter_static/parameter_static.h"
 #include "assets/textures/do_action_static/do_action_static.h"
diff --git a/src/code/z_path.c b/src/code/z_path.c
index 29b51a8f1..f025f0449 100644
--- a/src/code/z_path.c
+++ b/src/code/z_path.c
@@ -1,9 +1,9 @@
 #include "ultra64.h"
 #include "libc64/math64.h"
 #include "segmented_address.h"
-#include "z64actor.h"
-#include "z64path.h"
-#include "z64play.h"
+#include "actor.h"
+#include "path.h"
+#include "play_state.h"
 
 Path* Path_GetByIndex(PlayState* play, s16 index, s16 max) {
     Path* path;
diff --git a/src/code/z_play.c b/src/code/z_play.c
index 87d344b13..590680da2 100644
--- a/src/code/z_play.c
+++ b/src/code/z_play.c
@@ -36,16 +36,16 @@
 #include "versions.h"
 #include "z_actor_dlftbls.h"
 #include "zelda_arena.h"
-#include "z64audio.h"
-#include "z64cutscene_flags.h"
-#include "z64debug_display.h"
-#include "z64effect.h"
-#include "z64frame_advance.h"
-#include "z64light.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
-#include "z64vis.h"
+#include "audio.h"
+#include "cutscene_flags.h"
+#include "debug_display.h"
+#include "effect.h"
+#include "frame_advance.h"
+#include "light.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
+#include "vis.h"
 
 #pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 ique-cn:224" \
                                "ntsc-1.0:240 ntsc-1.1:240 ntsc-1.2:240 pal-1.0:240 pal-1.1:240"
diff --git a/src/code/z_player_call.c b/src/code/z_player_call.c
index eb52aff79..5838188ab 100644
--- a/src/code/z_player_call.c
+++ b/src/code/z_player_call.c
@@ -1,8 +1,8 @@
 #include "kaleido_manager.h"
-#include "z64actor.h"
-#include "z64actor_profile.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "actor.h"
+#include "actor_profile.h"
+#include "play_state.h"
+#include "player.h"
 
 #define FLAGS                                                                                 \
     (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c
index 3ce2143c5..7358db96d 100644
--- a/src/code/z_player_lib.c
+++ b/src/code/z_player_lib.c
@@ -6,12 +6,12 @@
 #include "sys_matrix.h"
 #include "versions.h"
 #include "z_lib.h"
-#include "z64draw.h"
-#include "z64effect.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
-#include "z64skin_matrix.h"
+#include "draw.h"
+#include "effect.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
+#include "skin_matrix.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_link_boy/object_link_boy.h"
diff --git a/src/code/z_quake.c b/src/code/z_quake.c
index d3ba17810..18ebfbcc3 100644
--- a/src/code/z_quake.c
+++ b/src/code/z_quake.c
@@ -4,8 +4,8 @@
 #include "quake.h"
 #include "terminal.h"
 #include "z_lib.h"
-#include "z64olib.h"
-#include "z64play.h"
+#include "olib.h"
+#include "play_state.h"
 
 typedef struct QuakeRequest {
     /* 0x00 */ s16 index;
diff --git a/src/code/z_rcp.c b/src/code/z_rcp.c
index 6228b51cf..135ffa887 100644
--- a/src/code/z_rcp.c
+++ b/src/code/z_rcp.c
@@ -5,7 +5,7 @@
 #include "letterbox.h"
 #include "main.h"
 #include "regs.h"
-#include "z64play.h"
+#include "play_state.h"
 
 Gfx sSetupDL[SETUPDL_MAX][6] = {
     {
diff --git a/src/code/z_room.c b/src/code/z_room.c
index 7bc9e4801..5549922b6 100644
--- a/src/code/z_room.c
+++ b/src/code/z_room.c
@@ -19,12 +19,12 @@
 #include "terminal.h"
 #include "translation.h"
 #include "versions.h"
-#include "z64audio.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64room.h"
-#include "z64save.h"
-#include "z64skin_matrix.h"
+#include "audio.h"
+#include "play_state.h"
+#include "player.h"
+#include "room.h"
+#include "save.h"
+#include "skin_matrix.h"
 
 Vec3f D_801270A0 = { 0.0f, 0.0f, 0.0f };
 
diff --git a/src/code/z_rumble.c b/src/code/z_rumble.c
index fc811cfcc..fcc39adee 100644
--- a/src/code/z_rumble.c
+++ b/src/code/z_rumble.c
@@ -13,7 +13,7 @@
  */
 #include "rumble.h"
 #include "padmgr.h"
-#include "z64math.h"
+#include "z_math.h"
 
 static s32 sUnused[4];
 RumbleMgr sRumbleMgr;
diff --git a/src/code/z_sample.c b/src/code/z_sample.c
index 63e0836bb..dc7c4836b 100644
--- a/src/code/z_sample.c
+++ b/src/code/z_sample.c
@@ -4,8 +4,8 @@
 #include "regs.h"
 #include "sample_state.h"
 #include "segment_symbols.h"
-#include "z64dma.h"
-#include "z64play.h"
+#include "dma.h"
+#include "play_state.h"
 
 void Sample_HandleStateChange(SampleState* this) {
     if (CHECK_BTN_ALL(this->state.input[0].press.button, BTN_START)) {
diff --git a/src/code/z_scene.c b/src/code/z_scene.c
index feef5ffc6..65503d0cc 100644
--- a/src/code/z_scene.c
+++ b/src/code/z_scene.c
@@ -11,10 +11,10 @@
 #include "versions.h"
 #include "z_actor_dlftbls.h"
 #include "z_lib.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
-#include "z64scene.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
+#include "scene.h"
 
 SceneCmdHandlerFunc sSceneCmdHandlers[SCENE_CMD_ID_MAX];
 RomFile sNaviQuestHintFiles[];
diff --git a/src/code/z_scene_table.c b/src/code/z_scene_table.c
index 5e096a262..97741c50b 100644
--- a/src/code/z_scene_table.c
+++ b/src/code/z_scene_table.c
@@ -11,10 +11,10 @@
 #include "sys_matrix.h"
 #include "versions.h"
 #include "z_lib.h"
-#include "z64frame_advance.h"
-#include "z64play.h"
-#include "z64player.h"
-#include "z64save.h"
+#include "frame_advance.h"
+#include "play_state.h"
+#include "player.h"
+#include "save.h"
 
 #include "assets/scenes/indoors/miharigoya/miharigoya_scene.h"
 #include "assets/scenes/indoors/souko/souko_scene.h"
diff --git a/src/code/z_sfx_source.c b/src/code/z_sfx_source.c
index 785afcde3..2aaadeb36 100644
--- a/src/code/z_sfx_source.c
+++ b/src/code/z_sfx_source.c
@@ -1,9 +1,9 @@
-#include "z64sfx_source.h"
+#include "sfx_source.h"
 
 #include "array_count.h"
 #include "sfx.h"
-#include "z64play.h"
-#include "z64skin_matrix.h"
+#include "play_state.h"
+#include "skin_matrix.h"
 
 void SfxSource_InitAll(PlayState* play) {
     SfxSource* sources = &play->sfxSources[0];
diff --git a/src/code/z_skelanime.c b/src/code/z_skelanime.c
index 4e4fd97e9..10e0df1a4 100644
--- a/src/code/z_skelanime.c
+++ b/src/code/z_skelanime.c
@@ -10,9 +10,9 @@
 #include "translation.h"
 #include "z_lib.h"
 #include "zelda_arena.h"
-#include "z64animation.h"
-#include "z64animation_legacy.h"
-#include "z64play.h"
+#include "animation.h"
+#include "animation_legacy.h"
+#include "play_state.h"
 
 #define ANIM_INTERP 1
 
diff --git a/src/code/z_skin.c b/src/code/z_skin.c
index 7861acb89..e5ddf71f4 100644
--- a/src/code/z_skin.c
+++ b/src/code/z_skin.c
@@ -1,10 +1,10 @@
 #include "gfx.h"
 #include "segmented_address.h"
 #include "sys_matrix.h"
-#include "z64math.h"
-#include "z64play.h"
-#include "z64skin.h"
-#include "z64skin_matrix.h"
+#include "z_math.h"
+#include "play_state.h"
+#include "skin.h"
+#include "skin_matrix.h"
 
 MtxF gSkinLimbMatrices[60]; // holds matrices for each limb of the skeleton currently being drawn
 
diff --git a/src/code/z_skin_awb.c b/src/code/z_skin_awb.c
index 196ce9aae..c6ddc1a79 100644
--- a/src/code/z_skin_awb.c
+++ b/src/code/z_skin_awb.c
@@ -1,10 +1,10 @@
 #include "array_count.h"
 #include "segmented_address.h"
 #include "zelda_arena.h"
-#include "z64actor.h"
-#include "z64play.h"
-#include "z64skin.h"
-#include "z64skin_matrix.h"
+#include "actor.h"
+#include "play_state.h"
+#include "skin.h"
+#include "skin_matrix.h"
 
 #include "overlays/actors/ovl_En_fHG/z_en_fhg.h"
 
diff --git a/src/code/z_skin_matrix.c b/src/code/z_skin_matrix.c
index 36d7a0279..1dbb9a26b 100644
--- a/src/code/z_skin_matrix.c
+++ b/src/code/z_skin_matrix.c
@@ -1,4 +1,4 @@
-#include "z64skin_matrix.h"
+#include "skin_matrix.h"
 
 #include "gfx.h"
 #include "printf.h"
diff --git a/src/code/z_sram.c b/src/code/z_sram.c
index 2eef6db03..17bfb5baa 100644
--- a/src/code/z_sram.c
+++ b/src/code/z_sram.c
@@ -1,4 +1,4 @@
-#include "z64sram.h"
+#include "sram.h"
 
 #include "array_count.h"
 #include "file_select_state.h"
@@ -8,14 +8,14 @@
 #include "terminal.h"
 #include "translation.h"
 #include "versions.h"
-#include "z64audio.h"
-#include "z64game.h"
-#include "z64interface.h"
-#include "z64message.h"
-#include "z64ocarina.h"
-#include "z64save.h"
-#include "z64scene.h"
-#include "z64ss_sram.h"
+#include "audio.h"
+#include "game.h"
+#include "interface.h"
+#include "message.h"
+#include "ocarina.h"
+#include "save.h"
+#include "scene.h"
+#include "ss_sram.h"
 
 #define SLOT_SIZE (sizeof(SaveContext) + 0x28)
 #define CHECKSUM_SIZE (sizeof(Save) / 2)
diff --git a/src/code/z_ss_sram.c b/src/code/z_ss_sram.c
index 94e97639a..de13b321d 100644
--- a/src/code/z_ss_sram.c
+++ b/src/code/z_ss_sram.c
@@ -1,6 +1,6 @@
 #include "ultra64.h"
 #include "printf.h"
-#include "z64ss_sram.h"
+#include "ss_sram.h"
 
 typedef struct SsSramContext {
     /* 0x00 */ OSPiHandle piHandle;
diff --git a/src/code/z_view.c b/src/code/z_view.c
index 6fe82aaeb..4c37194cf 100644
--- a/src/code/z_view.c
+++ b/src/code/z_view.c
@@ -1,4 +1,4 @@
-#include "z64view.h"
+#include "view.h"
 
 #include "libc64/malloc.h"
 #include "libu64/debug.h"
diff --git a/src/code/z_viscvg.c b/src/code/z_viscvg.c
index 51fc6f8e5..1616b661c 100644
--- a/src/code/z_viscvg.c
+++ b/src/code/z_viscvg.c
@@ -21,7 +21,7 @@
  */
 
 #include "gfx.h"
-#include "z64vis.h"
+#include "vis.h"
 
 /**
  * Draws only coverage: does not retain any of the original pixel RGB, primColor is used as background color.
diff --git a/src/code/z_vismono.c b/src/code/z_vismono.c
index 517f2ada6..632d00a6e 100644
--- a/src/code/z_vismono.c
+++ b/src/code/z_vismono.c
@@ -13,7 +13,7 @@
 #include "attributes.h"
 #include "gfx.h"
 #include "gfxalloc.h"
-#include "z64vis.h"
+#include "vis.h"
 
 // Height of the fragments the color frame buffer (CFB) is split into.
 // It is the maximum amount of lines such that all rgba16 SCREEN_WIDTH-long lines fit into
diff --git a/src/code/z_viszbuf.c b/src/code/z_viszbuf.c
index 431d7f6d9..aa7228974 100644
--- a/src/code/z_viszbuf.c
+++ b/src/code/z_viszbuf.c
@@ -33,7 +33,7 @@
  */
 
 #include "gfx.h"
-#include "z64vis.h"
+#include "vis.h"
 
 // Height of the fragments the z-buffer is split into.
 // It is the maximum amount of lines such that all rgba16 SCREEN_WIDTH-long lines fit into TMEM.
diff --git a/src/code/z_vr_box.c b/src/code/z_vr_box.c
index 2fa2122ac..3387db500 100644
--- a/src/code/z_vr_box.c
+++ b/src/code/z_vr_box.c
@@ -1,14 +1,14 @@
-#include "z64skybox.h"
+#include "skybox.h"
 
 #include "array_count.h"
 #include "printf.h"
 #include "segment_symbols.h"
 #include "terminal.h"
 #include "ultra64.h"
-#include "z64environment.h"
-#include "z64game.h"
-#include "z64play.h"
-#include "z64save.h"
+#include "environment.h"
+#include "game.h"
+#include "play_state.h"
+#include "save.h"
 
 typedef struct SkyboxFaceParams {
     /* 0x000 */ s32 xStart;
diff --git a/src/code/z_vr_box_draw.c b/src/code/z_vr_box_draw.c
index aa7fa1dae..46c38291f 100644
--- a/src/code/z_vr_box_draw.c
+++ b/src/code/z_vr_box_draw.c
@@ -1,7 +1,7 @@
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "sys_matrix.h"
-#include "z64skybox.h"
+#include "skybox.h"
 
 Mtx* sSkyboxDrawMatrix;