Index: src/driver/cfa.cc
===================================================================
--- src/driver/cfa.cc	(revision b947fb2e40ff1eb3c74f2ca17397c8a24c9a2a9c)
+++ src/driver/cfa.cc	(revision d746bc821f67aff8f4e526f470cad8f8d18fa98f)
@@ -10,6 +10,6 @@
 // Created On       : Tue Aug 20 13:44:49 2002
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul 20 15:54:45 2017
-// Update Count     : 156
+// Last Modified On : Fri Jan 20 14:38:45 2017
+// Update Count     : 155
 //
 
@@ -76,4 +76,5 @@
 	bool cpp_flag = false;								// -E or -M flag, preprocessor only
 	bool std_flag = false;								// -std= flag
+	bool noincstd_flag = false;							// -no-include-stdhdr= flag
 	bool debugging __attribute(( unused )) = false;		// -g flag
 
@@ -133,4 +134,6 @@
 			} else if ( arg == "-nohelp" ) {
 				help = false;							// strip the nohelp flag
+			} else if ( arg == "-no-include-stdhdr" ) {
+				noincstd_flag = true;					// strip the no-include-stdhdr flag
 			} else if ( arg == "-compiler" ) {
 				// use the user specified compiler
@@ -231,6 +234,8 @@
 	args[nargs] = "-I" CFA_INCDIR;
 	nargs += 1;
-	args[nargs] = "-I" CFA_INCDIR "/stdhdr";
-	nargs += 1;
+	if ( ! noincstd_flag ) {							// do not use during build
+		args[nargs] = "-I" CFA_INCDIR "/stdhdr";
+		nargs += 1;
+	} // if
 	args[nargs] = "-I" CFA_INCDIR "/concurrency";
 	nargs += 1;
Index: src/libcfa/Makefile.am
===================================================================
--- src/libcfa/Makefile.am	(revision b947fb2e40ff1eb3c74f2ca17397c8a24c9a2a9c)
+++ src/libcfa/Makefile.am	(revision d746bc821f67aff8f4e526f470cad8f8d18fa98f)
@@ -39,5 +39,9 @@
 
 AM_CCASFLAGS = @CFA_FLAGS@
-CFLAGS = -quiet -I${abs_top_srcdir}/src/libcfa/stdhdr -XCFA -t -B${abs_top_srcdir}/src/driver ${EXTRA_FLAGS}
+
+#CFLAGS for most libcfa src
+#use -no-include-stdhdr to prevent rebuild cycles
+#The built sources must not depend on the installed headers
+CFLAGS = -quiet -no-include-stdhdr -I${abs_top_srcdir}/src/libcfa/stdhdr -XCFA -t -B${abs_top_srcdir}/src/driver ${EXTRA_FLAGS}
 CC = ${abs_top_srcdir}/src/driver/cfa
 
Index: src/libcfa/Makefile.in
===================================================================
--- src/libcfa/Makefile.in	(revision b947fb2e40ff1eb3c74f2ca17397c8a24c9a2a9c)
+++ src/libcfa/Makefile.in	(revision d746bc821f67aff8f4e526f470cad8f8d18fa98f)
@@ -308,5 +308,9 @@
 CFA_NAME = @CFA_NAME@
 CFA_PREFIX = @CFA_PREFIX@
-CFLAGS = -quiet -I${abs_top_srcdir}/src/libcfa/stdhdr -XCFA -t -B${abs_top_srcdir}/src/driver ${EXTRA_FLAGS}
+
+#CFLAGS for most libcfa src
+#use -no-include-stdhdr to prevent rebuild cycles
+#The built sources must not depend on the installed headers
+CFLAGS = -quiet -no-include-stdhdr -I${abs_top_srcdir}/src/libcfa/stdhdr -XCFA -t -B${abs_top_srcdir}/src/driver ${EXTRA_FLAGS}
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@