diff --git a/src/home/homectl.c b/src/home/homectl.c
index f2a04d5a0ce..25e942bd94d 100644
--- a/src/home/homectl.c
+++ b/src/home/homectl.c
@@ -39,13 +39,13 @@
 #include "path-util.h"
 #include "percent-util.h"
 #include "pkcs11-util.h"
+#include "polkit-agent.h"
 #include "pretty-print.h"
 #include "proc-cmdline.h"
 #include "process-util.h"
 #include "recurse-dir.h"
 #include "rlimit-util.h"
 #include "rm-rf.h"
-#include "spawn-polkit-agent.h"
 #include "terminal-util.h"
 #include "tmpfile-util.h"
 #include "uid-classification.h"
diff --git a/src/hostname/hostnamectl.c b/src/hostname/hostnamectl.c
index 83e53a45607..157ac769cab 100644
--- a/src/hostname/hostnamectl.c
+++ b/src/hostname/hostnamectl.c
@@ -23,9 +23,9 @@
 #include "hostname-util.h"
 #include "main-func.h"
 #include "parse-argument.h"
+#include "polkit-agent.h"
 #include "pretty-print.h"
 #include "socket-util.h"
-#include "spawn-polkit-agent.h"
 #include "terminal-util.h"
 #include "verbs.h"
 
diff --git a/src/import/importctl.c b/src/import/importctl.c
index d81e79e3cdb..3334f37b946 100644
--- a/src/import/importctl.c
+++ b/src/import/importctl.c
@@ -24,10 +24,10 @@
 #include "parse-argument.h"
 #include "parse-util.h"
 #include "path-util.h"
+#include "polkit-agent.h"
 #include "pretty-print.h"
 #include "signal-util.h"
 #include "sort-util.h"
-#include "spawn-polkit-agent.h"
 #include "string-table.h"
 #include "verbs.h"
 #include "web-util.h"
diff --git a/src/locale/localectl.c b/src/locale/localectl.c
index 9a2163bcfef..5b00820e5a5 100644
--- a/src/locale/localectl.c
+++ b/src/locale/localectl.c
@@ -17,10 +17,10 @@
 #include "main-func.h"
 #include "memory-util.h"
 #include "pager.h"
+#include "polkit-agent.h"
 #include "pretty-print.h"
 #include "proc-cmdline.h"
 #include "set.h"
-#include "spawn-polkit-agent.h"
 #include "strv.h"
 #include "terminal-util.h"
 #include "verbs.h"
diff --git a/src/login/loginctl.c b/src/login/loginctl.c
index 36421da0ad2..7ca07c4efe1 100644
--- a/src/login/loginctl.c
+++ b/src/login/loginctl.c
@@ -25,12 +25,12 @@
 #include "pager.h"
 #include "parse-argument.h"
 #include "parse-util.h"
+#include "polkit-agent.h"
 #include "pretty-print.h"
 #include "process-util.h"
 #include "rlimit-util.h"
 #include "sigbus.h"
 #include "signal-util.h"
-#include "spawn-polkit-agent.h"
 #include "string-table.h"
 #include "strv.h"
 #include "sysfs-show.h"
diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
index 5572115a547..f49927ae854 100644
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -47,6 +47,7 @@
 #include "parse-argument.h"
 #include "parse-util.h"
 #include "path-util.h"
+#include "polkit-agent.h"
 #include "pretty-print.h"
 #include "process-util.h"
 #include "ptyfwd.h"
@@ -55,7 +56,6 @@
 #include "signal-util.h"
 #include "sort-util.h"
 #include "spawn-ask-password-agent.h"
-#include "spawn-polkit-agent.h"
 #include "stdio-util.h"
 #include "string-table.h"
 #include "strv.h"
diff --git a/src/mount/mount-tool.c b/src/mount/mount-tool.c
index fcebdcaf18c..8ac08e95b8d 100644
--- a/src/mount/mount-tool.c
+++ b/src/mount/mount-tool.c
@@ -28,10 +28,10 @@
 #include "parse-argument.h"
 #include "parse-util.h"
 #include "path-util.h"
+#include "polkit-agent.h"
 #include "pretty-print.h"
 #include "process-util.h"
 #include "sort-util.h"
-#include "spawn-polkit-agent.h"
 #include "stat-util.h"
 #include "strv.h"
 #include "terminal-util.h"
diff --git a/src/portable/portablectl.c b/src/portable/portablectl.c
index 57b930d6cba..e4eb437b2ec 100644
--- a/src/portable/portablectl.c
+++ b/src/portable/portablectl.c
@@ -26,9 +26,9 @@
 #include "parse-argument.h"
 #include "parse-util.h"
 #include "path-util.h"
