diff --git a/include/animation.h b/include/animation.h
index 74851b41df..9e162ea9c5 100644
--- a/include/animation.h
+++ b/include/animation.h
@@ -3,7 +3,7 @@
 
 #include "avoid_ub.h"
 #include "ultra64.h"
-#include "z64dma.h"
+#include "dma.h"
 #include "z64math.h"
 
 struct PlayState;
diff --git a/include/z64debug.h b/include/debug.h
similarity index 90%
rename from include/z64debug.h
rename to include/debug.h
index 0e2c7334ee..9c12f82429 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
similarity index 93%
rename from include/z64debug_display.h
rename to include/debug_display.h
index 9cb1198067..8853238807 100644
--- a/include/z64debug_display.h
+++ b/include/debug_display.h
@@ -1,5 +1,5 @@
-#ifndef Z64_DEBUG_DISPLAY_H
-#define Z64_DEBUG_DISPLAY_H
+#ifndef DEBUG_DISPLAY_H
+#define DEBUG_DISPLAY_H
 
 #include "ultra64.h"
 #include "z64math.h"
diff --git a/include/z64dma.h b/include/dma.h
similarity index 98%
rename from include/z64dma.h
rename to include/dma.h
index 10968517bc..83a79619c8 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
similarity index 73%
rename from include/z64draw.h
rename to include/draw.h
index 51250ed8c8..272a233fdc 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/z64environment.h b/include/z64environment.h
index 4c4bc770cd..54a28563fc 100644
--- a/include/z64environment.h
+++ b/include/z64environment.h
@@ -3,7 +3,7 @@
 
 #include "z64math.h"
 #include "z64light.h"
-#include "z64dma.h"
+#include "dma.h"
 
 struct GameOverContext;
 struct MessageContext;
diff --git a/include/z64interface.h b/include/z64interface.h
index bfa3bffeb3..f7bb371092 100644
--- a/include/z64interface.h
+++ b/include/z64interface.h
@@ -2,7 +2,7 @@
 #define Z64INTERFACE_H
 
 #include "ultra64.h"
-#include "z64dma.h"
+#include "dma.h"
 #include "z64view.h"
 
 struct PlayState;
diff --git a/include/z64object.h b/include/z64object.h
index 016eda00d7..296f35e521 100644
--- a/include/z64object.h
+++ b/include/z64object.h
@@ -2,7 +2,7 @@
 #define Z64OBJECT_H
 
 #include "ultra64.h"
-#include "z64dma.h"
+#include "dma.h"
 
 struct PlayState;
 
diff --git a/include/z64room.h b/include/z64room.h
index 72c6f0982b..63cfb837fd 100644
--- a/include/z64room.h
+++ b/include/z64room.h
@@ -2,7 +2,7 @@
 #define Z64ROOM_H
 
 #include "ultra64.h"
-#include "z64dma.h"
+#include "dma.h"
 #include "z64math.h"
 
 struct Input;
diff --git a/include/z64skybox.h b/include/z64skybox.h
index e0ebcf0c03..fae5587614 100644
--- a/include/z64skybox.h
+++ b/include/z64skybox.h
@@ -5,7 +5,7 @@
 #include "ultra64/gbi.h"
 
 #include "z64math.h"
-#include "z64dma.h" // for RomFile
+#include "dma.h" // for RomFile
 
 struct GameState;
 struct GraphicsContext;
diff --git a/src/boot/idle.c b/src/boot/idle.c
index 743219d94c..f9d5813fbd 100644
--- a/src/boot/idle.c
+++ b/src/boot/idle.c
@@ -12,7 +12,7 @@
 #include "versions.h"
 #include "vi_mode.h"
 #include "z64thread.h"
-#include "z64dma.h"
+#include "dma.h"
 
 #pragma increment_block_number "gc-eu:192 gc-eu-mq:192 gc-jp:192 gc-jp-ce:192 gc-jp-mq:192 gc-us:192 gc-us-mq:192" \
                                "ntsc-1.0:192 ntsc-1.1:192 ntsc-1.2:192 pal-1.0:192 pal-1.1:192"
