diff --git a/meson.build b/meson.build
index 190baf2154..d9987f3d77 100644
--- a/meson.build
+++ b/meson.build
@@ -2373,17 +2373,21 @@ subdir('src/libsystemd-network')
 subdir('src/ac-power')
 subdir('src/analyze')
 subdir('src/backlight')
+subdir('src/battery-check')
 subdir('src/binfmt')
 subdir('src/boot')
 subdir('src/boot/efi')
 subdir('src/busctl')
 subdir('src/coredump')
+subdir('src/creds')
 subdir('src/cryptenroll')
 subdir('src/cryptsetup')
 subdir('src/debug-generator')
+subdir('src/delta')
 subdir('src/detect-virt')
 subdir('src/dissect')
 subdir('src/environment-d-generator')
+subdir('src/escape')
 subdir('src/firstboot')
 subdir('src/fsck')
 subdir('src/fstab-generator')
@@ -2401,6 +2405,7 @@ subdir('src/login')
 subdir('src/machine')
 subdir('src/machine-id-setup')
 subdir('src/network')
+subdir('src/notify')
 subdir('src/nspawn')
 subdir('src/nss-myhostname')
 subdir('src/nss-mymachines')
@@ -2592,64 +2597,6 @@ meson.add_install_script(meson_make_symlink,
                          bindir / 'udevadm',
                          libexecdir / 'systemd-udevd')
 
-public_programs += executable(
-        'systemd-delta',
-        'src/delta/delta.c',
-        include_directories : includes,
-        link_with : [libshared],
-        dependencies : [userspace],
-        install_rpath : pkglibdir,
-        install : true)
-
-public_programs += executable(
-        'systemd-escape',
-        'src/escape/escape.c',
-        include_directories : includes,
-        link_with : [libshared],
-        dependencies : [userspace],
-        install_rpath : pkglibdir,
-        install : true)
-
-public_programs += executable(
-        'systemd-notify',
-        'src/notify/notify.c',
-        include_directories : includes,
-        link_with : [libshared],
-        dependencies : [userspace],
-        install_rpath : pkglibdir,
-        install : true)
-
-public_programs += executable(
-        'systemd-creds',
-        'src/creds/creds.c',
-        include_directories : includes,
-        link_with : [libshared],
-        dependencies : [threads,
-                        libopenssl,
-                        userspace],
-        install_rpath : pkglibdir,
-        install : true)
-
-public_programs += executable(
-        'systemd-battery-check',
-        'src/battery-check/battery-check.c',
-        include_directories : includes,
-        link_with : [libshared],
-        dependencies : [userspace],
-        install_rpath : pkglibdir,
-        install_dir : libexecdir,
-        install : true)
-
-# Protecting files from the distro in /usr doesn't make sense since they can be trivially accessed otherwise,
-# so don't restrict the access mode in /usr. That doesn't apply to /etc, so we do restrict the access mode
-# there.
-meson.add_install_script('sh', '-c', mkdir_p.format(credstoredir))
-if install_sysconfdir
-        # Keep in sync with tmpfiles.d/credstore.conf
-        meson.add_install_script('sh', '-c', mkdir_p_mode.format(sysconfdir / 'credstore', '0700'))
-        meson.add_install_script('sh', '-c', mkdir_p_mode.format(sysconfdir / 'credstore.encrypted', '0700'))
-endif
-
 executable(
         'systemd-volatile-root',
         'src/volatile-root/volatile-root.c',
diff --git a/src/battery-check/meson.build b/src/battery-check/meson.build
new file mode 100644
index 0000000000..370d4d450a
--- /dev/null
+++ b/src/battery-check/meson.build
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        libexec_template + {
+                'name' : 'systemd-battery-check',
+                'public' : true,
+                'sources' : files('battery-check.c'),
+        },
+]
diff --git a/src/creds/meson.build b/src/creds/meson.build
new file mode 100644
index 0000000000..905c349635
--- /dev/null
+++ b/src/creds/meson.build
@@ -0,0 +1,23 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        executable_template + {
+                'name' : 'systemd-creds',
+                'public' : true,
+                'sources' : files('creds.c'),
+                'dependencies' : [
+                        libopenssl,
+                        threads,
+                ],
+        },
+]
+
+# Protecting files from the distro in /usr doesn't make sense since they can be trivially accessed otherwise,
+# so don't restrict the access mode in /usr. That doesn't apply to /etc, so we do restrict the access mode
+# there.
+meson.add_install_script('sh', '-c', mkdir_p.format(credstoredir))
+if install_sysconfdir
+        # Keep in sync with tmpfiles.d/credstore.conf
+        meson.add_install_script('sh', '-c', mkdir_p_mode.format(sysconfdir / 'credstore', '0700'))
+        meson.add_install_script('sh', '-c', mkdir_p_mode.format(sysconfdir / 'credstore.encrypted', '0700'))
+endif
diff --git a/src/delta/meson.build b/src/delta/meson.build
new file mode 100644
index 0000000000..31c4be2a1e
--- /dev/null
+++ b/src/delta/meson.build
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        executable_template + {
+                'name' : 'systemd-delta',
+                'public' : true,
+                'sources' : files('delta.c'),
+        },
+]
diff --git a/src/escape/meson.build b/src/escape/meson.build
new file mode 100644
index 0000000000..d21b3722cc
--- /dev/null
+++ b/src/escape/meson.build
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        executable_template + {
+                'name' : 'systemd-escape',
+                'public' : true,
+                'sources' : files('escape.c'),
+        },
+]
diff --git a/src/notify/meson.build b/src/notify/meson.build
new file mode 100644
index 0000000000..3baa086a92
--- /dev/null
+++ b/src/notify/meson.build
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        executable_template + {
+                'name' : 'systemd-notify',
+                'public' : true,
+                'sources' : files('notify.c'),
+        },
+]