Index: src/libcfa/Makefile.am
===================================================================
--- src/libcfa/Makefile.am	(revision 74e5a3aa6b9010315116a44eb4977d4f150313eb)
+++ src/libcfa/Makefile.am	(revision c5a8c5bf2ad8fe91b68614a3c832241d460c3571)
@@ -34,5 +34,5 @@
 	 ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -D__CFA_DEBUG__ -O0 -c -o $@ $<
 
-EXTRA_FLAGS = -g -Wall -Wno-unused-function -I${abs_top_srcdir}/src/libcfa/libhdr @CFA_FLAGS@
+EXTRA_FLAGS = -g -Wall -Wno-unused-function -I${abs_top_srcdir}/src/libcfa/libhdr -imacros libcfa-prelude.c @CFA_FLAGS@
 
 AM_CCASFLAGS = @CFA_FLAGS@
@@ -47,9 +47,4 @@
 % : %.c
 	@true
-
-# %.$(OJBEXT) : libcfa-prelude.c
-# 	echo "FRED"
-# 	@false
-#	${AM_V_CC} ${abs_top_srcdir}/src/driver/cfa
 
 concurrency/libcfa_a-invoke.o : concurrency/invoke.c
Index: src/libcfa/Makefile.in
===================================================================
--- src/libcfa/Makefile.in	(revision 74e5a3aa6b9010315116a44eb4977d4f150313eb)
+++ src/libcfa/Makefile.in	(revision c5a8c5bf2ad8fe91b68614a3c832241d460c3571)
@@ -270,5 +270,5 @@
 AUTOMAKE_OPTIONS = subdir-objects
 lib_LIBRARIES = $(am__append_1) $(am__append_2)
-EXTRA_FLAGS = -g -Wall -Wno-unused-function -I${abs_top_srcdir}/src/libcfa/libhdr @CFA_FLAGS@
+EXTRA_FLAGS = -g -Wall -Wno-unused-function -I${abs_top_srcdir}/src/libcfa/libhdr -imacros libcfa-prelude.c @CFA_FLAGS@
 AM_CCASFLAGS = @CFA_FLAGS@
 headers = limits stdlib math iostream fstream iterator rational assert containers/vector concurrency/threads
@@ -1005,9 +1005,4 @@
 	@true
 
-# %.$(OJBEXT) : libcfa-prelude.c
-# 	echo "FRED"
-# 	@false
-#	${AM_V_CC} ${abs_top_srcdir}/src/driver/cfa
-
 concurrency/libcfa_a-invoke.o : concurrency/invoke.c
 	${AM_V_CC}@BACKEND_CC@ -DHAVE_CONFIG_H -I. -I../.. -O2 ${EXTRA_FLAGS} -c -o $@ $<
Index: src/prelude/Makefile.am
===================================================================
--- src/prelude/Makefile.am	(revision 74e5a3aa6b9010315116a44eb4977d4f150313eb)
+++ src/prelude/Makefile.am	(revision c5a8c5bf2ad8fe91b68614a3c832241d460c3571)
@@ -42,5 +42,5 @@
 prototypes.awk :
 
-../libcfa/libcfa-prelude.c : prelude.cf extras.cf builtins.cf
+../libcfa/libcfa-prelude.c : prelude.cf extras.cf builtins.cf ${abs_top_srcdir}/src/driver/cfa-cpp
 	${AM_V_GEN}${abs_top_srcdir}/src/driver/cfa-cpp -l prelude.cf $@  # use src/cfa-cpp as not in lib until after install
 
Index: src/prelude/Makefile.in
===================================================================
--- src/prelude/Makefile.in	(revision 74e5a3aa6b9010315116a44eb4977d4f150313eb)
+++ src/prelude/Makefile.in	(revision c5a8c5bf2ad8fe91b68614a3c832241d460c3571)
@@ -438,5 +438,5 @@
 prototypes.awk :
 
-../libcfa/libcfa-prelude.c : prelude.cf extras.cf builtins.cf
+../libcfa/libcfa-prelude.c : prelude.cf extras.cf builtins.cf ${abs_top_srcdir}/src/driver/cfa-cpp
 	${AM_V_GEN}${abs_top_srcdir}/src/driver/cfa-cpp -l prelude.cf $@  # use src/cfa-cpp as not in lib until after install