find src \( -name '*.h' -o -name '*.c' \) -type f -exec ./fixup_includes {} \;

8 files changed, 18 insertions, 11 deletions

diff --git a/src/systemd-nspawn/nspawn-cgroup.c b/src/systemd-nspawn/nspawn-cgroup.c
index 67c86303e5..d0e2de2345 100644
--- a/src/systemd-nspawn/nspawn-cgroup.c
+++ b/src/systemd-nspawn/nspawn-cgroup.c
@@ -24,11 +24,12 @@
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
 #include "basic/mkdir.h"
-#include "nspawn-cgroup.h"
 #include "basic/string-util.h"
 #include "basic/strv.h"
 #include "basic/util.h"
 
+#include "nspawn-cgroup.h"
+
 int chown_cgroup(pid_t pid, uid_t uid_shift) {
         _cleanup_free_ char *path = NULL, *fs = NULL;
         _cleanup_close_ int fd = -1;
diff --git a/src/systemd-nspawn/nspawn-mount.c b/src/systemd-nspawn/nspawn-mount.c
index 7e8bd936f2..bb2906e8d7 100644
--- a/src/systemd-nspawn/nspawn-mount.c
+++ b/src/systemd-nspawn/nspawn-mount.c
@@ -17,8 +17,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <sys/mount.h>
 #include <linux/magic.h>
+#include <sys/mount.h>
 
 #include "basic/alloc-util.h"
 #include "basic/cgroup-util.h"
@@ -27,7 +27,6 @@
 #include "basic/label.h"
 #include "basic/mkdir.h"
 #include "basic/mount-util.h"
-#include "nspawn-mount.h"
 #include "basic/parse-util.h"
 #include "basic/path-util.h"
 #include "basic/rm-rf.h"
@@ -38,6 +37,8 @@
 #include "basic/user-util.h"
 #include "basic/util.h"
 
+#include "nspawn-mount.h"
+
 CustomMount* custom_mount_add(CustomMount **l, unsigned *n, CustomMountType t) {
         CustomMount *c, *ret;
 
diff --git a/src/systemd-nspawn/nspawn-network.c b/src/systemd-nspawn/nspawn-network.c
index 4929615b74..45caddb75b 100644
--- a/src/systemd-nspawn/nspawn-network.c
+++ b/src/systemd-nspawn/nspawn-network.c
@@ -20,7 +20,7 @@
 #include <linux/veth.h>
 #include <net/if.h>
 
-#include "libudev.h"
+#include <libudev.h>
 #include <systemd/sd-id128.h>
 
 #include "basic/alloc-util.h"
diff --git a/src/systemd-nspawn/nspawn-settings.c b/src/systemd-nspawn/nspawn-settings.c
index e5cc385e07..f05c671946 100644
--- a/src/systemd-nspawn/nspawn-settings.c
+++ b/src/systemd-nspawn/nspawn-settings.c
@@ -19,9 +19,6 @@
 
 #include "basic/alloc-util.h"
 #include "basic/cap-list.h"
-#include "shared/conf-parser.h"
-#include "nspawn-network.h"
-#include "nspawn-settings.h"
 #include "basic/parse-util.h"
 #include "basic/process-util.h"
 #include "basic/socket-util.h"
@@ -29,6 +26,10 @@
 #include "basic/strv.h"
 #include "basic/user-util.h"
 #include "basic/util.h"
+#include "shared/conf-parser.h"
+
+#include "nspawn-network.h"
+#include "nspawn-settings.h"
 
 int settings_load(FILE *f, const char *path, Settings **ret) {
         _cleanup_(settings_freep) Settings *s = NULL;
diff --git a/src/systemd-nspawn/nspawn-settings.h b/src/systemd-nspawn/nspawn-settings.h
index 0abf4c9835..95e70d5fa4 100644
--- a/src/systemd-nspawn/nspawn-settings.h
+++ b/src/systemd-nspawn/nspawn-settings.h
@@ -22,6 +22,7 @@
 #include <stdio.h>
 
 #include "basic/macro.h"
+
 #include "nspawn-expose-ports.h"
 #include "nspawn-mount.h"
 
diff --git a/src/systemd-nspawn/nspawn-setuid.c b/src/systemd-nspawn/nspawn-setuid.c
index b42c4c2456..38ca9e2e24 100644
--- a/src/systemd-nspawn/nspawn-setuid.c
+++ b/src/systemd-nspawn/nspawn-setuid.c
@@ -24,13 +24,14 @@
 #include "basic/alloc-util.h"
 #include "basic/fd-util.h"
 #include "basic/mkdir.h"
-#include "nspawn-setuid.h"
 #include "basic/process-util.h"
 #include "basic/signal-util.h"
 #include "basic/string-util.h"
 #include "basic/user-util.h"
 #include "basic/util.h"
 
+#include "nspawn-setuid.h"
+
 static int spawn_getent(const char *database, const char *key, pid_t *rpid) {
         int pipe_fds[2];
         pid_t pid;
diff --git a/src/systemd-nspawn/nspawn-stub-pid1.c b/src/systemd-nspawn/nspawn-stub-pid1.c
index 47243ee082..86783b6136 100644
--- a/src/systemd-nspawn/nspawn-stub-pid1.c
+++ b/src/systemd-nspawn/nspawn-stub-pid1.c
@@ -21,13 +21,14 @@
 #include <sys/unistd.h>
 #include <sys/wait.h>
 
+#include "basic/def.h"
 #include "basic/fd-util.h"
 #include "basic/log.h"
-#include "nspawn-stub-pid1.h"
 #include "basic/process-util.h"
 #include "basic/signal-util.h"
 #include "basic/time-util.h"
-#include "basic/def.h"
+
+#include "nspawn-stub-pid1.h"
 
 int stub_pid1(void) {
         enum {
diff --git a/src/systemd-nspawn/test-patch-uid.c b/src/systemd-nspawn/test-patch-uid.c
index 8b990da220..e751e0ec95 100644
--- a/src/systemd-nspawn/test-patch-uid.c
+++ b/src/systemd-nspawn/test-patch-uid.c
@@ -20,10 +20,11 @@
 #include <stdlib.h>
 
 #include "basic/log.h"
-#include "nspawn-patch-uid.h"
 #include "basic/user-util.h"
 #include "basic/util.h"
 
+#include "nspawn-patch-uid.h"
+
 int main(int argc, char *argv[]) {
         uid_t shift, range;
         int r;