diff --git a/libsrc/c128/c128.inc b/asminc/c128.inc
similarity index 100%
rename from libsrc/c128/c128.inc
rename to asminc/c128.inc
diff --git a/libsrc/c64/c64.inc b/asminc/c64.inc
similarity index 100%
rename from libsrc/c64/c64.inc
rename to asminc/c64.inc
diff --git a/libsrc/cbm510/cbm510.inc b/asminc/cbm510.inc
similarity index 100%
rename from libsrc/cbm510/cbm510.inc
rename to asminc/cbm510.inc
diff --git a/libsrc/cbm610/cbm610.inc b/asminc/cbm610.inc
similarity index 100%
rename from libsrc/cbm610/cbm610.inc
rename to asminc/cbm610.inc
diff --git a/libsrc/nes/nes.inc b/asminc/nes.inc
similarity index 100%
rename from libsrc/nes/nes.inc
rename to asminc/nes.inc
diff --git a/libsrc/plus4/plus4.inc b/asminc/plus4.inc
similarity index 100%
rename from libsrc/plus4/plus4.inc
rename to asminc/plus4.inc
diff --git a/libsrc/supervision/supervision.inc b/asminc/supervision.inc
similarity index 100%
rename from libsrc/supervision/supervision.inc
rename to asminc/supervision.inc
diff --git a/libsrc/vic20/vic20.inc b/asminc/vic20.inc
similarity index 100%
rename from libsrc/vic20/vic20.inc
rename to asminc/vic20.inc
diff --git a/libsrc/apple2/Makefile b/libsrc/apple2/Makefile
index adf96c6fe..fe2bd1602 100644
--- a/libsrc/apple2/Makefile
+++ b/libsrc/apple2/Makefile
@@ -13,7 +13,7 @@ AS	= ../../src/ca65/ca65
 CC	= ../../src/cc65/cc65
 LD	= ../../src/ld65/ld65
 
-AFLAGS	= -t $(SYS) -I../../asminc
+AFLAGS	= -t $(SYS) --forget-inc-paths -I../../asminc
 CFLAGS	= -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include
 
 #--------------------------------------------------------------------------
diff --git a/libsrc/apple2enh/Makefile b/libsrc/apple2enh/Makefile
index e9e5d05f9..af25f3eff 100644
--- a/libsrc/apple2enh/Makefile
+++ b/libsrc/apple2enh/Makefile
@@ -13,7 +13,7 @@ AS	= ../../src/ca65/ca65
 CC	= ../../src/cc65/cc65
 LD	= ../../src/ld65/ld65
 
-AFLAGS	= -t $(SYS) -I../apple2 -I../../asminc
+AFLAGS	= -t $(SYS) --forget-inc-paths -I../apple2 -I../../asminc
 CFLAGS	= -Osir -g -T -t $(SYS) --forget-inc-paths -I ../apple2 -I ../../include
 
 #--------------------------------------------------------------------------
diff --git a/libsrc/atari/Makefile b/libsrc/atari/Makefile
index 0ea8e48e9..4e0b93013 100644
--- a/libsrc/atari/Makefile
+++ b/libsrc/atari/Makefile
@@ -30,7 +30,7 @@ AS	= ../../src/ca65/ca65
 CC	= ../../src/cc65/cc65
 LD	= ../../src/ld65/ld65
 
-AFLAGS	= -t $(SYS) -I../../asminc
+AFLAGS	= -t $(SYS) --forget-inc-paths -I../../asminc
 CFLAGS	= -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include
 
 #--------------------------------------------------------------------------
diff --git a/libsrc/c128/Makefile b/libsrc/c128/Makefile
index 47f795752..ee176650b 100644
--- a/libsrc/c128/Makefile
+++ b/libsrc/c128/Makefile
@@ -13,7 +13,7 @@ AS	= ../../src/ca65/ca65
 CC	= ../../src/cc65/cc65
 LD	= ../../src/ld65/ld65
 
-AFLAGS	= -t $(SYS) -I../../asminc
+AFLAGS	= -t $(SYS) --forget-inc-paths -I../../asminc
 CFLAGS	= -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include
 
 #--------------------------------------------------------------------------
