Index: src/tests/.expect/extension.txt
===================================================================
--- src/tests/.expect/extension.txt	(revision 540b2755230a9d50f9cacc73f3c3448b9b6689d2)
+++ src/tests/.expect/extension.txt	(revision e66ef08a1966b653fdc89d825d773ebf7b8bf32e)
@@ -1,5 +1,8 @@
+extern void *malloc(long unsigned int __size);
+extern void free(void *__ptr);
 extern void abort(void);
 extern int atexit(void (*__func)(void));
 extern void exit(int __status);
+extern int printf(const char *__restrict __format, ...);
 __extension__ int __a__i_1;
 __extension__ int __b__i_1;
Index: src/tests/.expect/gccExtensions.txt
===================================================================
--- src/tests/.expect/gccExtensions.txt	(revision 540b2755230a9d50f9cacc73f3c3448b9b6689d2)
+++ src/tests/.expect/gccExtensions.txt	(revision e66ef08a1966b653fdc89d825d773ebf7b8bf32e)
@@ -1,5 +1,8 @@
+extern void *malloc(long unsigned int __size);
+extern void free(void *__ptr);
 extern void abort(void);
 extern int atexit(void (*__func)(void));
 extern void exit(int __status);
+extern int printf(const char *__restrict __format, ...);
 int main(int __argc__i_1, const char **__argv__PPCc_1){
     asm ( "nop" :  :  :  );
Index: src/tests/Makefile.am
===================================================================
--- src/tests/Makefile.am	(revision 540b2755230a9d50f9cacc73f3c3448b9b6689d2)
+++ src/tests/Makefile.am	(revision e66ef08a1966b653fdc89d825d773ebf7b8bf32e)
@@ -11,10 +11,10 @@
 ## Created On       : Sun May 31 09:08:15 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Mon Jun 27 14:39:08 2016
-## Update Count     : 34
+## Last Modified On : Sat Jul  9 11:23:24 2016
+## Update Count     : 35
 ###############################################################################
 
 # applies to both programs
-CFLAGS = -g -Wall -Wno-unused-function # TEMPORARY: does not build with -O2
+CFLAGS = -g -Wall -Wno-unused-function @CFA_FLAGS@ # TEMPORARY: does not build with -O2
 CC = @CFA_BINDIR@/cfa
 
Index: src/tests/Makefile.in
===================================================================
--- src/tests/Makefile.in	(revision 540b2755230a9d50f9cacc73f3c3448b9b6689d2)
+++ src/tests/Makefile.in	(revision e66ef08a1966b653fdc89d825d773ebf7b8bf32e)
@@ -114,4 +114,5 @@
 CFA_BACKEND_CC = @CFA_BACKEND_CC@
 CFA_BINDIR = @CFA_BINDIR@
+CFA_FLAGS = @CFA_FLAGS@
 CFA_INCDIR = @CFA_INCDIR@
 CFA_LIBDIR = @CFA_LIBDIR@
@@ -119,5 +120,5 @@
 
 # applies to both programs
-CFLAGS = -g -Wall -Wno-unused-function # TEMPORARY: does not build with -O2
+CFLAGS = -g -Wall -Wno-unused-function @CFA_FLAGS@ # TEMPORARY: does not build with -O2
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
Index: src/tests/avltree/avl.h
===================================================================
--- src/tests/avltree/avl.h	(revision 540b2755230a9d50f9cacc73f3c3448b9b6689d2)
+++ src/tests/avltree/avl.h	(revision e66ef08a1966b653fdc89d825d773ebf7b8bf32e)
@@ -4,7 +4,5 @@
 extern "C" {
 #define NULL 0
-void free(void *);
 #define assert(cond) if (! (cond)) { printf("Assertion failed: (%s) at %s:%d\n", #cond, __FILE__, __LINE__); abort(); }
-int printf(const char *, ...);
 }
 
Index: src/tests/avltree/avl1.c
===================================================================
--- src/tests/avltree/avl1.c	(revision 540b2755230a9d50f9cacc73f3c3448b9b6689d2)
+++ src/tests/avltree/avl1.c	(revision e66ef08a1966b653fdc89d825d773ebf7b8bf32e)
@@ -1,8 +1,4 @@
 #include "avl.h"
 // #include "cwrap.h"
-
-extern "C" {
-  void * malloc(long int);
-}
 
 forall(otype K | Comparable(K), otype V)
Index: src/tests/avltree/avl_test.c
===================================================================
--- src/tests/avltree/avl_test.c	(revision 540b2755230a9d50f9cacc73f3c3448b9b6689d2)
+++ src/tests/avltree/avl_test.c	(revision e66ef08a1966b653fdc89d825d773ebf7b8bf32e)
@@ -3,5 +3,4 @@
 
 extern "C" {
-  int printf(const char *, ...);
   int strcmp(const char *, const char *);
 }
Index: src/tests/init_once.c
===================================================================
--- src/tests/init_once.c	(revision 540b2755230a9d50f9cacc73f3c3448b9b6689d2)
+++ src/tests/init_once.c	(revision e66ef08a1966b653fdc89d825d773ebf7b8bf32e)
@@ -10,6 +10,6 @@
 // Created On       : Tue Jun 14 15:43:35 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul  5 16:40:07 2016
-// Update Count     : 2
+// Last Modified On : Sat Jul  9 11:30:29 2016
+// Update Count     : 3
 //
 
@@ -23,10 +23,8 @@
 //*** setup
 extern "C" {
-typedef unsigned long int size_t;
 #define NULL 0
 void * malloc(size_t);
 void free(void *);
 #define assert(cond) if (! (cond)) { printf("Assertion failed: (%s) at %s:%d\n", #cond, __FILE__, __LINE__); abort(); }
-int printf(const char *, ...);
 void *memset(void *s, int c, size_t n);
 }