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/test/test-arphrd-util.c

@@ -1,8 +1,7 @@
 /* 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 <linux/if_arp.h>
+#include <net/if.h>
 
 #include "arphrd-util.h"
 #include "string-util.h"

src/test/test-async.c

@@ -10,8 +10,8 @@
 #include "path-util.h"
 #include "process-util.h"
 #include "signal-util.h"
-#include "time-util.h"
 #include "tests.h"
+#include "time-util.h"
 #include "tmpfile-util.h"
 
 TEST(asynchronous_sync) {

src/test/test-btrfs.c

@@ -5,9 +5,9 @@
 
 #include "btrfs-util.h"
 #include "fd-util.h"
-#include "fs-util.h"
 #include "fileio.h"
 #include "format-util.h"
+#include "fs-util.h"
 #include "log.h"
 #include "string-util.h"
 #include "tests.h"

src/test/test-clock.c

@@ -3,8 +3,8 @@
   Copyright © 2016 Canonical Ltd.
 ***/
 
-#include <unistd.h>
 #include <fcntl.h>
+#include <unistd.h>
 
 #include "clock-util.h"
 #include "fd-util.h"

src/test/test-compress.c

@@ -6,9 +6,9 @@
 #include <lz4.h>
 #endif
 
-#include "dlfcn-util.h"
 #include "alloc-util.h"
 #include "compress.h"
+#include "dlfcn-util.h"
 #include "fd-util.h"
 #include "fs-util.h"
 #include "macro.h"

src/test/test-conf-parser.c

@@ -2,8 +2,8 @@
 
 #include "conf-parser.h"
 #include "fd-util.h"
-#include "fs-util.h"
 #include "fileio.h"
+#include "fs-util.h"
 #include "log.h"
 #include "macro.h"
 #include "mkdir.h"

src/test/test-coredump-util.c

@@ -4,8 +4,8 @@
 
 #include "alloc-util.h"
 #include "coredump-util.h"
-#include "fileio.h"
 #include "fd-util.h"
+#include "fileio.h"
 #include "format-util.h"
 #include "macro.h"
 #include "tests.h"

src/test/test-cpu-set-util.c

@@ -2,9 +2,9 @@
 
 #include "alloc-util.h"
 #include "cpu-set-util.h"
+#include "macro.h"
 #include "string-util.h"
 #include "tests.h"
