diff -Naur libmusicbrainz-2.1.5.org/lib/comhttpsocket.cpp libmusicbrainz-2.1.5/lib/comhttpsocket.cpp
--- libmusicbrainz-2.1.5.org/lib/comhttpsocket.cpp	2008-01-07 11:36:10.105820000 +0100
+++ libmusicbrainz-2.1.5/lib/comhttpsocket.cpp	2008-01-07 11:38:45.794974000 +0100
@@ -20,6 +20,7 @@
 #endif
 #include <stdlib.h>
 #include <assert.h>
+#include <cstring>
 
 const char* g_strCOMVer = "libmusicbrainz/"VERSION;
 
diff -Naur libmusicbrainz-2.1.5.org/lib/comsocket.cpp libmusicbrainz-2.1.5/lib/comsocket.cpp
--- libmusicbrainz-2.1.5.org/lib/comsocket.cpp	2008-01-07 11:36:10.145783000 +0100
+++ libmusicbrainz-2.1.5/lib/comsocket.cpp	2008-01-07 11:44:12.604854000 +0100
@@ -34,6 +34,7 @@
 #include "comsocket.h"
 #ifndef WIN32
 
+#include <string.h>
 #include <netinet/tcp.h>
 #include <errno.h>
 #include <stdio.h>
diff -Naur libmusicbrainz-2.1.5.org/lib/c_wrapper.cpp libmusicbrainz-2.1.5/lib/c_wrapper.cpp
--- libmusicbrainz-2.1.5.org/lib/c_wrapper.cpp	2008-01-07 11:36:10.083846000 +0100
+++ libmusicbrainz-2.1.5/lib/c_wrapper.cpp	2008-01-07 11:41:45.093496000 +0100
@@ -21,6 +21,7 @@
      $Id: c_wrapper.cpp 665 2003-10-16 22:21:10Z robert $
 
 ----------------------------------------------------------------------------*/
+#include <cstring>
 #include "musicbrainz.h"
 #include "trm.h"
 #include "mb_c.h"
diff -Naur libmusicbrainz-2.1.5.org/lib/http.cpp libmusicbrainz-2.1.5/lib/http.cpp
--- libmusicbrainz-2.1.5.org/lib/http.cpp	2008-01-07 11:36:10.210725000 +0100
+++ libmusicbrainz-2.1.5/lib/http.cpp	2008-01-07 11:46:38.053245000 +0100
@@ -23,7 +23,8 @@
 
 ----------------------------------------------------------------------------*/
 #include <stdlib.h>
-#include <stdio.h> 
+#include <stdio.h>
+#include <string.h> 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <ctype.h>
diff -Naur libmusicbrainz-2.1.5.org/lib/sigclient.cpp libmusicbrainz-2.1.5/lib/sigclient.cpp
--- libmusicbrainz-2.1.5.org/lib/sigclient.cpp	2008-01-07 11:36:10.338589000 +0100
+++ libmusicbrainz-2.1.5/lib/sigclient.cpp	2008-01-07 11:48:42.883323000 +0100
@@ -33,6 +33,8 @@
 #pragma warning(disable:4786)
 #endif
 
+#include <string.h>
+
 #include "sigclient.h"
 #include "comhttpsocket.h"