diff --git a/src/basic/fd-util.h b/src/basic/fd-util.h
index 4a02d92078..6aecb91fab 100644
--- a/src/basic/fd-util.h
+++ b/src/basic/fd-util.h
@@ -8,8 +8,6 @@
 #include <sys/socket.h>
 
 #include "macro.h"
-#include "format-util.h"
-#include "process-util.h"
 #include "stdio-util.h"
 
 /* maximum length of fdname */
@@ -114,17 +112,14 @@ static inline int dir_fd_is_root_or_cwd(int dir_fd) {
         return dir_fd == AT_FDCWD ? true : path_is_root_at(dir_fd, NULL);
 }
 
-/* The maximum length a buffer for a /proc/<pid>/fd/<fd> path needs. We intentionally don't use /proc/self/fd
- * as these paths might be read by other programs (for example when mounting file descriptors the source path
- * ends up in /proc/mounts and related files) for which /proc/self/fd will be interpreted differently than
- * /proc/<pid>/fd. */
+/* The maximum length a buffer for a /proc/self/fd/<fd> path needs */
 #define PROC_FD_PATH_MAX \
-        (STRLEN("/proc//fd/") + DECIMAL_STR_MAX(pid_t) + DECIMAL_STR_MAX(int))
+        (STRLEN("/proc/self/fd/") + DECIMAL_STR_MAX(int))
 
 static inline char *format_proc_fd_path(char buf[static PROC_FD_PATH_MAX], int fd) {
         assert(buf);
         assert(fd >= 0);
-        assert_se(snprintf_ok(buf, PROC_FD_PATH_MAX, "/proc/" PID_FMT "/fd/%i", getpid_cached(), fd));
+        assert_se(snprintf_ok(buf, PROC_FD_PATH_MAX, "/proc/self/fd/%i", fd));
         return buf;
 }
 
diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c
index 9a4f3ab1bf..6d62ba380b 100644
--- a/src/libsystemd-network/sd-dhcp6-client.c
+++ b/src/libsystemd-network/sd-dhcp6-client.c
@@ -5,9 +5,8 @@
 
 #include <errno.h>
 #include <sys/ioctl.h>
-#include <net/if.h>
-#include <linux/if_arp.h> /* Must be included after <net/if.h> */
-#include <linux/if_infiniband.h> /* Must be included after <net/if.h> */
+#include <linux/if_arp.h>
+#include <linux/if_infiniband.h>
 
 #include "sd-dhcp6-client.h"
 
diff --git a/src/network/networkd-dhcp-server.c b/src/network/networkd-dhcp-server.c
index 6ed15e76db..620fbbddc7 100644
--- a/src/network/networkd-dhcp-server.c
+++ b/src/network/networkd-dhcp-server.c
@@ -1,9 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <netinet/in.h>
-#include <net/if.h>
-#include <linux/if_arp.h> /* Must be included after <net/if.h> */
-#include <linux/if.h> /* Must be included after <net/if.h> */
+#include <linux/if_arp.h>
+#include <linux/if.h>
 
 #include "sd-dhcp-server.h"
 
diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
index 22acf15c6d..b6ba216eee 100644
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -3,8 +3,7 @@
 #include <netinet/in.h>
 #include <sys/socket.h>
 #include <unistd.h>
-#include <net/if.h>
-#include <linux/if.h> /* Must be included after <net/if.h> */
+#include <linux/if.h>
 #include <linux/fib_rules.h>
 #include <linux/nexthop.h>
 #include <linux/nl80211.h>
diff --git a/src/network/networkd-state-file.c b/src/network/networkd-state-file.c
index e27984d2de..85c9d21082 100644
--- a/src/network/networkd-state-file.c
+++ b/src/network/networkd-state-file.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <netinet/in.h>
-#include <net/if.h>
-#include <linux/if.h> /* Must be included after <net/if.h> */
+#include <linux/if.h>
 
 #include "alloc-util.h"
 #include "dns-domain.h"
diff --git a/src/resolve/resolved-link.c b/src/resolve/resolved-link.c
index a60aabb395..dd5daddce4 100644
--- a/src/resolve/resolved-link.c
+++ b/src/resolve/resolved-link.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <net/if.h>
-#include <linux/if.h> /* Must be included after <net/if.h> */
+#include <linux/if.h>
 #include <unistd.h>
 
 #include "sd-network.h"
diff --git a/src/test/test-fd-util.c b/src/test/test-fd-util.c
index 1674758e6b..20d412f5c6 100644
--- a/src/test/test-fd-util.c
+++ b/src/test/test-fd-util.c
@@ -382,16 +382,11 @@ TEST(close_all_fds) {
 }
 
 TEST(format_proc_fd_path) {
-        _cleanup_free_ char *expected = NULL;
-
-        for (int i = 0; i < 4; i++) {
-                assert_se(asprintf(&expected, "/proc/" PID_FMT "/fd/%i", getpid_cached(), i) >= 0);
-                assert_se(streq_ptr(FORMAT_PROC_FD_PATH(i), expected));
-                expected = mfree(expected);
-        }
-
-        assert_se(asprintf(&expected, "/proc/" PID_FMT "/fd/2147483647", getpid_cached()) >= 0);
-        assert_se(streq_ptr(FORMAT_PROC_FD_PATH(2147483647), expected));
+        assert_se(streq_ptr(FORMAT_PROC_FD_PATH(0), "/proc/self/fd/0"));
+        assert_se(streq_ptr(FORMAT_PROC_FD_PATH(1), "/proc/self/fd/1"));
+        assert_se(streq_ptr(FORMAT_PROC_FD_PATH(2), "/proc/self/fd/2"));
+        assert_se(streq_ptr(FORMAT_PROC_FD_PATH(3), "/proc/self/fd/3"));
+        assert_se(streq_ptr(FORMAT_PROC_FD_PATH(2147483647), "/proc/self/fd/2147483647"));
 }
 
 TEST(fd_reopen) {
diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c
index b22f2e3e60..b554a6827d 100644
--- a/src/udev/net/link-config.c
+++ b/src/udev/net/link-config.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <net/if.h>
-#include <linux/netdevice.h> /* Must be included after <net/if.h> */
+#include <linux/netdevice.h>
 #include <netinet/ether.h>
 #include <unistd.h>