8 files changed, 12 insertions, 1 deletions
diff --git a/apt-pkg/contrib/error.cc b/apt-pkg/contrib/error.cc
index 8c2d6cb19..db8c53c36 100644
--- a/apt-pkg/contrib/error.cc
+++ b/apt-pkg/contrib/error.cc
@@ -19,10 +19,12 @@
 #include <iostream>
 #include <errno.h>
 #include <stdio.h>
-#include <string>
 #include <stdarg.h>
 #include <unistd.h>
 
+#include <string>
+#include <cstring>
+
 #include "config.h"
    									/*}}}*/
 
diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index d19a92e62..9e13b4f60 100644
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -22,6 +22,8 @@
 #include <apti18n.h>
 
 #include <cstdlib>
+#include <cstring>
+
 #include <iostream>
 #include <unistd.h>
 #include <fcntl.h>
diff --git a/apt-pkg/contrib/md5.cc b/apt-pkg/contrib/md5.cc
index 44242371a..a095f8f0f 100644
--- a/apt-pkg/contrib/md5.cc
+++ b/apt-pkg/contrib/md5.cc
@@ -44,6 +44,7 @@
 #include <inttypes.h>
 #include <config.h>
 #include <system.h>
+
 									/*}}}*/
 
 // byteSwap - Swap bytes in a buffer					/*{{{*/
diff --git a/apt-pkg/contrib/md5.h b/apt-pkg/contrib/md5.h
index 247b3fab9..96c8975b4 100644
--- a/apt-pkg/contrib/md5.h
+++ b/apt-pkg/contrib/md5.h
@@ -25,6 +25,7 @@
 
 
 #include <string>
+#include <cstring>
 #include <algorithm>
 #include <stdint.h>
 
diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc
index 88e71e8e3..7f814c2d2 100644
--- a/apt-pkg/contrib/mmap.cc
+++ b/apt-pkg/contrib/mmap.cc
@@ -31,6 +31,8 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>
+
+#include <cstring>
    									/*}}}*/
 
 // MMap::MMap - Constructor						/*{{{*/
diff --git a/apt-pkg/contrib/progress.cc b/apt-pkg/contrib/progress.cc
index 6ce6e950a..cffdddc4f 100644
--- a/apt-pkg/contrib/progress.cc
+++ b/apt-pkg/contrib/progress.cc
@@ -16,6 +16,7 @@
 
 #include <iostream>
 #include <stdio.h>
+#include <cstring>
 									/*}}}*/
 
 using namespace std;
diff --git a/apt-pkg/contrib/sha1.h b/apt-pkg/contrib/sha1.h
index 010ef802e..8ddd889f1 100644
--- a/apt-pkg/contrib/sha1.h
+++ b/apt-pkg/contrib/sha1.h
@@ -15,6 +15,7 @@
 #define APTPKG_SHA1_H
 
 #include <string>
+#include <cstring>
 #include <algorithm>
 
 using std::string;
diff --git a/apt-pkg/contrib/sha256.h b/apt-pkg/contrib/sha256.h
index c490bfa4d..1951f053b 100644
--- a/apt-pkg/contrib/sha256.h
+++ b/apt-pkg/contrib/sha256.h
@@ -15,6 +15,7 @@
 #define APTPKG_SHA256_H
 
 #include <string>
+#include <cstring>
 #include <algorithm>
 
 using std::string;