9 files changed, 19 insertions, 10 deletions
diff --git a/src/battle/battle_bg.c b/src/battle/battle_bg.c
index 5a2a1efa3..4928708e0 100644
--- a/src/battle/battle_bg.c
+++ b/src/battle/battle_bg.c
@@ -1,6 +1,5 @@
 #include "global.h"
 #include "battle.h"
-#include "constants/songs.h"
 #include "decompress.h"
 #include "ewram.h"
 #include "graphics.h"
@@ -13,6 +12,8 @@
 #include "trainer.h"
 #include "trig.h"
 #include "sound.h"
+#include "constants/map_types.h"
+#include "constants/songs.h"
 
 
 extern u16 gBattleTypeFlags;
diff --git a/src/battle/battle_setup.c b/src/battle/battle_setup.c
index 8c5f68902..e8a3ef451 100644
--- a/src/battle/battle_setup.c
+++ b/src/battle/battle_setup.c
@@ -12,9 +12,7 @@
 #include "fieldmap.h"
 #include "fldeff_poison.h"
 #include "main.h"
-#include "constants/maps.h"
 #include "metatile_behavior.h"
-#include "constants/opponents.h"
 #include "palette.h"
 #include "random.h"
 #include "overworld.h"
@@ -22,15 +20,18 @@
 #include "script.h"
 #include "script_pokemon_80C4.h"
 #include "secret_base.h"
-#include "constants/songs.h"
 #include "sound.h"
-#include "constants/species.h"
 #include "starter_choose.h"
 #include "string_util.h"
 #include "strings.h"
 #include "task.h"
 #include "text.h"
 #include "trainer.h"
+#include "constants/map_types.h"
+#include "constants/maps.h"
+#include "constants/opponents.h"
+#include "constants/songs.h"
+#include "constants/species.h"
 
 extern u16 gSpecialVar_Result;
 
diff --git a/src/bike.c b/src/bike.c
index 41090a375..bf61d2aed 100644
--- a/src/bike.c
+++ b/src/bike.c
@@ -7,8 +7,9 @@
 #include "global.fieldmap.h"
 #include "metatile_behavior.h"
 #include "overworld.h"
-#include "constants/songs.h"
 #include "sound.h"
+#include "constants/map_types.h"
+#include "constants/songs.h"
 
 extern bool8 gBikeCyclingChallenge;
 extern u8 gBikeCollisions;
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c
index 296d9ef63..7a438e100 100644
--- a/src/field_control_avatar.c
+++ b/src/field_control_avatar.c
@@ -25,6 +25,7 @@
 #include "constants/vars.h"
 #include "wild_encounter.h"
 #include "constants/bg_event_constants.h"
+#include "constants/map_types.h"
 
 struct Coords32
 {
diff --git a/src/fldeff_flash.c b/src/fldeff_flash.c
index 5a04f7061..22da8e501 100644
--- a/src/fldeff_flash.c
+++ b/src/fldeff_flash.c
@@ -7,10 +7,11 @@
 #include "overworld.h"
 #include "rom6.h"
 #include "script.h"
-#include "constants/songs.h"
 #include "sound.h"
 #include "sprite.h"
 #include "task.h"
+#include "constants/map_types.h"
+#include "constants/songs.h"
 
 struct MapTypeFadePairs
 {
diff --git a/src/item_use.c b/src/item_use.c
index 91c17399f..1f33144b2 100644
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -35,6 +35,7 @@
 #include "strings.h"
 #include "task.h"
 #include "constants/bg_event_constants.h"
+#include "constants/map_types.h"
 #include "constants/species.h"
 #include "constants/vars.h"
 
diff --git a/src/overworld.c b/src/overworld.c
index f6dea1271..a7a203ca2 100644
--- a/src/overworld.c
+++ b/src/overworld.c
@@ -24,7 +24,6 @@
 #include "load_save.h"
 #include "main.h"
 #include "m4a.h"
-#include "constants/maps.h"
 #include "map_name_popup.h"
 #include "menu.h"
 #include "metatile_behavior.h"
@@ -38,9 +37,7 @@
 #include "script.h"
 #include "script_pokemon_80C4.h"
 #include "secret_base.h"
-#include "constants/songs.h"
 #include "sound.h"
-#include "constants/species.h"
 #include "start_menu.h"
 #include "task.h"
 #include "tileset_anim.h"
@@ -48,6 +45,10 @@
 #include "tv.h"
 #include "scanline_effect.h"
 #include "wild_encounter.h"
+#include "constants/map_types.h"
+#include "constants/maps.h"
+#include "constants/songs.h"
+#include "constants/species.h"
 
 #ifdef SAPPHIRE
 #define LEGENDARY_MUSIC MUS_OOAME  // Heavy Rain
diff --git a/src/rom6.c b/src/rom6.c
index 556a81293..6efb1802e 100644
--- a/src/rom6.c
+++ b/src/rom6.c
@@ -15,6 +15,7 @@
 #include "task.h"
 #include "constants/event_object_movement_constants.h"
 #include "constants/field_effects.h"
+#include "constants/map_types.h"
 
 extern u16 gSpecialVar_LastTalked;
 extern void (*gFieldCallback)(void);
diff --git a/src/secret_base.c b/src/secret_base.c
index d155bda0c..ca5f0c31f 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -32,6 +32,7 @@
 #include "constants/bg_event_constants.h"
 #include "constants/decorations.h"
 #include "constants/items.h"
+#include "constants/map_types.h"
 #include "constants/moves.h"
 #include "constants/species.h"
 #include "constants/vars.h"