diff --git a/libsrc/c16/Makefile b/libsrc/c16/Makefile
index f8f4bf017..6aa5275dd 100644
--- a/libsrc/c16/Makefile
+++ b/libsrc/c16/Makefile
@@ -13,7 +13,7 @@ AS	= ../../src/ca65/ca65
 CC	= ../../src/cc65/cc65
 LD	= ../../src/ld65/ld65
 
-AFLAGS	= -t $(SYS) -I../../asminc
+AFLAGS	= -t $(SYS) --forget-inc-paths -I. -I../../asminc
 CFLAGS	= -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include
 
 #--------------------------------------------------------------------------
diff --git a/libsrc/c16/break.s b/libsrc/c16/break.s
index 76813595b..c51cc4b07 100644
--- a/libsrc/c16/break.s
+++ b/libsrc/c16/break.s
@@ -9,7 +9,7 @@
 	.destructor	_reset_brk
 	.export	       	_brk_a, _brk_x, _brk_y, _brk_sr, _brk_pc
 
-	.include      	"../plus4/plus4.inc"
+	.include      	"plus4.inc"
 
 
 .bss
diff --git a/libsrc/c16/c16-ram.s b/libsrc/c16/c16-ram.s
index 30f6c4699..8f879095c 100644
--- a/libsrc/c16/c16-ram.s
+++ b/libsrc/c16/c16-ram.s
@@ -9,7 +9,7 @@
 
       	.include 	"em-kernel.inc"
         .include        "em-error.inc"
-	.include	"../plus4/plus4.inc"
+	.include	"plus4.inc"
 
         .macpack        generic
 
diff --git a/libsrc/c16/cgetc.s b/libsrc/c16/cgetc.s
index dc6e1e811..5a2125a0a 100644
--- a/libsrc/c16/cgetc.s
+++ b/libsrc/c16/cgetc.s
@@ -7,7 +7,7 @@
        	.export		_cgetc
        	.import		cursor
 
-       	.include	"../plus4/plus4.inc"
+       	.include	"plus4.inc"
 
 
 ; --------------------------------------------------------------------------
diff --git a/libsrc/c16/clrscr.s b/libsrc/c16/clrscr.s
index ff8bd5d10..4b6c48355 100644
--- a/libsrc/c16/clrscr.s
+++ b/libsrc/c16/clrscr.s
@@ -6,7 +6,7 @@
 
 	.export		_clrscr
 
-	.include	"../plus4/plus4.inc"
+	.include	"plus4.inc"
 
 _clrscr	= CLRSCR
 
diff --git a/libsrc/c16/color.s b/libsrc/c16/color.s
index 7d54eafb5..9d7107de8 100644
--- a/libsrc/c16/color.s
+++ b/libsrc/c16/color.s
@@ -8,7 +8,7 @@
 
  	.export		_textcolor, _bgcolor, _bordercolor
 
-	.include	"../plus4/plus4.inc"
+	.include	"plus4.inc"
 
 _textcolor:
 	ldx	CHARCOLOR	; get old value
diff --git a/libsrc/c16/conio.s b/libsrc/c16/conio.s
index c3269359a..23c794856 100644
--- a/libsrc/c16/conio.s
+++ b/libsrc/c16/conio.s
@@ -6,5 +6,5 @@
 
 	.exportzp	CURS_X, CURS_Y
 
-	.include	"../plus4/plus4.inc"
+	.include	"plus4.inc"
 
diff --git a/libsrc/c16/cputc.s b/libsrc/c16/cputc.s
index 26bc2ae5a..5788c1cb0 100644
--- a/libsrc/c16/cputc.s
+++ b/libsrc/c16/cputc.s
@@ -10,7 +10,7 @@
 	.import		popa, _gotoxy
         .import         PLOT
 
-	.include	"../plus4/plus4.inc"
+	.include	"plus4.inc"
 
 
 _cputcxy:
diff --git a/libsrc/c16/crt0.s b/libsrc/c16/crt0.s
index c967671c5..805d1c5ab 100644
--- a/libsrc/c16/crt0.s
+++ b/libsrc/c16/crt0.s
@@ -13,7 +13,7 @@
 	.import	       	__INTERRUPTOR_COUNT__
 
         .include        "zeropage.inc"
