diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c
index 03abbc241d..59a22f207c 100644
--- a/src/analyze/analyze.c
+++ b/src/analyze/analyze.c
@@ -88,7 +88,6 @@
 #include "strxcpyx.h"
 #include "terminal-util.h"
 #include "time-util.h"
-#include "tmpfile-util.h"
 #include "unit-name.h"
 #include "verb-log-control.h"
 #include "verbs.h"
diff --git a/src/basic/fd-util.c b/src/basic/fd-util.c
index 890f608dec..55b274a25e 100644
--- a/src/basic/fd-util.c
+++ b/src/basic/fd-util.c
@@ -28,7 +28,6 @@
 #include "sort-util.h"
 #include "stat-util.h"
 #include "stdio-util.h"
-#include "tmpfile-util.h"
 
 /* The maximum number of iterations in the loop to close descriptors in the fallback case
  * when /proc/self/fd/ is inaccessible. */
diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
index 279b62bfd4..3349094e91 100644
--- a/src/firstboot/firstboot.c
+++ b/src/firstboot/firstboot.c
@@ -49,7 +49,6 @@
 #include "terminal-util.h"
 #include "time-util.h"
 #include "tmpfile-util-label.h"
-#include "tmpfile-util.h"
 #include "umask-util.h"
 #include "user-util.h"
 #include "vconsole-util.h"
diff --git a/src/home/homectl.c b/src/home/homectl.c
index 23570ca31b..077fe8076a 100644
--- a/src/home/homectl.c
+++ b/src/home/homectl.c
@@ -50,7 +50,6 @@
 #include "rlimit-util.h"
 #include "rm-rf.h"
 #include "terminal-util.h"
-#include "tmpfile-util.h"
 #include "uid-classification.h"
 #include "user-record.h"
 #include "user-record-password-quality.h"
diff --git a/src/home/homework-cifs.c b/src/home/homework-cifs.c
index 0cdf89f768..6c18472d58 100644
--- a/src/home/homework-cifs.c
+++ b/src/home/homework-cifs.c
@@ -16,7 +16,6 @@
 #include "process-util.h"
 #include "stat-util.h"
 #include "strv.h"
-#include "tmpfile-util.h"
 
 int home_setup_cifs(
                 UserRecord *h,
diff --git a/src/libsystemd/sd-journal/journal-send.c b/src/libsystemd/sd-journal/journal-send.c
index c4deb927cf..bbd4685467 100644
--- a/src/libsystemd/sd-journal/journal-send.c
+++ b/src/libsystemd/sd-journal/journal-send.c
@@ -29,7 +29,6 @@
 #include "socket-util.h"
 #include "stdio-util.h"
 #include "string-util.h"
-#include "tmpfile-util.h"
 
 #define SNDBUF_SIZE (8*1024*1024)
 
diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c
index fc48d44a6e..bc0fbde62a 100644
--- a/src/machine/machine-dbus.c
+++ b/src/machine/machine-dbus.c
@@ -35,7 +35,6 @@
 #include "signal-util.h"
 #include "strv.h"
 #include "terminal-util.h"
-#include "tmpfile-util.h"
 #include "user-util.h"
 
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_class, machine_class, MachineClass);
diff --git a/src/machine/machined-dbus.c b/src/machine/machined-dbus.c
index f50ce90170..d9e43d9e0a 100644
--- a/src/machine/machined-dbus.c
+++ b/src/machine/machined-dbus.c
@@ -33,7 +33,6 @@
 #include "process-util.h"
 #include "stdio-util.h"
 #include "strv.h"
-#include "tmpfile-util.h"
 #include "unit-name.h"
 #include "user-util.h"
 
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index b13b668c1a..61c397bc8b 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -68,7 +68,6 @@
 #include "string-table.h"
 #include "strv.h"
 #include "tc.h"
-#include "tmpfile-util.h"
 #include "tuntap.h"
 #include "udev-util.h"
 #include "vrf.h"
diff --git a/src/network/networkd-lldp-rx.c b/src/network/networkd-lldp-rx.c
index 6ba198282e..169221aa65 100644
--- a/src/network/networkd-lldp-rx.c
+++ b/src/network/networkd-lldp-rx.c
@@ -15,7 +15,6 @@
 #include "string-table.h"
 #include "string-util.h"
 #include "strv.h"
-#include "tmpfile-util.h"
 
 DEFINE_CONFIG_PARSE_ENUM(config_parse_lldp_mode, lldp_mode, LLDPMode);
 
diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
index dc380bbe48..cae5c129eb 100644
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -64,7 +64,6 @@
 #include "strv.h"
 #include "sysctl-util.h"
 #include "tclass.h"
-#include "tmpfile-util.h"
 #include "tuntap.h"
 #include "udev-util.h"
 
diff --git a/src/pstore/pstore.c b/src/pstore/pstore.c
index 0addaa6df6..bf1906ced8 100644
--- a/src/pstore/pstore.c
+++ b/src/pstore/pstore.c
@@ -43,7 +43,6 @@
 #include "string-table.h"
 #include "string-util.h"
 #include "strv.h"
-#include "tmpfile-util.h"
 #include "user-util.h"
 
 /* Command line argument handling */
diff --git a/src/shared/exec-util.c b/src/shared/exec-util.c
index 01c6d74a00..22cef5a200 100644
--- a/src/shared/exec-util.c
+++ b/src/shared/exec-util.c
@@ -30,7 +30,6 @@
 #include "string-util.h"
 #include "strv.h"
 #include "terminal-util.h"
-#include "tmpfile-util.h"
 
 #define EXIT_SKIP_REMAINING 77
 
diff --git a/src/shared/loop-util.c b/src/shared/loop-util.c
index 5f2fe03e2e..e312f7c890 100644
--- a/src/shared/loop-util.c
+++ b/src/shared/loop-util.c
@@ -33,7 +33,6 @@
 #include "stat-util.h"
 #include "stdio-util.h"
 #include "string-util.h"
-#include "tmpfile-util.h"
 
 static void cleanup_clear_loop_close(int *fd) {
         if (*fd < 0)
diff --git a/src/shared/serialize.c b/src/shared/serialize.c
index 425e7f1ac3..be73cc7098 100644
--- a/src/shared/serialize.c
+++ b/src/shared/serialize.c
@@ -15,7 +15,6 @@
 #include "process-util.h"
 #include "serialize.h"
 #include "strv.h"
-#include "tmpfile-util.h"
 
 int serialize_item(FILE *f, const char *key, const char *value) {
         assert(f);
diff --git a/src/test/test-hostname-util.c b/src/test/test-hostname-util.c
index adfc6b2d6a..2667bb7b19 100644
--- a/src/test/test-hostname-util.c
+++ b/src/test/test-hostname-util.c
@@ -7,7 +7,6 @@
 #include "hostname-util.h"
 #include "string-util.h"
 #include "tests.h"
-#include "tmpfile-util.h"
 
 TEST(hostname_is_valid) {
         assert_se(hostname_is_valid("foobar", 0));
diff --git a/src/test/test-load-fragment.c b/src/test/test-load-fragment.c
index fdbfe1d157..462a7ffff9 100644
--- a/src/test/test-load-fragment.c
+++ b/src/test/test-load-fragment.c
@@ -30,7 +30,6 @@
 #include "string-util.h"
 #include "strv.h"
 #include "tests.h"
-#include "tmpfile-util.h"
 #include "user-util.h"
 
 /* Nontrivial value serves as a placeholder to check that parsing function (didn't) change it */
diff --git a/src/test/test-notify-recv.c b/src/test/test-notify-recv.c
index 8634df9fd1..f4f96a74e2 100644
--- a/src/test/test-notify-recv.c
+++ b/src/test/test-notify-recv.c
@@ -12,7 +12,6 @@
 #include "rm-rf.h"
 #include "socket-util.h"
 #include "tests.h"
-#include "tmpfile-util.h"
 
 typedef struct Context {
         unsigned data;
diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c
index 06aee82bdf..b934871f95 100644
--- a/src/test/test-unit-file.c
+++ b/src/test/test-unit-file.c
@@ -10,7 +10,6 @@
 #include "special.h"
 #include "strv.h"
 #include "tests.h"
-#include "tmpfile-util.h"
 #include "unit-file.h"
 
 TEST(unit_validate_alias_symlink_and_warn) {