Index: apt-rpm-0.5.15lorg3.2/apt-pkg/contrib/cdromutl.cc
===================================================================
--- apt-rpm-0.5.15lorg3.2.orig/apt-pkg/contrib/cdromutl.cc	2008-03-17 17:47:33.000000000 +0100
+++ apt-rpm-0.5.15lorg3.2/apt-pkg/contrib/cdromutl.cc	2008-03-17 17:47:36.000000000 +0100
@@ -34,6 +34,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <stdio.h>
+#include <stdlib.h>
 									/*}}}*/
 
 // IsMounted - Returns true if the mount point is mounted		/*{{{*/
Index: apt-rpm-0.5.15lorg3.2/apt-pkg/contrib/fileutl.cc
===================================================================
--- apt-rpm-0.5.15lorg3.2.orig/apt-pkg/contrib/fileutl.cc	2008-03-17 17:47:33.000000000 +0100
+++ apt-rpm-0.5.15lorg3.2/apt-pkg/contrib/fileutl.cc	2008-03-17 17:47:36.000000000 +0100
@@ -21,6 +21,7 @@
 #include <apt-pkg/error.h>
 #include <apt-pkg/sptr.h>
 
+#include <cstdlib>
 #include <iostream>
 #include <unistd.h>
 #include <fcntl.h>
@@ -30,6 +31,7 @@
 #include <sys/wait.h>
 #include <signal.h>
 #include <errno.h>
+#include <string.h>
 
 // CNC:2003-02-14 - Ralf Corsepius told RH8 with GCC 3.2.1 fails
 //                  compiling without moving this header to here.
Index: apt-rpm-0.5.15lorg3.2/apt-pkg/init.cc
===================================================================
--- apt-rpm-0.5.15lorg3.2.orig/apt-pkg/init.cc	2008-03-17 17:47:33.000000000 +0100
+++ apt-rpm-0.5.15lorg3.2/apt-pkg/init.cc	2008-03-17 17:47:36.000000000 +0100
@@ -12,9 +12,11 @@
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/error.h>
 
+#include <cstdlib>
 #include <apti18n.h>
 #include <config.h>
 #include <sys/stat.h>
+#include <string.h>
 
 // CNC:2003-03-17
 #include <apt-pkg/luaiface.h>
Index: apt-rpm-0.5.15lorg3.2/apt-pkg/contrib/md5.h
===================================================================
--- apt-rpm-0.5.15lorg3.2.orig/apt-pkg/contrib/md5.h	2008-03-17 17:47:33.000000000 +0100
+++ apt-rpm-0.5.15lorg3.2/apt-pkg/contrib/md5.h	2008-03-17 17:47:36.000000000 +0100
@@ -28,6 +28,7 @@
 #endif 
 
 #include <string>
+#include <string.h>
 
 using std::string;
 
Index: apt-rpm-0.5.15lorg3.2/apt-pkg/contrib/strutl.h
===================================================================
--- apt-rpm-0.5.15lorg3.2.orig/apt-pkg/contrib/strutl.h	2008-03-17 17:47:33.000000000 +0100
+++ apt-rpm-0.5.15lorg3.2/apt-pkg/contrib/strutl.h	2008-03-17 17:47:36.000000000 +0100
@@ -22,6 +22,7 @@
 
 #include <stdlib.h>
 #include <string>
+#include <string.h>
 #include <vector>
 #include <iostream>
 #include <time.h>
Index: apt-rpm-0.5.15lorg3.2/apt-pkg/contrib/error.cc
===================================================================
--- apt-rpm-0.5.15lorg3.2.orig/apt-pkg/contrib/error.cc	2008-03-17 17:47:33.000000000 +0100
+++ apt-rpm-0.5.15lorg3.2/apt-pkg/contrib/error.cc	2008-03-17 17:47:36.000000000 +0100
@@ -26,6 +26,7 @@
 #include <string>
 #include <stdarg.h>
 #include <unistd.h>
+#include <string.h>
 
 #include "config.h"
    									/*}}}*/
Index: apt-rpm-0.5.15lorg3.2/apt-pkg/contrib/mmap.cc
===================================================================
--- apt-rpm-0.5.15lorg3.2.orig/apt-pkg/contrib/mmap.cc	2008-03-17 17:47:33.000000000 +0100
+++ apt-rpm-0.5.15lorg3.2/apt-pkg/contrib/mmap.cc	2008-03-17 17:47:36.000000000 +0100
@@ -35,6 +35,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <string.h>
    									/*}}}*/
 
 // MMap::MMap - Constructor						/*{{{*/
Index: apt-rpm-0.5.15lorg3.2/apt-pkg/contrib/progress.cc
===================================================================
--- apt-rpm-0.5.15lorg3.2.orig/apt-pkg/contrib/progress.cc	2008-03-17 17:47:33.000000000 +0100
+++ apt-rpm-0.5.15lorg3.2/apt-pkg/contrib/progress.cc	2008-03-17 17:47:36.000000000 +0100
@@ -19,6 +19,7 @@
 
 #include <iostream>
 #include <stdio.h>
+#include <string.h>
 									/*}}}*/
 
 using namespace std;
Index: apt-rpm-0.5.15lorg3.2/apt-pkg/contrib/sha1.h
===================================================================
--- apt-rpm-0.5.15lorg3.2.orig/apt-pkg/contrib/sha1.h	2008-03-17 17:47:33.000000000 +0100
+++ apt-rpm-0.5.15lorg3.2/apt-pkg/contrib/sha1.h	2008-03-17 17:47:36.000000000 +0100
@@ -19,6 +19,7 @@
 #endif 
 
 #include <string>
