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

27 files changed, 98 insertions, 79 deletions

diff --git a/src/grp-login/liblogind-core/logind-acl.c b/src/grp-login/liblogind-core/logind-acl.c
index 9f6199e6eb..44e49c1dad 100644
--- a/src/grp-login/liblogind-core/logind-acl.c
+++ b/src/grp-login/liblogind-core/logind-acl.c
@@ -20,17 +20,18 @@
 #include <errno.h>
 #include <string.h>
 
-#include "shared/acl-util.h"
 #include "basic/alloc-util.h"
 #include "basic/dirent-util.h"
 #include "basic/escape.h"
 #include "basic/fd-util.h"
 #include "basic/formats-util.h"
-#include "logind-acl.h"
 #include "basic/set.h"
 #include "basic/string-util.h"
-#include "shared/udev-util.h"
 #include "basic/util.h"
+#include "shared/acl-util.h"
+#include "shared/udev-util.h"
+
+#include "logind-acl.h"
 
 static int flush_acl(acl_t acl) {
         acl_entry_t i;
diff --git a/src/grp-login/liblogind-core/logind-acl.h b/src/grp-login/liblogind-core/logind-acl.h
index 1286c6a3cd..7d324ea90a 100644
--- a/src/grp-login/liblogind-core/logind-acl.h
+++ b/src/grp-login/liblogind-core/logind-acl.h
@@ -22,7 +22,7 @@
 #include <stdbool.h>
 #include <sys/types.h>
 
-#include "libudev.h"
+#include <libudev.h>
 
 #ifdef HAVE_ACL
 
diff --git a/src/grp-login/liblogind-core/logind-action.c b/src/grp-login/liblogind-core/logind-action.c
index 6976377c0a..0cfeab3fdb 100644
--- a/src/grp-login/liblogind-core/logind-action.c
+++ b/src/grp-login/liblogind-core/logind-action.c
@@ -20,17 +20,18 @@
 #include <unistd.h>
 
 #include "basic/alloc-util.h"
-#include "bus-error.h"
-#include "shared/bus-util.h"
-#include "shared/conf-parser.h"
 #include "basic/formats-util.h"
-#include "logind-action.h"
 #include "basic/process-util.h"
-#include "shared/sleep-config.h"
 #include "basic/special.h"
 #include "basic/string-table.h"
 #include "basic/terminal-util.h"
 #include "basic/user-util.h"
+#include "sd-bus/bus-error.h"
+#include "shared/bus-util.h"
+#include "shared/conf-parser.h"
+#include "shared/sleep-config.h"
+
+#include "logind-action.h"
 
 int manager_handle_action(
                 Manager *m,
diff --git a/src/grp-login/liblogind-core/logind-action.h b/src/grp-login/liblogind-core/logind-action.h
index fb40ae48d2..39ba3cf0f6 100644
--- a/src/grp-login/liblogind-core/logind-action.h
+++ b/src/grp-login/liblogind-core/logind-action.h
@@ -33,9 +33,10 @@ typedef enum HandleAction {
         _HANDLE_ACTION_INVALID = -1
 } HandleAction;
 
-#include "logind-inhibit.h"
 #include "logind.h"
 
+#include "logind-inhibit.h"
+
 int manager_handle_action(
                 Manager *m,
                 InhibitWhat inhibit_key,
diff --git a/src/grp-login/liblogind-core/logind-button.c b/src/grp-login/liblogind-core/logind-button.c
index d791578cd7..428e6e91a0 100644
--- a/src/grp-login/liblogind-core/logind-button.c
+++ b/src/grp-login/liblogind-core/logind-button.c
@@ -19,19 +19,20 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#include <linux/input.h>
 #include <string.h>
 #include <sys/ioctl.h>
 #include <unistd.h>
-#include <linux/input.h>
 
 #include <systemd/sd-messages.h>
 
 #include "basic/alloc-util.h"
 #include "basic/fd-util.h"
-#include "logind-button.h"
 #include "basic/string-util.h"
 #include "basic/util.h"
 
+#include "logind-button.h"
+
 Button* button_new(Manager *m, const char *name) {
         Button *b;
 
diff --git a/src/grp-login/liblogind-core/logind-core.c b/src/grp-login/liblogind-core/logind-core.c
index e47677ffda..0a9e45bb22 100644
--- a/src/grp-login/liblogind-core/logind-core.c
+++ b/src/grp-login/liblogind-core/logind-core.c
@@ -18,21 +18,21 @@
 ***/
 
 #include <fcntl.h>
+#include <linux/vt.h>
 #include <pwd.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
-#include <linux/vt.h>
 
 #include "basic/alloc-util.h"
-#include "bus-error.h"
-#include "shared/bus-util.h"
 #include "basic/cgroup-util.h"
 #include "basic/fd-util.h"
-#include "logind.h"
 #include "basic/strv.h"
 #include "basic/terminal-util.h"
-#include "shared/udev-util.h"
 #include "basic/user-util.h"
+#include "logind.h"
+#include "sd-bus/bus-error.h"
+#include "shared/bus-util.h"
+#include "shared/udev-util.h"
 
 int manager_add_device(Manager *m, const char *sysfs, bool master, Device **_device) {
         Device *d;
diff --git a/src/grp-login/liblogind-core/logind-dbus.c b/src/grp-login/liblogind-core/logind-dbus.c
index bc705e1754..cb51e43a5c 100644
--- a/src/grp-login/liblogind-core/logind-dbus.c
+++ b/src/grp-login/liblogind-core/logind-dbus.c
@@ -26,28 +26,28 @@
 
 #include "basic/alloc-util.h"
 #include "basic/audit-util.h"
-#include "bus-common-errors.h"
-#include "bus-error.h"
-#include "shared/bus-util.h"
 #include "basic/dirent-util.h"
-#include "shared/efivars.h"
 #include "basic/escape.h"
 #include "basic/fd-util.h"
 #include "basic/fileio-label.h"
 #include "basic/formats-util.h"
 #include "basic/fs-util.h"
-#include "logind.h"
 #include "basic/mkdir.h"
 #include "basic/path-util.h"
 #include "basic/process-util.h"
 #include "basic/selinux-util.h"
-#include "shared/sleep-config.h"
 #include "basic/special.h"
 #include "basic/strv.h"
 #include "basic/terminal-util.h"
-#include "shared/udev-util.h"
 #include "basic/unit-name.h"
 #include "basic/user-util.h"
+#include "logind.h"
+#include "sd-bus/bus-common-errors.h"
+#include "sd-bus/bus-error.h"
+#include "shared/bus-util.h"
+#include "shared/efivars.h"
+#include "shared/sleep-config.h"
+#include "shared/udev-util.h"
 #include "shared/utmp-wtmp.h"
 
 int manager_get_session_from_creds(Manager *m, sd_bus_message *message, const char *name, sd_bus_error *error, Session **ret) {
diff --git a/src/grp-login/liblogind-core/logind-device.c b/src/grp-login/liblogind-core/logind-device.c
index db6a8d93d1..6165a9ea6e 100644
--- a/src/grp-login/liblogind-core/logind-device.c
+++ b/src/grp-login/liblogind-core/logind-device.c
@@ -20,9 +20,10 @@
 #include <string.h>
 
 #include "basic/alloc-util.h"
-#include "logind-device.h"
 #include "basic/util.h"
 
+#include "logind-device.h"
+
 Device* device_new(Manager *m, const char *sysfs, bool master) {
         Device *d;
 
diff --git a/src/grp-login/liblogind-core/logind-device.h b/src/grp-login/liblogind-core/logind-device.h
index 96c012bdd9..23dfcd1964 100644
--- a/src/grp-login/liblogind-core/logind-device.h
+++ b/src/grp-login/liblogind-core/logind-device.h
@@ -22,6 +22,7 @@
 typedef struct Device Device;
 
 #include "basic/list.h"
+
 #include "logind-seat.h"
 #include "logind-session-device.h"
 
diff --git a/src/grp-login/liblogind-core/logind-inhibit.c b/src/grp-login/liblogind-core/logind-inhibit.c
index f95582f9db..8a35db0dc8 100644
--- a/src/grp-login/liblogind-core/logind-inhibit.c
+++ b/src/grp-login/liblogind-core/logind-inhibit.c
@@ -27,7 +27,6 @@
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
 #include "basic/formats-util.h"
-#include "logind-inhibit.h"
 #include "basic/mkdir.h"
 #include "basic/parse-util.h"
 #include "basic/string-table.h"
@@ -35,6 +34,8 @@
 #include "basic/user-util.h"
 #include "basic/util.h"
 
+#include "logind-inhibit.h"
+
 Inhibitor* inhibitor_new(Manager *m, const char* id) {
         Inhibitor *i;
 
diff --git a/src/grp-login/liblogind-core/logind-seat-dbus.c b/src/grp-login/liblogind-core/logind-seat-dbus.c
index bd9c4d1c06..fbebe6fcff 100644
--- a/src/grp-login/liblogind-core/logind-seat-dbus.c
+++ b/src/grp-login/liblogind-core/logind-seat-dbus.c
@@ -21,14 +21,15 @@
 #include <string.h>
 
 #include "basic/alloc-util.h"
-#include "bus-common-errors.h"
 #include "basic/bus-label.h"
-#include "shared/bus-util.h"
-#include "logind-seat.h"
-#include "logind.h"
 #include "basic/strv.h"
 #include "basic/user-util.h"
 #include "basic/util.h"
+#include "logind.h"
+#include "sd-bus/bus-common-errors.h"
+#include "shared/bus-util.h"
+
+#include "logind-seat.h"
 
 static int property_get_active_session(
                 sd_bus *bus,
diff --git a/src/grp-login/liblogind-core/logind-seat.c b/src/grp-login/liblogind-core/logind-seat.c
index da68288dbd..6525ad5d7b 100644
--- a/src/grp-login/liblogind-core/logind-seat.c
+++ b/src/grp-login/liblogind-core/logind-seat.c
@@ -28,8 +28,6 @@
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
 #include "basic/formats-util.h"
-#include "logind-acl.h"
-#include "logind-seat.h"
 #include "basic/mkdir.h"
 #include "basic/parse-util.h"
 #include "basic/stdio-util.h"
@@ -37,6 +35,9 @@
 #include "basic/terminal-util.h"
 #include "basic/util.h"
 
+#include "logind-acl.h"
+#include "logind-seat.h"
+
 Seat *seat_new(Manager *m, const char *id) {
         Seat *s;
 
diff --git a/src/grp-login/liblogind-core/logind-seat.h b/src/grp-login/liblogind-core/logind-seat.h
index 9201e0ea1f..a2aeb58687 100644
--- a/src/grp-login/liblogind-core/logind-seat.h
+++ b/src/grp-login/liblogind-core/logind-seat.h
@@ -22,6 +22,7 @@
 typedef struct Seat Seat;
 
 #include "basic/list.h"
+
 #include "logind-session.h"
 
 struct Seat {
diff --git a/src/grp-login/liblogind-core/logind-session-dbus.c b/src/grp-login/liblogind-core/logind-session-dbus.c
index 483bf0de52..76228d4474 100644
--- a/src/grp-login/liblogind-core/logind-session-dbus.c
+++ b/src/grp-login/liblogind-core/logind-session-dbus.c
@@ -21,16 +21,17 @@
 #include <string.h>
 
 #include "basic/alloc-util.h"
-#include "bus-common-errors.h"
 #include "basic/bus-label.h"
-#include "shared/bus-util.h"
 #include "basic/fd-util.h"
-#include "logind-session-device.h"
-#include "logind-session.h"
-#include "logind.h"
 #include "basic/signal-util.h"
 #include "basic/strv.h"
 #include "basic/util.h"
+#include "logind.h"
+#include "sd-bus/bus-common-errors.h"
+#include "shared/bus-util.h"
+
+#include "logind-session-device.h"
+#include "logind-session.h"
 
 static int property_get_user(
                 sd_bus *bus,
diff --git a/src/grp-login/liblogind-core/logind-session-device.c b/src/grp-login/liblogind-core/logind-session-device.c
index 517a2fcb8e..1bdb188f05 100644
--- a/src/grp-login/liblogind-core/logind-session-device.c
+++ b/src/grp-login/liblogind-core/logind-session-device.c
@@ -23,14 +23,15 @@
 #include <sys/ioctl.h>
 #include <sys/types.h>
 
-#include "libudev.h"
+#include <libudev.h>
 
 #include "basic/alloc-util.h"
-#include "shared/bus-util.h"
 #include "basic/fd-util.h"
-#include "logind-session-device.h"
 #include "basic/missing.h"
 #include "basic/util.h"
+#include "shared/bus-util.h"
+
+#include "logind-session-device.h"
 
 enum SessionDeviceNotifications {
         SESSION_DEVICE_RESUME,
diff --git a/src/grp-login/liblogind-core/logind-session.c b/src/grp-login/liblogind-core/logind-session.c
index b38e47e7e9..ef451d900a 100644
--- a/src/grp-login/liblogind-core/logind-session.c
+++ b/src/grp-login/liblogind-core/logind-session.c
@@ -30,14 +30,11 @@
 
 #include "basic/alloc-util.h"
 #include "basic/audit-util.h"
-#include "bus-error.h"
-#include "shared/bus-util.h"
 #include "basic/escape.h"
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
 #include "basic/formats-util.h"
 #include "basic/io-util.h"
-#include "logind-session.h"
 #include "basic/mkdir.h"
 #include "basic/parse-util.h"
 #include "basic/path-util.h"
@@ -45,6 +42,10 @@
 #include "basic/terminal-util.h"
 #include "basic/user-util.h"
 #include "basic/util.h"
+#include "sd-bus/bus-error.h"
+#include "shared/bus-util.h"
+
+#include "logind-session.h"
 
 #define RELEASE_USEC (20*USEC_PER_SEC)
 
diff --git a/src/grp-login/liblogind-core/logind-session.h b/src/grp-login/liblogind-core/logind-session.h
index 17da11e70c..23ff6576c9 100644
--- a/src/grp-login/liblogind-core/logind-session.h
+++ b/src/grp-login/liblogind-core/logind-session.h
@@ -24,6 +24,7 @@ typedef enum KillWho KillWho;
 
 #include "basic/list.h"
 #include "basic/login-util.h"
+
 #include "logind-user.h"
 
 typedef enum SessionState {
diff --git a/src/grp-login/liblogind-core/logind-user-dbus.c b/src/grp-login/liblogind-core/logind-user-dbus.c
index b09ecf05b4..d82ced605e 100644
--- a/src/grp-login/liblogind-core/logind-user-dbus.c
+++ b/src/grp-login/liblogind-core/logind-user-dbus.c
@@ -21,13 +21,14 @@
 #include <string.h>
 
 #include "basic/alloc-util.h"
-#include "shared/bus-util.h"
 #include "basic/formats-util.h"
-#include "logind-user.h"
-#include "logind.h"
 #include "basic/signal-util.h"
 #include "basic/strv.h"
 #include "basic/user-util.h"
+#include "logind.h"
+#include "shared/bus-util.h"
+
+#include "logind-user.h"
 
 static int property_get_display(
                 sd_bus *bus,
diff --git a/src/grp-login/liblogind-core/logind-user.c b/src/grp-login/liblogind-core/logind-user.c
index 4d7d8b1133..015276efc8 100644
--- a/src/grp-login/liblogind-core/logind-user.c
+++ b/src/grp-login/liblogind-core/logind-user.c
@@ -23,11 +23,6 @@
 #include <unistd.h>
 
 #include "basic/alloc-util.h"
-#include "bus-common-errors.h"
-#include "bus-error.h"
-#include "shared/bus-util.h"
-#include "shared/clean-ipc.h"
-#include "shared/conf-parser.h"
 #include "basic/escape.h"
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
@@ -35,7 +30,6 @@
 #include "basic/fs-util.h"
 #include "basic/hashmap.h"
 #include "basic/label.h"
-#include "logind-user.h"
 #include "basic/mkdir.h"
 #include "basic/mount-util.h"
 #include "basic/parse-util.h"
@@ -48,6 +42,13 @@
 #include "basic/unit-name.h"
 #include "basic/user-util.h"
 #include "basic/util.h"
+#include "sd-bus/bus-common-errors.h"
+#include "sd-bus/bus-error.h"
+#include "shared/bus-util.h"
+#include "shared/clean-ipc.h"
+#include "shared/conf-parser.h"
+
+#include "logind-user.h"
 
 int user_new(User **out, Manager *m, uid_t uid, gid_t gid, const char *name) {
         _cleanup_(user_freep) User *u = NULL;
diff --git a/src/grp-login/liblogind-core/logind-utmp.c b/src/grp-login/liblogind-core/logind-utmp.c
index 04ade6684b..c5dc137d61 100644
--- a/src/grp-login/liblogind-core/logind-utmp.c
+++ b/src/grp-login/liblogind-core/logind-utmp.c
@@ -26,15 +26,15 @@
 
 #include "basic/alloc-util.h"
 #include "basic/audit-util.h"
-#include "bus-common-errors.h"
-#include "bus-error.h"
-#include "shared/bus-util.h"
 #include "basic/formats-util.h"
-#include "logind.h"
 #include "basic/special.h"
 #include "basic/strv.h"
 #include "basic/unit-name.h"
 #include "basic/user-util.h"
+#include "logind.h"
+#include "sd-bus/bus-common-errors.h"
+#include "sd-bus/bus-error.h"
+#include "shared/bus-util.h"
 #include "shared/utmp-wtmp.h"
 
 _const_ static usec_t when_wall(usec_t n, usec_t elapse) {
diff --git a/src/grp-login/loginctl/loginctl.c b/src/grp-login/loginctl/loginctl.c
index af747d2344..3ac325fc97 100644
--- a/src/grp-login/loginctl/loginctl.c
+++ b/src/grp-login/loginctl/loginctl.c
@@ -26,26 +26,27 @@
 #include <systemd/sd-bus.h>
 
 #include "basic/alloc-util.h"
-#include "bus-error.h"
-#include "shared/bus-unit-util.h"
-#include "shared/bus-util.h"
-#include "shared/cgroup-show.h"
 #include "basic/cgroup-util.h"
 #include "basic/log.h"
-#include "shared/logs-show.h"
 #include "basic/macro.h"
-#include "shared/pager.h"
 #include "basic/parse-util.h"
 #include "basic/process-util.h"
 #include "basic/signal-util.h"
-#include "shared/spawn-polkit-agent.h"
 #include "basic/strv.h"
-#include "sysfs-show.h"
 #include "basic/terminal-util.h"
 #include "basic/unit-name.h"
 #include "basic/user-util.h"
 #include "basic/util.h"
 #include "basic/verbs.h"
+#include "sd-bus/bus-error.h"
+#include "shared/bus-unit-util.h"
+#include "shared/bus-util.h"
+#include "shared/cgroup-show.h"
+#include "shared/logs-show.h"
+#include "shared/pager.h"
+#include "shared/spawn-polkit-agent.h"
+
+#include "sysfs-show.h"
 
 static char **arg_property = NULL;
 static bool arg_all = false;
diff --git a/src/grp-login/loginctl/sysfs-show.c b/src/grp-login/loginctl/sysfs-show.c
index c56c919168..12808c3336 100644
--- a/src/grp-login/loginctl/sysfs-show.c
+++ b/src/grp-login/loginctl/sysfs-show.c
@@ -20,16 +20,17 @@
 #include <errno.h>
 #include <string.h>
 
-#include "libudev.h"
+#include <libudev.h>
 
 #include "basic/alloc-util.h"
 #include "basic/locale-util.h"
 #include "basic/path-util.h"
 #include "basic/string-util.h"
-#include "sysfs-show.h"
 #include "basic/terminal-util.h"
-#include "shared/udev-util.h"
 #include "basic/util.h"
+#include "shared/udev-util.h"
+
+#include "sysfs-show.h"
 
 static int show_sysfs_one(
                 struct udev *udev,
diff --git a/src/grp-login/pam_systemd/pam_systemd.c b/src/grp-login/pam_systemd/pam_systemd.c
index b50fa50697..6f67506e5a 100644
--- a/src/grp-login/pam_systemd/pam_systemd.c
+++ b/src/grp-login/pam_systemd/pam_systemd.c
@@ -30,9 +30,6 @@
 
 #include "basic/alloc-util.h"
 #include "basic/audit-util.h"
-#include "bus-common-errors.h"
-#include "bus-error.h"
-#include "shared/bus-util.h"
 #include "basic/def.h"
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
@@ -45,6 +42,9 @@
 #include "basic/strv.h"
 #include "basic/terminal-util.h"
 #include "basic/util.h"
+#include "sd-bus/bus-common-errors.h"
+#include "sd-bus/bus-error.h"
+#include "shared/bus-util.h"
 
 static int parse_argv(
                 pam_handle_t *handle,
diff --git a/src/grp-login/systemd-inhibit/inhibit.c b/src/grp-login/systemd-inhibit/inhibit.c
index 89f116f1b5..543bdb9e80 100644
--- a/src/grp-login/systemd-inhibit/inhibit.c
+++ b/src/grp-login/systemd-inhibit/inhibit.c
@@ -26,8 +26,6 @@
 #include <systemd/sd-bus.h>
 
 #include "basic/alloc-util.h"
-#include "bus-error.h"
-#include "shared/bus-util.h"
 #include "basic/fd-util.h"
 #include "basic/formats-util.h"
 #include "basic/process-util.h"
@@ -35,6 +33,8 @@
 #include "basic/strv.h"
 #include "basic/user-util.h"
 #include "basic/util.h"
+#include "sd-bus/bus-error.h"
+#include "shared/bus-util.h"
 
 static const char* arg_what = "idle:sleep:shutdown";
 static const char* arg_who = NULL;
diff --git a/src/grp-login/systemd-logind/logind.c b/src/grp-login/systemd-logind/logind.c
index 8031d04a8f..e5e21f7567 100644
--- a/src/grp-login/systemd-logind/logind.c
+++ b/src/grp-login/systemd-logind/logind.c
@@ -22,23 +22,24 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "libudev.h"
+#include <libudev.h>
 #include <systemd/sd-daemon.h>
 
 #include "basic/alloc-util.h"
-#include "bus-error.h"
-#include "shared/bus-util.h"
-#include "shared/conf-parser.h"
 #include "basic/def.h"
 #include "basic/dirent-util.h"
 #include "basic/fd-util.h"
 #include "basic/formats-util.h"
-#include "logind.h"
 #include "basic/selinux-util.h"
 #include "basic/signal-util.h"
 #include "basic/strv.h"
+#include "sd-bus/bus-error.h"
+#include "shared/bus-util.h"
+#include "shared/conf-parser.h"
 #include "shared/udev-util.h"
 
+#include "logind.h"
+
 static void manager_free(Manager *m);
 
 static void manager_reset_config(Manager *m) {
diff --git a/src/grp-login/systemd-logind/logind.h b/src/grp-login/systemd-logind/logind.h
index ab6d917678..effc498118 100644
--- a/src/grp-login/systemd-logind/logind.h
+++ b/src/grp-login/systemd-logind/logind.h
@@ -21,7 +21,7 @@
 
 #include <stdbool.h>
 
-#include "libudev.h"
+#include <libudev.h>
 #include <systemd/sd-bus.h>
 #include <systemd/sd-event.h>
 
diff --git a/src/grp-login/test-inhibit.c b/src/grp-login/test-inhibit.c
index b186b36ce1..2451d56446 100644
--- a/src/grp-login/test-inhibit.c
+++ b/src/grp-login/test-inhibit.c
@@ -21,10 +21,10 @@
 
 #include <systemd/sd-bus.h>
 
-#include "shared/bus-util.h"
 #include "basic/fd-util.h"
 #include "basic/macro.h"
 #include "basic/util.h"
+#include "shared/bus-util.h"
 
 static int inhibit(sd_bus *bus, const char *what) {
         _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;