+#include "polkit-agent.h"
 #include "portable.h"
 #include "pretty-print.h"
-#include "spawn-polkit-agent.h"
 #include "string-util.h"
 #include "strv.h"
 #include "terminal-util.h"
diff --git a/src/run/run.c b/src/run/run.c
index 5779403b9c5..975b8ddf17b 100644
--- a/src/run/run.c
+++ b/src/run/run.c
@@ -30,11 +30,11 @@
 #include "parse-argument.h"
 #include "parse-util.h"
 #include "path-util.h"
+#include "polkit-agent.h"
 #include "pretty-print.h"
 #include "process-util.h"
 #include "ptyfwd.h"
 #include "signal-util.h"
-#include "spawn-polkit-agent.h"
 #include "special.h"
 #include "strv.h"
 #include "terminal-util.h"
diff --git a/src/shared/main-func.h b/src/shared/main-func.h
index d0689b42d9c..0dd0821ea6f 100644
--- a/src/shared/main-func.h
+++ b/src/shared/main-func.h
@@ -12,10 +12,10 @@
 #include "argv-util.h"
 #include "hashmap.h"
 #include "pager.h"
+#include "polkit-agent.h"
 #include "selinux-util.h"
 #include "signal-util.h"
 #include "spawn-ask-password-agent.h"
-#include "spawn-polkit-agent.h"
 #include "static-destruct.h"
 
 #define _DEFINE_MAIN_FUNCTION(intro, impl, result_to_exit_status, result_to_return_value) \
diff --git a/src/shared/meson.build b/src/shared/meson.build
index 46679c1adab..1385172fe8f 100644
--- a/src/shared/meson.build
+++ b/src/shared/meson.build
@@ -140,6 +140,7 @@ shared_sources = files(
         'pe-binary.c',
         'pkcs11-util.c',
         'plymouth-util.c',
+        'polkit-agent.c',
         'pretty-print.c',
         'capsule-util.c',
         'ptyfwd.c',
@@ -160,7 +161,6 @@ shared_sources = files(
         'socket-label.c',
         'socket-netlink.c',
         'spawn-ask-password-agent.c',
-        'spawn-polkit-agent.c',
         'specifier.c',
         'switch-root.c',
         'tmpfile-util-label.c',
diff --git a/src/shared/spawn-polkit-agent.c b/src/shared/polkit-agent.c
similarity index 98%
rename from src/shared/spawn-polkit-agent.c
rename to src/shared/polkit-agent.c
index ce3c5fb9486..a891246156d 100644
--- a/src/shared/spawn-polkit-agent.c
+++ b/src/shared/polkit-agent.c
@@ -11,8 +11,8 @@
 #include "io-util.h"
 #include "log.h"
 #include "macro.h"
+#include "polkit-agent.h"
 #include "process-util.h"
-#include "spawn-polkit-agent.h"
 #include "stdio-util.h"
 #include "time-util.h"
 
diff --git a/src/shared/spawn-polkit-agent.h b/src/shared/polkit-agent.h
similarity index 100%
rename from src/shared/spawn-polkit-agent.h
rename to src/shared/polkit-agent.h
diff --git a/src/systemctl/systemctl-util.c b/src/systemctl/systemctl-util.c
index be3b35e6f9d..8e665d60153 100644
--- a/src/systemctl/systemctl-util.c
+++ b/src/systemctl/systemctl-util.c
@@ -19,11 +19,11 @@
 #include "macro.h"
 #include "path-util.h"
 #include "pidref.h"
+#include "polkit-agent.h"
 #include "process-util.h"
 #include "reboot-util.h"
 #include "set.h"
 #include "spawn-ask-password-agent.h"
-#include "spawn-polkit-agent.h"
 #include "stat-util.h"
 #include "systemctl-util.h"
 #include "systemctl.h"
diff --git a/src/timedate/timedatectl.c b/src/timedate/timedatectl.c
index 46ec6b31bc4..2e19b28a6d5 100644
--- a/src/timedate/timedatectl.c
+++ b/src/timedate/timedatectl.c
@@ -19,9 +19,9 @@
 #include "main-func.h"
 #include "pager.h"
 #include "parse-util.h"
+#include "polkit-agent.h"
 #include "pretty-print.h"
 #include "sparse-endian.h"
-#include "spawn-polkit-agent.h"
 #include "string-table.h"
 #include "strv.h"
 #include "terminal-util.h"