Remove redundant include lines

src/bag.c

@@ -1,5 +1,4 @@
 #include "global.h"
-#include "task.h"
 #include "palette.h"
 #include "item_menu.h"
 #include "text.h"
@@ -9,7 +8,6 @@
 #include "new_menu_helpers.h"
 #include "menu.h"
 #include "money.h"
-#include "bag.h"
 #include "strings.h"
 
 static const u16 sBagWindowPalF[] = INCBIN_U16("data/bag/bag_window_pal.gbapal");

src/battle_anim_effects_1.c

@@ -1,15 +1,9 @@
 #include "global.h"
-#include "malloc.h"
 #include "battle_anim.h"
 #include "battle_interface.h"
-#include "decompress.h"
 #include "gpu_regs.h"
-#include "graphics.h"
-#include "main.h"
-#include "math_util.h"
 #include "palette.h"
 #include "random.h"
-#include "scanline_effect.h"
 #include "sound.h"
 #include "trig.h"
 #include "util.h"

src/battle_anim_effects_2.c

@@ -5,7 +5,6 @@
 #include "decompress.h"
 #include "gpu_regs.h"
 #include "graphics.h"
-#include "main.h"
 #include "math_util.h"
 #include "palette.h"
 #include "random.h"

src/battle_controller_link_opponent.c

@@ -1,27 +1,20 @@
 #include "global.h"
-#include "bg.h"
 #include "data.h"
 #include "link.h"
-#include "main.h"
 #include "m4a.h"
 #include "palette.h"
 #include "pokeball.h"
 #include "pokemon.h"
-#include "reshow_battle_screen.h"
 #include "sound.h"
 #include "string_util.h"
 #include "task.h"
 #include "text.h"
 #include "util.h"
-#include "window.h"
 #include "battle.h"
-#include "battle_ai_script_commands.h"
 #include "battle_anim.h"
 #include "battle_controllers.h"
 #include "battle_interface.h"
 #include "battle_message.h"
-#include "battle_setup.h"
-#include "battle_tower.h"
 #include "constants/battle_anim.h"
 #include "constants/songs.h"
 #include "constants/facility_trainer_classes.h"

src/battle_controller_link_partner.c

@@ -1,9 +1,6 @@
 #include "global.h"
-#include "bg.h"
 #include "data.h"
 #include "link.h"
-#include "main.h"
-#include "m4a.h"
 #include "palette.h"
 #include "pokeball.h"
 #include "pokemon.h"
@@ -12,16 +9,11 @@
 #include "task.h"
 #include "text.h"
 #include "util.h"
-#include "window.h"
 #include "battle.h"
-#include "battle_ai_script_commands.h"
 #include "battle_anim.h"
 #include "battle_controllers.h"
 #include "battle_interface.h"
 #include "battle_message.h"
-#include "battle_setup.h"
-#include "battle_tower.h"
-#include "reshow_battle_screen.h"
 #include "constants/battle_anim.h"
 #include "constants/songs.h"
 

src/battle_controller_opponent.c

@@ -1,15 +1,10 @@
 #include "global.h"
-#include "bg.h"
 #include "data.h"
-#include "item.h"
-#include "link.h"
 #include "main.h"
 #include "m4a.h"
 #include "task.h"
 #include "text.h"
 #include "util.h"
-#include "window.h"
-#include "palette.h"
 #include "pokeball.h"
 #include "pokemon.h"
 #include "random.h"
@@ -20,15 +15,12 @@
 #include "battle_controllers.h"
 #include "battle_message.h"
 #include "battle_interface.h"
-#include "battle_setup.h"
 #include "battle_tower.h"
 #include "battle_gfx_sfx_util.h"
 #include "battle_ai_script_commands.h"
 #include "battle_ai_switch_items.h"
 #include "trainer_tower.h"
-#include "reshow_battle_screen.h"
 #include "constants/battle_anim.h"
-#include "constants/items.h"
 #include "constants/moves.h"
 #include "constants/songs.h"
 

src/battle_controller_player.c

@@ -10,7 +10,6 @@
 #include "party_menu.h"
 #include "pokeball.h"
 #include "pokemon.h"
-#include "random.h"
 #include "sound.h"
 #include "strings.h"
 #include "string_util.h"
