diff --git a/include/z64scene.h b/include/z64scene.h
index c64897338a..98691db6cd 100644
--- a/include/z64scene.h
+++ b/include/z64scene.h
@@ -309,13 +309,12 @@ typedef enum {
     /* 0x6E */ SCENE_ID_MAX
 } SceneID;
 
+#undef DEFINE_SCENE
+
 // this define exists to preserve shiftability for an unused scene that is
 // listed in the entrance table
 #define SCENE_UNUSED_6E SCENE_ID_MAX
 
-#undef DEFINE_SCENE
-
-
 // Entrance Index Enum
 #define DEFINE_ENTRANCE(enum, _1, _2, _3, _4, _5, _6) enum,
 
@@ -324,6 +323,8 @@ typedef enum {
     /* 0x614 */ ENTR_MAX
 } EntranceIndex;
 
+#undef DEFINE_ENTRANCE
+
 #define ENTR_LOAD_OPENING -1
 
 typedef enum {
@@ -336,8 +337,6 @@ typedef enum {
     /* 0x7FFF */ ENTR_RETURN_GROTTO // Grottos and normal Fairy Fountain
 } ReturnEntranceIndex;
 
-#undef DEFINE_ENTRANCE
-
 typedef enum {
     /*  0 */ SDC_DEFAULT,
     /*  1 */ SDC_SPOT00,