Merge branch 'misc/include-cleanup'

This should make it easier to read includes.

25 files changed, 105 insertions, 115 deletions

diff --git a/apt-private/acqprogress.cc b/apt-private/acqprogress.cc
index 1f053cb9f..a788ec98b 100644
--- a/apt-private/acqprogress.cc
+++ b/apt-private/acqprogress.cc
@@ -7,23 +7,23 @@
    ##################################################################### */
 									/*}}}*/
 // Include files							/*{{{*/
-#include<config.h>
+#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/strutl.h>
 #include <apt-pkg/error.h>
+#include <apt-pkg/strutl.h>
 
 #include <apt-private/acqprogress.h>
 #include <apt-private/private-output.h>
 
-#include <string.h>
-#include <stdio.h>
-#include <signal.h>
 #include <iostream>
 #include <sstream>
+#include <signal.h>
+#include <stdio.h>
+#include <string.h>
 #include <unistd.h>
 
 #include <apti18n.h>
diff --git a/apt-private/acqprogress.h b/apt-private/acqprogress.h
index 196995ac4..c8c211689 100644
--- a/apt-private/acqprogress.h
+++ b/apt-private/acqprogress.h
@@ -12,8 +12,8 @@
 #include <apt-pkg/acquire.h>
 #include <apt-pkg/macros.h>
 
-#include <string>
 #include <iostream>
+#include <string>
 
 class APT_PUBLIC AcqTextStatus : public pkgAcquireStatus2
 {
diff --git a/apt-private/private-cachefile.cc b/apt-private/private-cachefile.cc
index 77090f8eb..ab25338ff 100644
--- a/apt-private/private-cachefile.cc
+++ b/apt-private/private-cachefile.cc
@@ -1,20 +1,20 @@
 // Include files							/*{{{*/
-#include<config.h>
+#include <config.h>
 
 #include <apt-pkg/algorithms.h>
-#include <apt-pkg/upgrade.h>
-#include <apt-pkg/error.h>
+#include <apt-pkg/cacheset.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/depcache.h>
+#include <apt-pkg/error.h>
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/cacheset.h>
+#include <apt-pkg/upgrade.h>
 
-#include <apt-private/private-output.h>
 #include <apt-private/private-cachefile.h>
+#include <apt-private/private-output.h>
 
-#include <string.h>
-#include <ostream>
 #include <cstdlib>
+#include <ostream>
+#include <string.h>
 
 #include <apti18n.h>
 									/*}}}*/
diff --git a/apt-private/private-cachefile.h b/apt-private/private-cachefile.h
index 77e8b61d9..5086ceaeb 100644
--- a/apt-private/private-cachefile.h
+++ b/apt-private/private-cachefile.h
@@ -2,12 +2,12 @@
 #define APT_PRIVATE_CACHEFILE_H
 
 #include <apt-pkg/cachefile.h>
-#include <apt-pkg/progress.h>
+#include <apt-pkg/cacheset.h>
 #include <apt-pkg/configuration.h>
-#include <apt-pkg/pkgcache.h>
 #include <apt-pkg/macros.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/progress.h>
 #include <apt-pkg/sourcelist.h>
-#include <apt-pkg/cacheset.h>
 
 // class CacheFile - Cover class for some dependency cache functions	/*{{{*/
 class APT_PUBLIC CacheFile : public pkgCacheFile
diff --git a/apt-private/private-cacheset.cc b/apt-private/private-cacheset.cc
index 52cd22d2a..3d1a2b91c 100644
--- a/apt-private/private-cacheset.cc
+++ b/apt-private/private-cacheset.cc
@@ -1,14 +1,13 @@
 #include <config.h>
 
+#include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/cachefile.h>
-#include <apt-pkg/pkgcache.h>
-#include <apt-pkg/depcache.h>
-#include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/cachefilter.h>
-#include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/configuration.h>
-#include <apt-pkg/progress.h>
+#include <apt-pkg/depcache.h>
+#include <apt-pkg/pkgcache.h>
 #include <apt-pkg/policy.h>
+#include <apt-pkg/progress.h>
 #include <apt-pkg/strutl.h>
 
 #include <apt-private/private-cacheset.h>
diff --git a/apt-private/private-cacheset.h b/apt-private/private-cacheset.h
index 37c921081..7bf486b9e 100644
--- a/apt-private/private-cacheset.h
+++ b/apt-private/private-cacheset.h
@@ -6,10 +6,10 @@
 
 #include <apt-private/private-output.h>
 
-#include <vector>
 #include <list>
 #include <set>
 #include <string>
+#include <vector>
 
 class OpProgress;
 
diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc
index 6b84324de..2ecc47ba4 100644
--- a/apt-private/private-cmndline.cc
+++ b/apt-private/private-cmndline.cc
@@ -3,21 +3,21 @@
 
 #include <apt-pkg/cmndline.h>
 #include <apt-pkg/configuration.h>
+#include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
-#include <apt-pkg/pkgsystem.h>
 #include <apt-pkg/init.h>
-#include <apt-pkg/error.h>
+#include <apt-pkg/pkgsystem.h>
 #include <apt-pkg/strutl.h>
 
 #include <apt-private/private-cmndline.h>
 #include <apt-private/private-main.h>
 
 #include <stdarg.h>
-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
 
-#include <vector>
 #include <iomanip>
+#include <vector>
 
 #include <apti18n.h>
 									/*}}}*/
diff --git a/apt-private/private-depends.cc b/apt-private/private-depends.cc
index 3a3a2737a..79d66b72a 100644
--- a/apt-private/private-depends.cc
+++ b/apt-private/private-depends.cc
@@ -1,12 +1,11 @@
 // Include Files							/*{{{*/
-#include<config.h>
+#include <config.h>
 
 #include <apt-pkg/algorithms.h>
 #include <apt-pkg/cachefile.h>
-#include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/cacheset.h>
-#include <apt-pkg/configuration.h>
 #include <apt-pkg/cmndline.h>
+#include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/pkgcache.h>
 
diff --git a/apt-private/private-download.cc b/apt-private/private-download.cc
index c8d1b5a09..25dee318e 100644
--- a/apt-private/private-download.cc
+++ b/apt-private/private-download.cc
@@ -1,30 +1,30 @@
 // Include Files							/*{{{*/
 #include <config.h>
 
-#include <apt-pkg/acquire.h>
 #include <apt-pkg/acquire-item.h>
+#include <apt-pkg/acquire.h>
 #include <apt-pkg/cacheset.h>
-#include <apt-pkg/cmndline.h>
 #include <apt-pkg/clean.h>
+#include <apt-pkg/cmndline.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/strutl.h>
 
+#include <apt-private/acqprogress.h>
 #include <apt-private/private-cachefile.h>
 #include <apt-private/private-download.h>
 #include <apt-private/private-output.h>
 #include <apt-private/private-utils.h>
-#include <apt-private/acqprogress.h>
 
 #include <fstream>
 #include <string>
 #include <vector>
 
-#include <unistd.h>
-#include <sys/types.h>
-#include <pwd.h>
 #include <fcntl.h>
+#include <pwd.h>
+#include <sys/types.h>
+#include <unistd.h>
 #ifdef HAVE_VFS_H
 #include <sys/vfs.h>
 #else
@@ -33,9 +33,9 @@
 #endif
 #include <sys/mount.h>
 #endif
-#include <sys/statvfs.h>
-#include <sys/stat.h>
 #include <errno.h>
+#include <sys/stat.h>
+#include <sys/statvfs.h>
 
 #include <apti18n.h>
 									/*}}}*/
diff --git a/apt-private/private-install.cc b/apt-private/private-install.cc
index e37ff5390..aafe5542d 100644
--- a/apt-private/private-install.cc
+++ b/apt-private/private-install.cc
@@ -1,41 +1,40 @@
 // Include Files							/*{{{*/
 #include <config.h>
 
-#include <apt-pkg/acquire.h>
 #include <apt-pkg/acquire-item.h>
+#include <apt-pkg/acquire.h>
 #include <apt-pkg/algorithms.h>
 #include <apt-pkg/cachefile.h>
 #include <apt-pkg/cacheset.h>
 #include <apt-pkg/cmndline.h>
+#include <apt-pkg/configuration.h>
 #include <apt-pkg/depcache.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
+#include <apt-pkg/install-progress.h>
+#include <apt-pkg/macros.h>
+#include <apt-pkg/packagemanager.h>
+#include <apt-pkg/pkgcache.h>
 #include <apt-pkg/pkgrecords.h>
 #include <apt-pkg/pkgsystem.h>
+#include <apt-pkg/prettyprinters.h>
 #include <apt-pkg/sptr.h>
 #include <apt-pkg/strutl.h>
-#include <apt-pkg/cacheiterators.h>
-#include <apt-pkg/configuration.h>
-#include <apt-pkg/macros.h>
-#include <apt-pkg/packagemanager.h>
-#include <apt-pkg/pkgcache.h>
 #include <apt-pkg/upgrade.h>
-#include <apt-pkg/install-progress.h>
-#include <apt-pkg/prettyprinters.h>
 
-#include <stdlib.h>
-#include <string.h>
 #include <algorithm>
 #include <iostream>
+#include <map>
 #include <set>
 #include <vector>
-#include <map>
+#include <stdlib.h>
+#include <string.h>
 
 #include <apt-private/acqprogress.h>
-#include <apt-private/private-install.h>
 #include <apt-private/private-cachefile.h>
 #include <apt-private/private-cacheset.h>
 #include <apt-private/private-download.h>
+#include <apt-private/private-install.h>
 #include <apt-private/private-output.h>
 
 #include <apti18n.h>
diff --git a/apt-private/private-install.h b/apt-private/private-install.h
index d2a9bed3f..c8b065331 100644
--- a/apt-private/private-install.h
+++ b/apt-private/private-install.h
@@ -2,11 +2,10 @@
 #define APT_PRIVATE_INSTALL_H
 
 #include <apt-pkg/cachefile.h>
-#include <apt-pkg/configuration.h>
-#include <apt-pkg/pkgcache.h>
-#include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/cacheset.h>
+#include <apt-pkg/configuration.h>
 #include <apt-pkg/macros.h>
+#include <apt-pkg/pkgcache.h>
 
 #include <list>
 #include <string>
diff --git a/apt-private/private-list.cc b/apt-private/private-list.cc
index 32c8eeaa2..2c9b349a3 100644
--- a/apt-private/private-list.cc
+++ b/apt-private/private-list.cc
@@ -5,21 +5,20 @@
 #include <apt-pkg/cachefilter.h>
 #include <apt-pkg/cacheset.h>
 #include <apt-pkg/cmndline.h>
-#include <apt-pkg/pkgrecords.h>
-#include <apt-pkg/progress.h>
-#include <apt-pkg/strutl.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/macros.h>
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/cacheiterators.h>
+#include <apt-pkg/pkgrecords.h>
+#include <apt-pkg/progress.h>
+#include <apt-pkg/strutl.h>
 
 #include <apt-private/private-cacheset.h>
 #include <apt-private/private-list.h>
 #include <apt-private/private-output.h>
 
 #include <iostream>
-#include <sstream>
 #include <map>
+#include <sstream>
 #include <string>
 #include <utility>
 #include <vector>
diff --git a/apt-private/private-main.cc b/apt-private/private-main.cc
index 52f35cfdc..47b1a0921 100644
--- a/apt-private/private-main.cc
+++ b/apt-private/private-main.cc
@@ -10,13 +10,12 @@
 #include <iostream>
 #include <locale>
 
+#include <signal.h>
 #include <string.h>
 #include <unistd.h>
-#include <signal.h>
 
 #include <apti18n.h>
 
-
 void InitLocale(APT_CMD const binary)				/*{{{*/
 {
    try {
diff --git a/apt-private/private-moo.cc b/apt-private/private-moo.cc
index b8ed6efbd..ca456ed96 100644
--- a/apt-private/private-moo.cc
+++ b/apt-private/private-moo.cc
@@ -7,22 +7,22 @@
    ##################################################################### */
 									/*}}}*/
 // 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/strutl.h>
 
 #include <apt-private/private-moo.h>
 #include <apt-private/private-output.h>
 #include <apt-private/private-utils.h>
 
-#include <stddef.h>
-#include <string.h>
-#include <time.h>
 #include <iostream>
 #include <sstream>
 #include <string>
+#include <stddef.h>
+#include <string.h>
+#include <time.h>
 
 #include <apti18n.h>
 									/*}}}*/
diff --git a/apt-private/private-output.cc b/apt-private/private-output.cc
index 3b8832c21..6bc18516d 100644
--- a/apt-private/private-output.cc
+++ b/apt-private/private-output.cc
@@ -1,29 +1,28 @@
 // Include files							/*{{{*/
-#include<config.h>
+#include <config.h>
 
+#include <apt-pkg/cachefile.h>
 #include <apt-pkg/configuration.h>
-#include <apt-pkg/strutl.h>
+#include <apt-pkg/depcache.h>
 #include <apt-pkg/error.h>
-#include <apt-pkg/cachefile.h>
+#include <apt-pkg/pkgcache.h>
 #include <apt-pkg/pkgrecords.h>
 #include <apt-pkg/policy.h>
-#include <apt-pkg/depcache.h>
-#include <apt-pkg/pkgcache.h>
-#include <apt-pkg/cacheiterators.h>
+#include <apt-pkg/strutl.h>
 
-#include <apt-private/private-output.h>
 #include <apt-private/private-cachefile.h>
+#include <apt-private/private-output.h>
 
-#include <regex.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <iomanip>
 #include <iostream>
 #include <langinfo.h>
-#include <unistd.h>
+#include <regex.h>
 #include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <sys/ioctl.h>
+#include <unistd.h>
 
 #include <sstream>
 
diff --git a/apt-private/private-output.h b/apt-private/private-output.h
index 79da3d130..1ac861328 100644
--- a/apt-private/private-output.h
+++ b/apt-private/private-output.h
@@ -2,13 +2,13 @@
 #define APT_PRIVATE_OUTPUT_H
 
 #include <apt-pkg/configuration.h>
-#include <apt-pkg/pkgcache.h>
 #include <apt-pkg/macros.h>
+#include <apt-pkg/pkgcache.h>
 
-#include <functional>
 #include <fstream>
-#include <string>
+#include <functional>
 #include <iostream>
+#include <string>
 
 // forward declaration
 class pkgCacheFile;
diff --git a/apt-private/private-search.cc b/apt-private/private-search.cc
index bae04173d..b850339f9 100644
--- a/apt-private/private-search.cc
+++ b/apt-private/private-search.cc
@@ -4,26 +4,25 @@
 #include <apt-pkg/cachefile.h>
 #include <apt-pkg/cacheset.h>
 #include <apt-pkg/cmndline.h>
-#include <apt-pkg/pkgrecords.h>
-#include <apt-pkg/policy.h>
-#include <apt-pkg/progress.h>
-#include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/depcache.h>
 #include <apt-pkg/macros.h>
 #include <apt-pkg/pkgcache.h>
+#include <apt-pkg/pkgrecords.h>
+#include <apt-pkg/policy.h>
+#include <apt-pkg/progress.h>
 
 #include <apt-private/private-cacheset.h>
 #include <apt-private/private-output.h>
 #include <apt-private/private-search.h>
 #include <apt-private/private-show.h>
 
-#include <string.h>
 #include <iostream>
-#include <sstream>
 #include <map>
+#include <sstream>
 #include <string>
 #include <utility>
+#include <string.h>
 
 #include <apti18n.h>
 									/*}}}*/
diff --git a/apt-private/private-search.h b/apt-private/private-search.h
index 8ae1f38f3..518f297ca 100644
--- a/apt-private/private-search.h
+++ b/apt-private/private-search.h
@@ -1,8 +1,8 @@
 #ifndef APT_PRIVATE_SEARCH_H
 #define APT_PRIVATE_SEARCH_H
 
-#include <apt-pkg/pkgcache.h>
 #include <apt-pkg/macros.h>
+#include <apt-pkg/pkgcache.h>
 
 class CommandLine;
 
diff --git a/apt-private/private-show.cc b/apt-private/private-show.cc
index 27338a08c..3cc6a5b87 100644
--- a/apt-private/private-show.cc
+++ b/apt-private/private-show.cc
@@ -4,29 +4,28 @@
 #include <apt-pkg/cachefile.h>
 #include <apt-pkg/cacheset.h>
 #include <apt-pkg/cmndline.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/depcache.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/indexfile.h>
+#include <apt-pkg/macros.h>
+#include <apt-pkg/pkgcache.h>
 #include <apt-pkg/pkgrecords.h>
 #include <apt-pkg/pkgsystem.h>
+#include <apt-pkg/policy.h>
 #include <apt-pkg/sourcelist.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/tagfile.h>
-#include <apt-pkg/cacheiterators.h>
-#include <apt-pkg/configuration.h>
-#include <apt-pkg/depcache.h>
-#include <apt-pkg/macros.h>
-#include <apt-pkg/pkgcache.h>
-#include <apt-pkg/policy.h>
 
 #include <apt-private/private-cacheset.h>
 #include <apt-private/private-output.h>
 #include <apt-private/private-show.h>
 
-#include <stdio.h>
-#include <unistd.h>
 #include <ostream>
 #include <string>
+#include <stdio.h>
+#include <unistd.h>
 
 #include <apti18n.h>
 									/*}}}*/
diff --git a/apt-private/private-show.h b/apt-private/private-show.h
index 80871b817..e48979c2c 100644
--- a/apt-private/private-show.h
+++ b/apt-private/private-show.h
@@ -1,8 +1,8 @@
 #ifndef APT_PRIVATE_SHOW_H
 #define APT_PRIVATE_SHOW_H
 
-#include <apt-pkg/pkgcache.h>
 #include <apt-pkg/macros.h>
+#include <apt-pkg/pkgcache.h>
 
 #include <iostream>
 
diff --git a/apt-private/private-source.cc b/apt-private/private-source.cc
index e9ec7c6cf..47610cd80 100644
--- a/apt-private/private-source.cc
+++ b/apt-private/private-source.cc
@@ -6,7 +6,6 @@
 #include <apt-pkg/algorithms.h>
 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/cachefile.h>
-#include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/cacheset.h>
 #include <apt-pkg/cmndline.h>
 #include <apt-pkg/configuration.h>
@@ -17,11 +16,11 @@
 #include <apt-pkg/indexfile.h>
 #include <apt-pkg/metaindex.h>
 #include <apt-pkg/pkgcache.h>
+#include <apt-pkg/policy.h>
 #include <apt-pkg/sourcelist.h>
 #include <apt-pkg/srcrecords.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/version.h>
-#include <apt-pkg/policy.h>
 
 #include <apt-private/private-cachefile.h>
 #include <apt-private/private-cacheset.h>
@@ -39,8 +38,8 @@
 #include <unistd.h>
 
 #include <iostream>
-#include <sstream>
 #include <set>
+#include <sstream>
 #include <string>
 #include <vector>
 
diff --git a/apt-private/private-sources.cc b/apt-private/private-sources.cc
index 587571760..1d27d0ff1 100644
--- a/apt-private/private-sources.cc
+++ b/apt-private/private-sources.cc
@@ -1,24 +1,24 @@
 #include <config.h>
 
-#include <apt-pkg/hashes.h>
-#include <apt-pkg/strutl.h>
-#include <apt-pkg/configuration.h>
-#include <apt-pkg/sourcelist.h>
+#include <apt-pkg/cachefile.h>
 #include <apt-pkg/cmndline.h>
+#include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
-#include <apt-pkg/cachefile.h>
+#include <apt-pkg/hashes.h>
+#include <apt-pkg/sourcelist.h>
+#include <apt-pkg/strutl.h>
 
 #include <apt-private/private-output.h>
 #include <apt-private/private-sources.h>
 #include <apt-private/private-utils.h>
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stddef.h>
-#include <unistd.h>
 #include <iostream>
 #include <string>
+#include <stddef.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
 
 #include <apti18n.h>
 
diff --git a/apt-private/private-unmet.cc b/apt-private/private-unmet.cc
index 51ace3f47..f5161fcc3 100644
--- a/apt-private/private-unmet.cc
+++ b/apt-private/private-unmet.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Include Files							/*{{{*/
-#include<config.h>
+#include <config.h>
 
 #include <apt-pkg/cachefile.h>
 #include <apt-pkg/cmndline.h>
diff --git a/apt-private/private-update.cc b/apt-private/private-update.cc
index a886c830f..8949dab30 100644
--- a/apt-private/private-update.cc
+++ b/apt-private/private-update.cc
@@ -1,15 +1,15 @@
 // Include files							/*{{{*/
-#include<config.h>
+#include <config.h>
 
 #include <apt-pkg/acquire-item.h>
+#include <apt-pkg/acquire.h>
 #include <apt-pkg/cachefile.h>
 #include <apt-pkg/cmndline.h>
+#include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/sourcelist.h>
 #include <apt-pkg/update.h>
-#include <apt-pkg/acquire.h>
-#include <apt-pkg/configuration.h>
 
 #include <apt-private/acqprogress.h>
 #include <apt-private/private-cachefile.h>
diff --git a/apt-private/private-upgrade.cc b/apt-private/private-upgrade.cc
index 679140bfd..989f6b0c1 100644
--- a/apt-private/private-upgrade.cc
+++ b/apt-private/private-upgrade.cc
@@ -1,14 +1,14 @@
 // Includes								/*{{{*/
 #include <config.h>
 
-#include <apt-pkg/upgrade.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>
+#include <apt-pkg/upgrade.h>
 
-#include <apt-private/private-install.h>
 #include <apt-private/private-cachefile.h>
-#include <apt-private/private-upgrade.h>
+#include <apt-private/private-install.h>
 #include <apt-private/private-output.h>
+#include <apt-private/private-upgrade.h>
 
 #include <iostream>