diff --git a/src/battle_2.c b/src/battle_2.c
index 93d6f7204..4beb0a46f 100644
--- a/src/battle_2.c
+++ b/src/battle_2.c
@@ -1,31 +1,31 @@
-#include "rom3.h"
-#include "unknown_task.h"
-#include "rom_8077ABC.h"
-#include "party_menu.h"
-#include "pokedex.h"
-#include "item.h"
-#include "util.h"
-#include "rom_8094928.h"
-#include "pokeball.h"
-#include "battle_interface.h"
 #include "global.h"
+#include "abilities.h"
 #include "battle.h"
+#include "battle_interface.h"
+#include "battle_setup.h"
 #include "data2.h"
+#include "item.h"
+#include "link.h"
 #include "main.h"
-#include "text.h"
+#include "name_string_util.h"
 #include "palette.h"
+#include "party_menu.h"
+#include "pokeball.h"
+#include "pokedex.h"
+#include "pokemon.h"
+#include "rng.h"
+#include "rom3.h"
+#include "rom_8077ABC.h"
+#include "rom_8094928.h"
+#include "songs.h"
+#include "sound.h"
+#include "species.h"
 #include "sprite.h"
 #include "task.h"
-#include "pokemon.h"
-#include "species.h"
-#include "link.h"
-#include "name_string_util.h"
-#include "battle_setup.h"
-#include "rng.h"
-#include "sound.h"
-#include "songs.h"
+#include "text.h"
 #include "trig.h"
