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.

1 files changed, 4 insertions, 4 deletions

diff --git a/methods/basehttp.h b/methods/basehttp.h
index 41a9a4306..7000e7b89 100644
--- a/methods/basehttp.h
+++ b/methods/basehttp.h
@@ -11,14 +11,14 @@
 #ifndef APT_SERVER_H
 #define APT_SERVER_H
 
-#include <apt-pkg/strutl.h>
-#include <apt-pkg/fileutl.h>
 #include "aptmethod.h"
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/strutl.h>
 
-#include <time.h>
 #include <iostream>
-#include <string>
 #include <memory>
+#include <string>
+#include <time.h>
 
 using std::cout;
 using std::endl;