Add our own <netinet/in.h> and <net/if.h> headers and sort includes tree-wide with clang-format (#37278)

.clang-format

@@ -107,6 +107,27 @@ ForEachMacros:
   - STRV_FOREACH
   - STRV_FOREACH_BACKWARDS
   - STRV_FOREACH_PAIR
+IncludeBlocks: Regroup
+IncludeCategories:
+  # "vmlinux.h" must always be included first in BPF programs before anything else.
+  - Regex:           '^"vmlinux.h"$'
+    Priority:        1
+  # <bpf/*.h> headers must be included after <linux/types.h> by design.
+  - Regex:           '^<bpf/.*\.h>$'
+    Priority:        2
+    SortPriority:    3
+  - Regex:           '^<.*\.h>$'
+    Priority:        2
+  - Regex:           '^"_?sd-.*\.h"$'
+    Priority:        4
+  - Regex:           '^"libudev\.h"$'
+    Priority:        4
+  - Regex:           '^"audit_type-to-name.h"$'
+    Priority:        6
+  - Regex:           '.*'
+    Priority:        5
+# Make sure the "main header" is not treated any differently than other headers.
+IncludeIsMainRegex: '^$'
 IndentPPDirectives: AfterHash
 IndentWidth: 8
 IndentWrappedFunctionNames: true

src/analyze/analyze-critical-chain.c

@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "analyze.h"
 #include "analyze-critical-chain.h"
 #include "analyze-time-data.h"
-#include "analyze.h"
 #include "bus-error.h"
 #include "copy.h"
 #include "path-util.h"

src/analyze/analyze-dump.c

@@ -2,8 +2,8 @@
 
 #include "sd-bus.h"
 
-#include "analyze-dump.h"
 #include "analyze.h"
+#include "analyze-dump.h"
 #include "bus-error.h"
 #include "bus-locator.h"
 #include "bus-message-util.h"

src/analyze/analyze-fdstore.c

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include "analyze-fdstore.h"
 #include "analyze.h"
+#include "analyze-fdstore.h"
 #include "bus-error.h"
 #include "bus-locator.h"
 #include "fd-util.h"

src/analyze/analyze-image-policy.c

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include "analyze-image-policy.h"
 #include "analyze.h"
+#include "analyze-image-policy.h"
 #include "format-table.h"
 #include "image-policy.h"
 #include "terminal-util.h"

src/analyze/analyze-malloc.c

@@ -2,8 +2,8 @@
 
 #include "sd-bus.h"
 
-#include "analyze-malloc.h"
 #include "analyze.h"
+#include "analyze-malloc.h"
 #include "bus-error.h"
 #include "bus-internal.h"
 #include "bus-message-util.h"

src/analyze/analyze-plot.c

@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "analyze.h"
 #include "analyze-plot.h"
 #include "analyze-time-data.h"
-#include "analyze.h"
 #include "bus-error.h"
 #include "bus-map-properties.h"
 #include "format-table.h"

src/analyze/analyze-syscall-filter.c

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include "analyze-syscall-filter.h"
 #include "analyze.h"
+#include "analyze-syscall-filter.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "nulstr-util.h"

src/analyze/analyze-time-data.c

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include "analyze-time-data.h"
 #include "analyze.h"
+#include "analyze-time-data.h"
 #include "bus-error.h"
 #include "bus-locator.h"
 #include "bus-map-properties.h"

src/analyze/analyze-verify-util.c

@@ -4,8 +4,8 @@
 
 #include "all-units.h"
 #include "alloc-util.h"
-#include "analyze-verify-util.h"
 #include "analyze.h"
+#include "analyze-verify-util.h"
 #include "bus-error.h"
 #include "bus-util.h"
 #include "log.h"

src/analyze/analyze.c

@@ -55,8 +55,8 @@
 #include "cap-list.h"
 #include "capability-util.h"
 #include "conf-files.h"
-#include "copy.h"
 #include "constants.h"
+#include "copy.h"
 #include "exit-status.h"
 #include "extract-word.h"
 #include "fd-util.h"

src/basic/arphrd-util.c

@@ -1,9 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <errno.h>
-#include <netinet/in.h>
 #include <linux/if_arp.h>
 #include <linux/if_infiniband.h>
+#include <netinet/in.h>
 #include <string.h>
 
 #include "arphrd-util.h"

src/basic/cap-list.c

@@ -5,8 +5,8 @@
 
 #include "alloc-util.h"
 #include "bitfield.h"
-#include "capability-util.h"
 #include "cap-list.h"
+#include "capability-util.h"
 #include "extract-word.h"
 #include "log.h"
 #include "macro.h"

src/basic/confidential-virt.c

@@ -9,8 +9,8 @@
 #include <threads.h>
 #include <unistd.h>
 
-#include "confidential-virt-fundamental.h"
 #include "confidential-virt.h"
+#include "confidential-virt-fundamental.h"
 #include "errno-util.h"
 #include "fd-util.h"
 #include "fileio.h"

src/basic/fs-util.c

@@ -1,11 +1,11 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <errno.h>
+#include <linux/falloc.h>
+#include <linux/magic.h>
 #include <stddef.h>
 #include <stdlib.h>
 #include <sys/file.h>
-#include <linux/falloc.h>
-#include <linux/magic.h>
 #include <unistd.h>
 
 #include "alloc-util.h"

src/basic/glob-util.c

@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <errno.h>
-#include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/types.h>
 #include <unistd.h>
 
 #include "dirent-util.h"

src/basic/in-addr-util.c

@@ -13,6 +13,7 @@
 #include "in-addr-util.h"
 #include "logarithm.h"
 #include "macro.h"
+#include "memory-util.h"
 #include "parse-util.h"
 #include "random-util.h"
 #include "stdio-util.h"
@@ -28,7 +29,7 @@ bool in4_addr_is_null(const struct in_addr *a) {
 bool in6_addr_is_null(const struct in6_addr *a) {
         assert(a);
 
-        return IN6_IS_ADDR_UNSPECIFIED(a);
+        return eqzero(a->in6_u.u6_addr32);
 }
 
 int in_addr_is_null(int family, const union in_addr_union *u) {
@@ -66,7 +67,7 @@ bool in4_addr_is_link_local_dynamic(const struct in_addr *a) {
 bool in6_addr_is_link_local(const struct in6_addr *a) {
         assert(a);
 
-        return IN6_IS_ADDR_LINKLOCAL(a);
+        return (a->in6_u.u6_addr32[0] & htobe32(0xffc00000)) == htobe32(0xfe800000);
 }
 
 int in_addr_is_link_local(int family, const union in_addr_union *u) {
@@ -100,7 +101,7 @@ bool in4_addr_is_multicast(const struct in_addr *a) {
 bool in6_addr_is_multicast(const struct in6_addr *a) {
         assert(a);
 
-        return IN6_IS_ADDR_MULTICAST(a);
+        return a->in6_u.u6_addr8[0] == 0xff;
 }
 
 int in_addr_is_multicast(int family, const union in_addr_union *u) {
@@ -136,6 +137,10 @@ bool in4_addr_is_non_local(const struct in_addr *a) {
                !in4_addr_is_localhost(a);
 }
 
+static bool in6_addr_is_loopback(const struct in6_addr *a) {
+        return memcmp(a, &(struct in6_addr) IN6ADDR_LOOPBACK_INIT, sizeof(struct in6_addr)) == 0;
+}
+
 int in_addr_is_localhost(int family, const union in_addr_union *u) {
         assert(u);
 
@@ -143,7 +148,7 @@ int in_addr_is_localhost(int family, const union in_addr_union *u) {
                 return in4_addr_is_localhost(&u->in);
 
         if (family == AF_INET6)
-                return IN6_IS_ADDR_LOOPBACK(&u->in6);
+                return in6_addr_is_loopback(&u->in6);
 
         return -EAFNOSUPPORT;
 }
@@ -156,7 +161,7 @@ int in_addr_is_localhost_one(int family, const union in_addr_union *u) {
                 return be32toh(u->in.s_addr) == UINT32_C(0x7F000001);
 
         if (family == AF_INET6)
-                return IN6_IS_ADDR_LOOPBACK(&u->in6);
+                return in6_addr_is_loopback(&u->in6);
 
         return -EAFNOSUPPORT;
 }
@@ -178,7 +183,7 @@ bool in6_addr_equal(const struct in6_addr *a, const struct in6_addr *b) {
         assert(a);
         assert(b);
 
-        return IN6_ARE_ADDR_EQUAL(a, b);
+        return memcmp(a, b, sizeof(struct in6_addr)) == 0;
 }
 
 int in_addr_equal(int family, const union in_addr_union *a, const union in_addr_union *b) {

src/basic/include/linux/.clang-format

@@ -0,0 +1,2 @@
+---
+DisableFormat: true

src/basic/include/net/if.h

@@ -0,0 +1,9 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+#pragma once
+
+#include <linux/if.h>
+
+#define IF_NAMESIZE       16
+
+extern unsigned int if_nametoindex(const char *__ifname) __THROW;
+extern char *if_indextoname(unsigned int __ifindex, char __ifname[IF_NAMESIZE]) __THROW;

src/basic/include/netinet/in.h

@@ -0,0 +1,19 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+#pragma once
+
+#include <linux/in.h>
+#include <linux/in6.h>
+#include <linux/ipv6.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <sys/socket.h>
+
+#define INET_ADDRSTRLEN 16
+#define INET6_ADDRSTRLEN 46
+
+extern const struct in6_addr in6addr_any;        /* :: */
+extern const struct in6_addr in6addr_loopback;   /* ::1 */
+#define IN6ADDR_ANY_INIT { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } } }
+#define IN6ADDR_LOOPBACK_INIT { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } } }
+
+typedef uint32_t in_addr_t;

src/basic/keyring-util.c

@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "keyring-util.h"
 #include "log.h"
-#include "alloc-util.h"
 #include "memory-util.h"
 #include "missing_syscall.h"
 

src/basic/missing_fs.h

@@ -1,50 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-/* temporary undef definitions in bits/uio-ext.h, which is included by sys/uio.h */
-#include <sys/uio.h>
-
-#define __RWF_HIPRI_SAVED__     RWF_HIPRI
-#undef RWF_HIPRI
-#define __RWF_DSYNC_SAVED__     RWF_DSYNC
-#undef RWF_DSYNC
-#define __RWF_SYNC_SAVED__      RWF_SYNC
-#undef RWF_SYNC
-#define __RWF_NOWAIT_SAVED__    RWF_NOWAIT
-#undef RWF_NOWAIT
-#define __RWF_APPEND_SAVED__    RWF_APPEND
-#undef RWF_APPEND
-#define __RWF_NOAPPEND_SAVED__  RWF_NOAPPEND
-#undef RWF_NOAPPEND
-#if defined(RWF_ATOMIC)
-#define __RWF_ATOMIC_SAVED__    RWF_ATOMIC
-#undef RWF_ATOMIC
-#else
-#define __RWF_ATOMIC_SAVED__    0x00000040
-#endif
-#if defined(RWF_DONTCACHE)
-#define __RWF_DONTCACHE_SAVED__ RWF_DONTCACHE
-#undef RWF_DONTCACHE
-#else
-#define __RWF_DONTCACHE_SAVED__ 0x00000080
-#endif
-
-#include <linux/btrfs.h>
-#include <linux/btrfs_tree.h>
 #include <linux/fs.h>
 
-#include "macro.h"
-
-/* check RWF_xyz are redefined by linux/fs.h */
-assert_cc(RWF_HIPRI     == __RWF_HIPRI_SAVED__);
-assert_cc(RWF_DSYNC     == __RWF_DSYNC_SAVED__);
-assert_cc(RWF_SYNC      == __RWF_SYNC_SAVED__);
-assert_cc(RWF_NOWAIT    == __RWF_NOWAIT_SAVED__);
-assert_cc(RWF_APPEND    == __RWF_APPEND_SAVED__);
-assert_cc(RWF_NOAPPEND  == __RWF_NOAPPEND_SAVED__);
-assert_cc(RWF_ATOMIC    == __RWF_ATOMIC_SAVED__);
-assert_cc(RWF_DONTCACHE == __RWF_DONTCACHE_SAVED__);
-
 /* Not exposed yet. Defined at fs/ext4/ext4.h */
 #ifndef EXT4_IOC_RESIZE_FS
 #define EXT4_IOC_RESIZE_FS _IOW('f', 16, __u64)

src/basic/missing_syscall_def.h

@@ -6,6 +6,8 @@
  */
 #pragma once
 
+#include "macro.h"
+
 /* Note: if this code looks strange, this is because it is derived from the same
  * template as the per-syscall blocks below. */
 #  if defined(__aarch64__)

src/basic/percent-util.c

@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "parse-util.h"
 #include "percent-util.h"
 #include "string-util.h"
-#include "parse-util.h"
 
 static int parse_parts_value_whole(const char *p, const char *symbol) {
         const char *pc, *n;

src/basic/psi-util.c

@@ -11,8 +11,8 @@
 #include "fileio.h"
 #include "parse-util.h"
 #include "psi-util.h"
-#include "string-util.h"
 #include "stat-util.h"
+#include "string-util.h"
 #include "strv.h"
 
 int read_resource_pressure(const char *path, PressureType type, ResourcePressure *ret) {

src/basic/recurse-dir.h

@@ -5,8 +5,8 @@
 #include <limits.h>
 
 #include "errno-list.h"
-#include "stat-util.h"
 #include "macro.h"
+#include "stat-util.h"
 
 typedef enum RecurseDirFlags {
         /* Interpreted by readdir_all() */

src/basic/socket-util.c

@@ -1,10 +1,10 @@
 /* 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 <errno.h>
 #include <limits.h>
+#include <linux/if.h>
+#include <net/if.h>
 #include <netdb.h>
 #include <netinet/ip.h>
 #include <poll.h>
@@ -14,7 +14,6 @@
 #include <stdlib.h>
 #include <sys/ioctl.h>
 #include <unistd.h>
-#include <linux/if.h>
 
 #include "alloc-util.h"
 #include "errno-util.h"

src/basic/sort-util.c

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include "sort-util.h"
 #include "alloc-util.h"
+#include "sort-util.h"
 
 /* hey glibc, APIs with callbacks without a user pointer are so useless */
 void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size,

src/basic/terminal-util.h

@@ -4,8 +4,8 @@
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <syslog.h>
 #include <sys/types.h>
+#include <syslog.h>
 #include <termios.h>
 #include <unistd.h>
 

src/boot/boot.c

@@ -7,8 +7,8 @@
 #include "devicetree.h"
 #include "drivers.h"
 #include "efi-string-table.h"
-#include "efivars-fundamental.h"
 #include "efivars.h"
+#include "efivars-fundamental.h"
 #include "export-vars.h"
 #include "graphics.h"
 #include "initrd.h"

src/boot/chid.h

@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 #pragma once
 
-#include "efi.h"
 #include "chid-fundamental.h"
+#include "efi.h"
 
 /* A .hwids PE section consists of a series of 'Device' structures. A 'Device' structure binds a CHID to some
  * resource, for now only Devicetree blobs. Designed to be extensible to other types of resources, should the

src/boot/efi-string.c

@@ -7,6 +7,7 @@
 #  include "util.h"
 #else
 #  include <stdlib.h>
+
 #  include "alloc-util.h"
 #  define xnew(t, n) ASSERT_SE_PTR(new(t, n))
 #  define xmalloc(n) ASSERT_SE_PTR(malloc(n))

src/bootctl/bootctl-set-efivar.c

@@ -5,8 +5,8 @@
 
 #include "bootctl.h"
 #include "bootctl-set-efivar.h"
-#include "efivars.h"
 #include "efi-loader.h"
+#include "efivars.h"
 #include "stdio-util.h"
 #include "utf8.h"
 #include "virt.h"

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

src/coredump/coredump-vacuum.c

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <sys/statvfs.h>
 #include <sys/stat.h>
+#include <sys/statvfs.h>
 #include <sys/types.h>
 #include <unistd.h>
 

src/coredump/coredump.c

@@ -2,10 +2,10 @@
 
 #include <errno.h>
 #include <stdio.h>
+#include <sys/auxv.h>
 #include <sys/mount.h>
 #include <sys/prctl.h>
 #include <sys/statvfs.h>
-#include <sys/auxv.h>
 #include <sys/xattr.h>
 #include <unistd.h>
 

src/creds/creds.c

@@ -32,8 +32,8 @@
 #include "tpm2-util.h"
 #include "user-util.h"
 #include "varlink-io.systemd.Credentials.h"
-#include "verbs.h"
 #include "varlink-util.h"
+#include "verbs.h"
 
 typedef enum TranscodeMode {
         TRANSCODE_OFF,

src/cryptenroll/cryptenroll-list.c

@@ -2,8 +2,8 @@
 
 #include "sd-json.h"
 
-#include "cryptenroll-list.h"
 #include "cryptenroll.h"
+#include "cryptenroll-list.h"
 #include "format-table.h"
 #include "json-util.h"
 #include "log.h"

src/cryptenroll/cryptenroll-wipe.c

@@ -2,8 +2,8 @@
 
 #include "sd-json.h"
 
-#include "cryptenroll-wipe.h"
 #include "cryptenroll.h"
+#include "cryptenroll-wipe.h"
 #include "json-util.h"
 #include "log.h"
 #include "memory-util.h"

src/cryptenroll/cryptenroll.c

@@ -7,6 +7,7 @@
 #include "blockdev-list.h"
 #include "blockdev-util.h"
 #include "build.h"
+#include "cryptenroll.h"
 #include "cryptenroll-fido2.h"
 #include "cryptenroll-list.h"
 #include "cryptenroll-password.h"
@@ -14,7 +15,6 @@
 #include "cryptenroll-recovery.h"
 #include "cryptenroll-tpm2.h"
 #include "cryptenroll-wipe.h"
-#include "cryptenroll.h"
 #include "cryptsetup-util.h"
 #include "devnum-util.h"
 #include "env-util.h"

src/cryptsetup/cryptsetup-pkcs11.c

@@ -1,10 +1,10 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <fcntl.h>
-#include <unistd.h>
-#include <sys/stat.h>
 #include <p11-kit/p11-kit.h>
 #include <p11-kit/uri.h>
+#include <sys/stat.h>
+#include <unistd.h>
 
 #include "sd-json.h"
 

src/cryptsetup/cryptsetup-tokens/cryptsetup-token-util.h

@@ -2,9 +2,9 @@
 
 #pragma once
 
+#include <libcryptsetup.h>
 #include <stdbool.h>
 #include <stddef.h>
-#include <libcryptsetup.h>
 
 /* crypt_dump() internal indentation magic */
 #define CRYPT_DUMP_LINE_SEP "\n\t            "

src/hibernate-resume/hibernate-resume-config.c

@@ -4,13 +4,13 @@
 
 #include "alloc-util.h"
 #include "device-nodes.h"
+#include "efivars.h"
 #include "fstab-util.h"
 #include "hibernate-resume-config.h"
 #include "os-util.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "proc-cmdline.h"
-#include "efivars.h"
 
 typedef struct KernelHibernateLocation {
         char *device;

src/home/homed-home-bus.c

@@ -8,8 +8,8 @@
 #include "format-util.h"
 #include "home-util.h"
 #include "homed-bus.h"
-#include "homed-home-bus.h"
 #include "homed-home.h"
+#include "homed-home-bus.h"
 #include "homed-manager.h"
 #include "log.h"
 #include "strv.h"

src/home/homed-home.c

@@ -39,10 +39,10 @@
 #include "string-table.h"
 #include "strv.h"
 #include "uid-classification.h"
+#include "user-record.h"
 #include "user-record-password-quality.h"
 #include "user-record-sign.h"
 #include "user-record-util.h"
-#include "user-record.h"
 #include "user-util.h"
 
 /* Retry to deactivate home directories again and again every 15s until it works */

src/home/homed-manager-bus.c

@@ -11,8 +11,8 @@
 #include "home-util.h"
 #include "homed-bus.h"
 #include "homed-home-bus.h"
-#include "homed-manager-bus.h"
 #include "homed-manager.h"
+#include "homed-manager-bus.h"
 #include "log.h"
 #include "openssl-util.h"
 #include "path-util.h"

src/home/homed-manager.c

@@ -29,10 +29,10 @@
 #include "gpt.h"
 #include "home-util.h"
 #include "homed-conf.h"
-#include "homed-home-bus.h"
 #include "homed-home.h"
-#include "homed-manager-bus.h"
+#include "homed-home-bus.h"
 #include "homed-manager.h"
+#include "homed-manager-bus.h"
 #include "homed-varlink.h"
 #include "io-util.h"
 #include "missing_fs.h"
@@ -51,9 +51,9 @@
 #include "sync-util.h"
 #include "tmpfile-util.h"
 #include "udev-util.h"
+#include "user-record.h"
 #include "user-record-sign.h"
 #include "user-record-util.h"
-#include "user-record.h"
 #include "user-util.h"
 #include "varlink-io.systemd.UserDatabase.h"
 #include "varlink-io.systemd.service.h"

src/home/homed-varlink.c

@@ -6,8 +6,8 @@
 #include "json-util.h"
 #include "log.h"
 #include "strv.h"
-#include "user-record-util.h"
 #include "user-record.h"
+#include "user-record-util.h"
 #include "user-util.h"
 
 typedef struct LookupParameters {

src/home/homework-blob.c

@@ -1,13 +1,13 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "copy.h"
-#include "fileio.h"
 #include "fd-util.h"
+#include "fileio.h"
 #include "format-util.h"
 #include "fs-util.h"
 #include "home-util.h"
-#include "homework-blob.h"
 #include "homework.h"
+#include "homework-blob.h"
 #include "install-file.h"
 #include "log.h"
 #include "macro.h"

src/home/homework-mount.c

@@ -8,8 +8,8 @@
 #include "format-util.h"
 #include "glyph-util.h"
 #include "home-util.h"
-#include "homework-mount.h"
 #include "homework.h"
+#include "homework-mount.h"
 #include "log.h"
 #include "missing_syscall.h"
 #include "mkdir.h"

src/home/homework-pkcs11.h

@@ -3,8 +3,8 @@
 
 #if HAVE_P11KIT
 #include "memory-util.h"
-#include "user-record.h"
 #include "pkcs11-util.h"
+#include "user-record.h"
 
 struct pkcs11_callback_data {
         UserRecord *user_record;

src/home/pam_systemd_home.c

@@ -19,8 +19,8 @@
 #include "parse-util.h"
 #include "path-util.h"
 #include "strv.h"
-#include "user-record-util.h"
 #include "user-record.h"
+#include "user-record-util.h"
 #include "user-util.h"
 
 typedef enum AcquireHomeFlags {

src/home/user-record-password-quality.h

@@ -2,6 +2,7 @@
 #pragma once
 
 #include "sd-bus.h"
+
 #include "user-record.h"
 
 int user_record_check_password_quality(UserRecord *hr, UserRecord *secret, sd_bus_error *error);

src/home/user-record-util.h

@@ -3,8 +3,8 @@
 
 #include "sd-bus.h"
 
-#include "user-record.h"
 #include "group-record.h"
+#include "user-record.h"
 
 /* We intentionally use snake_case instead of the usual camelCase here to further
  * reduce the chance of collision with a field any legitimate user record may ever

src/hostname/hostnamed.c

@@ -1,9 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <errno.h>
-#include <sys/utsname.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <sys/utsname.h>
 #include <unistd.h>
 
 #include "sd-device.h"
@@ -18,8 +18,8 @@
 #include "constants.h"
 #include "daemon-util.h"
 #include "device-private.h"
-#include "env-file-label.h"
 #include "env-file.h"
+#include "env-file-label.h"
 #include "env-util.h"
 #include "fileio.h"
 #include "hostname-setup.h"

src/import/import-fs.c

@@ -5,8 +5,8 @@
 
 #include "alloc-util.h"
 #include "ansi-color.h"
-#include "build.h"
 #include "btrfs-util.h"
+#include "build.h"
 #include "discover-image.h"
 #include "fd-util.h"
 #include "format-util.h"

src/integritysetup/integrity-util.c

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
-#include "integrity-util.h"
-
 #include "extract-word.h"
 #include "fileio.h"
+#include "integrity-util.h"
 #include "log.h"
 #include "path-util.h"
 #include "percent-util.h"

src/journal-remote/fuzz-journal-remote.c

@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include "fuzz.h"
-
 #include <sys/mman.h>
 
 #include "sd-journal.h"
@@ -10,6 +8,7 @@
 #include "fd-util.h"
 #include "fileio.h"
 #include "fs-util.h"
+#include "fuzz.h"
 #include "journal-remote.h"
 #include "logs-show.h"
 #include "memfd-util.h"

src/journal-remote/journal-remote-main.c

@@ -12,8 +12,8 @@
 #include "fd-util.h"
 #include "fileio.h"
 #include "journal-compression-util.h"
-#include "journal-remote-write.h"
 #include "journal-remote.h"
+#include "journal-remote-write.h"
 #include "logs-show.h"
 #include "main-func.h"
 #include "memory-util.h"

src/journal-remote/journal-remote.c

@@ -2,9 +2,9 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <sys/prctl.h>
-#include <stdint.h>
 
 #include "sd-daemon.h"
 
@@ -15,12 +15,12 @@
 #include "escape.h"
 #include "fd-util.h"
 #include "journal-file-util.h"
-#include "journal-remote-write.h"
 #include "journal-remote.h"
+#include "journal-remote-write.h"
 #include "log.h"
 #include "macro.h"
-#include "parse-util.h"
 #include "parse-helpers.h"
+#include "parse-util.h"
 #include "process-util.h"
 #include "socket-util.h"
 #include "stdio-util.h"