Index: src/libcfa/Makefile.am
===================================================================
--- src/libcfa/Makefile.am	(revision 2514607d289661cb73e88d94ca4daf01d5f7bda5)
+++ src/libcfa/Makefile.am	(revision e89f4b16a58e198551a14858078a1c0c55172fbc)
@@ -36,5 +36,5 @@
 	 ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -D__CFA_DEBUG__ -Wall -O0 -c -o $@ $<
 
-EXTRA_FLAGS = -g -Wall -Wno-unused-function -imacros libcfa-prelude.c -I${srcdir} @CFA_FLAGS@
+EXTRA_FLAGS = -g -Wall -Wno-unused-function -imacros libcfa-prelude.c @CFA_FLAGS@ $(DEFAULT_INCLUDES)
 
 AM_CCASFLAGS = @CFA_FLAGS@
Index: src/libcfa/Makefile.in
===================================================================
--- src/libcfa/Makefile.in	(revision 2514607d289661cb73e88d94ca4daf01d5f7bda5)
+++ src/libcfa/Makefile.in	(revision e89f4b16a58e198551a14858078a1c0c55172fbc)
@@ -423,5 +423,5 @@
 ARFLAGS = cr
 lib_LIBRARIES = $(am__append_1) $(am__append_2)
-EXTRA_FLAGS = -g -Wall -Wno-unused-function -imacros libcfa-prelude.c -I${srcdir} @CFA_FLAGS@
+EXTRA_FLAGS = -g -Wall -Wno-unused-function -imacros libcfa-prelude.c @CFA_FLAGS@ $(DEFAULT_INCLUDES)
 AM_CCASFLAGS = @CFA_FLAGS@
 headers = fstream iostream iterator limits rational time stdlib common \