+#include <string.h>
 
 using std::string;
 
Index: apt-rpm-0.5.15lorg3.2/apt-pkg/rpm/repomd.cc
===================================================================
--- apt-rpm-0.5.15lorg3.2.orig/apt-pkg/rpm/repomd.cc	2008-03-17 17:47:33.000000000 +0100
+++ apt-rpm-0.5.15lorg3.2/apt-pkg/rpm/repomd.cc	2008-03-17 17:47:36.000000000 +0100
@@ -19,6 +19,7 @@
 #include <apt-pkg/error.h>
 #include <libxml/parser.h>
 #include <libxml/tree.h>
+#include <string.h>
 
 #include <apti18n.h>
 
Index: apt-rpm-0.5.15lorg3.2/apt-pkg/rpm/rpmmisc.h
===================================================================
--- apt-rpm-0.5.15lorg3.2.orig/apt-pkg/rpm/rpmmisc.h	2008-03-17 17:47:33.000000000 +0100
+++ apt-rpm-0.5.15lorg3.2/apt-pkg/rpm/rpmmisc.h	2008-03-17 17:47:36.000000000 +0100
@@ -5,6 +5,8 @@
 
 #include <ext/hash_map>
 
+#include <string.h>
+
 using namespace __gnu_cxx;
 
 struct hash_string
Index: apt-rpm-0.5.15lorg3.2/apt-pkg/rpm/rpmpackagedata.h
===================================================================
--- apt-rpm-0.5.15lorg3.2.orig/apt-pkg/rpm/rpmpackagedata.h	2008-03-17 17:47:33.000000000 +0100
+++ apt-rpm-0.5.15lorg3.2/apt-pkg/rpm/rpmpackagedata.h	2008-03-17 17:47:36.000000000 +0100
@@ -8,6 +8,7 @@
 #include <map>
 #include <vector>
 #include <regex.h>
+#include <string.h>
 
 using namespace std;
 
Index: apt-rpm-0.5.15lorg3.2/apt-pkg/pkgcachegen.h
===================================================================
--- apt-rpm-0.5.15lorg3.2.orig/apt-pkg/pkgcachegen.h	2008-03-17 17:47:33.000000000 +0100
+++ apt-rpm-0.5.15lorg3.2/apt-pkg/pkgcachegen.h	2008-03-17 17:47:36.000000000 +0100
@@ -59,7 +59,7 @@
    public:
 
    // CNC:2003-02-27 - We need this in rpmListParser.
-   bool NewPackage(pkgCache::PkgIterator &Pkg,string Pkg);
+   bool NewPackage(pkgCache::PkgIterator &Pkg,string Name);
 
    unsigned long WriteUniqString(const char *S,unsigned int Size);
    inline unsigned long WriteUniqString(string S) {return WriteUniqString(S.c_str(),S.length());};
Index: apt-rpm-0.5.15lorg3.2/apt-pkg/rpm/rpmpm.cc
===================================================================
--- apt-rpm-0.5.15lorg3.2.orig/apt-pkg/rpm/rpmpm.cc	2008-03-17 17:47:33.000000000 +0100
+++ apt-rpm-0.5.15lorg3.2/apt-pkg/rpm/rpmpm.cc	2008-03-17 17:47:36.000000000 +0100
@@ -33,6 +33,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <iostream>
+#include <string.h>
 
 #if RPM_VERSION >= 0x040100
 #include <rpm/rpmdb.h>
Index: apt-rpm-0.5.15lorg3.2/apt-pkg/rpm/rpmrecords.cc
===================================================================
--- apt-rpm-0.5.15lorg3.2.orig/apt-pkg/rpm/rpmrecords.cc	2008-03-17 17:47:33.000000000 +0100
+++ apt-rpm-0.5.15lorg3.2/apt-pkg/rpm/rpmrecords.cc	2008-03-17 17:47:36.000000000 +0100
@@ -17,6 +17,7 @@
 #ifdef HAVE_RPM
 
 #include <assert.h>
+#include <string.h>
 
 #include <apt-pkg/rpmrecords.h>
 #include <apt-pkg/error.h>
Index: apt-rpm-0.5.15lorg3.2/apt-pkg/indexfile.cc
===================================================================
--- apt-rpm-0.5.15lorg3.2.orig/apt-pkg/indexfile.cc	2008-03-17 17:47:33.000000000 +0100
+++ apt-rpm-0.5.15lorg3.2/apt-pkg/indexfile.cc	2008-03-17 17:47:36.000000000 +0100
@@ -14,6 +14,8 @@
 
 #include <apt-pkg/indexfile.h>
 #include <apt-pkg/error.h>
+
+#include <string.h>
 									/*}}}*/
 
 // Global list of Item supported
Index: apt-rpm-0.5.15lorg3.2/apt-pkg/pkgsystem.cc
===================================================================
--- apt-rpm-0.5.15lorg3.2.orig/apt-pkg/pkgsystem.cc	2008-03-17 17:48:57.000000000 +0100
+++ apt-rpm-0.5.15lorg3.2/apt-pkg/pkgsystem.cc	2008-03-17 17:49:06.000000000 +0100
@@ -16,6 +16,8 @@
 
 #include <apt-pkg/pkgsystem.h>
 #include <apt-pkg/policy.h>
+
+#include <string.h>
 									/*}}}*/
 
 pkgSystem *_system = 0;