--- staptree.h-dist	2007-10-24 16:27:33.000000000 +0200
+++ staptree.h	2007-10-24 16:27:56.000000000 +0200
@@ -844,7 +844,7 @@ require (deep_copy_visitor* v, T* dst, T
     }
 }
 
-template <> static void
+template <> void
 require <indexable *> (deep_copy_visitor* v, indexable** dst, indexable* src)
 {
   if (src != NULL)
--- staptree.cxx-dist	2007-10-24 16:27:29.000000000 +0200
+++ staptree.cxx	2007-10-24 16:28:06.000000000 +0200
@@ -17,6 +17,7 @@
 #include <cassert>
 #include <vector>
 #include <algorithm>
+#include <cstring>
 
 using namespace std;