diff --git a/Makefile b/Makefile
index 7a9976c2..023d3e9e 100644
--- a/Makefile
+++ b/Makefile
@@ -58,6 +58,7 @@ endif
 
 MAINDIR=src
 SDLDIR=src/sdl
+AGBDIR=src/agb
 DMGDIR=src/dmg
 GBAPUDIR=src/dmg/gb_apu
 FEXDIR=../dependencies/File_Extractor-0.4.3
@@ -73,11 +74,11 @@ ${GBAPUDIR}/Gb_Apu_State${OE} ${GBAPUDIR}/Gb_Oscs${OE} ${GBAPUDIR}/Multi_Buffer$
 
 CALTERNOBJ=${HQCDIR}/hq_implementation${OE}
 
-MAINOBJ=${MAINDIR}/2xSaI${OE} ${MAINDIR}/admame${OE} ${MAINDIR}/agb/agbprint${OE} ${MAINDIR}/armdis${OE} \
+MAINOBJ=${MAINDIR}/2xSaI${OE} ${MAINDIR}/admame${OE} ${AGBDIR}agbprint${OE} ${MAINDIR}/armdis${OE} \
 ${MAINDIR}/bilinear${OE} ${MAINDIR}/bios${OE} ${MAINDIR}/Cheats${OE} ${MAINDIR}/CheatSearch${OE} \
-${MAINDIR}/EEprom${OE} ${MAINDIR}/elf${OE} ${MAINDIR}/Flash${OE} ${MAINDIR}/agb/GBA${OE} \
-${MAINDIR}/agb/gbafilter${OE} ${MAINDIR}/agb/GBAGFX${OE} ${MAINDIR}/Globals${OE} ${MAINDIR}/interframe${OE} \
-${MAINDIR}/hq2x${OE} ${MAINDIR}/agb/gba-thumb${OE} ${MAINDIR}/agb/gba-arm${OE} ${MAINDIR}/Mode0${OE} \
+${MAINDIR}/EEprom${OE} ${MAINDIR}/elf${OE} ${MAINDIR}/Flash${OE} ${AGBDIR}GBA${OE} \
+${AGBDIR}gbafilter${OE} ${AGBDIR}GBAGfx${OE} ${MAINDIR}/Globals${OE} ${MAINDIR}/interframe${OE} \
+${MAINDIR}/hq2x${OE} ${AGBDIR}GBA-thumb${OE} ${AGBDIR}GBA-arm${OE} ${MAINDIR}/Mode0${OE} \
 ${MAINDIR}/Mode1${OE} ${MAINDIR}/Mode2${OE} ${MAINDIR}/Mode3${OE} ${MAINDIR}/Mode4${OE} \
 ${MAINDIR}/Mode5${OE} ${MAINDIR}/pixel${OE} \
 ${MAINDIR}/remote${OE} ${MAINDIR}/RTC${OE} ${MAINDIR}/scanline${OE} \