Sort order of header includes

Place first <config.h> and <compat.h>, then all <sys/*.h> sorted by
complexity, followed by the rest of the system headers, then <dpkg/*.h>
and finally the local "*.h" ones.

Move <dpkg/i18n.h> inclusion into libdpkg inclusion block, as the
<gettext.h> compatibility header already takes care of including
<locale.h> before <libintl.h> on environments were its probamatic.

Removed duplicated inclusions.

dpkg-deb/build.c

@@ -23,27 +23,27 @@
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
-
-#include <stdbool.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <signal.h>
-#include <sys/stat.h>
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <sys/wait.h>
-#include <time.h>
+
+#include <assert.h>
 #include <errno.h>
-#include <unistd.h>
-#include <dirent.h>
 #include <limits.h>
 #include <ctype.h>
-#include <assert.h>
+#include <string.h>
+#include <time.h>
+#include <dirent.h>
+#include <signal.h>
+#include <unistd.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <stdio.h>
 #ifdef WITH_ZLIB
 #include <zlib.h>
 #endif
 
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 #include <dpkg/path.h>

dpkg-deb/extract.c

@@ -18,29 +18,30 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <signal.h>
-#include <sys/stat.h>
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <sys/wait.h>
+
+#include <assert.h>
 #include <errno.h>
-#include <unistd.h>
-#include <dirent.h>
 #include <limits.h>
 #include <ctype.h>
-#include <assert.h>
+#include <string.h>
+#include <dirent.h>
+#include <signal.h>
+#include <unistd.h>
 #include <ar.h>
+#include <stdlib.h>
+#include <stdio.h>
 #ifdef WITH_ZLIB
 #include <zlib.h>
 #endif
 
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/buffer.h>
 #include <dpkg/subproc.h>

dpkg-deb/info.c

@@ -19,24 +19,25 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <signal.h>
-#include <sys/stat.h>
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <sys/wait.h>
+
 #include <errno.h>
-#include <unistd.h>
-#include <dirent.h>
 #include <limits.h>
 #include <ctype.h>
+#include <string.h>
+#include <dirent.h>
+#include <signal.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
 
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 #include <dpkg/buffer.h>

dpkg-deb/main.c

@@ -18,30 +18,30 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <signal.h>
-#include <sys/stat.h>
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <sys/wait.h>
+
+#include <assert.h>
 #include <errno.h>
-#include <unistd.h>
-#include <dirent.h>
 #include <limits.h>
-#include <ctype.h>
-#include <assert.h>
-
 #if HAVE_LOCALE_H
 #include <locale.h>
 #endif
+#include <ctype.h>
+#include <string.h>
+#include <dirent.h>
+#include <signal.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
 
 #include <dpkg/macros.h>
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 #include <dpkg/myopt.h>

dpkg-split/info.c

@@ -18,21 +18,22 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
+#include <sys/stat.h>
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <limits.h>
 #include <assert.h>
+#include <limits.h>
+#include <ctype.h>
 #include <string.h>
 #include <unistd.h>
-#include <sys/stat.h>
 #include <ar.h>
-#include <ctype.h>
+#include <stdlib.h>
+#include <stdio.h>
 
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 #include <dpkg/myopt.h>

dpkg-split/join.c

@@ -18,17 +18,17 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <limits.h>
 #include <assert.h>
+#include <limits.h>
 #include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
 
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 #include <dpkg/myopt.h>

dpkg-split/main.c

@@ -21,21 +21,20 @@
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
-
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <limits.h>
-#include <assert.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 
+#include <assert.h>
+#include <limits.h>
 #if HAVE_LOCALE_H
 #include <locale.h>
 #endif
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
 
 #include <dpkg/macros.h>
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 #include <dpkg/myopt.h>

dpkg-split/queue.c

@@ -27,21 +27,22 @@
  *  <md5sum>.<maxpartlen>.<thispartn>.<maxpartn>
  * all numbers in hex
  */
+
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
+#include <sys/stat.h>
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <limits.h>
 #include <assert.h>
-#include <unistd.h>
-#include <sys/stat.h>
+#include <limits.h>
+#include <string.h>
 #include <fcntl.h>
 #include <dirent.h>
-#include <string.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
 
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 #include <dpkg/myopt.h>

