Index: libcfa/src/stdhdr/sys/mman.h
===================================================================
--- libcfa/src/stdhdr/sys/mman.h	(revision 64a7146c54101e2d816b7c6fd793f072222b5599)
+++ libcfa/src/stdhdr/sys/mman.h	(revision 64a7146c54101e2d816b7c6fd793f072222b5599)
@@ -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.
+// 
+// mman.h -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Tue May 26 21:23:45 2020
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed May 27 14:23:41 2020
+// Update Count     : 3
+// 
+
+extern "C" {
+#include_next <sys/mman.h>									// has internal check for multiple expansion
+} // extern "C"
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //
Index: libcfa/src/stdhdr/sys/ucontext.h
===================================================================
--- libcfa/src/stdhdr/sys/ucontext.h	(revision 095ac9927ab4898752d1b2c90bc12487bfb282c1)
+++ 	(revision )
@@ -1,32 +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.
-// 
-// uco.h -- 
-// 
-// Author           : Peter A. Buhr
-// Created On       : Thu Feb  8 23:48:16 2018
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Feb  7 19:05:41 2020
-// Update Count     : 6
-// 
-
-#if ! defined( ftype )									// nesting ?
-#define ftype ``ftype									// make keyword an identifier
-#define __CFA_UCONTEXT_H__
-#endif
-
-#include_next <sys/ucontext.h>							// must have internal check for multiple expansion
-
-#if defined( ftype ) && defined( __CFA_UCONTEXT_H__ )	// reset only if set
-#undef ftype
-#undef __CFA_UCONTEXT_H__
-#endif
-
-// Local Variables: //
-// tab-width: 4 //
-// mode: c++ //
-// compile-command: "make install" //
-// End: //