From 01e1303f9c61597194dec5fbc1a97484b6642d7a Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 10 Jul 2026 20:44:44 +0900 Subject: [PATCH] Rename basic-forward.h, sd-forward.h, and shared-forward.h to forward.h Follow-up for 74d392ed1bab578e901699ee272faa0c8b922128. --- docs/CODING_STYLE.md | 15 +++++++-------- meson.build | 2 +- src/analyze/analyze-architectures.h | 2 +- src/analyze/analyze-blame.h | 2 +- src/analyze/analyze-calendar.h | 2 +- src/analyze/analyze-capability.h | 2 +- src/analyze/analyze-cat-config.h | 2 +- src/analyze/analyze-chid.h | 2 +- src/analyze/analyze-compare-versions.h | 2 +- src/analyze/analyze-condition.h | 2 +- src/analyze/analyze-critical-chain.h | 2 +- src/analyze/analyze-dlopen-metadata.h | 2 +- src/analyze/analyze-dot.h | 2 +- src/analyze/analyze-dump.h | 2 +- src/analyze/analyze-exit-status.h | 2 +- src/analyze/analyze-fdstore.h | 2 +- src/analyze/analyze-filesystems.h | 2 +- src/analyze/analyze-has-tpm2.h | 2 +- src/analyze/analyze-image-policy.h | 2 +- src/analyze/analyze-inspect-elf.h | 2 +- src/analyze/analyze-log-control.h | 2 +- src/analyze/analyze-malloc.h | 2 +- src/analyze/analyze-nvpcrs.h | 2 +- src/analyze/analyze-pcrs.h | 2 +- src/analyze/analyze-plot.h | 2 +- src/analyze/analyze-security.h | 2 +- src/analyze/analyze-service-watchdogs.h | 2 +- src/analyze/analyze-smbios11.h | 2 +- src/analyze/analyze-srk.h | 2 +- src/analyze/analyze-syscall-filter.h | 2 +- src/analyze/analyze-time-data.h | 2 +- src/analyze/analyze-time.h | 2 +- src/analyze/analyze-timespan.h | 2 +- src/analyze/analyze-timestamp.h | 2 +- src/analyze/analyze-unit-files.h | 2 +- src/analyze/analyze-unit-gdb.h | 2 +- src/analyze/analyze-unit-paths.h | 2 +- src/analyze/analyze-unit-shell.h | 2 +- src/analyze/analyze-verify-util.h | 2 +- src/analyze/analyze-verify.h | 2 +- src/analyze/analyze.h | 2 +- src/basic/af-list.h | 2 +- src/basic/alloc-util.h | 2 +- src/basic/ansi-color.h | 2 +- src/basic/architecture.h | 2 +- src/basic/argv-util.h | 2 +- src/basic/arphrd-util.h | 2 +- src/basic/audit-util.h | 2 +- src/basic/bitfield.h | 2 +- src/basic/btrfs-util.h | 2 +- src/basic/build.h | 2 +- src/basic/bus-label.h | 2 +- src/basic/capability-list.h | 2 +- src/basic/capability-util.h | 2 +- src/basic/capsule-util.h | 2 +- src/basic/cgroup-util.h | 2 +- src/basic/chase.h | 2 +- src/basic/chattr-util.h | 2 +- src/basic/compress.h | 2 +- src/basic/conf-files.h | 2 +- src/basic/confidential-virt.h | 2 +- src/basic/device-nodes.h | 2 +- src/basic/devnum-util.h | 2 +- src/basic/dirent-util.h | 2 +- src/basic/dlfcn-util.h | 2 +- src/basic/dlopen-note.h | 2 +- src/basic/dns-def.h | 2 +- src/basic/efivars.h | 2 +- src/basic/env-file.h | 2 +- src/basic/env-util.h | 2 +- src/basic/errno-list.h | 2 +- src/basic/errno-util.h | 2 +- src/basic/escape.h | 2 +- src/basic/ether-addr-util.h | 2 +- src/basic/extract-word.h | 2 +- src/basic/fd-util.h | 2 +- src/basic/fiber-ops.h | 2 +- src/basic/fileio.h | 2 +- src/basic/filesystems.h | 2 +- src/basic/format-util.h | 2 +- src/basic/{basic-forward.h => forward.h} | 0 src/basic/fs-util.h | 2 +- src/basic/glob-util.h | 2 +- src/basic/glyph-util.h | 2 +- src/basic/gunicode.h | 2 +- src/basic/hash-funcs.h | 2 +- src/basic/hashmap.h | 2 +- src/basic/hexdecoct.h | 2 +- src/basic/hmac.h | 2 +- src/basic/hostname-util.h | 2 +- src/basic/in-addr-util.h | 2 +- src/basic/initrd-util.h | 2 +- src/basic/inotify-util.h | 2 +- src/basic/io-util.h | 2 +- src/basic/iovec-util.h | 2 +- src/basic/iovec-wrapper.h | 2 +- src/basic/iterator.h | 2 +- src/basic/keyring-util.h | 2 +- src/basic/label-util.h | 2 +- src/basic/limits-util.h | 2 +- src/basic/list.h | 2 +- src/basic/locale-util.h | 2 +- src/basic/lock-util.h | 2 +- src/basic/log-context.h | 2 +- src/basic/log.h | 2 +- src/basic/login-util.h | 2 +- src/basic/math-util.h | 2 +- src/basic/memfd-util.h | 2 +- src/basic/memory-util.h | 2 +- src/basic/mempool.h | 2 +- src/basic/memstream-util.h | 2 +- src/basic/mkdir.h | 2 +- src/basic/mountpoint-util.h | 2 +- src/basic/namespace-util.h | 2 +- src/basic/nulstr-util.h | 2 +- src/basic/ordered-set.h | 2 +- src/basic/os-util.h | 2 +- src/basic/parse-util.h | 2 +- src/basic/path-util.h | 2 +- src/basic/pcapng.h | 2 +- src/basic/percent-util.h | 2 +- src/basic/pidfd-util.h | 2 +- src/basic/pidref.h | 2 +- src/basic/prioq.h | 2 +- src/basic/proc-cmdline.h | 2 +- src/basic/process-util.h | 2 +- src/basic/procfs-util.h | 2 +- src/basic/psi-util.h | 2 +- src/basic/pthread-util.h | 2 +- src/basic/random-util.h | 2 +- src/basic/ratelimit.h | 2 +- src/basic/raw-clone.h | 2 +- src/basic/recurse-dir.h | 2 +- src/basic/replace-var.h | 2 +- src/basic/rlimit-util.h | 2 +- src/basic/runtime-scope.h | 2 +- src/basic/set.h | 2 +- src/basic/sha256.h | 2 +- src/basic/sigbus.h | 2 +- src/basic/signal-util.h | 2 +- src/basic/siphash24.h | 2 +- src/basic/socket-util.h | 2 +- src/basic/sort-util.h | 2 +- src/basic/sparse-endian.h | 2 +- src/basic/stat-util.h | 2 +- src/basic/static-destruct.h | 2 +- src/basic/stdio-util.h | 2 +- src/basic/strbuf.h | 2 +- src/basic/string-table.h | 2 +- src/basic/string-util.h | 2 +- src/basic/strv.h | 2 +- src/basic/strxcpyx.h | 2 +- src/basic/sync-util.h | 2 +- src/basic/sysctl-util.h | 2 +- src/basic/syslog-util.h | 2 +- src/basic/terminal-util.h | 2 +- src/basic/time-util.h | 2 +- src/basic/tmpfile-util.h | 2 +- src/basic/uid-classification.h | 2 +- src/basic/uid-range.h | 2 +- src/basic/umask-util.h | 2 +- src/basic/unaligned.h | 2 +- src/basic/unit-def.h | 2 +- src/basic/unit-name.h | 2 +- src/basic/user-util.h | 2 +- src/basic/utf8.h | 2 +- src/basic/virt.h | 2 +- src/basic/xattr-util.h | 2 +- src/bootctl/bootctl-cleanup.h | 2 +- src/bootctl/bootctl-install.h | 2 +- src/bootctl/bootctl-link.h | 2 +- src/bootctl/bootctl-random-seed.h | 2 +- src/bootctl/bootctl-reboot-to-firmware.h | 2 +- src/bootctl/bootctl-set-efivar.h | 2 +- src/bootctl/bootctl-status.h | 2 +- src/bootctl/bootctl-uki.h | 2 +- src/bootctl/bootctl-unlink.h | 2 +- src/bootctl/bootctl.h | 2 +- src/busctl/busctl-introspect.h | 2 +- src/core/bpf-restrict-fsaccess.h | 2 +- src/core/core-forward.h | 2 +- src/core/varlink-execute.h | 2 +- src/coredump/coredump-forward.h | 2 +- src/coredump/coredump-vacuum.h | 2 +- src/cryptenroll/cryptenroll-fido2.h | 2 +- src/cryptenroll/cryptenroll-list.h | 2 +- src/cryptenroll/cryptenroll-password.h | 2 +- src/cryptenroll/cryptenroll-pkcs11.h | 2 +- src/cryptenroll/cryptenroll-recovery.h | 2 +- src/cryptenroll/cryptenroll-tpm2.h | 2 +- src/cryptenroll/cryptenroll-wipe.h | 2 +- src/cryptenroll/cryptenroll.h | 2 +- src/cryptsetup/cryptsetup-keyfile.h | 2 +- src/cryptsetup/cryptsetup-pkcs11.h | 2 +- .../cryptsetup-tokens/cryptsetup-token-util.h | 2 +- .../cryptsetup-tokens/cryptsetup-token.h | 2 +- src/cryptsetup/cryptsetup-tokens/luks2-pkcs11.h | 2 +- src/fuzz/fuzz.h | 2 +- src/hibernate-resume/hibernate-resume-config.h | 2 +- src/home/homectl-fido2.h | 2 +- src/home/homectl-pkcs11.h | 2 +- src/home/homectl-recovery-key.h | 2 +- src/home/homed-forward.h | 2 +- src/home/homework-forward.h | 2 +- src/home/user-record-password-quality.h | 2 +- src/home/user-record-sign.h | 2 +- src/home/user-record-util.h | 2 +- src/imds/imds-tool.h | 2 +- src/import/export-raw.h | 2 +- src/import/export-tar.h | 1 - src/import/import-common.h | 2 +- src/import/import-raw.h | 1 - src/import/import-tar.h | 1 - src/import/oci-util.h | 2 +- src/import/pull-forward.h | 2 +- src/integritysetup/integrity-util.h | 2 +- src/journal-remote/journal-compression-util.h | 2 +- src/journal-remote/journal-header-util.h | 2 +- src/journal-remote/journal-remote-parse.h | 2 +- src/journal-remote/journal-remote.h | 2 +- src/journal-remote/journal-upload.h | 2 +- src/journal/audit-type.h | 2 +- src/journal/journalctl-filter.h | 2 +- src/journal/journalctl-metrics.h | 2 +- src/journal/journalctl-misc.h | 2 +- src/journal/journalctl-util.h | 2 +- src/journal/journalctl.h | 2 +- src/journal/journald-forward.h | 2 +- src/libsystemd-network/arp-util.h | 2 +- src/libsystemd-network/dhcp-forward.h | 2 +- src/libsystemd-network/dhcp6-client-internal.h | 2 +- src/libsystemd-network/dhcp6-internal.h | 2 +- src/libsystemd-network/dhcp6-lease-internal.h | 2 +- src/libsystemd-network/dhcp6-option.h | 2 +- src/libsystemd-network/dhcp6-protocol.h | 2 +- src/libsystemd-network/dns-resolver-internal.h | 2 +- src/libsystemd-network/icmp6-packet.h | 2 +- src/libsystemd-network/icmp6-util.h | 2 +- src/libsystemd-network/ip-util.h | 2 +- src/libsystemd-network/lldp-neighbor.h | 2 +- src/libsystemd-network/lldp-rx-internal.h | 2 +- src/libsystemd-network/ndisc-internal.h | 2 +- src/libsystemd-network/ndisc-neighbor-internal.h | 2 +- src/libsystemd-network/ndisc-option.h | 2 +- src/libsystemd-network/ndisc-redirect-internal.h | 2 +- .../ndisc-router-solicit-internal.h | 2 +- src/libsystemd-network/network-common.h | 2 +- src/libsystemd-network/network-internal.h | 2 +- src/libsystemd-network/radv-internal.h | 2 +- src/libsystemd-network/tlv-util.h | 2 +- .../{sd-common/sd-forward.h => forward.h} | 2 +- src/libsystemd/sd-bus/bus-container.h | 2 +- src/libsystemd/sd-bus/bus-control.h | 2 +- src/libsystemd/sd-bus/bus-creds.h | 2 +- src/libsystemd/sd-bus/bus-dump.h | 2 +- src/libsystemd/sd-bus/bus-error.h | 2 +- src/libsystemd/sd-bus/bus-forward.h | 2 +- src/libsystemd/sd-bus/bus-future.h | 2 +- src/libsystemd/sd-bus/bus-kernel.h | 2 +- src/libsystemd/sd-bus/bus-signature.h | 2 +- src/libsystemd/sd-bus/bus-socket.h | 2 +- src/libsystemd/sd-bus/bus-track.h | 2 +- src/libsystemd/sd-bus/bus-type.h | 2 +- .../sd-device/device-enumerator-private.h | 2 +- src/libsystemd/sd-device/device-filter.h | 2 +- src/libsystemd/sd-device/device-internal.h | 2 +- src/libsystemd/sd-device/device-monitor-private.h | 2 +- src/libsystemd/sd-device/device-private.h | 2 +- src/libsystemd/sd-device/device-util.h | 2 +- src/libsystemd/sd-event/event-future.h | 2 +- src/libsystemd/sd-event/event-source.h | 2 +- src/libsystemd/sd-event/event-util.h | 2 +- src/libsystemd/sd-hwdb/hwdb-internal.h | 2 +- src/libsystemd/sd-id128/id128-util.h | 2 +- src/libsystemd/sd-journal/catalog.h | 2 +- .../sd-journal/journal-authenticate-internal.h | 2 +- src/libsystemd/sd-journal/journal-def.h | 2 +- src/libsystemd/sd-journal/journal-file.h | 2 +- src/libsystemd/sd-journal/journal-internal.h | 2 +- src/libsystemd/sd-journal/journal-vacuum.h | 2 +- src/libsystemd/sd-journal/lookup3.h | 2 +- src/libsystemd/sd-journal/mmap-cache.h | 2 +- src/libsystemd/sd-json/json-internal.h | 2 +- src/libsystemd/sd-json/json-stream.h | 2 +- src/libsystemd/sd-json/json-util.h | 2 +- src/libsystemd/sd-netlink/netlink-genl.h | 2 +- src/libsystemd/sd-netlink/netlink-internal.h | 2 +- src/libsystemd/sd-netlink/netlink-slot.h | 2 +- src/libsystemd/sd-netlink/netlink-types.h | 2 +- src/libsystemd/sd-netlink/netlink-util.h | 2 +- src/libsystemd/sd-network/network-util.h | 2 +- src/libsystemd/sd-path/path-lookup.h | 2 +- src/libsystemd/sd-varlink/varlink-idl-util.h | 2 +- src/libsystemd/sd-varlink/varlink-internal.h | 2 +- src/libsystemd/sd-varlink/varlink-util.h | 2 +- src/libudev/libudev-device-internal.h | 2 +- src/libudev/libudev-list-internal.h | 2 +- src/libudev/libudev-util.c | 1 - src/libudev/libudev-util.h | 2 +- src/locale/localed-util.h | 2 +- src/locale/xkbcommon-util.h | 2 +- src/login/logind-forward.h | 2 +- src/login/sysfs-show.h | 2 +- src/machine/machine-forward.h | 2 +- src/mountfsd/mountfsd-manager.h | 2 +- src/network/netdev/bareudp.h | 1 - src/network/netdev/batadv.h | 1 - src/network/netdev/bond.h | 1 - src/network/netdev/bridge.h | 1 - src/network/netdev/dummy.h | 1 - src/network/netdev/fou-tunnel.h | 1 - src/network/netdev/geneve.h | 1 - src/network/netdev/l2tp-tunnel.h | 1 - src/network/netdev/macsec.h | 1 - src/network/netdev/tunnel.h | 1 - src/network/netdev/tuntap.h | 1 - src/network/netdev/vlan.h | 1 - src/network/netdev/wireguard.h | 1 - src/network/netdev/wlan.h | 1 - src/network/netdev/xfrm.h | 1 - src/network/networkctl-address-label.h | 2 +- src/network/networkctl-config-file.h | 2 +- src/network/networkctl-dhcp-lease.h | 2 +- src/network/networkctl-dump-util.h | 3 +-- src/network/networkctl-link-info-json.h | 2 +- src/network/networkctl-link-info.h | 2 +- src/network/networkctl-list.h | 2 +- src/network/networkctl-lldp.h | 2 +- src/network/networkctl-misc.h | 2 +- src/network/networkctl-status-link.h | 2 +- src/network/networkctl-status-system.h | 2 +- src/network/networkctl-util.h | 2 +- src/network/networkctl.h | 2 +- src/network/networkd-forward.h | 2 +- src/network/tc/drr.h | 1 - src/network/tc/ets.h | 1 - src/network/tc/fifo.h | 1 - src/network/tc/fq-codel.h | 1 - src/network/tc/fq-pie.h | 1 - src/network/tc/fq.h | 1 - src/network/tc/gred.h | 1 - src/network/tc/hhf.h | 1 - src/network/tc/htb.h | 1 - src/network/tc/mq.c | 1 - src/network/tc/mq.h | 1 - src/network/tc/multiq.h | 1 - src/network/tc/netem.h | 1 - src/network/tc/pie.h | 1 - src/network/tc/qfq.h | 1 - src/network/tc/sfb.h | 1 - src/network/tc/sfq.h | 1 - src/network/tc/tbf.h | 1 - src/network/tc/tc-util.h | 2 +- src/network/tc/teql.h | 1 - src/network/wait-online/wait-online-link.h | 2 +- src/network/wait-online/wait-online-manager.h | 2 +- src/nspawn/nspawn-bind-user.h | 2 +- src/nspawn/nspawn-cgroup.h | 2 +- src/nspawn/nspawn-expose-ports.h | 2 +- src/nspawn/nspawn-mount.h | 2 +- src/nspawn/nspawn-network.h | 2 +- src/nspawn/nspawn-oci.h | 2 +- src/nspawn/nspawn-register.h | 2 +- src/nspawn/nspawn-seccomp.h | 2 +- src/nspawn/nspawn-settings.h | 2 +- src/nspawn/nspawn-setuid.h | 2 +- src/nspawn/nspawn-stub-pid1.h | 2 +- src/nspawn/nspawn.h | 2 +- src/nsresourced/nsresourced-manager.h | 2 +- src/nsresourced/userns-registry.h | 2 +- src/nsresourced/userns-restrict.h | 2 +- src/nss-systemd/nss-systemd.h | 2 +- src/nss-systemd/userdb-glue.h | 2 +- src/oom/oomd-manager-bus.h | 2 +- src/oom/oomd-manager.h | 2 +- src/oom/oomd-util.h | 2 +- src/pcrlock/pcrlock-firmware.h | 2 +- src/portable/portable.h | 2 +- src/portable/portabled-forward.h | 2 +- src/repart/iso9660.h | 2 +- src/repart/repart-list-candidate-devices.h | 2 +- src/report/report-basic.h | 2 +- src/report/report-cgroup.h | 2 +- src/report/report-files.h | 2 +- src/report/report.h | 2 +- src/resolve/resolvectl.h | 2 +- src/resolve/resolved-dns-dnssec-crypto.h | 2 +- src/resolve/resolved-forward.h | 2 +- src/sbsign/authenticode.h | 2 +- src/shared/acl-util.h | 2 +- src/shared/acpi-fpdt.h | 2 +- src/shared/apparmor-util.h | 2 +- src/shared/ask-password-agent.h | 2 +- src/shared/ask-password-api.h | 2 +- src/shared/async.h | 2 +- src/shared/barrier.h | 2 +- src/shared/base-filesystem.h | 2 +- src/shared/battery-util.h | 2 +- src/shared/bitmap.h | 2 +- src/shared/blkid-util.h | 2 +- src/shared/blockdev-list.h | 3 +-- src/shared/blockdev-util.h | 2 +- src/shared/bond-util.h | 2 +- src/shared/boot-entry.h | 2 +- src/shared/boot-timestamps.h | 2 +- src/shared/bootspec.h | 2 +- src/shared/bpf-link.h | 2 +- src/shared/bpf-program.h | 2 +- src/shared/bpf-util.h | 2 +- src/shared/bridge-util.h | 2 +- src/shared/btrfs-util.h | 2 +- src/shared/bus-get-properties.h | 2 +- src/shared/bus-locator.h | 2 +- src/shared/bus-log-control-api.h | 2 +- src/shared/bus-map-properties.h | 2 +- src/shared/bus-message-util.h | 2 +- src/shared/bus-object.h | 2 +- src/shared/bus-polkit.h | 2 +- src/shared/bus-print-properties.h | 2 +- src/shared/bus-unit-procs.h | 2 +- src/shared/bus-unit-util.h | 2 +- src/shared/bus-util.h | 2 +- src/shared/bus-wait-for-jobs.h | 2 +- src/shared/bus-wait-for-units.h | 2 +- src/shared/calendarspec.h | 2 +- src/shared/cgroup-setup.h | 2 +- src/shared/cgroup-show.h | 2 +- src/shared/chown-recursive.h | 2 +- src/shared/clean-ipc.h | 2 +- src/shared/color-util.h | 2 +- src/shared/common-signal.h | 2 +- src/shared/compare-operator.h | 2 +- src/shared/condition.h | 2 +- src/shared/copy.h | 2 +- src/shared/coredump-util.h | 2 +- src/shared/cpu-set-util.h | 2 +- src/shared/creds-util.h | 2 +- src/shared/crypto-util.h | 2 +- src/shared/cryptsetup-fido2.h | 2 +- src/shared/cryptsetup-tpm2.h | 3 +-- src/shared/cryptsetup-util.h | 2 +- src/shared/curl-util.h | 2 +- src/shared/daemon-util.h | 2 +- src/shared/data-fd-util.h | 2 +- src/shared/dev-setup.h | 2 +- src/shared/discover-image.h | 2 +- src/shared/dissect-image.h | 2 +- src/shared/dlopen-note.h | 2 +- src/shared/dns-answer.h | 2 +- src/shared/dns-configuration.h | 2 +- src/shared/dns-domain.h | 2 +- src/shared/dns-packet.h | 2 +- src/shared/dns-question.h | 2 +- src/shared/dns-rr.h | 2 +- src/shared/dns-type.h | 2 +- src/shared/dropin.h | 2 +- src/shared/edit-util.h | 2 +- src/shared/efi-api.h | 2 +- src/shared/efi-loader.h | 2 +- src/shared/elf-util.h | 2 +- src/shared/ethtool-util.h | 2 +- src/shared/exec-util.h | 2 +- src/shared/exit-status.h | 2 +- src/shared/extension-util.h | 2 +- src/shared/factory-reset.h | 2 +- src/shared/fdisk-util.h | 2 +- src/shared/fdset.h | 2 +- src/shared/fido2-util.h | 2 +- src/shared/find-esp.h | 2 +- src/shared/firewall-util.h | 2 +- src/shared/firstboot-util.h | 2 +- src/shared/fork-notify.h | 2 +- src/shared/format-table.h | 2 +- src/shared/{shared-forward.h => forward.h} | 3 ++- src/shared/fsprg-openssl.h | 2 +- src/shared/fstab-util.h | 2 +- src/shared/generator.h | 2 +- src/shared/geneve-util.h | 2 +- src/shared/gnutls-util.h | 2 +- src/shared/gpt.h | 2 +- src/shared/group-record.h | 2 +- src/shared/hibernate-util.h | 2 +- src/shared/hostname-setup.h | 2 +- src/shared/hwdb-util.h | 2 +- src/shared/id128-print.h | 2 +- src/shared/idn-util.h | 2 +- src/shared/ima-util.h | 2 +- src/shared/image-policy.h | 2 +- src/shared/import-util.h | 2 +- src/shared/in-addr-prefix-util.h | 2 +- src/shared/initrd-cpio.h | 2 +- src/shared/install-file.h | 2 +- src/shared/install-printf.h | 2 +- src/shared/install.h | 2 +- src/shared/ioprio-util.h | 2 +- src/shared/ip-protocol-list.h | 2 +- src/shared/ipvlan-util.h | 2 +- src/shared/journal-authenticate.h | 2 +- src/shared/journal-file-util.h | 2 +- src/shared/journal-importer.h | 2 +- src/shared/journal-util.h | 2 +- src/shared/kbd-util.h | 2 +- src/shared/kernel-config.h | 2 +- src/shared/kernel-image.h | 2 +- src/shared/killall.h | 2 +- src/shared/label-util.h | 2 +- src/shared/libarchive-util.h | 2 +- src/shared/libaudit-util.h | 2 +- src/shared/libcrypt-util.h | 2 +- src/shared/libfido2-util.h | 2 +- src/shared/libmount-util.h | 2 +- src/shared/local-addresses.h | 2 +- src/shared/locale-setup.h | 2 +- src/shared/log-assert-critical.h | 2 +- src/shared/logs-show.h | 2 +- src/shared/loop-util.h | 2 +- src/shared/luo-util.h | 3 +-- src/shared/machine-bind-user.h | 2 +- src/shared/machine-credential.h | 2 +- src/shared/machine-id-setup.h | 2 +- src/shared/machine-register.h | 2 +- src/shared/machine-util.h | 2 +- src/shared/macvlan-util.h | 2 +- src/shared/main-func.h | 2 +- src/shared/metrics.h | 2 +- src/shared/microhttpd-util.h | 2 +- src/shared/mkdir.h | 2 +- src/shared/mkfs-util.h | 2 +- src/shared/module-util.h | 2 +- src/shared/mount-setup.h | 2 +- src/shared/mount-util.h | 2 +- src/shared/mstack.h | 2 +- src/shared/net-condition.h | 2 +- src/shared/netif-naming-scheme.h | 2 +- src/shared/netif-sriov.h | 2 +- src/shared/netif-util.h | 2 +- src/shared/notify-recv.h | 2 +- src/shared/nsflags.h | 2 +- src/shared/nsresource.h | 2 +- src/shared/nss-util.h | 2 +- src/shared/numa-util.h | 2 +- src/shared/open-file.h | 2 +- src/shared/options.h | 2 +- src/shared/osc-context.h | 2 +- src/shared/output-mode.h | 2 +- src/shared/pager.h | 2 +- src/shared/pam-util.h | 2 +- src/shared/parse-argument.h | 2 +- src/shared/parse-helpers.h | 2 +- src/shared/password-quality-util-passwdqc.h | 2 +- src/shared/password-quality-util-pwquality.h | 2 +- src/shared/pcre2-util.h | 2 +- src/shared/pcrextend-util.h | 2 +- src/shared/pkcs11-padding.h | 2 +- src/shared/pkcs11-util.h | 2 +- src/shared/plymouth-util.h | 2 +- src/shared/polkit-agent.h | 2 +- src/shared/portable-util.h | 2 +- src/shared/pretty-print.h | 2 +- src/shared/prompt-util.h | 2 +- src/shared/ptyfwd.h | 2 +- src/shared/qmp-client.h | 2 +- src/shared/qrcode-util.h | 2 +- src/shared/quota-util.h | 2 +- src/shared/reboot-util.h | 2 +- src/shared/recovery-key.h | 2 +- src/shared/reread-partition-table.h | 4 +--- src/shared/resize-fs.h | 2 +- src/shared/resolve-hook-util.h | 2 +- src/shared/resolve-util.h | 2 +- src/shared/resolve-varlink-util.h | 2 +- src/shared/resolved-def.h | 2 +- src/shared/rm-rf.h | 2 +- src/shared/seccomp-util.h | 2 +- src/shared/securebits-util.h | 2 +- src/shared/selinux-util.h | 2 +- src/shared/serialize.h | 2 +- src/shared/service-util.h | 2 +- src/shared/shift-uid.h | 2 +- src/shared/sleep-config.h | 2 +- src/shared/smack-util.h | 2 +- src/shared/smbios11.h | 2 +- src/shared/snapshot-util.h | 2 +- src/shared/socket-forward.h | 2 +- src/shared/socket-label.h | 2 +- src/shared/socket-netlink.h | 2 +- src/shared/specifier.h | 2 +- src/shared/ssl-util.h | 2 +- src/shared/switch-root.h | 2 +- src/shared/test-tables.h | 2 +- src/shared/tests.h | 2 +- src/shared/tomoyo-util.h | 2 +- src/shared/tpm2-event-log.h | 2 +- src/shared/tpm2-util.h | 2 +- src/shared/tsm-report.h | 2 +- src/shared/udev-util.h | 2 +- src/shared/unit-file.h | 2 +- src/shared/user-record-nss.h | 2 +- src/shared/user-record-show.h | 2 +- src/shared/user-record.h | 2 +- src/shared/userdb-dropin.h | 2 +- src/shared/userdb.h | 2 +- src/shared/utmp-wtmp.h | 2 +- src/shared/varlink-serialize.h | 2 +- src/shared/vconsole-util.h | 2 +- src/shared/verb-log-control.h | 2 +- src/shared/verbs.h | 2 +- src/shared/vlan-util.h | 2 +- src/shared/volatile-util.h | 2 +- src/shared/vpick.h | 2 +- src/shared/wall.h | 2 +- src/shared/watchdog.h | 2 +- src/shared/web-util.h | 2 +- src/shared/wifi-util.h | 2 +- src/shared/xml.h | 2 +- src/shutdown/detach-dm.h | 2 +- src/shutdown/detach-loopback.h | 2 +- src/shutdown/detach-md.h | 2 +- src/shutdown/detach-swap.h | 2 +- src/shutdown/umount.h | 2 +- src/systemctl/systemctl-add-dependency.h | 2 +- src/systemctl/systemctl-cancel-job.h | 2 +- src/systemctl/systemctl-clean-or-freeze.h | 2 +- src/systemctl/systemctl-edit.h | 2 +- src/systemctl/systemctl-enable.h | 2 +- src/systemctl/systemctl-is-active.h | 2 +- src/systemctl/systemctl-is-enabled.h | 2 +- src/systemctl/systemctl-is-system-running.h | 2 +- src/systemctl/systemctl-kill.h | 2 +- src/systemctl/systemctl-list-dependencies.h | 2 +- src/systemctl/systemctl-list-jobs.h | 2 +- src/systemctl/systemctl-list-machines.h | 2 +- src/systemctl/systemctl-list-unit-files.h | 2 +- src/systemctl/systemctl-log-setting.h | 2 +- src/systemctl/systemctl-mount.h | 2 +- src/systemctl/systemctl-preset-all.h | 2 +- src/systemctl/systemctl-reset-failed.h | 2 +- src/systemctl/systemctl-service-watchdogs.h | 2 +- src/systemctl/systemctl-set-default.h | 2 +- src/systemctl/systemctl-set-environment.h | 2 +- src/systemctl/systemctl-set-property.h | 2 +- src/systemctl/systemctl-show.h | 2 +- src/systemctl/systemctl-start-special.h | 2 +- src/systemctl/systemctl-switch-root.h | 2 +- src/systemctl/systemctl-trivial-method.h | 2 +- src/systemctl/systemctl-whoami.h | 2 +- src/systemctl/systemctl.h | 2 +- src/sysupdate/sysupdate-config.h | 2 +- src/sysupdate/sysupdate-forward.h | 2 +- src/sysupdate/sysupdate-update-set-flags.h | 2 +- src/test/fsprg.h | 2 +- src/test/gcrypt-util.h | 2 +- src/test/nss-test-util.h | 2 +- src/test/test-dlopen.c | 2 +- src/test/test-sizeof.c | 2 +- src/timedate/hwclock-util.h | 2 +- src/timesync/timesyncd-forward.h | 2 +- src/tmpfiles/offline-passwd.h | 2 +- src/udev/fido_id/fido_id_desc.h | 2 +- src/udev/mtd_probe/mtd_probe.h | 2 +- src/udev/net/link-config.h | 2 +- src/udev/scsi_id/scsi_id.h | 2 +- src/udev/udev-forward.h | 2 +- src/udev/udevadm-util.h | 2 +- src/udev/udevadm.h | 2 +- src/userdb/userdbd-manager.h | 2 +- src/vmspawn/vmspawn-bind-volume.h | 2 +- src/vmspawn/vmspawn-mount.h | 2 +- src/vmspawn/vmspawn-qmp.h | 2 +- src/vmspawn/vmspawn-scope.h | 2 +- src/vmspawn/vmspawn-settings.h | 2 +- src/vmspawn/vmspawn-util.h | 2 +- src/vmspawn/vmspawn-varlink.h | 2 +- .../xdg-autostart-service.h | 2 +- 674 files changed, 642 insertions(+), 686 deletions(-) rename src/basic/{basic-forward.h => forward.h} (100%) rename src/libsystemd/{sd-common/sd-forward.h => forward.h} (98%) rename src/shared/{shared-forward.h => forward.h} (96%) diff --git a/docs/CODING_STYLE.md b/docs/CODING_STYLE.md index 51551962f5..aa751e8228 100644 --- a/docs/CODING_STYLE.md +++ b/docs/CODING_STYLE.md @@ -302,9 +302,9 @@ SPDX-License-Identifier: LGPL-2.1-or-later inline functions that require the full definition of a struct into the implementation file so that only a forward declaration of the struct is required and not the full definition. - - `src/basic/basic-forward.h` contains forward declarations for common types. - If possible, only include `basic-forward.h` in header files which makes - circular header dependencies a non-issue. + - `src/basic/forward.h` contains forward declarations for common types. If + possible, only include `forward.h` in header files which makes circular + header dependencies a non-issue. Bad: @@ -382,10 +382,9 @@ SPDX-License-Identifier: LGPL-2.1-or-later For common code, there are three different forward declaration headers: - - `src/basic`: `basic-forward.h` - - `src/libsystemd`: `sd-forward.h` - - `src/libsystemd-network`: `sd-forward.h` - - `src/shared`: `shared-forward.h` + - `src/basic/forward.h` + - `src/libsystemd/forward.h` + - `src/shared/forward.h` Header files that extend other header files can include the original header file. For example, `iovec-util.h` includes `sys/uio.h`. To identify headers @@ -412,7 +411,7 @@ SPDX-License-Identifier: LGPL-2.1-or-later ```c // source.h - #include "basic-forward.h" + #include "forward.h" void my_function_that_logs(size_t sz); diff --git a/meson.build b/meson.build index c7ef13bced..e872f4d6f2 100644 --- a/meson.build +++ b/meson.build @@ -1871,8 +1871,8 @@ basic_includes = [ ] libsystemd_includes = [include_directories( + 'src/libsystemd', 'src/libsystemd/sd-bus', - 'src/libsystemd/sd-common', 'src/libsystemd/sd-device', 'src/libsystemd/sd-event', 'src/libsystemd/sd-future', diff --git a/src/analyze/analyze-architectures.h b/src/analyze/analyze-architectures.h index d8ba8b82ae..33d7e8e52c 100644 --- a/src/analyze/analyze-architectures.h +++ b/src/analyze/analyze-architectures.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_architectures(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/analyze/analyze-blame.h b/src/analyze/analyze-blame.h index 362f6c9d36..ce6b389ab8 100644 --- a/src/analyze/analyze-blame.h +++ b/src/analyze/analyze-blame.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_blame(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/analyze/analyze-calendar.h b/src/analyze/analyze-calendar.h index 673a6ed61b..f1fd438721 100644 --- a/src/analyze/analyze-calendar.h +++ b/src/analyze/analyze-calendar.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_calendar(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/analyze/analyze-capability.h b/src/analyze/analyze-capability.h index fa6f5537e1..5edddbf417 100644 --- a/src/analyze/analyze-capability.h +++ b/src/analyze/analyze-capability.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_capabilities(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/analyze/analyze-cat-config.h b/src/analyze/analyze-cat-config.h index c90d7e82a4..38dd54098f 100644 --- a/src/analyze/analyze-cat-config.h +++ b/src/analyze/analyze-cat-config.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_cat_config(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/analyze/analyze-chid.h b/src/analyze/analyze-chid.h index 64e2bab0e1..5a3df18f33 100644 --- a/src/analyze/analyze-chid.h +++ b/src/analyze/analyze-chid.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_chid(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/analyze/analyze-compare-versions.h b/src/analyze/analyze-compare-versions.h index f907ffff20..0f49f39ab1 100644 --- a/src/analyze/analyze-compare-versions.h +++ b/src/analyze/analyze-compare-versions.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_compare_versions(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/analyze/analyze-condition.h b/src/analyze/analyze-condition.h index c385cdfb78..3c893bd063 100644 --- a/src/analyze/analyze-condition.h +++ b/src/analyze/analyze-condition.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_condition(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/analyze/analyze-critical-chain.h b/src/analyze/analyze-critical-chain.h index c4e84b1e11..305a44b55a 100644 --- a/src/analyze/analyze-critical-chain.h +++ b/src/analyze/analyze-critical-chain.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_critical_chain(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/analyze/analyze-dlopen-metadata.h b/src/analyze/analyze-dlopen-metadata.h index 8abb8bb9c4..e251d15dc3 100644 --- a/src/analyze/analyze-dlopen-metadata.h +++ b/src/analyze/analyze-dlopen-metadata.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_dlopen_metadata(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/analyze/analyze-dot.h b/src/analyze/analyze-dot.h index 944e1d7a30..0bb9c8bfce 100644 --- a/src/analyze/analyze-dot.h +++ b/src/analyze/analyze-dot.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_dot(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/analyze/analyze-dump.h b/src/analyze/analyze-dump.h index 30c697e2ad..29da21e761 100644 --- a/src/analyze/analyze-dump.h +++ b/src/analyze/analyze-dump.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_dump(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/analyze/analyze-exit-status.h b/src/analyze/analyze-exit-status.h index 63e1601066..f4b20db790 100644 --- a/src/analyze/analyze-exit-status.h +++ b/src/analyze/analyze-exit-status.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_exit_status(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/analyze/analyze-fdstore.h b/src/analyze/analyze-fdstore.h index b48496a384..d2e5206428 100644 --- a/src/analyze/analyze-fdstore.h +++ b/src/analyze/analyze-fdstore.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_fdstore(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/analyze/analyze-filesystems.h b/src/analyze/analyze-filesystems.h index 480e5ae7de..37bbd2bc78 100644 --- a/src/analyze/analyze-filesystems.h +++ b/src/analyze/analyze-filesystems.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_filesystems(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/analyze/analyze-has-tpm2.h b/src/analyze/analyze-has-tpm2.h index bb5af66fbb..8fd6876172 100644 --- a/src/analyze/analyze-has-tpm2.h +++ b/src/analyze/analyze-has-tpm2.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_has_tpm2(int argc, char *argv[], uintptr_t _data, void *userdata); int verb_identify_tpm2(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/analyze/analyze-image-policy.h b/src/analyze/analyze-image-policy.h index 3e62e12791..9de4e48084 100644 --- a/src/analyze/analyze-image-policy.h +++ b/src/analyze/analyze-image-policy.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_image_policy(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/analyze/analyze-inspect-elf.h b/src/analyze/analyze-inspect-elf.h index 890572ea00..ddc2fa5356 100644 --- a/src/analyze/analyze-inspect-elf.h +++ b/src/analyze/analyze-inspect-elf.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_elf_inspection(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/analyze/analyze-log-control.h b/src/analyze/analyze-log-control.h index 0ad41aeddc..0f58eaecd0 100644 --- a/src/analyze/analyze-log-control.h +++ b/src/analyze/analyze-log-control.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_log_control(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/analyze/analyze-malloc.h b/src/analyze/analyze-malloc.h index 3e30467e77..b1b9d25d3b 100644 --- a/src/analyze/analyze-malloc.h +++ b/src/analyze/analyze-malloc.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_malloc(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/analyze/analyze-nvpcrs.h b/src/analyze/analyze-nvpcrs.h index 7e287f2298..d9f67f0260 100644 --- a/src/analyze/analyze-nvpcrs.h +++ b/src/analyze/analyze-nvpcrs.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_nvpcrs(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/analyze/analyze-pcrs.h b/src/analyze/analyze-pcrs.h index 7fa5a8379f..a004c14ea7 100644 --- a/src/analyze/analyze-pcrs.h +++ b/src/analyze/analyze-pcrs.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_pcrs(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/analyze/analyze-plot.h b/src/analyze/analyze-plot.h index 4854498ce9..ee4dbddddf 100644 --- a/src/analyze/analyze-plot.h +++ b/src/analyze/analyze-plot.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_plot(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/analyze/analyze-security.h b/src/analyze/analyze-security.h index cd5fec307c..fe5b5bc661 100644 --- a/src/analyze/analyze-security.h +++ b/src/analyze/analyze-security.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" typedef enum AnalyzeSecurityFlags { ANALYZE_SECURITY_SHORT = 1 << 0, diff --git a/src/analyze/analyze-service-watchdogs.h b/src/analyze/analyze-service-watchdogs.h index e626a223c3..e18b589e36 100644 --- a/src/analyze/analyze-service-watchdogs.h +++ b/src/analyze/analyze-service-watchdogs.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_service_watchdogs(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/analyze/analyze-smbios11.h b/src/analyze/analyze-smbios11.h index 32ae157fa1..8beed6fb3f 100644 --- a/src/analyze/analyze-smbios11.h +++ b/src/analyze/analyze-smbios11.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_smbios11(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/analyze/analyze-srk.h b/src/analyze/analyze-srk.h index 73d3c865ad..15bd0353dc 100644 --- a/src/analyze/analyze-srk.h +++ b/src/analyze/analyze-srk.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_srk(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/analyze/analyze-syscall-filter.h b/src/analyze/analyze-syscall-filter.h index a648b3c603..fbabfd6343 100644 --- a/src/analyze/analyze-syscall-filter.h +++ b/src/analyze/analyze-syscall-filter.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_syscall_filters(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/analyze/analyze-time-data.h b/src/analyze/analyze-time-data.h index d3d686948d..ca20730c81 100644 --- a/src/analyze/analyze-time-data.h +++ b/src/analyze/analyze-time-data.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" #include "unit-def.h" typedef struct BootTimes { diff --git a/src/analyze/analyze-time.h b/src/analyze/analyze-time.h index 23591d8fd4..dd43cfe56b 100644 --- a/src/analyze/analyze-time.h +++ b/src/analyze/analyze-time.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_time(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/analyze/analyze-timespan.h b/src/analyze/analyze-timespan.h index b2f238b413..878d38edde 100644 --- a/src/analyze/analyze-timespan.h +++ b/src/analyze/analyze-timespan.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_timespan(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/analyze/analyze-timestamp.h b/src/analyze/analyze-timestamp.h index e71ab70554..a31ff8d4a0 100644 --- a/src/analyze/analyze-timestamp.h +++ b/src/analyze/analyze-timestamp.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_timestamp(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/analyze/analyze-unit-files.h b/src/analyze/analyze-unit-files.h index 4dc46e7d7b..b55d3fd9c7 100644 --- a/src/analyze/analyze-unit-files.h +++ b/src/analyze/analyze-unit-files.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_unit_files(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/analyze/analyze-unit-gdb.h b/src/analyze/analyze-unit-gdb.h index 4e62610c58..0cc7423c2c 100644 --- a/src/analyze/analyze-unit-gdb.h +++ b/src/analyze/analyze-unit-gdb.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_unit_gdb(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/analyze/analyze-unit-paths.h b/src/analyze/analyze-unit-paths.h index 609c17074f..2d42ef3e56 100644 --- a/src/analyze/analyze-unit-paths.h +++ b/src/analyze/analyze-unit-paths.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_unit_paths(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/analyze/analyze-unit-shell.h b/src/analyze/analyze-unit-shell.h index 533cd9a989..271e519ac6 100644 --- a/src/analyze/analyze-unit-shell.h +++ b/src/analyze/analyze-unit-shell.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_unit_shell(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/analyze/analyze-verify-util.h b/src/analyze/analyze-verify-util.h index b08c9453ab..9f8c2bfe49 100644 --- a/src/analyze/analyze-verify-util.h +++ b/src/analyze/analyze-verify-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" typedef struct ExecCommand ExecCommand; typedef struct Unit Unit; diff --git a/src/analyze/analyze-verify.h b/src/analyze/analyze-verify.h index 0108ccf3a1..4c48fb491f 100644 --- a/src/analyze/analyze-verify.h +++ b/src/analyze/analyze-verify.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_verify(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/analyze/analyze.h b/src/analyze/analyze.h index b987e272ce..d5b7bfcb82 100644 --- a/src/analyze/analyze.h +++ b/src/analyze/analyze.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" typedef enum RecursiveErrors RecursiveErrors; diff --git a/src/basic/af-list.h b/src/basic/af-list.h index b2948e916a..6b7154cb59 100644 --- a/src/basic/af-list.h +++ b/src/basic/af-list.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" const char* af_to_name(int id) _const_; int af_from_name(const char *name) _pure_; diff --git a/src/basic/alloc-util.h b/src/basic/alloc-util.h index a3e2321b30..1f0342eda3 100644 --- a/src/basic/alloc-util.h +++ b/src/basic/alloc-util.h @@ -3,7 +3,7 @@ #include -#include "basic-forward.h" +#include "forward.h" #include "memory-util.h" /* IWYU pragma: keep */ #if HAS_FEATURE_MEMORY_SANITIZER diff --git a/src/basic/ansi-color.h b/src/basic/ansi-color.h index 20f6b3bf62..25a170aa65 100644 --- a/src/basic/ansi-color.h +++ b/src/basic/ansi-color.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" /* Limits the use of ANSI colors to a subset. */ typedef enum ColorMode { diff --git a/src/basic/architecture.h b/src/basic/architecture.h index 350a72d087..1dc8278118 100644 --- a/src/basic/architecture.h +++ b/src/basic/architecture.h @@ -3,7 +3,7 @@ #include -#include "basic-forward.h" +#include "forward.h" /* A cleaned up architecture definition. We don't want to get lost in * processor features, models, generations or even ABIs. Hence we diff --git a/src/basic/argv-util.h b/src/basic/argv-util.h index 02901ebc49..a9526ef936 100644 --- a/src/basic/argv-util.h +++ b/src/basic/argv-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" extern int saved_argc; extern char **saved_argv; diff --git a/src/basic/arphrd-util.h b/src/basic/arphrd-util.h index 4c2fd207d1..97a1c0b248 100644 --- a/src/basic/arphrd-util.h +++ b/src/basic/arphrd-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" const char* arphrd_to_name(int id) _const_; int arphrd_from_name(const char *name) _pure_; diff --git a/src/basic/audit-util.h b/src/basic/audit-util.h index 7f06d4bb88..ff9ce72e0b 100644 --- a/src/basic/audit-util.h +++ b/src/basic/audit-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" #define AUDIT_SESSION_INVALID UINT32_MAX diff --git a/src/basic/bitfield.h b/src/basic/bitfield.h index 96b4684871..a06841a649 100644 --- a/src/basic/bitfield.h +++ b/src/basic/bitfield.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" /* Bit index (0-based) to mask of specified type. Assertion failure if index is out of range. */ #define _INDEX_TO_MASK(type, i, uniq) \ diff --git a/src/basic/btrfs-util.h b/src/basic/btrfs-util.h index 4023a2fc0e..3d7332d504 100644 --- a/src/basic/btrfs-util.h +++ b/src/basic/btrfs-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" typedef enum BtrfsSubvolFlags { BTRFS_SUBVOL_RO = 1 << 0, diff --git a/src/basic/build.h b/src/basic/build.h index 83fac462cd..3f1211e708 100644 --- a/src/basic/build.h +++ b/src/basic/build.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" extern const char* const systemd_features; diff --git a/src/basic/bus-label.h b/src/basic/bus-label.h index 890f34716b..22dd796984 100644 --- a/src/basic/bus-label.h +++ b/src/basic/bus-label.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" char* bus_label_escape(const char *s); char* bus_label_unescape_n(const char *f, size_t l); diff --git a/src/basic/capability-list.h b/src/basic/capability-list.h index 2f73c74cde..f60569a61a 100644 --- a/src/basic/capability-list.h +++ b/src/basic/capability-list.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" /* Space for capability_to_string() in case we write out a numeric capability because we don't know the name * for it. "0x3e" is the largest string we might output, in both sensese of the word "largest": two chars for diff --git a/src/basic/capability-util.h b/src/basic/capability-util.h index 3088fdb79f..4ef8dd2830 100644 --- a/src/basic/capability-util.h +++ b/src/basic/capability-util.h @@ -3,7 +3,7 @@ #include /* IWYU pragma: export */ -#include "basic-forward.h" +#include "forward.h" /* Special marker used when storing a capabilities mask as "unset". This would need to be updated as soon as * Linux learns more than 63 caps. */ diff --git a/src/basic/capsule-util.h b/src/basic/capsule-util.h index 1ed80a908b..02b00220f1 100644 --- a/src/basic/capsule-util.h +++ b/src/basic/capsule-util.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" int capsule_name_is_valid(const char *name); diff --git a/src/basic/cgroup-util.h b/src/basic/cgroup-util.h index 2c438167f1..f53a1c9390 100644 --- a/src/basic/cgroup-util.h +++ b/src/basic/cgroup-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" #define SYSTEMD_CGROUP_CONTROLLER "_systemd" diff --git a/src/basic/chase.h b/src/basic/chase.h index afb50fa61e..3d7e9f3f6b 100644 --- a/src/basic/chase.h +++ b/src/basic/chase.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" typedef enum ChaseFlags { CHASE_PREFIX_ROOT = 1 << 0, /* The specified path will be prefixed by the specified root before beginning the iteration */ diff --git a/src/basic/chattr-util.h b/src/basic/chattr-util.h index 1f93b3182d..543843db2c 100644 --- a/src/basic/chattr-util.h +++ b/src/basic/chattr-util.h @@ -3,7 +3,7 @@ #include -#include "basic-forward.h" +#include "forward.h" /* The chattr() flags to apply when creating a new file *before* writing to it. In particular, flags such as * FS_NOCOW_FL don't work if applied a-posteriori. All other flags are fine (or even necessary, think diff --git a/src/basic/compress.h b/src/basic/compress.h index e25ab6d9a4..f46b787f0c 100644 --- a/src/basic/compress.h +++ b/src/basic/compress.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" #include "dlopen-note.h" typedef enum Compression { diff --git a/src/basic/conf-files.h b/src/basic/conf-files.h index e6c248a59a..03231b795e 100644 --- a/src/basic/conf-files.h +++ b/src/basic/conf-files.h @@ -3,7 +3,7 @@ #include -#include "basic-forward.h" +#include "forward.h" typedef enum ConfFilesFlags { CONF_FILES_EXECUTABLE = 1 << 0, /* inode must be marked executable */ diff --git a/src/basic/confidential-virt.h b/src/basic/confidential-virt.h index 5505f997e6..795aa48833 100644 --- a/src/basic/confidential-virt.h +++ b/src/basic/confidential-virt.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" #include "../fundamental/confidential-virt.h" /* IWYU pragma: export */ diff --git a/src/basic/device-nodes.h b/src/basic/device-nodes.h index 21118b5bd1..f57378c0f6 100644 --- a/src/basic/device-nodes.h +++ b/src/basic/device-nodes.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" int encode_devnode_name(const char *str, char *str_enc, size_t len); int allow_listed_char_for_devnode(char c, const char *additional); diff --git a/src/basic/devnum-util.h b/src/basic/devnum-util.h index b5ae0dee57..a23dfcacb4 100644 --- a/src/basic/devnum-util.h +++ b/src/basic/devnum-util.h @@ -3,7 +3,7 @@ #include -#include "basic-forward.h" +#include "forward.h" int parse_devnum(const char *s, dev_t *ret); diff --git a/src/basic/dirent-util.h b/src/basic/dirent-util.h index 76ae40eb5e..44e751ba41 100644 --- a/src/basic/dirent-util.h +++ b/src/basic/dirent-util.h @@ -3,7 +3,7 @@ #include /* IWYU pragma: export */ -#include "basic-forward.h" +#include "forward.h" #include "path-util.h" /* IWYU pragma: keep */ bool dirent_is_file(const struct dirent *de) _pure_; diff --git a/src/basic/dlfcn-util.h b/src/basic/dlfcn-util.h index 0fd78483f8..d50ba0eec7 100644 --- a/src/basic/dlfcn-util.h +++ b/src/basic/dlfcn-util.h @@ -3,7 +3,7 @@ #include /* IWYU pragma: export */ -#include "basic-forward.h" +#include "forward.h" void* safe_dlclose(void *dl); diff --git a/src/basic/dlopen-note.h b/src/basic/dlopen-note.h index 6d3bd5e2bc..265d64450a 100644 --- a/src/basic/dlopen-note.h +++ b/src/basic/dlopen-note.h @@ -3,7 +3,7 @@ #include "sd-dlopen.h" -#include "basic-forward.h" +#include "forward.h" #include "strv.h" /* Prevent dlopen helper functions (e.g., dlopen_libfoo()) from being inlined or cloned by the compiler/LTO. diff --git a/src/basic/dns-def.h b/src/basic/dns-def.h index 04205e4665..5c0f031df7 100644 --- a/src/basic/dns-def.h +++ b/src/basic/dns-def.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" /* Length of a single label, with all escaping removed, excluding any trailing dot or NUL byte */ #define DNS_LABEL_MAX 63 diff --git a/src/basic/efivars.h b/src/basic/efivars.h index 368fe12a49..c0ec94af5b 100644 --- a/src/basic/efivars.h +++ b/src/basic/efivars.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" #include "sd-id128.h" diff --git a/src/basic/env-file.h b/src/basic/env-file.h index 4d74245915..092b56a9a0 100644 --- a/src/basic/env-file.h +++ b/src/basic/env-file.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" int parse_env_filev(FILE *f, const char *fname, va_list ap); int parse_env_file_fdv(int fd, const char *fname, va_list ap); diff --git a/src/basic/env-util.h b/src/basic/env-util.h index 4063517660..27e7eed7c4 100644 --- a/src/basic/env-util.h +++ b/src/basic/env-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" #define ENVIRONMENT_ASSIGNMENTS_MAX 16384U diff --git a/src/basic/errno-list.h b/src/basic/errno-list.h index cd96573ea8..2064afa0f4 100644 --- a/src/basic/errno-list.h +++ b/src/basic/errno-list.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" const char* errno_name_no_fallback(int id) _const_; int errno_from_name(const char *name) _pure_; diff --git a/src/basic/errno-util.h b/src/basic/errno-util.h index 195d13208b..316fdde5fd 100644 --- a/src/basic/errno-util.h +++ b/src/basic/errno-util.h @@ -3,7 +3,7 @@ #include -#include "basic-forward.h" +#include "forward.h" /* strerror(3) says that glibc uses a maximum length of 1024 bytes. */ #define ERRNO_BUF_LEN 1024 diff --git a/src/basic/escape.h b/src/basic/escape.h index 625758f2f4..1d55f2d16d 100644 --- a/src/basic/escape.h +++ b/src/basic/escape.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" /* What characters are special in the shell? */ /* must be escaped outside and inside double-quotes */ diff --git a/src/basic/ether-addr-util.h b/src/basic/ether-addr-util.h index 42b899e7eb..d97748f115 100644 --- a/src/basic/ether-addr-util.h +++ b/src/basic/ether-addr-util.h @@ -5,7 +5,7 @@ #include #include -#include "basic-forward.h" +#include "forward.h" struct hw_addr_data { size_t length; diff --git a/src/basic/extract-word.h b/src/basic/extract-word.h index 17b2f1a396..2740de9189 100644 --- a/src/basic/extract-word.h +++ b/src/basic/extract-word.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" typedef enum ExtractFlags { EXTRACT_RELAX = 1 << 0, /* Allow unbalanced quote and eat up trailing backslash. */ diff --git a/src/basic/fd-util.h b/src/basic/fd-util.h index 86bddb6dac..999b49ab03 100644 --- a/src/basic/fd-util.h +++ b/src/basic/fd-util.h @@ -5,7 +5,7 @@ #include #include -#include "basic-forward.h" +#include "forward.h" /* maximum length of fdname */ #define FDNAME_MAX 255 diff --git a/src/basic/fiber-ops.h b/src/basic/fiber-ops.h index 64bd82353b..2b2e77d12a 100644 --- a/src/basic/fiber-ops.h +++ b/src/basic/fiber-ops.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" typedef struct sd_future sd_future; diff --git a/src/basic/fileio.h b/src/basic/fileio.h index d10b04c907..4910b28f9c 100644 --- a/src/basic/fileio.h +++ b/src/basic/fileio.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" #define LONG_LINE_MAX (1U*1024U*1024U) diff --git a/src/basic/filesystems.h b/src/basic/filesystems.h index e618500bee..eed3982afd 100644 --- a/src/basic/filesystems.h +++ b/src/basic/filesystems.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" #include "stat-util.h" #define FILESYSTEM_MAGIC_MAX 10 diff --git a/src/basic/format-util.h b/src/basic/format-util.h index ac7f7b21a1..5ab982d126 100644 --- a/src/basic/format-util.h +++ b/src/basic/format-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" #include "cgroup-util.h" #include "stdio-util.h" /* IWYU pragma: keep */ diff --git a/src/basic/basic-forward.h b/src/basic/forward.h similarity index 100% rename from src/basic/basic-forward.h rename to src/basic/forward.h diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h index 32283d4c1f..0608d713ae 100644 --- a/src/basic/fs-util.h +++ b/src/basic/fs-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" #include "lock-util.h" /* The following macros add 1 when converting things, since 0 is a valid mode, while the pointer diff --git a/src/basic/glob-util.h b/src/basic/glob-util.h index 7fc13648db..ea3e869319 100644 --- a/src/basic/glob-util.h +++ b/src/basic/glob-util.h @@ -3,7 +3,7 @@ #include /* IWYU pragma: export */ -#include "basic-forward.h" +#include "forward.h" typedef DIR* (*opendir_t)(const char *); diff --git a/src/basic/glyph-util.h b/src/basic/glyph-util.h index eb0843d128..f7b7181877 100644 --- a/src/basic/glyph-util.h +++ b/src/basic/glyph-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" typedef enum Glyph { GLYPH_SPACE, diff --git a/src/basic/gunicode.h b/src/basic/gunicode.h index 3ee0c4ebbe..9bba03ba30 100644 --- a/src/basic/gunicode.h +++ b/src/basic/gunicode.h @@ -6,7 +6,7 @@ */ #pragma once -#include "basic-forward.h" +#include "forward.h" char *utf8_prev_char (const char *p); diff --git a/src/basic/hash-funcs.h b/src/basic/hash-funcs.h index 19af1aa031..7ce29fbe6c 100644 --- a/src/basic/hash-funcs.h +++ b/src/basic/hash-funcs.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" typedef void (*hash_func_t)(const void *p, struct siphash *state); typedef int (*compare_func_t)(const void *a, const void *b); diff --git a/src/basic/hashmap.h b/src/basic/hashmap.h index df68b0ccf8..7bc0914077 100644 --- a/src/basic/hashmap.h +++ b/src/basic/hashmap.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" #include "hash-funcs.h" #include "iterator.h" diff --git a/src/basic/hexdecoct.h b/src/basic/hexdecoct.h index 1322323ac5..ed3c9dc39d 100644 --- a/src/basic/hexdecoct.h +++ b/src/basic/hexdecoct.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" char octchar(int x) _const_; int unoctchar(char c) _const_; diff --git a/src/basic/hmac.h b/src/basic/hmac.h index 35faf14f26..fd474f7649 100644 --- a/src/basic/hmac.h +++ b/src/basic/hmac.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" #include "sha256.h" /* Unoptimized implementation based on FIPS 198. 'res' has to be allocated by diff --git a/src/basic/hostname-util.h b/src/basic/hostname-util.h index 0fdc5b483b..3eb676064a 100644 --- a/src/basic/hostname-util.h +++ b/src/basic/hostname-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" #include "strv.h" /* HOST_NAME_MAX should be 64 on linux, but musl uses the one by POSIX (255). */ diff --git a/src/basic/in-addr-util.h b/src/basic/in-addr-util.h index 4148fa2e67..cb76ef221c 100644 --- a/src/basic/in-addr-util.h +++ b/src/basic/in-addr-util.h @@ -3,7 +3,7 @@ #include -#include "basic-forward.h" +#include "forward.h" union in_addr_union { struct in_addr in; diff --git a/src/basic/initrd-util.h b/src/basic/initrd-util.h index f83b5c9d5d..904711dbd5 100644 --- a/src/basic/initrd-util.h +++ b/src/basic/initrd-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" bool in_initrd(void); void in_initrd_force(bool value); diff --git a/src/basic/inotify-util.h b/src/basic/inotify-util.h index ebd3809906..a509a97f50 100644 --- a/src/basic/inotify-util.h +++ b/src/basic/inotify-util.h @@ -4,7 +4,7 @@ #include /* IWYU pragma: export */ #include -#include "basic-forward.h" +#include "forward.h" #define INOTIFY_EVENT_MAX (offsetof(struct inotify_event, name) + NAME_MAX + 1) diff --git a/src/basic/io-util.h b/src/basic/io-util.h index 6697f88b54..0b3d7fff8d 100644 --- a/src/basic/io-util.h +++ b/src/basic/io-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" /* On most architectures POLL* and EPOLL* share numeric values, but sparc allocates POLLRDHUP at * 0x800 while EPOLLRDHUP is 0x2000 everywhere. Always go through these helpers when crossing diff --git a/src/basic/iovec-util.h b/src/basic/iovec-util.h index ade2e6be34..d054e404d1 100644 --- a/src/basic/iovec-util.h +++ b/src/basic/iovec-util.h @@ -3,7 +3,7 @@ #include /* IWYU pragma: export */ -#include "basic-forward.h" +#include "forward.h" #include "../fundamental/iovec-util.h" /* IWYU pragma: export */ diff --git a/src/basic/iovec-wrapper.h b/src/basic/iovec-wrapper.h index a4f93f1fdb..7f9863aaf9 100644 --- a/src/basic/iovec-wrapper.h +++ b/src/basic/iovec-wrapper.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" struct iovec_wrapper { struct iovec *iovec; diff --git a/src/basic/iterator.h b/src/basic/iterator.h index ecdc5efca4..be9e1a9b6b 100644 --- a/src/basic/iterator.h +++ b/src/basic/iterator.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" /* Ideally the Iterator would be an opaque struct, but it is instantiated * by hashmap users, so the definition has to be here. Do not use its fields diff --git a/src/basic/keyring-util.h b/src/basic/keyring-util.h index 2ec12d3583..b8a36a9ad6 100644 --- a/src/basic/keyring-util.h +++ b/src/basic/keyring-util.h @@ -3,7 +3,7 @@ #include /* IWYU pragma: export */ -#include "basic-forward.h" +#include "forward.h" /* Like TAKE_PTR() but for key_serial_t, resetting them to -1 */ #define TAKE_KEY_SERIAL(key_serial) TAKE_GENERIC(key_serial, key_serial_t, -1) diff --git a/src/basic/label-util.h b/src/basic/label-util.h index 9f8af5e4bb..186f93d697 100644 --- a/src/basic/label-util.h +++ b/src/basic/label-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" typedef struct LabelOps { int (*pre)(int dir_fd, const char *path, mode_t mode); diff --git a/src/basic/limits-util.h b/src/basic/limits-util.h index ef7ce40cde..6049cfa9e9 100644 --- a/src/basic/limits-util.h +++ b/src/basic/limits-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" uint64_t physical_memory(void); uint64_t physical_memory_scale(uint64_t v, uint64_t max); diff --git a/src/basic/list.h b/src/basic/list.h index d86002f2b3..ee3405f054 100644 --- a/src/basic/list.h +++ b/src/basic/list.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" /* The head of the linked list. Use this in the structure that shall * contain the head of the linked list */ diff --git a/src/basic/locale-util.h b/src/basic/locale-util.h index 869a0eb4fb..673503590a 100644 --- a/src/basic/locale-util.h +++ b/src/basic/locale-util.h @@ -4,7 +4,7 @@ #include /* IWYU pragma: export */ #include /* IWYU pragma: export */ -#include "basic-forward.h" +#include "forward.h" typedef enum LocaleVariable { /* We don't list LC_ALL here on purpose. People should be diff --git a/src/basic/lock-util.h b/src/basic/lock-util.h index d44c4e74df..b9643c22a1 100644 --- a/src/basic/lock-util.h +++ b/src/basic/lock-util.h @@ -4,7 +4,7 @@ /* Include here so consumers have LOCK_{EX,SH,NB} available. */ #include /* IWYU pragma: export */ -#include "basic-forward.h" +#include "forward.h" typedef struct LockFile { int dir_fd; diff --git a/src/basic/log-context.h b/src/basic/log-context.h index 638d2ed913..2c01f6e9d5 100644 --- a/src/basic/log-context.h +++ b/src/basic/log-context.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" #include "list.h" /* diff --git a/src/basic/log.h b/src/basic/log.h index 17c20f8cf0..c8e98ac8d9 100644 --- a/src/basic/log.h +++ b/src/basic/log.h @@ -5,7 +5,7 @@ #include #include -#include "basic-forward.h" +#include "forward.h" typedef enum LogTarget{ LOG_TARGET_CONSOLE, diff --git a/src/basic/login-util.h b/src/basic/login-util.h index 0b4b7b77ca..fd07ed2c6e 100644 --- a/src/basic/login-util.h +++ b/src/basic/login-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" #define SD_LOGIND_ROOT_CHECK_INHIBITORS (UINT64_C(1) << 0) #define SD_LOGIND_REBOOT_VIA_KEXEC (UINT64_C(1) << 1) diff --git a/src/basic/math-util.h b/src/basic/math-util.h index 9bcd994ae2..01e9eb691f 100644 --- a/src/basic/math-util.h +++ b/src/basic/math-util.h @@ -3,7 +3,7 @@ #include /* IWYU pragma: export */ -#include "basic-forward.h" +#include "forward.h" /* On some optimization level, iszero(x) is converted to (x == 0.0), and emits warning -Wfloat-equal. * The argument must be a floating point, i.e. one of float, double, or long double. */ diff --git a/src/basic/memfd-util.h b/src/basic/memfd-util.h index 2fc94f429f..befe41ac43 100644 --- a/src/basic/memfd-util.h +++ b/src/basic/memfd-util.h @@ -3,7 +3,7 @@ #include /* IWYU pragma: export */ -#include "basic-forward.h" +#include "forward.h" int memfd_create_wrapper(const char *name, unsigned mode); diff --git a/src/basic/memory-util.h b/src/basic/memory-util.h index 39dff8271a..7a73e76c94 100644 --- a/src/basic/memory-util.h +++ b/src/basic/memory-util.h @@ -3,7 +3,7 @@ #include -#include "basic-forward.h" +#include "forward.h" #include "../fundamental/memory-util.h" /* IWYU pragma: export */ diff --git a/src/basic/mempool.h b/src/basic/mempool.h index 1dd1e4e314..3817b0c5b9 100644 --- a/src/basic/mempool.h +++ b/src/basic/mempool.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" struct pool; diff --git a/src/basic/memstream-util.h b/src/basic/memstream-util.h index 895073be8e..8c979c7a0a 100644 --- a/src/basic/memstream-util.h +++ b/src/basic/memstream-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" typedef struct MemStream { FILE *f; diff --git a/src/basic/mkdir.h b/src/basic/mkdir.h index f286598a2a..d18b3bfe49 100644 --- a/src/basic/mkdir.h +++ b/src/basic/mkdir.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" typedef enum MkdirFlags { MKDIR_FOLLOW_SYMLINK = 1 << 0, diff --git a/src/basic/mountpoint-util.h b/src/basic/mountpoint-util.h index dd27f36c2c..7f29ffe177 100644 --- a/src/basic/mountpoint-util.h +++ b/src/basic/mountpoint-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" /* The limit used for /dev itself. 4MB should be enough since device nodes and symlinks don't * consume any space and udev isn't supposed to create regular file either. There's no limit on the diff --git a/src/basic/namespace-util.h b/src/basic/namespace-util.h index 3bfa34371c..b82efc826b 100644 --- a/src/basic/namespace-util.h +++ b/src/basic/namespace-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" typedef enum NamespaceType { NAMESPACE_CGROUP, diff --git a/src/basic/nulstr-util.h b/src/basic/nulstr-util.h index 10235a9e6d..2b95116014 100644 --- a/src/basic/nulstr-util.h +++ b/src/basic/nulstr-util.h @@ -3,7 +3,7 @@ #include -#include "basic-forward.h" +#include "forward.h" #define NULSTR_FOREACH(i, l) \ for (typeof(*(l)) *(i) = (l); (i) && *(i); (i) = strchr((i), 0)+1) diff --git a/src/basic/ordered-set.h b/src/basic/ordered-set.h index e25fc606e4..fb3e53395e 100644 --- a/src/basic/ordered-set.h +++ b/src/basic/ordered-set.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" #include "hashmap.h" typedef struct OrderedSet OrderedSet; diff --git a/src/basic/os-util.h b/src/basic/os-util.h index 336c17ec21..281f56abbd 100644 --- a/src/basic/os-util.h +++ b/src/basic/os-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" typedef enum ImageClass { IMAGE_MACHINE, diff --git a/src/basic/parse-util.h b/src/basic/parse-util.h index 6df08915f6..a7cd9a62ef 100644 --- a/src/basic/parse-util.h +++ b/src/basic/parse-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" typedef unsigned long loadavg_t; diff --git a/src/basic/path-util.h b/src/basic/path-util.h index e2e80ae91f..7865906213 100644 --- a/src/basic/path-util.h +++ b/src/basic/path-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" #define PATH_SPLIT_BIN(x) x "sbin:" x "bin" #define PATH_SPLIT_BIN_NULSTR(x) x "sbin\0" x "bin\0" diff --git a/src/basic/pcapng.h b/src/basic/pcapng.h index ea7516082d..268e4aa820 100644 --- a/src/basic/pcapng.h +++ b/src/basic/pcapng.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" /* * For details about the file format see RFC: diff --git a/src/basic/percent-util.h b/src/basic/percent-util.h index 7b75654e32..60b0d4a9ef 100644 --- a/src/basic/percent-util.h +++ b/src/basic/percent-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" int parse_percent_unbounded(const char *p); int parse_percent(const char *p); diff --git a/src/basic/pidfd-util.h b/src/basic/pidfd-util.h index 74dd1d96a2..d6d3e46139 100644 --- a/src/basic/pidfd-util.h +++ b/src/basic/pidfd-util.h @@ -3,7 +3,7 @@ #include /* IWYU pragma: export */ -#include "basic-forward.h" +#include "forward.h" int pidfd_get_namespace(int fd, unsigned long ns_type_cmd); diff --git a/src/basic/pidref.h b/src/basic/pidref.h index 2f1d95f997..a4c138c4bf 100644 --- a/src/basic/pidref.h +++ b/src/basic/pidref.h @@ -3,7 +3,7 @@ #include -#include "basic-forward.h" +#include "forward.h" /* An embeddable structure carrying a reference to a process. Supposed to be used when tracking processes * continuously. This combines a PID, a modern Linux pidfd and the 64bit inode number of the pidfd into one diff --git a/src/basic/prioq.h b/src/basic/prioq.h index 07cedf603c..97b4f40b4a 100644 --- a/src/basic/prioq.h +++ b/src/basic/prioq.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" typedef struct Prioq Prioq; diff --git a/src/basic/proc-cmdline.h b/src/basic/proc-cmdline.h index 6abf57ac3c..34f05ee0c7 100644 --- a/src/basic/proc-cmdline.h +++ b/src/basic/proc-cmdline.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" typedef enum ProcCmdlineFlags { PROC_CMDLINE_RD_STRICT = 1 << 0, /* Only look at options with the "rd." prefix when in the initrd and only diff --git a/src/basic/process-util.h b/src/basic/process-util.h index 7adb94e8b0..007397704e 100644 --- a/src/basic/process-util.h +++ b/src/basic/process-util.h @@ -5,7 +5,7 @@ #include "fileio.h" #include "format-util.h" -#include "basic-forward.h" +#include "forward.h" #include "string-util.h" #define procfs_file_alloca(pid, field) \ diff --git a/src/basic/procfs-util.h b/src/basic/procfs-util.h index a33383358e..cf091d1e07 100644 --- a/src/basic/procfs-util.h +++ b/src/basic/procfs-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" int procfs_get_pid_max(uint64_t *ret); int procfs_get_threads_max(uint64_t *ret); diff --git a/src/basic/psi-util.h b/src/basic/psi-util.h index 8716767ca5..458c7f63ea 100644 --- a/src/basic/psi-util.h +++ b/src/basic/psi-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" #include "parse-util.h" typedef enum PressureType { diff --git a/src/basic/pthread-util.h b/src/basic/pthread-util.h index 1e62bc1d62..362944efc8 100644 --- a/src/basic/pthread-util.h +++ b/src/basic/pthread-util.h @@ -3,7 +3,7 @@ #include /* IWYU pragma: export */ -#include "basic-forward.h" +#include "forward.h" static inline pthread_mutex_t* pthread_mutex_lock_assert(pthread_mutex_t *mutex) { assert_se(pthread_mutex_lock(mutex) == 0); diff --git a/src/basic/random-util.h b/src/basic/random-util.h index d65c472031..ae4d18721d 100644 --- a/src/basic/random-util.h +++ b/src/basic/random-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" /* Returns random bytes suitable for most uses, but may be insecure sometimes. */ void random_bytes(void *p, size_t n) _nonnull_if_nonzero_(1, 2); diff --git a/src/basic/ratelimit.h b/src/basic/ratelimit.h index 4d6c7f6e52..c70571340a 100644 --- a/src/basic/ratelimit.h +++ b/src/basic/ratelimit.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" typedef struct RateLimit { usec_t interval; /* Keep those two fields first so they can be initialized easily: */ diff --git a/src/basic/raw-clone.h b/src/basic/raw-clone.h index 2b826bb352..af20cde73b 100644 --- a/src/basic/raw-clone.h +++ b/src/basic/raw-clone.h @@ -3,6 +3,6 @@ #include /* IWYU pragma: export */ -#include "basic-forward.h" +#include "forward.h" pid_t raw_clone(unsigned long flags); diff --git a/src/basic/recurse-dir.h b/src/basic/recurse-dir.h index 6b6eac3639..9a01ddd529 100644 --- a/src/basic/recurse-dir.h +++ b/src/basic/recurse-dir.h @@ -3,7 +3,7 @@ #include -#include "basic-forward.h" +#include "forward.h" typedef enum RecurseDirFlags { /* Interpreted by readdir_all() */ diff --git a/src/basic/replace-var.h b/src/basic/replace-var.h index 3f1fda65c1..abaa57b503 100644 --- a/src/basic/replace-var.h +++ b/src/basic/replace-var.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" char* replace_var(const char *text, char *(*lookup)(const char *variable, void *userdata), void *userdata); diff --git a/src/basic/rlimit-util.h b/src/basic/rlimit-util.h index f6a936bf3f..24dcbc79fb 100644 --- a/src/basic/rlimit-util.h +++ b/src/basic/rlimit-util.h @@ -3,7 +3,7 @@ #include /* IWYU pragma: export */ -#include "basic-forward.h" +#include "forward.h" #define _RLIMIT_MAX RLIMIT_NLIMITS diff --git a/src/basic/runtime-scope.h b/src/basic/runtime-scope.h index 8a6313d245..88faa0f24f 100644 --- a/src/basic/runtime-scope.h +++ b/src/basic/runtime-scope.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" typedef enum RuntimeScope { RUNTIME_SCOPE_SYSTEM, /* for the system */ diff --git a/src/basic/set.h b/src/basic/set.h index 52854934ad..e6ce91c752 100644 --- a/src/basic/set.h +++ b/src/basic/set.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" #include "hashmap.h" #define set_free_and_replace(a, b) \ diff --git a/src/basic/sha256.h b/src/basic/sha256.h index 8d3387ea49..659a4addaa 100644 --- a/src/basic/sha256.h +++ b/src/basic/sha256.h @@ -2,7 +2,7 @@ #pragma once -#include "basic-forward.h" +#include "forward.h" #include "../fundamental/sha256.h" /* IWYU pragma: export */ diff --git a/src/basic/sigbus.h b/src/basic/sigbus.h index f5946a0d87..cf7593072d 100644 --- a/src/basic/sigbus.h +++ b/src/basic/sigbus.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" void sigbus_install(void); void sigbus_reset(void); diff --git a/src/basic/signal-util.h b/src/basic/signal-util.h index 0c6aa6898d..e5860094db 100644 --- a/src/basic/signal-util.h +++ b/src/basic/signal-util.h @@ -3,7 +3,7 @@ #include /* IWYU pragma: export */ -#include "basic-forward.h" +#include "forward.h" int reset_all_signal_handlers(void); int reset_signal_mask(void); diff --git a/src/basic/siphash24.h b/src/basic/siphash24.h index 772e2728b6..6da73fedaa 100644 --- a/src/basic/siphash24.h +++ b/src/basic/siphash24.h @@ -2,7 +2,7 @@ #pragma once -#include "basic-forward.h" +#include "forward.h" struct siphash { uint64_t v0; diff --git a/src/basic/socket-util.h b/src/basic/socket-util.h index f9d6ddaaad..81e5bf1d4b 100644 --- a/src/basic/socket-util.h +++ b/src/basic/socket-util.h @@ -8,7 +8,7 @@ #include #include -#include "basic-forward.h" +#include "forward.h" #include "memory-util.h" #include "missing-network.h" diff --git a/src/basic/sort-util.h b/src/basic/sort-util.h index 37c196158e..ad9be96912 100644 --- a/src/basic/sort-util.h +++ b/src/basic/sort-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size, comparison_userdata_fn_t compar, void *arg); diff --git a/src/basic/sparse-endian.h b/src/basic/sparse-endian.h index c56268f4d6..d66e77afc2 100644 --- a/src/basic/sparse-endian.h +++ b/src/basic/sparse-endian.h @@ -25,7 +25,7 @@ #include #include -#include "basic-forward.h" +#include "forward.h" #ifdef __CHECKER__ #define __sd_bitwise __attribute__((__bitwise__)) diff --git a/src/basic/stat-util.h b/src/basic/stat-util.h index 267d6ed7b4..aa1c21ed90 100644 --- a/src/basic/stat-util.h +++ b/src/basic/stat-util.h @@ -4,7 +4,7 @@ #include /* IWYU pragma: export */ #include /* IWYU pragma: export */ -#include "basic-forward.h" +#include "forward.h" int stat_verify_regular(const struct stat *st); int statx_verify_regular(const struct statx *stx); diff --git a/src/basic/static-destruct.h b/src/basic/static-destruct.h index 8e71c9b235..ead11bdb37 100644 --- a/src/basic/static-destruct.h +++ b/src/basic/static-destruct.h @@ -2,7 +2,7 @@ #pragma once -#include "basic-forward.h" +#include "forward.h" typedef void (*free_func_t)(void *p); diff --git a/src/basic/stdio-util.h b/src/basic/stdio-util.h index f8055b3853..df114b4425 100644 --- a/src/basic/stdio-util.h +++ b/src/basic/stdio-util.h @@ -4,7 +4,7 @@ #include #include -#include "basic-forward.h" +#include "forward.h" _printf_(3, 4) static inline char* snprintf_ok(char *buf, size_t len, const char *format, ...) { diff --git a/src/basic/strbuf.h b/src/basic/strbuf.h index 9f4a63fe92..68baaffb40 100644 --- a/src/basic/strbuf.h +++ b/src/basic/strbuf.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" struct strbuf { char *buf; diff --git a/src/basic/string-table.h b/src/basic/string-table.h index 6e7038074b..38704ac6f3 100644 --- a/src/basic/string-table.h +++ b/src/basic/string-table.h @@ -3,7 +3,7 @@ #include -#include "basic-forward.h" +#include "forward.h" const char* string_table_lookup_to_string(const char * const *table, size_t len, ssize_t i) _const_; diff --git a/src/basic/string-util.h b/src/basic/string-util.h index 68ab38c321..8f4cc69a54 100644 --- a/src/basic/string-util.h +++ b/src/basic/string-util.h @@ -4,7 +4,7 @@ #include #include "alloc-util.h" -#include "basic-forward.h" +#include "forward.h" #include "../fundamental/string-util.h" /* IWYU pragma: export */ diff --git a/src/basic/strv.h b/src/basic/strv.h index 7bac1b66fa..2a0c2730d1 100644 --- a/src/basic/strv.h +++ b/src/basic/strv.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" #include "../fundamental/strv.h" /* IWYU pragma: export */ diff --git a/src/basic/strxcpyx.h b/src/basic/strxcpyx.h index b89d180fb8..7d045fe8d2 100644 --- a/src/basic/strxcpyx.h +++ b/src/basic/strxcpyx.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" size_t strnpcpy_full(char **dest, size_t size, const char *src, size_t len, bool *ret_truncated); static inline size_t strnpcpy(char **dest, size_t size, const char *src, size_t len) { diff --git a/src/basic/sync-util.h b/src/basic/sync-util.h index 0f6e195ec3..c464a656d4 100644 --- a/src/basic/sync-util.h +++ b/src/basic/sync-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" int fsync_directory_of_file(int fd); int fsync_full(int fd); diff --git a/src/basic/sysctl-util.h b/src/basic/sysctl-util.h index febbb233d4..a65c40b43f 100644 --- a/src/basic/sysctl-util.h +++ b/src/basic/sysctl-util.h @@ -2,7 +2,7 @@ #pragma once -#include "basic-forward.h" +#include "forward.h" #include "stdio-util.h" char* sysctl_normalize(char *s); diff --git a/src/basic/syslog-util.h b/src/basic/syslog-util.h index 64f237d6a1..5a9c1f6467 100644 --- a/src/basic/syslog-util.h +++ b/src/basic/syslog-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" DECLARE_STRING_TABLE_LOOKUP_WITH_FALLBACK(log_facility_unshifted, int); bool log_facility_unshifted_is_valid(int faciliy); diff --git a/src/basic/terminal-util.h b/src/basic/terminal-util.h index f8cd74f410..0e65d205a5 100644 --- a/src/basic/terminal-util.h +++ b/src/basic/terminal-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" /* Erase characters until the end of the line */ #define ANSI_ERASE_TO_END_OF_LINE "\x1B[K" diff --git a/src/basic/time-util.h b/src/basic/time-util.h index 1200449728..3b341911a3 100644 --- a/src/basic/time-util.h +++ b/src/basic/time-util.h @@ -4,7 +4,7 @@ #include #include -#include "basic-forward.h" +#include "forward.h" #define PRI_NSEC PRIu64 #define PRI_USEC PRIu64 diff --git a/src/basic/tmpfile-util.h b/src/basic/tmpfile-util.h index 3999020e01..cbaae5dbb3 100644 --- a/src/basic/tmpfile-util.h +++ b/src/basic/tmpfile-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" int fopen_temporary_at(int dir_fd, const char *path, FILE **ret_file, char **ret_path); static inline int fopen_temporary(const char *path, FILE **ret_file, char **ret_path) { diff --git a/src/basic/uid-classification.h b/src/basic/uid-classification.h index 58692f1ed2..a8a786a739 100644 --- a/src/basic/uid-classification.h +++ b/src/basic/uid-classification.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" /* The container base should have the last 16 bit set to zero */ assert_cc((CONTAINER_UID_BASE_MIN & 0xFFFFU) == 0); diff --git a/src/basic/uid-range.h b/src/basic/uid-range.h index 08d707ae25..1d6a1ec345 100644 --- a/src/basic/uid-range.h +++ b/src/basic/uid-range.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" typedef struct UIDRangeEntry { uid_t start, nr; diff --git a/src/basic/umask-util.h b/src/basic/umask-util.h index 86dfcfcd31..1f9ea2bf2b 100644 --- a/src/basic/umask-util.h +++ b/src/basic/umask-util.h @@ -3,7 +3,7 @@ #include -#include "basic-forward.h" +#include "forward.h" static inline void umaskp(mode_t *u) { umask(*u); diff --git a/src/basic/unaligned.h b/src/basic/unaligned.h index f54d7d8edd..9350f54430 100644 --- a/src/basic/unaligned.h +++ b/src/basic/unaligned.h @@ -3,7 +3,7 @@ #include -#include "basic-forward.h" +#include "forward.h" #include "../fundamental/unaligned.h" /* IWYU pragma: export */ diff --git a/src/basic/unit-def.h b/src/basic/unit-def.h index 8d05b5b5ed..9192d8c4a5 100644 --- a/src/basic/unit-def.h +++ b/src/basic/unit-def.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" /* The enum order is used to order unit jobs in the job queue * when other criteria (cpu weight, nice level) are identical. diff --git a/src/basic/unit-name.h b/src/basic/unit-name.h index 7484ec6529..0a301f747d 100644 --- a/src/basic/unit-name.h +++ b/src/basic/unit-name.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" #define UNIT_NAME_MAX 256 diff --git a/src/basic/user-util.h b/src/basic/user-util.h index ab9222c500..8355548b00 100644 --- a/src/basic/user-util.h +++ b/src/basic/user-util.h @@ -8,7 +8,7 @@ #include #include -#include "basic-forward.h" +#include "forward.h" #include "errno-util.h" /* Users managed by systemd-homed. See https://systemd.io/UIDS-GIDS for details diff --git a/src/basic/utf8.h b/src/basic/utf8.h index 967edb4014..dc97f4aee7 100644 --- a/src/basic/utf8.h +++ b/src/basic/utf8.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" #define UTF8_REPLACEMENT_CHARACTER "\xef\xbf\xbd" #define UTF8_BYTE_ORDER_MARK "\xef\xbb\xbf" diff --git a/src/basic/virt.h b/src/basic/virt.h index 99877044e0..fcb3cdc5ae 100644 --- a/src/basic/virt.h +++ b/src/basic/virt.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" typedef enum Virtualization { VIRTUALIZATION_NONE = 0, diff --git a/src/basic/xattr-util.h b/src/basic/xattr-util.h index d8e521b969..f38ecf491d 100644 --- a/src/basic/xattr-util.h +++ b/src/basic/xattr-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" int getxattr_at_malloc(int fd, const char *path, const char *name, int at_flags, char **ret, size_t *ret_size); static inline int getxattr_malloc(const char *path, const char *name, char **ret, size_t *ret_size) { diff --git a/src/bootctl/bootctl-cleanup.h b/src/bootctl/bootctl-cleanup.h index 22d087374e..016c93b15b 100644 --- a/src/bootctl/bootctl-cleanup.h +++ b/src/bootctl/bootctl-cleanup.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_cleanup(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/bootctl/bootctl-install.h b/src/bootctl/bootctl-install.h index c9019520cc..3d83482900 100644 --- a/src/bootctl/bootctl-install.h +++ b/src/bootctl/bootctl-install.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_install(int argc, char *argv[], uintptr_t _data, void *userdata); int verb_remove(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/bootctl/bootctl-link.h b/src/bootctl/bootctl-link.h index fb04c31511..3ca2e0bb2a 100644 --- a/src/bootctl/bootctl-link.h +++ b/src/bootctl/bootctl-link.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_link(int argc, char *argv[], uintptr_t data, void *userdata); int verb_link_auto(int argc, char *argv[], uintptr_t data, void *userdata); diff --git a/src/bootctl/bootctl-random-seed.h b/src/bootctl/bootctl-random-seed.h index 1764668b3a..d9c18b7707 100644 --- a/src/bootctl/bootctl-random-seed.h +++ b/src/bootctl/bootctl-random-seed.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int install_random_seed(const char *esp, int esp_fd); diff --git a/src/bootctl/bootctl-reboot-to-firmware.h b/src/bootctl/bootctl-reboot-to-firmware.h index 0262c861c4..b3ca24a3a7 100644 --- a/src/bootctl/bootctl-reboot-to-firmware.h +++ b/src/bootctl/bootctl-reboot-to-firmware.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_reboot_to_firmware(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/bootctl/bootctl-set-efivar.h b/src/bootctl/bootctl-set-efivar.h index ee5e518b44..6037337e27 100644 --- a/src/bootctl/bootctl-set-efivar.h +++ b/src/bootctl/bootctl-set-efivar.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_set_efivar(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/bootctl/bootctl-status.h b/src/bootctl/bootctl-status.h index 941bcdd9ac..4cfc6e7861 100644 --- a/src/bootctl/bootctl-status.h +++ b/src/bootctl/bootctl-status.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_status(int argc, char *argv[], uintptr_t _data, void *userdata); int verb_list(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/bootctl/bootctl-uki.h b/src/bootctl/bootctl-uki.h index febac7394d..7c8eb983cc 100644 --- a/src/bootctl/bootctl-uki.h +++ b/src/bootctl/bootctl-uki.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_kernel_identify(int argc, char *argv[], uintptr_t _data, void *userdata); int verb_kernel_inspect(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/bootctl/bootctl-unlink.h b/src/bootctl/bootctl-unlink.h index 728c775d26..e789ef7e21 100644 --- a/src/bootctl/bootctl-unlink.h +++ b/src/bootctl/bootctl-unlink.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_unlink(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/bootctl/bootctl.h b/src/bootctl/bootctl.h index b478ae0ec1..49656c1098 100644 --- a/src/bootctl/bootctl.h +++ b/src/bootctl/bootctl.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" typedef enum InstallSource { INSTALL_SOURCE_IMAGE, diff --git a/src/busctl/busctl-introspect.h b/src/busctl/busctl-introspect.h index d83be3715d..374ab53a19 100644 --- a/src/busctl/busctl-introspect.h +++ b/src/busctl/busctl-introspect.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" typedef struct XMLIntrospectOps { int (*on_path)(const char *path, void *userdata); diff --git a/src/core/bpf-restrict-fsaccess.h b/src/core/bpf-restrict-fsaccess.h index 3203f0fc7e..cefdcb9ee9 100644 --- a/src/core/bpf-restrict-fsaccess.h +++ b/src/core/bpf-restrict-fsaccess.h @@ -3,7 +3,7 @@ #include "core-forward.h" #include "macro.h" -#include "shared-forward.h" +#include "forward.h" typedef enum RestrictFileSystemAccess { RESTRICT_FILESYSTEM_ACCESS_NO, diff --git a/src/core/core-forward.h b/src/core/core-forward.h index 14bcc142a2..4dedb2b691 100644 --- a/src/core/core-forward.h +++ b/src/core/core-forward.h @@ -4,7 +4,7 @@ /* IWYU pragma: always_keep */ #include "conf-parser-forward.h" /* IWYU pragma: export */ -#include "shared-forward.h" /* IWYU pragma: export */ +#include "forward.h" /* IWYU pragma: export */ #include "unit-def.h" /* IWYU pragma: export */ typedef enum CGroupDevicePermissions CGroupDevicePermissions; diff --git a/src/core/varlink-execute.h b/src/core/varlink-execute.h index ba3fa7279e..86b0285509 100644 --- a/src/core/varlink-execute.h +++ b/src/core/varlink-execute.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int unit_exec_context_build_json(sd_json_variant **ret, const char *name, void *userdata); diff --git a/src/coredump/coredump-forward.h b/src/coredump/coredump-forward.h index 0fa18a4a12..98c5767f98 100644 --- a/src/coredump/coredump-forward.h +++ b/src/coredump/coredump-forward.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" typedef struct CoredumpConfig CoredumpConfig; typedef struct CoredumpContext CoredumpContext; diff --git a/src/coredump/coredump-vacuum.h b/src/coredump/coredump-vacuum.h index 74cd4344bc..1a2d648111 100644 --- a/src/coredump/coredump-vacuum.h +++ b/src/coredump/coredump-vacuum.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int coredump_vacuum(int exclude_fd, uint64_t keep_free, uint64_t max_use); diff --git a/src/cryptenroll/cryptenroll-fido2.h b/src/cryptenroll/cryptenroll-fido2.h index c5d57f12db..c637202ced 100644 --- a/src/cryptenroll/cryptenroll-fido2.h +++ b/src/cryptenroll/cryptenroll-fido2.h @@ -2,7 +2,7 @@ #pragma once #include "cryptenroll.h" -#include "shared-forward.h" +#include "forward.h" int load_volume_key_fido2(const EnrollContext *c, struct crypt_device *cd, struct iovec *ret_vk); int enroll_fido2(const EnrollContext *c, struct crypt_device *cd, const struct iovec *volume_key); diff --git a/src/cryptenroll/cryptenroll-list.h b/src/cryptenroll/cryptenroll-list.h index 3366336713..84239c9ce7 100644 --- a/src/cryptenroll/cryptenroll-list.h +++ b/src/cryptenroll/cryptenroll-list.h @@ -2,7 +2,7 @@ #pragma once #include "cryptenroll.h" -#include "shared-forward.h" +#include "forward.h" typedef struct EnrolledSlot { int slot; diff --git a/src/cryptenroll/cryptenroll-password.h b/src/cryptenroll/cryptenroll-password.h index 035a1becc5..3ed8abb96b 100644 --- a/src/cryptenroll/cryptenroll-password.h +++ b/src/cryptenroll/cryptenroll-password.h @@ -2,7 +2,7 @@ #pragma once #include "cryptenroll.h" -#include "shared-forward.h" +#include "forward.h" int load_volume_key_empty(const EnrollContext *c, struct crypt_device *cd, struct iovec *ret_vk); int load_volume_key_keyfile(const EnrollContext *c, struct crypt_device *cd, struct iovec *ret_vk); diff --git a/src/cryptenroll/cryptenroll-pkcs11.h b/src/cryptenroll/cryptenroll-pkcs11.h index 614c6d466c..c9269148b6 100644 --- a/src/cryptenroll/cryptenroll-pkcs11.h +++ b/src/cryptenroll/cryptenroll-pkcs11.h @@ -2,6 +2,6 @@ #pragma once #include "cryptenroll.h" -#include "shared-forward.h" +#include "forward.h" int enroll_pkcs11(const EnrollContext *c, struct crypt_device *cd, const struct iovec *volume_key); diff --git a/src/cryptenroll/cryptenroll-recovery.h b/src/cryptenroll/cryptenroll-recovery.h index 1655f71445..244867d436 100644 --- a/src/cryptenroll/cryptenroll-recovery.h +++ b/src/cryptenroll/cryptenroll-recovery.h @@ -2,7 +2,7 @@ #pragma once #include "cryptenroll.h" -#include "shared-forward.h" +#include "forward.h" /* When c->interactive is unset, the generated recovery key is returned via ret_recovery_key * instead of being printed to stdout/stderr + rendered as a QR code. */ diff --git a/src/cryptenroll/cryptenroll-tpm2.h b/src/cryptenroll/cryptenroll-tpm2.h index 3d57b8f8f3..3336cb4f25 100644 --- a/src/cryptenroll/cryptenroll-tpm2.h +++ b/src/cryptenroll/cryptenroll-tpm2.h @@ -2,7 +2,7 @@ #pragma once #include "cryptenroll.h" -#include "shared-forward.h" +#include "forward.h" int load_volume_key_tpm2(const EnrollContext *c, struct crypt_device *cd, struct iovec *ret_vk); int enroll_tpm2(const EnrollContext *c, struct crypt_device *cd, const struct iovec *volume_key, int *ret_slot_to_wipe); diff --git a/src/cryptenroll/cryptenroll-wipe.h b/src/cryptenroll/cryptenroll-wipe.h index cb3dd71933..2275663255 100644 --- a/src/cryptenroll/cryptenroll-wipe.h +++ b/src/cryptenroll/cryptenroll-wipe.h @@ -2,7 +2,7 @@ #pragma once #include "cryptenroll.h" -#include "shared-forward.h" +#include "forward.h" /* Wipes the slots selected by c->wipe_slots / c->n_wipe_slots / c->wipe_slots_scope / * c->wipe_slots_mask, except for c->wipe_except_slot (set to -1 for none). If ret_wiped_slots/ diff --git a/src/cryptenroll/cryptenroll.h b/src/cryptenroll/cryptenroll.h index 4e96976f50..60073278b2 100644 --- a/src/cryptenroll/cryptenroll.h +++ b/src/cryptenroll/cryptenroll.h @@ -2,8 +2,8 @@ #pragma once #include "crypto-util.h" +#include "forward.h" #include "libfido2-util.h" -#include "shared-forward.h" typedef enum EnrollType { ENROLL_PASSWORD, diff --git a/src/cryptsetup/cryptsetup-keyfile.h b/src/cryptsetup/cryptsetup-keyfile.h index 87ff70d65f..76c21004af 100644 --- a/src/cryptsetup/cryptsetup-keyfile.h +++ b/src/cryptsetup/cryptsetup-keyfile.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int find_key_file(const char *key_file, char **search_path, const char *bindname, struct iovec *ret_key); diff --git a/src/cryptsetup/cryptsetup-pkcs11.h b/src/cryptsetup/cryptsetup-pkcs11.h index faccad599e..3382a60f89 100644 --- a/src/cryptsetup/cryptsetup-pkcs11.h +++ b/src/cryptsetup/cryptsetup-pkcs11.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once +#include "forward.h" #include "pkcs11-padding.h" -#include "shared-forward.h" int decrypt_pkcs11_key( const char *volume_name, diff --git a/src/cryptsetup/cryptsetup-tokens/cryptsetup-token-util.h b/src/cryptsetup/cryptsetup-tokens/cryptsetup-token-util.h index c6a7d25f39..240422e2db 100644 --- a/src/cryptsetup/cryptsetup-tokens/cryptsetup-token-util.h +++ b/src/cryptsetup/cryptsetup-tokens/cryptsetup-token-util.h @@ -3,7 +3,7 @@ #pragma once #include "cryptsetup-util.h" -#include "shared-forward.h" +#include "forward.h" /* crypt_dump() internal indentation magic */ #define CRYPT_DUMP_LINE_SEP "\n\t " diff --git a/src/cryptsetup/cryptsetup-tokens/cryptsetup-token.h b/src/cryptsetup/cryptsetup-tokens/cryptsetup-token.h index fa02ec207b..b23f62be8d 100644 --- a/src/cryptsetup/cryptsetup-tokens/cryptsetup-token.h +++ b/src/cryptsetup/cryptsetup-tokens/cryptsetup-token.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" /* for more information see libcryptsetup.h crypt-tokens section */ diff --git a/src/cryptsetup/cryptsetup-tokens/luks2-pkcs11.h b/src/cryptsetup/cryptsetup-tokens/luks2-pkcs11.h index a4f11b6468..a65e5ddea7 100644 --- a/src/cryptsetup/cryptsetup-tokens/luks2-pkcs11.h +++ b/src/cryptsetup/cryptsetup-tokens/luks2-pkcs11.h @@ -2,8 +2,8 @@ #pragma once +#include "forward.h" #include "pkcs11-util.h" -#include "shared-forward.h" int acquire_luks2_key( struct crypt_device *cd, diff --git a/src/fuzz/fuzz.h b/src/fuzz/fuzz.h index be708abfd1..518f4d92c5 100644 --- a/src/fuzz/fuzz.h +++ b/src/fuzz/fuzz.h @@ -3,7 +3,7 @@ #include -#include "shared-forward.h" +#include "forward.h" #include "fileio.h" #include "log.h" diff --git a/src/hibernate-resume/hibernate-resume-config.h b/src/hibernate-resume/hibernate-resume-config.h index bad2cf8283..55f344a9e6 100644 --- a/src/hibernate-resume/hibernate-resume-config.h +++ b/src/hibernate-resume/hibernate-resume-config.h @@ -3,7 +3,7 @@ #include "sd-id128.h" -#include "shared-forward.h" +#include "forward.h" typedef struct KernelHibernateLocation KernelHibernateLocation; diff --git a/src/home/homectl-fido2.h b/src/home/homectl-fido2.h index 9815ec8e18..840dd79d19 100644 --- a/src/home/homectl-fido2.h +++ b/src/home/homectl-fido2.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int identity_add_fido2_parameters(sd_json_variant **v, const char *device, Fido2EnrollFlags lock_with, int cred_alg); diff --git a/src/home/homectl-pkcs11.h b/src/home/homectl-pkcs11.h index ca79a0f29b..cee12b49ed 100644 --- a/src/home/homectl-pkcs11.h +++ b/src/home/homectl-pkcs11.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int identity_add_token_pin(sd_json_variant **v, const char *pin); int identity_add_pkcs11_key_data(sd_json_variant **v, const char *token_uri); diff --git a/src/home/homectl-recovery-key.h b/src/home/homectl-recovery-key.h index b5100da0f1..5a48f5fec1 100644 --- a/src/home/homectl-recovery-key.h +++ b/src/home/homectl-recovery-key.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int identity_add_recovery_key(sd_json_variant **v); diff --git a/src/home/homed-forward.h b/src/home/homed-forward.h index 995d87eaa5..679b936e9a 100644 --- a/src/home/homed-forward.h +++ b/src/home/homed-forward.h @@ -4,7 +4,7 @@ /* IWYU pragma: always_keep */ #include "conf-parser-forward.h" /* IWYU pragma: export */ -#include "shared-forward.h" /* IWYU pragma: export */ +#include "forward.h" /* IWYU pragma: export */ typedef struct Manager Manager; typedef struct Home Home; diff --git a/src/home/homework-forward.h b/src/home/homework-forward.h index 3c09338eef..e431340761 100644 --- a/src/home/homework-forward.h +++ b/src/home/homework-forward.h @@ -3,7 +3,7 @@ /* IWYU pragma: always_keep */ -#include "shared-forward.h" /* IWYU pragma: export */ +#include "forward.h" /* IWYU pragma: export */ typedef enum HomeSetupFlags HomeSetupFlags; diff --git a/src/home/user-record-password-quality.h b/src/home/user-record-password-quality.h index 36e2b3ed13..b76092113c 100644 --- a/src/home/user-record-password-quality.h +++ b/src/home/user-record-password-quality.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int user_record_check_password_quality(UserRecord *hr, UserRecord *secret, sd_bus_error *error); diff --git a/src/home/user-record-sign.h b/src/home/user-record-sign.h index 673c7b2b37..63763ead5d 100644 --- a/src/home/user-record-sign.h +++ b/src/home/user-record-sign.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int user_record_sign(UserRecord *ur, EVP_PKEY *private_key, UserRecord **ret); diff --git a/src/home/user-record-util.h b/src/home/user-record-util.h index e493e1dc3c..8a95572547 100644 --- a/src/home/user-record-util.h +++ b/src/home/user-record-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.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/imds/imds-tool.h b/src/imds/imds-tool.h index bfe26015c3..1d4fcbb582 100644 --- a/src/imds/imds-tool.h +++ b/src/imds/imds-tool.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once +#include "forward.h" #include "imds-util.h" -#include "shared-forward.h" /* Helpers shared between imds-tool.c and imds-tool-metrics.c for talking to systemd-imdsd. */ diff --git a/src/import/export-raw.h b/src/import/export-raw.h index f1f17c2c6d..cfd79d37af 100644 --- a/src/import/export-raw.h +++ b/src/import/export-raw.h @@ -2,7 +2,7 @@ #pragma once #include "compress.h" -#include "shared-forward.h" +#include "forward.h" typedef struct RawExport RawExport; diff --git a/src/import/export-tar.h b/src/import/export-tar.h index be039b6b41..6fbeda8d48 100644 --- a/src/import/export-tar.h +++ b/src/import/export-tar.h @@ -3,7 +3,6 @@ #include "compress.h" #include "import-common.h" -#include "shared-forward.h" typedef struct TarExport TarExport; diff --git a/src/import/import-common.h b/src/import/import-common.h index 69bdb33528..68525a777d 100644 --- a/src/import/import-common.h +++ b/src/import/import-common.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" typedef enum ImportFlags { /* Public Flags (i.e. accessible via D-Bus, must stay stable! */ diff --git a/src/import/import-raw.h b/src/import/import-raw.h index 7fdafdf2f4..8d8ad42c4c 100644 --- a/src/import/import-raw.h +++ b/src/import/import-raw.h @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" #include "import-common.h" typedef struct RawImport RawImport; diff --git a/src/import/import-tar.h b/src/import/import-tar.h index 116c3269bd..285555555d 100644 --- a/src/import/import-tar.h +++ b/src/import/import-tar.h @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" #include "import-common.h" typedef struct TarImport TarImport; diff --git a/src/import/oci-util.h b/src/import/oci-util.h index 72b6370057..ee7026c7cb 100644 --- a/src/import/oci-util.h +++ b/src/import/oci-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" bool oci_image_is_valid(const char *n); int oci_registry_is_valid(const char *n); diff --git a/src/import/pull-forward.h b/src/import/pull-forward.h index 39ed1725ce..81b5280a4d 100644 --- a/src/import/pull-forward.h +++ b/src/import/pull-forward.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" typedef enum PullJobState PullJobState; diff --git a/src/integritysetup/integrity-util.h b/src/integritysetup/integrity-util.h index b1fd98c849..868809b43f 100644 --- a/src/integritysetup/integrity-util.h +++ b/src/integritysetup/integrity-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" typedef enum { INTEGRITY_ALGORITHM_CRC32, diff --git a/src/journal-remote/journal-compression-util.h b/src/journal-remote/journal-compression-util.h index 6670d61756..ca079dbb8d 100644 --- a/src/journal-remote/journal-compression-util.h +++ b/src/journal-remote/journal-compression-util.h @@ -3,7 +3,7 @@ #include "compress.h" #include "conf-parser-forward.h" -#include "shared-forward.h" +#include "forward.h" typedef struct CompressionConfig { Compression algorithm; diff --git a/src/journal-remote/journal-header-util.h b/src/journal-remote/journal-header-util.h index 0e99b66009..767de11e5a 100644 --- a/src/journal-remote/journal-header-util.h +++ b/src/journal-remote/journal-header-util.h @@ -2,7 +2,7 @@ #pragma once #include "conf-parser-forward.h" -#include "shared-forward.h" +#include "forward.h" bool header_value_is_valid(const char *value); diff --git a/src/journal-remote/journal-remote-parse.h b/src/journal-remote/journal-remote-parse.h index 2ce0b86ad7..54b984431e 100644 --- a/src/journal-remote/journal-remote-parse.h +++ b/src/journal-remote/journal-remote-parse.h @@ -2,7 +2,7 @@ #pragma once #include "compress.h" -#include "shared-forward.h" +#include "forward.h" #include "journal-importer.h" #include "journal-remote-write.h" diff --git a/src/journal-remote/journal-remote.h b/src/journal-remote/journal-remote.h index b893530250..bcf619332c 100644 --- a/src/journal-remote/journal-remote.h +++ b/src/journal-remote/journal-remote.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" #include "journal-remote-parse.h" #include "journal-remote-write.h" diff --git a/src/journal-remote/journal-upload.h b/src/journal-remote/journal-upload.h index 3c857dc4b6..812de60bdb 100644 --- a/src/journal-remote/journal-upload.h +++ b/src/journal-remote/journal-upload.h @@ -3,7 +3,7 @@ #pragma once #include "curl-util.h" -#include "shared-forward.h" +#include "forward.h" #include "journal-compression-util.h" typedef enum { diff --git a/src/journal/audit-type.h b/src/journal/audit-type.h index fa43233c69..5dd455d6eb 100644 --- a/src/journal/audit-type.h +++ b/src/journal/audit-type.h @@ -3,7 +3,7 @@ #include /* IWYU pragma: keep */ -#include "sd-forward.h" +#include "forward.h" #include "alloc-util.h" /* IWYU pragma: keep */ diff --git a/src/journal/journalctl-filter.h b/src/journal/journalctl-filter.h index 95b4aeaf04..bf2f7b839c 100644 --- a/src/journal/journalctl-filter.h +++ b/src/journal/journalctl-filter.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int journal_add_unit_matches( sd_journal *j, diff --git a/src/journal/journalctl-metrics.h b/src/journal/journalctl-metrics.h index 8250b43855..c32faca6b0 100644 --- a/src/journal/journalctl-metrics.h +++ b/src/journal/journalctl-metrics.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" #define METRIC_IO_SYSTEMD_JOURNAL_PREFIX "io.systemd.Journal." diff --git a/src/journal/journalctl-misc.h b/src/journal/journalctl-misc.h index dad0d4edbd..0da319079c 100644 --- a/src/journal/journalctl-misc.h +++ b/src/journal/journalctl-misc.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int action_print_header(void); int action_verify(void); diff --git a/src/journal/journalctl-util.h b/src/journal/journalctl-util.h index f237aab2b0..4571c28540 100644 --- a/src/journal/journalctl-util.h +++ b/src/journal/journalctl-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" #include "logs-show.h" /* The lists below are supposed to return the superset of unit names possibly matched by rules added with diff --git a/src/journal/journalctl.h b/src/journal/journalctl.h index 504e5e6dd1..59353253d4 100644 --- a/src/journal/journalctl.h +++ b/src/journal/journalctl.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" #include "pcre2-util.h" typedef enum JournalctlAction { diff --git a/src/journal/journald-forward.h b/src/journal/journald-forward.h index 66bcc40d3a..0928ecf4a0 100644 --- a/src/journal/journald-forward.h +++ b/src/journal/journald-forward.h @@ -4,7 +4,7 @@ /* IWYU pragma: always_keep */ #include "conf-parser-forward.h" /* IWYU pragma: export */ -#include "shared-forward.h" /* IWYU pragma: export */ +#include "forward.h" /* IWYU pragma: export */ typedef enum Storage Storage; typedef enum SplitMode SplitMode; diff --git a/src/libsystemd-network/arp-util.h b/src/libsystemd-network/arp-util.h index 5cf56c064a..4152c3a098 100644 --- a/src/libsystemd-network/arp-util.h +++ b/src/libsystemd-network/arp-util.h @@ -5,7 +5,7 @@ Copyright © 2014 Axis Communications AB. All rights reserved. ***/ -#include "sd-forward.h" +#include "forward.h" int arp_update_filter(int fd, const struct in_addr *a, const struct ether_addr *mac); int arp_network_bind_raw_socket(int ifindex, const struct in_addr *a, const struct ether_addr *mac); diff --git a/src/libsystemd-network/dhcp-forward.h b/src/libsystemd-network/dhcp-forward.h index f83c58a3af..7915976b12 100644 --- a/src/libsystemd-network/dhcp-forward.h +++ b/src/libsystemd-network/dhcp-forward.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "sd-forward.h" +#include "forward.h" #include "sparse-endian.h" struct in_pktinfo; diff --git a/src/libsystemd-network/dhcp6-client-internal.h b/src/libsystemd-network/dhcp6-client-internal.h index 2c68263508..1a84053735 100644 --- a/src/libsystemd-network/dhcp6-client-internal.h +++ b/src/libsystemd-network/dhcp6-client-internal.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "sd-forward.h" +#include "forward.h" #include "sd-dhcp6-client.h" int dhcp6_client_set_state_callback( diff --git a/src/libsystemd-network/dhcp6-internal.h b/src/libsystemd-network/dhcp6-internal.h index faa82c230b..5762966c26 100644 --- a/src/libsystemd-network/dhcp6-internal.h +++ b/src/libsystemd-network/dhcp6-internal.h @@ -13,7 +13,7 @@ #include "dhcp-duid-internal.h" #include "dhcp6-option.h" #include "dhcp6-protocol.h" -#include "sd-forward.h" +#include "forward.h" #include "network-common.h" #include "sparse-endian.h" diff --git a/src/libsystemd-network/dhcp6-lease-internal.h b/src/libsystemd-network/dhcp6-lease-internal.h index f2f4cbc690..a841ce6271 100644 --- a/src/libsystemd-network/dhcp6-lease-internal.h +++ b/src/libsystemd-network/dhcp6-lease-internal.h @@ -9,7 +9,7 @@ #include "dhcp6-option.h" #include "dhcp6-protocol.h" -#include "sd-forward.h" +#include "forward.h" #include "time-util.h" struct sd_dhcp6_lease { diff --git a/src/libsystemd-network/dhcp6-option.h b/src/libsystemd-network/dhcp6-option.h index 7142853197..9deee41ae4 100644 --- a/src/libsystemd-network/dhcp6-option.h +++ b/src/libsystemd-network/dhcp6-option.h @@ -5,7 +5,7 @@ #include "sd-dhcp6-option.h" /* IWYU pragma: export */ -#include "sd-forward.h" +#include "forward.h" #include "list.h" #include "sparse-endian.h" diff --git a/src/libsystemd-network/dhcp6-protocol.h b/src/libsystemd-network/dhcp6-protocol.h index 74b5b8f530..496eae22ab 100644 --- a/src/libsystemd-network/dhcp6-protocol.h +++ b/src/libsystemd-network/dhcp6-protocol.h @@ -5,7 +5,7 @@ Copyright © 2014 Intel Corporation. All rights reserved. ***/ -#include "sd-forward.h" +#include "forward.h" #include "sparse-endian.h" struct DHCP6Message { diff --git a/src/libsystemd-network/dns-resolver-internal.h b/src/libsystemd-network/dns-resolver-internal.h index c9b3103cdb..b8115baf6d 100644 --- a/src/libsystemd-network/dns-resolver-internal.h +++ b/src/libsystemd-network/dns-resolver-internal.h @@ -3,7 +3,7 @@ #include "sd-dns-resolver.h" -#include "sd-forward.h" +#include "forward.h" #include "socket-netlink.h" /* Represents a "designated resolver" */ diff --git a/src/libsystemd-network/icmp6-packet.h b/src/libsystemd-network/icmp6-packet.h index 1b6f157275..1abb7c2ad3 100644 --- a/src/libsystemd-network/icmp6-packet.h +++ b/src/libsystemd-network/icmp6-packet.h @@ -3,7 +3,7 @@ #include -#include "sd-forward.h" +#include "forward.h" #include "time-util.h" typedef struct ICMP6Packet { diff --git a/src/libsystemd-network/icmp6-util.h b/src/libsystemd-network/icmp6-util.h index d23e0fe0eb..25bdd2c1df 100644 --- a/src/libsystemd-network/icmp6-util.h +++ b/src/libsystemd-network/icmp6-util.h @@ -7,7 +7,7 @@ #include -#include "sd-forward.h" +#include "forward.h" #define IN6_ADDR_ALL_ROUTERS_MULTICAST \ ((const struct in6_addr) { { { \ diff --git a/src/libsystemd-network/ip-util.h b/src/libsystemd-network/ip-util.h index 31fa4631c3..4698775370 100644 --- a/src/libsystemd-network/ip-util.h +++ b/src/libsystemd-network/ip-util.h @@ -4,7 +4,7 @@ #include #include -#include "sd-forward.h" +#include "forward.h" #include "sparse-endian.h" diff --git a/src/libsystemd-network/lldp-neighbor.h b/src/libsystemd-network/lldp-neighbor.h index 2060474e2a..9a2dc7d81d 100644 --- a/src/libsystemd-network/lldp-neighbor.h +++ b/src/libsystemd-network/lldp-neighbor.h @@ -5,7 +5,7 @@ #include "sd-lldp-rx.h" -#include "sd-forward.h" +#include "forward.h" #include "memory-util.h" #include "time-util.h" diff --git a/src/libsystemd-network/lldp-rx-internal.h b/src/libsystemd-network/lldp-rx-internal.h index 18fd33b742..75e7d8277d 100644 --- a/src/libsystemd-network/lldp-rx-internal.h +++ b/src/libsystemd-network/lldp-rx-internal.h @@ -6,7 +6,7 @@ #include "sd-lldp-rx.h" /* IWYU pragma: export */ #include "network-common.h" -#include "sd-forward.h" +#include "forward.h" struct sd_lldp_rx { unsigned n_ref; diff --git a/src/libsystemd-network/ndisc-internal.h b/src/libsystemd-network/ndisc-internal.h index a8ec0ee79b..3cee2039eb 100644 --- a/src/libsystemd-network/ndisc-internal.h +++ b/src/libsystemd-network/ndisc-internal.h @@ -11,7 +11,7 @@ #include "sd-event.h" #include "sd-ndisc.h" /* IWYU pragma: export */ -#include "sd-forward.h" +#include "forward.h" #include "network-common.h" #include "time-util.h" diff --git a/src/libsystemd-network/ndisc-neighbor-internal.h b/src/libsystemd-network/ndisc-neighbor-internal.h index 2b54aac8ed..295c093b43 100644 --- a/src/libsystemd-network/ndisc-neighbor-internal.h +++ b/src/libsystemd-network/ndisc-neighbor-internal.h @@ -3,7 +3,7 @@ #include -#include "sd-forward.h" +#include "forward.h" typedef struct sd_ndisc_neighbor { unsigned n_ref; diff --git a/src/libsystemd-network/ndisc-option.h b/src/libsystemd-network/ndisc-option.h index 8a24574d4a..d92ff6813c 100644 --- a/src/libsystemd-network/ndisc-option.h +++ b/src/libsystemd-network/ndisc-option.h @@ -5,7 +5,7 @@ #include #include "sd-dns-resolver.h" -#include "sd-forward.h" +#include "forward.h" #include "time-util.h" diff --git a/src/libsystemd-network/ndisc-redirect-internal.h b/src/libsystemd-network/ndisc-redirect-internal.h index 96a0156f37..77d6f8b88f 100644 --- a/src/libsystemd-network/ndisc-redirect-internal.h +++ b/src/libsystemd-network/ndisc-redirect-internal.h @@ -3,7 +3,7 @@ #include -#include "sd-forward.h" +#include "forward.h" typedef struct sd_ndisc_redirect { unsigned n_ref; diff --git a/src/libsystemd-network/ndisc-router-solicit-internal.h b/src/libsystemd-network/ndisc-router-solicit-internal.h index 1c57e9d0b4..2186238a6f 100644 --- a/src/libsystemd-network/ndisc-router-solicit-internal.h +++ b/src/libsystemd-network/ndisc-router-solicit-internal.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "sd-forward.h" +#include "forward.h" typedef struct sd_ndisc_router_solicit { unsigned n_ref; diff --git a/src/libsystemd-network/network-common.h b/src/libsystemd-network/network-common.h index 87a51c76fc..933ce170b7 100644 --- a/src/libsystemd-network/network-common.h +++ b/src/libsystemd-network/network-common.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "sd-forward.h" +#include "forward.h" #include "log-link.h" #include "sparse-endian.h" #include "time-util.h" diff --git a/src/libsystemd-network/network-internal.h b/src/libsystemd-network/network-internal.h index 773f42c42d..c59d32ba7d 100644 --- a/src/libsystemd-network/network-internal.h +++ b/src/libsystemd-network/network-internal.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "sd-forward.h" +#include "forward.h" size_t serialize_in_addrs(FILE *f, const struct in_addr *addresses, diff --git a/src/libsystemd-network/radv-internal.h b/src/libsystemd-network/radv-internal.h index 673d863ca3..0e34176e8c 100644 --- a/src/libsystemd-network/radv-internal.h +++ b/src/libsystemd-network/radv-internal.h @@ -7,7 +7,7 @@ #include -#include "sd-forward.h" +#include "forward.h" #include "network-common.h" #include "time-util.h" diff --git a/src/libsystemd-network/tlv-util.h b/src/libsystemd-network/tlv-util.h index 1bdcadccb8..115b259e39 100644 --- a/src/libsystemd-network/tlv-util.h +++ b/src/libsystemd-network/tlv-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "sd-forward.h" +#include "forward.h" #define TLV_TAG_PAD UINT32_C(0) #define TLV_TAG_END UINT32_C(0xFF) diff --git a/src/libsystemd/sd-common/sd-forward.h b/src/libsystemd/forward.h similarity index 98% rename from src/libsystemd/sd-common/sd-forward.h rename to src/libsystemd/forward.h index aca0ed3209..cb229f4621 100644 --- a/src/libsystemd/sd-common/sd-forward.h +++ b/src/libsystemd/forward.h @@ -3,7 +3,7 @@ /* IWYU pragma: always_keep */ -#include "basic-forward.h" /* IWYU pragma: export */ +#include "../basic/forward.h" /* IWYU pragma: export */ typedef void (*_sd_destroy_t)(void *userdata); diff --git a/src/libsystemd/sd-bus/bus-container.h b/src/libsystemd/sd-bus/bus-container.h index f6ede2ecd6..a83fb7dde6 100644 --- a/src/libsystemd/sd-bus/bus-container.h +++ b/src/libsystemd/sd-bus/bus-container.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "sd-forward.h" +#include "forward.h" int container_get_leader(RuntimeScope scope, const char *machine, pid_t *ret); diff --git a/src/libsystemd/sd-bus/bus-control.h b/src/libsystemd/sd-bus/bus-control.h index 9f65eda23a..56b4a70cda 100644 --- a/src/libsystemd/sd-bus/bus-control.h +++ b/src/libsystemd/sd-bus/bus-control.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "sd-forward.h" +#include "forward.h" int bus_add_match_internal(sd_bus *bus, const char *match, uint64_t timeout_usec, uint64_t *ret_counter); int bus_add_match_internal_async(sd_bus *bus, sd_bus_slot **ret, const char *match, sd_bus_message_handler_t callback, void *userdata, uint64_t timeout_usec); diff --git a/src/libsystemd/sd-bus/bus-creds.h b/src/libsystemd/sd-bus/bus-creds.h index 212da42055..089442e885 100644 --- a/src/libsystemd/sd-bus/bus-creds.h +++ b/src/libsystemd/sd-bus/bus-creds.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "sd-forward.h" +#include "forward.h" typedef struct sd_bus_creds { bool allocated; diff --git a/src/libsystemd/sd-bus/bus-dump.h b/src/libsystemd/sd-bus/bus-dump.h index 6dee318df9..d924301792 100644 --- a/src/libsystemd/sd-bus/bus-dump.h +++ b/src/libsystemd/sd-bus/bus-dump.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "sd-forward.h" +#include "forward.h" int bus_creds_dump(sd_bus_creds *c, FILE *f, bool terse); diff --git a/src/libsystemd/sd-bus/bus-error.h b/src/libsystemd/sd-bus/bus-error.h index 32d29b3c8c..3d98de17f7 100644 --- a/src/libsystemd/sd-bus/bus-error.h +++ b/src/libsystemd/sd-bus/bus-error.h @@ -4,7 +4,7 @@ #include "sd-bus-protocol.h" #include "errno-util.h" -#include "sd-forward.h" +#include "forward.h" bool bus_error_is_dirty(sd_bus_error *e); diff --git a/src/libsystemd/sd-bus/bus-forward.h b/src/libsystemd/sd-bus/bus-forward.h index 65f8d6515a..1210de15af 100644 --- a/src/libsystemd/sd-bus/bus-forward.h +++ b/src/libsystemd/sd-bus/bus-forward.h @@ -3,7 +3,7 @@ /* IWYU pragma: always_keep */ -#include "sd-forward.h" /* IWYU pragma: export */ +#include "forward.h" /* IWYU pragma: export */ typedef enum BusAuth BusAuth; typedef enum BusSlotType BusSlotType; diff --git a/src/libsystemd/sd-bus/bus-future.h b/src/libsystemd/sd-bus/bus-future.h index ec9bd80b15..e96a43e825 100644 --- a/src/libsystemd/sd-bus/bus-future.h +++ b/src/libsystemd/sd-bus/bus-future.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "sd-forward.h" +#include "forward.h" int bus_call_future(sd_bus *bus, sd_bus_message *m, uint64_t usec, sd_future **ret); int future_get_bus_reply(sd_future *f, sd_bus_error *reterr_error, sd_bus_message **ret_reply); diff --git a/src/libsystemd/sd-bus/bus-kernel.h b/src/libsystemd/sd-bus/bus-kernel.h index 544ee542bc..c364f62a8d 100644 --- a/src/libsystemd/sd-bus/bus-kernel.h +++ b/src/libsystemd/sd-bus/bus-kernel.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "sd-forward.h" +#include "forward.h" #define MEMFD_CACHE_MAX 32 diff --git a/src/libsystemd/sd-bus/bus-signature.h b/src/libsystemd/sd-bus/bus-signature.h index 3af5091ed4..b75df7335d 100644 --- a/src/libsystemd/sd-bus/bus-signature.h +++ b/src/libsystemd/sd-bus/bus-signature.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "sd-forward.h" +#include "forward.h" bool signature_is_single(const char *s, bool allow_dict_entry); bool signature_is_pair(const char *s); diff --git a/src/libsystemd/sd-bus/bus-socket.h b/src/libsystemd/sd-bus/bus-socket.h index 0356f64a4b..1c1d3561ee 100644 --- a/src/libsystemd/sd-bus/bus-socket.h +++ b/src/libsystemd/sd-bus/bus-socket.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "sd-forward.h" +#include "forward.h" void bus_socket_setup(sd_bus *b); diff --git a/src/libsystemd/sd-bus/bus-track.h b/src/libsystemd/sd-bus/bus-track.h index baa9d247d7..0ecd42e6d3 100644 --- a/src/libsystemd/sd-bus/bus-track.h +++ b/src/libsystemd/sd-bus/bus-track.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "sd-forward.h" +#include "forward.h" void bus_track_dispatch(sd_bus_track *track); void bus_track_close(sd_bus_track *track); diff --git a/src/libsystemd/sd-bus/bus-type.h b/src/libsystemd/sd-bus/bus-type.h index b6ec78f827..0e851b0249 100644 --- a/src/libsystemd/sd-bus/bus-type.h +++ b/src/libsystemd/sd-bus/bus-type.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "sd-forward.h" +#include "forward.h" bool bus_type_is_valid(char c) _const_; bool bus_type_is_basic(char c) _const_; diff --git a/src/libsystemd/sd-device/device-enumerator-private.h b/src/libsystemd/sd-device/device-enumerator-private.h index 983eddd188..bcbbf7853f 100644 --- a/src/libsystemd/sd-device/device-enumerator-private.h +++ b/src/libsystemd/sd-device/device-enumerator-private.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "sd-forward.h" +#include "forward.h" typedef enum MatchInitializedType { MATCH_INITIALIZED_NO, /* only devices without a db entry */ diff --git a/src/libsystemd/sd-device/device-filter.h b/src/libsystemd/sd-device/device-filter.h index 8c71aa530e..d72cbab7e8 100644 --- a/src/libsystemd/sd-device/device-filter.h +++ b/src/libsystemd/sd-device/device-filter.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "sd-forward.h" +#include "forward.h" int update_match_strv(Hashmap **match_strv, const char *key, const char *value, bool clear_on_null); bool device_match_sysattr(sd_device *device, Hashmap *match_sysattr, Hashmap *nomatch_sysattr); diff --git a/src/libsystemd/sd-device/device-internal.h b/src/libsystemd/sd-device/device-internal.h index f207a1618f..fa76cf7788 100644 --- a/src/libsystemd/sd-device/device-internal.h +++ b/src/libsystemd/sd-device/device-internal.h @@ -3,7 +3,7 @@ #include "sd-device.h" -#include "sd-forward.h" +#include "forward.h" #include "iterator.h" #define OLDEST_UDEV_DATABASE_VERSION 1 diff --git a/src/libsystemd/sd-device/device-monitor-private.h b/src/libsystemd/sd-device/device-monitor-private.h index dc1af6c19c..bcb3093fd7 100644 --- a/src/libsystemd/sd-device/device-monitor-private.h +++ b/src/libsystemd/sd-device/device-monitor-private.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "sd-forward.h" +#include "forward.h" typedef enum MonitorNetlinkGroup { MONITOR_GROUP_NONE, diff --git a/src/libsystemd/sd-device/device-private.h b/src/libsystemd/sd-device/device-private.h index 0773ec9098..04d36bfc8f 100644 --- a/src/libsystemd/sd-device/device-private.h +++ b/src/libsystemd/sd-device/device-private.h @@ -3,7 +3,7 @@ #include "sd-device.h" /* IWYU pragma: export */ -#include "sd-forward.h" +#include "forward.h" int device_new_from_mode_and_devnum(sd_device **ret, mode_t mode, dev_t devnum); int device_new_from_nulstr(sd_device **ret, char *nulstr, size_t len); diff --git a/src/libsystemd/sd-device/device-util.h b/src/libsystemd/sd-device/device-util.h index e4350a679b..1130798c44 100644 --- a/src/libsystemd/sd-device/device-util.h +++ b/src/libsystemd/sd-device/device-util.h @@ -3,7 +3,7 @@ #include "sd-device.h" -#include "sd-forward.h" +#include "forward.h" #include "log.h" #define device_unref_and_replace_new_ref(a, b) \ diff --git a/src/libsystemd/sd-event/event-future.h b/src/libsystemd/sd-event/event-future.h index 83d5939d6b..9ae02cf4f6 100644 --- a/src/libsystemd/sd-event/event-future.h +++ b/src/libsystemd/sd-event/event-future.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "sd-forward.h" +#include "forward.h" int future_new_io(sd_event *e, int fd, uint32_t events, sd_future **ret); int future_new_time(sd_event *e, clockid_t clock, uint64_t usec, uint64_t accuracy, int result, sd_future **ret); diff --git a/src/libsystemd/sd-event/event-source.h b/src/libsystemd/sd-event/event-source.h index 8487c966ab..3fea30c4b4 100644 --- a/src/libsystemd/sd-event/event-source.h +++ b/src/libsystemd/sd-event/event-source.h @@ -6,7 +6,7 @@ #include "sd-event.h" -#include "sd-forward.h" +#include "forward.h" #include "inotify-util.h" #include "list.h" #include "ratelimit.h" diff --git a/src/libsystemd/sd-event/event-util.h b/src/libsystemd/sd-event/event-util.h index ce213b9c9e..06fff49c96 100644 --- a/src/libsystemd/sd-event/event-util.h +++ b/src/libsystemd/sd-event/event-util.h @@ -3,7 +3,7 @@ #include "sd-event.h" -#include "sd-forward.h" +#include "forward.h" #define PROTECT_EVENT(e) \ _unused_ _cleanup_(sd_event_unrefp) sd_event *_ref = sd_event_ref(e); diff --git a/src/libsystemd/sd-hwdb/hwdb-internal.h b/src/libsystemd/sd-hwdb/hwdb-internal.h index 72b2f777c8..65c810416a 100644 --- a/src/libsystemd/sd-hwdb/hwdb-internal.h +++ b/src/libsystemd/sd-hwdb/hwdb-internal.h @@ -3,7 +3,7 @@ #include -#include "sd-forward.h" +#include "forward.h" #include "iterator.h" #include "sparse-endian.h" diff --git a/src/libsystemd/sd-id128/id128-util.h b/src/libsystemd/sd-id128/id128-util.h index e64921e525..874fc9f446 100644 --- a/src/libsystemd/sd-id128/id128-util.h +++ b/src/libsystemd/sd-id128/id128-util.h @@ -4,7 +4,7 @@ #include "sd-id128.h" #include "errno-util.h" -#include "sd-forward.h" +#include "forward.h" bool id128_is_valid(const char *s) _pure_; diff --git a/src/libsystemd/sd-journal/catalog.h b/src/libsystemd/sd-journal/catalog.h index 1e5b3b5477..7b29731b23 100644 --- a/src/libsystemd/sd-journal/catalog.h +++ b/src/libsystemd/sd-journal/catalog.h @@ -3,7 +3,7 @@ #include "sd-id128.h" -#include "sd-forward.h" +#include "forward.h" #include "sparse-endian.h" #define CATALOG_SIGNATURE { 'R', 'H', 'H', 'H', 'K', 'S', 'L', 'P' } diff --git a/src/libsystemd/sd-journal/journal-authenticate-internal.h b/src/libsystemd/sd-journal/journal-authenticate-internal.h index 5d5d94be20..c055eab437 100644 --- a/src/libsystemd/sd-journal/journal-authenticate-internal.h +++ b/src/libsystemd/sd-journal/journal-authenticate-internal.h @@ -2,7 +2,7 @@ #pragma once #include "journal-def.h" -#include "sd-forward.h" +#include "forward.h" typedef struct JournalAuthOps { JournalAuthContext* (*free)(JournalAuthContext *c); diff --git a/src/libsystemd/sd-journal/journal-def.h b/src/libsystemd/sd-journal/journal-def.h index a48554cee1..edd95b9783 100644 --- a/src/libsystemd/sd-journal/journal-def.h +++ b/src/libsystemd/sd-journal/journal-def.h @@ -3,7 +3,7 @@ #include "sd-id128.h" -#include "sd-forward.h" +#include "forward.h" #include "sparse-endian.h" /* Make sure not to make this smaller than the maximum coredump size. diff --git a/src/libsystemd/sd-journal/journal-file.h b/src/libsystemd/sd-journal/journal-file.h index 03a65644bf..491236c569 100644 --- a/src/libsystemd/sd-journal/journal-file.h +++ b/src/libsystemd/sd-journal/journal-file.h @@ -5,7 +5,7 @@ #include #include "compress.h" -#include "sd-forward.h" +#include "forward.h" #include "journal-def.h" #include "mmap-cache.h" #include "ratelimit.h" diff --git a/src/libsystemd/sd-journal/journal-internal.h b/src/libsystemd/sd-journal/journal-internal.h index f0a3043974..15dc934db0 100644 --- a/src/libsystemd/sd-journal/journal-internal.h +++ b/src/libsystemd/sd-journal/journal-internal.h @@ -3,7 +3,7 @@ #include "journal-file.h" #include "list.h" -#include "sd-forward.h" +#include "forward.h" #include "time-util.h" #define JOURNAL_FILES_MAX 7168u diff --git a/src/libsystemd/sd-journal/journal-vacuum.h b/src/libsystemd/sd-journal/journal-vacuum.h index a9ded061d3..e134a9d4b9 100644 --- a/src/libsystemd/sd-journal/journal-vacuum.h +++ b/src/libsystemd/sd-journal/journal-vacuum.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "sd-forward.h" +#include "forward.h" int journal_directory_vacuum(const char *directory, uint64_t max_use, uint64_t n_max_files, usec_t max_retention_usec, usec_t *oldest_usec, bool verbose); diff --git a/src/libsystemd/sd-journal/lookup3.h b/src/libsystemd/sd-journal/lookup3.h index 1c5a6e3407..e4709490e2 100644 --- a/src/libsystemd/sd-journal/lookup3.h +++ b/src/libsystemd/sd-journal/lookup3.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LicenseRef-lookup3-public-domain */ #pragma once -#include "sd-forward.h" +#include "forward.h" uint32_t jenkins_hashword(const uint32_t *k, size_t length, uint32_t initval) _pure_; void jenkins_hashword2(const uint32_t *k, size_t length, uint32_t *pc, uint32_t *pb); diff --git a/src/libsystemd/sd-journal/mmap-cache.h b/src/libsystemd/sd-journal/mmap-cache.h index 3489d56e71..bf690536e9 100644 --- a/src/libsystemd/sd-journal/mmap-cache.h +++ b/src/libsystemd/sd-journal/mmap-cache.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "sd-forward.h" +#include "forward.h" #include "journal-def.h" typedef struct MMapCache MMapCache; diff --git a/src/libsystemd/sd-json/json-internal.h b/src/libsystemd/sd-json/json-internal.h index badd88ac3c..d42d1c6be5 100644 --- a/src/libsystemd/sd-json/json-internal.h +++ b/src/libsystemd/sd-json/json-internal.h @@ -2,7 +2,7 @@ #pragma once -#include "sd-forward.h" +#include "forward.h" /* This header should include all prototypes only the JSON parser itself and * its tests need access to. Normal code consuming the JSON parser should not diff --git a/src/libsystemd/sd-json/json-stream.h b/src/libsystemd/sd-json/json-stream.h index 336ececc0f..87ad23397d 100644 --- a/src/libsystemd/sd-json/json-stream.h +++ b/src/libsystemd/sd-json/json-stream.h @@ -3,7 +3,7 @@ #include -#include "sd-forward.h" +#include "forward.h" #include "list.h" #include "log.h" diff --git a/src/libsystemd/sd-json/json-util.h b/src/libsystemd/sd-json/json-util.h index 54f8c85331..00e76de1b5 100644 --- a/src/libsystemd/sd-json/json-util.h +++ b/src/libsystemd/sd-json/json-util.h @@ -6,7 +6,7 @@ #include "sd-json.h" #include "log.h" -#include "sd-forward.h" +#include "forward.h" #include "string-util.h" /* IWYU pragma: keep */ #define JSON_VARIANT_REPLACE(v, q) \ diff --git a/src/libsystemd/sd-netlink/netlink-genl.h b/src/libsystemd/sd-netlink/netlink-genl.h index 26b2ae1cf9..ea9135ac32 100644 --- a/src/libsystemd/sd-netlink/netlink-genl.h +++ b/src/libsystemd/sd-netlink/netlink-genl.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "sd-forward.h" +#include "forward.h" #define CTRL_GENL_NAME "nlctrl" diff --git a/src/libsystemd/sd-netlink/netlink-internal.h b/src/libsystemd/sd-netlink/netlink-internal.h index 51e523c1ba..c214792147 100644 --- a/src/libsystemd/sd-netlink/netlink-internal.h +++ b/src/libsystemd/sd-netlink/netlink-internal.h @@ -4,7 +4,7 @@ #include #include -#include "sd-forward.h" +#include "forward.h" #include "list.h" #include "netlink-types.h" diff --git a/src/libsystemd/sd-netlink/netlink-slot.h b/src/libsystemd/sd-netlink/netlink-slot.h index 85f12013d9..9ed1746b61 100644 --- a/src/libsystemd/sd-netlink/netlink-slot.h +++ b/src/libsystemd/sd-netlink/netlink-slot.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "sd-forward.h" +#include "forward.h" #include "netlink-internal.h" int netlink_slot_allocate( diff --git a/src/libsystemd/sd-netlink/netlink-types.h b/src/libsystemd/sd-netlink/netlink-types.h index 3c1bfdc280..8682a9b8b9 100644 --- a/src/libsystemd/sd-netlink/netlink-types.h +++ b/src/libsystemd/sd-netlink/netlink-types.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "sd-forward.h" +#include "forward.h" typedef enum NLAType { NETLINK_TYPE_UNSPEC, /* NLA_UNSPEC */ diff --git a/src/libsystemd/sd-netlink/netlink-util.h b/src/libsystemd/sd-netlink/netlink-util.h index 25ef069e3f..142cfe424f 100644 --- a/src/libsystemd/sd-netlink/netlink-util.h +++ b/src/libsystemd/sd-netlink/netlink-util.h @@ -3,7 +3,7 @@ #include -#include "sd-forward.h" +#include "forward.h" #include "in-addr-util.h" #define RTA_FLAGS(rta) ((rta)->rta_type & ~NLA_TYPE_MASK) diff --git a/src/libsystemd/sd-network/network-util.h b/src/libsystemd/sd-network/network-util.h index 18d18b58d0..c4a4966126 100644 --- a/src/libsystemd/sd-network/network-util.h +++ b/src/libsystemd/sd-network/network-util.h @@ -4,7 +4,7 @@ #include #include "constants.h" -#include "sd-forward.h" +#include "forward.h" #define NETWORK_DIRS ((const char* const*) CONF_PATHS_STRV("systemd/network")) #define NETWORK_DIRS_NULSTR CONF_PATHS_NULSTR("systemd/network") diff --git a/src/libsystemd/sd-path/path-lookup.h b/src/libsystemd/sd-path/path-lookup.h index 7f5f1999a6..f2caa45170 100644 --- a/src/libsystemd/sd-path/path-lookup.h +++ b/src/libsystemd/sd-path/path-lookup.h @@ -3,7 +3,7 @@ #include "sd-path.h" -#include "sd-forward.h" +#include "forward.h" #include "runtime-scope.h" typedef enum LookupPathsFlags { diff --git a/src/libsystemd/sd-varlink/varlink-idl-util.h b/src/libsystemd/sd-varlink/varlink-idl-util.h index 07a6edbfef..0640a26995 100644 --- a/src/libsystemd/sd-varlink/varlink-idl-util.h +++ b/src/libsystemd/sd-varlink/varlink-idl-util.h @@ -4,7 +4,7 @@ #include "sd-varlink.h" #include "sd-varlink-idl.h" -#include "sd-forward.h" +#include "forward.h" bool varlink_idl_field_name_is_valid(const char *name); bool varlink_idl_symbol_name_is_valid(const char *name); diff --git a/src/libsystemd/sd-varlink/varlink-internal.h b/src/libsystemd/sd-varlink/varlink-internal.h index cefef889be..5cad0f6987 100644 --- a/src/libsystemd/sd-varlink/varlink-internal.h +++ b/src/libsystemd/sd-varlink/varlink-internal.h @@ -8,7 +8,7 @@ #include "json-stream.h" #include "list.h" #include "pidref.h" -#include "sd-forward.h" +#include "forward.h" typedef enum VarlinkState { /* Client side states */ diff --git a/src/libsystemd/sd-varlink/varlink-util.h b/src/libsystemd/sd-varlink/varlink-util.h index d5765ca2c7..9f6b283815 100644 --- a/src/libsystemd/sd-varlink/varlink-util.h +++ b/src/libsystemd/sd-varlink/varlink-util.h @@ -3,7 +3,7 @@ #include "sd-varlink.h" -#include "sd-forward.h" +#include "forward.h" int varlink_get_peer_pidref(sd_varlink *v, PidRef *ret); diff --git a/src/libudev/libudev-device-internal.h b/src/libudev/libudev-device-internal.h index 230d1e9703..c872973091 100644 --- a/src/libudev/libudev-device-internal.h +++ b/src/libudev/libudev-device-internal.h @@ -3,7 +3,7 @@ #include "libudev.h" -#include "shared-forward.h" +#include "forward.h" struct udev_device; diff --git a/src/libudev/libudev-list-internal.h b/src/libudev/libudev-list-internal.h index 94dbd3ca09..efe394d1fd 100644 --- a/src/libudev/libudev-list-internal.h +++ b/src/libudev/libudev-list-internal.h @@ -3,7 +3,7 @@ #include "libudev.h" -#include "shared-forward.h" +#include "forward.h" struct udev_list; diff --git a/src/libudev/libudev-util.c b/src/libudev/libudev-util.c index e650676851..553b38f47c 100644 --- a/src/libudev/libudev-util.c +++ b/src/libudev/libudev-util.c @@ -2,7 +2,6 @@ #include "libudev.h" -#include "shared-forward.h" #include "device-nodes.h" /** diff --git a/src/libudev/libudev-util.h b/src/libudev/libudev-util.h index 041a14120f..eb899f9f1d 100644 --- a/src/libudev/libudev-util.h +++ b/src/libudev/libudev-util.h @@ -3,7 +3,7 @@ #include "libudev.h" -#include "shared-forward.h" +#include "forward.h" /* Cleanup functions */ DEFINE_TRIVIAL_CLEANUP_FUNC(struct udev*, udev_unref); diff --git a/src/locale/localed-util.h b/src/locale/localed-util.h index 35f86d66e3..888313b001 100644 --- a/src/locale/localed-util.h +++ b/src/locale/localed-util.h @@ -4,7 +4,7 @@ #include #include -#include "shared-forward.h" +#include "forward.h" #include "locale-setup.h" #include "vconsole-util.h" diff --git a/src/locale/xkbcommon-util.h b/src/locale/xkbcommon-util.h index e441e9d89b..a595427e22 100644 --- a/src/locale/xkbcommon-util.h +++ b/src/locale/xkbcommon-util.h @@ -2,7 +2,7 @@ #pragma once #include "dlfcn-util.h" -#include "shared-forward.h" +#include "forward.h" #if HAVE_XKBCOMMON #ifndef SYSTEMD_CFLAGS_MARKER_LIBXKBCOMMON diff --git a/src/login/logind-forward.h b/src/login/logind-forward.h index 8f1fe4acee..77bc2ae6f6 100644 --- a/src/login/logind-forward.h +++ b/src/login/logind-forward.h @@ -4,7 +4,7 @@ /* IWYU pragma: always_keep */ #include "conf-parser-forward.h" /* IWYU pragma: export */ -#include "shared-forward.h" /* IWYU pragma: export */ +#include "forward.h" /* IWYU pragma: export */ typedef enum InhibitWhat InhibitWhat; typedef enum KillWhom KillWhom; diff --git a/src/login/sysfs-show.h b/src/login/sysfs-show.h index fe4420c624..0864419877 100644 --- a/src/login/sysfs-show.h +++ b/src/login/sysfs-show.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" #include "output-mode.h" int show_sysfs(const char *seat, const char *prefix, unsigned columns, OutputFlags flags); diff --git a/src/machine/machine-forward.h b/src/machine/machine-forward.h index 5921ad87fa..1461c45658 100644 --- a/src/machine/machine-forward.h +++ b/src/machine/machine-forward.h @@ -3,7 +3,7 @@ /* IWYU pragma: always_keep */ -#include "shared-forward.h" /* IWYU pragma: export */ +#include "forward.h" /* IWYU pragma: export */ typedef struct Machine Machine; typedef struct Manager Manager; diff --git a/src/mountfsd/mountfsd-manager.h b/src/mountfsd/mountfsd-manager.h index 457ec0e6f2..06bd15f09a 100644 --- a/src/mountfsd/mountfsd-manager.h +++ b/src/mountfsd/mountfsd-manager.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" #include "ratelimit.h" #define MOUNTFS_WORKERS_MIN 3 diff --git a/src/network/netdev/bareudp.h b/src/network/netdev/bareudp.h index 829e767da0..ee5fbf7203 100644 --- a/src/network/netdev/bareudp.h +++ b/src/network/netdev/bareudp.h @@ -3,7 +3,6 @@ #pragma once #include "netdev.h" -#include "shared-forward.h" typedef enum BareUDPProtocol { BARE_UDP_PROTOCOL_IPV4 = ETH_P_IP, diff --git a/src/network/netdev/batadv.h b/src/network/netdev/batadv.h index 20d6e8c6e0..e66e4e0632 100644 --- a/src/network/netdev/batadv.h +++ b/src/network/netdev/batadv.h @@ -4,7 +4,6 @@ #include -#include "shared-forward.h" #include "netdev.h" #define BATADV_GENL_NAME "batadv" diff --git a/src/network/netdev/bond.h b/src/network/netdev/bond.h index fa799047c7..45f2203156 100644 --- a/src/network/netdev/bond.h +++ b/src/network/netdev/bond.h @@ -2,7 +2,6 @@ #pragma once #include "bond-util.h" -#include "shared-forward.h" #include "netdev.h" typedef struct Bond { diff --git a/src/network/netdev/bridge.h b/src/network/netdev/bridge.h index 0bc48b482b..d7d4e95fdf 100644 --- a/src/network/netdev/bridge.h +++ b/src/network/netdev/bridge.h @@ -2,7 +2,6 @@ #pragma once #include "netdev.h" -#include "shared-forward.h" #define LINK_BRIDGE_PORT_PRIORITY_INVALID 128U #define LINK_BRIDGE_PORT_PRIORITY_MAX 63U diff --git a/src/network/netdev/dummy.h b/src/network/netdev/dummy.h index 5ee79b6496..eafdf4b5bf 100644 --- a/src/network/netdev/dummy.h +++ b/src/network/netdev/dummy.h @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" #include "netdev.h" typedef struct Dummy { diff --git a/src/network/netdev/fou-tunnel.h b/src/network/netdev/fou-tunnel.h index 9c518b610d..a7ebce2a39 100644 --- a/src/network/netdev/fou-tunnel.h +++ b/src/network/netdev/fou-tunnel.h @@ -5,7 +5,6 @@ #include "in-addr-util.h" #include "netdev.h" -#include "shared-forward.h" typedef enum FooOverUDPEncapType { NETDEV_FOO_OVER_UDP_ENCAP_UNSPEC = FOU_ENCAP_UNSPEC, diff --git a/src/network/netdev/geneve.h b/src/network/netdev/geneve.h index 3dcccb8243..c7d550a375 100644 --- a/src/network/netdev/geneve.h +++ b/src/network/netdev/geneve.h @@ -5,7 +5,6 @@ #include "in-addr-util.h" #include "netdev.h" -#include "shared-forward.h" #define GENEVE_VID_MAX (1u << 24) - 1 diff --git a/src/network/netdev/l2tp-tunnel.h b/src/network/netdev/l2tp-tunnel.h index 885791b20e..7088689477 100644 --- a/src/network/netdev/l2tp-tunnel.h +++ b/src/network/netdev/l2tp-tunnel.h @@ -4,7 +4,6 @@ #include #include "in-addr-util.h" -#include "shared-forward.h" #include "netdev.h" typedef enum L2tpL2specType { diff --git a/src/network/netdev/macsec.h b/src/network/netdev/macsec.h index 09def58d96..7ffa147356 100644 --- a/src/network/netdev/macsec.h +++ b/src/network/netdev/macsec.h @@ -4,7 +4,6 @@ #include #include -#include "shared-forward.h" #include "netdev.h" #include "sparse-endian.h" diff --git a/src/network/netdev/tunnel.h b/src/network/netdev/tunnel.h index f7738f8783..64aadfbb3b 100644 --- a/src/network/netdev/tunnel.h +++ b/src/network/netdev/tunnel.h @@ -4,7 +4,6 @@ #include "fou-tunnel.h" #include "netdev.h" #include "networkd-link.h" -#include "shared-forward.h" /* For IFLA_IPTUN_PROTO attribute */ typedef enum TunnelMode { diff --git a/src/network/netdev/tuntap.h b/src/network/netdev/tuntap.h index e832b3dd5a..6a94351ccb 100644 --- a/src/network/netdev/tuntap.h +++ b/src/network/netdev/tuntap.h @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" #include "netdev.h" typedef struct TunTap { diff --git a/src/network/netdev/vlan.h b/src/network/netdev/vlan.h index 48ee0e5428..73e51dc3d6 100644 --- a/src/network/netdev/vlan.h +++ b/src/network/netdev/vlan.h @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" #include "netdev.h" typedef struct VLan { diff --git a/src/network/netdev/wireguard.h b/src/network/netdev/wireguard.h index 3bf8856514..4feb9c42a7 100644 --- a/src/network/netdev/wireguard.h +++ b/src/network/netdev/wireguard.h @@ -7,7 +7,6 @@ #include "in-addr-util.h" #include "list.h" #include "netdev.h" -#include "networkd-forward.h" #include "socket-util.h" typedef struct WireguardIPmask { diff --git a/src/network/netdev/wlan.h b/src/network/netdev/wlan.h index 4c63a3048a..4bf11a16c0 100644 --- a/src/network/netdev/wlan.h +++ b/src/network/netdev/wlan.h @@ -3,7 +3,6 @@ #include -#include "shared-forward.h" #include "netdev.h" typedef struct WLan { diff --git a/src/network/netdev/xfrm.h b/src/network/netdev/xfrm.h index c850c72833..f56c4f272a 100644 --- a/src/network/netdev/xfrm.h +++ b/src/network/netdev/xfrm.h @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" #include "netdev.h" typedef struct Xfrm { diff --git a/src/network/networkctl-address-label.h b/src/network/networkctl-address-label.h index 0afbd2b2bc..6aa0b1bb2e 100644 --- a/src/network/networkctl-address-label.h +++ b/src/network/networkctl-address-label.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_list_address_labels(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/network/networkctl-config-file.h b/src/network/networkctl-config-file.h index 8d52d58ffc..881cd12554 100644 --- a/src/network/networkctl-config-file.h +++ b/src/network/networkctl-config-file.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_edit(int argc, char *argv[], uintptr_t _data, void *userdata); int verb_cat(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/network/networkctl-dhcp-lease.h b/src/network/networkctl-dhcp-lease.h index f068df3b5c..dfe7b705f1 100644 --- a/src/network/networkctl-dhcp-lease.h +++ b/src/network/networkctl-dhcp-lease.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_dhcp_lease(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/network/networkctl-dump-util.h b/src/network/networkctl-dump-util.h index a4c02f0390..7b8468f190 100644 --- a/src/network/networkctl-dump-util.h +++ b/src/network/networkctl-dump-util.h @@ -1,9 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" - #include "dhcp-message.h" +#include "forward.h" int dump_list(Table *table, const char *key, char * const *l); int ieee_oui(sd_hwdb *hwdb, const struct ether_addr *mac, char **ret); diff --git a/src/network/networkctl-link-info-json.h b/src/network/networkctl-link-info-json.h index 2b15e5b01b..0cc0e2cabe 100644 --- a/src/network/networkctl-link-info-json.h +++ b/src/network/networkctl-link-info-json.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" typedef struct LinkInfo LinkInfo; diff --git a/src/network/networkctl-link-info.h b/src/network/networkctl-link-info.h index ae1bf71687..bad41e2ade 100644 --- a/src/network/networkctl-link-info.h +++ b/src/network/networkctl-link-info.h @@ -9,7 +9,7 @@ #include "dhcp-message.h" #include "ether-addr-util.h" #include "ethtool-util.h" -#include "shared-forward.h" +#include "forward.h" #include "in-addr-util.h" typedef struct VxLanInfo { diff --git a/src/network/networkctl-list.h b/src/network/networkctl-list.h index 955797ea2f..60a461cbf2 100644 --- a/src/network/networkctl-list.h +++ b/src/network/networkctl-list.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_list_links(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/network/networkctl-lldp.h b/src/network/networkctl-lldp.h index b1536fc36d..a1b0c8bcca 100644 --- a/src/network/networkctl-lldp.h +++ b/src/network/networkctl-lldp.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int dump_lldp_neighbors(sd_varlink *vl, Table *table, int ifindex); int verb_link_lldp_status(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/network/networkctl-misc.h b/src/network/networkctl-misc.h index 771761d05f..ccdc9c550a 100644 --- a/src/network/networkctl-misc.h +++ b/src/network/networkctl-misc.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_link_delete(int argc, char *argv[], uintptr_t _data, void *userdata); int verb_link_varlink_simple_method(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/network/networkctl-status-link.h b/src/network/networkctl-status-link.h index fcc0fa0728..a904b00801 100644 --- a/src/network/networkctl-status-link.h +++ b/src/network/networkctl-status-link.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_link_status(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/network/networkctl-status-system.h b/src/network/networkctl-status-system.h index 1c02aa38ce..a3292a85f0 100644 --- a/src/network/networkctl-status-system.h +++ b/src/network/networkctl-status-system.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int system_status(sd_netlink *rtnl, sd_hwdb *hwdb); diff --git a/src/network/networkctl-util.h b/src/network/networkctl-util.h index 6067602d1a..ae0f565007 100644 --- a/src/network/networkctl-util.h +++ b/src/network/networkctl-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int varlink_connect_networkd(sd_varlink **ret_varlink); int reload_networkd(void); diff --git a/src/network/networkctl.h b/src/network/networkctl.h index e15f524948..39c81e7947 100644 --- a/src/network/networkctl.h +++ b/src/network/networkctl.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" #include "pager.h" extern PagerFlags arg_pager_flags; diff --git a/src/network/networkd-forward.h b/src/network/networkd-forward.h index 40e6380b91..268fe73bf1 100644 --- a/src/network/networkd-forward.h +++ b/src/network/networkd-forward.h @@ -5,7 +5,7 @@ #include "conf-parser-forward.h" /* IWYU pragma: export */ #include "dhcp-forward.h" /* IWYU pragma: export */ -#include "shared-forward.h" /* IWYU pragma: export */ +#include "forward.h" /* IWYU pragma: export */ typedef enum NetDevLocalAddressType NetDevLocalAddressType; typedef enum NetworkConfigSource NetworkConfigSource; diff --git a/src/network/tc/drr.h b/src/network/tc/drr.h index 0ff95c43bc..4719bf6c4f 100644 --- a/src/network/tc/drr.h +++ b/src/network/tc/drr.h @@ -2,7 +2,6 @@ * Copyright © 2020 VMware, Inc. */ #pragma once -#include "shared-forward.h" #include "qdisc.h" #include "tclass.h" diff --git a/src/network/tc/ets.h b/src/network/tc/ets.h index 2841d342c0..c00415cc43 100644 --- a/src/network/tc/ets.h +++ b/src/network/tc/ets.h @@ -3,7 +3,6 @@ #include -#include "shared-forward.h" #include "qdisc.h" typedef struct EnhancedTransmissionSelection { diff --git a/src/network/tc/fifo.h b/src/network/tc/fifo.h index 111a63caa9..7191658fec 100644 --- a/src/network/tc/fifo.h +++ b/src/network/tc/fifo.h @@ -2,7 +2,6 @@ * Copyright © 2020 VMware, Inc. */ #pragma once -#include "shared-forward.h" #include "qdisc.h" typedef struct FirstInFirstOut { diff --git a/src/network/tc/fq-codel.h b/src/network/tc/fq-codel.h index ab2a3e4e5e..f985042cf9 100644 --- a/src/network/tc/fq-codel.h +++ b/src/network/tc/fq-codel.h @@ -2,7 +2,6 @@ * Copyright © 2019 VMware, Inc. */ #pragma once -#include "shared-forward.h" #include "qdisc.h" typedef struct FairQueueingControlledDelay { diff --git a/src/network/tc/fq-pie.h b/src/network/tc/fq-pie.h index a287bf3435..0219c6825a 100644 --- a/src/network/tc/fq-pie.h +++ b/src/network/tc/fq-pie.h @@ -2,7 +2,6 @@ * Copyright © 2020 VMware, Inc. */ #pragma once -#include "shared-forward.h" #include "qdisc.h" typedef struct FlowQueuePIE { diff --git a/src/network/tc/fq.h b/src/network/tc/fq.h index 0f10641573..1004282e4b 100644 --- a/src/network/tc/fq.h +++ b/src/network/tc/fq.h @@ -2,7 +2,6 @@ * Copyright © 2019 VMware, Inc. */ #pragma once -#include "shared-forward.h" #include "qdisc.h" typedef struct FairQueueing { diff --git a/src/network/tc/gred.h b/src/network/tc/gred.h index 6c87c2534a..c7e9c39616 100644 --- a/src/network/tc/gred.h +++ b/src/network/tc/gred.h @@ -2,7 +2,6 @@ * Copyright © 2020 VMware, Inc. */ #pragma once -#include "shared-forward.h" #include "qdisc.h" typedef struct GenericRandomEarlyDetection { diff --git a/src/network/tc/hhf.h b/src/network/tc/hhf.h index 59c09e6f0a..c1b034b9ee 100644 --- a/src/network/tc/hhf.h +++ b/src/network/tc/hhf.h @@ -2,7 +2,6 @@ * Copyright © 2020 VMware, Inc. */ #pragma once -#include "shared-forward.h" #include "qdisc.h" typedef struct HeavyHitterFilter { diff --git a/src/network/tc/htb.h b/src/network/tc/htb.h index 5151f1a31d..0a8d600af0 100644 --- a/src/network/tc/htb.h +++ b/src/network/tc/htb.h @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" #include "qdisc.h" #include "tclass.h" diff --git a/src/network/tc/mq.c b/src/network/tc/mq.c index e9225165d4..1435ed1fda 100644 --- a/src/network/tc/mq.c +++ b/src/network/tc/mq.c @@ -1,6 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include "shared-forward.h" #include "mq.h" const QDiscVTable mq_vtable = { diff --git a/src/network/tc/mq.h b/src/network/tc/mq.h index 4df7158951..88f0049670 100644 --- a/src/network/tc/mq.h +++ b/src/network/tc/mq.h @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" #include "qdisc.h" typedef struct ClassfulMultiQueueing { diff --git a/src/network/tc/multiq.h b/src/network/tc/multiq.h index 0c54f2066d..e53ed57c71 100644 --- a/src/network/tc/multiq.h +++ b/src/network/tc/multiq.h @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" #include "qdisc.h" typedef struct BandMultiQueueing { diff --git a/src/network/tc/netem.h b/src/network/tc/netem.h index 7f9e5c5789..bb76f154f1 100644 --- a/src/network/tc/netem.h +++ b/src/network/tc/netem.h @@ -2,7 +2,6 @@ * Copyright © 2019 VMware, Inc. */ #pragma once -#include "shared-forward.h" #include "qdisc.h" typedef struct NetworkEmulator { diff --git a/src/network/tc/pie.h b/src/network/tc/pie.h index 714c197182..b2eb233a32 100644 --- a/src/network/tc/pie.h +++ b/src/network/tc/pie.h @@ -2,7 +2,6 @@ * Copyright © 2020 VMware, Inc. */ #pragma once -#include "shared-forward.h" #include "qdisc.h" typedef struct ProportionalIntegralControllerEnhanced { diff --git a/src/network/tc/qfq.h b/src/network/tc/qfq.h index 4c6dbb2600..2c6b460245 100644 --- a/src/network/tc/qfq.h +++ b/src/network/tc/qfq.h @@ -2,7 +2,6 @@ * Copyright © 2020 VMware, Inc. */ #pragma once -#include "shared-forward.h" #include "qdisc.h" #include "tclass.h" diff --git a/src/network/tc/sfb.h b/src/network/tc/sfb.h index c46c1789eb..f8a610b0b8 100644 --- a/src/network/tc/sfb.h +++ b/src/network/tc/sfb.h @@ -2,7 +2,6 @@ * Copyright © 2020 VMware, Inc. */ #pragma once -#include "shared-forward.h" #include "qdisc.h" typedef struct StochasticFairBlue { diff --git a/src/network/tc/sfq.h b/src/network/tc/sfq.h index bca9f6ba05..45e4c6e008 100644 --- a/src/network/tc/sfq.h +++ b/src/network/tc/sfq.h @@ -2,7 +2,6 @@ * Copyright © 2019 VMware, Inc. */ #pragma once -#include "shared-forward.h" #include "qdisc.h" typedef struct StochasticFairnessQueueing { diff --git a/src/network/tc/tbf.h b/src/network/tc/tbf.h index 86f460a257..c30099c025 100644 --- a/src/network/tc/tbf.h +++ b/src/network/tc/tbf.h @@ -2,7 +2,6 @@ * Copyright © 2019 VMware, Inc. */ #pragma once -#include "shared-forward.h" #include "qdisc.h" typedef struct TokenBucketFilter { diff --git a/src/network/tc/tc-util.h b/src/network/tc/tc-util.h index e3a63d08b2..7ef789f995 100644 --- a/src/network/tc/tc-util.h +++ b/src/network/tc/tc-util.h @@ -4,7 +4,7 @@ #include -#include "shared-forward.h" +#include "networkd-forward.h" int tc_init(double *ret_ticks_in_usec, uint32_t *ret_hz); int tc_time_to_tick(usec_t t, uint32_t *ret); diff --git a/src/network/tc/teql.h b/src/network/tc/teql.h index 6469946681..d7563b55bf 100644 --- a/src/network/tc/teql.h +++ b/src/network/tc/teql.h @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" #include "qdisc.h" typedef struct TrivialLinkEqualizer { diff --git a/src/network/wait-online/wait-online-link.h b/src/network/wait-online/wait-online-link.h index 6af89ad735..20b1764cfb 100644 --- a/src/network/wait-online/wait-online-link.h +++ b/src/network/wait-online/wait-online-link.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" #include "network-util.h" typedef struct DNSConfiguration DNSConfiguration; diff --git a/src/network/wait-online/wait-online-manager.h b/src/network/wait-online/wait-online-manager.h index 795aef251c..591552dc24 100644 --- a/src/network/wait-online/wait-online-manager.h +++ b/src/network/wait-online/wait-online-manager.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" #include "network-util.h" typedef struct DNSConfiguration DNSConfiguration; diff --git a/src/nspawn/nspawn-bind-user.h b/src/nspawn/nspawn-bind-user.h index 0c182dd8d4..682784f52b 100644 --- a/src/nspawn/nspawn-bind-user.h +++ b/src/nspawn/nspawn-bind-user.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int bind_user_setup(const MachineBindUserContext *c, const char *root); diff --git a/src/nspawn/nspawn-cgroup.h b/src/nspawn/nspawn-cgroup.h index ae565bf1e1..8d61513ad5 100644 --- a/src/nspawn/nspawn-cgroup.h +++ b/src/nspawn/nspawn-cgroup.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" #include "nspawn-settings.h" int create_subcgroup( diff --git a/src/nspawn/nspawn-expose-ports.h b/src/nspawn/nspawn-expose-ports.h index d68349bfde..3a17179462 100644 --- a/src/nspawn/nspawn-expose-ports.h +++ b/src/nspawn/nspawn-expose-ports.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" #include "list.h" typedef struct ExposePort { diff --git a/src/nspawn/nspawn-mount.h b/src/nspawn/nspawn-mount.h index 421c5dffff..f049cf4aee 100644 --- a/src/nspawn/nspawn-mount.h +++ b/src/nspawn/nspawn-mount.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" #include "volatile-util.h" typedef enum MountSettingsMask { diff --git a/src/nspawn/nspawn-network.h b/src/nspawn/nspawn-network.h index d2234d2e3a..692c40108c 100644 --- a/src/nspawn/nspawn-network.h +++ b/src/nspawn/nspawn-network.h @@ -3,7 +3,7 @@ #include -#include "shared-forward.h" +#include "forward.h" int test_network_interfaces_initialized(char **iface_pairs); int resolve_network_interface_names(char **iface_pairs); diff --git a/src/nspawn/nspawn-oci.h b/src/nspawn/nspawn-oci.h index 0125851a4c..1b49be88ab 100644 --- a/src/nspawn/nspawn-oci.h +++ b/src/nspawn/nspawn-oci.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" #include "nspawn-settings.h" int oci_load(FILE *f, const char *bundle, Settings **ret); diff --git a/src/nspawn/nspawn-register.h b/src/nspawn/nspawn-register.h index d82c780181..df05579708 100644 --- a/src/nspawn/nspawn-register.h +++ b/src/nspawn/nspawn-register.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" #include "nspawn-settings.h" typedef enum AllocateScopeFlags { diff --git a/src/nspawn/nspawn-seccomp.h b/src/nspawn/nspawn-seccomp.h index 52232ad56a..2829f4de68 100644 --- a/src/nspawn/nspawn-seccomp.h +++ b/src/nspawn/nspawn-seccomp.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int setup_seccomp( uint64_t cap_list_retain, diff --git a/src/nspawn/nspawn-settings.h b/src/nspawn/nspawn-settings.h index c2e079f056..e7fea4cebf 100644 --- a/src/nspawn/nspawn-settings.h +++ b/src/nspawn/nspawn-settings.h @@ -6,9 +6,9 @@ #include "capability-util.h" #include "conf-parser-forward.h" #include "cpu-set-util.h" +#include "forward.h" #include "rlimit-util.h" #include "seccomp-util.h" -#include "shared-forward.h" #include "volatile-util.h" typedef struct CustomMount CustomMount; diff --git a/src/nspawn/nspawn-setuid.h b/src/nspawn/nspawn-setuid.h index 79d67266a8..740375a43e 100644 --- a/src/nspawn/nspawn-setuid.h +++ b/src/nspawn/nspawn-setuid.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int change_uid_gid_raw(uid_t uid, gid_t gid, const gid_t *supplementary_gids, size_t n_supplementary_gids, bool chown_stdio); int change_uid_gid(const char *user, bool chown_stdio, char **ret_home); diff --git a/src/nspawn/nspawn-stub-pid1.h b/src/nspawn/nspawn-stub-pid1.h index 620065b36c..c7889583f4 100644 --- a/src/nspawn/nspawn-stub-pid1.h +++ b/src/nspawn/nspawn-stub-pid1.h @@ -3,6 +3,6 @@ #include "sd-id128.h" -#include "shared-forward.h" +#include "forward.h" int stub_pid1(sd_id128_t uuid); diff --git a/src/nspawn/nspawn.h b/src/nspawn/nspawn.h index 192110c4d4..95e3906aeb 100644 --- a/src/nspawn/nspawn.h +++ b/src/nspawn/nspawn.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int userns_chown_at(int fd, const char *fname, uid_t uid, gid_t gid, int flags); int userns_lchown(const char *p, uid_t uid, gid_t gid); diff --git a/src/nsresourced/nsresourced-manager.h b/src/nsresourced/nsresourced-manager.h index 9acb619e9f..ce8d8c690a 100644 --- a/src/nsresourced/nsresourced-manager.h +++ b/src/nsresourced/nsresourced-manager.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" #include "ratelimit.h" #define NSRESOURCE_WORKERS_MIN 5 diff --git a/src/nsresourced/userns-registry.h b/src/nsresourced/userns-registry.h index ba537e8294..4c88b45cfd 100644 --- a/src/nsresourced/userns-registry.h +++ b/src/nsresourced/userns-registry.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" struct userns_restrict_bpf; diff --git a/src/nsresourced/userns-restrict.h b/src/nsresourced/userns-restrict.h index f0673d1594..87457bf368 100644 --- a/src/nsresourced/userns-restrict.h +++ b/src/nsresourced/userns-restrict.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" struct userns_restrict_bpf; diff --git a/src/nss-systemd/nss-systemd.h b/src/nss-systemd/nss-systemd.h index e8c6c59615..054bd40305 100644 --- a/src/nss-systemd/nss-systemd.h +++ b/src/nss-systemd/nss-systemd.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int _nss_systemd_block(bool b); bool _nss_systemd_is_blocked(void); diff --git a/src/nss-systemd/userdb-glue.h b/src/nss-systemd/userdb-glue.h index a7205518e2..840329312d 100644 --- a/src/nss-systemd/userdb-glue.h +++ b/src/nss-systemd/userdb-glue.h @@ -5,7 +5,7 @@ #include #include -#include "shared-forward.h" +#include "forward.h" #include "userdb.h" UserDBFlags nss_glue_userdb_flags(void); diff --git a/src/oom/oomd-manager-bus.h b/src/oom/oomd-manager-bus.h index 5147c5beff..70c473f15b 100644 --- a/src/oom/oomd-manager-bus.h +++ b/src/oom/oomd-manager-bus.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" extern const BusObjectImplementation manager_object; diff --git a/src/oom/oomd-manager.h b/src/oom/oomd-manager.h index cc588461b0..b82b1799eb 100644 --- a/src/oom/oomd-manager.h +++ b/src/oom/oomd-manager.h @@ -3,7 +3,7 @@ #include "conf-parser-forward.h" #include "constants.h" -#include "shared-forward.h" +#include "forward.h" #include "oomd-conf.h" #include "oomd-util.h" diff --git a/src/oom/oomd-util.h b/src/oom/oomd-util.h index a76454f812..79151d18a4 100644 --- a/src/oom/oomd-util.h +++ b/src/oom/oomd-util.h @@ -2,7 +2,7 @@ #pragma once #include "cgroup-util.h" -#include "shared-forward.h" +#include "forward.h" #include "psi-util.h" #define DUMP_ON_KILL_COUNT 10u diff --git a/src/pcrlock/pcrlock-firmware.h b/src/pcrlock/pcrlock-firmware.h index 7ec045793b..f87775e4bb 100644 --- a/src/pcrlock/pcrlock-firmware.h +++ b/src/pcrlock/pcrlock-firmware.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" #include "tpm2-event-log.h" int validate_firmware_event( diff --git a/src/portable/portable.h b/src/portable/portable.h index af5ef3ba65..597f0f1468 100644 --- a/src/portable/portable.h +++ b/src/portable/portable.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once +#include "forward.h" #include "runtime-scope.h" -#include "shared-forward.h" #include "string-util.h" typedef struct PortableMetadata { diff --git a/src/portable/portabled-forward.h b/src/portable/portabled-forward.h index 9792a7acd1..203c2f46c6 100644 --- a/src/portable/portabled-forward.h +++ b/src/portable/portabled-forward.h @@ -3,7 +3,7 @@ /* IWYU pragma: always_keep */ -#include "shared-forward.h" /* IWYU pragma: export */ +#include "forward.h" /* IWYU pragma: export */ typedef struct Manager Manager; typedef struct Operation Operation; diff --git a/src/repart/iso9660.h b/src/repart/iso9660.h index cdb6eef226..b5122b30b1 100644 --- a/src/repart/iso9660.h +++ b/src/repart/iso9660.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" #include "sparse-endian.h" /* ISO9660 is 5 blocks: diff --git a/src/repart/repart-list-candidate-devices.h b/src/repart/repart-list-candidate-devices.h index 21277c8a5f..6953d0709a 100644 --- a/src/repart/repart-list-candidate-devices.h +++ b/src/repart/repart-list-candidate-devices.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "sd-forward.h" +#include "forward.h" int vl_method_list_candidate_devices( sd_varlink *link, diff --git a/src/report/report-basic.h b/src/report/report-basic.h index 8f123cb17f..e857b40ef7 100644 --- a/src/report/report-basic.h +++ b/src/report/report-basic.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" #define METRIC_IO_SYSTEMD_BASIC_PREFIX "io.systemd.Basic." diff --git a/src/report/report-cgroup.h b/src/report/report-cgroup.h index ce1e55b280..f9ef48709c 100644 --- a/src/report/report-cgroup.h +++ b/src/report/report-cgroup.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" #define METRIC_IO_SYSTEMD_CGROUP_PREFIX "io.systemd.CGroup." diff --git a/src/report/report-files.h b/src/report/report-files.h index 0bdee8cb97..71c64574bf 100644 --- a/src/report/report-files.h +++ b/src/report/report-files.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" #define METRIC_IO_SYSTEMD_FILES_PREFIX "io.systemd.Files." diff --git a/src/report/report.h b/src/report/report.h index 177491d0d7..8d1c687c95 100644 --- a/src/report/report.h +++ b/src/report/report.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" #include "iovec-wrapper.h" diff --git a/src/resolve/resolvectl.h b/src/resolve/resolvectl.h index 6752060cdf..c6ec008169 100644 --- a/src/resolve/resolvectl.h +++ b/src/resolve/resolvectl.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" typedef enum ExecutionMode { MODE_RESOLVE_HOST, diff --git a/src/resolve/resolved-dns-dnssec-crypto.h b/src/resolve/resolved-dns-dnssec-crypto.h index 87dd6c8db5..7fa88ee169 100644 --- a/src/resolve/resolved-dns-dnssec-crypto.h +++ b/src/resolve/resolved-dns-dnssec-crypto.h @@ -2,7 +2,7 @@ #pragma once #include "crypto-util.h" -#include "shared-forward.h" +#include "forward.h" #if HAVE_OPENSSL diff --git a/src/resolve/resolved-forward.h b/src/resolve/resolved-forward.h index 16c5380d9b..c20b770961 100644 --- a/src/resolve/resolved-forward.h +++ b/src/resolve/resolved-forward.h @@ -4,7 +4,7 @@ /* IWYU pragma: always_keep */ #include "conf-parser-forward.h" /* IWYU pragma: export */ -#include "shared-forward.h" /* IWYU pragma: export */ +#include "forward.h" /* IWYU pragma: export */ typedef enum DnsAnswerFlags DnsAnswerFlags; typedef enum DnsCacheMode DnsCacheMode; diff --git a/src/sbsign/authenticode.h b/src/sbsign/authenticode.h index 236435a7e9..88897cae7a 100644 --- a/src/sbsign/authenticode.h +++ b/src/sbsign/authenticode.h @@ -7,7 +7,7 @@ #include -#include "shared-forward.h" +#include "forward.h" #define SPC_INDIRECT_DATA_OBJID "1.3.6.1.4.1.311.2.1.4" #define SPC_PE_IMAGE_DATA_OBJID "1.3.6.1.4.1.311.2.1.15" diff --git a/src/shared/acl-util.h b/src/shared/acl-util.h index 6c29e85135..93066301da 100644 --- a/src/shared/acl-util.h +++ b/src/shared/acl-util.h @@ -2,7 +2,7 @@ #pragma once #include "dlopen-note.h" -#include "shared-forward.h" +#include "forward.h" #if HAVE_ACL #ifndef SYSTEMD_CFLAGS_MARKER_LIBACL diff --git a/src/shared/acpi-fpdt.h b/src/shared/acpi-fpdt.h index c59ef4dfbf..167813a462 100644 --- a/src/shared/acpi-fpdt.h +++ b/src/shared/acpi-fpdt.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int acpi_get_boot_usec(usec_t *ret_loader_start, usec_t *ret_loader_exit); diff --git a/src/shared/apparmor-util.h b/src/shared/apparmor-util.h index 69e937eade..997ea04761 100644 --- a/src/shared/apparmor-util.h +++ b/src/shared/apparmor-util.h @@ -2,7 +2,7 @@ #pragma once #include "dlopen-note.h" -#include "shared-forward.h" +#include "forward.h" #if HAVE_APPARMOR # ifndef SYSTEMD_CFLAGS_MARKER_LIBAPPARMOR diff --git a/src/shared/ask-password-agent.h b/src/shared/ask-password-agent.h index 3b2e14bc65..610f910905 100644 --- a/src/shared/ask-password-agent.h +++ b/src/shared/ask-password-agent.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int ask_password_agent_open(void); void ask_password_agent_close(void); diff --git a/src/shared/ask-password-api.h b/src/shared/ask-password-api.h index 5ea37f04d6..a470caf5da 100644 --- a/src/shared/ask-password-api.h +++ b/src/shared/ask-password-api.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" typedef enum AskPasswordFlags { ASK_PASSWORD_ACCEPT_CACHED = 1 << 0, /* read from kernel keyring */ diff --git a/src/shared/async.h b/src/shared/async.h index 2088876c83..d887a4ca55 100644 --- a/src/shared/async.h +++ b/src/shared/async.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" /* These functions implement various potentially slow operations that are executed asynchronously. They are * carefully written to not use pthreads, but use fork() or clone() (without CLONE_VM) so that the child does diff --git a/src/shared/barrier.h b/src/shared/barrier.h index e95e5589d7..61c3ff9ffd 100644 --- a/src/shared/barrier.h +++ b/src/shared/barrier.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" /* See source file for an API description. */ diff --git a/src/shared/base-filesystem.h b/src/shared/base-filesystem.h index 9ea1062213..5c5aa573ef 100644 --- a/src/shared/base-filesystem.h +++ b/src/shared/base-filesystem.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int base_filesystem_create_fd(int fd, const char *root, uid_t uid, gid_t gid); int base_filesystem_create(const char *root, uid_t uid, gid_t gid); diff --git a/src/shared/battery-util.h b/src/shared/battery-util.h index 35e22d96ec..3c39fc76c9 100644 --- a/src/shared/battery-util.h +++ b/src/shared/battery-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int on_ac_power(void); diff --git a/src/shared/bitmap.h b/src/shared/bitmap.h index a5199f746b..a12451ca0e 100644 --- a/src/shared/bitmap.h +++ b/src/shared/bitmap.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" #include "iterator.h" typedef struct Bitmap { diff --git a/src/shared/blkid-util.h b/src/shared/blkid-util.h index 5457fbc28c..0f3175d616 100644 --- a/src/shared/blkid-util.h +++ b/src/shared/blkid-util.h @@ -2,7 +2,7 @@ #pragma once #include "dlopen-note.h" -#include "shared-forward.h" +#include "forward.h" #if HAVE_BLKID # ifndef SYSTEMD_CFLAGS_MARKER_LIBBLKID diff --git a/src/shared/blockdev-list.h b/src/shared/blockdev-list.h index 8658b45753..7804bbe052 100644 --- a/src/shared/blockdev-list.h +++ b/src/shared/blockdev-list.h @@ -1,8 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" -#include "shared-forward.h" +#include "forward.h" typedef enum BlockDevListFlags { BLOCKDEV_LIST_SHOW_SYMLINKS = 1 << 0, /* Pick up symlinks to block devices too */ diff --git a/src/shared/blockdev-util.h b/src/shared/blockdev-util.h index e268783d5e..48962f8b26 100644 --- a/src/shared/blockdev-util.h +++ b/src/shared/blockdev-util.h @@ -3,7 +3,7 @@ #include -#include "shared-forward.h" +#include "forward.h" #include "stdio-util.h" #define SYS_BLOCK_PATH_MAX(suffix) \ diff --git a/src/shared/bond-util.h b/src/shared/bond-util.h index cf3f8e897e..8157b4b29a 100644 --- a/src/shared/bond-util.h +++ b/src/shared/bond-util.h @@ -3,7 +3,7 @@ #include -#include "shared-forward.h" +#include "forward.h" /* * Maximum number of targets supported by the kernel for a single diff --git a/src/shared/boot-entry.h b/src/shared/boot-entry.h index 7db1ed0d52..d5f998770d 100644 --- a/src/shared/boot-entry.h +++ b/src/shared/boot-entry.h @@ -3,7 +3,7 @@ #include "sd-id128.h" -#include "shared-forward.h" +#include "forward.h" typedef enum BootEntryTokenType { BOOT_ENTRY_TOKEN_MACHINE_ID, diff --git a/src/shared/boot-timestamps.h b/src/shared/boot-timestamps.h index 84cb560682..9ccbeb2c04 100644 --- a/src/shared/boot-timestamps.h +++ b/src/shared/boot-timestamps.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int boot_timestamps(const dual_timestamp *n, dual_timestamp *firmware, dual_timestamp *loader); diff --git a/src/shared/bootspec.h b/src/shared/bootspec.h index 0560bfb3a4..3f62726b25 100644 --- a/src/shared/bootspec.h +++ b/src/shared/bootspec.h @@ -2,7 +2,7 @@ #pragma once -#include "shared-forward.h" +#include "forward.h" #include "../fundamental/bootspec.h" /* IWYU pragma: export */ diff --git a/src/shared/bpf-link.h b/src/shared/bpf-link.h index b5be07865d..4972abab4a 100644 --- a/src/shared/bpf-link.h +++ b/src/shared/bpf-link.h @@ -8,7 +8,7 @@ #include -#include "shared-forward.h" +#include "forward.h" bool bpf_can_link_program(struct bpf_program *prog); bool bpf_can_link_lsm_program(struct bpf_program *prog); diff --git a/src/shared/bpf-program.h b/src/shared/bpf-program.h index cf7fbcd6a5..11d82f3b16 100644 --- a/src/shared/bpf-program.h +++ b/src/shared/bpf-program.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" /* This encapsulates three different concepts: the loaded BPF program, the BPF code, and the attachment to a * cgroup. Typically our BPF programs go through all three stages: we build the code, we load it, and finally diff --git a/src/shared/bpf-util.h b/src/shared/bpf-util.h index 70c7fde3c0..b21cce18bb 100644 --- a/src/shared/bpf-util.h +++ b/src/shared/bpf-util.h @@ -4,7 +4,7 @@ #include #include "dlopen-note.h" -#include "shared-forward.h" +#include "forward.h" #if HAVE_LIBBPF #ifndef SYSTEMD_CFLAGS_MARKER_LIBBPF diff --git a/src/shared/bridge-util.h b/src/shared/bridge-util.h index ff865af9e4..c3a1fbdc45 100644 --- a/src/shared/bridge-util.h +++ b/src/shared/bridge-util.h @@ -3,7 +3,7 @@ #include -#include "shared-forward.h" +#include "forward.h" typedef enum BridgeState { NETDEV_BRIDGE_STATE_DISABLED = BR_STATE_DISABLED, diff --git a/src/shared/btrfs-util.h b/src/shared/btrfs-util.h index da7c0481a6..be5e0b59d3 100644 --- a/src/shared/btrfs-util.h +++ b/src/shared/btrfs-util.h @@ -3,7 +3,7 @@ #include "sd-id128.h" -#include "shared-forward.h" +#include "forward.h" #include "../basic/btrfs-util.h" /* IWYU pragma: export */ diff --git a/src/shared/bus-get-properties.h b/src/shared/bus-get-properties.h index 219c8195b7..68dc762f32 100644 --- a/src/shared/bus-get-properties.h +++ b/src/shared/bus-get-properties.h @@ -3,7 +3,7 @@ #include "sd-bus.h" /* IWYU pragma: keep */ -#include "shared-forward.h" +#include "forward.h" int bus_property_get_bool(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, void *userdata, sd_bus_error *reterr_error); int bus_property_set_bool(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *value, void *userdata, sd_bus_error *reterr_error); diff --git a/src/shared/bus-locator.h b/src/shared/bus-locator.h index adb43f8a5e..9b0ac39775 100644 --- a/src/shared/bus-locator.h +++ b/src/shared/bus-locator.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" typedef struct BusLocator { const char *destination; diff --git a/src/shared/bus-log-control-api.h b/src/shared/bus-log-control-api.h index f651d47679..4178f7c29f 100644 --- a/src/shared/bus-log-control-api.h +++ b/src/shared/bus-log-control-api.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" extern const BusObjectImplementation log_control_object; diff --git a/src/shared/bus-map-properties.h b/src/shared/bus-map-properties.h index 834374ce97..e019266ac2 100644 --- a/src/shared/bus-map-properties.h +++ b/src/shared/bus-map-properties.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" typedef int (*bus_property_set_t)(sd_bus *bus, const char *member, sd_bus_message *m, sd_bus_error *reterr_error, void *userdata); diff --git a/src/shared/bus-message-util.h b/src/shared/bus-message-util.h index 1e6d25e8b2..4e8fb4d4e5 100644 --- a/src/shared/bus-message-util.h +++ b/src/shared/bus-message-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int bus_message_read_id128(sd_bus_message *m, sd_id128_t *ret); diff --git a/src/shared/bus-object.h b/src/shared/bus-object.h index a3dbae80ae..85d8a4d9d9 100644 --- a/src/shared/bus-object.h +++ b/src/shared/bus-object.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" typedef struct BusObjectVtablePair { const sd_bus_vtable *vtable; diff --git a/src/shared/bus-polkit.h b/src/shared/bus-polkit.h index 887ed2a55b..a08037da71 100644 --- a/src/shared/bus-polkit.h +++ b/src/shared/bus-polkit.h @@ -4,7 +4,7 @@ #include "sd-json.h" #include "sd-varlink.h" -#include "shared-forward.h" +#include "forward.h" typedef enum PolkitFlags { POLKIT_ALLOW_INTERACTIVE = 1 << 0, /* Allow interactive auth (typically not required, because can be derived from bus message/link automatically) */ diff --git a/src/shared/bus-print-properties.h b/src/shared/bus-print-properties.h index be0063a9ed..88db8882bf 100644 --- a/src/shared/bus-print-properties.h +++ b/src/shared/bus-print-properties.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" typedef enum BusPrintPropertyFlags { BUS_PRINT_PROPERTY_ONLY_VALUE = 1 << 0, /* e.g. systemctl --value */ diff --git a/src/shared/bus-unit-procs.h b/src/shared/bus-unit-procs.h index 22406046f7..f2665ad79b 100644 --- a/src/shared/bus-unit-procs.h +++ b/src/shared/bus-unit-procs.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int unit_show_processes(sd_bus *bus, const char *unit, const char *cgroup_path, const char *prefix, unsigned n_columns, OutputFlags flags, sd_bus_error *reterr_error); diff --git a/src/shared/bus-unit-util.h b/src/shared/bus-unit-util.h index a50cfbc37b..72ac9f7c4f 100644 --- a/src/shared/bus-unit-util.h +++ b/src/shared/bus-unit-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" typedef enum ExecDirectoryFlags { EXEC_DIRECTORY_READ_ONLY = 1 << 0, /* Public API via DBUS, do not change */ diff --git a/src/shared/bus-util.h b/src/shared/bus-util.h index a74619fb2f..c69ed45617 100644 --- a/src/shared/bus-util.h +++ b/src/shared/bus-util.h @@ -3,8 +3,8 @@ #include "sd-bus.h" /* IWYU pragma: export */ +#include "forward.h" #include "log.h" -#include "shared-forward.h" typedef enum BusTransport { BUS_TRANSPORT_LOCAL, diff --git a/src/shared/bus-wait-for-jobs.h b/src/shared/bus-wait-for-jobs.h index 125a2e9ea8..bce4f25ac2 100644 --- a/src/shared/bus-wait-for-jobs.h +++ b/src/shared/bus-wait-for-jobs.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" typedef struct BusWaitForJobs BusWaitForJobs; diff --git a/src/shared/bus-wait-for-units.h b/src/shared/bus-wait-for-units.h index b563249897..eed7fd1f4b 100644 --- a/src/shared/bus-wait-for-units.h +++ b/src/shared/bus-wait-for-units.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" typedef struct BusWaitForUnits BusWaitForUnits; diff --git a/src/shared/calendarspec.h b/src/shared/calendarspec.h index 339dda30ab..d45aaa8a37 100644 --- a/src/shared/calendarspec.h +++ b/src/shared/calendarspec.h @@ -4,7 +4,7 @@ /* A structure for specifying (possibly repetitive) points in calendar * time, a la cron */ -#include "shared-forward.h" +#include "forward.h" typedef struct CalendarComponent { int start; diff --git a/src/shared/cgroup-setup.h b/src/shared/cgroup-setup.h index 33802c3624..4cc5c9f4cc 100644 --- a/src/shared/cgroup-setup.h +++ b/src/shared/cgroup-setup.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int cg_weight_parse(const char *s, uint64_t *ret); int cg_cpu_weight_parse(const char *s, uint64_t *ret); diff --git a/src/shared/cgroup-show.h b/src/shared/cgroup-show.h index 27fc878c93..56636e5674 100644 --- a/src/shared/cgroup-show.h +++ b/src/shared/cgroup-show.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int show_cgroup_by_path(const char *path, const char *prefix, size_t n_columns, OutputFlags flags); int show_cgroup(const char *path, const char *prefix, size_t n_columns, OutputFlags flags); diff --git a/src/shared/chown-recursive.h b/src/shared/chown-recursive.h index 55605c4a76..8bf8a80d6b 100644 --- a/src/shared/chown-recursive.h +++ b/src/shared/chown-recursive.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int path_chown_recursive(const char *path, uid_t uid, gid_t gid, mode_t mask, int flags); diff --git a/src/shared/clean-ipc.h b/src/shared/clean-ipc.h index 43f9ec6873..a1f8b9ec63 100644 --- a/src/shared/clean-ipc.h +++ b/src/shared/clean-ipc.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int clean_ipc_internal(uid_t uid, gid_t gid, bool rm); diff --git a/src/shared/color-util.h b/src/shared/color-util.h index ff1de1f90c..1816b7971c 100644 --- a/src/shared/color-util.h +++ b/src/shared/color-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" void rgb_to_hsv(double r, double g, double b, double *ret_h, double *ret_s, double *ret_v); diff --git a/src/shared/common-signal.h b/src/shared/common-signal.h index fabe94370e..07bc4c5f00 100644 --- a/src/shared/common-signal.h +++ b/src/shared/common-signal.h @@ -3,7 +3,7 @@ #include -#include "shared-forward.h" +#include "forward.h" /* All our long-running services should implement a SIGRTMIN+18 handler that can be used to trigger certain * actions that affect service runtime. The specific action is indicated via the "value integer" you can pass diff --git a/src/shared/compare-operator.h b/src/shared/compare-operator.h index 6f934a4a88..aa19835fd0 100644 --- a/src/shared/compare-operator.h +++ b/src/shared/compare-operator.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" #define COMPARE_OPERATOR_CHARS "!<=>" #define COMPARE_OPERATOR_WITH_FNMATCH_CHARS COMPARE_OPERATOR_CHARS "$" diff --git a/src/shared/condition.h b/src/shared/condition.h index e518ee608b..26f3ba407f 100644 --- a/src/shared/condition.h +++ b/src/shared/condition.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once +#include "forward.h" #include "list.h" -#include "shared-forward.h" typedef enum ConditionType { CONDITION_ARCHITECTURE, diff --git a/src/shared/copy.h b/src/shared/copy.h index 9299735326..56732498bc 100644 --- a/src/shared/copy.h +++ b/src/shared/copy.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" typedef enum CopyFlags { COPY_REFLINK = 1 << 0, /* Try to reflink */ diff --git a/src/shared/coredump-util.h b/src/shared/coredump-util.h index 0839e4894c..2db9c8de12 100644 --- a/src/shared/coredump-util.h +++ b/src/shared/coredump-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" typedef enum CoredumpFilter { COREDUMP_FILTER_PRIVATE_ANONYMOUS = 0, diff --git a/src/shared/cpu-set-util.h b/src/shared/cpu-set-util.h index 1f89ce2020..ee9e21b3f3 100644 --- a/src/shared/cpu-set-util.h +++ b/src/shared/cpu-set-util.h @@ -4,7 +4,7 @@ #include #include "conf-parser-forward.h" -#include "shared-forward.h" +#include "forward.h" /* This wraps the libc interface with a variable to keep the allocated size. */ typedef struct CPUSet { diff --git a/src/shared/creds-util.h b/src/shared/creds-util.h index 6dfad385fa..c962a660d1 100644 --- a/src/shared/creds-util.h +++ b/src/shared/creds-util.h @@ -4,7 +4,7 @@ #include "sd-id128.h" #include "fd-util.h" -#include "shared-forward.h" +#include "forward.h" #define CREDENTIAL_NAME_MAX FDNAME_MAX diff --git a/src/shared/crypto-util.h b/src/shared/crypto-util.h index b2705998a6..17d29b8915 100644 --- a/src/shared/crypto-util.h +++ b/src/shared/crypto-util.h @@ -2,9 +2,9 @@ #pragma once #include "dlopen-note.h" +#include "forward.h" #include "iovec-util.h" #include "sha256.h" -#include "shared-forward.h" typedef enum CertificateSourceType { OPENSSL_CERTIFICATE_SOURCE_FILE, diff --git a/src/shared/cryptsetup-fido2.h b/src/shared/cryptsetup-fido2.h index 75203ae8af..63d46cd97f 100644 --- a/src/shared/cryptsetup-fido2.h +++ b/src/shared/cryptsetup-fido2.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int acquire_fido2_key( const char *volume_name, diff --git a/src/shared/cryptsetup-tpm2.h b/src/shared/cryptsetup-tpm2.h index 7c06ebd200..6d0370847d 100644 --- a/src/shared/cryptsetup-tpm2.h +++ b/src/shared/cryptsetup-tpm2.h @@ -3,8 +3,7 @@ #include -#include "crypto-util.h" -#include "shared-forward.h" +#include "forward.h" int acquire_tpm2_key( const char *volume_name, diff --git a/src/shared/cryptsetup-util.h b/src/shared/cryptsetup-util.h index 959f696ca0..2e49c35d92 100644 --- a/src/shared/cryptsetup-util.h +++ b/src/shared/cryptsetup-util.h @@ -3,7 +3,7 @@ #include "dlfcn-util.h" #include "dlopen-note.h" -#include "shared-forward.h" +#include "forward.h" #if HAVE_LIBCRYPTSETUP #ifndef SYSTEMD_CFLAGS_MARKER_LIBCRYPTSETUP diff --git a/src/shared/curl-util.h b/src/shared/curl-util.h index d76f5128ee..d3d4e21c86 100644 --- a/src/shared/curl-util.h +++ b/src/shared/curl-util.h @@ -2,7 +2,7 @@ #pragma once #include "dlopen-note.h" -#include "shared-forward.h" +#include "forward.h" #if HAVE_LIBCURL #ifndef SYSTEMD_CFLAGS_MARKER_LIBCURL diff --git a/src/shared/daemon-util.h b/src/shared/daemon-util.h index 089e418f7b..35e9355483 100644 --- a/src/shared/daemon-util.h +++ b/src/shared/daemon-util.h @@ -3,7 +3,7 @@ #include "sd-daemon.h" /* IWYU pragma: export */ -#include "shared-forward.h" +#include "forward.h" #define NOTIFY_READY_MESSAGE "READY=1\n" "STATUS=Processing requests..." #define NOTIFY_STOPPING_MESSAGE "STOPPING=1\n" "STATUS=Shutting down..." diff --git a/src/shared/data-fd-util.h b/src/shared/data-fd-util.h index 11027d8ce8..605ba6b24e 100644 --- a/src/shared/data-fd-util.h +++ b/src/shared/data-fd-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int copy_data_fd(int fd); int memfd_clone_fd(int fd, const char *name, int mode); diff --git a/src/shared/dev-setup.h b/src/shared/dev-setup.h index 573c7a5c0b..8844d751ac 100644 --- a/src/shared/dev-setup.h +++ b/src/shared/dev-setup.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int dev_setup(const char *prefix, uid_t uid, gid_t gid); diff --git a/src/shared/discover-image.h b/src/shared/discover-image.h index 5dac81b9c5..71d00cbdb0 100644 --- a/src/shared/discover-image.h +++ b/src/shared/discover-image.h @@ -3,7 +3,7 @@ #include "sd-id128.h" -#include "shared-forward.h" +#include "forward.h" #include "os-util.h" typedef enum ImageType { diff --git a/src/shared/dissect-image.h b/src/shared/dissect-image.h index fe6af790bf..3ff2fdb882 100644 --- a/src/shared/dissect-image.h +++ b/src/shared/dissect-image.h @@ -4,9 +4,9 @@ #include "sd-id128.h" #include "architecture.h" +#include "forward.h" #include "gpt.h" #include "iovec-util.h" -#include "shared-forward.h" typedef struct DecryptedImage DecryptedImage; diff --git a/src/shared/dlopen-note.h b/src/shared/dlopen-note.h index b1ed14e5b4..3430948a5c 100644 --- a/src/shared/dlopen-note.h +++ b/src/shared/dlopen-note.h @@ -2,7 +2,7 @@ #pragma once #include "../basic/dlopen-note.h" /* IWYU pragma: export */ -#include "shared-forward.h" +#include "forward.h" #if HAVE_ACL # define LIBACL_NOTE(priority) \ diff --git a/src/shared/dns-answer.h b/src/shared/dns-answer.h index 191da34567..526af099ec 100644 --- a/src/shared/dns-answer.h +++ b/src/shared/dns-answer.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once +#include "forward.h" #include "ordered-set.h" -#include "shared-forward.h" /* A simple array of resource records. We keep track of the originating ifindex for each RR where that makes * sense, so that we can qualify A and AAAA RRs referring to a local link with the right ifindex. diff --git a/src/shared/dns-configuration.h b/src/shared/dns-configuration.h index a14490f7e5..9a04ec835f 100644 --- a/src/shared/dns-configuration.h +++ b/src/shared/dns-configuration.h @@ -3,8 +3,8 @@ #include +#include "forward.h" #include "in-addr-util.h" -#include "shared-forward.h" typedef struct DNSServer { struct iovec addr; diff --git a/src/shared/dns-domain.h b/src/shared/dns-domain.h index f2fb2f0cea..aabfaa5029 100644 --- a/src/shared/dns-domain.h +++ b/src/shared/dns-domain.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" typedef enum DNSLabelFlags { DNS_LABEL_LDH = 1 << 0, /* Follow the "LDH" rule — only letters, digits, and internal hyphens. */ diff --git a/src/shared/dns-packet.h b/src/shared/dns-packet.h index e36d91a0b4..5eab4ffab1 100644 --- a/src/shared/dns-packet.h +++ b/src/shared/dns-packet.h @@ -5,10 +5,10 @@ #include #include +#include "forward.h" #include "in-addr-util.h" #include "memory-util.h" #include "resolved-def.h" -#include "shared-forward.h" #include "sparse-endian.h" typedef enum DnsProtocol { diff --git a/src/shared/dns-question.h b/src/shared/dns-question.h index 85de7ad06d..3f6995650d 100644 --- a/src/shared/dns-question.h +++ b/src/shared/dns-question.h @@ -3,7 +3,7 @@ #include "sd-json.h" -#include "shared-forward.h" +#include "forward.h" #define DNS_QUESTION_ITEMS_MAX 128U diff --git a/src/shared/dns-rr.h b/src/shared/dns-rr.h index a3cde2f3d1..a8199cdc44 100644 --- a/src/shared/dns-rr.h +++ b/src/shared/dns-rr.h @@ -5,8 +5,8 @@ #include "dns-def.h" #include "dns-type.h" +#include "forward.h" #include "list.h" -#include "shared-forward.h" /* DNSKEY RR flags */ #define DNSKEY_FLAG_SEP (UINT16_C(1) << 0) diff --git a/src/shared/dns-type.h b/src/shared/dns-type.h index dc96d5961d..c0cb7679ba 100644 --- a/src/shared/dns-type.h +++ b/src/shared/dns-type.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" /* DNS record types, taken from * http://www.iana.org/assignments/dns-parameters/dns-parameters.xhtml. diff --git a/src/shared/dropin.h b/src/shared/dropin.h index 635dbbf8bb..318b225dd3 100644 --- a/src/shared/dropin.h +++ b/src/shared/dropin.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int drop_in_file( const char *dir, diff --git a/src/shared/edit-util.h b/src/shared/edit-util.h index 427533f67c..5bcdaeba16 100644 --- a/src/shared/edit-util.h +++ b/src/shared/edit-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" #define DROPIN_MARKER_START "### Anything between here and the comment below will become the contents of the drop-in file" #define DROPIN_MARKER_END "### Edits below this comment will be discarded" diff --git a/src/shared/efi-api.h b/src/shared/efi-api.h index 0457416e6b..4f9a223d7f 100644 --- a/src/shared/efi-api.h +++ b/src/shared/efi-api.h @@ -3,7 +3,7 @@ #include "sd-id128.h" -#include "shared-forward.h" +#include "forward.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 c51c2dbb2f..d4344e92ad 100644 --- a/src/shared/efi-loader.h +++ b/src/shared/efi-loader.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" /* Various calls that interface with EFI variables implementing https://systemd.io/BOOT_LOADER_INTERFACE */ diff --git a/src/shared/elf-util.h b/src/shared/elf-util.h index 4092cdf303..6d480e94d7 100644 --- a/src/shared/elf-util.h +++ b/src/shared/elf-util.h @@ -2,7 +2,7 @@ #pragma once #include "dlopen-note.h" -#include "shared-forward.h" +#include "forward.h" int dlopen_dw(int log_level) _dlopen_loader_; int dlopen_elf(int log_level) _dlopen_loader_; diff --git a/src/shared/ethtool-util.h b/src/shared/ethtool-util.h index dbb8875997..0c8cf85c13 100644 --- a/src/shared/ethtool-util.h +++ b/src/shared/ethtool-util.h @@ -4,7 +4,7 @@ #include #include "conf-parser-forward.h" -#include "shared-forward.h" +#include "forward.h" #define N_ADVERTISE 4 diff --git a/src/shared/exec-util.h b/src/shared/exec-util.h index 1c50f5a836..11b01f321f 100644 --- a/src/shared/exec-util.h +++ b/src/shared/exec-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" typedef int (*gather_stdout_callback_t) (int fd, void *arg); diff --git a/src/shared/exit-status.h b/src/shared/exit-status.h index 28730ff64d..5a880d4664 100644 --- a/src/shared/exit-status.h +++ b/src/shared/exit-status.h @@ -2,7 +2,7 @@ #pragma once #include "bitmap.h" -#include "shared-forward.h" +#include "forward.h" /* This defines pretty names for the LSB 'start' verb exit codes. Note that they shouldn't be confused with * the LSB 'status' verb exit codes which are defined very differently. For details see: diff --git a/src/shared/extension-util.h b/src/shared/extension-util.h index 2cfe974ce0..08bdd7f33e 100644 --- a/src/shared/extension-util.h +++ b/src/shared/extension-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" /* Given an image name (for logging purposes), a set of os-release values from the host and a key-value pair * vector of extension-release variables, check that the distro and (system extension level or distro diff --git a/src/shared/factory-reset.h b/src/shared/factory-reset.h index 6a3b24fc21..a5214f8d66 100644 --- a/src/shared/factory-reset.h +++ b/src/shared/factory-reset.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" typedef enum FactoryResetMode { FACTORY_RESET_UNSUPPORTED, /* feature not available on this OS */ diff --git a/src/shared/fdisk-util.h b/src/shared/fdisk-util.h index aa1e188dba..6f6ae6b438 100644 --- a/src/shared/fdisk-util.h +++ b/src/shared/fdisk-util.h @@ -2,7 +2,7 @@ #pragma once #include "dlopen-note.h" -#include "shared-forward.h" +#include "forward.h" #if HAVE_LIBFDISK #ifndef SYSTEMD_CFLAGS_MARKER_LIBFDISK diff --git a/src/shared/fdset.h b/src/shared/fdset.h index 429b334bc1..96a17c7835 100644 --- a/src/shared/fdset.h +++ b/src/shared/fdset.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once +#include "forward.h" #include "iterator.h" -#include "shared-forward.h" FDSet* fdset_new(void); FDSet* fdset_free(FDSet *s); diff --git a/src/shared/fido2-util.h b/src/shared/fido2-util.h index 25b3a0732d..8eccf2cc0d 100644 --- a/src/shared/fido2-util.h +++ b/src/shared/fido2-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int fido2_generate_salt(struct iovec *ret_salt); int fido2_read_salt_file(const char *filename, uint64_t offset, const char *client, const char *node, struct iovec *ret_salt); diff --git a/src/shared/find-esp.h b/src/shared/find-esp.h index ad02bcd8f3..004fffcb1d 100644 --- a/src/shared/find-esp.h +++ b/src/shared/find-esp.h @@ -2,7 +2,7 @@ #pragma once -#include "shared-forward.h" +#include "forward.h" int find_esp_and_warn_at_full(int rfd, const char *path, int unprivileged_mode, char **ret_path, int *ret_fd, uint32_t *ret_part, uint64_t *ret_pstart, uint64_t *ret_psize, sd_id128_t *ret_uuid, dev_t *ret_devid); int find_esp_and_warn_full(const char *root, const char *path, int unprivileged_mode, char **ret_path, int *ret_fd, uint32_t *ret_part, uint64_t *ret_pstart, uint64_t *ret_psize, sd_id128_t *ret_uuid, dev_t *ret_devid); diff --git a/src/shared/firewall-util.h b/src/shared/firewall-util.h index 202e5407b4..1bef10d880 100644 --- a/src/shared/firewall-util.h +++ b/src/shared/firewall-util.h @@ -2,7 +2,7 @@ #pragma once #include "conf-parser-forward.h" -#include "shared-forward.h" +#include "forward.h" int fw_nftables_add_masquerade( sd_netlink *nfnl, diff --git a/src/shared/firstboot-util.h b/src/shared/firstboot-util.h index e87da6f18c..68c8bceace 100644 --- a/src/shared/firstboot-util.h +++ b/src/shared/firstboot-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" /* Parsed value of the systemd.firstboot= kernel command line option, honoured by systemd-firstboot, * homectl's firstboot logic and systemd-cryptenroll. */ diff --git a/src/shared/fork-notify.h b/src/shared/fork-notify.h index cf22f48ba2..2e750b72f9 100644 --- a/src/shared/fork-notify.h +++ b/src/shared/fork-notify.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once +#include "forward.h" #include "output-mode.h" -#include "shared-forward.h" typedef void (*fork_notify_handler_t)(void *userdata); diff --git a/src/shared/format-table.h b/src/shared/format-table.h index ba4d33cfc6..43e2b6772c 100644 --- a/src/shared/format-table.h +++ b/src/shared/format-table.h @@ -3,7 +3,7 @@ #include "sd-json.h" -#include "shared-forward.h" +#include "forward.h" #include "log.h" #include "pager.h" diff --git a/src/shared/shared-forward.h b/src/shared/forward.h similarity index 96% rename from src/shared/shared-forward.h rename to src/shared/forward.h index a9c7101e55..f314b6c218 100644 --- a/src/shared/shared-forward.h +++ b/src/shared/forward.h @@ -3,7 +3,7 @@ /* IWYU pragma: always_keep */ -#include "sd-forward.h" /* IWYU pragma: export */ +#include "../libsystemd/forward.h" /* IWYU pragma: export */ typedef int (*copy_progress_bytes_t)(uint64_t n_bytes, uint64_t bytes_per_second, void *userdata); typedef int (*copy_progress_path_t)(const char *path, const struct stat *st, void *userdata); @@ -47,6 +47,7 @@ typedef enum UserDBFlags UserDBFlags; typedef enum UserRecordLoadFlags UserRecordLoadFlags; typedef enum UserStorage UserStorage; +typedef struct Argon2IdParameters Argon2IdParameters; typedef struct AskPasswordRequest AskPasswordRequest; typedef struct Bitmap Bitmap; typedef struct BootConfig BootConfig; diff --git a/src/shared/fsprg-openssl.h b/src/shared/fsprg-openssl.h index e9e5649617..ff90077df3 100644 --- a/src/shared/fsprg-openssl.h +++ b/src/shared/fsprg-openssl.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "sd-forward.h" +#include "forward.h" #define FSPRG_RECOMMENDED_SECPAR 1536 #define FSPRG_RECOMMENDED_SEEDLEN (96/8) diff --git a/src/shared/fstab-util.h b/src/shared/fstab-util.h index e3a5f66332..59d909d44f 100644 --- a/src/shared/fstab-util.h +++ b/src/shared/fstab-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" bool fstab_enabled_full(int enabled); static inline bool fstab_enabled(void) { diff --git a/src/shared/generator.h b/src/shared/generator.h index fb627d4e7a..46c4e58576 100644 --- a/src/shared/generator.h +++ b/src/shared/generator.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" #include "main-func.h" int generator_open_unit_file_full(const char *dir, const char *source, const char *filename, FILE **ret_file, char **ret_final_path, char **ret_temp_path); diff --git a/src/shared/geneve-util.h b/src/shared/geneve-util.h index c21a1f6905..acbe756ea5 100644 --- a/src/shared/geneve-util.h +++ b/src/shared/geneve-util.h @@ -3,7 +3,7 @@ #include -#include "shared-forward.h" +#include "forward.h" typedef enum GeneveDF { NETDEV_GENEVE_DF_UNSET = GENEVE_DF_UNSET, diff --git a/src/shared/gnutls-util.h b/src/shared/gnutls-util.h index 721ae7bf00..a68faec2bb 100644 --- a/src/shared/gnutls-util.h +++ b/src/shared/gnutls-util.h @@ -2,7 +2,7 @@ #pragma once #include "dlopen-note.h" -#include "shared-forward.h" +#include "forward.h" int dlopen_gnutls(int log_level) _dlopen_loader_; diff --git a/src/shared/gpt.h b/src/shared/gpt.h index 18d665441c..922bc82c15 100644 --- a/src/shared/gpt.h +++ b/src/shared/gpt.h @@ -5,7 +5,7 @@ #include "sd-id128.h" #include "architecture.h" -#include "shared-forward.h" +#include "forward.h" #include "sparse-endian.h" /* maximum length of gpt label */ diff --git a/src/shared/group-record.h b/src/shared/group-record.h index 35968aa29f..bacecab72c 100644 --- a/src/shared/group-record.h +++ b/src/shared/group-record.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" #include "user-record.h" typedef struct GroupRecord { diff --git a/src/shared/hibernate-util.h b/src/shared/hibernate-util.h index 0fe2b2e11b..719e2c0554 100644 --- a/src/shared/hibernate-util.h +++ b/src/shared/hibernate-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" /* represents values for /sys/power/resume & /sys/power/resume_offset and the corresponding path */ typedef struct HibernationDevice { diff --git a/src/shared/hostname-setup.h b/src/shared/hostname-setup.h index 802f7c9f20..6e68b6fa79 100644 --- a/src/shared/hostname-setup.h +++ b/src/shared/hostname-setup.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" typedef enum HostnameSource { HOSTNAME_STATIC, /* from /etc/hostname */ diff --git a/src/shared/hwdb-util.h b/src/shared/hwdb-util.h index c1f14c446a..6e41b8b588 100644 --- a/src/shared/hwdb-util.h +++ b/src/shared/hwdb-util.h @@ -3,7 +3,7 @@ #include "sd-hwdb.h" /* IWYU pragma: export */ -#include "shared-forward.h" +#include "forward.h" bool hwdb_should_reload(sd_hwdb *hwdb); int hwdb_update(const char *root, const char *hwdb_bin_dir, bool strict, bool compat); diff --git a/src/shared/id128-print.h b/src/shared/id128-print.h index db3c176a34..0048e95729 100644 --- a/src/shared/id128-print.h +++ b/src/shared/id128-print.h @@ -4,7 +4,7 @@ #include "sd-id128.h" -#include "shared-forward.h" +#include "forward.h" typedef enum Id128PrettyPrintMode { ID128_PRINT_ID128, diff --git a/src/shared/idn-util.h b/src/shared/idn-util.h index c143317ebf..945b7cd927 100644 --- a/src/shared/idn-util.h +++ b/src/shared/idn-util.h @@ -2,7 +2,7 @@ #pragma once #include "dlopen-note.h" -#include "shared-forward.h" +#include "forward.h" #if HAVE_LIBIDN2 #ifndef SYSTEMD_CFLAGS_MARKER_LIBIDN2 diff --git a/src/shared/ima-util.h b/src/shared/ima-util.h index 6007e76891..fb864f6063 100644 --- a/src/shared/ima-util.h +++ b/src/shared/ima-util.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" bool use_ima(void); diff --git a/src/shared/image-policy.h b/src/shared/image-policy.h index b0c229e71e..ae0d2f360b 100644 --- a/src/shared/image-policy.h +++ b/src/shared/image-policy.h @@ -3,7 +3,7 @@ #include "conf-parser-forward.h" #include "dissect-image.h" -#include "shared-forward.h" +#include "forward.h" #include "gpt.h" typedef enum PartitionPolicyFlags { diff --git a/src/shared/import-util.h b/src/shared/import-util.h index a982d159ca..3ab6c50587 100644 --- a/src/shared/import-util.h +++ b/src/shared/import-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" typedef enum ImportType { IMPORT_RAW, diff --git a/src/shared/in-addr-prefix-util.h b/src/shared/in-addr-prefix-util.h index 6bb46b6815..b18609a121 100644 --- a/src/shared/in-addr-prefix-util.h +++ b/src/shared/in-addr-prefix-util.h @@ -2,7 +2,7 @@ #pragma once #include "conf-parser-forward.h" -#include "shared-forward.h" +#include "forward.h" #include "in-addr-util.h" struct in_addr_prefix { diff --git a/src/shared/initrd-cpio.h b/src/shared/initrd-cpio.h index dd6a737636..33dc298e44 100644 --- a/src/shared/initrd-cpio.h +++ b/src/shared/initrd-cpio.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" /* Builds a new CPIO archive containing each credential as a * file under .extra/system_credentials/.cred, writes it to a diff --git a/src/shared/install-file.h b/src/shared/install-file.h index 6cd21c93c4..450dd96c56 100644 --- a/src/shared/install-file.h +++ b/src/shared/install-file.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" typedef enum InstallFileFlags { INSTALL_REPLACE = 1 << 0, /* Replace an existing inode */ diff --git a/src/shared/install-printf.h b/src/shared/install-printf.h index 0d05badc47..f88449ffe1 100644 --- a/src/shared/install-printf.h +++ b/src/shared/install-printf.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int install_name_printf( RuntimeScope scope, diff --git a/src/shared/install.h b/src/shared/install.h index f184b7191c..526204a72a 100644 --- a/src/shared/install.h +++ b/src/shared/install.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once +#include "forward.h" #include "runtime-scope.h" -#include "shared-forward.h" #include "unit-file.h" typedef enum UnitFilePresetMode { diff --git a/src/shared/ioprio-util.h b/src/shared/ioprio-util.h index 6102294099..5a637c8d17 100644 --- a/src/shared/ioprio-util.h +++ b/src/shared/ioprio-util.h @@ -3,7 +3,7 @@ #include /* IWYU pragma: export */ -#include "shared-forward.h" +#include "forward.h" static inline int ioprio_prio_class(int value) { return IOPRIO_PRIO_CLASS(value); diff --git a/src/shared/ip-protocol-list.h b/src/shared/ip-protocol-list.h index 6ea91e4c27..cb8599787b 100644 --- a/src/shared/ip-protocol-list.h +++ b/src/shared/ip-protocol-list.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" const char* ip_protocol_to_name(int id); int ip_protocol_from_name(const char *name); diff --git a/src/shared/ipvlan-util.h b/src/shared/ipvlan-util.h index 194e5cea04..4fb7149f99 100644 --- a/src/shared/ipvlan-util.h +++ b/src/shared/ipvlan-util.h @@ -3,7 +3,7 @@ #include -#include "shared-forward.h" +#include "forward.h" typedef enum IPVlanMode { NETDEV_IPVLAN_MODE_L2 = IPVLAN_MODE_L2, diff --git a/src/shared/journal-authenticate.h b/src/shared/journal-authenticate.h index a12afb9ac7..05426ee431 100644 --- a/src/shared/journal-authenticate.h +++ b/src/shared/journal-authenticate.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once +#include "forward.h" #include "journal-authenticate-internal.h" /* IWYU pragma: export */ -#include "shared-forward.h" void journal_auth_init(void); diff --git a/src/shared/journal-file-util.h b/src/shared/journal-file-util.h index a3a8781218..cb9a6e5666 100644 --- a/src/shared/journal-file-util.h +++ b/src/shared/journal-file-util.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once +#include "forward.h" #include "journal-file.h" /* IWYU pragma: export */ -#include "shared-forward.h" int journal_file_set_offline(JournalFile *f, bool wait); bool journal_file_is_offlining(JournalFile *f); diff --git a/src/shared/journal-importer.h b/src/shared/journal-importer.h index 21de703781..ac32dfb941 100644 --- a/src/shared/journal-importer.h +++ b/src/shared/journal-importer.h @@ -4,7 +4,7 @@ #include "sd-id128.h" -#include "shared-forward.h" +#include "forward.h" #include "iovec-wrapper.h" #include "time-util.h" diff --git a/src/shared/journal-util.h b/src/shared/journal-util.h index 4e12e4b76f..2805ae1976 100644 --- a/src/shared/journal-util.h +++ b/src/shared/journal-util.h @@ -3,7 +3,7 @@ #include "sd-journal.h" /* IWYU pragma: export */ -#include "shared-forward.h" +#include "forward.h" int journal_access_blocked(sd_journal *j); int journal_access_check_and_warn(sd_journal *j, bool quiet, bool want_other_users); diff --git a/src/shared/kbd-util.h b/src/shared/kbd-util.h index 28c63dc791..35ae976baa 100644 --- a/src/shared/kbd-util.h +++ b/src/shared/kbd-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int keymap_directories(char ***ret); int get_keymaps(char ***ret); diff --git a/src/shared/kernel-config.h b/src/shared/kernel-config.h index eab3fe4641..d46aba8278 100644 --- a/src/shared/kernel-config.h +++ b/src/shared/kernel-config.h @@ -2,7 +2,7 @@ #pragma once #include "fd-util.h" -#include "shared-forward.h" +#include "forward.h" int load_kernel_install_conf_at( const char *root, diff --git a/src/shared/kernel-image.h b/src/shared/kernel-image.h index c0b8847caf..1e1874748d 100644 --- a/src/shared/kernel-image.h +++ b/src/shared/kernel-image.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" typedef enum KernelImageType { KERNEL_IMAGE_TYPE_UNKNOWN, diff --git a/src/shared/killall.h b/src/shared/killall.h index a39675b119..1eb198acec 100644 --- a/src/shared/killall.h +++ b/src/shared/killall.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int broadcast_signal(int sig, bool wait_for_exit, bool send_sighup, usec_t timeout); diff --git a/src/shared/label-util.h b/src/shared/label-util.h index 720bd06533..7420b9f149 100644 --- a/src/shared/label-util.h +++ b/src/shared/label-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" #include "../basic/label-util.h" /* IWYU pragma: export */ diff --git a/src/shared/libarchive-util.h b/src/shared/libarchive-util.h index fca7ef206b..77971236fa 100644 --- a/src/shared/libarchive-util.h +++ b/src/shared/libarchive-util.h @@ -2,7 +2,7 @@ #pragma once #include "dlopen-note.h" -#include "shared-forward.h" +#include "forward.h" #if HAVE_LIBARCHIVE #ifndef SYSTEMD_CFLAGS_MARKER_LIBARCHIVE diff --git a/src/shared/libaudit-util.h b/src/shared/libaudit-util.h index d2e827d479..2123f1e6f6 100644 --- a/src/shared/libaudit-util.h +++ b/src/shared/libaudit-util.h @@ -2,7 +2,7 @@ #pragma once #include "dlopen-note.h" -#include "shared-forward.h" +#include "forward.h" int dlopen_libaudit(int log_level) _dlopen_loader_; diff --git a/src/shared/libcrypt-util.h b/src/shared/libcrypt-util.h index 56e39d26a1..04ea39415a 100644 --- a/src/shared/libcrypt-util.h +++ b/src/shared/libcrypt-util.h @@ -2,7 +2,7 @@ #pragma once #include "dlopen-note.h" -#include "shared-forward.h" +#include "forward.h" #if HAVE_LIBCRYPT int make_salt(char **ret); diff --git a/src/shared/libfido2-util.h b/src/shared/libfido2-util.h index d1b90066df..d4c6d287a7 100644 --- a/src/shared/libfido2-util.h +++ b/src/shared/libfido2-util.h @@ -2,7 +2,7 @@ #pragma once #include "dlopen-note.h" -#include "shared-forward.h" +#include "forward.h" #define FIDO2_SALT_SIZE 32U diff --git a/src/shared/libmount-util.h b/src/shared/libmount-util.h index 309798ac0a..6352b84eb5 100644 --- a/src/shared/libmount-util.h +++ b/src/shared/libmount-util.h @@ -2,7 +2,7 @@ #pragma once #include "dlopen-note.h" -#include "shared-forward.h" +#include "forward.h" #if HAVE_LIBMOUNT #ifndef SYSTEMD_CFLAGS_MARKER_LIBMOUNT diff --git a/src/shared/local-addresses.h b/src/shared/local-addresses.h index 6dd1b30051..474098219e 100644 --- a/src/shared/local-addresses.h +++ b/src/shared/local-addresses.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" #include "in-addr-util.h" struct local_address { diff --git a/src/shared/locale-setup.h b/src/shared/locale-setup.h index d720a53adb..84b359ab48 100644 --- a/src/shared/locale-setup.h +++ b/src/shared/locale-setup.h @@ -3,7 +3,7 @@ #include -#include "shared-forward.h" +#include "forward.h" #include "locale-util.h" typedef struct LocaleContext { diff --git a/src/shared/log-assert-critical.h b/src/shared/log-assert-critical.h index 62c7360412..114610447b 100644 --- a/src/shared/log-assert-critical.h +++ b/src/shared/log-assert-critical.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" void log_set_assert_return_is_critical(bool b); void log_set_assert_return_is_critical_from_env(void); diff --git a/src/shared/logs-show.h b/src/shared/logs-show.h index 5108941f79..846bff419a 100644 --- a/src/shared/logs-show.h +++ b/src/shared/logs-show.h @@ -3,7 +3,7 @@ #include "sd-id128.h" -#include "shared-forward.h" +#include "forward.h" typedef struct LogId { sd_id128_t id; /* boot ID or invocation ID */ diff --git a/src/shared/loop-util.h b/src/shared/loop-util.h index ae8374d17b..ef560474dd 100644 --- a/src/shared/loop-util.h +++ b/src/shared/loop-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" /* Some helpers for setting up loopback block devices */ diff --git a/src/shared/luo-util.h b/src/shared/luo-util.h index 8f4ca5ab54..c1bd523939 100644 --- a/src/shared/luo-util.h +++ b/src/shared/luo-util.h @@ -1,8 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" -#include "sd-forward.h" +#include "forward.h" #define LUO_SESSION_NAME "systemd" diff --git a/src/shared/machine-bind-user.h b/src/shared/machine-bind-user.h index 265fe13727..079e061397 100644 --- a/src/shared/machine-bind-user.h +++ b/src/shared/machine-bind-user.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" typedef struct MachineBindUserData { /* The host's user/group records */ diff --git a/src/shared/machine-credential.h b/src/shared/machine-credential.h index adef6a0605..244ebd6192 100644 --- a/src/shared/machine-credential.h +++ b/src/shared/machine-credential.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" typedef struct MachineCredential { char *id; diff --git a/src/shared/machine-id-setup.h b/src/shared/machine-id-setup.h index b5f76713ce..a5100766a4 100644 --- a/src/shared/machine-id-setup.h +++ b/src/shared/machine-id-setup.h @@ -3,7 +3,7 @@ #include "sd-id128.h" -#include "shared-forward.h" +#include "forward.h" typedef enum MachineIdSetupFlags { MACHINE_ID_SETUP_FORCE_TRANSIENT = 1 << 0, diff --git a/src/shared/machine-register.h b/src/shared/machine-register.h index ffec15a881..1a12dd80f8 100644 --- a/src/shared/machine-register.h +++ b/src/shared/machine-register.h @@ -3,8 +3,8 @@ #include "sd-id128.h" +#include "forward.h" #include "runtime-scope.h" -#include "shared-forward.h" typedef struct MachineRegistration { const char *name; diff --git a/src/shared/machine-util.h b/src/shared/machine-util.h index a992e24448..bc7490b04a 100644 --- a/src/shared/machine-util.h +++ b/src/shared/machine-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" #include "storage-util.h" typedef enum ImageFormat { diff --git a/src/shared/macvlan-util.h b/src/shared/macvlan-util.h index 6ffc93ebf4..846f192bf2 100644 --- a/src/shared/macvlan-util.h +++ b/src/shared/macvlan-util.h @@ -3,7 +3,7 @@ #include -#include "shared-forward.h" +#include "forward.h" typedef enum MacVlanMode { NETDEV_MACVLAN_MODE_PRIVATE = MACVLAN_MODE_PRIVATE, diff --git a/src/shared/main-func.h b/src/shared/main-func.h index db8c3fe67d..00d671f0ce 100644 --- a/src/shared/main-func.h +++ b/src/shared/main-func.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" #include "static-destruct.h" /* IWYU pragma: keep */ void main_prepare(int argc, char *argv[]); diff --git a/src/shared/metrics.h b/src/shared/metrics.h index 253e950fea..9751a89f8d 100644 --- a/src/shared/metrics.h +++ b/src/shared/metrics.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" typedef enum MetricFamilyType { METRIC_FAMILY_TYPE_COUNTER, diff --git a/src/shared/microhttpd-util.h b/src/shared/microhttpd-util.h index 7b777e2f33..20fd2545ae 100644 --- a/src/shared/microhttpd-util.h +++ b/src/shared/microhttpd-util.h @@ -2,7 +2,7 @@ #pragma once #include "dlopen-note.h" -#include "shared-forward.h" +#include "forward.h" #if HAVE_MICROHTTPD #ifndef SYSTEMD_CFLAGS_MARKER_LIBMICROHTTPD diff --git a/src/shared/mkdir.h b/src/shared/mkdir.h index b02e02a8f0..e20b020c94 100644 --- a/src/shared/mkdir.h +++ b/src/shared/mkdir.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" #include "../basic/mkdir.h" /* IWYU pragma: export */ diff --git a/src/shared/mkfs-util.h b/src/shared/mkfs-util.h index b23f0cf745..e94659a55e 100644 --- a/src/shared/mkfs-util.h +++ b/src/shared/mkfs-util.h @@ -3,7 +3,7 @@ #include "sd-id128.h" -#include "shared-forward.h" +#include "forward.h" typedef enum MakeFilesystemFlags { MKFS_QUIET = 1 << 0, /* Suppress mkfs command output */ diff --git a/src/shared/module-util.h b/src/shared/module-util.h index c315fdaa16..5dd3d475dc 100644 --- a/src/shared/module-util.h +++ b/src/shared/module-util.h @@ -2,7 +2,7 @@ #pragma once #include "dlopen-note.h" -#include "shared-forward.h" +#include "forward.h" #if HAVE_KMOD #ifndef SYSTEMD_CFLAGS_MARKER_LIBKMOD diff --git a/src/shared/mount-setup.h b/src/shared/mount-setup.h index 0f0bbaff56..9e1787b2c5 100644 --- a/src/shared/mount-setup.h +++ b/src/shared/mount-setup.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" bool mount_point_is_api(const char *path) _pure_; bool mount_point_ignore(const char *path) _pure_; diff --git a/src/shared/mount-util.h b/src/shared/mount-util.h index b178bf7bac..43e6835a9e 100644 --- a/src/shared/mount-util.h +++ b/src/shared/mount-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" typedef struct SubMount { char *path; diff --git a/src/shared/mstack.h b/src/shared/mstack.h index 3a05221e5e..11ad88c2b2 100644 --- a/src/shared/mstack.h +++ b/src/shared/mstack.h @@ -2,7 +2,7 @@ #pragma once #include "discover-image.h" -#include "shared-forward.h" +#include "forward.h" typedef enum MStackFlags { MSTACK_MKDIR = 1 << 0, /* when mounting, create top-level inode to mount on top */ diff --git a/src/shared/net-condition.h b/src/shared/net-condition.h index 49be68a0c4..ff3f2a36b5 100644 --- a/src/shared/net-condition.h +++ b/src/shared/net-condition.h @@ -4,7 +4,7 @@ #include #include "conf-parser-forward.h" -#include "shared-forward.h" +#include "forward.h" typedef struct NetMatch { Set *hw_addr; diff --git a/src/shared/netif-naming-scheme.h b/src/shared/netif-naming-scheme.h index 1848cb570b..8adc91b3a3 100644 --- a/src/shared/netif-naming-scheme.h +++ b/src/shared/netif-naming-scheme.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" /* So here's the deal: net_id is supposed to be an exercise in providing stable names for network devices. However, we * also want to keep updating the naming scheme used in future versions of net_id. These two goals of course are diff --git a/src/shared/netif-sriov.h b/src/shared/netif-sriov.h index 578a7ea579..f4273035f6 100644 --- a/src/shared/netif-sriov.h +++ b/src/shared/netif-sriov.h @@ -5,7 +5,7 @@ #include #include "conf-parser-forward.h" -#include "shared-forward.h" +#include "forward.h" typedef enum SRIOVAttribute { SR_IOV_VF_MAC, diff --git a/src/shared/netif-util.h b/src/shared/netif-util.h index cf956f42c6..5b2ba1d11d 100644 --- a/src/shared/netif-util.h +++ b/src/shared/netif-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" bool netif_has_carrier(uint8_t operstate, unsigned flags); int net_get_type_string(sd_device *device, uint16_t iftype, char **ret); diff --git a/src/shared/notify-recv.h b/src/shared/notify-recv.h index 5075739d6c..e260e7ef5e 100644 --- a/src/shared/notify-recv.h +++ b/src/shared/notify-recv.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int notify_socket_prepare_full( sd_event *event, diff --git a/src/shared/nsflags.h b/src/shared/nsflags.h index f046a9ef8c..eae199d73f 100644 --- a/src/shared/nsflags.h +++ b/src/shared/nsflags.h @@ -3,7 +3,7 @@ #include -#include "shared-forward.h" +#include "forward.h" /* The combination of all namespace flags defined by the kernel. The right type for this isn't clear. setns() and * unshare() expect these flags to be passed as (signed) "int", while clone() wants them as "unsigned long". The latter diff --git a/src/shared/nsresource.h b/src/shared/nsresource.h index c26dd4f8a5..7b85b03a92 100644 --- a/src/shared/nsresource.h +++ b/src/shared/nsresource.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" #include "user-util.h" /* Helpful constants for the only numbers of UIDs that can currently be allocated */ diff --git a/src/shared/nss-util.h b/src/shared/nss-util.h index 8f9c4e1ff3..ebd0d437b9 100644 --- a/src/shared/nss-util.h +++ b/src/shared/nss-util.h @@ -8,7 +8,7 @@ #include #include -#include "shared-forward.h" +#include "forward.h" #include "signal-util.h" extern sd_json_dispatch_flags_t nss_json_dispatch_flags; diff --git a/src/shared/numa-util.h b/src/shared/numa-util.h index 8b9a81852f..6b504b05df 100644 --- a/src/shared/numa-util.h +++ b/src/shared/numa-util.h @@ -4,7 +4,7 @@ #include #include "cpu-set-util.h" -#include "shared-forward.h" +#include "forward.h" static inline bool mpol_is_valid(int t) { return t >= MPOL_DEFAULT && t <= MPOL_WEIGHTED_INTERLEAVE; diff --git a/src/shared/open-file.h b/src/shared/open-file.h index 7fa30997f8..36b7787b67 100644 --- a/src/shared/open-file.h +++ b/src/shared/open-file.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" #include "list.h" typedef enum OpenFileFlag { diff --git a/src/shared/options.h b/src/shared/options.h index f02eb30027..561cd349e8 100644 --- a/src/shared/options.h +++ b/src/shared/options.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" /* Option namespace/group explanation: * the list of options is split into namespaces, and a namespace is split into groups. diff --git a/src/shared/osc-context.h b/src/shared/osc-context.h index 8db6e263cb..8f80b2932b 100644 --- a/src/shared/osc-context.h +++ b/src/shared/osc-context.h @@ -3,7 +3,7 @@ #include "sd-id128.h" -#include "shared-forward.h" +#include "forward.h" int osc_context_open_boot(char **ret_seq); int osc_context_open_container(const char *name, char **ret_seq, sd_id128_t *ret_context_id); diff --git a/src/shared/output-mode.h b/src/shared/output-mode.h index 151bf6b4bc..0888fad40a 100644 --- a/src/shared/output-mode.h +++ b/src/shared/output-mode.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" typedef enum OutputMode { OUTPUT_SHORT, diff --git a/src/shared/pager.h b/src/shared/pager.h index 2de516717d..d79e64407b 100644 --- a/src/shared/pager.h +++ b/src/shared/pager.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" typedef enum PagerFlags { PAGER_DISABLE = 1 << 0, diff --git a/src/shared/pam-util.h b/src/shared/pam-util.h index 3f1d765a33..ed085fa771 100644 --- a/src/shared/pam-util.h +++ b/src/shared/pam-util.h @@ -2,7 +2,7 @@ #pragma once #include "dlopen-note.h" -#include "shared-forward.h" +#include "forward.h" #if HAVE_PAM #ifndef SYSTEMD_CFLAGS_MARKER_LIBPAM diff --git a/src/shared/parse-argument.h b/src/shared/parse-argument.h index 0df7fc3b5e..a72e661113 100644 --- a/src/shared/parse-argument.h +++ b/src/shared/parse-argument.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int parse_boolean_argument(const char *optname, const char *s, bool *ret); int parse_tristate_argument_with_auto(const char *optname, const char *s, int *ret); diff --git a/src/shared/parse-helpers.h b/src/shared/parse-helpers.h index a906dfdaef..fff58882ef 100644 --- a/src/shared/parse-helpers.h +++ b/src/shared/parse-helpers.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" typedef enum PathSimplifyWarnFlags { PATH_CHECK_FATAL = 1 << 0, /* If not set, then error message is appended with 'ignoring'. */ diff --git a/src/shared/password-quality-util-passwdqc.h b/src/shared/password-quality-util-passwdqc.h index 7c9d9e456f..c75852ea0d 100644 --- a/src/shared/password-quality-util-passwdqc.h +++ b/src/shared/password-quality-util-passwdqc.h @@ -2,7 +2,7 @@ #pragma once #include "dlopen-note.h" -#include "shared-forward.h" +#include "forward.h" #if HAVE_PASSWDQC int suggest_passwords(void); diff --git a/src/shared/password-quality-util-pwquality.h b/src/shared/password-quality-util-pwquality.h index 6499b54ee1..97bae211b0 100644 --- a/src/shared/password-quality-util-pwquality.h +++ b/src/shared/password-quality-util-pwquality.h @@ -2,7 +2,7 @@ #pragma once #include "dlopen-note.h" -#include "shared-forward.h" +#include "forward.h" #if HAVE_PWQUALITY int suggest_passwords(void); diff --git a/src/shared/pcre2-util.h b/src/shared/pcre2-util.h index f2691e28e0..1775b9bf9e 100644 --- a/src/shared/pcre2-util.h +++ b/src/shared/pcre2-util.h @@ -2,7 +2,7 @@ #pragma once #include "dlopen-note.h" -#include "shared-forward.h" +#include "forward.h" #if HAVE_PCRE2 #ifndef SYSTEMD_CFLAGS_MARKER_LIBPCRE2 diff --git a/src/shared/pcrextend-util.h b/src/shared/pcrextend-util.h index c753c26568..a81d8b1970 100644 --- a/src/shared/pcrextend-util.h +++ b/src/shared/pcrextend-util.h @@ -3,7 +3,7 @@ #include -#include "shared-forward.h" +#include "forward.h" int pcrextend_file_system_word(const char *path, char **ret, char **ret_normalized_path); int pcrextend_machine_id_word(char **ret); diff --git a/src/shared/pkcs11-padding.h b/src/shared/pkcs11-padding.h index c65f9617d9..d7310ad59a 100644 --- a/src/shared/pkcs11-padding.h +++ b/src/shared/pkcs11-padding.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" typedef enum Pkcs11RsaPadding { PKCS11_RSA_PADDING_PKCS1V15, /* CKM_RSA_PKCS, RFC 8017 PKCS#1 v1.5 (legacy) */ diff --git a/src/shared/pkcs11-util.h b/src/shared/pkcs11-util.h index 5ccea4a6c3..4f6971cf83 100644 --- a/src/shared/pkcs11-util.h +++ b/src/shared/pkcs11-util.h @@ -12,8 +12,8 @@ #include "ask-password-api.h" #include "dlfcn-util.h" #include "dlopen-note.h" +#include "forward.h" #include "pkcs11-padding.h" -#include "shared-forward.h" bool pkcs11_uri_valid(const char *uri); diff --git a/src/shared/plymouth-util.h b/src/shared/plymouth-util.h index 4030c5bdb6..f5c19b0a99 100644 --- a/src/shared/plymouth-util.h +++ b/src/shared/plymouth-util.h @@ -2,7 +2,7 @@ #pragma once #include "errno-util.h" -#include "shared-forward.h" +#include "forward.h" int plymouth_connect(int flags); int plymouth_send_raw(const void *raw, size_t size, int flags); diff --git a/src/shared/polkit-agent.h b/src/shared/polkit-agent.h index fb0be87605..3ed13f9ba5 100644 --- a/src/shared/polkit-agent.h +++ b/src/shared/polkit-agent.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int polkit_agent_open(void); void polkit_agent_close(void); diff --git a/src/shared/portable-util.h b/src/shared/portable-util.h index fd78f70700..e5ae112c56 100644 --- a/src/shared/portable-util.h +++ b/src/shared/portable-util.h @@ -2,7 +2,7 @@ #pragma once #include "constants.h" -#include "shared-forward.h" +#include "forward.h" #define PORTABLE_PROFILE_DIRS CONF_PATHS_NULSTR("systemd/portable/profile") diff --git a/src/shared/pretty-print.h b/src/shared/pretty-print.h index 44cc692011..712363839b 100644 --- a/src/shared/pretty-print.h +++ b/src/shared/pretty-print.h @@ -6,7 +6,7 @@ #include "ansi-color.h" #include "fileio.h" -#include "shared-forward.h" +#include "forward.h" #include "glyph-util.h" #define CYLON_BUFFER_EXTRA (2*STRLEN(ANSI_RED) + STRLEN(ANSI_HIGHLIGHT_RED) + 2*STRLEN(ANSI_NORMAL)) diff --git a/src/shared/prompt-util.h b/src/shared/prompt-util.h index 255433b671..19ab497f08 100644 --- a/src/shared/prompt-util.h +++ b/src/shared/prompt-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" typedef enum PromptFlags { PROMPT_MAY_SKIP = 1 << 0, /* Question may be skipped */ diff --git a/src/shared/ptyfwd.h b/src/shared/ptyfwd.h index f92676dabe..75ed81664c 100644 --- a/src/shared/ptyfwd.h +++ b/src/shared/ptyfwd.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" typedef struct PTYForward PTYForward; diff --git a/src/shared/qmp-client.h b/src/shared/qmp-client.h index 0bf435384c..2270bf641f 100644 --- a/src/shared/qmp-client.h +++ b/src/shared/qmp-client.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" typedef int (*qmp_event_callback_t)( QmpClient *client, diff --git a/src/shared/qrcode-util.h b/src/shared/qrcode-util.h index 5961aa7e47..ab1d464be4 100644 --- a/src/shared/qrcode-util.h +++ b/src/shared/qrcode-util.h @@ -2,7 +2,7 @@ #pragma once #include "dlopen-note.h" -#include "shared-forward.h" +#include "forward.h" int print_qrcode_full( FILE *out, diff --git a/src/shared/quota-util.h b/src/shared/quota-util.h index 21c80011a7..2e82b94134 100644 --- a/src/shared/quota-util.h +++ b/src/shared/quota-util.h @@ -4,7 +4,7 @@ #include /* IWYU pragma: export */ #include /* IWYU pragma: export */ -#include "shared-forward.h" +#include "forward.h" /* Wrapper around the QCMD() macro of linux/quota.h that removes some undefined behaviour. A typical quota * command such as QCMD(Q_GETQUOTA, USRQUOTA) cannot be resolved on platforms where "int" is 32-bit, as it is diff --git a/src/shared/reboot-util.h b/src/shared/reboot-util.h index 658d065ce9..8dd9279079 100644 --- a/src/shared/reboot-util.h +++ b/src/shared/reboot-util.h @@ -4,7 +4,7 @@ #include /* IWYU pragma: export */ #include /* IWYU pragma: export */ -#include "shared-forward.h" +#include "forward.h" /* glibc defines the reboot() API call, which is a wrapper around the system call of the same name, but * without the extra "arg" parameter. Since we need that parameter for some calls, let's add a "raw" wrapper diff --git a/src/shared/recovery-key.h b/src/shared/recovery-key.h index 2206021fe4..ec7090a1c2 100644 --- a/src/shared/recovery-key.h +++ b/src/shared/recovery-key.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" /* 256 bit keys = 32 bytes */ #define RECOVERY_KEY_MODHEX_RAW_LENGTH 32 diff --git a/src/shared/reread-partition-table.h b/src/shared/reread-partition-table.h index 44f81552fe..cb755cdeea 100644 --- a/src/shared/reread-partition-table.h +++ b/src/shared/reread-partition-table.h @@ -1,9 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "sd-forward.h" - -#include "shared-forward.h" +#include "forward.h" typedef enum RereadPartitionTableFlags { REREADPT_FORCE_UEVENT = 1 << 0, /* Force a "change" uevent out on partitions we didn't resize/remove/add */ diff --git a/src/shared/resize-fs.h b/src/shared/resize-fs.h index 57877ed13c..f1b8dd19e1 100644 --- a/src/shared/resize-fs.h +++ b/src/shared/resize-fs.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" #include "stat-util.h" int resize_fs(int fd, uint64_t sz, uint64_t *ret_size); diff --git a/src/shared/resolve-hook-util.h b/src/shared/resolve-hook-util.h index be41eb78aa..f7162a52a9 100644 --- a/src/shared/resolve-hook-util.h +++ b/src/shared/resolve-hook-util.h @@ -3,7 +3,7 @@ #include "sd-json.h" -#include "shared-forward.h" +#include "forward.h" typedef struct ResolveRecordParameters { DnsQuestion *question; diff --git a/src/shared/resolve-util.h b/src/shared/resolve-util.h index d8f1ce6365..95ddb3212a 100644 --- a/src/shared/resolve-util.h +++ b/src/shared/resolve-util.h @@ -2,7 +2,7 @@ #pragma once #include "conf-parser-forward.h" -#include "shared-forward.h" +#include "forward.h" /* 127.0.0.53 in native endian (The IP address we listen on with the full DNS stub, i.e. that does LLMNR/mDNS, and stuff) */ #define INADDR_DNS_STUB ((in_addr_t) 0x7f000035U) diff --git a/src/shared/resolve-varlink-util.h b/src/shared/resolve-varlink-util.h index a05e18daea..a66f284ec4 100644 --- a/src/shared/resolve-varlink-util.h +++ b/src/shared/resolve-varlink-util.h @@ -3,8 +3,8 @@ #include +#include "forward.h" #include "in-addr-util.h" -#include "shared-forward.h" typedef struct ResolveError { int rcode; diff --git a/src/shared/resolved-def.h b/src/shared/resolved-def.h index 68a3d91179..d1cbf4f166 100644 --- a/src/shared/resolved-def.h +++ b/src/shared/resolved-def.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" #include "time-util.h" /* Input + Output: The various protocols we can use */ diff --git a/src/shared/rm-rf.h b/src/shared/rm-rf.h index 9353cafcbf..abad164e21 100644 --- a/src/shared/rm-rf.h +++ b/src/shared/rm-rf.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" typedef enum RemoveFlags { REMOVE_ONLY_DIRECTORIES = 1 << 0, /* Only remove empty directories, no files */ diff --git a/src/shared/seccomp-util.h b/src/shared/seccomp-util.h index dd692ecfd7..fc164488c5 100644 --- a/src/shared/seccomp-util.h +++ b/src/shared/seccomp-util.h @@ -3,7 +3,7 @@ #include "dlopen-note.h" #include "errno-util.h" -#include "shared-forward.h" +#include "forward.h" #if HAVE_SECCOMP #ifndef SYSTEMD_CFLAGS_MARKER_LIBSECCOMP diff --git a/src/shared/securebits-util.h b/src/shared/securebits-util.h index 90debea147..cacae7347d 100644 --- a/src/shared/securebits-util.h +++ b/src/shared/securebits-util.h @@ -3,7 +3,7 @@ #include -#include "shared-forward.h" +#include "forward.h" int secure_bits_to_strv(int i, char ***ret); DECLARE_STRING_TABLE_LOOKUP_WITH_FALLBACK(secure_bits, int); diff --git a/src/shared/selinux-util.h b/src/shared/selinux-util.h index 747ad95156..ed76e6532e 100644 --- a/src/shared/selinux-util.h +++ b/src/shared/selinux-util.h @@ -4,7 +4,7 @@ #include #include "dlopen-note.h" -#include "shared-forward.h" +#include "forward.h" #if HAVE_SELINUX #ifndef SYSTEMD_CFLAGS_MARKER_LIBSELINUX diff --git a/src/shared/serialize.h b/src/shared/serialize.h index 57607670fb..eef1ca169e 100644 --- a/src/shared/serialize.h +++ b/src/shared/serialize.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int serialize_item(FILE *f, const char *key, const char *value); int serialize_item_escaped(FILE *f, const char *key, const char *value); diff --git a/src/shared/service-util.h b/src/shared/service-util.h index 0529f30ad5..462ba2b3fa 100644 --- a/src/shared/service-util.h +++ b/src/shared/service-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int service_parse_argv( const char *service, diff --git a/src/shared/shift-uid.h b/src/shared/shift-uid.h index d980efd699..59435c748d 100644 --- a/src/shared/shift-uid.h +++ b/src/shared/shift-uid.h @@ -2,6 +2,6 @@ #pragma once -#include "shared-forward.h" +#include "forward.h" int path_patch_uid(const char *path, uid_t shift, uid_t range); diff --git a/src/shared/sleep-config.h b/src/shared/sleep-config.h index ea4856a70c..9f16dea5f4 100644 --- a/src/shared/sleep-config.h +++ b/src/shared/sleep-config.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" typedef enum SleepOperation { SLEEP_SUSPEND, diff --git a/src/shared/smack-util.h b/src/shared/smack-util.h index bb5b317747..b778889842 100644 --- a/src/shared/smack-util.h +++ b/src/shared/smack-util.h @@ -7,7 +7,7 @@ Author: Auke Kok ***/ -#include "shared-forward.h" +#include "forward.h" typedef enum SmackAttr { SMACK_ATTR_ACCESS, diff --git a/src/shared/smbios11.h b/src/shared/smbios11.h index 8e6d0dfb32..1d097c0af4 100644 --- a/src/shared/smbios11.h +++ b/src/shared/smbios11.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int read_smbios11_field(unsigned i, size_t max_size, char **ret_data, size_t *ret_size); diff --git a/src/shared/snapshot-util.h b/src/shared/snapshot-util.h index aec83aee99..97857d5b1f 100644 --- a/src/shared/snapshot-util.h +++ b/src/shared/snapshot-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" /* create_ephemeral_snapshot - create a snapshot of the given directory. * diff --git a/src/shared/socket-forward.h b/src/shared/socket-forward.h index a5b81b4a44..d64ea1a66b 100644 --- a/src/shared/socket-forward.h +++ b/src/shared/socket-forward.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" /* Bidirectional forwarder using splice(). * diff --git a/src/shared/socket-label.h b/src/shared/socket-label.h index 15dc9d86fe..2c97222c74 100644 --- a/src/shared/socket-label.h +++ b/src/shared/socket-label.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" typedef enum SocketAddressBindIPv6Only { SOCKET_ADDRESS_DEFAULT, diff --git a/src/shared/socket-netlink.h b/src/shared/socket-netlink.h index be15398ba5..4825dfa20e 100644 --- a/src/shared/socket-netlink.h +++ b/src/shared/socket-netlink.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" #include "in-addr-util.h" int make_socket_fd(int log_level, const char* address, int type, int flags); diff --git a/src/shared/specifier.h b/src/shared/specifier.h index 68cad23102..3b9d43cd85 100644 --- a/src/shared/specifier.h +++ b/src/shared/specifier.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" typedef int (*SpecifierCallback)(char specifier, const void *data, const char *root, const void *userdata, char **ret); diff --git a/src/shared/ssl-util.h b/src/shared/ssl-util.h index 156bda77b8..16096ff426 100644 --- a/src/shared/ssl-util.h +++ b/src/shared/ssl-util.h @@ -2,7 +2,7 @@ #pragma once #include "dlopen-note.h" -#include "shared-forward.h" +#include "forward.h" #if HAVE_OPENSSL #ifndef SYSTEMD_CFLAGS_MARKER_LIBOPENSSL diff --git a/src/shared/switch-root.h b/src/shared/switch-root.h index 63da181791..2b8e143251 100644 --- a/src/shared/switch-root.h +++ b/src/shared/switch-root.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" typedef enum SwitchRootFlags { SWITCH_ROOT_DESTROY_OLD_ROOT = 1 << 0, /* rm -rf old root when switching – under the condition diff --git a/src/shared/test-tables.h b/src/shared/test-tables.h index a1e40addb6..41b719ccce 100644 --- a/src/shared/test-tables.h +++ b/src/shared/test-tables.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" #include "string-util.h" #define _test_table(type, name, lookup, reverse, size, sparse) \ diff --git a/src/shared/tests.h b/src/shared/tests.h index 3f8fdf7fa7..a3cee312b8 100644 --- a/src/shared/tests.h +++ b/src/shared/tests.h @@ -4,7 +4,7 @@ #include #include "errno-list.h" -#include "shared-forward.h" +#include "forward.h" #include "log.h" #include "log-assert-critical.h" #include "static-destruct.h" /* IWYU pragma: keep */ diff --git a/src/shared/tomoyo-util.h b/src/shared/tomoyo-util.h index c539ca2d2b..d5c0fe8e66 100644 --- a/src/shared/tomoyo-util.h +++ b/src/shared/tomoyo-util.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" bool mac_tomoyo_use(void); diff --git a/src/shared/tpm2-event-log.h b/src/shared/tpm2-event-log.h index 81600d5976..84eb05c1a3 100644 --- a/src/shared/tpm2-event-log.h +++ b/src/shared/tpm2-event-log.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" #include "tpm2-util.h" /* IWYU pragma: keep */ /* Definitions as per "TCG PC Client Specific Platform Firmware Profile Specification" diff --git a/src/shared/tpm2-util.h b/src/shared/tpm2-util.h index 9daf2466a1..dbe0200840 100644 --- a/src/shared/tpm2-util.h +++ b/src/shared/tpm2-util.h @@ -4,8 +4,8 @@ #include "bitfield.h" #include "crypto-util.h" #include "dlopen-note.h" +#include "forward.h" #include "iovec-util.h" -#include "shared-forward.h" #include "sha256.h" typedef enum TPM2Flags { diff --git a/src/shared/tsm-report.h b/src/shared/tsm-report.h index 6b7d63ac60..077028befb 100644 --- a/src/shared/tsm-report.h +++ b/src/shared/tsm-report.h @@ -3,7 +3,7 @@ #include -#include "shared-forward.h" +#include "forward.h" #define TSM_REPORT_DATA_SIZE 64U diff --git a/src/shared/udev-util.h b/src/shared/udev-util.h index 1701c50279..26b3f59bc5 100644 --- a/src/shared/udev-util.h +++ b/src/shared/udev-util.h @@ -2,7 +2,7 @@ #pragma once #include "conf-parser.h" -#include "shared-forward.h" +#include "forward.h" int udev_parse_config_full(const ConfigTableItem config_table[]); int udev_parse_config(void); diff --git a/src/shared/unit-file.h b/src/shared/unit-file.h index 6434bf58b9..df79a5ffbc 100644 --- a/src/shared/unit-file.h +++ b/src/shared/unit-file.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" #include "unit-def.h" typedef enum UnitFileState { diff --git a/src/shared/user-record-nss.h b/src/shared/user-record-nss.h index 53681c3178..233e08e973 100644 --- a/src/shared/user-record-nss.h +++ b/src/shared/user-record-nss.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" /* Synthesize UserRecord and GroupRecord objects from NSS data */ diff --git a/src/shared/user-record-show.h b/src/shared/user-record-show.h index 7952a73431..3612fa3624 100644 --- a/src/shared/user-record-show.h +++ b/src/shared/user-record-show.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" const char* user_record_state_color(const char *state); diff --git a/src/shared/user-record.h b/src/shared/user-record.h index aee78694a9..b926558d22 100644 --- a/src/shared/user-record.h +++ b/src/shared/user-record.h @@ -6,9 +6,9 @@ #include "sd-id128.h" #include "bitfield.h" +#include "forward.h" #include "pkcs11-padding.h" #include "rlimit-util.h" -#include "shared-forward.h" typedef enum UserDisposition { USER_INTRINSIC, /* root and nobody */ diff --git a/src/shared/userdb-dropin.h b/src/shared/userdb-dropin.h index a8131fb337..170232f99d 100644 --- a/src/shared/userdb-dropin.h +++ b/src/shared/userdb-dropin.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" /* This could be put together with CONF_PATHS_NULSTR, with the exception of the /run/host/ part in the * middle, which we use here, but not otherwise. */ diff --git a/src/shared/userdb.h b/src/shared/userdb.h index 08d602ddf7..d56d9214a9 100644 --- a/src/shared/userdb.h +++ b/src/shared/userdb.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" #include "group-record.h" #include "user-record.h" diff --git a/src/shared/utmp-wtmp.h b/src/shared/utmp-wtmp.h index e1467eeaf3..72e8ff375b 100644 --- a/src/shared/utmp-wtmp.h +++ b/src/shared/utmp-wtmp.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" #if ENABLE_UTMP #include diff --git a/src/shared/varlink-serialize.h b/src/shared/varlink-serialize.h index 99bf046f04..bf5f8f940e 100644 --- a/src/shared/varlink-serialize.h +++ b/src/shared/varlink-serialize.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int varlink_server_serialize(sd_varlink_server *s, const char *name, FILE *f, FDSet *fds); int varlink_server_deserialize_one(sd_varlink_server *s, const char *value, FDSet *fds); diff --git a/src/shared/vconsole-util.h b/src/shared/vconsole-util.h index 416eb86eb5..624674b7ba 100644 --- a/src/shared/vconsole-util.h +++ b/src/shared/vconsole-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" typedef struct X11Context { char *layout; diff --git a/src/shared/verb-log-control.h b/src/shared/verb-log-control.h index 91432acce9..71c5f6c58d 100644 --- a/src/shared/verb-log-control.h +++ b/src/shared/verb-log-control.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_log_control_common(sd_bus *bus, const char *destination, const char *verb, const char *value); diff --git a/src/shared/verbs.h b/src/shared/verbs.h index 253181e8c4..b7ecfbcb6d 100644 --- a/src/shared/verbs.h +++ b/src/shared/verbs.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" #define VERB_ANY (UINT_MAX) diff --git a/src/shared/vlan-util.h b/src/shared/vlan-util.h index 51efb3c7cc..f2dbe82769 100644 --- a/src/shared/vlan-util.h +++ b/src/shared/vlan-util.h @@ -2,7 +2,7 @@ #pragma once #include "conf-parser-forward.h" -#include "shared-forward.h" +#include "forward.h" #define VLANID_MAX 4094 #define VLANID_INVALID UINT16_MAX diff --git a/src/shared/volatile-util.h b/src/shared/volatile-util.h index 3035ad2ef4..5ed89b6d2a 100644 --- a/src/shared/volatile-util.h +++ b/src/shared/volatile-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" typedef enum VolatileMode { VOLATILE_NO, diff --git a/src/shared/vpick.h b/src/shared/vpick.h index de67cbe353..3d9647fc32 100644 --- a/src/shared/vpick.h +++ b/src/shared/vpick.h @@ -4,7 +4,7 @@ #include #include "architecture.h" -#include "shared-forward.h" +#include "forward.h" typedef enum PickFlags { PICK_ARCHITECTURE = 1 << 0, /* Look for an architecture suffix */ diff --git a/src/shared/wall.h b/src/shared/wall.h index d38e1ae472..c622b6f652 100644 --- a/src/shared/wall.h +++ b/src/shared/wall.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" #if ENABLE_UTMP || ENABLE_LOGIND diff --git a/src/shared/watchdog.h b/src/shared/watchdog.h index 61f60b949d..3ed5b43d12 100644 --- a/src/shared/watchdog.h +++ b/src/shared/watchdog.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" const char* watchdog_get_device(void); usec_t watchdog_get_last_ping(clockid_t clock); diff --git a/src/shared/web-util.h b/src/shared/web-util.h index ec154c107a..97891c61d7 100644 --- a/src/shared/web-util.h +++ b/src/shared/web-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" bool http_url_is_valid(const char *url) _pure_; bool file_url_is_valid(const char *url) _pure_; diff --git a/src/shared/wifi-util.h b/src/shared/wifi-util.h index e6b52ab0ae..d85c2a9f47 100644 --- a/src/shared/wifi-util.h +++ b/src/shared/wifi-util.h @@ -4,7 +4,7 @@ #include -#include "shared-forward.h" +#include "forward.h" int wifi_get_interface(sd_netlink *genl, int ifindex, enum nl80211_iftype *ret_iftype, char **ret_ssid); int wifi_get_station(sd_netlink *genl, int ifindex, struct ether_addr *ret_bssid); diff --git a/src/shared/xml.h b/src/shared/xml.h index 8deca29dd7..1ef9de147d 100644 --- a/src/shared/xml.h +++ b/src/shared/xml.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" enum { XML_END, diff --git a/src/shutdown/detach-dm.h b/src/shutdown/detach-dm.h index 50e52cf65f..0db81350e0 100644 --- a/src/shutdown/detach-dm.h +++ b/src/shutdown/detach-dm.h @@ -5,6 +5,6 @@ Copyright © 2010 ProFUSION embedded systems ***/ -#include "shared-forward.h" +#include "forward.h" int dm_detach_all(bool *changed, bool last_try); diff --git a/src/shutdown/detach-loopback.h b/src/shutdown/detach-loopback.h index 16464a1b75..18cb2f6cfc 100644 --- a/src/shutdown/detach-loopback.h +++ b/src/shutdown/detach-loopback.h @@ -5,6 +5,6 @@ Copyright © 2010 ProFUSION embedded systems ***/ -#include "shared-forward.h" +#include "forward.h" int loopback_detach_all(bool *changed, bool last_try); diff --git a/src/shutdown/detach-md.h b/src/shutdown/detach-md.h index 656ea01bc7..8965a6ab65 100644 --- a/src/shutdown/detach-md.h +++ b/src/shutdown/detach-md.h @@ -5,6 +5,6 @@ Copyright © 2010 ProFUSION embedded systems ***/ -#include "shared-forward.h" +#include "forward.h" int md_detach_all(bool *changed, bool last_try); diff --git a/src/shutdown/detach-swap.h b/src/shutdown/detach-swap.h index 8d267e5073..64e89076e7 100644 --- a/src/shutdown/detach-swap.h +++ b/src/shutdown/detach-swap.h @@ -5,7 +5,7 @@ Copyright © 2010 ProFUSION embedded systems ***/ -#include "shared-forward.h" +#include "forward.h" #include "list.h" int swapoff_all(bool *changed); diff --git a/src/shutdown/umount.h b/src/shutdown/umount.h index b168c40eef..5fdaf76392 100644 --- a/src/shutdown/umount.h +++ b/src/shutdown/umount.h @@ -5,7 +5,7 @@ Copyright © 2010 ProFUSION embedded systems ***/ -#include "shared-forward.h" +#include "forward.h" #include "list.h" int umount_all(bool *changed, bool last_try); diff --git a/src/systemctl/systemctl-add-dependency.h b/src/systemctl/systemctl-add-dependency.h index 799301170b..4fd39fa127 100644 --- a/src/systemctl/systemctl-add-dependency.h +++ b/src/systemctl/systemctl-add-dependency.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_add_dependency(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/systemctl/systemctl-cancel-job.h b/src/systemctl/systemctl-cancel-job.h index 0c27cb19e5..92527ff680 100644 --- a/src/systemctl/systemctl-cancel-job.h +++ b/src/systemctl/systemctl-cancel-job.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_cancel(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/systemctl/systemctl-clean-or-freeze.h b/src/systemctl/systemctl-clean-or-freeze.h index aadf15c297..e1218b11d8 100644 --- a/src/systemctl/systemctl-clean-or-freeze.h +++ b/src/systemctl/systemctl-clean-or-freeze.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_clean_or_freeze(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/systemctl/systemctl-edit.h b/src/systemctl/systemctl-edit.h index d847b8c42c..59d2ef0697 100644 --- a/src/systemctl/systemctl-edit.h +++ b/src/systemctl/systemctl-edit.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_cat(int argc, char *argv[], uintptr_t _data, void *userdata); int verb_edit(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/systemctl/systemctl-enable.h b/src/systemctl/systemctl-enable.h index ec1d911a7e..6c810109f2 100644 --- a/src/systemctl/systemctl-enable.h +++ b/src/systemctl/systemctl-enable.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_enable(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/systemctl/systemctl-is-active.h b/src/systemctl/systemctl-is-active.h index 771739f856..102fadfba2 100644 --- a/src/systemctl/systemctl-is-active.h +++ b/src/systemctl/systemctl-is-active.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_is_active(int argc, char *argv[], uintptr_t _data, void *userdata); int verb_is_failed(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/systemctl/systemctl-is-enabled.h b/src/systemctl/systemctl-is-enabled.h index 1ce1343327..1370064d7a 100644 --- a/src/systemctl/systemctl-is-enabled.h +++ b/src/systemctl/systemctl-is-enabled.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_is_enabled(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/systemctl/systemctl-is-system-running.h b/src/systemctl/systemctl-is-system-running.h index ebe80aed9d..2de1e21e37 100644 --- a/src/systemctl/systemctl-is-system-running.h +++ b/src/systemctl/systemctl-is-system-running.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_is_system_running(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/systemctl/systemctl-kill.h b/src/systemctl/systemctl-kill.h index 54e8bbe262..c027b3eedd 100644 --- a/src/systemctl/systemctl-kill.h +++ b/src/systemctl/systemctl-kill.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_kill(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/systemctl/systemctl-list-dependencies.h b/src/systemctl/systemctl-list-dependencies.h index 53b68085ac..245faff5df 100644 --- a/src/systemctl/systemctl-list-dependencies.h +++ b/src/systemctl/systemctl-list-dependencies.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_list_dependencies(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/systemctl/systemctl-list-jobs.h b/src/systemctl/systemctl-list-jobs.h index f8fe9b6302..0636527046 100644 --- a/src/systemctl/systemctl-list-jobs.h +++ b/src/systemctl/systemctl-list-jobs.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_list_jobs(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/systemctl/systemctl-list-machines.h b/src/systemctl/systemctl-list-machines.h index fd0331604b..162d02eeb8 100644 --- a/src/systemctl/systemctl-list-machines.h +++ b/src/systemctl/systemctl-list-machines.h @@ -2,7 +2,7 @@ #pragma once #include "bus-map-properties.h" -#include "shared-forward.h" +#include "forward.h" int verb_list_machines(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/systemctl/systemctl-list-unit-files.h b/src/systemctl/systemctl-list-unit-files.h index 150d392f00..065bc83c74 100644 --- a/src/systemctl/systemctl-list-unit-files.h +++ b/src/systemctl/systemctl-list-unit-files.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_list_unit_files(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/systemctl/systemctl-log-setting.h b/src/systemctl/systemctl-log-setting.h index bf8bfc3229..469b14571b 100644 --- a/src/systemctl/systemctl-log-setting.h +++ b/src/systemctl/systemctl-log-setting.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_log_setting(int argc, char *argv[], uintptr_t _data, void *userdata); int verb_service_log_setting(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/systemctl/systemctl-mount.h b/src/systemctl/systemctl-mount.h index a4a9760b34..b812c785bb 100644 --- a/src/systemctl/systemctl-mount.h +++ b/src/systemctl/systemctl-mount.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_bind(int argc, char *argv[], uintptr_t _data, void *userdata); int verb_mount_image(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/systemctl/systemctl-preset-all.h b/src/systemctl/systemctl-preset-all.h index 178ca31291..bdcfe630d7 100644 --- a/src/systemctl/systemctl-preset-all.h +++ b/src/systemctl/systemctl-preset-all.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_preset_all(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/systemctl/systemctl-reset-failed.h b/src/systemctl/systemctl-reset-failed.h index 6ad714cf4a..e582291152 100644 --- a/src/systemctl/systemctl-reset-failed.h +++ b/src/systemctl/systemctl-reset-failed.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_reset_failed(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/systemctl/systemctl-service-watchdogs.h b/src/systemctl/systemctl-service-watchdogs.h index e626a223c3..e18b589e36 100644 --- a/src/systemctl/systemctl-service-watchdogs.h +++ b/src/systemctl/systemctl-service-watchdogs.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_service_watchdogs(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/systemctl/systemctl-set-default.h b/src/systemctl/systemctl-set-default.h index 7df9e78c4f..56d17e5219 100644 --- a/src/systemctl/systemctl-set-default.h +++ b/src/systemctl/systemctl-set-default.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_get_default(int argc, char *argv[], uintptr_t _data, void *userdata); int verb_set_default(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/systemctl/systemctl-set-environment.h b/src/systemctl/systemctl-set-environment.h index 659afd53c5..eb1fa86ba9 100644 --- a/src/systemctl/systemctl-set-environment.h +++ b/src/systemctl/systemctl-set-environment.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_show_environment(int argc, char *argv[], uintptr_t _data, void *userdata); int verb_set_environment(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/systemctl/systemctl-set-property.h b/src/systemctl/systemctl-set-property.h index e1dc8dc049..7297da93eb 100644 --- a/src/systemctl/systemctl-set-property.h +++ b/src/systemctl/systemctl-set-property.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_set_property(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/systemctl/systemctl-show.h b/src/systemctl/systemctl-show.h index 4ca15bca74..a41e6aa613 100644 --- a/src/systemctl/systemctl-show.h +++ b/src/systemctl/systemctl-show.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_show(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/systemctl/systemctl-start-special.h b/src/systemctl/systemctl-start-special.h index 93df5f89b7..a9ae7fe251 100644 --- a/src/systemctl/systemctl-start-special.h +++ b/src/systemctl/systemctl-start-special.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_start_special(int argc, char *argv[], uintptr_t _data, void *userdata); int verb_start_system_special(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/systemctl/systemctl-switch-root.h b/src/systemctl/systemctl-switch-root.h index 46d3364306..fb6c890c34 100644 --- a/src/systemctl/systemctl-switch-root.h +++ b/src/systemctl/systemctl-switch-root.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_switch_root(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/systemctl/systemctl-trivial-method.h b/src/systemctl/systemctl-trivial-method.h index ed901c14a8..762f03cece 100644 --- a/src/systemctl/systemctl-trivial-method.h +++ b/src/systemctl/systemctl-trivial-method.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_trivial_method(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/systemctl/systemctl-whoami.h b/src/systemctl/systemctl-whoami.h index 9bdefdb14a..372934818a 100644 --- a/src/systemctl/systemctl-whoami.h +++ b/src/systemctl/systemctl-whoami.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_whoami(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/systemctl/systemctl.h b/src/systemctl/systemctl.h index 8f05bdb46e..b372b8cc20 100644 --- a/src/systemctl/systemctl.h +++ b/src/systemctl/systemctl.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" enum action { ACTION_SYSTEMCTL, diff --git a/src/sysupdate/sysupdate-config.h b/src/sysupdate/sysupdate-config.h index 271430c73d..176dc5716b 100644 --- a/src/sysupdate/sysupdate-config.h +++ b/src/sysupdate/sysupdate-config.h @@ -2,7 +2,7 @@ #pragma once #include "conf-parser-forward.h" -#include "shared-forward.h" +#include "forward.h" CONFIG_PARSER_PROTOTYPE(config_parse_url_specifiers); CONFIG_PARSER_PROTOTYPE(config_parse_url_specifiers_many); diff --git a/src/sysupdate/sysupdate-forward.h b/src/sysupdate/sysupdate-forward.h index f32cb55d32..c6a64a16bf 100644 --- a/src/sysupdate/sysupdate-forward.h +++ b/src/sysupdate/sysupdate-forward.h @@ -3,7 +3,7 @@ /* IWYU pragma: always_keep */ -#include "shared-forward.h" /* IWYU pragma: export */ +#include "forward.h" /* IWYU pragma: export */ typedef struct Context Context; typedef struct Instance Instance; diff --git a/src/sysupdate/sysupdate-update-set-flags.h b/src/sysupdate/sysupdate-update-set-flags.h index fd4e77e117..a8a3e68440 100644 --- a/src/sysupdate/sysupdate-update-set-flags.h +++ b/src/sysupdate/sysupdate-update-set-flags.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" typedef enum UpdateSetFlags { UPDATE_NEWEST = 1 << 0, diff --git a/src/test/fsprg.h b/src/test/fsprg.h index 7ad77136a7..f65c5f9e06 100644 --- a/src/test/fsprg.h +++ b/src/test/fsprg.h @@ -7,7 +7,7 @@ * Contact: fsprg@point-at-infinity.org */ -#include "sd-forward.h" +#include "forward.h" #ifdef __cplusplus extern "C" { diff --git a/src/test/gcrypt-util.h b/src/test/gcrypt-util.h index 2d6c6a0a0a..b5dd464bba 100644 --- a/src/test/gcrypt-util.h +++ b/src/test/gcrypt-util.h @@ -2,7 +2,7 @@ #pragma once -#include "basic-forward.h" +#include "forward.h" int dlopen_gcrypt(int log_level); diff --git a/src/test/nss-test-util.h b/src/test/nss-test-util.h index cc5c78670f..efd65845c5 100644 --- a/src/test/nss-test-util.h +++ b/src/test/nss-test-util.h @@ -3,7 +3,7 @@ #include -#include "shared-forward.h" +#include "forward.h" const char* nss_status_to_string(enum nss_status status, char *buf, size_t buf_len); void* nss_open_handle(const char *dir, const char *module, int flags); diff --git a/src/test/test-dlopen.c b/src/test/test-dlopen.c index aefd216473..691905bde5 100644 --- a/src/test/test-dlopen.c +++ b/src/test/test-dlopen.c @@ -4,7 +4,7 @@ #include #include "dlfcn-util.h" -#include "shared-forward.h" +#include "forward.h" int main(int argc, char **argv) { void *handles[argc - 1]; diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c index 21a7d74005..075cc8c5a0 100644 --- a/src/test/test-sizeof.c +++ b/src/test/test-sizeof.c @@ -12,7 +12,7 @@ #define __STDC_WANT_IEC_60559_TYPES_EXT__ #include -#include "shared-forward.h" +#include "forward.h" /* Print information about various types. Useful when diagnosing * gcc diagnostics on an unfamiliar architecture. */ diff --git a/src/timedate/hwclock-util.h b/src/timedate/hwclock-util.h index 9e83d290e7..ad24dad3a7 100644 --- a/src/timedate/hwclock-util.h +++ b/src/timedate/hwclock-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int hwclock_get(struct tm *tm); int hwclock_set(const struct tm *tm); diff --git a/src/timesync/timesyncd-forward.h b/src/timesync/timesyncd-forward.h index 1c3d68d1e5..7a9dcf55c9 100644 --- a/src/timesync/timesyncd-forward.h +++ b/src/timesync/timesyncd-forward.h @@ -4,7 +4,7 @@ /* IWYU pragma: always_keep */ #include "conf-parser-forward.h" /* IWYU pragma: export */ -#include "shared-forward.h" /* IWYU pragma: export */ +#include "forward.h" /* IWYU pragma: export */ typedef enum ServerType ServerType; diff --git a/src/tmpfiles/offline-passwd.h b/src/tmpfiles/offline-passwd.h index d2ae211f5e..d031ef74c9 100644 --- a/src/tmpfiles/offline-passwd.h +++ b/src/tmpfiles/offline-passwd.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int name_to_uid_offline(const char *root, const char *user, uid_t *ret_uid, Hashmap **cache); int name_to_gid_offline(const char *root, const char *group, gid_t *ret_gid, Hashmap **cache); diff --git a/src/udev/fido_id/fido_id_desc.h b/src/udev/fido_id/fido_id_desc.h index df22a420fd..90ae6cbdf1 100644 --- a/src/udev/fido_id/fido_id_desc.h +++ b/src/udev/fido_id/fido_id_desc.h @@ -2,6 +2,6 @@ #pragma once -#include "shared-forward.h" +#include "forward.h" int is_fido_security_token_desc(const uint8_t *desc, size_t desc_len); diff --git a/src/udev/mtd_probe/mtd_probe.h b/src/udev/mtd_probe/mtd_probe.h index 08a793952e..fe1f28d12f 100644 --- a/src/udev/mtd_probe/mtd_probe.h +++ b/src/udev/mtd_probe/mtd_probe.h @@ -22,7 +22,7 @@ #include -#include "shared-forward.h" +#include "forward.h" /* Full oob structure as written on the flash */ struct sm_oob { diff --git a/src/udev/net/link-config.h b/src/udev/net/link-config.h index a2b0def4c3..630c5df936 100644 --- a/src/udev/net/link-config.h +++ b/src/udev/net/link-config.h @@ -8,7 +8,7 @@ #include "cpu-set-util.h" #include "ether-addr-util.h" #include "ethtool-util.h" -#include "shared-forward.h" +#include "forward.h" #include "list.h" #include "net-condition.h" diff --git a/src/udev/scsi_id/scsi_id.h b/src/udev/scsi_id/scsi_id.h index 984bbc05f4..e3d0aa3b0f 100644 --- a/src/udev/scsi_id/scsi_id.h +++ b/src/udev/scsi_id/scsi_id.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ #pragma once -#include "basic-forward.h" +#include "forward.h" /* * Copyright © IBM Corp. 2003 diff --git a/src/udev/udev-forward.h b/src/udev/udev-forward.h index 4932063692..d4526ad8e5 100644 --- a/src/udev/udev-forward.h +++ b/src/udev/udev-forward.h @@ -3,7 +3,7 @@ /* IWYU pragma: always_keep */ -#include "shared-forward.h" /* IWYU pragma: export */ +#include "forward.h" /* IWYU pragma: export */ typedef struct UdevCtrl UdevCtrl; typedef struct UdevEvent UdevEvent; diff --git a/src/udev/udevadm-util.h b/src/udev/udevadm-util.h index af6b51519f..906479825c 100644 --- a/src/udev/udevadm-util.h +++ b/src/udev/udevadm-util.h @@ -3,7 +3,7 @@ #include "sd-device.h" -#include "shared-forward.h" +#include "forward.h" #include "udev-def.h" int find_device(const char *id, const char *prefix, sd_device **ret); diff --git a/src/udev/udevadm.h b/src/udev/udevadm.h index 285a474fba..224c0ac4bf 100644 --- a/src/udev/udevadm.h +++ b/src/udev/udevadm.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" int verb_cat_main(int argc, char *argv[], uintptr_t _data, void *userdata); int verb_info_main(int argc, char *argv[], uintptr_t _data, void *userdata); diff --git a/src/userdb/userdbd-manager.h b/src/userdb/userdbd-manager.h index 717c10d17d..40ff0ed121 100644 --- a/src/userdb/userdbd-manager.h +++ b/src/userdb/userdbd-manager.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" #include "ratelimit.h" #define USERDB_WORKERS_MIN 3 diff --git a/src/vmspawn/vmspawn-bind-volume.h b/src/vmspawn/vmspawn-bind-volume.h index 23b3ff52f3..979b905501 100644 --- a/src/vmspawn/vmspawn-bind-volume.h +++ b/src/vmspawn/vmspawn-bind-volume.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once +#include "forward.h" #include "machine-util.h" -#include "shared-forward.h" #include "vmspawn-qmp.h" /* Empty/NULL defaults to virtio-blk; otherwise delegates to disk_type_from_string(). */ diff --git a/src/vmspawn/vmspawn-mount.h b/src/vmspawn/vmspawn-mount.h index 4647affb99..00f530e94c 100644 --- a/src/vmspawn/vmspawn-mount.h +++ b/src/vmspawn/vmspawn-mount.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" typedef struct RuntimeMount { bool read_only; diff --git a/src/vmspawn/vmspawn-qmp.h b/src/vmspawn/vmspawn-qmp.h index f627c66375..bf9919f93a 100644 --- a/src/vmspawn/vmspawn-qmp.h +++ b/src/vmspawn/vmspawn-qmp.h @@ -3,8 +3,8 @@ #include +#include "forward.h" #include "machine-util.h" -#include "shared-forward.h" #define VMSPAWN_PCIE_HOTPLUG_SPARES 10 diff --git a/src/vmspawn/vmspawn-scope.h b/src/vmspawn/vmspawn-scope.h index dea8ede30c..00e73566c3 100644 --- a/src/vmspawn/vmspawn-scope.h +++ b/src/vmspawn/vmspawn-scope.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" typedef struct SocketServicePair { char **exec_start_pre; diff --git a/src/vmspawn/vmspawn-settings.h b/src/vmspawn/vmspawn-settings.h index 5f488337f9..68231b8120 100644 --- a/src/vmspawn/vmspawn-settings.h +++ b/src/vmspawn/vmspawn-settings.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once +#include "forward.h" #include "machine-util.h" -#include "shared-forward.h" typedef struct ExtraDrive { char *path; diff --git a/src/vmspawn/vmspawn-util.h b/src/vmspawn/vmspawn-util.h index 8d1911663c..3472157e74 100644 --- a/src/vmspawn/vmspawn-util.h +++ b/src/vmspawn/vmspawn-util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" #if defined(__x86_64__) || defined(__i386__) || defined(__arm__) || defined(__aarch64__) # define ARCHITECTURE_SUPPORTS_SMBIOS 1 diff --git a/src/vmspawn/vmspawn-varlink.h b/src/vmspawn/vmspawn-varlink.h index 1833416a56..ed004df2af 100644 --- a/src/vmspawn/vmspawn-varlink.h +++ b/src/vmspawn/vmspawn-varlink.h @@ -2,7 +2,7 @@ #pragma once #include "cleanup-util.h" -#include "shared-forward.h" +#include "forward.h" #include "vmspawn-qmp.h" typedef struct VmspawnVarlinkContext VmspawnVarlinkContext; diff --git a/src/xdg-autostart-generator/xdg-autostart-service.h b/src/xdg-autostart-generator/xdg-autostart-service.h index f6eff9f44a..83a692f708 100644 --- a/src/xdg-autostart-generator/xdg-autostart-service.h +++ b/src/xdg-autostart-generator/xdg-autostart-service.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "shared-forward.h" +#include "forward.h" typedef struct XdgAutostartService { char *name;