diff -Naur apt-0.5.15lorg2.orig/apt-pkg/contrib/cdromutl.cc apt-0.5.15lorg2/apt-pkg/contrib/cdromutl.cc

--- apt-0.5.15lorg2.orig/apt-pkg/contrib/cdromutl.cc	2008-12-12 16:11:53 +0300

+++ apt-0.5.15lorg2/apt-pkg/contrib/cdromutl.cc	2008-12-12 16:21:25 +0300

@@ -35,6 +35,7 @@

 #include <unistd.h>

 #include <stdio.h>

 #include <mntent.h>

+#include <cstdlib>

 									/*}}}*/

 // IsMounted - Returns true if the mount point is mounted		/*{{{*/

diff -Naur apt-0.5.15lorg2.orig/apt-pkg/contrib/error.cc apt-0.5.15lorg2/apt-pkg/contrib/error.cc

--- apt-0.5.15lorg2.orig/apt-pkg/contrib/error.cc	2008-09-01 22:42:04 +0400

+++ apt-0.5.15lorg2/apt-pkg/contrib/error.cc	2008-12-12 16:21:25 +0300

@@ -26,6 +26,7 @@

 #include <string>

 #include <stdarg.h>

 #include <unistd.h>

+#include <cstring>

 #include "config.h"

    									/*}}}*/

diff -Naur apt-0.5.15lorg2.orig/apt-pkg/contrib/fileutl.cc apt-0.5.15lorg2/apt-pkg/contrib/fileutl.cc

--- apt-0.5.15lorg2.orig/apt-pkg/contrib/fileutl.cc	2008-09-01 22:42:04 +0400

+++ apt-0.5.15lorg2/apt-pkg/contrib/fileutl.cc	2008-12-12 16:21:25 +0300

@@ -30,6 +30,8 @@

 #include <sys/wait.h>

 #include <signal.h>

 #include <errno.h>

+#include <cstdlib>

+#include <cstring>

 // CNC:2003-02-14 - Ralf Corsepius told RH8 with GCC 3.2.1 fails

 //                  compiling without moving this header to here.

diff -Naur apt-0.5.15lorg2.orig/apt-pkg/contrib/md5.h apt-0.5.15lorg2/apt-pkg/contrib/md5.h

--- apt-0.5.15lorg2.orig/apt-pkg/contrib/md5.h	2008-09-01 22:42:04 +0400

+++ apt-0.5.15lorg2/apt-pkg/contrib/md5.h	2008-12-12 16:21:25 +0300

@@ -28,6 +28,7 @@

 #endif 

 #include <string>

+#include <cstring>

 using std::string;

diff -Naur apt-0.5.15lorg2.orig/apt-pkg/contrib/mmap.cc apt-0.5.15lorg2/apt-pkg/contrib/mmap.cc

--- apt-0.5.15lorg2.orig/apt-pkg/contrib/mmap.cc	2008-09-01 22:42:04 +0400

+++ apt-0.5.15lorg2/apt-pkg/contrib/mmap.cc	2008-12-12 16:21:25 +0300

@@ -35,6 +35,7 @@

 #include <sys/stat.h>

 #include <unistd.h>

 #include <fcntl.h>

+#include <cstring>

    									/*}}}*/

 // MMap::MMap - Constructor						/*{{{*/

diff -Naur apt-0.5.15lorg2.orig/apt-pkg/contrib/progress.cc apt-0.5.15lorg2/apt-pkg/contrib/progress.cc

--- apt-0.5.15lorg2.orig/apt-pkg/contrib/progress.cc	2008-09-01 22:42:04 +0400

+++ apt-0.5.15lorg2/apt-pkg/contrib/progress.cc	2008-12-12 16:21:25 +0300

@@ -19,6 +19,7 @@

 #include <iostream>

 #include <stdio.h>

+#include <cstring>

 									/*}}}*/

 using namespace std;

diff -Naur apt-0.5.15lorg2.orig/apt-pkg/contrib/sha1.h apt-0.5.15lorg2/apt-pkg/contrib/sha1.h

--- apt-0.5.15lorg2.orig/apt-pkg/contrib/sha1.h	2008-09-01 22:42:04 +0400

+++ apt-0.5.15lorg2/apt-pkg/contrib/sha1.h	2008-12-12 16:21:25 +0300

@@ -19,6 +19,7 @@

 #endif 

 #include <string>

+#include <cstring>

 using std::string;

diff -Naur apt-0.5.15lorg2.orig/apt-pkg/contrib/strutl.h apt-0.5.15lorg2/apt-pkg/contrib/strutl.h

--- apt-0.5.15lorg2.orig/apt-pkg/contrib/strutl.h	2008-09-01 22:42:04 +0400

+++ apt-0.5.15lorg2/apt-pkg/contrib/strutl.h	2008-12-12 16:21:25 +0300

@@ -25,6 +25,7 @@

 #include <vector>

 #include <iostream>

 #include <time.h>

+#include <cstring>

 using std::string;

 using std::vector;

diff -Naur apt-0.5.15lorg2.orig/apt-pkg/contrib/system.h apt-0.5.15lorg2/apt-pkg/contrib/system.h

--- apt-0.5.15lorg2.orig/apt-pkg/contrib/system.h	2008-09-01 22:42:04 +0400

+++ apt-0.5.15lorg2/apt-pkg/contrib/system.h	2008-12-12 16:21:25 +0300

@@ -26,7 +26,7 @@

 #endif

 // GNU C++ has a min/max operator <coolio>

-#if defined(__GNUG__)

+#if 0

 #define MIN(A,B) ((A) <? (B))

 #define MAX(A,B) ((A) >? (B))

 #endif

diff -Naur apt-0.5.15lorg2.orig/apt-pkg/indexfile.cc apt-0.5.15lorg2/apt-pkg/indexfile.cc

--- apt-0.5.15lorg2.orig/apt-pkg/indexfile.cc	2008-09-01 22:42:04 +0400

+++ apt-0.5.15lorg2/apt-pkg/indexfile.cc	2008-12-12 16:21:25 +0300

@@ -14,6 +14,7 @@

 #include <apt-pkg/indexfile.h>

 #include <apt-pkg/error.h>

+#include <cstring>

 									/*}}}*/

 // Global list of Item supported

diff -Naur apt-0.5.15lorg2.orig/apt-pkg/init.cc apt-0.5.15lorg2/apt-pkg/init.cc

--- apt-0.5.15lorg2.orig/apt-pkg/init.cc	2008-12-12 16:11:54 +0300

+++ apt-0.5.15lorg2/apt-pkg/init.cc	2008-12-12 16:21:25 +0300

@@ -20,6 +20,8 @@

 // CNC:2003-03-17

 #include <apt-pkg/luaiface.h>

+#include <cstring>

+#include <cstdlib>

 									/*}}}*/

 #define Stringfy_(x) # x

diff -Naur apt-0.5.15lorg2.orig/apt-pkg/pkgcachegen.h apt-0.5.15lorg2/apt-pkg/pkgcachegen.h

--- apt-0.5.15lorg2.orig/apt-pkg/pkgcachegen.h	2008-09-01 22:42:04 +0400

+++ apt-0.5.15lorg2/apt-pkg/pkgcachegen.h	2008-12-12 16:21:25 +0300

@@ -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 &PkgI,string Pkg);

    unsigned long WriteUniqString(const char *S,unsigned int Size);

    inline unsigned long WriteUniqString(string S) {return WriteUniqString(S.c_str(),S.length());};

diff -Naur apt-0.5.15lorg2.orig/apt-pkg/pkgrecords.cc apt-0.5.15lorg2/apt-pkg/pkgrecords.cc

--- apt-0.5.15lorg2.orig/apt-pkg/pkgrecords.cc	2008-12-12 16:11:53 +0300

+++ apt-0.5.15lorg2/apt-pkg/pkgrecords.cc	2008-12-12 16:21:25 +0300

@@ -18,6 +18,7 @@

 #include <apt-pkg/configuration.h>

 #include <apti18n.h>   

+#include <cstring>

 									/*}}}*/

 // Records::pkgRecords - Constructor					/*{{{*/

diff -Naur apt-0.5.15lorg2.orig/apt-pkg/pkgsystem.cc apt-0.5.15lorg2/apt-pkg/pkgsystem.cc

--- apt-0.5.15lorg2.orig/apt-pkg/pkgsystem.cc	2008-09-01 22:42:04 +0400

+++ apt-0.5.15lorg2/apt-pkg/pkgsystem.cc	2008-12-12 16:21:25 +0300

@@ -16,6 +16,7 @@

 #include <apt-pkg/pkgsystem.h>

 #include <apt-pkg/policy.h>

+#include <cstring>

 									/*}}}*/

 pkgSystem *_system = 0;

diff -Naur apt-0.5.15lorg2.orig/apt-pkg/rpm/rpmmisc.h apt-0.5.15lorg2/apt-pkg/rpm/rpmmisc.h

--- apt-0.5.15lorg2.orig/apt-pkg/rpm/rpmmisc.h	2008-09-01 22:42:04 +0400

+++ apt-0.5.15lorg2/apt-pkg/rpm/rpmmisc.h	2008-12-12 16:21:39 +0300

@@ -4,6 +4,7 @@

 #ifdef WITH_GNU_HASH_MAP

 #include <ext/hash_map>

+#include <cstring>

 using namespace __gnu_cxx;

diff -Naur apt-0.5.15lorg2.orig/apt-pkg/rpm/rpmpackagedata.h apt-0.5.15lorg2/apt-pkg/rpm/rpmpackagedata.h

--- apt-0.5.15lorg2.orig/apt-pkg/rpm/rpmpackagedata.h	2008-12-12 16:11:53 +0300

+++ apt-0.5.15lorg2/apt-pkg/rpm/rpmpackagedata.h	2008-12-12 16:22:03 +0300

@@ -8,6 +8,7 @@

 #include <map>

 #include <vector>

 #include <regex.h>

+#include <cstring>

 using namespace std;

diff -Naur apt-0.5.15lorg2.orig/apt-pkg/rpm/rpmpm.cc apt-0.5.15lorg2/apt-pkg/rpm/rpmpm.cc

--- apt-0.5.15lorg2.orig/apt-pkg/rpm/rpmpm.cc	2008-12-12 16:11:54 +0300

+++ apt-0.5.15lorg2/apt-pkg/rpm/rpmpm.cc	2008-12-12 16:21:25 +0300

@@ -33,6 +33,7 @@

 #include <errno.h>

 #include <stdio.h>

 #include <iostream>

+#include <cstring>

 #if RPM_VERSION >= 0x040100

 #include <rpm/rpmdb.h>

diff -Naur apt-0.5.15lorg2.orig/apt-pkg/rpm/rpmrecords.cc apt-0.5.15lorg2/apt-pkg/rpm/rpmrecords.cc

--- apt-0.5.15lorg2.orig/apt-pkg/rpm/rpmrecords.cc	2008-12-12 16:11:54 +0300

+++ apt-0.5.15lorg2/apt-pkg/rpm/rpmrecords.cc	2008-12-12 16:21:25 +0300

@@ -25,6 +25,8 @@

 #include <apti18n.h>

+#include <cstring>

+

 // RecordParser::rpmRecordParser - Constructor				/*{{{*/

 // ---------------------------------------------------------------------

 /* */