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

41 files changed, 63 insertions, 62 deletions

diff --git a/src/libshared/include/shared/bus-unit-util.h b/src/libshared/include/shared/bus-unit-util.h
index e657b42ecb..5e5b33ded1 100644
--- a/src/libshared/include/shared/bus-unit-util.h
+++ b/src/libshared/include/shared/bus-unit-util.h
@@ -21,8 +21,8 @@
 
 #include <systemd/sd-bus.h>
 
-#include "shared/output-mode.h"
 #include "shared/install.h"
+#include "shared/output-mode.h"
 
 typedef struct UnitInfo {
         const char *machine;
diff --git a/src/libshared/include/shared/install.h b/src/libshared/include/shared/install.h
index 2f9b15a1c8..bf1f6f25c8 100644
--- a/src/libshared/include/shared/install.h
+++ b/src/libshared/include/shared/install.h
@@ -32,9 +32,9 @@ typedef struct UnitFileInstallInfo UnitFileInstallInfo;
 
 #include "basic/hashmap.h"
 #include "basic/macro.h"
-#include "shared/path-lookup.h"
 #include "basic/strv.h"
 #include "basic/unit-name.h"
+#include "shared/path-lookup.h"
 
 enum UnitFileScope {
         UNIT_FILE_SYSTEM,
diff --git a/src/libshared/include/shared/logs-show.h b/src/libshared/include/shared/logs-show.h
index 8f3cadd0e3..14f955dfb4 100644
--- a/src/libshared/include/shared/logs-show.h
+++ b/src/libshared/include/shared/logs-show.h
@@ -27,9 +27,9 @@
 #include <systemd/sd-journal.h>
 
 #include "basic/macro.h"
-#include "shared/output-mode.h"
 #include "basic/time-util.h"
 #include "basic/util.h"
+#include "shared/output-mode.h"
 
 int output_journal(
                 FILE *f,
diff --git a/src/libshared/include/shared/udev-util.h b/src/libshared/include/shared/udev-util.h
index 7765918a12..c3db8ab30e 100644
--- a/src/libshared/include/shared/udev-util.h
+++ b/src/libshared/include/shared/udev-util.h
@@ -19,8 +19,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "udev.h"
 #include "basic/util.h"
+#include "udev.h"
 
 DEFINE_TRIVIAL_CLEANUP_FUNC(struct udev*, udev_unref);
 DEFINE_TRIVIAL_CLEANUP_FUNC(struct udev_device*, udev_device_unref);
diff --git a/src/libshared/src/acl-util.c b/src/libshared/src/acl-util.c
index fb19394e02..b9af6aca5c 100644
--- a/src/libshared/src/acl-util.c
+++ b/src/libshared/src/acl-util.c
@@ -20,12 +20,12 @@
 #include <errno.h>
 #include <stdbool.h>
 
-#include "shared/acl-util.h"
 #include "basic/alloc-util.h"
 #include "basic/string-util.h"
 #include "basic/strv.h"
 #include "basic/user-util.h"
 #include "basic/util.h"
+#include "shared/acl-util.h"
 
 int acl_find_uid(acl_t acl, uid_t uid, acl_entry_t *entry) {
         acl_entry_t i;
diff --git a/src/libshared/src/acpi-fpdt.c b/src/libshared/src/acpi-fpdt.c
index a43bf3847a..d3a744acbd 100644
--- a/src/libshared/src/acpi-fpdt.c
+++ b/src/libshared/src/acpi-fpdt.c
@@ -24,11 +24,11 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "shared/acpi-fpdt.h"
 #include "basic/alloc-util.h"
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
 #include "basic/time-util.h"
+#include "shared/acpi-fpdt.h"
 
 struct acpi_table_header {
         char signature[4];
diff --git a/src/libshared/src/apparmor-util.c b/src/libshared/src/apparmor-util.c
index 7d638d0a28..af5498e05e 100644
--- a/src/libshared/src/apparmor-util.c
+++ b/src/libshared/src/apparmor-util.c
@@ -20,9 +20,9 @@
 #include <stddef.h>
 
 #include "basic/alloc-util.h"
-#include "shared/apparmor-util.h"
 #include "basic/fileio.h"
 #include "basic/parse-util.h"
+#include "shared/apparmor-util.h"
 
 bool mac_apparmor_use(void) {
         static int cached_use = -1;
diff --git a/src/libshared/src/ask-password-api.c b/src/libshared/src/ask-password-api.c
index 864c62ee9b..9be47256aa 100644
--- a/src/libshared/src/ask-password-api.c
+++ b/src/libshared/src/ask-password-api.c
@@ -40,7 +40,6 @@
 #include <unistd.h>
 
 #include "basic/alloc-util.h"
-#include "shared/ask-password-api.h"
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
 #include "basic/formats-util.h"
@@ -59,6 +58,7 @@
 #include "basic/umask-util.h"
 #include "basic/utf8.h"
 #include "basic/util.h"
+#include "shared/ask-password-api.h"
 
 #define KEYRING_TIMEOUT_USEC ((5 * USEC_PER_MINUTE) / 2)
 
diff --git a/src/libshared/src/base-filesystem.c b/src/libshared/src/base-filesystem.c
index ac3a1bf6b9..881bfb061c 100644
--- a/src/libshared/src/base-filesystem.c
+++ b/src/libshared/src/base-filesystem.c
@@ -26,7 +26,6 @@
 #include <unistd.h>
 
 #include "basic/alloc-util.h"
-#include "shared/base-filesystem.h"
 #include "basic/fd-util.h"
 #include "basic/log.h"
 #include "basic/macro.h"
@@ -34,6 +33,7 @@
 #include "basic/umask-util.h"
 #include "basic/user-util.h"
 #include "basic/util.h"
+#include "shared/base-filesystem.h"
 
 typedef struct BaseFilesystem {
         const char *dir;
diff --git a/src/libshared/src/boot-timestamps.c b/src/libshared/src/boot-timestamps.c
index 4d2bad0492..3e3034f032 100644
--- a/src/libshared/src/boot-timestamps.c
+++ b/src/libshared/src/boot-timestamps.c
@@ -18,11 +18,11 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "basic/macro.h"
+#include "basic/time-util.h"
 #include "shared/acpi-fpdt.h"
 #include "shared/boot-timestamps.h"
 #include "shared/efivars.h"
-#include "basic/macro.h"
-#include "basic/time-util.h"
 
 int boot_timestamps(const dual_timestamp *n, dual_timestamp *firmware, dual_timestamp *loader) {
         usec_t x = 0, y = 0, a;
diff --git a/src/libshared/src/bus-unit-util.c b/src/libshared/src/bus-unit-util.c
index 9ae172c181..08c495aae5 100644
--- a/src/libshared/src/bus-unit-util.c
+++ b/src/libshared/src/bus-unit-util.c
@@ -18,9 +18,6 @@
 ***/
 
 #include "basic/alloc-util.h"
-#include "sd-bus/bus-internal.h"
-#include "shared/bus-unit-util.h"
-#include "shared/bus-util.h"
 #include "basic/cgroup-util.h"
 #include "basic/env-util.h"
 #include "basic/escape.h"
@@ -37,6 +34,9 @@
 #include "basic/terminal-util.h"
 #include "basic/utf8.h"
 #include "basic/util.h"
+#include "sd-bus/bus-internal.h"
+#include "shared/bus-unit-util.h"
+#include "shared/bus-util.h"
 
 int bus_parse_unit_info(sd_bus_message *message, UnitInfo *u) {
         assert(message);
diff --git a/src/libshared/src/bus-util.c b/src/libshared/src/bus-util.c
index 6163b40679..b303509f34 100644
--- a/src/libshared/src/bus-util.c
+++ b/src/libshared/src/bus-util.c
@@ -35,10 +35,7 @@
 #include <systemd/sd-id128.h>
 
 #include "basic/alloc-util.h"
-#include "sd-bus/bus-internal.h"
 #include "basic/bus-label.h"
-#include "sd-bus/bus-message.h"
-#include "shared/bus-util.h"
 #include "basic/def.h"
 #include "basic/escape.h"
 #include "basic/fd-util.h"
@@ -49,6 +46,9 @@
 #include "basic/stdio-util.h"
 #include "basic/strv.h"
 #include "basic/user-util.h"
+#include "sd-bus/bus-internal.h"
+#include "sd-bus/bus-message.h"
+#include "shared/bus-util.h"
 
 static int name_owner_change_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) {
         sd_event *e = userdata;
diff --git a/src/libshared/src/cgroup-show.c b/src/libshared/src/cgroup-show.c
index 6b1b8dba99..e8dae923f5 100644
--- a/src/libshared/src/cgroup-show.c
+++ b/src/libshared/src/cgroup-show.c
@@ -25,17 +25,17 @@
 #include <string.h>
 
 #include "basic/alloc-util.h"
-#include "shared/cgroup-show.h"
 #include "basic/cgroup-util.h"
 #include "basic/fd-util.h"
 #include "basic/formats-util.h"
 #include "basic/locale-util.h"
 #include "basic/macro.h"
-#include "shared/output-mode.h"
 #include "basic/path-util.h"
 #include "basic/process-util.h"
 #include "basic/string-util.h"
 #include "basic/terminal-util.h"
+#include "shared/cgroup-show.h"
+#include "shared/output-mode.h"
 
 static void show_pid_array(
                 pid_t pids[],
diff --git a/src/libshared/src/clean-ipc.c b/src/libshared/src/clean-ipc.c
index 326fa32a3a..b9c60c48ae 100644
--- a/src/libshared/src/clean-ipc.c
+++ b/src/libshared/src/clean-ipc.c
@@ -32,7 +32,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "shared/clean-ipc.h"
 #include "basic/dirent-util.h"
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
@@ -41,6 +40,7 @@
 #include "basic/macro.h"
 #include "basic/string-util.h"
 #include "basic/strv.h"
+#include "shared/clean-ipc.h"
 
 static int clean_sysvipc_shm(uid_t delete_uid) {
         _cleanup_fclose_ FILE *f = NULL;
diff --git a/src/libshared/src/condition.c b/src/libshared/src/condition.c
index bb0346f416..fdfa3b0941 100644
--- a/src/libshared/src/condition.c
+++ b/src/libshared/src/condition.c
@@ -30,16 +30,13 @@
 #include <systemd/sd-id128.h>
 
 #include "basic/alloc-util.h"
-#include "shared/apparmor-util.h"
 #include "basic/architecture.h"
 #include "basic/audit-util.h"
 #include "basic/cap-list.h"
-#include "shared/condition.h"
 #include "basic/extract-word.h"
 #include "basic/fd-util.h"
 #include "basic/glob-util.h"
 #include "basic/hostname-util.h"
-#include "shared/ima-util.h"
 #include "basic/list.h"
 #include "basic/macro.h"
 #include "basic/mount-util.h"
@@ -53,6 +50,9 @@
 #include "basic/string-util.h"
 #include "basic/util.h"
 #include "basic/virt.h"
+#include "shared/apparmor-util.h"
+#include "shared/condition.h"
+#include "shared/ima-util.h"
 
 Condition* condition_new(ConditionType type, const char *parameter, bool trigger, bool negate) {
         Condition *c;
diff --git a/src/libshared/src/conf-parser.c b/src/libshared/src/conf-parser.c
index ee1cb0f5d7..6631ff966f 100644
--- a/src/libshared/src/conf-parser.c
+++ b/src/libshared/src/conf-parser.c
@@ -27,7 +27,6 @@
 
 #include "basic/alloc-util.h"
 #include "basic/conf-files.h"
-#include "shared/conf-parser.h"
 #include "basic/extract-word.h"
 #include "basic/fd-util.h"
 #include "basic/fs-util.h"
@@ -43,6 +42,7 @@
 #include "basic/syslog-util.h"
 #include "basic/time-util.h"
 #include "basic/utf8.h"
+#include "shared/conf-parser.h"
 
 int config_item_table_lookup(
                 const void *table,
diff --git a/src/libshared/src/dev-setup.c b/src/libshared/src/dev-setup.c
index 57489ef6d9..495099dc28 100644
--- a/src/libshared/src/dev-setup.c
+++ b/src/libshared/src/dev-setup.c
@@ -22,12 +22,12 @@
 #include <unistd.h>
 
 #include "basic/alloc-util.h"
-#include "shared/dev-setup.h"
 #include "basic/label.h"
 #include "basic/log.h"
 #include "basic/path-util.h"
 #include "basic/user-util.h"
 #include "basic/util.h"
+#include "shared/dev-setup.h"
 
 int dev_setup(const char *prefix, uid_t uid, gid_t gid) {
         static const char symlinks[] =
diff --git a/src/libshared/src/dropin.c b/src/libshared/src/dropin.c
index 8a2cccb38f..ed044e0ba4 100644
--- a/src/libshared/src/dropin.c
+++ b/src/libshared/src/dropin.c
@@ -25,7 +25,6 @@
 
 #include "basic/alloc-util.h"
 #include "basic/conf-files.h"
-#include "shared/dropin.h"
 #include "basic/escape.h"
 #include "basic/fd-util.h"
 #include "basic/fileio-label.h"
@@ -38,6 +37,7 @@
 #include "basic/string-util.h"
 #include "basic/strv.h"
 #include "basic/unit-name.h"
+#include "shared/dropin.h"
 
 int drop_in_file(const char *dir, const char *unit, unsigned level,
                  const char *name, char **_p, char **_q) {
diff --git a/src/libshared/src/efivars.c b/src/libshared/src/efivars.c
index 28bf61c11a..41247eac03 100644
--- a/src/libshared/src/efivars.c
+++ b/src/libshared/src/efivars.c
@@ -31,7 +31,6 @@
 
 #include "basic/alloc-util.h"
 #include "basic/dirent-util.h"
-#include "shared/efivars.h"
 #include "basic/fd-util.h"
 #include "basic/io-util.h"
 #include "basic/macro.h"
@@ -41,6 +40,7 @@
 #include "basic/utf8.h"
 #include "basic/util.h"
 #include "basic/virt.h"
+#include "shared/efivars.h"
 
 #ifdef ENABLE_EFI
 
diff --git a/src/libshared/src/fstab-util.c b/src/libshared/src/fstab-util.c
index 82a175bfd6..3f301c6fe3 100644
--- a/src/libshared/src/fstab-util.c
+++ b/src/libshared/src/fstab-util.c
@@ -25,7 +25,6 @@
 
 #include "basic/alloc-util.h"
 #include "basic/device-nodes.h"
-#include "shared/fstab-util.h"
 #include "basic/macro.h"
 #include "basic/mount-util.h"
 #include "basic/parse-util.h"
@@ -33,6 +32,7 @@
 #include "basic/string-util.h"
 #include "basic/strv.h"
 #include "basic/util.h"
+#include "shared/fstab-util.h"
 
 bool fstab_is_mount_point(const char *mount) {
         _cleanup_endmntent_ FILE *f = NULL;
diff --git a/src/libshared/src/gcrypt-util.c b/src/libshared/src/gcrypt-util.c
index f222de6b4f..069134a4be 100644
--- a/src/libshared/src/gcrypt-util.c
+++ b/src/libshared/src/gcrypt-util.c
@@ -22,8 +22,8 @@
 #ifdef HAVE_GCRYPT
 #include <gcrypt.h>
 
-#include "gcrypt-util.h"
 #include "basic/hexdecoct.h"
+#include "shared/gcrypt-util.h"
 
 void initialize_libgcrypt(bool secmem) {
         const char *p;
diff --git a/src/libshared/src/generator.c b/src/libshared/src/generator.c
index f7ced68f36..7e7c3fd78b 100644
--- a/src/libshared/src/generator.c
+++ b/src/libshared/src/generator.c
@@ -21,12 +21,9 @@
 #include <unistd.h>
 
 #include "basic/alloc-util.h"
-#include "shared/dropin.h"
 #include "basic/escape.h"
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
-#include "shared/fstab-util.h"
-#include "shared/generator.h"
 #include "basic/log.h"
 #include "basic/macro.h"
 #include "basic/mkdir.h"
@@ -36,6 +33,9 @@
 #include "basic/time-util.h"
 #include "basic/unit-name.h"
 #include "basic/util.h"
+#include "shared/dropin.h"
+#include "shared/fstab-util.h"
+#include "shared/generator.h"
 
 static int write_fsck_sysroot_service(const char *dir, const char *what) {
         _cleanup_free_ char *device = NULL, *escaped = NULL;
diff --git a/src/libshared/src/import-util.c b/src/libshared/src/import-util.c
index d587b596b2..286cc1398a 100644
--- a/src/libshared/src/import-util.c
+++ b/src/libshared/src/import-util.c
@@ -22,13 +22,13 @@
 
 #include "basic/alloc-util.h"
 #include "basic/btrfs-util.h"
-#include "shared/import-util.h"
 #include "basic/log.h"
 #include "basic/macro.h"
 #include "basic/path-util.h"
 #include "basic/string-table.h"
 #include "basic/string-util.h"
 #include "basic/util.h"
+#include "shared/import-util.h"
 
 int import_url_last_component(const char *url, char **ret) {
         const char *e, *p;
diff --git a/src/libshared/src/install-printf.c b/src/libshared/src/install-printf.c
index d22057d5aa..2d62e3dfd2 100644
--- a/src/libshared/src/install-printf.c
+++ b/src/libshared/src/install-printf.c
@@ -23,12 +23,12 @@
 #include <unistd.h>
 
 #include "basic/formats-util.h"
-#include "shared/install-printf.h"
-#include "shared/install.h"
 #include "basic/macro.h"
-#include "shared/specifier.h"
 #include "basic/unit-name.h"
 #include "basic/user-util.h"
+#include "shared/install-printf.h"
+#include "shared/install.h"
+#include "shared/specifier.h"
 
 static int specifier_prefix_and_instance(char specifier, void *data, void *userdata, char **ret) {
         UnitFileInstallInfo *i = userdata;
diff --git a/src/libshared/src/install.c b/src/libshared/src/install.c
index d07ff0a652..bd360abcee 100644
--- a/src/libshared/src/install.c
+++ b/src/libshared/src/install.c
@@ -31,20 +31,16 @@
 
 #include "basic/alloc-util.h"
 #include "basic/conf-files.h"
-#include "shared/conf-parser.h"
 #include "basic/dirent-util.h"
 #include "basic/extract-word.h"
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
 #include "basic/fs-util.h"
 #include "basic/hashmap.h"
-#include "shared/install-printf.h"
-#include "shared/install.h"
 #include "basic/locale-util.h"
 #include "basic/log.h"
 #include "basic/macro.h"
 #include "basic/mkdir.h"
-#include "shared/path-lookup.h"
 #include "basic/path-util.h"
 #include "basic/rm-rf.h"
 #include "basic/set.h"
@@ -54,6 +50,10 @@
 #include "basic/string-util.h"
 #include "basic/strv.h"
 #include "basic/unit-name.h"
+#include "shared/conf-parser.h"
+#include "shared/install-printf.h"
+#include "shared/install.h"
+#include "shared/path-lookup.h"
 
 #define UNIT_FILE_FOLLOW_SYMLINK_MAX 64
 
diff --git a/src/libshared/src/logs-show.c b/src/libshared/src/logs-show.c
index 8956728414..1e5a7c6f01 100644
--- a/src/libshared/src/logs-show.c
+++ b/src/libshared/src/logs-show.c
@@ -37,11 +37,8 @@
 #include "basic/hashmap.h"
 #include "basic/hostname-util.h"
 #include "basic/io-util.h"
-#include "sd-journal/journal-internal.h"
 #include "basic/log.h"
-#include "shared/logs-show.h"
 #include "basic/macro.h"
-#include "shared/output-mode.h"
 #include "basic/parse-util.h"
 #include "basic/process-util.h"
 #include "basic/sparse-endian.h"
@@ -51,6 +48,9 @@
 #include "basic/time-util.h"
 #include "basic/utf8.h"
 #include "basic/util.h"
+#include "sd-journal/journal-internal.h"
+#include "shared/logs-show.h"
+#include "shared/output-mode.h"
 
 /* up to three lines (each up to 100 characters) or 300 characters, whichever is less */
 #define PRINT_LINE_THRESHOLD 3
diff --git a/src/libshared/src/machine-image.c b/src/libshared/src/machine-image.c
index 8f533d82ec..c7b0a33ce5 100644
--- a/src/libshared/src/machine-image.c
+++ b/src/libshared/src/machine-image.c
@@ -20,13 +20,14 @@
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <linux/fs.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <linux/fs.h>
+
 #include "basic/alloc-util.h"
 #include "basic/btrfs-util.h"
 #include "basic/chattr-util.h"
@@ -38,7 +39,6 @@
 #include "basic/lockfile-util.h"
 #include "basic/log.h"
 #include "basic/macro.h"
-#include "shared/machine-image.h"
 #include "basic/mkdir.h"
 #include "basic/path-util.h"
 #include "basic/rm-rf.h"
@@ -49,6 +49,7 @@
 #include "basic/utf8.h"
 #include "basic/util.h"
 #include "basic/xattr-util.h"
+#include "shared/machine-image.h"
 
 static const char image_search_path[] =
         "/var/lib/machines\0"
diff --git a/src/libshared/src/machine-pool.c b/src/libshared/src/machine-pool.c
index 7ca3980ece..ee8c0a9ba1 100644
--- a/src/libshared/src/machine-pool.c
+++ b/src/libshared/src/machine-pool.c
@@ -43,7 +43,6 @@
 #include "basic/fs-util.h"
 #include "basic/lockfile-util.h"
 #include "basic/log.h"
-#include "shared/machine-pool.h"
 #include "basic/macro.h"
 #include "basic/missing.h"
 #include "basic/mkdir.h"
@@ -54,6 +53,7 @@
 #include "basic/signal-util.h"
 #include "basic/stat-util.h"
 #include "basic/string-util.h"
+#include "shared/machine-pool.h"
 
 #define VAR_LIB_MACHINES_SIZE_START (1024UL*1024UL*500UL)
 #define VAR_LIB_MACHINES_FREE_MIN (1024UL*1024UL*750UL)
diff --git a/src/libshared/src/output-mode.c b/src/libshared/src/output-mode.c
index b112ceb20f..f482b0fa06 100644
--- a/src/libshared/src/output-mode.c
+++ b/src/libshared/src/output-mode.c
@@ -17,8 +17,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "shared/output-mode.h"
 #include "basic/string-table.h"
+#include "shared/output-mode.h"
 
 static const char *const output_mode_table[_OUTPUT_MODE_MAX] = {
         [OUTPUT_SHORT] = "short",
diff --git a/src/libshared/src/pager.c b/src/libshared/src/pager.c
index 611337bed3..8598d8e51a 100644
--- a/src/libshared/src/pager.c
+++ b/src/libshared/src/pager.c
@@ -32,11 +32,11 @@
 #include "basic/locale-util.h"
 #include "basic/log.h"
 #include "basic/macro.h"
-#include "shared/pager.h"
 #include "basic/process-util.h"
 #include "basic/signal-util.h"
 #include "basic/string-util.h"
 #include "basic/terminal-util.h"
+#include "shared/pager.h"
 
 static pid_t pager_pid = 0;
 
diff --git a/src/libshared/src/path-lookup.c b/src/libshared/src/path-lookup.c
index 3e9a478075..6ce89f4ed4 100644
--- a/src/libshared/src/path-lookup.c
+++ b/src/libshared/src/path-lookup.c
@@ -23,17 +23,17 @@
 #include <string.h>
 
 #include "basic/alloc-util.h"
-#include "shared/install.h"
 #include "basic/log.h"
 #include "basic/macro.h"
 #include "basic/mkdir.h"
-#include "shared/path-lookup.h"
 #include "basic/path-util.h"
 #include "basic/rm-rf.h"
 #include "basic/stat-util.h"
 #include "basic/string-util.h"
 #include "basic/strv.h"
 #include "basic/util.h"
+#include "shared/install.h"
+#include "shared/path-lookup.h"
 
 static int user_runtime_dir(char **ret, const char *suffix) {
         const char *e;
diff --git a/src/libshared/src/ptyfwd.c b/src/libshared/src/ptyfwd.c
index d8d8af6b4a..cd6a360ae4 100644
--- a/src/libshared/src/ptyfwd.c
+++ b/src/libshared/src/ptyfwd.c
@@ -36,8 +36,8 @@
 #include "basic/fd-util.h"
 #include "basic/log.h"
 #include "basic/macro.h"
-#include "shared/ptyfwd.h"
 #include "basic/time-util.h"
+#include "shared/ptyfwd.h"
 
 struct PTYForward {
         sd_event *event;
diff --git a/src/libshared/src/resolve-util.c b/src/libshared/src/resolve-util.c
index 17d6188ba3..1f031e566d 100644
--- a/src/libshared/src/resolve-util.c
+++ b/src/libshared/src/resolve-util.c
@@ -17,9 +17,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "basic/string-table.h"
 #include "shared/conf-parser.h"
 #include "shared/resolve-util.h"
-#include "basic/string-table.h"
 
 DEFINE_CONFIG_PARSE_ENUM(config_parse_resolve_support, resolve_support, ResolveSupport, "Failed to parse resolve support setting");
 DEFINE_CONFIG_PARSE_ENUM(config_parse_dnssec_mode, dnssec_mode, DnssecMode, "Failed to parse DNSSEC mode setting");
diff --git a/src/libshared/src/seccomp-util.c b/src/libshared/src/seccomp-util.c
index 2278a0e904..a7063539fb 100644
--- a/src/libshared/src/seccomp-util.c
+++ b/src/libshared/src/seccomp-util.c
@@ -22,8 +22,8 @@
 #include <stddef.h>
 
 #include "basic/macro.h"
-#include "shared/seccomp-util.h"
 #include "basic/string-util.h"
+#include "shared/seccomp-util.h"
 
 const char* seccomp_arch_to_string(uint32_t c) {
 
diff --git a/src/libshared/src/sleep-config.c b/src/libshared/src/sleep-config.c
index 9525246fb3..fd33763f68 100644
--- a/src/libshared/src/sleep-config.c
+++ b/src/libshared/src/sleep-config.c
@@ -26,7 +26,6 @@
 #include <unistd.h>
 
 #include "basic/alloc-util.h"
-#include "shared/conf-parser.h"
 #include "basic/def.h"
 #include "basic/env-util.h"
 #include "basic/fd-util.h"
@@ -34,9 +33,10 @@
 #include "basic/log.h"
 #include "basic/macro.h"
 #include "basic/parse-util.h"
-#include "shared/sleep-config.h"
 #include "basic/string-util.h"
 #include "basic/strv.h"
+#include "shared/conf-parser.h"
+#include "shared/sleep-config.h"
 
 #define USE(x, y) do { (x) = (y); (y) = NULL; } while (0)
 
diff --git a/src/libshared/src/spawn-ask-password-agent.c b/src/libshared/src/spawn-ask-password-agent.c
index bfd47d88dc..6c8aafcfb1 100644
--- a/src/libshared/src/spawn-ask-password-agent.c
+++ b/src/libshared/src/spawn-ask-password-agent.c
@@ -23,8 +23,8 @@
 
 #include "basic/log.h"
 #include "basic/process-util.h"
-#include "shared/spawn-ask-password-agent.h"
 #include "basic/util.h"
+#include "shared/spawn-ask-password-agent.h"
 
 static pid_t agent_pid = 0;
 
diff --git a/src/libshared/src/spawn-polkit-agent.c b/src/libshared/src/spawn-polkit-agent.c
index d5d129ccad..cb191fb6c5 100644
--- a/src/libshared/src/spawn-polkit-agent.c
+++ b/src/libshared/src/spawn-polkit-agent.c
@@ -28,10 +28,10 @@
 #include "basic/log.h"
 #include "basic/macro.h"
 #include "basic/process-util.h"
-#include "shared/spawn-polkit-agent.h"
 #include "basic/stdio-util.h"
 #include "basic/time-util.h"
 #include "basic/util.h"
+#include "shared/spawn-polkit-agent.h"
 
 #ifdef ENABLE_POLKIT
 static pid_t agent_pid = 0;
diff --git a/src/libshared/src/specifier.c b/src/libshared/src/specifier.c
index 195854f212..42bd306e00 100644
--- a/src/libshared/src/specifier.c
+++ b/src/libshared/src/specifier.c
@@ -29,8 +29,8 @@
 #include "basic/alloc-util.h"
 #include "basic/hostname-util.h"
 #include "basic/macro.h"
-#include "shared/specifier.h"
 #include "basic/string-util.h"
+#include "shared/specifier.h"
 
 /*
  * Generic infrastructure for replacing %x style specifiers in
diff --git a/src/libshared/src/switch-root.c b/src/libshared/src/switch-root.c
index 42079ea70b..d41a114ae1 100644
--- a/src/libshared/src/switch-root.c
+++ b/src/libshared/src/switch-root.c
@@ -26,7 +26,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "shared/base-filesystem.h"
 #include "basic/fd-util.h"
 #include "basic/log.h"
 #include "basic/missing.h"
@@ -35,9 +34,10 @@
 #include "basic/rm-rf.h"
 #include "basic/stdio-util.h"
 #include "basic/string-util.h"
-#include "shared/switch-root.h"
 #include "basic/user-util.h"
 #include "basic/util.h"
+#include "shared/base-filesystem.h"
+#include "shared/switch-root.h"
 
 int switch_root(const char *new_root, const char *oldroot, bool detach_oldroot,  unsigned long mountflags) {
 
diff --git a/src/libshared/src/uid-range.c b/src/libshared/src/uid-range.c
index 3764198610..22cac34c6e 100644
--- a/src/libshared/src/uid-range.c
+++ b/src/libshared/src/uid-range.c
@@ -22,8 +22,8 @@
 #include <string.h>
 
 #include "basic/macro.h"
-#include "shared/uid-range.h"
 #include "basic/user-util.h"
+#include "shared/uid-range.h"
 
 static bool uid_range_intersect(UidRange *range, uid_t start, uid_t nr) {
         assert(range);
diff --git a/src/libshared/src/watchdog.c b/src/libshared/src/watchdog.c
index bc5c5f0503..49577669f4 100644
--- a/src/libshared/src/watchdog.c
+++ b/src/libshared/src/watchdog.c
@@ -19,10 +19,10 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#include <linux/watchdog.h>
 #include <sys/ioctl.h>
 #include <syslog.h>
 #include <unistd.h>
-#include <linux/watchdog.h>
 
 #include "basic/fd-util.h"
 #include "basic/log.h"