@@ -24,7 +23,6 @@
 #include "battle_controllers.h"
 #include "battle_interface.h"
 #include "battle_message.h"
-#include "battle_setup.h"
 #include "battle_script_commands.h"
 #include "reshow_battle_screen.h"
 #include "constants/battle_anim.h"

src/battle_controller_pokedude.c

@@ -11,7 +11,6 @@
 #include "link.h"
 #include "sound.h"
 #include "event_data.h"
-#include "item.h"
 #include "item_menu.h"
 #include "text.h"
 #include "strings.h"
@@ -25,7 +24,6 @@
 #include "reshow_battle_screen.h"
 #include "teachy_tv.h"
 #include "constants/songs.h"
-#include "constants/items.h"
 #include "constants/moves.h"
 #include "constants/pokemon.h"
 #include "constants/trainers.h"

src/battle_controller_safari.c

@@ -9,16 +9,12 @@
 #include "item_menu.h"
 #include "link.h"
 #include "main.h"
-#include "m4a.h"
 #include "palette.h"
 #include "pokeball.h"
 #include "pokemon.h"
-#include "reshow_battle_screen.h"
 #include "sound.h"
-#include "task.h"
 #include "text.h"
 #include "util.h"
-#include "window.h"
 #include "strings.h"
 #include "constants/songs.h"
 #include "constants/battle_anim.h"

src/battle_gfx_sfx_util.c

@@ -13,8 +13,6 @@
 #include "party_menu.h"
 #include "battle.h"
 #include "battle_main.h"
-#include "battle_controllers.h"
-#include "battle_ai_script_commands.h"
 #include "battle_anim.h"
 #include "battle_interface.h"
 #include "constants/battle_anim.h"

src/battle_interface.c

@@ -12,7 +12,6 @@
 #include "safari_zone.h"
 #include "sound.h"
 #include "string_util.h"
-#include "strings.h"
 #include "text.h"
 #include "window.h"
 #include "constants/songs.h"

src/battle_main.c

@@ -8,13 +8,11 @@
 #include "battle_message.h"
 #include "battle_scripts.h"
 #include "battle_setup.h"
-#include "battle_tower.h"
 #include "battle_string_ids.h"
 #include "berry.h"
 #include "bg.h"
 #include "data.h"
 #include "decompress.h"
-#include "dma3.h"
 #include "event_data.h"
 #include "evolution_scene.h"
 #include "graphics.h"
@@ -40,14 +38,12 @@
 #include "sound.h"
 #include "sprite.h"
 #include "string_util.h"
-#include "strings.h"
 #include "task.h"
 #include "text.h"
 #include "trig.h"
 #include "vs_seeker.h"
 #include "util.h"
 #include "window.h"
-#include "cable_club.h"
 #include "constants/abilities.h"
 #include "constants/battle_move_effects.h"
 #include "constants/battle_setup.h"

src/battle_message.c

@@ -22,7 +22,6 @@
 #include "constants/moves.h"
 #include "constants/items.h"
 #include "constants/trainer_classes.h"
