tree-wide: Various forward header cleanups

- Make sure forward headers have the iwyu pragma to always keep them
- Make sure we always include the daemon specific forward header
  instead of shared-forward.h
- Remove shared-forward.h include where the daemon specific forward
  header is already included

diff --git a/src/core/audit-fd.h b/src/core/audit-fd.h
index 4f02bdfdd09a68dd5bf5ca28295c13c3a2b49c84..f98f4e907ddff67e9cc27c7cb231c674c466d343 100644 (file)
--- a/src/core/audit-fd.h
+++ b/src/core/audit-fd.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "shared-forward.h"
+#include "core-forward.h"
 
 int get_core_audit_fd(void);
 void close_core_audit_fd(void);

diff --git a/src/core/clock-warp.h b/src/core/clock-warp.h
index 1c6011b3d57c9e25c67595a73e726c469f9c6681..771fefd2890a56643e3822c1340071e977905dfa 100644 (file)
--- a/src/core/clock-warp.h
+++ b/src/core/clock-warp.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "shared-forward.h"
+#include "core-forward.h"
 
 int clock_reset_timewarp(void);
 void clock_apply_epoch(bool allow_backwards);

diff --git a/src/core/core-forward.h b/src/core/core-forward.h
index a82a12bc08ccb9581059a279d08bfdf3611b9926..446cf501e43e775c28c5e92cf36f11567c4c637e 100644 (file)
--- a/src/core/core-forward.h
+++ b/src/core/core-forward.h
@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+/* IWYU pragma: always_keep */
+
 #include "conf-parser-forward.h"        /* IWYU pragma: export */
 #include "shared-forward.h"             /* IWYU pragma: export */
 #include "unit-def.h"                   /* IWYU pragma: export */

