tree-wide: Make sure all headers are standalone

Let's make sure all of our headers include everything they require.

src/basic/iovec-wrapper.h

@@ -5,6 +5,7 @@
 #include <sys/uio.h>
 
 #include "macro.h"
+#include "memory-util.h"
 
 struct iovec_wrapper {
         struct iovec *iovec;

src/basic/missing_xfs.h

@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+#include <stdint.h>
+
 /* This is currently not exported in the public kernel headers, but the libxfs library code part of xfsprogs
  * defines it as public header */
 

src/basic/pcapng.h

@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+#include <stdint.h>
+
 /*
  * For details about the file format see RFC:
  *   https://www.ietf.org/id/draft-tuexen-opsawg-pcapng-03.html

src/basic/pthread-util.h

@@ -3,7 +3,7 @@
 
 #include <pthread.h>
 
-#include "macro.h"
+#include "assert-util.h"
 
 static inline pthread_mutex_t* pthread_mutex_lock_assert(pthread_mutex_t *mutex) {
         assert_se(pthread_mutex_lock(mutex) == 0);

src/basic/raw-reboot.h

@@ -4,6 +4,7 @@
 #include <linux/reboot.h>
 #include <sys/reboot.h>
 #include <sys/syscall.h>
+#include <unistd.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 that is defined the

src/basic/strbuf.h

@@ -5,7 +5,7 @@
 #include <stdint.h>
 #include <sys/types.h>
 
-#include "macro.h"
+#include "memory-util.h"
 
 struct strbuf {
         char *buf;

src/basic/sysctl-util.h

@@ -4,6 +4,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 
+#include "hashmap.h"
 #include "macro.h"
 #include "stdio-util.h"
 #include "string-util.h"

src/basic/uid-classification.h

@@ -4,6 +4,8 @@
 #include <stdbool.h>
 #include <sys/types.h>
 
+#include "macro.h"
+
 /* The container base should have the last 16 bit set to zero */
 assert_cc((CONTAINER_UID_BASE_MIN & 0xFFFFU) == 0);
 assert_cc((CONTAINER_UID_BASE_MAX & 0xFFFFU) == 0);

src/basic/uid-range.h

@@ -4,7 +4,7 @@
 #include <stdbool.h>
 #include <sys/types.h>
 
-#include "macro.h"
+#include "memory-util.h"
 
 typedef struct UIDRangeEntry {
         uid_t start, nr;

src/boot/url-discovery.h

@@ -1,4 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+#include "efi.h"
+
 char16_t *disk_get_url(EFI_HANDLE *handle);

src/core/dynamic-user.h

@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <stdio.h>
 #include <stdbool.h>
+#include <stdio.h>
 #include <sys/types.h>
 
 #include "fdset.h"

src/core/main.h

@@ -3,6 +3,8 @@
 
 #include <stdbool.h>
 
+#include "crash-handler.h"
+
 extern bool arg_dump_core;
 extern int arg_crash_chvt;
 extern bool arg_crash_shell;

src/core/show-status.h

@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+#include <stdarg.h>
 #include <stdbool.h>
 
 #include "macro.h"

src/core/smack-setup.h

@@ -7,4 +7,6 @@
         Nathaniel Chen <nathaniel.chen@intel.com>
 ***/
 
+#include <stdbool.h>
+
 int mac_smack_setup(bool *loaded_policy);

src/cryptsetup/cryptsetup-pkcs11.h

@@ -3,6 +3,7 @@
 
 #include <sys/types.h>
 
+#include "ask-password-api.h"
 #include "cryptsetup-util.h"
 #include "log.h"
 #include "time-util.h"

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

@@ -1,6 +1,10 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+#include <stddef.h>
+
+struct crypt_device;
+
 /* for more information see libcryptsetup.h crypt-tokens section */
 
 const char* cryptsetup_token_version(void);

src/cryptsetup/cryptsetup-tokens/luks2-pkcs11.h

@@ -2,6 +2,8 @@
 
 #pragma once
 
+#include <stddef.h>
+
 struct crypt_device;
 
 int acquire_luks2_key(

src/fundamental/iovec-util-fundamental.h

@@ -1,7 +1,13 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+#if !SD_BOOT
+#include <stdlib.h>
+#include <sys/uio.h>
+#endif
+
 #include "assert-fundamental.h"
+#include "macro-fundamental.h"
 
 #if SD_BOOT
 /* struct iovec is a POSIX userspace construct. Let's introduce it also in EFI mode, it's just so useful */

src/home/homed-manager-bus.h

@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "bus-util.h"
+#include "bus-object.h"
 
 extern const BusObjectImplementation manager_object;

src/home/homework-mount.h

@@ -2,6 +2,7 @@
 #pragma once
 
 #include <stdbool.h>
+#include <sys/types.h>
 
 int home_mount_node(const char *node, const char *fstype, bool discard, unsigned long flags, const char *extra_mount_options);
 int home_unshare_and_mkdir(void);

src/import/export-raw.h

@@ -4,7 +4,7 @@
 #include "sd-event.h"
 
 #include "import-compress.h"
-#include "macro.h"
+#include "memory-util.h"
 
 typedef struct RawExport RawExport;
 

src/import/export-tar.h

@@ -4,7 +4,7 @@
 #include "sd-event.h"
 
 #include "import-compress.h"
-#include "macro.h"
+#include "memory-util.h"
 
 typedef struct TarExport TarExport;
 

src/import/import-common.h

@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+#include <errno.h>
+#include <stdbool.h>
 #include <sys/types.h>
 
 #include "sd-event.h"

src/import/import-raw.c

@@ -13,6 +13,7 @@
 #include "import-common.h"
 #include "import-compress.h"
 #include "import-raw.h"
+#include "import-util.h"
 #include "install-file.h"
 #include "io-util.h"
 #include "log.h"

src/import/import-raw.h

@@ -4,8 +4,7 @@
 #include "sd-event.h"
 
 #include "import-common.h"
-#include "import-util.h"
-#include "macro.h"
+#include "memory-util.h"
 
 typedef struct RawImport RawImport;
 

src/import/import-tar.c

@@ -13,6 +13,7 @@
 #include "import-common.h"
 #include "import-compress.h"
 #include "import-tar.h"
+#include "import-util.h"
 #include "install-file.h"
 #include "io-util.h"
 #include "log.h"

src/import/import-tar.h

@@ -4,8 +4,7 @@
 #include "sd-event.h"
 
 #include "import-common.h"
-#include "import-util.h"
-#include "macro.h"
+#include "memory-util.h"
 
 typedef struct TarImport TarImport;
 

src/journal-remote/journal-upload.c

@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <curl/curl.h>
 #include <fcntl.h>
 #include <getopt.h>
 #include <stdio.h>

src/journal-remote/journal-upload.h

@@ -2,6 +2,7 @@
 
 #pragma once
 
+#include <curl/curl.h>
 #include <inttypes.h>
 
 #include "sd-event.h"

src/journal-remote/microhttpd-util.h

@@ -4,7 +4,7 @@
 #include <microhttpd.h>
 #include <stdarg.h>
 
-#include "macro.h"
+#include "memory-util.h"
 
 /* Those defines are added when options are renamed. If the old names
  * are not '#define'd, then they are not deprecated yet and there are

src/libsystemd/sd-bus/bus-signature.h

@@ -2,6 +2,7 @@
 #pragma once
 
 #include <stdbool.h>
+#include <stddef.h>
 
 bool signature_is_single(const char *s, bool allow_dict_entry);
 bool signature_is_pair(const char *s);

src/libsystemd/sd-bus/bus-socket.h

@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+#include <stdbool.h>
+
 #include "sd-bus.h"
 
 void bus_socket_setup(sd_bus *b);

src/libsystemd/sd-bus/bus-track.h

@@ -1,5 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+typedef struct sd_bus_track sd_bus_track;
+
 void bus_track_dispatch(sd_bus_track *track);
 void bus_track_close(sd_bus_track *track);

src/libsystemd/sd-bus/test-vtable-data.h

@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-/* This is meant to be included in other files, hence no headers */
+#include <stdbool.h>
+
+#include "sd-bus-vtable.h"
 
 struct context {
         bool quit;

src/libsystemd/sd-journal/mmap-cache.h

@@ -6,6 +6,7 @@
 #include <sys/stat.h>
 
 #include "journal-def.h"
+#include "memory-util.h"
 
 typedef struct MMapCache MMapCache;
 typedef struct MMapFileDescriptor MMapFileDescriptor;

src/libsystemd/sd-json/json-internal.h

@@ -2,8 +2,12 @@
 
 #pragma once
 
+#include <stdbool.h>
+
 #include "sd-json.h"
 
+#include "macro.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
  * interface with this. */

src/libsystemd/sd-netlink/netlink-slot.h

@@ -1,8 +1,12 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+#include <stdbool.h>
+
 #include "sd-netlink.h"
 
+#include "netlink-internal.h"
+
 int netlink_slot_allocate(
                 sd_netlink *nl,
                 bool floating,

src/libsystemd/sd-varlink/varlink-idl-util.h

@@ -4,7 +4,7 @@
 #include "sd-varlink.h"
 #include "sd-varlink-idl.h"
 
-#include "macro.h"
+#include "memory-util.h"
 
 int varlink_idl_parse(const char *text, unsigned *ret_line, unsigned *ret_column, sd_varlink_interface **ret);
 sd_varlink_interface* varlink_interface_free(sd_varlink_interface *interface);

src/libudev/libudev-list-internal.h

@@ -3,7 +3,7 @@
 
 #include "libudev.h"
 
-#include "macro.h"
+#include "memory-util.h"
 
 struct udev_list;
 

src/network/networkd-bridge-mdb.h

@@ -2,6 +2,7 @@
 #pragma once
 
 #include <inttypes.h>
+#include <net/ethernet.h>
 
 #include "conf-parser.h"
 #include "in-addr-util.h"

src/network/networkd-ipv4acd.h

@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+#include <stdbool.h>
+
 typedef struct Address Address;
 typedef struct Link Link;
 

src/network/networkd-netlabel.h

@@ -1,5 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+typedef struct Address Address;
+
 void address_add_netlabel(const Address *address);
 void address_del_netlabel(const Address *address);

src/network/networkd-nexthop.h

@@ -17,6 +17,7 @@ typedef struct Link Link;
 typedef struct Manager Manager;
 typedef struct Network Network;
 typedef struct NextHop NextHop;
+typedef struct Request Request;
 typedef int (*nexthop_netlink_handler_t)(
                 sd_netlink *rtnl,
                 sd_netlink_message *m,

src/network/networkd-radv.h

@@ -15,6 +15,7 @@
 #include "ndisc-option.h"
 #include "networkd-util.h"
 
+typedef struct Address Address;
 typedef struct Link Link;
 typedef struct Network Network;
 

src/network/networkd-route-util.h

@@ -5,6 +5,7 @@
 #include <stdbool.h>
 
 #include "conf-parser.h"
+#include "in-addr-util.h"
 
 typedef struct Link Link;
 typedef struct Manager Manager;

src/network/networkd-state-file.h

@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+#include <stdbool.h>
+
 typedef struct Link Link;
 typedef struct Manager Manager;
 

src/network/networkd-wiphy.h

@@ -4,6 +4,7 @@
 #include <inttypes.h>
 
 #include "sd-device.h"
+#include "sd-netlink.h"
 
 #include "macro.h"
 

src/nspawn/nspawn-mount.h

@@ -2,6 +2,8 @@
 #pragma once
 
 #include <stdbool.h>
+#include <stddef.h>
+#include <sys/types.h>
 
 #include "volatile-util.h"
 

src/nspawn/nspawn-seccomp.h

@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <sys/types.h>
+#include <stdint.h>
 
 int setup_seccomp(uint64_t cap_list_retain, char **syscall_allow_list, char **syscall_deny_list);

src/nspawn/nspawn-setuid.h

@@ -1,5 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+#include <stdbool.h>
+#include <sys/types.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);

src/nsresourced/userns-registry.h

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "macro.h"
+#include "memory-util.h"
 
 #define USER_NAMESPACE_CGROUPS_DELEGATE_MAX 16U
 #define USER_NAMESPACE_NETIFS_DELEGATE_MAX 16U

src/nss-systemd/nss-systemd.h

@@ -3,6 +3,8 @@
 
 #include <stdbool.h>
 
+#include "assert-util.h"
+
 int _nss_systemd_block(bool b);
 bool _nss_systemd_is_blocked(void);
 

src/sbsign/authenticode.h

@@ -3,7 +3,7 @@
 
 #include <openssl/asn1t.h>
 
-#include "macro.h"
+#include "memory-util.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"

src/shared/bpf-compat.h

@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+#include <bpf/libbpf.h>
+
 /* libbpf has been moving quickly.
  * They added new symbols in the 0.x versions and shortly after removed
  * deprecated symbols in 1.0.

src/shared/cpu-set-util.h

@@ -3,7 +3,7 @@
 
 #include <sched.h>
 
-#include "macro.h"
+#include "memory-util.h"
 #include "missing_syscall.h"
 
 /* This wraps the libc interface with a variable to keep the allocated size. */

src/shared/cryptsetup-fido2.h

@@ -3,6 +3,7 @@
 
 #include <sys/types.h>
 
+#include "ask-password-api.h"
 #include "cryptsetup-util.h"
 #include "libfido2-util.h"
 #include "log.h"

src/shared/edit-util.h

@@ -2,6 +2,7 @@
 #pragma once
 
 #include <stdbool.h>
+#include <stddef.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"

src/shared/fdisk-util.h

@@ -7,7 +7,7 @@
 
 #include "sd-id128.h"
 
-#include "macro.h"
+#include "memory-util.h"
 
 DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(struct fdisk_context*, fdisk_unref_context, NULL);
 DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(struct fdisk_partition*, fdisk_unref_partition, NULL);

src/shared/hibernate-util.h

@@ -2,8 +2,11 @@
 #pragma once
 
 #include <linux/fiemap.h>
+#include <stdint.h>
 #include <sys/types.h>
 
+#include "assert-util.h"
+
 /* represents values for /sys/power/resume & /sys/power/resume_offset and the corresponding path */
 typedef struct HibernationDevice {
         dev_t devno;

src/shared/hostname-setup.h

@@ -1,9 +1,12 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+#include <errno.h>
 #include <stdbool.h>
 #include <stdio.h>
 
+#include "macro.h"
+
 typedef enum HostnameSource {
         HOSTNAME_STATIC,     /* from /etc/hostname */
         HOSTNAME_TRANSIENT,  /* a transient hostname set through systemd, hostnamed, the container manager, or otherwise */

src/shared/id128-print.h

@@ -2,6 +2,7 @@
 
 #pragma once
 
+#include <errno.h>
 #include <stdbool.h>
 
 #include "sd-id128.h"

src/shared/libcrypt-util.h

@@ -2,6 +2,7 @@
 #pragma once
 
 #include <stdbool.h>
+#include <stddef.h>
 
 int make_salt(char **ret);
 int hash_password_full(const char *password, void **cd_data, int *cd_size, char **ret);

src/shared/loop-util.h

@@ -5,7 +5,7 @@
 
 #include "sd-device.h"
 
-#include "macro.h"
+#include "memory-util.h"
 #include "time-util.h"
 
 typedef struct LoopDevice LoopDevice;

src/shared/machine-credential.h

@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+#include <stdbool.h>
 #include <sys/types.h>
 
 typedef struct MachineCredential {

src/shared/machine-id-setup.h

@@ -3,6 +3,8 @@
 
 #include <stdbool.h>
 
+#include "sd-id128.h"
+
 typedef enum MachineIdSetupFlags {
         MACHINE_ID_SETUP_FORCE_TRANSIENT = 1 << 0,
         MACHINE_ID_SETUP_FORCE_FIRMWARE  = 1 << 1,

src/shared/machine-pool.h

@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+#include <stdbool.h>
 #include <stdint.h>
 
 #include "sd-bus.h"

src/shared/macvlan-util.h

@@ -1,8 +1,11 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+#include <errno.h>
 #include <linux/if_link.h>
 
+#include "macro.h"
+
 typedef enum MacVlanMode {
         NETDEV_MACVLAN_MODE_PRIVATE = MACVLAN_MODE_PRIVATE,
         NETDEV_MACVLAN_MODE_VEPA = MACVLAN_MODE_VEPA,

src/shared/netif-sriov.h

@@ -4,6 +4,7 @@
 #include <linux/if_link.h>
 
 #include "sd-device.h"
+#include "sd-netlink.h"
 
 #include "conf-parser.h"
 #include "ether-addr-util.h"

src/shared/pam-util.h

@@ -2,7 +2,9 @@
 #pragma once
 
 #include <security/pam_modules.h>
+#include <syslog.h>
 
+#include "macro.h"
 #include "sd-bus.h"
 
 void pam_log_setup(void);

src/shared/password-quality-util-pwquality.h

@@ -9,6 +9,7 @@
 #include <pwquality.h>
 
 #include "dlfcn-util.h"
+#include "memory-util.h"
 
 extern DLSYM_PROTOTYPE(pwquality_check);
 extern DLSYM_PROTOTYPE(pwquality_default_settings);

src/shared/pkcs11-util.h

@@ -15,7 +15,7 @@
 #include "ask-password-api.h"
 #include "dlfcn-util.h"
 #include "log.h"
-#include "macro.h"
+#include "memory-util.h"
 #include "time-util.h"
 
 bool pkcs11_uri_valid(const char *uri);

src/shared/ptyfwd.h

@@ -5,7 +5,7 @@
 
 #include "sd-event.h"
 
-#include "macro.h"
+#include "memory-util.h"
 
 typedef struct PTYForward PTYForward;
 

src/shared/securebits-util.h

@@ -1,9 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <stdbool.h>
-
+#include <errno.h>
 #include <linux/securebits.h>
+#include <stdbool.h>
 
 int secure_bits_to_string_alloc(int i, char **s);
 int secure_bits_from_string(const char *s);

src/shared/volatile-util.h

@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+#include <errno.h>
+
 typedef enum VolatileMode {
         VOLATILE_NO,
         VOLATILE_YES,

src/shared/vpick.h

@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+#include <sys/stat.h>
 #include <sys/types.h>
 
 #include "architecture.h"

src/systemctl/systemctl-list-units.h

@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+#include "time-util.h"
+
 int verb_list_units(int argc, char *argv[], void *userdata);
 int verb_list_sockets(int argc, char *argv[], void *userdata);
 int verb_list_timers(int argc, char *argv[], void *userdata);

src/timesync/timesyncd-ntp-message.h

@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+#include "macro.h"
 #include "sparse-endian.h"
 
 /* NTP protocol, packet header */

src/udev/scsi_id/scsi.h

@@ -4,6 +4,7 @@
 /* Copyright (C) IBM Corp. 2003 */
 
 #include <scsi/scsi.h>
+#include <sys/types.h>
 
 struct scsi_ioctl_command {
         unsigned inlen;        /* excluding scsi command length */

src/udev/udevadm-util.h

@@ -3,6 +3,7 @@
 
 #include "sd-device.h"
 
+#include "time-util.h"
 #include "udev-def.h"
 
 int find_device(const char *id, const char *prefix, sd_device **ret);

src/vmspawn/vmspawn-register.h

@@ -1,5 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <stdbool.h>
+
 #include "sd-bus.h"
 #include "sd-id128.h"
 

src/vmspawn/vmspawn-util.h

@@ -2,7 +2,9 @@
 #pragma once
 
 #include <stdbool.h>
-#include "macro.h"
+
+#include "assert-util.h"
+#include "memory-util.h"
 
 #if defined(__x86_64__) || defined(__i386__) || defined(__arm__) || defined(__aarch64__)
 #  define ARCHITECTURE_SUPPORTS_SMBIOS 1