diff -Naur cdrdao-1.2.2/trackdb/FormatConverter.cc cdrdao-1.2.2.oden/trackdb/FormatConverter.cc
--- cdrdao-1.2.2/trackdb/FormatConverter.cc	2005-05-09 20:55:28.000000000 -0400
+++ cdrdao-1.2.2.oden/trackdb/FormatConverter.cc	2008-05-23 05:46:46.000000000 -0400
@@ -18,6 +18,7 @@
  */
 
 #include <stdlib.h>
+#include <string.h>
 #ifdef HAVE_AO
 #include <ao/ao.h>
 #endif
diff -Naur cdrdao-1.2.2/trackdb/FormatMp3.cc cdrdao-1.2.2.oden/trackdb/FormatMp3.cc
--- cdrdao-1.2.2/trackdb/FormatMp3.cc	2005-09-24 14:28:43.000000000 -0400
+++ cdrdao-1.2.2.oden/trackdb/FormatMp3.cc	2008-05-23 05:46:46.000000000 -0400
@@ -28,6 +28,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
+#include <cstring>
 
 #include "util.h"
 #include "FormatMp3.h"
diff -Naur cdrdao-1.2.2/trackdb/FormatOgg.cc cdrdao-1.2.2.oden/trackdb/FormatOgg.cc
--- cdrdao-1.2.2/trackdb/FormatOgg.cc	2005-04-21 22:01:46.000000000 -0400
+++ cdrdao-1.2.2.oden/trackdb/FormatOgg.cc	2008-05-23 05:46:46.000000000 -0400
@@ -18,6 +18,7 @@
  */
 
 #include <stdio.h>
+#include <cstring>
 
 #include "util.h"
 #include "FormatOgg.h"
diff -Naur cdrdao-1.2.2/trackdb/TempFileManager.cc cdrdao-1.2.2.oden/trackdb/TempFileManager.cc
--- cdrdao-1.2.2/trackdb/TempFileManager.cc	2005-04-21 22:01:46.000000000 -0400
+++ cdrdao-1.2.2.oden/trackdb/TempFileManager.cc	2008-05-23 05:46:46.000000000 -0400
@@ -24,6 +24,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <string.h>
 
 #define DEFAULT_TEMP_PATH "/tmp/"
 
diff -Naur cdrdao-1.2.2/xdao/AudioCDProject.cc cdrdao-1.2.2.oden/xdao/AudioCDProject.cc
--- cdrdao-1.2.2/xdao/AudioCDProject.cc	2006-09-18 06:42:26.000000000 -0400
+++ cdrdao-1.2.2.oden/xdao/AudioCDProject.cc	2008-05-23 05:46:54.000000000 -0400
@@ -20,6 +20,7 @@
 #include <assert.h>
 #include <gtkmm.h>
 #include <libgnome/gnome-i18n.h>
+#include <cstring>
 
 #include "Toc.h"
 #include "SoundIF.h"
diff -Naur cdrdao-1.2.2/xdao/TextEdit.cc cdrdao-1.2.2.oden/xdao/TextEdit.cc
--- cdrdao-1.2.2/xdao/TextEdit.cc	2004-02-11 20:13:32.000000000 -0500
+++ cdrdao-1.2.2.oden/xdao/TextEdit.cc	2008-05-23 05:50:17.000000000 -0400
@@ -21,6 +21,7 @@
 
 #include <stddef.h>
 #include <ctype.h>
+#include <cstring>
 
 TextEdit::TextEdit(const char *sample) : Gtk::Entry()
 {