Merge branch 'misc/include-cleanup'

This should make it easier to read includes.

13 files changed, 53 insertions, 56 deletions

diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc
index 9c02e5b87..196a0668c 100644
--- a/ftparchive/apt-ftparchive.cc
+++ b/ftparchive/apt-ftparchive.cc
@@ -12,33 +12,33 @@
 // Include Files							/*{{{*/
 #include <config.h>
 
-#include <apt-pkg/error.h>
-#include <apt-pkg/configuration.h>
 #include <apt-pkg/cmndline.h>
-#include <apt-pkg/strutl.h>
-#include <apt-pkg/init.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
+#include <apt-pkg/init.h>
+#include <apt-pkg/strutl.h>
 
 #include <apt-private/private-cmndline.h>
-#include <apt-private/private-output.h>
 #include <apt-private/private-main.h>
+#include <apt-private/private-output.h>
 
 #include <algorithm>
 #include <climits>
-#include <sys/time.h>
-#include <locale.h>
-#include <stdio.h>
-#include <sys/stat.h>
-#include <time.h>
 #include <functional>
 #include <iostream>
 #include <string>
 #include <vector>
+#include <locale.h>
+#include <stdio.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <time.h>
 
-#include "cachedb.h"
-#include "override.h"
 #include "apt-ftparchive.h"
+#include "cachedb.h"
 #include "multicompress.h"
+#include "override.h"
 #include "writer.h"
 
 #include <apti18n.h>
diff --git a/ftparchive/apt-ftparchive.h b/ftparchive/apt-ftparchive.h
index 240cf9ba7..b1ce17545 100644
--- a/ftparchive/apt-ftparchive.h
+++ b/ftparchive/apt-ftparchive.h
@@ -13,7 +13,6 @@
 #ifndef APT_FTPARCHIVE_H
 #define APT_FTPARCHIVE_H
 
-
 #include <fstream>
 
 using std::ostream;
diff --git a/ftparchive/byhash.cc b/ftparchive/byhash.cc
index 354d089c3..b24f6158e 100644
--- a/ftparchive/byhash.cc
+++ b/ftparchive/byhash.cc
@@ -11,15 +11,15 @@
 // Include Files							/*{{{*/
 #include <config.h>
 
-#include<algorithm>
-#include<string>
+#include <algorithm>
+#include <string>
 
-#include <unistd.h>
 #include <sys/stat.h>
+#include <unistd.h>
 
+#include "byhash.h"
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/hashes.h>
-#include "byhash.h"
 
 // Delete all files in a directory except the most recent N ones
 void DeleteAllButMostRecent(std::string dir, int KeepFiles)
diff --git a/ftparchive/cachedb.cc b/ftparchive/cachedb.cc
index 868029abd..210ce6dc1 100644
--- a/ftparchive/cachedb.cc
+++ b/ftparchive/cachedb.cc
@@ -12,22 +12,22 @@
 // Include Files							/*{{{*/
 #include <config.h>
 
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/debfile.h>
 #include <apt-pkg/error.h>
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/gpgv.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 <apt-pkg/configuration.h>
-#include <apt-pkg/fileutl.h>
-#include <apt-pkg/debfile.h>
-#include <apt-pkg/gpgv.h>
-#include <apt-pkg/hashes.h>
 
-#include <netinet/in.h>       // htonl, etc
 #include <ctype.h>
+#include <netinet/in.h> // htonl, etc
 #include <stddef.h>
-#include <sys/stat.h>
 #include <strings.h>
+#include <sys/stat.h>
 
 #include "cachedb.h"
 
diff --git a/ftparchive/cachedb.h b/ftparchive/cachedb.h
index 417c25a9f..117ba5a1b 100644
--- a/ftparchive/cachedb.h
+++ b/ftparchive/cachedb.h
@@ -12,15 +12,15 @@
 #ifndef CACHEDB_H
 #define CACHEDB_H
 
-#include <apt-pkg/hashes.h>
 #include <apt-pkg/debfile.h>
+#include <apt-pkg/hashes.h>
 
 #include <db.h>
-#include <errno.h>
 #include <string>
-#include <string.h>
+#include <errno.h>
 #include <stdint.h>
 #include <stdio.h>
+#include <string.h>
 
 #include "contents.h"
 #include "sources.h"
diff --git a/ftparchive/contents.h b/ftparchive/contents.h
index bc691d473..8691b0e87 100644
--- a/ftparchive/contents.h
+++ b/ftparchive/contents.h
@@ -12,9 +12,9 @@
 
 #include <apt-pkg/dirstream.h>
 
+#include <string>
 #include <stddef.h>
 #include <stdio.h>
-#include <string>
 
 class debDebFile;
 class FileFd;
diff --git a/ftparchive/multicompress.cc b/ftparchive/multicompress.cc
index 0a8d4d109..abb8c5906 100644
--- a/ftparchive/multicompress.cc
+++ b/ftparchive/multicompress.cc
@@ -16,17 +16,17 @@
 // Include Files							/*{{{*/
 #include <config.h>
 
-#include <apt-pkg/fileutl.h>
-#include <apt-pkg/strutl.h>
-#include <apt-pkg/error.h>
-#include <apt-pkg/md5.h>
 #include <apt-pkg/aptconfiguration.h>
+#include <apt-pkg/error.h>
+#include <apt-pkg/fileutl.h>
 #include <apt-pkg/hashsum_template.h>
+#include <apt-pkg/md5.h>
+#include <apt-pkg/strutl.h>
 
 #include <ctype.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/time.h>
+#include <sys/types.h>
 #include <unistd.h>
 
 #include <algorithm>
diff --git a/ftparchive/multicompress.h b/ftparchive/multicompress.h
index 161716b86..50453acab 100644
--- a/ftparchive/multicompress.h
+++ b/ftparchive/multicompress.h
@@ -16,8 +16,8 @@
 #ifndef MULTICOMPRESS_H
 #define MULTICOMPRESS_H
 
-#include <apt-pkg/fileutl.h>
 #include <apt-pkg/aptconfiguration.h>
+#include <apt-pkg/fileutl.h>
 
 #include <string>
 #include <stdio.h>
diff --git a/ftparchive/override.cc b/ftparchive/override.cc
index 8a0c5bab1..26d629bfa 100644
--- a/ftparchive/override.cc
+++ b/ftparchive/override.cc
@@ -12,13 +12,13 @@
 // Include Files							/*{{{*/
 #include <config.h>
 
-#include <apt-pkg/strutl.h>
 #include <apt-pkg/error.h>
+#include <apt-pkg/strutl.h>
 
-#include <stdio.h>
+#include <utility>
 #include <ctype.h>
+#include <stdio.h>
 #include <string.h>
-#include <utility>
 
 #include "override.h"
 
diff --git a/ftparchive/override.h b/ftparchive/override.h
index c5cacc2b4..74637404c 100644
--- a/ftparchive/override.h
+++ b/ftparchive/override.h
@@ -12,8 +12,6 @@
 #ifndef OVERRIDE_H
 #define OVERRIDE_H
 
-
-
 #include <map>
 #include <string>
 
diff --git a/ftparchive/sources.cc b/ftparchive/sources.cc
index ab976b490..60a86171f 100644
--- a/ftparchive/sources.cc
+++ b/ftparchive/sources.cc
@@ -1,5 +1,5 @@
-#include <string>
 #include <sstream>
+#include <string>
 
 // for memcpy
 #include <cstring>
diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc
index 7cda37459..d5c9735e7 100644
--- a/ftparchive/writer.cc
+++ b/ftparchive/writer.cc
@@ -14,19 +14,26 @@
 #include <config.h>
 
 #include <apt-pkg/configuration.h>
+#include <apt-pkg/debfile.h>
 #include <apt-pkg/deblistparser.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/gpgv.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/md5.h>
-#include <apt-pkg/strutl.h>
-#include <apt-pkg/debfile.h>
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/sha1.h>
 #include <apt-pkg/sha2.h>
+#include <apt-pkg/strutl.h>
 #include <apt-pkg/tagfile.h>
 
+#include <algorithm>
+#include <ctime>
+#include <iomanip>
+#include <iostream>
+#include <memory>
+#include <sstream>
+#include <utility>
 #include <ctype.h>
 #include <fnmatch.h>
 #include <ftw.h>
@@ -35,19 +42,12 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <ctime>
-#include <iostream>
-#include <iomanip>
-#include <sstream>
-#include <memory>
-#include <utility>
-#include <algorithm>
 
 #include "apt-ftparchive.h"
-#include "writer.h"
+#include "byhash.h"
 #include "cachedb.h"
 #include "multicompress.h"
-#include "byhash.h"
+#include "writer.h"
 
 #include <apti18n.h>
 									/*}}}*/
diff --git a/ftparchive/writer.h b/ftparchive/writer.h
index ea4c66da4..b2cef4f00 100644
--- a/ftparchive/writer.h
+++ b/ftparchive/writer.h
@@ -15,19 +15,19 @@
 
 #include <apt-pkg/hashes.h>
 
-#include <string>
-#include <stdio.h>
 #include <iostream>
-#include <vector>
 #include <map>
 #include <set>
+#include <string>
+#include <vector>
+#include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
 
-#include "contents.h"
+#include "apt-ftparchive.h"
 #include "cachedb.h"
+#include "contents.h"
 #include "override.h"
-#include "apt-ftparchive.h"
 
 using std::string;
 using std::cout;