diff -ruNp libtunepimp-0.5.3-orig/lib/c_wrapper.cpp libtunepimp-0.5.3/lib/c_wrapper.cpp
--- libtunepimp-0.5.3-orig/lib/c_wrapper.cpp	2006-11-18 04:52:33.000000000 -0600
+++ libtunepimp-0.5.3/lib/c_wrapper.cpp	2014-06-09 20:42:42.000000000 -0500
@@ -28,6 +28,8 @@
 #include "mutex.h"
 #include "tp_c.h"
 #include "astrcmp.h"
+#include <stdlib.h>
+#include <sys/malloc.h>
 
 #define DB printf("%s:%d\n", __FILE__, __LINE__);
 
diff -ruNp libtunepimp-0.5.3-orig/lib/metadata.cpp libtunepimp-0.5.3/lib/metadata.cpp
--- libtunepimp-0.5.3-orig/lib/metadata.cpp	2006-11-18 04:52:33.000000000 -0600
+++ libtunepimp-0.5.3/lib/metadata.cpp	2014-06-09 20:14:40.000000000 -0500
@@ -26,6 +26,7 @@
 ----------------------------------------------------------------------------*/
 #include <math.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include "metadata.h"
 #include "../config.h"
 using namespace std;
diff -ruNp libtunepimp-0.5.3-orig/lib/protocol.cpp libtunepimp-0.5.3/lib/protocol.cpp
--- libtunepimp-0.5.3-orig/lib/protocol.cpp	2006-11-28 14:25:04.000000000 -0600
+++ libtunepimp-0.5.3/lib/protocol.cpp	2014-06-09 20:16:00.000000000 -0500
@@ -12,8 +12,6 @@
 #include <map>
 #include <expat.h>
 #include <curl/curl.h>
-#include <curl/types.h>
-#include <curl/easy.h>
 using namespace std;
 
 #include "protocol.h"
diff -ruNp libtunepimp-0.5.3-orig/lib/readmeta.cpp libtunepimp-0.5.3/lib/readmeta.cpp
--- libtunepimp-0.5.3-orig/lib/readmeta.cpp	2006-11-18 04:52:33.000000000 -0600
+++ libtunepimp-0.5.3/lib/readmeta.cpp	2014-06-09 20:45:52.000000000 -0500
@@ -31,6 +31,7 @@
 #endif
 
 #include <stdio.h>
+#include <stdlib.h>
 #ifndef WIN32
 #include <unistd.h>
 #endif
diff -ruNp libtunepimp-0.5.3-orig/lib/tunepimp.cpp libtunepimp-0.5.3/lib/tunepimp.cpp
--- libtunepimp-0.5.3-orig/lib/tunepimp.cpp	2006-11-18 04:52:33.000000000 -0600
+++ libtunepimp-0.5.3/lib/tunepimp.cpp	2014-06-09 19:34:42.000000000 -0500
@@ -32,6 +32,7 @@
 
 #include <stdio.h>
 #include <map>
+#include <stdlib.h>
 using namespace std;
 
 #ifdef WIN32
diff -ruNp libtunepimp-0.5.3-orig/lib/utf8/utf8util.cpp libtunepimp-0.5.3/lib/utf8/utf8util.cpp
--- libtunepimp-0.5.3-orig/lib/utf8/utf8util.cpp	2006-11-18 04:52:26.000000000 -0600
+++ libtunepimp-0.5.3/lib/utf8/utf8util.cpp	2014-06-09 19:13:16.000000000 -0500
@@ -31,6 +31,7 @@
 #ifdef WIN32
 #include "../../config_win32.h"
 #endif
+#include <stdlib.h>
 
 string utf8Encode(const string &from)
 {
diff -ruNp libtunepimp-0.5.3-orig/lib/write.cpp libtunepimp-0.5.3/lib/write.cpp
--- libtunepimp-0.5.3-orig/lib/write.cpp	2006-11-18 04:52:33.000000000 -0600
+++ libtunepimp-0.5.3/lib/write.cpp	2014-06-09 20:37:45.000000000 -0500
@@ -47,6 +47,7 @@
 #endif
 
 
+#include <stdlib.h>
 #include <ctype.h>
 #include <errno.h>
 #include <algorithm>
diff -ruNp libtunepimp-0.5.3-orig/plugins/mp3/id3_meta.cpp libtunepimp-0.5.3/plugins/mp3/id3_meta.cpp
--- libtunepimp-0.5.3-orig/plugins/mp3/id3_meta.cpp	2006-11-18 04:51:07.000000000 -0600
+++ libtunepimp-0.5.3/plugins/mp3/id3_meta.cpp	2014-06-09 21:11:25.000000000 -0500
@@ -26,6 +26,7 @@
 ----------------------------------------------------------------------------*/
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <time.h>
 #include <ctype.h>
 #include <musicbrainz/mb_c.h>
diff -ruN libtunepimp-0.5.3.orig/lib/fileio.cpp libtunepimp-0.5.3/lib/fileio.cpp
--- libtunepimp-0.5.3.orig/lib/fileio.cpp	2009-05-28 11:49:43.000000000 -0700
+++ libtunepimp-0.5.3/lib/fileio.cpp	2009-05-28 11:59:05.000000000 -0700
@@ -124,7 +124,8 @@
 
 void tmktempname(const char *path, char *newPath, int newPathLen)
 {
-    char *ptr, *temp;
+    const char *ptr;
+    char *temp;
 
     temp = (char *)malloc(strlen(path) + 32);
     ptr = strrchr(path, dirSepChar);