diff --git a/include/z64interface.h b/include/interface.h
similarity index 99%
rename from include/z64interface.h
rename to include/interface.h
index f7bb371092..2b2529b824 100644
--- a/include/z64interface.h
+++ b/include/interface.h
@@ -1,5 +1,5 @@
-#ifndef Z64INTERFACE_H
-#define Z64INTERFACE_H
+#ifndef INTERFACE_H
+#define INTERFACE_H
 
 #include "ultra64.h"
 #include "dma.h"
diff --git a/include/z64inventory.h b/include/inventory.h
similarity index 90%
rename from include/z64inventory.h
rename to include/inventory.h
index 8c1a5a90d8..3ad5c1bbbd 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
similarity index 99%
rename from include/z64item.h
rename to include/item.h
index 60344f326c..f5d4a530af 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/message_data_fmt.h b/include/message_data_fmt.h
index ac798d9346..16bc487e50 100644
--- a/include/message_data_fmt.h
+++ b/include/message_data_fmt.h
@@ -2,7 +2,7 @@
 #define MESSAGE_DATA_FMT_H
 
 #include "z64save.h" // For highscores
-#include "z64item.h" // For item ids
+#include "item.h" // For item ids
 #include "sfx.h" // For sfx ids
 
 /*
diff --git a/include/z64play.h b/include/z64play.h
index edbef69d54..fe9c86032d 100644
--- a/include/z64play.h
+++ b/include/z64play.h
@@ -13,7 +13,7 @@
 #include "frame_advance.h"
 #include "game.h"
 #include "game_over.h"
-#include "z64interface.h"
+#include "interface.h"
 #include "z64light.h"
 #include "z64message.h"
 #include "z64object.h"
diff --git a/include/z64save.h b/include/z64save.h
index 71b1414052..9150787db6 100644
--- a/include/z64save.h
+++ b/include/z64save.h
@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 #include "versions.h"
-#include "z64inventory.h"
+#include "inventory.h"
 #include "z64math.h"
 
 typedef enum ZTargetSetting {
diff --git a/src/code/z_construct.c b/src/code/z_construct.c
index aa92850b37..fe6b8ba467 100644
--- a/src/code/z_construct.c
+++ b/src/code/z_construct.c
@@ -5,7 +5,7 @@
 #include "translation.h"
 #include "versions.h"
 #include "z64lifemeter.h"
-#include "z64interface.h"
+#include "interface.h"
 #include "z64ocarina.h"
 #include "z64play.h"
 #include "z64save.h"
diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c
index ebca801905..2cd72f8f38 100644
--- a/src/code/z_en_item00.c
+++ b/src/code/z_en_item00.c
@@ -14,7 +14,7 @@
 #include "z_lib.h"
 #include "draw.h"
 #include "effect.h"
-#include "z64item.h"
+#include "item.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
diff --git a/src/code/z_sram.c b/src/code/z_sram.c
index b1ac3c6981..98988a6c76 100644
--- a/src/code/z_sram.c
+++ b/src/code/z_sram.c
@@ -10,7 +10,7 @@
 #include "versions.h"
 #include "audio.h"
 #include "game.h"
-#include "z64interface.h"
+#include "interface.h"
 #include "z64message.h"
 #include "z64ocarina.h"
 #include "z64save.h"
diff --git a/src/overlays/actors/ovl_En_Fish/z_en_fish.c b/src/overlays/actors/ovl_En_Fish/z_en_fish.c
index 9de3dbe4f8..20af3034f8 100644
--- a/src/overlays/actors/ovl_En_Fish/z_en_fish.c
+++ b/src/overlays/actors/ovl_En_Fish/z_en_fish.c
@@ -14,7 +14,7 @@
 #include "sfx.h"
 #include "terminal.h"
 #include "z_lib.h"
-#include "z64item.h"
+#include "item.h"
 #include "z64play.h"
 #include "z64player.h"
 
diff --git a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c
index 5e0783bc30..25bf8e9de3 100644
--- a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c
+++ b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c
@@ -13,7 +13,7 @@
 #include "sys_matrix.h"
 #include "versions.h"
 #include "z_lib.h"
-#include "z64item.h"
+#include "item.h"
 #include "z64play.h"
 #include "z64player.h"
 
diff --git a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c
index 8db6b38d0f..2408761ef0 100644
--- a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c
+++ b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c
@@ -14,7 +14,7 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64item.h"
+#include "item.h"
 #include "z64light.h"
 #include "z64play.h"
 #include "z64player.h"
diff --git a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c
index 9523394ac4..21ff7930b7 100644
--- a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c
+++ b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c
@@ -23,7 +23,7 @@
 #include "z_en_item00.h"
 #include "z_lib.h"
 #include "effect.h"
-#include "z64item.h"
+#include "item.h"
 #include "z64play.h"
 
 #include "assets/objects/gameplay_field_keep/gameplay_field_keep.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 3b8227e08c..78aa7ade36 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
@@ -10,7 +10,7 @@
 #include "regs.h"
 #include "terminal.h"
 #include "debug_display.h"
-#include "z64item.h"
+#include "item.h"
 #include "z64play.h"
 #include "z64player.h"
 
diff --git a/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c b/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c
index a690bfa73f..a7d2170da4 100644
--- a/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c
+++ b/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c
@@ -11,7 +11,7 @@
 #include "ichain.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64item.h"
+#include "item.h"
 #include "z64play.h"
 
 #include "assets/objects/object_gi_hearts/object_gi_hearts.h"
diff --git a/src/overlays/actors/ovl_Item_Shield/z_item_shield.c b/src/overlays/actors/ovl_Item_Shield/z_item_shield.c
index 09814def6a..e84486eed7 100644
--- a/src/overlays/actors/ovl_Item_Shield/z_item_shield.c
+++ b/src/overlays/actors/ovl_Item_Shield/z_item_shield.c
@@ -16,7 +16,7 @@
 #include "terminal.h"
 #include "z_lib.h"
 #include "effect.h"
-#include "z64item.h"
+#include "item.h"
 #include "z64play.h"
 #include "z64player.h"
 
diff --git a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c
index 3d9e359963..cede882789 100644
--- a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c
+++ b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c
@@ -14,7 +14,7 @@
 #include "z_en_item00.h"
 #include "z_lib.h"
 #include "effect.h"
-#include "z64item.h"
+#include "item.h"
 #include "z64play.h"
 #include "z64player.h"
 
diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h
index 5a99234432..efead4c6ea 100644
--- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h
+++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h
@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 #include "gfx.h"
-#include "z64inventory.h"
+#include "inventory.h"
 #include "z64pause.h"
 
 struct PlayState;