Index: src/prelude/Makefile.am
===================================================================
--- src/prelude/Makefile.am	(revision f975c65c08a97943e299e1f2284739d5992e9db9)
+++ src/prelude/Makefile.am	(revision 992386182ecafc440e6db7bddd4e6a47aa0b082a)
@@ -42,5 +42,5 @@
 
 bootloader.c : bootloader.cf prelude.cf extras.cf builtins.cf ${abs_top_srcdir}/src/driver/cfa-cpp
-	${AM_V_GEN}${abs_top_srcdir}/src/driver/cfa-cpp -tpm bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
+	${AM_V_GEN}${abs_top_srcdir}/src/driver/cfa-cpp -tpmL bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
 
 MAINTAINERCLEANFILES = builtins.c builtins.cf extras.cf bootloader.c ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}}
Index: src/prelude/Makefile.in
===================================================================
--- src/prelude/Makefile.in	(revision f975c65c08a97943e299e1f2284739d5992e9db9)
+++ src/prelude/Makefile.in	(revision 992386182ecafc440e6db7bddd4e6a47aa0b082a)
@@ -439,5 +439,5 @@
 
 bootloader.c : bootloader.cf prelude.cf extras.cf builtins.cf ${abs_top_srcdir}/src/driver/cfa-cpp
-	${AM_V_GEN}${abs_top_srcdir}/src/driver/cfa-cpp -tpm bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
+	${AM_V_GEN}${abs_top_srcdir}/src/driver/cfa-cpp -tpmL bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
Index: src/tests/Makefile.am
===================================================================
--- src/tests/Makefile.am	(revision f975c65c08a97943e299e1f2284739d5992e9db9)
+++ src/tests/Makefile.am	(revision 992386182ecafc440e6db7bddd4e6a47aa0b082a)
@@ -76,17 +76,17 @@
 
 declarationSpecifier: declarationSpecifier.c
-	${CC} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
+	${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 
 gccExtensions : gccExtensions.c
-	${CC} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
+	${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 
 extension : extension.c
-	${CC} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
+	${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 
 attributes : attributes.c
-	${CC} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
+	${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 
 KRfunctions : KRfunctions.c
-	${CC} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
+	${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 
 memberCtors-ERR1: memberCtors.c
Index: src/tests/Makefile.in
===================================================================
--- src/tests/Makefile.in	(revision f975c65c08a97943e299e1f2284739d5992e9db9)
+++ src/tests/Makefile.in	(revision 992386182ecafc440e6db7bddd4e6a47aa0b082a)
@@ -695,17 +695,17 @@
 
 declarationSpecifier: declarationSpecifier.c
-	${CC} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
+	${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 
 gccExtensions : gccExtensions.c
-	${CC} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
+	${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 
 extension : extension.c
-	${CC} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
+	${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 
 attributes : attributes.c
-	${CC} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
+	${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 
 KRfunctions : KRfunctions.c
-	${CC} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
+	${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 
 memberCtors-ERR1: memberCtors.c