diff --git a/include/variables.h b/include/variables.h
index 3b12d539e8..9738715967 100644
--- a/include/variables.h
+++ b/include/variables.h
@@ -9,13 +9,6 @@
 extern ActorOverlay gActorOverlayTable[ACTOR_ID_MAX];
 extern ActorId gMaxActorId;
 
-extern FlexSkeletonHeader* gPlayerSkeletons[PLAYER_FORM_MAX];
-extern PlayerModelIndices gPlayerModelTypes[];
-extern struct_80124618 D_801C03A0[];
-extern struct_80124618 D_801C0490[];
-extern Gfx gCullBackDList[];
-extern Gfx gCullFrontDList[];
-
 extern u32 gBitFlags[32];
 extern u16 gEquipMasks[];
 extern u16 gEquipNegMasks[];
@@ -32,12 +25,6 @@ extern s16 gItemPrices[];
 extern u16 gSceneIdsPerRegion[11][27];
 extern u8 gPlayerFormItemRestrictions[PLAYER_FORM_MAX][114];
 
-extern s16 gPlayerFormObjectIds[PLAYER_FORM_MAX];
-extern ObjectId gObjectTableSize;
-extern RomFile gObjectTable[OBJECT_ID_MAX];
-
-extern SceneTableEntry gSceneTable[SCENE_MAX];
-
 extern KaleidoMgrOverlay gKaleidoMgrOverlayTable[2];
 extern KaleidoMgrOverlay* gKaleidoMgrCurOvl;
 
diff --git a/include/z64object.h b/include/z64object.h
index d547d4a9e0..719da82afb 100644
--- a/include/z64object.h
+++ b/include/z64object.h
@@ -14,4 +14,7 @@ typedef enum ObjectId {
 #undef DEFINE_OBJECT_UNSET
 #undef DEFINE_OBJECT_SIZE_ZERO
 
+extern ObjectId gObjectTableSize;
+extern RomFile gObjectTable[OBJECT_ID_MAX];
+
 #endif
diff --git a/include/z64player.h b/include/z64player.h
index 1ba95c108b..a5c531ca86 100644
--- a/include/z64player.h
+++ b/include/z64player.h
@@ -1423,4 +1423,14 @@ s32 func_80128640(struct PlayState* play, Player* player, Gfx* dList);
 void Player_SetFeetPos(struct PlayState* play, Player* player, s32 limbIndex);
 void Player_PostLimbDrawGameplay(struct PlayState* play, s32 limbIndex, Gfx** dList1, Gfx** dList2, Vec3s* rot, Actor* actor);
 
+extern FlexSkeletonHeader* gPlayerSkeletons[PLAYER_FORM_MAX];
+extern PlayerModelIndices gPlayerModelTypes[];
+extern struct_80124618 D_801C03A0[];
+extern struct_80124618 D_801C0490[];
+extern Gfx gCullBackDList[];
+extern Gfx gCullFrontDList[];
+
+// object_table.c
+extern s16 gPlayerFormObjectIds[PLAYER_FORM_MAX];
+
 #endif
diff --git a/include/z64scene.h b/include/z64scene.h
index d89aacb64c..c5d3782560 100644
--- a/include/z64scene.h
+++ b/include/z64scene.h
@@ -975,4 +975,6 @@ s32 Entrance_GetSceneIdAbsolute(u16 entrance);
 s32 Entrance_GetSpawnNum(u16 entrance);
 s32 Entrance_GetTransitionFlags(u16 entrance);
 
+extern SceneTableEntry gSceneTable[SCENE_MAX];
+
 #endif