diff --git a/include/console_logo_state.h b/include/console_logo_state.h
index 09b7d66546..e82ee5547c 100644
--- a/include/console_logo_state.h
+++ b/include/console_logo_state.h
@@ -2,7 +2,7 @@
 #define CONSOLE_LOGO_STATE_H
 
 #include "ultra64.h"
-#include "z64game.h"
+#include "game.h"
 #include "z64sram.h"
 #include "z64view.h"
 
diff --git a/include/file_select_state.h b/include/file_select_state.h
index 522f5c16f7..7054bed82a 100644
--- a/include/file_select_state.h
+++ b/include/file_select_state.h
@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 #include "environment.h"
-#include "z64game.h"
+#include "game.h"
 #include "z64message.h"
 #include "z64skybox.h"
 #include "z64sram.h"
diff --git a/include/z64game.h b/include/game.h
similarity index 98%
rename from include/z64game.h
rename to include/game.h
index fe683777b7..836720b18f 100644
--- a/include/z64game.h
+++ b/include/game.h
@@ -1,5 +1,5 @@
-#ifndef Z64GAME_H
-#define Z64GAME_H
+#ifndef GAME_H
+#define GAME_H
 // This file is named "game" after game.c for now, this may change later with the system name
 
 #include "ultra64/ultratypes.h"
diff --git a/include/z64game_over.h b/include/game_over.h
similarity index 95%
rename from include/z64game_over.h
rename to include/game_over.h
index 03697c1f50..e91ad0413a 100644
--- a/include/z64game_over.h
+++ b/include/game_over.h
@@ -1,5 +1,5 @@
-#ifndef Z64GAME_OVER_H
-#define Z64GAME_OVER_H
+#ifndef GAME_OVER_H
+#define GAME_OVER_H
 
 #include "ultra64.h"
 
diff --git a/include/map_select_state.h b/include/map_select_state.h
index d2a6b43d19..701876dbcc 100644
--- a/include/map_select_state.h
+++ b/include/map_select_state.h
@@ -2,7 +2,7 @@
 #define MAP_SELECT_STATE_H
 
 #include "ultra64.h"
-#include "z64game.h"
+#include "game.h"
 #include "z64view.h"
 
 struct MapSelectState;
diff --git a/include/prenmi_state.h b/include/prenmi_state.h
index 3710425ca9..950eb94dea 100644
--- a/include/prenmi_state.h
+++ b/include/prenmi_state.h
@@ -2,7 +2,7 @@
 #define PRENMI_STATE_H
 
 #include "ultra64.h"
