* merged the remaining bits from the apt--no-pragma branch

diff --cc apt-pkg/acquire-worker.cc
Simple merge

diff --cc apt-pkg/acquire.cc
Simple merge

diff --cc apt-pkg/algorithms.cc
Simple merge

diff --cc apt-pkg/cdrom.cc
Simple merge

diff --cc apt-pkg/contrib/fileutl.cc
Simple merge

diff --cc apt-pkg/contrib/progress.cc
Simple merge

diff --cc apt-pkg/contrib/strutl.cc
Simple merge

diff --cc apt-pkg/deb/debindexfile.cc
Simple merge

diff --cc apt-pkg/deb/debmetaindex.cc
Simple merge

diff --cc apt-pkg/deb/debrecords.cc
index 2aa47e3436ed9346f331d97609e8bfa387544f01,6ecbd15d62695e1b1b174fc972dee5206340d9af..8a5b6e21589e3e9743c91d3b83b72a66e5c5ae1f
--- 1/apt-pkg/deb/debrecords.cc
--- 2/apt-pkg/deb/debrecords.cc
+++ b/apt-pkg/deb/debrecords.cc
@@@ -8,13 -8,8 +8,10 @@@
     ##################################################################### */
                                                                        /*}}}*/
  // Include Files                                                      /*{{{*/
- #ifdef __GNUG__
- #pragma implementation "apt-pkg/debrecords.h"
- #endif
  #include <apt-pkg/debrecords.h>
 +#include <apt-pkg/strutl.h>
  #include <apt-pkg/error.h>
 +#include <langinfo.h>
                                                                        /*}}}*/
  
  // RecordParser::debRecordParser - Constructor                                /*{{{*/

diff --cc apt-pkg/deb/debsrcrecords.cc
Simple merge

diff --cc apt-pkg/deb/dpkgpm.cc
Simple merge

diff --cc apt-pkg/indexfile.cc
index bb2210bf677cebcaf64516fa86bd0ce1b9d1c62c,63f692c1d5397a93f5fcecab83f53a43c8530029..ca11fc11143e97ac2fed8324042800a839ba5aab
--- 1/apt-pkg/indexfile.cc
--- 2/apt-pkg/indexfile.cc
+++ b/apt-pkg/indexfile.cc
@@@ -8,15 -8,8 +8,11 @@@
     ##################################################################### */
                                                                        /*}}}*/
  // Include Files                                                      /*{{{*/
- #ifdef __GNUG__
- #pragma implementation "apt-pkg/indexfile.h"
- #endif
- 
 +#include <apt-pkg/configuration.h>
  #include <apt-pkg/indexfile.h>
  #include <apt-pkg/error.h>
 +
 +#include <clocale>
                                                                        /*}}}*/
  
  // Global list of Item supported

diff --cc apt-pkg/orderlist.cc
Simple merge

diff --cc apt-pkg/packagemanager.cc
Simple merge

diff --cc apt-pkg/pkgcachegen.cc
Simple merge

diff --cc apt-pkg/pkgrecords.cc
Simple merge

diff --cc apt-pkg/policy.cc
Simple merge

diff --cc apt-pkg/tagfile.cc
Simple merge

diff --cc ftparchive/apt-ftparchive.cc
Simple merge