From 1cf40697e3ce60fa4734ee2454793e8186efd809 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Mon, 28 Apr 2025 15:08:57 +0200 Subject: [PATCH] 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/analyze/analyze-critical-chain.c | 2 +- src/analyze/analyze-dump.c | 2 +- src/analyze/analyze-fdstore.c | 2 +- src/analyze/analyze-image-policy.c | 2 +- src/analyze/analyze-malloc.c | 2 +- src/analyze/analyze-plot.c | 2 +- src/analyze/analyze-syscall-filter.c | 2 +- src/analyze/analyze-time-data.c | 2 +- src/analyze/analyze-verify-util.c | 2 +- src/analyze/analyze.c | 2 +- src/basic/arphrd-util.c | 2 +- src/basic/cap-list.c | 2 +- src/basic/confidential-virt.c | 2 +- src/basic/fs-util.c | 4 +-- src/basic/glob-util.c | 2 +- src/basic/keyring-util.c | 2 +- src/basic/percent-util.c | 2 +- src/basic/psi-util.c | 2 +- src/basic/recurse-dir.h | 2 +- src/basic/socket-util.c | 5 ++- src/basic/socket-util.h | 2 +- src/basic/sort-util.c | 2 +- src/basic/terminal-util.h | 2 +- src/boot/boot.c | 2 +- src/boot/chid.h | 2 +- src/boot/efi-string.c | 1 + src/bootctl/bootctl-set-efivar.c | 2 +- src/core/all-units.h | 3 +- src/core/automount.c | 6 ++-- src/core/bpf-firewall.c | 5 ++- src/core/bpf-restrict-ifaces.c | 2 +- src/core/bpf-socket-bind.c | 2 +- src/core/bpf/restrict_fs/restrict-fs.bpf.c | 10 +++--- src/core/bpf/socket_bind/socket-bind.bpf.c | 6 ++-- src/core/cgroup.c | 2 +- src/core/core-varlink.c | 2 +- src/core/dbus-cgroup.c | 2 +- src/core/dbus-cgroup.h | 2 +- src/core/dbus-execute.c | 1 + src/core/dbus-job.c | 2 +- src/core/dbus-manager.c | 2 +- src/core/dbus-scope.c | 2 +- src/core/dbus-service.c | 2 +- src/core/dbus-unit.c | 2 +- src/core/dbus-util.c | 2 +- src/core/dbus.c | 2 +- src/core/device.c | 4 +-- src/core/execute-serialize.c | 2 +- src/core/executor.c | 4 +-- src/core/fuzz-manager-serialize.c | 2 +- src/core/job.c | 2 +- src/core/load-dropin.c | 2 +- src/core/main.c | 2 +- src/core/manager-serialize.c | 2 +- src/core/manager.c | 2 +- src/core/manager.h | 4 +-- src/core/mount.c | 4 +-- src/core/namespace.c | 2 +- src/core/path.c | 2 +- src/core/scope.c | 2 +- src/core/service.c | 2 +- src/core/slice.c | 2 +- src/core/socket.c | 4 +-- src/core/swap.c | 4 +-- src/core/target.c | 2 +- src/core/timer.c | 5 ++- src/core/unit-printf.c | 5 +-- src/core/unit.c | 4 +-- src/coredump/coredump-vacuum.c | 2 +- src/coredump/coredump.c | 2 +- src/creds/creds.c | 2 +- src/cryptenroll/cryptenroll-list.c | 2 +- src/cryptenroll/cryptenroll-wipe.c | 2 +- src/cryptenroll/cryptenroll.c | 2 +- src/cryptsetup/cryptsetup-pkcs11.c | 4 +-- .../cryptsetup-tokens/cryptsetup-token-util.h | 2 +- .../hibernate-resume-config.c | 2 +- src/home/homed-home-bus.c | 2 +- src/home/homed-home.c | 2 +- src/home/homed-manager-bus.c | 2 +- src/home/homed-manager.c | 6 ++-- src/home/homed-varlink.c | 2 +- src/home/homework-blob.c | 4 +-- src/home/homework-mount.c | 2 +- src/home/homework-pkcs11.h | 2 +- src/home/pam_systemd_home.c | 2 +- src/home/user-record-password-quality.h | 1 + src/home/user-record-util.h | 2 +- src/hostname/hostnamed.c | 4 +-- src/import/import-fs.c | 2 +- src/integritysetup/integrity-util.c | 3 +- src/journal-remote/fuzz-journal-remote.c | 3 +- src/journal-remote/journal-remote-main.c | 2 +- src/journal-remote/journal-remote.c | 6 ++-- src/journal/fuzz-journald-native-fd.c | 2 +- src/journal/fuzz-journald.c | 3 +- src/journal/journald-server.c | 2 +- src/libsystemd-network/dhcp-network.c | 3 +- src/libsystemd-network/dhcp-option.h | 2 +- src/libsystemd-network/dhcp6-internal.h | 2 +- src/libsystemd-network/dhcp6-lease-internal.h | 2 +- src/libsystemd-network/dhcp6-network.c | 2 +- .../dns-resolver-internal.h | 2 +- src/libsystemd-network/fuzz-dhcp-client.c | 3 +- .../fuzz-dhcp-server-relay.c | 3 +- src/libsystemd-network/fuzz-dhcp-server.c | 3 +- src/libsystemd-network/icmp6-util.c | 3 +- src/libsystemd-network/ndisc-option.c | 2 +- src/libsystemd-network/ndisc-option.h | 2 +- src/libsystemd-network/sd-dhcp-client-id.c | 2 +- src/libsystemd-network/sd-dhcp-client.c | 2 +- src/libsystemd-network/sd-dhcp-lease.c | 2 +- src/libsystemd-network/sd-dhcp-server-lease.c | 2 +- src/libsystemd-network/sd-dhcp6-client.c | 2 +- src/libsystemd-network/sd-dns-resolver.c | 2 +- src/libsystemd-network/sd-radv.c | 2 +- src/libsystemd-network/test-acd.c | 3 +- src/libsystemd-network/test-ipv4ll-manual.c | 3 +- src/libsystemd-network/test-ndisc-ra.c | 2 +- src/libsystemd-network/test-ndisc-rs.c | 4 +-- src/libsystemd/sd-bus/bus-convenience.c | 2 +- src/libsystemd/sd-bus/bus-kernel.c | 2 +- src/libsystemd/sd-bus/bus-message.c | 2 +- src/libsystemd/sd-bus/sd-bus.c | 2 +- src/libsystemd/sd-bus/test-bus-introspect.c | 3 +- src/libsystemd/sd-bus/test-bus-watch-bind.c | 2 +- src/libsystemd/sd-event/sd-event.c | 2 +- src/libsystemd/sd-journal/journal-file.c | 2 +- src/libsystemd/sd-journal/journal-send.c | 2 +- src/libsystemd/sd-journal/journal-vacuum.c | 2 +- src/libsystemd/sd-journal/journal-verify.c | 2 +- src/libsystemd/sd-journal/test-audit-type.c | 2 +- .../sd-journal/test-journal-interleaving.c | 2 +- src/libsystemd/sd-json/sd-json.c | 2 +- .../sd-netlink/netlink-message-nfnl.c | 6 ++-- .../sd-netlink/netlink-message-rtnl.c | 2 +- .../sd-netlink/netlink-types-genl.c | 4 +-- .../sd-netlink/netlink-types-rtnl.c | 4 +-- src/libsystemd/sd-netlink/test-netlink.c | 7 ++-- src/libudev/libudev-device.c | 3 +- src/libudev/test-udev-device-thread.c | 1 + src/locale/localed-util.c | 2 +- src/login/logind-brightness.c | 2 +- src/login/logind-core.c | 2 +- src/login/logind-dbus.c | 4 +-- src/login/logind-seat-dbus.c | 4 +-- src/login/logind-seat.c | 2 +- src/login/logind-session-dbus.c | 4 +-- src/login/logind-session-device.c | 2 +- src/login/logind-session.c | 2 +- src/login/logind-user-dbus.c | 4 +-- src/login/logind-user.c | 2 +- src/login/test-inhibit.c | 2 +- src/machine/image-varlink.c | 4 +-- src/machine/machine-dbus.c | 2 +- src/machine/machine-varlink.c | 2 +- src/machine/machine.c | 4 +-- src/machine/machined-dbus.c | 2 +- src/machine/machined-varlink.c | 2 +- src/machine/machined.c | 2 +- src/mountfsd/mountwork.c | 2 +- src/network/netdev/bareudp.c | 2 +- src/network/netdev/batadv.c | 2 +- src/network/netdev/bond.c | 2 +- src/network/netdev/bond.h | 2 +- src/network/netdev/bridge.c | 3 +- src/network/netdev/fou-tunnel.c | 5 ++- src/network/netdev/fou-tunnel.h | 2 +- src/network/netdev/geneve.c | 3 +- src/network/netdev/hsr.c | 3 +- src/network/netdev/ipvlan.c | 3 +- src/network/netdev/ipvlan.h | 2 +- src/network/netdev/l2tp-tunnel.c | 4 +-- src/network/netdev/l2tp-tunnel.h | 2 +- src/network/netdev/macsec.c | 4 +-- src/network/netdev/macsec.h | 2 +- src/network/netdev/macvlan.c | 3 +- src/network/netdev/netdev.c | 3 +- src/network/netdev/tunnel.c | 2 +- src/network/netdev/tunnel.h | 5 ++- src/network/netdev/tuntap.c | 3 +- src/network/netdev/vcan.h | 2 +- src/network/netdev/veth.c | 3 +- src/network/netdev/vlan.c | 5 ++- src/network/netdev/vrf.c | 3 +- src/network/netdev/vxlan.c | 7 ++-- src/network/netdev/vxlan.h | 2 +- src/network/netdev/wireguard.c | 5 ++- src/network/netdev/wireguard.h | 2 +- src/network/networkctl-status-link.c | 1 - src/network/networkd-address-label.c | 3 +- src/network/networkd-address-pool.c | 2 +- src/network/networkd-address.c | 4 +-- src/network/networkd-bridge-mdb.c | 3 +- src/network/networkd-bridge-vlan.c | 2 +- src/network/networkd-can.c | 3 +- src/network/networkd-dhcp-common.c | 2 +- src/network/networkd-dhcp-prefix-delegation.c | 4 +-- src/network/networkd-dhcp-server.c | 6 ++-- src/network/networkd-dhcp4.c | 8 ++--- src/network/networkd-dhcp6.c | 2 +- src/network/networkd-ipv4ll.c | 2 +- src/network/networkd-ipv6-proxy-ndp.c | 2 +- src/network/networkd-json.c | 2 +- src/network/networkd-link-bus.c | 2 +- src/network/networkd-link.c | 11 +++---- src/network/networkd-link.h | 2 +- src/network/networkd-manager-bus.c | 4 +-- src/network/networkd-manager.c | 10 +++--- src/network/networkd-ndisc.c | 4 +-- src/network/networkd-network.c | 5 ++- src/network/networkd-nexthop.c | 3 +- src/network/networkd-radv.c | 6 ++-- src/network/networkd-radv.h | 2 +- src/network/networkd-route-util.c | 2 +- src/network/networkd-route.c | 2 +- src/network/networkd-routing-policy-rule.c | 3 +- src/network/networkd-setlink.c | 2 +- src/network/networkd-speed-meter.c | 2 +- src/network/networkd-state-file.c | 4 +-- src/network/networkd-sysctl.c | 3 +- src/network/networkd-wifi.c | 2 +- src/network/networkd-wiphy.c | 2 +- src/network/networkd.c | 2 +- src/network/tc/htb.c | 2 +- src/network/tc/pie.c | 2 +- src/network/tc/qdisc.c | 33 +++++++++---------- src/network/tc/tclass.c | 7 ++-- src/network/test-network-tables.c | 3 +- src/network/wait-online/manager.c | 4 +-- src/nspawn/nspawn-bind-user.h | 2 +- src/nspawn/nspawn-mount.c | 2 +- src/nspawn/nspawn-network.c | 3 +- src/nspawn/nspawn-stub-pid1.c | 2 +- src/nspawn/nspawn.c | 7 ++-- .../bpf/userns_restrict/userns-restrict.bpf.c | 4 +-- src/nsresourced/nsresourced.c | 2 +- src/nsresourced/nsresourcework.c | 6 ++-- src/nss-systemd/nss-systemd.c | 2 +- src/nss-systemd/userdb-glue.c | 4 +-- src/nss-systemd/userdb-glue.h | 2 +- src/oom/oomd-manager-bus.c | 2 +- src/oom/oomd-manager.c | 2 +- src/oom/oomd.c | 2 +- src/portable/portable.c | 2 +- src/portable/portabled-bus.c | 4 +-- src/portable/portabled-image-bus.c | 4 +-- src/portable/portabled-image.c | 2 +- src/portable/portabled.c | 2 +- src/pstore/pstore.c | 2 +- src/random-seed/random-seed.c | 2 +- src/reply-password/reply-password.c | 2 +- src/resolve/dns-type.c | 2 +- src/resolve/resolved-bus.c | 2 +- src/resolve/resolved-dns-scope.c | 2 +- src/resolve/resolved-dns-stream.h | 2 +- src/resolve/resolved-dnssd-bus.c | 2 +- src/resolve/resolved-manager.c | 2 +- src/resolve/resolved-mdns.c | 4 +-- src/resolve/resolved-timeouts.h | 2 +- src/resolve/test-dns-answer.c | 10 +++--- src/resolve/test-dns-packet-append.c | 5 ++- src/resolve/test-dns-packet-extract.c | 3 +- src/resolve/test-dns-packet.c | 2 +- src/resolve/test-dns-question.c | 10 +++--- src/resolve/test-dns-rr.c | 3 +- src/resolve/test-dns-search-domain.c | 3 +- src/resolve/test-dns-zone.c | 3 +- src/resolve/test-resolved-link.c | 5 ++- src/resolve/test-resolved-stream.c | 5 +-- src/run/run.c | 2 +- src/shared/barrier.h | 2 +- src/shared/battery-util.c | 2 +- src/shared/bond-util.h | 2 +- src/shared/bootspec.c | 2 +- src/shared/bpf-dlopen.c | 2 +- src/shared/bpf-link.h | 2 +- src/shared/bridge-util.h | 2 +- src/shared/bus-log-control-api.c | 3 +- src/shared/bus-map-properties.c | 2 +- src/shared/bus-print-properties.c | 2 +- src/shared/bus-wait-for-units.h | 3 +- src/shared/condition.c | 2 +- src/shared/conf-parser.c | 5 +-- src/shared/conf-parser.h | 2 +- src/shared/efi-api.h | 2 +- src/shared/efi-loader.h | 2 +- src/shared/elf-util.c | 2 +- src/shared/elf-util.h | 3 +- src/shared/env-file-label.c | 2 +- src/shared/ethtool-util.c | 4 +-- src/shared/ethtool-util.h | 2 +- src/shared/exec-util.c | 2 +- src/shared/firewall-util-iptables.c | 11 +++---- src/shared/firewall-util-nft.c | 6 ++-- src/shared/install-printf.c | 2 +- src/shared/install.c | 2 +- src/shared/ipvlan-util.h | 2 +- src/shared/journal-importer.h | 2 +- src/shared/kernel-image.c | 2 +- src/shared/locale-setup.c | 2 +- src/shared/loop-util.c | 2 +- src/shared/machine-credential.c | 2 +- src/shared/mount-util.c | 2 +- src/shared/netif-naming-scheme.c | 2 +- src/shared/netif-sriov.c | 2 +- src/shared/openssl-util.c | 2 +- src/shared/output-mode.h | 1 + src/shared/pam-util.c | 2 +- src/shared/pam-util.h | 3 +- src/shared/password-quality-util-pwquality.h | 2 +- src/shared/pe-binary.h | 2 +- src/shared/qrcode-util.h | 4 +-- src/shared/reboot-util.c | 2 +- src/shared/seccomp-util.c | 2 ++ src/shared/selinux-util.h | 2 +- src/shared/socket-netlink.c | 3 +- src/shared/tmpfile-util-label.c | 2 +- src/shared/tpm2-event-log.c | 3 +- src/shared/tpm2-util.h | 3 +- src/shared/user-record-show.h | 2 +- src/shared/varlink-io.systemd.FactoryReset.c | 3 +- src/shared/vlan-util.h | 2 +- src/shared/watchdog.c | 2 +- src/socket-proxy/socket-proxyd.c | 2 +- src/systemctl/systemctl-add-dependency.c | 2 +- src/systemctl/systemctl-cancel-job.c | 2 +- src/systemctl/systemctl-clean-or-freeze.c | 2 +- src/systemctl/systemctl-compat-halt.c | 2 +- src/systemctl/systemctl-compat-runlevel.c | 2 +- src/systemctl/systemctl-compat-shutdown.c | 2 +- src/systemctl/systemctl-compat-telinit.c | 2 +- src/systemctl/systemctl-daemon-reload.c | 2 +- src/systemctl/systemctl-edit.c | 2 +- src/systemctl/systemctl-enable.c | 2 +- src/systemctl/systemctl-is-active.c | 2 +- src/systemctl/systemctl-is-enabled.c | 2 +- src/systemctl/systemctl-is-system-running.c | 12 +++---- src/systemctl/systemctl-kill.c | 2 +- src/systemctl/systemctl-list-dependencies.c | 2 +- src/systemctl/systemctl-list-jobs.c | 2 +- src/systemctl/systemctl-list-machines.c | 2 +- src/systemctl/systemctl-list-unit-files.c | 2 +- src/systemctl/systemctl-list-units.c | 2 +- src/systemctl/systemctl-log-setting.c | 2 +- src/systemctl/systemctl-logind.c | 2 +- src/systemctl/systemctl-mount.c | 2 +- src/systemctl/systemctl-preset-all.c | 2 +- src/systemctl/systemctl-reset-failed.c | 2 +- src/systemctl/systemctl-service-watchdogs.c | 2 +- src/systemctl/systemctl-set-default.c | 2 +- src/systemctl/systemctl-set-environment.c | 2 +- src/systemctl/systemctl-set-property.c | 2 +- src/systemctl/systemctl-show.c | 4 +-- src/systemctl/systemctl-start-special.c | 2 +- src/systemctl/systemctl-start-unit.c | 2 +- src/systemctl/systemctl-sysv-compat.c | 2 +- src/systemctl/systemctl-trivial-method.c | 2 +- src/systemctl/systemctl-util.c | 2 +- src/systemctl/systemctl.c | 2 +- src/systemd/sd-bus.h | 5 ++- src/systemd/sd-daemon.h | 2 +- src/systemd/sd-device.h | 3 +- src/systemd/sd-dhcp-client-id.h | 3 +- src/systemd/sd-dhcp-client.h | 5 ++- src/systemd/sd-dhcp-lease.h | 3 +- src/systemd/sd-dhcp-option.h | 3 +- src/systemd/sd-dhcp-server.h | 3 +- src/systemd/sd-dhcp6-client.h | 3 +- src/systemd/sd-dhcp6-lease.h | 3 +- src/systemd/sd-dhcp6-option.h | 3 +- src/systemd/sd-gpt.h | 3 +- src/systemd/sd-ipv4acd.h | 3 +- src/systemd/sd-ipv4ll.h | 3 +- src/systemd/sd-journal.h | 3 +- src/systemd/sd-json.h | 3 +- src/systemd/sd-lldp-rx.h | 3 +- src/systemd/sd-lldp-tx.h | 3 +- src/systemd/sd-messages.h | 3 +- src/systemd/sd-ndisc.h | 3 +- src/systemd/sd-netlink.h | 7 ++-- src/systemd/sd-resolve.h | 3 +- src/systemd/sd-varlink-idl.h | 3 +- src/systemd/sd-varlink.h | 3 +- src/sysupdate/sysupdate-feature.c | 2 +- src/sysupdate/sysupdate-instance.h | 3 +- src/sysupdate/sysupdate-resource.c | 2 +- src/sysupdate/sysupdate-update-set.c | 2 +- src/sysupdate/sysupdate-util.c | 1 - src/test/test-arphrd-util.c | 3 +- src/test/test-async.c | 2 +- src/test/test-btrfs.c | 2 +- src/test/test-clock.c | 2 +- src/test/test-compress.c | 2 +- src/test/test-conf-parser.c | 2 +- src/test/test-coredump-util.c | 2 +- src/test/test-cpu-set-util.c | 2 +- src/test/test-daemon.c | 2 +- src/test/test-data-fd-util.c | 4 +-- src/test/test-dirent-util.c | 2 +- src/test/test-exec-util.c | 2 +- src/test/test-execute.c | 4 +-- src/test/test-fiemap.c | 2 +- src/test/test-hash-funcs.c | 2 +- src/test/test-image-policy.c | 2 +- src/test/test-journal-importer.c | 6 ++-- src/test/test-libcrypt-util.c | 2 +- src/test/test-libmount.c | 2 +- src/test/test-load-fragment.c | 2 +- src/test/test-local-addresses.c | 3 +- src/test/test-modhex.c | 2 +- src/test/test-namespace.c | 2 +- src/test/test-netlink-manual.c | 3 +- src/test/test-nss-hosts.c | 2 +- src/test/test-nss-users.c | 2 +- src/test/test-os-util.c | 1 + src/test/test-parse-helpers.c | 2 +- src/test/test-path.c | 2 +- src/test/test-procfs-util.c | 2 +- src/test/test-sbat.c | 3 +- src/test/test-sd-hwdb.c | 2 +- src/test/test-shift-uid.c | 2 +- src/test/test-signal-util.c | 2 +- src/test/test-socket-netlink.c | 2 +- src/test/test-tables.c | 6 ++-- src/test/test-uid-classification.c | 2 +- src/test/test-unit-name.c | 6 ++-- src/test/test-utmp.c | 2 +- src/timesync/test-timesync.c | 2 +- src/timesync/timesyncd-manager.c | 2 +- src/tmpfiles/test-offline-passwd.c | 4 +-- src/udev/udev-builtin-keyboard.c | 2 +- src/udev/udev-builtin-net_id.c | 7 ++-- src/udev/udevadm-control.c | 2 +- src/udev/udevadm-settle.c | 2 +- src/udev/udevadm-test.c | 2 +- src/udev/v4l_id/v4l_id.c | 2 +- src/update-utmp/update-utmp.c | 2 +- src/userdb/userdbd.c | 2 +- src/vconsole/vconsole-setup.c | 4 +-- src/vmspawn/test-vmspawn-util.c | 2 +- src/vmspawn/vmspawn-register.c | 2 +- src/vmspawn/vmspawn-util.c | 2 +- src/vmspawn/vmspawn.c | 4 +-- .../xdg-autostart-service.c | 3 +- 445 files changed, 590 insertions(+), 662 deletions(-) diff --git a/src/analyze/analyze-critical-chain.c b/src/analyze/analyze-critical-chain.c index 40d669bcd5c..edb06c5c536 100644 --- a/src/analyze/analyze-critical-chain.c +++ b/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" diff --git a/src/analyze/analyze-dump.c b/src/analyze/analyze-dump.c index 4ca6278d6ac..5bb2ff2da66 100644 --- a/src/analyze/analyze-dump.c +++ b/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" diff --git a/src/analyze/analyze-fdstore.c b/src/analyze/analyze-fdstore.c index e7e273e218b..01ee241fc90 100644 --- a/src/analyze/analyze-fdstore.c +++ b/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" diff --git a/src/analyze/analyze-image-policy.c b/src/analyze/analyze-image-policy.c index d18200a0624..ce2915d195f 100644 --- a/src/analyze/analyze-image-policy.c +++ b/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" diff --git a/src/analyze/analyze-malloc.c b/src/analyze/analyze-malloc.c index 0438d03ae8e..a95b5d91394 100644 --- a/src/analyze/analyze-malloc.c +++ b/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" diff --git a/src/analyze/analyze-plot.c b/src/analyze/analyze-plot.c index 20d6811f9ba..0dc562b5960 100644 --- a/src/analyze/analyze-plot.c +++ b/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" diff --git a/src/analyze/analyze-syscall-filter.c b/src/analyze/analyze-syscall-filter.c index fceeff82753..b9522ca49d7 100644 --- a/src/analyze/analyze-syscall-filter.c +++ b/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" diff --git a/src/analyze/analyze-time-data.c b/src/analyze/analyze-time-data.c index 1a2699166f3..89198dff2d3 100644 --- a/src/analyze/analyze-time-data.c +++ b/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" diff --git a/src/analyze/analyze-verify-util.c b/src/analyze/analyze-verify-util.c index 04d9de381ec..4e034ae7adf 100644 --- a/src/analyze/analyze-verify-util.c +++ b/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" diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c index 59a22f207c7..0b029c5f017 100644 --- a/src/analyze/analyze.c +++ b/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" diff --git a/src/basic/arphrd-util.c b/src/basic/arphrd-util.c index 3ea2c9d09a9..540d7d984e3 100644 --- a/src/basic/arphrd-util.c +++ b/src/basic/arphrd-util.c @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include #include #include +#include #include #include "arphrd-util.h" diff --git a/src/basic/cap-list.c b/src/basic/cap-list.c index 258e7191433..c2b374c8fcf 100644 --- a/src/basic/cap-list.c +++ b/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" diff --git a/src/basic/confidential-virt.c b/src/basic/confidential-virt.c index f882f44540e..bb8953bba4c 100644 --- a/src/basic/confidential-virt.c +++ b/src/basic/confidential-virt.c @@ -9,8 +9,8 @@ #include #include -#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" diff --git a/src/basic/fs-util.c b/src/basic/fs-util.c index 2f16b6a5a78..3b619a15ac6 100644 --- a/src/basic/fs-util.c +++ b/src/basic/fs-util.c @@ -1,11 +1,11 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include +#include +#include #include #include #include -#include -#include #include #include "alloc-util.h" diff --git a/src/basic/glob-util.c b/src/basic/glob-util.c index cabb382106e..59dda9809ca 100644 --- a/src/basic/glob-util.c +++ b/src/basic/glob-util.c @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include #include +#include #include #include "dirent-util.h" diff --git a/src/basic/keyring-util.c b/src/basic/keyring-util.c index 4d7431cdf23..2a9b3d9aca9 100644 --- a/src/basic/keyring-util.c +++ b/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" diff --git a/src/basic/percent-util.c b/src/basic/percent-util.c index cab9d0eaeac..c205b10b09c 100644 --- a/src/basic/percent-util.c +++ b/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; diff --git a/src/basic/psi-util.c b/src/basic/psi-util.c index 9ac25e7bff1..1e4de3d8a71 100644 --- a/src/basic/psi-util.c +++ b/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) { diff --git a/src/basic/recurse-dir.h b/src/basic/recurse-dir.h index f1b740ff838..82af043b15d 100644 --- a/src/basic/recurse-dir.h +++ b/src/basic/recurse-dir.h @@ -5,8 +5,8 @@ #include #include "errno-list.h" -#include "stat-util.h" #include "macro.h" +#include "stat-util.h" typedef enum RecurseDirFlags { /* Interpreted by readdir_all() */ diff --git a/src/basic/socket-util.c b/src/basic/socket-util.c index 10b7bc7df5c..b86b67e783f 100644 --- a/src/basic/socket-util.c +++ b/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 #include #include #include +#include +#include #include #include #include @@ -14,7 +14,6 @@ #include #include #include -#include #include "alloc-util.h" #include "errno-util.h" diff --git a/src/basic/socket-util.h b/src/basic/socket-util.h index c5e389ca3a7..d0aedb524e8 100644 --- a/src/basic/socket-util.h +++ b/src/basic/socket-util.h @@ -6,12 +6,12 @@ #include #include #include -#include /* linux/vms_sockets.h requires 'struct sockaddr' */ #include #include #include #include #include +#include #include #include diff --git a/src/basic/sort-util.c b/src/basic/sort-util.c index 9eadb960be9..59329dff31c 100644 --- a/src/basic/sort-util.c +++ b/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, diff --git a/src/basic/terminal-util.h b/src/basic/terminal-util.h index 943513db560..0faf3c87611 100644 --- a/src/basic/terminal-util.h +++ b/src/basic/terminal-util.h @@ -4,8 +4,8 @@ #include #include #include -#include #include +#include #include #include diff --git a/src/boot/boot.c b/src/boot/boot.c index 818614a69e6..c7f354506c2 100644 --- a/src/boot/boot.c +++ b/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" diff --git a/src/boot/chid.h b/src/boot/chid.h index 17096cc8622..ba594a291d6 100644 --- a/src/boot/chid.h +++ b/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 diff --git a/src/boot/efi-string.c b/src/boot/efi-string.c index 1f669a2749c..e8dbe297ed2 100644 --- a/src/boot/efi-string.c +++ b/src/boot/efi-string.c @@ -7,6 +7,7 @@ # include "util.h" #else # include + # include "alloc-util.h" # define xnew(t, n) ASSERT_SE_PTR(new(t, n)) # define xmalloc(n) ASSERT_SE_PTR(malloc(n)) diff --git a/src/bootctl/bootctl-set-efivar.c b/src/bootctl/bootctl-set-efivar.c index fe55462ffd5..75cae290977 100644 --- a/src/bootctl/bootctl-set-efivar.c +++ b/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" diff --git a/src/core/all-units.h b/src/core/all-units.h index cb2563d2c88..9e8649d1e17 100644 --- a/src/core/all-units.h +++ b/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" diff --git a/src/core/automount.c b/src/core/automount.c index ef5db87a7e1..feb97a9f99b 100644 --- a/src/core/automount.c +++ b/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, diff --git a/src/core/bpf-firewall.c b/src/core/bpf-firewall.c index 85fce6f32a3..a1e557c420c 100644 --- a/src/core/bpf-firewall.c +++ b/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 #include #include #include #include #include #include +#include #include #include #include @@ -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 { diff --git a/src/core/bpf-restrict-ifaces.c b/src/core/bpf-restrict-ifaces.c index a9066ee2a91..a162efbcdc9 100644 --- a/src/core/bpf-restrict-ifaces.c +++ b/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" diff --git a/src/core/bpf-socket-bind.c b/src/core/bpf-socket-bind.c index 437b084392d..c751cde8ba5 100644 --- a/src/core/bpf-socket-bind.c +++ b/src/core/bpf-socket-bind.c @@ -4,8 +4,8 @@ #include #endif -#include "fd-util.h" #include "bpf-socket-bind.h" +#include "fd-util.h" #include "unit.h" #if BPF_FRAMEWORK diff --git a/src/core/bpf/restrict_fs/restrict-fs.bpf.c b/src/core/bpf/restrict_fs/restrict-fs.bpf.c index 28fd555d5ff..385769d7f9a 100644 --- a/src/core/bpf/restrict_fs/restrict-fs.bpf.c +++ b/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 -#include -#include -#include -#include #include +#include +#include #include #include +#include +#include +#include struct super_block { unsigned long s_magic; diff --git a/src/core/bpf/socket_bind/socket-bind.bpf.c b/src/core/bpf/socket_bind/socket-bind.bpf.c index da9f9d13de7..2e9e66e2925 100644 --- a/src/core/bpf/socket_bind/socket-bind.bpf.c +++ b/src/core/bpf/socket_bind/socket-bind.bpf.c @@ -10,12 +10,12 @@ /* must precede due to * does not depend from type header by design. */ -#include -#include -#include #include +#include #include #include +#include +#include /* * max_entries is set from user space with bpf_map__set_max_entries helper. diff --git a/src/core/cgroup.c b/src/core/cgroup.c index 27d81b0b858..74c9d786a1f 100644 --- a/src/core/cgroup.c +++ b/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" diff --git a/src/core/core-varlink.c b/src/core/core-varlink.c index 0dee43c01b2..5c5b9c667af 100644 --- a/src/core/core-varlink.c +++ b/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" diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c index 6f5d2c0b9e1..793f5538155 100644 --- a/src/core/dbus-cgroup.c +++ b/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" diff --git a/src/core/dbus-cgroup.h b/src/core/dbus-cgroup.h index dd0d5da65df..21f33984857 100644 --- a/src/core/dbus-cgroup.h +++ b/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[]; diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c index 2a257f12603..34511181bfe 100644 --- a/src/core/dbus-execute.c +++ b/src/core/dbus-execute.c @@ -2,6 +2,7 @@ #include #include + #include "af-list.h" #include "alloc-util.h" #include "bus-get-properties.h" diff --git a/src/core/dbus-job.c b/src/core/dbus-job.c index 693efbbcbaf..7ebaec976b4 100644 --- a/src/core/dbus-job.c +++ b/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" diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c index 903f45d1029..b2705e04ce5 100644 --- a/src/core/dbus-manager.c +++ b/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" diff --git a/src/core/dbus-scope.c b/src/core/dbus-scope.c index f3beee92e70..cf282462702 100644 --- a/src/core/dbus-scope.c +++ b/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" diff --git a/src/core/dbus-service.c b/src/core/dbus-service.c index aaa2291d691..20ed478068d 100644 --- a/src/core/dbus-service.c +++ b/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" diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c index 3caa4876dd8..b955a2fdded 100644 --- a/src/core/dbus-unit.c +++ b/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" diff --git a/src/core/dbus-util.c b/src/core/dbus-util.c index e1a4cf0bdc1..b7578307134 100644 --- a/src/core/dbus-util.c +++ b/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, diff --git a/src/core/dbus.c b/src/core/dbus.c index faec7eb33c5..0c3c124ce96 100644 --- a/src/core/dbus.c +++ b/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" diff --git a/src/core/device.c b/src/core/device.c index ea06f0ccb49..97124645711 100644 --- a/src/core/device.c +++ b/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, diff --git a/src/core/execute-serialize.c b/src/core/execute-serialize.c index 0aea6fe8048..0b715126536 100644 --- a/src/core/execute-serialize.c +++ b/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" diff --git a/src/core/executor.c b/src/core/executor.c index 823466595ea..3f1cf3fe43d 100644 --- a/src/core/executor.c +++ b/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" diff --git a/src/core/fuzz-manager-serialize.c b/src/core/fuzz-manager-serialize.c index 57083ca25f0..ca155fd15a4 100644 --- a/src/core/fuzz-manager-serialize.c +++ b/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) { diff --git a/src/core/job.c b/src/core/job.c index d051b3db6d5..c335bb1cf78 100644 --- a/src/core/job.c +++ b/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" diff --git a/src/core/load-dropin.c b/src/core/load-dropin.c index 0256f706357..a84ecb9910b 100644 --- a/src/core/load-dropin.c +++ b/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); diff --git a/src/core/main.c b/src/core/main.c index affffb667fe..3ffacc8ccc6 100644 --- a/src/core/main.c +++ b/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" diff --git a/src/core/manager-serialize.c b/src/core/manager-serialize.c index ae4472b38b6..429918e3e78 100644 --- a/src/core/manager-serialize.c +++ b/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" diff --git a/src/core/manager.c b/src/core/manager.c index 15c8f2b90df..c283645921e 100644 --- a/src/core/manager.c +++ b/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" diff --git a/src/core/manager.h b/src/core/manager.h index c116c53e913..27783d06bb7 100644 --- a/src/core/manager.h +++ b/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; diff --git a/src/core/mount.c b/src/core/mount.c index 2a881f2c95c..a831bac697f 100644 --- a/src/core/mount.c +++ b/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 diff --git a/src/core/namespace.c b/src/core/namespace.c index 207f3a2d667..6cf92b17739 100644 --- a/src/core/namespace.c +++ b/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" diff --git a/src/core/path.c b/src/core/path.c index 364d94f528e..c2e8fa7cca1 100644 --- a/src/core/path.c +++ b/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, diff --git a/src/core/scope.c b/src/core/scope.c index caeadd7e232..3424d978de9 100644 --- a/src/core/scope.c +++ b/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] = { diff --git a/src/core/service.c b/src/core/service.c index b835af1f3aa..278d93272ae 100644 --- a/src/core/service.c +++ b/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__) diff --git a/src/core/slice.c b/src/core/slice.c index 4a9ff98ee94..0bb73727bc9 100644 --- a/src/core/slice.c +++ b/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, diff --git a/src/core/socket.c b/src/core/socket.c index b13becfd5d1..1583c33cf48 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -3,12 +3,12 @@ #include #include #include +#include #include #include #include #include #include -#include #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 { diff --git a/src/core/swap.c b/src/core/swap.c index a8549699ffe..6d505c2acfd 100644 --- a/src/core/swap.c +++ b/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] = { diff --git a/src/core/target.c b/src/core/target.c index 15866e9b1e8..f095aa19924 100644 --- a/src/core/target.c +++ b/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, diff --git a/src/core/timer.c b/src/core/timer.c index d69e2299229..14dd44e3620 100644 --- a/src/core/timer.c +++ b/src/core/timer.c @@ -1,11 +1,10 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include #include #include -#include - #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" diff --git a/src/core/unit-printf.c b/src/core/unit-printf.c index 0bdacfc3c08..5bce46b6257 100644 --- a/src/core/unit-printf.c +++ b/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) { diff --git a/src/core/unit.c b/src/core/unit.c index db142976227..c723a540600 100644 --- a/src/core/unit.c +++ b/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 diff --git a/src/coredump/coredump-vacuum.c b/src/coredump/coredump-vacuum.c index e908ded8a04..e4c5e00ead3 100644 --- a/src/coredump/coredump-vacuum.c +++ b/src/coredump/coredump-vacuum.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include +#include #include #include diff --git a/src/coredump/coredump.c b/src/coredump/coredump.c index defc809c974..2090dbc3434 100644 --- a/src/coredump/coredump.c +++ b/src/coredump/coredump.c @@ -2,10 +2,10 @@ #include #include +#include #include #include #include -#include #include #include diff --git a/src/creds/creds.c b/src/creds/creds.c index 98e19bd981f..5caa45062e7 100644 --- a/src/creds/creds.c +++ b/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, diff --git a/src/cryptenroll/cryptenroll-list.c b/src/cryptenroll/cryptenroll-list.c index 5308182fe00..91f9dd72c2c 100644 --- a/src/cryptenroll/cryptenroll-list.c +++ b/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" diff --git a/src/cryptenroll/cryptenroll-wipe.c b/src/cryptenroll/cryptenroll-wipe.c index 68bc7f72352..05f862dafdd 100644 --- a/src/cryptenroll/cryptenroll-wipe.c +++ b/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" diff --git a/src/cryptenroll/cryptenroll.c b/src/cryptenroll/cryptenroll.c index 8941d7a5ae8..fd57f11f76e 100644 --- a/src/cryptenroll/cryptenroll.c +++ b/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" diff --git a/src/cryptsetup/cryptsetup-pkcs11.c b/src/cryptsetup/cryptsetup-pkcs11.c index c7ecca865ea..f9a1c42869d 100644 --- a/src/cryptsetup/cryptsetup-pkcs11.c +++ b/src/cryptsetup/cryptsetup-pkcs11.c @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include -#include #include #include +#include +#include #include "sd-json.h" diff --git a/src/cryptsetup/cryptsetup-tokens/cryptsetup-token-util.h b/src/cryptsetup/cryptsetup-tokens/cryptsetup-token-util.h index cfdb8a99db9..4e9535a9951 100644 --- a/src/cryptsetup/cryptsetup-tokens/cryptsetup-token-util.h +++ b/src/cryptsetup/cryptsetup-tokens/cryptsetup-token-util.h @@ -2,9 +2,9 @@ #pragma once +#include #include #include -#include /* crypt_dump() internal indentation magic */ #define CRYPT_DUMP_LINE_SEP "\n\t " diff --git a/src/hibernate-resume/hibernate-resume-config.c b/src/hibernate-resume/hibernate-resume-config.c index a11c68ae4a9..ed064ea4153 100644 --- a/src/hibernate-resume/hibernate-resume-config.c +++ b/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; diff --git a/src/home/homed-home-bus.c b/src/home/homed-home-bus.c index 903644ffd26..d7cbb7b883c 100644 --- a/src/home/homed-home-bus.c +++ b/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" diff --git a/src/home/homed-home.c b/src/home/homed-home.c index 6f0bcc65c39..d33b4974b90 100644 --- a/src/home/homed-home.c +++ b/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 */ diff --git a/src/home/homed-manager-bus.c b/src/home/homed-manager-bus.c index 24faf40bd54..2280cb77688 100644 --- a/src/home/homed-manager-bus.c +++ b/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" diff --git a/src/home/homed-manager.c b/src/home/homed-manager.c index 9723725e439..44468e04ea0 100644 --- a/src/home/homed-manager.c +++ b/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" diff --git a/src/home/homed-varlink.c b/src/home/homed-varlink.c index 8b4cb91a21f..e3a748e2512 100644 --- a/src/home/homed-varlink.c +++ b/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 { diff --git a/src/home/homework-blob.c b/src/home/homework-blob.c index 5ba519a7794..b9c71b56e73 100644 --- a/src/home/homework-blob.c +++ b/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" diff --git a/src/home/homework-mount.c b/src/home/homework-mount.c index 1ba732aa139..356f5fb8b61 100644 --- a/src/home/homework-mount.c +++ b/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" diff --git a/src/home/homework-pkcs11.h b/src/home/homework-pkcs11.h index c8674e0bc7f..fd1d0b7714f 100644 --- a/src/home/homework-pkcs11.h +++ b/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; diff --git a/src/home/pam_systemd_home.c b/src/home/pam_systemd_home.c index aef56b8ce37..f32d2fb2822 100644 --- a/src/home/pam_systemd_home.c +++ b/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 { diff --git a/src/home/user-record-password-quality.h b/src/home/user-record-password-quality.h index c7d6ec60462..41473aabde4 100644 --- a/src/home/user-record-password-quality.h +++ b/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); diff --git a/src/home/user-record-util.h b/src/home/user-record-util.h index c2429c8df6c..4268396b905 100644 --- a/src/home/user-record-util.h +++ b/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 diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c index a3b8bb96bf2..15c27af090d 100644 --- a/src/hostname/hostnamed.c +++ b/src/hostname/hostnamed.c @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include #include #include +#include #include #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" diff --git a/src/import/import-fs.c b/src/import/import-fs.c index 440ae85ba16..2c9f5ba146a 100644 --- a/src/import/import-fs.c +++ b/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" diff --git a/src/integritysetup/integrity-util.c b/src/integritysetup/integrity-util.c index 4d65f5be749..754f3bf332f 100644 --- a/src/integritysetup/integrity-util.c +++ b/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" diff --git a/src/journal-remote/fuzz-journal-remote.c b/src/journal-remote/fuzz-journal-remote.c index 3c44945cd45..f18b6da4c0b 100644 --- a/src/journal-remote/fuzz-journal-remote.c +++ b/src/journal-remote/fuzz-journal-remote.c @@ -1,7 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include "fuzz.h" - #include #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" diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c index bf71a9dc94c..d33a7ab6b6f 100644 --- a/src/journal-remote/journal-remote-main.c +++ b/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" diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c index ef505197560..caf7958fc00 100644 --- a/src/journal-remote/journal-remote.c +++ b/src/journal-remote/journal-remote.c @@ -2,9 +2,9 @@ #include #include +#include #include #include -#include #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" diff --git a/src/journal/fuzz-journald-native-fd.c b/src/journal/fuzz-journald-native-fd.c index 07a8eb55e18..d3e1d0bc1aa 100644 --- a/src/journal/fuzz-journald-native-fd.c +++ b/src/journal/fuzz-journald-native-fd.c @@ -2,8 +2,8 @@ #include "fd-util.h" #include "fs-util.h" -#include "fuzz-journald.h" #include "fuzz.h" +#include "fuzz-journald.h" #include "journald-native.h" #include "memfd-util.h" #include "process-util.h" diff --git a/src/journal/fuzz-journald.c b/src/journal/fuzz-journald.c index 8317783d5ed..86e41d3cb73 100644 --- a/src/journal/fuzz-journald.c +++ b/src/journal/fuzz-journald.c @@ -1,9 +1,10 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include "sd-event.h" + #include "alloc-util.h" #include "fuzz-journald.h" #include "journald-server.h" -#include "sd-event.h" void dummy_server_init(Server *s, const uint8_t *buffer, size_t size) { assert(s); diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c index a267136eb3c..0a50467aaaa 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #if HAVE_SELINUX #include #endif @@ -7,7 +8,6 @@ #include #include #include -#include #include "sd-daemon.h" #include "sd-journal.h" diff --git a/src/libsystemd-network/dhcp-network.c b/src/libsystemd-network/dhcp-network.c index 44c6c14f374..e9e500623d3 100644 --- a/src/libsystemd-network/dhcp-network.c +++ b/src/libsystemd-network/dhcp-network.c @@ -3,13 +3,12 @@ Copyright © 2013 Intel Corporation. All rights reserved. ***/ -/* Make sure the net/if.h header is included before any linux/ one */ -#include #include #include #include #include #include +#include #include #include #include diff --git a/src/libsystemd-network/dhcp-option.h b/src/libsystemd-network/dhcp-option.h index 047c8f34155..289e833443f 100644 --- a/src/libsystemd-network/dhcp-option.h +++ b/src/libsystemd-network/dhcp-option.h @@ -4,9 +4,9 @@ #include #include "sd-dhcp-option.h" -#include "dns-resolver-internal.h" #include "dhcp-protocol.h" +#include "dns-resolver-internal.h" #include "hash-funcs.h" struct sd_dhcp_option { diff --git a/src/libsystemd-network/dhcp6-internal.h b/src/libsystemd-network/dhcp6-internal.h index ecd62ea802c..2ef8dc8690c 100644 --- a/src/libsystemd-network/dhcp6-internal.h +++ b/src/libsystemd-network/dhcp6-internal.h @@ -8,8 +8,8 @@ #include #include -#include "sd-event.h" #include "sd-dhcp6-client.h" +#include "sd-event.h" #include "dhcp-duid-internal.h" #include "dhcp6-client-internal.h" diff --git a/src/libsystemd-network/dhcp6-lease-internal.h b/src/libsystemd-network/dhcp6-lease-internal.h index 60cd84f2d83..62c3858841a 100644 --- a/src/libsystemd-network/dhcp6-lease-internal.h +++ b/src/libsystemd-network/dhcp6-lease-internal.h @@ -8,10 +8,10 @@ #include #include "sd-dhcp6-lease.h" -#include "dns-resolver-internal.h" #include "dhcp6-option.h" #include "dhcp6-protocol.h" +#include "dns-resolver-internal.h" #include "macro.h" #include "set.h" #include "time-util.h" diff --git a/src/libsystemd-network/dhcp6-network.c b/src/libsystemd-network/dhcp6-network.c index 0aa8469cc39..dbe42531643 100644 --- a/src/libsystemd-network/dhcp6-network.c +++ b/src/libsystemd-network/dhcp6-network.c @@ -4,13 +4,13 @@ ***/ #include +#include #include #include #include #include #include #include -#include #include "dhcp6-internal.h" #include "dhcp6-protocol.h" diff --git a/src/libsystemd-network/dns-resolver-internal.h b/src/libsystemd-network/dns-resolver-internal.h index e5c185c2e07..a02aa05bf21 100644 --- a/src/libsystemd-network/dns-resolver-internal.h +++ b/src/libsystemd-network/dns-resolver-internal.h @@ -5,8 +5,8 @@ #include "sd-dns-resolver.h" -#include "macro.h" #include "list.h" +#include "macro.h" #include "socket-netlink.h" /* https://www.iana.org/assignments/dns-svcb/dns-svcb.xhtml#dns-svcparamkeys */ diff --git a/src/libsystemd-network/fuzz-dhcp-client.c b/src/libsystemd-network/fuzz-dhcp-client.c index 72787c4ddd9..3ed21ee175a 100644 --- a/src/libsystemd-network/fuzz-dhcp-client.c +++ b/src/libsystemd-network/fuzz-dhcp-client.c @@ -4,14 +4,13 @@ #include #include -#include "sd-dhcp-client.c" - #include "alloc-util.h" #include "dhcp-lease-internal.h" #include "dhcp-network.h" #include "fs-util.h" #include "fuzz.h" #include "network-internal.h" +#include "sd-dhcp-client.c" #include "tmpfile-util.h" int dhcp_network_bind_raw_socket( diff --git a/src/libsystemd-network/fuzz-dhcp-server-relay.c b/src/libsystemd-network/fuzz-dhcp-server-relay.c index 55200038977..3cfcab7e997 100644 --- a/src/libsystemd-network/fuzz-dhcp-server-relay.c +++ b/src/libsystemd-network/fuzz-dhcp-server-relay.c @@ -4,9 +4,8 @@ #include #include -#include "sd-dhcp-server.c" - #include "fuzz.h" +#include "sd-dhcp-server.c" ssize_t sendto(int sockfd, const void *buf, size_t len, int flags, const struct sockaddr *dest_addr, socklen_t addrlen) { return len; diff --git a/src/libsystemd-network/fuzz-dhcp-server.c b/src/libsystemd-network/fuzz-dhcp-server.c index c8b03781d04..3f83aae34d8 100644 --- a/src/libsystemd-network/fuzz-dhcp-server.c +++ b/src/libsystemd-network/fuzz-dhcp-server.c @@ -4,11 +4,10 @@ #include #include -#include "sd-dhcp-server.c" - #include "fuzz.h" #include "path-util.h" #include "rm-rf.h" +#include "sd-dhcp-server.c" #include "tmpfile-util.h" /* stub out network so that the server doesn't send */ diff --git a/src/libsystemd-network/icmp6-util.c b/src/libsystemd-network/icmp6-util.c index 70190164c4f..58c473c0481 100644 --- a/src/libsystemd-network/icmp6-util.c +++ b/src/libsystemd-network/icmp6-util.c @@ -3,10 +3,9 @@ Copyright © 2014 Intel Corporation. All rights reserved. ***/ -/* Make sure the net/if.h header is included before any linux/ one */ -#include #include #include +#include #include #include #include diff --git a/src/libsystemd-network/ndisc-option.c b/src/libsystemd-network/ndisc-option.c index 5816714fefd..daa7aba5eab 100644 --- a/src/libsystemd-network/ndisc-option.c +++ b/src/libsystemd-network/ndisc-option.c @@ -3,8 +3,8 @@ #include #include -#include "dns-resolver-internal.h" #include "dns-domain.h" +#include "dns-resolver-internal.h" #include "ether-addr-util.h" #include "hostname-util.h" #include "icmp6-util.h" diff --git a/src/libsystemd-network/ndisc-option.h b/src/libsystemd-network/ndisc-option.h index b51837af5b2..d9408be79a9 100644 --- a/src/libsystemd-network/ndisc-option.h +++ b/src/libsystemd-network/ndisc-option.h @@ -8,8 +8,8 @@ #include #include -#include "sd-ndisc-protocol.h" #include "sd-dns-resolver.h" +#include "sd-ndisc-protocol.h" #include "icmp6-packet.h" #include "macro.h" diff --git a/src/libsystemd-network/sd-dhcp-client-id.c b/src/libsystemd-network/sd-dhcp-client-id.c index 82d9d7e3c9b..d1280fb6192 100644 --- a/src/libsystemd-network/sd-dhcp-client-id.c +++ b/src/libsystemd-network/sd-dhcp-client-id.c @@ -3,8 +3,8 @@ #include "alloc-util.h" #include "dhcp-client-id-internal.h" #include "iovec-util.h" -#include "log.h" #include "json-util.h" +#include "log.h" #include "unaligned.h" #include "utf8.h" diff --git a/src/libsystemd-network/sd-dhcp-client.c b/src/libsystemd-network/sd-dhcp-client.c index a319024590d..56e97475289 100644 --- a/src/libsystemd-network/sd-dhcp-client.c +++ b/src/libsystemd-network/sd-dhcp-client.c @@ -4,12 +4,12 @@ ***/ #include +#include #include #include #include #include #include -#include #include "sd-dhcp-client.h" diff --git a/src/libsystemd-network/sd-dhcp-lease.c b/src/libsystemd-network/sd-dhcp-lease.c index 5aac8143cba..21761ffc513 100644 --- a/src/libsystemd-network/sd-dhcp-lease.c +++ b/src/libsystemd-network/sd-dhcp-lease.c @@ -11,12 +11,12 @@ #include #include "sd-dhcp-lease.h" -#include "dns-resolver-internal.h" #include "alloc-util.h" #include "dhcp-lease-internal.h" #include "dhcp-option.h" #include "dns-domain.h" +#include "dns-resolver-internal.h" #include "env-file.h" #include "fd-util.h" #include "fileio.h" diff --git a/src/libsystemd-network/sd-dhcp-server-lease.c b/src/libsystemd-network/sd-dhcp-server-lease.c index 899a6aa466c..32706bf842b 100644 --- a/src/libsystemd-network/sd-dhcp-server-lease.c +++ b/src/libsystemd-network/sd-dhcp-server-lease.c @@ -3,8 +3,8 @@ #include "dhcp-server-lease-internal.h" #include "fd-util.h" #include "fs-util.h" -#include "json-util.h" #include "iovec-util.h" +#include "json-util.h" #include "mkdir.h" #include "tmpfile-util.h" diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c index ce7254581f0..b806a7debb0 100644 --- a/src/libsystemd-network/sd-dhcp6-client.c +++ b/src/libsystemd-network/sd-dhcp6-client.c @@ -4,9 +4,9 @@ ***/ #include -#include #include #include +#include #include "sd-dhcp6-client.h" diff --git a/src/libsystemd-network/sd-dns-resolver.c b/src/libsystemd-network/sd-dns-resolver.c index 2ffbaa72e24..ef06573d15f 100644 --- a/src/libsystemd-network/sd-dns-resolver.c +++ b/src/libsystemd-network/sd-dns-resolver.c @@ -3,12 +3,12 @@ #include "dns-resolver-internal.h" #include "log.h" #include "macro.h" -#include "unaligned.h" #include "socket-netlink.h" #include "stdio-util.h" #include "string-table.h" #include "string-util.h" #include "strv.h" +#include "unaligned.h" void sd_dns_resolver_done(sd_dns_resolver *res) { assert(res); diff --git a/src/libsystemd-network/sd-radv.c b/src/libsystemd-network/sd-radv.c index f241929ad59..48a198099dc 100644 --- a/src/libsystemd-network/sd-radv.c +++ b/src/libsystemd-network/sd-radv.c @@ -3,10 +3,10 @@ Copyright © 2017 Intel Corporation. All rights reserved. ***/ +#include #include #include #include -#include #include "sd-radv.h" diff --git a/src/libsystemd-network/test-acd.c b/src/libsystemd-network/test-acd.c index 6b979bd10b9..c00e87605ab 100644 --- a/src/libsystemd-network/test-acd.c +++ b/src/libsystemd-network/test-acd.c @@ -1,9 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -/* Make sure the net/if.h header is included before any linux/ one */ -#include #include #include +#include #include #include diff --git a/src/libsystemd-network/test-ipv4ll-manual.c b/src/libsystemd-network/test-ipv4ll-manual.c index de072dbee46..1fc6d11b88f 100644 --- a/src/libsystemd-network/test-ipv4ll-manual.c +++ b/src/libsystemd-network/test-ipv4ll-manual.c @@ -1,9 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -/* Make sure the net/if.h header is included before any linux/ one */ -#include #include #include +#include #include #include diff --git a/src/libsystemd-network/test-ndisc-ra.c b/src/libsystemd-network/test-ndisc-ra.c index 2f736aa4ea7..cc7007f15a2 100644 --- a/src/libsystemd-network/test-ndisc-ra.c +++ b/src/libsystemd-network/test-ndisc-ra.c @@ -3,8 +3,8 @@ Copyright © 2017 Intel Corporation. All rights reserved. ***/ -#include #include +#include #include #include "sd-radv.h" diff --git a/src/libsystemd-network/test-ndisc-rs.c b/src/libsystemd-network/test-ndisc-rs.c index 66aad2600a3..effed116154 100644 --- a/src/libsystemd-network/test-ndisc-rs.c +++ b/src/libsystemd-network/test-ndisc-rs.c @@ -3,8 +3,8 @@ Copyright © 2014 Intel Corporation. All rights reserved. ***/ -#include #include +#include #include #include "sd-ndisc.h" @@ -14,9 +14,9 @@ #include "hexdecoct.h" #include "icmp6-packet.h" #include "icmp6-test-util.h" +#include "ndisc-internal.h" #include "socket-util.h" #include "strv.h" -#include "ndisc-internal.h" #include "tests.h" static struct ether_addr mac_addr = { diff --git a/src/libsystemd/sd-bus/bus-convenience.c b/src/libsystemd/sd-bus/bus-convenience.c index e7c1d703bde..a6533815e83 100644 --- a/src/libsystemd/sd-bus/bus-convenience.c +++ b/src/libsystemd/sd-bus/bus-convenience.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include +#include #include "bus-internal.h" #include "bus-message.h" diff --git a/src/libsystemd/sd-bus/bus-kernel.c b/src/libsystemd/sd-bus/bus-kernel.c index 7fdab032097..b726957c767 100644 --- a/src/libsystemd/sd-bus/bus-kernel.c +++ b/src/libsystemd/sd-bus/bus-kernel.c @@ -20,12 +20,12 @@ #include "format-util.h" #include "log.h" #include "memfd-util.h" +#include "memory-util.h" #include "parse-util.h" #include "stdio-util.h" #include "string-util.h" #include "strv.h" #include "user-util.h" -#include "memory-util.h" void close_and_munmap(int fd, void *address, size_t size) { if (size > 0) { diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c index cdd988c3bee..15aa16a788e 100644 --- a/src/libsystemd/sd-bus/bus-message.c +++ b/src/libsystemd/sd-bus/bus-message.c @@ -13,9 +13,9 @@ #include "bus-type.h" #include "fd-util.h" #include "iovec-util.h" +#include "log.h" #include "memfd-util.h" #include "memory-util.h" -#include "log.h" #include "string-util.h" #include "strv.h" #include "time-util.h" diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c index 2f6caee8ec6..db8c19e4516 100644 --- a/src/libsystemd/sd-bus/sd-bus.c +++ b/src/libsystemd/sd-bus/sd-bus.c @@ -36,8 +36,8 @@ #include "hexdecoct.h" #include "hostname-util.h" #include "io-util.h" -#include "log-context.h" #include "log.h" +#include "log-context.h" #include "macro.h" #include "memory-util.h" #include "missing_syscall.h" diff --git a/src/libsystemd/sd-bus/test-bus-introspect.c b/src/libsystemd/sd-bus/test-bus-introspect.c index 3c026aedb98..fe59819674a 100644 --- a/src/libsystemd/sd-bus/test-bus-introspect.c +++ b/src/libsystemd/sd-bus/test-bus-introspect.c @@ -2,9 +2,8 @@ #include "bus-introspect.h" #include "log.h" -#include "tests.h" - #include "test-vtable-data.h" +#include "tests.h" static void test_manual_introspection_one(const sd_bus_vtable vtable[]) { struct introspect intro = {}; diff --git a/src/libsystemd/sd-bus/test-bus-watch-bind.c b/src/libsystemd/sd-bus/test-bus-watch-bind.c index 7f73c6e7b87..f7ba14a6a80 100644 --- a/src/libsystemd/sd-bus/test-bus-watch-bind.c +++ b/src/libsystemd/sd-bus/test-bus-watch-bind.c @@ -16,8 +16,8 @@ #include "rm-rf.h" #include "socket-util.h" #include "string-util.h" -#include "tmpfile-util.h" #include "tests.h" +#include "tmpfile-util.h" static int method_foobar(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) { log_info("Got Foobar() call."); diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c index 8a79867a194..3f9e21505a4 100644 --- a/src/libsystemd/sd-event/sd-event.c +++ b/src/libsystemd/sd-event/sd-event.c @@ -28,8 +28,8 @@ #include "missing_wait.h" #include "origin-id.h" #include "path-util.h" -#include "prioq.h" #include "pidfd-util.h" +#include "prioq.h" #include "process-util.h" #include "psi-util.h" #include "set.h" diff --git a/src/libsystemd/sd-journal/journal-file.c b/src/libsystemd/sd-journal/journal-file.c index 7dc1c3b6477..720c67c7be4 100644 --- a/src/libsystemd/sd-journal/journal-file.c +++ b/src/libsystemd/sd-journal/journal-file.c @@ -22,11 +22,11 @@ #include "fs-util.h" #include "gcrypt-util.h" #include "id128-util.h" -#include "log.h" #include "journal-authenticate.h" #include "journal-def.h" #include "journal-file.h" #include "journal-internal.h" +#include "log.h" #include "lookup3.h" #include "memory-util.h" #include "missing_fs.h" diff --git a/src/libsystemd/sd-journal/journal-send.c b/src/libsystemd/sd-journal/journal-send.c index bbd46854679..012592b4cd2 100644 --- a/src/libsystemd/sd-journal/journal-send.c +++ b/src/libsystemd/sd-journal/journal-send.c @@ -20,8 +20,8 @@ #include "fileio.h" #include "io-util.h" #include "iovec-util.h" -#include "log.h" #include "journal-send.h" +#include "log.h" #include "memfd-util.h" #include "missing_mman.h" #include "missing_syscall.h" diff --git a/src/libsystemd/sd-journal/journal-vacuum.c b/src/libsystemd/sd-journal/journal-vacuum.c index a048dd679ac..e069594f6d3 100644 --- a/src/libsystemd/sd-journal/journal-vacuum.c +++ b/src/libsystemd/sd-journal/journal-vacuum.c @@ -11,11 +11,11 @@ #include "fd-util.h" #include "format-util.h" #include "fs-util.h" -#include "log.h" #include "journal-def.h" #include "journal-file.h" #include "journal-internal.h" #include "journal-vacuum.h" +#include "log.h" #include "ratelimit.h" #include "sort-util.h" #include "string-util.h" diff --git a/src/libsystemd/sd-journal/journal-verify.c b/src/libsystemd/sd-journal/journal-verify.c index af5a74d2222..87d66aac433 100644 --- a/src/libsystemd/sd-journal/journal-verify.c +++ b/src/libsystemd/sd-journal/journal-verify.c @@ -12,11 +12,11 @@ #include "fileio.h" #include "fs-util.h" #include "gcrypt-util.h" -#include "log.h" #include "journal-authenticate.h" #include "journal-def.h" #include "journal-file.h" #include "journal-verify.h" +#include "log.h" #include "lookup3.h" #include "macro.h" #include "terminal-util.h" diff --git a/src/libsystemd/sd-journal/test-audit-type.c b/src/libsystemd/sd-journal/test-audit-type.c index 1d5003bd9b1..04af134261d 100644 --- a/src/libsystemd/sd-journal/test-audit-type.c +++ b/src/libsystemd/sd-journal/test-audit-type.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include +#include #include "audit-type.h" #include "tests.h" diff --git a/src/libsystemd/sd-journal/test-journal-interleaving.c b/src/libsystemd/sd-journal/test-journal-interleaving.c index 6e9c87c023d..fe20118207d 100644 --- a/src/libsystemd/sd-journal/test-journal-interleaving.c +++ b/src/libsystemd/sd-journal/test-journal-interleaving.c @@ -16,8 +16,8 @@ #include "parse-util.h" #include "random-util.h" #include "rm-rf.h" -#include "tmpfile-util.h" #include "tests.h" +#include "tmpfile-util.h" /* This program tests skipping around in a multi-file journal. */ diff --git a/src/libsystemd/sd-json/sd-json.c b/src/libsystemd/sd-json/sd-json.c index fa8c25da8a1..4a91bc8b816 100644 --- a/src/libsystemd/sd-json/sd-json.c +++ b/src/libsystemd/sd-json/sd-json.c @@ -24,12 +24,12 @@ #include "iovec-util.h" #include "json-internal.h" #include "json-util.h" -#include "ordered-set.h" #include "log.h" #include "macro.h" #include "math-util.h" #include "memory-util.h" #include "memstream-util.h" +#include "ordered-set.h" #include "path-util.h" #include "process-util.h" #include "ratelimit.h" diff --git a/src/libsystemd/sd-netlink/netlink-message-nfnl.c b/src/libsystemd/sd-netlink/netlink-message-nfnl.c index 1ce1adb5cd4..66049d3106d 100644 --- a/src/libsystemd/sd-netlink/netlink-message-nfnl.c +++ b/src/libsystemd/sd-netlink/netlink-message-nfnl.c @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include -#include -#include #include +#include +#include +#include #include "sd-netlink.h" diff --git a/src/libsystemd/sd-netlink/netlink-message-rtnl.c b/src/libsystemd/sd-netlink/netlink-message-rtnl.c index 9143e29358b..fdde1fb2c80 100644 --- a/src/libsystemd/sd-netlink/netlink-message-rtnl.c +++ b/src/libsystemd/sd-netlink/netlink-message-rtnl.c @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include #include #include #include +#include #include #include diff --git a/src/libsystemd/sd-netlink/netlink-types-genl.c b/src/libsystemd/sd-netlink/netlink-types-genl.c index 226ac865c93..ebb091b90fb 100644 --- a/src/libsystemd/sd-netlink/netlink-types-genl.c +++ b/src/libsystemd/sd-netlink/netlink-types-genl.c @@ -1,7 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include -#include #include #include #include @@ -10,6 +8,8 @@ #include #include #include +#include +#include #include "missing_network.h" #include "netlink-genl.h" diff --git a/src/libsystemd/sd-netlink/netlink-types-rtnl.c b/src/libsystemd/sd-netlink/netlink-types-rtnl.c index 57a38ecb4bc..7af44ab1448 100644 --- a/src/libsystemd/sd-netlink/netlink-types-rtnl.c +++ b/src/libsystemd/sd-netlink/netlink-types-rtnl.c @@ -1,7 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include -#include #include #include #include @@ -25,6 +23,8 @@ #include #include #include +#include +#include #include "missing_network.h" #include "netlink-types-internal.h" diff --git a/src/libsystemd/sd-netlink/test-netlink.c b/src/libsystemd/sd-netlink/test-netlink.c index 1468aabc0a5..fd481dced0b 100644 --- a/src/libsystemd/sd-netlink/test-netlink.c +++ b/src/libsystemd/sd-netlink/test-netlink.c @@ -1,14 +1,13 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -/* Make sure the net/if.h header is included before any linux/ one */ -#include -#include -#include #include #include #include #include #include +#include +#include +#include #include #include "sd-netlink.h" diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c index a155b3606d2..ae62138c8f3 100644 --- a/src/libudev/libudev-device.c +++ b/src/libudev/libudev-device.c @@ -1,12 +1,11 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -/* Make sure the net/if.h header is included before any linux/ one */ -#include #include #include #include #include #include +#include #include #include #include diff --git a/src/libudev/test-udev-device-thread.c b/src/libudev/test-udev-device-thread.c index fdf08188631..c12480f89cd 100644 --- a/src/libudev/test-udev-device-thread.c +++ b/src/libudev/test-udev-device-thread.c @@ -6,6 +6,7 @@ #include #include "libudev.h" + #include "tests.h" #define handle_error_errno(error, msg) \ diff --git a/src/locale/localed-util.c b/src/locale/localed-util.c index b477aeb2539..76383589c08 100644 --- a/src/locale/localed-util.c +++ b/src/locale/localed-util.c @@ -6,8 +6,8 @@ #include #include "copy.h" -#include "env-file-label.h" #include "env-file.h" +#include "env-file-label.h" #include "env-util.h" #include "fd-util.h" #include "fileio.h" diff --git a/src/login/logind-brightness.c b/src/login/logind-brightness.c index b3e7718394a..a51f2ab2496 100644 --- a/src/login/logind-brightness.c +++ b/src/login/logind-brightness.c @@ -4,8 +4,8 @@ #include "bus-util.h" #include "device-util.h" #include "hash-funcs.h" -#include "logind-brightness.h" #include "logind.h" +#include "logind-brightness.h" #include "process-util.h" #include "stdio-util.h" diff --git a/src/login/logind-core.c b/src/login/logind-core.c index 80e777b5054..75fd0a2d87d 100644 --- a/src/login/logind-core.c +++ b/src/login/logind-core.c @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include +#include #include #include -#include #include "sd-device.h" diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c index 51edb60d047..a7fc968facf 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c @@ -49,10 +49,10 @@ #include "process-util.h" #include "reboot-util.h" #include "selinux-util.h" -#include "sleep-config.h" -#include "special.h" #include "serialize.h" #include "signal-util.h" +#include "sleep-config.h" +#include "special.h" #include "stdio-util.h" #include "strv.h" #include "terminal-util.h" diff --git a/src/login/logind-seat-dbus.c b/src/login/logind-seat-dbus.c index 3c027e8fe1b..31897b8c194 100644 --- a/src/login/logind-seat-dbus.c +++ b/src/login/logind-seat-dbus.c @@ -8,13 +8,13 @@ #include "bus-label.h" #include "bus-polkit.h" #include "bus-util.h" +#include "logind.h" #include "logind-dbus.h" #include "logind-polkit.h" -#include "logind-seat-dbus.h" #include "logind-seat.h" +#include "logind-seat-dbus.h" #include "logind-session-dbus.h" #include "logind-user.h" -#include "logind.h" #include "strv.h" #include "user-util.h" diff --git a/src/login/logind-seat.c b/src/login/logind-seat.c index 06f32ecec5a..285c9b418db 100644 --- a/src/login/logind-seat.c +++ b/src/login/logind-seat.c @@ -16,8 +16,8 @@ #include "fs-util.h" #include "logind.h" #include "logind-device.h" -#include "logind-seat-dbus.h" #include "logind-seat.h" +#include "logind-seat-dbus.h" #include "logind-session.h" #include "logind-session-dbus.h" #include "logind-session-device.h" diff --git a/src/login/logind-session-dbus.c b/src/login/logind-session-dbus.c index af5e04bce4e..a7e4b7c861f 100644 --- a/src/login/logind-session-dbus.c +++ b/src/login/logind-session-dbus.c @@ -12,17 +12,17 @@ #include "devnum-util.h" #include "fd-util.h" #include "format-util.h" +#include "logind.h" #include "logind-brightness.h" #include "logind-dbus.h" #include "logind-polkit.h" #include "logind-seat.h" #include "logind-seat-dbus.h" +#include "logind-session.h" #include "logind-session-dbus.h" #include "logind-session-device.h" -#include "logind-session.h" #include "logind-user.h" #include "logind-user-dbus.h" -#include "logind.h" #include "path-util.h" #include "signal-util.h" #include "strv.h" diff --git a/src/login/logind-session-device.c b/src/login/logind-session-device.c index 984c1c1eeb6..c51660540d5 100644 --- a/src/login/logind-session-device.c +++ b/src/login/logind-session-device.c @@ -7,8 +7,8 @@ #include #include -#include "sd-device.h" #include "sd-daemon.h" +#include "sd-device.h" #include "alloc-util.h" #include "bus-util.h" diff --git a/src/login/logind-session.c b/src/login/logind-session.c index 75ceb650a4a..2ca5a3716d6 100644 --- a/src/login/logind-session.c +++ b/src/login/logind-session.c @@ -29,9 +29,9 @@ #include "logind-dbus.h" #include "logind-seat.h" #include "logind-seat-dbus.h" +#include "logind-session.h" #include "logind-session-dbus.h" #include "logind-session-device.h" -#include "logind-session.h" #include "logind-user.h" #include "logind-user-dbus.h" #include "logind-varlink.h" diff --git a/src/login/logind-user-dbus.c b/src/login/logind-user-dbus.c index 847b611dc4d..ade2368b969 100644 --- a/src/login/logind-user-dbus.c +++ b/src/login/logind-user-dbus.c @@ -7,11 +7,11 @@ #include "bus-polkit.h" #include "bus-util.h" #include "format-util.h" +#include "logind.h" #include "logind-dbus.h" #include "logind-session-dbus.h" -#include "logind-user-dbus.h" #include "logind-user.h" -#include "logind.h" +#include "logind-user-dbus.h" #include "signal-util.h" #include "strv.h" #include "user-util.h" diff --git a/src/login/logind-user.c b/src/login/logind-user.c index 1ef32188263..d5795e2a7fc 100644 --- a/src/login/logind-user.c +++ b/src/login/logind-user.c @@ -22,8 +22,8 @@ #include "logind.h" #include "logind-dbus.h" #include "logind-seat.h" -#include "logind-user-dbus.h" #include "logind-user.h" +#include "logind-user-dbus.h" #include "mkdir-label.h" #include "parse-util.h" #include "path-util.h" diff --git a/src/login/test-inhibit.c b/src/login/test-inhibit.c index abb80d953e4..9334ea532c5 100644 --- a/src/login/test-inhibit.c +++ b/src/login/test-inhibit.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include +#include #include "sd-bus.h" diff --git a/src/machine/image-varlink.c b/src/machine/image-varlink.c index 4749487541c..c7bc684ab55 100644 --- a/src/machine/image-varlink.c +++ b/src/machine/image-varlink.c @@ -3,8 +3,8 @@ #include "sd-json.h" #include "sd-varlink.h" -#include "bus-polkit.h" #include "btrfs-util.h" +#include "bus-polkit.h" #include "discover-image.h" #include "fd-util.h" #include "fileio.h" @@ -13,8 +13,8 @@ #include "io-util.h" #include "json-util.h" #include "machine.h" -#include "machined.h" #include "machine-pool.h" +#include "machined.h" #include "operation.h" #include "process-util.h" #include "string-util.h" diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c index bc0fbde62a3..de839099e08 100644 --- a/src/machine/machine-dbus.c +++ b/src/machine/machine-dbus.c @@ -21,8 +21,8 @@ #include "fs-util.h" #include "in-addr-util.h" #include "local-addresses.h" -#include "machine-dbus.h" #include "machine.h" +#include "machine-dbus.h" #include "machined.h" #include "mkdir.h" #include "mount-util.h" diff --git a/src/machine/machine-varlink.c b/src/machine/machine-varlink.c index e59cb851557..7ee1a356cab 100644 --- a/src/machine/machine-varlink.c +++ b/src/machine/machine-varlink.c @@ -11,8 +11,8 @@ #include "fd-util.h" #include "hostname-util.h" #include "json-util.h" -#include "machine-varlink.h" #include "machine.h" +#include "machine-varlink.h" #include "machined.h" #include "mount-util.h" #include "operation.h" diff --git a/src/machine/machine.c b/src/machine/machine.c index 36fc2a1476a..09c10dc3501 100644 --- a/src/machine/machine.c +++ b/src/machine/machine.c @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include #include +#include #include "sd-messages.h" @@ -21,8 +21,8 @@ #include "format-util.h" #include "fs-util.h" #include "hashmap.h" -#include "machine-dbus.h" #include "machine.h" +#include "machine-dbus.h" #include "machined.h" #include "mkdir-label.h" #include "namespace-util.h" diff --git a/src/machine/machined-dbus.c b/src/machine/machined-dbus.c index d9e43d9e0a6..3be1ec0cddd 100644 --- a/src/machine/machined-dbus.c +++ b/src/machine/machined-dbus.c @@ -23,9 +23,9 @@ #include "image.h" #include "image-dbus.h" #include "io-util.h" +#include "machine.h" #include "machine-dbus.h" #include "machine-pool.h" -#include "machine.h" #include "machined.h" #include "operation.h" #include "os-util.h" diff --git a/src/machine/machined-varlink.c b/src/machine/machined-varlink.c index e331ccba666..5aeb0f797c1 100644 --- a/src/machine/machined-varlink.c +++ b/src/machine/machined-varlink.c @@ -8,8 +8,8 @@ #include "hostname-util.h" #include "image-varlink.h" #include "json-util.h" -#include "machine-varlink.h" #include "machine.h" +#include "machine-varlink.h" #include "machined.h" #include "machined-varlink.h" #include "mkdir.h" diff --git a/src/machine/machined.c b/src/machine/machined.c index 253561e4350..bc2739268f3 100644 --- a/src/machine/machined.c +++ b/src/machine/machined.c @@ -20,8 +20,8 @@ #include "format-util.h" #include "hostname-util.h" #include "machine.h" -#include "machined-varlink.h" #include "machined.h" +#include "machined-varlink.h" #include "main-func.h" #include "mkdir-label.h" #include "operation.h" diff --git a/src/mountfsd/mountwork.c b/src/mountfsd/mountwork.c index 9567146fdc1..8f24d2c3de8 100644 --- a/src/mountfsd/mountwork.c +++ b/src/mountfsd/mountwork.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include +#include #include "sd-daemon.h" #include "sd-varlink.h" diff --git a/src/network/netdev/bareudp.c b/src/network/netdev/bareudp.c index e122abd97fc..9a8019eea9d 100644 --- a/src/network/netdev/bareudp.c +++ b/src/network/netdev/bareudp.c @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later * Copyright © 2020 VMware, Inc. */ -#include #include +#include #include "bareudp.h" #include "netlink-util.h" diff --git a/src/network/netdev/batadv.c b/src/network/netdev/batadv.c index 9806d8eb7c3..c122aeec41d 100644 --- a/src/network/netdev/batadv.c +++ b/src/network/netdev/batadv.c @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include #include #include +#include #include "batadv.h" #include "fileio.h" diff --git a/src/network/netdev/bond.c b/src/network/netdev/bond.c index b866940b7a8..a83a46bb6e6 100644 --- a/src/network/netdev/bond.c +++ b/src/network/netdev/bond.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include +#include #include "alloc-util.h" #include "bond.h" diff --git a/src/network/netdev/bond.h b/src/network/netdev/bond.h index ea94001e6e6..6f349f86e4f 100644 --- a/src/network/netdev/bond.h +++ b/src/network/netdev/bond.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include #include +#include #include "bond-util.h" #include "macro.h" diff --git a/src/network/netdev/bridge.c b/src/network/netdev/bridge.c index 06f9840d1c6..afba0973b6b 100644 --- a/src/network/netdev/bridge.c +++ b/src/network/netdev/bridge.c @@ -1,9 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -/* Make sure the net/if.h header is included before any linux/ one */ -#include #include #include +#include #include #include "bridge.h" diff --git a/src/network/netdev/fou-tunnel.c b/src/network/netdev/fou-tunnel.c index a85aff2e6d3..29240d4beaf 100644 --- a/src/network/netdev/fou-tunnel.c +++ b/src/network/netdev/fou-tunnel.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 #include -#include #include +#include +#include #include "conf-parser.h" #include "fou-tunnel.h" diff --git a/src/network/netdev/fou-tunnel.h b/src/network/netdev/fou-tunnel.h index 1dd2e3b927d..e8cab9e1617 100644 --- a/src/network/netdev/fou-tunnel.h +++ b/src/network/netdev/fou-tunnel.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include #include +#include #include "in-addr-util.h" #include "netdev.h" diff --git a/src/network/netdev/geneve.c b/src/network/netdev/geneve.c index 1d68be9bc88..8d203bcb917 100644 --- a/src/network/netdev/geneve.c +++ b/src/network/netdev/geneve.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 #include +#include #include #include "alloc-util.h" diff --git a/src/network/netdev/hsr.c b/src/network/netdev/hsr.c index c3536a1faa4..975e439ce96 100644 --- a/src/network/netdev/hsr.c +++ b/src/network/netdev/hsr.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 #include +#include #include #include "hsr.h" diff --git a/src/network/netdev/ipvlan.c b/src/network/netdev/ipvlan.c index 6e50f72aaa7..71e95ddc4ca 100644 --- a/src/network/netdev/ipvlan.c +++ b/src/network/netdev/ipvlan.c @@ -1,9 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -/* Make sure the net/if.h header is included before any linux/ one */ +#include #include #include -#include #include "conf-parser.h" #include "ipvlan.h" diff --git a/src/network/netdev/ipvlan.h b/src/network/netdev/ipvlan.h index 633b0bd94fc..43ff2818e03 100644 --- a/src/network/netdev/ipvlan.h +++ b/src/network/netdev/ipvlan.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include #include +#include #include "ipvlan-util.h" #include "netdev.h" diff --git a/src/network/netdev/l2tp-tunnel.c b/src/network/netdev/l2tp-tunnel.c index f63951ea97d..42d2ec8642f 100644 --- a/src/network/netdev/l2tp-tunnel.c +++ b/src/network/netdev/l2tp-tunnel.c @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include +#include #include #include -#include +#include #include "conf-parser.h" #include "hashmap.h" diff --git a/src/network/netdev/l2tp-tunnel.h b/src/network/netdev/l2tp-tunnel.h index c558ed49def..a5f6fbad1e2 100644 --- a/src/network/netdev/l2tp-tunnel.h +++ b/src/network/netdev/l2tp-tunnel.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include #include +#include #include "in-addr-util.h" #include "netdev.h" diff --git a/src/network/netdev/macsec.c b/src/network/netdev/macsec.c index d367c5c87f8..0df52fd360b 100644 --- a/src/network/netdev/macsec.c +++ b/src/network/netdev/macsec.c @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include +#include #include #include #include -#include +#include #include "conf-parser.h" #include "fileio.h" diff --git a/src/network/netdev/macsec.h b/src/network/netdev/macsec.h index 17bb1ca3fbe..a78e7a359ac 100644 --- a/src/network/netdev/macsec.h +++ b/src/network/netdev/macsec.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include #include +#include #include "ether-addr-util.h" #include "in-addr-util.h" diff --git a/src/network/netdev/macvlan.c b/src/network/netdev/macvlan.c index fd112b58e17..3fe71fccdf9 100644 --- a/src/network/netdev/macvlan.c +++ b/src/network/netdev/macvlan.c @@ -1,9 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -/* Make sure the net/if.h header is included before any linux/ one */ +#include #include #include -#include #include "conf-parser.h" #include "macvlan.h" diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c index 99137371406..2a27693d0b8 100644 --- a/src/network/netdev/netdev.c +++ b/src/network/netdev/netdev.c @@ -1,9 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -/* Make sure the net/if.h header is included before any linux/ one */ +#include #include #include -#include #include #include "alloc-util.h" diff --git a/src/network/netdev/tunnel.c b/src/network/netdev/tunnel.c index e6f857c90c9..cf3a36be8fb 100644 --- a/src/network/netdev/tunnel.c +++ b/src/network/netdev/tunnel.c @@ -1,11 +1,11 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include #include #include #include #include +#include #include "af-list.h" #include "conf-parser.h" diff --git a/src/network/netdev/tunnel.h b/src/network/netdev/tunnel.h index 6cd03b032d2..34fdbfaf428 100644 --- a/src/network/netdev/tunnel.h +++ b/src/network/netdev/tunnel.h @@ -1,12 +1,11 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "in-addr-util.h" - #include "conf-parser.h" #include "fou-tunnel.h" -#include "netdev-util.h" +#include "in-addr-util.h" #include "netdev.h" +#include "netdev-util.h" #include "networkd-link.h" typedef enum Ip6TnlMode { diff --git a/src/network/netdev/tuntap.c b/src/network/netdev/tuntap.c index a421e667331..2d96682ca5b 100644 --- a/src/network/netdev/tuntap.c +++ b/src/network/netdev/tuntap.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 #include #include #include +#include #include #include #include diff --git a/src/network/netdev/vcan.h b/src/network/netdev/vcan.h index 843984fbee3..f149eb2bb83 100644 --- a/src/network/netdev/vcan.h +++ b/src/network/netdev/vcan.h @@ -3,8 +3,8 @@ typedef struct VCan VCan; -#include #include +#include #include "netdev.h" diff --git a/src/network/netdev/veth.c b/src/network/netdev/veth.c index 54d3b597349..d263e35748b 100644 --- a/src/network/netdev/veth.c +++ b/src/network/netdev/veth.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 #include #include #include +#include #include #include "netlink-util.h" diff --git a/src/network/netdev/vlan.c b/src/network/netdev/vlan.c index 60e49a5b8a9..f6b9234740f 100644 --- a/src/network/netdev/vlan.c +++ b/src/network/netdev/vlan.c @@ -1,14 +1,13 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -/* Make sure the net/if.h header is included before any linux/ one */ -#include #include #include #include +#include #include "parse-util.h" -#include "vlan-util.h" #include "vlan.h" +#include "vlan-util.h" static int netdev_vlan_fill_message_create(NetDev *netdev, Link *link, sd_netlink_message *req) { assert(link); diff --git a/src/network/netdev/vrf.c b/src/network/netdev/vrf.c index c35419f859f..6a8d6e8f31a 100644 --- a/src/network/netdev/vrf.c +++ b/src/network/netdev/vrf.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 #include +#include #include #include "vrf.h" diff --git a/src/network/netdev/vxlan.c b/src/network/netdev/vxlan.c index 5961c284221..1796cf764ec 100644 --- a/src/network/netdev/vxlan.c +++ b/src/network/netdev/vxlan.c @@ -1,18 +1,17 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -/* Make sure the net/if.h header is included before any linux/ one */ +#include #include #include -#include -#include "conf-parser.h" #include "alloc-util.h" +#include "conf-parser.h" #include "extract-word.h" #include "networkd-link.h" +#include "parse-util.h" #include "string-table.h" #include "string-util.h" #include "strv.h" -#include "parse-util.h" #include "vxlan.h" static const char* const df_table[_NETDEV_VXLAN_DF_MAX] = { diff --git a/src/network/netdev/vxlan.h b/src/network/netdev/vxlan.h index 9d4e8852664..cb0386adbe2 100644 --- a/src/network/netdev/vxlan.h +++ b/src/network/netdev/vxlan.h @@ -6,8 +6,8 @@ typedef struct VxLan VxLan; #include #include "in-addr-util.h" -#include "netdev-util.h" #include "netdev.h" +#include "netdev-util.h" #define VXLAN_VID_MAX (1u << 24) - 1 #define VXLAN_FLOW_LABEL_MAX_MASK 0xFFFFFU diff --git a/src/network/netdev/wireguard.c b/src/network/netdev/wireguard.c index f497c2533ed..69584bbec18 100644 --- a/src/network/netdev/wireguard.c +++ b/src/network/netdev/wireguard.c @@ -3,10 +3,9 @@ Copyright © 2015-2017 Jason A. Donenfeld . All Rights Reserved. ***/ -/* Make sure the net/if.h header is included before any linux/ one */ -#include #include #include +#include #include #include @@ -22,8 +21,8 @@ #include "memory-util.h" #include "netlink-util.h" #include "networkd-manager.h" -#include "networkd-route-util.h" #include "networkd-route.h" +#include "networkd-route-util.h" #include "networkd-util.h" #include "parse-helpers.h" #include "parse-util.h" diff --git a/src/network/netdev/wireguard.h b/src/network/netdev/wireguard.h index 8e5b3b58f56..3925f4787b8 100644 --- a/src/network/netdev/wireguard.h +++ b/src/network/netdev/wireguard.h @@ -4,8 +4,8 @@ typedef struct Wireguard Wireguard; -#include #include +#include #include "sd-event.h" #include "sd-resolve.h" diff --git a/src/network/networkctl-status-link.c b/src/network/networkctl-status-link.c index ac62ca583fa..ac8b067fcdd 100644 --- a/src/network/networkctl-status-link.c +++ b/src/network/networkctl-status-link.c @@ -1,6 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -/* Make sure the net/if.h header is included before any linux/ one */ #include #include "sd-network.h" diff --git a/src/network/networkd-address-label.c b/src/network/networkd-address-label.c index 8f7f571d21e..5f7a2b7ede4 100644 --- a/src/network/networkd-address-label.c +++ b/src/network/networkd-address-label.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 #include +#include #include "alloc-util.h" #include "netlink-util.h" diff --git a/src/network/networkd-address-pool.c b/src/network/networkd-address-pool.c index 8e4d6826a81..c3f9fb71e17 100644 --- a/src/network/networkd-address-pool.c +++ b/src/network/networkd-address-pool.c @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "alloc-util.h" -#include "networkd-address-pool.h" #include "networkd-address.h" +#include "networkd-address-pool.h" #include "networkd-manager.h" #include "networkd-queue.h" #include "string-util.h" diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c index a750f570d46..979890f9a57 100644 --- a/src/network/networkd-address.c +++ b/src/network/networkd-address.c @@ -11,8 +11,8 @@ #include "logarithm.h" #include "memory-util.h" #include "netlink-util.h" -#include "networkd-address-pool.h" #include "networkd-address.h" +#include "networkd-address-pool.h" #include "networkd-dhcp-prefix-delegation.h" #include "networkd-dhcp-server.h" #include "networkd-ipv4acd.h" @@ -21,8 +21,8 @@ #include "networkd-netlabel.h" #include "networkd-network.h" #include "networkd-queue.h" -#include "networkd-route-util.h" #include "networkd-route.h" +#include "networkd-route-util.h" #include "parse-util.h" #include "string-util.h" #include "strv.h" diff --git a/src/network/networkd-bridge-mdb.c b/src/network/networkd-bridge-mdb.c index 45c271c848d..aba4571352c 100644 --- a/src/network/networkd-bridge-mdb.c +++ b/src/network/networkd-bridge-mdb.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 #include +#include #include "netlink-util.h" #include "networkd-bridge-mdb.h" diff --git a/src/network/networkd-bridge-vlan.c b/src/network/networkd-bridge-vlan.c index 0deffa46510..c9be1dd0499 100644 --- a/src/network/networkd-bridge-vlan.c +++ b/src/network/networkd-bridge-vlan.c @@ -3,8 +3,8 @@ Copyright © 2016 BISDN GmbH. All rights reserved. ***/ -#include #include +#include #include #include "alloc-util.h" diff --git a/src/network/networkd-can.c b/src/network/networkd-can.c index 9457104a0ea..abd5518097c 100644 --- a/src/network/networkd-can.c +++ b/src/network/networkd-can.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 #include +#include #include "networkd-can.h" #include "networkd-link.h" diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c index 8b64dfe8f00..427d807356e 100644 --- a/src/network/networkd-dhcp-common.c +++ b/src/network/networkd-dhcp-common.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include +#include #include "bus-error.h" #include "bus-locator.h" diff --git a/src/network/networkd-dhcp-prefix-delegation.c b/src/network/networkd-dhcp-prefix-delegation.c index 16426de9812..41f215ba532 100644 --- a/src/network/networkd-dhcp-prefix-delegation.c +++ b/src/network/networkd-dhcp-prefix-delegation.c @@ -5,16 +5,16 @@ #include "dhcp6-lease-internal.h" #include "hashmap.h" #include "in-addr-prefix-util.h" -#include "networkd-address-generation.h" #include "networkd-address.h" +#include "networkd-address-generation.h" #include "networkd-dhcp-prefix-delegation.h" #include "networkd-dhcp6.h" #include "networkd-link.h" #include "networkd-manager.h" #include "networkd-queue.h" #include "networkd-radv.h" -#include "networkd-route-util.h" #include "networkd-route.h" +#include "networkd-route-util.h" #include "networkd-setlink.h" #include "parse-util.h" #include "string-util.h" diff --git a/src/network/networkd-dhcp-server.c b/src/network/networkd-dhcp-server.c index c35102af74a..45b92d9ec0c 100644 --- a/src/network/networkd-dhcp-server.c +++ b/src/network/networkd-dhcp-server.c @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include -#include #include +#include +#include #include "sd-dhcp-server.h" @@ -12,9 +12,9 @@ #include "fileio.h" #include "network-common.h" #include "networkd-address.h" +#include "networkd-dhcp-server.h" #include "networkd-dhcp-server-bus.h" #include "networkd-dhcp-server-static-lease.h" -#include "networkd-dhcp-server.h" #include "networkd-link.h" #include "networkd-manager.h" #include "networkd-network.h" diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c index d793d603629..96b82a447ce 100644 --- a/src/network/networkd-dhcp4.c +++ b/src/network/networkd-dhcp4.c @@ -1,21 +1,20 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include -#include #include #include +#include +#include #include "alloc-util.h" #include "device-private.h" #include "dhcp-client-internal.h" #include "hostname-setup.h" #include "hostname-util.h" -#include "parse-util.h" #include "network-internal.h" #include "networkd-address.h" #include "networkd-dhcp-prefix-delegation.h" -#include "networkd-dhcp4-bus.h" #include "networkd-dhcp4.h" +#include "networkd-dhcp4-bus.h" #include "networkd-ipv4ll.h" #include "networkd-link.h" #include "networkd-manager.h" @@ -26,6 +25,7 @@ #include "networkd-route.h" #include "networkd-setlink.h" #include "networkd-state-file.h" +#include "parse-util.h" #include "string-table.h" #include "strv.h" #include "sysctl-util.h" diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c index 31a3fbc8e8e..90b4b33bbc9 100644 --- a/src/network/networkd-dhcp6.c +++ b/src/network/networkd-dhcp6.c @@ -10,8 +10,8 @@ #include "hostname-util.h" #include "networkd-address.h" #include "networkd-dhcp-prefix-delegation.h" -#include "networkd-dhcp6-bus.h" #include "networkd-dhcp6.h" +#include "networkd-dhcp6-bus.h" #include "networkd-link.h" #include "networkd-manager.h" #include "networkd-ntp.h" diff --git a/src/network/networkd-ipv4ll.c b/src/network/networkd-ipv4ll.c index 9dbaba0fa0e..d154574a3ff 100644 --- a/src/network/networkd-ipv4ll.c +++ b/src/network/networkd-ipv4ll.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include +#include #include "netif-util.h" #include "networkd-address.h" diff --git a/src/network/networkd-ipv6-proxy-ndp.c b/src/network/networkd-ipv6-proxy-ndp.c index 03c16c50c0f..d1bac5862d0 100644 --- a/src/network/networkd-ipv6-proxy-ndp.c +++ b/src/network/networkd-ipv6-proxy-ndp.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include +#include #include "netlink-util.h" #include "networkd-ipv6-proxy-ndp.h" diff --git a/src/network/networkd-json.c b/src/network/networkd-json.c index 160bcbdccad..2572b8961fb 100644 --- a/src/network/networkd-json.c +++ b/src/network/networkd-json.c @@ -19,8 +19,8 @@ #include "networkd-network.h" #include "networkd-nexthop.h" #include "networkd-ntp.h" -#include "networkd-route-util.h" #include "networkd-route.h" +#include "networkd-route-util.h" #include "networkd-routing-policy-rule.h" #include "sort-util.h" #include "strv.h" diff --git a/src/network/networkd-link-bus.c b/src/network/networkd-link-bus.c index dfecd76d226..b4026054c09 100644 --- a/src/network/networkd-link-bus.c +++ b/src/network/networkd-link-bus.c @@ -12,8 +12,8 @@ #include "dns-domain.h" #include "networkd-dhcp4.h" #include "networkd-json.h" -#include "networkd-link-bus.h" #include "networkd-link.h" +#include "networkd-link-bus.h" #include "networkd-manager.h" #include "networkd-state-file.h" #include "parse-util.h" diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index 61c397bc8b9..0bd27a45c89 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -1,12 +1,11 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -/* Make sure the net/if.h header is included before any linux/ one */ -#include -#include #include #include #include #include +#include +#include #include #include @@ -32,8 +31,8 @@ #include "missing_network.h" #include "netlink-util.h" #include "network-internal.h" -#include "networkd-address-label.h" #include "networkd-address.h" +#include "networkd-address-label.h" #include "networkd-bridge-fdb.h" #include "networkd-bridge-mdb.h" #include "networkd-bridge-vlan.h" @@ -45,8 +44,8 @@ #include "networkd-ipv4acd.h" #include "networkd-ipv4ll.h" #include "networkd-ipv6-proxy-ndp.h" -#include "networkd-link-bus.h" #include "networkd-link.h" +#include "networkd-link-bus.h" #include "networkd-lldp-tx.h" #include "networkd-manager.h" #include "networkd-ndisc.h" @@ -54,8 +53,8 @@ #include "networkd-nexthop.h" #include "networkd-queue.h" #include "networkd-radv.h" -#include "networkd-route-util.h" #include "networkd-route.h" +#include "networkd-route-util.h" #include "networkd-routing-policy-rule.h" #include "networkd-setlink.h" #include "networkd-sriov.h" diff --git a/src/network/networkd-link.h b/src/network/networkd-link.h index b35f86e918e..acfbf75028b 100644 --- a/src/network/networkd-link.h +++ b/src/network/networkd-link.h @@ -14,8 +14,8 @@ #include "sd-lldp-rx.h" #include "sd-lldp-tx.h" #include "sd-ndisc.h" -#include "sd-radv.h" #include "sd-netlink.h" +#include "sd-radv.h" #include "ether-addr-util.h" #include "log-link.h" diff --git a/src/network/networkd-manager-bus.c b/src/network/networkd-manager-bus.c index 29e58952550..c9a61d96ad8 100644 --- a/src/network/networkd-manager-bus.c +++ b/src/network/networkd-manager-bus.c @@ -12,10 +12,10 @@ #include "networkd-dhcp4-bus.h" #include "networkd-dhcp6-bus.h" #include "networkd-json.h" -#include "networkd-link-bus.h" #include "networkd-link.h" -#include "networkd-manager-bus.h" +#include "networkd-link-bus.h" #include "networkd-manager.h" +#include "networkd-manager-bus.h" #include "networkd-network-bus.h" #include "path-util.h" #include "strv.h" diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c index cae5c129ebf..f4e8c41a764 100644 --- a/src/network/networkd-manager.c +++ b/src/network/networkd-manager.c @@ -1,12 +1,12 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include -#include -#include -#include #include +#include #include #include +#include +#include +#include #include "sd-netlink.h" @@ -34,9 +34,9 @@ #include "mount-util.h" #include "netlink-util.h" #include "network-internal.h" +#include "networkd-address.h" #include "networkd-address-label.h" #include "networkd-address-pool.h" -#include "networkd-address.h" #include "networkd-dhcp-server-bus.h" #include "networkd-dhcp6.h" #include "networkd-link-bus.h" diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c index f0065befd57..9063c8baa98 100644 --- a/src/network/networkd-ndisc.c +++ b/src/network/networkd-ndisc.c @@ -4,17 +4,17 @@ ***/ #include -#include #include #include +#include #include "sd-ndisc.h" #include "event-util.h" #include "missing_network.h" #include "ndisc-router-internal.h" -#include "networkd-address-generation.h" #include "networkd-address.h" +#include "networkd-address-generation.h" #include "networkd-dhcp6.h" #include "networkd-manager.h" #include "networkd-ndisc.h" diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c index 03e91dccd48..db21d51b2f4 100644 --- a/src/network/networkd-network.c +++ b/src/network/networkd-network.c @@ -1,9 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -/* Make sure the net/if.h header is included before any linux/ one */ +#include #include #include -#include #include #include "alloc-util.h" @@ -16,8 +15,8 @@ #include "net-condition.h" #include "netdev/macvlan.h" #include "network-util.h" -#include "networkd-address-label.h" #include "networkd-address.h" +#include "networkd-address-label.h" #include "networkd-bridge-fdb.h" #include "networkd-bridge-mdb.h" #include "networkd-dhcp-common.h" diff --git a/src/network/networkd-nexthop.c b/src/network/networkd-nexthop.c index d61ff6f4f28..51ee49ae38f 100644 --- a/src/network/networkd-nexthop.c +++ b/src/network/networkd-nexthop.c @@ -2,9 +2,8 @@ * Copyright © 2019 VMware, Inc. */ -/* Make sure the net/if.h header is included before any linux/ one */ -#include #include +#include #include "alloc-util.h" #include "netlink-util.h" diff --git a/src/network/networkd-radv.c b/src/network/networkd-radv.c index 5e838028f24..b3fc77fa0fc 100644 --- a/src/network/networkd-radv.c +++ b/src/network/networkd-radv.c @@ -3,13 +3,13 @@ Copyright © 2017 Intel Corporation. All rights reserved. ***/ -#include #include +#include #include "dns-domain.h" #include "ndisc-router-internal.h" -#include "networkd-address-generation.h" #include "networkd-address.h" +#include "networkd-address-generation.h" #include "networkd-dhcp-prefix-delegation.h" #include "networkd-link.h" #include "networkd-manager.h" @@ -19,8 +19,8 @@ #include "networkd-route-util.h" #include "parse-util.h" #include "radv-internal.h" -#include "string-util.h" #include "string-table.h" +#include "string-util.h" #include "strv.h" bool link_radv_enabled(Link *link) { diff --git a/src/network/networkd-radv.h b/src/network/networkd-radv.h index 23af8a2ba5b..f3367174452 100644 --- a/src/network/networkd-radv.h +++ b/src/network/networkd-radv.h @@ -10,8 +10,8 @@ #include "sd-radv.h" -#include "in-addr-util.h" #include "conf-parser.h" +#include "in-addr-util.h" #include "ndisc-option.h" #include "networkd-util.h" diff --git a/src/network/networkd-route-util.c b/src/network/networkd-route-util.c index 90fba7a5408..2512abf1527 100644 --- a/src/network/networkd-route-util.c +++ b/src/network/networkd-route-util.c @@ -9,8 +9,8 @@ #include "networkd-address.h" #include "networkd-link.h" #include "networkd-manager.h" -#include "networkd-route-util.h" #include "networkd-route.h" +#include "networkd-route-util.h" #include "parse-util.h" #include "string-table.h" #include "string-util.h" diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c index 67c5d5ae8e8..ab56e6f5dc2 100644 --- a/src/network/networkd-route.c +++ b/src/network/networkd-route.c @@ -13,8 +13,8 @@ #include "networkd-network.h" #include "networkd-nexthop.h" #include "networkd-queue.h" -#include "networkd-route-util.h" #include "networkd-route.h" +#include "networkd-route-util.h" #include "parse-util.h" #include "string-util.h" #include "strv.h" diff --git a/src/network/networkd-routing-policy-rule.c b/src/network/networkd-routing-policy-rule.c index 7c9bd6d0eac..819cb69f338 100644 --- a/src/network/networkd-routing-policy-rule.c +++ b/src/network/networkd-routing-policy-rule.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 #include +#include #include "af-list.h" #include "alloc-util.h" diff --git a/src/network/networkd-setlink.c b/src/network/networkd-setlink.c index 857f1019784..9c4dbc74f75 100644 --- a/src/network/networkd-setlink.c +++ b/src/network/networkd-setlink.c @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include #include #include #include +#include #include "device-private.h" #include "missing_network.h" diff --git a/src/network/networkd-speed-meter.c b/src/network/networkd-speed-meter.c index cf8294ef955..cc94673d767 100644 --- a/src/network/networkd-speed-meter.c +++ b/src/network/networkd-speed-meter.c @@ -5,8 +5,8 @@ #include "sd-event.h" #include "sd-netlink.h" -#include "networkd-link-bus.h" #include "networkd-link.h" +#include "networkd-link-bus.h" #include "networkd-manager.h" #include "networkd-speed-meter.h" diff --git a/src/network/networkd-state-file.c b/src/network/networkd-state-file.c index 7c028dddbd7..52836fdf4c9 100644 --- a/src/network/networkd-state-file.c +++ b/src/network/networkd-state-file.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include +#include #include "alloc-util.h" #include "dns-domain.h" @@ -13,8 +13,8 @@ #include "network-internal.h" #include "networkd-dhcp-common.h" #include "networkd-link.h" -#include "networkd-manager-bus.h" #include "networkd-manager.h" +#include "networkd-manager-bus.h" #include "networkd-network.h" #include "networkd-ntp.h" #include "networkd-state-file.h" diff --git a/src/network/networkd-sysctl.c b/src/network/networkd-sysctl.c index d9ee26abf83..b03e64b8e5e 100644 --- a/src/network/networkd-sysctl.c +++ b/src/network/networkd-sysctl.c @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include #include +#include #include "sd-messages.h" @@ -26,7 +26,6 @@ #if HAVE_VMLINUX_H #include "bpf-link.h" - #include "bpf/sysctl_monitor/sysctl-monitor-skel.h" #include "bpf/sysctl_monitor/sysctl-write-event.h" diff --git a/src/network/networkd-wifi.c b/src/network/networkd-wifi.c index bc1d79adcef..35357830be7 100644 --- a/src/network/networkd-wifi.c +++ b/src/network/networkd-wifi.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include +#include #include "ether-addr-util.h" #include "netlink-util.h" diff --git a/src/network/networkd-wiphy.c b/src/network/networkd-wiphy.c index 798531f8e65..ca50c52f8eb 100644 --- a/src/network/networkd-wiphy.c +++ b/src/network/networkd-wiphy.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include +#include #include "device-private.h" #include "device-util.h" diff --git a/src/network/networkd.c b/src/network/networkd.c index 2e1b242da24..2060e6b2fa3 100644 --- a/src/network/networkd.c +++ b/src/network/networkd.c @@ -14,8 +14,8 @@ #include "main-func.h" #include "mkdir-label.h" #include "networkd-conf.h" -#include "networkd-manager-bus.h" #include "networkd-manager.h" +#include "networkd-manager-bus.h" #include "networkd-serialize.h" #include "service-util.h" #include "signal-util.h" diff --git a/src/network/tc/htb.c b/src/network/tc/htb.c index 39f436a804d..1dbad284643 100644 --- a/src/network/tc/htb.c +++ b/src/network/tc/htb.c @@ -4,11 +4,11 @@ #include "alloc-util.h" #include "conf-parser.h" +#include "htb.h" #include "netlink-util.h" #include "networkd-link.h" #include "parse-util.h" #include "qdisc.h" -#include "htb.h" #include "string-util.h" #include "tc-util.h" diff --git a/src/network/tc/pie.c b/src/network/tc/pie.c index c482f19787a..8a0fa4a8cf2 100644 --- a/src/network/tc/pie.c +++ b/src/network/tc/pie.c @@ -5,9 +5,9 @@ #include "alloc-util.h" #include "conf-parser.h" -#include "pie.h" #include "netlink-util.h" #include "parse-util.h" +#include "pie.h" #include "string-util.h" static int pie_fill_message(Link *link, QDisc *qdisc, sd_netlink_message *req) { diff --git a/src/network/tc/qdisc.c b/src/network/tc/qdisc.c index 3b7bcfd48a0..401c9fe8e68 100644 --- a/src/network/tc/qdisc.c +++ b/src/network/tc/qdisc.c @@ -4,39 +4,38 @@ #include #include "alloc-util.h" -#include "conf-parser.h" -#include "in-addr-util.h" -#include "netlink-util.h" -#include "networkd-link.h" -#include "networkd-manager.h" -#include "networkd-network.h" -#include "networkd-queue.h" -#include "parse-util.h" -#include "qdisc.h" -#include "set.h" -#include "string-util.h" -#include "strv.h" -#include "tc-util.h" - #include "cake.h" #include "codel.h" +#include "conf-parser.h" +#include "drr.h" #include "ets.h" #include "fifo.h" +#include "fq.h" #include "fq-codel.h" #include "fq-pie.h" -#include "fq.h" #include "gred.h" #include "hhf.h" #include "htb.h" +#include "in-addr-util.h" #include "mq.h" #include "multiq.h" +#include "netem.h" +#include "netlink-util.h" +#include "networkd-link.h" +#include "networkd-manager.h" +#include "networkd-network.h" +#include "networkd-queue.h" +#include "parse-util.h" #include "pie.h" +#include "qdisc.h" #include "qfq.h" -#include "netem.h" -#include "drr.h" +#include "set.h" #include "sfb.h" #include "sfq.h" +#include "string-util.h" +#include "strv.h" #include "tbf.h" +#include "tc-util.h" #include "teql.h" const QDiscVTable * const qdisc_vtable[_QDISC_KIND_MAX] = { diff --git a/src/network/tc/tclass.c b/src/network/tc/tclass.c index e156a7f1cf0..61ba42e45fe 100644 --- a/src/network/tc/tclass.c +++ b/src/network/tc/tclass.c @@ -5,6 +5,8 @@ #include "alloc-util.h" #include "conf-parser.h" +#include "drr.h" +#include "htb.h" #include "in-addr-util.h" #include "netlink-util.h" #include "networkd-link.h" @@ -12,16 +14,13 @@ #include "networkd-network.h" #include "networkd-queue.h" #include "parse-util.h" +#include "qfq.h" #include "set.h" #include "string-util.h" #include "strv.h" #include "tc-util.h" #include "tclass.h" -#include "drr.h" -#include "htb.h" -#include "qfq.h" - const TClassVTable * const tclass_vtable[_TCLASS_KIND_MAX] = { [TCLASS_KIND_DRR] = &drr_tclass_vtable, [TCLASS_KIND_HTB] = &htb_tclass_vtable, diff --git a/src/network/test-network-tables.c b/src/network/test-network-tables.c index f4e14c6d9b3..2939f344bae 100644 --- a/src/network/test-network-tables.c +++ b/src/network/test-network-tables.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 #include +#include #include "bond.h" #include "dhcp6-internal.h" diff --git a/src/network/wait-online/manager.c b/src/network/wait-online/manager.c index 597598abc6b..df8f695b1e2 100644 --- a/src/network/wait-online/manager.c +++ b/src/network/wait-online/manager.c @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include -#include #include +#include +#include #include "sd-event.h" #include "sd-json.h" diff --git a/src/nspawn/nspawn-bind-user.h b/src/nspawn/nspawn-bind-user.h index 4352ce0ab20..1ee0597b412 100644 --- a/src/nspawn/nspawn-bind-user.h +++ b/src/nspawn/nspawn-bind-user.h @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "user-record.h" #include "group-record.h" #include "nspawn-mount.h" +#include "user-record.h" typedef struct BindUserData { /* The host's user/group records */ diff --git a/src/nspawn/nspawn-mount.c b/src/nspawn/nspawn-mount.c index a6c99c83c6f..075cf3d45ac 100644 --- a/src/nspawn/nspawn-mount.c +++ b/src/nspawn/nspawn-mount.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include +#include #include "alloc-util.h" #include "chase.h" diff --git a/src/nspawn/nspawn-network.c b/src/nspawn/nspawn-network.c index 928b8c5d411..bd6c9f1fc5e 100644 --- a/src/nspawn/nspawn-network.c +++ b/src/nspawn/nspawn-network.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 #include #include #include +#include #include #include diff --git a/src/nspawn/nspawn-stub-pid1.c b/src/nspawn/nspawn-stub-pid1.c index 47f7155b195..6a64aea5115 100644 --- a/src/nspawn/nspawn-stub-pid1.c +++ b/src/nspawn/nspawn-stub-pid1.c @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include +#include #include #include -#include #include #include "argv-util.h" diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index 6d4aaf872a3..b1eeef335df 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -2,6 +2,7 @@ #include #include +#include #include #include #include @@ -15,14 +16,11 @@ #include #include -#include /* Must be included after */ - #include "sd-bus.h" #include "sd-daemon.h" #include "sd-id128.h" #include "alloc-util.h" -#include "ether-addr-util.h" #include "barrier.h" #include "base-filesystem.h" #include "btrfs-util.h" @@ -45,6 +43,7 @@ #include "dissect-image.h" #include "env-util.h" #include "escape.h" +#include "ether-addr-util.h" #include "fd-util.h" #include "fdset.h" #include "fileio.h" @@ -67,6 +66,7 @@ #include "mountpoint-util.h" #include "namespace-util.h" #include "notify-recv.h" +#include "nspawn.h" #include "nspawn-bind-user.h" #include "nspawn-cgroup.h" #include "nspawn-expose-ports.h" @@ -78,7 +78,6 @@ #include "nspawn-settings.h" #include "nspawn-setuid.h" #include "nspawn-stub-pid1.h" -#include "nspawn.h" #include "nsresource.h" #include "nulstr-util.h" #include "os-util.h" diff --git a/src/nsresourced/bpf/userns_restrict/userns-restrict.bpf.c b/src/nsresourced/bpf/userns_restrict/userns-restrict.bpf.c index 8d75339b4bc..f327e9004b3 100644 --- a/src/nsresourced/bpf/userns_restrict/userns-restrict.bpf.c +++ b/src/nsresourced/bpf/userns_restrict/userns-restrict.bpf.c @@ -15,10 +15,10 @@ #include "vmlinux.h" +#include +#include #include #include -#include -#include #ifndef bpf_core_cast /* bpf_rdonly_cast() was introduced in libbpf commit 688879f together with diff --git a/src/nsresourced/nsresourced.c b/src/nsresourced/nsresourced.c index 70568972430..07df95b4d7b 100644 --- a/src/nsresourced/nsresourced.c +++ b/src/nsresourced/nsresourced.c @@ -4,9 +4,9 @@ #include #include "daemon-util.h" -#include "nsresourced-manager.h" #include "log.h" #include "main-func.h" +#include "nsresourced-manager.h" #include "signal-util.h" static int run(int argc, char *argv[]) { diff --git a/src/nsresourced/nsresourcework.c b/src/nsresourced/nsresourcework.c index 0e23ebeec7f..26ea1d066e7 100644 --- a/src/nsresourced/nsresourcework.c +++ b/src/nsresourced/nsresourcework.c @@ -1,12 +1,10 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -/* Make sure the net/if.h header is included before any linux/ one */ -#include - #include #include #include #include +#include #include #include #include @@ -41,8 +39,8 @@ #include "time-util.h" #include "uid-classification.h" #include "uid-range.h" -#include "user-record-nss.h" #include "user-record.h" +#include "user-record-nss.h" #include "user-util.h" #include "userdb.h" #include "userns-registry.h" diff --git a/src/nss-systemd/nss-systemd.c b/src/nss-systemd/nss-systemd.c index b7a71d7bb14..474b8d45cf6 100644 --- a/src/nss-systemd/nss-systemd.c +++ b/src/nss-systemd/nss-systemd.c @@ -17,8 +17,8 @@ #include "strv.h" #include "user-record-nss.h" #include "user-util.h" -#include "userdb-glue.h" #include "userdb.h" +#include "userdb-glue.h" static const struct passwd root_passwd = { .pw_name = (char*) "root", diff --git a/src/nss-systemd/userdb-glue.c b/src/nss-systemd/userdb-glue.c index 110235bb4ae..c522c264bc9 100644 --- a/src/nss-systemd/userdb-glue.c +++ b/src/nss-systemd/userdb-glue.c @@ -4,11 +4,11 @@ #include "fd-util.h" #include "nss-systemd.h" #include "strv.h" -#include "user-record-nss.h" #include "user-record.h" +#include "user-record-nss.h" #include "user-util.h" -#include "userdb-glue.h" #include "userdb.h" +#include "userdb-glue.h" UserDBFlags nss_glue_userdb_flags(void) { UserDBFlags flags = USERDB_EXCLUDE_NSS; diff --git a/src/nss-systemd/userdb-glue.h b/src/nss-systemd/userdb-glue.h index 386cc88955d..ed4c5ec546a 100644 --- a/src/nss-systemd/userdb-glue.h +++ b/src/nss-systemd/userdb-glue.h @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once +#include #include #include -#include #include #include "userdb.h" diff --git a/src/oom/oomd-manager-bus.c b/src/oom/oomd-manager-bus.c index 77bd31e4e7a..b406bc94e8a 100644 --- a/src/oom/oomd-manager-bus.c +++ b/src/oom/oomd-manager-bus.c @@ -6,8 +6,8 @@ #include "bus-polkit.h" #include "fd-util.h" #include "memfd-util.h" -#include "oomd-manager-bus.h" #include "oomd-manager.h" +#include "oomd-manager-bus.h" #include "user-util.h" static int bus_method_dump_by_fd(sd_bus_message *message, void *userdata, sd_bus_error *error) { diff --git a/src/oom/oomd-manager.c b/src/oom/oomd-manager.c index 352d558281c..dcec133d6f1 100644 --- a/src/oom/oomd-manager.c +++ b/src/oom/oomd-manager.c @@ -15,8 +15,8 @@ #include "memory-util.h" #include "memstream-util.h" #include "oomd-conf.h" -#include "oomd-manager-bus.h" #include "oomd-manager.h" +#include "oomd-manager-bus.h" #include "path-util.h" #include "percent-util.h" #include "varlink-io.systemd.oom.h" diff --git a/src/oom/oomd.c b/src/oom/oomd.c index a75528f7e01..f49accd7791 100644 --- a/src/oom/oomd.c +++ b/src/oom/oomd.c @@ -12,8 +12,8 @@ #include "log.h" #include "main-func.h" #include "oomd-conf.h" -#include "oomd-manager-bus.h" #include "oomd-manager.h" +#include "oomd-manager-bus.h" #include "parse-util.h" #include "pretty-print.h" #include "psi-util.h" diff --git a/src/portable/portable.c b/src/portable/portable.c index 9536cd9846b..763f283bb4a 100644 --- a/src/portable/portable.c +++ b/src/portable/portable.c @@ -9,9 +9,9 @@ #include "bus-locator.h" #include "chase.h" #include "conf-files.h" +#include "constants.h" #include "copy.h" #include "data-fd-util.h" -#include "constants.h" #include "dirent-util.h" #include "discover-image.h" #include "dissect-image.h" diff --git a/src/portable/portabled-bus.c b/src/portable/portabled-bus.c index 1302e5d8937..f313ce37ca9 100644 --- a/src/portable/portabled-bus.c +++ b/src/portable/portabled-bus.c @@ -9,10 +9,10 @@ #include "fd-util.h" #include "io-util.h" #include "portable.h" +#include "portabled.h" #include "portabled-bus.h" -#include "portabled-image-bus.h" #include "portabled-image.h" -#include "portabled.h" +#include "portabled-image-bus.h" #include "strv.h" #include "user-util.h" diff --git a/src/portable/portabled-image-bus.c b/src/portable/portabled-image-bus.c index be0ea536235..6a35262e6d0 100644 --- a/src/portable/portabled-image-bus.c +++ b/src/portable/portabled-image-bus.c @@ -18,10 +18,10 @@ #include "io-util.h" #include "os-util.h" #include "portable.h" +#include "portabled.h" #include "portabled-bus.h" -#include "portabled-image-bus.h" #include "portabled-image.h" -#include "portabled.h" +#include "portabled-image-bus.h" #include "process-util.h" #include "strv.h" #include "user-util.h" diff --git a/src/portable/portabled-image.c b/src/portable/portabled-image.c index 50e0e7a99cb..f14d1a69efd 100644 --- a/src/portable/portabled-image.c +++ b/src/portable/portabled-image.c @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "portable.h" -#include "portabled-image.h" #include "portabled.h" +#include "portabled-image.h" Image *manager_image_cache_get(Manager *m, const char *name_or_path) { assert(m); diff --git a/src/portable/portabled.c b/src/portable/portabled.c index 6d7c3b534f4..75872d51fe8 100644 --- a/src/portable/portabled.c +++ b/src/portable/portabled.c @@ -12,9 +12,9 @@ #include "constants.h" #include "daemon-util.h" #include "main-func.h" +#include "portabled.h" #include "portabled-bus.h" #include "portabled-image-bus.h" -#include "portabled.h" #include "process-util.h" #include "service-util.h" #include "signal-util.h" diff --git a/src/pstore/pstore.c b/src/pstore/pstore.c index bf1906ced8e..b941c7e9102 100644 --- a/src/pstore/pstore.c +++ b/src/pstore/pstore.c @@ -38,8 +38,8 @@ #include "process-util.h" #include "signal-util.h" #include "socket-util.h" -#include "special.h" #include "sort-util.h" +#include "special.h" #include "string-table.h" #include "string-util.h" #include "strv.h" diff --git a/src/random-seed/random-seed.c b/src/random-seed/random-seed.c index 4d458646a03..3ddaea04a32 100644 --- a/src/random-seed/random-seed.c +++ b/src/random-seed/random-seed.c @@ -24,10 +24,10 @@ #include "parse-util.h" #include "pretty-print.h" #include "random-util.h" +#include "sha256.h" #include "string-table.h" #include "string-util.h" #include "sync-util.h" -#include "sha256.h" #include "xattr-util.h" typedef enum SeedAction { diff --git a/src/reply-password/reply-password.c b/src/reply-password/reply-password.c index ce4582afe86..93fbf11f912 100644 --- a/src/reply-password/reply-password.c +++ b/src/reply-password/reply-password.c @@ -5,11 +5,11 @@ #include #include "alloc-util.h" -#include "main-func.h" #include "fd-util.h" #include "fileio.h" #include "log.h" #include "macro.h" +#include "main-func.h" #include "memory-util.h" #include "socket-util.h" #include "string-util.h" diff --git a/src/resolve/dns-type.c b/src/resolve/dns-type.c index 197fb8a3611..4cce7130c07 100644 --- a/src/resolve/dns-type.c +++ b/src/resolve/dns-type.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include +#include #include "dns-type.h" #include "parse-util.h" diff --git a/src/resolve/resolved-bus.c b/src/resolve/resolved-bus.c index 3824401918e..23dad7f9cf4 100644 --- a/src/resolve/resolved-bus.c +++ b/src/resolve/resolved-bus.c @@ -29,8 +29,8 @@ #include "resolved-dns-synthesize.h" #include "resolved-dns-transaction.h" #include "resolved-dns-trust-anchor.h" -#include "resolved-dnssd-bus.h" #include "resolved-dnssd.h" +#include "resolved-dnssd-bus.h" #include "resolved-link.h" #include "resolved-link-bus.h" #include "resolved-manager.h" diff --git a/src/resolve/resolved-dns-scope.c b/src/resolve/resolved-dns-scope.c index b76bc710fa8..50f290a8d86 100644 --- a/src/resolve/resolved-dns-scope.c +++ b/src/resolve/resolved-dns-scope.c @@ -11,7 +11,6 @@ #include "hostname-util.h" #include "missing_network.h" #include "random-util.h" -#include "resolved-dnssd.h" #include "resolved-dns-answer.h" #include "resolved-dns-packet.h" #include "resolved-dns-query.h" @@ -23,6 +22,7 @@ #include "resolved-dns-synthesize.h" #include "resolved-dns-transaction.h" #include "resolved-dns-zone.h" +#include "resolved-dnssd.h" #include "resolved-link.h" #include "resolved-llmnr.h" #include "resolved-manager.h" diff --git a/src/resolve/resolved-dns-stream.h b/src/resolve/resolved-dns-stream.h index 8098e994bcb..fe661d5cee2 100644 --- a/src/resolve/resolved-dns-stream.h +++ b/src/resolve/resolved-dns-stream.h @@ -5,8 +5,8 @@ #include "list.h" #include "ordered-set.h" -#include "resolved-dnstls.h" #include "resolved-dns-packet.h" +#include "resolved-dnstls.h" #include "socket-util.h" typedef struct DnsPacket DnsPacket; diff --git a/src/resolve/resolved-dnssd-bus.c b/src/resolve/resolved-dnssd-bus.c index 844b85ce0a1..0f97eae05ac 100644 --- a/src/resolve/resolved-dnssd-bus.c +++ b/src/resolve/resolved-dnssd-bus.c @@ -3,8 +3,8 @@ #include "alloc-util.h" #include "bus-polkit.h" #include "resolved-dns-scope.h" -#include "resolved-dnssd-bus.h" #include "resolved-dnssd.h" +#include "resolved-dnssd-bus.h" #include "resolved-link.h" #include "resolved-manager.h" #include "strv.h" diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c index 174db4dcc50..78b14ea3bf5 100644 --- a/src/resolve/resolved-manager.c +++ b/src/resolve/resolved-manager.c @@ -53,8 +53,8 @@ #include "resolved-socket-graveyard.h" #include "resolved-util.h" #include "resolved-varlink.h" -#include "socket-util.h" #include "socket-netlink.h" +#include "socket-util.h" #include "string-table.h" #include "string-util.h" #include "utf8.h" diff --git a/src/resolve/resolved-mdns.c b/src/resolve/resolved-mdns.c index 19275d9d34a..d9a993a0014 100644 --- a/src/resolve/resolved-mdns.c +++ b/src/resolve/resolved-mdns.c @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include -#include #include +#include +#include #include "alloc-util.h" #include "dns-domain.h" diff --git a/src/resolve/resolved-timeouts.h b/src/resolve/resolved-timeouts.h index e17fe301756..717bccca4a2 100644 --- a/src/resolve/resolved-timeouts.h +++ b/src/resolve/resolved-timeouts.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "time-util.h" #include "resolved-def.h" +#include "time-util.h" /* LLMNR Jitter interval, see RFC 4795 Section 7 */ #define LLMNR_JITTER_INTERVAL_USEC (100 * USEC_PER_MSEC) diff --git a/src/resolve/test-dns-answer.c b/src/resolve/test-dns-answer.c index 8d8e7529ecc..7f59e666bca 100644 --- a/src/resolve/test-dns-answer.c +++ b/src/resolve/test-dns-answer.c @@ -1,15 +1,13 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "dns-type.h" -#include "resolved-dns-answer.h" -#include "resolved-dns-rr.h" - -#include "log.h" -#include "tests.h" - #include "fd-util.h" #include "fileio.h" #include "fs-util.h" +#include "log.h" +#include "resolved-dns-answer.h" +#include "resolved-dns-rr.h" +#include "tests.h" #include "tmpfile-util.h" /* ================================================================ diff --git a/src/resolve/test-dns-packet-append.c b/src/resolve/test-dns-packet-append.c index df311286a33..99bf0b7615b 100644 --- a/src/resolve/test-dns-packet-append.c +++ b/src/resolve/test-dns-packet-append.c @@ -1,13 +1,12 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "dns-type.h" +#include "list.h" +#include "log.h" #include "resolved-dns-answer.h" #include "resolved-dns-packet.h" #include "resolved-dns-question.h" #include "resolved-dns-rr.h" - -#include "list.h" -#include "log.h" #include "tests.h" #define BIT_QR (1 << 7) diff --git a/src/resolve/test-dns-packet-extract.c b/src/resolve/test-dns-packet-extract.c index c63484578b4..64bbd6241db 100644 --- a/src/resolve/test-dns-packet-extract.c +++ b/src/resolve/test-dns-packet-extract.c @@ -1,12 +1,11 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "dns-type.h" +#include "log.h" #include "resolved-dns-answer.h" #include "resolved-dns-packet.h" #include "resolved-dns-question.h" #include "resolved-dns-rr.h" - -#include "log.h" #include "tests.h" #define BIT_QR (1 << 7) diff --git a/src/resolve/test-dns-packet.c b/src/resolve/test-dns-packet.c index ca09b0840c5..fca52bcf61e 100644 --- a/src/resolve/test-dns-packet.c +++ b/src/resolve/test-dns-packet.c @@ -9,9 +9,9 @@ #include "glob-util.h" #include "log.h" #include "macro.h" +#include "path-util.h" #include "resolved-dns-packet.h" #include "resolved-dns-rr.h" -#include "path-util.h" #include "string-util.h" #include "strv.h" #include "tests.h" diff --git a/src/resolve/test-dns-question.c b/src/resolve/test-dns-question.c index a621aeeca2b..27e907463ae 100644 --- a/src/resolve/test-dns-question.c +++ b/src/resolve/test-dns-question.c @@ -1,15 +1,13 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "dns-type.h" -#include "resolved-dns-question.h" -#include "resolved-dns-rr.h" - -#include "log.h" -#include "tests.h" - #include "fd-util.h" #include "fileio.h" #include "fs-util.h" +#include "log.h" +#include "resolved-dns-question.h" +#include "resolved-dns-rr.h" +#include "tests.h" #include "tmpfile-util.h" /* ================================================================ diff --git a/src/resolve/test-dns-rr.c b/src/resolve/test-dns-rr.c index 5fcd3aad4f4..8b8f9566135 100644 --- a/src/resolve/test-dns-rr.c +++ b/src/resolve/test-dns-rr.c @@ -1,10 +1,9 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "dns-type.h" +#include "log.h" #include "resolved-dns-packet.h" #include "resolved-dns-rr.h" - -#include "log.h" #include "tests.h" /* ================================================================ diff --git a/src/resolve/test-dns-search-domain.c b/src/resolve/test-dns-search-domain.c index e73e4d99865..b1229dc916c 100644 --- a/src/resolve/test-dns-search-domain.c +++ b/src/resolve/test-dns-search-domain.c @@ -1,10 +1,9 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include "log.h" #include "resolved-dns-search-domain.h" #include "resolved-link.h" #include "resolved-manager.h" - -#include "log.h" #include "tests.h" static void check_domains(DnsSearchDomain *head, const char **expected, size_t n) { diff --git a/src/resolve/test-dns-zone.c b/src/resolve/test-dns-zone.c index b1cfbb697a9..0023f0bf939 100644 --- a/src/resolve/test-dns-zone.c +++ b/src/resolve/test-dns-zone.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "dns-type.h" +#include "log.h" #include "resolved-dns-answer.h" #include "resolved-dns-packet.h" #include "resolved-dns-rr.h" @@ -8,8 +9,6 @@ #include "resolved-dns-zone.h" #include "resolved-link.h" #include "resolved-manager.h" - -#include "log.h" #include "tests.h" static void dns_scope_freep(DnsScope **s) { diff --git a/src/resolve/test-resolved-link.c b/src/resolve/test-resolved-link.c index 3f6af5d3242..0336c73aa9c 100644 --- a/src/resolve/test-resolved-link.c +++ b/src/resolve/test-resolved-link.c @@ -1,16 +1,15 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include +#include +#include "log.h" #include "netlink-internal.h" #include "resolved-dns-packet.h" #include "resolved-dns-scope.h" #include "resolved-dns-server.h" #include "resolved-link.h" #include "resolved-manager.h" - -#include "log.h" #include "tests.h" DEFINE_TRIVIAL_CLEANUP_FUNC(LinkAddress*, link_address_free); diff --git a/src/resolve/test-resolved-stream.c b/src/resolve/test-resolved-stream.c index 27b3603e2c7..ef5c2763ec1 100644 --- a/src/resolve/test-resolved-stream.c +++ b/src/resolve/test-resolved-stream.c @@ -14,6 +14,8 @@ #include #include +#include "sd-event.h" + #include "fd-util.h" #include "log.h" #include "macro.h" @@ -23,11 +25,10 @@ #include "resolved-dns-packet.h" #include "resolved-dns-question.h" #include "resolved-dns-rr.h" -#include "resolved-dnstls.h" #include "resolved-dns-server.h" #include "resolved-dns-stream.h" +#include "resolved-dnstls.h" #include "resolved-manager.h" -#include "sd-event.h" #include "sparse-endian.h" #include "tests.h" diff --git a/src/run/run.c b/src/run/run.c index 5464f6af9aa..e2b6c98e03a 100644 --- a/src/run/run.c +++ b/src/run/run.c @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include #include -#include #include #include diff --git a/src/shared/barrier.h b/src/shared/barrier.h index e108aebeb2d..d9e185646f2 100644 --- a/src/shared/barrier.h +++ b/src/shared/barrier.h @@ -5,8 +5,8 @@ #include #include -#include "memory-util.h" #include "macro.h" +#include "memory-util.h" /* See source file for an API description. */ diff --git a/src/shared/battery-util.c b/src/shared/battery-util.c index 37b3f6a6ea3..c300194961c 100644 --- a/src/shared/battery-util.c +++ b/src/shared/battery-util.c @@ -2,10 +2,10 @@ #include "sd-device.h" +#include "battery-util.h" #include "device-private.h" #include "device-util.h" #include "string-util.h" -#include "battery-util.h" #define BATTERY_LOW_CAPACITY_LEVEL 5 diff --git a/src/shared/bond-util.h b/src/shared/bond-util.h index 58be49788e8..557912c73fe 100644 --- a/src/shared/bond-util.h +++ b/src/shared/bond-util.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include #include +#include #include "macro.h" diff --git a/src/shared/bootspec.c b/src/shared/bootspec.c index 6635076b23d..7bdb32192aa 100644 --- a/src/shared/bootspec.c +++ b/src/shared/bootspec.c @@ -2,8 +2,8 @@ #include -#include "bootspec-fundamental.h" #include "bootspec.h" +#include "bootspec-fundamental.h" #include "chase.h" #include "conf-files.h" #include "devnum-util.h" diff --git a/src/shared/bpf-dlopen.c b/src/shared/bpf-dlopen.c index 87b13615c19..c5abd2ef3b4 100644 --- a/src/shared/bpf-dlopen.c +++ b/src/shared/bpf-dlopen.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include "dlfcn-util.h" #include "bpf-dlopen.h" +#include "dlfcn-util.h" #include "log.h" #include "strv.h" diff --git a/src/shared/bpf-link.h b/src/shared/bpf-link.h index c66bf38eaeb..402327a5a3d 100644 --- a/src/shared/bpf-link.h +++ b/src/shared/bpf-link.h @@ -2,8 +2,8 @@ #pragma once -#include #include +#include #include "fdset.h" #include "macro.h" diff --git a/src/shared/bridge-util.h b/src/shared/bridge-util.h index fcc4d9ada5c..1ea7b93394c 100644 --- a/src/shared/bridge-util.h +++ b/src/shared/bridge-util.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include #include +#include #include "conf-parser.h" diff --git a/src/shared/bus-log-control-api.c b/src/shared/bus-log-control-api.c index 40f99ac2bb2..ad667d0e64a 100644 --- a/src/shared/bus-log-control-api.c +++ b/src/shared/bus-log-control-api.c @@ -1,11 +1,12 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include "sd-bus.h" + #include "alloc-util.h" #include "bus-get-properties.h" #include "bus-log-control-api.h" #include "bus-util.h" #include "log.h" -#include "sd-bus.h" #include "syslog-util.h" int bus_property_get_log_level( diff --git a/src/shared/bus-map-properties.c b/src/shared/bus-map-properties.c index 4f966ccc243..c2af0498ba1 100644 --- a/src/shared/bus-map-properties.c +++ b/src/shared/bus-map-properties.c @@ -2,8 +2,8 @@ #include "alloc-util.h" #include "bus-map-properties.h" -#include "bus-message-util.h" #include "bus-message.h" +#include "bus-message-util.h" #include "bus-util.h" #include "log.h" #include "strv.h" diff --git a/src/shared/bus-print-properties.c b/src/shared/bus-print-properties.c index 2e36f8ed797..88e83497d3c 100644 --- a/src/shared/bus-print-properties.c +++ b/src/shared/bus-print-properties.c @@ -4,8 +4,8 @@ #include "cap-list.h" #include "cgroup-util.h" #include "escape.h" -#include "mountpoint-util.h" #include "log.h" +#include "mountpoint-util.h" #include "nsflags.h" #include "parse-util.h" #include "stdio-util.h" diff --git a/src/shared/bus-wait-for-units.h b/src/shared/bus-wait-for-units.h index f1004ea36a3..29725e9adb5 100644 --- a/src/shared/bus-wait-for-units.h +++ b/src/shared/bus-wait-for-units.h @@ -1,9 +1,10 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once +#include "sd-bus.h" + #include "macro.h" #include "memory-util.h" -#include "sd-bus.h" typedef struct BusWaitForUnits BusWaitForUnits; diff --git a/src/shared/condition.c b/src/shared/condition.c index cc9a65d2674..726f9404893 100644 --- a/src/shared/condition.c +++ b/src/shared/condition.c @@ -41,8 +41,8 @@ #include "glob-util.h" #include "hostname-setup.h" #include "hostname-util.h" -#include "ima-util.h" #include "id128-util.h" +#include "ima-util.h" #include "initrd-util.h" #include "limits-util.h" #include "list.h" diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c index 6ba8adf5c21..2c5d6275a6f 100644 --- a/src/shared/conf-parser.c +++ b/src/shared/conf-parser.c @@ -8,9 +8,11 @@ #include #include +#include "sd-id128.h" + #include "alloc-util.h" -#include "chase.h" #include "calendarspec.h" +#include "chase.h" #include "conf-files.h" #include "conf-parser.h" #include "constants.h" @@ -36,7 +38,6 @@ #include "percent-util.h" #include "process-util.h" #include "rlimit-util.h" -#include "sd-id128.h" #include "set.h" #include "signal-util.h" #include "socket-util.h" diff --git a/src/shared/conf-parser.h b/src/shared/conf-parser.h index d882e2d3202..83bf62cca96 100644 --- a/src/shared/conf-parser.h +++ b/src/shared/conf-parser.h @@ -5,8 +5,8 @@ #include #include #include -#include #include +#include #include "alloc-util.h" #include "hashmap.h" diff --git a/src/shared/efi-api.h b/src/shared/efi-api.h index 61ef91df9fb..bce5275ba07 100644 --- a/src/shared/efi-api.h +++ b/src/shared/efi-api.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "efivars-fundamental.h" #include "efivars.h" +#include "efivars-fundamental.h" #include "string-util.h" /* Various calls for interfacing with EFI variables from the official UEFI specs. */ diff --git a/src/shared/efi-loader.h b/src/shared/efi-loader.h index 48a81daf799..0d924e5dc3a 100644 --- a/src/shared/efi-loader.h +++ b/src/shared/efi-loader.h @@ -3,8 +3,8 @@ #include -#include "efivars-fundamental.h" #include "efivars.h" +#include "efivars-fundamental.h" #include "log.h" /* Various calls that interface with EFI variables implementing https://systemd.io/BOOT_LOADER_INTERFACE */ diff --git a/src/shared/elf-util.c b/src/shared/elf-util.c index f900b082ca3..edc2e82d362 100644 --- a/src/shared/elf-util.c +++ b/src/shared/elf-util.c @@ -16,8 +16,8 @@ #include "elf-util.h" #include "errno-util.h" #include "escape.h" -#include "fileio.h" #include "fd-util.h" +#include "fileio.h" #include "format-util.h" #include "hexdecoct.h" #include "io-util.h" diff --git a/src/shared/elf-util.h b/src/shared/elf-util.h index 8f97f852954..426a05ac42b 100644 --- a/src/shared/elf-util.h +++ b/src/shared/elf-util.h @@ -1,9 +1,10 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "log.h" #include "sd-json.h" +#include "log.h" + #if HAVE_ELFUTILS int dlopen_dw(void); int dlopen_elf(void); diff --git a/src/shared/env-file-label.c b/src/shared/env-file-label.c index 5917b6377f3..7609250605f 100644 --- a/src/shared/env-file-label.c +++ b/src/shared/env-file-label.c @@ -2,8 +2,8 @@ #include -#include "env-file-label.h" #include "env-file.h" +#include "env-file-label.h" #include "selinux-util.h" int write_env_file_label(int dir_fd, const char *fname, char **headers, char **l) { diff --git a/src/shared/ethtool-util.c b/src/shared/ethtool-util.c index 70066b6104a..0dab790305f 100644 --- a/src/shared/ethtool-util.c +++ b/src/shared/ethtool-util.c @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include -#include #include #include #include +#include +#include #include "conf-parser.h" #include "ethtool-util.h" diff --git a/src/shared/ethtool-util.h b/src/shared/ethtool-util.h index 8f67e6e2b60..c363aed23f6 100644 --- a/src/shared/ethtool-util.h +++ b/src/shared/ethtool-util.h @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once +#include #include #include -#include #include "conf-parser.h" #include "ether-addr-util.h" diff --git a/src/shared/exec-util.c b/src/shared/exec-util.c index 22cef5a2003..25d919cac45 100644 --- a/src/shared/exec-util.c +++ b/src/shared/exec-util.c @@ -2,10 +2,10 @@ #include #include +#include #include #include #include -#include #include "alloc-util.h" #include "bitfield.h" diff --git a/src/shared/firewall-util-iptables.c b/src/shared/firewall-util-iptables.c index 2d648acf273..35b4c24e2de 100644 --- a/src/shared/firewall-util-iptables.c +++ b/src/shared/firewall-util-iptables.c @@ -1,17 +1,16 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -/* Make sure the net/if.h header is included before any linux/ one */ -#include #include #include #include -#include -#include +#include #include -#include #include #include -#include +#include +#include +#include +#include #include "alloc-util.h" #include "dlfcn-util.h" diff --git a/src/shared/firewall-util-nft.c b/src/shared/firewall-util-nft.c index 01bc43632bf..410a2d13904 100644 --- a/src/shared/firewall-util-nft.c +++ b/src/shared/firewall-util-nft.c @@ -3,13 +3,13 @@ #include #include #include -#include -#include -#include #include +#include #include #include #include +#include +#include #include "sd-netlink.h" diff --git a/src/shared/install-printf.c b/src/shared/install-printf.c index bdb44b348fb..d62e803a37e 100644 --- a/src/shared/install-printf.c +++ b/src/shared/install-printf.c @@ -5,8 +5,8 @@ #include #include "format-util.h" -#include "install-printf.h" #include "install.h" +#include "install-printf.h" #include "macro.h" #include "specifier.h" #include "string-util.h" diff --git a/src/shared/install.c b/src/shared/install.c index 1f1c66d6d8a..3b370c854de 100644 --- a/src/shared/install.c +++ b/src/shared/install.c @@ -22,8 +22,8 @@ #include "fileio.h" #include "fs-util.h" #include "hashmap.h" -#include "install-printf.h" #include "install.h" +#include "install-printf.h" #include "locale-util.h" #include "log.h" #include "macro.h" diff --git a/src/shared/ipvlan-util.h b/src/shared/ipvlan-util.h index d1bf1afe7b9..ca7b0b40f52 100644 --- a/src/shared/ipvlan-util.h +++ b/src/shared/ipvlan-util.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include #include +#include #include "macro.h" diff --git a/src/shared/journal-importer.h b/src/shared/journal-importer.h index d84dcc4bb0b..50d378f7675 100644 --- a/src/shared/journal-importer.h +++ b/src/shared/journal-importer.h @@ -2,8 +2,8 @@ #pragma once -#include #include +#include #include #include "sd-id128.h" diff --git a/src/shared/kernel-image.c b/src/shared/kernel-image.c index 273120021a4..090281de5e1 100644 --- a/src/shared/kernel-image.c +++ b/src/shared/kernel-image.c @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include "env-file.h" #include "fd-util.h" #include "fileio.h" -#include "env-file.h" #include "kernel-image.h" #include "log.h" #include "os-util.h" diff --git a/src/shared/locale-setup.c b/src/shared/locale-setup.c index 5c4580cffff..f3a10c5d828 100644 --- a/src/shared/locale-setup.c +++ b/src/shared/locale-setup.c @@ -3,8 +3,8 @@ #include #include -#include "env-file-label.h" #include "env-file.h" +#include "env-file-label.h" #include "env-util.h" #include "errno-util.h" #include "fd-util.h" diff --git a/src/shared/loop-util.c b/src/shared/loop-util.c index e312f7c890a..71bc6e725cf 100644 --- a/src/shared/loop-util.c +++ b/src/shared/loop-util.c @@ -23,8 +23,8 @@ #include "env-util.h" #include "errno-util.h" #include "fd-util.h" -#include "fs-util.h" #include "fileio.h" +#include "fs-util.h" #include "loop-util.h" #include "missing_fs.h" #include "parse-util.h" diff --git a/src/shared/machine-credential.c b/src/shared/machine-credential.c index 149cbfa7779..6f02babe144 100644 --- a/src/shared/machine-credential.c +++ b/src/shared/machine-credential.c @@ -6,9 +6,9 @@ #include "extract-word.h" #include "fileio.h" #include "log.h" +#include "machine-credential.h" #include "macro.h" #include "memory-util.h" -#include "machine-credential.h" #include "path-util.h" #include "string-util-fundamental.h" diff --git a/src/shared/mount-util.c b/src/shared/mount-util.c index 25219e56ed4..5f747c209a8 100644 --- a/src/shared/mount-util.c +++ b/src/shared/mount-util.c @@ -1,12 +1,12 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include +#include #include #include #include #include #include -#include #include "alloc-util.h" #include "chase.h" diff --git a/src/shared/netif-naming-scheme.c b/src/shared/netif-naming-scheme.c index 8e05598c5e8..c51e5a01ddd 100644 --- a/src/shared/netif-naming-scheme.c +++ b/src/shared/netif-naming-scheme.c @@ -6,8 +6,8 @@ #include "device-private.h" #include "netif-naming-scheme.h" #include "proc-cmdline.h" -#include "string-util.h" #include "string-table.h" +#include "string-util.h" static const NamingScheme naming_schemes[] = { { "v238", NAMING_V238 }, diff --git a/src/shared/netif-sriov.c b/src/shared/netif-sriov.c index fc851689b09..0948e445c8d 100644 --- a/src/shared/netif-sriov.c +++ b/src/shared/netif-sriov.c @@ -2,8 +2,8 @@ #include "alloc-util.h" #include "device-util.h" -#include "netlink-util.h" #include "netif-sriov.h" +#include "netlink-util.h" #include "parse-util.h" #include "set.h" #include "stdio-util.h" diff --git a/src/shared/openssl-util.c b/src/shared/openssl-util.c index beb09a21514..4bbe708757b 100644 --- a/src/shared/openssl-util.c +++ b/src/shared/openssl-util.c @@ -16,8 +16,8 @@ #include "strv.h" #if HAVE_OPENSSL -# include # include +# include # if !defined(OPENSSL_NO_ENGINE) && !defined(OPENSSL_NO_DEPRECATED_3_0) # include diff --git a/src/shared/output-mode.h b/src/shared/output-mode.h index 5079b84658a..36dc85c175a 100644 --- a/src/shared/output-mode.h +++ b/src/shared/output-mode.h @@ -2,6 +2,7 @@ #pragma once #include "sd-json.h" + #include "macro.h" typedef enum OutputMode { diff --git a/src/shared/pam-util.c b/src/shared/pam-util.c index b83b5482277..8cb4b9b1eb1 100644 --- a/src/shared/pam-util.c +++ b/src/shared/pam-util.c @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include #include +#include #include "alloc-util.h" #include "bus-internal.h" diff --git a/src/shared/pam-util.h b/src/shared/pam-util.h index d1295a618f1..699648d43bd 100644 --- a/src/shared/pam-util.h +++ b/src/shared/pam-util.h @@ -4,9 +4,10 @@ #include #include -#include "macro.h" #include "sd-bus.h" +#include "macro.h" + void pam_log_setup(void); int pam_syslog_errno(pam_handle_t *handle, int level, int error, const char *format, ...) _printf_(4,5); diff --git a/src/shared/password-quality-util-pwquality.h b/src/shared/password-quality-util-pwquality.h index 9e3509b991f..68aa8db4824 100644 --- a/src/shared/password-quality-util-pwquality.h +++ b/src/shared/password-quality-util-pwquality.h @@ -5,8 +5,8 @@ #if HAVE_PWQUALITY /* pwquality.h uses size_t but doesn't include sys/types.h on its own */ -#include #include +#include #include "dlfcn-util.h" #include "memory-util.h" diff --git a/src/shared/pe-binary.h b/src/shared/pe-binary.h index a93493eb47c..14200189b23 100644 --- a/src/shared/pe-binary.h +++ b/src/shared/pe-binary.h @@ -3,8 +3,8 @@ #include -#include "openssl-util.h" #include "macro-fundamental.h" +#include "openssl-util.h" #include "sparse-endian.h" #include "uki.h" diff --git a/src/shared/qrcode-util.h b/src/shared/qrcode-util.h index 89a15bb3f5e..ff73b01ef81 100644 --- a/src/shared/qrcode-util.h +++ b/src/shared/qrcode-util.h @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include -#include #include #include +#include +#include #if HAVE_QRENCODE int dlopen_qrencode(void); diff --git a/src/shared/reboot-util.c b/src/shared/reboot-util.c index 903e19efae2..20fbff7b5b0 100644 --- a/src/shared/reboot-util.c +++ b/src/shared/reboot-util.c @@ -8,9 +8,9 @@ #if HAVE_XENCTRL #define __XEN_INTERFACE_VERSION__ 0x00040900 -#include #include #include +#include #endif #include "alloc-util.h" diff --git a/src/shared/seccomp-util.c b/src/shared/seccomp-util.c index 7f6d6103b82..416e6292070 100644 --- a/src/shared/seccomp-util.c +++ b/src/shared/seccomp-util.c @@ -9,9 +9,11 @@ #include #include +/* clang-format off */ /* include missing_syscall_def.h earlier to make __SNR_foo mapped to __NR_foo. */ #include "missing_syscall_def.h" #include +/* clang-format on */ #include "af-list.h" #include "alloc-util.h" diff --git a/src/shared/selinux-util.h b/src/shared/selinux-util.h index 3ca6232b349..4ed4a331989 100644 --- a/src/shared/selinux-util.h +++ b/src/shared/selinux-util.h @@ -6,8 +6,8 @@ #include #include -#include "macro.h" #include "label-util.h" +#include "macro.h" #if HAVE_SELINUX #include diff --git a/src/shared/socket-netlink.c b/src/shared/socket-netlink.c index bdb203934b4..0054641c22c 100644 --- a/src/shared/socket-netlink.c +++ b/src/shared/socket-netlink.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 #include #include #include +#include #include #include "alloc-util.h" diff --git a/src/shared/tmpfile-util-label.c b/src/shared/tmpfile-util-label.c index a5f364cba0a..b928460f1be 100644 --- a/src/shared/tmpfile-util-label.c +++ b/src/shared/tmpfile-util-label.c @@ -3,8 +3,8 @@ #include #include "selinux-util.h" -#include "tmpfile-util-label.h" #include "tmpfile-util.h" +#include "tmpfile-util-label.h" int fopen_temporary_at_label( int dir_fd, diff --git a/src/shared/tpm2-event-log.c b/src/shared/tpm2-event-log.c index 2d79b2332ba..6cf0fcfed24 100644 --- a/src/shared/tpm2-event-log.c +++ b/src/shared/tpm2-event-log.c @@ -1,8 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include "tpm2-event-log.h" - #include "sort-util.h" +#include "tpm2-event-log.h" typedef struct tpm2_log_event_type_info { uint32_t event_type; diff --git a/src/shared/tpm2-util.h b/src/shared/tpm2-util.h index 48d14349094..d6e5297ce93 100644 --- a/src/shared/tpm2-util.h +++ b/src/shared/tpm2-util.h @@ -3,9 +3,10 @@ #include +#include "sd-json.h" + #include "bitfield.h" #include "io-util.h" -#include "sd-json.h" #include "macro.h" #include "openssl-util.h" #include "ordered-set.h" diff --git a/src/shared/user-record-show.h b/src/shared/user-record-show.h index 777c555a907..7b65b14e9d2 100644 --- a/src/shared/user-record-show.h +++ b/src/shared/user-record-show.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "user-record.h" #include "group-record.h" +#include "user-record.h" const char* user_record_state_color(const char *state); diff --git a/src/shared/varlink-io.systemd.FactoryReset.c b/src/shared/varlink-io.systemd.FactoryReset.c index 4f68889f2e6..7d55041e0f2 100644 --- a/src/shared/varlink-io.systemd.FactoryReset.c +++ b/src/shared/varlink-io.systemd.FactoryReset.c @@ -1,8 +1,9 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include "varlink-io.systemd.FactoryReset.h" #include "sd-varlink-idl.h" +#include "varlink-io.systemd.FactoryReset.h" + static SD_VARLINK_DEFINE_ENUM_TYPE( FactoryResetMode, SD_VARLINK_FIELD_COMMENT("Factory reset is not supported on this OS."), diff --git a/src/shared/vlan-util.h b/src/shared/vlan-util.h index 0336908bf33..f245b72aab6 100644 --- a/src/shared/vlan-util.h +++ b/src/shared/vlan-util.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include #include +#include #include "conf-parser.h" diff --git a/src/shared/watchdog.c b/src/shared/watchdog.c index a6077d66540..3466d1aa070 100644 --- a/src/shared/watchdog.c +++ b/src/shared/watchdog.c @@ -2,10 +2,10 @@ #include #include +#include #include #include #include -#include #include "sd-messages.h" diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c index fd23c608a09..6c406175631 100644 --- a/src/socket-proxy/socket-proxyd.c +++ b/src/socket-proxy/socket-proxyd.c @@ -16,8 +16,8 @@ #include "alloc-util.h" #include "build.h" #include "daemon-util.h" -#include "event-util.h" #include "errno-util.h" +#include "event-util.h" #include "fd-util.h" #include "log.h" #include "main-func.h" diff --git a/src/systemctl/systemctl-add-dependency.c b/src/systemctl/systemctl-add-dependency.c index 8df25b515de..7ebcc12afb6 100644 --- a/src/systemctl/systemctl-add-dependency.c +++ b/src/systemctl/systemctl-add-dependency.c @@ -2,10 +2,10 @@ #include "bus-error.h" #include "bus-locator.h" +#include "systemctl.h" #include "systemctl-add-dependency.h" #include "systemctl-daemon-reload.h" #include "systemctl-util.h" -#include "systemctl.h" int verb_add_dependency(int argc, char *argv[], void *userdata) { _cleanup_strv_free_ char **names = NULL; diff --git a/src/systemctl/systemctl-cancel-job.c b/src/systemctl/systemctl-cancel-job.c index e9f34c151ce..214fbc3c8a3 100644 --- a/src/systemctl/systemctl-cancel-job.c +++ b/src/systemctl/systemctl-cancel-job.c @@ -3,10 +3,10 @@ #include "bus-error.h" #include "bus-locator.h" #include "parse-util.h" +#include "systemctl.h" #include "systemctl-cancel-job.h" #include "systemctl-trivial-method.h" #include "systemctl-util.h" -#include "systemctl.h" int verb_cancel(int argc, char *argv[], void *userdata) { sd_bus *bus; diff --git a/src/systemctl/systemctl-clean-or-freeze.c b/src/systemctl/systemctl-clean-or-freeze.c index 40d5f6d557a..ccd4772bb53 100644 --- a/src/systemctl/systemctl-clean-or-freeze.c +++ b/src/systemctl/systemctl-clean-or-freeze.c @@ -3,9 +3,9 @@ #include "bus-error.h" #include "bus-locator.h" #include "bus-wait-for-units.h" +#include "systemctl.h" #include "systemctl-clean-or-freeze.h" #include "systemctl-util.h" -#include "systemctl.h" int verb_clean_or_freeze(int argc, char *argv[], void *userdata) { _cleanup_(bus_wait_for_units_freep) BusWaitForUnits *w = NULL; diff --git a/src/systemctl/systemctl-compat-halt.c b/src/systemctl/systemctl-compat-halt.c index 9d692300973..8f8ede23c87 100644 --- a/src/systemctl/systemctl-compat-halt.c +++ b/src/systemctl/systemctl-compat-halt.c @@ -9,12 +9,12 @@ #include "pretty-print.h" #include "process-util.h" #include "reboot-util.h" +#include "systemctl.h" #include "systemctl-compat-halt.h" #include "systemctl-compat-telinit.h" #include "systemctl-logind.h" #include "systemctl-start-unit.h" #include "systemctl-util.h" -#include "systemctl.h" #include "terminal-util.h" #include "utmp-wtmp.h" diff --git a/src/systemctl/systemctl-compat-runlevel.c b/src/systemctl/systemctl-compat-runlevel.c index 04b6b7630b9..7c64715bac6 100644 --- a/src/systemctl/systemctl-compat-runlevel.c +++ b/src/systemctl/systemctl-compat-runlevel.c @@ -4,8 +4,8 @@ #include "alloc-util.h" #include "pretty-print.h" -#include "systemctl-compat-runlevel.h" #include "systemctl.h" +#include "systemctl-compat-runlevel.h" #include "terminal-util.h" #include "utmp-wtmp.h" diff --git a/src/systemctl/systemctl-compat-shutdown.c b/src/systemctl/systemctl-compat-shutdown.c index 96597b1d9df..0bb752db956 100644 --- a/src/systemctl/systemctl-compat-shutdown.c +++ b/src/systemctl/systemctl-compat-shutdown.c @@ -5,10 +5,10 @@ #include "alloc-util.h" #include "pretty-print.h" #include "reboot-util.h" +#include "systemctl.h" #include "systemctl-compat-shutdown.h" #include "systemctl-logind.h" #include "systemctl-sysv-compat.h" -#include "systemctl.h" #include "terminal-util.h" static int shutdown_help(void) { diff --git a/src/systemctl/systemctl-compat-telinit.c b/src/systemctl/systemctl-compat-telinit.c index 210d0a1d468..d0f869fc7c7 100644 --- a/src/systemctl/systemctl-compat-telinit.c +++ b/src/systemctl/systemctl-compat-telinit.c @@ -6,11 +6,11 @@ #include "alloc-util.h" #include "pretty-print.h" #include "rlimit-util.h" +#include "systemctl.h" #include "systemctl-compat-telinit.h" #include "systemctl-daemon-reload.h" #include "systemctl-start-unit.h" #include "systemctl-sysv-compat.h" -#include "systemctl.h" #include "terminal-util.h" static int telinit_help(void) { diff --git a/src/systemctl/systemctl-daemon-reload.c b/src/systemctl/systemctl-daemon-reload.c index 7e9b45665a1..03a06c077d8 100644 --- a/src/systemctl/systemctl-daemon-reload.c +++ b/src/systemctl/systemctl-daemon-reload.c @@ -2,9 +2,9 @@ #include "bus-error.h" #include "bus-locator.h" +#include "systemctl.h" #include "systemctl-daemon-reload.h" #include "systemctl-util.h" -#include "systemctl.h" int daemon_reload(enum action action, bool graceful) { _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL; diff --git a/src/systemctl/systemctl-edit.c b/src/systemctl/systemctl-edit.c index 7165fa1cf74..cb8f7693ec1 100644 --- a/src/systemctl/systemctl-edit.c +++ b/src/systemctl/systemctl-edit.c @@ -7,10 +7,10 @@ #include "path-util.h" #include "pretty-print.h" #include "selinux-util.h" +#include "systemctl.h" #include "systemctl-daemon-reload.h" #include "systemctl-edit.h" #include "systemctl-util.h" -#include "systemctl.h" #include "terminal-util.h" int verb_cat(int argc, char *argv[], void *userdata) { diff --git a/src/systemctl/systemctl-enable.c b/src/systemctl/systemctl-enable.c index c46bd5ea2dc..21b7119b98e 100644 --- a/src/systemctl/systemctl-enable.c +++ b/src/systemctl/systemctl-enable.c @@ -3,12 +3,12 @@ #include "bus-error.h" #include "bus-locator.h" #include "path-util.h" +#include "systemctl.h" #include "systemctl-daemon-reload.h" #include "systemctl-enable.h" #include "systemctl-start-unit.h" #include "systemctl-sysv-compat.h" #include "systemctl-util.h" -#include "systemctl.h" #include "verbs.h" static int normalize_link_paths(char **paths) { diff --git a/src/systemctl/systemctl-is-active.c b/src/systemctl/systemctl-is-active.c index ae834f1071a..a33e427d94c 100644 --- a/src/systemctl/systemctl-is-active.c +++ b/src/systemctl/systemctl-is-active.c @@ -4,10 +4,10 @@ #include "bus-locator.h" #include "pretty-print.h" #include "syslog-util.h" +#include "systemctl.h" #include "systemctl-is-active.h" #include "systemctl-sysv-compat.h" #include "systemctl-util.h" -#include "systemctl.h" static int check_unit_generic(int code, const UnitActiveState good_states[], size_t nb_states, char **args) { _cleanup_strv_free_ char **names = NULL; diff --git a/src/systemctl/systemctl-is-enabled.c b/src/systemctl/systemctl-is-enabled.c index 2cf97759734..a6d7dec882e 100644 --- a/src/systemctl/systemctl-is-enabled.c +++ b/src/systemctl/systemctl-is-enabled.c @@ -2,10 +2,10 @@ #include "bus-error.h" #include "bus-locator.h" +#include "systemctl.h" #include "systemctl-is-enabled.h" #include "systemctl-sysv-compat.h" #include "systemctl-util.h" -#include "systemctl.h" static int show_installation_targets_client_side(const char *name) { InstallChange *changes = NULL; diff --git a/src/systemctl/systemctl-is-system-running.c b/src/systemctl/systemctl-is-system-running.c index 8d5303c2d83..2bd546597bb 100644 --- a/src/systemctl/systemctl-is-system-running.c +++ b/src/systemctl/systemctl-is-system-running.c @@ -1,15 +1,15 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include "sd-event.h" #include "sd-daemon.h" +#include "sd-event.h" -#include "systemctl-util.h" +#include "bus-error.h" +#include "bus-locator.h" +#include "bus-util.h" +#include "systemctl.h" #include "systemctl-is-system-running.h" +#include "systemctl-util.h" #include "virt.h" -#include "systemctl.h" -#include "bus-util.h" -#include "bus-locator.h" -#include "bus-error.h" static int match_startup_finished(sd_bus_message *m, void *userdata, sd_bus_error *error) { char **state = ASSERT_PTR(userdata); diff --git a/src/systemctl/systemctl-kill.c b/src/systemctl/systemctl-kill.c index 4c1829e0c68..0581e47bd89 100644 --- a/src/systemctl/systemctl-kill.c +++ b/src/systemctl/systemctl-kill.c @@ -3,9 +3,9 @@ #include "bus-error.h" #include "bus-locator.h" #include "bus-wait-for-units.h" +#include "systemctl.h" #include "systemctl-kill.h" #include "systemctl-util.h" -#include "systemctl.h" int verb_kill(int argc, char *argv[], void *userdata) { _cleanup_(bus_wait_for_units_freep) BusWaitForUnits *w = NULL; diff --git a/src/systemctl/systemctl-list-dependencies.c b/src/systemctl/systemctl-list-dependencies.c index 8cd9fc83a1a..66a88519986 100644 --- a/src/systemctl/systemctl-list-dependencies.c +++ b/src/systemctl/systemctl-list-dependencies.c @@ -4,9 +4,9 @@ #include "locale-util.h" #include "sort-util.h" #include "special.h" +#include "systemctl.h" #include "systemctl-list-dependencies.h" #include "systemctl-util.h" -#include "systemctl.h" #include "terminal-util.h" static int list_dependencies_print(const char *name, UnitActiveState state, int level, unsigned branches, bool last) { diff --git a/src/systemctl/systemctl-list-jobs.c b/src/systemctl/systemctl-list-jobs.c index 098914b5d3b..6420365bad8 100644 --- a/src/systemctl/systemctl-list-jobs.c +++ b/src/systemctl/systemctl-list-jobs.c @@ -4,9 +4,9 @@ #include "bus-error.h" #include "bus-locator.h" #include "locale-util.h" +#include "systemctl.h" #include "systemctl-list-jobs.h" #include "systemctl-util.h" -#include "systemctl.h" #include "terminal-util.h" static int output_waiting_jobs(sd_bus *bus, Table *table, uint32_t id, const char *method, const char *prefix) { diff --git a/src/systemctl/systemctl-list-machines.c b/src/systemctl/systemctl-list-machines.c index e53f314c8f0..cc053504a0d 100644 --- a/src/systemctl/systemctl-list-machines.c +++ b/src/systemctl/systemctl-list-machines.c @@ -11,9 +11,9 @@ #include "locale-util.h" #include "memory-util.h" #include "sort-util.h" +#include "systemctl.h" #include "systemctl-list-machines.h" #include "systemctl-util.h" -#include "systemctl.h" #include "terminal-util.h" const struct bus_properties_map machine_info_property_map[] = { diff --git a/src/systemctl/systemctl-list-unit-files.c b/src/systemctl/systemctl-list-unit-files.c index 975b3ebc548..40e0b46cfc3 100644 --- a/src/systemctl/systemctl-list-unit-files.c +++ b/src/systemctl/systemctl-list-unit-files.c @@ -4,9 +4,9 @@ #include "bus-error.h" #include "bus-locator.h" #include "sort-util.h" +#include "systemctl.h" #include "systemctl-list-unit-files.h" #include "systemctl-util.h" -#include "systemctl.h" #include "terminal-util.h" static int compare_unit_file_list(const UnitFileList *a, const UnitFileList *b) { diff --git a/src/systemctl/systemctl-list-units.c b/src/systemctl/systemctl-list-units.c index c284be9f0d4..72dc09183e2 100644 --- a/src/systemctl/systemctl-list-units.c +++ b/src/systemctl/systemctl-list-units.c @@ -11,9 +11,9 @@ #include "path-util.h" #include "set.h" #include "sort-util.h" +#include "systemctl.h" #include "systemctl-list-units.h" #include "systemctl-util.h" -#include "systemctl.h" #include "terminal-util.h" static int get_unit_list_recursive( diff --git a/src/systemctl/systemctl-log-setting.c b/src/systemctl/systemctl-log-setting.c index 88b2e49b1a6..a3afbe5d08c 100644 --- a/src/systemctl/systemctl-log-setting.c +++ b/src/systemctl/systemctl-log-setting.c @@ -4,9 +4,9 @@ #include "bus-locator.h" #include "pretty-print.h" #include "syslog-util.h" +#include "systemctl.h" #include "systemctl-log-setting.h" #include "systemctl-util.h" -#include "systemctl.h" #include "verb-log-control.h" static void give_log_control1_hint(const char *name) { diff --git a/src/systemctl/systemctl-logind.c b/src/systemctl/systemctl-logind.c index 4acd32832cf..f915ff9ac15 100644 --- a/src/systemctl/systemctl-logind.c +++ b/src/systemctl/systemctl-logind.c @@ -9,10 +9,10 @@ #include "login-util.h" #include "mountpoint-util.h" #include "process-util.h" +#include "systemctl.h" #include "systemctl-logind.h" #include "systemctl-start-unit.h" #include "systemctl-util.h" -#include "systemctl.h" #include "terminal-util.h" #include "user-util.h" diff --git a/src/systemctl/systemctl-mount.c b/src/systemctl/systemctl-mount.c index 61af218a4b5..6b51983fe9b 100644 --- a/src/systemctl/systemctl-mount.c +++ b/src/systemctl/systemctl-mount.c @@ -3,9 +3,9 @@ #include "bus-error.h" #include "bus-locator.h" #include "dissect-image.h" +#include "systemctl.h" #include "systemctl-mount.h" #include "systemctl-util.h" -#include "systemctl.h" int verb_bind(int argc, char *argv[], void *userdata) { _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL; diff --git a/src/systemctl/systemctl-preset-all.c b/src/systemctl/systemctl-preset-all.c index 769a73f4d97..f0928e60849 100644 --- a/src/systemctl/systemctl-preset-all.c +++ b/src/systemctl/systemctl-preset-all.c @@ -2,10 +2,10 @@ #include "bus-error.h" #include "bus-locator.h" +#include "systemctl.h" #include "systemctl-daemon-reload.h" #include "systemctl-preset-all.h" #include "systemctl-util.h" -#include "systemctl.h" #include "verbs.h" int verb_preset_all(int argc, char *argv[], void *userdata) { diff --git a/src/systemctl/systemctl-reset-failed.c b/src/systemctl/systemctl-reset-failed.c index 1ca05339dc5..f3f6fab7c35 100644 --- a/src/systemctl/systemctl-reset-failed.c +++ b/src/systemctl/systemctl-reset-failed.c @@ -2,10 +2,10 @@ #include "bus-error.h" #include "bus-locator.h" +#include "systemctl.h" #include "systemctl-reset-failed.h" #include "systemctl-trivial-method.h" #include "systemctl-util.h" -#include "systemctl.h" int verb_reset_failed(int argc, char *argv[], void *userdata) { _cleanup_strv_free_ char **names = NULL; diff --git a/src/systemctl/systemctl-service-watchdogs.c b/src/systemctl/systemctl-service-watchdogs.c index 620f46aafbe..d5a537d215a 100644 --- a/src/systemctl/systemctl-service-watchdogs.c +++ b/src/systemctl/systemctl-service-watchdogs.c @@ -3,9 +3,9 @@ #include "bus-error.h" #include "bus-locator.h" #include "parse-util.h" +#include "systemctl.h" #include "systemctl-service-watchdogs.h" #include "systemctl-util.h" -#include "systemctl.h" int verb_service_watchdogs(int argc, char *argv[], void *userdata) { sd_bus *bus; diff --git a/src/systemctl/systemctl-set-default.c b/src/systemctl/systemctl-set-default.c index 58c2bc335dc..c8293cca3ab 100644 --- a/src/systemctl/systemctl-set-default.c +++ b/src/systemctl/systemctl-set-default.c @@ -3,10 +3,10 @@ #include "bus-error.h" #include "bus-locator.h" #include "proc-cmdline.h" +#include "systemctl.h" #include "systemctl-daemon-reload.h" #include "systemctl-set-default.h" #include "systemctl-util.h" -#include "systemctl.h" static int parse_proc_cmdline_item(const char *key, const char *value, void *data) { char **ret = data; diff --git a/src/systemctl/systemctl-set-environment.c b/src/systemctl/systemctl-set-environment.c index 409985ebdae..8a21a4df899 100644 --- a/src/systemctl/systemctl-set-environment.c +++ b/src/systemctl/systemctl-set-environment.c @@ -4,9 +4,9 @@ #include "bus-locator.h" #include "env-util.h" #include "escape.h" +#include "systemctl.h" #include "systemctl-set-environment.h" #include "systemctl-util.h" -#include "systemctl.h" static int json_transform_message(sd_bus_message *m, sd_json_variant **ret) { _cleanup_(sd_json_variant_unrefp) sd_json_variant *v = NULL; diff --git a/src/systemctl/systemctl-set-property.c b/src/systemctl/systemctl-set-property.c index 5f4b810525c..45b14f43ee8 100644 --- a/src/systemctl/systemctl-set-property.c +++ b/src/systemctl/systemctl-set-property.c @@ -2,9 +2,9 @@ #include "bus-error.h" #include "bus-locator.h" +#include "systemctl.h" #include "systemctl-set-property.h" #include "systemctl-util.h" -#include "systemctl.h" static int set_property_one(sd_bus *bus, const char *name, char **properties) { _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL; diff --git a/src/systemctl/systemctl-show.c b/src/systemctl/systemctl-show.c index d35f79c38f4..84dc1ff9eac 100644 --- a/src/systemctl/systemctl-show.c +++ b/src/systemctl/systemctl-show.c @@ -16,8 +16,8 @@ #include "fd-util.h" #include "format-util.h" #include "hexdecoct.h" -#include "hostname-util.h" #include "hostname-setup.h" +#include "hostname-util.h" #include "in-addr-util.h" #include "ip-protocol-list.h" #include "journal-file.h" @@ -34,12 +34,12 @@ #include "sort-util.h" #include "special.h" #include "string-table.h" +#include "systemctl.h" #include "systemctl-list-machines.h" #include "systemctl-list-units.h" #include "systemctl-show.h" #include "systemctl-sysv-compat.h" #include "systemctl-util.h" -#include "systemctl.h" #include "terminal-util.h" #include "utf8.h" diff --git a/src/systemctl/systemctl-start-special.c b/src/systemctl/systemctl-start-special.c index 5fff5d4f186..c17e8ae4800 100644 --- a/src/systemctl/systemctl-start-special.c +++ b/src/systemctl/systemctl-start-special.c @@ -10,12 +10,12 @@ #include "path-util.h" #include "process-util.h" #include "reboot-util.h" +#include "systemctl.h" #include "systemctl-logind.h" #include "systemctl-start-special.h" #include "systemctl-start-unit.h" #include "systemctl-trivial-method.h" #include "systemctl-util.h" -#include "systemctl.h" static int load_kexec_kernel(void) { _cleanup_(boot_config_free) BootConfig config = BOOT_CONFIG_NULL; diff --git a/src/systemctl/systemctl-start-unit.c b/src/systemctl/systemctl-start-unit.c index 909f051cdef..d4192b4506a 100644 --- a/src/systemctl/systemctl-start-unit.c +++ b/src/systemctl/systemctl-start-unit.c @@ -12,9 +12,9 @@ #include "macro.h" #include "special.h" #include "string-util.h" +#include "systemctl.h" #include "systemctl-start-unit.h" #include "systemctl-util.h" -#include "systemctl.h" #include "terminal-util.h" static const struct { diff --git a/src/systemctl/systemctl-sysv-compat.c b/src/systemctl/systemctl-sysv-compat.c index cb9c43e3dc0..5686b0a1cd5 100644 --- a/src/systemctl/systemctl-sysv-compat.c +++ b/src/systemctl/systemctl-sysv-compat.c @@ -13,8 +13,8 @@ #include "path-util.h" #include "process-util.h" #include "strv.h" -#include "systemctl-sysv-compat.h" #include "systemctl.h" +#include "systemctl-sysv-compat.h" int talk_initctl(char rl) { #if HAVE_SYSV_COMPAT diff --git a/src/systemctl/systemctl-trivial-method.c b/src/systemctl/systemctl-trivial-method.c index 02a29123e76..4d4f2627269 100644 --- a/src/systemctl/systemctl-trivial-method.c +++ b/src/systemctl/systemctl-trivial-method.c @@ -2,9 +2,9 @@ #include "bus-error.h" #include "bus-locator.h" +#include "systemctl.h" #include "systemctl-trivial-method.h" #include "systemctl-util.h" -#include "systemctl.h" /* A generic implementation for cases we just need to invoke a simple method call on the Manager object. */ diff --git a/src/systemctl/systemctl-util.c b/src/systemctl/systemctl-util.c index a6771601a18..9a3944fcf66 100644 --- a/src/systemctl/systemctl-util.c +++ b/src/systemctl/systemctl-util.c @@ -25,8 +25,8 @@ #include "reboot-util.h" #include "set.h" #include "stat-util.h" -#include "systemctl-util.h" #include "systemctl.h" +#include "systemctl-util.h" #include "terminal-util.h" #include "verbs.h" diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index 840b1b35845..3ed29d1026b 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -25,6 +25,7 @@ #include "signal-util.h" #include "stat-util.h" #include "string-table.h" +#include "systemctl.h" #include "systemctl-add-dependency.h" #include "systemctl-cancel-job.h" #include "systemctl-clean-or-freeze.h" @@ -61,7 +62,6 @@ #include "systemctl-trivial-method.h" #include "systemctl-util.h" #include "systemctl-whoami.h" -#include "systemctl.h" #include "terminal-util.h" #include "time-util.h" #include "user-util.h" diff --git a/src/systemd/sd-bus.h b/src/systemd/sd-bus.h index cf07029217d..78c6cc10a46 100644 --- a/src/systemd/sd-bus.h +++ b/src/systemd/sd-bus.h @@ -23,12 +23,11 @@ #include #include -#include "sd-event.h" -#include "sd-id128.h" - #include "_sd-common.h" #include "sd-bus-protocol.h" #include "sd-bus-vtable.h" +#include "sd-event.h" +#include "sd-id128.h" _SD_BEGIN_DECLARATIONS; diff --git a/src/systemd/sd-daemon.h b/src/systemd/sd-daemon.h index 595b6f33745..a18a9211b90 100644 --- a/src/systemd/sd-daemon.h +++ b/src/systemd/sd-daemon.h @@ -18,8 +18,8 @@ ***/ #include -#include #include +#include #include "_sd-common.h" diff --git a/src/systemd/sd-device.h b/src/systemd/sd-device.h index f627ae6daed..8f6141b3dfa 100644 --- a/src/systemd/sd-device.h +++ b/src/systemd/sd-device.h @@ -23,11 +23,10 @@ #include #include +#include "_sd-common.h" #include "sd-event.h" #include "sd-id128.h" -#include "_sd-common.h" - _SD_BEGIN_DECLARATIONS; typedef struct sd_device sd_device; diff --git a/src/systemd/sd-dhcp-client-id.h b/src/systemd/sd-dhcp-client-id.h index d6174c67473..404c01b1ebe 100644 --- a/src/systemd/sd-dhcp-client-id.h +++ b/src/systemd/sd-dhcp-client-id.h @@ -20,9 +20,8 @@ #include #include -#include "sd-dhcp-duid.h" - #include "_sd-common.h" +#include "sd-dhcp-duid.h" _SD_BEGIN_DECLARATIONS; diff --git a/src/systemd/sd-dhcp-client.h b/src/systemd/sd-dhcp-client.h index 1483afa2203..0fb87e2684a 100644 --- a/src/systemd/sd-dhcp-client.h +++ b/src/systemd/sd-dhcp-client.h @@ -22,17 +22,16 @@ #include #include #include -#include #include +#include +#include "_sd-common.h" #include "sd-device.h" #include "sd-dhcp-client-id.h" #include "sd-dhcp-lease.h" #include "sd-dhcp-option.h" #include "sd-event.h" -#include "_sd-common.h" - _SD_BEGIN_DECLARATIONS; enum { diff --git a/src/systemd/sd-dhcp-lease.h b/src/systemd/sd-dhcp-lease.h index 2265b8b9aad..fa5772019c7 100644 --- a/src/systemd/sd-dhcp-lease.h +++ b/src/systemd/sd-dhcp-lease.h @@ -24,9 +24,8 @@ #include #include -#include "sd-dhcp-client-id.h" - #include "_sd-common.h" +#include "sd-dhcp-client-id.h" _SD_BEGIN_DECLARATIONS; diff --git a/src/systemd/sd-dhcp-option.h b/src/systemd/sd-dhcp-option.h index 2c31ec2d57e..14141da1dba 100644 --- a/src/systemd/sd-dhcp-option.h +++ b/src/systemd/sd-dhcp-option.h @@ -20,9 +20,8 @@ #include #include -#include "sd-dhcp-protocol.h" - #include "_sd-common.h" +#include "sd-dhcp-protocol.h" _SD_BEGIN_DECLARATIONS; diff --git a/src/systemd/sd-dhcp-server.h b/src/systemd/sd-dhcp-server.h index 1bba7a60770..0ef4d132cfd 100644 --- a/src/systemd/sd-dhcp-server.h +++ b/src/systemd/sd-dhcp-server.h @@ -21,12 +21,11 @@ #include #include +#include "_sd-common.h" #include "sd-dhcp-lease.h" #include "sd-dhcp-option.h" #include "sd-event.h" -#include "_sd-common.h" - _SD_BEGIN_DECLARATIONS; typedef struct sd_dhcp_server sd_dhcp_server; diff --git a/src/systemd/sd-dhcp6-client.h b/src/systemd/sd-dhcp6-client.h index d551b4dd901..6054dc44323 100644 --- a/src/systemd/sd-dhcp6-client.h +++ b/src/systemd/sd-dhcp6-client.h @@ -23,14 +23,13 @@ #include #include +#include "_sd-common.h" #include "sd-device.h" #include "sd-dhcp-duid.h" #include "sd-dhcp6-lease.h" #include "sd-dhcp6-option.h" #include "sd-event.h" -#include "_sd-common.h" - _SD_BEGIN_DECLARATIONS; enum { diff --git a/src/systemd/sd-dhcp6-lease.h b/src/systemd/sd-dhcp6-lease.h index d6bcceb2a2e..5d082b0cbe7 100644 --- a/src/systemd/sd-dhcp6-lease.h +++ b/src/systemd/sd-dhcp6-lease.h @@ -23,9 +23,8 @@ #include #include -#include "sd-dhcp6-option.h" - #include "_sd-common.h" +#include "sd-dhcp6-option.h" _SD_BEGIN_DECLARATIONS; diff --git a/src/systemd/sd-dhcp6-option.h b/src/systemd/sd-dhcp6-option.h index 320124266a1..69f3eaa39de 100644 --- a/src/systemd/sd-dhcp6-option.h +++ b/src/systemd/sd-dhcp6-option.h @@ -20,9 +20,8 @@ #include #include -#include "sd-dhcp6-protocol.h" - #include "_sd-common.h" +#include "sd-dhcp6-protocol.h" _SD_BEGIN_DECLARATIONS; diff --git a/src/systemd/sd-gpt.h b/src/systemd/sd-gpt.h index 7ffa57a9451..c60e7b40d77 100644 --- a/src/systemd/sd-gpt.h +++ b/src/systemd/sd-gpt.h @@ -17,9 +17,8 @@ along with systemd; If not, see . ***/ -#include "sd-id128.h" - #include "_sd-common.h" +#include "sd-id128.h" _SD_BEGIN_DECLARATIONS; diff --git a/src/systemd/sd-ipv4acd.h b/src/systemd/sd-ipv4acd.h index 65a53f9f2b1..33879af5166 100644 --- a/src/systemd/sd-ipv4acd.h +++ b/src/systemd/sd-ipv4acd.h @@ -22,9 +22,8 @@ #include #include -#include "sd-event.h" - #include "_sd-common.h" +#include "sd-event.h" _SD_BEGIN_DECLARATIONS; diff --git a/src/systemd/sd-ipv4ll.h b/src/systemd/sd-ipv4ll.h index 1e7922cf671..6c687fef20c 100644 --- a/src/systemd/sd-ipv4ll.h +++ b/src/systemd/sd-ipv4ll.h @@ -22,9 +22,8 @@ #include #include -#include "sd-event.h" - #include "_sd-common.h" +#include "sd-event.h" _SD_BEGIN_DECLARATIONS; diff --git a/src/systemd/sd-journal.h b/src/systemd/sd-journal.h index 5eefb0d7719..ca062ca681e 100644 --- a/src/systemd/sd-journal.h +++ b/src/systemd/sd-journal.h @@ -23,9 +23,8 @@ #include #include -#include "sd-id128.h" - #include "_sd-common.h" +#include "sd-id128.h" /* Journal APIs. See sd-journal(3) for more information. */ diff --git a/src/systemd/sd-json.h b/src/systemd/sd-json.h index 3930d82b0d0..754ce73db86 100644 --- a/src/systemd/sd-json.h +++ b/src/systemd/sd-json.h @@ -23,9 +23,8 @@ #include #include -#include "sd-id128.h" - #include "_sd-common.h" +#include "sd-id128.h" _SD_BEGIN_DECLARATIONS; diff --git a/src/systemd/sd-lldp-rx.h b/src/systemd/sd-lldp-rx.h index 51b9f394820..d4e135512e7 100644 --- a/src/systemd/sd-lldp-rx.h +++ b/src/systemd/sd-lldp-rx.h @@ -22,11 +22,10 @@ #include #include +#include "_sd-common.h" #include "sd-event.h" #include "sd-lldp.h" -#include "_sd-common.h" - _SD_BEGIN_DECLARATIONS; typedef struct sd_lldp_rx sd_lldp_rx; diff --git a/src/systemd/sd-lldp-tx.h b/src/systemd/sd-lldp-tx.h index c97684852ee..73b9f2ad3c3 100644 --- a/src/systemd/sd-lldp-tx.h +++ b/src/systemd/sd-lldp-tx.h @@ -22,11 +22,10 @@ #include #include +#include "_sd-common.h" #include "sd-event.h" #include "sd-lldp.h" -#include "_sd-common.h" - _SD_BEGIN_DECLARATIONS; typedef struct sd_lldp_tx sd_lldp_tx; diff --git a/src/systemd/sd-messages.h b/src/systemd/sd-messages.h index 502a2e5d5ae..319154824a5 100644 --- a/src/systemd/sd-messages.h +++ b/src/systemd/sd-messages.h @@ -17,9 +17,8 @@ along with systemd; If not, see . ***/ -#include "sd-id128.h" - #include "_sd-common.h" +#include "sd-id128.h" _SD_BEGIN_DECLARATIONS; diff --git a/src/systemd/sd-ndisc.h b/src/systemd/sd-ndisc.h index 85fcf6bc030..a8f8c47b68a 100644 --- a/src/systemd/sd-ndisc.h +++ b/src/systemd/sd-ndisc.h @@ -25,14 +25,13 @@ #include #include +#include "_sd-common.h" #include "sd-event.h" #include "sd-ndisc-neighbor.h" #include "sd-ndisc-protocol.h" #include "sd-ndisc-redirect.h" #include "sd-ndisc-router.h" -#include "_sd-common.h" - _SD_BEGIN_DECLARATIONS; typedef struct sd_ndisc sd_ndisc; diff --git a/src/systemd/sd-netlink.h b/src/systemd/sd-netlink.h index c758f9b1e41..5f8f143db1a 100644 --- a/src/systemd/sd-netlink.h +++ b/src/systemd/sd-netlink.h @@ -19,15 +19,14 @@ #include #include -#include -#include #include #include #include - -#include "sd-event.h" +#include +#include #include "_sd-common.h" +#include "sd-event.h" _SD_BEGIN_DECLARATIONS; diff --git a/src/systemd/sd-resolve.h b/src/systemd/sd-resolve.h index f5dfae8ff69..53780406847 100644 --- a/src/systemd/sd-resolve.h +++ b/src/systemd/sd-resolve.h @@ -27,9 +27,8 @@ #include #include -#include "sd-event.h" - #include "_sd-common.h" +#include "sd-event.h" _SD_BEGIN_DECLARATIONS; diff --git a/src/systemd/sd-varlink-idl.h b/src/systemd/sd-varlink-idl.h index 63d79d33f7b..c580a0d9903 100644 --- a/src/systemd/sd-varlink-idl.h +++ b/src/systemd/sd-varlink-idl.h @@ -20,9 +20,8 @@ #include #include -#include "sd-json.h" - #include "_sd-common.h" +#include "sd-json.h" _SD_BEGIN_DECLARATIONS; diff --git a/src/systemd/sd-varlink.h b/src/systemd/sd-varlink.h index 655444595b2..450f29d85bb 100644 --- a/src/systemd/sd-varlink.h +++ b/src/systemd/sd-varlink.h @@ -20,12 +20,11 @@ #include #include +#include "_sd-common.h" #include "sd-event.h" #include "sd-json.h" #include "sd-varlink-idl.h" -#include "_sd-common.h" - _SD_BEGIN_DECLARATIONS; /* A minimal Varlink implementation. We only implement the minimal, obvious bits here though. No validation, diff --git a/src/sysupdate/sysupdate-feature.c b/src/sysupdate/sysupdate-feature.c index 4b811ac3511..38fbc2b20cc 100644 --- a/src/sysupdate/sysupdate-feature.c +++ b/src/sysupdate/sysupdate-feature.c @@ -3,8 +3,8 @@ #include "conf-parser.h" #include "hash-funcs.h" #include "path-util.h" -#include "sysupdate-feature.h" #include "sysupdate.h" +#include "sysupdate-feature.h" #include "web-util.h" static Feature *feature_free(Feature *f) { diff --git a/src/sysupdate/sysupdate-instance.h b/src/sysupdate/sysupdate-instance.h index f39db617d33..0d845c8a32a 100644 --- a/src/sysupdate/sysupdate-instance.h +++ b/src/sysupdate/sysupdate-instance.h @@ -8,9 +8,8 @@ #include "sd-id128.h" #include "fs-util.h" -#include "time-util.h" - #include "sysupdate-partition.h" +#include "time-util.h" typedef struct Resource Resource; typedef struct Instance Instance; diff --git a/src/sysupdate/sysupdate-resource.c b/src/sysupdate/sysupdate-resource.c index 424f10b2960..368d4c5c975 100644 --- a/src/sysupdate/sysupdate-resource.c +++ b/src/sysupdate/sysupdate-resource.c @@ -24,11 +24,11 @@ #include "process-util.h" #include "sort-util.h" #include "string-table.h" +#include "sysupdate.h" #include "sysupdate-cache.h" #include "sysupdate-instance.h" #include "sysupdate-pattern.h" #include "sysupdate-resource.h" -#include "sysupdate.h" #include "utf8.h" void resource_destroy(Resource *rr) { diff --git a/src/sysupdate/sysupdate-update-set.c b/src/sysupdate/sysupdate-update-set.c index 0756dff04b4..8ca0fea850e 100644 --- a/src/sysupdate/sysupdate-update-set.c +++ b/src/sysupdate/sysupdate-update-set.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include "ansi-color.h" #include "alloc-util.h" +#include "ansi-color.h" #include "string-util.h" #include "sysupdate-update-set.h" diff --git a/src/sysupdate/sysupdate-util.c b/src/sysupdate/sysupdate-util.c index d66e6fa86f5..1aba63cf782 100644 --- a/src/sysupdate/sysupdate-util.c +++ b/src/sysupdate/sysupdate-util.c @@ -6,7 +6,6 @@ #include "bus-locator.h" #include "log.h" #include "login-util.h" - #include "sysupdate-util.h" int reboot_now(void) { diff --git a/src/test/test-arphrd-util.c b/src/test/test-arphrd-util.c index 15b79977504..72ff9565586 100644 --- a/src/test/test-arphrd-util.c +++ b/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 #include +#include #include "arphrd-util.h" #include "string-util.h" diff --git a/src/test/test-async.c b/src/test/test-async.c index 2b87faba7db..7b0f7dc6bef 100644 --- a/src/test/test-async.c +++ b/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) { diff --git a/src/test/test-btrfs.c b/src/test/test-btrfs.c index 6dff70902e1..326712a42dd 100644 --- a/src/test/test-btrfs.c +++ b/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" diff --git a/src/test/test-clock.c b/src/test/test-clock.c index 4c247c1474b..5115bd83c2c 100644 --- a/src/test/test-clock.c +++ b/src/test/test-clock.c @@ -3,8 +3,8 @@ Copyright © 2016 Canonical Ltd. ***/ -#include #include +#include #include "clock-util.h" #include "fd-util.h" diff --git a/src/test/test-compress.c b/src/test/test-compress.c index b9ef3644e1c..2d8732bddb1 100644 --- a/src/test/test-compress.c +++ b/src/test/test-compress.c @@ -6,9 +6,9 @@ #include #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" diff --git a/src/test/test-conf-parser.c b/src/test/test-conf-parser.c index a4309c0134f..6989d470b15 100644 --- a/src/test/test-conf-parser.c +++ b/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" diff --git a/src/test/test-coredump-util.c b/src/test/test-coredump-util.c index 4e7f3b43453..2f66ed63e02 100644 --- a/src/test/test-coredump-util.c +++ b/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" diff --git a/src/test/test-cpu-set-util.c b/src/test/test-cpu-set-util.c index ccb52c96d4d..4fbb7717c55 100644 --- a/src/test/test-cpu-set-util.c +++ b/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 = {}; diff --git a/src/test/test-daemon.c b/src/test/test-daemon.c index 5d6c52374cf..957f0f2a80f 100644 --- a/src/test/test-daemon.c +++ b/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; diff --git a/src/test/test-data-fd-util.c b/src/test/test-data-fd-util.c index bdbceee1710..ef047a3c6a6 100644 --- a/src/test/test-data-fd-util.c +++ b/src/test/test-data-fd-util.c @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include -#include #include +#include +#include #include #include "data-fd-util.h" diff --git a/src/test/test-dirent-util.c b/src/test/test-dirent-util.c index 420ccd108dd..44e26e8e244 100644 --- a/src/test/test-dirent-util.c +++ b/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; diff --git a/src/test/test-exec-util.c b/src/test/test-exec-util.c index 75fb48ea392..6987e558ba4 100644 --- a/src/test/test-exec-util.c +++ b/src/test/test-exec-util.c @@ -6,8 +6,8 @@ #include #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" diff --git a/src/test/test-execute.c b/src/test/test-execute.c index c86b9a9b872..ef476280fa6 100644 --- a/src/test/test-execute.c +++ b/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" diff --git a/src/test/test-fiemap.c b/src/test/test-fiemap.c index 380638bef3a..9094a2b9f1d 100644 --- a/src/test/test-fiemap.c +++ b/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) { diff --git a/src/test/test-hash-funcs.c b/src/test/test-hash-funcs.c index f5166c1fad4..72cb3fdbe6e 100644 --- a/src/test/test-hash-funcs.c +++ b/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, diff --git a/src/test/test-image-policy.c b/src/test/test-image-policy.c index 7d29e3d12ee..7134f3d1d07 100644 --- a/src/test/test-image-policy.c +++ b/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; diff --git a/src/test/test-journal-importer.c b/src/test/test-journal-importer.c index ec9e49e9e45..a8e003e649c 100644 --- a/src/test/test-journal-importer.c +++ b/src/test/test-journal-importer.c @@ -1,12 +1,12 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include -#include #include +#include +#include #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" diff --git a/src/test/test-libcrypt-util.c b/src/test/test-libcrypt-util.c index f88a9f9b249..f544a0003ea 100644 --- a/src/test/test-libcrypt-util.c +++ b/src/test/test-libcrypt-util.c @@ -6,9 +6,9 @@ # include #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__); diff --git a/src/test/test-libmount.c b/src/test/test-libmount.c index d514bb94d3b..b53de31c482 100644 --- a/src/test/test-libmount.c +++ b/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" diff --git a/src/test/test-load-fragment.c b/src/test/test-load-fragment.c index 462a7ffff98..45b02a3c7eb 100644 --- a/src/test/test-load-fragment.c +++ b/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" diff --git a/src/test/test-local-addresses.c b/src/test/test-local-addresses.c index d4a2a6a0977..c2033bfeb32 100644 --- a/src/test/test-local-addresses.c +++ b/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 #include +#include #include #include "af-list.h" diff --git a/src/test/test-modhex.c b/src/test/test-modhex.c index 6725732be82..eee3259d772 100644 --- a/src/test/test-modhex.c +++ b/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" diff --git a/src/test/test-namespace.c b/src/test/test-namespace.c index 9d30b08c5e1..decebf737c9 100644 --- a/src/test/test-namespace.c +++ b/src/test/test-namespace.c @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include #include #include +#include #include "alloc-util.h" #include "fd-util.h" diff --git a/src/test/test-netlink-manual.c b/src/test/test-netlink-manual.c index d12eee42cb6..eae13d9b4a3 100644 --- a/src/test/test-netlink-manual.c +++ b/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 #include #include #include +#include #include #include diff --git a/src/test/test-nss-hosts.c b/src/test/test-nss-hosts.c index 08d198a02da..1b2d1078368 100644 --- a/src/test/test-nss-hosts.c +++ b/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" diff --git a/src/test/test-nss-users.c b/src/test/test-nss-users.c index cba0f823b92..9033fd22c96 100644 --- a/src/test/test-nss-users.c +++ b/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" diff --git a/src/test/test-os-util.c b/src/test/test-os-util.c index 74802a23b38..709ee04d6b8 100644 --- a/src/test/test-os-util.c +++ b/src/test/test-os-util.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include + #include "fileio.h" #include "fs-util.h" #include "log.h" diff --git a/src/test/test-parse-helpers.c b/src/test/test-parse-helpers.c index e63b4df4eb8..483ea671ac7 100644 --- a/src/test/test-parse-helpers.c +++ b/src/test/test-parse-helpers.c @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include #include +#include #include "macro.h" #include "parse-helpers.h" diff --git a/src/test/test-path.c b/src/test/test-path.c index fd3120f922d..a20535c1b9b 100644 --- a/src/test/test-path.c +++ b/src/test/test-path.c @@ -4,8 +4,8 @@ #include #include -#include "alloc-util.h" #include "all-units.h" +#include "alloc-util.h" #include "fd-util.h" #include "fs-util.h" #include "macro.h" diff --git a/src/test/test-procfs-util.c b/src/test/test-procfs-util.c index 2b19a9888b1..4835b0461e7 100644 --- a/src/test/test-procfs-util.c +++ b/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[]) { diff --git a/src/test/test-sbat.c b/src/test/test-sbat.c index cf9c155c9d4..c41b4192d5f 100644 --- a/src/test/test-sbat.c +++ b/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" diff --git a/src/test/test-sd-hwdb.c b/src/test/test-sd-hwdb.c index 7689cdf9a48..a13f7ce7980 100644 --- a/src/test/test-sd-hwdb.c +++ b/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" diff --git a/src/test/test-shift-uid.c b/src/test/test-shift-uid.c index b1e272c79fa..27fea2161cd 100644 --- a/src/test/test-shift-uid.c +++ b/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; diff --git a/src/test/test-signal-util.c b/src/test/test-signal-util.c index aa14a3f9d9c..45f31b0c543 100644 --- a/src/test/test-signal-util.c +++ b/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) diff --git a/src/test/test-socket-netlink.c b/src/test/test-socket-netlink.c index 1849585cc82..659e583fa32 100644 --- a/src/test/test-socket-netlink.c +++ b/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; diff --git a/src/test/test-tables.c b/src/test/test-tables.c index 1896391beeb..d6e41007604 100644 --- a/src/test/test-tables.c +++ b/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) { diff --git a/src/test/test-uid-classification.c b/src/test/test-uid-classification.c index 9c7500a00e5..9a76ad28a07 100644 --- a/src/test/test-uid-classification.c +++ b/src/test/test-uid-classification.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include +#include #include "fd-util.h" #include "fileio.h" diff --git a/src/test/test-unit-name.c b/src/test/test-unit-name.c index 4734a3320f4..b5e6f23c1b2 100644 --- a/src/test/test-unit-name.c +++ b/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; diff --git a/src/test/test-utmp.c b/src/test/test-utmp.c index e94ee03250e..ca985d35727 100644 --- a/src/test/test-utmp.c +++ b/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) diff --git a/src/timesync/test-timesync.c b/src/timesync/test-timesync.c index 160685b6d4e..c8d8fd4bd4a 100644 --- a/src/timesync/test-timesync.c +++ b/src/timesync/test-timesync.c @@ -4,10 +4,10 @@ #include "log.h" #include "macro.h" +#include "tests.h" #include "timesyncd-conf.h" #include "timesyncd-manager.h" #include "timesyncd-server.h" -#include "tests.h" TEST(manager_parse_string) { /* Make sure that NTP_SERVERS is configured to something diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c index 4410b1626d0..69d6703949c 100644 --- a/src/timesync/timesyncd-manager.c +++ b/src/timesync/timesyncd-manager.c @@ -26,9 +26,9 @@ #include "log.h" #include "logarithm.h" #include "network-util.h" +#include "random-util.h" #include "ratelimit.h" #include "resolve-private.h" -#include "random-util.h" #include "socket-util.h" #include "string-util.h" #include "strv.h" diff --git a/src/tmpfiles/test-offline-passwd.c b/src/tmpfiles/test-offline-passwd.c index ef495825103..25b1fcceff0 100644 --- a/src/tmpfiles/test-offline-passwd.c +++ b/src/tmpfiles/test-offline-passwd.c @@ -2,10 +2,10 @@ #include -#include "offline-passwd.h" -#include "user-util.h" #include "format-util.h" +#include "offline-passwd.h" #include "tests.h" +#include "user-util.h" static char *arg_root = NULL; diff --git a/src/udev/udev-builtin-keyboard.c b/src/udev/udev-builtin-keyboard.c index 1595a8f0318..e17fcbe74c8 100644 --- a/src/udev/udev-builtin-keyboard.c +++ b/src/udev/udev-builtin-keyboard.c @@ -2,9 +2,9 @@ #include #include +#include #include #include -#include #include "device-util.h" #include "fd-util.h" diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c index eaef7d56b2d..406ff7a86f0 100644 --- a/src/udev/udev-builtin-net_id.c +++ b/src/udev/udev-builtin-net_id.c @@ -12,16 +12,15 @@ * When the code here is changed, man/systemd.net-naming-scheme.xml must be updated too. */ -/* Make sure the net/if.h header is included before any linux/ one */ -#include #include #include -#include -#include #include #include #include #include +#include +#include +#include #include "alloc-util.h" #include "chase.h" diff --git a/src/udev/udevadm-control.c b/src/udev/udevadm-control.c index 64eef31a81a..8b665366177 100644 --- a/src/udev/udevadm-control.c +++ b/src/udev/udevadm-control.c @@ -18,9 +18,9 @@ #include "strv.h" #include "syslog-util.h" #include "time-util.h" -#include "udevadm.h" #include "udev-ctrl.h" #include "udev-varlink.h" +#include "udevadm.h" #include "varlink-util.h" #include "virt.h" diff --git a/src/udev/udevadm-settle.c b/src/udev/udevadm-settle.c index 8a4f96eec28..6f87f76fcdb 100644 --- a/src/udev/udevadm-settle.c +++ b/src/udev/udevadm-settle.c @@ -17,8 +17,8 @@ #include "strv.h" #include "time-util.h" #include "udev-util.h" -#include "udevadm-util.h" #include "udevadm.h" +#include "udevadm-util.h" #include "unit-def.h" #include "virt.h" diff --git a/src/udev/udevadm-test.c b/src/udev/udevadm-test.c index 51a63b21745..7b5fdb59ce0 100644 --- a/src/udev/udevadm-test.c +++ b/src/udev/udevadm-test.c @@ -18,8 +18,8 @@ #include "udev-dump.h" #include "udev-event.h" #include "udev-rules.h" -#include "udevadm-util.h" #include "udevadm.h" +#include "udevadm-util.h" static sd_device_action_t arg_action = SD_DEVICE_ADD; static ResolveNameTiming arg_resolve_name_timing = RESOLVE_NAME_EARLY; diff --git a/src/udev/v4l_id/v4l_id.c b/src/udev/v4l_id/v4l_id.c index 6bc04e67e8d..312a8233b10 100644 --- a/src/udev/v4l_id/v4l_id.c +++ b/src/udev/v4l_id/v4l_id.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include @@ -14,7 +15,6 @@ #include #include #include -#include #include "build.h" #include "fd-util.h" diff --git a/src/update-utmp/update-utmp.c b/src/update-utmp/update-utmp.c index 6df94140638..488c8c18eab 100644 --- a/src/update-utmp/update-utmp.c +++ b/src/update-utmp/update-utmp.c @@ -7,8 +7,8 @@ #include "sd-bus.h" -#include "audit-util.h" #include "alloc-util.h" +#include "audit-util.h" #include "bus-error.h" #include "bus-locator.h" #include "bus-util.h" diff --git a/src/userdb/userdbd.c b/src/userdb/userdbd.c index cbe4c8e4f85..434a50a329e 100644 --- a/src/userdb/userdbd.c +++ b/src/userdb/userdbd.c @@ -4,10 +4,10 @@ #include #include "daemon-util.h" -#include "userdbd-manager.h" #include "log.h" #include "main-func.h" #include "signal-util.h" +#include "userdbd-manager.h" /* This service offers two Varlink services, both implementing io.systemd.UserDatabase: * diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c index 131bd41c72c..6edb71308ff 100644 --- a/src/vconsole/vconsole-setup.c +++ b/src/vconsole/vconsole-setup.c @@ -13,10 +13,10 @@ #include #include #include -#include -#include #include #include +#include +#include #include #include "alloc-util.h" diff --git a/src/vmspawn/test-vmspawn-util.c b/src/vmspawn/test-vmspawn-util.c index 67e5c4cefcb..aaf55245364 100644 --- a/src/vmspawn/test-vmspawn-util.c +++ b/src/vmspawn/test-vmspawn-util.c @@ -4,8 +4,8 @@ #include "alloc-util.h" #include "string-util.h" -#include "vmspawn-util.h" #include "tests.h" +#include "vmspawn-util.h" #define _ESCAPE_QEMU_VALUE_CHECK(str, correct, varname) \ do { \ diff --git a/src/vmspawn/vmspawn-register.c b/src/vmspawn/vmspawn-register.c index c9b0d9779ba..a55caebc119 100644 --- a/src/vmspawn/vmspawn-register.c +++ b/src/vmspawn/vmspawn-register.c @@ -16,8 +16,8 @@ #include "socket-util.h" #include "string-util.h" #include "terminal-util.h" -#include "vmspawn-register.h" #include "varlink-util.h" +#include "vmspawn-register.h" int register_machine( sd_bus *bus, diff --git a/src/vmspawn/vmspawn-util.c b/src/vmspawn/vmspawn-util.c index 22cfa289fae..5700a0c893c 100644 --- a/src/vmspawn/vmspawn-util.c +++ b/src/vmspawn/vmspawn-util.c @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include #include +#include #include "sd-json.h" diff --git a/src/vmspawn/vmspawn.c b/src/vmspawn/vmspawn.c index e3cb03f651c..4b1898ac3f6 100644 --- a/src/vmspawn/vmspawn.c +++ b/src/vmspawn/vmspawn.c @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include -#include #include +#include +#include #include #include #include diff --git a/src/xdg-autostart-generator/xdg-autostart-service.c b/src/xdg-autostart-generator/xdg-autostart-service.c index c5852a3d64d..a00b9d30634 100644 --- a/src/xdg-autostart-generator/xdg-autostart-service.c +++ b/src/xdg-autostart-generator/xdg-autostart-service.c @@ -4,8 +4,6 @@ #include #include -#include "xdg-autostart-service.h" - #include "conf-parser.h" #include "escape.h" #include "fd-util.h" @@ -20,6 +18,7 @@ #include "strv.h" #include "unit-name.h" #include "user-util.h" +#include "xdg-autostart-service.h" XdgAutostartService* xdg_autostart_service_free(XdgAutostartService *s) { if (!s) -- 2.47.3