dpkg-split/split.c

@@ -18,19 +18,20 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
+#include <sys/stat.h>
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <limits.h>
-#include <unistd.h>
-#include <string.h>
-#include <sys/stat.h>
 #include <fcntl.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
 
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 #include <dpkg/myopt.h>

dselect/basecmds.cc

@@ -23,11 +23,10 @@
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
-
-#include <stdio.h>
 #include <string.h>
+#include <stdio.h>
 
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 

dselect/baselist.cc

@@ -23,16 +23,16 @@
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
+#include <sys/ioctl.h>
+#include <sys/termios.h>
 
-#include <stdio.h>
-#include <string.h>
 #include <assert.h>
 #include <ctype.h>
+#include <string.h>
 #include <unistd.h>
-#include <sys/ioctl.h>
-#include <sys/termios.h>
+#include <stdio.h>
 
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 

dselect/bindings.cc

@@ -22,11 +22,10 @@
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
-
-#include <stdio.h>
 #include <string.h>
+#include <stdio.h>
 
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 

dselect/dselect.h

@@ -23,15 +23,15 @@
 #ifndef DSELECT_H
 #define DSELECT_H
 
+#include <signal.h>
+
+#include "dselect-curses.h"
+
 #define DSELECT		"dselect"
 
 #define TOTAL_LIST_WIDTH 180
 #define MAX_DISPLAY_INFO 120
 
