Index: libcfa/src/heap.hfa
===================================================================
--- libcfa/src/heap.hfa	(revision 3d46f019e14e165242138c834ad1d93262fc1e1e)
+++ libcfa/src/heap.hfa	(revision 4e7c0fc0090de26380183bc8742b335bbe1cf243)
@@ -10,6 +10,6 @@
 // Created On       : Tue May 26 11:23:55 2020
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May 26 18:13:56 2020
-// Update Count     : 7
+// Last Modified On : Mon Jun  1 21:19:00 2020
+// Update Count     : 10
 // 
 
@@ -36,7 +36,8 @@
 	void * amemalign( size_t align, size_t dim, size_t elemSize );
 	void * cmemalign( size_t align, size_t noOfElems, size_t elemSize );
+	size_t malloc_alignment( void * addr );
+	bool malloc_zero_fill( void * addr );
 	size_t malloc_size( void * addr );
-	size_t malloc_alignment( void * addr );
-	bool malloc_zero_fill( void * );
+	size_t malloc_usable_size( void * addr );
 	int malloc_stats_fd( int fd );
 } // extern "C"
Index: libcfa/src/stdlib.cfa
===================================================================
--- libcfa/src/stdlib.cfa	(revision 3d46f019e14e165242138c834ad1d93262fc1e1e)
+++ libcfa/src/stdlib.cfa	(revision 4e7c0fc0090de26380183bc8742b335bbe1cf243)
@@ -10,6 +10,6 @@
 // Created On       : Thu Jan 28 17:10:29 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Apr 16 22:43:33 2020
-// Update Count     : 498
+// Last Modified On : Tue Jun  2 08:44:46 2020
+// Update Count     : 499
 //
 
@@ -277,5 +277,5 @@
 extern "C" {											// override C version
 	void srandom( unsigned int seed ) { srand48( (long int)seed ); }
-	long int random( void ) { return mrand48(); }
+	long int random( void ) { return mrand48(); }		// GENERATES POSITIVE AND NEGATIVE VALUES
 } // extern "C"
 
Index: libcfa/src/stdlib.hfa
===================================================================
--- libcfa/src/stdlib.hfa	(revision 3d46f019e14e165242138c834ad1d93262fc1e1e)
+++ libcfa/src/stdlib.hfa	(revision 4e7c0fc0090de26380183bc8742b335bbe1cf243)
@@ -10,6 +10,6 @@
 // Created On       : Thu Jan 28 17:12:35 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May 26 22:50:08 2020
-// Update Count     : 439
+// Last Modified On : Tue Jun  2 09:05:16 2020
+// Update Count     : 450
 //
 
@@ -19,9 +19,11 @@
 #include "bits/align.hfa"
 
-#include <malloc.h>
 #include <stdlib.h>										// *alloc, strto*, ato*
+#include <heap.hfa>
 
 // Reduce includes by explicitly defining these routines.
 extern "C" {
+	void * memalign( size_t alignment, size_t size );	// malloc.h
+	void * pvalloc( size_t size );						// malloc.h
 	void * memset( void * dest, int fill, size_t size ); // string.h
 	void * memcpy( void * dest, const void * src, size_t size ); // string.h
@@ -299,5 +301,6 @@
 extern "C" {											// override C version
 	void srandom( unsigned int seed );
-	long int random( void );
+	long int random( void );							// GENERATES POSITIVE AND NEGATIVE VALUES
+	// For positive values, use unsigned int, e.g., unsigned int r = random() % 100U;
 } // extern "C"
 
@@ -306,6 +309,6 @@
 	long int random( long int u ) { if ( u < 0 ) return random( u, 0 ); else return random( 0, u ); } // [0,u)
 	unsigned long int random( void ) { return lrand48(); }
+	unsigned long int random( unsigned long int u ) { return lrand48() % u; } // [0,u)
 	unsigned long int random( unsigned long int l, unsigned long int u ) { if ( u < l ) [u, l] = [l, u]; return lrand48() % (u - l) + l; } // [l,u)
-	unsigned long int random( unsigned long int u ) { return lrand48() % u; } // [0,u)
 
 	char random( void ) { return (unsigned long int)random(); }