diff --git a/src/boot/inflate.c b/src/boot/inflate.c
index 391ce0368f..3690d5cbe0 100644
--- a/src/boot/inflate.c
+++ b/src/boot/inflate.c
@@ -102,7 +102,7 @@
 #include "libc/stdint.h"
 #include "alignment.h"
 #include "attributes.h"
-#include "z64dma.h"
+#include "dma.h"
 
 typedef u8 uch;
 typedef u16 ush;
diff --git a/src/boot/yaz0.c b/src/boot/yaz0.c
index eb3ce23317..601d5145eb 100644
--- a/src/boot/yaz0.c
+++ b/src/boot/yaz0.c
@@ -2,7 +2,7 @@
 
 #include "alignment.h"
 #include "ultra64.h"
-#include "z64dma.h"
+#include "dma.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 ntsc-1.2:128" \
                                "pal-1.1:128"
diff --git a/src/boot/z_std_dma.c b/src/boot/z_std_dma.c
index de2a19e57c..8060997cde 100644
--- a/src/boot/z_std_dma.c
+++ b/src/boot/z_std_dma.c
@@ -42,7 +42,7 @@
 #if !PLATFORM_IQUE
 #include "yaz0.h"
 #endif
-#include "z64dma.h"
+#include "dma.h"
 #include "z64thread.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 ntsc-1.2:66" \
diff --git a/src/code/audio_thread_manager.c b/src/code/audio_thread_manager.c
index 57f530a4b8..01b0072d9b 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 979a95afbb..1509b7223b 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/db_camera.c b/src/code/db_camera.c
index c6a0f8366d..8256e422d6 100644
--- a/src/code/db_camera.c
+++ b/src/code/db_camera.c
@@ -13,8 +13,8 @@
 #include "camera.h"
 #include "cutscene.h"
 #include "cutscene_spline.h"
-#include "z64debug.h"
-#include "z64debug_display.h"
+#include "debug.h"
+#include "debug_display.h"
 #include "z64olib.h"
 #include "z64play.h"
 #include "z64save.h"
diff --git a/src/code/game.c b/src/code/game.c
index 7f63d4d641..c1b3fc08a2 100644
--- a/src/code/game.c
+++ b/src/code/game.c
@@ -26,8 +26,8 @@
 #include "versions.h"
 #include "vi_mode.h"
 #include "zelda_arena.h"
-#include "z64debug.h"
-#include "z64dma.h"
+#include "debug.h"
+#include "dma.h"
 #include "z64game.h"
 #include "z64play.h"
 #include "z64vis.h"
diff --git a/src/code/main.c b/src/code/main.c
index cb936b2176..597b121540 100644
--- a/src/code/main.c
+++ b/src/code/main.c
@@ -40,7 +40,7 @@ extern struct IrqMgr gIrqMgr;
 #include "cic6105.h"
 #include "n64dd.h"
 #endif
-#include "z64debug.h"
+#include "debug.h"
 #include "z64thread.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_camera.c b/src/code/z_camera.c
index f4e306558a..dbf2abe551 100644
--- a/src/code/z_camera.c
+++ b/src/code/z_camera.c
@@ -19,7 +19,7 @@
 #include "zelda_arena.h"
 #include "audio.h"
 #include "cutscene_spline.h"
-#include "z64debug.h"
+#include "debug.h"
 #include "z64olib.h"
 #include "z64play.h"
 #include "z64player.h"
diff --git a/src/code/z_debug.c b/src/code/z_debug.c
index d5804cd7ee..6de85056c2 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 9d15663a67..44a45265d2 100644
--- a/src/code/z_debug_display.c
+++ b/src/code/z_debug_display.c
@@ -2,7 +2,7 @@
 #include "gfx_setupdl.h"
 #include "sys_matrix.h"
 #include "z64play.h"
-#include "z64debug_display.h"
+#include "debug_display.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/code/z_draw.c b/src/code/z_draw.c
index 9e0dd236eb..e8089371ef 100644
--- a/src/code/z_draw.c
+++ b/src/code/z_draw.c
@@ -1,7 +1,7 @@
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "sys_matrix.h"
-#include "z64draw.h"
+#include "draw.h"
 #include "z64play.h"
 
 #include "assets/objects/object_gi_key/object_gi_key.h"
diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c
index f0c627b250..9622e9071c 100644
--- a/src/code/z_en_item00.c
+++ b/src/code/z_en_item00.c
@@ -12,7 +12,7 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64draw.h"
+#include "draw.h"
 #include "z64effect.h"
 #include "z64item.h"
 #include "z64play.h"
diff --git a/src/code/z_kanfont.c b/src/code/z_kanfont.c
index 89f5bbd3b7..74f200c54f 100644
--- a/src/code/z_kanfont.c
+++ b/src/code/z_kanfont.c
@@ -4,7 +4,7 @@
 #include "segment_symbols.h"
 #include "translation.h"
 #include "versions.h"
-#include "z64dma.h"
+#include "dma.h"
 #include "z64font.h"
 #include "z64message.h"
 
diff --git a/src/code/z_play.c b/src/code/z_play.c
index d40a06b3b9..1f247d6c10 100644
--- a/src/code/z_play.c
+++ b/src/code/z_play.c
@@ -38,7 +38,7 @@
 #include "zelda_arena.h"
 #include "audio.h"
 #include "cutscene_flags.h"
-#include "z64debug_display.h"
+#include "debug_display.h"
 #include "z64effect.h"
 #include "z64frame_advance.h"
 #include "z64light.h"
diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c
index 1ac27fdb6c..ba1e967f1d 100644
--- a/src/code/z_player_lib.c
+++ b/src/code/z_player_lib.c
@@ -6,7 +6,7 @@
 #include "sys_matrix.h"
 #include "versions.h"
 #include "z_lib.h"
-#include "z64draw.h"
+#include "draw.h"
 #include "z64effect.h"
 #include "z64play.h"
 #include "z64player.h"
diff --git a/src/code/z_sample.c b/src/code/z_sample.c
index 63e0836bbc..4d2c8cb1d6 100644
--- a/src/code/z_sample.c
+++ b/src/code/z_sample.c
@@ -4,7 +4,7 @@
 #include "regs.h"
 #include "sample_state.h"
 #include "segment_symbols.h"
-#include "z64dma.h"
+#include "dma.h"
 #include "z64play.h"
 
 void Sample_HandleStateChange(SampleState* this) {
diff --git a/src/dmadata/dmadata.c b/src/dmadata/dmadata.c
index 93ea2b4d33..eff05f171b 100644
--- a/src/dmadata/dmadata.c
+++ b/src/dmadata/dmadata.c
@@ -1,4 +1,4 @@
-#include "z64dma.h"
+#include "dma.h"
 
 // Linker symbol declarations (used in the table below)
 #define DEFINE_DMA_ENTRY(name, _1)        \
diff --git a/src/libu64/load_gc.c b/src/libu64/load_gc.c
index 340780a130..e99c83d1df 100644
--- a/src/libu64/load_gc.c
+++ b/src/libu64/load_gc.c
@@ -2,7 +2,7 @@
 #include "ultra64.h"
 #include "printf.h"
 #include "translation.h"
-#include "z64dma.h"
+#include "dma.h"
 
 size_t Overlay_Load(uintptr_t vromStart, uintptr_t vromEnd, void* vramStart, void* vramEnd, void* allocatedRamAddr) {
     s32 pad[3];
diff --git a/src/libu64/loadfragment2_n64.c b/src/libu64/loadfragment2_n64.c
index be0e5295d9..72ecabaf37 100644
--- a/src/libu64/loadfragment2_n64.c
+++ b/src/libu64/loadfragment2_n64.c
@@ -9,7 +9,7 @@
 #include "libc64/malloc.h"
 #include "libu64/overlay.h"
 #include "translation.h"
-#include "z64dma.h"
+#include "dma.h"
 
 s32 gOverlayLogSeverity = 2;
 
diff --git a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c
index 02394e4dc9..2f43c93143 100644
--- a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c
+++ b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c
@@ -17,7 +17,7 @@
 #include "z_lib.h"
 #include "audio.h"
 #include "curve.h"
-#include "z64draw.h"
+#include "draw.h"
 #include "cutscene_flags.h"
 #include "z64effect.h"
 #include "z64play.h"
diff --git a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c
index 6bc60ac276..bb363d6f72 100644
--- a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c
+++ b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c
@@ -20,7 +20,7 @@
 #include "translation.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64draw.h"
+#include "draw.h"
 #include "z64effect.h"
 #include "z64play.h"
 #include "z64player.h"
diff --git a/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c b/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c
index 4163b5d24f..e48e091bd7 100644
--- a/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c
+++ b/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c
@@ -11,7 +11,7 @@
 #include "regs.h"
 #include "terminal.h"
 #include "z_lib.h"
-#include "z64debug_display.h"
+#include "debug_display.h"
 #include "z64play.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED
diff --git a/src/overlays/actors/ovl_En_Changer/z_en_changer.c b/src/overlays/actors/ovl_En_Changer/z_en_changer.c
index 95debf0273..0e39b324ad 100644
--- a/src/overlays/actors/ovl_En_Changer/z_en_changer.c
+++ b/src/overlays/actors/ovl_En_Changer/z_en_changer.c
@@ -13,7 +13,7 @@
 #include "rand.h"
 #include "regs.h"
 #include "terminal.h"
-#include "z64debug_display.h"
+#include "debug_display.h"
 #include "z64play.h"
 #include "z64save.h"
 
diff --git a/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c b/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c
index cd1f15f3db..348e032a2c 100644
--- a/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c
+++ b/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c
@@ -19,7 +19,7 @@
 #include "terminal.h"
 #include "z_lib.h"
 #include "audio.h"
-#include "z64debug_display.h"
+#include "debug_display.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
diff --git a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c
index 92374ad12a..75c04cbae6 100644
--- a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c
+++ b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c
@@ -8,7 +8,7 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64debug_display.h"
+#include "debug_display.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
diff --git a/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c b/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c
index cbbb4fa0ee..54bcbcea35 100644
--- a/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c
+++ b/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c
@@ -16,7 +16,7 @@
 #include "sys_matrix.h"
 #include "terminal.h"
 #include "z_lib.h"
-#include "z64draw.h"
+#include "draw.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
diff --git a/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c
index 60f7198875..b66bda7bdd 100644
--- a/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c
+++ b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c
@@ -11,7 +11,7 @@
 #include "sys_matrix.h"
 #include "terminal.h"
 #include "z_lib.h"
-#include "z64debug_display.h"
+#include "debug_display.h"
 #include "z64effect.h"
 #include "z64play.h"
 #include "z64player.h"
diff --git a/src/overlays/actors/ovl_En_Fr/z_en_fr.c b/src/overlays/actors/ovl_En_Fr/z_en_fr.c
index 3468e37b28..670bac51df 100644
--- a/src/overlays/actors/ovl_En_Fr/z_en_fr.c
+++ b/src/overlays/actors/ovl_En_Fr/z_en_fr.c
@@ -15,7 +15,7 @@
 #include "terminal.h"
 #include "z_lib.h"
 #include "audio.h"
-#include "z64debug_display.h"
+#include "debug_display.h"
 #include "z64effect.h"
 #include "z64light.h"
 #include "z64ocarina.h"
diff --git a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c
index 0d84a61ca0..292e519479 100644
--- a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c
+++ b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c
@@ -22,7 +22,7 @@
 #include "z_en_item00.h"
 #include "z_lib.h"
 #include "audio.h"
-#include "z64debug_display.h"
+#include "debug_display.h"
 #include "z64effect.h"
 #include "z64play.h"
 #include "z64player.h"
diff --git a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c
index aebb758cd7..524ded870c 100644
--- a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c
+++ b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c
@@ -11,7 +11,7 @@
 #include "sys_matrix.h"
 #include "terminal.h"
 #include "z_lib.h"
-#include "z64draw.h"
+#include "draw.h"
 #include "z64play.h"
 #include "z64save.h"
 
diff --git a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c
index 0736896895..44606f0226 100644
--- a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c
+++ b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c
@@ -18,7 +18,7 @@
 #include "sys_matrix.h"
 #include "terminal.h"
 #include "z_lib.h"
-#include "z64debug_display.h"
+#include "debug_display.h"
 #include "z64effect.h"
 #include "z64play.h"
 #include "z64player.h"
diff --git a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c
index 7651842925..29eeefbbec 100644
--- a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c
+++ b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c
@@ -13,7 +13,7 @@
 #include "sfx.h"
 #include "terminal.h"
 #include "z_lib.h"
-#include "z64debug_display.h"
+#include "debug_display.h"
 #include "z64ocarina.h"
 #include "z64play.h"
 #include "z64player.h"
diff --git a/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c b/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c
index a8e76af95a..e67bfcc98f 100644
--- a/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c
+++ b/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c
@@ -13,7 +13,7 @@
 #include "versions.h"
 #include "audio.h"
 #include "cutscene_flags.h"
-#include "z64debug_display.h"
+#include "debug_display.h"
 #include "z64frame_advance.h"
 #include "z64play.h"
 #include "z64save.h"
diff --git a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c
index 2576143c86..810c8ff7fe 100644
--- a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c
+++ b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c
@@ -15,7 +15,7 @@
 #include "versions.h"
 #include "z_lib.h"
 #include "audio.h"
-#include "z64debug_display.h"
+#include "debug_display.h"
 #include "z64ocarina.h"
 #include "z64play.h"
 #include "z64player.h"
diff --git a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c
index 856958e81e..1feea85289 100644
--- a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c
+++ b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c
@@ -19,7 +19,7 @@
 #include "terminal.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64debug_display.h"
+#include "debug_display.h"
 #include "z64effect.h"
 #include "z64play.h"
 #include "z64player.h"
diff --git a/src/overlays/actors/ovl_En_Si/z_en_si.c b/src/overlays/actors/ovl_En_Si/z_en_si.c
index 649845bd1f..f2f613b347 100644
--- a/src/overlays/actors/ovl_En_Si/z_en_si.c
+++ b/src/overlays/actors/ovl_En_Si/z_en_si.c
@@ -9,7 +9,7 @@
 #include "sequence.h"
 #include "z_lib.h"
 #include "audio.h"
-#include "z64draw.h"
+#include "draw.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
diff --git a/src/overlays/actors/ovl_En_Skj/z_en_skj.c b/src/overlays/actors/ovl_En_Skj/z_en_skj.c
index bfe95cacbd..1fdcbab056 100644
--- a/src/overlays/actors/ovl_En_Skj/z_en_skj.c
+++ b/src/overlays/actors/ovl_En_Skj/z_en_skj.c
@@ -13,7 +13,7 @@
 #include "z_en_item00.h"
 #include "z_lib.h"
 #include "audio.h"
-#include "z64debug_display.h"
+#include "debug_display.h"
 #include "z64face_reaction.h"
 #include "z64ocarina.h"
 #include "z64effect.h"
diff --git a/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c b/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c
index e409e9c246..05e85675c7 100644
--- a/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c
+++ b/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c
@@ -9,7 +9,7 @@
 #include "sfx.h"
 #include "terminal.h"
 #include "z_lib.h"
-#include "z64debug_display.h"
+#include "debug_display.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
diff --git a/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c b/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c
index 149eba4700..bb9bc7a023 100644
--- a/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c
+++ b/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c
@@ -16,7 +16,7 @@
 #include "quake.h"
 #include "terminal.h"
 #include "z_lib.h"
-#include "z64debug_display.h"
+#include "debug_display.h"
 #include "z64effect.h"
 #include "z64play.h"
 
diff --git a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c
index 04082aa10f..ab75aa8e28 100644
--- a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c
+++ b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c
@@ -11,7 +11,7 @@
 #include "terminal.h"
 #include "versions.h"
 #include "z_lib.h"
-#include "z64debug_display.h"
+#include "debug_display.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
diff --git a/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c b/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c
index a1cf8f5be6..ffc2442923 100644
--- a/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c
+++ b/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c
@@ -13,7 +13,7 @@
 #include "translation.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
-#include "z64debug_display.h"
+#include "debug_display.h"
 #include "z64play.h"
 #include "z64player.h"
 
diff --git a/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c b/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c
index fb455390a7..a64b7ba930 100644
--- a/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c
+++ b/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c
@@ -9,7 +9,7 @@
 #include "printf.h"
 #include "regs.h"
 #include "terminal.h"
-#include "z64debug_display.h"
+#include "debug_display.h"
 #include "z64play.h"
 #include "z64save.h"
 
diff --git a/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c b/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c
index bb58339fc1..3b8227e08c 100644
--- a/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c
+++ b/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c
@@ -9,7 +9,7 @@
 #include "printf.h"
 #include "regs.h"
 #include "terminal.h"
-#include "z64debug_display.h"
+#include "debug_display.h"
 #include "z64item.h"
 #include "z64play.h"
 #include "z64player.h"
diff --git a/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c b/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c
index 2e8528ced3..f824f062fa 100644
--- a/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c
+++ b/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c
@@ -13,7 +13,7 @@
 #include "terminal.h"
 #include "z_lib.h"
 #include "audio.h"
-#include "z64debug_display.h"
+#include "debug_display.h"
 #include "z64effect.h"
 #include "z64play.h"
 #include "z64save.h"
diff --git a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c
index 3909fb72f9..9147fca96a 100644
--- a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c
+++ b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c
@@ -10,7 +10,7 @@
 #include "libu64/debug.h"
 #include "printf.h"
 #include "rand.h"
-#include "z64draw.h"
+#include "draw.h"
 #include "z64effect.h"
 #include "z64play.h"
 #include "z64save.h"
diff --git a/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c b/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c
index 40594c86f6..445e983d56 100644
--- a/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c
+++ b/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c
@@ -5,7 +5,7 @@
  */
 
 #include "z_item_inbox.h"
-#include "z64draw.h"
+#include "draw.h"
 #include "z64play.h"
 
 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY)
diff --git a/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c b/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c
index fa4f500c87..7c9a0f14dc 100644
--- a/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c
+++ b/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c
@@ -9,7 +9,7 @@
 #include "libu64/debug.h"
 #include "segmented_address.h"
 #include "sfx.h"
-#include "z64draw.h"
+#include "draw.h"
 #include "z64effect.h"
 #include "z64play.h"
 #include "z64save.h"
diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c
index 05da549dbd..7f7d01fb5f 100644
--- a/src/overlays/actors/ovl_player_actor/z_player.c
+++ b/src/overlays/actors/ovl_player_actor/z_player.c
@@ -43,7 +43,7 @@
 #include "z_lib.h"
 #include "zelda_arena.h"
 #include "audio.h"
-#include "z64debug.h"
+#include "debug.h"
 #include "z64effect.h"
 #include "z64lifemeter.h"
 #include "z64ocarina.h"