diff --git a/Makefile b/Makefile
index 4163a25..397f83f 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,8 @@
 CC65DIR = ~/Personal/Development/cc65
 CC65BINDIR = $(CC65DIR)/bin
 CC65LIBDIR = $(CC65DIR)/lib
+CC65INCDIR = $(CC65DIR)/include
+CA65INCDIR = $(CC65DIR)/asminc
 APPLECMDR = ~/Desktop/Apple2/AppleCommander-1.3.5.jar
 
 all: bin/eightball bin/eightballvm bin/disass bin/8ball20.prg bin/8ballvm20.prg bin/disass20.prg bin/8ball64.prg bin/8ballvm64.prg bin/disass64.prg bin/eb bin/ebvm bin/ebdiss disk-images/eightball.d64 disk-images/eightball.dsk
@@ -52,93 +54,93 @@ bin/disass: disass.o eightballutils.o
 #
 
 eightball_20.o: eightball.c eightballutils.h eightballvm.h
-	$(CC65BINDIR)/cc65 -Or -t vic20 -D VIC20 -o eightball_20.s eightball.c
-	$(CC65BINDIR)/ca65 -t vic20 eightball_20.s
+	$(CC65BINDIR)/cc65 -I $(CC65INCDIR) -Or -t vic20 -D VIC20 -o eightball_20.s eightball.c
+	$(CC65BINDIR)/ca65 -I $(CA65INCDIR) -t vic20 eightball_20.s
 
 eightballvm_20.o: eightballvm.c eightballutils.h eightballvm.h
-	$(CC65BINDIR)/cc65 -Or -t vic20 -D VIC20 -o eightballvm_20.s eightballvm.c
-	$(CC65BINDIR)/ca65 -t vic20 eightballvm_20.s
+	$(CC65BINDIR)/cc65 -I $(CC65INCDIR) -Or -t vic20 -D VIC20 -o eightballvm_20.s eightballvm.c
+	$(CC65BINDIR)/ca65 -I $(CA65INCDIR) -t vic20 eightballvm_20.s
 
 disass_20.o: disass.c eightballutils.h eightballvm.h
-	$(CC65BINDIR)/cc65 -Or -t vic20 -D VIC20 -o disass_20.s disass.c
-	$(CC65BINDIR)/ca65 -t vic20 disass_20.s
+	$(CC65BINDIR)/cc65 -I $(CC65INCDIR) -Or -t vic20 -D VIC20 -o disass_20.s disass.c
+	$(CC65BINDIR)/ca65 -I $(CA65INCDIR) -t vic20 disass_20.s
 
 eightballutils_20.o: eightballutils.c eightballutils.h
-	$(CC65BINDIR)/cc65 -Or -t vic20 -D VIC20 -o eightballutils_20.s eightballutils.c
-	$(CC65BINDIR)/ca65 -t vic20 eightballutils_20.s
+	$(CC65BINDIR)/cc65 -I $(CC65INCDIR) -Or -t vic20 -D VIC20 -o eightballutils_20.s eightballutils.c
+	$(CC65BINDIR)/ca65 -I $(CA65INCDIR) -t vic20 eightballutils_20.s
 
 bin/8ball20.prg: eightball_20.o eightballutils_20.o
-	$(CC65BINDIR)/ld65 -m 8ball20.map -o bin/8ball20.prg -Ln 8ball20.vice -C vic20-32k.cfg eightball_20.o eightballutils_20.o $(CC65LIBDIR)/vic20.lib
+	$(CC65BINDIR)/ld65 -m 8ball20.map -o bin/8ball20.prg -Ln 8ball20.vice -C cc65/vic20-32k.cfg eightball_20.o eightballutils_20.o $(CC65LIBDIR)/vic20.lib
 
 bin/8ballvm20.prg: eightballvm_20.o eightballutils_20.o
-	$(CC65BINDIR)/ld65 -m 8ballvm20.map -o bin/8ballvm20.prg -Ln 8ballvm20.vice -C vic20-32k.cfg eightballvm_20.o eightballutils_20.o $(CC65LIBDIR)/vic20.lib
+	$(CC65BINDIR)/ld65 -m 8ballvm20.map -o bin/8ballvm20.prg -Ln 8ballvm20.vice -C cc65/vic20-32k.cfg eightballvm_20.o eightballutils_20.o $(CC65LIBDIR)/vic20.lib
 
 bin/disass20.prg: disass_20.o eightballutils_20.o
