Index: libcfa/src/stdhdr/malloc.h
===================================================================
--- libcfa/src/stdhdr/malloc.h	(revision 76e21136a1c0bd25b9c248fb398e4bb5222916b9)
+++ libcfa/src/stdhdr/malloc.h	(revision d6d1f80435878c773e2c58c98dede3a28b9ea068)
@@ -10,37 +10,13 @@
 // Created On       : Thu Jul 20 15:58:16 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Apr 16 22:44:06 2020
-// Update Count     : 13
+// Last Modified On : Wed May 27 14:13:14 2020
+// Update Count     : 18
 // 
-
-
-size_t default_mmap_start();							// CFA extras
-size_t default_heap_expansion();
-
-bool traceHeap();
-bool traceHeapOn();
-bool traceHeapOff();
-
-bool traceHeapTerm();
-bool traceHeapTermOn();
-bool traceHeapTermOff();
-
-bool checkFree();
-bool checkFreeOn();
-bool checkFreeOff();
-
-extern "C" {
-void * aalloc( size_t noOfElems, size_t elemSize );
-void * amemalign( size_t alignment, size_t noOfElems, size_t elemSize );
-void * cmemalign( size_t alignment, size_t noOfElems, size_t elemSize );
-size_t malloc_alignment( void * );
-bool malloc_zero_fill( void * );
-size_t malloc_size( void * );
-int malloc_stats_fd( int fd );
-} // extern "C"
 
 extern "C" {
 #include_next <malloc.h>								// has internal check for multiple expansion
 } // extern "C"
+
+#include <heap.hfa>
 
 // Local Variables: //
Index: libcfa/src/stdhdr/sys/mman.h
===================================================================
--- libcfa/src/stdhdr/sys/mman.h	(revision d6d1f80435878c773e2c58c98dede3a28b9ea068)
+++ libcfa/src/stdhdr/sys/mman.h	(revision d6d1f80435878c773e2c58c98dede3a28b9ea068)
@@ -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 76e21136a1c0bd25b9c248fb398e4bb5222916b9)
+++ 	(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: //