-#include "macro.h"
 
 TEST(parse_cpu_set) {
         CPUSet c = {};

src/test/test-daemon.c

@@ -6,8 +6,8 @@
 
 #include "parse-util.h"
 #include "strv.h"
-#include "time-util.h"
 #include "tests.h"
+#include "time-util.h"
 
 int main(int argc, char *argv[]) {
         _cleanup_strv_free_ char **l = NULL;

src/test/test-data-fd-util.c

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

src/test/test-dirent-util.c

@@ -13,8 +13,8 @@
 #include "rm-rf.h"
 #include "stat-util.h"
 #include "string-util.h"
-#include "tmpfile-util.h"
 #include "tests.h"
+#include "tmpfile-util.h"
 
 TEST (test_dirent_ensure_type) {
         int r, dir_fd;

src/test/test-exec-util.c

@@ -6,8 +6,8 @@
 #include <unistd.h>
 
 #include "alloc-util.h"
-#include "copy.h"
 #include "constants.h"
+#include "copy.h"
 #include "env-util.h"
 #include "exec-util.h"
 #include "fd-util.h"

src/test/test-execute.c

@@ -10,8 +10,8 @@
 
 #include "build-path.h"
 #include "capability-util.h"
-#include "cpu-set-util.h"
 #include "copy.h"
+#include "cpu-set-util.h"
 #include "dropin.h"
 #include "errno-list.h"
 #include "fd-util.h"
@@ -27,8 +27,8 @@
 #include "seccomp-util.h"
 #include "service.h"
 #include "signal-util.h"
-#include "static-destruct.h"
 #include "stat-util.h"
+#include "static-destruct.h"
 #include "sysctl-util.h"
 #include "tests.h"
 #include "tmpfile-util.h"

src/test/test-fiemap.c

@@ -9,8 +9,8 @@
 
 #include "errno-util.h"
 #include "fd-util.h"
-#include "log.h"
 #include "hibernate-util.h"
+#include "log.h"
 #include "tests.h"
 
 static int test_fiemap_one(const char *path) {

src/test/test-hash-funcs.c

@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include "tests.h"
 #include "hash-funcs.h"
 #include "set.h"
+#include "tests.h"
 
 TEST(path_hash_set) {
         /* The goal is to make sure that non-simplified path are hashed as expected,

src/test/test-image-policy.c

@@ -1,10 +1,10 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "image-policy.h"
+#include "pager.h"
 #include "pretty-print.h"
 #include "string-util.h"
 #include "tests.h"
-#include "pager.h"
 
 static void test_policy(const ImagePolicy *p, const char *name) {
         _cleanup_free_ char *as_string = NULL, *as_string_simplified = NULL;

src/test/test-journal-importer.c

@@ -1,12 +1,12 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 
 #include "alloc-util.h"
-#include "log.h"
 #include "journal-importer.h"
+#include "log.h"
 #include "path-util.h"
 #include "string-util.h"
 #include "tests.h"

src/test/test-libcrypt-util.c

@@ -6,9 +6,9 @@
 #  include <unistd.h>
 #endif
 
+#include "libcrypt-util.h"
 #include "strv.h"
 #include "tests.h"
-#include "libcrypt-util.h"
 
 static void test_crypt_preferred_method(void) {
         log_info("/* %s */", __func__);

src/test/test-libmount.c

@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "alloc-util.h"
-#include "fd-util.h"
 #include "escape.h"
+#include "fd-util.h"
 #include "libmount-util.h"
 #include "tests.h"
 

src/test/test-load-fragment.c

@@ -18,8 +18,8 @@
 #include "hashmap.h"
 #include "hostname-setup.h"
 #include "hostname-util.h"
-#include "install-printf.h"
 #include "install.h"
+#include "install-printf.h"
 #include "load-fragment.h"
 #include "macro.h"
 #include "memory-util.h"

src/test/test-local-addresses.c

@@ -1,8 +1,7 @@
 /* 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 <linux/if.h>
+#include <net/if.h>
 #include <stdio.h>
 
 #include "af-list.h"

src/test/test-modhex.c

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include "recovery-key.h"
 #include "alloc-util.h"
+#include "recovery-key.h"
 #include "string-util.h"
 #include "tests.h"
 

src/test/test-namespace.c

@@ -1,9 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <fcntl.h>
-#include <sysexits.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
+#include <sysexits.h>
 
 #include "alloc-util.h"
 #include "fd-util.h"

src/test/test-netlink-manual.c

@@ -1,10 +1,9 @@
 /* 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 <linux/if_tunnel.h>
 #include <linux/ip.h>
+#include <net/if.h>
 #include <sys/types.h>
 #include <unistd.h>
 

src/test/test-nss-hosts.c

@@ -11,8 +11,8 @@
 #include "errno-list.h"
 #include "format-ifname.h"
 #include "hexdecoct.h"
-#include "hostname-util.h"
 #include "hostname-setup.h"
+#include "hostname-util.h"
 #include "in-addr-util.h"
 #include "local-addresses.h"
 #include "log.h"

src/test/test-nss-users.c

@@ -13,8 +13,8 @@
 #include "main-func.h"
 #include "nss-test-util.h"
 #include "nss-util.h"
-#include "path-util.h"
 #include "parse-util.h"
+#include "path-util.h"
 #include "stdio-util.h"
 #include "string-util.h"
 #include "strv.h"

src/test/test-os-util.c

@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <errno.h>
+
 #include "fileio.h"
 #include "fs-util.h"
 #include "log.h"

src/test/test-parse-helpers.c

@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <linux/in.h>
-#include <sys/socket.h>
 #include <stdio.h>
+#include <sys/socket.h>
 
 #include "macro.h"
 #include "parse-helpers.h"

src/test/test-path.c

@@ -4,8 +4,8 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include "alloc-util.h"
 #include "all-units.h"
+#include "alloc-util.h"
 #include "fd-util.h"
 #include "fs-util.h"
 #include "macro.h"

src/test/test-procfs-util.c

@@ -5,8 +5,8 @@
 #include "errno-util.h"
 #include "format-util.h"
 #include "log.h"
-#include "procfs-util.h"
 #include "process-util.h"
+#include "procfs-util.h"
 #include "tests.h"
 
 int main(int argc, char *argv[]) {

src/test/test-sbat.c

@@ -2,9 +2,8 @@
 
 /* We include efi_config.h after undefining PROJECT_VERSION which is also defined in config.h. */
 #undef PROJECT_VERSION
-#include "efi_config.h"
-
 #include "build.h"
+#include "efi_config.h"
 #include "sbat.h"
 #include "tests.h"
 

src/test/test-sd-hwdb.c

@@ -3,8 +3,8 @@
 #include "sd-hwdb.h"
 
 #include "alloc-util.h"
-#include "errno-util.h"
 #include "errno.h"
+#include "errno-util.h"
 #include "hwdb-internal.h"
 #include "nulstr-util.h"
 #include "tests.h"

src/test/test-shift-uid.c

@@ -4,9 +4,9 @@
 
 #include "log.h"
 #include "shift-uid.h"
-#include "user-util.h"
 #include "string-util.h"
 #include "tests.h"
+#include "user-util.h"
 
 int main(int argc, char *argv[]) {
         uid_t shift, range;

src/test/test-signal-util.c

@@ -4,11 +4,11 @@
 
 #include "log.h"
 #include "macro.h"
+#include "process-util.h"
 #include "signal-util.h"
 #include "stdio-util.h"
 #include "string-util.h"
 #include "tests.h"
-#include "process-util.h"
 
 #define info(sig) log_info(#sig " = " STRINGIFY(sig) " = %d", sig)
 

src/test/test-socket-netlink.c

@@ -2,9 +2,9 @@
 
 #include "alloc-util.h"
 #include "missing_network.h"
-#include "tests.h"
 #include "socket-netlink.h"
 #include "string-util.h"
+#include "tests.h"
 
 static void test_socket_address_parse_one(const char *in, int ret, int family, const char *expected) {
         SocketAddress a;

src/test/test-tables.c

@@ -7,8 +7,8 @@
 #include "compress.h"
 #include "condition.h"
 #include "confidential-virt.h"
-#include "device-private.h"
 #include "device.h"
+#include "device-private.h"
 #include "discover-image.h"
 #include "execute.h"
 #include "import-util.h"
@@ -28,15 +28,15 @@
 #include "service.h"
 #include "show-status.h"
 #include "slice.h"
-#include "socket-util.h"
 #include "socket.h"
+#include "socket-util.h"
 #include "swap.h"
 #include "target.h"
 #include "test-tables.h"
 #include "tests.h"
 #include "timer.h"
-#include "unit-name.h"
 #include "unit.h"
+#include "unit-name.h"
 #include "virt.h"
 
 int main(int argc, char **argv) {

src/test/test-uid-classification.c

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

src/test/test-unit-name.c

@@ -5,10 +5,10 @@
 
 #include "sd-id128.h"
 
-#include "alloc-util.h"
 #include "all-units.h"
-#include "glob-util.h"
+#include "alloc-util.h"
 #include "format-util.h"
+#include "glob-util.h"
 #include "hostname-setup.h"
 #include "hostname-util.h"
 #include "macro.h"
@@ -20,10 +20,10 @@
 #include "string-util.h"
 #include "tests.h"
 #include "tmpfile-util.h"
+#include "unit.h"
 #include "unit-def.h"
 #include "unit-name.h"
 #include "unit-printf.h"
-#include "unit.h"
 #include "user-util.h"
 
 static char *runtime_dir = NULL;

src/test/test-utmp.c

@@ -4,8 +4,8 @@
 #include "socket-util.h"
 #include "stdio-util.h"
 #include "string-util.h"
-#include "utmp-wtmp.h"
 #include "tests.h"
+#include "utmp-wtmp.h"
 
 #define UTX_LINESIZE sizeof_field(struct utmpx, ut_line)
 #define UTX_NAMESIZE sizeof_field(struct utmpx, ut_user)