Sort includes

58 files changed, 140 insertions, 133 deletions

diff --git a/include/asm.h b/include/asm.h
index 0b0fc3006..fe1b3139f 100644
--- a/include/asm.h
+++ b/include/asm.h
@@ -1,10 +1,10 @@
 #ifndef PROJECT_ASM_H
 #define PROJECT_ASM_H
 
-#include "task.h"
+#include "asm_fieldmap.h"
 #include "main.h"
 #include "sprite.h"
-#include "asm_fieldmap.h"
+#include "task.h"
 
 struct FieldInput
 {
diff --git a/include/battle_party_menu.h b/include/battle_party_menu.h
index d0ae8da35..b9c3ad707 100644
--- a/include/battle_party_menu.h
+++ b/include/battle_party_menu.h
@@ -1,6 +1,8 @@
 #ifndef GUARD_BATTLE_PARTY_MENU_H
 #define GUARD_BATTLE_PARTY_MENU_H
 
+#include "task.h"
+
 struct UnknownStruct1
 {
     u8 filler0[0x259];
diff --git a/include/field_control_avatar.h b/include/field_control_avatar.h
index 3f17ebee9..0f8b74d59 100644
--- a/include/field_control_avatar.h
+++ b/include/field_control_avatar.h
@@ -1,6 +1,8 @@
 #ifndef GUARD_FIELDCONTROLAVATAR_H
 #define GUARD_FIELDCONTROLAVATAR_H
 
+#include "asm.h"
+
 void FieldClearPlayerInput(struct FieldInput *pStruct);
 void FieldGetPlayerInput(struct FieldInput *pStruct, u16 keys, u16 heldKeys);
 int sub_8068024(struct FieldInput *pStruct);
diff --git a/include/naming_screen.h b/include/naming_screen.h
index b6b464538..62d0c0029 100644
--- a/include/naming_screen.h
+++ b/include/naming_screen.h
@@ -1,6 +1,8 @@
 #ifndef GUARD_NAMINGSCREEN_H
 #define GUARD_NAMINGSCREEN_H
 
+#include "main.h"
+
 #define KBEVENT_NONE 0
 #define KBEVENT_PRESSED_A 5
 #define KBEVENT_PRESSED_B 6
diff --git a/include/trainer_see.h b/include/trainer_see.h
index dd04912e7..0113143b6 100644
--- a/include/trainer_see.h
+++ b/include/trainer_see.h
@@ -1,6 +1,7 @@
 #ifndef GUARD_TRAINER_SEE_H
 #define GUARD_TRAINER_SEE_H
 
+#include "sprite.h"
 #include "task.h"
 
 bool8 CheckTrainers(void);
diff --git a/src/battle_ai.c b/src/battle_ai.c
index 07f319e40..cefa8fecb 100644
--- a/src/battle_ai.c
+++ b/src/battle_ai.c
@@ -1,14 +1,14 @@
 #include "global.h"
+#include "battle_ai.h"
 #include "abilities.h"
 #include "asm.h"
 #include "battle.h"
 #include "battle_move_effects.h"
 #include "item.h"
+#include "moves.h"
 #include "pokemon.h"
 #include "rng.h"
 #include "species.h"
-#include "moves.h"
-#include "battle_ai.h"
 
 extern void sub_801CAF8(u8, u8);
 
diff --git a/src/battle_anim.c b/src/battle_anim.c
index c381f4f87..a18453fa1 100644
--- a/src/battle_anim.c
+++ b/src/battle_anim.c
@@ -1,4 +1,5 @@
 #include "global.h"
+#include "battle_anim.h"
 #include "asm.h"
 #include "decompress.h"
 #include "m4a.h"
@@ -6,7 +7,6 @@
 #include "sound.h"
 #include "sprite.h"
 #include "task.h"
-#include "battle_anim.h"
 
 extern u8 unk_2000000[];
 extern u16 gUnknown_02024A6A[4];
diff --git a/src/battle_anim_80A7E7C.c b/src/battle_anim_80A7E7C.c
index 474d268a0..931b923b7 100644
--- a/src/battle_anim_80A7E7C.c
+++ b/src/battle_anim_80A7E7C.c
@@ -1,8 +1,8 @@
 #include "global.h"
+#include "battle_anim.h"
 #include "sprite.h"
 #include "task.h"
 #include "trig.h"
-#include "battle_anim.h"
 
 #define TASK gTasks[task]
 #define SPRITE gSprites[TASK.data[0]]
diff --git a/src/battle_party_menu.c b/src/battle_party_menu.c
index 79c926e0d..d61da637e 100644
--- a/src/battle_party_menu.c
+++ b/src/battle_party_menu.c
@@ -1,4 +1,5 @@
 #include "global.h"
+#include "battle_party_menu.h"
 #include "asm.h"
 #include "main.h"
 #include "menu.h"
@@ -9,7 +10,6 @@
 #include "string_util.h"
 #include "task.h"
 #include "text.h"
-#include "battle_party_menu.h"
 
 extern u8 IsLinkDoubleBattle(void);
 extern void TryCreatePartyMenuMonIcon(u8, u8, struct Pokemon *);
diff --git a/src/battle_setup.c b/src/battle_setup.c
index a8f94baed..abc0b978d 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -3,15 +3,21 @@
 #include "asm.h"
 #include "battle.h"
 #include "event_data.h"
+#include "field_control_avatar.h"
+#include "field_map_obj_helpers.h"
 #include "field_message_box.h"
 #include "field_player_avatar.h"
+#include "field_screeneffect.h"
 #include "main.h"
+#include "map_constants.h"
 #include "metatile_behavior.h"
+#include "opponent_constants.h"
 #include "palette.h"
 #include "rng.h"
 #include "rom4.h"
 #include "safari_zone.h"
 #include "script.h"
+#include "script_pokemon_80C4.h"
 #include "songs.h"
 #include "sound.h"
 #include "species.h"
@@ -20,12 +26,6 @@
 #include "task.h"
 #include "text.h"
 #include "trainer.h"
-#include "field_screeneffect.h"
-#include "map_constants.h"
-#include "opponent_constants.h"
-#include "script_pokemon_80C4.h"
-#include "field_map_obj_helpers.h"
-#include "field_control_avatar.h"
 
 extern u16 gScriptResult;
 
diff --git a/src/berry.c b/src/berry.c
index 99c9f6342..636028adf 100644
--- a/src/berry.c
+++ b/src/berry.c
@@ -1,12 +1,12 @@
 #include "global.h"
 #include "berry.h"
 #include "asm.h"
+#include "field_control_avatar.h"
 #include "item.h"
 #include "items.h"
 #include "main.h"
 #include "rng.h"
 #include "text.h"
-#include "field_control_avatar.h"
 
 #define BERRY_NAME_LENGTH 6
 
diff --git a/src/bike.c b/src/bike.c
index 7693c7539..4faa6329f 100644
--- a/src/bike.c
+++ b/src/bike.c
@@ -1,14 +1,14 @@
 #include "global.h"
-#include "global.fieldmap.h"
-#include "flags.h"
+#include "bike.h"
 #include "asm.h"
 #include "field_map_obj.h"
 #include "field_player_avatar.h"
+#include "flags.h"
+#include "global.fieldmap.h"
 #include "metatile_behavior.h"
+#include "rom4.h"
 #include "songs.h"
 #include "sound.h"
-#include "rom4.h"
-#include "bike.h"
 
 extern u8 sub_80608A4(u8);
 
diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c
index 94643691c..220e8420c 100644
--- a/src/braille_puzzles.c
+++ b/src/braille_puzzles.c
@@ -1,4 +1,5 @@
 #include "global.h"
+#include "braille_puzzles.h"
 #include "asm.h"
 #include "event_data.h"
 #include "field_camera.h"
@@ -6,14 +7,13 @@
 #include "flags.h"
 #include "map_obj_lock.h"
 #include "menu.h"
+#include "rom6.h"
 #include "script.h"
 #include "songs.h"
 #include "sound.h"
 #include "species.h"
 #include "task.h"
 #include "text.h"
-#include "braille_puzzles.h"
-#include "rom6.h"
 
 extern u8 gPlayerPartyCount;
 extern u8 gLastFieldPokeMenuOpened;
diff --git a/src/clock.c b/src/clock.c
index fd9e6915a..ceb140774 100644
--- a/src/clock.c
+++ b/src/clock.c
@@ -1,4 +1,5 @@
 #include "global.h"
+#include "clock.h"
 #include "berry.h"
 #include "event_data.h"
 #include "lottery_corner.h"
@@ -6,7 +7,6 @@
 #include "rom4.h"
 #include "rtc.h"
 #include "wallclock.h"
-#include "clock.h"
 
 extern void sub_80FA220(u16);
 extern void sub_80BE8C4(u16);
diff --git a/src/contest_painting.c b/src/contest_painting.c
index 41f6afabf..08244597e 100644
--- a/src/contest_painting.c
+++ b/src/contest_painting.c
@@ -1,4 +1,5 @@
 #include "global.h"
+#include "contest_painting.h"
 #include "asm.h"
 #include "decompress.h"
 #include "main.h"
@@ -8,7 +9,6 @@
 #include "sprite.h"
 #include "string_util.h"
 #include "text.h"
-#include "contest_painting.h"
 
 extern u8 unk_2000000[];
 extern u8 gUnknown_03000750;
diff --git a/src/dewford_trend.c b/src/dewford_trend.c
index b2a8e81da..55314b1c6 100644
--- a/src/dewford_trend.c
+++ b/src/dewford_trend.c
@@ -1,10 +1,10 @@
 #include "global.h"
+#include "dewford_trend.h"
 #include "asm.h"
 #include "event_data.h"
 #include "link.h"
 #include "rng.h"
 #include "text.h"
-#include "dewford_trend.h"
 
 extern u8 unk_2000000[];
 
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c
index 9bff65004..1f049c0bd 100644
--- a/src/field_control_avatar.c
+++ b/src/field_control_avatar.c
@@ -1,6 +1,8 @@
 #include "global.h"
+#include "field_control_avatar.h"
 #include "asm.h"
 #include "battle_setup.h"
+#include "bike.h"
 #include "event_data.h"
 #include "field_player_avatar.h"
 #include "flags.h"
@@ -13,8 +15,6 @@
 #include "trainer_see.h"
 #include "vars.h"
 #include "wild_encounter.h"
-#include "bike.h"
-#include "field_control_avatar.h"
 
 struct Coords32
 {
diff --git a/src/field_door.c b/src/field_door.c
index 4b1390d11..fa763a5d6 100644
--- a/src/field_door.c
+++ b/src/field_door.c
@@ -1,9 +1,9 @@
 #include "global.h"
+#include "field_door.h"
 #include "asm.h"
 #include "field_camera.h"
 #include "metatile_behavior.h"
 #include "task.h"
-#include "field_door.h"
 
 extern struct DoorAnimFrame gDoorOpenAnimFrames[];
 extern struct DoorAnimFrame gDoorCloseAnimFrames[];
diff --git a/src/field_effect.c b/src/field_effect.c
index 4727aba54..1b2346a00 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -1,8 +1,8 @@
 #include "global.h"
 #include "field_effect.h"
+#include "field_screeneffect.h"
 #include "sprite.h"
 #include "text.h"
-#include "field_screeneffect.h"
 
 typedef bool8 (*FldEffCmd)(u8 **, u32 *);
 
diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c
index 3f86299df..f7d591c69 100644
--- a/src/field_fadetransition.c
+++ b/src/field_fadetransition.c
@@ -1,9 +1,9 @@
 #include "global.h"
 #include "gba/syscall.h"
+#include "field_screeneffect.h"
 #include "global.fieldmap.h"
 #include "script.h"
 #include "task.h"
-#include "field_screeneffect.h"
 
 void palette_bg_fill_white(void);
 void palette_bg_fill_black(void);
diff --git a/src/field_map_obj.c b/src/field_map_obj.c
index e56ea9787..e049aae57 100644
--- a/src/field_map_obj.c
+++ b/src/field_map_obj.c
@@ -1,8 +1,8 @@
 #include "global.h"
+#include "field_map_obj.h"
 #include "asm.h"
 #include "berry.h"
 #include "event_data.h"
-#include "field_map_obj.h"
 #include "field_player_avatar.h"
 #include "palette.h"
 #include "rom4.h"
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c
index 53bbf013b..6a0fe1dce 100644
--- a/src/field_player_avatar.c
+++ b/src/field_player_avatar.c
@@ -2,10 +2,13 @@
 #include "field_player_avatar.h"
 #include "asm.h"
 #include "asm_fieldmap.h"
+#include "bike.h"
 #include "event_data.h"
 #include "field_effect.h"
 #include "field_map_obj.h"
+#include "field_map_obj_helpers.h"
 #include "main.h"
+#include "map_object_constants.h"
 #include "menu.h"
 #include "metatile_behavior.h"
 #include "rng.h"
@@ -15,9 +18,6 @@
 #include "sound.h"
 #include "task.h"
 #include "wild_encounter.h"
-#include "map_object_constants.h"
-#include "bike.h"
-#include "field_map_obj_helpers.h"
 
 extern u8 gOtherText_OhABite[];
 extern u8 gOtherText_PokeOnHook[];
diff --git a/src/fieldmap.c b/src/fieldmap.c
index b34a51bdc..0301115d5 100644
--- a/src/fieldmap.c
+++ b/src/fieldmap.c
@@ -1,6 +1,6 @@
 #include "global.h"
-#include "palette.h"
 #include "fieldmap.h"
+#include "palette.h"
 
 struct BackupMapData
 {
diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c
index f432027ab..1f5f49850 100644
--- a/src/fldeff_cut.c
+++ b/src/fldeff_cut.c
@@ -1,18 +1,18 @@
 #include "global.h"
 #include "asm.h"
+#include "field_camera.h"
+#include "field_effect.h"
+#include "field_player_avatar.h"
+#include "map_obj_lock.h"
 #include "metatile_behavior.h"
 #include "metatile_behaviors.h"
-#include "field_player_avatar.h"
-#include "field_effect.h"
 #include "rom4.h"
-#include "script.h"
 #include "rom6.h"
+#include "script.h"
+#include "songs.h"
 #include "sound.h"
-#include "field_camera.h"
 #include "sprite.h"
-#include "songs.h"
 #include "trig.h"
-#include "map_obj_lock.h"
 
 extern u8 gCutGrassSpriteArray[8]; // seems to be an array of 8 sprite IDs
 
diff --git a/src/fldeff_strength.c b/src/fldeff_strength.c
index e7e7473d0..f9db40a67 100644
--- a/src/fldeff_strength.c
+++ b/src/fldeff_strength.c
@@ -1,12 +1,12 @@
 #include "global.h"
 #include "asm.h"
+#include "braille_puzzles.h"
 #include "field_effect.h"
 #include "pokemon.h"
+#include "rom6.h"
 #include "script.h"
 #include "task.h"
 #include "text.h"
-#include "braille_puzzles.h"
-#include "rom6.h"
 
 static void sub_811AA18(void);
 static void sub_811AA38(void);
diff --git a/src/fldeff_sweetscent.c b/src/fldeff_sweetscent.c
index a6f569942..4e8214b07 100644
--- a/src/fldeff_sweetscent.c
+++ b/src/fldeff_sweetscent.c
@@ -1,14 +1,14 @@
 #include "global.h"
 #include "asm.h"
-#include "task.h"
-#include "sound.h"
-#include "wild_encounter.h"
-#include "sprite.h"
 #include "field_effect.h"
-#include "palette.h"
-#include "script.h"
 #include "field_player_avatar.h"
+#include "palette.h"
 #include "rom6.h"
+#include "script.h"
+#include "sound.h"
+#include "sprite.h"
+#include "task.h"
+#include "wild_encounter.h"
 
 static void sub_812BFD4(void);
 static void sub_812C01C(void);
diff --git a/src/hof_pc.c b/src/hof_pc.c
index 7c01020d5..fcbc3f7e1 100644
--- a/src/hof_pc.c
+++ b/src/hof_pc.c
@@ -1,9 +1,9 @@
 #include "global.h"
-#include "script.h"
 #include "main.h"
-#include "script_menu.h"
 #include "palette.h"
 #include "rom4.h"
+#include "script.h"
+#include "script_menu.h"
 #include "task.h"
 
 extern void sub_81428CC(void);
diff --git a/src/intro.c b/src/intro.c
index fd0a3316e..a6b6b2734 100644
--- a/src/intro.c
+++ b/src/intro.c
@@ -1,8 +1,8 @@
 #include "global.h"
+#include "gba/m4a_internal.h"
 #include "intro.h"
 #include "asm.h"
 #include "decompress.h"
-#include "gba/m4a_internal.h"
 #include "libgncmultiboot.h"
 #include "link.h"
 #include "m4a.h"
diff --git a/src/item_use.c b/src/item_use.c
index 309fa5b98..4fcf8d2c1 100644
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -1,8 +1,13 @@
 #include "global.h"
 #include "asm.h"
+#include "battle.h"
+#include "berry.h"
+#include "coins.h"
 #include "event_data.h"
-#include "field_player_avatar.h"
 #include "field_map_obj_helpers.h"
+#include "field_player_avatar.h"
+#include "field_screeneffect.h"
+#include "fieldmap.h"
 #include "item.h"
 #include "items.h"
 #include "mail.h"
@@ -16,12 +21,7 @@
 #include "sound.h"
 #include "string_util.h"
 #include "task.h"
-#include "field_screeneffect.h"
-#include "fieldmap.h"
-#include "coins.h"
-#include "berry.h"
 #include "vars.h"
-#include "battle.h"
 
 extern void (* const gExitToOverworldFuncList[])();
 extern void (* gUnknown_03005D00)(u8);
diff --git a/src/mail.c b/src/mail.c
index 97c8dab5b..a0a47e98f 100644
--- a/src/mail.c
+++ b/src/mail.c
@@ -3,13 +3,13 @@
 #include "asm.h"
 #include "items.h"
 #include "menu.h"
+#include "name_string_util.h"
 #include "palette.h"
 #include "rom4.h"
 #include "sprite.h"
 #include "string_util.h"
 #include "task.h"
 #include "text.h"
-#include "name_string_util.h"
 
 struct UnkMailStruct
 {
diff --git a/src/main.c b/src/main.c
index 0e93fb89f..3275c817e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,8 +1,8 @@
 #include "global.h"
-#include "main.h"
-#include "asm.h"
 #include "gba/flash_internal.h"
 #include "gba/m4a_internal.h"
+#include "main.h"
+#include "asm.h"
 #include "intro.h"
 #include "link.h"
 #include "load_save.h"
diff --git a/src/main_menu.c b/src/main_menu.c
index 3c8df52d4..284fbac52 100644
--- a/src/main_menu.c
+++ b/src/main_menu.c
@@ -5,6 +5,7 @@
 #include "event_data.h"
 #include "menu.h"
 #include "mystery_event_menu.h"
+#include "naming_screen.h"
 #include "option_menu.h"
 #include "palette.h"
 #include "rom4.h"
@@ -17,7 +18,6 @@
 #include "task.h"
 #include "text.h"
 #include "title_screen.h"
-#include "naming_screen.h"
 
 #define BirchSpeechUpdateWindowText() ((u8)MenuUpdateWindowText_OverrideLineLength(24))
 
diff --git a/src/map_obj_lock.c b/src/map_obj_lock.c
index e500deca0..713ca03f9 100644
--- a/src/map_obj_lock.c
+++ b/src/map_obj_lock.c
@@ -1,9 +1,9 @@
 #include "global.h"
 #include "map_obj_lock.h"
 #include "asm.h"
+#include "field_map_obj_helpers.h"
 #include "field_player_avatar.h"
 #include "task.h"
-#include "field_map_obj_helpers.h"
 
 extern u16 gScriptFacing;
 
diff --git a/src/matsuda_debug_menu.c b/src/matsuda_debug_menu.c
index 6177d9edb..39c338658 100644
--- a/src/matsuda_debug_menu.c
+++ b/src/matsuda_debug_menu.c
@@ -1,5 +1,7 @@
 #include "global.h"
+#include "matsuda_debug_menu.h"
 #include "asm.h"
+#include "contest.h"
 #include "link.h"
 #include "main.h"
 #include "menu.h"
@@ -10,8 +12,6 @@
 #include "string_util.h"
 #include "task.h"
 #include "text.h"
-#include "contest.h"
-#include "matsuda_debug_menu.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 c01a51091..70bb6d669 100644
--- a/src/mauville_old_man.c
+++ b/src/mauville_old_man.c
@@ -1,9 +1,9 @@
 #include "global.h"
-#include "string_util.h"
-#include "menu.h"
-#include "script.h"
 #include "asm.h"
+#include "menu.h"
 #include "rng.h"
+#include "script.h"
+#include "string_util.h"
 
 extern u16 gScriptResult;
 extern u16 gSpecialVar_0x8004;
diff --git a/src/naming_screen.c b/src/naming_screen.c
index 54a796264..cd108740b 100644
--- a/src/naming_screen.c
+++ b/src/naming_screen.c
@@ -1,4 +1,5 @@
 #include "global.h"
+#include "naming_screen.h"
 #include "asm.h"
 #include "main.h"
 #include "menu.h"
@@ -10,7 +11,6 @@
 #include "task.h"
 #include "text.h"
 #include "trig.h"
-#include "naming_screen.h"
 
 extern u8 GetRivalAvatarGraphicsIdByStateIdAndGender(u8, u8);
 extern u8 CreateMonIcon();
diff --git a/src/new_game.c b/src/new_game.c
index 82a26b52b..fc8272f18 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -2,6 +2,7 @@
 #include "new_game.h"
 #include "asm.h"
 #include "berry.h"
+#include "dewford_trend.h"
 #include "event_data.h"
 #include "lottery_corner.h"
 #include "play_time.h"
@@ -11,7 +12,6 @@
 #include "rom4.h"
 #include "rtc.h"
 #include "script.h"
-#include "dewford_trend.h"
 
 extern u8 gDifferentSaveFile;
 
diff --git a/src/player_pc.c b/src/player_pc.c
index cb70539bf..fa0c39a19 100644
--- a/src/player_pc.c
+++ b/src/player_pc.c
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "asm.h"
+#include "field_screeneffect.h"
 #include "item.h"
 #include "main.h"
 #include "menu.h"
@@ -8,7 +9,6 @@
 #include "sound.h"
 #include "string_util.h"
 #include "task.h"
-#include "field_screeneffect.h"
 
 extern void DisplayItemMessageOnField(u8, u8*, TaskFunc, u16);
 extern void ItemStorageMenuProcessInput(u8);
diff --git a/src/pokedex.c b/src/pokedex.c
index bd6125f7c..a5dcfe049 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -1,9 +1,9 @@
 #include "global.h"
+#include "gba/m4a_internal.h"
 #include "pokedex.h"
 #include "asm.h"
 #include "decompress.h"
 #include "event_data.h"
-#include "gba/m4a_internal.h"
 #include "m4a.h"
 #include "main.h"
 #include "menu.h"
diff --git a/src/post_battle_event_funcs.c b/src/post_battle_event_funcs.c
index 56e1518eb..f0b88025c 100644
--- a/src/post_battle_event_funcs.c
+++ b/src/post_battle_event_funcs.c
@@ -1,10 +1,10 @@
 #include "global.h"
-#include "main.h"
-#include "script_pokemon_80C4.h"
 #include "event_data.h"
+#include "load_save.h"
+#include "main.h"
 #include "pokemon.h"
 #include "rom4.h"
-#include "load_save.h"
+#include "script_pokemon_80C4.h"
 
 extern void sub_8141F90(void);
 
diff --git a/src/record_mixing.c b/src/record_mixing.c
index 57a6790f1..c08128637 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -1,6 +1,7 @@
 #include "global.h"
 #include "record_mixing.h"
 #include "asm.h"
+#include "dewford_trend.h"
 #include "event_data.h"
 #include "link.h"
 #include "menu.h"
@@ -10,7 +11,6 @@
 #include "sound.h"
 #include "string_util.h"
 #include "task.h"
-#include "dewford_trend.h"
 
 extern void *recordMixingSecretBases;
 extern void *recordMixingTvShows;
diff --git a/src/rom4.c b/src/rom4.c
index cc734cad9..ba1b31348 100644
--- a/src/rom4.c
+++ b/src/rom4.c
@@ -4,12 +4,16 @@
 #include "asm_fieldmap.h"
 #include "battle_setup.h"
 #include "berry.h"
+#include "clock.h"
 #include "event_data.h"
 #include "field_camera.h"
+#include "field_control_avatar.h"
 #include "field_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_screeneffect.h"
 #include "field_special_scene.h"
 #include "heal_location.h"
 #include "link.h"
@@ -23,17 +27,13 @@
 #include "rng.h"
 #include "safari_zone.h"
 #include "script.h"
+#include "script_pokemon_80C4.h"
 #include "songs.h"
 #include "sound.h"
 #include "start_menu.h"
 #include "task.h"
 #include "tileset_anim.h"
-#include "field_screeneffect.h"
 #include "wild_encounter.h"
-#include "script_pokemon_80C4.h"
-#include "clock.h"
-#include "field_map_obj_helpers.h"
-#include "field_control_avatar.h"
 
 #ifdef SAPPHIRE
 #define LEGENDARY_MUSIC BGM_OOAME  // Heavy Rain
diff --git a/src/rom6.c b/src/rom6.c
index 037516489..0cc510914 100644
--- a/src/rom6.c
+++ b/src/rom6.c
@@ -1,5 +1,7 @@
 #include "global.h"
+#include "rom6.h"
 #include "asm.h"
+#include "braille_puzzles.h"
 #include "field_effect.h"
 #include "field_player_avatar.h"
 #include "rom4.h"
@@ -8,8 +10,6 @@
 #include "sound.h"
 #include "sprite.h"
 #include "task.h"
-#include "rom6.h"
-#include "braille_puzzles.h"
 
 extern u16 gScriptLastTalked;
 extern u32 gUnknown_0202FF84[];
diff --git a/src/rom_8077ABC.c b/src/rom_8077ABC.c
index 412361161..5dd90ce28 100644
--- a/src/rom_8077ABC.c
+++ b/src/rom_8077ABC.c
@@ -1,12 +1,12 @@
 #include "global.h"
 #include "battle.h"
-#include "sprite.h"
-#include "species.h"
-#include "trig.h"
-#include "task.h"
 #include "blend_palette.h"
 #include "decompress.h"
 #include "palette.h"
+#include "species.h"
+#include "sprite.h"
+#include "task.h"
+#include "trig.h"
 
 #define GET_UNOWN_LETTER(personality) ((\
 	  (((personality & 0x03000000) >> 24) << 6) \
diff --git a/src/save.c b/src/save.c
index b5934e231..72ec3b251 100644
--- a/src/save.c
+++ b/src/save.c
@@ -1,6 +1,6 @@
 #include "global.h"
-#include "gba/flash_internal.h"
 #include "gba/gba.h"
+#include "gba/flash_internal.h"
 #include "save.h"
 #include "asm.h"
 #include "load_save.h"
diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c
index dd0e1b966..c2f77d27d 100644
--- a/src/save_failed_screen.c
+++ b/src/save_failed_screen.c
@@ -1,6 +1,6 @@
 #include "global.h"
-#include "asm.h"
 #include "gba/flash_internal.h"
+#include "asm.h"
 #include "m4a.h"
 #include "main.h"
 #include "menu.h"
diff --git a/src/scrcmd.c b/src/scrcmd.c
index 8d35def5c..7569462e6 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -3,14 +3,17 @@
 #include "asm_fieldmap.h"
 #include "battle_setup.h"
 #include "berry.h"
+#include "clock.h"
 #include "coins.h"
+#include "contest_painting.h"
 #include "decoration.h"
 #include "event_data.h"
+#include "field_door.h"
 #include "field_effect.h"
+#include "field_map_obj_helpers.h"
 #include "field_message_box.h"
 #include "field_player_avatar.h"
-#include "field_map_obj_helpers.h"
-#include "field_door.h"
+#include "field_screeneffect.h"
 #include "item.h"
 #include "main.h"
 #include "map_obj_lock.h"
@@ -22,14 +25,11 @@
 #include "rom4.h"
 #include "rtc.h"
 #include "script.h"
-#include "sound.h"
-#include "string_util.h"
-#include "field_screeneffect.h"
 #include "script_menu.h"
-#include "script_pokemon_80F9.h"
 #include "script_pokemon_80C4.h"
-#include "clock.h"
-#include "contest_painting.h"
+#include "script_pokemon_80F9.h"
+#include "sound.h"
+#include "string_util.h"
 
 typedef u16 (*SpecialFunc)(void);
 typedef void (*NativeFunc)(void);
diff --git a/src/script_menu.c b/src/script_menu.c
index de3dd7269..22afadbce 100644
--- a/src/script_menu.c
+++ b/src/script_menu.c
@@ -1,13 +1,13 @@
 #include "global.h"
+#include "script_menu.h"
 #include "event_data.h"
 #include "menu.h"
 #include "palette.h"
 #include "script.h"
 #include "sound.h"
 #include "sprite.h"
-#include "task.h"
 #include "strings.h"
-#include "script_menu.h"
+#include "task.h"
 
 // multichoice lists
 const struct MenuAction MultichoiceList_00[] =
diff --git a/src/script_movement.c b/src/script_movement.c
index dcd772d5f..13d0ff7ac 100644
--- a/src/script_movement.c
+++ b/src/script_movement.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "asm.h"
-#include "task.h"
 #include "field_map_obj_helpers.h"
+#include "task.h"
 
 extern const u32 gBitTable[];
 extern u8 *gUnknown_020384F8[];
diff --git a/src/script_pokemon_util_80C4BF0.c b/src/script_pokemon_util_80C4BF0.c
index ba1545861..a65a6ae9e 100644
--- a/src/script_pokemon_util_80C4BF0.c
+++ b/src/script_pokemon_util_80C4BF0.c
@@ -1,22 +1,22 @@
 #include "global.h"
-#include "contest.h"
-#include "rom4.h"
-#include "main.h"
-#include "battle.h"
-#include "event_data.h"
-#include "pokemon.h"
-#include "task.h"
-#include "menu.h"
-#include "decompress.h"
-#include "link.h"
-#include "rng.h"
-#include "pokedex.h"
 #include "asm.h"
-#include "species.h"
+#include "battle.h"
 #include "berry.h"
+#include "contest.h"
+#include "decompress.h"
+#include "event_data.h"
 #include "items.h"
+#include "link.h"
 #include "load_save.h"
+#include "main.h"
+#include "menu.h"
+#include "pokedex.h"
+#include "pokemon.h"
+#include "rng.h"
+#include "rom4.h"
 #include "script_pokemon_80C4.h"
+#include "species.h"
+#include "task.h"
 
 #define CONTEST_ENTRY_PIC_LEFT 10
 #define CONTEST_ENTRY_PIC_TOP 3
diff --git a/src/script_pokemon_util_80F99CC.c b/src/script_pokemon_util_80F99CC.c
index 1a848c665..1f12c4943 100644
--- a/src/script_pokemon_util_80F99CC.c
+++ b/src/script_pokemon_util_80F99CC.c
@@ -1,15 +1,15 @@
 #include "global.h"
-#include "script.h"
-#include "task.h"
-#include "palette.h"
-#include "battle_party_menu.h"
-#include "sound.h"
 #include "asm.h"
-#include "rom4.h"
+#include "battle_party_menu.h"
+#include "palette.h"
 #include "pokemon.h"
-#include "text.h"
-#include "string_util.h"
+#include "rom4.h"
+#include "script.h"
 #include "script_pokemon_80F9.h"
+#include "sound.h"
+#include "string_util.h"
+#include "task.h"
+#include "text.h"
 
 extern u8 gPlayerPartyCount;
 extern u16 gSpecialVar_0x8004;
diff --git a/src/shop.c b/src/shop.c
index 3a0554e15..a533936c5 100644
--- a/src/shop.c
+++ b/src/shop.c
@@ -1,15 +1,15 @@
 #include "global.h"
+#include "asm.h"
+#include "decompress.h"
+#include "field_screeneffect.h"
+#include "main.h"
 #include "menu.h"
+#include "money.h"
+#include "palette.h"
 #include "script.h"
-#include "task.h"
-#include "main.h"
 #include "sound.h"
-#include "field_screeneffect.h"
-#include "palette.h"
 #include "sprite.h"
-#include "asm.h"
-#include "decompress.h"
-#include "money.h"
+#include "task.h"
 
 struct UnknownShopStruct
 {
diff --git a/src/smokescreen.c b/src/smokescreen.c
index 20808331f..d7ca7167c 100644
--- a/src/smokescreen.c
+++ b/src/smokescreen.c
@@ -1,6 +1,6 @@
 #include "global.h"
-#include "sprite.h"
 #include "decompress.h"
+#include "sprite.h"
 
 extern u8 CreateInvisibleSpriteWithCallback(void (*)(struct Sprite *));
 
diff --git a/src/sound.c b/src/sound.c
index ea8d5b49c..3256c4d67 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -1,8 +1,8 @@
 #include "global.h"
+#include "gba/m4a_internal.h"
 #include "sound.h"
 #include "asm.h"
 #include "battle.h"
-#include "gba/m4a_internal.h"
 #include "m4a.h"
 #include "songs.h"
 #include "task.h"
diff --git a/src/start_menu.c b/src/start_menu.c
index 1fc9b6363..48217219d 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -2,7 +2,9 @@
 #include "start_menu.h"
 #include "asm.h"
 #include "event_data.h"
+#include "field_map_obj_helpers.h"
 #include "field_player_avatar.h"
+#include "field_screeneffect.h"
 #include "load_save.h"
 #include "main.h"
 #include "map_obj_lock.h"
@@ -21,8 +23,6 @@
 #include "string_util.h"
 #include "task.h"
 #include "trainer_card.h"
-#include "field_screeneffect.h"
-#include "field_map_obj_helpers.h"
 
 //Menu actions
 enum {
diff --git a/src/title_screen.c b/src/title_screen.c
index 1565abf62..dd6a858f6 100644
--- a/src/title_screen.c
+++ b/src/title_screen.c
@@ -1,10 +1,10 @@
 #include "global.h"
+#include "gba/m4a_internal.h"
 #include "title_screen.h"
 #include "asm.h"
 #include "clear_save_data_menu.h"
 #include "decompress.h"
 #include "event_data.h"
-#include "gba/m4a_internal.h"
 #include "intro.h"
 #include "m4a.h"
 #include "main.h"
diff --git a/src/trainer_card.c b/src/trainer_card.c
index 0070e8a9a..a0b1cf6d1 100644
--- a/src/trainer_card.c
+++ b/src/trainer_card.c
@@ -9,12 +9,12 @@
 #include "palette.h"
 #include "pokedex.h"
 #include "rom4.h"
+#include "script_pokemon_80C4.h"
 #include "songs.h"
 #include "sound.h"
 #include "sprite.h"
 #include "string_util.h"
 #include "task.h"
-#include "script_pokemon_80C4.h"
 
 typedef void (*Callback)(void);
 
diff --git a/src/trainer_see.c b/src/trainer_see.c
index 56085f9be..9d58faab8 100644
--- a/src/trainer_see.c
+++ b/src/trainer_see.c
@@ -1,4 +1,5 @@
 #include "global.h"
+#include "trainer_see.h"
 #include "asm.h"
 #include "asm_fieldmap.h"
 #include "battle_setup.h"
@@ -8,7 +9,6 @@
 #include "script.h"
 #include "sprite.h"
 #include "task.h"
-#include "trainer_see.h"
 
 extern bool8 (*gIsTrainerInRange[])(struct MapObject *, u16, s16, s16);
 extern bool8 (*gTrainerSeeFuncList[])(u8, struct Task *, struct MapObject *);