-#include "constants/trainer_tower.h"
 
 struct BattleWindowText
 {

src/battle_script_commands.c

@@ -3,7 +3,6 @@
 #include "util.h"
 #include "pokemon.h"
 #include "random.h"
-#include "data.h"
 #include "text.h"
 #include "sound.h"
 #include "pokedex.h"
@@ -14,7 +13,6 @@
 #include "bg.h"
 #include "string_util.h"
 #include "pokemon_icon.h"
-#include "m4a.h"
 #include "mail.h"
 #include "event_data.h"
 #include "strings.h"
@@ -30,7 +28,6 @@
 #include "battle.h"
 #include "battle_message.h"
 #include "battle_anim.h"
-#include "battle_setup.h"
 #include "battle_ai_script_commands.h"
 #include "battle_scripts.h"
 #include "battle_string_ids.h"

src/battle_setup.c

@@ -22,10 +22,8 @@
 #include "field_player_avatar.h"
 #include "field_screen_effect.h"
 #include "field_message_box.h"
-#include "event_object_movement.h"
 #include "vs_seeker.h"
 #include "battle.h"
-#include "battle_setup.h"
 #include "battle_transition.h"
 #include "battle_controllers.h"
 #include "constants/battle_setup.h"
@@ -37,7 +35,6 @@
 #include "constants/pokemon.h"
 #include "constants/trainers.h"
 #include "constants/trainer_classes.h"
-#include "constants/maps.h"
 
 enum
 {

src/battle_util2.c

@@ -5,7 +5,6 @@
 #include "pokemon.h"
 #include "malloc.h"
 #include "trainer_tower.h"
-#include "battle_util2.h"
 
 void AllocateBattleResources(void)
 {

src/berry_fix_program.c

@@ -1,17 +1,12 @@
 #include "global.h"
 #include "gpu_regs.h"
 #include "multiboot.h"
-#include "malloc.h"
-#include "bg.h"
 #include "graphics.h"
 #include "main.h"
 #include "sprite.h"
 #include "task.h"
 #include "scanline_effect.h"
-#include "window.h"
-#include "text.h"
 #include "help_system.h"
-#include "menu.h"
 #include "m4a.h"
 
 // Static type declarations

src/credits.c

@@ -11,8 +11,6 @@
 #include "decompress.h"
 #include "graphics.h"
 #include "strings.h"
-#include "menu.h"
-#include "field_weather.h"
 #include "trainer_pokemon_sprites.h"
 #include "sound.h"
 #include "constants/species.h"

src/daycare.c

@@ -1,7 +1,6 @@
 #include "global.h"
 #include "gflib.h"
 #include "battle.h"
-#include "daycare.h"
 #include "constants/species.h"
 #include "constants/items.h"
 #include "mail_data.h"

src/decompress.c

@@ -2,7 +2,6 @@
 #include "malloc.h"
 #include "decompress.h"
 #include "pokemon.h"
-#include "text.h"
 #include "constants/species.h"
 
 extern const struct CompressedSpriteSheet gMonFrontPicTable[];

src/digit_obj_util.c

@@ -3,7 +3,6 @@
 #include "decompress.h"
 #include "digit_obj_util.h"
 #include "main.h"
-#include "battle.h"
 
 struct DigitPrinterAlloc
 {

src/diploma.c

@@ -4,7 +4,6 @@
 #include "dynamic_placeholder_text_util.h"
 #include "gba/macro.h"
 #include "gpu_regs.h"
-#include "gpu_regs.h"
 #include "main.h"
 #include "malloc.h"
 #include "menu.h"
@@ -19,7 +18,6 @@
 #include "task.h"
 #include "text.h"
 #include "window.h"
-#include "diploma.h"
 
 struct Diploma
 {

src/dynamic_placeholder_text_util.c

@@ -1,6 +1,5 @@
 #include "global.h"
 #include "text.h"
-#include "dynamic_placeholder_text_util.h"
 #include "string_util.h"
 #include "constants/object_events.h"
 

src/easy_chat.c

@@ -1,33 +1,18 @@
 #include "global.h"
 #include "malloc.h"
-#include "bg.h"
 #include "data.h"
-#include "decompress.h"
-#include "dynamic_placeholder_text_util.h"
 #include "easy_chat.h"
 #include "event_data.h"
 #include "field_message_box.h"
-#include "field_weather.h"
-#include "gpu_regs.h"
-#include "graphics.h"
-#include "main.h"
 #include "mevent.h"
 #include "menu.h"
 #include "mail.h"
-#include "overworld.h"
-#include "palette.h"
 #include "pokedex.h"
 #include "random.h"
-#include "sound.h"
 #include "string_util.h"
 #include "strings.h"
-#include "task.h"
-#include "text_window.h"
-#include "window.h"
 #include "constants/easy_chat.h"
-#include "constants/object_events.h"
 #include "constants/flags.h"
-#include "constants/songs.h"
 #include "constants/species.h"
 
 struct Unk203A120

src/event_object_80688E4.c

@@ -1,6 +1,5 @@
 #include "global.h"
 #include "event_object_movement.h"
-#include "event_object_movement.h"
 #include "field_effect.h"
 #include "field_ground_effect.h"
 

src/evolution_scene.c

@@ -31,8 +31,6 @@
 #include "text.h"
 #include "text_window.h"
 #include "trig.h"
-#include "trade.h"
-#include "util.h"
 #include "battle_string_ids.h"
 #include "constants/species.h"
 #include "constants/songs.h"

src/field_fadetransition.c

@@ -18,7 +18,6 @@
 #include "field_door.h"
 #include "field_effect.h"
 #include "field_screen_effect.h"
-#include "event_object_movement.h"
 #include "field_specials.h"
 #include "event_object_lock.h"
 #include "start_menu.h"

src/fieldmap.c

@@ -3,7 +3,6 @@
 #include "palette.h"
 #include "overworld.h"
 #include "script.h"
-#include "menu.h"
 #include "new_menu_helpers.h"
 #include "quest_log.h"
 #include "fieldmap.h"

src/fldeff_dig.c

@@ -5,8 +5,6 @@
 #include "item_use.h"
 #include "overworld.h"
 #include "party_menu.h"
-#include "sprite.h"
-#include "constants/object_events.h"
 
 static void FieldCallback_Dig(void);
 static void sub_80C9AFC(void);

src/fldeff_rocksmash.c

@@ -3,16 +3,12 @@
 #include "field_player_avatar.h"
 #include "field_effect.h"
 #include "party_menu.h"
-#include "malloc.h"
 #include "event_data.h"
 #include "script.h"
 #include "fldeff.h"
 #include "event_scripts.h"
-#include "field_weather.h"
 #include "sound.h"
-#include "palette.h"
 #include "overworld.h"
-#include "wild_encounter.h"
 #include "event_object_movement.h"
 #include "constants/songs.h"
 #include "constants/object_events.h"

src/fldeff_softboiled.c

@@ -5,7 +5,6 @@
 #include "menu.h"
 #include "new_menu_helpers.h"
 #include "constants/songs.h"
-#include "fldeff.h"
 
 static void sub_80E57E8(u8 taskId);
 static void sub_80E583C(u8 taskId);

src/fldeff_strength.c

@@ -6,7 +6,6 @@
 #include "script.h"
 #include "fldeff.h"
 #include "event_scripts.h"
-#include "constants/songs.h"
 #include "constants/object_events.h"
 
 static void FldEff_UseStrength(void);

src/fldeff_sweetscent.c

@@ -3,7 +3,6 @@
 #include "field_effect.h"
 #include "party_menu.h"
 #include "malloc.h"
-#include "event_data.h"
 #include "script.h"
 #include "fldeff.h"
 #include "event_scripts.h"

src/help_system.c

@@ -10,9 +10,7 @@
 #include "strings.h"
 #include "text.h"
 #include "blit.h"
-#include "event_data.h"
 #include "constants/songs.h"
-#include "constants/flags.h"
 
 extern u8 gGlyphInfo[];
 

src/hof_pc.c

@@ -5,7 +5,6 @@
 #include "script.h"
 #include "script_menu.h"
 #include "task.h"
-#include "hall_of_fame.h"
 #include "bg.h"
 #include "window.h"
 

src/ice.c

@@ -1,10 +1,8 @@
 #include "global.h"
 #include "battle_anim.h"
 #include "bg.h"
-#include "field_weather.h"
 #include "gpu_regs.h"
 #include "graphics.h"
-#include "main.h"
 #include "palette.h"
 #include "random.h"
 #include "sprite.h"

src/item_use.c

@@ -19,7 +19,6 @@
 #include "mail.h"
 #include "main.h"
 #include "malloc.h"
-#include "event_object_movement.h"
 #include "event_object_lock.h"
 #include "metatile_behavior.h"
 #include "new_menu_helpers.h"
@@ -42,7 +41,6 @@
 #include "constants/maps.h"
 #include "constants/moves.h"
 #include "constants/songs.h"
-#include "constants/maps.h"
 
 static EWRAM_DATA void (*sItemUseOnFieldCB)(u8 taskId) = NULL;
 

src/itemfinder.c

@@ -10,7 +10,6 @@
 #include "field_player_avatar.h"
 #include "field_specials.h"
 #include "fieldmap.h"
-#include "itemfinder.h"
 #include "constants/songs.h"
 
 static void Task_NoResponse_CleanUp(u8 taskId);

src/list_menu.c

@@ -8,9 +8,7 @@
 #include "main.h"
 #include "task.h"
 #include "graphics.h"
-#include "decompress.h"
 #include "palette.h"
-#include "malloc.h"
 #include "strings.h"
 #include "sound.h"
 #include "pokemon_icon.h"

src/load_save.c

@@ -8,7 +8,6 @@
 #include "item.h"
 #include "save_location.h"
 #include "berry_powder.h"
-#include "item.h"
 #include "overworld.h"
 #include "quest_log.h"
 

src/main.c

@@ -9,7 +9,6 @@
 #include "random.h"
 #include "dma3.h"
 #include "gba/flash_internal.h"
-#include "battle.h"
 #include "help_system.h"
 #include "sound.h"
 #include "new_menu_helpers.h"
@@ -17,12 +16,10 @@
 #include "overworld.h"
 #include "sprite.h"
 #include "play_time.h"
-#include "pokemon.h"
 #include "intro.h"
 #include "battle_controllers.h"
 #include "scanline_effect.h"
 #include "save_failed_screen.h"
-#include "battle.h"
 
 extern u32 intr_main[];
 

src/menu.c

@@ -1,12 +1,8 @@
 #include "global.h"
 #include "bg.h"
-#include "malloc.h"
 #include "menu.h"
 #include "menu_helpers.h"
-#include "new_menu_helpers.h"
-#include "string_util.h"
 #include "strings.h"
-#include "task.h"
 #include "text_window.h"
 #include "window.h"
 #include "sound.h"

src/menu_indicators.c

@@ -3,7 +3,6 @@
 #include "task.h"
 #include "decompress.h"
 #include "palette.h"
-#include "strings.h"
 #include "sprite.h"
 #include "trig.h"
 #include "list_menu.h"

src/mevent_server.c

@@ -1,10 +1,6 @@
 #include "global.h"
 #include "malloc.h"
-#include "decompress.h"
-#include "overworld.h"
 #include "script.h"
-#include "battle_tower.h"
-#include "mystery_event_script.h"
 #include "mevent.h"
 #include "mevent_server.h"
 

src/mevent_server_helpers.c

@@ -1,14 +1,7 @@
 #include "global.h"
-#include "malloc.h"
-#include "decompress.h"
 #include "util.h"
 #include "link.h"
 #include "link_rfu.h"
-#include "overworld.h"
-#include "script.h"
-#include "battle_tower.h"
-#include "mystery_event_script.h"
-#include "mevent.h"
 #include "mevent_server.h"
 
 static u32 mevent_receive_func(struct mevent_srv_sub *);

src/mevent_show_card.c

@@ -1,7 +1,6 @@
 #include "global.h"
 #include "constants/species.h"
 #include "bg.h"
-#include "gpu_regs.h"
 #include "palette.h"
 #include "decompress.h"
 #include "malloc.h"
@@ -9,9 +8,7 @@
 #include "new_menu_helpers.h"
 #include "pokemon_icon.h"
 #include "mystery_gift_menu.h"
-#include "menu_indicators.h"
 #include "string_util.h"
-#include "link_rfu.h"
 #include "mevent.h"
 #include "battle_anim.h"
 

src/mystery_event_script.c

@@ -3,7 +3,6 @@
 #include "battle_tower.h"
 #include "easy_chat.h"
 #include "event_data.h"
-#include "mail.h"
 #include "mail_data.h"
 #include "mystery_event_script.h"
 #include "pokedex.h"

src/new_game.c

@@ -1,5 +1,4 @@
 #include "global.h"
-#include "new_game.h"
 #include "random.h"
 #include "main.h"
 #include "overworld.h"

src/new_menu_helpers.c

@@ -3,7 +3,6 @@
 #include "dma3.h"
 #include "task.h"
 #include "bg.h"
-#include "gpu_regs.h"
 #include "window.h"
 #include "menu.h"
 #include "menu_helpers.h"
@@ -13,7 +12,6 @@
 #include "field_specials.h"
 #include "text_window.h"
 #include "script.h"
-#include "graphics.h"
 #include "palette.h"
 
 #define DLG_WINDOW_PALETTE_NUM 15

src/oak_speech.c

@@ -4,7 +4,6 @@
 #include "task.h"
 #include "malloc.h"
 #include "gpu_regs.h"
-#include "wild_encounter.h"
 #include "palette.h"
 #include "blend_palette.h"
 #include "text.h"
@@ -25,7 +24,6 @@
 #include "overworld.h"
 #include "random.h"
 #include "data.h"
-#include "oak_speech.h"
 #include "constants/species.h"
 #include "constants/songs.h"
 

src/party_menu.c

@@ -13,11 +13,9 @@
 #include "easy_chat.h"
 #include "event_data.h"
 #include "evolution_scene.h"
-#include "field_control_avatar.h"
 #include "field_effect.h"
 #include "field_player_avatar.h"
 #include "field_screen_effect.h"
-#include "field_specials.h"
 #include "field_weather.h"
 #include "fieldmap.h"
 #include "fldeff.h"
@@ -46,7 +44,6 @@
 #include "pokemon_icon.h"
 #include "pokemon_jump.h"
 #include "pokemon_special_anim.h"
-#include "pokemon_storage_system.h"
 #include "pokemon_summary_screen.h"
 #include "quest_log.h"
 #include "region_map.h"
@@ -78,7 +75,6 @@
 #include "constants/quest_log.h"
 #include "constants/songs.h"
 #include "constants/species.h"
-#include "constants/vars.h"
 
 #define PARTY_PAL_SELECTED     (1 << 0)
 #define PARTY_PAL_FAINTED      (1 << 1)

src/party_menu_specials.c

@@ -2,7 +2,6 @@
 #include "data.h"
 #include "script.h"
 #include "overworld.h"
-#include "battle.h"
 #include "palette.h"
 #include "pokemon.h"
 #include "party_menu.h"

src/pokeball.c

@@ -15,7 +15,6 @@
 #include "link.h"
 #include "battle_gfx_sfx_util.h"
 #include "constants/songs.h"
-#include "constants/species.h"
 
 #define tFrames          data[0]
 #define tPan             data[1]

src/pokemon_jump_6.c

@@ -1,7 +1,6 @@
 #include "global.h"
 #include "gflib.h"
 #include "menu.h"
-#include "pokemon_jump.h"
 #include "script.h"
 #include "strings.h"
 #include "task.h"

src/pokemon_size_record.c

@@ -3,7 +3,6 @@
 #include "event_data.h"
 #include "pokedex.h"
 #include "pokemon.h"
-#include "pokemon_size_record.h"
 #include "string_util.h"
 #include "text.h"
 #include "strings.h"

src/quest_log.c

@@ -18,10 +18,8 @@
 #include "field_fadetransition.h"
 #include "field_weather.h"
 #include "event_object_movement.h"
-#include "event_object_movement.h"
 #include "event_object_lock.h"
 #include "field_player_avatar.h"
-#include "field_control_avatar.h"
 #include "battle.h"
 #include "item.h"
 #include "region_map.h"

src/quest_log_objects.c

@@ -1,11 +1,8 @@
 #include "global.h"
-#include "event_data.h"
 #include "quest_log.h"
 #include "fieldmap.h"
 #include "field_player_avatar.h"
 #include "metatile_behavior.h"
-#include "link.h"
-#include "link_rfu.h"
 
 void SetQuestLogObjectEventsData(struct QuestLog * questLog)
 {

src/random.c

@@ -1,5 +1,4 @@
 #include "global.h"
-#include "random.h"
 
 // The number 1103515245 comes from the example implementation
 // of rand and srand in the ISO C standard.

src/reshow_battle_screen.c

@@ -6,7 +6,6 @@
 #include "link.h"
 #include "data.h"
 #include "sprite.h"
-#include "text.h"
 #include "gpu_regs.h"
 #include "scanline_effect.h"
 #include "help_system.h"
@@ -14,8 +13,6 @@
 #include "battle_interface.h"
 #include "battle_anim.h"
 #include "battle_controllers.h"
-#include "reshow_battle_screen.h"
-#include "constants/species.h"
 
 static void CB2_ReshowBattleScreenAfterMenu(void);
 static void sub_8077AAC(void);

src/rfu_union_tool.c

@@ -1,7 +1,6 @@
 #include "global.h"
 #include "event_data.h"
 #include "event_object_movement.h"
-#include "event_object_movement.h"
 #include "event_object_8097404.h"
 #include "field_player_avatar.h"
 #include "fieldmap.h"

src/roamer.c

@@ -1,5 +1,4 @@
 #include "global.h"
-#include "roamer.h"
 #include "random.h"
 #include "overworld.h"
 #include "field_specials.h"

src/safari_zone.c

@@ -2,7 +2,6 @@
 #include "battle.h"
 #include "event_scripts.h"
 #include "overworld.h"
-#include "battle.h"
 #include "script.h"
 #include "event_data.h"
 #include "field_screen_effect.h"

src/save_failed_screen.c

@@ -6,7 +6,6 @@
 #include "help_system.h"
 #include "m4a.h"
 #include "save.h"
-#include "save_failed_screen.h"
 #include "strings.h"
 #include "text.h"
 

src/scanline_effect.c

@@ -1,5 +1,4 @@
 #include "global.h"
-#include "battle.h"
 #include "task.h"
 #include "trig.h"
 #include "scanline_effect.h"

src/scrcmd.c

@@ -21,7 +21,6 @@
 #include "field_message_box.h"
 #include "new_menu_helpers.h"
 #include "window.h"
-#include "start_menu.h"
 #include "script_menu.h"
 #include "string_util.h"
 #include "data.h"
@@ -38,7 +37,6 @@
 #include "field_effect.h"
 #include "fieldmap.h"
 #include "field_door.h"
-#include "scrcmd.h"
 
 extern u16 (*const gSpecials[])(void);
 extern u16 (*const gSpecialsEnd[])(void);

src/script_pokemon_util.c

@@ -1,9 +1,7 @@
 #include "global.h"
-#include "battle.h"
 #include "berry.h"
 #include "daycare.h"
 #include "event_data.h"
-#include "event_object_movement.h"
 #include "load_save.h"
 #include "malloc.h"
 #include "overworld.h"

src/sea_cottage_special_anim.c

@@ -1,10 +1,8 @@
 #include "global.h"
 #include "event_data.h"
 #include "task.h"
-#include "menu.h"
 #include "field_player_avatar.h"
 #include "fieldmap.h"
-#include "event_object_movement.h"
 #include "field_camera.h"
 
 static EWRAM_DATA u8 gUnknown_2039984 = 0;

src/shop.c

@@ -10,7 +10,6 @@
 #include "window.h"
 #include "field_specials.h"
 #include "field_weather.h"
-#include "field_camera.h"
 #include "task.h"
 #include "text.h"
 #include "item.h"
@@ -19,7 +18,6 @@
 #include "sound.h"
 #include "string_util.h"
 #include "overworld.h"
-#include "window.h"
 #include "palette.h"
 #include "field_fadetransition.h"
 #include "scanline_effect.h"

src/slot_machine.c

@@ -11,7 +11,6 @@
 #include "coins.h"
 #include "quest_log.h"
 #include "overworld.h"
-#include "slot_machine.h"
 #include "menu.h"
 #include "new_menu_helpers.h"
 #include "text_window.h"

src/sound.c

@@ -5,7 +5,6 @@
 #include "quest_log.h"
 #include "m4a.h"
 #include "main.h"
-#include "pokemon.h"
 #include "constants/songs.h"
 #include "task.h"
 

src/text.c

@@ -1,15 +1,11 @@
 #include "global.h"
 #include "main.h"
-#include "palette.h"
-#include "string_util.h"
 #include "window.h"
 #include "text.h"
 #include "sprite.h"
-#include "blit.h"
 #include "sound.h"
 #include "m4a.h"
 #include "quest_log.h"
-#include "window.h"
 #include "graphics.h"
 #include "dynamic_placeholder_text_util.h"
 #include "constants/songs.h"

src/text_window.c

@@ -1,7 +1,6 @@
 #include "global.h"
 #include "bg.h"
 #include "palette.h"
-#include "text.h"
 #include "window.h"
 #include "text_window.h"
 #include "text_window_graphics.h"

src/tileset_anims.c

@@ -1,10 +1,4 @@
 #include "global.h"
-#include "graphics.h"
-#include "palette.h"
-#include "util.h"
-#include "battle_transition.h"
-#include "task.h"
-#include "fieldmap.h"
 
 static EWRAM_DATA struct {
     const u16 *src;

src/tm_case.c

@@ -25,7 +25,6 @@
 #include "scanline_effect.h"
 #include "sound.h"
 #include "strings.h"
-#include "tm_case.h"
 #include "menu_indicators.h"
 #include "constants/items.h"
 #include "constants/songs.h"

src/trade.c

@@ -6,7 +6,6 @@
 #include "pokemon_icon.h"
 #include "graphics.h"
 #include "link.h"
-#include "load_save.h"
 #include "link_rfu.h"
 #include "cable_club.h"
 #include "data.h"
@@ -14,7 +13,6 @@
 #include "menu.h"
 #include "overworld.h"
 #include "battle_anim.h"
-#include "pokeball.h"
 #include "party_menu.h"
 #include "daycare.h"
 #include "event_data.h"
@@ -22,7 +20,6 @@
 #include "pokemon_summary_screen.h"
 #include "pokemon_storage_system.h"
 #include "new_menu_helpers.h"
-#include "trade.h"
 #include "trade_scene.h"
 #include "constants/songs.h"
 #include "constants/moves.h"

src/trade_scene.c

@@ -10,7 +10,6 @@
 #include "palette.h"
 #include "trade.h"
 #include "link.h"
-#include "librfu.h"
 #include "link_rfu.h"
 #include "text.h"
 #include "mevent.h"
@@ -31,7 +30,6 @@
 #include "quest_log.h"
 #include "help_system.h"
 #include "new_menu_helpers.h"
-#include "battle_interface.h"
 #include "pokedex.h"
 #include "save.h"
 #include "load_save.h"

src/trainer_card.c

@@ -14,7 +14,6 @@
 #include "event_data.h"
 #include "easy_chat.h"
 #include "money.h"
-#include "window.h"
 #include "strings.h"
 #include "string_util.h"
 #include "trainer_card.h"
@@ -22,7 +21,6 @@
 #include "pokedex.h"
 #include "pokemon_icon.h"
 #include "graphics.h"
-#include "pokemon_icon.h"
 #include "help_system.h"
 #include "trainer_pokemon_sprites.h"
 #include "new_menu_helpers.h"

src/trainer_pokemon_sprites.c

@@ -2,12 +2,9 @@
 #include "sprite.h"
 #include "window.h"
 #include "malloc.h"
-#include "constants/species.h"
 #include "palette.h"
 #include "decompress.h"
-#include "trainer_pokemon_sprites.h"
 #include "pokemon.h"
-#include "constants/trainer_classes.h"
 
 extern const struct CompressedSpriteSheet gMonFrontPicTable[];
 extern const struct CompressedSpriteSheet gMonBackPicTable[];

src/trainer_tower.c

@@ -2,11 +2,9 @@
 #include "main.h"
 #include "task.h"
 #include "malloc.h"
-#include "save.h"
 #include "util.h"
 #include "string_util.h"
 #include "event_data.h"
-#include "random.h"
 #include "cereader_tool.h"
 #include "easy_chat.h"
 #include "text.h"
@@ -20,11 +18,9 @@
 #include "menu.h"
 #include "new_menu_helpers.h"
 #include "sound.h"
-#include "constants/flags.h"
 #include "constants/vars.h"
 #include "constants/items.h"
 #include "constants/species.h"
-#include "constants/maps.h"
 #include "constants/songs.h"
 #include "constants/layouts.h"
 #include "constants/trainers.h"

src/trig.c

@@ -1,5 +1,4 @@
 #include "global.h"
-#include "trig.h"
 
 // Values of sin(x*(π/128)) as Q8.8 fixed-point numbers from x = 0 to x = 319
 const s16 gSineTable[] =

src/union_room_message.c

@@ -1,5 +1,4 @@
 #include "global.h"
-#include "union_room_message.h"
 #include "mevent_server.h"
 #include "constants/union_room.h"
 

src/util.c

@@ -1,5 +1,4 @@
 #include "global.h"
-#include "util.h"
 
 const u32 gBitTable[] =
 {

src/vs_seeker.c

@@ -18,9 +18,7 @@
 #include "battle.h"
 #include "battle_setup.h"
 #include "random.h"
-#include "event_object_movement.h"
 #include "field_player_avatar.h"
-#include "event_object_movement.h"
 #include "event_object_8097404.h"
 #include "vs_seeker.h"
 #include "constants/movement_commands.h"