diff --git a/include/play_state.h b/include/play_state.h
index 40f72e2963..61f411e636 100644
--- a/include/play_state.h
+++ b/include/play_state.h
@@ -18,7 +18,7 @@
 #include "message.h"
 #include "object.h"
 #include "pause.h"
-#include "z64room.h"
+#include "room.h"
 #include "z64scene.h"
 #include "z64sfx_source.h"
 #include "z64skybox.h"
diff --git a/include/z64room.h b/include/room.h
similarity index 99%
rename from include/z64room.h
rename to include/room.h
index f026c17c73..836b94b31e 100644
--- a/include/z64room.h
+++ b/include/room.h
@@ -1,5 +1,5 @@
-#ifndef Z64ROOM_H
-#define Z64ROOM_H
+#ifndef ROOM_H
+#define ROOM_H
 
 #include "ultra64.h"
 #include "dma.h"
diff --git a/src/code/z_room.c b/src/code/z_room.c
index f92c497e99..6f8fd535ca 100644
--- a/src/code/z_room.c
+++ b/src/code/z_room.c
@@ -22,7 +22,7 @@
 #include "audio.h"
 #include "play_state.h"
 #include "player.h"
-#include "z64room.h"
+#include "room.h"
 #include "z64save.h"
 #include "z64skin_matrix.h"