tree-wide: Sort includes

This was done by running a locally built clang-format with
https://github.com/llvm/llvm-project/pull/137617 and
https://github.com/llvm/llvm-project/pull/137840 applied on all .c
and .h files.

src/core/all-units.h

@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "unit.h"
-
 #include "automount.h"
 #include "device.h"
 #include "mount.h"
@@ -14,3 +12,4 @@
 #include "swap.h"
 #include "target.h"
 #include "timer.h"
+#include "unit.h"

src/core/automount.c

@@ -21,10 +21,10 @@
 #include "fstab-util.h"
 #include "io-util.h"
 #include "label-util.h"
-#include "mkdir-label.h"
 #include "manager.h"
-#include "mount-util.h"
+#include "mkdir-label.h"
 #include "mount.h"
+#include "mount-util.h"
 #include "mountpoint-util.h"
 #include "parse-util.h"
 #include "path-util.h"
@@ -34,8 +34,8 @@
 #include "stdio-util.h"
 #include "string-table.h"
 #include "string-util.h"
-#include "unit-name.h"
 #include "unit.h"
+#include "unit-name.h"
 
 static const UnitActiveState state_translation_table[_AUTOMOUNT_STATE_MAX] = {
         [AUTOMOUNT_DEAD]    = UNIT_INACTIVE,

src/core/bpf-firewall.c

@@ -1,13 +1,12 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-/* Make sure the net/if.h header is included before any linux/ one */
-#include <net/if.h>
 #include <arpa/inet.h>
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <linux/bpf_insn.h>
 #include <net/ethernet.h>
+#include <net/if.h>
 #include <netinet/ip.h>
 #include <netinet/ip6.h>
 #include <stddef.h>
@@ -23,8 +22,8 @@
 #include "manager.h"
 #include "memory-util.h"
 #include "missing_syscall.h"
-#include "unit.h"
 #include "strv.h"
+#include "unit.h"
 #include "virt.h"
 
 enum {

src/core/bpf-restrict-ifaces.c

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include "fd-util.h"
 #include "bpf-restrict-ifaces.h"
+#include "fd-util.h"
 #include "netlink-util.h"
 #include "unit.h"
 

src/core/bpf-socket-bind.c

@@ -4,8 +4,8 @@
 #include <bpf/bpf.h>
 #endif
 
-#include "fd-util.h"
 #include "bpf-socket-bind.h"
+#include "fd-util.h"
 #include "unit.h"
 
 #if BPF_FRAMEWORK

src/core/bpf/restrict_fs/restrict-fs.bpf.c

@@ -6,14 +6,14 @@
  * fine given that LGPL-2.1-or-later downgrades to GPL if needed.
  */
 
-#include <linux/types.h>
-#include <linux/bpf.h>
-#include <bpf/bpf_helpers.h>
-#include <bpf/bpf_tracing.h>
-#include <bpf/bpf_core_read.h>
 #include <errno.h>
+#include <linux/bpf.h>
+#include <linux/types.h>
 #include <stddef.h>
 #include <stdint.h>
+#include <bpf/bpf_core_read.h>
+#include <bpf/bpf_helpers.h>
+#include <bpf/bpf_tracing.h>
 
 struct super_block {
         unsigned long s_magic;

src/core/bpf/socket_bind/socket-bind.bpf.c

@@ -10,12 +10,12 @@
 /* <linux/types.h> must precede <bpf/bpf_helpers.h> due to
  * <bpf/bpf_helpers.h> does not depend from type header by design.
  */
-#include <linux/types.h>
-#include <bpf/bpf_endian.h>
-#include <bpf/bpf_helpers.h>
 #include <linux/bpf.h>
+#include <linux/types.h>
 #include <netinet/in.h>
 #include <stdbool.h>
+#include <bpf/bpf_endian.h>
+#include <bpf/bpf_helpers.h>
 
 /*
  * max_entries is set from user space with bpf_map__set_max_entries helper.

src/core/cgroup.c

@@ -15,9 +15,9 @@
 #include "btrfs-util.h"
 #include "bus-error.h"
 #include "bus-locator.h"
+#include "cgroup.h"
 #include "cgroup-setup.h"
 #include "cgroup-util.h"
-#include "cgroup.h"
 #include "devnum-util.h"
 #include "fd-util.h"
 #include "fileio.h"

src/core/core-varlink.c

@@ -11,8 +11,8 @@
 #include "unit.h"
 #include "user-util.h"
 #include "varlink-internal.h"
-#include "varlink-io.systemd.UserDatabase.h"
 #include "varlink-io.systemd.ManagedOOM.h"
+#include "varlink-io.systemd.UserDatabase.h"
 #include "varlink-io.systemd.service.h"
 #include "varlink-util.h"
 

src/core/dbus-cgroup.c

@@ -9,8 +9,8 @@
 #include "bus-get-properties.h"
 #include "bus-message-util.h"
 #include "bus-util.h"
-#include "cgroup-util.h"
 #include "cgroup.h"
+#include "cgroup-util.h"
 #include "core-varlink.h"
 #include "dbus-cgroup.h"
 #include "dbus-util.h"

src/core/dbus-cgroup.h

@@ -4,8 +4,8 @@
 #include "sd-bus.h"
 #include "sd-bus-vtable.h"
 
-#include "unit.h"
 #include "cgroup.h"
+#include "unit.h"
 
 extern const sd_bus_vtable bus_cgroup_vtable[];
 

src/core/dbus-execute.c

@@ -2,6 +2,7 @@
 
 #include <sys/mount.h>
 #include <sys/prctl.h>
+
 #include "af-list.h"
 #include "alloc-util.h"
 #include "bus-get-properties.h"

src/core/dbus-job.c

@@ -5,10 +5,10 @@
 #include "alloc-util.h"
 #include "bus-get-properties.h"
 #include "bus-util.h"
+#include "dbus.h"
 #include "dbus-job.h"
 #include "dbus-unit.h"
 #include "dbus-util.h"
-#include "dbus.h"
 #include "job.h"
 #include "log.h"
 #include "selinux-access.h"

src/core/dbus-manager.c

@@ -16,6 +16,7 @@
 #include "bus-util.h"
 #include "chase.h"
 #include "confidential-virt.h"
+#include "dbus.h"
 #include "dbus-cgroup.h"
 #include "dbus-execute.h"
 #include "dbus-job.h"
@@ -24,7 +25,6 @@
 #include "dbus-service.h"
 #include "dbus-unit.h"
 #include "dbus-util.h"
-#include "dbus.h"
 #include "dynamic-user.h"
 #include "env-util.h"
 #include "fd-util.h"

src/core/dbus-scope.c

@@ -4,13 +4,13 @@
 #include "bus-common-errors.h"
 #include "bus-get-properties.h"
 #include "bus-util.h"
+#include "dbus.h"
 #include "dbus-cgroup.h"
 #include "dbus-kill.h"
 #include "dbus-manager.h"
 #include "dbus-scope.h"
 #include "dbus-unit.h"
 #include "dbus-util.h"
-#include "dbus.h"
 #include "scope.h"
 #include "selinux-access.h"
 #include "unit.h"

src/core/dbus-service.c

@@ -12,8 +12,8 @@
 #include "dbus-manager.h"
 #include "dbus-service.h"
 #include "dbus-util.h"
-#include "execute.h"
 #include "exec-credential.h"
+#include "execute.h"
 #include "exit-status.h"
 #include "fd-util.h"
 #include "fileio.h"

src/core/dbus-unit.c

@@ -11,11 +11,11 @@
 #include "bus-util.h"
 #include "cgroup-util.h"
 #include "condition.h"
+#include "dbus.h"
 #include "dbus-job.h"
 #include "dbus-manager.h"
 #include "dbus-unit.h"
 #include "dbus-util.h"
-#include "dbus.h"
 #include "fd-util.h"
 #include "install.h"
 #include "locale-util.h"

src/core/dbus-util.c

@@ -8,9 +8,9 @@
 #include "parse-util.h"
 #include "path-util.h"
 #include "reboot-util.h"
+#include "unit.h"
 #include "unit-printf.h"
 #include "user-util.h"
-#include "unit.h"
 
 int bus_property_get_triggered_unit(
                 sd_bus *bus,

src/core/dbus.c

@@ -13,6 +13,7 @@
 #include "bus-internal.h"
 #include "bus-polkit.h"
 #include "bus-util.h"
+#include "dbus.h"
 #include "dbus-automount.h"
 #include "dbus-cgroup.h"
 #include "dbus-device.h"
@@ -30,7 +31,6 @@
 #include "dbus-target.h"
 #include "dbus-timer.h"
 #include "dbus-unit.h"
-#include "dbus.h"
 #include "fd-util.h"
 #include "fs-util.h"
 #include "log.h"

src/core/device.c

@@ -9,9 +9,9 @@
 #include "bus-common-errors.h"
 #include "dbus-device.h"
 #include "dbus-unit.h"
+#include "device.h"
 #include "device-private.h"
 #include "device-util.h"
-#include "device.h"
 #include "log.h"
 #include "manager.h"
 #include "parse-util.h"
@@ -22,8 +22,8 @@
 #include "string-util.h"
 #include "swap.h"
 #include "udev-util.h"
-#include "unit-name.h"
 #include "unit.h"
+#include "unit-name.h"
 
 static const UnitActiveState state_translation_table[_DEVICE_STATE_MAX] = {
         [DEVICE_DEAD]      = UNIT_INACTIVE,

src/core/execute-serialize.c

@@ -8,9 +8,9 @@
 #include "escape.h"
 #include "exec-credential.h"
 #include "execute-serialize.h"
-#include "hexdecoct.h"
 #include "fd-util.h"
 #include "fileio.h"
+#include "hexdecoct.h"
 #include "in-addr-prefix-util.h"
 #include "parse-helpers.h"
 #include "parse-util.h"

src/core/executor.c

@@ -12,11 +12,11 @@
 #include "cgroup.h"
 #include "dynamic-user.h"
 #include "exec-invoke.h"
-#include "execute-serialize.h"
 #include "execute.h"
+#include "execute-serialize.h"
 #include "exit-status.h"
-#include "fdset.h"
 #include "fd-util.h"
+#include "fdset.h"
 #include "fileio.h"
 #include "getopt-defs.h"
 #include "label-util.h"

src/core/fuzz-manager-serialize.c

@@ -5,8 +5,8 @@
 #include "alloc-util.h"
 #include "fd-util.h"
 #include "fuzz.h"
-#include "manager-serialize.h"
 #include "manager.h"
+#include "manager-serialize.h"
 #include "service.h"
 
 int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {

src/core/job.c

@@ -9,8 +9,8 @@
 #include "ansi-color.h"
 #include "async.h"
 #include "cgroup.h"
-#include "dbus-job.h"
 #include "dbus.h"
+#include "dbus-job.h"
 #include "escape.h"
 #include "fileio.h"
 #include "job.h"

src/core/load-dropin.c

@@ -10,8 +10,8 @@
 #include "stat-util.h"
 #include "string-util.h"
 #include "strv.h"
-#include "unit-name.h"
 #include "unit.h"
+#include "unit-name.h"
 
 int unit_find_dropin_paths(Unit *u, bool use_unit_path_cache, char ***paths) {
         assert(u);

src/core/main.c

@@ -35,8 +35,8 @@
 #include "copy.h"
 #include "cpu-set-util.h"
 #include "crash-handler.h"
-#include "dbus-manager.h"
 #include "dbus.h"
+#include "dbus-manager.h"
 #include "dev-setup.h"
 #include "efi-random.h"
 #include "efivars.h"

src/core/manager-serialize.c

@@ -11,8 +11,8 @@
 #include "format-util.h"
 #include "initrd-util.h"
 #include "macro.h"
-#include "manager-serialize.h"
 #include "manager.h"
+#include "manager-serialize.h"
 #include "parse-util.h"
 #include "serialize.h"
 #include "syslog-util.h"

src/core/manager.c

@@ -37,10 +37,10 @@
 #include "core-varlink.h"
 #include "creds-util.h"
 #include "daemon-util.h"
+#include "dbus.h"
 #include "dbus-job.h"
 #include "dbus-manager.h"
 #include "dbus-unit.h"
-#include "dbus.h"
 #include "dirent-util.h"
 #include "dynamic-user.h"
 #include "env-util.h"

src/core/manager.h

@@ -9,8 +9,8 @@
 #include "sd-event.h"
 #include "sd-varlink.h"
 
-#include "cgroup-util.h"
 #include "cgroup.h"
+#include "cgroup-util.h"
 #include "common-signal.h"
 #include "emergency-action.h"
 #include "execute.h"
@@ -23,8 +23,8 @@
 #include "ratelimit.h"
 #include "show-status.h"
 #include "transaction.h"
-#include "unit-name.h"
 #include "unit.h"
+#include "unit-name.h"
 
 struct libmnt_monitor;
 

src/core/mount.c

@@ -23,8 +23,8 @@
 #include "log.h"
 #include "manager.h"
 #include "mkdir-label.h"
-#include "mount-setup.h"
 #include "mount.h"
+#include "mount-setup.h"
 #include "mountpoint-util.h"
 #include "parse-util.h"
 #include "path-util.h"
@@ -35,8 +35,8 @@
 #include "string-table.h"
 #include "string-util.h"
 #include "strv.h"
-#include "unit-name.h"
 #include "unit.h"
+#include "unit-name.h"
 #include "utf8.h"
 
 #define RETRY_UMOUNT_MAX 32

src/core/namespace.c

@@ -29,8 +29,8 @@
 #include "mkdir-label.h"
 #include "mount-util.h"
 #include "mountpoint-util.h"
-#include "namespace-util.h"
 #include "namespace.h"
+#include "namespace-util.h"
 #include "nsflags.h"
 #include "nulstr-util.h"
 #include "os-util.h"

src/core/path.c

@@ -25,8 +25,8 @@
 #include "stat-util.h"
 #include "string-table.h"
 #include "string-util.h"
-#include "unit-name.h"
 #include "unit.h"
+#include "unit-name.h"
 
 static const UnitActiveState state_translation_table[_PATH_STATE_MAX] = {
         [PATH_DEAD]    = UNIT_INACTIVE,

src/core/scope.c

@@ -19,8 +19,8 @@
 #include "string-table.h"
 #include "string-util.h"
 #include "strv.h"
-#include "unit-name.h"
 #include "unit.h"
+#include "unit-name.h"
 #include "user-util.h"
 
 static const UnitActiveState state_translation_table[_SCOPE_STATE_MAX] = {

src/core/service.c

@@ -49,8 +49,8 @@
 #include "string-util.h"
 #include "strv.h"
 #include "transaction.h"
-#include "unit-name.h"
 #include "unit.h"
+#include "unit-name.h"
 #include "utf8.h"
 
 #define service_spawn(...) service_spawn_internal(__func__, __VA_ARGS__)

src/core/slice.c

@@ -13,8 +13,8 @@
 #include "special.h"
 #include "string-util.h"
 #include "strv.h"
-#include "unit-name.h"
 #include "unit.h"
+#include "unit-name.h"
 
 static const UnitActiveState state_translation_table[_SLICE_STATE_MAX] = {
         [SLICE_DEAD]   = UNIT_INACTIVE,

src/core/socket.c

@@ -3,12 +3,12 @@
 #include <arpa/inet.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <linux/sctp.h>
 #include <mqueue.h>
 #include <netinet/tcp.h>
 #include <sys/epoll.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <linux/sctp.h>
 
 #include "alloc-util.h"
 #include "bpf-firewall.h"
@@ -46,8 +46,8 @@
 #include "string-table.h"
 #include "string-util.h"
 #include "strv.h"
-#include "unit-name.h"
 #include "unit.h"
+#include "unit-name.h"
 #include "user-util.h"
 
 struct SocketPeer {

src/core/swap.c

@@ -10,8 +10,8 @@
 #include "alloc-util.h"
 #include "dbus-swap.h"
 #include "dbus-unit.h"
-#include "device-util.h"
 #include "device.h"
+#include "device-util.h"
 #include "escape.h"
 #include "exit-status.h"
 #include "fd-util.h"
@@ -26,8 +26,8 @@
 #include "string-table.h"
 #include "string-util.h"
 #include "swap.h"
-#include "unit-name.h"
 #include "unit.h"
+#include "unit-name.h"
 #include "virt.h"
 
 static const UnitActiveState state_translation_table[_SWAP_STATE_MAX] = {

src/core/target.c

@@ -7,8 +7,8 @@
 #include "special.h"
 #include "string-util.h"
 #include "target.h"
-#include "unit-name.h"
 #include "unit.h"
+#include "unit-name.h"
 
 static const UnitActiveState state_translation_table[_TARGET_STATE_MAX] = {
         [TARGET_DEAD]   = UNIT_INACTIVE,

src/core/timer.c

@@ -1,11 +1,10 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <errno.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <errno.h>
-
 #include "alloc-util.h"
 #include "bus-error.h"
 #include "bus-util.h"
@@ -20,8 +19,8 @@
 #include "string-table.h"
 #include "string-util.h"
 #include "timer.h"
-#include "unit-name.h"
 #include "unit.h"
+#include "unit-name.h"
 #include "user-util.h"
 #include "virt.h"
 

src/core/unit-printf.c

@@ -1,17 +1,18 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "sd-path.h"
+
 #include "alloc-util.h"
 #include "cgroup-util.h"
 #include "format-util.h"
 #include "macro.h"
 #include "manager.h"
-#include "sd-path.h"
 #include "specifier.h"
 #include "string-util.h"
 #include "strv.h"
+#include "unit.h"
 #include "unit-name.h"
 #include "unit-printf.h"
-#include "unit.h"
 #include "user-util.h"
 
 static int specifier_prefix_and_instance(char specifier, const void *data, const char *root, const void *userdata, char **ret) {

src/core/unit.c

@@ -21,8 +21,8 @@
 #include "cgroup-util.h"
 #include "chase.h"
 #include "core-varlink.h"
-#include "dbus-unit.h"
 #include "dbus.h"
+#include "dbus-unit.h"
 #include "dropin.h"
 #include "dynamic-user.h"
 #include "env-util.h"
@@ -60,8 +60,8 @@
 #include "terminal-util.h"
 #include "tmpfile-util.h"
 #include "umask-util.h"
-#include "unit-name.h"
 #include "unit.h"
+#include "unit-name.h"
 #include "user-util.h"
 #include "virt.h"
 #if BPF_FRAMEWORK