-#include <signal.h>
-
-#include "dselect-curses.h"
-
 struct helpmenuentry {
   char key;
   const struct helpmessage *msg;

dselect/main.cc

@@ -23,25 +23,23 @@
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/stat.h>
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <sys/wait.h>
-#include <fcntl.h>
+
+#include <assert.h>
 #include <errno.h>
-#include <unistd.h>
-#include <dirent.h>
 #include <limits.h>
-#include <ctype.h>
-#include <assert.h>
-
 #if HAVE_LOCALE_H
 #include <locale.h>
 #endif
+#include <ctype.h>
+#include <string.h>
+#include <fcntl.h>
+#include <dirent.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
 
 #if defined(HAVE_NCURSESW_TERM_H)
 #include <ncursesw/term.h>
@@ -51,6 +49,7 @@
 #include <term.h>
 #endif
 
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 #include <dpkg/myopt.h>

dselect/methlist.cc

@@ -23,13 +23,12 @@
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
-
-#include <stdio.h>
-#include <string.h>
 #include <assert.h>
 #include <errno.h>
+#include <string.h>
+#include <stdio.h>
 
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 

dselect/method.cc

@@ -23,25 +23,24 @@
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <signal.h>
-#include <sys/stat.h>
 #include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/file.h>
 #include <sys/wait.h>
+
+#include <assert.h>
 #include <errno.h>
-#include <unistd.h>
-#include <dirent.h>
 #include <limits.h>
 #include <ctype.h>
-#include <assert.h>
-#include <unistd.h>
+#include <string.h>
 #include <fcntl.h>
-#include <sys/file.h>
+#include <dirent.h>
+#include <signal.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
 
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 #include <dpkg/subproc.h>

dselect/methparse.cc

@@ -22,21 +22,21 @@
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/stat.h>
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <sys/wait.h>
+
+#include <assert.h>
 #include <errno.h>
-#include <unistd.h>
-#include <dirent.h>
 #include <limits.h>
 #include <ctype.h>
-#include <assert.h>
+#include <string.h>
+#include <dirent.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
 
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 

dselect/pkgcmds.cc

@@ -22,8 +22,8 @@
 #include <config.h>
 #include <compat.h>
 
-#include <stdio.h>
 #include <string.h>
+#include <stdio.h>
 
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>

dselect/pkgdepcon.cc

@@ -22,9 +22,9 @@
 #include <config.h>
 #include <compat.h>
 
-#include <stdio.h>
-#include <string.h>
 #include <assert.h>
+#include <string.h>
+#include <stdio.h>
 
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>

dselect/pkgdisplay.cc

@@ -22,11 +22,10 @@
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
-
-#include <stdio.h>
 #include <string.h>
+#include <stdio.h>
 
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 

dselect/pkginfo.cc

@@ -22,12 +22,11 @@
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
-
-#include <stdio.h>
-#include <string.h>
 #include <ctype.h>
+#include <string.h>
+#include <stdio.h>
 
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 

dselect/pkglist.cc

@@ -23,14 +23,13 @@
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <assert.h>
 #include <errno.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
 
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 

dselect/pkgsublist.cc

@@ -22,12 +22,11 @@
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
-
-#include <stdio.h>
-#include <string.h>
 #include <assert.h>
+#include <string.h>
+#include <stdio.h>
 
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 

dselect/pkgtop.cc

@@ -22,13 +22,12 @@
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
-
-#include <stdio.h>
-#include <string.h>
 #include <assert.h>
 #include <ctype.h>
+#include <string.h>
+#include <stdio.h>
 
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 

lib/compat/alphasort.c

@@ -20,8 +20,8 @@
 
 #include <config.h>
 
-#include <dirent.h>
 #include <string.h>
+#include <dirent.h>
 
 #ifndef HAVE_ALPHASORT
 int

lib/compat/scandir.c

@@ -21,9 +21,10 @@
 #include <config.h>
 
 #include <sys/types.h>
+
+#include <string.h>
 #include <dirent.h>
 #include <stdlib.h>
-#include <string.h>
 
 #ifndef HAVE_SCANDIR
 int

lib/compat/unsetenv.c

@@ -20,8 +20,8 @@
 
 #include <config.h>
 
-#include <stdlib.h>
 #include <string.h>
+#include <stdlib.h>
 
 #ifndef HAVE_UNSETENV
 int

lib/compat/vsnprintf.c

@@ -21,9 +21,9 @@
 
 #include <config.h>
 
+#include <unistd.h>
 #include <stdarg.h>
 #include <stdio.h>
-#include <unistd.h>
 
 #ifndef HAVE_VSNPRINTF
 int

lib/dpkg/buffer.c

@@ -24,15 +24,15 @@
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
-
 #include <sys/types.h>
+
 #include <errno.h>
 #include <string.h>
+#include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <unistd.h>
 
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/varbuf.h>
 #include <dpkg/md5.h>

lib/dpkg/cleanup.c

@@ -22,9 +22,9 @@
 #include <config.h>
 #include <compat.h>
 
-#include <stdio.h>
-#include <unistd.h>
 #include <dirent.h>
+#include <unistd.h>
+#include <stdio.h>
 
 #include <dpkg/dpkg.h>
 

lib/dpkg/compression.c

@@ -1,12 +1,10 @@
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
 #include <errno.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdlib.h>
 
 #ifdef WITH_ZLIB
 #include <zlib.h>
@@ -15,6 +13,7 @@
 #include <bzlib.h>
 #endif
 
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 #include <dpkg/buffer.h>

lib/dpkg/database.c

@@ -18,15 +18,15 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
-
 #include <ctype.h>
 #include <string.h>
 #include <stdlib.h>
 
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 

lib/dpkg/dbmodify.c

@@ -19,26 +19,27 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <signal.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/wait.h>
+
+#include <assert.h>
 #include <errno.h>
-#include <unistd.h>
-#include <dirent.h>
 #include <limits.h>
 #include <ctype.h>
+#include <string.h>
 #include <time.h>
-#include <assert.h>
+#include <dirent.h>
+#include <signal.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
 
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 

lib/dpkg/dpkg-db.h

@@ -23,15 +23,16 @@
 #ifndef DPKG_DB_H
 #define DPKG_DB_H
 
+#include <sys/types.h>
+
+#include <stdbool.h>
+#include <stdio.h>
+
 #include <dpkg/macros.h>
 #include <dpkg/varbuf.h>
 
 DPKG_BEGIN_DECLS
 
-#include <sys/types.h>
-#include <stdbool.h>
-#include <stdio.h>
-
 struct versionrevision {
   unsigned long epoch;
   const char *version;

lib/dpkg/dpkg.h

@@ -23,22 +23,21 @@
 #ifndef DPKG_H
 #define DPKG_H
 
-#include <dpkg/macros.h>
-
-DPKG_BEGIN_DECLS
-
-#include <setjmp.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-
 #ifdef HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
+#include <sys/types.h>
 
+#include <setjmp.h>
 #ifdef HAVE_STDDEF_H
 #include <stddef.h>
 #endif
+#include <stdarg.h>
+#include <stdio.h>
+
+#include <dpkg/macros.h>
+
+DPKG_BEGIN_DECLS
 
 #define MAXCONFFILENAME     1000
 #define MAXDIVERTFILENAME   1024

lib/dpkg/dump.c

@@ -24,18 +24,18 @@
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <assert.h>
 #include <errno.h>
-#include <unistd.h>
 #include <ctype.h>
-#include <assert.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
 
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 #include <dpkg/parsedump.h>

lib/dpkg/ehandle.c

@@ -18,20 +18,20 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
+#include <assert.h>
 #include <errno.h>
+#include <string.h>
 #include <unistd.h>
 #include <stdarg.h>
-#include <assert.h>
+#include <stdlib.h>
+#include <stdio.h>
 
 #include <dpkg/macros.h>
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 

lib/dpkg/fields.c

@@ -19,15 +19,15 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
-
-#include <stdio.h>
 #include <ctype.h>
 #include <string.h>
+#include <stdio.h>
 
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 #include <dpkg/path.h>

lib/dpkg/file.c

@@ -25,6 +25,7 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
+
 #include <errno.h>
 #include <unistd.h>
 

lib/dpkg/lock.c

@@ -18,20 +18,20 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
+#include <sys/file.h>
 
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
 #include <assert.h>
+#include <errno.h>
+#include <string.h>
 #include <fcntl.h>
-#include <sys/file.h>
+#include <unistd.h>
+#include <stdlib.h>
 
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 

lib/dpkg/log.c

@@ -22,15 +22,14 @@
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
-
 #include <assert.h>
+#include <errno.h>
+#include <time.h>
+#include <unistd.h>
 #include <stdarg.h>
 #include <stdio.h>
-#include <unistd.h>
-#include <time.h>
-#include <errno.h>
 
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 

lib/dpkg/md5.c

@@ -23,9 +23,10 @@
 #include <config.h>
 #include <compat.h>
 
-#include <string.h>		/* for memcpy() */
 #include <sys/types.h>		/* for stupid systems */
 
+#include <string.h>		/* for memcpy() */
+
 #include "md5.h"
 
 #ifdef WORDS_BIGENDIAN

lib/dpkg/mlib.c

@@ -22,18 +22,17 @@
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
+#include <sys/types.h>
 
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
 #include <errno.h>
+#include <string.h>
 #include <fcntl.h>
+#include <signal.h>
 #include <unistd.h>
-#include <sys/types.h>
+#include <stdlib.h>
+#include <stdio.h>
 
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 

lib/dpkg/myopt-util.c

@@ -18,15 +18,15 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
-
-#include <stdlib.h>
-#include <unistd.h>
 #include <fcntl.h>
+#include <unistd.h>
+#include <stdlib.h>
 
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/buffer.h>
 #include <dpkg/myopt.h>

lib/dpkg/myopt.c

@@ -20,18 +20,18 @@
  * 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 <compat.h>
 
-#include <dpkg/i18n.h>
-
-#include <string.h>
 #include <errno.h>
 #include <ctype.h>
+#include <string.h>
 #include <dirent.h>
 #include <stdarg.h>
 #include <stdlib.h>
 
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/string.h>
 #include <dpkg/myopt.h>

lib/dpkg/nfmalloc.c

@@ -18,15 +18,15 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
-
-#include <stdlib.h>
 #include <string.h>
+#include <stdlib.h>
 #include <obstack.h>
 
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 

lib/dpkg/parse.c

@@ -18,34 +18,32 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdarg.h>
-
-
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
-#include <fcntl.h>
+#ifdef HAVE_MMAP
+#include <sys/mman.h>
+#endif
+
 #include <assert.h>
+#include <fcntl.h>
+#include <ctype.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <stdio.h>
 
 #include <dpkg/macros.h>
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 #include <dpkg/parsedump.h>
 #include <dpkg/buffer.h>
 
-#ifdef HAVE_MMAP
-#include <sys/mman.h>
-#endif
-
 const struct fieldinfo fieldinfos[]= {
   /* NB: capitalisation of these strings is important. */
   { "Package",          f_name,            w_name                                     },

lib/dpkg/parsehelp.c

@@ -18,16 +18,16 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
-
-#include <stdio.h>
-#include <stdlib.h>
 #include <ctype.h>
 #include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
 
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 #include <dpkg/string.h>

lib/dpkg/path.c

@@ -23,8 +23,8 @@
 #include <config.h>
 #include <compat.h>
 
-#include <stdio.h>
 #include <string.h>
+#include <stdio.h>
 
 #include <dpkg/path.h>
 

lib/dpkg/path.h

@@ -22,12 +22,12 @@
 #ifndef DPKG_PATH_H
 #define DPKG_PATH_H
 
-#include <dpkg/macros.h>
-
 #ifdef HAVE_STDDEF_H
 #include <stddef.h>
 #endif
 
+#include <dpkg/macros.h>
+
 DPKG_BEGIN_DECLS
 
 size_t path_rtrim_slash_slashdot(char *path);

lib/dpkg/progress.c

@@ -23,11 +23,11 @@
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
-
 #include <unistd.h>
 #include <stdio.h>
 
+#include <dpkg/i18n.h>
+
 #include "progress.h"
 
 void

lib/dpkg/showpkg.c

@@ -21,12 +21,11 @@
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
-
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
 
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 #include <dpkg/parsedump.h>

lib/dpkg/subproc.c

@@ -22,15 +22,15 @@
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
-
 #include <sys/types.h>
 #include <sys/wait.h>
+
 #include <errno.h>
-#include <stdio.h>
 #include <string.h>
 #include <signal.h>
+#include <stdio.h>
 
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/subproc.h>
 

lib/dpkg/tarfn.c

@@ -8,13 +8,13 @@
 #include <config.h>
 #include <compat.h>
 
-#include <stdlib.h>
+#include <errno.h>
 #include <string.h>
-#include <stdio.h>
-#include <unistd.h>
 #include <pwd.h>
 #include <grp.h>
-#include <errno.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
 
 #include <dpkg/macros.h>
 #include <dpkg/dpkg.h>

lib/dpkg/tarfn.h

@@ -8,10 +8,11 @@
  * This is free software under the GNU General Public License.
  */
 
-#include <stdlib.h>
-#include <unistd.h>
 #include <sys/types.h>
 
+#include <unistd.h>
+#include <stdlib.h>
+
 enum tar_format {
 	tar_format_old,
 	tar_format_gnu,

lib/dpkg/test.h

@@ -25,13 +25,13 @@
 #include <config.h>
 #include <compat.h>
 
+#include <assert.h>
+#include <string.h>
+
 #ifndef TEST_MAIN_PROVIDED
 #include <dpkg/dpkg.h>
 #endif
 
-#include <assert.h>
-#include <string.h>
-
 /* XXX: Using assert is problematic with NDEBUG. */
 
 #define test_pass(a)			assert((a))

lib/dpkg/test/t-buffer.c

@@ -19,11 +19,11 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <stdio.h>
+
 #include <dpkg/test.h>
 #include <dpkg/buffer.h>
 
-#include <stdio.h>
-
 static void
 test_buffer_hash(void)
 {

lib/dpkg/test/t-path.c

@@ -19,11 +19,11 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <stdlib.h>
+
 #include <dpkg/test.h>
 #include <dpkg/path.h>
 
-#include <stdlib.h>
-
 /* Use the test_trim_eq_ref macro to avoid leaking the string and to get
  * meaningful line numbers from assert. */
 #define test_trim_eq_ref(p, ref) \

lib/dpkg/test/t-string.c

@@ -19,11 +19,11 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <string.h>
+
 #include <dpkg/test.h>
 #include <dpkg/string.h>
 
-#include <string.h>
-
 static void
 test_str_escape_fmt(void)
 {

lib/dpkg/trigdeferred.l

@@ -37,11 +37,10 @@
 
 #include <config.h>
 
-#include <dpkg/i18n.h>
-
 #include <sys/stat.h>
 #include <sys/fcntl.h>
 
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 

lib/dpkg/triglib.c

@@ -23,15 +23,14 @@
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 
 #include <assert.h>
-#include <unistd.h>
 #include <errno.h>
+#include <unistd.h>
 
-#include <sys/types.h>
-#include <sys/stat.h>
-
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 #include <dpkg/pkg-list.h>

lib/dpkg/utils.c

@@ -21,10 +21,9 @@
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
-
 #include <string.h>
 
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 
 /* Reimplementation of the standard ctype.h is* functions. Since gettext

lib/dpkg/varbuf.c

@@ -19,16 +19,17 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+
 #include <config.h>
 #include <compat.h>
 
-#include <stdlib.h>
 #include <string.h>
+#include <stdlib.h>
 #include <stdio.h>
 
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
-#include <dpkg/i18n.h>
 
 void
 varbufaddc(struct varbuf *v, int c)

lib/dpkg/vercmp.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 <compat.h>
 

m4/compiler.m4

@@ -53,10 +53,9 @@ AS_IF([test "x$dpkg_cv_attribute" = "xyes"],
 # Try compiling some C99 code to see whether it works
 AC_DEFUN([DPKG_TRY_C99],
 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-#include <stdio.h>
-#include <stdbool.h>
 #include <inttypes.h>
-
+#include <stdbool.h>
+#include <stdio.h>
 
 /* Variadic macro arguments */
 #define variadic_macro(foo, ...) printf(foo, __VA_ARGS__)

src/archives.c

@@ -19,28 +19,28 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 
+#include <assert.h>
 #include <errno.h>
-#include <stdio.h>
+#include <ctype.h>
 #include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <utime.h>
-#include <assert.h>
 #include <time.h>
-#include <ctype.h>
+#include <utime.h>
 #include <fcntl.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
 #include <obstack.h>
 #define obstack_chunk_alloc m_malloc
 #define obstack_chunk_free free
 
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 #include <dpkg/path.h>

src/cleanup.c

@@ -18,23 +18,24 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 
 #include <errno.h>
-#include <stdio.h>
+#include <ctype.h>
 #include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <utime.h>
 #include <time.h>
-#include <ctype.h>
+#include <utime.h>
 #include <fcntl.h>
-#include <sys/stat.h>
-#include <sys/types.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
 
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 #include <dpkg/tarfn.h>

src/configure.c

@@ -23,27 +23,25 @@
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <sys/termios.h>
 
+#include <assert.h>
 #include <errno.h>
-#include <signal.h>
-#include <stdio.h>
+#include <ctype.h>
 #include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
+#include <time.h>
 #include <fcntl.h>
-#include <sys/stat.h>
-#include <sys/types.h>
 #include <dirent.h>
-#include <ctype.h>
+#include <signal.h>
 #include <unistd.h>
-#include <string.h>
-#include <assert.h>
-#include <sys/wait.h>
-#include <time.h>
-#include <sys/termios.h>
+#include <stdlib.h>
+#include <stdio.h>
 
 #include <dpkg/macros.h>
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 #include <dpkg/buffer.h>

src/depcon.c

@@ -18,17 +18,18 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 
+#include <assert.h>
 #include <errno.h>
 #include <unistd.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <assert.h>
 
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 

src/divertdb.c

@@ -23,19 +23,18 @@
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <string.h>
-#include <errno.h>
+#include <sys/types.h>
 #include <sys/stat.h>
 
+#include <errno.h>
+#include <string.h>
 #include <pwd.h>
 #include <grp.h>
-#include <sys/types.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <stdlib.h>
 
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 

src/enquiry.c

@@ -23,20 +23,20 @@
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
-
-#include <stdbool.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <unistd.h>
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <sys/ioctl.h>
+#include <sys/stat.h>
 #include <sys/termios.h>
+
+#include <assert.h>
+#include <string.h>
 #include <fcntl.h>
+#include <unistd.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <stdio.h>
 
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 #include <dpkg/myopt.h>

src/errors.c

@@ -18,24 +18,25 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <signal.h>
-#include <sys/stat.h>
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <sys/wait.h>
+
 #include <errno.h>
-#include <unistd.h>
-#include <dirent.h>
 #include <limits.h>
 #include <ctype.h>
+#include <string.h>
+#include <dirent.h>
+#include <signal.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
 
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 #include <dpkg/myopt.h>

src/filesdb.c

@@ -19,23 +19,23 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 
 #include <assert.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <string.h>
 #include <errno.h>
-#include <sys/stat.h>
-
+#include <string.h>
 #include <pwd.h>
 #include <grp.h>
-#include <sys/types.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <stdlib.h>
 
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 #include <dpkg/path.h>

src/help.c

@@ -18,22 +18,23 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
 
-#include <errno.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <dirent.h>
 #include <assert.h>
+#include <errno.h>
 #include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/wait.h>
 #include <time.h>
+#include <dirent.h>
+#include <unistd.h>
+#include <stdlib.h>
 
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 #include <dpkg/path.h>

src/main.c

@@ -19,31 +19,31 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
-
-#include <stdbool.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <signal.h>
-#include <sys/stat.h>
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <sys/wait.h>
+
 #include <errno.h>
-#include <unistd.h>
-#include <dirent.h>
 #include <limits.h>
-#include <ctype.h>
-#include <fcntl.h>
-
 #if HAVE_LOCALE_H
 #include <locale.h>
 #endif
+#include <ctype.h>
+#include <string.h>
+#include <fcntl.h>
+#include <dirent.h>
+#include <signal.h>
+#include <unistd.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <stdio.h>
 
 #include <dpkg/macros.h>
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 #include <dpkg/myopt.h>

src/packages.c

@@ -18,24 +18,23 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 
-#include <stdio.h>
+#include <assert.h>
+#include <ctype.h>
 #include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
 #include <fcntl.h>
-#include <sys/stat.h>
-#include <sys/types.h>
 #include <dirent.h>
-#include <ctype.h>
 #include <unistd.h>
-#include <string.h>
-#include <assert.h>
+#include <stdlib.h>
+#include <stdio.h>
 
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 #include <dpkg/pkg-list.h>

src/pkg-show.c

@@ -22,11 +22,10 @@
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
-
 #include <string.h>
 
 #include <dpkg/macros.h>
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 

src/processarc.c

@@ -18,26 +18,27 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
 
+#include <assert.h>
 #include <errno.h>
-#include <stdio.h>
+#include <ctype.h>
 #include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <utime.h>
-#include <assert.h>
 #include <time.h>
-#include <ctype.h>
-#include <dirent.h>
+#include <utime.h>
 #include <fcntl.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/wait.h>
+#include <dirent.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
 
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 #include <dpkg/buffer.h>

src/query.c

@@ -20,27 +20,27 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <fnmatch.h>
-#include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/termios.h>
-#include <fcntl.h>
-#include <dirent.h>
 
 #if HAVE_LOCALE_H
 #include <locale.h>
 #endif
+#include <string.h>
+#include <fcntl.h>
+#include <dirent.h>
+#include <fnmatch.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
 
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 #include <dpkg/pkg-array.h>

src/remove.c

@@ -18,25 +18,24 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 
+#include <assert.h>
 #include <errno.h>
-#include <stdio.h>
+#include <ctype.h>
 #include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
 #include <fcntl.h>
-#include <sys/stat.h>
-#include <sys/types.h>
 #include <dirent.h>
-#include <ctype.h>
 #include <unistd.h>
-#include <string.h>
-#include <assert.h>
+#include <stdlib.h>
+#include <stdio.h>
 
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 #include <dpkg/myopt.h>

src/select.c

@@ -18,17 +18,17 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <fnmatch.h>
 #include <ctype.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
 
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 #include <dpkg/pkg-array.h>

src/statcmd.c

@@ -23,23 +23,23 @@
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
-
 #include <sys/types.h>
 #include <sys/stat.h>
+
 #include <errno.h>
-#include <signal.h>
+#if HAVE_LOCALE_H
+#include <locale.h>
+#endif
+#include <string.h>
 #include <grp.h>
 #include <pwd.h>
 #include <fnmatch.h>
+#include <signal.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
 
-#if HAVE_LOCALE_H
-#include <locale.h>
-#endif
-
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 #include <dpkg/path.h>

src/statdb.c

@@ -23,19 +23,18 @@
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <string.h>
-#include <errno.h>
+#include <sys/types.h>
 #include <sys/stat.h>
 
+#include <errno.h>
+#include <string.h>
 #include <pwd.h>
 #include <grp.h>
-#include <sys/types.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <stdlib.h>
 
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 #include <dpkg/buffer.h>

src/trigcmd.c

@@ -22,22 +22,21 @@
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <sys/ioctl.h>
+#include <sys/stat.h>
 #include <sys/termios.h>
-#include <fcntl.h>
 
+#include <fcntl.h>
 #if HAVE_LOCALE_H
 #include <locale.h>
 #endif
+#include <string.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
 
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 #include <dpkg/myopt.h>

src/trigproc.c

@@ -23,13 +23,13 @@
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
+#include <sys/fcntl.h>
+#include <sys/stat.h>
 
 #include <assert.h>
 #include <stdlib.h>
-#include <sys/stat.h>
-#include <sys/fcntl.h>
 
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 

src/update.c

@@ -18,17 +18,17 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+
 #include <config.h>
 #include <compat.h>
 
-#include <dpkg/i18n.h>
-
 #include <errno.h>
-#include <stdio.h>
 #include <string.h>
-#include <stdlib.h>
 #include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
 
+#include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 #include <dpkg/myopt.h>

utils/install-info.c

@@ -20,11 +20,11 @@
 
 #include <config.h>
 
-#include <unistd.h>
 #include <errno.h>
 #include <string.h>
-#include <stdio.h>
+#include <unistd.h>
 #include <stdlib.h>
+#include <stdio.h>
 
 #define SELF "/usr/sbin/install-info"
 #define WRAPPED "/usr/bin/install-info"

utils/start-stop-daemon.c

@@ -44,6 +44,14 @@
 
 #define MIN_POLL_INTERVAL 20000 /* µs */
 
+#ifdef HAVE_SYS_CDEFS_H
+#include <sys/cdefs.h>
+#endif
+
+#ifdef HAVE_SYS_SYSCALL_H
+#include <sys/syscall.h>
+#endif
+
 #if defined(OSHurd)
 #include <hurd.h>
 #include <ps.h>
@@ -52,17 +60,15 @@
 #if defined(OSOpenBSD) || defined(OSFreeBSD) || defined(OSNetBSD)
 #include <sys/param.h>
 #include <sys/proc.h>
-#include <sys/stat.h>
-#include <sys/types.h>
 
 #include <err.h>
-#include <limits.h>
 #endif
 
 #ifdef HAVE_KVM_H
-#include <kvm.h>
 #include <sys/sysctl.h>
 #include <sys/user.h>
+
+#include <kvm.h>
 #endif
 
 #if defined(OShpux)
@@ -70,50 +76,42 @@
 #include <sys/pstat.h>
 #endif
 
-#include <errno.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-#include <signal.h>
-#include <sys/stat.h>
-#include <dirent.h>
+#include <sys/types.h>
 #include <sys/time.h>
-#include <unistd.h>
-#include <getopt.h>
-#include <pwd.h>
-#include <grp.h>
+#include <sys/stat.h>
 #include <sys/ioctl.h>
-#include <sys/types.h>
 #include <sys/termios.h>
-#include <fcntl.h>
-#include <limits.h>
+
 #include <assert.h>
+#include <errno.h>
+#include <limits.h>
+#include <fcntl.h>
+#include <dirent.h>
 #include <ctype.h>
-
-#ifdef _POSIX_PRIORITY_SCHEDULING
-#include <sched.h>
-#else
-#define SCHED_OTHER -1
-#define SCHED_FIFO -1
-#define SCHED_RR -1
-#endif
-
-#ifdef HAVE_SYS_CDEFS_H
-#include <sys/cdefs.h>
-#endif
-
+#include <string.h>
+#include <pwd.h>
+#include <grp.h>
+#include <signal.h>
+#include <unistd.h>
 #ifdef HAVE_STDDEF_H
 #include <stddef.h>
 #endif
+#include <stdbool.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <getopt.h>
 
 #ifdef HAVE_ERROR_H
 #include <error.h>
 #endif
 
-#ifdef HAVE_SYS_SYSCALL_H
-#include <sys/syscall.h>
+#ifdef _POSIX_PRIORITY_SCHEDULING
+#include <sched.h>
+#else
+#define SCHED_OTHER -1
+#define SCHED_FIFO -1
+#define SCHED_RR -1
 #endif
 
 #if defined(OSLinux)