diff --git a/Makefile b/Makefile
index 85d3f6a51..451a28740 100644
--- a/Makefile
+++ b/Makefile
@@ -43,6 +43,7 @@ ELF = $(ROM:.gba=.elf)
 MAP = $(ROM:.gba=.map)
 
 C_SUBDIR = src
+GFLIB_SUBDIR = gflib
 ASM_SUBDIR = asm
 DATA_SRC_SUBDIR = src/data
 DATA_ASM_SUBDIR = data
@@ -50,6 +51,7 @@ SONG_SUBDIR = sound/songs
 MID_SUBDIR = sound/songs/midi
 
 C_BUILDDIR = $(OBJ_DIR)/$(C_SUBDIR)
+GFLIB_BUILDDIR = $(OBJ_DIR)/$(GFLIB_SUBDIR)
 ASM_BUILDDIR = $(OBJ_DIR)/$(ASM_SUBDIR)
 DATA_ASM_BUILDDIR = $(OBJ_DIR)/$(DATA_ASM_SUBDIR)
 SONG_BUILDDIR = $(OBJ_DIR)/$(SONG_SUBDIR)
@@ -73,7 +75,7 @@ OBJ_DIR := build/modern
 LIBPATH := -L $(TOOLCHAIN)/lib/gcc/arm-none-eabi/$(GCC_VER)/thumb -L $(TOOLCHAIN)/arm-none-eabi/lib/thumb
 endif
 
-CPPFLAGS := -iquote include -Wno-trigraphs -DMODERN=$(MODERN)
+CPPFLAGS := -iquote include -iquote $(GFLIB_SUBDIR) -Wno-trigraphs -DMODERN=$(MODERN)
 ifeq ($(MODERN),0)
 CPPFLAGS += -I tools/agbcc/include -I tools/agbcc
 endif
@@ -125,6 +127,9 @@ C_SRCS_IN := $(wildcard $(C_SUBDIR)/*.c $(C_SUBDIR)/*/*.c $(C_SUBDIR)/*/*/*.c)
 C_SRCS := $(foreach src,$(C_SRCS_IN),$(if $(findstring .inc.c,$(src)),,$(src)))
 C_OBJS := $(patsubst $(C_SUBDIR)/%.c,$(C_BUILDDIR)/%.o,$(C_SRCS))
 
+GFLIB_SRCS := $(wildcard $(GFLIB_SUBDIR)/*.c)
+GFLIB_OBJS := $(patsubst $(GFLIB_SUBDIR)/%.c,$(GFLIB_BUILDDIR)/%.o,$(GFLIB_SRCS))
+
 C_ASM_SRCS += $(wildcard $(C_SUBDIR)/*.s $(C_SUBDIR)/*/*.s $(C_SUBDIR)/*/*/*.s)
 C_ASM_OBJS := $(patsubst $(C_SUBDIR)/%.s,$(C_BUILDDIR)/%.o,$(C_ASM_SRCS))
 