-	.include	"../plus4/plus4.inc"
+	.include	"plus4.inc"
 
 
 ; ------------------------------------------------------------------------
diff --git a/libsrc/c16/get_tv.s b/libsrc/c16/get_tv.s
index 6f27e747c..84f09b12c 100644
--- a/libsrc/c16/get_tv.s
+++ b/libsrc/c16/get_tv.s
@@ -5,7 +5,7 @@
 ; /* Return the video mode the machine is using */
 ;
 
-        .include        "../plus4/plus4.inc"
+        .include        "plus4.inc"
 	.include	"get_tv.inc"
 
 
diff --git a/libsrc/c16/kbhit.s b/libsrc/c16/kbhit.s
index be64e64b2..f1164bbaa 100644
--- a/libsrc/c16/kbhit.s
+++ b/libsrc/c16/kbhit.s
@@ -7,7 +7,7 @@
 	.export		_kbhit
 	.import		return0, return1
 
-	.include	"../plus4/plus4.inc"
+	.include	"plus4.inc"
 
 _kbhit:
 	lda	KEY_COUNT	; Get number of characters
diff --git a/libsrc/c16/mainargs.s b/libsrc/c16/mainargs.s
index 863c8e473..418bfe90f 100644
--- a/libsrc/c16/mainargs.s
+++ b/libsrc/c16/mainargs.s
@@ -25,7 +25,7 @@
 	.constructor	initmainargs, 24
 	.import		__argc, __argv
 
-	.include	"../plus4/plus4.inc"
+	.include	"plus4.inc"
 
 
 
diff --git a/libsrc/c16/randomize.s b/libsrc/c16/randomize.s
index 8bde89c6f..e65fd4dab 100644
--- a/libsrc/c16/randomize.s
+++ b/libsrc/c16/randomize.s
@@ -8,7 +8,7 @@
     	.export	       	__randomize
 	.import		_srand
 
-	.include	"../plus4/plus4.inc"
+	.include	"plus4.inc"
 
 __randomize:
         ldx     TED_VLINELO     ; Use TED rasterline as high byte
diff --git a/libsrc/c16/revers.s b/libsrc/c16/revers.s
index c9adac7f2..c48ff9862 100644
--- a/libsrc/c16/revers.s
+++ b/libsrc/c16/revers.s
@@ -6,7 +6,7 @@
 
       	.export		_revers
 
-        .include        "../plus4/plus4.inc"
+        .include        "plus4.inc"
 
 .proc   _revers
 
diff --git a/libsrc/c64/Makefile b/libsrc/c64/Makefile
index 42f516758..bfce3e8f9 100644
--- a/libsrc/c64/Makefile
+++ b/libsrc/c64/Makefile
@@ -14,7 +14,7 @@ AS	= ../../src/ca65/ca65
 CC	= ../../src/cc65/cc65
 LD	= ../../src/ld65/ld65
 
-AFLAGS	= -t $(SYS) -I../../asminc
+AFLAGS	= -t $(SYS) --forget-inc-paths -I../../asminc
 CFLAGS	= -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include
 
 #--------------------------------------------------------------------------
diff --git a/libsrc/cbm510/Makefile b/libsrc/cbm510/Makefile
index 2d1f36c06..0eadda41b 100644
--- a/libsrc/cbm510/Makefile
+++ b/libsrc/cbm510/Makefile
@@ -13,7 +13,7 @@ AS	= ../../src/ca65/ca65
 CC	= ../../src/cc65/cc65
 LD	= ../../src/ld65/ld65
 
-AFLAGS	= -t $(SYS) -I../../asminc
+AFLAGS	= -t $(SYS) --forget-inc-paths -I../../asminc
 CFLAGS	= -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include
 
 #--------------------------------------------------------------------------
diff --git a/libsrc/cbm610/Makefile b/libsrc/cbm610/Makefile
index bd963d1da..ac0293ed6 100644
--- a/libsrc/cbm610/Makefile
+++ b/libsrc/cbm610/Makefile
@@ -13,7 +13,7 @@ AS	= ../../src/ca65/ca65
 CC	= ../../src/cc65/cc65
 LD	= ../../src/ld65/ld65
 
