diff --git a/include/z64object.h b/include/object.h
similarity index 97%
rename from include/z64object.h
rename to include/object.h
index 296f35e521..e40e671120 100644
--- a/include/z64object.h
+++ b/include/object.h
@@ -1,5 +1,5 @@
-#ifndef Z64OBJECT_H
-#define Z64OBJECT_H
+#ifndef OBJECT_H
+#define OBJECT_H
 
 #include "ultra64.h"
 #include "dma.h"
diff --git a/include/z64ocarina.h b/include/ocarina.h
similarity index 99%
rename from include/z64ocarina.h
rename to include/ocarina.h
index d00ef01f2b..b3d502836a 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
similarity index 92%
rename from include/z64olib.h
rename to include/olib.h
index bb9d2084f6..88b918987d 100644
--- a/include/z64olib.h
+++ b/include/olib.h
@@ -1,5 +1,5 @@
-#ifndef Z64OLIB_H
-#define Z64OLIB_H
+#ifndef OLIB_H
+#define OLIB_H
 
 #include "z_math.h"
 
diff --git a/include/z64.h b/include/z64.h
index 03f38ad5c1..79b52d4163 100644
--- a/include/z64.h
+++ b/include/z64.h
@@ -15,6 +15,6 @@
 #include "curve.h"
 #include "z64skin.h"
 #include "z64player.h"
-#include "z64ocarina.h"
+#include "ocarina.h"
 
 #endif
diff --git a/include/z64play.h b/include/z64play.h
index 8ef43a509e..1765693c43 100644
--- a/include/z64play.h
+++ b/include/z64play.h
@@ -16,7 +16,7 @@
 #include "interface.h"
 #include "light.h"
 #include "message.h"
-#include "z64object.h"
+#include "object.h"
 #include "z64pause.h"
 #include "z64room.h"
 #include "z64scene.h"
diff --git a/src/audio/general.c b/src/audio/general.c
index dcecee6c1c..0e1ca6df5c 100644
--- a/src/audio/general.c
+++ b/src/audio/general.c
@@ -11,7 +11,7 @@
 #include "ultra64.h"
 #include "versions.h"
 #include "audio.h"
-#include "z64ocarina.h"
+#include "ocarina.h"
 
 #define ABS_ALT(x) ((x) < 0 ? -(x) : (x))
 
diff --git a/src/code/db_camera.c b/src/code/db_camera.c
index 8256e422d6..b23238b006 100644
--- a/src/code/db_camera.c
+++ b/src/code/db_camera.c
@@ -15,7 +15,7 @@
 #include "cutscene_spline.h"
 #include "debug.h"
 #include "debug_display.h"
-#include "z64olib.h"
+#include "olib.h.h"
 #include "z64play.h"
 #include "z64save.h"
 
diff --git a/src/code/object_table.c b/src/code/object_table.c
index 9ed6a1f44d..3bb45a0073 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/z_camera.c b/src/code/z_camera.c
index dbf2abe551..5d567d2e30 100644
--- a/src/code/z_camera.c
+++ b/src/code/z_camera.c
@@ -20,7 +20,7 @@
 #include "audio.h"
 #include "cutscene_spline.h"
 #include "debug.h"
-#include "z64olib.h"
+#include "olib.h.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
diff --git a/src/code/z_construct.c b/src/code/z_construct.c
index 6adabcd8e9..ff9baad4f1 100644
--- a/src/code/z_construct.c
+++ b/src/code/z_construct.c
@@ -6,7 +6,7 @@
 #include "versions.h"
 #include "lifemeter.h"
 #include "interface.h"
-#include "z64ocarina.h"
+#include "ocarina.h"
 #include "z64play.h"
 #include "z64save.h"
 
diff --git a/src/code/z_demo.c b/src/code/z_demo.c
index f0760ae04c..f267072890 100644
--- a/src/code/z_demo.c
+++ b/src/code/z_demo.c
@@ -25,7 +25,7 @@
 #include "camera.h"
 #include "cutscene.h"
 #include "cutscene_flags.h"
-#include "z64ocarina.h"
+#include "ocarina.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
diff --git a/src/code/z_message.c b/src/code/z_message.c
index 49a548aa18..ecb817a2de 100644
--- a/src/code/z_message.c
+++ b/src/code/z_message.c
@@ -19,7 +19,7 @@
 #include "translation.h"
 #include "versions.h"
 #include "audio.h"
