Index: src/driver/cfa.cc
===================================================================
--- src/driver/cfa.cc	(revision a6151baa3a12bfe16ad97aa148f11da6d2d8d4c3)
+++ src/driver/cfa.cc	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
@@ -10,6 +10,6 @@
 // Created On       : Tue Aug 20 13:44:49 2002
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jul  4 11:33:15 2016
-// Update Count     : 139
+// Last Modified On : Tue Jul  5 20:56:18 2016
+// Update Count     : 140
 //
 
@@ -246,7 +246,6 @@
 	args[nargs] = "-I" CFA_INCDIR;
 	nargs += 1;
-	args[nargs] = "-I" CFA_INCDIR "/containers";
-	nargs += 1;
-
+	args[nargs] = "-I" CFA_INCDIR "/stdhdr";
+	nargs += 1;
 	args[nargs] = "-I" CFA_INCDIR "/containers";
 	nargs += 1;
Index: src/examples/random.c
===================================================================
--- src/examples/random.c	(revision a6151baa3a12bfe16ad97aa148f11da6d2d8d4c3)
+++ 	(revision )
@@ -1,37 +1,0 @@
-extern "C" {
-#include <unistd.h>										// getpid
-} // extern "C"
-
-#include <fstream>
-#include <stdlib>										// random
-
-int main() {
-	rand48seed( getpid() );								// set random seed
-
-	// test polymorphic calls to random and stream
-	char c = rand48();
-	sout | c | endl;
-	int i = rand48();
-    sout | i | endl;
-	unsigned int ui = rand48();
-    sout | ui | endl;
-	long int li = rand48();
-    sout | li | endl;
-	unsigned long int uli = rand48();
-    sout | uli | endl;
-    float f = rand48();
-    sout | f | endl;
-    double d = rand48();
-    sout | d | endl;
-    float _Complex fc = rand48();
-    sout | fc | endl;
-    double _Complex dc = rand48();
-    sout | dc | endl;
-    long double _Complex ldc = rand48();
-    sout | ldc | endl;
-} // main
-
-// Local Variables: //
-// tab-width: 4 //
-// compile-command: "cfa random.c" //
-// End: //
Index: src/libcfa/Makefile.am
===================================================================
--- src/libcfa/Makefile.am	(revision a6151baa3a12bfe16ad97aa148f11da6d2d8d4c3)
+++ src/libcfa/Makefile.am	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
@@ -11,6 +11,6 @@
 ## Created On       : Sun May 31 08:54:01 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Tue Jul  5 17:10:26 2016
-## Update Count     : 182
+## Last Modified On : Tue Jul  5 20:52:31 2016
+## Update Count     : 185
 ###############################################################################
 
@@ -67,5 +67,7 @@
 libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c}
 
