Index: src/libcfa/builtins.cf
===================================================================
--- src/libcfa/builtins.cf	(revision b63e3760197cb5f480cf1cdfd5886fdd0411d103)
+++ src/libcfa/builtins.cf	(revision 04380914e7d493aa24ecb2e24d89d5752c2133fb)
@@ -584,3 +584,2 @@
 int __builtin_LINE();
 extern const char *__PRETTY_FUNCTION__;
-typedef int wchar_t;
Index: src/libcfa/stdlib
===================================================================
--- src/libcfa/stdlib	(revision b63e3760197cb5f480cf1cdfd5886fdd0411d103)
+++ src/libcfa/stdlib	(revision 04380914e7d493aa24ecb2e24d89d5752c2133fb)
@@ -10,6 +10,6 @@
 // Created On       : Thu Jan 28 17:12:35 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar  2 17:38:21 2016
-// Update Count     : 64
+// Last Modified On : Tue Mar 22 22:34:24 2016
+// Update Count     : 69
 //
 
@@ -19,7 +19,4 @@
 #include <stddef.h>										// size_t
 } // extern "C"
-
-forall( otype T ) T * memset( T * ptr, unsigned char fill ); // use default value '\0' for fill
-forall( otype T ) T * memset( T * ptr );					// remove when default value available
 
 forall( otype T ) T * malloc( void );
@@ -34,4 +31,7 @@
 forall( otype T ) T * memalign( size_t alignment );		// deprecated
 forall( otype T ) int posix_memalign( T ** ptr, size_t alignment );
+
+forall( otype T ) T * memset( T * ptr, unsigned char fill ); // use default value '\0' for fill
+forall( otype T ) T * memset( T * ptr );				// remove when default value available
 
 //---------------------------------------
@@ -93,15 +93,15 @@
 //---------------------------------------
 
-void randseed( long int s );
-char random();
-int random();
-unsigned int random();
-long int random();
-unsigned long int random();
-float random();
-double random();
-float _Complex random();
-double _Complex random();
-long double _Complex random();
+void rand48seed( long int s );
+char rand48();
+int rand48();
+unsigned int rand48();
+long int rand48();
+unsigned long int rand48();
+float rand48();
+double rand48();
+float _Complex rand48();
+double _Complex rand48();
+long double _Complex rand48();
 
 //---------------------------------------
Index: src/libcfa/stdlib.c
===================================================================
--- src/libcfa/stdlib.c	(revision b63e3760197cb5f480cf1cdfd5886fdd0411d103)
+++ src/libcfa/stdlib.c	(revision 04380914e7d493aa24ecb2e24d89d5752c2133fb)
@@ -10,6 +10,6 @@
 // Created On       : Thu Jan 28 17:10:29 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar  2 17:38:47 2016
-// Update Count     : 143
+// Last Modified On : Tue Mar 22 22:34:26 2016
+// Update Count     : 145
 //
 
@@ -26,13 +26,4 @@
 #include <complex.h>									// _Complex_I, cabsf, cabs, cabsl
 } // extern "C"
-
-forall( otype T ) T * memset( T * ptr, unsigned char fill ) { // use default value '\0' for fill
-	printf( "memset1\n" );
-    return (T *)memset( ptr, (int)fill, malloc_usable_size( ptr ) );
-} // memset
-forall( otype T ) T * memset( T * ptr ) {				// remove when default value available
-	printf( "memset2\n" );
-    return (T *)memset( ptr, 0, malloc_usable_size( ptr ) );
-} // memset
 
 forall( otype T ) T * malloc( void ) {
@@ -91,4 +82,13 @@
 } // posix_memalign
 
+forall( otype T ) T * memset( T * ptr, unsigned char fill ) { // use default value '\0' for fill
+	printf( "memset1\n" );
+    return (T *)memset( ptr, (int)fill, malloc_usable_size( ptr ) );
+} // memset
+forall( otype T ) T * memset( T * ptr ) {				// remove when default value available
+	printf( "memset2\n" );
+    return (T *)memset( ptr, 0, malloc_usable_size( ptr ) );
+} // memset
+
 //---------------------------------------
 
@@ -243,15 +243,15 @@
 //---------------------------------------
 
-void randseed( long int s ) { srand48( s ); }
-char random() { return lrand48(); }
-int random() { return mrand48(); }
-unsigned int random() { return lrand48(); }
-long int random() { return mrand48(); }
-unsigned long int random() { return lrand48(); }
-float random() { return (float)drand48(); }				// otherwise float uses lrand48
-double random() { return drand48(); }
-float _Complex random() { return (float)drand48() + (float _Complex)(drand48() * _Complex_I); }
-double _Complex random() { return drand48() + (double _Complex)(drand48() * _Complex_I); }
-long double _Complex random() { return (long double)drand48() + (long double _Complex)(drand48() * _Complex_I); }
+void rand48seed( long int s ) { srand48( s ); }
+char rand48() { return lrand48(); }
+int rand48() { return mrand48(); }
+unsigned int rand48() { return lrand48(); }
+long int rand48() { return mrand48(); }
+unsigned long int rand48() { return lrand48(); }
+float rand48() { return (float)drand48(); }				// otherwise float uses lrand48
+double rand48() { return drand48(); }
+float _Complex rand48() { return (float)drand48() + (float _Complex)(drand48() * _Complex_I); }
+double _Complex rand48() { return drand48() + (double _Complex)(drand48() * _Complex_I); }
+long double _Complex rand48() { return (long double)drand48() + (long double _Complex)(drand48() * _Complex_I); }
 
 //---------------------------------------