-#include "abilities.h"
+#include "unknown_task.h"
+#include "util.h"
 
 struct UnknownStruct6
 {
diff --git a/src/battle_6.c b/src/battle_6.c
index ad5121d81..866a66ae3 100644
--- a/src/battle_6.c
+++ b/src/battle_6.c
@@ -1,6 +1,6 @@
-#include "battle_message.h"
 #include "global.h"
 #include "battle.h"
+#include "battle_message.h"
 #include "menu_cursor.h"
 #include "text.h"
 
diff --git a/src/battle_811DA74.c b/src/battle_811DA74.c
index ccb23ca42..145e9bba1 100644
--- a/src/battle_811DA74.c
+++ b/src/battle_811DA74.c
@@ -1,22 +1,22 @@
-#include "battle.h"
-#include "rom_8077ABC.h"
-#include "battle_interface.h"
-#include "pokeball.h"
-#include "task.h"
-#include "battle_anim_813F0F4.h"
-#include "util.h"
-#include "rom3.h"
 #include "global.h"
 #include "battle_811DA74.h"
+#include "battle.h"
+#include "battle_anim_813F0F4.h"
+#include "battle_interface.h"
 #include "link.h"
 #include "m4a.h"
 #include "main.h"
 #include "palette.h"
+#include "pokeball.h"
 #include "pokemon.h"
+#include "rom3.h"
+#include "rom_8077ABC.h"
 #include "sound.h"
 #include "sprite.h"
 #include "string_util.h"
+#include "task.h"
 #include "text.h"
+#include "util.h"
 
 struct UnknownStruct1
 {
diff --git a/src/battle_ai.c b/src/battle_ai.c
index 18f4108c8..c9a3d16ca 100644
--- a/src/battle_ai.c
+++ b/src/battle_ai.c
@@ -1,5 +1,3 @@
-#include "util.h"
-#include "rom_8077ABC.h"
 #include "global.h"
 #include "battle_ai.h"
 #include "abilities.h"
@@ -10,7 +8,9 @@
 #include "moves.h"
 #include "pokemon.h"
 #include "rng.h"
+#include "rom_8077ABC.h"
 #include "species.h"
+#include "util.h"
 
 extern u16 gBattleTypeFlags;
 extern u16 gBattleWeather;
diff --git a/src/battle_anim.c b/src/battle_anim.c
index ee9bc003d..90e5c97c3 100644
--- a/src/battle_anim.c
+++ b/src/battle_anim.c
@@ -1,14 +1,14 @@
-#include "rom_8077ABC.h"
-#include "battle_interface.h"
-#include "battle_anim_80CA710.h"
-#include "contest.h"
-#include "main.h"
-#include "battle.h"
 #include "global.h"
 #include "battle_anim.h"
+#include "battle.h"
+#include "battle_anim_80CA710.h"
+#include "battle_interface.h"
+#include "contest.h"
 #include "decompress.h"
 #include "m4a.h"
+#include "main.h"
 #include "palette.h"
+#include "rom_8077ABC.h"
 #include "sound.h"
 #include "sprite.h"
 #include "task.h"
diff --git a/src/battle_anim_80A7E7C.c b/src/battle_anim_80A7E7C.c
index ca17dba8f..12b53d7d9 100644
--- a/src/battle_anim_80A7E7C.c
+++ b/src/battle_anim_80A7E7C.c
@@ -1,6 +1,6 @@
-#include "rom_8077ABC.h"
 #include "global.h"
 #include "battle_anim.h"
+#include "rom_8077ABC.h"
 #include "sprite.h"
 #include "task.h"
 #include "trig.h"
diff --git a/src/battle_anim_81258BC.c b/src/battle_anim_81258BC.c
index 57b060174..fe4e9bd38 100644
--- a/src/battle_anim_81258BC.c
+++ b/src/battle_anim_81258BC.c
@@ -1,9 +1,9 @@
-#include "battle.h"
-#include "battle_message.h"
 #include "global.h"
 #include "battle_anim_81258BC.h"
-#include "text.h"
+#include "battle.h"
+#include "battle_message.h"
 #include "menu_cursor.h"
+#include "text.h"
 
 extern struct Window gUnknown_03004210;
 extern u8 gUnknown_020238CC[];
@@ -13,7 +13,7 @@ extern const u8 gUnknown_08400CBB[];
 extern u8 gUnknown_02024A60;
 extern const u8 gUnknown_08400D15[];
 
-extern void* gUnknown_03004330[];
+extern void *gUnknown_03004330[];
 extern u16 gUnknown_030042A0;
 extern u16 gUnknown_030042A4;
 
diff --git a/src/battle_interface.c b/src/battle_interface.c
index b1c0c1497..e555bbad6 100644
--- a/src/battle_interface.c
+++ b/src/battle_interface.c
@@ -1,17 +1,17 @@
-#include "rom_8077ABC.h"
-#include "task.h"
-#include "safari_zone.h"
-#include "pokedex.h"
 #include "global.h"
 #include "battle_interface.h"
+#include "battle.h"
+#include "decompress.h"
+#include "palette.h"
+#include "pokedex.h"
+#include "rom_8077ABC.h"
+#include "safari_zone.h"
+#include "songs.h"
+#include "sound.h"
 #include "sprite.h"
 #include "string_util.h"
+#include "task.h"
 #include "text.h"
-#include "decompress.h"
-#include "sound.h"
-#include "songs.h"
-#include "battle.h"
-#include "palette.h"
 
 struct UnknownStruct5
 {
diff --git a/src/battle_party_menu.c b/src/battle_party_menu.c
index 8be774047..be34cd5c0 100644
--- a/src/battle_party_menu.c
+++ b/src/battle_party_menu.c
@@ -1,16 +1,16 @@
-#include "party_menu.h"
-#include "rom_8094928.h"
-#include "battle.h"
-#include "item_menu.h"
-#include "rom_8077ABC.h"
-#include "menu_helpers.h"
-#include "pokemon_summary_screen.h"
 #include "global.h"
 #include "battle_party_menu.h"
+#include "battle.h"
+#include "item_menu.h"
 #include "main.h"
 #include "menu.h"
+#include "menu_helpers.h"
 #include "palette.h"
+#include "party_menu.h"
 #include "pokemon.h"
+#include "pokemon_summary_screen.h"
+#include "rom_8077ABC.h"
+#include "rom_8094928.h"
 #include "songs.h"
 #include "sound.h"
 #include "string_util.h"
diff --git a/src/battle_setup.c b/src/battle_setup.c
index 09a1b14e1..97e8ffe42 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -1,18 +1,17 @@
-#include "fldeff_80C5CD4.h"
-#include "battle_transition.h"
-#include "fieldmap.h"
-#include "secret_base.h"
-#include "field_fadetransition.h"
 #include "global.h"
 #include "battle_setup.h"
 #include "battle.h"
+#include "battle_transition.h"
 #include "data2.h"
 #include "event_data.h"
 #include "field_control_avatar.h"
+#include "field_fadetransition.h"
 #include "field_map_obj_helpers.h"
 #include "field_message_box.h"
 #include "field_player_avatar.h"
 #include "field_weather.h"
+#include "fieldmap.h"
+#include "fldeff_80C5CD4.h"
 #include "main.h"
 #include "map_constants.h"
 #include "metatile_behavior.h"
@@ -23,6 +22,7 @@
 #include "safari_zone.h"
 #include "script.h"
 #include "script_pokemon_80C4.h"
+#include "secret_base.h"
 #include "songs.h"
 #include "sound.h"
 #include "species.h"
diff --git a/src/berry.c b/src/berry.c
index 470044709..d6fbb955e 100644
--- a/src/berry.c
+++ b/src/berry.c
@@ -1,10 +1,10 @@
-#include "field_map_obj.h"
-#include "fieldmap.h"
-#include "item_menu.h"
 #include "global.h"
 #include "berry.h"
 #include "field_control_avatar.h"
+#include "field_map_obj.h"
+#include "fieldmap.h"
 #include "item.h"
+#include "item_menu.h"
 #include "items.h"
 #include "main.h"
 #include "rng.h"
diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c
index 39cc7ac70..5647d4593 100644
--- a/src/berry_tag_screen.c
+++ b/src/berry_tag_screen.c
@@ -1,13 +1,13 @@
-#include "menu_helpers.h"
-#include "item_menu.h"
-#include "field_map_obj.h"
 #include "global.h"
 #include "berry_tag_screen.h"
 #include "berry.h"
 #include "decompress.h"
+#include "field_map_obj.h"
+#include "item_menu.h"
 #include "items.h"
 #include "main.h"
 #include "menu.h"
+#include "menu_helpers.h"
 #include "palette.h"
 #include "rom4.h"
 #include "songs.h"
diff --git a/src/bike.c b/src/bike.c
index ca3b17bb7..f37eb2144 100644
--- a/src/bike.c
+++ b/src/bike.c
@@ -1,8 +1,8 @@
-#include "fieldmap.h"
 #include "global.h"
 #include "bike.h"
 #include "field_map_obj.h"
 #include "field_player_avatar.h"
+#include "fieldmap.h"
 #include "flags.h"
 #include "global.fieldmap.h"
 #include "metatile_behavior.h"
diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c
index f0ef51ac2..4de945b9c 100644
--- a/src/braille_puzzles.c
+++ b/src/braille_puzzles.c
@@ -1,11 +1,11 @@
-#include "fieldmap.h"
-#include "main.h"
 #include "global.h"
 #include "braille_puzzles.h"
 #include "event_data.h"
 #include "field_camera.h"
 #include "field_effect.h"
+#include "fieldmap.h"
 #include "flags.h"
+#include "main.h"
 #include "map_obj_lock.h"
 #include "menu.h"
 #include "rom6.h"
diff --git a/src/clock.c b/src/clock.c
index 669e4cf3c..1f2aac9fd 100644
--- a/src/clock.c
+++ b/src/clock.c
@@ -1,16 +1,16 @@
-#include "dewford_trend.h"
-#include "field_weather.h"
-#include "tv.h"
-#include "time_events.h"
-#include "field_specials.h"
 #include "global.h"
 #include "clock.h"
 #include "berry.h"
+#include "dewford_trend.h"
 #include "event_data.h"
+#include "field_specials.h"
+#include "field_weather.h"
 #include "lottery_corner.h"
 #include "main.h"
 #include "rom4.h"
 #include "rtc.h"
+#include "time_events.h"
+#include "tv.h"
 #include "wallclock.h"
 
 static void InitTimeBasedEvents(void);
diff --git a/src/contest_painting.c b/src/contest_painting.c
index 3abcf85d1..eddcc87c1 100644
--- a/src/contest_painting.c
+++ b/src/contest_painting.c
@@ -1,7 +1,6 @@
-#include "unknown_task.h"
-#include "cute_sketch.h"
 #include "global.h"
 #include "contest_painting.h"
+#include "cute_sketch.h"
 #include "data2.h"
 #include "decompress.h"
 #include "main.h"
@@ -12,6 +11,7 @@
 #include "string_util.h"
 #include "strings.h"
 #include "text.h"
+#include "unknown_task.h"
 
 extern u8 unk_2000000[];
 extern u8 gUnknown_03000750;
diff --git a/src/coord_event_weather.c b/src/coord_event_weather.c
index 719ff05bf..9c5a1ca4d 100644
--- a/src/coord_event_weather.c
+++ b/src/coord_event_weather.c
@@ -1,6 +1,6 @@
-#include "field_weather.h"
 #include "global.h"
 #include "coord_event_weather.h"
+#include "field_weather.h"
 
 struct CoordEventWeather
 {
diff --git a/src/credits.c b/src/credits.c
index 247a69dbd..e66fbe1e7 100644
--- a/src/credits.c
+++ b/src/credits.c
@@ -1,10 +1,9 @@
-#include "task.h"
-#include "intro_credits_graphics.h"
-#include "hall_of_fame.h"
 #include "global.h"
 #include "data2.h"
 #include "decompress.h"
 #include "event_data.h"
+#include "hall_of_fame.h"
+#include "intro_credits_graphics.h"
 #include "m4a.h"
 #include "main.h"
 #include "menu.h"
@@ -15,6 +14,7 @@
 #include "sound.h"
 #include "species.h"
 #include "starter_choose.h"
+#include "task.h"
 #include "trig.h"
 
 asm(".set REG_BASE, 0x4000000");
diff --git a/src/diploma.c b/src/diploma.c
index a9ea8a262..ba7de58aa 100644
--- a/src/diploma.c
+++ b/src/diploma.c
@@ -1,4 +1,3 @@
-#include "unknown_task.h"
 #include "global.h"
 #include "diploma.h"
 #include "main.h"
@@ -11,6 +10,7 @@
 #include "strings2.h"
 #include "task.h"
 #include "text.h"
+#include "unknown_task.h"
 
 static void VBlankCB(void);
 static void MainCB2(void);
diff --git a/src/field_camera.c b/src/field_camera.c
index 163082282..1aed1549b 100644
--- a/src/field_camera.c
+++ b/src/field_camera.c
@@ -1,9 +1,9 @@
-#include "rotating_gate.h"
-#include "fieldmap.h"
 #include "global.h"
 #include "field_camera.h"
 #include "berry.h"
 #include "field_player_avatar.h"
+#include "fieldmap.h"
+#include "rotating_gate.h"
 #include "sprite.h"
 #include "text.h"
 
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c
index 60065fe5d..2d8140be5 100644
--- a/src/field_control_avatar.c
+++ b/src/field_control_avatar.c
@@ -1,25 +1,25 @@
-#include "fieldmap.h"
-#include "start_menu.h"
-#include "item_menu.h"
-#include "secret_base.h"
-#include "field_fadetransition.h"
-#include "coord_event_weather.h"
-#include "field_specials.h"
-#include "daycare.h"
-#include "field_poison.h"
 #include "global.h"
 #include "field_control_avatar.h"
 #include "battle_setup.h"
 #include "bike.h"
+#include "coord_event_weather.h"
+#include "daycare.h"
 #include "event_data.h"
+#include "field_fadetransition.h"
 #include "field_player_avatar.h"
+#include "field_poison.h"
+#include "field_specials.h"
+#include "fieldmap.h"
 #include "flags.h"
+#include "item_menu.h"
 #include "metatile_behavior.h"
 #include "rom4.h"
 #include "safari_zone.h"
 #include "script.h"
+#include "secret_base.h"
 #include "songs.h"
 #include "sound.h"
+#include "start_menu.h"
 #include "trainer_see.h"
 #include "vars.h"
 #include "wild_encounter.h"
diff --git a/src/field_door.c b/src/field_door.c
index 62ebb9721..791ed4c94 100644
--- a/src/field_door.c
+++ b/src/field_door.c
@@ -1,7 +1,7 @@
-#include "fieldmap.h"
 #include "global.h"
 #include "field_door.h"
 #include "field_camera.h"
+#include "fieldmap.h"
 #include "metatile_behavior.h"
 #include "task.h"
 
diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c
index 125fc2c62..364d55e51 100644
--- a/src/field_fadetransition.c
+++ b/src/field_fadetransition.c
@@ -1,11 +1,11 @@
-#include "rom4.h"
-#include "fldeff_flash.h"
-#include "field_player_avatar.h"
 #include "global.h"
 #include "gba/syscall.h"
 #include "field_fadetransition.h"
+#include "field_player_avatar.h"
 #include "field_weather.h"
+#include "fldeff_flash.h"
 #include "global.fieldmap.h"
+#include "rom4.h"
 #include "script.h"
 #include "task.h"
 
diff --git a/src/field_ground_effect.c b/src/field_ground_effect.c
index 357ba2df9..42862d0ff 100644
--- a/src/field_ground_effect.c
+++ b/src/field_ground_effect.c
@@ -1,6 +1,6 @@
-#include "fieldmap.h"
 #include "global.h"
 #include "field_ground_effect.h"
+#include "fieldmap.h"
 #include "metatile_behavior.h"
 
 extern u32 gUnknown_08376008[];
diff --git a/src/field_map_obj.c b/src/field_map_obj.c
old mode 100755
new mode 100644
index 1314cbc2c..3530f5579
--- a/src/field_map_obj.c
+++ b/src/field_map_obj.c
@@ -1,18 +1,18 @@
-#include "field_effect_helpers.h"
 #include "global.h"
 #include "field_map_obj.h"
-#include "field_map_obj_helpers.h"
-#include "fieldmap.h"
 #include "berry.h"
 #include "event_data.h"
-#include "field_player_avatar.h"
-#include "field_effect.h"
-#include "field_ground_effect.h"
-#include "palette.h"
-#include "rom4.h"
-#include "rng.h"
-#include "sprite.h"
 #include "field_camera.h"
+#include "field_effect.h"
+#include "field_effect_helpers.h"
+#include "field_ground_effect.h"
+#include "field_map_obj_helpers.h"
+#include "field_player_avatar.h"
+#include "fieldmap.h"
+#include "palette.h"
+#include "rng.h"
+#include "rom4.h"
+#include "sprite.h"
 
 extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[36];
 
diff --git a/src/field_map_obj_helpers.c b/src/field_map_obj_helpers.c
index d93b429a0..e269cd924 100644
--- a/src/field_map_obj_helpers.c
+++ b/src/field_map_obj_helpers.c
@@ -1,8 +1,8 @@
-#include "field_map_obj.h"
-#include "field_ground_effect.h"
 #include "global.h"
 #include "field_map_obj_helpers.h"
 #include "field_effect.h"
+#include "field_ground_effect.h"
+#include "field_map_obj.h"
 #include "sprite.h"
 
 typedef void (*SpriteStepFunc)(struct Sprite *sprite, u8 dir);
diff --git a/src/field_message_box.c b/src/field_message_box.c
index 925c13015..2cd2e66ab 100644
--- a/src/field_message_box.c
+++ b/src/field_message_box.c
@@ -1,6 +1,6 @@
-#include "menu.h"
 #include "global.h"
 #include "field_message_box.h"
+#include "menu.h"
 #include "string_util.h"
 #include "task.h"
 #include "text.h"
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c
index 346c29bbb..3cdb45584 100644
--- a/src/field_player_avatar.c
+++ b/src/field_player_avatar.c
@@ -1,27 +1,27 @@
-#include "fieldmap.h"
-#include "field_ground_effect.h"
-#include "field_effect_helpers.h"
-#include "tv.h"
-#include "party_menu.h"
-#include "rotating_gate.h"
 #include "global.h"
 #include "field_player_avatar.h"
 #include "bike.h"
 #include "event_data.h"
 #include "field_effect.h"
+#include "field_effect_helpers.h"
+#include "field_ground_effect.h"
 #include "field_map_obj.h"
 #include "field_map_obj_helpers.h"
+#include "fieldmap.h"
 #include "main.h"
 #include "map_object_constants.h"
 #include "menu.h"
 #include "metatile_behavior.h"
+#include "party_menu.h"
 #include "rng.h"
 #include "rom4.h"
+#include "rotating_gate.h"
 #include "script.h"
 #include "songs.h"
 #include "sound.h"
 #include "strings2.h"
 #include "task.h"
+#include "tv.h"
 #include "wild_encounter.h"
 
 extern u32 gUnknown_0202FF84[];
diff --git a/src/field_poison.c b/src/field_poison.c
index e5edb6f76..8c9e029e1 100644
--- a/src/field_poison.c
+++ b/src/field_poison.c
@@ -1,9 +1,9 @@
-#include "pokemon_summary_screen.h"
-#include "fldeff_80C5CD4.h"
 #include "global.h"
 #include "field_poison.h"
 #include "field_message_box.h"
+#include "fldeff_80C5CD4.h"
 #include "pokemon.h"
+#include "pokemon_summary_screen.h"
 #include "script.h"
 #include "string_util.h"
 #include "task.h"
diff --git a/src/field_region_map.c b/src/field_region_map.c
index 7616a1e27..58b0e37bc 100644
--- a/src/field_region_map.c
+++ b/src/field_region_map.c
@@ -1,12 +1,12 @@
-#include "region_map.h"
 #include "global.h"
 #include "field_region_map.h"
 #include "main.h"
 #include "menu.h"
 #include "palette.h"
+#include "region_map.h"
 #include "sprite.h"
-#include "text.h"
 #include "strings2.h"
+#include "text.h"
 
 struct RegionMapStruct
 {
diff --git a/src/field_special_scene.c b/src/field_special_scene.c
index d4ce816fb..c88ac8f65 100644
--- a/src/field_special_scene.c
+++ b/src/field_special_scene.c
@@ -1,16 +1,16 @@
-#include "field_map_obj.h"
-#include "field_specials.h"
-#include "main.h"
-#include "script_movement.h"
-#include "field_fadetransition.h"
-#include "fieldmap.h"
 #include "global.h"
 #include "field_special_scene.h"
 #include "event_data.h"
 #include "field_camera.h"
+#include "field_fadetransition.h"
+#include "field_map_obj.h"
+#include "field_specials.h"
+#include "fieldmap.h"
+#include "main.h"
 #include "palette.h"
 #include "rom4.h"
 #include "script.h"
+#include "script_movement.h"
 #include "songs.h"
 #include "sound.h"
 #include "sprite.h"
diff --git a/src/field_specials.c b/src/field_specials.c
index fda5efdea..2cb2cf795 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -1,6 +1,6 @@
-#include "diploma.h"
 #include "global.h"
 #include "field_specials.h"
+#include "diploma.h"
 #include "event_data.h"
 #include "field_player_avatar.h"
 #include "main.h"
diff --git a/src/fieldmap.c b/src/fieldmap.c
index e138a7c57..c4e7dde8b 100644
--- a/src/fieldmap.c
+++ b/src/fieldmap.c
@@ -1,10 +1,10 @@
-#include "script.h"
-#include "secret_base.h"
-#include "rom4.h"
-#include "tv.h"
 #include "global.h"
 #include "fieldmap.h"
 #include "palette.h"
+#include "rom4.h"
+#include "script.h"
+#include "secret_base.h"
+#include "tv.h"
 
 struct BackupMapData
 {
diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c
index aabdde1eb..5bba4e888 100644
--- a/src/fldeff_cut.c
+++ b/src/fldeff_cut.c
@@ -1,20 +1,20 @@
-#include "pokemon_menu.h"
-#include "fieldmap.h"
-#include "task.h"
 #include "global.h"
 #include "fldeff_cut.h"
 #include "field_camera.h"
 #include "field_effect.h"
 #include "field_player_avatar.h"
+#include "fieldmap.h"
 #include "map_obj_lock.h"
 #include "metatile_behavior.h"
 #include "metatile_behaviors.h"
+#include "pokemon_menu.h"
 #include "rom4.h"
 #include "rom6.h"
 #include "script.h"
 #include "songs.h"
 #include "sound.h"
 #include "sprite.h"
+#include "task.h"
 #include "trig.h"
 
 extern u8 gCutGrassSpriteArray[8]; // seems to be an array of 8 sprite IDs
diff --git a/src/fldeff_softboiled.c b/src/fldeff_softboiled.c
index 8a1a8d3b7..45f319c62 100644
--- a/src/fldeff_softboiled.c
+++ b/src/fldeff_softboiled.c
@@ -1,9 +1,9 @@
-#include "party_menu.h"
-#include "pokemon_menu.h"
 #include "global.h"
 #include "fldeff_softboiled.h"
 #include "menu.h"
+#include "party_menu.h"
 #include "pokemon.h"
+#include "pokemon_menu.h"
 #include "songs.h"
 #include "sound.h"
 #include "sprite.h"
diff --git a/src/fldeff_strength.c b/src/fldeff_strength.c
index 8381e6f01..1de9ee8ca 100644
--- a/src/fldeff_strength.c
+++ b/src/fldeff_strength.c
@@ -1,9 +1,9 @@
-#include "pokemon_menu.h"
-#include "party_menu.h"
 #include "global.h"
 #include "braille_puzzles.h"
 #include "field_effect.h"
+#include "party_menu.h"
 #include "pokemon.h"
+#include "pokemon_menu.h"
 #include "rom6.h"
 #include "script.h"
 #include "task.h"
diff --git a/src/fldeff_sweetscent.c b/src/fldeff_sweetscent.c
index 3ce0ac8e9..9716e21f1 100644
--- a/src/fldeff_sweetscent.c
+++ b/src/fldeff_sweetscent.c
@@ -1,8 +1,8 @@
-#include "pokemon_menu.h"
 #include "global.h"
 #include "field_effect.h"
 #include "field_player_avatar.h"
 #include "palette.h"
+#include "pokemon_menu.h"
 #include "rom6.h"
 #include "script.h"
 #include "sound.h"
diff --git a/src/fldeff_teleport.c b/src/fldeff_teleport.c
index 489e20193..4fba1285f 100644
--- a/src/fldeff_teleport.c
+++ b/src/fldeff_teleport.c
@@ -1,11 +1,11 @@
-#include "task.h"
-#include "pokemon_menu.h"
 #include "global.h"
 #include "fldeff_teleport.h"
 #include "field_effect.h"
 #include "field_player_avatar.h"
+#include "pokemon_menu.h"
 #include "rom4.h"
 #include "rom6.h"
+#include "task.h"
 
 extern u32 gUnknown_0202FF84[];
 
diff --git a/src/intro.c b/src/intro.c
index 20cb36cd7..d5383b899 100644
--- a/src/intro.c
+++ b/src/intro.c
@@ -1,11 +1,10 @@
-#include "intro_credits_graphics.h"
-#include "unknown_task.h"
-#include "hall_of_fame.h"
 #include "global.h"
 #include "gba/m4a_internal.h"
 #include "intro.h"
 #include "data2.h"
 #include "decompress.h"
+#include "hall_of_fame.h"
+#include "intro_credits_graphics.h"
 #include "libgncmultiboot.h"
 #include "link.h"
 #include "m4a.h"
@@ -20,6 +19,7 @@
 #include "task.h"
 #include "title_screen.h"
 #include "trig.h"
+#include "unknown_task.h"
 
 extern struct SpriteTemplate gUnknown_02024E8C;
 extern u16 gUnknown_02039318;
diff --git a/src/item.c b/src/item.c
index 16a11ba8d..920670e8f 100644
--- a/src/item.c
+++ b/src/item.c
@@ -1,6 +1,6 @@
-#include "berry.h"
 #include "global.h"
 #include "item.h"
+#include "berry.h"
 #include "string_util.h"
 #include "strings.h"
 
diff --git a/src/item_use.c b/src/item_use.c
index 09173cf8e..8139114ba 100644
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -1,24 +1,19 @@
-#include "pokemon_menu.h"
-#include "pokeblock.h.h"
-#include "item_menu.h"
-#include "bike.h"
-#include "field_fadetransition.h"
-#include "pokemon_item_effect.h"
-#include "party_menu.h"
-#include "rom_8094928.h"
-#include "field_effect.h"
 #include "global.h"
 #include "item_use.h"
 #include "battle.h"
 #include "berry.h"
+#include "bike.h"
 #include "coins.h"
 #include "data2.h"
 #include "event_data.h"
+#include "field_effect.h"
+#include "field_fadetransition.h"
 #include "field_map_obj_helpers.h"
 #include "field_player_avatar.h"
 #include "field_weather.h"
 #include "fieldmap.h"
 #include "item.h"
+#include "item_menu.h"
 #include "items.h"
 #include "mail.h"
 #include "main.h"
@@ -27,7 +22,12 @@
 #include "menu_helpers.h"
 #include "metatile_behavior.h"
 #include "palette.h"
+#include "party_menu.h"
+#include "pokeblock.h.h"
+#include "pokemon_item_effect.h"
+#include "pokemon_menu.h"
 #include "rom4.h"
+#include "rom_8094928.h"
 #include "script.h"
 #include "songs.h"
 #include "sound.h"
diff --git a/src/link.c b/src/link.c
index 102714c39..6ad5a8fb7 100644
--- a/src/link.c
+++ b/src/link.c
@@ -1,7 +1,7 @@
-#include "berry_blender.h"
 #include "global.h"
 #include "link.h"
 #include "battle.h"
+#include "berry_blender.h"
 #include "main.h"
 #include "menu.h"
 #include "palette.h"
diff --git a/src/mail.c b/src/mail.c
index 1f19bf230..6b26bafe9 100644
--- a/src/mail.c
+++ b/src/mail.c
@@ -1,20 +1,20 @@
-#include "easy_chat.h"
-#include "mail_data.h"
-#include "pokemon_icon.h"
-#include "menu_helpers.h"
-#include "unknown_task.h"
 #include "global.h"
 #include "mail.h"
+#include "easy_chat.h"
 #include "items.h"
+#include "mail_data.h"
 #include "menu.h"
+#include "menu_helpers.h"
 #include "name_string_util.h"
 #include "palette.h"
+#include "pokemon_icon.h"
 #include "rom4.h"
 #include "sprite.h"
 #include "string_util.h"
 #include "strings2.h"
 #include "task.h"
 #include "text.h"
+#include "unknown_task.h"
 
 struct UnkMailStruct
 {
diff --git a/src/mail_data.c b/src/mail_data.c
index 9deb9f685..ae3f4b3e8 100644
--- a/src/mail_data.c
+++ b/src/mail_data.c
@@ -1,9 +1,9 @@
-#include "pokemon_icon.h"
 #include "global.h"
 #include "mail_data.h"
 #include "items.h"
 #include "name_string_util.h"
 #include "pokemon.h"
+#include "pokemon_icon.h"
 #include "species.h"
 #include "text.h"
 
diff --git a/src/main.c b/src/main.c
index 9d4a3a1ed..afaa0e77a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,5 +1,3 @@
-#include "rom3.h"
-#include "unknown_task.h"
 #include "global.h"
 #include "gba/flash_internal.h"
 #include "gba/m4a_internal.h"
@@ -10,10 +8,12 @@
 #include "m4a.h"
 #include "play_time.h"
 #include "rng.h"
+#include "rom3.h"
 #include "rom4.h"
 #include "rtc.h"
 #include "siirtc.h"
 #include "sound.h"
+#include "unknown_task.h"
 
 extern struct SoundInfo gSoundInfo;
 extern u32 IntrMain[];
diff --git a/src/main_menu.c b/src/main_menu.c
index 1a9ed9dd9..28473c166 100644
--- a/src/main_menu.c
+++ b/src/main_menu.c
@@ -1,16 +1,15 @@
-#include "unknown_task.h"
-#include "field_effect.h"
-#include "pokeball.h"
 #include "global.h"
 #include "main_menu.h"
 #include "data2.h"
 #include "decompress.h"
 #include "event_data.h"
+#include "field_effect.h"
 #include "menu.h"
 #include "mystery_event_menu.h"
 #include "naming_screen.h"
 #include "option_menu.h"
 #include "palette.h"
+#include "pokeball.h"
 #include "rom4.h"
 #include "rtc.h"
 #include "save_menu_util.h"
@@ -22,6 +21,7 @@
 #include "task.h"
 #include "text.h"
 #include "title_screen.h"
+#include "unknown_task.h"
 
 #define BirchSpeechUpdateWindowText() ((u8)MenuUpdateWindowText_OverrideLineLength(24))
 
diff --git a/src/map_name_popup.c b/src/map_name_popup.c
index e47b89d07..303cc3d07 100644
--- a/src/map_name_popup.c
+++ b/src/map_name_popup.c
@@ -1,8 +1,8 @@
-#include "region_map.h"
 #include "global.h"
 #include "map_name_popup.h"
 #include "event_data.h"
 #include "menu.h"
+#include "region_map.h"
 #include "task.h"
 
 EWRAM_DATA static u8 sTaskId = 0;
diff --git a/src/map_obj_lock.c b/src/map_obj_lock.c
index 1aeb248ee..bd40bcacc 100644
--- a/src/map_obj_lock.c
+++ b/src/map_obj_lock.c
@@ -1,9 +1,9 @@
-#include "field_map_obj.h"
-#include "script_movement.h"
 #include "global.h"
 #include "map_obj_lock.h"
+#include "field_map_obj.h"
 #include "field_map_obj_helpers.h"
 #include "field_player_avatar.h"
+#include "script_movement.h"
 #include "task.h"
 
 extern u16 gScriptFacing;
diff --git a/src/matsuda_debug_menu.c b/src/matsuda_debug_menu.c
index a9a6079a1..3665cabd8 100644
--- a/src/matsuda_debug_menu.c
+++ b/src/matsuda_debug_menu.c
@@ -1,9 +1,8 @@
-#include "contest_link_80C2020.h"
-#include "contest_link_80C857C.h"
-#include "unknown_task.h"
 #include "global.h"
 #include "matsuda_debug_menu.h"
 #include "contest.h"
+#include "contest_link_80C2020.h"
+#include "contest_link_80C857C.h"
 #include "data2.h"
 #include "link.h"
 #include "main.h"
@@ -15,6 +14,7 @@
 #include "string_util.h"
 #include "task.h"
 #include "text.h"
+#include "unknown_task.h"
 
 extern u8 gUnknown_0203856C;
 extern u8 gUnknown_0203857D[][64];
diff --git a/src/mauville_old_man.c b/src/mauville_old_man.c
index d5d2ae3a9..93684fc60 100644
--- a/src/mauville_old_man.c
+++ b/src/mauville_old_man.c
@@ -1,12 +1,12 @@
-#include "easy_chat.h"
-#include "trader.h"
 #include "global.h"
 #include "mauville_old_man.h"
+#include "easy_chat.h"
 #include "menu.h"
 #include "rng.h"
 #include "script.h"
 #include "string_util.h"
 #include "strings.h"
+#include "trader.h"
 
 extern u16 gScriptResult;
 extern u16 gSpecialVar_0x8004;
diff --git a/src/mori_debug_menu.c b/src/mori_debug_menu.c
index 50a090026..b2e1116a9 100644
--- a/src/mori_debug_menu.c
+++ b/src/mori_debug_menu.c
@@ -1,12 +1,12 @@
-#include "daycare.h"
-#include "pokeblock.h.h"
-#include "learn_move.h"
 #include "global.h"
 #include "mori_debug_menu.h"
 #include "data2.h"
+#include "daycare.h"
+#include "learn_move.h"
 #include "link.h"
 #include "main.h"
 #include "menu.h"
+#include "pokeblock.h.h"
 #include "start_menu.h"
 #include "string_util.h"
 
diff --git a/src/mystery_event_menu.c b/src/mystery_event_menu.c
index 8254bbbec..4be5dec1c 100644
--- a/src/mystery_event_menu.c
+++ b/src/mystery_event_menu.c
@@ -1,9 +1,9 @@
-#include "mystery_event_script.h"
 #include "global.h"
 #include "mystery_event_menu.h"
 #include "link.h"
 #include "main.h"
 #include "menu.h"
+#include "mystery_event_script.h"
 #include "palette.h"
 #include "save.h"
 #include "songs.h"
diff --git a/src/naming_screen.c b/src/naming_screen.c
index 65e55e284..88059e669 100644
--- a/src/naming_screen.c
+++ b/src/naming_screen.c
@@ -1,14 +1,13 @@
-#include "util.h"
-#include "field_player_avatar.h"
-#include "field_map_obj.h"
-#include "pokemon_icon.h"
-#include "field_effect.h"
 #include "global.h"
 #include "naming_screen.h"
 #include "data2.h"
+#include "field_effect.h"
+#include "field_map_obj.h"
+#include "field_player_avatar.h"
 #include "main.h"
 #include "menu.h"
 #include "palette.h"
+#include "pokemon_icon.h"
 #include "songs.h"
 #include "sound.h"
 #include "sprite.h"
@@ -17,6 +16,7 @@
 #include "task.h"
 #include "text.h"
 #include "trig.h"
+#include "util.h"
 
 extern u16 gKeyRepeatStartDelay;
 
diff --git a/src/new_game.c b/src/new_game.c
index a1f949fdd..d22babb4a 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -1,30 +1,30 @@
-#include "item_menu.h"
-#include "mail_data.h"
-#include "tv.h"
-#include "secret_base.h"
-#include "contest.h"
-#include "battle_records.h"
-#include "pokemon_storage_system.h"
-#include "player_pc.h"
-#include "decoration_inventory.h"
-#include "pokeblock.h.h"
-#include "mauville_old_man.h"
-#include "easy_chat.h"
-#include "field_specials.h"
 #include "global.h"
 #include "new_game.h"
+#include "battle_records.h"
 #include "berry.h"
+#include "contest.h"
+#include "decoration_inventory.h"
 #include "dewford_trend.h"
+#include "easy_chat.h"
 #include "event_data.h"
+#include "field_specials.h"
+#include "item_menu.h"
 #include "lottery_corner.h"
+#include "mail_data.h"
+#include "mauville_old_man.h"
 #include "play_time.h"
+#include "player_pc.h"
+#include "pokeblock.h.h"
 #include "pokedex.h"
 #include "pokemon_size_record.h"
+#include "pokemon_storage_system.h"
 #include "rng.h"
 #include "roamer.h"
 #include "rom4.h"
 #include "rtc.h"
 #include "script.h"
+#include "secret_base.h"
+#include "tv.h"
 
 extern u8 gDifferentSaveFile;
 
diff --git a/src/party_menu.c b/src/party_menu.c
index 549a2a45a..7d21de63c 100644
--- a/src/party_menu.c
+++ b/src/party_menu.c
@@ -1,28 +1,28 @@
-#include "mail_data.h"
-#include "pokemon_summary_screen.h"
-#include "pokemon_menu.h"
-#include "rom_8077ABC.h"
-#include "battle.h"
-#include "battle_party_menu.h"
-#include "rom_8094928.h"
-#include "pokemon_item_effect.h"
 #include "global.h"
 #include "party_menu.h"
+#include "battle.h"
+#include "battle_interface.h"
+#include "battle_party_menu.h"
 #include "data2.h"
+#include "event_data.h"
+#include "item.h"
+#include "mail_data.h"
+#include "main.h"
 #include "menu.h"
+#include "palette.h"
 #include "pokemon.h"
+#include "pokemon_item_effect.h"
+#include "pokemon_menu.h"
+#include "pokemon_summary_screen.h"
+#include "rom_8077ABC.h"
+#include "rom_8094928.h"
 #include "songs.h"
 #include "sound.h"
+#include "species.h"
+#include "sprite.h"
 #include "string_util.h"
 #include "strings.h"
 #include "task.h"
-#include "sprite.h"
-#include "palette.h"
-#include "event_data.h"
-#include "main.h"
-#include "item.h"
-#include "battle_interface.h"
-#include "species.h"
 
 #define DATA_COUNT (6)
 
diff --git a/src/player_pc.c b/src/player_pc.c
index 95ce07b2c..822365222 100644
--- a/src/player_pc.c
+++ b/src/player_pc.c
@@ -1,10 +1,10 @@
-#include "item_menu.h"
-#include "field_fadetransition.h"
-#include "decoration.h"
 #include "global.h"
 #include "player_pc.h"
+#include "decoration.h"
+#include "field_fadetransition.h"
 #include "field_weather.h"
 #include "item.h"
+#include "item_menu.h"
 #include "items.h"
 #include "main.h"
 #include "menu.h"
diff --git a/src/pokedex.c b/src/pokedex.c
index 89dcd293b..53becdb1f 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -1,5 +1,4 @@
 
-#include "unknown_task.h"
 #include "global.h"
 #include "gba/m4a_internal.h"
 #include "pokedex.h"
@@ -9,16 +8,17 @@
 #include "main.h"
 #include "menu.h"
 #include "palette.h"
+#include "pokedex_area_screen.h"
+#include "pokedex_cry_screen.h"
 #include "rng.h"
+#include "rom4.h"
 #include "songs.h"
 #include "sound.h"
 #include "string_util.h"
 #include "strings.h"
 #include "task.h"
 #include "trig.h"
-#include "rom4.h"
-#include "pokedex_cry_screen.h"
-#include "pokedex_area_screen.h"
+#include "unknown_task.h"
 
 // I'm #define-ing these just for now so I can keep using the old unkXXX member names
 #define unk60E selectedPokemon
diff --git a/src/pokemon_1.c b/src/pokemon_1.c
index a8e5dfa32..c55105ef3 100644
--- a/src/pokemon_1.c
+++ b/src/pokemon_1.c
@@ -1,8 +1,8 @@
 #include "global.h"
-#include "pokemon.h"
 #include "data2.h"
 #include "items.h"
 #include "main.h"
+#include "pokemon.h"
 #include "rng.h"
 #include "rom4.h"
 #include "species.h"
diff --git a/src/pokemon_2.c b/src/pokemon_2.c
index cab68b07e..91cd77f86 100644
--- a/src/pokemon_2.c
+++ b/src/pokemon_2.c
@@ -1,17 +1,17 @@
-#include "rom_8077ABC.h"
-#include "util.h"
-#include "battle.h"
 #include "global.h"
-#include "pokemon.h"
+#include "battle.h"
 #include "data2.h"
 #include "event_data.h"
 #include "main.h"
+#include "pokemon.h"
 #include "rng.h"
+#include "rom_8077ABC.h"
 #include "species.h"
 #include "sprite.h"
 #include "string_util.h"
-#include "text.h"
 #include "strings2.h"
+#include "text.h"
+#include "util.h"
 
 extern u8 gPlayerPartyCount;
 extern u8 gEnemyPartyCount;
diff --git a/src/pokemon_3.c b/src/pokemon_3.c
index 8622c11d9..98fa68302 100644
--- a/src/pokemon_3.c
+++ b/src/pokemon_3.c
@@ -1,20 +1,19 @@
-#include "battle_message.h"
-#include "rom_8077ABC.h"
-#include "rom_8094928.h"
-#include "util.h"
 #include "global.h"
-#include "pokemon.h"
 #include "battle.h"
+#include "battle_message.h"
 #include "data2.h"
 #include "event_data.h"
 #include "hold_effects.h"
 #include "item.h"
 #include "items.h"
 #include "link.h"
-#include "main.h"
 #include "m4a.h"
+#include "main.h"
+#include "pokemon.h"
 #include "rng.h"
 #include "rom4.h"
+#include "rom_8077ABC.h"
+#include "rom_8094928.h"
 #include "rtc.h"
 #include "songs.h"
 #include "sound.h"
@@ -22,6 +21,7 @@
 #include "sprite.h"
 #include "string_util.h"
 #include "text.h"
+#include "util.h"
 
 #define EVO_FRIENDSHIP       0x0001 // Pokémon levels up with friendship ≥ 220
 #define EVO_FRIENDSHIP_DAY   0x0002 // Pokémon levels up during the day with friendship ≥ 220
diff --git a/src/pokemon_size_record.c b/src/pokemon_size_record.c
index b96bdcf5f..f293190e8 100644
--- a/src/pokemon_size_record.c
+++ b/src/pokemon_size_record.c
@@ -1,8 +1,8 @@
-#include "pokedex.h"
 #include "global.h"
 #include "pokemon_size_record.h"
 #include "data2.h"
 #include "event_data.h"
+#include "pokedex.h"
 #include "species.h"
 #include "string_util.h"
 #include "strings2.h"
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c
index 47af6c6f9..61ae11438 100644
--- a/src/pokemon_summary_screen.c
+++ b/src/pokemon_summary_screen.c
@@ -1,12 +1,12 @@
-#include "region_map.h"
-#include "tv.h"
 #include "global.h"
 #include "pokemon_summary_screen.h"
 #include "link.h"
 #include "menu.h"
 #include "pokemon.h"
+#include "region_map.h"
 #include "string_util.h"
 #include "strings2.h"
+#include "tv.h"
 
 extern struct Pokemon *unk_2018000;
 
diff --git a/src/post_battle_event_funcs.c b/src/post_battle_event_funcs.c
index 44fb2d66a..8d85705c8 100644
--- a/src/post_battle_event_funcs.c
+++ b/src/post_battle_event_funcs.c
@@ -1,6 +1,6 @@
-#include "hall_of_fame.h"
 #include "global.h"
 #include "event_data.h"
+#include "hall_of_fame.h"
 #include "load_save.h"
 #include "main.h"
 #include "pokemon.h"
diff --git a/src/record_mixing.c b/src/record_mixing.c
index 02dd6181f..3b1076626 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -1,24 +1,24 @@
-#include "cable_club.h"
-#include "secret_base.h"
-#include "mauville_old_man.h"
-#include "battle_tower.h"
-#include "tv.h"
-#include "mystery_event_script.h"
-#include "daycare.h"
-#include "fldeff_80C5CD4.h"
 #include "global.h"
 #include "record_mixing.h"
+#include "battle_tower.h"
+#include "cable_club.h"
+#include "daycare.h"
 #include "dewford_trend.h"
 #include "event_data.h"
+#include "fldeff_80C5CD4.h"
 #include "link.h"
+#include "mauville_old_man.h"
 #include "menu.h"
+#include "mystery_event_script.h"
 #include "rom4.h"
 #include "script.h"
+#include "secret_base.h"
 #include "songs.h"
 #include "sound.h"
 #include "string_util.h"
 #include "strings2.h"
 #include "task.h"
+#include "tv.h"
 
 extern void *recordMixingSecretBases;
 extern void *recordMixingTvShows;
diff --git a/src/rom3.c b/src/rom3.c
index 21c63af78..93f0f0356 100644
--- a/src/rom3.c
+++ b/src/rom3.c
@@ -1,19 +1,19 @@
-#include "battle_anim.h"
-#include "battle_ai.h"
-#include "rom_8094928.h"
-#include "battle_811DA74.h"
-#include "util.h"
-#include "battle_anim_81258BC.h"
-#include "battle_anim_8137220.h"
-#include "cable_club.h"
 #include "global.h"
 #include "rom3.h"
 #include "battle.h"
+#include "battle_811DA74.h"
+#include "battle_ai.h"
+#include "battle_anim.h"
+#include "battle_anim_81258BC.h"
+#include "battle_anim_8137220.h"
+#include "cable_club.h"
 #include "items.h"
 #include "link.h"
 #include "pokemon.h"
+#include "rom_8094928.h"
 #include "species.h"
 #include "task.h"
+#include "util.h"
 
 extern u8 unk_2000000[];
 
diff --git a/src/rom4.c b/src/rom4.c
index be07e5867..04071cedb 100644
--- a/src/rom4.c
+++ b/src/rom4.c
@@ -1,36 +1,31 @@
-#include "field_specials.h"
-#include "fieldmap.h"
-#include "tv.h"
-#include "secret_base.h"
-#include "map_name_popup.h"
-#include "field_fadetransition.h"
-#include "fldeff_flash.h"
-#include "unknown_task.h"
-#include "cable_club.h"
-#include "field_ground_effect.h"
-#include "field_tasks.h"
-#include "rotating_gate.h"
-#include "field_screen_effect.h"
-#include "time_events.h"
 #include "global.h"
 #include "rom4.h"
 #include "battle_setup.h"
 #include "berry.h"
+#include "cable_club.h"
 #include "clock.h"
 #include "event_data.h"
 #include "field_camera.h"
 #include "field_control_avatar.h"
 #include "field_effect.h"
+#include "field_fadetransition.h"
+#include "field_ground_effect.h"
 #include "field_map_obj.h"
 #include "field_map_obj_helpers.h"
 #include "field_message_box.h"
 #include "field_player_avatar.h"
-#include "field_weather.h"
+#include "field_screen_effect.h"
 #include "field_special_scene.h"
+#include "field_specials.h"
+#include "field_tasks.h"
+#include "field_weather.h"
+#include "fieldmap.h"
+#include "fldeff_flash.h"
 #include "heal_location.h"
 #include "link.h"
 #include "load_save.h"
 #include "main.h"
+#include "map_name_popup.h"
 #include "menu.h"
 #include "metatile_behavior.h"
 #include "new_game.h"
@@ -38,14 +33,19 @@
 #include "play_time.h"
 #include "rng.h"
 #include "roamer.h"
+#include "rotating_gate.h"
 #include "safari_zone.h"
 #include "script.h"
 #include "script_pokemon_80C4.h"
+#include "secret_base.h"
 #include "songs.h"
 #include "sound.h"
 #include "start_menu.h"
 #include "task.h"
 #include "tileset_anim.h"
+#include "time_events.h"
+#include "tv.h"
+#include "unknown_task.h"
 #include "wild_encounter.h"
 
 #ifdef SAPPHIRE
diff --git a/src/rom6.c b/src/rom6.c
index c466e724d..d5314fdec 100644
--- a/src/rom6.c
+++ b/src/rom6.c
@@ -1,11 +1,11 @@
-#include "field_map_obj.h"
-#include "pokemon_menu.h"
-#include "item_use.h"
 #include "global.h"
 #include "rom6.h"
 #include "braille_puzzles.h"
 #include "field_effect.h"
+#include "field_map_obj.h"
 #include "field_player_avatar.h"
+#include "item_use.h"
+#include "pokemon_menu.h"
 #include "rom4.h"
 #include "script.h"
 #include "songs.h"
diff --git a/src/rom_8077ABC.c b/src/rom_8077ABC.c
index 7e079c0d3..a31a764fb 100644
--- a/src/rom_8077ABC.c
+++ b/src/rom_8077ABC.c
@@ -1,17 +1,17 @@
-#include "util.h"
-#include "battle_anim.h"
-#include "pokemon_icon.h"
 #include "global.h"
 #include "rom_8077ABC.h"
 #include "battle.h"
+#include "battle_anim.h"
 #include "blend_palette.h"
 #include "data2.h"
 #include "decompress.h"
 #include "palette.h"
+#include "pokemon_icon.h"
 #include "species.h"
 #include "sprite.h"
 #include "task.h"
 #include "trig.h"
+#include "util.h"
 
 #define GET_UNOWN_LETTER(personality) ((\
       (((personality & 0x03000000) >> 24) << 6) \
diff --git a/src/rom_8094928.c b/src/rom_8094928.c
index de1823d88..b927fe329 100644
--- a/src/rom_8094928.c
+++ b/src/rom_8094928.c
@@ -1,7 +1,7 @@
-#include "party_menu.h"
-#include "rom_8077ABC.h"
 #include "global.h"
 #include "rom_8094928.h"
+#include "party_menu.h"
+#include "rom_8077ABC.h"
 
 #define UNK_201606C_ARRAY (unk_2000000 + 0x1606C) // lazy define but whatever.
 
diff --git a/src/safari_zone.c b/src/safari_zone.c
index 74f1a9f0b..f3fc2a0ad 100644
--- a/src/safari_zone.c
+++ b/src/safari_zone.c
@@ -1,7 +1,7 @@
-#include "field_fadetransition.h"
 #include "global.h"
 #include "safari_zone.h"
 #include "event_data.h"
+#include "field_fadetransition.h"
 #include "field_player_avatar.h"
 #include "main.h"
 #include "rom4.h"
diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c
index 07f90ed17..a64b3eb5f 100644
--- a/src/save_failed_screen.c
+++ b/src/save_failed_screen.c
@@ -1,4 +1,3 @@
-#include "starter_choose.h"
 #include "global.h"
 #include "gba/flash_internal.h"
 #include "save_failed_screen.h"
@@ -8,6 +7,7 @@
 #include "palette.h"
 #include "save.h"
 #include "sprite.h"
+#include "starter_choose.h"
 #include "strings.h"
 #include "task.h"
 #include "text.h"
diff --git a/src/save_menu_util.c b/src/save_menu_util.c
index 19bd178ad..b2dd662d6 100644
--- a/src/save_menu_util.c
+++ b/src/save_menu_util.c
@@ -1,9 +1,9 @@
-#include "region_map.h"
 #include "global.h"
 #include "save_menu_util.h"
 #include "event_data.h"
 #include "menu.h"
 #include "pokedex.h"
+#include "region_map.h"
 #include "string_util.h"
 #include "strings2.h"
 
diff --git a/src/scrcmd.c b/src/scrcmd.c
index 965a1aa88..f309b4f93 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -1,48 +1,48 @@
-#include "decoration_inventory.h"
-#include "field_screen_effect.h"
-#include "field_map_obj.h"
-#include "script_movement.h"
-#include "field_fadetransition.h"
-#include "mystery_event_script.h"
-#include "contest_link_80C2020.h"
-#include "fieldmap.h"
-#include "field_specials.h"
-#include "shop.h"
-#include "party_menu.h"
-#include "field_tasks.h"
-#include "tv.h"
-#include "slot_machine.h"
 #include "global.h"
 #include "battle_setup.h"
 #include "berry.h"
 #include "clock.h"
 #include "coins.h"
+#include "contest_link_80C2020.h"
 #include "contest_painting.h"
 #include "data2.h"
 #include "decoration.h"
+#include "decoration_inventory.h"
 #include "event_data.h"
 #include "field_door.h"
 #include "field_effect.h"
+#include "field_fadetransition.h"
+#include "field_map_obj.h"
 #include "field_map_obj_helpers.h"
 #include "field_message_box.h"
 #include "field_player_avatar.h"
+#include "field_screen_effect.h"
+#include "field_specials.h"
+#include "field_tasks.h"
 #include "field_weather.h"
+#include "fieldmap.h"
 #include "item.h"
 #include "main.h"
 #include "map_obj_lock.h"
 #include "menu.h"
 #include "money.h"
+#include "mystery_event_script.h"
 #include "palette.h"
+#include "party_menu.h"
 #include "pokemon.h"
 #include "rng.h"
 #include "rom4.h"
 #include "rtc.h"
 #include "script.h"
 #include "script_menu.h"
+#include "script_movement.h"
 #include "script_pokemon_80C4.h"
 #include "script_pokemon_80F9.h"
+#include "shop.h"
+#include "slot_machine.h"
 #include "sound.h"
 #include "string_util.h"
+#include "tv.h"
 
 typedef u16 (*SpecialFunc)(void);
 typedef void (*NativeFunc)(void);
diff --git a/src/script_menu.c b/src/script_menu.c
index 98c55e678..4669a362a 100644
--- a/src/script_menu.c
+++ b/src/script_menu.c
@@ -1,7 +1,7 @@
-#include "field_effect.h"
 #include "global.h"
 #include "script_menu.h"
 #include "event_data.h"
+#include "field_effect.h"
 #include "menu.h"
 #include "palette.h"
 #include "script.h"
diff --git a/src/script_movement.c b/src/script_movement.c
index f1033c525..31143ed6f 100644
--- a/src/script_movement.c
+++ b/src/script_movement.c
@@ -1,9 +1,9 @@
-#include "field_map_obj.h"
-#include "util.h"
 #include "global.h"
 #include "script_movement.h"
+#include "field_map_obj.h"
 #include "field_map_obj_helpers.h"
 #include "task.h"
+#include "util.h"
 
 extern u8 *gUnknown_020384F8[];
 
diff --git a/src/script_pokemon_util_80C4BF0.c b/src/script_pokemon_util_80C4BF0.c
index 6f5b941f4..8edae138a 100644
--- a/src/script_pokemon_util_80C4BF0.c
+++ b/src/script_pokemon_util_80C4BF0.c
@@ -1,13 +1,13 @@
-#include "contest_link_80C2020.h"
-#include "daycare.h"
-#include "contest_painting.h"
-#include "debug.h"
-#include "choose_party.h"
 #include "global.h"
 #include "battle.h"
 #include "berry.h"
+#include "choose_party.h"
 #include "contest.h"
+#include "contest_link_80C2020.h"
+#include "contest_painting.h"
 #include "data2.h"
+#include "daycare.h"
+#include "debug.h"
 #include "decompress.h"
 #include "event_data.h"
 #include "items.h"
diff --git a/src/script_pokemon_util_80F99CC.c b/src/script_pokemon_util_80F99CC.c
index 29c4560c0..25c467312 100644
--- a/src/script_pokemon_util_80F99CC.c
+++ b/src/script_pokemon_util_80F99CC.c
@@ -1,13 +1,13 @@
-#include "party_menu.h"
-#include "contest.h"
-#include "choose_party.h"
-#include "pokemon_summary_screen.h"
-#include "field_fadetransition.h"
 #include "global.h"
 #include "battle_party_menu.h"
+#include "choose_party.h"
+#include "contest.h"
 #include "data2.h"
+#include "field_fadetransition.h"
 #include "palette.h"
+#include "party_menu.h"
 #include "pokemon.h"
+#include "pokemon_summary_screen.h"
 #include "rom4.h"
 #include "script.h"
 #include "script_pokemon_80F9.h"
diff --git a/src/secret_base.c b/src/secret_base.c
index 0d558f02b..91878abaf 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -1,25 +1,25 @@
-#include "fieldmap.h"
-#include "field_fadetransition.h"
-#include "main.h"
-#include "map_name_popup.h"
 #include "global.h"
 #include "secret_base.h"
-#include "string_util.h"
-#include "strings.h"
-#include "text.h"
+#include "decoration.h"
 #include "event_data.h"
-#include "vars.h"
+#include "field_camera.h"
+#include "field_fadetransition.h"
+#include "field_player_avatar.h"
+#include "field_weather.h"
+#include "fieldmap.h"
+#include "main.h"
+#include "map_constants.h"
+#include "map_name_popup.h"
+#include "metatile_behavior.h"
+#include "palette.h"
+#include "pokemon.h"
 #include "rom4.h"
 #include "script.h"
-#include "field_player_avatar.h"
-#include "field_camera.h"
-#include "map_constants.h"
+#include "string_util.h"
+#include "strings.h"
 #include "task.h"
-#include "palette.h"
-#include "decoration.h"
-#include "field_weather.h"
-#include "metatile_behavior.h"
-#include "pokemon.h"
+#include "text.h"
+#include "vars.h"
 
 extern u8 gUnknown_020387DC;
 extern u16 gSpecialVar_0x8004;
diff --git a/src/shop.c b/src/shop.c
index 4eee33632..3b315121e 100644
--- a/src/shop.c
+++ b/src/shop.c
@@ -1,14 +1,12 @@
-#include "menu_helpers.h"
-#include "field_fadetransition.h"
-#include "item_menu.h"
-#include "tv.h"
-#include "unknown_task.h"
 #include "global.h"
 #include "shop.h"
 #include "decompress.h"
+#include "field_fadetransition.h"
 #include "field_weather.h"
+#include "item_menu.h"
 #include "main.h"
 #include "menu.h"
+#include "menu_helpers.h"
 #include "money.h"
 #include "palette.h"
 #include "script.h"
@@ -16,6 +14,8 @@
 #include "sprite.h"
 #include "strings.h"
 #include "task.h"
+#include "tv.h"
+#include "unknown_task.h"
 
 struct UnknownShopStruct
 {
diff --git a/src/smokescreen.c b/src/smokescreen.c
index 327b6ae6f..8345cb6ad 100644
--- a/src/smokescreen.c
+++ b/src/smokescreen.c
@@ -1,8 +1,8 @@
-#include "util.h"
 #include "global.h"
 #include "data2.h"
 #include "decompress.h"
 #include "sprite.h"
+#include "util.h"
 
 
 static void sub_8046388(struct Sprite *);
diff --git a/src/sound.c b/src/sound.c
index 988feeb2c..c9c4916b0 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -1,9 +1,9 @@
-#include "main.h"
 #include "global.h"
 #include "gba/m4a_internal.h"
 #include "sound.h"
 #include "battle.h"
 #include "m4a.h"
+#include "main.h"
 #include "songs.h"
 #include "task.h"
 
diff --git a/src/start_menu.c b/src/start_menu.c
index 6c3b411bc..f6d50db71 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -1,14 +1,11 @@
-#include "item_menu.h"
-#include "pokenav.h"
-#include "pokemon_menu.h"
-#include "unknown_task.h"
-#include "fieldmap.h"
 #include "global.h"
 #include "start_menu.h"
 #include "event_data.h"
 #include "field_map_obj_helpers.h"
 #include "field_player_avatar.h"
 #include "field_weather.h"
+#include "fieldmap.h"
+#include "item_menu.h"
 #include "load_save.h"
 #include "main.h"
 #include "map_obj_lock.h"
@@ -16,6 +13,8 @@
 #include "option_menu.h"
 #include "palette.h"
 #include "pokedex.h"
+#include "pokemon_menu.h"
+#include "pokenav.h"
 #include "rom4.h"
 #include "safari_zone.h"
 #include "save.h"
@@ -29,6 +28,7 @@
 #include "strings2.h"
 #include "task.h"
 #include "trainer_card.h"
+#include "unknown_task.h"
 
 //Menu actions
 enum {
diff --git a/src/starter_choose.c b/src/starter_choose.c
index dd35ab9df..0e3c6ad16 100644
--- a/src/starter_choose.c
+++ b/src/starter_choose.c
@@ -1,4 +1,3 @@
-#include "unknown_task.h"
 #include "global.h"
 #include "starter_choose.h"
 #include "data2.h"
@@ -15,6 +14,7 @@
 #include "strings.h"
 #include "task.h"
 #include "trig.h"
+#include "unknown_task.h"
 
 extern u16 gScriptResult;
 extern struct SpriteTemplate gUnknown_02024E8C;
diff --git a/src/time_events.c b/src/time_events.c
index f05828bec..e1b9a2e9e 100644
--- a/src/time_events.c
+++ b/src/time_events.c
@@ -1,7 +1,7 @@
-#include "field_weather.h"
 #include "global.h"
 #include "time_events.h"
 #include "event_data.h"
+#include "field_weather.h"
 #include "pokemon.h"
 #include "rng.h"
 #include "rom4.h"
diff --git a/src/title_screen.c b/src/title_screen.c
index 25967a91a..12c31d10a 100644
--- a/src/title_screen.c
+++ b/src/title_screen.c
@@ -1,5 +1,3 @@
-#include "unknown_task.h"
-#include "reset_rtc_screen.h"
 #include "global.h"
 #include "gba/m4a_internal.h"
 #include "title_screen.h"
@@ -11,9 +9,11 @@
 #include "main.h"
 #include "main_menu.h"
 #include "palette.h"
+#include "reset_rtc_screen.h"
 #include "sound.h"
 #include "sprite.h"
 #include "task.h"
+#include "unknown_task.h"
 
 extern u8 gReservedSpritePaletteCount;
 extern struct MusicPlayerInfo gMPlay_BGM;
diff --git a/src/trainer_card.c b/src/trainer_card.c
index d5567b12a..b2a1ad71b 100644
--- a/src/trainer_card.c
+++ b/src/trainer_card.c
@@ -1,10 +1,8 @@
-#include "unknown_task.h"
-#include "easy_chat.h"
-#include "util.h"
-#include "field_effect.h"
 #include "global.h"
 #include "trainer_card.h"
+#include "easy_chat.h"
 #include "event_data.h"
+#include "field_effect.h"
 #include "link.h"
 #include "main.h"
 #include "menu.h"
@@ -19,6 +17,8 @@
 #include "string_util.h"
 #include "strings2.h"
 #include "task.h"
+#include "unknown_task.h"
+#include "util.h"
 
 typedef void (*Callback)(void);
 
diff --git a/src/tv.c b/src/tv.c
index b7a4e206a..0881a2d2b 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -1,29 +1,29 @@
-#include "battle_tower.h"
-#include "field_specials.h"
-#include "region_map.h"
-#include "script_menu.h"
-#include "field_map_obj.h"
 #include "global.h"
 #include "tv.h"
+#include "battle_tower.h"
+#include "contest_painting.h"
 #include "data2.h"
-#include "event_data.h"
-#include "field_message_box.h"
-#include "flags.h"
-#include "rng.h"
-#include "string_util.h"
-#include "text.h"
-#include "species.h"
-#include "pokedex.h"
-#include "naming_screen.h"
-#include "rom4.h"
-#include "map_constants.h"
-#include "strings.h"
-#include "link.h"
 #include "easy_chat.h"
+#include "event_data.h"
+#include "field_map_obj.h"
+#include "field_message_box.h"
+#include "field_specials.h"
+#include "flags.h"
 #include "item.h"
 #include "items.h"
-#include "contest_painting.h"
+#include "link.h"
+#include "map_constants.h"
+#include "naming_screen.h"
+#include "pokedex.h"
+#include "region_map.h"
+#include "rng.h"
+#include "rom4.h"
 #include "rtc.h"
+#include "script_menu.h"
+#include "species.h"
+#include "string_util.h"
+#include "strings.h"
+#include "text.h"
 
 struct UnkTvStruct
 {
diff --git a/src/wallclock.c b/src/wallclock.c
index 1fe4cc19b..7faa177b0 100644
--- a/src/wallclock.c
+++ b/src/wallclock.c
@@ -1,4 +1,3 @@
-#include "unknown_task.h"
 #include "global.h"
 #include "wallclock.h"
 #include "decompress.h"
@@ -11,6 +10,7 @@
 #include "strings2.h"
 #include "task.h"
 #include "trig.h"
+#include "unknown_task.h"
 
 extern u16 gSpecialVar_0x8004;
 extern u8 gMiscClock_Gfx[];
diff --git a/src/wild_encounter.c b/src/wild_encounter.c
index 0746c7a90..143587438 100644
--- a/src/wild_encounter.c
+++ b/src/wild_encounter.c
@@ -1,19 +1,19 @@
-#include "fieldmap.h"
-#include "pokeblock.h.h"
-#include "tv.h"
 #include "global.h"
 #include "wild_encounter.h"
 #include "abilities.h"
 #include "battle_setup.h"
 #include "event_data.h"
 #include "field_player_avatar.h"
+#include "fieldmap.h"
 #include "metatile_behavior.h"
+#include "pokeblock.h.h"
 #include "rng.h"
 #include "roamer.h"
 #include "rom4.h"
 #include "safari_zone.h"
 #include "script.h"
 #include "species.h"
+#include "tv.h"
 
 struct WildPokemon
 {