--- trackdb/FormatConverter.cc~	2008-03-19 11:23:09.000000000 +0100
+++ trackdb/FormatConverter.cc	2008-03-19 11:23:45.000000000 +0100
@@ -17,7 +17,8 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <stdlib.h>
+#include <cstdlib>
+#include <cstring>
 #ifdef HAVE_AO
 #include <ao/ao.h>
 #endif
--- trackdb/TempFileManager.cc~	2008-03-19 11:21:18.000000000 +0100
+++ trackdb/TempFileManager.cc	2008-03-19 11:24:06.000000000 +0100
@@ -24,6 +24,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <cstring>
 
 #define DEFAULT_TEMP_PATH "/tmp/"