Clean up includes

117 files changed, 112 insertions, 450 deletions

diff --git a/src/cereader_tool.c b/src/cereader_tool.c
index c6e0c9a99..cb8c48f7a 100644
--- a/src/cereader_tool.c
+++ b/src/cereader_tool.c
@@ -1,7 +1,7 @@
 #include "global.h"
+#include "gflib.h"
 #include "util.h"
 #include "save.h"
-#include "malloc.h"
 #include "cereader_tool.h"
 
 u8 sub_815D654(void)
diff --git a/src/coins.c b/src/coins.c
index fd5000fbd..1b9c610c5 100644
--- a/src/coins.c
+++ b/src/coins.c
@@ -1,6 +1,6 @@
 #include "global.h"
+#include "gflib.h"
 #include "string_util.h"
-#include "text.h"
 #include "menu.h"
 #include "text_window.h"
 #include "strings.h"
diff --git a/src/credits.c b/src/credits.c
index dfcdfb418..3be5c8fa5 100644
--- a/src/credits.c
+++ b/src/credits.c
@@ -1,19 +1,14 @@
 #include "global.h"
-#include "malloc.h"
-#include "bg.h"
+#include "gflib.h"
 #include "credits.h"
-#include "palette.h"
-#include "gpu_regs.h"
 #include "task.h"
 #include "overworld.h"
 #include "event_data.h"
-#include "window.h"
 #include "new_menu_helpers.h"
 #include "decompress.h"
 #include "graphics.h"
 #include "strings.h"
 #include "trainer_pokemon_sprites.h"
-#include "sound.h"
 #include "constants/species.h"
 #include "constants/maps.h"
 #include "constants/field_weather.h"
diff --git a/src/dark.c b/src/dark.c
index e13227316..d2e0996bd 100644
--- a/src/dark.c
+++ b/src/dark.c
@@ -1,8 +1,7 @@
 #include "global.h"
+#include "gflib.h"
 #include "battle_anim.h"
-#include "gpu_regs.h"
 #include "graphics.h"
-#include "palette.h"
 #include "scanline_effect.h"
 #include "trig.h"
 #include "util.h"
diff --git a/src/data.c b/src/data.c
index 891c9f94f..54c67c875 100644
--- a/src/data.c
+++ b/src/data.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "malloc.h"
+#include "gflib.h"
 #include "battle.h"
 #include "data.h"
 #include "graphics.h"
diff --git a/src/decompress.c b/src/decompress.c
index 3f0c82bce..3e32f00eb 100644
--- a/src/decompress.c
+++ b/src/decompress.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "malloc.h"
+#include "gflib.h"
 #include "decompress.h"
 #include "pokemon.h"
 #include "constants/species.h"
diff --git a/src/digit_obj_util.c b/src/digit_obj_util.c
index 82af5dcab..852c386ac 100644
--- a/src/digit_obj_util.c
+++ b/src/digit_obj_util.c
@@ -1,8 +1,7 @@
 #include "global.h"
-#include "malloc.h"
+#include "gflib.h"
 #include "decompress.h"
 #include "digit_obj_util.h"