diff --git a/src/core/crash-handler.h b/src/core/crash-handler.h
index 379f3050b13699449881730fcd624fa197d813e1..b00991ae0738ea24ba40ba37a7fd70cf00589d2b 100644 (file)
--- a/src/core/crash-handler.h
+++ b/src/core/crash-handler.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "shared-forward.h"
+#include "core-forward.h"
 
 typedef enum CrashAction {
         CRASH_FREEZE,

diff --git a/src/core/kill.h b/src/core/kill.h
index 4bb88c9bd951f9b2dca7e1e7a126f81019cf2d24..ac1163737f58d1eecea8af81e4f781061b3149c3 100644 (file)
--- a/src/core/kill.h
+++ b/src/core/kill.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "shared-forward.h"
+#include "core-forward.h"
 
 typedef enum KillMode {
         /* The kill mode is a property of a unit. */

diff --git a/src/core/main.h b/src/core/main.h
index f892b13f025f342796c30d185a13d597ae53a1dc..9ad53884134b08105001d70f7f5d719e5d450b75 100644 (file)
--- a/src/core/main.h
+++ b/src/core/main.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "shared-forward.h"
+#include "core-forward.h"
 #include "crash-handler.h"
 
 extern bool arg_dump_core;

diff --git a/src/core/manager.h b/src/core/manager.h
index d57912f6bdc1ade4c0c5aa358ac63ec483d5ac65..00f3becd63c973cca44126e1bb6eb1da4e7f0bc4 100644 (file)
--- a/src/core/manager.h
+++ b/src/core/manager.h
@@ -6,7 +6,7 @@
 #include "cgroup.h"
 #include "common-signal.h"
 #include "execute.h"
-#include "shared-forward.h"
+#include "core-forward.h"
 #include "log.h"
 #include "path-lookup.h"
 #include "show-status.h"

diff --git a/src/core/selinux-setup.h b/src/core/selinux-setup.h
index 2caa75ff739a460a2c52b71a00d801fc8bcdfaac..3dad97bbf69776fe35087cbf11f0215046cc1ce8 100644 (file)
--- a/src/core/selinux-setup.h
+++ b/src/core/selinux-setup.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "shared-forward.h"
+#include "core-forward.h"
 
 int mac_selinux_setup(bool *loaded_policy);

diff --git a/src/core/show-status.h b/src/core/show-status.h
index 9625426fa19ee9504df0bedf2e3e8e6e73697d0c..cc58a191f726a0fb41eea32530ad1cc1abccf392 100644 (file)
--- a/src/core/show-status.h
+++ b/src/core/show-status.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "shared-forward.h"
+#include "core-forward.h"
 
 /* Manager status */
 

diff --git a/src/core/smack-setup.h b/src/core/smack-setup.h
index df64d585475f8e9716198dd76839d686f1f69b75..1e77018aa84a870025337b7b2ce623594992b1d3 100644 (file)
--- a/src/core/smack-setup.h
+++ b/src/core/smack-setup.h
@@ -7,6 +7,6 @@
         Nathaniel Chen <nathaniel.chen@intel.com>
 ***/
 
-#include "shared-forward.h"
+#include "core-forward.h"
 
 int mac_smack_setup(bool *loaded_policy);

diff --git a/src/core/unit-dependency-atom.h b/src/core/unit-dependency-atom.h
index c0ad3db513e0411e9dd8a18a3cf56ec06892c747..38f7532281b619c778cef51a46678acce0a74e9a 100644 (file)
--- a/src/core/unit-dependency-atom.h
+++ b/src/core/unit-dependency-atom.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "shared-forward.h"
+#include "core-forward.h"
 
 /* Flags that identify the various "atomic" behaviours a specific dependency type implies. Each dependency is
  * a combination of one or more of these flags that define what they actually entail. */

diff --git a/src/core/varlink-cgroup.h b/src/core/varlink-cgroup.h
index 8e5f2363c33437b188f5e05217847cb9483b5897..13e24417d62606ea1b509414d159386d34e42e4a 100644 (file)
--- a/src/core/varlink-cgroup.h
+++ b/src/core/varlink-cgroup.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "shared-forward.h"
+#include "core-forward.h"
 
 int unit_cgroup_context_build_json(sd_json_variant **ret, const char *name, void *userdata);
 int unit_cgroup_runtime_build_json(sd_json_variant **ret, const char *name, void *userdata);

diff --git a/src/core/varlink-common.h b/src/core/varlink-common.h
index 24e21e7b0b8c7b2aa1d92e6244e75346d929a88d..5918f9ac68fd3ad1abb29607f6a0e31d7f288f16 100644 (file)
--- a/src/core/varlink-common.h
+++ b/src/core/varlink-common.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "shared-forward.h"
+#include "core-forward.h"
 
 int rlimit_build_json(sd_json_variant **ret, const char *name, void *userdata);
 int rlimit_table_build_json(sd_json_variant **ret, const char *name, void *userdata);

diff --git a/src/core/varlink-dynamic-user.h b/src/core/varlink-dynamic-user.h
index 14bcf3191fa292e0b79b2f33fbb113a8f64c2c39..6089d3b559adb06dd1de7e016c49b60a45be914b 100644 (file)
--- a/src/core/varlink-dynamic-user.h
+++ b/src/core/varlink-dynamic-user.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "shared-forward.h"
+#include "core-forward.h"
 
 int vl_method_get_user_record(sd_varlink *link, sd_json_variant *parameters, sd_varlink_method_flags_t flags, void *userdata);
 int vl_method_get_group_record(sd_varlink *link, sd_json_variant *parameters, sd_varlink_method_flags_t flags, void *userdata);

diff --git a/src/core/varlink-manager.h b/src/core/varlink-manager.h
index 5836d5443a5c7bac90851bb1a256b008671e157a..fde4b6137680ba8e434cb920ed962901f8ad3379 100644 (file)
--- a/src/core/varlink-manager.h
+++ b/src/core/varlink-manager.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "shared-forward.h"
+#include "core-forward.h"
 
 int vl_method_describe_manager(sd_varlink *link, sd_json_variant *parameters, sd_varlink_method_flags_t flags, void *userdata);

diff --git a/src/core/varlink-unit.h b/src/core/varlink-unit.h
index 431f1f832e4e03c085678372afeab54af7063b5f..4b5e7aa52ab84cd0a3fae3b3a6872983372ab003 100644 (file)
--- a/src/core/varlink-unit.h
+++ b/src/core/varlink-unit.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "shared-forward.h"
+#include "core-forward.h"
 
 #define VARLINK_ERROR_UNIT_NO_SUCH_UNIT "io.systemd.Unit.NoSuchUnit"
 

diff --git a/src/home/homed-forward.h b/src/home/homed-forward.h
index 18a8df8e61bb386e45c7a4906942e723ef2886aa..995d87eaa5e579049599a3c49a57dfd9d8d9104b 100644 (file)
--- a/src/home/homed-forward.h
+++ b/src/home/homed-forward.h
@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+/* IWYU pragma: always_keep */
+
 #include "conf-parser-forward.h"    /* IWYU pragma: export */
 #include "shared-forward.h"         /* IWYU pragma: export */
 

diff --git a/src/home/homed-home.h b/src/home/homed-home.h
index 0692e56089823bc4a2592ea6a519a48c0cd2e763..93f38d86d6216ba6d0887d9a7bf6ff1cc23b4415 100644 (file)
--- a/src/home/homed-home.h
+++ b/src/home/homed-home.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "shared-forward.h"
 #include "homed-forward.h"
 #include "pidref.h"
 #include "stat-util.h"

diff --git a/src/home/homework-forward.h b/src/home/homework-forward.h
index 04fefe6d45a3ef8d28c78b4dfeabbd709d347e6c..3c09338eef9e483d93c700722b733c427a9e9f36 100644 (file)
--- a/src/home/homework-forward.h
+++ b/src/home/homework-forward.h
@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+/* IWYU pragma: always_keep */
+
 #include "shared-forward.h" /* IWYU pragma: export */
 
 typedef enum HomeSetupFlags HomeSetupFlags;

diff --git a/src/journal/journald-forward.h b/src/journal/journald-forward.h
index 141b98024f5ee16c5a16a4205e2b2919e5ac3e55..66bcc40d3aed96c7dcae53a763583dedb470fd0e 100644 (file)
--- a/src/journal/journald-forward.h
+++ b/src/journal/journald-forward.h
@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+/* IWYU pragma: always_keep */
+
 #include "conf-parser-forward.h"    /* IWYU pragma: export */
 #include "shared-forward.h"         /* IWYU pragma: export */
 

diff --git a/src/libsystemd/sd-bus/bus-forward.h b/src/libsystemd/sd-bus/bus-forward.h
index 7208e89c1b6876cf8993291a5d912a4221e732a7..65f8d6515aa0f2bfeadc27ee2d84e10ab80a54f8 100644 (file)
--- a/src/libsystemd/sd-bus/bus-forward.h
+++ b/src/libsystemd/sd-bus/bus-forward.h
@@ -1,7 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "sd-forward.h"
+/* IWYU pragma: always_keep */
+
+#include "sd-forward.h"         /* IWYU pragma: export */
 
 typedef enum BusAuth BusAuth;
 typedef enum BusSlotType BusSlotType;

diff --git a/src/login/logind-forward.h b/src/login/logind-forward.h
index e9b9ebce376d1eaf68ddac9db73854f0237fa8fd..8f1fe4acee33ddce0f3231173899cfc3598b4b96 100644 (file)
--- a/src/login/logind-forward.h
+++ b/src/login/logind-forward.h
@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+/* IWYU pragma: always_keep */
+
 #include "conf-parser-forward.h"    /* IWYU pragma: export */
 #include "shared-forward.h"         /* IWYU pragma: export */
 

diff --git a/src/login/logind-user.h b/src/login/logind-user.h
index d3773996fa5d368054a145292eda8f376a266fe2..413cfb3f8e3019fb773fa003d9f0bfbb3805c8aa 100644 (file)
--- a/src/login/logind-user.h
+++ b/src/login/logind-user.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "shared-forward.h"
 #include "list.h"
 #include "logind-forward.h"
 #include "time-util.h"

diff --git a/src/machine/machine-forward.h b/src/machine/machine-forward.h
index ff7b98fc45c6adb2074b8cdb763d4382f7eac61a..5921ad87fabbe31faf3a9090f2e63d4fd97ce1b4 100644 (file)
--- a/src/machine/machine-forward.h
+++ b/src/machine/machine-forward.h
@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+/* IWYU pragma: always_keep */
+
 #include "shared-forward.h" /* IWYU pragma: export */
 
 typedef struct Machine Machine;

diff --git a/src/network/networkd-address.h b/src/network/networkd-address.h
index 1304e41f8ccf34e464680a366429b387ad77bdb5..1154aaf9477cd78c7cad52009c219d6e087a7aea 100644 (file)
--- a/src/network/networkd-address.h
+++ b/src/network/networkd-address.h
@@ -2,7 +2,6 @@
 #pragma once
 
 #include "firewall-util.h"
-#include "shared-forward.h"
 #include "in-addr-util.h"
 #include "networkd-forward.h"
 #include "networkd-util.h"

diff --git a/src/network/networkd-bridge-fdb.h b/src/network/networkd-bridge-fdb.h
index b53235a8eb5b202c20a9ae2feca3145df8de0426..a80c9d4c3f9e8a7b09cb5b3f34df6964a09fbcd1 100644 (file)
--- a/src/network/networkd-bridge-fdb.h
+++ b/src/network/networkd-bridge-fdb.h
@@ -8,7 +8,6 @@
 #include <linux/neighbour.h>
 #include <net/ethernet.h>
 
-#include "shared-forward.h"
 #include "in-addr-util.h"
 #include "networkd-forward.h"
 

diff --git a/src/network/networkd-forward.h b/src/network/networkd-forward.h
index f004fc6a47a9548134f21bc85527ad62f9b21718..95bd46801e320cb9b14cb6e3b304d17297a64303 100644 (file)
--- a/src/network/networkd-forward.h
+++ b/src/network/networkd-forward.h
@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+/* IWYU pragma: always_keep */
+
 #include "conf-parser-forward.h"    /* IWYU pragma: export */
 #include "shared-forward.h"         /* IWYU pragma: export */
 

diff --git a/src/network/networkd-link.h b/src/network/networkd-link.h
index 5622677600242e3e9a9783d64716b8254afcf920..6e936e3bb13353385687d0e273bdb458a2b3494f 100644 (file)
--- a/src/network/networkd-link.h
+++ b/src/network/networkd-link.h
@@ -4,7 +4,6 @@
 #include <linux/nl80211.h>
 
 #include "ether-addr-util.h"
-#include "shared-forward.h"
 #include "network-util.h"
 #include "networkd-bridge-vlan.h"
 #include "networkd-forward.h"

diff --git a/src/portable/portabled-forward.h b/src/portable/portabled-forward.h
index 7dc8fee923328605a4a6e916e767af1c6e5e20bb..9792a7acd1c6b2933849c102e5b8b2128deab7d1 100644 (file)
--- a/src/portable/portabled-forward.h
+++ b/src/portable/portabled-forward.h
@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+/* IWYU pragma: always_keep */
+
 #include "shared-forward.h" /* IWYU pragma: export */
 
 typedef struct Manager Manager;

diff --git a/src/resolve/resolved-dns-scope.h b/src/resolve/resolved-dns-scope.h
index c1a5365090136bf4e30ff3fc85dc21b4eea4f1f9..3ecc2183df1d4ea116c318cb7b95a862877916b5 100644 (file)
--- a/src/resolve/resolved-dns-scope.h
+++ b/src/resolve/resolved-dns-scope.h
@@ -2,7 +2,6 @@
 #pragma once
 
 #include "dns-def.h"
-#include "shared-forward.h"
 #include "list.h"
 #include "ratelimit.h"
 #include "resolve-util.h"

diff --git a/src/resolve/resolved-dns-server.h b/src/resolve/resolved-dns-server.h
index 0eaac0033206aeb3a30bca9d4ac75db038acccbf..7dfa0eae66c2cb53ec6b2a28ccac7fd0306a03b3 100644 (file)
--- a/src/resolve/resolved-dns-server.h
+++ b/src/resolve/resolved-dns-server.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "shared-forward.h"
 #include "in-addr-util.h"
 #include "list.h"
 #include "resolved-conf.h"

diff --git a/src/resolve/resolved-dns-stream.h b/src/resolve/resolved-dns-stream.h
index 6c932f5e847f2c4d17ba25bea79f1bfc6090a8ac..83bbd11eab5369c44adcc18c594fa38182953660 100644 (file)
--- a/src/resolve/resolved-dns-stream.h
+++ b/src/resolve/resolved-dns-stream.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "shared-forward.h"
 #include "list.h"
 #include "resolved-dns-packet.h"
 #include "resolved-dnstls.h"

diff --git a/src/resolve/resolved-dnssd-bus.h b/src/resolve/resolved-dnssd-bus.h
index 882e5a81b3df3bff89539f1f788b9611e470503b..df0a646fe62917307d9c9490c2a3d734f5521fb8 100644 (file)
--- a/src/resolve/resolved-dnssd-bus.h
+++ b/src/resolve/resolved-dnssd-bus.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "shared-forward.h"
+#include "resolved-forward.h"
 
 extern const BusObjectImplementation dnssd_object;
 

diff --git a/src/resolve/resolved-forward.h b/src/resolve/resolved-forward.h
index 9a79734847ad2957f6178e9b0467eb08ea93b1c2..8f1fb02539725c754401eca7a65ecd6b38c67657 100644 (file)
--- a/src/resolve/resolved-forward.h
+++ b/src/resolve/resolved-forward.h
@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+/* IWYU pragma: always_keep */
+
 #include "conf-parser-forward.h"    /* IWYU pragma: export */
 #include "shared-forward.h"         /* IWYU pragma: export */
 

diff --git a/src/resolve/resolved-manager.h b/src/resolve/resolved-manager.h
index 47a25abd44873246c490bfbfbe35a8d81799f25d..68e9a6e4ea2c260a381e0b3f2259b0af4ebba903 100644 (file)
--- a/src/resolve/resolved-manager.h
+++ b/src/resolve/resolved-manager.h
@@ -4,7 +4,6 @@
 #include <sys/stat.h>
 
 #include "common-signal.h"
-#include "shared-forward.h"
 #include "list.h"
 #include "resolve-util.h"
 #include "resolved-dns-browse-services.h"

diff --git a/src/sysupdate/sysupdate-forward.h b/src/sysupdate/sysupdate-forward.h
index a92de0878ab3e6187547a2fcb57060c798b93a68..a8659d756b2cd2e3feb260e70b7091aad9bf6c5f 100644 (file)
--- a/src/sysupdate/sysupdate-forward.h
+++ b/src/sysupdate/sysupdate-forward.h
@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+/* IWYU pragma: always_keep */
+
 #include "shared-forward.h" /* IWYU pragma: export */
 
 typedef struct Context Context;

diff --git a/src/timesync/timesyncd-forward.h b/src/timesync/timesyncd-forward.h
index 8df2e021110e68e60044a1ddc9afce263180e3b4..1c3d68d1e5f6ae20affb80a1ef685169aa221919 100644 (file)
--- a/src/timesync/timesyncd-forward.h
+++ b/src/timesync/timesyncd-forward.h
@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+/* IWYU pragma: always_keep */
+
 #include "conf-parser-forward.h"    /* IWYU pragma: export */
 #include "shared-forward.h"         /* IWYU pragma: export */
 

diff --git a/src/udev/udev-builtin.h b/src/udev/udev-builtin.h
index 5f600d6a4384a260e1c16c76a5ededea6db576e2..3e830c77ea2b0ad107e1ec6164f68c409c8e4650 100644 (file)
--- a/src/udev/udev-builtin.h
+++ b/src/udev/udev-builtin.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 #pragma once
 
-#include "shared-forward.h"
+#include "udev-forward.h"
 #include "udev-event.h"
 
 typedef struct UdevBuiltin {

diff --git a/src/udev/udev-error.h b/src/udev/udev-error.h
index c1db12960b4e7995c0fa07fa2ab43d57fdb90b85..d1216c65e65c815140a5ca3601f3d816f7500ad5 100644 (file)
--- a/src/udev/udev-error.h
+++ b/src/udev/udev-error.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 #pragma once
 
-#include "shared-forward.h"
+#include "udev-forward.h"
 
 int device_add_errno(sd_device *dev, int error);
 int device_add_exit_status(sd_device *dev, int status);

diff --git a/src/udev/udev-forward.h b/src/udev/udev-forward.h
index f5e9be6a1f168e43d46d2881f3afe4ceaccb6c5c..49320636927f842323de69afa01619a2d9964ccc 100644 (file)
--- a/src/udev/udev-forward.h
+++ b/src/udev/udev-forward.h
@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+/* IWYU pragma: always_keep */
+
 #include "shared-forward.h" /* IWYU pragma: export */
 
 typedef struct UdevCtrl UdevCtrl;

diff --git a/src/udev/udev-manager.h b/src/udev/udev-manager.h
index 9bb93632400a698d35654aa9ef34ddd0ac358872..9bafe24f280c8ce8e442b0feea0ec5f0b73d75b0 100644 (file)
--- a/src/udev/udev-manager.h
+++ b/src/udev/udev-manager.h
@@ -3,7 +3,6 @@
 
 #include "sd-event.h"
 
-#include "shared-forward.h"
 #include "list.h"
 #include "udev-config.h"
 #include "udev-forward.h"

diff --git a/src/udev/udev-node.h b/src/udev/udev-node.h
index 904421c0ec3df261626ea79f2f287574d4f5f14d..d5c75ebd6e27307e1cd8916fd3f0294a4a0b6576 100644 (file)
--- a/src/udev/udev-node.h
+++ b/src/udev/udev-node.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 #pragma once
 
-#include "shared-forward.h"
+#include "udev-forward.h"
 
 int udev_node_apply_permissions(
                 sd_device *dev,

diff --git a/src/udev/udev-trace.h b/src/udev/udev-trace.h
index 10d1e27345f13a3abe062037719054239d7545b2..15a2e8bd258ee3f39f96a932be4ea5af20e54904 100644 (file)
--- a/src/udev/udev-trace.h
+++ b/src/udev/udev-trace.h
@@ -8,7 +8,7 @@
 #include "device-private.h"
 #include "device-util.h"
 #include "errno-util.h"
-#include "shared-forward.h"
+#include "udev-forward.h"
 
 /* Each trace point can have different number of additional arguments. Note that when the macro is used only
  * additional arguments are listed in the macro invocation!