From dbcb74499899922f39fd49667f00ba8fab0ddecc Mon Sep 17 00:00:00 2001
From: Adam Heath <doogie@debian.org>
Date: Sat, 25 Oct 2003 20:03:20 +0000
Subject: [PATCH] Almost *EVERY* damn file was including config.h in the wrong
 spot.  After making it the first include, then off_t/size_t/etc could
 actually be redefined to be 64-bit compatible.

---
 ChangeLog             | 7 +++++++
 debian/changelog      | 3 +++
 dpkg-deb/build.c      | 3 ++-
 dpkg-deb/extract.c    | 2 +-
 dpkg-deb/info.c       | 2 +-
 dpkg-deb/main.c       | 2 +-
 dselect/basecmds.cc   | 5 +++--
 dselect/baselist.cc   | 4 +++-
 dselect/basetop.cc    | 5 +++--
 dselect/bindings.cc   | 4 +++-
 dselect/main.cc       | 4 +++-
 dselect/methkeys.cc   | 4 +++-
 dselect/methlist.cc   | 4 +++-
 dselect/method.cc     | 4 +++-
 dselect/methparse.cc  | 4 +++-
 dselect/pkgcmds.cc    | 4 +++-
 dselect/pkgdepcon.cc  | 4 +++-
 dselect/pkgdisplay.cc | 4 +++-
 dselect/pkginfo.cc    | 4 +++-
 dselect/pkgkeys.cc    | 4 +++-
 dselect/pkglist.cc    | 4 +++-
 dselect/pkgsublist.cc | 4 +++-
 dselect/pkgtop.cc     | 4 +++-
 lib/compat.c          | 2 +-
 lib/database.c        | 2 +-
 lib/dbmodify.c        | 2 +-
 lib/dump.c            | 2 +-
 lib/ehandle.c         | 2 +-
 lib/fields.c          | 2 +-
 lib/lock.c            | 2 +-
 lib/md5.c             | 2 +-
 lib/mlib.c            | 2 +-
 lib/myopt.c           | 2 +-
 lib/nfmalloc.c        | 2 +-
 lib/parse.c           | 2 +-
 lib/parsehelp.c       | 2 +-
 lib/showcright.c      | 2 +-
 lib/showpkg.c         | 3 ++-
 lib/varbuf.c          | 2 +-
 lib/vercmp.c          | 2 +-
 main/archives.c       | 2 +-
 main/cleanup.c        | 2 +-
 main/configure.c      | 2 +-
 main/depcon.c         | 2 +-
 main/enquiry.c        | 2 +-
 main/errors.c         | 2 +-
 main/filesdb.c        | 2 +-
 main/help.c           | 2 +-
 main/main.c           | 2 +-
 main/packages.c       | 2 +-
 main/processarc.c     | 2 +-
 main/query.c          | 2 +-
 main/remove.c         | 2 +-
 main/select.c         | 2 +-
 main/update.c         | 2 +-
 split/info.c          | 2 +-
 split/join.c          | 2 +-
 split/main.c          | 2 +-
 split/queue.c         | 2 +-
 split/split.c         | 2 +-
 60 files changed, 104 insertions(+), 60 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 49c005d1..e5ff5a13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,11 @@
+Sat Oct 25 15:02:27 CDT 2003 Adam Heath <doogie@debian.org>
+
+  * almost all .c files: Almost *EVERY* damn file was including config.h in
+    the wrong spot.  After making it the first include, then
+    off_t/size_t/etc could actually be redefined to be 64-bit compatible.
+
 Sat Oct 25 12:47:22 CDT 2003 Adam Heath <doogie@debian.org>
+
   * scripts/dpkg-checkbuilddeps.pl: Fix dpkg-checkbuilddeps calling of
     parsedep.  It wasn't setting use_arch.
 
diff --git a/debian/changelog b/debian/changelog
index 4b53d6c2..aab6a4b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 dpkg (1.10.16) unstable; urgency=low
 
