diff --git a/include/dungeon_engine.h b/include/dungeon_engine.h
index 50b8f181d..7c0ef6036 100644
--- a/include/dungeon_engine.h
+++ b/include/dungeon_engine.h
@@ -1,7 +1,9 @@
 #ifndef GUARD_DUNGEON_ENGINE_H
 #define GUARD_DUNGEON_ENGINE_H
 
+#include "structs/str_position.h"
 #include "structs/dungeon_entity.h"
+#include "structs/menu.h"
 
 extern const s16 gSpeedTurns[NUM_SPEED_COUNTERS][25];
 
@@ -10,4 +12,7 @@ void sub_80444F4(Entity *pokemon);
 bool8 IsFloorOver(void);
 bool8 sub_8044B84(void);
 
+extern DungeonPos gUnknown_202EE0C;
+extern MenuInputStruct gDungeonMenu;
+
 #endif
diff --git a/src/code_8069E0C.c b/src/code_8069E0C.c
index 75552de8b..5c57a9ee2 100644
--- a/src/code_8069E0C.c
+++ b/src/code_8069E0C.c
@@ -35,6 +35,7 @@
 #include "dungeon_spawns.h"
 #include "dungeon_pos_data.h"
 #include "dungeon_tilemap.h"
+#include "dungeon_engine.h"
 
 extern void sub_8042900(Entity *r0);
 extern void sub_8042968(Entity *r0);
@@ -45,14 +46,12 @@ extern void sub_8042B20(Entity *entity);
 extern void sub_8042B0C(Entity *entity);
 extern void sub_8072AC8(u16 *param_1, s32 species, s32 param_3);
 extern Entity *gLeaderPointer;
-extern DungeonPos gUnknown_202EE0C;
 extern bool8 sub_80860A8(u8 id);
 extern u8 gUnknown_202F32C;
 extern u8 GetRandomFloorItem(s32 a0);
 extern void sub_80429E8(Entity *r0);
 extern Entity *sub_804550C(s16 a);
 extern Entity *sub_80453AC(s16 id);
-extern void UpdateMinimap(void);
 extern void sub_806B678(void);
 extern void EntityUpdateStatusSprites(Entity *);
 extern Entity *sub_80696A8(Entity *a0);
diff --git a/src/code_80848F0.c b/src/code_80848F0.c
index 8084e4d82..a69577897 100644
--- a/src/code_80848F0.c
+++ b/src/code_80848F0.c
@@ -37,6 +37,7 @@
 #include "dungeon_pos_data.h"
 #include "dungeon_engine.h"
 #include "dungeon_tilemap.h"
+#include "dungeon_map.h"
 
 struct RgbS16
 {
@@ -51,7 +52,6 @@ extern RGB gUnknown_202ECA4[];
 extern const u8 gUnknown_8107358[25];
 
 extern bool8 sub_8004C00(unkStruct_202EE8C *a0, s32 a1, s32 a2, s32 brightness, const RGB *ramp, struct RgbS16 *a5);
-extern void UpdateMinimap(void);
 extern void sub_803F878(s32, s32);
 extern void sub_8085F44(s32);
 extern bool8 sub_800E90C(DungeonPos *);
diff --git a/src/dungeon_8067A80.c b/src/dungeon_8067A80.c
index d9b34f90a..3bb810de1 100644
--- a/src/dungeon_8067A80.c
+++ b/src/dungeon_8067A80.c
@@ -36,6 +36,7 @@
 #include "text_1.h"
 #include "trap.h"
 #include "dungeon_submenu.h"
+#include "dungeon_engine.h"
 
 extern void sub_80684C4(void);
 extern void sub_8068344(void);
@@ -43,7 +44,6 @@ void sub_8068310(s32 n, Pokemon **monPtrs);
 void sub_8067F00(u8 a0, Pokemon **a1, s32 a2, s32 a3, s32 a4);
 void sub_806806C(Pokemon *a0);
 
-extern MenuInputStruct gDungeonMenu;
 
 static EWRAM_DATA WindowHeader gUnknown_202F308 = {0};
 static EWRAM_DATA s32 gUnknown_202F30C = 0;
diff --git a/src/dungeon_cutscene_articuno.c b/src/dungeon_cutscene_articuno.c
index e15b07520..602071140 100644
--- a/src/dungeon_cutscene_articuno.c
+++ b/src/dungeon_cutscene_articuno.c
@@ -39,7 +39,6 @@ extern void sub_806FDF4(Entity *, Entity *, Entity **);
 extern void sub_8085EB0(void);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void UpdateMinimap(void);
 extern void sub_8086A54(Entity *);
 extern void ResetMonEntityData(EntityInfo *, u32);
 extern void sub_8041888(u32);
diff --git a/src/dungeon_cutscene_celebi.c b/src/dungeon_cutscene_celebi.c
index 8ca2cb50b..28d822e34 100644
--- a/src/dungeon_cutscene_celebi.c
+++ b/src/dungeon_cutscene_celebi.c
@@ -40,7 +40,6 @@ extern void sub_806FDF4(Entity *, Entity *, Entity **);
 extern void sub_8085EB0(void);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void UpdateMinimap(void);
 extern void sub_8086A54(Entity *);
 extern void ResetMonEntityData(EntityInfo *, u32);
 extern void sub_8041888(u32);
diff --git a/src/dungeon_cutscene_deoxys.c b/src/dungeon_cutscene_deoxys.c
index 219445b62..3356e6a6c 100644
--- a/src/dungeon_cutscene_deoxys.c
+++ b/src/dungeon_cutscene_deoxys.c
@@ -39,7 +39,6 @@ extern void sub_806FDF4(Entity *, Entity *, Entity **);
 extern void sub_8085EB0(void);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void UpdateMinimap(void);
 extern void sub_8086A54(Entity *);
 extern void ResetMonEntityData(EntityInfo *, u32);
 extern void sub_8041888(u32);
diff --git a/src/dungeon_cutscene_entei.c b/src/dungeon_cutscene_entei.c
index b84d47776..1e508a562 100644
--- a/src/dungeon_cutscene_entei.c
+++ b/src/dungeon_cutscene_entei.c
@@ -38,7 +38,6 @@ extern void sub_806FDF4(Entity *, Entity *, Entity **);
 extern void sub_8085EB0(void);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void UpdateMinimap(void);
 extern void sub_8086A54(Entity *);
 extern void ResetMonEntityData(EntityInfo *, u32);
 extern void sub_8041888(u32);
diff --git a/src/dungeon_cutscene_groudon.c b/src/dungeon_cutscene_groudon.c
index 95d9813b7..6549f6312 100644
--- a/src/dungeon_cutscene_groudon.c
+++ b/src/dungeon_cutscene_groudon.c
@@ -39,7 +39,6 @@ extern void sub_806FDF4(Entity *, Entity *, Entity **);
 extern void sub_8085EB0(void);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void UpdateMinimap(void);
 extern void sub_8086A54(Entity *);
 extern void ResetMonEntityData(EntityInfo *, u32);
 extern void sub_8041888(u32);
diff --git a/src/dungeon_cutscene_hooh.c b/src/dungeon_cutscene_hooh.c
index 40fc9be96..c70a49552 100644
--- a/src/dungeon_cutscene_hooh.c
+++ b/src/dungeon_cutscene_hooh.c
@@ -38,7 +38,6 @@ extern void sub_806FDF4(Entity *, Entity *, Entity **);
 extern void sub_8085EB0(void);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void UpdateMinimap(void);
 extern void sub_8086A54(Entity *);
 extern void ResetMonEntityData(EntityInfo *, u32);
 extern void sub_8041888(u32);
diff --git a/src/dungeon_cutscene_jirachi.c b/src/dungeon_cutscene_jirachi.c
index 02f16b8f5..8a69986d7 100644
--- a/src/dungeon_cutscene_jirachi.c
+++ b/src/dungeon_cutscene_jirachi.c
@@ -32,7 +32,7 @@
 #include "dungeon_config.h"
 #include "dungeon_boss_dialogue.h"
 #include "dungeon_spawns.h"
-
+#include "dungeon_map.h"
 
 extern void sub_8042B0C(Entity *);
 extern u8 sub_806FD18(Entity *);
@@ -40,7 +40,6 @@ extern void sub_806FDF4(Entity *, Entity *, Entity **);
 extern void sub_8085EB0(void);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void UpdateMinimap(void);
 extern void sub_8086A54(Entity *);
 extern void ResetMonEntityData(EntityInfo *, u32);
 extern void sub_8041888(u32);
diff --git a/src/dungeon_cutscene_kyogre.c b/src/dungeon_cutscene_kyogre.c
index b76ed58a2..f9c90478c 100644
--- a/src/dungeon_cutscene_kyogre.c
+++ b/src/dungeon_cutscene_kyogre.c
@@ -32,7 +32,7 @@
 #include "dungeon_config.h"
 #include "dungeon_boss_dialogue.h"
 #include "dungeon_tilemap.h"
-
+#include "dungeon_map.h"
 
 extern void sub_8042B0C(Entity *);
 extern u8 sub_806FD18(Entity *);
@@ -40,7 +40,6 @@ extern void sub_806FDF4(Entity *, Entity *, Entity **);
 extern void sub_8085EB0(void);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void UpdateMinimap(void);
 extern void sub_8086A54(Entity *);
 extern void ResetMonEntityData(EntityInfo *, u32);
 extern void sub_8041888(u32);
diff --git a/src/dungeon_cutscene_latios.c b/src/dungeon_cutscene_latios.c
index 7b641c81b..b0352ff3f 100644
--- a/src/dungeon_cutscene_latios.c
+++ b/src/dungeon_cutscene_latios.c
@@ -39,7 +39,6 @@ extern void sub_806FDF4(Entity *, Entity *, Entity **);
 extern void sub_8085EB0(void);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void UpdateMinimap(void);
 extern void sub_8086A54(Entity *);
 extern void ResetMonEntityData(EntityInfo *, u32);
 extern void sub_8041888(u32);
diff --git a/src/dungeon_cutscene_lugia.c b/src/dungeon_cutscene_lugia.c
index ba1d79fa4..83692dda8 100644
--- a/src/dungeon_cutscene_lugia.c
+++ b/src/dungeon_cutscene_lugia.c
@@ -39,7 +39,6 @@ extern void sub_806FDF4(Entity *, Entity *, Entity **);
 extern void sub_8085EB0(void);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void UpdateMinimap(void);
 extern void sub_8086A54(Entity *);
 extern void ResetMonEntityData(EntityInfo *, u32);
 extern void sub_8041888(u32);
diff --git a/src/dungeon_cutscene_magma_cavern.c b/src/dungeon_cutscene_magma_cavern.c
index d0603af01..070f6d6e8 100644
--- a/src/dungeon_cutscene_magma_cavern.c
+++ b/src/dungeon_cutscene_magma_cavern.c
@@ -38,7 +38,6 @@ extern void sub_806FDF4(Entity *, Entity *, Entity **);
 extern void sub_8085EB0(void);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void UpdateMinimap(void);
 extern void sub_8086A54(Entity *);
 extern void ResetMonEntityData(EntityInfo *, u32);
 extern void sub_8041888(u32);
diff --git a/src/dungeon_cutscene_mankey.c b/src/dungeon_cutscene_mankey.c
index 89b6d9432..1e233bd25 100644
--- a/src/dungeon_cutscene_mankey.c
+++ b/src/dungeon_cutscene_mankey.c
@@ -38,7 +38,6 @@ extern void sub_806FDF4(Entity *, Entity *, Entity **);
 extern void sub_8085EB0(void);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void UpdateMinimap(void);
 extern void sub_8086A54(Entity *);
 extern void ResetMonEntityData(EntityInfo *, u32);
 extern void sub_8041888(u32);
diff --git a/src/dungeon_cutscene_meanies.c b/src/dungeon_cutscene_meanies.c
index 4a37a5ebd..bb59fcb2e 100644
--- a/src/dungeon_cutscene_meanies.c
+++ b/src/dungeon_cutscene_meanies.c
@@ -38,7 +38,6 @@ extern void sub_806FDF4(Entity *, Entity *, Entity **);
 extern void sub_8085EB0(void);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void UpdateMinimap(void);
 extern void sub_8086A54(Entity *);
 extern void ResetMonEntityData(EntityInfo *, u32);
 extern void sub_8041888(u32);
diff --git a/src/dungeon_cutscene_medicham.c b/src/dungeon_cutscene_medicham.c
index 59b38b553..7d8929b77 100644
--- a/src/dungeon_cutscene_medicham.c
+++ b/src/dungeon_cutscene_medicham.c
@@ -38,7 +38,6 @@ extern void sub_806FDF4(Entity *, Entity *, Entity **);
 extern void sub_8085EB0(void);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void UpdateMinimap(void);
 extern void sub_8086A54(Entity *);
 extern void ResetMonEntityData(EntityInfo *, u32);
 extern void sub_8041888(u32);
diff --git a/src/dungeon_cutscene_mewtwo.c b/src/dungeon_cutscene_mewtwo.c
index cc8cd8130..ff1a6a83c 100644
--- a/src/dungeon_cutscene_mewtwo.c
+++ b/src/dungeon_cutscene_mewtwo.c
@@ -38,7 +38,6 @@ extern void sub_806FDF4(Entity *, Entity *, Entity **);
 extern void sub_8085EB0(void);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void UpdateMinimap(void);
 extern void sub_8086A54(Entity *);
 extern void ResetMonEntityData(EntityInfo *, u32);
 extern void sub_8041888(u32);
diff --git a/src/dungeon_cutscene_moltres.c b/src/dungeon_cutscene_moltres.c
index 1833db773..0e815d400 100644
--- a/src/dungeon_cutscene_moltres.c
+++ b/src/dungeon_cutscene_moltres.c
@@ -39,7 +39,6 @@ extern void sub_806FDF4(Entity *, Entity *, Entity **);
 extern void sub_8085EB0(void);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void UpdateMinimap(void);
 extern void sub_8086A54(Entity *);
 extern void ResetMonEntityData(EntityInfo *, u32);
 extern void sub_8041888(u32);
diff --git a/src/dungeon_cutscene_raikou.c b/src/dungeon_cutscene_raikou.c
index 7df79ba1d..e1fa8d33f 100644
--- a/src/dungeon_cutscene_raikou.c
+++ b/src/dungeon_cutscene_raikou.c
@@ -39,7 +39,6 @@ extern void sub_806FDF4(Entity *, Entity *, Entity **);
 extern void sub_8085EB0(void);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void UpdateMinimap(void);
 extern void sub_8086A54(Entity *);
 extern void ResetMonEntityData(EntityInfo *, u32);
 extern void sub_8041888(u32);
diff --git a/src/dungeon_cutscene_rayquaza.c b/src/dungeon_cutscene_rayquaza.c
index e3738b132..d3f93c38f 100644
--- a/src/dungeon_cutscene_rayquaza.c
+++ b/src/dungeon_cutscene_rayquaza.c
@@ -38,7 +38,6 @@ extern void sub_806FDF4(Entity *, Entity *, Entity **);
 extern void sub_8085EB0(void);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void UpdateMinimap(void);
 extern void sub_8086A54(Entity *);
 extern void ResetMonEntityData(EntityInfo *, u32);
 extern void sub_8041888(u32);
diff --git a/src/dungeon_cutscene_regis.c b/src/dungeon_cutscene_regis.c
index 9a6739b07..ff5c61223 100644
--- a/src/dungeon_cutscene_regis.c
+++ b/src/dungeon_cutscene_regis.c
@@ -31,6 +31,7 @@
 #include "math.h"
 #include "dungeon_config.h"
 #include "dungeon_boss_dialogue.h"
+#include "dungeon_map.h"
 
 extern void sub_8042B0C(Entity *);
 extern u8 sub_806FD18(Entity *);
@@ -38,14 +39,12 @@ extern void sub_806FDF4(Entity *, Entity *, Entity **);
 extern void sub_8085EB0(void);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void UpdateMinimap(void);
 extern void sub_8086A54(Entity *);
 extern void ResetMonEntityData(EntityInfo *, u32);
 extern void sub_8041888(u32);
 extern u32 sub_80861F8(u32, Entity *, u32);
 extern u8 sub_80860A8(u32);
 extern void sub_8052D44(s16 *, Entity *, Entity *);
-extern void SpawnDroppedItemWrapper(Entity *, DungeonPos *, Item *);
 extern void SetDungeonBGColorRGB(u32, u32, u32, u32, u32);
 extern u32 sub_8085EC8(u32, u32, u32, DungeonPos *, u32);
 extern void sub_8072008(Entity *, Entity *, s16, u32, u32);
diff --git a/src/dungeon_cutscene_skarmory.c b/src/dungeon_cutscene_skarmory.c
index 6db25e49a..97eb50420 100644
--- a/src/dungeon_cutscene_skarmory.c
+++ b/src/dungeon_cutscene_skarmory.c
@@ -38,7 +38,6 @@ extern void sub_806FDF4(Entity *, Entity *, Entity **);
 extern void sub_8085EB0(void);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void UpdateMinimap(void);
 extern void sub_8086A54(Entity *);
 extern void ResetMonEntityData(EntityInfo *, u32);
 extern void sub_8041888(u32);
diff --git a/src/dungeon_cutscene_smeargle.c b/src/dungeon_cutscene_smeargle.c
index f6b8be1e6..7238c4f9f 100644
--- a/src/dungeon_cutscene_smeargle.c
+++ b/src/dungeon_cutscene_smeargle.c
@@ -38,7 +38,6 @@ extern void sub_806FDF4(Entity *, Entity *, Entity **);
 extern void sub_8085EB0(void);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void UpdateMinimap(void);
 extern void sub_8086A54(Entity *);
 extern void ResetMonEntityData(EntityInfo *, u32);
 extern void sub_8041888(u32);
diff --git a/src/dungeon_cutscene_suicune.c b/src/dungeon_cutscene_suicune.c
index b963593fd..087df8308 100644
--- a/src/dungeon_cutscene_suicune.c
+++ b/src/dungeon_cutscene_suicune.c
@@ -38,7 +38,6 @@ extern void sub_806FDF4(Entity *, Entity *, Entity **);
 extern void sub_8085EB0(void);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void UpdateMinimap(void);
 extern void sub_8086A54(Entity *);
 extern void ResetMonEntityData(EntityInfo *, u32);
 extern void sub_8041888(u32);
diff --git a/src/dungeon_cutscene_zapdos.c b/src/dungeon_cutscene_zapdos.c
index 0c9b8e9c7..24601bb59 100644
--- a/src/dungeon_cutscene_zapdos.c
+++ b/src/dungeon_cutscene_zapdos.c
@@ -38,7 +38,6 @@ extern void sub_806FDF4(Entity *, Entity *, Entity **);
 extern void sub_8085EB0(void);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void UpdateMinimap(void);
 extern void sub_8086A54(Entity *);
 extern void ResetMonEntityData(EntityInfo *, u32);
 extern void sub_8041888(u32);
diff --git a/src/dungeon_main.c b/src/dungeon_main.c
index d23dd176c..1e14b6451 100644
--- a/src/dungeon_main.c
+++ b/src/dungeon_main.c
@@ -120,7 +120,6 @@ extern const u8 *const gUnknown_80F91E0;
 extern const u8 *const gUnknown_80F91A8;
 extern const u8 *const gUnknown_80FE954;
 
-extern MenuInputStruct gDungeonMenu;
 extern s32 gTeamMenuChosenId;
 
 static EWRAM_DATA bool8 sInDiagonalMode = 0;
diff --git a/src/dungeon_menu_items.c b/src/dungeon_menu_items.c
index 97953d447..5df666cd2 100644
--- a/src/dungeon_menu_items.c
+++ b/src/dungeon_menu_items.c
@@ -27,6 +27,7 @@
 #include "text_1.h"
 #include "dungeon_action.h"
 #include "code_801B3C0.h"
+#include "dungeon_engine.h"
 
 extern bool8 sub_8070F14(Entity * pokemon, s32 direction);
 bool8 sub_805EC2C(Entity *a0, s32 x, s32 y);
@@ -40,7 +41,6 @@ extern bool8 PosHasItem(DungeonPos *pos);
 extern u8 gUnknown_202EE00;
 extern Entity *gLeaderPointer;
 
-extern MenuInputStruct gDungeonMenu;
 
 extern const u8 *gUnknown_80F8B24;
 extern const u8 *gTeamToolboxAPtr;
diff --git a/src/dungeon_menu_moves.c b/src/dungeon_menu_moves.c
index 1f8e1a954..5c4c6bf9e 100644
--- a/src/dungeon_menu_moves.c
+++ b/src/dungeon_menu_moves.c
@@ -17,6 +17,7 @@
 #include "dungeon_submenu.h"
 #include "dungeon_strings.h"
 #include "dungeon_util.h"
+#include "dungeon_engine.h"
 #include "input.h"
 #include "moves.h"
 #include "menu_input.h"
@@ -35,7 +36,6 @@ extern void ShowDungeonSummaryOrIQMenu(ActionContainer *a0, bool8 a1);
 extern void sub_8067768(ActionContainer *a0);
 extern bool8 sub_8071A8C(Entity *pokemon);
 
-extern MenuInputStruct gDungeonMenu;
 
 static void ShowMovesMenuWindows(Entity *entity, EntityInfo *entInfo, bool8 redColorForChargingMoves, WindowTemplates *windows, WindowHeader *header, u8 *arg5, s32 arg6, s32 arg7);
 static void AddMovesSubMenuOptions(Entity *entity, bool8 addLinkOptions, bool8 addUseMove);
diff --git a/src/dungeon_menu_others.c b/src/dungeon_menu_others.c
index d3dccd1f0..04a625944 100644
--- a/src/dungeon_menu_others.c
+++ b/src/dungeon_menu_others.c
@@ -19,6 +19,7 @@
 #include "dungeon_music.h"
 #include "dungeon_strings.h"
 #include "dungeon_submenu.h"
+#include "dungeon_engine.h"
 #include "dungeon_util.h"
 #include "game_options.h"
 #include "input.h"
@@ -32,7 +33,6 @@
 extern bool8 IsBossFight(void);
 extern u16 GetLeaderActionId(void);
 
-extern MenuInputStruct gDungeonMenu;
 
 static void PrintOthersMenuOptions(void);
 static void ShowGameOptionsMenu(void);
diff --git a/src/dungeon_menu_recruitment.c b/src/dungeon_menu_recruitment.c
index 3322361bc..e9ef0363c 100644
--- a/src/dungeon_menu_recruitment.c
+++ b/src/dungeon_menu_recruitment.c
@@ -18,13 +18,13 @@
 #include "text_1.h"
 #include "text_2.h"
 #include "text_3.h"
+#include "dungeon_engine.h"
 
 extern u16 GetLeaderActionId(void);
 extern u8 sub_806F9BC(s32);
 extern bool8 sub_80860A8(u8 id);
 extern bool8 sub_806A564(s32 r0);
 
-extern MenuInputStruct gDungeonMenu;
 
 struct MonRecruitList
 {
diff --git a/src/dungeon_menu_stairs.c b/src/dungeon_menu_stairs.c
index c9b12ac45..66ad6f5b9 100644
--- a/src/dungeon_menu_stairs.c
+++ b/src/dungeon_menu_stairs.c
@@ -15,15 +15,13 @@
 #include "dungeon_submenu.h"
 #include "dungeon_util.h"
 #include "dungeon_strings.h"
+#include "dungeon_engine.h"
+#include "run_dungeon.h"
 #include "input.h"
 #include "menu_input.h"
 #include "text_1.h"
 #include "text_3.h"
 
-extern u8 GetFloorType(void);
-
-extern MenuInputStruct gDungeonMenu;
-
 static void ShowAndPrintOnStairsMenu(DungeonPos *pos, WindowTemplates *windows, WindowHeader *header);
 static void AddStairsSubMenuOptions(Entity *mon);
 static void ShowStairsDescription(DungeonPos *pos);
diff --git a/src/dungeon_menu_team.c b/src/dungeon_menu_team.c
index 09375f152..43cac0831 100644
--- a/src/dungeon_menu_team.c
+++ b/src/dungeon_menu_team.c
@@ -31,6 +31,7 @@
 #include "dungeon_util.h"
 #include "dungeon_strings.h"
 #include "dungeon_info.h"
+#include "dungeon_engine.h"
 #include "input.h"
 #include "items.h"
 #include "menu_input.h"
@@ -93,7 +94,6 @@ extern void sub_8045C18(u8 *buffer, Item *item);
 
 extern u8 gUnknown_202EE00;
 extern Entity *gLeaderPointer;
-extern MenuInputStruct gDungeonMenu;
 extern u8 gUnknown_202EE39;
 
 EWRAM_DATA s32 gTeamMenuChosenId = 0;
diff --git a/src/dungeon_menu_tile.c b/src/dungeon_menu_tile.c
index ab1ad6683..11df04ffc 100644
--- a/src/dungeon_menu_tile.c
+++ b/src/dungeon_menu_tile.c
@@ -6,6 +6,7 @@
 #include "code_8097DD0.h"
 #include "dungeon_info.h"
 #include "dungeon_action.h"
+#include "dungeon_engine.h"
 #include "dungeon_map_access.h"
 #include "dungeon_menu_moves.h"
 #include "dungeon_menu_team.h"
@@ -20,8 +21,6 @@
 #include "text_3.h"
 #include "trap.h"
 
-extern MenuInputStruct gDungeonMenu;
-
 static void ShowAndPrintOnTileMenu(DungeonPos *pos, WindowTemplates *windows, WindowHeader *header);
 static void AddTileSubMenuOptions(Entity *mon);
 static void ShowTileDescription(DungeonPos *pos);
diff --git a/src/dungeon_message.c b/src/dungeon_message.c
index f570d16e9..17a498066 100644
--- a/src/dungeon_message.c
+++ b/src/dungeon_message.c
@@ -12,6 +12,7 @@
 #include "dungeon_info.h"
 #include "dungeon_range.h"
 #include "dungeon_map.h"
+#include "dungeon_main.h"
 #include "dungeon_music.h"
 #include "dungeon_util.h"
 #include "dungeon_util_1.h"
@@ -28,19 +29,14 @@
 #include "dungeon_strings.h"
 #include "dungeon_portrait_placement.h"
 
-void sub_80526D0(s32 r0);
-static bool8 sub_8052DC0(Entity *);
-static void DisplayMessageAddToLog(Entity *pokemon, const u8 *str, bool8 r2);
-
-extern void sub_805E804(void);
-
-extern u8 gUnknown_202EE01;
-
 static EWRAM_DATA Entity *sLastLogMsgEntity = NULL;
 static UNUSED EWRAM_DATA u8 sUnused = 0;
 static EWRAM_DATA SpriteOAM sUnknown_202F1F0 = {0};
 EWRAM_INIT u8 gUnknown_203B434 = 1;
 
+static bool8 sub_8052DC0(Entity *);
+static void DisplayMessageAddToLog(Entity *pokemon, const u8 *str, bool8 r2);
+
 void sub_80521D0(void)
 {
     s32 i;
@@ -125,8 +121,7 @@ void TryDisplayDungeonLoggableMessage4(Entity *attacker, Entity *target, const u
     }
 }
 
-void LogMessageByIdWithPopupCheckUserUnknown(Entity *pokemon, DungeonPos *pos,
-                                       const u8 *str)
+void LogMessageByIdWithPopupCheckUserUnknown(Entity *pokemon, DungeonPos *pos, const u8 *str)
 {
     u8 flag;
     flag = ShouldDisplayEntity(pokemon) ? TRUE : FALSE;
diff --git a/src/dungeon_message_log.c b/src/dungeon_message_log.c
index 78216f7fa..d0cc19949 100644
--- a/src/dungeon_message_log.c
+++ b/src/dungeon_message_log.c
@@ -16,19 +16,15 @@
 
 #define MESSAGE_LOG_ROW_COUNT 8 // How many log messages are shown
 
-extern void sub_805E804(void);
-extern u32 GetTouchScreenArrowPress(s32 a0, const void *a1);
-
+static EWRAM_DATA s32 sMessageLogCursor = 0;
+static EWRAM_DATA u8 sMessageLogFlags = 0;
+static EWRAM_DATA SpriteOAM sMessageLogArrowSpriteOAM = {0};
 
 static void PutStringsOnMessageLog(void);
 static bool8 TryScrollLogDown(s32 a0);
 static bool8 TryScrollLogUp(s32 a0);
 static void CreateMessageLogArrow(bool8 upArrow, s32 y);
 
-static EWRAM_DATA s32 sMessageLogCursor = 0;
-static EWRAM_DATA u8 sMessageLogFlags = 0;
-static EWRAM_DATA SpriteOAM sMessageLogArrowSpriteOAM = {0};
-
 void ResetMessageLog(void)
 {
     s32 i;
diff --git a/src/dungeon_misc.c b/src/dungeon_misc.c
index 17c819c75..a515167a5 100644
--- a/src/dungeon_misc.c
+++ b/src/dungeon_misc.c
@@ -46,6 +46,7 @@
 #include "dungeon_pos_data.h"
 #include "dungeon_data.h"
 #include "dungeon_tilemap.h"
+#include "dungeon_engine.h"
 
 static void EnsureCastformLoaded(void);
 static void EnsureDeoxysLoaded(void);
@@ -77,7 +78,6 @@ extern s32 sub_803DA20(s32 param_1);
 extern void sub_8042EC8(Entity *a0, s32 a1);
 extern Entity *sub_804550C(s16 a);
 extern Entity *sub_80453AC(s16 id);
-extern void UpdateMinimap(void);
 extern void sub_806B678(void);
 extern void EntityUpdateStatusSprites(Entity *);
 extern Entity *sub_80696A8(Entity *a0);
@@ -85,8 +85,6 @@ extern Entity *sub_80696A8(Entity *a0);
 extern Entity *gLeaderPointer;
 extern u8 gUnknown_202EE70[MAX_TEAM_BODY_SIZE];
 extern u8 gUnknown_202EE76[DUNGEON_MAX_WILD_POKEMON_BODY_SIZE];
-extern DungeonPos gPlayerDotMapPosition;
-extern DungeonPos gUnknown_202EE0C;
 extern u8 gUnknown_202F32C;
 
 bool8 sub_806A564(s16 r0);
diff --git a/src/dungeon_music.c b/src/dungeon_music.c
index 86438cd78..2f6e088f7 100644
--- a/src/dungeon_music.c
+++ b/src/dungeon_music.c
@@ -7,8 +7,7 @@
 #include "dungeon_info.h"
 #include "music.h"
 #include "run_dungeon.h"
-
-extern MenuInputStruct gDungeonMenu;
+#include "dungeon_engine.h"
 
 // Dungeon Music Player adds in this flag to tell
 // the system to fade in rather than immediately playing
diff --git a/src/dungeon_serializer.c b/src/dungeon_serializer.c
index a0676b37f..e7f731ff9 100644
--- a/src/dungeon_serializer.c
+++ b/src/dungeon_serializer.c
@@ -4,6 +4,7 @@
 #include "code_805D8C8.h"
 #include "code_806CD90.h"
 #include "dungeon_items.h"
+#include "dungeon_map.h"
 #include "dungeon_map_access.h"
 #include "dungeon_logic.h"
 #include "dungeon_serializer.h"
@@ -14,7 +15,6 @@
 extern u8 gUnknown_202EE70[MAX_TEAM_BODY_SIZE];
 extern u8 gUnknown_202EE76[DUNGEON_MAX_WILD_POKEMON_BODY_SIZE];
 
-extern DungeonPos gPlayerDotMapPosition;
 extern Entity *gLeaderPointer; // 203B450
 
 #include "data/dungeon_serializer.h"
diff --git a/src/dungeon_submenu.c b/src/dungeon_submenu.c
index ac52e2ffb..cda890277 100644
--- a/src/dungeon_submenu.c
+++ b/src/dungeon_submenu.c
@@ -4,13 +4,13 @@
 #include "dungeon_submenu.h"
 #include "dungeon_vram.h"
 #include "dungeon_action.h"
+#include "dungeon_engine.h"
 #include "menu_input.h"
 #include "text_1.h"
 #include "text_3.h"
 
 // The reason this short file(just 1 function) exists is because of the pksdir string which usually signifies the file's beginning.
 
-extern MenuInputStruct gDungeonMenu;
 
 void CreateDungeonMenuSubWindow(WindowTemplate *mainWindow, s32 subWindowX)
 {
diff --git a/src/dungeon_tilemap.c b/src/dungeon_tilemap.c
index 45cbd778d..64cb6f3b3 100644
--- a/src/dungeon_tilemap.c
+++ b/src/dungeon_tilemap.c
@@ -34,7 +34,6 @@
 #include "effect_main.h"
 
 
-extern void UpdateMinimap(void);
 extern void sub_8041888(u8 param_1);
 extern void UpdateMinimap();
 
diff --git a/src/dungeon_util.c b/src/dungeon_util.c
index 8cbbdfcfc..5e36f5762 100644
--- a/src/dungeon_util.c
+++ b/src/dungeon_util.c
@@ -20,6 +20,7 @@
 #include "dungeon_range.h"
 #include "dungeon_message.h"
 #include "dungeon_pokemon_sprites.h"
+#include "dungeon_misc.h"
 #include "dungeon_music.h"
 #include "dungeon_map.h"
 #include "string_format.h"
@@ -28,10 +29,6 @@
 #include "dungeon_data.h"
 #include "dungeon_strings.h"
 
-extern void sub_8045ACC(void);
-extern s32 GetMonsterApparentID(Entity *pokemon, s32 id);
-extern void sub_8045BF8(u8 *, Item *);
-
 EWRAM_DATA u8 gUnknown_202EE70[MAX_TEAM_BODY_SIZE] = {0};
 EWRAM_DATA u8 gUnknown_202EE76[DUNGEON_MAX_WILD_POKEMON_BODY_SIZE] = {0};
 
diff --git a/src/dungeon_vram.c b/src/dungeon_vram.c
index 1ab4dc6ba..7c4353ffe 100644
--- a/src/dungeon_vram.c
+++ b/src/dungeon_vram.c
@@ -29,6 +29,7 @@
 #include "menu_input.h"
 #include "code_801602C.h"
 #include "dungeon_tilemap.h"
+#include "dungeon_engine.h"
 
 // File split is correct. This technical file deals with windows, advancing frames(v-blanks) and vram / pal set-up.
 
@@ -42,7 +43,6 @@ extern struct DungeonPalFile *gDungeonPaletteFile;
 extern struct DungeonPalFile *gDungeonNameBannerPalette;
 extern struct DungeonPalFile *gUnknown_202EC94;
 extern RGB gUnknown_202ECA4[];
-extern MenuInputStruct gDungeonMenu;
 extern OpenedFile *gUnknown_202EC9C;
 
 void xxx_draw_string_80524F0(void);
diff --git a/src/move_orb_actions_4.c b/src/move_orb_actions_4.c
index 5e910ea8a..e45f758d0 100644
--- a/src/move_orb_actions_4.c
+++ b/src/move_orb_actions_4.c
@@ -37,6 +37,7 @@
 #include "dungeon_damage.h"
 #include "dungeon_tilemap.h"
 #include "dungeon_spawns.h"
+#include "dungeon_map.h"
 #include "warp_target.h"
 #include "expose_trap.h"
 #include "one_room_orb.h"
@@ -45,7 +46,6 @@
 #include "switcher_orb.h"
 #include "trawl_orb.h"
 
-extern void UpdateMinimap(void);
 extern void sub_806BB6C(Entity *, s32);
 
 extern u32 gUnknown_8106A50;
diff --git a/src/move_orb_effects_2.c b/src/move_orb_effects_2.c
index dd2072150..999f2193d 100644
--- a/src/move_orb_effects_2.c
+++ b/src/move_orb_effects_2.c
@@ -87,7 +87,6 @@ extern void nullsub_87(Entity *);
 extern void nullsub_86(Entity *);
 extern void sub_8041E0C(Entity *);
 extern void sub_8041DD8(Entity *r0, s32 r1); // NOTE: is s16 in another file
-extern void UpdateMinimap(void);
 extern void sub_8041D9C(Entity *);
 extern void sub_8041DB0(Entity *pokemon);
 extern void sub_8041CA8(Entity *);
diff --git a/src/run_dungeon.c b/src/run_dungeon.c
index 2a4de7d21..0e3fbb1c7 100644
--- a/src/run_dungeon.c
+++ b/src/run_dungeon.c
@@ -74,7 +74,6 @@ extern void IncrementAdventureFloorsExplored(void);
 extern void sub_806AB2C(void);
 extern void DisplayPreFightDialogue(void);
 extern void EnemyEvolution(Entity *);
-extern void UpdateMinimap(void);
 extern void sub_807E5AC(void);
 extern void TryActivateArtificialWeatherAbilities(void);
 extern void nullsub_16(void);