@@ -140,7 +145,7 @@ SONG_OBJS := $(patsubst $(SONG_SUBDIR)/%.s,$(SONG_BUILDDIR)/%.o,$(SONG_SRCS))
 MID_SRCS := $(wildcard $(MID_SUBDIR)/*.mid)
 MID_OBJS := $(patsubst $(MID_SUBDIR)/%.mid,$(MID_BUILDDIR)/%.o,$(MID_SRCS))
 
-OBJS     := $(C_OBJS) $(C_ASM_OBJS) $(ASM_OBJS) $(DATA_ASM_OBJS) $(SONG_OBJS) $(MID_OBJS)
+OBJS     := $(C_OBJS) $(GFLIB_OBJS) $(C_ASM_OBJS) $(ASM_OBJS) $(DATA_ASM_OBJS) $(SONG_OBJS) $(MID_OBJS)
 OBJS_REL := $(patsubst $(OBJ_DIR)/%,%,$(OBJS))
 
 SUBDIRS  := $(sort $(dir $(OBJS)))
@@ -230,7 +235,7 @@ endif
 ifeq ($(NODEP),1)
 $(C_BUILDDIR)/%.o: c_dep :=
 else
-$(C_BUILDDIR)/%.o: c_dep = $(shell [[ -f $(C_SUBDIR)/$*.c ]] && $(SCANINC) -I include -I tools/agbcc/include $(C_SUBDIR)/$*.c)
+$(C_BUILDDIR)/%.o: c_dep = $(shell [[ -f $(C_SUBDIR)/$*.c ]] && $(SCANINC) -I include -I tools/agbcc/include -I gflib $(C_SUBDIR)/$*.c)
 endif
 
 ifeq ($(DINFO),1)
@@ -243,6 +248,18 @@ $(C_BUILDDIR)/%.o : $(C_SUBDIR)/%.c $$(c_dep)
 	@echo -e ".text\n\t.align\t2, 0\n" >> $(C_BUILDDIR)/$*.s
 	$(AS) $(ASFLAGS) -o $@ $(C_BUILDDIR)/$*.s
 
+ifeq ($(NODEP),1)
+$(GFLIB_BUILDDIR)/%.o: c_dep :=
+else
+$(GFLIB_BUILDDIR)/%.o: c_dep = $(shell [[ -f $(GFLIB_SUBDIR)/$*.c ]] && $(SCANINC) -I include -I tools/agbcc/include -I gflib $(GFLIB_SUBDIR)/$*.c)
+endif
+
+$(GFLIB_BUILDDIR)/%.o : $(GFLIB_SUBDIR)/%.c $$(c_dep)
+	@$(CPP) $(CPPFLAGS) $< -o $(GFLIB_BUILDDIR)/$*.i
+	@$(PREPROC) $(GFLIB_BUILDDIR)/$*.i charmap.txt | $(CC1) $(CFLAGS) -o $(GFLIB_BUILDDIR)/$*.s
+	@echo -e ".text\n\t.align\t2, 0\n" >> $(GFLIB_BUILDDIR)/$*.s
+	$(AS) $(ASFLAGS) -o $@ $(GFLIB_BUILDDIR)/$*.s
+
 ifeq ($(NODEP),1)
 $(C_BUILDDIR)/%.o: c_asm_dep :=
 else
diff --git a/src/bg.c b/gflib/bg.c
similarity index 100%
rename from src/bg.c
rename to gflib/bg.c
diff --git a/include/bg.h b/gflib/bg.h
similarity index 100%
rename from include/bg.h
rename to gflib/bg.h
diff --git a/src/blit.c b/gflib/blit.c
similarity index 100%
rename from src/blit.c
rename to gflib/blit.c
diff --git a/include/blit.h b/gflib/blit.h
similarity index 100%
rename from include/blit.h
rename to gflib/blit.h
diff --git a/include/dma3.h b/gflib/dma3.h
similarity index 100%
rename from include/dma3.h
rename to gflib/dma3.h
diff --git a/src/dma3_manager.c b/gflib/dma3_manager.c
similarity index 100%
rename from src/dma3_manager.c
rename to gflib/dma3_manager.c
diff --git a/src/gpu_regs.c b/gflib/gpu_regs.c
similarity index 100%
rename from src/gpu_regs.c
rename to gflib/gpu_regs.c
diff --git a/include/gpu_regs.h b/gflib/gpu_regs.h
similarity index 100%
rename from include/gpu_regs.h
rename to gflib/gpu_regs.h
diff --git a/src/alloc.c b/gflib/malloc.c
similarity index 100%
rename from src/alloc.c
rename to gflib/malloc.c
diff --git a/include/alloc.h b/gflib/malloc.h
similarity index 100%
rename from include/alloc.h
rename to gflib/malloc.h
diff --git a/src/sprite.c b/gflib/sprite.c
similarity index 100%
rename from src/sprite.c
rename to gflib/sprite.c
diff --git a/include/sprite.h b/gflib/sprite.h
similarity index 100%
rename from include/sprite.h
rename to gflib/sprite.h
diff --git a/src/string_util.c b/gflib/string_util.c
similarity index 100%
rename from src/string_util.c
rename to gflib/string_util.c
diff --git a/include/string_util.h b/gflib/string_util.h
similarity index 100%
rename from include/string_util.h
rename to gflib/string_util.h
diff --git a/src/text.c b/gflib/text.c
similarity index 100%
rename from src/text.c
rename to gflib/text.c
diff --git a/include/text.h b/gflib/text.h
similarity index 100%
rename from include/text.h
rename to gflib/text.h
diff --git a/src/window.c b/gflib/window.c
similarity index 99%
rename from src/window.c
rename to gflib/window.c
index fbce57743..7c87ea86d 100644
--- a/src/window.c
+++ b/gflib/window.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "window.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "bg.h"
 #include "blit.h"
 
diff --git a/include/window.h b/gflib/window.h
similarity index 100%
rename from include/window.h
rename to gflib/window.h
diff --git a/ld_script.txt b/ld_script.txt
index 4247fca4d..cb3a7fa16 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -49,15 +49,15 @@ SECTIONS {
     {
         src/crt0.o(.text);
         src/main.o(.text);
-        src/alloc.o(.text);
-        src/dma3_manager.o(.text);
-        src/gpu_regs.o(.text);
-        src/bg.o(.text);
-        src/blit.o(.text);
-        src/window.o(.text);
-        src/text.o(.text);
-        src/sprite.o(.text);
-        src/string_util.o(.text);
+        gflib/malloc.o(.text);
+        gflib/dma3_manager.o(.text);
+        gflib/gpu_regs.o(.text);
+        gflib/bg.o(.text);
+        gflib/blit.o(.text);
+        gflib/window.o(.text);
+        gflib/text.o(.text);
+        gflib/sprite.o(.text);
+        gflib/string_util.o(.text);
         src/link.o(.text);
         src/link_rfu.o(.text);
         src/union_room.o(.text);
@@ -420,12 +420,12 @@ SECTIONS {
     ALIGN(4)
     {
         src/main.o(.rodata);
-        src/bg.o(.rodata);
-        src/window.o(.rodata);
-        src/text.o(.rodata);
-        src/sprite.o(.rodata);
+        gflib/bg.o(.rodata);
+        gflib/window.o(.rodata);
+        gflib/text.o(.rodata);
+        gflib/sprite.o(.rodata);
         data/io_reg.o(.rodata);
-        src/string_util.o(.rodata);
+        gflib/string_util.o(.rodata);
         src/link.o(.rodata);
         src/link.o(.rodata.str1.4);
         src/link_rfu.o(.rodata);
diff --git a/src/apprentice.c b/src/apprentice.c
index 4ad295e1a..6c4ac86aa 100644
--- a/src/apprentice.c
+++ b/src/apprentice.c
@@ -10,7 +10,7 @@
 #include "item.h"
 #include "item_menu.h"
 #include "main.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "menu.h"
 #include "new_game.h"
 #include "party_menu.h"
diff --git a/src/battle_anim_effects_1.c b/src/battle_anim_effects_1.c
index db9057cb4..b2999a127 100644
--- a/src/battle_anim_effects_1.c
+++ b/src/battle_anim_effects_1.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "battle_anim.h"
 #include "battle_interface.h"
 #include "decompress.h"
diff --git a/src/battle_anim_effects_2.c b/src/battle_anim_effects_2.c
index 1add76bf3..87023e7e1 100755
--- a/src/battle_anim_effects_2.c
+++ b/src/battle_anim_effects_2.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "battle_anim.h"
 #include "battle_interface.h"
 #include "decompress.h"
diff --git a/src/battle_anim_effects_3.c b/src/battle_anim_effects_3.c
index 79b728e61..ea69780ef 100755
--- a/src/battle_anim_effects_3.c
+++ b/src/battle_anim_effects_3.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "battle.h"
 #include "battle_anim.h"
 #include "bg.h"
diff --git a/src/battle_anim_mons.c b/src/battle_anim_mons.c
index a667daecf..9a588a9ca 100644
--- a/src/battle_anim_mons.c
+++ b/src/battle_anim_mons.c
@@ -7,7 +7,7 @@
 #include "decompress.h"
 #include "dma3.h"
 #include "gpu_regs.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "palette.h"
 #include "pokemon_icon.h"
 #include "sprite.h"
diff --git a/src/battle_anim_utility_funcs.c b/src/battle_anim_utility_funcs.c
index efe35e1b4..1a0200271 100644
--- a/src/battle_anim_utility_funcs.c
+++ b/src/battle_anim_utility_funcs.c
@@ -3,7 +3,7 @@
 #include "contest.h"
 #include "gpu_regs.h"
 #include "graphics.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "palette.h"
 #include "sound.h"
 #include "sprite.h"
diff --git a/src/battle_dome.c b/src/battle_dome.c
index 1c116467d..22a1ecaf2 100644
--- a/src/battle_dome.c
+++ b/src/battle_dome.c
@@ -8,7 +8,7 @@
 #include "event_data.h"
 #include "overworld.h"
 #include "util.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "string_util.h"
 #include "random.h"
 #include "task.h"
diff --git a/src/battle_factory_screen.c b/src/battle_factory_screen.c
index f56442432..36839cde5 100644
--- a/src/battle_factory_screen.c
+++ b/src/battle_factory_screen.c
@@ -11,7 +11,7 @@
 #include "palette.h"
 #include "task.h"
 #include "main.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "bg.h"
 #include "gpu_regs.h"
 #include "string_util.h"
diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c
index de403aec7..737e6b61e 100644
--- a/src/battle_gfx_sfx_util.c
+++ b/src/battle_gfx_sfx_util.c
@@ -6,7 +6,7 @@
 #include "constants/battle_anim.h"
 #include "battle_interface.h"
 #include "main.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "graphics.h"
 #include "random.h"
 #include "util.h"
diff --git a/src/battle_main.c b/src/battle_main.c
index 87e29dd57..c8b2d17cc 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -26,7 +26,7 @@
 #include "link_rfu.h"
 #include "load_save.h"
 #include "main.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "m4a.h"
 #include "palette.h"
 #include "party_menu.h"
diff --git a/src/battle_pike.c b/src/battle_pike.c
index 8846e2d1a..7d1257fb3 100644
--- a/src/battle_pike.c
+++ b/src/battle_pike.c
@@ -9,7 +9,7 @@
 #include "task.h"
 #include "battle_tower.h"
 #include "party_menu.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "palette.h"
 #include "script.h"
 #include "battle_setup.h"
diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c
index cc722da8d..e0a00d28c 100644
--- a/src/battle_pyramid.c
+++ b/src/battle_pyramid.c
@@ -23,7 +23,7 @@
 #include "main.h"
 #include "load_save.h"
 #include "script.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "overworld.h"
 #include "event_scripts.h"
 #include "constants/battle_frontier.h"
diff --git a/src/battle_pyramid_bag.c b/src/battle_pyramid_bag.c
index b4ec6cd62..a17a93499 100644
--- a/src/battle_pyramid_bag.c
+++ b/src/battle_pyramid_bag.c
@@ -17,7 +17,7 @@
 #include "list_menu.h"
 #include "mail.h"
 #include "main.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "menu.h"
 #include "menu_helpers.h"
 #include "overworld.h"
diff --git a/src/battle_records.c b/src/battle_records.c
index 3d4cabcb0..ccd16e219 100644
--- a/src/battle_records.c
+++ b/src/battle_records.c
@@ -18,7 +18,7 @@
 #include "international_string_util.h"
 #include "sound.h"
 #include "constants/songs.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "gpu_regs.h"
 #include "constants/game_stat.h"
 #include "trainer_hill.h"
diff --git a/src/battle_transition.c b/src/battle_transition.c
index 3e86fcf51..ae6c28711 100644
--- a/src/battle_transition.c
+++ b/src/battle_transition.c
@@ -9,7 +9,7 @@
 #include "field_weather.h"
 #include "gpu_regs.h"
 #include "main.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "overworld.h"
 #include "palette.h"
 #include "random.h"
diff --git a/src/battle_util2.c b/src/battle_util2.c
index f840cd58b..ce2153b2d 100644
--- a/src/battle_util2.c
+++ b/src/battle_util2.c
@@ -2,7 +2,7 @@
 #include "battle.h"
 #include "battle_anim.h"
 #include "battle_controllers.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "pokemon.h"
 #include "trainer_hill.h"
 #include "party_menu.h"
diff --git a/src/berry_blender.c b/src/berry_blender.c
index 03764b2f8..3c58ca1b4 100644
--- a/src/berry_blender.c
+++ b/src/berry_blender.c
@@ -12,7 +12,7 @@
 #include "bg.h"
 #include "palette.h"
 #include "decompress.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "gpu_regs.h"
 #include "text.h"
 #include "text_window.h"
diff --git a/src/berry_crush.c b/src/berry_crush.c
index 6259e0a41..8b4c7a545 100755
--- a/src/berry_crush.c
+++ b/src/berry_crush.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "berry_powder.h"
 #include "bg.h"
 #include "event_data.h"
diff --git a/src/berry_fix_program.c b/src/berry_fix_program.c
index 37be569f8..e3c4e2675 100644
--- a/src/berry_fix_program.c
+++ b/src/berry_fix_program.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "gpu_regs.h"
 #include "multiboot.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "bg.h"
 #include "graphics.h"
 #include "main.h"
diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c
index c3eac783d..8c9cde7d3 100644
--- a/src/berry_tag_screen.c
+++ b/src/berry_tag_screen.c
@@ -21,7 +21,7 @@
 #include "string_util.h"
 #include "strings.h"
 #include "bg.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "scanline_effect.h"
 #include "gpu_regs.h"
 #include "graphics.h"
diff --git a/src/cable_car.c b/src/cable_car.c
index adeee2647..c6e7e724e 100644
--- a/src/cable_car.c
+++ b/src/cable_car.c
@@ -6,7 +6,7 @@
 #include "field_weather.h"
 #include "gpu_regs.h"
 #include "graphics.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "main.h"
 #include "menu.h"
 #include "overworld.h"
diff --git a/src/contest.c b/src/contest.c
index 79c1616c2..e9a2f456f 100644
--- a/src/contest.c
+++ b/src/contest.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "gpu_regs.h"
 #include "bg.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "constants/items.h"
 #include "constants/event_objects.h"
 #include "constants/moves.h"
diff --git a/src/contest_link_80F57C4.c b/src/contest_link_80F57C4.c
index a0a29f0ad..54b2326d0 100644
--- a/src/contest_link_80F57C4.c
+++ b/src/contest_link_80F57C4.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "battle.h"
 #include "battle_gfx_sfx_util.h"
 #include "bg.h"
diff --git a/src/contest_painting.c b/src/contest_painting.c
index 1b95e1ed9..2b36d5e38 100644
--- a/src/contest_painting.c
+++ b/src/contest_painting.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "battle.h"
 #include "battle_gfx_sfx_util.h"
 #include "bg.h"
diff --git a/src/credits.c b/src/credits.c
index 44fa2002c..e2c125d3f 100644
--- a/src/credits.c
+++ b/src/credits.c
@@ -3,7 +3,7 @@
 #include "main.h"
 #include "task.h"
 #include "bg.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "window.h"
 #include "text.h"
 #include "menu.h"
diff --git a/src/data.c b/src/data.c
index 7aebd63ed..8d6640223 100644
--- a/src/data.c
+++ b/src/data.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "battle.h"
 #include "data.h"
 #include "graphics.h"
diff --git a/src/decompress.c b/src/decompress.c
index 46e4ef614..5e85e065f 100644
--- a/src/decompress.c
+++ b/src/decompress.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "data.h"
 #include "decompress.h"
 #include "pokemon.h"
diff --git a/src/decoration.c b/src/decoration.c
index 974859c88..3e6428501 100644
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "decompress.h"
 #include "decoration.h"
 #include "decoration_inventory.h"
diff --git a/src/dewford_trend.c b/src/dewford_trend.c
index ee310af04..57a97d8f3 100644
--- a/src/dewford_trend.c
+++ b/src/dewford_trend.c
@@ -3,7 +3,7 @@
 #include "easy_chat.h"
 #include "event_data.h"
 #include "link.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "random.h"
 #include "text.h"
 #include "tv.h"
diff --git a/src/diploma.c b/src/diploma.c
index 8e0901fa8..3c03c057f 100644
--- a/src/diploma.c
+++ b/src/diploma.c
@@ -5,7 +5,7 @@
 #include "gpu_regs.h"
 #include "scanline_effect.h"
 #include "task.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "decompress.h"
 #include "bg.h"
 #include "window.h"
diff --git a/src/dodrio_berry_picking.c b/src/dodrio_berry_picking.c
index 714b10ef6..4b636e2b9 100644
--- a/src/dodrio_berry_picking.c
+++ b/src/dodrio_berry_picking.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "bg.h"
 #include "dodrio_berry_picking.h"
 #include "dynamic_placeholder_text_util.h"
diff --git a/src/easy_chat.c b/src/easy_chat.c
index ba54de783..f4ac92d06 100644
--- a/src/easy_chat.c
+++ b/src/easy_chat.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "bard_music.h"
 #include "bg.h"
 #include "data.h"
diff --git a/src/egg_hatch.c b/src/egg_hatch.c
index 5e16f1479..c796a0423 100644
--- a/src/egg_hatch.c
+++ b/src/egg_hatch.c
@@ -17,7 +17,7 @@
 #include "menu.h"
 #include "trig.h"
 #include "random.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "dma3.h"
 #include "gpu_regs.h"
 #include "bg.h"
diff --git a/src/ereader_helpers.c b/src/ereader_helpers.c
index f184dea82..7f0887790 100755
--- a/src/ereader_helpers.c
+++ b/src/ereader_helpers.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "decompress.h"
 #include "ereader_helpers.h"
 #include "link.h"
diff --git a/src/ereader_screen.c b/src/ereader_screen.c
index 13e964224..0e865558a 100755
--- a/src/ereader_screen.c
+++ b/src/ereader_screen.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "decompress.h"
 #include "ereader_helpers.h"
 #include "link.h"
diff --git a/src/event_object_movement.c b/src/event_object_movement.c
index 75f758a12..c493c6d87 100644
--- a/src/event_object_movement.c
+++ b/src/event_object_movement.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "battle_pyramid.h"
 #include "berry.h"
 #include "decoration.h"
diff --git a/src/evolution_scene.c b/src/evolution_scene.c
index 96ca2ed1c..5ba979453 100644
--- a/src/evolution_scene.c
+++ b/src/evolution_scene.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "battle.h"
 #include "battle_message.h"
 #include "bg.h"
diff --git a/src/field_region_map.c b/src/field_region_map.c
index ac1b26154..184c49b40 100644
--- a/src/field_region_map.c
+++ b/src/field_region_map.c
@@ -3,7 +3,7 @@
 #include "gpu_regs.h"
 #include "international_string_util.h"
 #include "main.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "menu.h"
 #include "palette.h"
 #include "region_map.h"
diff --git a/src/field_specials.c b/src/field_specials.c
index 99e8e93a9..5af0fd88a 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "battle.h"
 #include "battle_tower.h"
 #include "cable_club.h"
diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c
index 3115ff231..00eed7624 100644
--- a/src/fldeff_cut.c
+++ b/src/fldeff_cut.c
@@ -7,7 +7,7 @@
 #include "field_player_avatar.h"
 #include "fieldmap.h"
 #include "fldeff.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "metatile_behavior.h"
 #include "overworld.h"
 #include "party_menu.h"
diff --git a/src/frontier_pass.c b/src/frontier_pass.c
index fff93c3c7..a4ef500d7 100644
--- a/src/frontier_pass.c
+++ b/src/frontier_pass.c
@@ -5,7 +5,7 @@
 #include "battle_anim.h"
 #include "event_data.h"
 #include "recorded_battle.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "sprite.h"
 #include "scanline_effect.h"
 #include "text_window.h"
diff --git a/src/frontier_util.c b/src/frontier_util.c
index 536e23e30..69db5f762 100644
--- a/src/frontier_util.c
+++ b/src/frontier_util.c
@@ -24,7 +24,7 @@
 #include "data.h"
 #include "record_mixing.h"
 #include "strings.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "save.h"
 #include "load_save.h"
 #include "battle_dome.h"
diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c
index ac37b2ece..d138abbb1 100644
--- a/src/hall_of_fame.c
+++ b/src/hall_of_fame.c
@@ -6,7 +6,7 @@
 #include "pokemon.h"
 #include "text.h"
 #include "text_window.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "gpu_regs.h"
 #include "graphics.h"
 #include "main.h"
diff --git a/src/intro.c b/src/intro.c
index e97fbedb0..58f2509cc 100644
--- a/src/intro.c
+++ b/src/intro.c
@@ -5,7 +5,7 @@
 #include "task.h"
 #include "title_screen.h"
 #include "libgcnmultiboot.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "gpu_regs.h"
 #include "link.h"
 #include "multiboot_pokemon_colosseum.h"
diff --git a/src/item.c b/src/item.c
index 5e505724c..6b8f51f12 100644
--- a/src/item.c
+++ b/src/item.c
@@ -4,7 +4,7 @@
 #include "string_util.h"
 #include "text.h"
 #include "event_data.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "secret_base.h"
 #include "item_menu.h"
 #include "strings.h"
diff --git a/src/item_icon.c b/src/item_icon.c
index 91c32951a..6ae7eac58 100644
--- a/src/item_icon.c
+++ b/src/item_icon.c
@@ -2,7 +2,7 @@
 #include "decompress.h"
 #include "graphics.h"
 #include "item_icon.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "sprite.h"
 #include "constants/items.h"
 
diff --git a/src/item_menu.c b/src/item_menu.c
index 12f03b328..c004ed443 100755
--- a/src/item_menu.c
+++ b/src/item_menu.c
@@ -25,7 +25,7 @@
 #include "link.h"
 #include "mail.h"
 #include "main.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "map_name_popup.h"
 #include "menu.h"
 #include "money.h"
diff --git a/src/link.c b/src/link.c
index 9928b48da..db72be19a 100644
--- a/src/link.c
+++ b/src/link.c
@@ -2,7 +2,7 @@
 // Includes
 #include "global.h"
 #include "m4a.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "reset_save_heap.h"
 #include "save.h"
 #include "bg.h"
diff --git a/src/link_rfu.c b/src/link_rfu.c
index 4b0b0a2a5..3b533a3a4 100644
--- a/src/link_rfu.c
+++ b/src/link_rfu.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "battle.h"
 #include "berry_blender.h"
 #include "decompress.h"
diff --git a/src/list_menu.c b/src/list_menu.c
index 6d51559f7..797aff5f8 100644
--- a/src/list_menu.c
+++ b/src/list_menu.c
@@ -8,7 +8,7 @@
 #include "trig.h"
 #include "decompress.h"
 #include "palette.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "strings.h"
 #include "sound.h"
 #include "constants/songs.h"
diff --git a/src/load_save.c b/src/load_save.c
index 5857f2b46..24dfda20c 100644
--- a/src/load_save.c
+++ b/src/load_save.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "berry_powder.h"
 #include "item.h"
 #include "load_save.h"
diff --git a/src/mail.c b/src/mail.c
index 0078bc4fc..cdf965545 100644
--- a/src/mail.c
+++ b/src/mail.c
@@ -17,7 +17,7 @@
 #include "bg.h"
 #include "pokemon_icon.h"
 #include "constants/species.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "easy_chat.h"
 #include "constants/rgb.h"
 
diff --git a/src/main.c b/src/main.c
index 06425e661..f488e7f6d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "crt0.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "link.h"
 #include "link_rfu.h"
 #include "librfu.h"
diff --git a/src/match_call.c b/src/match_call.c
index b02af9977..bf5642a83 100644
--- a/src/match_call.c
+++ b/src/match_call.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "battle.h"
 #include "battle_setup.h"
 #include "bg.h"
diff --git a/src/menu.c b/src/menu.c
index 8d50d4dcc..177c37694 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "bg.h"
 #include "blit.h"
 #include "dma3.h"
diff --git a/src/menu_specialized.c b/src/menu_specialized.c
index 1536cf413..f46c93e05 100644
--- a/src/menu_specialized.c
+++ b/src/menu_specialized.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "battle_main.h"
 #include "contest_effect.h"
 #include "data.h"
diff --git a/src/mevent_801BAAC.c b/src/mevent_801BAAC.c
index 8f5b2d636..24d55c511 100644
--- a/src/mevent_801BAAC.c
+++ b/src/mevent_801BAAC.c
@@ -4,7 +4,7 @@
 #include "gpu_regs.h"
 #include "palette.h"
 #include "decompress.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "menu.h"
 #include "pokemon_icon.h"
 #include "union_room.h"
diff --git a/src/mevent_client.c b/src/mevent_client.c
index ec8908af2..659b772df 100644
--- a/src/mevent_client.c
+++ b/src/mevent_client.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "decompress.h"
 #include "overworld.h"
 #include "script.h"
diff --git a/src/mevent_server.c b/src/mevent_server.c
index 06b10dd95..0d3afea30 100644
--- a/src/mevent_server.c
+++ b/src/mevent_server.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "script.h"
 #include "mevent.h"
 #include "mevent_server.h"
diff --git a/src/mevent_server_helpers.c b/src/mevent_server_helpers.c
index 9d47ba745..616f394f7 100644
--- a/src/mevent_server_helpers.c
+++ b/src/mevent_server_helpers.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "decompress.h"
 #include "util.h"
 #include "link.h"
diff --git a/src/mirage_tower.c b/src/mirage_tower.c
index bb9c6e958..0c2b8ce74 100644
--- a/src/mirage_tower.c
+++ b/src/mirage_tower.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "bg.h"
 #include "event_data.h"
 #include "event_object_movement.h"
diff --git a/src/mossdeep_gym.c b/src/mossdeep_gym.c
index d8adbe0c6..e4e807c4e 100644
--- a/src/mossdeep_gym.c
+++ b/src/mossdeep_gym.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "event_object_movement.h"
 #include "fieldmap.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "mossdeep_gym.h"
 #include "script_movement.h"
 #include "constants/event_object_movement_constants.h"
diff --git a/src/move_relearner.c b/src/move_relearner.c
index 0b0b4a5aa..0d1362232 100644
--- a/src/move_relearner.c
+++ b/src/move_relearner.c
@@ -9,7 +9,7 @@
 #include "gpu_regs.h"
 #include "move_relearner.h"
 #include "list_menu.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "menu.h"
 #include "menu_helpers.h"
 #include "menu_specialized.h"
diff --git a/src/mystery_gift.c b/src/mystery_gift.c
index ab3df9020..aae7d127e 100644
--- a/src/mystery_gift.c
+++ b/src/mystery_gift.c
@@ -2,7 +2,7 @@
 #include "main.h"
 #include "text.h"
 #include "task.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "gpu_regs.h"
 #include "scanline_effect.h"
 #include "text_window.h"
diff --git a/src/naming_screen.c b/src/naming_screen.c
index 7da7d99b0..b259d9a24 100644
--- a/src/naming_screen.c
+++ b/src/naming_screen.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "naming_screen.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "palette.h"
 #include "task.h"
 #include "sprite.h"
diff --git a/src/overworld.c b/src/overworld.c
index cefbd8159..2f6898ee5 100644
--- a/src/overworld.c
+++ b/src/overworld.c
@@ -26,7 +26,7 @@
 #include "link_rfu.h"
 #include "load_save.h"
 #include "main.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "m4a.h"
 #include "map_name_popup.h"
 #include "match_call.h"
diff --git a/src/party_menu.c b/src/party_menu.c
index f4b749bde..e4235b29f 100755
--- a/src/party_menu.c
+++ b/src/party_menu.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "battle.h"
 #include "battle_anim.h"
 #include "battle_controllers.h"
diff --git a/src/player_pc.c b/src/player_pc.c
index 08f24d379..dd90bbd8a 100644
--- a/src/player_pc.c
+++ b/src/player_pc.c
@@ -14,7 +14,7 @@
 #include "list_menu.h"
 #include "mail.h"
 #include "main.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "menu.h"
 #include "menu_helpers.h"
 #include "overworld.h"
diff --git a/src/pokeblock.c b/src/pokeblock.c
index 0d8469132..d9f5c5498 100644
--- a/src/pokeblock.c
+++ b/src/pokeblock.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "battle.h"
 #include "battle_controllers.h"
 #include "battle_message.h"
diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c
index 4ad15414d..2c0b68dc6 100644
--- a/src/pokeblock_feed.c
+++ b/src/pokeblock_feed.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "battle.h"
 #include "bg.h"
 #include "data.h"
diff --git a/src/pokedex.c b/src/pokedex.c
index c1787ef6a..0710bdecf 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -8,7 +8,7 @@
 #include "graphics.h"
 #include "international_string_util.h"
 #include "main.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "menu.h"
 #include "m4a.h"
 #include "overworld.h"
diff --git a/src/pokedex_area_screen.c b/src/pokedex_area_screen.c
index dc69b5d54..697fdb792 100755
--- a/src/pokedex_area_screen.c
+++ b/src/pokedex_area_screen.c
@@ -4,7 +4,7 @@
 #include "gpu_regs.h"
 #include "graphics.h"
 #include "main.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "menu.h"
 #include "overworld.h"
 #include "palette.h"
diff --git a/src/pokedex_cry_screen.c b/src/pokedex_cry_screen.c
index 487db6d58..0b35b00ee 100644
--- a/src/pokedex_cry_screen.c
+++ b/src/pokedex_cry_screen.c
@@ -2,7 +2,7 @@
 #include "bg.h"
 #include "m4a.h"
 #include "main.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "palette.h"
 #include "pokedex_cry_screen.h"
 #include "sound.h"
diff --git a/src/pokemon.c b/src/pokemon.c
index 074ee2d19..b4d791e27 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "apprentice.h"
 #include "battle.h"
 #include "battle_anim.h"
diff --git a/src/pokemon_jump.c b/src/pokemon_jump.c
index 8f16e1ce2..cc9c2f4ff 100755
--- a/src/pokemon_jump.c
+++ b/src/pokemon_jump.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "battle_anim.h"
 #include "bg.h"
 #include "data.h"
diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c
index 4cd1a4772..06531be0e 100644
--- a/src/pokemon_storage_system.c
+++ b/src/pokemon_storage_system.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "bg.h"
 #include "data.h"
 #include "decompress.h"
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c
index 79aac4b5e..8018e4fe0 100644
--- a/src/pokemon_summary_screen.c
+++ b/src/pokemon_summary_screen.c
@@ -20,7 +20,7 @@
 #include "item.h"
 #include "link.h"
 #include "m4a.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "menu.h"
 #include "menu_helpers.h"
 #include "mon_markings.h"
diff --git a/src/pokenav.c b/src/pokenav.c
index a5bb51789..2a1647a6f 100644
--- a/src/pokenav.c
+++ b/src/pokenav.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "task.h"
 #include "main.h"
 #include "overworld.h"
diff --git a/src/pokenav_unk_2.c b/src/pokenav_unk_2.c
index 1c40e146f..cb9467a9c 100644
--- a/src/pokenav_unk_2.c
+++ b/src/pokenav_unk_2.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "decompress.h"
 #include "bg.h"
 #include "palette.h"
diff --git a/src/rayquaza_scene.c b/src/rayquaza_scene.c
index fc2860797..4e5e492f2 100644
--- a/src/rayquaza_scene.c
+++ b/src/rayquaza_scene.c
@@ -5,7 +5,7 @@
 #include "graphics.h"
 #include "bg.h"
 #include "main.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "palette.h"
 #include "scanline_effect.h"
 #include "menu.h"
diff --git a/src/record_mixing.c b/src/record_mixing.c
index 32e0404b9..8df0a8a8b 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "random.h"
 #include "constants/items.h"
 #include "text.h"
diff --git a/src/recorded_battle.c b/src/recorded_battle.c
index 9e03d57f6..b2aa3c008 100644
--- a/src/recorded_battle.c
+++ b/src/recorded_battle.c
@@ -10,7 +10,7 @@
 #include "string_util.h"
 #include "palette.h"
 #include "save.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "util.h"
 #include "task.h"
 #include "text.h"
diff --git a/src/region_map.c b/src/region_map.c
index a98964e5c..4957f1cac 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -2,7 +2,7 @@
 #include "main.h"
 #include "text.h"
 #include "menu.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "gpu_regs.h"
 #include "palette.h"
 #include "party_menu.h"
diff --git a/src/reset_save_heap.c b/src/reset_save_heap.c
index beba742f5..5a54a2177 100644
--- a/src/reset_save_heap.c
+++ b/src/reset_save_heap.c
@@ -6,7 +6,7 @@
 #include "save.h"
 #include "new_game.h"
 #include "overworld.h"
-#include "alloc.h"
+#include "malloc.h"
 
 void sub_81700F8(void)
 {
diff --git a/src/rom_8034C54.c b/src/rom_8034C54.c
index 42817fc2b..7cc30c775 100644
--- a/src/rom_8034C54.c
+++ b/src/rom_8034C54.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "rom_8034C54.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "decompress.h"
 #include "main.h"
 #include "battle_main.h"
diff --git a/src/rom_81520A8.c b/src/rom_81520A8.c
index f06823594..f6d14d49c 100644
--- a/src/rom_81520A8.c
+++ b/src/rom_81520A8.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "rom_81520A8.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "main.h"
 #include "rom_8034C54.h"
 
diff --git a/src/roulette.c b/src/roulette.c
index 662522aae..bef14a364 100644
--- a/src/roulette.c
+++ b/src/roulette.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "bg.h"
 #include "coins.h"
 #include "decompress.h"
diff --git a/src/secret_base.c b/src/secret_base.c
index 12cb8cd61..71346d389 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "battle.h"
 #include "battle_setup.h"
 #include "decoration.h"
diff --git a/src/shop.c b/src/shop.c
index bf15568fb..ded88a2a6 100755
--- a/src/shop.c
+++ b/src/shop.c
@@ -17,7 +17,7 @@
 #include "item_menu.h"
 #include "list_menu.h"
 #include "main.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "menu.h"
 #include "menu_helpers.h"
 #include "money.h"
diff --git a/src/slot_machine.c b/src/slot_machine.c
index 003ac3327..37071926e 100644
--- a/src/slot_machine.c
+++ b/src/slot_machine.c
@@ -14,7 +14,7 @@
 #include "util.h"
 #include "text.h"
 #include "menu.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "bg.h"
 #include "gpu_regs.h"
 #include "coins.h"
diff --git a/src/trade.c b/src/trade.c
index d95e4ebf5..7e585e280 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "battle_anim.h"
 #include "battle_interface.h"
 #include "bg.h"
diff --git a/src/trainer_card.c b/src/trainer_card.c
index 9c4816c42..f7685b8cc 100755
--- a/src/trainer_card.c
+++ b/src/trainer_card.c
@@ -4,7 +4,7 @@
 #include "task.h"
 #include "main.h"
 #include "window.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "link.h"
 #include "bg.h"
 #include "sound.h"
diff --git a/src/trainer_hill.c b/src/trainer_hill.c
index 2a7e003d9..995dc164a 100644
--- a/src/trainer_hill.c
+++ b/src/trainer_hill.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "battle.h"
 #include "battle_tower.h"
 #include "battle_setup.h"
diff --git a/src/trainer_pokemon_sprites.c b/src/trainer_pokemon_sprites.c
index 047783a85..f360ec84c 100644
--- a/src/trainer_pokemon_sprites.c
+++ b/src/trainer_pokemon_sprites.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "sprite.h"
 #include "window.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "constants/species.h"
 #include "palette.h"
 #include "decompress.h"
diff --git a/src/tv.c b/src/tv.c
index ef826a4af..3e9390e61 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -31,7 +31,7 @@
 #include "text.h"
 #include "script_menu.h"
 #include "naming_screen.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "region_map.h"
 #include "constants/region_map_sections.h"
 #include "decoration.h"
diff --git a/src/union_room.c b/src/union_room.c
index 01288c8cc..95278a08f 100644
--- a/src/union_room.c
+++ b/src/union_room.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "battle.h"
 #include "berry_crush.h"
 #include "bg.h"
diff --git a/src/union_room_battle.c b/src/union_room_battle.c
index 79d12291d..b49406eac 100644
--- a/src/union_room_battle.c
+++ b/src/union_room_battle.c
@@ -6,7 +6,7 @@
 #include "bg.h"
 #include "palette.h"
 #include "gpu_regs.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "menu.h"
 #include "window.h"
 #include "text_window.h"
diff --git a/src/union_room_chat.c b/src/union_room_chat.c
index 4afeb99cf..8a3ab758e 100755
--- a/src/union_room_chat.c
+++ b/src/union_room_chat.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "bg.h"
 #include "decompress.h"
 #include "dma3.h"
diff --git a/src/unk_pokedex_area_screen_helper.c b/src/unk_pokedex_area_screen_helper.c
index 0041d628c..9b2401cb2 100644
--- a/src/unk_pokedex_area_screen_helper.c
+++ b/src/unk_pokedex_area_screen_helper.c
@@ -2,7 +2,7 @@
 #include "main.h"
 #include "menu.h"
 #include "bg.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "palette.h"
 #include "unk_pokedex_area_screen_helper.h"
 
diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c
index 655f38def..4d7605c50 100644
--- a/src/use_pokeblock.c
+++ b/src/use_pokeblock.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "main.h"
 #include "pokeblock.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "decompress.h"
 #include "graphics.h"
 #include "palette.h"
diff --git a/sym_bss.txt b/sym_bss.txt
index 29b30f2db..c2a60404e 100644
--- a/sym_bss.txt
+++ b/sym_bss.txt
@@ -1,10 +1,10 @@
 	.include "src/main.o"
-	.include "src/alloc.o"
-	.include "src/dma3_manager.o"
-	.include "src/gpu_regs.o"
-	.include "src/bg.o"
-	.include "src/text.o"
-	.include "src/sprite.o"
+	.include "gflib/malloc.o"
+	.include "gflib/dma3_manager.o"
+	.include "gflib/gpu_regs.o"
+	.include "gflib/bg.o"
+	.include "gflib/text.o"
+	.include "gflib/sprite.o"
 	.include "src/link.o"
 	.include "src/link_rfu.o"
 	.include "src/union_room.o"
diff --git a/sym_common.txt b/sym_common.txt
index f277ed0f2..7c306c61b 100644
--- a/sym_common.txt
+++ b/sym_common.txt
@@ -1,9 +1,37 @@
 	.space 0x8
 	.include "main.o"
-	.include "bg.o"
-	.include "window.o"
-	.include "text.o"
-	.include "sprite.o"
+	@ ../gflib/bg.o
+	.align 2
+gUnneededFireRedVariable:
+    .space 4
+    @ ../gflib/window.o
+    .align 4
+gTransparentTileNumber:
+    .space 1
+    .align 4
+gUnknown_03002F70:
+    .space 16
+    @ ../gflib/text.o
+    .align 4
+gFonts:
+    .space 4
+    .align 2
+gUnknown_03002F84:
+    .space 1
+    .align 4
+gUnknown_03002F90:
+    .space 132
+    .align 2
+gTextFlags:
+    .space 4
+    @ ../gflib/sprite.o
+    .align 2
+gOamMatrixAllocBitmap:
+    .space 4
+    .align 2
+gReservedSpritePaletteCount:
+    .space 1
+    .align 4
 	.include "link.o"
 	.include "link_rfu.o"
 	.include "rtc.o"
diff --git a/sym_ewram.txt b/sym_ewram.txt
index 3de0c45cb..bdbb85d37 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -1,9 +1,9 @@
 	.include "src/decompress.o"
 	.include "src/main.o"
-	.include "src/window.o"
-	.include "src/text.o"
-	.include "src/sprite.o"
-	.include "src/string_util.o"
+	.include "gflib/window.o"
+	.include "gflib/text.o"
+	.include "gflib/sprite.o"
+	.include "gflib/string_util.o"
 	.include "src/link.o"
 	.include "src/link_rfu.o"
 	.include "src/union_room.o"