diff --git a/libsrc/geos-cbm/Makefile b/libsrc/geos-cbm/Makefile
index cbf3029fc..d5a649d8c 100644
--- a/libsrc/geos-cbm/Makefile
+++ b/libsrc/geos-cbm/Makefile
@@ -13,7 +13,7 @@ AS	= ../../src/ca65/ca65
 CC	= ../../src/cc65/cc65
 LD	= ../../src/ld65/ld65
 
-AFLAGS	= -t $(SYS) --forget-inc-paths -I. -I../../asminc
+AFLAGS	= -t $(SYS) --forget-inc-paths -I. -I../geos-common -I../../asminc
 CFLAGS	= -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include
 
 #--------------------------------------------------------------------------
diff --git a/libsrc/geos-common/Makefile b/libsrc/geos-common/Makefile
index 695ba5fde..99e8fa94c 100644
--- a/libsrc/geos-common/Makefile
+++ b/libsrc/geos-common/Makefile
@@ -13,7 +13,7 @@ AS	= ../../src/ca65/ca65
 CC	= ../../src/cc65/cc65
 LD	= ../../src/ld65/ld65
 
-AFLAGS	= -t $(SYS) --forget-inc-paths -I../$(SYS) -I../../asminc
+AFLAGS	= -t $(SYS) --forget-inc-paths -I. -I../$(SYS) -I../../asminc
 CFLAGS	= -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include
 
 #--------------------------------------------------------------------------
diff --git a/libsrc/geos-cbm/const.inc b/libsrc/geos-common/const.inc
similarity index 100%
rename from libsrc/geos-cbm/const.inc
rename to libsrc/geos-common/const.inc
diff --git a/libsrc/geos-cbm/geosmac.ca65.inc b/libsrc/geos-common/geosmac.ca65.inc
similarity index 100%
rename from libsrc/geos-cbm/geosmac.ca65.inc
rename to libsrc/geos-common/geosmac.ca65.inc