-#include "main.h"
 
 struct DigitPrinterAlloc
 {
diff --git a/src/diploma.c b/src/diploma.c
index e2e81c113..c43eff105 100644
--- a/src/diploma.c
+++ b/src/diploma.c
@@ -1,23 +1,14 @@
 #include "global.h"
-#include "bg.h"
-#include "constants/fanfares.h"
+#include "gflib.h"
 #include "dynamic_placeholder_text_util.h"
-#include "gba/macro.h"
-#include "gpu_regs.h"
-#include "main.h"
-#include "malloc.h"
 #include "menu.h"
 #include "new_menu_helpers.h"
 #include "overworld.h"
-#include "palette.h"
 #include "pokedex.h"
 #include "scanline_effect.h"
-#include "sound.h"
-#include "sprite.h"
 #include "strings.h"
 #include "task.h"
-#include "text.h"
-#include "window.h"
+#include "constants/fanfares.h"
 
 struct Diploma
 {
diff --git a/src/dynamic_placeholder_text_util.c b/src/dynamic_placeholder_text_util.c
index 174a1c5d5..eede1ae48 100644
--- a/src/dynamic_placeholder_text_util.c
+++ b/src/dynamic_placeholder_text_util.c
@@ -1,6 +1,5 @@
 #include "global.h"
-#include "text.h"
-#include "string_util.h"
+#include "gflib.h"
 #include "constants/event_objects.h"
 
 static EWRAM_DATA const u8 *sStringPointers[8] = {0};
diff --git a/src/easy_chat.c b/src/easy_chat.c
index 657d178d7..c34ace10d 100644
--- a/src/easy_chat.c
+++ b/src/easy_chat.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "malloc.h"
+#include "gflib.h"
 #include "data.h"
 #include "easy_chat.h"
 #include "event_data.h"
@@ -9,7 +9,6 @@
 #include "mail.h"
 #include "pokedex.h"
 #include "random.h"
-#include "string_util.h"
 #include "strings.h"
 #include "constants/easy_chat.h"
 #include "constants/flags.h"
diff --git a/src/event_object_lock.c b/src/event_object_lock.c
index 389d16c05..8520ef017 100644
--- a/src/event_object_lock.c
+++ b/src/event_object_lock.c
@@ -4,7 +4,6 @@
 #include "event_object_movement.h"
 #include "script_movement.h"
 #include "event_data.h"
-#include "constants/maps.h"
 #include "constants/event_objects.h"
 
 bool8 walkrun_is_standing_still(void)
diff --git a/src/event_object_movement.c b/src/event_object_movement.c
index 7f69963a3..72ce58bb5 100644
--- a/src/event_object_movement.c
+++ b/src/event_object_movement.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "malloc.h"
+#include "gflib.h"
 #include "event_data.h"
 #include "event_object_movement.h"
 #include "field_camera.h"
@@ -10,7 +10,6 @@
 #include "fieldmap.h"
 #include "metatile_behavior.h"
 #include "overworld.h"
-#include "palette.h"
 #include "quest_log.h"
 #include "random.h"
 #include "script.h"
diff --git a/src/evolution_graphics.c b/src/evolution_graphics.c
index 622b26f8f..d9c9317bd 100644
--- a/src/evolution_graphics.c
+++ b/src/evolution_graphics.c
@@ -1,9 +1,8 @@
 #include "global.h"
+#include "gflib.h"
 #include "trig.h"
 #include "random.h"
 #include "decompress.h"
-#include "palette.h"
-#include "sound.h"
 #include "task.h"
 #include "evolution_scene.h"
 #include "evolution_graphics.h"
diff --git a/src/evolution_scene.c b/src/evolution_scene.c
index 71eb3fc36..caa19a7a5 100644
--- a/src/evolution_scene.c
+++ b/src/evolution_scene.c
@@ -1,34 +1,25 @@
 #include "global.h"
-#include "malloc.h"
+#include "gflib.h"
 #include "battle.h"
 #include "battle_message.h"
-#include "bg.h"
 #include "data.h"
 #include "decompress.h"
 #include "help_system.h"
 #include "evolution_scene.h"
 #include "evolution_graphics.h"
-#include "gpu_regs.h"
 #include "link.h"
 #include "link_rfu.h"
 #include "m4a.h"
 #include "event_data.h"
 #include "trade_scene.h"
-#include "main.h"
 #include "new_menu_helpers.h"
 #include "menu.h"
 #include "overworld.h"
-#include "palette.h"
 #include "pokedex.h"
-#include "pokemon.h"
 #include "pokemon_summary_screen.h"
 #include "scanline_effect.h"
-#include "sound.h"
-#include "sprite.h"
-#include "string_util.h"
 #include "strings.h"
 #include "task.h"
-#include "text.h"
 #include "text_window.h"
 #include "trig.h"
 #include "battle_string_ids.h"
diff --git a/src/fame_checker.c b/src/fame_checker.c
index dbdb47da8..cccdbf604 100644
--- a/src/fame_checker.c
+++ b/src/fame_checker.c
@@ -1,7 +1,6 @@
 #include "global.h"
+#include "gflib.h"
 #include "constants/songs.h"
-#include "sprite.h"
-#include "bg.h"
 #include "event_data.h"
 #include "event_scripts.h"
 #include "graphics.h"
@@ -13,15 +12,7 @@
 #include "new_menu_helpers.h"
 #include "item_menu.h"
 #include "list_menu.h"
-#include "gpu_regs.h"
-#include "palette.h"
 #include "task.h"
-#include "malloc.h"
-#include "main.h"
-#include "sound.h"
-#include "text.h"
-#include "window.h"
-#include "string_util.h"
 #include "event_object_movement.h"
 #include "menu_indicators.h"
 #include "text_window.h"
diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c
index 06d48fce0..d259775ef 100644
--- a/src/field_effect_helpers.c
+++ b/src/field_effect_helpers.c
@@ -1,12 +1,11 @@
 #include "global.h"
+#include "gflib.h"
 #include "event_object_movement.h"
 #include "field_camera.h"
 #include "field_effect.h"
 #include "field_weather.h"
 #include "fieldmap.h"
 #include "metatile_behavior.h"
-#include "sound.h"
-#include "sprite.h"
 #include "constants/field_effects.h"
 #include "constants/songs.h"
 
diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c
index 10f21bc0f..aec3df374 100644
--- a/src/field_fadetransition.c
+++ b/src/field_fadetransition.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "palette.h"
+#include "gflib.h"
 #include "field_fadetransition.h"
 #include "overworld.h"
 #include "fldeff.h"
@@ -14,7 +14,6 @@
 #include "quest_log.h"
 #include "link.h"
 #include "event_object_movement.h"
-#include "sound.h"
 #include "field_door.h"
 #include "field_effect.h"
 #include "field_screen_effect.h"
diff --git a/src/field_poison.c b/src/field_poison.c
index aa77375a5..ed2a9360d 100644
--- a/src/field_poison.c
+++ b/src/field_poison.c
@@ -1,9 +1,9 @@
 #include "global.h"
+#include "gflib.h"
 #include "strings.h"
 #include "task.h"
 #include "field_message_box.h"
 #include "script.h"
-#include "string_util.h"
 #include "event_data.h"
 #include "fldeff.h"
 #include "party_menu.h"
diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c
index 22043ed2d..a926e5937 100644
--- a/src/field_screen_effect.c
+++ b/src/field_screen_effect.c
@@ -1,13 +1,11 @@
 #include "global.h"
+#include "gflib.h"
 #include "field_screen_effect.h"
-#include "gpu_regs.h"
 #include "overworld.h"
 #include "scanline_effect.h"
 #include "script.h"
 #include "task.h"
-#include "window.h"
 #include "strings.h"
-#include "string_util.h"
 #include "menu.h"
 #include "heal_location.h"
 #include "new_menu_helpers.h"
diff --git a/src/field_specials.c b/src/field_specials.c
index f6cdae90b..26a1d75e6 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -1,6 +1,5 @@
 #include "global.h"
-#include "malloc.h"
-#include "palette.h"
+#include "gflib.h"
 #include "quest_log.h"
 #include "list_menu.h"
 #include "diploma.h"
@@ -9,7 +8,6 @@
 #include "overworld.h"
 #include "field_message_box.h"
 #include "event_data.h"
-#include "string_util.h"
 #include "strings.h"
 #include "battle.h"
 #include "fieldmap.h"
@@ -24,13 +22,10 @@
 #include "random.h"
 #include "mail_data.h"
 #include "help_system.h"
-#include "sound.h"
-#include "text.h"
 #include "pokemon_storage_system.h"
 #include "script_menu.h"
 #include "data.h"
 #include "pokedex.h"
-#include "window.h"
 #include "text_window.h"
 #include "menu.h"
 #include "mevent.h"
diff --git a/src/field_tasks.c b/src/field_tasks.c
index 53b49b0d8..0eb3045e0 100644
--- a/src/field_tasks.c
+++ b/src/field_tasks.c
@@ -1,4 +1,5 @@
 #include "global.h"
+#include "gflib.h"
 #include "bike.h"
 #include "event_data.h"
 #include "field_camera.h"
@@ -9,7 +10,6 @@
 #include "overworld.h"
 #include "quest_log.h"
 #include "script.h"
-#include "sound.h"
 #include "task.h"
 #include "constants/field_tasks.h"
 #include "constants/flags.h"
diff --git a/src/field_weather_effects.c b/src/field_weather_effects.c
index e6f4bfacf..2acf19a5f 100644
--- a/src/field_weather_effects.c
+++ b/src/field_weather_effects.c
@@ -4,7 +4,6 @@
 #include "event_object_movement.h"
 #include "field_weather.h"
 #include "field_weather_effects.h"
-#include "overworld.h"
 #include "random.h"
 #include "script.h"
 #include "constants/weather.h"
diff --git a/src/fieldmap.c b/src/fieldmap.c
index 60c6f3dae..53110396d 100644
--- a/src/fieldmap.c
+++ b/src/fieldmap.c
@@ -1,6 +1,5 @@
 #include "global.h"
-#include "bg.h"
-#include "palette.h"
+#include "gflib.h"
 #include "overworld.h"
 #include "script.h"
 #include "new_menu_helpers.h"
diff --git a/src/fighting.c b/src/fighting.c
index 7b826594d..fcfee5c54 100644
--- a/src/fighting.c
+++ b/src/fighting.c
@@ -1,6 +1,6 @@
 #include "global.h"
+#include "gflib.h"
 #include "battle_anim.h"
-#include "gpu_regs.h"
 #include "random.h"
 #include "task.h"
 #include "trig.h"
diff --git a/src/fldeff_poison.c b/src/fldeff_poison.c
index d117e0c9b..c88ec6502 100644
--- a/src/fldeff_poison.c
+++ b/src/fldeff_poison.c
@@ -1,7 +1,6 @@
 #include "global.h"
+#include "gflib.h"
 #include "task.h"
-#include "bg.h"
-#include "sound.h"
 #include "constants/songs.h"
 
 static void Task_FieldPoisonEffect(u8 taskId)
diff --git a/src/fldeff_rocksmash.c b/src/fldeff_rocksmash.c
index dc372ce18..12377f345 100644
--- a/src/fldeff_rocksmash.c
+++ b/src/fldeff_rocksmash.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "global.fieldmap.h"
+#include "gflib.h"
 #include "field_player_avatar.h"
 #include "field_effect.h"
 #include "party_menu.h"
@@ -7,7 +7,6 @@
 #include "script.h"
 #include "fldeff.h"
 #include "event_scripts.h"
-#include "sound.h"
 #include "overworld.h"
 #include "event_object_movement.h"
 #include "constants/songs.h"
diff --git a/src/fldeff_softboiled.c b/src/fldeff_softboiled.c
index 966a7934c..2854653e5 100644
--- a/src/fldeff_softboiled.c
+++ b/src/fldeff_softboiled.c
@@ -1,7 +1,6 @@
 #include "global.h"
+#include "gflib.h"
 #include "party_menu.h"
-#include "sound.h"
-#include "string_util.h"
 #include "menu.h"
 #include "new_menu_helpers.h"
 #include "constants/songs.h"
diff --git a/src/fldeff_sweetscent.c b/src/fldeff_sweetscent.c
index d827aff4d..3d1dce193 100644
--- a/src/fldeff_sweetscent.c
+++ b/src/fldeff_sweetscent.c
@@ -1,14 +1,12 @@
 #include "global.h"
+#include "gflib.h"
 #include "field_player_avatar.h"
 #include "field_effect.h"
 #include "party_menu.h"
-#include "malloc.h"
 #include "script.h"
 #include "fldeff.h"
 #include "event_scripts.h"
 #include "field_weather.h"
-#include "sound.h"
-#include "palette.h"
 #include "wild_encounter.h"
 #include "constants/songs.h"
 
diff --git a/src/flying.c b/src/flying.c
index 4ecfa2899..83c8e1f0e 100644
--- a/src/flying.c
+++ b/src/flying.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "battle_anim.h"
-#include "palette.h"
+#include "gflib.h"
 #include "trig.h"
 #include "constants/battle_anim.h"
 #include "random.h"
diff --git a/src/ghost.c b/src/ghost.c
index 35dcd267b..9a77999de 100644
--- a/src/ghost.c
+++ b/src/ghost.c
@@ -1,12 +1,8 @@
 #include "global.h"
+#include "gflib.h"
 #include "battle_anim.h"
-#include "bg.h"
-#include "gpu_regs.h"
-#include "palette.h"
 #include "scanline_effect.h"
-#include "malloc.h"
 #include "graphics.h"
-#include "sound.h"
 #include "trig.h"
 #include "util.h"
 #include "decompress.h"
diff --git a/src/gpu_regs.c b/src/gpu_regs.c
index c1909ff32..2f52c5be3 100644
--- a/src/gpu_regs.c
+++ b/src/gpu_regs.c
@@ -1,5 +1,4 @@
 #include "global.h"
-#include "gpu_regs.h"
 
 #define GPU_REG_BUF_SIZE 0x60
 
diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c
index 14f399f24..1652538a3 100644
--- a/src/hall_of_fame.c
+++ b/src/hall_of_fame.c
@@ -1,14 +1,8 @@
 #include "global.h"
-#include "palette.h"
-#include "malloc.h"
+#include "gflib.h"
 #include "decompress.h"
-#include "bg.h"
 #include "scanline_effect.h"
-#include "gpu_regs.h"
 #include "task.h"
-#include "text.h"
-#include "main.h"
-#include "sound.h"
 #include "save.h"
 #include "data.h"
 #include "m4a.h"
diff --git a/src/help_message.c b/src/help_message.c
index 630e32ecd..2fd76e432 100644
--- a/src/help_message.c
+++ b/src/help_message.c
@@ -1,5 +1,4 @@
 #include "global.h"
-#include "gflib.h"
 #include "menu.h"
 
 static EWRAM_DATA u8 sHelpMessageWindowId = 0;
diff --git a/src/help_system.c b/src/help_system.c
index 8eabd4e1d..eeeb0a65f 100644
--- a/src/help_system.c
+++ b/src/help_system.c
@@ -1,15 +1,10 @@
 #include "global.h"
+#include "gflib.h"
 #include "decompress.h"
-#include "gpu_regs.h"
-#include "main.h"
 #include "m4a.h"
-#include "dma3.h"
 #include "help_system.h"
 #include "list_menu.h"
-#include "sound.h"
 #include "strings.h"
-#include "text.h"
-#include "blit.h"
 #include "constants/songs.h"
 
 extern u8 gGlyphInfo[];
diff --git a/src/help_system_812B1E0.c b/src/help_system_812B1E0.c
index 0db564460..f3ec0ba85 100644
--- a/src/help_system_812B1E0.c
+++ b/src/help_system_812B1E0.c
@@ -1,4 +1,5 @@
 #include "global.h"
+#include "gflib.h"
 #include "event_data.h"
 #include "event_scripts.h"
 #include "field_player_avatar.h"
@@ -10,7 +11,6 @@
 #include "quest_log.h"
 #include "save.h"
 #include "save_location.h"
-#include "sound.h"
 #include "strings.h"
 #include "constants/items.h"
 #include "constants/maps.h"
diff --git a/src/hof_pc.c b/src/hof_pc.c
index 173625774..6f21d3c32 100644
--- a/src/hof_pc.c
+++ b/src/hof_pc.c
@@ -1,12 +1,10 @@
 #include "global.h"
+#include "gflib.h"
 #include "hall_of_fame.h"
-#include "palette.h"
 #include "overworld.h"
 #include "script.h"
 #include "script_menu.h"
 #include "task.h"
-#include "bg.h"
-#include "window.h"
 
 static void ReshowPCMenuAfterHallOfFamePC(void);
 static void Task_WaitForPaletteFade(u8 taskId);
diff --git a/src/ice.c b/src/ice.c
index 8b4269a95..c00358357 100644
--- a/src/ice.c
+++ b/src/ice.c
@@ -1,11 +1,8 @@
 #include "global.h"
+#include "gflib.h"
 #include "battle_anim.h"
-#include "bg.h"
-#include "gpu_regs.h"
 #include "graphics.h"
-#include "palette.h"
 #include "random.h"
-#include "sprite.h"
 #include "task.h"
 #include "trig.h"
 #include "constants/battle_anim.h"
diff --git a/src/isagbprn.c b/src/isagbprn.c
index 3fd5e9142..d6f547c1f 100644
--- a/src/isagbprn.c
+++ b/src/isagbprn.c
@@ -1,6 +1,5 @@
 #include <stdarg.h>
 #include <stdio.h>
-#include "global.h"
 #include "config.h"
 #include "gba/gba.h"
 
diff --git a/src/item.c b/src/item.c
index 296ba8ec7..ab082c315 100644
--- a/src/item.c
+++ b/src/item.c
@@ -1,12 +1,11 @@
 #include "global.h"
+#include "gflib.h"
 #include "berry.h"
 #include "event_data.h"
 #include "item.h"
 #include "item_use.h"
 #include "load_save.h"
-#include "malloc.h"
 #include "quest_log.h"
-#include "string_util.h"
 #include "strings.h"
 #include "constants/hold_effects.h"
 #include "constants/items.h"
diff --git a/src/item_menu_icons.c b/src/item_menu_icons.c
index d389c7781..6e7e8b80b 100644
--- a/src/item_menu_icons.c
+++ b/src/item_menu_icons.c
@@ -1,8 +1,8 @@
 #include "global.h"
+#include "gflib.h"
 #include "decompress.h"
 #include "graphics.h"
 #include "item_menu_icons.h"
-#include "malloc.h"
 #include "constants/items.h"
 
 static EWRAM_DATA u8 sItemMenuIconSpriteIds[12] = {0};
diff --git a/src/item_pc.c b/src/item_pc.c
index 1fda50d6f..dce96d59d 100644
--- a/src/item_pc.c
+++ b/src/item_pc.c
@@ -1,8 +1,7 @@
 #include "global.h"
-#include "bg.h"
+#include "gflib.h"
 #include "data.h"
 #include "decompress.h"
-#include "gpu_regs.h"
 #include "graphics.h"
 #include "help_system.h"
 #include "item.h"
@@ -11,18 +10,13 @@
 #include "list_menu.h"
 #include "item_pc.h"
 #include "item_use.h"
-#include "main.h"
-#include "malloc.h"
 #include "menu.h"
 #include "menu_helpers.h"
 #include "menu_indicators.h"
 #include "new_menu_helpers.h"
-#include "palette.h"
 #include "party_menu.h"
 #include "pc_screen_effect.h"
 #include "scanline_effect.h"
-#include "sound.h"
-#include "string_util.h"
 #include "strings.h"
 #include "task.h"
 #include "text_window.h"
diff --git a/src/item_use.c b/src/item_use.c
index 5682392a1..550163b04 100644
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -1,4 +1,5 @@
 #include "global.h"
+#include "gflib.h"
 #include "battle.h"
 #include "berry_pouch.h"
 #include "berry_powder.h"
@@ -17,19 +18,14 @@
 #include "item_use.h"
 #include "itemfinder.h"
 #include "mail.h"
-#include "main.h"
-#include "malloc.h"
 #include "event_object_lock.h"
 #include "metatile_behavior.h"
 #include "new_menu_helpers.h"
 #include "overworld.h"
-#include "palette.h"
 #include "party_menu.h"
 #include "quest_log.h"
 #include "region_map.h"
 #include "script.h"
-#include "sound.h"
-#include "string_util.h"
 #include "strings.h"
 #include "task.h"
 #include "teachy_tv.h"
diff --git a/src/itemfinder.c b/src/itemfinder.c
index 19d58b471..7ade34849 100644
--- a/src/itemfinder.c
+++ b/src/itemfinder.c
@@ -1,11 +1,11 @@
 #include "global.h"
+#include "gflib.h"
 #include "task.h"
 #include "new_menu_helpers.h"
 #include "strings.h"
 #include "event_scripts.h"
 #include "event_object_lock.h"
 #include "script.h"
-#include "sound.h"
 #include "event_data.h"
 #include "field_player_avatar.h"
 #include "field_specials.h"
diff --git a/src/learn_move.c b/src/learn_move.c
index 8cf10cffa..d444b5d40 100644
--- a/src/learn_move.c
+++ b/src/learn_move.c
@@ -1,13 +1,9 @@
 #include "global.h"
-#include "bg.h"
-#include "malloc.h"
-#include "gpu_regs.h"
-#include "palette.h"
+#include "gflib.h"
 #include "script.h"
 #include "task.h"
 #include "data.h"
 #include "trig.h"
-#include "window.h"
 #include "field_fadetransition.h"
 #include "overworld.h"
 #include "new_menu_helpers.h"
@@ -15,10 +11,8 @@
 #include "list_menu.h"
 #include "event_data.h"
 #include "text_window.h"
-#include "string_util.h"
 #include "pokemon_summary_screen.h"
 #include "graphics.h"
-#include "sound.h"
 #include "strings.h"
 #include "constants/songs.h"
 #include "constants/moves.h"
diff --git a/src/librfu_intr.c b/src/librfu_intr.c
index 23962a937..44160acbb 100644
--- a/src/librfu_intr.c
+++ b/src/librfu_intr.c
@@ -1,4 +1,3 @@
-#include "global.h"
 #include "librfu.h"
 
 static void sio32intr_clock_master(void);
diff --git a/src/link.c b/src/link.c
index ed04cdc21..75e6b9927 100644
--- a/src/link.c
+++ b/src/link.c
@@ -1,12 +1,9 @@
 #include "global.h"
-#include "palette.h"
-#include "bg.h"
+#include "gflib.h"
 #include "m4a.h"
 #include "scanline_effect.h"
 #include "bg_regs.h"
-#include "gpu_regs.h"
 #include "decompress.h"
-#include "malloc.h"
 #include "save.h"
 #include "battle.h"
 #include "quest_log.h"
@@ -15,16 +12,12 @@
 #include "random.h"
 #include "task.h"
 #include "event_data.h"
-#include "string_util.h"
 #include "item_menu.h"
 #include "trade.h"
-#include "text.h"
-#include "sound.h"
 #include "menu.h"
 #include "overworld.h"
 #include "new_menu_helpers.h"
 #include "link.h"
-#include "window.h"
 #include "graphics.h"
 #include "strings.h"
 #include "help_system.h"
diff --git a/src/link_rfu_2.c b/src/link_rfu_2.c
index e86a3b43f..bedc9a025 100644
--- a/src/link_rfu_2.c
+++ b/src/link_rfu_2.c
@@ -1,15 +1,13 @@
 #include "global.h"
-#include "battle.h"
-#include "gpu_regs.h"
+#include "gflib.h"
 #include "librfu.h"
+#include "battle.h"
 #include "link.h"
 #include "link_rfu.h"
 #include "mystery_gift_menu.h"
 #include "overworld.h"
-#include "palette.h"
 #include "quest_log.h"
 #include "random.h"
-#include "string_util.h"
 #include "task.h"
 #include "constants/species.h"
 #include "constants/union_room.h"
diff --git a/src/link_rfu_3.c b/src/link_rfu_3.c
index 8382f1dab..8d34bc4e8 100644
--- a/src/link_rfu_3.c
+++ b/src/link_rfu_3.c
@@ -1,12 +1,10 @@
 #include "global.h"
+#include "gflib.h"
 #include "decompress.h"
 #include "event_data.h"
 #include "link.h"
 #include "link_rfu.h"
-#include "malloc.h"
 #include "random.h"
-#include "string_util.h"
-#include "text.h"
 #include "constants/flags.h"
 
 static EWRAM_DATA u8 gWirelessStatusIndicatorSpriteId = 0;
diff --git a/src/list_menu.c b/src/list_menu.c
index 9439d712c..5232708f3 100644
--- a/src/list_menu.c
+++ b/src/list_menu.c
@@ -1,16 +1,13 @@
 #include "global.h"
+#include "gflib.h"
 #include "menu.h"
 #include "list_menu.h"
 #include "menu_indicators.h"
 #include "new_menu_helpers.h"
-#include "window.h"
 #include "text_window.h"
-#include "main.h"
 #include "task.h"
 #include "graphics.h"
-#include "palette.h"
 #include "strings.h"
-#include "sound.h"
 #include "pokemon_icon.h"
 #include "constants/songs.h"
 
diff --git a/src/load_save.c b/src/load_save.c
index 859ec57af..f17d31f37 100644
--- a/src/load_save.c
+++ b/src/load_save.c
@@ -1,10 +1,9 @@
 #include "global.h"
+#include "gflib.h"
 #include "gba/flash_internal.h"
 #include "load_save.h"
-#include "main.h"
 #include "pokemon.h"
 #include "random.h"
-#include "malloc.h"
 #include "item.h"
 #include "save_location.h"
 #include "berry_powder.h"
diff --git a/src/mail.c b/src/mail.c
index 9a28fae41..0e9a8db41 100644
--- a/src/mail.c
+++ b/src/mail.c
@@ -1,12 +1,8 @@
 #include "global.h"
-#include "malloc.h"
-#include "bg.h"
+#include "gflib.h"
 #include "scanline_effect.h"
 #include "palette.h"
-#include "gpu_regs.h"
-#include "window.h"
 #include "text_window.h"
-#include "main.h"
 #include "easy_chat.h"
 #include "mail.h"
 #include "task.h"
diff --git a/src/mail_data.c b/src/mail_data.c
index 43ca1d0e6..a032cdd95 100644
--- a/src/mail_data.c
+++ b/src/mail_data.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "text.h"
+#include "gflib.h"
 #include "mail.h"
 #include "mail_data.h"
 #include "constants/species.h"
diff --git a/src/mailbox_pc.c b/src/mailbox_pc.c
index 5489c4c4e..ffa7ed073 100644
--- a/src/mailbox_pc.c
+++ b/src/mailbox_pc.c
@@ -1,14 +1,11 @@
 #include "global.h"
-#include "malloc.h"
-#include "window.h"
+#include "gflib.h"
 #include "menu.h"
-#include "string_util.h"
 #include "new_menu_helpers.h"
 #include "list_menu.h"
 #include "player_pc.h"
 #include "strings.h"
 #include "menu_indicators.h"
-#include "sound.h"
 #include "constants/songs.h"
 
 static EWRAM_DATA u8 sWindowIds[3] = {};
diff --git a/src/main.c b/src/main.c
index 5ba87aaa0..be025c79f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,20 +1,14 @@
 #include "global.h"
-#include "bg.h"
-#include "gpu_regs.h"
+#include "gflib.h"
 #include "link.h"
 #include "link_rfu.h"
 #include "load_save.h"
-#include "main.h"
 #include "m4a.h"
 #include "random.h"
-#include "dma3.h"
 #include "gba/flash_internal.h"
 #include "help_system.h"
-#include "sound.h"
 #include "new_menu_helpers.h"
-#include "malloc.h"
 #include "overworld.h"
-#include "sprite.h"
 #include "play_time.h"
 #include "intro.h"
 #include "battle_controllers.h"
diff --git a/src/main_menu.c b/src/main_menu.c
index 899119654..00ecd0fe3 100644
--- a/src/main_menu.c
+++ b/src/main_menu.c
@@ -1,14 +1,9 @@
 #include "global.h"
-#include "palette.h"
-#include "gpu_regs.h"
+#include "gflib.h"
 #include "scanline_effect.h"
-#include "bg.h"
-#include "dma3.h"
 #include "task.h"
-#include "text.h"
 #include "save.h"
 #include "event_data.h"
-#include "window.h"
 #include "menu.h"
 #include "link.h"
 #include "oak_speech.h"
@@ -16,10 +11,8 @@
 #include "quest_log.h"
 #include "mystery_gift_menu.h"
 #include "strings.h"
-#include "sound.h"
 #include "title_screen.h"
 #include "help_system.h"
-#include "string_util.h"
 #include "pokedex.h"
 #include "text_window.h"
 #include "text_window_graphics.h"
diff --git a/src/map_name_popup.c b/src/map_name_popup.c
index 9126c6b7a..b490722a5 100644
--- a/src/map_name_popup.c
+++ b/src/map_name_popup.c
@@ -1,16 +1,11 @@
 #include "global.h"
-#include "bg.h"
-#include "gpu_regs.h"
-#include "window.h"
-#include "palette.h"
+#include "gflib.h"
 #include "task.h"
 #include "event_data.h"
 #include "text_window.h"
 #include "quest_log.h"
 #include "region_map.h"
-#include "text.h"
 #include "strings.h"
-#include "string_util.h"
 #include "constants/flags.h"
 
 static void Task_MapNamePopup(u8 taskId);
diff --git a/src/map_preview_screen.c b/src/map_preview_screen.c
index 6418a3139..33e69a8a0 100644
--- a/src/map_preview_screen.c
+++ b/src/map_preview_screen.c
@@ -1,11 +1,7 @@
 #include "global.h"
-#include "gpu_regs.h"
-#include "bg.h"
-#include "palette.h"
-#include "malloc.h"
+#include "gflib.h"
 #include "quest_log.h"
 #include "new_menu_helpers.h"
-#include "window.h"
 #include "region_map.h"
 #include "menu.h"
 #include "field_fadetransition.h"
diff --git a/src/menu.c b/src/menu.c
index b7c3f54eb..03cdaed09 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -1,12 +1,9 @@
 #include "global.h"
-#include "bg.h"
+#include "gflib.h"
 #include "menu.h"
 #include "menu_helpers.h"
 #include "strings.h"
 #include "text_window.h"
-#include "window.h"
-#include "sound.h"
-#include "palette.h"
 #include "constants/songs.h"
 
 struct Menu
diff --git a/src/menu2.c b/src/menu2.c
index 116bf7b52..cc596dba4 100644
--- a/src/menu2.c
+++ b/src/menu2.c
@@ -1,10 +1,7 @@
 #include "global.h"
-#include "text.h"
-#include "blit.h"
-#include "gpu_regs.h"
+#include "gflib.h"
 #include "task.h"
 #include "wild_encounter.h"
-#include "string_util.h"
 #include "constants/species.h"
 
 static void Task_SmoothBlendLayers(u8 taskId);
diff --git a/src/menu_helpers.c b/src/menu_helpers.c
index 8e63ea99d..a4794e1af 100644
--- a/src/menu_helpers.c
+++ b/src/menu_helpers.c
@@ -1,14 +1,9 @@
 #include "global.h"
+#include "gflib.h"
 #include "task.h"
-#include "bg.h"
-#include "gpu_regs.h"
-#include "window.h"
 #include "menu.h"
 #include "menu_helpers.h"
 #include "new_menu_helpers.h"
-#include "string_util.h"
-#include "text.h"
-#include "sound.h"
 #include "link.h"
 #include "overworld.h"
 #include "mail_data.h"
diff --git a/src/menu_indicators.c b/src/menu_indicators.c
index 3044fb8b4..890a5fcfa 100644
--- a/src/menu_indicators.c
+++ b/src/menu_indicators.c
@@ -1,9 +1,7 @@
 #include "global.h"
-#include "malloc.h"
+#include "gflib.h"
 #include "task.h"
 #include "decompress.h"
-#include "palette.h"
-#include "sprite.h"
 #include "trig.h"
 #include "list_menu.h"
 #include "menu_indicators.h"
diff --git a/src/mevent.c b/src/mevent.c
index 9eabcad61..469019fa6 100644
--- a/src/mevent.c
+++ b/src/mevent.c
@@ -1,10 +1,8 @@
 #include "global.h"
+#include "gflib.h"
 #include "constants/songs.h"
 #include "constants/species.h"
-#include "malloc.h"
-#include "sound.h"
 #include "easy_chat.h"
-#include "main.h"
 #include "task.h"
 #include "decompress.h"
 #include "link.h"
@@ -15,7 +13,6 @@
 #include "event_data.h"
 #include "battle_tower.h"
 #include "new_game.h"
-#include "string_util.h"
 #include "menews_jisan.h"
 #include "cereader_tool.h"
 #include "mystery_gift_menu.h"
diff --git a/src/mevent_client.c b/src/mevent_client.c
index d7eff1ec6..5346a4e82 100644
--- a/src/mevent_client.c
+++ b/src/mevent_client.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "malloc.h"
+#include "gflib.h"
 #include "decompress.h"
 #include "overworld.h"
 #include "script.h"
diff --git a/src/mevent_server.c b/src/mevent_server.c
index f1505fcbc..4a6e6a19c 100644
--- a/src/mevent_server.c
+++ b/src/mevent_server.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "malloc.h"
+#include "gflib.h"
 #include "script.h"
 #include "mevent.h"
 #include "mevent_server.h"
diff --git a/src/mevent_show_card.c b/src/mevent_show_card.c
index 5f92a36bf..0452c60b9 100644
--- a/src/mevent_show_card.c
+++ b/src/mevent_show_card.c
@@ -1,14 +1,11 @@
 #include "global.h"
+#include "gflib.h"
 #include "constants/species.h"
-#include "bg.h"
-#include "palette.h"
 #include "decompress.h"
-#include "malloc.h"
 #include "menu.h"
 #include "new_menu_helpers.h"
 #include "pokemon_icon.h"
 #include "mystery_gift_menu.h"
-#include "string_util.h"
 #include "mevent.h"
 #include "battle_anim.h"
 
diff --git a/src/minigame_countdown.c b/src/minigame_countdown.c
index 81d1cb7df..874fb2377 100644
--- a/src/minigame_countdown.c
+++ b/src/minigame_countdown.c
@@ -1,6 +1,6 @@
 #include "global.h"
+#include "gflib.h"
 #include "decompress.h"
-#include "sound.h"
 #include "task.h"
 #include "trig.h"
 #include "constants/songs.h"
diff --git a/src/mon_markings.c b/src/mon_markings.c
index dfef23821..feb8a255a 100644
--- a/src/mon_markings.c
+++ b/src/mon_markings.c
@@ -1,7 +1,6 @@
 #include "global.h"
-#include "dma3.h"
+#include "gflib.h"
 #include "text_window_graphics.h"
-#include "sound.h"
 #include "mon_markings.h"
 #include "graphics.h"
 #include "constants/songs.h"
diff --git a/src/money.c b/src/money.c
index 323b2e5f6..3fa52bb8c 100644
--- a/src/money.c
+++ b/src/money.c
@@ -1,7 +1,6 @@
 #include "global.h"
+#include "gflib.h"
 #include "event_data.h"
-#include "text.h"
-#include "string_util.h"
 #include "menu.h"
 #include "text_window.h"
 #include "strings.h"
diff --git a/src/mystery_event_script.c b/src/mystery_event_script.c
index 5a105bae9..1fea39b60 100644
--- a/src/mystery_event_script.c
+++ b/src/mystery_event_script.c
@@ -1,4 +1,5 @@
 #include "global.h"
+#include "gflib.h"
 #include "berry.h"
 #include "battle_tower.h"
 #include "easy_chat.h"
@@ -6,13 +7,10 @@
 #include "mail_data.h"
 #include "mystery_event_script.h"
 #include "pokedex.h"
-#include "pokemon.h"
 #include "pokemon_size_record.h"
 #include "script.h"
 #include "constants/species.h"
 #include "strings.h"
-#include "string_util.h"
-#include "text.h"
 #include "util.h"
 #include "mystery_event_msg.h"
 #include "pokemon_storage_system.h"
diff --git a/src/mystery_gift_menu.c b/src/mystery_gift_menu.c
index a80ffe1b3..a207cee96 100644
--- a/src/mystery_gift_menu.c
+++ b/src/mystery_gift_menu.c
@@ -1,21 +1,14 @@
 #include "global.h"
-#include "palette.h"
-#include "gpu_regs.h"
-#include "bg.h"
+#include "gflib.h"
 #include "task.h"
 #include "scanline_effect.h"
-#include "malloc.h"
-#include "text.h"
-#include "window.h"
 #include "text_window.h"
 #include "menu.h"
 #include "new_menu_helpers.h"
-#include "sound.h"
 #include "mystery_gift_menu.h"
 #include "title_screen.h"
 #include "list_menu.h"
 #include "link_rfu.h"
-#include "string_util.h"
 #include "mevent.h"
 #include "save.h"
 #include "link.h"
diff --git a/src/new_game.c b/src/new_game.c
index d03e83b34..bc7763fd9 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -1,6 +1,6 @@
 #include "global.h"
+#include "gflib.h"
 #include "random.h"
-#include "main.h"
 #include "overworld.h"
 #include "constants/maps.h"
 #include "load_save.h"
@@ -10,7 +10,6 @@
 #include "quest_log.h"
 #include "wild_encounter.h"
 #include "event_data.h"
-#include "string_util.h"
 #include "mail_data.h"
 #include "play_time.h"
 #include "money.h"
diff --git a/src/normal.c b/src/normal.c
index 366219c72..5a4d98907 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -1,6 +1,6 @@
 #include "global.h"
+#include "gflib.h"
 #include "battle_anim.h"
-#include "palette.h"
 #include "random.h"
 #include "task.h"
 #include "trig.h"
diff --git a/src/oak_speech.c b/src/oak_speech.c
index 91fe117f1..3d0c656d7 100644
--- a/src/oak_speech.c
+++ b/src/oak_speech.c
@@ -1,23 +1,14 @@
 #include "global.h"
-#include "main.h"
+#include "gflib.h"
 #include "decompress.h"
 #include "task.h"
-#include "malloc.h"
-#include "gpu_regs.h"
-#include "palette.h"
 #include "blend_palette.h"
-#include "text.h"
-#include "window.h"
 #include "text_window.h"
-#include "bg.h"
 #include "menu.h"
 #include "help_system.h"
 #include "new_menu_helpers.h"
-#include "pokemon.h"
-#include "sound.h"
 #include "event_scripts.h"
 #include "scanline_effect.h"
-#include "string_util.h"
 #include "pokeball.h"
 #include "naming_screen.h"
 #include "math_util.h"
diff --git a/src/option_menu.c b/src/option_menu.c
index f224db1bc..5a7bc42e4 100644
--- a/src/option_menu.c
+++ b/src/option_menu.c
@@ -1,20 +1,13 @@
 #include "global.h"
-#include "gpu_regs.h"
+#include "gflib.h"
 #include "scanline_effect.h"
 #include "text_window_graphics.h"
 #include "menu.h"
 #include "menu_helpers.h"
 #include "task.h"
-#include "palette.h"
 #include "overworld.h"
-#include "malloc.h"
 #include "help_system.h"
-#include "main.h"
-#include "bg.h"
-#include "window.h"
-#include "text.h"
 #include "text_window.h"
-#include "string_util.h"
 #include "strings.h"
 #include "field_fadetransition.h"
 #include "gba/m4a_internal.h"
diff --git a/src/palette.c b/src/palette.c
index 04638f6d1..014199a7a 100644
--- a/src/palette.c
+++ b/src/palette.c
@@ -1,8 +1,7 @@
 #include "global.h"
-#include "palette.h"
+#include "gflib.h"
 #include "util.h"
 #include "decompress.h"
-#include "gpu_regs.h"
 #include "task.h"
 
 enum
diff --git a/src/party_menu_specials.c b/src/party_menu_specials.c
index 48406da9a..56e3373ec 100644
--- a/src/party_menu_specials.c
+++ b/src/party_menu_specials.c
@@ -1,14 +1,12 @@
 #include "global.h"
+#include "gflib.h"
 #include "data.h"
 #include "script.h"
 #include "overworld.h"
-#include "palette.h"
-#include "pokemon.h"
 #include "party_menu.h"
 #include "field_fadetransition.h"
 #include "pokemon_summary_screen.h"
 #include "event_data.h"
-#include "string_util.h"
 #include "constants/moves.h"
 
 static void sub_80BF97C(u8 taskId);
diff --git a/src/pc_screen_effect.c b/src/pc_screen_effect.c
index 5ee8e2b7b..5b5952c26 100644
--- a/src/pc_screen_effect.c
+++ b/src/pc_screen_effect.c
@@ -1,7 +1,6 @@
 #include "global.h"
+#include "gflib.h"
 #include "task.h"
-#include "gpu_regs.h"
-#include "palette.h"
 
 /*
  * Animates the screen as though it was a CRT monitor turning on or off.
diff --git a/src/player_pc.c b/src/player_pc.c
index 736c67a51..1c6c9c3d4 100644
--- a/src/player_pc.c
+++ b/src/player_pc.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "palette.h"
+#include "gflib.h"
 #include "item.h"
 #include "task.h"
 #include "menu_indicators.h"
@@ -9,7 +9,6 @@
 #include "mail.h"
 #include "mail_data.h"
 #include "help_system.h"
-#include "sound.h"
 #include "overworld.h"
 #include "script.h"
 #include "mailbox_pc.h"
@@ -17,7 +16,6 @@
 #include "field_weather.h"
 #include "event_scripts.h"
 #include "field_fadetransition.h"
-#include "string_util.h"
 #include "item_menu.h"
 #include "item_pc.h"
 #include "party_menu.h"
diff --git a/src/pokeball.c b/src/pokeball.c
index 92b22abe6..4b908ddea 100644
--- a/src/pokeball.c
+++ b/src/pokeball.c
@@ -1,14 +1,11 @@
 #include "global.h"
+#include "gflib.h"
 #include "battle.h"
 #include "battle_anim.h"
 #include "decompress.h"
 #include "graphics.h"
-#include "main.h"
 #include "m4a.h"
 #include "pokeball.h"
-#include "pokemon.h"
-#include "sound.h"
-#include "sprite.h"
 #include "task.h"
 #include "trig.h"
 #include "util.h"
diff --git a/src/pokedex_area_markers.c b/src/pokedex_area_markers.c
index 3ff2aa496..a47d6876d 100644
--- a/src/pokedex_area_markers.c
+++ b/src/pokedex_area_markers.c
@@ -1,9 +1,6 @@
 #include "global.h"
-#include "malloc.h"
-#include "bg.h"
+#include "gflib.h"
 #include "decompress.h"
-#include "gpu_regs.h"
-#include "palette.h"
 #include "task.h"
 #include "wild_pokemon_area.h"
 #include "pokedex_area_markers.h"
diff --git a/src/pokedex_screen.c b/src/pokedex_screen.c
index 0219ca466..d80a2eefa 100644
--- a/src/pokedex_screen.c
+++ b/src/pokedex_screen.c
@@ -1,17 +1,10 @@
 #include "global.h"
-#include "bg.h"
-#include "malloc.h"
-#include "palette.h"
+#include "gflib.h"
 #include "graphics.h"
-#include "dma3.h"
-#include "gpu_regs.h"
 #include "m4a.h"
 #include "scanline_effect.h"
 #include "task.h"
-#include "text.h"
-#include "window.h"
 #include "new_menu_helpers.h"
-#include "sound.h"
 #include "event_data.h"
 #include "help_system.h"
 #include "menu_indicators.h"
@@ -21,7 +14,6 @@
 #include "pokedex_screen.h"
 #include "data.h"
 #include "pokedex.h"
-#include "string_util.h"
 #include "trainer_pokemon_sprites.h"
 #include "constants/songs.h"
 #include "constants/species.h"
diff --git a/src/pokemon.c b/src/pokemon.c
index 4c5a3e867..c85c7772c 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -1,12 +1,10 @@
 #define IS_POKEMON_C
 
 #include "global.h"
-#include "pokemon.h"
+#include "gflib.h"
 #include "random.h"
-#include "main.h"
 #include "text.h"
 #include "data.h"
-#include "string_util.h"
 #include "battle.h"
 #include "battle_anim.h"
 #include "item.h"
@@ -20,10 +18,8 @@
 #include "battle_util.h"
 #include "link.h"
 #include "m4a.h"
-#include "sound.h"
 #include "pokedex.h"
 #include "strings.h"
-#include "malloc.h"
 #include "overworld.h"
 #include "party_menu.h"
 #include "field_specials.h"
diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c
index 4c7681231..133caeb63 100644
--- a/src/pokemon_icon.c
+++ b/src/pokemon_icon.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "palette.h"
+#include "gflib.h"
 #include "mail_data.h"
 #include "pokemon_icon.h"
 #include "graphics.h"
diff --git a/src/pokemon_size_record.c b/src/pokemon_size_record.c
index 66bdb9194..6041ce7ff 100644
--- a/src/pokemon_size_record.c
+++ b/src/pokemon_size_record.c
@@ -1,9 +1,8 @@
 #include "global.h"
+#include "gflib.h"
 #include "data.h"
 #include "event_data.h"
 #include "pokedex.h"
-#include "pokemon.h"
-#include "string_util.h"
 #include "text.h"
 #include "strings.h"
 #include "constants/species.h"
diff --git a/src/psychic.c b/src/psychic.c
index 722ea014f..eb3522188 100644
--- a/src/psychic.c
+++ b/src/psychic.c
@@ -1,8 +1,6 @@
 #include "global.h"
+#include "gflib.h"
 #include "battle_anim.h"
-#include "gpu_regs.h"
-#include "palette.h"
-#include "sound.h"
 #include "scanline_effect.h"
 #include "trig.h"
 #include "constants/songs.h"
diff --git a/src/quest_log.c b/src/quest_log.c
index 5278f1ab3..c62618f51 100644
--- a/src/quest_log.c
+++ b/src/quest_log.c
@@ -1,18 +1,10 @@
 #include "global.h"
-#include "data.h"
-#include "malloc.h"
-#include "main.h"
+#include "gflib.h"
 #include "task.h"
-#include "palette.h"
 #include "menu.h"
-#include "random.h"
 #include "menu_helpers.h"
-#include "window.h"
 #include "text_window.h"
-#include "dynamic_placeholder_text_util.h"
 #include "event_data.h"
-#include "event_scripts.h"
-#include "string_util.h"
 #include "script.h"
 #include "overworld.h"
 #include "field_fadetransition.h"
@@ -20,16 +12,13 @@
 #include "event_object_movement.h"
 #include "event_object_lock.h"
 #include "field_player_avatar.h"
-#include "battle.h"
 #include "item.h"
 #include "region_map.h"
 #include "map_name_popup.h"
 #include "wild_encounter.h"
 #include "help_system.h"
-#include "party_menu.h"
 #include "pokemon_storage_system.h"
 #include "save.h"
-#include "link.h"
 #include "quest_log_objects.h"
 #include "quest_log_player.h"
 #include "quest_log.h"
@@ -37,14 +26,10 @@
 #include "strings.h"
 #include "constants/event_objects.h"
 #include "constants/maps.h"
-#include "constants/party_menu.h"
 #include "constants/quest_log.h"
-#include "constants/trainer_classes.h"
 #include "constants/species.h"
-#include "constants/items.h"
 #include "constants/field_weather.h"
 #include "constants/event_object_movement.h"
-#include "constants/region_map_sections.h"
 
 struct TrainerFanClub
 {
diff --git a/src/quest_log_battle.c b/src/quest_log_battle.c
index 7ae4d7c2c..fc3390508 100644
--- a/src/quest_log_battle.c
+++ b/src/quest_log_battle.c
@@ -1,6 +1,6 @@
 #include "global.h"
+#include "gflib.h"
 #include "constants/species.h"
-#include "malloc.h"
 #include "battle.h"
 #include "battle_anim.h"
 #include "link.h"
diff --git a/src/region_map.c b/src/region_map.c
index 33cf665d0..81bd4aca4 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -1,20 +1,15 @@
 #include "global.h"
-#include "palette.h"
-#include "gpu_regs.h"
+#include "gflib.h"
 #include "scanline_effect.h"
 #include "task.h"
 #include "m4a.h"
-#include "malloc.h"
 #include "overworld.h"
 #include "event_data.h"
 #include "region_map.h"
-#include "window.h"
-#include "sound.h"
 #include "party_menu.h"
 #include "field_effect.h"
 #include "new_menu_helpers.h"
 #include "menu.h"
-#include "string_util.h"
 #include "strings.h"
 #include "map_preview_screen.h"
 #include "constants/flags.h"
diff --git a/src/reset_save_heap.c b/src/reset_save_heap.c
index 7b9d30c06..20527fa85 100644
--- a/src/reset_save_heap.c
+++ b/src/reset_save_heap.c
@@ -1,12 +1,10 @@
 #include "global.h"
-#include "main.h"
-#include "gpu_regs.h"
+#include "gflib.h"
 #include "m4a.h"
 #include "load_save.h"
 #include "save.h"
 #include "new_game.h"
 #include "overworld.h"
-#include "malloc.h"
 
 void ResetSaveHeap(void)
 {
diff --git a/src/reshow_battle_screen.c b/src/reshow_battle_screen.c
index 25470fc43..c65169710 100644
--- a/src/reshow_battle_screen.c
+++ b/src/reshow_battle_screen.c
@@ -1,12 +1,7 @@
 #include "global.h"
-#include "bg.h"
-#include "palette.h"
-#include "pokemon.h"
-#include "main.h"
+#include "gflib.h"
 #include "link.h"
 #include "data.h"
-#include "sprite.h"
-#include "gpu_regs.h"
 #include "scanline_effect.h"
 #include "help_system.h"
 #include "battle.h"
diff --git a/src/rock.c b/src/rock.c
index 3ec9cec04..a2d28d057 100644
--- a/src/rock.c
+++ b/src/rock.c
@@ -1,9 +1,7 @@
 #include "global.h"
+#include "gflib.h"
 #include "battle_anim.h"
-#include "gpu_regs.h"
 #include "graphics.h"
-#include "palette.h"
-#include "sound.h"
 #include "task.h"
 #include "trig.h"
 #include "constants/songs.h"
diff --git a/src/roulette_util.c b/src/roulette_util.c
index 3c5a3c825..9dab23342 100644
--- a/src/roulette_util.c
+++ b/src/roulette_util.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "palette.h"
+#include "gflib.h"
 #include "roulette_util.h"
 #include "util.h"
 
diff --git a/src/save.c b/src/save.c
index 3db8dcdbf..3c192c098 100644
--- a/src/save.c
+++ b/src/save.c
@@ -1,7 +1,6 @@
 #include "global.h"
 #include "save.h"
 #include "decompress.h"
-#include "main.h"
 #include "overworld.h"
 #include "load_save.h"
 #include "task.h"
diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c
index 09e49a1bb..e71910485 100644
--- a/src/save_failed_screen.c
+++ b/src/save_failed_screen.c
@@ -1,13 +1,11 @@
 #include "global.h"
+#include "gflib.h"
 #include "decompress.h"
-#include "dma3.h"
 #include "gba/flash_internal.h"
-#include "gpu_regs.h"
 #include "help_system.h"
 #include "m4a.h"
 #include "save.h"
 #include "strings.h"
-#include "text.h"
 
 bool32 sIsInSaveFailedScreen;
 
diff --git a/src/save_menu_util.c b/src/save_menu_util.c
index 54073785e..5f5f1f492 100644
--- a/src/save_menu_util.c
+++ b/src/save_menu_util.c
@@ -1,6 +1,5 @@
 #include "global.h"
-#include "string_util.h"
-#include "text.h"
+#include "gflib.h"
 #include "event_data.h"
 #include "pokedex.h"
 #include "region_map.h"
diff --git a/src/scrcmd.c b/src/scrcmd.c
index e3a9b3b72..75761f0a3 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -1,6 +1,5 @@
 #include "global.h"
-#include "gba/isagbprint.h"
-#include "palette.h"
+#include "gflib.h"
 #include "script.h"
 #include "mystery_event_script.h"
 #include "event_data.h"
@@ -14,15 +13,12 @@
 #include "field_tasks.h"
 #include "field_fadetransition.h"
 #include "field_player_avatar.h"
-#include "sound.h"
 #include "script_movement.h"
 #include "event_object_movement.h"
 #include "event_object_lock.h"
 #include "field_message_box.h"
 #include "new_menu_helpers.h"
-#include "window.h"
 #include "script_menu.h"
-#include "string_util.h"
 #include "data.h"
 #include "field_specials.h"
 #include "constants/items.h"
diff --git a/src/script_menu.c b/src/script_menu.c
index b2748db38..4e5ba905c 100644
--- a/src/script_menu.c
+++ b/src/script_menu.c
@@ -1,17 +1,13 @@
 #include "global.h"
-#include "palette.h"
-#include "text.h"
+#include "gflib.h"
 #include "menu.h"
 #include "task.h"
-#include "sound.h"
 #include "script_menu.h"
 #include "quest_log.h"
-#include "window.h"
 #include "new_menu_helpers.h"
 #include "event_data.h"
 #include "script.h"
 #include "strings.h"
-#include "string_util.h"
 #include "field_effect.h"
 #include "event_scripts.h"
 #include "constants/songs.h"
diff --git a/src/script_pokemon_util.c b/src/script_pokemon_util.c
index 677759497..f0bfad455 100644
--- a/src/script_pokemon_util.c
+++ b/src/script_pokemon_util.c
@@ -1,9 +1,9 @@
 #include "global.h"
+#include "gflib.h"
 #include "berry.h"
 #include "daycare.h"
 #include "event_data.h"
 #include "load_save.h"
-#include "malloc.h"
 #include "overworld.h"
 #include "party_menu.h"
 #include "pokedex.h"
diff --git a/src/seagallop.c b/src/seagallop.c
index 11022f315..da020f882 100644
--- a/src/seagallop.c
+++ b/src/seagallop.c
@@ -1,13 +1,8 @@
 #include "global.h"
-#include "gpu_regs.h"
-#include "bg.h"
-#include "palette.h"
-#include "malloc.h"
+#include "gflib.h"
 #include "scanline_effect.h"
 #include "trainer_pokemon_sprites.h"
-#include "window.h"
 #include "text_window.h"
-#include "sound.h"
 #include "task.h"
 #include "help_system.h"
 #include "overworld.h"
diff --git a/src/shop.c b/src/shop.c
index b84007bed..66b9fdb49 100644
--- a/src/shop.c
+++ b/src/shop.c
@@ -1,4 +1,5 @@
 #include "global.h"
+#include "gflib.h"
 #include "shop.h"
 #include "menu.h"
 #include "data.h"
@@ -7,24 +8,15 @@
 #include "list_menu.h"
 #include "new_menu_helpers.h"
 #include "party_menu.h"
-#include "window.h"
 #include "field_specials.h"
 #include "field_weather.h"
 #include "task.h"
-#include "text.h"
 #include "item.h"
 #include "item_menu.h"
-#include "main.h"
-#include "sound.h"
-#include "string_util.h"
 #include "overworld.h"
-#include "palette.h"
 #include "field_fadetransition.h"
 #include "scanline_effect.h"
 #include "item_menu_icons.h"
-#include "bg.h"
-#include "gpu_regs.h"
-#include "malloc.h"
 #include "decompress.h"
 #include "menu_indicators.h"
 #include "field_player_avatar.h"
diff --git a/src/sound.c b/src/sound.c
index 43b51020d..ed3f368ad 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -1,10 +1,9 @@
 #include "global.h"
 #include "gba/m4a_internal.h"
-#include "sound.h"
+#include "gflib.h"
 #include "battle.h"
 #include "quest_log.h"
 #include "m4a.h"
-#include "main.h"
 #include "constants/songs.h"
 #include "constants/fanfares.h"
 #include "task.h"
diff --git a/src/ss_anne.c b/src/ss_anne.c
index df04d8c66..fd0195830 100644
--- a/src/ss_anne.c
+++ b/src/ss_anne.c
@@ -1,6 +1,6 @@
 #include "global.h"
+#include "gflib.h"
 #include "task.h"
-#include "sound.h"
 #include "event_object_movement.h"
 #include "script.h"
 #include "constants/songs.h"
diff --git a/src/string_util.c b/src/string_util.c
index 0a2365d25..17507b0e8 100644
--- a/src/string_util.c
+++ b/src/string_util.c
@@ -1,6 +1,5 @@
 #include "global.h"
-#include "string_util.h"
-#include "text.h"
+#include "gflib.h"
 
 EWRAM_DATA u8 gStringVar1[32] = {};
 EWRAM_DATA u8 gStringVar2[20] = {};
diff --git a/src/teachy_tv.c b/src/teachy_tv.c
index 1d49ee3d9..6924f8e9d 100644
--- a/src/teachy_tv.c
+++ b/src/teachy_tv.c
@@ -1,23 +1,15 @@
 #include "task.h"
-#include "menu.h"
-#include "palette.h"
-#include "sprite.h"
+#include "gflib.h"
 #include "menu_helpers.h"
 #include "new_menu_helpers.h"
-#include "sound.h"
-#include "malloc.h"
 #include "scanline_effect.h"
-#include "bg.h"
-#include "gpu_regs.h"
 #include "decompress.h"
-#include "window.h"
 #include "list_menu.h"
 #include "item_menu.h"
 #include "item.h"
 #include "menu_indicators.h"
 #include "event_object_movement.h"
 #include "random.h"
-#include "text.h"
 #include "constants/songs.h"
 #include "constants/items.h"
 #include "event_data.h"
diff --git a/src/text.c b/src/text.c
index 1a0858604..9e0bb4c5f 100644
--- a/src/text.c
+++ b/src/text.c
@@ -1,9 +1,5 @@
 #include "global.h"
-#include "main.h"
-#include "window.h"
-#include "text.h"
-#include "sprite.h"
-#include "sound.h"
+#include "gflib.h"
 #include "m4a.h"
 #include "quest_log.h"
 #include "graphics.h"
diff --git a/src/text_window.c b/src/text_window.c
index 8b2572fd1..b4914e07b 100644
--- a/src/text_window.c
+++ b/src/text_window.c
@@ -1,7 +1,5 @@
 #include "global.h"
-#include "bg.h"
-#include "palette.h"
-#include "window.h"
+#include "gflib.h"
 #include "text_window.h"
 #include "text_window_graphics.h"
 #include "quest_log.h"
diff --git a/src/title_screen.c b/src/title_screen.c
index e7ac79401..156dfa50d 100644
--- a/src/title_screen.c
+++ b/src/title_screen.c
@@ -1,10 +1,6 @@
 #include "global.h"
-#include "malloc.h"
-#include "palette.h"
-#include "gpu_regs.h"
-#include "bg.h"
+#include "gflib.h"
 #include "task.h"
-#include "main.h"
 #include "new_menu_helpers.h"
 #include "m4a.h"
 #include "scanline_effect.h"
@@ -12,7 +8,6 @@
 #include "help_system.h"
 #include "intro.h"
 #include "load_save.h"
-#include "sound.h"
 #include "new_game.h"
 #include "save.h"
 #include "main_menu.h"
diff --git a/src/tm_case.c b/src/tm_case.c
index 57eee6faf..0ec19d134 100644
--- a/src/tm_case.c
+++ b/src/tm_case.c
@@ -1,12 +1,8 @@
 #include "global.h"
-#include "malloc.h"
-#include "bg.h"
+#include "gflib.h"
 #include "decompress.h"
-#include "gpu_regs.h"
-#include "palette.h"
 #include "graphics.h"
 #include "task.h"
-#include "text.h"
 #include "text_window.h"
 #include "menu.h"
 #include "menu_helpers.h"
@@ -19,11 +15,9 @@
 #include "shop.h"
 #include "teachy_tv.h"
 #include "pokemon_storage_system.h"
-#include "string_util.h"
 #include "party_menu.h"
 #include "data.h"
 #include "scanline_effect.h"
-#include "sound.h"
 #include "strings.h"
 #include "menu_indicators.h"
 #include "constants/items.h"
diff --git a/src/trade_scene.c b/src/trade_scene.c
index 308cd6e5b..e23a2e307 100644
--- a/src/trade_scene.c
+++ b/src/trade_scene.c
@@ -1,17 +1,11 @@
 #include "global.h"
+#include "gflib.h"
 #include "task.h"
-#include "malloc.h"
-#include "bg.h"
-#include "gpu_regs.h"
 #include "util.h"
-#include "window.h"
-#include "sound.h"
 #include "decompress.h"
-#include "palette.h"
 #include "trade.h"
 #include "link.h"
 #include "link_rfu.h"
-#include "text.h"
 #include "mevent.h"
 #include "graphics.h"
 #include "strings.h"
@@ -20,7 +14,6 @@
 #include "battle.h"
 #include "script.h"
 #include "event_data.h"
-#include "string_util.h"
 #include "mail.h"
 #include "mail_data.h"
 #include "pokeball.h"
diff --git a/src/trainer_card.c b/src/trainer_card.c
index 01bd2c228..33440e5a5 100644
--- a/src/trainer_card.c
+++ b/src/trainer_card.c
@@ -1,23 +1,15 @@
 #include "global.h"
+#include "gflib.h"
 #include "scanline_effect.h"
-#include "palette.h"
 #include "task.h"
-#include "main.h"
-#include "window.h"
-#include "malloc.h"
 #include "link.h"
-#include "bg.h"
-#include "sound.h"
 #include "overworld.h"
 #include "menu.h"
-#include "text.h"
 #include "event_data.h"
 #include "easy_chat.h"
 #include "money.h"
 #include "strings.h"
-#include "string_util.h"
 #include "trainer_card.h"
-#include "gpu_regs.h"
 #include "pokedex.h"
 #include "pokemon_icon.h"
 #include "graphics.h"
diff --git a/src/trainer_pokemon_sprites.c b/src/trainer_pokemon_sprites.c
index 8567d791b..f88a0d803 100644
--- a/src/trainer_pokemon_sprites.c
+++ b/src/trainer_pokemon_sprites.c
@@ -1,10 +1,6 @@
 #include "global.h"
-#include "sprite.h"
-#include "window.h"
-#include "malloc.h"
-#include "palette.h"
+#include "gflib.h"
 #include "decompress.h"
-#include "pokemon.h"
 
 extern const struct CompressedSpriteSheet gMonFrontPicTable[];
 extern const struct CompressedSpriteSheet gMonBackPicTable[];
diff --git a/src/trainer_tower.c b/src/trainer_tower.c
index 64acbacd8..06c4a2fad 100644
--- a/src/trainer_tower.c
+++ b/src/trainer_tower.c
@@ -1,23 +1,17 @@
 #include "global.h"
-#include "main.h"
-#include "task.h"
-#include "malloc.h"
+#include "gflib.h"
 #include "util.h"
-#include "string_util.h"
 #include "event_data.h"
 #include "cereader_tool.h"
 #include "easy_chat.h"
-#include "text.h"
 #include "battle_setup.h"
 #include "battle_transition.h"
 #include "battle.h"
 #include "battle_main.h"
 #include "overworld.h"
 #include "item.h"
-#include "window.h"
 #include "menu.h"
 #include "new_menu_helpers.h"
-#include "sound.h"
 #include "constants/vars.h"
 #include "constants/items.h"
 #include "constants/species.h"
diff --git a/src/union_room_battle.c b/src/union_room_battle.c
index b4d8af9ce..c6b5f485b 100644
--- a/src/union_room_battle.c
+++ b/src/union_room_battle.c
@@ -1,18 +1,14 @@
 #include "global.h"
-#include "bg.h"
+#include "gflib.h"
 #include "battle.h"
-#include "gpu_regs.h"
 #include "link.h"
-#include "malloc.h"
 #include "menu.h"
 #include "new_menu_helpers.h"
 #include "overworld.h"
-#include "palette.h"
 #include "party_menu.h"
 #include "strings.h"
 #include "text_window.h"
 #include "union_room.h"
-#include "window.h"
 #include "constants/union_room.h"
 
 struct UnionRoomBattleWork
diff --git a/src/vs_seeker.c b/src/vs_seeker.c
index 813cb029f..7685f461d 100644
--- a/src/vs_seeker.c
+++ b/src/vs_seeker.c
@@ -1,8 +1,7 @@
 #include "global.h"
+#include "gflib.h"
 #include "constants/songs.h"
-#include "sound.h"
 #include "task.h"
-#include "malloc.h"
 #include "event_object_movement.h"
 #include "new_menu_helpers.h"
 #include "item_use.h"
diff --git a/src/window.c b/src/window.c
index 4aaa6d9b4..a7cec4186 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1,8 +1,5 @@
 #include "global.h"
-#include "window.h"
-#include "malloc.h"
-#include "bg.h"
-#include "blit.h"
+#include "gflib.h"
 
 u8 gWindowClearTile;
 void *gWindowBgTilemapBuffers[4];
diff --git a/src/window_8bpp.c b/src/window_8bpp.c
index 8977d61e4..441dbbef8 100644
--- a/src/window_8bpp.c
+++ b/src/window_8bpp.c
@@ -1,8 +1,5 @@
 #include "global.h"
-#include "window.h"
-#include "malloc.h"
-#include "bg.h"
-#include "blit.h"
+#include "gflib.h"
 
 EWRAM_DATA static struct Window* sWindowPtr = NULL;
 EWRAM_DATA static u16 sWindowSize = 0;
diff --git a/src/wireless_communication_status_screen.c b/src/wireless_communication_status_screen.c
index a284a6d16..f8f552711 100644
--- a/src/wireless_communication_status_screen.c
+++ b/src/wireless_communication_status_screen.c
@@ -1,18 +1,11 @@
 #include "global.h"
-#include "bg.h"
-#include "palette.h"
-#include "gpu_regs.h"
-#include "malloc.h"
+#include "gflib.h"
 #include "task.h"
-#include "text.h"
-#include "window.h"
 #include "new_menu_helpers.h"
 #include "scanline_effect.h"
 #include "m4a.h"
-#include "string_util.h"
 #include "dynamic_placeholder_text_util.h"
 #include "overworld.h"
-#include "sound.h"
 #include "strings.h"
 #include "menu.h"
 #include "librfu.h"