Index: src/libcfa/stdhdr/bfdlink.h
===================================================================
--- src/libcfa/stdhdr/bfdlink.h	(revision 9cc047288add80fde90745e40c152d8037f4b6a8)
+++ src/libcfa/stdhdr/bfdlink.h	(revision 9cc047288add80fde90745e40c152d8037f4b6a8)
@@ -0,0 +1,33 @@
+// 
+// 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.
+// 
+// bfdlink.h -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Tue Jul 18 07:26:04 2017
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul 18 07:46:50 2017
+// Update Count     : 3
+// 
+
+// include file uses the CFA keyword "with".
+#if ! defined( with )									// nesting ?
+#define with `with`										// make keyword an identifier
+#define __CFA_BFDLINK_H__
+#endif
+
+#include_next <bfdlink.h>								// must have internal check for multiple expansion
+
+#if defined( with ) && defined( __CFA_BFDLINK_H__ )		// reset only if set
+#undef with
+#undef __CFA_BFDLINK_H__
+#endif
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //
Index: src/libcfa/stdhdr/hwloc.h
===================================================================
--- src/libcfa/stdhdr/hwloc.h	(revision 9cc047288add80fde90745e40c152d8037f4b6a8)
+++ src/libcfa/stdhdr/hwloc.h	(revision 9cc047288add80fde90745e40c152d8037f4b6a8)
@@ -0,0 +1,33 @@
+// 
+// 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.
+// 
+// hwloc.h -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Tue Jul 18 07:45:00 2017
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul 18 07:56:33 2017
+// Update Count     : 3
+// 
+
+// include file uses the CFA keyword "thread".
+#if ! defined( thread )									// nesting ?
+#define thread `thread`									// make keyword an identifier
+#define __CFA_HWLOC_H__
+#endif
+
+#include_next <hwloc.h>									// must have internal check for multiple expansion
+
+#if defined( thread ) && defined( __CFA_HWLOC_H__ )		// reset only if set
+#undef thread
+#undef __CFA_HWLOC_H__
+#endif
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //
Index: src/libcfa/stdhdr/krb5.h
===================================================================
--- src/libcfa/stdhdr/krb5.h	(revision 9cc047288add80fde90745e40c152d8037f4b6a8)
+++ src/libcfa/stdhdr/krb5.h	(revision 9cc047288add80fde90745e40c152d8037f4b6a8)
@@ -0,0 +1,33 @@
+// 
+// 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.
+// 
+// krb5.h -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Tue Jul 18 07:55:44 2017
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul 18 07:58:01 2017
+// Update Count     : 3
+// 
+
+// include file uses the CFA keyword "enable".
+#if ! defined( enable )									// nesting ?
+#define enable `enable`									// make keyword an identifier
+#define __CFA_KRB5_H__
+#endif
+
+#include_next <krb5.h>									// must have internal check for multiple expansion
+
+#if defined( enable ) && defined( __CFA_KRB5_H__ )		// reset only if set
+#undef enable
+#undef __CFA_KRB5_H__
+#endif
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //