Reformat and sort all includes with clang-format

This makes it easier to see which headers includes what.

The changes were done by running

    git grep -l '#\s*include'  \
        | grep -E '.(cc|h)$' \
        | xargs sed -i -E 's/(^\s*)#(\s*)include/\1#\2 include/'

To modify all include lines by adding a space, and then running
./git-clang-format.sh.

.clang-format

@@ -7,4 +7,18 @@ IndentWidth:       3
 ColumnLimit:       0
 BreakBeforeBraces: Allman
 AccessModifierOffset: 0
-SortIncludes: false
+IncludeCategories:
+  - Regex:           'apti18n.h'
+    Priority:        9999
+  - Regex:           'apt-[^/]*/'
+    Priority:        20
+  - Regex:           '^"'
+    Priority:        10
+  - Regex:           'config.h'
+    Priority:        0
+  - Regex:           '(zlib|bzlib|lzma|lz4frame|gtest/gtest|db|gnutls/.*)\.h'
+    Priority:        30
+  - Regex:           '\.h'
+    Priority:        100
+  - Regex:           '.*'
+    Priority:        99

apt-inst/contrib/arfile.cc

@@ -14,16 +14,16 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
-#include<config.h>
+#include <config.h>
 
 #include <apt-pkg/arfile.h>
-#include <apt-pkg/strutl.h>
-#include <apt-pkg/fileutl.h>
 #include <apt-pkg/error.h>
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/strutl.h>
 
+#include <string>
 #include <string.h>
 #include <sys/types.h>
-#include <string>
 
 #include <apti18n.h>
 									/*}}}*/

apt-inst/contrib/arfile.h

@@ -15,9 +15,8 @@
 #ifndef PKGLIB_ARFILE_H
 #define PKGLIB_ARFILE_H
 
-
-#include <string>
 #include <apt-pkg/macros.h>
+#include <string>
 #ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/fileutl.h>
 #endif

apt-inst/contrib/extracttar.cc

@@ -16,22 +16,22 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
-#include<config.h>
+#include <config.h>
 
+#include <apt-pkg/configuration.h>
 #include <apt-pkg/dirstream.h>
-#include <apt-pkg/extracttar.h>
 #include <apt-pkg/error.h>
-#include <apt-pkg/strutl.h>
-#include <apt-pkg/configuration.h>
+#include <apt-pkg/extracttar.h>
 #include <apt-pkg/fileutl.h>
+#include <apt-pkg/strutl.h>
 
-#include <string.h>
 #include <algorithm>
+#include <iostream>
 #include <string>
-#include <unistd.h>
-#include <signal.h>
 #include <fcntl.h>
-#include <iostream>
+#include <signal.h>
+#include <string.h>
+#include <unistd.h>
 
 #include <apti18n.h>
 									/*}}}*/

apt-inst/deb/debfile.cc

@@ -16,20 +16,20 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
-#include<config.h>
+#include <config.h>
 
-#include <apt-pkg/debfile.h>
-#include <apt-pkg/extracttar.h>
-#include <apt-pkg/error.h>
 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/arfile.h>
+#include <apt-pkg/debfile.h>
 #include <apt-pkg/dirstream.h>
+#include <apt-pkg/error.h>
+#include <apt-pkg/extracttar.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/tagfile.h>
 
-#include <string.h>
 #include <string>
 #include <vector>
+#include <string.h>
 #include <sys/stat.h>
 
 #include <apti18n.h>

apt-inst/deb/debfile.h

@@ -23,11 +23,10 @@
 #ifndef PKGLIB_DEBFILE_H
 #define PKGLIB_DEBFILE_H
 
-
 #include <apt-pkg/arfile.h>
 #include <apt-pkg/dirstream.h>
-#include <apt-pkg/tagfile.h>
 #include <apt-pkg/macros.h>
+#include <apt-pkg/tagfile.h>
 
 #include <string>
 

apt-inst/dirstream.cc

@@ -11,15 +11,15 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
-#include<config.h>
+#include <config.h>
 
 #include <apt-pkg/dirstream.h>
 #include <apt-pkg/error.h>
 
+#include <errno.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/time.h>
-#include <errno.h>
 #include <unistd.h>
 #include <apti18n.h>
 									/*}}}*/

apt-inst/extract.cc

@@ -44,24 +44,24 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
-#include<config.h>
+#include <config.h>
 
-#include <apt-pkg/extract.h>
-#include <apt-pkg/error.h>
 #include <apt-pkg/debversion.h>
-#include <apt-pkg/fileutl.h>
 #include <apt-pkg/dirstream.h>
+#include <apt-pkg/error.h>
+#include <apt-pkg/extract.h>
 #include <apt-pkg/filelist.h>
+#include <apt-pkg/fileutl.h>
 #include <apt-pkg/mmap.h>
 #include <apt-pkg/pkgcache.h>
 
-#include <string.h>
+#include <iostream>
 #include <string>
-#include <sys/stat.h>
-#include <stdio.h>
-#include <errno.h>
 #include <dirent.h>
-#include <iostream>
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/stat.h>
 
 #include <apti18n.h>
 									/*}}}*/

apt-inst/filelist.cc

@@ -32,15 +32,15 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
-#include<config.h>
+#include <config.h>
 
+#include <apt-pkg/error.h>
 #include <apt-pkg/filelist.h>
 #include <apt-pkg/mmap.h>
-#include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>
 
-#include <string.h>
 #include <iostream>
+#include <string.h>
 #include <apti18n.h>
 									/*}}}*/
 

apt-pkg/acquire-item.cc

@@ -16,36 +16,36 @@
 #include <config.h>
 
 #include <apt-pkg/acquire-item.h>
-#include <apt-pkg/configuration.h>
+#include <apt-pkg/acquire.h>
 #include <apt-pkg/aptconfiguration.h>
-#include <apt-pkg/sourcelist.h>
+#include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>
-#include <apt-pkg/strutl.h>
 #include <apt-pkg/fileutl.h>
-#include <apt-pkg/tagfile.h>
-#include <apt-pkg/metaindex.h>
-#include <apt-pkg/acquire.h>
+#include <apt-pkg/gpgv.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/indexfile.h>
+#include <apt-pkg/metaindex.h>
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/pkgrecords.h>
-#include <apt-pkg/gpgv.h>
+#include <apt-pkg/sourcelist.h>
+#include <apt-pkg/strutl.h>
+#include <apt-pkg/tagfile.h>
 
 #include <algorithm>
+#include <ctime>
+#include <iostream>
+#include <numeric>
+#include <random>
+#include <sstream>
+#include <string>
+#include <vector>
+#include <errno.h>
 #include <stddef.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <iostream>
-#include <vector>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <errno.h>
-#include <string>
-#include <stdio.h>
-#include <ctime>
-#include <sstream>
-#include <numeric>
-#include <random>
 
 #include <apti18n.h>
 									/*}}}*/

apt-pkg/acquire-item.h

@@ -20,18 +20,18 @@
 #define PKGLIB_ACQUIRE_ITEM_H
 
 #include <apt-pkg/acquire.h>
-#include <apt-pkg/indexfile.h>
 #include <apt-pkg/hashes.h>
-#include <apt-pkg/weakptr.h>
+#include <apt-pkg/indexfile.h>
 #include <apt-pkg/pkgcache.h>
+#include <apt-pkg/weakptr.h>
 
+#include <map>
 #include <string>
 #include <vector>
-#include <map>
 
 #ifndef APT_8_CLEANER_HEADERS
-#include <apt-pkg/sourcelist.h>
 #include <apt-pkg/pkgrecords.h>
+#include <apt-pkg/sourcelist.h>
 #endif
 
 /** \addtogroup acquire

apt-pkg/acquire-method.cc

@@ -18,23 +18,23 @@
 #include <config.h>
 
 #include <apt-pkg/acquire-method.h>
-#include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>
-#include <apt-pkg/strutl.h>
+#include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/md5.h>
 #include <apt-pkg/sha1.h>
 #include <apt-pkg/sha2.h>
+#include <apt-pkg/strutl.h>
 
+#include <iostream>
+#include <string>
+#include <vector>
 #include <stdarg.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <string>
-#include <vector>
-#include <iostream>
-#include <stdio.h>
 									/*}}}*/
 
 using namespace std;

apt-pkg/acquire-worker.cc

@@ -14,27 +14,27 @@
 // Include Files							/*{{{*/
 #include <config.h>
 
-#include <apt-pkg/acquire.h>
-#include <apt-pkg/acquire-worker.h>
 #include <apt-pkg/acquire-item.h>
+#include <apt-pkg/acquire-worker.h>
+#include <apt-pkg/acquire.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
-#include <apt-pkg/strutl.h>
 #include <apt-pkg/hashes.h>
+#include <apt-pkg/strutl.h>
 
 #include <algorithm>
+#include <iostream>
 #include <string>
 #include <vector>
-#include <iostream>
 
-#include <sys/stat.h>
-#include <stdlib.h>
-#include <unistd.h>
+#include <sstream>
+#include <errno.h>
 #include <signal.h>
 #include <stdio.h>
-#include <errno.h>
-#include <sstream>
+#include <stdlib.h>
+#include <sys/stat.h>
+#include <unistd.h>
 
 #include <apti18n.h>
 									/*}}}*/

apt-pkg/acquire-worker.h

@@ -21,9 +21,9 @@
 #include <apt-pkg/acquire.h>
 #include <apt-pkg/weakptr.h>
 
-#include <sys/types.h>
 #include <string>
 #include <vector>
+#include <sys/types.h>
 
 /** \brief A fetch subprocess.
  *

apt-pkg/acquire.cc

@@ -15,35 +15,35 @@
 // Include Files							/*{{{*/
 #include <config.h>
 
-#include <apt-pkg/acquire.h>
 #include <apt-pkg/acquire-item.h>
 #include <apt-pkg/acquire-worker.h>
+#include <apt-pkg/acquire.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>
-#include <apt-pkg/strutl.h>
 #include <apt-pkg/fileutl.h>
+#include <apt-pkg/strutl.h>
 
 #include <algorithm>
+#include <iomanip>
+#include <iostream>
+#include <memory>
 #include <numeric>
+#include <sstream>
 #include <string>
 #include <vector>
-#include <iostream>
-#include <sstream>
-#include <iomanip>
-#include <memory>
 
+#include <dirent.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <grp.h>
+#include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <pwd.h>
-#include <grp.h>
-#include <dirent.h>
-#include <sys/time.h>
 #include <sys/select.h>
-#include <errno.h>
 #include <sys/stat.h>
+#include <sys/time.h>
+#include <unistd.h>
 
 #include <apti18n.h>
 									/*}}}*/

apt-pkg/acquire.h

@@ -65,16 +65,16 @@
 #ifndef PKGLIB_ACQUIRE_H
 #define PKGLIB_ACQUIRE_H
 
+#include <apt-pkg/hashes.h>
 #include <apt-pkg/macros.h>
 #include <apt-pkg/weakptr.h>
-#include <apt-pkg/hashes.h>
 
 #include <string>
 #include <vector>
 
 #include <stddef.h>
-#include <sys/time.h>
 #include <sys/select.h>
+#include <sys/time.h>
 
 #ifndef APT_10_CLEANER_HEADERS
 #include <unistd.h>

apt-pkg/algorithms.cc

@@ -17,20 +17,20 @@
 #include <config.h>
 
 #include <apt-pkg/algorithms.h>
-#include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>
-#include <apt-pkg/edsp.h>
 #include <apt-pkg/depcache.h>
+#include <apt-pkg/dpkgpm.h>
+#include <apt-pkg/edsp.h>
+#include <apt-pkg/error.h>
 #include <apt-pkg/packagemanager.h>
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/prettyprinters.h>
-#include <apt-pkg/dpkgpm.h>
 
-#include <string.h>
-#include <string>
 #include <cstdlib>
 #include <iostream>
+#include <string>
 #include <utility>
+#include <string.h>
 
 #include <apti18n.h>
 									/*}}}*/

apt-pkg/algorithms.h

@@ -29,9 +29,8 @@
 #ifndef PKGLIB_ALGORITHMS_H
 #define PKGLIB_ALGORITHMS_H
 
-
-#include <apt-pkg/packagemanager.h>
 #include <apt-pkg/depcache.h>
+#include <apt-pkg/packagemanager.h>
 #include <apt-pkg/pkgcache.h>
 
 #include <iostream>
@@ -46,8 +45,8 @@ using std::ostream;
 
 #ifndef APT_9_CLEANER_HEADERS
 // include pkg{DistUpgrade,AllUpgrade,MiniizeUpgrade} here for compatibility
-#include <apt-pkg/upgrade.h>
 #include <apt-pkg/update.h>
+#include <apt-pkg/upgrade.h>
 #endif
 
 

apt-pkg/aptconfiguration.cc

@@ -15,20 +15,20 @@
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/macros.h>
-#include <apt-pkg/strutl.h>
 #include <apt-pkg/pkgsystem.h>
+#include <apt-pkg/strutl.h>
 
+#include <algorithm>
+#include <string>
+#include <vector>
+#include <ctype.h>
 #include <dirent.h>
-#include <stdio.h>
 #include <fcntl.h>
-#include <ctype.h>
 #include <stddef.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <algorithm>
-#include <string>
-#include <vector>
 
 									/*}}}*/
 namespace APT {

apt-pkg/aptconfiguration.h

@@ -11,9 +11,9 @@
 #ifndef APT_CONFIGURATION_H
 #define APT_CONFIGURATION_H
 // Include Files							/*{{{*/
+#include <limits>
 #include <string>
 #include <vector>
-#include <limits>
 									/*}}}*/
 namespace APT {
 namespace Configuration {							/*{{{*/

apt-pkg/cachefile.cc

@@ -15,24 +15,24 @@
 #include <config.h>
 
 #include <apt-pkg/cachefile.h>
-#include <apt-pkg/error.h>
-#include <apt-pkg/sourcelist.h>
-#include <apt-pkg/pkgcachegen.h>
 #include <apt-pkg/configuration.h>
-#include <apt-pkg/policy.h>
-#include <apt-pkg/pkgsystem.h>
-#include <apt-pkg/fileutl.h>
-#include <apt-pkg/progress.h>
 #include <apt-pkg/depcache.h>
+#include <apt-pkg/error.h>
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/indexfile.h>
 #include <apt-pkg/mmap.h>
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/indexfile.h>
+#include <apt-pkg/pkgcachegen.h>
+#include <apt-pkg/pkgsystem.h>
+#include <apt-pkg/policy.h>
+#include <apt-pkg/progress.h>
+#include <apt-pkg/sourcelist.h>
 
-#include <string.h>
-#include <unistd.h>
+#include <memory>
 #include <string>
 #include <vector>
-#include <memory>
+#include <string.h>
+#include <unistd.h>
 
 #include <apti18n.h>
 									/*}}}*/

apt-pkg/cachefilter.cc

@@ -9,16 +9,16 @@
 #include <apt-pkg/cachefile.h>
 #include <apt-pkg/cachefilter.h>
 #include <apt-pkg/error.h>
+#include <apt-pkg/macros.h>
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/strutl.h>
-#include <apt-pkg/macros.h>
 
 #include <algorithm>
 #include <string>
 #include <unordered_map>
-#include <string.h>
-#include <regex.h>
 #include <fnmatch.h>
+#include <regex.h>
+#include <string.h>
 
 #include <apti18n.h>
 									/*}}}*/

apt-pkg/cacheiterators.h

@@ -29,17 +29,17 @@
 									/*}}}*/
 #ifndef PKGLIB_CACHEITERATORS_H
 #define PKGLIB_CACHEITERATORS_H
-#include<apt-pkg/pkgcache.h>
-#include<apt-pkg/macros.h>
+#include <apt-pkg/macros.h>
+#include <apt-pkg/pkgcache.h>
 
-#include<iterator>
 #include <iosfwd>
+#include <iterator>
 #include <string>
 #ifdef APT_PKG_EXPOSE_STRING_VIEW
 #include <apt-pkg/string_view.h>
 #endif
 
-#include<string.h>
+#include <string.h>
 
 // abstract Iterator template						/*{{{*/
 /* This template provides the very basic iterator methods we

apt-pkg/cacheset.cc

@@ -15,23 +15,23 @@
 #include <apt-pkg/cachefile.h>
 #include <apt-pkg/cachefilter.h>
 #include <apt-pkg/cacheset.h>
-#include <apt-pkg/error.h>
-#include <apt-pkg/versionmatch.h>
-#include <apt-pkg/pkgrecords.h>
-#include <apt-pkg/policy.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/depcache.h>
+#include <apt-pkg/error.h>
+#include <apt-pkg/fileutl.h>
 #include <apt-pkg/macros.h>
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/fileutl.h>
+#include <apt-pkg/pkgrecords.h>
+#include <apt-pkg/policy.h>
+#include <apt-pkg/versionmatch.h>
 
-#include <stddef.h>
-#include <stdio.h>
-#include <string.h>
-#include <regex.h>
 #include <list>
 #include <string>
 #include <vector>
+#include <regex.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <string.h>
 
 #include <apti18n.h>
 									/*}}}*/

apt-pkg/cacheset.h

@@ -13,22 +13,22 @@
 #include <map>
 #include <set>
 #if __cplusplus >= 201103L
-#include <unordered_set>
 #include <forward_list>
 #include <initializer_list>
+#include <unordered_set>
 #endif
-#include <list>
+#include <algorithm>
 #include <deque>
-#include <vector>
-#include <string>
 #include <iterator>
-#include <algorithm>
+#include <list>
+#include <string>
+#include <vector>
 
 #include <stddef.h>
 
 #include <apt-pkg/error.h>
-#include <apt-pkg/pkgcache.h>
 #include <apt-pkg/macros.h>
+#include <apt-pkg/pkgcache.h>
 
 #ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/cachefile.h>

apt-pkg/cdrom.cc

@@ -2,31 +2,30 @@
  */
 #include <config.h>
 
-#include <apt-pkg/error.h>
-#include <apt-pkg/cdromutl.h>
-#include <apt-pkg/strutl.h>
-#include <apt-pkg/cdrom.h>
 #include <apt-pkg/aptconfiguration.h>
+#include <apt-pkg/cdrom.h>
+#include <apt-pkg/cdromutl.h>
 #include <apt-pkg/configuration.h>
+#include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/indexcopy.h>
+#include <apt-pkg/strutl.h>
 
-
-#include <string.h>
+#include <algorithm>
+#include <fstream>
+#include <iostream>
 #include <iostream>
+#include <sstream>
 #include <string>
 #include <vector>
-#include <sys/stat.h>
 #include <dirent.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <algorithm>
 #include <dlfcn.h>
-#include <iostream>
-#include <sstream>
-#include <fstream>
+#include <stdio.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <unistd.h>
 
-#include<apti18n.h>
+#include <apti18n.h>
 
 using namespace std;
 

apt-pkg/cdrom.h

@@ -3,8 +3,8 @@
 
 #include <apt-pkg/macros.h>
 
-#include<string>
-#include<vector>
+#include <string>
+#include <vector>
 
 #include <stddef.h>
 

apt-pkg/clean.cc

@@ -8,23 +8,23 @@
    ##################################################################### */
 									/*}}}*/
 // Includes								/*{{{*/
-#include<config.h>
+#include <config.h>
 
+#include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/clean.h>
-#include <apt-pkg/strutl.h>
-#include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>
-#include <apt-pkg/aptconfiguration.h>
+#include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/pkgcache.h>
+#include <apt-pkg/strutl.h>
 
 #include <string>
-#include <string.h>
 #include <dirent.h>
-#include <sys/types.h>
+#include <fcntl.h>
+#include <string.h>
 #include <sys/stat.h>
+#include <sys/types.h>
 #include <unistd.h>
-#include <fcntl.h>
 
 #include <apti18n.h>
 									/*}}}*/

apt-pkg/contrib/cdromutl.cc

@@ -10,26 +10,26 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
-#include<config.h>
+#include <config.h>
 
 #include <apt-pkg/cdromutl.h>
+#include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>
-#include <apt-pkg/md5.h>
 #include <apt-pkg/fileutl.h>
-#include <apt-pkg/configuration.h>
+#include <apt-pkg/md5.h>
 #include <apt-pkg/strutl.h>
 
-#include <stdlib.h>
-#include <string.h>
 #include <iostream>
 #include <string>
 #include <vector>
-#include <sys/statvfs.h>
 #include <dirent.h>
 #include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <sys/stat.h>
+#include <sys/statvfs.h>
 #include <unistd.h>
-#include <stdio.h>
 
 #include <apti18n.h>
 									/*}}}*/

apt-pkg/contrib/cmndline.cc

@@ -11,17 +11,17 @@
    ##################################################################### */
 									/*}}}*/
 // Include files							/*{{{*/
-#include<config.h>
+#include <config.h>
 
-#include <apt-pkg/configuration.h>
 #include <apt-pkg/cmndline.h>
+#include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>
 
+#include <string>
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
-#include <string>
 
 #include <apti18n.h>
 									/*}}}*/

apt-pkg/contrib/configuration.cc

@@ -19,9 +19,9 @@
 
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>
-#include <apt-pkg/strutl.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/macros.h>
+#include <apt-pkg/strutl.h>
 
 #include <ctype.h>
 #include <regex.h>
@@ -31,13 +31,13 @@
 #include <string.h>
 
 #include <algorithm>
-#include <iterator>
-#include <string>
-#include <stack>
-#include <vector>
 #include <fstream>
+#include <iterator>
 #include <sstream>
+#include <stack>
+#include <string>
 #include <unordered_map>
+#include <vector>
 
 #include <apti18n.h>
 

apt-pkg/contrib/configuration.h

@@ -30,9 +30,9 @@
 
 #include <regex.h>
 
+#include <iostream>
 #include <string>
 #include <vector>
-#include <iostream>
 
 #include <apt-pkg/macros.h>
 

apt-pkg/contrib/error.cc

@@ -17,17 +17,17 @@
 
 #include <apt-pkg/error.h>
 
-#include <stdarg.h>
-#include <stddef.h>
-#include <list>
+#include <algorithm>
+#include <cstring>
 #include <iostream>
+#include <list>
+#include <string>
 #include <errno.h>
+#include <stdarg.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <string>
-#include <cstring>
-#include <algorithm>
 
 									/*}}}*/
 
@@ -37,20 +37,21 @@
    Per-Thread error object is maintained in much the same manner as libc
    manages errno */
 #if defined(_POSIX_THREADS) && defined(HAVE_PTHREAD)
-	#include <pthread.h>
+#include <pthread.h>
 
-	static pthread_key_t ErrorKey;
-	static void ErrorDestroy(void *Obj) {delete (GlobalError *)Obj;};
-	static void KeyAlloc() {pthread_key_create(&ErrorKey,ErrorDestroy);};
+static pthread_key_t ErrorKey;
+static void ErrorDestroy(void *Obj) { delete (GlobalError *)Obj; };
+static void KeyAlloc() { pthread_key_create(&ErrorKey, ErrorDestroy); };
 
-	GlobalError *_GetErrorObj() {
-		static pthread_once_t Once = PTHREAD_ONCE_INIT;
-		pthread_once(&Once,KeyAlloc);
+GlobalError *_GetErrorObj()
+{
+   static pthread_once_t Once = PTHREAD_ONCE_INIT;
+   pthread_once(&Once, KeyAlloc);
 
-		void *Res = pthread_getspecific(ErrorKey);
-		if (Res == 0)
-			pthread_setspecific(ErrorKey,Res = new GlobalError);
-		return (GlobalError *)Res;
+   void *Res = pthread_getspecific(ErrorKey);
+   if (Res == 0)
+      pthread_setspecific(ErrorKey, Res = new GlobalError);
+   return (GlobalError *)Res;
 	}
 #else
 	GlobalError *_GetErrorObj() {

apt-pkg/contrib/error.h

@@ -46,8 +46,8 @@
 #include <list>
 #include <string>
 
-#include <stddef.h>
 #include <stdarg.h>
+#include <stddef.h>
 
 class GlobalError							/*{{{*/
 {

apt-pkg/contrib/fileutl.cc

@@ -19,52 +19,52 @@
 // Include Files							/*{{{*/
 #include <config.h>
 
-#include <apt-pkg/fileutl.h>
-#include <apt-pkg/strutl.h>
-#include <apt-pkg/error.h>
-#include <apt-pkg/sptr.h>
 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/configuration.h>
+#include <apt-pkg/error.h>
+#include <apt-pkg/fileutl.h>
 #include <apt-pkg/macros.h>
+#include <apt-pkg/sptr.h>
+#include <apt-pkg/strutl.h>
 
-#include <ctype.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <sys/select.h>
-#include <time.h>
-#include <string>
-#include <vector>
+#include <cstdio>
 #include <cstdlib>
 #include <cstring>
-#include <cstdio>
 #include <iostream>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/wait.h>
+#include <string>
+#include <vector>
+#include <ctype.h>
 #include <dirent.h>
-#include <signal.h>
 #include <errno.h>
+#include <fcntl.h>
 #include <glob.h>
-#include <pwd.h>
 #include <grp.h>
+#include <pwd.h>
+#include <signal.h>
+#include <stdarg.h>
+#include <stddef.h>
+#include <sys/select.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/wait.h>
+#include <time.h>
+#include <unistd.h>
 
-#include <set>
 #include <algorithm>
 #include <memory>
+#include <set>
 
 #ifdef HAVE_ZLIB
-	#include <zlib.h>
+#include <zlib.h>
 #endif
 #ifdef HAVE_BZ2
-	#include <bzlib.h>
+#include <bzlib.h>
 #endif
 #ifdef HAVE_LZMA
-	#include <lzma.h>
+#include <lzma.h>
 #endif
 #ifdef HAVE_LZ4
-	#include <lz4frame.h>
+#include <lz4frame.h>
 #endif
 #include <endian.h>
 #include <stdint.h>

apt-pkg/contrib/fileutl.h

@@ -21,12 +21,12 @@
 #ifndef PKGLIB_FILEUTL_H
 #define PKGLIB_FILEUTL_H
 
-#include <apt-pkg/macros.h>
 #include <apt-pkg/aptconfiguration.h>
+#include <apt-pkg/macros.h>
 
+#include <set>
 #include <string>
 #include <vector>
-#include <set>
 #include <time.h>
 
 #include <zlib.h>

apt-pkg/contrib/gpgv.cc

@@ -1,21 +1,21 @@
 // -*- mode: cpp; mode: fold -*-
 // Include Files							/*{{{*/
-#include<config.h>
+#include <config.h>
 
-#include<apt-pkg/configuration.h>
-#include<apt-pkg/error.h>
-#include<apt-pkg/strutl.h>
-#include<apt-pkg/fileutl.h>
-#include<apt-pkg/gpgv.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/error.h>
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/gpgv.h>
+#include <apt-pkg/strutl.h>
 
 #include <errno.h>
+#include <fcntl.h>
+#include <stddef.h>
 #include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
-#include <fcntl.h>
+#include <string.h>
 #include <sys/wait.h>
 #include <unistd.h>
-#include <stddef.h>
 
 #include <algorithm>
 #include <fstream>

apt-pkg/contrib/hashes.cc

@@ -13,19 +13,19 @@
 // Include Files							/*{{{*/
 #include <config.h>
 
-#include <apt-pkg/hashes.h>
-#include <apt-pkg/fileutl.h>
 #include <apt-pkg/configuration.h>
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/hashes.h>
 #include <apt-pkg/md5.h>
 #include <apt-pkg/sha1.h>
 #include <apt-pkg/sha2.h>
 
-#include <stddef.h>
 #include <algorithm>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string>
 #include <iostream>
+#include <string>
+#include <stddef.h>
+#include <stdlib.h>
+#include <unistd.h>
 									/*}}}*/
 
 const char * HashString::_SupportedHashes[] =

apt-pkg/contrib/hashes.h

@@ -13,11 +13,10 @@
 #ifndef APTPKG_HASHES_H
 #define APTPKG_HASHES_H
 
-
+#include <apt-pkg/macros.h>
 #include <apt-pkg/md5.h>
 #include <apt-pkg/sha1.h>
 #include <apt-pkg/sha2.h>
-#include <apt-pkg/macros.h>
 
 #include <cstring>
 #include <string>

apt-pkg/contrib/hashsum.cc

@@ -3,9 +3,9 @@
 
 #include <apt-pkg/fileutl.h>
 
+#include "hashsum_template.h"
 #include <algorithm>
 #include <unistd.h>
-#include "hashsum_template.h"
 
 // Summation::AddFD - Add content of file into the checksum		/*{{{*/
 // ---------------------------------------------------------------------

apt-pkg/contrib/hashsum_template.h

@@ -10,9 +10,8 @@
 #ifndef APTPKG_HASHSUM_TEMPLATE_H
 #define APTPKG_HASHSUM_TEMPLATE_H
 
-
-#include <string>
 #include <cstring>
+#include <string>
 #ifdef APT_PKG_EXPOSE_STRING_VIEW
 #include <apt-pkg/string_view.h>
 #endif

apt-pkg/contrib/md5.h

@@ -28,9 +28,9 @@
 #include "hashsum_template.h"
 
 #ifndef APT_10_CLEANER_HEADERS
-#include <string>
-#include <cstring>
 #include <algorithm>
+#include <cstring>
+#include <string>
 #endif
 #ifndef APT_8_CLEANER_HEADERS
 using std::string;

apt-pkg/contrib/mmap.cc

@@ -19,17 +19,17 @@
 #define _DEFAULT_SOURCE
 #include <config.h>
 
-#include <apt-pkg/mmap.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/macros.h>
+#include <apt-pkg/mmap.h>
 
+#include <cstring>
 #include <string>
+#include <errno.h>
+#include <stdlib.h>
 #include <sys/mman.h>
 #include <unistd.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <cstring>
 
 #include <apti18n.h>
 									/*}}}*/

apt-pkg/contrib/mmap.h

@@ -25,7 +25,6 @@
 #ifndef PKGLIB_MMAP_H
 #define PKGLIB_MMAP_H
 
-
 #include <string>
 
 #ifndef APT_8_CLEANER_HEADERS

apt-pkg/contrib/netrc.cc

@@ -17,12 +17,12 @@
 #include <apt-pkg/strutl.h>
 
 #include <iostream>
+#include <pwd.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <stddef.h>
-#include <pwd.h>
 
 #include "netrc.h"
 

apt-pkg/contrib/progress.cc

@@ -10,15 +10,15 @@
 // Include Files							/*{{{*/
 #include <config.h>
 
-#include <apt-pkg/progress.h>
-#include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>
+#include <apt-pkg/error.h>
+#include <apt-pkg/progress.h>
 
-#include <sys/time.h>
-#include <string>
+#include <cstring>
 #include <iostream>
+#include <string>
 #include <stdio.h>
-#include <cstring>
+#include <sys/time.h>
 
 #include <apti18n.h>
 									/*}}}*/

apt-pkg/contrib/progress.h

@@ -21,10 +21,9 @@
 #ifndef PKGLIB_PROGRESS_H
 #define PKGLIB_PROGRESS_H
 
-
+#include <apt-pkg/macros.h>
 #include <string>
 #include <sys/time.h>
-#include <apt-pkg/macros.h>
 
 #ifndef APT_8_CLEANER_HEADERS
 using std::string;

apt-pkg/contrib/proxy.cc

@@ -7,15 +7,15 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
-#include<apt-pkg/configuration.h>
-#include<apt-pkg/error.h>
-#include<apt-pkg/fileutl.h>
-#include<apt-pkg/strutl.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/error.h>
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/strutl.h>
 
 #include <algorithm>
-#include<iostream>
-#include<fcntl.h>
-#include<unistd.h>
+#include <iostream>
+#include <fcntl.h>
+#include <unistd.h>
 
 #include "proxy.h"
 									/*}}}*/

apt-pkg/contrib/sha1.h

@@ -17,9 +17,9 @@
 #include "hashsum_template.h"
 
 #ifndef APT_10_CLEANER_HEADERS
-#include <string>
-#include <cstring>
 #include <algorithm>
+#include <cstring>
+#include <string>
 #endif
 #ifndef APT_8_CLEANER_HEADERS
 using std::string;

apt-pkg/contrib/sha2.h

@@ -16,12 +16,12 @@
 
 #include <cstring>
 
-#include "sha2_internal.h"
 #include "hashsum_template.h"
+#include "sha2_internal.h"
 
 #ifndef APT_10_CLEANER_HEADERS
-#include <string>
 #include <algorithm>
+#include <string>
 #include <stdint.h>
 #endif
 

apt-pkg/contrib/sha2_internal.cc

@@ -33,10 +33,10 @@
  */
 #include <config.h>
 
-#include <endian.h>
-#include <string.h>	/* memcpy()/memset() or bcopy()/bzero() */
-#include <assert.h>	/* assert() */
 #include "sha2_internal.h"
+#include <assert.h> /* assert() */
+#include <endian.h>
+#include <string.h> /* memcpy()/memset() or bcopy()/bzero() */
 
 /*
  * ASSERT NOTE:

apt-pkg/contrib/sha2_internal.h

@@ -44,8 +44,8 @@
 
 #ifdef SHA2_USE_INTTYPES_H
 
-#include <stddef.h>
 #include <inttypes.h>
+#include <stddef.h>
 
 #endif /* SHA2_USE_INTTYPES_H */
 

apt-pkg/contrib/srvrec.cc

@@ -10,8 +10,8 @@
 
 #include <netdb.h>
 
-#include <netinet/in.h>
 #include <arpa/nameser.h>
+#include <netinet/in.h>
 #include <resolv.h>
 #include <time.h>
 
@@ -22,10 +22,8 @@
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>
 
-
 #include "srvrec.h"
 
-
 bool SrvRec::operator==(SrvRec const &other) const
 {
    return (std::tie(target, priority, weight, port) ==

apt-pkg/contrib/srvrec.h

@@ -9,9 +9,9 @@
 #ifndef SRVREC_H
 #define SRVREC_H
 
-#include <arpa/nameser.h>
-#include <vector>
 #include <string>
+#include <vector>
+#include <arpa/nameser.h>
 
 class SrvRec
 {

apt-pkg/contrib/string_view.h

@@ -11,9 +11,9 @@
 
 #if !defined(APT_STRINGVIEW_H) && defined(APT_PKG_EXPOSE_STRING_VIEW)
 #define APT_STRINGVIEW_H
-#include <string.h>
-#include <string>
 #include <apt-pkg/macros.h>
+#include <string>
+#include <string.h>
 
 namespace APT {
 

apt-pkg/contrib/strutl.cc

@@ -17,30 +17,30 @@
 // Includes								/*{{{*/
 #include <config.h>
 
-#include <apt-pkg/strutl.h>
-#include <apt-pkg/fileutl.h>
 #include <apt-pkg/error.h>
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/strutl.h>
 
-#include <array>
 #include <algorithm>
+#include <array>
 #include <iomanip>
 #include <locale>
 #include <sstream>
-#include <string>
 #include <sstream>
+#include <string>
 #include <vector>
 
+#include <ctype.h>
+#include <errno.h>
+#include <iconv.h>
+#include <regex.h>
+#include <stdarg.h>
 #include <stddef.h>
+#include <stdio.h>
 #include <stdlib.h>
-#include <time.h>
-#include <ctype.h>
 #include <string.h>
-#include <stdio.h>
+#include <time.h>