-nobase_include_HEADERS = ${headers} stdio.h
+stdhdr = ${shell echo stdhdr/*}
+
+nobase_include_HEADERS = ${headers} ${stdhdr}
 
 CLEANFILES = libcfa-prelude.c
Index: src/libcfa/Makefile.in
===================================================================
--- src/libcfa/Makefile.in	(revision a6151baa3a12bfe16ad97aa148f11da6d2d8d4c3)
+++ src/libcfa/Makefile.in	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
@@ -236,5 +236,6 @@
 libobjs = ${headers:=.o}
 libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c}
-nobase_include_HEADERS = ${headers} stdio.h
+stdhdr = ${shell echo stdhdr/*}
+nobase_include_HEADERS = ${headers} ${stdhdr}
 CLEANFILES = libcfa-prelude.c
 all: all-am
Index: src/libcfa/stdhdr/assert.h
===================================================================
--- src/libcfa/stdhdr/assert.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
+++ src/libcfa/stdhdr/assert.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
@@ -0,0 +1,24 @@
+//
+// 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.h -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Mon Jul  4 23:25:26 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul  5 20:34:23 2016
+// Update Count     : 8
+// 
+
+extern "C" {
+#include_next <assert.h>								// has internal check for multiple expansion
+} // extern "C"
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //
Index: src/libcfa/stdhdr/complex.h
===================================================================
--- src/libcfa/stdhdr/complex.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
+++ src/libcfa/stdhdr/complex.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
@@ -0,0 +1,24 @@
+//
+// 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.
+// 
+// complex.h -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Mon Jul  4 23:25:26 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul  5 20:28:33 2016
+// Update Count     : 6
+// 
+
+extern "C" {
+#include_next <complex.h>								// has internal check for multiple expansion
+} // extern "C"
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //
Index: src/libcfa/stdhdr/ctype.h
===================================================================
--- src/libcfa/stdhdr/ctype.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
+++ src/libcfa/stdhdr/ctype.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
@@ -0,0 +1,24 @@
+//
+// 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.
+// 
+// ctype.h -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Mon Jul  4 23:25:26 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul  5 20:34:11 2016
+// Update Count     : 6
+// 
+
+extern "C" {
+#include_next <ctype.h>									// has internal check for multiple expansion
+} // extern "C"
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //
Index: src/libcfa/stdhdr/errno.h
===================================================================
--- src/libcfa/stdhdr/errno.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
+++ src/libcfa/stdhdr/errno.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
@@ -0,0 +1,24 @@
+//
+// 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.
+// 
+// errno.h -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Mon Jul  4 23:25:26 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul  5 20:27:03 2016
+// Update Count     : 4
+// 
+
+extern "C" {
+#include_next <errno.h>									// has internal check for multiple expansion
+} // extern "C"
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //
Index: src/libcfa/stdhdr/fenv.h
===================================================================
--- src/libcfa/stdhdr/fenv.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
+++ src/libcfa/stdhdr/fenv.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
@@ -0,0 +1,24 @@
+//
+// 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.
+// 
+// fenv.h -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Mon Jul  4 23:25:26 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul  5 20:29:46 2016
+// Update Count     : 6
+// 
+
+extern "C" {
+#include_next <fenv.h>									// has internal check for multiple expansion
+} // extern "C"
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //
Index: src/libcfa/stdhdr/float.h
===================================================================
--- src/libcfa/stdhdr/float.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
+++ src/libcfa/stdhdr/float.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
@@ -0,0 +1,24 @@
+//
+// 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.
+// 
+// float.h -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Mon Jul  4 23:25:26 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul  5 20:30:25 2016
+// Update Count     : 7
+// 
+
+extern "C" {
+#include_next <float.h>									// has internal check for multiple expansion
+} // extern "C"
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //
Index: src/libcfa/stdhdr/inttypes.h
===================================================================
--- src/libcfa/stdhdr/inttypes.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
+++ src/libcfa/stdhdr/inttypes.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
@@ -0,0 +1,24 @@
+//
+// 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.
+// 
+// inttypes.h -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Mon Jul  4 23:25:26 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul  5 20:30:58 2016
+// Update Count     : 8
+// 
+
+extern "C" {
+#include_next <inttypes.h>								// has internal check for multiple expansion
+} // extern "C"
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //
Index: src/libcfa/stdhdr/iso646.h
===================================================================
--- src/libcfa/stdhdr/iso646.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
+++ src/libcfa/stdhdr/iso646.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
@@ -0,0 +1,24 @@
+//
+// 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.
+// 
+// ios646.h -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Mon Jul  4 23:25:26 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul  5 20:35:36 2016
+// Update Count     : 9
+// 
+
+extern "C" {
+#include_next <ios646.h>								// has internal check for multiple expansion
+} // extern "C"
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //
Index: src/libcfa/stdhdr/limits.h
===================================================================
--- src/libcfa/stdhdr/limits.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
+++ src/libcfa/stdhdr/limits.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
@@ -0,0 +1,24 @@
+//
+// 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.
+// 
+// limits.h -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Mon Jul  4 23:25:26 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul  5 20:35:58 2016
+// Update Count     : 10
+// 
+
+extern "C" {
+#include_next <limits.h>								// has internal check for multiple expansion
+} // extern "C"
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //
Index: src/libcfa/stdhdr/locale.h
===================================================================
--- src/libcfa/stdhdr/locale.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
+++ src/libcfa/stdhdr/locale.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
@@ -0,0 +1,24 @@
+//
+// 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.
+// 
+// locale.h -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Mon Jul  4 23:25:26 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul  5 20:37:56 2016
+// Update Count     : 12
+// 
+
+extern "C" {
+#include_next <locale.h>								// has internal check for multiple expansion
+} // extern "C"
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //
Index: src/libcfa/stdhdr/math.h
===================================================================
--- src/libcfa/stdhdr/math.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
+++ src/libcfa/stdhdr/math.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
@@ -0,0 +1,24 @@
+//
+// 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.
+// 
+// math.h -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Mon Jul  4 23:25:26 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul  5 20:38:18 2016
+// Update Count     : 12
+// 
+
+extern "C" {
+#include_next <math.h>									// has internal check for multiple expansion
+} // extern "C"
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //
Index: src/libcfa/stdhdr/setjmp.h
===================================================================
--- src/libcfa/stdhdr/setjmp.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
+++ src/libcfa/stdhdr/setjmp.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
@@ -0,0 +1,24 @@
+//
+// 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.
+// 
+// setjmp.h -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Mon Jul  4 23:25:26 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul  5 20:38:33 2016
+// Update Count     : 12
+// 
+
+extern "C" {
+#include_next <setjmp.h>								// has internal check for multiple expansion
+} // extern "C"
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //
Index: src/libcfa/stdhdr/signal.h
===================================================================
--- src/libcfa/stdhdr/signal.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
+++ src/libcfa/stdhdr/signal.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
@@ -0,0 +1,24 @@
+//
+// 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.
+// 
+// signal.h -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Mon Jul  4 23:25:26 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul  5 20:38:48 2016
+// Update Count     : 12
+// 
+
+extern "C" {
+#include_next <signal.h>								// has internal check for multiple expansion
+} // extern "C"
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //
Index: src/libcfa/stdhdr/stdalign.h
===================================================================
--- src/libcfa/stdhdr/stdalign.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
+++ src/libcfa/stdhdr/stdalign.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
@@ -0,0 +1,24 @@
+//
+// 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.
+// 
+// stdalign.h -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Mon Jul  4 23:25:26 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul  5 20:39:11 2016
+// Update Count     : 12
+// 
+
+extern "C" {
+#include_next <stdalign.h>								// has internal check for multiple expansion
+} // extern "C"
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //
Index: src/libcfa/stdhdr/stdarg.h
===================================================================
--- src/libcfa/stdhdr/stdarg.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
+++ src/libcfa/stdhdr/stdarg.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
@@ -0,0 +1,24 @@
+//
+// 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.
+// 
+// stdarg.h -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Mon Jul  4 23:25:26 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul  5 20:39:25 2016
+// Update Count     : 12
+// 
+
+extern "C" {
+#include_next <stdarg.h>								// has internal check for multiple expansion
+} // extern "C"
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //
Index: src/libcfa/stdhdr/stdatomic.h
===================================================================
--- src/libcfa/stdhdr/stdatomic.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
+++ src/libcfa/stdhdr/stdatomic.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
@@ -0,0 +1,24 @@
+//
+// 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.
+// 
+// stdatomic.h -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Mon Jul  4 23:25:26 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul  5 20:39:38 2016
+// Update Count     : 12
+// 
+
+extern "C" {
+#include_next <stdatomic.h>								// has internal check for multiple expansion
+} // extern "C"
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //
Index: src/libcfa/stdhdr/stdbool.h
===================================================================
--- src/libcfa/stdhdr/stdbool.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
+++ src/libcfa/stdhdr/stdbool.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
@@ -0,0 +1,24 @@
+//
+// 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.
+// 
+// stdbool.h -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Mon Jul  4 23:25:26 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul  5 20:39:51 2016
+// Update Count     : 12
+// 
+
+extern "C" {
+#include_next <stdbool.h>								// has internal check for multiple expansion
+} // extern "C"
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //
Index: src/libcfa/stdhdr/stddef.h
===================================================================
--- src/libcfa/stdhdr/stddef.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
+++ src/libcfa/stdhdr/stddef.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
@@ -0,0 +1,24 @@
+//
+// 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.
+// 
+// stddef.h -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Mon Jul  4 23:25:26 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul  5 20:40:01 2016
+// Update Count     : 12
+// 
+
+extern "C" {
+#include_next <stddef.h>								// has internal check for multiple expansion
+} // extern "C"
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //
Index: src/libcfa/stdhdr/stdint.h
===================================================================
--- src/libcfa/stdhdr/stdint.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
+++ src/libcfa/stdhdr/stdint.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
@@ -0,0 +1,24 @@
+//
+// 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.
+// 
+// stdint.h -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Mon Jul  4 23:25:26 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul  5 20:40:11 2016
+// Update Count     : 12
+// 
+
+extern "C" {
+#include_next <stdint.h>								// has internal check for multiple expansion
+} // extern "C"
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //
Index: src/libcfa/stdhdr/stdio.h
===================================================================
--- src/libcfa/stdhdr/stdio.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
+++ src/libcfa/stdhdr/stdio.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
@@ -0,0 +1,24 @@
+//
+// 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.
+// 
+// stdio.h -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Mon Jul  4 23:25:26 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Mon Jul  4 23:33:37 2016
+// Update Count     : 3
+// 
+
+extern "C" {
+#include_next <stdio.h>									// has internal check for multiple expansion
+} // extern "C"
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //
Index: src/libcfa/stdhdr/stdlib.h
===================================================================
--- src/libcfa/stdhdr/stdlib.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
+++ src/libcfa/stdhdr/stdlib.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
@@ -0,0 +1,24 @@
+//
+// 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.
+// 
+// stdlib.h -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Mon Jul  4 23:25:26 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul  5 20:40:28 2016
+// Update Count     : 12
+// 
+
+extern "C" {
+#include_next <stdlib.h>								// has internal check for multiple expansion
+} // extern "C"
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //
Index: src/libcfa/stdhdr/stdnoreturn.h
===================================================================
--- src/libcfa/stdhdr/stdnoreturn.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
+++ src/libcfa/stdhdr/stdnoreturn.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
@@ -0,0 +1,24 @@
+//
+// 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.
+// 
+// stdnoreturn.h -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Mon Jul  4 23:25:26 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul  5 20:40:37 2016
+// Update Count     : 12
+// 
+
+extern "C" {
+#include_next <stdnoreturn.h>							// has internal check for multiple expansion
+} // extern "C"
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //
Index: src/libcfa/stdhdr/string.h
===================================================================
--- src/libcfa/stdhdr/string.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
+++ src/libcfa/stdhdr/string.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
@@ -0,0 +1,24 @@
+//
+// 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.
+// 
+// string.h -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Mon Jul  4 23:25:26 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul  5 20:40:47 2016
+// Update Count     : 12
+// 
+
+extern "C" {
+#include_next <string.h>								// has internal check for multiple expansion
+} // extern "C"
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //
Index: src/libcfa/stdhdr/tgmath.h
===================================================================
--- src/libcfa/stdhdr/tgmath.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
+++ src/libcfa/stdhdr/tgmath.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
@@ -0,0 +1,24 @@
+//
+// 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.
+// 
+// tgmath.h -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Mon Jul  4 23:25:26 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul  5 20:40:56 2016
+// Update Count     : 12
+// 
+
+extern "C" {
+#include_next <tgmath.h>								// has internal check for multiple expansion
+} // extern "C"
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //
Index: src/libcfa/stdhdr/threads.h
===================================================================
--- src/libcfa/stdhdr/threads.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
+++ src/libcfa/stdhdr/threads.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
@@ -0,0 +1,24 @@
+//
+// 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.
+// 
+// threads.h -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Mon Jul  4 23:25:26 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul  5 20:41:04 2016
+// Update Count     : 12
+// 
+
+extern "C" {
+#include_next <threads.h>								// has internal check for multiple expansion
+} // extern "C"
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //
Index: src/libcfa/stdhdr/time.h
===================================================================
--- src/libcfa/stdhdr/time.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
+++ src/libcfa/stdhdr/time.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
@@ -0,0 +1,24 @@
+//
+// 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.
+// 
+// time.h -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Mon Jul  4 23:25:26 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul  5 20:41:24 2016
+// Update Count     : 12
+// 
+
+extern "C" {
+#include_next <time.h>									// has internal check for multiple expansion
+} // extern "C"
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //
Index: src/libcfa/stdhdr/uchar.h
===================================================================
--- src/libcfa/stdhdr/uchar.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
+++ src/libcfa/stdhdr/uchar.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
@@ -0,0 +1,24 @@
+//
+// 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.
+// 
+// uchar.h -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Mon Jul  4 23:25:26 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul  5 20:41:33 2016
+// Update Count     : 12
+// 
+
+extern "C" {
+#include_next <uchar.h>									// has internal check for multiple expansion
+} // extern "C"
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //
Index: src/libcfa/stdhdr/unistd.h
===================================================================
--- src/libcfa/stdhdr/unistd.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
+++ src/libcfa/stdhdr/unistd.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
@@ -0,0 +1,24 @@
+//
+// 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.
+// 
+// unistd.h -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Mon Jul  4 23:25:26 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul  5 21:06:59 2016
+// Update Count     : 13
+// 
+
+extern "C" {
+#include_next <unistd.h>								// has internal check for multiple expansion
+} // extern "C"
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //
Index: src/libcfa/stdhdr/wchar.h
===================================================================
--- src/libcfa/stdhdr/wchar.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
+++ src/libcfa/stdhdr/wchar.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
@@ -0,0 +1,24 @@
+//
+// 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.
+// 
+// wchar.h -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Mon Jul  4 23:25:26 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul  5 20:41:43 2016
+// Update Count     : 12
+// 
+
+extern "C" {
+#include_next <wchar.h>									// has internal check for multiple expansion
+} // extern "C"
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //
Index: src/libcfa/stdhdr/wctype.h
===================================================================
--- src/libcfa/stdhdr/wctype.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
+++ src/libcfa/stdhdr/wctype.h	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
@@ -0,0 +1,24 @@
+//
+// 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.
+// 
+// wctype.h -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Mon Jul  4 23:25:26 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul  5 20:41:53 2016
+// Update Count     : 12
+// 
+
+extern "C" {
+#include_next <wctype.h>								// has internal check for multiple expansion
+} // extern "C"
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //
Index: src/libcfa/stdio.h
===================================================================
--- src/libcfa/stdio.h	(revision a6151baa3a12bfe16ad97aa148f11da6d2d8d4c3)
+++ 	(revision )
@@ -1,24 +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.
-// 
-// stdio.h -- 
-// 
-// Author           : Peter A. Buhr
-// Created On       : Mon Jul  4 23:25:26 2016
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jul  4 23:33:37 2016
-// Update Count     : 3
-// 
-
-extern "C" {
-#include_next <stdio.h>									// has internal check for multiple expansion
-} // extern "C"
-
-// Local Variables: //
-// tab-width: 4 //
-// mode: c++ //
-// compile-command: "make install" //
-// End: //
Index: src/tests/random.c
===================================================================
--- src/tests/random.c	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
+++ src/tests/random.c	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
@@ -0,0 +1,49 @@
+// 
+// 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.
+// 
+// random.c -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Tue Jul  5 21:29:30 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul  5 21:29:54 2016
+// Update Count     : 1
+// 
+
+#include <fstream>
+#include <stdlib>										// random
+#include <unistd.h>										// getpid
+
+int main() {
+	rand48seed( getpid() );								// set random seed
+
+	// test polymorphic calls to random and stream
+	char c = rand48();
+	sout | c | endl;
+	int i = rand48();
+    sout | i | endl;
+	unsigned int ui = rand48();
+    sout | ui | endl;
+	long int li = rand48();
+    sout | li | endl;
+	unsigned long int uli = rand48();
+    sout | uli | endl;
+    float f = rand48();
+    sout | f | endl;
+    double d = rand48();
+    sout | d | endl;
+    float _Complex fc = rand48();
+    sout | fc | endl;
+    double _Complex dc = rand48();
+    sout | dc | endl;
+    long double _Complex ldc = rand48();
+    sout | ldc | endl;
+} // main
+
+// Local Variables: //
+// tab-width: 4 //
+// compile-command: "cfa random.c" //
+// End: //
Index: src/tests/vector/vector_int.c
===================================================================
--- src/tests/vector/vector_int.c	(revision a6151baa3a12bfe16ad97aa148f11da6d2d8d4c3)
+++ src/tests/vector/vector_int.c	(revision ed0e67af84f24e07df5e60055abed88b8c7c24e4)
@@ -9,14 +9,12 @@
 // Author           : Richard C. Bilson
 // Created On       : Wed May 27 17:56:53 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Apr 27 17:27:12 2016
-// Update Count     : 3
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul  5 21:00:56 2016
+// Update Count     : 4
 //
 
 #include "vector_int.h"
-extern "C" {
 #include <stdlib.h>
 #include <assert.h>
-}
 
 #define DEFAULT_CAPACITY 20