-#include "z64ocarina.h"
+#include "ocarina.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
diff --git a/src/code/z_olib.c b/src/code/z_olib.c
index c4dc3b5393..392bce860a 100644
--- a/src/code/z_olib.c
+++ b/src/code/z_olib.c
@@ -1,6 +1,6 @@
 #include "z_math.h"
 #include "libc64/math64.h"
-#include "z64olib.h"
+#include "olib.h.h"
 #include "z_lib.h"
 
 /**
diff --git a/src/code/z_onepointdemo.c b/src/code/z_onepointdemo.c
index 94c3bc9e11..59f57b605b 100644
--- a/src/code/z_onepointdemo.c
+++ b/src/code/z_onepointdemo.c
@@ -9,7 +9,7 @@
 #include "terminal.h"
 #include "versions.h"
 #include "z_lib.h"
-#include "z64olib.h"
+#include "olib.h.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c
index 74031feec2..2c324d4ec2 100644
--- a/src/code/z_parameter.c
+++ b/src/code/z_parameter.c
@@ -20,7 +20,7 @@
 #include "audio.h"
 #include "lifemeter.h"
 #include "horse.h"
-#include "z64ocarina.h"
+#include "ocarina.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
diff --git a/src/code/z_quake.c b/src/code/z_quake.c
index d3ba17810d..cdc831653f 100644
--- a/src/code/z_quake.c
+++ b/src/code/z_quake.c
@@ -4,7 +4,7 @@
 #include "quake.h"
 #include "terminal.h"
 #include "z_lib.h"
-#include "z64olib.h"
+#include "olib.h.h"
 #include "z64play.h"
 
 typedef struct QuakeRequest {
diff --git a/src/code/z_sram.c b/src/code/z_sram.c
index af2f5e9b2c..437677cbef 100644
--- a/src/code/z_sram.c
+++ b/src/code/z_sram.c
@@ -12,7 +12,7 @@
 #include "game.h"
 #include "interface.h"
 #include "message.h"
-#include "z64ocarina.h"
+#include "ocarina.h"
 #include "z64save.h"
 #include "z64scene.h"
 #include "z64ss_sram.h"
diff --git a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c
index 006deb893e..8490a47ddf 100644
--- a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c
+++ b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c
@@ -21,7 +21,7 @@
 #include "translation.h"
 #include "versions.h"
 #include "z_lib.h"
-#include "z64ocarina.h"
+#include "ocarina.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c
index 179420a17a..18946bb4d4 100644
--- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c
+++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c
@@ -13,7 +13,7 @@
 #include "cutscene_commands.h"
 #include "cutscene_flags.h"
 #include "cutscene_spline.h"
-#include "z64olib.h"
+#include "olib.h.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
diff --git a/src/overlays/actors/ovl_En_Box/z_en_box.c b/src/overlays/actors/ovl_En_Box/z_en_box.c
index 150f2d9f72..34dad978c6 100644
--- a/src/overlays/actors/ovl_En_Box/z_en_box.c
+++ b/src/overlays/actors/ovl_En_Box/z_en_box.c
@@ -15,7 +15,7 @@
 #include "audio.h"
 #include "curve.h"
 #include "effect.h"
-#include "z64ocarina.h"
+#include "ocarina.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
diff --git a/src/overlays/actors/ovl_En_Cow/z_en_cow.c b/src/overlays/actors/ovl_En_Cow/z_en_cow.c
index d459c93f6f..1bb30524b7 100644
--- a/src/overlays/actors/ovl_En_Cow/z_en_cow.c
+++ b/src/overlays/actors/ovl_En_Cow/z_en_cow.c
@@ -13,7 +13,7 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64ocarina.h"
+#include "ocarina.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
diff --git a/src/overlays/actors/ovl_En_Du/z_en_du.c b/src/overlays/actors/ovl_En_Du/z_en_du.c
index 3fe6b1d1c0..fa4d098ae6 100644
--- a/src/overlays/actors/ovl_En_Du/z_en_du.c
+++ b/src/overlays/actors/ovl_En_Du/z_en_du.c
@@ -9,7 +9,7 @@
 #include "z_lib.h"
 #include "audio.h"
 #include "face_reaction.h"
-#include "z64ocarina.h"
+#include "ocarina.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.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 ddfc8bde3b..f74068dd9b 100644
--- a/src/overlays/actors/ovl_En_Fr/z_en_fr.c
+++ b/src/overlays/actors/ovl_En_Fr/z_en_fr.c
@@ -18,7 +18,7 @@
 #include "debug_display.h"
 #include "effect.h"
 #include "light.h"
-#include "z64ocarina.h"
+#include "ocarina.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
diff --git a/src/overlays/actors/ovl_En_Fu/z_en_fu.c b/src/overlays/actors/ovl_En_Fu/z_en_fu.c
index 809a112a6b..a61af9e3cf 100644
--- a/src/overlays/actors/ovl_En_Fu/z_en_fu.c
+++ b/src/overlays/actors/ovl_En_Fu/z_en_fu.c
@@ -13,7 +13,7 @@
 #include "sys_matrix.h"
 #include "z_lib.h"
 #include "face_reaction.h"
-#include "z64ocarina.h"
+#include "ocarina.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
diff --git a/src/overlays/actors/ovl_En_Gs/z_en_gs.c b/src/overlays/actors/ovl_En_Gs/z_en_gs.c
index 26139c2de6..e7d1368b11 100644
--- a/src/overlays/actors/ovl_En_Gs/z_en_gs.c
+++ b/src/overlays/actors/ovl_En_Gs/z_en_gs.c
@@ -16,7 +16,7 @@
 #include "sys_matrix.h"
 #include "z_lib.h"
 #include "effect.h"
-#include "z64ocarina.h"
+#include "ocarina.h"
 #include "z64play.h"
 #include "z64player.h"
 
diff --git a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c
index d2d807cd28..c9708e2c34 100644
--- a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c
+++ b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c
@@ -16,7 +16,7 @@
 #include "sfx.h"
 #include "terminal.h"
 #include "z_lib.h"
-#include "z64ocarina.h"
+#include "ocarina.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.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 29eeefbbec..5ae6731210 100644
--- a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c
+++ b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c
@@ -14,7 +14,7 @@
 #include "terminal.h"
 #include "z_lib.h"
 #include "debug_display.h"
-#include "z64ocarina.h"
+#include "ocarina.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
diff --git a/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c b/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c
index 8f4d21e36d..a4035391d4 100644
--- a/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c
+++ b/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c
@@ -16,7 +16,7 @@
 #include "sfx.h"
 #include "terminal.h"
 #include "z_lib.h"
-#include "z64ocarina.h"
+#include "ocarina.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
diff --git a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c
index b6338f65df..d0e384314e 100644
--- a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c
+++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c
@@ -20,7 +20,7 @@
 #include "terminal.h"
 #include "z_lib.h"
 #include "effect.h"
-#include "z64ocarina.h"
+#include "ocarina.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
diff --git a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c
index d13e3e7d02..3a250b2f0b 100644
--- a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c
+++ b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c
@@ -14,7 +14,7 @@
 #include "z_lib.h"
 #include "audio.h"
 #include "face_reaction.h"
-#include "z64ocarina.h"
+#include "ocarina.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
diff --git a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c
index 85c9a47dfc..112c3fba1c 100644
--- a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c
+++ b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c
@@ -9,7 +9,7 @@
 #include "z_lib.h"
 #include "audio.h"
 #include "face_reaction.h"
-#include "z64ocarina.h"
+#include "ocarina.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
diff --git a/src/overlays/actors/ovl_En_Md/z_en_md.c b/src/overlays/actors/ovl_En_Md/z_en_md.c
index 5226b076c6..690b7de3ff 100644
--- a/src/overlays/actors/ovl_En_Md/z_en_md.c
+++ b/src/overlays/actors/ovl_En_Md/z_en_md.c
@@ -15,7 +15,7 @@
 #include "sys_matrix.h"
 #include "z_lib.h"
 #include "face_reaction.h"
-#include "z64ocarina.h"
+#include "ocarina.h"
 #include "z64play.h"
 #include "z64player.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 810c8ff7fe..7b6577c174 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
@@ -16,7 +16,7 @@
 #include "z_lib.h"
 #include "audio.h"
 #include "debug_display.h"
-#include "z64ocarina.h"
+#include "ocarina.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 ca45a74499..5e11f0d788 100644
--- a/src/overlays/actors/ovl_En_Skj/z_en_skj.c
+++ b/src/overlays/actors/ovl_En_Skj/z_en_skj.c
@@ -15,7 +15,7 @@
 #include "audio.h"
 #include "debug_display.h"
 #include "face_reaction.h"
-#include "z64ocarina.h"
+#include "ocarina.h"
 #include "effect.h"
 #include "z64play.h"
 #include "z64player.h"
diff --git a/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c b/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c
index ad927dca9a..14081a9126 100644
--- a/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c
+++ b/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c
@@ -14,7 +14,7 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64ocarina.h"
+#include "ocarina.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
diff --git a/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c b/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c
index 78e1cdf3a4..e8065f1240 100644
--- a/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c
+++ b/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c
@@ -16,7 +16,7 @@
 #include "sys_matrix.h"
 #include "terminal.h"
 #include "z_lib.h"
-#include "z64ocarina.h"
+#include "ocarina.h"
 #include "z64play.h"
 #include "z64player.h"
 
diff --git a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c
index 518ca1edd9..90672b2c9d 100644
--- a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c
+++ b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c
@@ -15,7 +15,7 @@
 #include "terminal.h"
 #include "z_lib.h"
 #include "light.h"
-#include "z64ocarina.h"
+#include "ocarina.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
diff --git a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c
index d9dcc9c612..5bfee75f1f 100644
--- a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c
+++ b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c
@@ -17,7 +17,7 @@
 #include "z_en_item00.h"
 #include "z_lib.h"
 #include "environment.h"
-#include "z64ocarina.h"
+#include "ocarina.h"
 #include "z64play.h"
 #include "z64player.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 669626d23a..40fe7fd827 100644
--- a/src/overlays/actors/ovl_player_actor/z_player.c
+++ b/src/overlays/actors/ovl_player_actor/z_player.c
@@ -46,7 +46,7 @@
 #include "debug.h"
 #include "effect.h"
 #include "lifemeter.h"
-#include "z64ocarina.h"
+#include "ocarina.h"
 #include "z64play.h"
 #include "z64save.h"
 #include "z64skin_matrix.h"
diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c
index 2f086413bc..1e2e5be021 100644
--- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c
+++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c
@@ -6,7 +6,7 @@
 #include "printf.h"
 #include "regs.h"
 #include "sfx.h"
-#include "z64ocarina.h"
+#include "ocarina.h"
 #include "z64play.h"
 #include "z64save.h"
 
diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c
index c8ee188e95..9fc9c8f127 100644
--- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c
+++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c
@@ -22,7 +22,7 @@
 #include "title_setup_state.h"
 #include "versions.h"
 #include "audio.h"
-#include "z64ocarina.h"
+#include "ocarina.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
diff --git a/tools/ZAPDConfigs/EnumData.xml b/tools/ZAPDConfigs/EnumData.xml
index bbe0b2d07a..9955475b9d 100644
--- a/tools/ZAPDConfigs/EnumData.xml
+++ b/tools/ZAPDConfigs/EnumData.xml
@@ -429,7 +429,7 @@
         <Item Key="cueid_77" ID="PLAYER_CUEID_77" Index="77"/>
     </Enum>
     <Enum Games="OoTMqDbg" Key="ocarinaSongActionId" ID="OcarinaSongActionId">
-        <!-- https://github.com/zeldaret/oot/blob/b3486b57ef41a284a366eb40ca07bf82bf4750d6/include/z64ocarina.h#L25-L76 -->
+        <!-- https://github.com/zeldaret/oot/blob/b3486b57ef41a284a366eb40ca07bf82bf4750d6/include/ocarina.h#L25-L76 -->
         <Item Key="unk_0" ID="OCARINA_ACTION_UNK_0" Index="0"/>
         <Item Key="free_play" ID="OCARINA_ACTION_FREE_PLAY" Index="1"/>
         <Item Key="teach_minuet" ID="OCARINA_ACTION_TEACH_MINUET" Index="2"/>