--- libmusicbrainz-2.1.4/lib/comhttpsocket.cpp.orig	2008-02-02 04:32:57.000000000 -0800
+++ libmusicbrainz-2.1.4/lib/comhttpsocket.cpp	2008-02-02 04:39:15.000000000 -0800
@@ -20,6 +20,7 @@
 #endif
 #include <stdlib.h>
 #include <assert.h>
+#include <cstring>
 
 const char* g_strCOMVer = "libmusicbrainz/"VERSION;
 
--- libmusicbrainz-2.1.4/lib/c_wrapper.cpp.orig	2008-02-02 04:43:31.000000000 -0800
+++ libmusicbrainz-2.1.4/lib/c_wrapper.cpp	2008-02-02 04:43:50.000000000 -0800
@@ -24,6 +24,7 @@
 #include "musicbrainz.h"
 #include "trm.h"
 #include "mb_c.h"
+#include <cstring>
 
 extern "C"
 {
--- libmusicbrainz-2.1.4/lib/comsocket.cpp.orig	2008-02-02 04:46:08.000000000 -0800
+++ libmusicbrainz-2.1.4/lib/comsocket.cpp	2008-02-02 04:47:15.000000000 -0800
@@ -43,6 +43,7 @@
 #include <fcntl.h>
 #include <net/if.h>
 #include <sys/ioctl.h>
+#include <cstring>
 #endif
 
 #define mb_socklen_t ACCEPT_ARG3

--- libmusicbrainz-2.1.4/lib/http.cpp.orig	2008-02-02 04:56:55.000000000 -0800
+++ libmusicbrainz-2.1.4/lib/http.cpp	2008-02-02 04:57:26.000000000 -0800
@@ -26,6 +26,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <ctype.h>
+#include <cstring>
+#include <cstdlib>
 #ifndef WIN32
 #include <sys/time.h>
 #endif
--- libmusicbrainz-2.1.4/lib/sigclient.cpp.orig	2008-02-02 04:58:39.000000000 -0800
+++ libmusicbrainz-2.1.4/lib/sigclient.cpp	2008-02-02 04:59:06.000000000 -0800
@@ -38,6 +38,8 @@
 
 #include "sigxdr.h"
 
+#include <cstring>
+
 char tooShortTRM[] = { 0xf9, 0x80, 0x9a, 0xb1, 0x2b, 0x0f, 0x4d, 0x78, 
                        0x88, 0x62, 0xfb, 0x42, 0x5a, 0xde, 0x8a, 0xb9 };
 char sigserverBusyTRM[] = { 0xc4, 0x57, 0xa4, 0xa8, 0xb3, 0x42, 0x4e, 0xc9,