-#include "z64game.h"
+#include "game.h"
 
 typedef struct PreNMIState {
     /* 0x00 */ GameState state;
diff --git a/include/sample_state.h b/include/sample_state.h
index b568a83f95..d8e72bf3ea 100644
--- a/include/sample_state.h
+++ b/include/sample_state.h
@@ -2,7 +2,7 @@
 #define SAMPLE_STATE_H
 
 #include "ultra64.h"
-#include "z64game.h"
+#include "game.h"
 #include "z64view.h"
 
 typedef struct SampleState {
diff --git a/include/setup_state.h b/include/setup_state.h
index 863b71401e..2ec4c1000b 100644
--- a/include/setup_state.h
+++ b/include/setup_state.h
@@ -1,7 +1,7 @@
 #ifndef SETUP_STATE_H
 #define SETUP_STATE_H
 
-#include "z64game.h"
+#include "game.h"
 
 typedef struct SetupState {
     /* 0x00 */ GameState state;
diff --git a/include/title_setup_state.h b/include/title_setup_state.h
index 30219872a8..731b0742c8 100644
--- a/include/title_setup_state.h
+++ b/include/title_setup_state.h
@@ -1,7 +1,7 @@
 #ifndef TITLE_SETUP_STATE_H
 #define TITLE_SETUP_STATE_H
 
-#include "z64game.h"
+#include "game.h"
 #include "z64view.h"
 
 typedef struct TitleSetupState {
diff --git a/include/z64play.h b/include/z64play.h
index 4170a51b41..edbef69d54 100644
--- a/include/z64play.h
+++ b/include/z64play.h
@@ -11,8 +11,8 @@
 #include "cutscene.h"
 #include "environment.h"
 #include "frame_advance.h"
-#include "z64game.h"
-#include "z64game_over.h"
+#include "game.h"
+#include "game_over.h"
 #include "z64interface.h"
 #include "z64light.h"
 #include "z64message.h"
diff --git a/src/code/game.c b/src/code/game.c
index c1b3fc08a2..5a79ab58c2 100644
--- a/src/code/game.c
+++ b/src/code/game.c
@@ -28,7 +28,7 @@
 #include "zelda_arena.h"
 #include "debug.h"
 #include "dma.h"
-#include "z64game.h"
+#include "game.h"
 #include "z64play.h"
 #include "z64vis.h"
 
diff --git a/src/code/speed_meter.c b/src/code/speed_meter.c
index bb3624fa86..6d0b746b20 100644
--- a/src/code/speed_meter.c
+++ b/src/code/speed_meter.c
@@ -9,7 +9,7 @@
 #include "speed_meter.h"
 #include "terminal.h"
 #include "zelda_arena.h"
-#include "z64game.h"
+#include "game.h"
 #include "z64view.h"
 
 /**
diff --git a/src/code/sys_matrix.c b/src/code/sys_matrix.c
index 2ca4882601..bcb543a471 100644
--- a/src/code/sys_matrix.c
+++ b/src/code/sys_matrix.c
@@ -7,7 +7,7 @@
 #include "sys_matrix.h"
 #include "ultra64.h"
 #include "z_lib.h"
-#include "z64game.h"
+#include "game.h"
 #include "z64skin_matrix.h"
 
 // clang-format off
diff --git a/src/code/z_game_over.c b/src/code/z_game_over.c
index f73616116d..107123195e 100644
--- a/src/code/z_game_over.c
+++ b/src/code/z_game_over.c
@@ -4,7 +4,7 @@
 #include "rumble.h"
 #include "sequence.h"
 #include "versions.h"
-#include "z64game_over.h"
+#include "game_over.h"
 #include "z64play.h"
 #include "z64save.h"
 
diff --git a/src/code/z_sram.c b/src/code/z_sram.c
index 7565bb9942..b1ac3c6981 100644
--- a/src/code/z_sram.c
+++ b/src/code/z_sram.c
@@ -9,7 +9,7 @@
 #include "translation.h"
 #include "versions.h"
 #include "audio.h"
-#include "z64game.h"
+#include "game.h"
 #include "z64interface.h"
 #include "z64message.h"
 #include "z64ocarina.h"
diff --git a/src/code/z_vr_box.c b/src/code/z_vr_box.c
index 26d05efc5c..5c452a9918 100644
--- a/src/code/z_vr_box.c
+++ b/src/code/z_vr_box.c
@@ -6,7 +6,7 @@
 #include "terminal.h"
 #include "ultra64.h"
 #include "environment.h"
-#include "z64game.h"
+#include "game.h"
 #include "z64play.h"
 #include "z64save.h"
 
diff --git a/src/overlays/gamestates/ovl_file_choose/file_select.h b/src/overlays/gamestates/ovl_file_choose/file_select.h
index ae41c4dced..aaa3281a1f 100644
--- a/src/overlays/gamestates/ovl_file_choose/file_select.h
+++ b/src/overlays/gamestates/ovl_file_choose/file_select.h
@@ -5,7 +5,7 @@
 #include "ultra64.h"
 #include "gfx.h"
 #include "versions.h"
-#include "z64game.h"
+#include "game.h"
 
 
 #define GET_NEWF(sramCtx, slotNum, index) (sramCtx->readBuff[gSramSlotOffsets[slotNum] + offsetof(SaveContext, save.info.playerData.newf[index])])
diff --git a/src/overlays/gamestates/ovl_opening/z_opening.c b/src/overlays/gamestates/ovl_opening/z_opening.c
index ad36b6e205..c644033351 100644
--- a/src/overlays/gamestates/ovl_opening/z_opening.c
+++ b/src/overlays/gamestates/ovl_opening/z_opening.c
@@ -8,7 +8,7 @@
 #include "regs.h"
 #include "sys_matrix.h"
 #include "title_setup_state.h"
-#include "z64game.h"
+#include "game.h"
 #include "z64play.h"
 #include "z64save.h"
 #include "z64sram.h"