diff -Nur libmusicbrainz-2.1.5.orig/lib/c_wrapper.cpp libmusicbrainz-2.1.5/lib/c_wrapper.cpp
--- libmusicbrainz-2.1.5.orig/lib/c_wrapper.cpp	2006-11-14 10:34:49.000000000 -0600
+++ libmusicbrainz-2.1.5/lib/c_wrapper.cpp	2009-07-03 00:21:19.990048479 -0500
@@ -21,6 +21,7 @@
      $Id: c_wrapper.cpp 665 2003-10-16 22:21:10Z robert $
 
 ----------------------------------------------------------------------------*/
+#include <string.h>
 #include "musicbrainz.h"
 #include "trm.h"
 #include "mb_c.h"
diff -Nur libmusicbrainz-2.1.5.orig/lib/comhttpsocket.cpp libmusicbrainz-2.1.5/lib/comhttpsocket.cpp
--- libmusicbrainz-2.1.5.orig/lib/comhttpsocket.cpp	2006-11-14 10:34:49.000000000 -0600
+++ libmusicbrainz-2.1.5/lib/comhttpsocket.cpp	2009-07-03 00:22:48.829320455 -0500
@@ -19,6 +19,7 @@
 #include "comsocket.h"
 #endif
 #include <stdlib.h>
+#include <string.h>
 #include <assert.h>
 
 const char* g_strCOMVer = "libmusicbrainz/"VERSION;
diff -Nur libmusicbrainz-2.1.5.orig/lib/comsocket.cpp libmusicbrainz-2.1.5/lib/comsocket.cpp
--- libmusicbrainz-2.1.5.orig/lib/comsocket.cpp	2006-11-14 10:34:49.000000000 -0600
+++ libmusicbrainz-2.1.5/lib/comsocket.cpp	2009-07-03 00:23:24.353011308 -0500
@@ -37,6 +37,7 @@
 #include <netinet/tcp.h>
 #include <errno.h>
 #include <stdio.h>
+#include <string.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <unistd.h>
diff -Nur libmusicbrainz-2.1.5.orig/lib/http.cpp libmusicbrainz-2.1.5/lib/http.cpp
--- libmusicbrainz-2.1.5.orig/lib/http.cpp	2007-05-11 01:21:21.000000000 -0500
+++ libmusicbrainz-2.1.5/lib/http.cpp	2009-07-03 00:24:08.036649042 -0500
@@ -24,6 +24,7 @@
 ----------------------------------------------------------------------------*/
 #include <stdlib.h>
 #include <stdio.h> 
+#include <string.h> 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <ctype.h>
diff -Nur libmusicbrainz-2.1.5.orig/lib/sigclient.cpp libmusicbrainz-2.1.5/lib/sigclient.cpp
--- libmusicbrainz-2.1.5.orig/lib/sigclient.cpp	2006-11-14 10:34:49.000000000 -0600
+++ libmusicbrainz-2.1.5/lib/sigclient.cpp	2009-07-03 00:25:16.980119224 -0500
@@ -33,6 +33,8 @@
 #pragma warning(disable:4786)
 #endif
 
+#include <string.h>
+
 #include "sigclient.h"
 #include "comhttpsocket.h"