-	$(CC65BINDIR)/ld65 -m disass20.map -o bin/disass20.prg -Ln disass20.vice -C vic20-32k.cfg disass_20.o eightballutils_20.o $(CC65LIBDIR)/vic20.lib
+	$(CC65BINDIR)/ld65 -m disass20.map -o bin/disass20.prg -Ln disass20.vice -C cc65/vic20-32k.cfg disass_20.o eightballutils_20.o $(CC65LIBDIR)/vic20.lib
 
 #
 # C64 target
 #
 
 eightball_64.o: eightball.c eightballutils.h eightballvm.h
-	$(CC65BINDIR)/cc65 -Or -t c64 -D C64 -o eightball_64.s eightball.c
-	$(CC65BINDIR)/ca65 -t c64 eightball_64.s
+	$(CC65BINDIR)/cc65 -I $(CC65INCDIR) -Or -t c64 -D C64 -o eightball_64.s eightball.c
+	$(CC65BINDIR)/ca65 -I $(CA65INCDIR) -t c64 eightball_64.s
 
 eightballvm_64.o: eightballvm.c eightballutils.h eightballvm.h
-	$(CC65BINDIR)/cc65 -Or -t c64 -D C64 -o eightballvm_64.s eightballvm.c
-	$(CC65BINDIR)/ca65 -t c64 eightballvm_64.s
+	$(CC65BINDIR)/cc65 -I $(CC65INCDIR) -Or -t c64 -D C64 -o eightballvm_64.s eightballvm.c
+	$(CC65BINDIR)/ca65 -I $(CA65INCDIR) -t c64 eightballvm_64.s
 
 disass_64.o: disass.c eightballutils.h eightballvm.h
-	$(CC65BINDIR)/cc65 -Or -t c64 -D C64 -o disass_64.s disass.c
-	$(CC65BINDIR)/ca65 -t c64 disass_64.s
+	$(CC65BINDIR)/cc65 -I $(CC65INCDIR) -Or -t c64 -D C64 -o disass_64.s disass.c
+	$(CC65BINDIR)/ca65 -I $(CA65INCDIR) -t c64 disass_64.s
 
 eightballutils_64.o: eightballutils.c eightballutils.h
-	$(CC65BINDIR)/cc65 -Or -t c64 -D C64 -o eightballutils_64.s eightballutils.c
-	$(CC65BINDIR)/ca65 -t c64 eightballutils_64.s
+	$(CC65BINDIR)/cc65 -I $(CC65INCDIR) -Or -t c64 -D C64 -o eightballutils_64.s eightballutils.c
+	$(CC65BINDIR)/ca65 -I $(CA65INCDIR) -t c64 eightballutils_64.s
 
 bin/8ball64.prg: eightball_64.o eightballutils_64.o
-	$(CC65BINDIR)/ld65 -m 8ball64.map -o bin/8ball64.prg -Ln 8ball64.vice -C c64.cfg eightball_64.o eightballutils_64.o $(CC65LIBDIR)/c64.lib
+	$(CC65BINDIR)/ld65 -m 8ball64.map -o bin/8ball64.prg -Ln 8ball64.vice -C cc65/c64.cfg eightball_64.o eightballutils_64.o $(CC65LIBDIR)/c64.lib
 
 bin/8ballvm64.prg: eightballvm_64.o eightballutils_64.o
-	$(CC65BINDIR)/ld65 -m 8ballvm64.map -o bin/8ballvm64.prg -Ln 8ballvm64.vice -C c64.cfg eightballvm_64.o eightballutils_64.o $(CC54LIBDIR)/c64.lib
+	$(CC65BINDIR)/ld65 -m 8ballvm64.map -o bin/8ballvm64.prg -Ln 8ballvm64.vice -C cc65/c64.cfg eightballvm_64.o eightballutils_64.o $(CC65LIBDIR)/c64.lib
 
 bin/disass64.prg: disass_64.o eightballutils_64.o
-	$(CC65BINDIR)/ld65 -m disass64.map -o bin/disass64.prg -Ln disass64.vice -C c64.cfg disass_64.o eightballutils_64.o $(CC65LIBDIR)/c64.lib
+	$(CC65BINDIR)/ld65 -m disass64.map -o bin/disass64.prg -Ln disass64.vice -C cc65/c64.cfg disass_64.o eightballutils_64.o $(CC65LIBDIR)/c64.lib
 
 #
 # Apple II target
 #
 
 eightball_a2e.o: eightball.c eightballutils.h eightballvm.h
-	$(CC65BINDIR)/cc65 -Or -t apple2enh -D A2E -o eightball_a2e.s eightball.c
-	$(CC65BINDIR)/ca65 -t apple2enh eightball_a2e.s
+	$(CC65BINDIR)/cc65 -I $(CC65INCDIR) -Or -t apple2enh -D A2E -o eightball_a2e.s eightball.c
+	$(CC65BINDIR)/ca65 -I $(CA65INCDIR) -t apple2enh eightball_a2e.s
 
 eightballzp_a2e.o: eightballzp_a2e.S
