Index: include/bfd.h
===================================================================
--- include/bfd.h	(revision b87a5edee8b2aa6c36e184150ebd60baf4c64251)
+++ include/bfd.h	(revision 2871210d7be1910f7296a17164d525f66ef82648)
@@ -10,13 +10,18 @@
 // Created On       : Thu Jan  8 15:50:56 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat May 16 07:54:59 2015
-// Update Count     : 5
+// Last Modified On : Sun Jun 28 09:07:14 2015
+// Update Count     : 7
 
 // This include file uses the CFA keyword "type" as a field name of a structure.
 // The name is changed only for the include file.
 
+#ifndef type	// nesting ?
 #define type `type`
-#include_next <math.h>
+#define __CFA_BFD_H__
+#endif // type
+#include_next <bfd.h>
+#ifdef __CFA_BFD_H__
 #undef type
+#endif // __CFA_BFD_H__
 
 // Local Variables: //
Index: include/bfdlink.h
===================================================================
--- include/bfdlink.h	(revision 2871210d7be1910f7296a17164d525f66ef82648)
+++ include/bfdlink.h	(revision 2871210d7be1910f7296a17164d525f66ef82648)
@@ -0,0 +1,31 @@
+//
+// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+//
+// bfdlink.h -- 
+//
+// Author           : Peter A. Buhr
+// Created On       : Sat Jun 27 09:14:00 2015
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sun Jun 28 09:08:26 2015
+// Update Count     : 3
+
+// This include file uses the CFA keyword "type" as a field name of a structure.
+// The name is changed only for the include file.
+
+#ifndef type	// nesting ?
+#define type `type`
+#define __CFA_BFDLINK_H__
+#endif // type
+#include_next <bfdlink.h>
+#ifdef __CFA_BFDLINK_H__
+#undef type
+#endif // __CFA_BFDLINK_H__
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //
Index: include/demangle.h
===================================================================
--- include/demangle.h	(revision 2871210d7be1910f7296a17164d525f66ef82648)
+++ include/demangle.h	(revision 2871210d7be1910f7296a17164d525f66ef82648)
@@ -0,0 +1,31 @@
+//
+// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+//
+// demangle.h -- 
+//
+// Author           : Peter A. Buhr
+// Created On       : Sat Jun 27 16:45:01 2015
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sun Jun 28 09:09:16 2015
+// Update Count     : 8
+
+// This include file uses the CFA keyword "type" as a field name of a structure.
+// The name is changed only for the include file.
+
+#ifndef type	// nesting ?
+#define type `type`
+#define __CFA_DEMANGLE_H__
+#endif // type
+#include_next <demangle.h>
+#ifdef __CFA_DEMANGLE_H__
+#undef type
+#endif // __CFA_DEMANGLE_H__
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //
Index: include/dialog.h
===================================================================
--- include/dialog.h	(revision 2871210d7be1910f7296a17164d525f66ef82648)
+++ include/dialog.h	(revision 2871210d7be1910f7296a17164d525f66ef82648)
@@ -0,0 +1,31 @@
+//
+// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+//
+// dialog.h -- 
+//
+// Author           : Peter A. Buhr
+// Created On       : Sun Jun 28 08:34:16 2015
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sun Jun 28 09:05:35 2015
+// Update Count     : 4
+
+// This include file uses the CFA keyword "type" as a field name of a structure.
+// The name is changed only for the include file.
+
+#ifndef type	// nesting ?
+#define type `type`
+#define __CFA_DIALOG_H__
+#endif // type
+#include_next <dialog.h>
+#ifdef __CFA_DIALOG_H__
+#undef type
+#endif // __CFA_DIALOG_H__
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //
Index: include/evdns.h
===================================================================
--- include/evdns.h	(revision 2871210d7be1910f7296a17164d525f66ef82648)
+++ include/evdns.h	(revision 2871210d7be1910f7296a17164d525f66ef82648)
@@ -0,0 +1,31 @@
+//
+// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+//
+// evdns.h -- 
+//
+// Author           : Peter A. Buhr
+// Created On       : Sun Jun 28 10:09:23 2015
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sun Jun 28 10:10:11 2015
+// Update Count     : 1
+
+// This include file uses the CFA keyword "type" as a field name of a structure.
+// The name is changed only for the include file.
+
+#ifndef type	// nesting ?
+#define type `type`
+#define __CFA_EVDNS_H__
+#endif // type
+#include_next <evdns.h>
+#ifdef __CFA_EVDNS_H__
+#undef type
+#endif // __CFA_EVDNS_H__
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //
Index: include/evhttp.h
===================================================================
--- include/evhttp.h	(revision 2871210d7be1910f7296a17164d525f66ef82648)
+++ include/evhttp.h	(revision 2871210d7be1910f7296a17164d525f66ef82648)
@@ -0,0 +1,31 @@
+//
+// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+//
+// evhttp.h -- 
+//
+// Author           : Peter A. Buhr
+// Created On       : Sun Jun 28 10:59:02 2015
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sun Jun 28 10:59:55 2015
+// Update Count     : 1
+
+// This include file uses the CFA keyword "type" as a field name of a structure.
+// The name is changed only for the include file.
+
+#ifndef type	// nesting ?
+#define type `type`
+#define __CFA_EVHTTP_H__
+#endif // type
+#include_next <evhttp.h>
+#ifdef __CFA_EVHTTP_H__
+#undef type
+#endif // __CFA_EVHTTP_H__
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //
Index: include/evrpc.h
===================================================================
--- include/evrpc.h	(revision 2871210d7be1910f7296a17164d525f66ef82648)
+++ include/evrpc.h	(revision 2871210d7be1910f7296a17164d525f66ef82648)
@@ -0,0 +1,31 @@
+//
+// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+//
+// evrpc.h -- 
+//
+// Author           : Peter A. Buhr
+// Created On       : Sun Jun 28 11:01:31 2015
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sun Jun 28 11:02:26 2015
+// Update Count     : 1
+
+// This include file uses the CFA keyword "type" as a field name of a structure.
+// The name is changed only for the include file.
+
+#ifndef type	// nesting ?
+#define type `type`
+#define __CFA_EVRPC_H__
+#endif // type
+#include_next <evrpc.h>
+#ifdef __CFA_EVRPC_H__
+#undef type
+#endif // __CFA_EVRPC_H__
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //
Index: include/expat.h
===================================================================
--- include/expat.h	(revision 2871210d7be1910f7296a17164d525f66ef82648)
+++ include/expat.h	(revision 2871210d7be1910f7296a17164d525f66ef82648)
@@ -0,0 +1,38 @@
+//
+// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+//
+// expat.h -- 
+//
+// Author           : Peter A. Buhr
+// Created On       : Sun Jun 28 11:10:15 2015
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sun Jun 28 11:14:28 2015
+// Update Count     : 2
+
+// This include file uses the CFA keyword "type" as a field name of a structure.
+// The name is changed only for the include file.
+
+#ifndef type	// nesting ?
+#define type `type`
+#define __CFA_EXPAT1_H__
+#endif // type
+#ifndef context	// nesting ?
+#define context `context`
+#define __CFA_EXPAT2_H__
+#endif // context
+#include_next <expat.h>
+#ifdef __CFA_EXPAT1_H__
+#undef type
+#endif // __CFA_EXPAT_H__
+#ifdef __CFA_EXPAT2_H__
+#undef type
+#endif // __CFA_EXPAT2_H__
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //
Index: include/fcntl.h
===================================================================
--- include/fcntl.h	(revision 2871210d7be1910f7296a17164d525f66ef82648)
+++ include/fcntl.h	(revision 2871210d7be1910f7296a17164d525f66ef82648)
@@ -0,0 +1,31 @@
+//
+// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+//
+// fcntl.h -- 
+//
+// Author           : Peter A. Buhr
+// Created On       : Sun Jun 28 23:03:14 2015
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sun Jun 28 23:03:48 2015
+// Update Count     : 7
+
+// This include file uses the CFA keyword "type" as a field name of a structure.
+// The name is changed only for the include file.
+
+#ifndef type	// nesting ?
+#define type `type`
+#define __CFA_FCNTL_H__
+#endif // type
+#include_next <fcntl.h>
+#ifdef __CFA_FCNTL_H__
+#undef type
+#endif // __CFA_FCNTL_H__
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //
Index: include/form.h
===================================================================
--- include/form.h	(revision 2871210d7be1910f7296a17164d525f66ef82648)
+++ include/form.h	(revision 2871210d7be1910f7296a17164d525f66ef82648)
@@ -0,0 +1,31 @@
+//
+// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+//
+// form.h -- 
+//
+// Author           : Peter A. Buhr
+// Created On       : Sun Jun 28 11:23:56 2015
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sun Jun 28 11:24:28 2015
+// Update Count     : 1
+
+// This include file uses the CFA keyword "type" as a field name of a structure.
+// The name is changed only for the include file.
+
+#ifndef type	// nesting ?
+#define type `type`
+#define __CFA_FORM_H__
+#endif // type
+#include_next <form.h>
+#ifdef __CFA_FORM_H__
+#undef type
+#endif // __CFA_FORM_H__
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //
Index: include/gcrypt.h
===================================================================
--- include/gcrypt.h	(revision 2871210d7be1910f7296a17164d525f66ef82648)
+++ include/gcrypt.h	(revision 2871210d7be1910f7296a17164d525f66ef82648)
@@ -0,0 +1,31 @@
+//
+// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+//
+// gcrypt.h -- 
+//
+// Author           : Peter A. Buhr
+// Created On       : Sun Jun 28 11:36:26 2015
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sun Jun 28 11:37:07 2015
+// Update Count     : 7
+
+// This include file uses the CFA keyword "type" as a field name of a structure.
+// The name is changed only for the include file.
+
+#ifndef type	// nesting ?
+#define type `type`
+#define __CFA_GCRYPT_H__
+#endif // type
+#include_next <gcrypt.h>
+#ifdef __CFA_GCRYPT_H__
+#undef type
+#endif // __CFA_GCRYPT_H__
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //
Index: include/math.h
===================================================================
--- include/math.h	(revision b87a5edee8b2aa6c36e184150ebd60baf4c64251)
+++ include/math.h	(revision 2871210d7be1910f7296a17164d525f66ef82648)
@@ -10,13 +10,18 @@
 // Created On       : Mon Nov 10 23:41:29 2014
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat May 16 07:55:52 2015
-// Update Count     : 3
+// Last Modified On : Sun Jun 28 09:05:22 2015
+// Update Count     : 6
 
 // This include file uses the CFA keyword "type" as a field name of a structure.
 // The name is changed only for the include file.
 
+#ifndef type	// nesting ?
 #define type `type`
+#define __CFA_MATH_H__
+#endif // type
 #include_next <math.h>
+#ifdef __CFA_MATH_H__
 #undef type
+#endif // __CFA_MATH_H__
 
 // Local Variables: //