+  * Almost *EVERY* damn file was including config.h in the wrong spot.
+    After making it the first include, then off_t/size_t/etc could actually
+    be redefined to be 64-bit compatible.
   * Jordi Mallach <jordi@debian.org>:
     Fix configure to set HAVE_SETLOCALE.  Closes: #211816
   * "Loïc Le Loarer" <lll_deb@m4x.org>:
diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c
index a79ab091..81467d9a 100644
--- a/dpkg-deb/build.c
+++ b/dpkg-deb/build.c
@@ -20,6 +20,8 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <config.h>
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -38,7 +40,6 @@
 #include <zlib.h>
 #endif
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 #include "dpkg-deb.h"
diff --git a/dpkg-deb/extract.c b/dpkg-deb/extract.c
index 82534a0c..caa6fc97 100644
--- a/dpkg-deb/extract.c
+++ b/dpkg-deb/extract.c
@@ -18,6 +18,7 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -37,7 +38,6 @@
 #include <zlib.h>
 #endif
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-deb.h>
 #include <myopt.h>
diff --git a/dpkg-deb/info.c b/dpkg-deb/info.c
index cd8215d6..5095f621 100644
--- a/dpkg-deb/info.c
+++ b/dpkg-deb/info.c
@@ -19,6 +19,7 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -33,7 +34,6 @@
 #include <limits.h>
 #include <ctype.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 #include <myopt.h>
diff --git a/dpkg-deb/main.c b/dpkg-deb/main.c
index 9d98e1d6..9bf1f663 100644
--- a/dpkg-deb/main.c
+++ b/dpkg-deb/main.c
@@ -18,6 +18,7 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -33,7 +34,6 @@
 #include <ctype.h>
 #include <assert.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <version.h>
 #include <myopt.h>
diff --git a/dselect/basecmds.cc b/dselect/basecmds.cc
index e294f84a..4c5c4bbe 100644
--- a/dselect/basecmds.cc
+++ b/dselect/basecmds.cc
@@ -19,13 +19,14 @@
  * License along with this; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-
+extern "C" {
+#include <config.h>
+}
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
 
 extern "C" {
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 }
diff --git a/dselect/baselist.cc b/dselect/baselist.cc
index b21bdcab..c942318e 100644
--- a/dselect/baselist.cc
+++ b/dselect/baselist.cc
@@ -19,6 +19,9 @@
  * License along with this; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+extern "C" {
+#include <config.h>
+}
 
 #include <stdio.h>
 #include <string.h>
@@ -29,7 +32,6 @@
 #include <sys/termios.h>
 
 extern "C" {
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 }
diff --git a/dselect/basetop.cc b/dselect/basetop.cc
index 4bfbfed6..82c1be6b 100644
--- a/dselect/basetop.cc
+++ b/dselect/basetop.cc
@@ -18,14 +18,15 @@
  * License along with this; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-
+extern "C" {
+#include <config.h>
+}
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
 #include <ctype.h>
 
 extern "C" {
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 }
diff --git a/dselect/bindings.cc b/dselect/bindings.cc
index f83a22d7..444c6609 100644
--- a/dselect/bindings.cc
+++ b/dselect/bindings.cc
@@ -18,13 +18,15 @@
  * License along with this; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+extern "C" {
+#include <config.h>
+}
 
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
 
 extern "C" {
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 }
diff --git a/dselect/main.cc b/dselect/main.cc
index 4dfc329a..dcd93d45 100644
--- a/dselect/main.cc
+++ b/dselect/main.cc
@@ -19,6 +19,9 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+extern "C" {
+#include <config.h>
+}
 
 #include <stdio.h>
 #include <string.h>
