Index: src/tests/avltree/avl.h
===================================================================
--- src/tests/avltree/avl.h	(revision b37dba01720427bc6246805fb6bb003461bdb094)
+++ src/tests/avltree/avl.h	(revision db67b11a26ef91f7c97930c8bb9f50bead0353ad)
@@ -21,7 +21,4 @@
 // xxx - unbound type variable problems when trying to use new instead of create
 // forall( otype T, ttype Params | { void ?{}(T *, Params); } ) T * new( Params p );
-
-forall(dtype T | { void ^?{}(T &); })
-void delete(T * x);
 
 // To-do: properly use height or balance factor
Index: src/tests/avltree/avl1.c
===================================================================
--- src/tests/avltree/avl1.c	(revision b37dba01720427bc6246805fb6bb003461bdb094)
+++ src/tests/avltree/avl1.c	(revision db67b11a26ef91f7c97930c8bb9f50bead0353ad)
@@ -1,4 +1,5 @@
 #include "avl.h"
 // #include "cwrap.h"
+#include <stdlib>
 
 forall(otype K | Comparable(K), otype V)
Index: src/tests/avltree/avl3.c
===================================================================
--- src/tests/avltree/avl3.c	(revision b37dba01720427bc6246805fb6bb003461bdb094)
+++ src/tests/avltree/avl3.c	(revision db67b11a26ef91f7c97930c8bb9f50bead0353ad)
@@ -1,4 +1,5 @@
 #include "avl.h"
 #include "avl-private.h"
+#include <stdlib>
 
 // from stdlib
@@ -32,5 +33,5 @@
   t->left = NULL;
   t->right = NULL;
-  deleteSingleNode(t);
+  delete(t);
 }
 
Index: src/tests/avltree/avl_test.c
===================================================================
--- src/tests/avltree/avl_test.c	(revision b37dba01720427bc6246805fb6bb003461bdb094)
+++ src/tests/avltree/avl_test.c	(revision db67b11a26ef91f7c97930c8bb9f50bead0353ad)
@@ -1,4 +1,5 @@
 #include "avl.h"
 #include "avl-private.h"
+#include <stdlib>
 
 extern "C" {