-AFLAGS	= -t $(SYS) -I../../asminc
+AFLAGS	= -t $(SYS) --forget-inc-paths -I../../asminc
 CFLAGS	= -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include
 
 #--------------------------------------------------------------------------
diff --git a/libsrc/lynx/Makefile b/libsrc/lynx/Makefile
index b355d9e8b..6f1aa071e 100644
--- a/libsrc/lynx/Makefile
+++ b/libsrc/lynx/Makefile
@@ -14,7 +14,7 @@ AS	= ../../src/ca65/ca65
 CC	= ../../src/cc65/cc65
 LD	= ../../src/ld65/ld65
 
-AFLAGS	= -t $(SYS) -I../../asminc
+AFLAGS 	= -t $(SYS) --forget-inc-paths -I../../asminc
 CFLAGS	= -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include
 
 #--------------------------------------------------------------------------
diff --git a/libsrc/nes/Makefile b/libsrc/nes/Makefile
index 191f4bb06..f0fe1df21 100644
--- a/libsrc/nes/Makefile
+++ b/libsrc/nes/Makefile
@@ -13,7 +13,7 @@ AS	= ../../src/ca65/ca65
 CC	= ../../src/cc65/cc65
 LD	= ../../src/ld65/ld65
 
-AFLAGS	= -t $(SYS) -I../../asminc
+AFLAGS	= -t $(SYS) --forget-inc-paths -I../../asminc
 CFLAGS	= -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include
 
 #--------------------------------------------------------------------------
diff --git a/libsrc/plus4/Makefile b/libsrc/plus4/Makefile
index e2bedca37..b3a3c4eee 100644
--- a/libsrc/plus4/Makefile
+++ b/libsrc/plus4/Makefile
@@ -13,7 +13,7 @@ AS	= ../../src/ca65/ca65
 CC	= ../../src/cc65/cc65
 LD	= ../../src/ld65/ld65
 
-AFLAGS	= -t $(SYS) -I../../asminc
+AFLAGS	= -t $(SYS) --forget-inc-paths -I../../asminc
 CFLAGS	= -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include
 
 #--------------------------------------------------------------------------
diff --git a/libsrc/plus4/plus4-stdjoy.s b/libsrc/plus4/plus4-stdjoy.s
index 4fe269a03..bdba131fb 100644
--- a/libsrc/plus4/plus4-stdjoy.s
+++ b/libsrc/plus4/plus4-stdjoy.s
@@ -9,7 +9,7 @@
 
       	.include 	"joy-kernel.inc"
         .include        "joy-error.inc"
-        .include        "../plus4/plus4.inc"
+        .include        "plus4.inc"
 
         .macpack        generic
 
diff --git a/libsrc/supervision/Makefile b/libsrc/supervision/Makefile
index 09a4d91fe..1fa38c32a 100644
--- a/libsrc/supervision/Makefile
+++ b/libsrc/supervision/Makefile
@@ -13,7 +13,7 @@ AS	= ../../src/ca65/ca65
 CC	= ../../src/cc65/cc65
 LD	= ../../src/ld65/ld65
 
-AFLAGS	= -t $(SYS) -I../../asminc
+AFLAGS	= -t $(SYS) --forget-inc-paths -I../../asminc
 CFLAGS	= -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include
 
 #--------------------------------------------------------------------------
diff --git a/libsrc/vic20/Makefile b/libsrc/vic20/Makefile
index eae0e96c6..67433999f 100644
--- a/libsrc/vic20/Makefile
+++ b/libsrc/vic20/Makefile
@@ -13,7 +13,7 @@ AS = ../../src/ca65/ca65
 CC = ../../src/cc65/cc65
 LD = ../../src/ld65/ld65
 
-AFLAGS=-t $(SYS) -I../../asminc
+AFLAGS=-t $(SYS) --forget-inc-paths -I../../asminc
 CFLAGS=-Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include
 
 #--------------------------------------------------------------------------