@@ -36,7 +39,6 @@
 #include <term.h>
 
 extern "C" {
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 #include <version.h>
diff --git a/dselect/methkeys.cc b/dselect/methkeys.cc
index db18202e..4ec7cb2c 100644
--- a/dselect/methkeys.cc
+++ b/dselect/methkeys.cc
@@ -18,13 +18,15 @@
  * License along with this; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+extern "C" {
+#include <config.h>
+}
 
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
 
 extern "C" {
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 }
diff --git a/dselect/methlist.cc b/dselect/methlist.cc
index 25c85973..7761c49a 100644
--- a/dselect/methlist.cc
+++ b/dselect/methlist.cc
@@ -19,6 +19,9 @@
  * License along with this; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+extern "C" {
+#include <config.h>
+}
 
 #include <stdio.h>
 #include <string.h>
@@ -26,7 +29,6 @@
 #include <errno.h>
 
 extern "C" {
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 }
diff --git a/dselect/method.cc b/dselect/method.cc
index 9a02ad42..0efcce3e 100644
--- a/dselect/method.cc
+++ b/dselect/method.cc
@@ -19,6 +19,9 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+extern "C" {
+#include <config.h>
+}
 
 #include <stdio.h>
 #include <string.h>
@@ -38,7 +41,6 @@
 #include <sys/file.h>
 
 extern "C" {
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 }
diff --git a/dselect/methparse.cc b/dselect/methparse.cc
index 86d1a505..1f49c2c2 100644
--- a/dselect/methparse.cc
+++ b/dselect/methparse.cc
@@ -18,6 +18,9 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+extern "C" {
+#include <config.h>
+}
 
 #include <stdio.h>
 #include <string.h>
@@ -34,7 +37,6 @@
 
 
 extern "C" {
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 }
diff --git a/dselect/pkgcmds.cc b/dselect/pkgcmds.cc
index d153b529..14a95c79 100644
--- a/dselect/pkgcmds.cc
+++ b/dselect/pkgcmds.cc
@@ -18,13 +18,15 @@
  * License along with this; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+extern "C" {
+#include <config.h>
+}
 
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
 
 extern "C" {
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 }
diff --git a/dselect/pkgdepcon.cc b/dselect/pkgdepcon.cc
index 0c0afca5..91208556 100644
--- a/dselect/pkgdepcon.cc
+++ b/dselect/pkgdepcon.cc
@@ -18,13 +18,15 @@
  * License along with this; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+extern "C" {
+#include <config.h>
+}
 
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
 
 extern "C" {
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 }
diff --git a/dselect/pkgdisplay.cc b/dselect/pkgdisplay.cc
index 09969da8..2fc17809 100644
--- a/dselect/pkgdisplay.cc
+++ b/dselect/pkgdisplay.cc
@@ -18,13 +18,15 @@
  * License along with this; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+extern "C" {
+#include <config.h>
+}
 
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
 
 extern "C" {
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 }
diff --git a/dselect/pkginfo.cc b/dselect/pkginfo.cc
index 4061539d..6c8aeb02 100644
--- a/dselect/pkginfo.cc
+++ b/dselect/pkginfo.cc
@@ -18,6 +18,9 @@
  * License along with this; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+extern "C" {
+#include <config.h>
+}
 
 #include <stdio.h>
 #include <string.h>
@@ -25,7 +28,6 @@
 #include <ctype.h>
 
 extern "C" {
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 }
diff --git a/dselect/pkgkeys.cc b/dselect/pkgkeys.cc
index cff8932d..98029e74 100644
--- a/dselect/pkgkeys.cc
+++ b/dselect/pkgkeys.cc
@@ -18,13 +18,15 @@
  * License along with this; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+extern "C" {
+#include <config.h>
+}
 
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
 
 extern "C" {
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 }
diff --git a/dselect/pkglist.cc b/dselect/pkglist.cc
index bd5f3271..f4eefdc1 100644
--- a/dselect/pkglist.cc
+++ b/dselect/pkglist.cc
@@ -19,6 +19,9 @@
  * License along with this; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+extern "C" {
+#include <config.h>
+}
 
 #include <stdio.h>
 #include <string.h>
@@ -26,7 +29,6 @@
 #include <errno.h>
 
 extern "C" {
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 }
diff --git a/dselect/pkgsublist.cc b/dselect/pkgsublist.cc
index 72bde089..fe41ebc2 100644
--- a/dselect/pkgsublist.cc
+++ b/dselect/pkgsublist.cc
@@ -18,13 +18,15 @@
  * License along with this; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+extern "C" {
+#include <config.h>
+}
 
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
 
 extern "C" {
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 }
diff --git a/dselect/pkgtop.cc b/dselect/pkgtop.cc
index 7d9ee976..385ed53f 100644
--- a/dselect/pkgtop.cc
+++ b/dselect/pkgtop.cc
@@ -18,6 +18,9 @@
  * License along with this; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+extern "C" {
+#include <config.h>
+}
 
 #include <stdio.h>
 #include <string.h>
@@ -25,7 +28,6 @@
 #include <ctype.h>
 
 extern "C" {
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 }
diff --git a/lib/compat.c b/lib/compat.c
index 438602af..09d4a9c6 100644
--- a/lib/compat.c
+++ b/lib/compat.c
@@ -18,6 +18,7 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <errno.h>
 #include <signal.h>
@@ -30,7 +31,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include <config.h>
 #include <dpkg.h>
 
 #ifndef HAVE_VSNPRINTF
diff --git a/lib/database.c b/lib/database.c
index 9e463882..299f294b 100644
--- a/lib/database.c
+++ b/lib/database.c
@@ -18,11 +18,11 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <ctype.h>
 #include <string.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 
diff --git a/lib/dbmodify.c b/lib/dbmodify.c
index d31317b6..48896137 100644
--- a/lib/dbmodify.c
+++ b/lib/dbmodify.c
@@ -19,6 +19,7 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -34,7 +35,6 @@
 #include <ctype.h>
 #include <assert.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 
diff --git a/lib/dump.c b/lib/dump.c
index 13483c19..48976d7f 100644
--- a/lib/dump.c
+++ b/lib/dump.c
@@ -21,6 +21,7 @@
  */
 
 /* fixme: don't write uninteresting packages */
+#include <config.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -31,7 +32,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 #include "parsedump.h"
diff --git a/lib/ehandle.c b/lib/ehandle.c
index db4c5ed2..d60804b5 100644
--- a/lib/ehandle.c
+++ b/lib/ehandle.c
@@ -18,6 +18,7 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -27,7 +28,6 @@
 #include <stdarg.h>
 #include <assert.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 
diff --git a/lib/fields.c b/lib/fields.c
index f192cedb..2f39f641 100644
--- a/lib/fields.c
+++ b/lib/fields.c
@@ -19,12 +19,12 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 #include "parsedump.h"
diff --git a/lib/lock.c b/lib/lock.c
index 1787b1dd..06fb413e 100644
--- a/lib/lock.c
+++ b/lib/lock.c
@@ -18,6 +18,7 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <unistd.h>
 #include <stdlib.h>
@@ -28,7 +29,6 @@
 #include <fcntl.h>
 #include <sys/file.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 
diff --git a/lib/md5.c b/lib/md5.c
index 3adddd10..8a7d354f 100644
--- a/lib/md5.c
+++ b/lib/md5.c
@@ -19,12 +19,12 @@
  *  - Ian Jackson <ian@chiark.greenend.org.uk>.
  * Still in the public domain.
  */
+#include "config.h"
 
 #include <string.h>		/* for memcpy() */
 #include <sys/types.h>		/* for stupid systems */
 #include <netinet/in.h>		/* for ntohl() */
 
-#include "config.h"
 #include "md5.h"
 
 #ifdef WORDS_BIGENDIAN
diff --git a/lib/mlib.c b/lib/mlib.c
index 6fc3cff6..8ae5a29b 100644
--- a/lib/mlib.c
+++ b/lib/mlib.c
@@ -18,6 +18,7 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <unistd.h>
 #include <stdio.h>
@@ -30,7 +31,6 @@
 #include <sys/wait.h>
 #include <sys/types.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 #include <md5.h>
diff --git a/lib/myopt.c b/lib/myopt.c
index 19488336..adfef9b7 100644
--- a/lib/myopt.c
+++ b/lib/myopt.c
@@ -19,13 +19,13 @@
  * License along with this file; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <string.h>
 #include <errno.h>
 #include <ctype.h>
 #include <stdlib.h>
 
-#include <config.h>
 #include <myopt.h>
 #include <dpkg.h>
 
diff --git a/lib/nfmalloc.c b/lib/nfmalloc.c
index f44d08c8..9b3cfcf5 100644
--- a/lib/nfmalloc.c
+++ b/lib/nfmalloc.c
@@ -18,11 +18,11 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <stdlib.h>
 #include <string.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 
diff --git a/lib/parse.c b/lib/parse.c
index d0543403..81c14714 100644
--- a/lib/parse.c
+++ b/lib/parse.c
@@ -18,6 +18,7 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -30,7 +31,6 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 #include "parsedump.h"
diff --git a/lib/parsehelp.c b/lib/parsehelp.c
index 0f13d7ac..9478445b 100644
--- a/lib/parsehelp.c
+++ b/lib/parsehelp.c
@@ -18,12 +18,12 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 #include "parsedump.h"
diff --git a/lib/showcright.c b/lib/showcright.c
index bebe3c40..8849c752 100644
--- a/lib/showcright.c
+++ b/lib/showcright.c
@@ -18,12 +18,12 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
 
-#include <config.h>
 #include <dpkg.h>
 
 void showcopyright(const struct cmdinfo *c, const char *v) NONRETURNING;
diff --git a/lib/showpkg.c b/lib/showpkg.c
index 329160bb..68228b12 100644
--- a/lib/showpkg.c
+++ b/lib/showpkg.c
@@ -17,11 +17,12 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 
diff --git a/lib/varbuf.c b/lib/varbuf.c
index 1831d92e..3ef97f54 100644
--- a/lib/varbuf.c
+++ b/lib/varbuf.c
@@ -18,12 +18,12 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 
diff --git a/lib/vercmp.c b/lib/vercmp.c
index 2e73043d..5e9b006c 100644
--- a/lib/vercmp.c
+++ b/lib/vercmp.c
@@ -18,11 +18,11 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <ctype.h>
 #include <string.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 #include "parsedump.h"
diff --git a/main/archives.c b/main/archives.c
index c89f9de9..7d61497e 100644
--- a/main/archives.c
+++ b/main/archives.c
@@ -19,6 +19,7 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <errno.h>
 #include <stdio.h>
@@ -37,7 +38,6 @@
 #define obstack_chunk_alloc m_malloc
 #define obstack_chunk_free free
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 #include <tarfn.h>
diff --git a/main/cleanup.c b/main/cleanup.c
index 32db3c69..3d93e8e4 100644
--- a/main/cleanup.c
+++ b/main/cleanup.c
@@ -18,6 +18,7 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <errno.h>
 #include <stdio.h>
@@ -32,7 +33,6 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 #include <tarfn.h>
diff --git a/main/configure.c b/main/configure.c
index b82a6931..741da37b 100644
--- a/main/configure.c
+++ b/main/configure.c
@@ -19,6 +19,7 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <errno.h>
 #include <signal.h>
@@ -36,7 +37,6 @@
 #include <assert.h>
 #include <sys/wait.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 
diff --git a/main/depcon.c b/main/depcon.c
index 3f6176d0..57677005 100644
--- a/main/depcon.c
+++ b/main/depcon.c
@@ -18,6 +18,7 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <errno.h>
 #include <unistd.h>
@@ -25,7 +26,6 @@
 #include <sys/types.h>
 #include <assert.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 
diff --git a/main/enquiry.c b/main/enquiry.c
index c1060495..a8a8b762 100644
--- a/main/enquiry.c
+++ b/main/enquiry.c
@@ -20,6 +20,7 @@
  */
 
 /* fixme: per-package audit */
+#include <config.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -33,7 +34,6 @@
 #include <sys/termios.h>
 #include <fcntl.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 #include <myopt.h>
diff --git a/main/errors.c b/main/errors.c
index 30d3130e..a5411b6e 100644
--- a/main/errors.c
+++ b/main/errors.c
@@ -18,6 +18,7 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -32,7 +33,6 @@
 #include <limits.h>
 #include <ctype.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 #include <myopt.h>
diff --git a/main/filesdb.c b/main/filesdb.c
index b5b086ea..35f1d2ed 100644
--- a/main/filesdb.c
+++ b/main/filesdb.c
@@ -19,6 +19,7 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <assert.h>
 #include <unistd.h>
@@ -31,7 +32,6 @@
 #include <grp.h>
 #include <sys/types.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 
diff --git a/main/help.c b/main/help.c
index 9cde30ce..b000cdc6 100644
--- a/main/help.c
+++ b/main/help.c
@@ -18,6 +18,7 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <errno.h>
 #include <unistd.h>
@@ -29,7 +30,6 @@
 #include <sys/wait.h>
 #include <signal.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <version.h>
 #include <dpkg-db.h>
diff --git a/main/main.c b/main/main.c
index 3e5607cd..1235b523 100644
--- a/main/main.c
+++ b/main/main.c
@@ -18,6 +18,7 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -32,7 +33,6 @@
 #include <limits.h>
 #include <ctype.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 #include <version.h>
diff --git a/main/packages.c b/main/packages.c
index b7644955..594ea227 100644
--- a/main/packages.c
+++ b/main/packages.c
@@ -18,6 +18,7 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -32,7 +33,6 @@
 #include <string.h>
 #include <assert.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 #include <myopt.h>
diff --git a/main/processarc.c b/main/processarc.c
index 20c4473a..2eedfb5e 100644
--- a/main/processarc.c
+++ b/main/processarc.c
@@ -18,6 +18,7 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <errno.h>
 #include <stdio.h>
@@ -34,7 +35,6 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 #include <tarfn.h>
diff --git a/main/query.c b/main/query.c
index c3f69a1e..51e0cffa 100644
--- a/main/query.c
+++ b/main/query.c
@@ -22,6 +22,7 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -35,7 +36,6 @@
 #include <sys/termios.h>
 #include <fcntl.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 #include <myopt.h>
diff --git a/main/remove.c b/main/remove.c
index 7b111b16..f764ead6 100644
--- a/main/remove.c
+++ b/main/remove.c
@@ -32,6 +32,7 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <errno.h>
 #include <stdio.h>
@@ -47,7 +48,6 @@
 #include <string.h>
 #include <assert.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 #include <myopt.h>
diff --git a/main/select.c b/main/select.c
index 9ed96985..a8becab2 100644
--- a/main/select.c
+++ b/main/select.c
@@ -18,6 +18,7 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -25,7 +26,6 @@
 #include <fnmatch.h>
 #include <ctype.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 
diff --git a/main/update.c b/main/update.c
index 82224b33..14ba4eaf 100644
--- a/main/update.c
+++ b/main/update.c
@@ -18,6 +18,7 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <errno.h>
 #include <stdio.h>
@@ -27,7 +28,6 @@
 #include <assert.h>
 #include <unistd.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 #include <myopt.h>
diff --git a/split/info.c b/split/info.c
index 1698e05a..8cb0a933 100644
--- a/split/info.c
+++ b/split/info.c
@@ -18,6 +18,7 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -29,7 +30,6 @@
 #include <ar.h>
 #include <ctype.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 #include "dpkg-split.h"
diff --git a/split/join.c b/split/join.c
index 18745dc8..4add3904 100644
--- a/split/join.c
+++ b/split/join.c
@@ -18,6 +18,7 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -25,7 +26,6 @@
 #include <assert.h>
 #include <string.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 #include "dpkg-split.h"
diff --git a/split/main.c b/split/main.c
index 4ab3c956..133f7a93 100644
--- a/split/main.c
+++ b/split/main.c
@@ -18,6 +18,7 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <string.h>
 #include <stdio.h>
@@ -25,7 +26,6 @@
 #include <limits.h>
 #include <assert.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 #include <version.h>
diff --git a/split/queue.c b/split/queue.c
index 0448e8c1..6a1312fa 100644
--- a/split/queue.c
+++ b/split/queue.c
@@ -27,6 +27,7 @@
  *  <md5sum>.<maxpartlen>.<thispartn>.<maxpartn>
  * all numbers in hex
  */
+#include <config.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -38,7 +39,6 @@
 #include <dirent.h>
 #include <string.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 #include "dpkg-split.h"
diff --git a/split/split.c b/split/split.c
index aad2904b..2c3b7894 100644
--- a/split/split.c
+++ b/split/split.c
@@ -18,6 +18,7 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -28,7 +29,6 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 #include "dpkg-split.h"
-- 
2.39.5