--- libtunepimp-0.5.3/include/tunepimp-0.5/metadata.h.gcc43	2006-11-18 10:52:08 +0000
+++ libtunepimp-0.5.3/include/tunepimp-0.5/metadata.h	2008-10-27 09:53:30 +0000
@@ -27,6 +27,7 @@
 #ifndef __METADATA_H__
 #define __METADATA_H__
 
+#include <string.h>
 #include <string>
 #include <cstdio>
 
--- libtunepimp-0.5.3/lib/c_wrapper.cpp.gcc43	2006-11-18 10:52:33 +0000
+++ libtunepimp-0.5.3/lib/c_wrapper.cpp	2008-10-27 09:58:06 +0000
@@ -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"
--- libtunepimp-0.5.3/lib/fileio.cpp.gcc43	2006-11-18 10:52:33 +0000
+++ libtunepimp-0.5.3/lib/fileio.cpp	2008-10-27 10:00:19 +0000
@@ -31,6 +31,8 @@
 #ifndef WIN32
 #include <unistd.h>
 #endif
+#include <stdlib.h>
+#include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 using namespace std;
--- libtunepimp-0.5.3/lib/metadata.cpp.gcc43	2006-11-18 10:52:33 +0000
+++ libtunepimp-0.5.3/lib/metadata.cpp	2008-10-27 09:56:43 +0000
@@ -24,6 +24,7 @@
    $Id: metadata.cpp 8359 2006-08-07 20:34:50Z luks $
 
 ----------------------------------------------------------------------------*/
+#include <stdlib.h>
 #include <math.h>
 #include <stdio.h>
 #include "metadata.h"
--- libtunepimp-0.5.3/lib/protocol.cpp.gcc43	2006-11-28 20:25:04 +0000
+++ libtunepimp-0.5.3/lib/protocol.cpp	2008-10-27 10:00:59 +0000
@@ -8,6 +8,7 @@
 -------------------------------------------------------------------*/
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <string>
 #include <map>
 #include <expat.h>
--- libtunepimp-0.5.3/lib/readmeta.cpp.gcc43	2006-11-18 10:52:33 +0000
+++ libtunepimp-0.5.3/lib/readmeta.cpp	2008-10-27 09:59:11 +0000
@@ -31,6 +31,7 @@
 #endif
 
 #include <stdio.h>
+#include <stdlib.h>
 #ifndef WIN32
 #include <unistd.h>
 #endif
--- libtunepimp-0.5.3/lib/tunepimp.cpp.gcc43	2006-11-18 10:52:33 +0000
+++ libtunepimp-0.5.3/lib/tunepimp.cpp	2008-10-27 09:50:07 +0000
@@ -31,6 +31,8 @@
 #endif
 
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <map>
 using namespace std;
 
@@ -46,9 +48,13 @@ using namespace std;
 #define DB         printf("%s:%d\n", __FILE__, __LINE__);
 #ifndef WIN32
 #ifndef PLUGIN_DIR
+#ifdef __x86_64__
+#define PLUGIN_DIR PREFIX"/lib64/tunepimp/plugins"
+#else
 #define PLUGIN_DIR PREFIX"/lib/tunepimp/plugins"
 #endif
 #endif
+#endif
 
 TunePimp::TunePimp(const string &appName, const string &appVersion, int startThreads, const char *pluginDir)
 {
--- libtunepimp-0.5.3/lib/utf8/utf8util.cpp.gcc43	2006-11-18 10:52:26 +0000
+++ libtunepimp-0.5.3/lib/utf8/utf8util.cpp	2008-10-27 09:45:39 +0000
@@ -26,6 +26,7 @@
 ----------------------------------------------------------------------------*/
 
 #include <stdio.h>
+#include <stdlib.h>
 #include "utf8util.h"
 #include "utf8.h"
 #ifdef WIN32
--- libtunepimp-0.5.3/plugins/mp3/id3_2_3_meta.cpp.gcc43	2006-11-18 10:51:07 +0000
+++ libtunepimp-0.5.3/plugins/mp3/id3_2_3_meta.cpp	2008-10-27 10:04:28 +0000
@@ -24,7 +24,7 @@
    $Id: id3_2_3_meta.cpp 7216 2006-04-14 23:10:49Z robert $
 
 ----------------------------------------------------------------------------*/
-
+#include <stdlib.h>
 #include <stdio.h>
 #include <assert.h>
 #include <ctype.h>
--- libtunepimp-0.5.3/plugins/mp3/id3_meta.cpp.gcc43	2006-11-18 10:51:07 +0000
+++ libtunepimp-0.5.3/plugins/mp3/id3_meta.cpp	2008-10-27 10:03:59 +0000
@@ -24,7 +24,7 @@
    $Id: id3_meta.cpp 8498 2006-09-29 21:31:25Z luks $
 
 ----------------------------------------------------------------------------*/
-
+#include <stdlib.h>
 #include <stdio.h>
 #include <time.h>
 #include <ctype.h>
--- libtunepimp-0.5.3/plugins/wma/wma.cpp.gcc43	2006-11-18 10:51:28 +0000
+++ libtunepimp-0.5.3/plugins/wma/wma.cpp	2008-10-27 10:01:49 +0000
@@ -24,7 +24,7 @@
    $Id: wma.cpp 8497 2006-09-29 21:26:44Z luks $
 
 ----------------------------------------------------------------------------*/
-
+#include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <wmafile.h>
--- libtunepimp-0.5.3/plugins/wma/wmafile.cpp.gcc43	2006-11-18 10:51:28 +0000
+++ libtunepimp-0.5.3/plugins/wma/wmafile.cpp	2008-10-27 10:02:26 +0000
@@ -18,7 +18,7 @@
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  *
  *   USA                                                                   *
  ***************************************************************************/
-
+#include <string.h>
 #include <tstring.h>
 #include <wmafile.h>
 #include <wmatag.h>