Merge branch 'misc/include-cleanup'

This should make it easier to read includes.

9 files changed, 33 insertions, 37 deletions

diff --git a/apt-inst/contrib/arfile.cc b/apt-inst/contrib/arfile.cc
index 905110781..26c85d066 100644
--- a/apt-inst/contrib/arfile.cc
+++ b/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>
 									/*}}}*/
diff --git a/apt-inst/contrib/arfile.h b/apt-inst/contrib/arfile.h
index 297303a9d..47624c72a 100644
--- a/apt-inst/contrib/arfile.h
+++ b/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
diff --git a/apt-inst/contrib/extracttar.cc b/apt-inst/contrib/extracttar.cc
index 60360053e..69e43d6a1 100644
--- a/apt-inst/contrib/extracttar.cc
+++ b/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>
 									/*}}}*/
diff --git a/apt-inst/deb/debfile.cc b/apt-inst/deb/debfile.cc
index 474fb1cbe..8eef446bb 100644
--- a/apt-inst/deb/debfile.cc
+++ b/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>
diff --git a/apt-inst/deb/debfile.h b/apt-inst/deb/debfile.h
index 02ebaae2e..0bc3254d6 100644
--- a/apt-inst/deb/debfile.h
+++ b/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>
 
diff --git a/apt-inst/dirstream.cc b/apt-inst/dirstream.cc
index 888020bfb..f43e9953b 100644
--- a/apt-inst/dirstream.cc
+++ b/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>
 									/*}}}*/
diff --git a/apt-inst/extract.cc b/apt-inst/extract.cc
index f50c23e46..667524c9e 100644
--- a/apt-inst/extract.cc
+++ b/apt-inst/extract.cc
@@ -44,25 +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 <apt-pkg/cacheiterators.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>
 									/*}}}*/
diff --git a/apt-inst/extract.h b/apt-inst/extract.h
index a62ff51bd..d2e355474 100644
--- a/apt-inst/extract.h
+++ b/apt-inst/extract.h
@@ -20,7 +20,6 @@
 #include <apt-pkg/dirstream.h>
 #include <apt-pkg/filelist.h>
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/cacheiterators.h>
 
 #include <string>
 
diff --git a/apt-inst/filelist.cc b/apt-inst/filelist.cc
index 6251b79b5..8a16574ea 100644
--- a/apt-inst/filelist.cc
+++ b/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>
 									/*}}}*/