--- include/tunepimp-0.5/metadata.h.gcc43	2006-11-18 11:52:08.000000000 +0100
+++ include/tunepimp-0.5/metadata.h	2008-12-27 06:08:15.000000000 +0100
@@ -27,6 +27,7 @@
 #ifndef __METADATA_H__
 #define __METADATA_H__
 
+#include <string.h>
 #include <string>
 #include <cstdio>
 
--- lib/c_wrapper.cpp.gcc43	2006-11-18 11:52:33.000000000 +0100
+++ lib/c_wrapper.cpp	2008-12-27 06:08:15.000000000 +0100
@@ -24,6 +24,7 @@
    $Id: c_wrapper.cpp 8360 2006-08-07 21:05:12Z luks $
 
 ----------------------------------------------------------------------------*/
+#include <stdlib.h>
 #include "tunepimp.h"
 #include "mutex.h"
 #include "tp_c.h"
--- lib/fileio.cpp.gcc43	2006-11-18 11:52:33.000000000 +0100
+++ lib/fileio.cpp	2008-12-27 06:08:15.000000000 +0100
@@ -27,6 +27,8 @@
 
 #include <assert.h>
 #include <errno.h>
+#include <stdlib.h>
+#include <string.h>
 #include <string>
 #ifndef WIN32
 #include <unistd.h>
--- lib/metadata.cpp.gcc43	2006-11-18 11:52:33.000000000 +0100
+++ lib/metadata.cpp	2008-12-27 06:08:15.000000000 +0100
@@ -26,6 +26,7 @@
 ----------------------------------------------------------------------------*/
 #include <math.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include "metadata.h"
 #include "../config.h"
 using namespace std;
--- lib/protocol.cpp.gcc43	2006-11-28 21:25:04.000000000 +0100
+++ lib/protocol.cpp	2008-12-27 06:08:15.000000000 +0100
@@ -8,6 +8,7 @@
 -------------------------------------------------------------------*/
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <string>
 #include <map>
 #include <expat.h>
--- lib/readmeta.cpp.gcc43	2006-11-18 11:52:33.000000000 +0100
+++ lib/readmeta.cpp	2008-12-27 06:08:15.000000000 +0100
@@ -31,6 +31,7 @@
 #endif
 
 #include <stdio.h>
+#include <stdlib.h>
 #ifndef WIN32
 #include <unistd.h>
 #endif
--- lib/tunepimp.cpp.gcc43	2006-11-18 11:52:33.000000000 +0100
+++ lib/tunepimp.cpp	2008-12-27 06:08:15.000000000 +0100
@@ -30,7 +30,9 @@
 #endif
 #endif
 
+#include <string.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <map>
 using namespace std;
 
--- lib/utf8/utf8util.cpp.gcc43	2006-11-18 11:52:26.000000000 +0100
+++ lib/utf8/utf8util.cpp	2008-12-27 06:08:15.000000000 +0100
@@ -26,6 +26,7 @@
 ----------------------------------------------------------------------------*/
 
 #include <stdio.h>
+#include <stdlib.h>
 #include "utf8util.h"
 #include "utf8.h"
 #ifdef WIN32
--- plugins/mp3/id3_2_3_meta.cpp.gcc43	2006-11-18 11:51:07.000000000 +0100
+++ plugins/mp3/id3_2_3_meta.cpp	2008-12-27 06:08:15.000000000 +0100
@@ -26,6 +26,7 @@
 ----------------------------------------------------------------------------*/
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <assert.h>
 #include <ctype.h>
 #include <musicbrainz/mb_c.h>
--- plugins/mp3/id3_meta.cpp.gcc43	2006-11-18 11:51:07.000000000 +0100
+++ plugins/mp3/id3_meta.cpp	2008-12-27 06:08:15.000000000 +0100
@@ -26,6 +26,7 @@
 ----------------------------------------------------------------------------*/
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <time.h>
 #include <ctype.h>
 #include <musicbrainz/mb_c.h>
--- plugins/mp4/mp4.cpp.gcc43	2006-11-18 11:51:08.000000000 +0100
+++ plugins/mp4/mp4.cpp	2008-12-27 06:08:15.000000000 +0100
@@ -27,6 +27,7 @@
 
 #include <string.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <mp4.h>
 #include "metadata.h"
 #include "plugin.h"
--- plugins/wma/wma.cpp.gcc43	2006-11-18 11:51:28.000000000 +0100
+++ plugins/wma/wma.cpp	2008-12-27 06:08:15.000000000 +0100
@@ -27,6 +27,7 @@
 
 #include <string.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <wmafile.h>
 #include "metadata.h"
 #include "plugin.h"
--- plugins/wma/wmafile.cpp.gcc43	2006-11-18 11:51:28.000000000 +0100
+++ plugins/wma/wmafile.cpp	2008-12-27 06:08:15.000000000 +0100
@@ -19,6 +19,7 @@
  *   USA                                                                   *
  ***************************************************************************/
 
+#include <string.h>
 #include <tstring.h>
 #include <wmafile.h>
 #include <wmatag.h>