-	$(CC65BINDIR)/ca65 -t apple2enh eightballzp_a2e.S
+	$(CC65BINDIR)/ca65 -I $(CA65INCDIR) -t apple2enh eightballzp_a2e.S
 
 eightballvm_a2e.o: eightballvm.c eightballutils.h eightballvm.h
-	$(CC65BINDIR)/cc65 -r -Oirs -t apple2enh -D A2E -o eightballvm_a2e.s eightballvm.c
-	$(CC65BINDIR)/ca65 -t apple2enh eightballvm_a2e.s
+	$(CC65BINDIR)/cc65 -I $(CC65INCDIR) -r -Oirs -t apple2enh -D A2E -o eightballvm_a2e.s eightballvm.c
+	$(CC65BINDIR)/ca65 -I $(CA65INCDIR) -t apple2enh eightballvm_a2e.s
 
 eightballvmzp_a2e.o: eightballvmzp_a2e.S
-	$(CC65BINDIR)/ca65 -t apple2enh eightballvmzp_a2e.S
+	$(CC65BINDIR)/ca65 -I $(CA65INCDIR) -t apple2enh eightballvmzp_a2e.S
 
 disass_a2e.o: disass.c eightballutils.h eightballvm.h
-	$(CC65BINDIR)/cc65 -Or -t apple2enh -D A2E -o disass_a2e.s disass.c
-	$(CC65BINDIR)/ca65 -t apple2enh disass_a2e.s
+	$(CC65BINDIR)/cc65 -I $(CC65INCDIR) -Or -t apple2enh -D A2E -o disass_a2e.s disass.c
+	$(CC65BINDIR)/ca65 -I $(CA65INCDIR) -t apple2enh disass_a2e.s
 
 eightballutils_a2e.o: eightballutils.c eightballutils.h
-	$(CC65BINDIR)/cc65 -Or -t apple2enh -D A2E -o eightballutils_a2e.s eightballutils.c
-	$(CC65BINDIR)/ca65 -t apple2enh eightballutils_a2e.s
+	$(CC65BINDIR)/cc65 -I $(CC65INCDIR) -Or -t apple2enh -D A2E -o eightballutils_a2e.s eightballutils.c
+	$(CC65BINDIR)/ca65 -I $(CA65INCDIR) -t apple2enh eightballutils_a2e.s
 
 bin/eb: eightball_a2e.o eightballutils_a2e.o eightballzp_a2e.o
-	$(CC65BINDIR)/ld65 -m 8balla2e.map -o bin/eb -C apple2enh.cfg -D __HIMEM__=0xbf00 eightball_a2e.o eightballutils_a2e.o eightballzp_a2e.o $(CC65LIBDIR)/apple2enh.lib
+	$(CC65BINDIR)/ld65 -m 8balla2e.map -o bin/eb -C cc65/apple2enh.cfg -D __HIMEM__=0xbf00 eightball_a2e.o eightballutils_a2e.o eightballzp_a2e.o $(CC65LIBDIR)/apple2enh.lib
 
 bin/ebvm: eightballvm_a2e.o eightballutils_a2e.o eightballvmzp_a2e.o
-	$(CC65BINDIR)/ld65 -m 8ballvma2e.map -o bin/ebvm -C apple2enh.cfg -D __HIMEM__=0xbf00 eightballvm_a2e.o eightballutils_a2e.o eightballvmzp_a2e.o $(CC65LIBDIR)/apple2enh.lib
+	$(CC65BINDIR)/ld65 -m 8ballvma2e.map -o bin/ebvm -C cc65/apple2enh.cfg -D __HIMEM__=0xbf00 eightballvm_a2e.o eightballutils_a2e.o eightballvmzp_a2e.o $(CC65LIBDIR)/apple2enh.lib
 
 bin/ebdiss: disass_a2e.o eightballutils_a2e.o
-	$(CC65BINDIR)/ld65 -m disassa2e.map -o bin/ebdiss -C apple2enh.cfg -D __HIMEM__=0xbf00 disass_a2e.o eightballutils_a2e.o $(CC65LIBDIR)/apple2enh.lib
+	$(CC65BINDIR)/ld65 -m disassa2e.map -o bin/ebdiss -C cc65/apple2enh.cfg -D __HIMEM__=0xbf00 disass_a2e.o eightballutils_a2e.o $(CC65LIBDIR)/apple2enh.lib
 
 
 #