Rename basic-forward.h, sd-forward.h, and shared-forward.h to forward.h

Follow-up for 74d392ed1b.

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);
 

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',

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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,

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);

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);

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);

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);

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 {

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);

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);

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);

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);

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);

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);

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);

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;

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);

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;
 

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_;

src/basic/alloc-util.h

@@ -3,7 +3,7 @@
 
 #include <stdlib.h>
 
-#include "basic-forward.h"
+#include "forward.h"
 #include "memory-util.h"        /* IWYU pragma: keep */
 
 #if HAS_FEATURE_MEMORY_SANITIZER

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 {

src/basic/architecture.h

@@ -3,7 +3,7 @@
 
 #include <endian.h>
 
-#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

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;

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_;

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
 

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)                                   \

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,

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;
 

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);

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

src/basic/capability-util.h

@@ -3,7 +3,7 @@
 
 #include <linux/capability.h>   /* 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. */

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);

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"
 

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 */

src/basic/chattr-util.h

@@ -3,7 +3,7 @@
 
 #include <linux/fs.h>
 
-#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

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 {

src/basic/conf-files.h

@@ -3,7 +3,7 @@
 
 #include <sys/stat.h>
 
-#include "basic-forward.h"
+#include "forward.h"
 
 typedef enum ConfFilesFlags {
         CONF_FILES_EXECUTABLE               = 1 << 0, /* inode must be marked executable */

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 */
 

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);

src/basic/devnum-util.h

@@ -3,7 +3,7 @@
 
 #include <sys/sysmacros.h>
 
-#include "basic-forward.h"
+#include "forward.h"
 
 int parse_devnum(const char *s, dev_t *ret);
 

src/basic/dirent-util.h

@@ -3,7 +3,7 @@
 
 #include <dirent.h>             /* 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_;

src/basic/dlfcn-util.h

@@ -3,7 +3,7 @@
 
 #include <dlfcn.h>      /* IWYU pragma: export */
 
-#include "basic-forward.h"
+#include "forward.h"
 
 void* safe_dlclose(void *dl);
 

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.

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

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"
 

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);

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
 

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_;

src/basic/errno-util.h

@@ -3,7 +3,7 @@
 
 #include <string.h>
 
-#include "basic-forward.h"
+#include "forward.h"
 
 /* strerror(3) says that glibc uses a maximum length of 1024 bytes. */
 #define ERRNO_BUF_LEN           1024

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 */

src/basic/ether-addr-util.h

@@ -5,7 +5,7 @@
 #include <netinet/in.h>
 #include <net/ethernet.h>
 
-#include "basic-forward.h"
+#include "forward.h"
 
 struct hw_addr_data {
         size_t length;

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. */

src/basic/fd-util.h

@@ -5,7 +5,7 @@
 #include <fcntl.h>
 #include <stdio.h>
 
-#include "basic-forward.h"
+#include "forward.h"
 
 /* maximum length of fdname */
 #define FDNAME_MAX 255

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;
 

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)
 

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

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 */
 

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

src/basic/glob-util.h

@@ -3,7 +3,7 @@
 
 #include <glob.h>       /* IWYU pragma: export */
 
-#include "basic-forward.h"
+#include "forward.h"
 
 typedef DIR* (*opendir_t)(const char *);
 

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,

src/basic/gunicode.h

@@ -6,7 +6,7 @@
  */
 #pragma once
 
-#include "basic-forward.h"
+#include "forward.h"
 
 char *utf8_prev_char (const char *p);
 

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);

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"
 

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_;

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

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). */

src/basic/in-addr-util.h

@@ -3,7 +3,7 @@
 
 #include <netinet/in.h>
 
-#include "basic-forward.h"
+#include "forward.h"
 
 union in_addr_union {
         struct in_addr in;

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);

src/basic/inotify-util.h

@@ -4,7 +4,7 @@
 #include <sys/inotify.h>        /* IWYU pragma: export */
 #include <syslog.h>
 
-#include "basic-forward.h"
+#include "forward.h"
 
 #define INOTIFY_EVENT_MAX (offsetof(struct inotify_event, name) + NAME_MAX + 1)
 

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

src/basic/iovec-util.h

@@ -3,7 +3,7 @@
 
 #include <sys/uio.h>                /* IWYU pragma: export */
 
-#include "basic-forward.h"
+#include "forward.h"
 
 #include "../fundamental/iovec-util.h" /* IWYU pragma: export */
 

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;

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

src/basic/keyring-util.h

@@ -3,7 +3,7 @@
 
 #include <sys/keyctl.h>         /* 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)

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);

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);