Index: src/driver/cfa.cc
===================================================================
--- src/driver/cfa.cc	(revision b15f6cf38cf6adeadb0b2a5bed1bf9fa8cdbe97b)
+++ src/driver/cfa.cc	(revision 3354e6dba43868f684560ccc5845005620f1b561)
@@ -10,6 +10,6 @@
 // Created On       : Tue Aug 20 13:44:49 2002
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jan 20 14:38:45 2017
-// Update Count     : 155
+// Last Modified On : Thu Jul 20 15:54:45 2017
+// Update Count     : 156
 //
 
@@ -76,5 +76,4 @@
 	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
 
@@ -134,6 +133,4 @@
 			} 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
@@ -234,8 +231,6 @@
 	args[nargs] = "-I" CFA_INCDIR;
 	nargs += 1;
-	if ( ! noincstd_flag ) {							// do not use during build
-		args[nargs] = "-I" CFA_INCDIR "/stdhdr";
-		nargs += 1;
-	} // if
+	args[nargs] = "-I" CFA_INCDIR "/stdhdr";
+	nargs += 1;
 	args[nargs] = "-I" CFA_INCDIR "/concurrency";
 	nargs += 1;
Index: c/libcfa/assert
===================================================================
--- src/libcfa/assert	(revision b15f6cf38cf6adeadb0b2a5bed1bf9fa8cdbe97b)
+++ 	(revision )
@@ -1,44 +1,0 @@
-//
-// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
-//
-// The contents of this file are covered under the licence agreement in the
-// file "LICENCE" distributed with Cforall.
-//
-// assert --
-//
-// Author           : Thierry Delisle
-// Created On       : Mon Nov 28 12:27:26 2016
-// Last Modified By : Thierry Delisle
-// Last Modified On : Mon Nov 28 12:27:26 2016
-// Update Count     : 0
-//
-
-#ifndef __ASSERT_H__
-#define __ASSERT_H__
-
-#ifdef __CFORALL__
-extern "C" {
-#endif //__CFORALL__
-
-	#include <assert.h>
-
-	#ifdef NDEBUG
-		#define assertf(expr, fmt, ...) ((void)0)
-	#else
-		#define __STRINGIFY__(str) #str
-		#define __VSTRINGIFY__(str) __STRINGIFY__(str)
-		#define assertf(expr, fmt, ...) ((expr) ? ((void)0) : __assert_fail_f(__VSTRINGIFY__(expr), __FILE__, __LINE__, __PRETTY_FUNCTION__, fmt, ## __VA_ARGS__ ))
-
-		void __assert_fail_f( const char *assertion, const char *file, unsigned int line, const char *function, const char *fmt, ... ) __attribute__((noreturn));
-	#endif
-	
-#ifdef __CFORALL__
-} // extern "C"
-#endif //__CFORALL__
-
-#endif // __ASSERT_H__
-
-// Local Variables: //
-// mode: c //
-// tab-width: 4 //
-// End: //
Index: src/libcfa/stdhdr/malloc.h
===================================================================
--- src/libcfa/stdhdr/malloc.h	(revision 3354e6dba43868f684560ccc5845005620f1b561)
+++ src/libcfa/stdhdr/malloc.h	(revision 3354e6dba43868f684560ccc5845005620f1b561)
@@ -0,0 +1,24 @@
+// 
+// Cforall Version 1.0.0 Copyright (C) 2017 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+// 
+// malloc.h -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Thu Jul 20 15:58:16 2017
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Jul 20 16:00:12 2017
+// Update Count     : 4
+// 
+
+extern "C" {
+#include_next <malloc.h>								// has internal check for multiple expansion
+} // extern "C"
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //