From cf0fbc49e67b55f8d346fc94de28c90113505297 Mon Sep 17 00:00:00 2001
From: Thomas Hindoe Paaboel Andersen <phomes@gmail.com>
Date: Mon, 16 Nov 2015 22:09:36 +0100
Subject: tree-wide: sort includes

Sort the includes accoding to the new coding style.
---
 src/import/aufs-util.c  | 2 +-
 src/import/export-raw.c | 4 ++++
 src/import/pull-tar.c   | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/import')

diff --git a/src/import/aufs-util.c b/src/import/aufs-util.c
index 7b1ac134a0..82f519958c 100644
--- a/src/import/aufs-util.c
+++ b/src/import/aufs-util.c
@@ -21,10 +21,10 @@
 
 #include <ftw.h>
 
+#include "aufs-util.h"
 #include "rm-rf.h"
 #include "string-util.h"
 #include "util.h"
-#include "aufs-util.h"
 
 static int nftw_cb(
                 const char *fpath,
diff --git a/src/import/export-raw.c b/src/import/export-raw.c
index 103d45bf21..28c87594d6 100644
--- a/src/import/export-raw.c
+++ b/src/import/export-raw.c
@@ -20,6 +20,10 @@
 ***/
 
 #include <sys/sendfile.h>
+
+/* When we include libgen.h because we need dirname() we immediately
+ * undefine basename() since libgen.h defines it as a macro to the POSIX
+ * version which is really broken. We prefer GNU basename(). */
 #include <libgen.h>
 #undef basename
 
diff --git a/src/import/pull-tar.c b/src/import/pull-tar.c
index e7fcd293f1..2e48167c54 100644
--- a/src/import/pull-tar.c
+++ b/src/import/pull-tar.c
@@ -19,8 +19,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <sys/prctl.h>
 #include <curl/curl.h>
+#include <sys/prctl.h>
 
 #include "sd-daemon.h"
 
-- 
cgit v1.2.3-54-g00ecf