meson: Do not include headers in source lists

Meson+ninja+compiler do this for us and are better at it.

https://mesonbuild.com/FAQ.html#do-i-need-to-add-my-headers-to-the-sources-list-like-in-autotools

33 files changed, 44 insertions, 893 deletions

diff --git a/src/analyze/meson.build b/src/analyze/meson.build
index 24ef94149c..55b805b68e 100644
--- a/src/analyze/meson.build
+++ b/src/analyze/meson.build
@@ -2,56 +2,32 @@
 
 systemd_analyze_sources = files(
         'analyze-blame.c',
-        'analyze-blame.h',
         'analyze-calendar.c',
-        'analyze-calendar.h',
         'analyze-capability.c',
-        'analyze-capability.h',
         'analyze-cat-config.c',
-        'analyze-cat-config.h',
         'analyze-compare-versions.c',
-        'analyze-compare-versions.h',
         'analyze-condition.c',
-        'analyze-condition.h',
         'analyze-critical-chain.c',
-        'analyze-critical-chain.h',
         'analyze-dot.c',
-        'analyze-dot.h',
         'analyze-dump.c',
-        'analyze-dump.h',
         'analyze-exit-status.c',
-        'analyze-exit-status.h',
         'analyze-filesystems.c',
-        'analyze-filesystems.h',
         'analyze-inspect-elf.c',
-        'analyze-inspect-elf.h',
         'analyze-log-control.c',
-        'analyze-log-control.h',
         'analyze-plot.c',
-        'analyze-plot.h',
         'analyze-security.c',
-        'analyze-security.h',
         'analyze-service-watchdogs.c',
-        'analyze-service-watchdogs.h',
         'analyze-syscall-filter.c',
-        'analyze-syscall-filter.h',
         'analyze-time.c',
-        'analyze-time.h',
         'analyze-time-data.c',
-        'analyze-time-data.h',
         'analyze-timespan.c',
-        'analyze-timespan.h',
         'analyze-timestamp.c',
-        'analyze-timestamp.h',
         'analyze-unit-files.c',
-        'analyze-unit-files.h',
         'analyze-unit-paths.c',
-        'analyze-unit-paths.h',
         'analyze-verify.c',
-        'analyze-verify.h',
         'analyze-verify-util.c',
-        'analyze-verify-util.h',
-        'analyze.c')
+        'analyze.c',
+)
 
 tests += [
         [files('test-verify.c',
diff --git a/src/basic/meson.build b/src/basic/meson.build
index 541031b8a3..7aae031d81 100644
--- a/src/basic/meson.build
+++ b/src/basic/meson.build
@@ -2,267 +2,100 @@
 
 basic_sources = files(
         'MurmurHash2.c',
-        'MurmurHash2.h',
         'af-list.c',
-        'af-list.h',
         'alloc-util.c',
-        'alloc-util.h',
         'architecture.c',
-        'architecture.h',
         'argv-util.c',
-        'argv-util.h',
         'arphrd-util.c',
-        'arphrd-util.h',
         'async.c',
-        'async.h',
         'audit-util.c',
-        'audit-util.h',
         'build.c',
-        'build.h',
         'bus-label.c',
-        'bus-label.h',
         'cap-list.c',
-        'cap-list.h',
         'capability-util.c',
-        'capability-util.h',
         'cgroup-util.c',
-        'cgroup-util.h',
         'chase-symlinks.c',
-        'chase-symlinks.h',
         'chattr-util.c',
-        'chattr-util.h',
         'conf-files.c',
-        'conf-files.h',
-        'constants.h',
         'devnum-util.c',
-        'devnum-util.h',
         'dirent-util.c',
-        'dirent-util.h',
-        'dns-def.h',
         'efivars.c',
-        'efivars.h',
         'env-file.c',
-        'env-file.h',
         'env-util.c',
-        'env-util.h',
         'errno-list.c',
-        'errno-list.h',
-        'errno-util.h',
         'escape.c',
-        'escape.h',
         'ether-addr-util.c',
-        'ether-addr-util.h',
         'extract-word.c',
-        'extract-word.h',
         'fd-util.c',
-        'fd-util.h',
         'fileio.c',
-        'fileio.h',
         'filesystems.c',
-        'filesystems.h',
         'format-util.c',
-        'format-util.h',
         'fs-util.c',
-        'fs-util.h',
         'glob-util.c',
-        'glob-util.h',
         'glyph-util.c',
-        'glyph-util.h',
         'gunicode.c',
-        'gunicode.h',
         'hash-funcs.c',
-        'hash-funcs.h',
         'hashmap.c',
-        'hashmap.h',
         'hexdecoct.c',
-        'hexdecoct.h',
         'hmac.c',
-        'hmac.h',
         'hostname-util.c',
-        'hostname-util.h',
         'in-addr-util.c',
-        'in-addr-util.h',
         'initrd-util.c',
-        'initrd-util.h',
         'inotify-util.c',
-        'inotify-util.h',
         'io-util.c',
-        'io-util.h',
         'ioprio-util.c',
-        'ioprio-util.h',
         'limits-util.c',
-        'limits-util.h',
-        'linux/btrfs.h',
-        'linux/btrfs_tree.h',
-        'linux/can/netlink.h',
-        'linux/can/vxcan.h',
-        'linux/cfm_bridge.h',
-        'linux/fib_rules.h',
-        'linux/fou.h',
-        'linux/genetlink.h',
-        'linux/hdlc/ioctl.h',
-        'linux/if.h',
-        'linux/if_addr.h',
-        'linux/if_bonding.h',
-        'linux/if_bridge.h',
-        'linux/if_ether.h',
-        'linux/if_link.h',
-        'linux/if_macsec.h',
-        'linux/if_tun.h',
-        'linux/if_tunnel.h',
-        'linux/in.h',
-        'linux/in6.h',
-        'linux/ipv6_route.h',
-        'linux/l2tp.h',
-        'linux/libc-compat.h',
-        'linux/mrp_bridge.h',
-        'linux/netdevice.h',
-        'linux/netfilter/nf_tables.h',
-        'linux/netfilter/nfnetlink.h',
-        'linux/netlink.h',
-        'linux/nexthop.h',
-        'linux/nl80211.h',
-        'linux/pkt_sched.h',
-        'linux/rtnetlink.h',
-        'linux/wireguard.h',
-        'list.h',
         'locale-util.c',
-        'locale-util.h',
         'log.c',
-        'log.h',
-        'logarithm.h',
         'login-util.c',
-        'login-util.h',
-        'macro.h',
-        'math-util.h',
         'memfd-util.c',
-        'memfd-util.h',
         'memory-util.c',
-        'memory-util.h',
         'mempool.c',
-        'mempool.h',
-        'missing_audit.h',
-        'missing_capability.h',
-        'missing_drm.h',
-        'missing_fcntl.h',
-        'missing_fs.h',
-        'missing_input.h',
-        'missing_ioprio.h',
-        'missing_keyctl.h',
-        'missing_magic.h',
-        'missing_mman.h',
-        'missing_mount.h',
-        'missing_network.h',
-        'missing_prctl.h',
-        'missing_random.h',
-        'missing_resource.h',
-        'missing_sched.h',
-        'missing_securebits.h',
-        'missing_socket.h',
-        'missing_stat.h',
-        'missing_stdlib.h',
-        'missing_syscall.h',
-        'missing_timerfd.h',
-        'missing_type.h',
         'mkdir.c',
-        'mkdir.h',
         'mountpoint-util.c',
-        'mountpoint-util.h',
         'namespace-util.c',
-        'namespace-util.h',
-        'nss-util.h',
         'nulstr-util.c',
-        'nulstr-util.h',
         'ordered-set.c',
-        'ordered-set.h',
         'os-util.c',
-        'os-util.h',
         'parse-util.c',
-        'parse-util.h',
         'path-lookup.c',
-        'path-lookup.h',
         'path-util.c',
-        'path-util.h',
         'percent-util.c',
-        'percent-util.h',
         'prioq.c',
-        'prioq.h',
         'proc-cmdline.c',
-        'proc-cmdline.h',
         'process-util.c',
-        'process-util.h',
         'procfs-util.c',
-        'procfs-util.h',
-        'pthread-util.h',
         'random-util.c',
-        'random-util.h',
         'ratelimit.c',
-        'ratelimit.h',
-        'raw-clone.h',
-        'raw-reboot.h',
         'recurse-dir.c',
-        'recurse-dir.h',
         'replace-var.c',
-        'replace-var.h',
         'rlimit-util.c',
-        'rlimit-util.h',
-        'set.h',
         'sigbus.c',
-        'sigbus.h',
         'signal-util.c',
-        'signal-util.h',
         'siphash24.c',
-        'siphash24.h',
         'socket-util.c',
-        'socket-util.h',
         'sort-util.c',
-        'sort-util.h',
-        'sparse-endian.h',
-        'special.h',
         'stat-util.c',
-        'stat-util.h',
-        'static-destruct.h',
-        'stdio-util.h',
         'strbuf.c',
-        'strbuf.h',
         'string-table.c',
-        'string-table.h',
         'string-util.c',
-        'string-util.h',
         'strv.c',
-        'strv.h',
         'strxcpyx.c',
-        'strxcpyx.h',
         'sync-util.c',
-        'sync-util.h',
         'sysctl-util.c',
-        'sysctl-util.h',
         'syslog-util.c',
-        'syslog-util.h',
         'terminal-util.c',
-        'terminal-util.h',
         'time-util.c',
-        'time-util.h',
         'tmpfile-util.c',
-        'tmpfile-util.h',
         'uid-range.c',
-        'uid-range.h',
-        'umask-util.h',
-        'unaligned.h',
         'unit-def.c',
-        'unit-def.h',
         'unit-file.c',
-        'unit-file.h',
         'unit-name.c',
-        'unit-name.h',
         'user-util.c',
-        'user-util.h',
         'utf8.c',
-        'utf8.h',
         'virt.c',
-        'virt.h',
         'xattr-util.c',
-        'xattr-util.h')
+)
 
 missing_audit_h = files('missing_audit.h')
 missing_capability_h = files('missing_capability.h')
@@ -439,7 +272,7 @@ libbasic = static_library(
 
 basic_gcrypt_sources = files(
         'gcrypt-util.c',
-        'gcrypt-util.h')
+)
 
 # A convenience library that is separate from libbasic to avoid
 # unnecessary linking to libgcrypt.
@@ -455,7 +288,7 @@ libbasic_gcrypt = static_library(
 
 basic_compress_sources = files(
         'compress.c',
-        'compress.h')
+)
 
 # A convenience library that is separate from libbasic to avoid unnecessary
 # linking to the compression libraries.
diff --git a/src/boot/meson.build b/src/boot/meson.build
index e4926645f5..eb621c88d7 100644
--- a/src/boot/meson.build
+++ b/src/boot/meson.build
@@ -2,21 +2,12 @@
 
 bootctl_sources = files(
         'bootctl-install.c',
-        'bootctl-install.h',
         'bootctl-random-seed.c',
-        'bootctl-random-seed.h',
         'bootctl-reboot-to-firmware.c',
-        'bootctl-reboot-to-firmware.h',
         'bootctl-set-efivar.c',
-        'bootctl-set-efivar.h',
         'bootctl-status.c',
-        'bootctl-status.h',
         'bootctl-systemd-efi-options.c',
-        'bootctl-systemd-efi-options.h',
         'bootctl-uki.c',
-        'bootctl-uki.h',
         'bootctl-util.c',
-        'bootctl-util.h',
         'bootctl.c',
-        'bootctl.h',
 )
diff --git a/src/busctl/meson.build b/src/busctl/meson.build
index 295dc0926d..e3611b74d7 100644
--- a/src/busctl/meson.build
+++ b/src/busctl/meson.build
@@ -2,11 +2,10 @@
 
 busctl_sources = files(
         'busctl-introspect.c',
-        'busctl-introspect.h',
-        'busctl.c')
+        'busctl.c',
+)
 
 tests += [
         [files('test-busctl-introspect.c',
-               'busctl-introspect.c',
-               'busctl-introspect.h')],
+               'busctl-introspect.c')],
 ]
diff --git a/src/core/meson.build b/src/core/meson.build
index 6fc9089583..981b46fc0b 100644
--- a/src/core/meson.build
+++ b/src/core/meson.build
@@ -2,141 +2,75 @@
 
 libcore_sources = files(
         'apparmor-setup.c',
-        'apparmor-setup.h',
         'audit-fd.c',
-        'audit-fd.h',
         'automount.c',
-        'automount.h',
         'bpf-devices.c',
-        'bpf-devices.h',
         'bpf-firewall.c',
-        'bpf-firewall.h',
         'bpf-foreign.c',
-        'bpf-foreign.h',
         'bpf-lsm.c',
-        'bpf-lsm.h',
         'bpf-socket-bind.c',
-        'bpf-socket-bind.h',
         'cgroup.c',
-        'cgroup.h',
         'core-varlink.c',
-        'core-varlink.h',
         'dbus-automount.c',
-        'dbus-automount.h',
         'dbus-cgroup.c',
-        'dbus-cgroup.h',
         'dbus-device.c',
-        'dbus-device.h',
         'dbus-execute.c',
-        'dbus-execute.h',
         'dbus-job.c',
-        'dbus-job.h',
         'dbus-kill.c',
-        'dbus-kill.h',
         'dbus-manager.c',
-        'dbus-manager.h',
         'dbus-mount.c',
-        'dbus-mount.h',
         'dbus-path.c',
-        'dbus-path.h',
         'dbus-scope.c',
-        'dbus-scope.h',
         'dbus-service.c',
-        'dbus-service.h',
         'dbus-slice.c',
-        'dbus-slice.h',
         'dbus-socket.c',
-        'dbus-socket.h',
         'dbus-swap.c',
-        'dbus-swap.h',
         'dbus-target.c',
-        'dbus-target.h',
         'dbus-timer.c',
-        'dbus-timer.h',
         'dbus-unit.c',
-        'dbus-unit.h',
         'dbus-util.c',
-        'dbus-util.h',
         'dbus.c',
-        'dbus.h',
         'device.c',
-        'device.h',
         'dynamic-user.c',
-        'dynamic-user.h',
         'efi-random.c',
-        'efi-random.h',
         'emergency-action.c',
-        'emergency-action.h',
         'execute.c',
-        'execute.h',
         'generator-setup.c',
-        'generator-setup.h',
         'ima-setup.c',
-        'ima-setup.h',
         'import-creds.c',
-        'import-creds.h',
         'job.c',
-        'job.h',
         'kill.c',
-        'kill.h',
         'kmod-setup.c',
-        'kmod-setup.h',
         'load-dropin.c',
-        'load-dropin.h',
         'load-fragment.c',
-        'load-fragment.h',
         'manager-dump.c',
-        'manager-dump.h',
         'manager-serialize.c',
-        'manager-serialize.h',
         'manager.c',
-        'manager.h',
         'mount.c',
-        'mount.h',
         'namespace.c',
-        'namespace.h',
         'path.c',
-        'path.h',
         'restrict-ifaces.c',
-        'restrict-ifaces.h',
         'scope.c',
-        'scope.h',
         'selinux-access.c',
-        'selinux-access.h',
         'selinux-setup.c',
-        'selinux-setup.h',
         'service.c',
-        'service.h',
         'show-status.c',
-        'show-status.h',
         'slice.c',
-        'slice.h',
         'smack-setup.c',
-        'smack-setup.h',
         'socket.c',
-        'socket.h',
         'swap.c',
-        'swap.h',
         'target.c',
-        'target.h',
         'timer.c',
-        'timer.h',
         'transaction.c',
-        'transaction.h',
         'unit-dependency-atom.c',
-        'unit-dependency-atom.h',
         'unit-printf.c',
-        'unit-printf.h',
         'unit-serialize.c',
-        'unit-serialize.h',
         'unit.c',
-        'unit.h',
 )
 
 if conf.get('BPF_FRAMEWORK') == 1
         libcore_sources += files(
                 'bpf-util.c',
-                'bpf-util.h',
         )
 endif
 
@@ -206,9 +140,7 @@ core_includes = [includes, include_directories('.')]
 
 systemd_sources = files(
         'main.c',
-        'main.h',
         'crash-handler.c',
-        'crash-handler.h',
 )
 
 in_files = [['system.conf',                     pkgsysconfdir],
diff --git a/src/coredump/meson.build b/src/coredump/meson.build
index ff509f9e28..9398a5142b 100644
--- a/src/coredump/meson.build
+++ b/src/coredump/meson.build
@@ -3,7 +3,7 @@
 systemd_coredump_sources = files(
         'coredump.c',
         'coredump-vacuum.c',
-        'coredump-vacuum.h')
+)
 
 coredumpctl_sources = files('coredumpctl.c')
 
@@ -14,7 +14,6 @@ endif
 
 tests += [
         [files('test-coredump-vacuum.c',
-               'coredump-vacuum.c',
-               'coredump-vacuum.h'),
+               'coredump-vacuum.c'),
          [], [], [], '', 'manual'],
 ]
diff --git a/src/cryptenroll/meson.build b/src/cryptenroll/meson.build
index 0a795934e2..9080af0db9 100644
--- a/src/cryptenroll/meson.build
+++ b/src/cryptenroll/meson.build
@@ -1,19 +1,12 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 systemd_cryptenroll_sources = files(
-        'cryptenroll-fido2.h',
         'cryptenroll-list.c',
-        'cryptenroll-list.h',
         'cryptenroll-password.c',
-        'cryptenroll-password.h',
-        'cryptenroll-pkcs11.h',
         'cryptenroll-recovery.c',
-        'cryptenroll-recovery.h',
-        'cryptenroll-tpm2.h',
         'cryptenroll-wipe.c',
-        'cryptenroll-wipe.h',
         'cryptenroll.c',
-        'cryptenroll.h')
+)
 
 if conf.get('HAVE_P11KIT') == 1 and conf.get('HAVE_OPENSSL') == 1
         systemd_cryptenroll_sources += files('cryptenroll-pkcs11.c')
diff --git a/src/cryptsetup/cryptsetup-tokens/meson.build b/src/cryptsetup/cryptsetup-tokens/meson.build
index 42c29f100e..9df3fea5d7 100644
--- a/src/cryptsetup/cryptsetup-tokens/meson.build
+++ b/src/cryptsetup/cryptsetup-tokens/meson.build
@@ -5,8 +5,6 @@ cryptsetup_token_sym_path = meson.current_source_dir() / 'cryptsetup-token.sym'
 
 lib_cryptsetup_token_common = static_library(
         'cryptsetup-token-common',
-        'cryptsetup-token.h',
-        'cryptsetup-token-util.h',
         'cryptsetup-token-util.c',
         include_directories : includes,
         link_with : libshared,
@@ -15,14 +13,14 @@ lib_cryptsetup_token_common = static_library(
 cryptsetup_token_systemd_tpm2_sources = files(
         'cryptsetup-token-systemd-tpm2.c',
         'luks2-tpm2.c',
-        'luks2-tpm2.h')
+)
 
 cryptsetup_token_systemd_fido2_sources = files(
         'cryptsetup-token-systemd-fido2.c',
         'luks2-fido2.c',
-        'luks2-fido2.h')
+)
 
 cryptsetup_token_systemd_pkcs11_sources = files(
         'cryptsetup-token-systemd-pkcs11.c',
         'luks2-pkcs11.c',
-        'luks2-pkcs11.h')
+)
diff --git a/src/cryptsetup/meson.build b/src/cryptsetup/meson.build
index ba8e01a198..45c4154c95 100644
--- a/src/cryptsetup/meson.build
+++ b/src/cryptsetup/meson.build
@@ -2,10 +2,8 @@
 
 systemd_cryptsetup_sources = files(
         'cryptsetup-keyfile.c',
-        'cryptsetup-keyfile.h',
-        'cryptsetup-pkcs11.h',
-        'cryptsetup-tpm2.h',
-        'cryptsetup.c')
+        'cryptsetup.c',
+)
 
 if conf.get('HAVE_P11KIT') == 1
         systemd_cryptsetup_sources += files('cryptsetup-pkcs11.c')
diff --git a/src/home/meson.build b/src/home/meson.build
index 3d3a2bc82a..475faaefea 100644
--- a/src/home/meson.build
+++ b/src/home/meson.build
@@ -4,27 +4,15 @@ home_includes = [includes, include_directories('.')]
 
 systemd_homework_sources = files(
         'home-util.c',
-        'home-util.h',
         'homework-cifs.c',
-        'homework-cifs.h',
         'homework-directory.c',
-        'homework-directory.h',
-        'homework-fido2.h',
         'homework-fscrypt.c',
-        'homework-fscrypt.h',
         'homework-luks.c',
-        'homework-luks.h',
         'homework-mount.c',
-        'homework-mount.h',
         'homework-password-cache.c',
-        'homework-password-cache.h',
-        'homework-pkcs11.h',
         'homework-quota.c',
-        'homework-quota.h',
         'homework.c',
-        'homework.h',
         'user-record-util.c',
-        'user-record-util.h',
 )
 
 if conf.get('HAVE_P11KIT') == 1
@@ -36,30 +24,18 @@ endif
 
 systemd_homed_sources = files(
         'home-util.c',
-        'home-util.h',
         'homed-bus.c',
-        'homed-bus.h',
         'homed-conf.c',
-        'homed-conf.h',
         'homed-home-bus.c',
-        'homed-home-bus.h',
         'homed-home.c',
-        'homed-home.h',
         'homed-manager-bus.c',
-        'homed-manager-bus.h',
         'homed-manager.c',
-        'homed-manager.h',
         'homed-operation.c',
-        'homed-operation.h',
         'homed-varlink.c',
-        'homed-varlink.h',
         'homed.c',
         'user-record-pwquality.c',
-        'user-record-pwquality.h',
         'user-record-sign.c',
-        'user-record-sign.h',
         'user-record-util.c',
-        'user-record-util.h',
 )
 
 homed_gperf_c = custom_target(
@@ -72,27 +48,19 @@ systemd_homed_sources += [homed_gperf_c]
 
 homectl_sources = files(
         'home-util.c',
-        'home-util.h',
         'homectl-fido2.c',
-        'homectl-fido2.h',
         'homectl-pkcs11.c',
-        'homectl-pkcs11.h',
         'homectl-recovery-key.c',
-        'homectl-recovery-key.h',
         'homectl.c',
         'user-record-pwquality.c',
-        'user-record-pwquality.h',
         'user-record-util.c',
-        'user-record-util.h',
 )
 
 pam_systemd_home_sym = 'src/home/pam_systemd_home.sym'
 pam_systemd_home_c = files(
         'home-util.c',
-        'home-util.h',
         'pam_systemd_home.c',
         'user-record-util.c',
-        'user-record-util.h',
 )
 
 if conf.get('ENABLE_HOMED') == 1
diff --git a/src/import/meson.build b/src/import/meson.build
index 7e923072a9..41595c81c6 100644
--- a/src/import/meson.build
+++ b/src/import/meson.build
@@ -6,22 +6,17 @@ systemd_importd_sources = files(
 systemd_pull_sources = files(
         'pull.c',
         'pull-raw.c',
-        'pull-raw.h',
         'pull-tar.c',
-        'pull-tar.h',
         'pull-job.c',
-        'pull-job.h',
         'pull-common.c',
-        'pull-common.h',
         'curl-util.c',
-        'curl-util.h')
+)
 
 systemd_import_sources = files(
         'import.c',
         'import-raw.c',
-        'import-raw.h',
         'import-tar.c',
-        'import-tar.h')
+)
 
 systemd_import_fs_sources = files(
         'import-fs.c')
@@ -29,19 +24,15 @@ systemd_import_fs_sources = files(
 systemd_export_sources = files(
         'export.c',
         'export-tar.c',
-        'export-tar.h',
         'export-raw.c',
-        'export-raw.h')
+)
 
 if conf.get('ENABLE_IMPORTD') == 1
         lib_import_common = static_library(
                 'import-common',
                 'import-common.c',
-                'import-common.h',
                 'import-compress.c',
-                'import-compress.h',
                 'qcow2-util.c',
-                'qcow2-util.h',
                 include_directories : includes,
                 dependencies : [libbzip2,
                                 libxz,
@@ -62,8 +53,7 @@ endif
 
 tests += [
         [files('test-qcow2.c',
-               'qcow2-util.c',
-               'qcow2-util.h'),
+               'qcow2-util.c'),
          [],
          [libz],
          [], 'HAVE_ZLIB', 'manual'],
diff --git a/src/journal-remote/meson.build b/src/journal-remote/meson.build
index f81d906616..ac375741b0 100644
--- a/src/journal-remote/meson.build
+++ b/src/journal-remote/meson.build
@@ -1,23 +1,18 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 systemd_journal_upload_sources = files(
-        'journal-upload.h',
-        'journal-upload.c',
         'journal-upload-journal.c',
+        'journal-upload.c',
 )
 
 libsystemd_journal_remote_sources = files(
-        'journal-remote-parse.h',
         'journal-remote-parse.c',
-        'journal-remote-write.h',
         'journal-remote-write.c',
-        'journal-remote.h',
         'journal-remote.c',
 )
 
 if conf.get('HAVE_MICROHTTPD') == 1
         libsystemd_journal_remote_sources += files(
-                'microhttpd-util.h',
                 'microhttpd-util.c',
         )
 endif
@@ -38,7 +33,6 @@ systemd_journal_remote_sources = files('journal-remote-main.c')
 
 systemd_journal_gatewayd_sources = files(
         'journal-gatewayd.c',
-        'microhttpd-util.h',
         'microhttpd-util.c',
 )
 
diff --git a/src/journal/meson.build b/src/journal/meson.build
index 9abab298cc..30cebe4d44 100644
--- a/src/journal/meson.build
+++ b/src/journal/meson.build
@@ -2,29 +2,17 @@
 
 sources = files(
         'journald-audit.c',
-        'journald-audit.h',
         'journald-client.c',
-        'journald-client.h',
         'journald-console.c',
-        'journald-console.h',
         'journald-context.c',
-        'journald-context.h',
         'journald-kmsg.c',
-        'journald-kmsg.h',
         'journald-native.c',
-        'journald-native.h',
         'journald-rate-limit.c',
-        'journald-rate-limit.h',
         'journald-server.c',
-        'journald-server.h',
         'journald-stream.c',
-        'journald-stream.h',
         'journald-syslog.c',
-        'journald-syslog.h',
         'journald-wall.c',
-        'journald-wall.h',
         'managed-journal-file.c',
-        'managed-journal-file.h',
 )
 
 sources += custom_target(
@@ -44,7 +32,6 @@ journal_includes = [includes, include_directories('.')]
 
 systemd_journald_sources = files(
         'journald.c',
-        'journald-server.h',
 )
 
 systemd_cat_sources = files('cat.c')
diff --git a/src/libsystemd-network/meson.build b/src/libsystemd-network/meson.build
index ff59ec0f37..5f203f5cda 100644
--- a/src/libsystemd-network/meson.build
+++ b/src/libsystemd-network/meson.build
@@ -2,39 +2,19 @@
 
 sources = files(
         'arp-util.c',
-        'arp-util.h',
-        'dhcp-client-internal.h',
         'dhcp-identifier.c',
-        'dhcp-identifier.h',
-        'dhcp-internal.h',
-        'dhcp-lease-internal.h',
         'dhcp-network.c',
         'dhcp-option.c',
         'dhcp-packet.c',
-        'dhcp-protocol.h',
-        'dhcp-server-internal.h',
-        'dhcp6-internal.h',
-        'dhcp6-lease-internal.h',
         'dhcp6-network.c',
         'dhcp6-option.c',
-        'dhcp6-option.h',
         'dhcp6-protocol.c',
-        'dhcp6-protocol.h',
         'icmp6-util.c',
-        'icmp6-util.h',
         'lldp-neighbor.c',
-        'lldp-neighbor.h',
         'lldp-network.c',
-        'lldp-network.h',
-        'lldp-rx-internal.h',
-        'ndisc-internal.h',
         'ndisc-router.c',
-        'ndisc-router.h',
         'network-common.c',
-        'network-common.h',
         'network-internal.c',
-        'network-internal.h',
-        'radv-internal.h',
         'sd-dhcp-client.c',
         'sd-dhcp-lease.c',
         'sd-dhcp-server.c',
diff --git a/src/libsystemd/meson.build b/src/libsystemd/meson.build
index 7fdffec2ea..e2eb88f9fd 100644
--- a/src/libsystemd/meson.build
+++ b/src/libsystemd/meson.build
@@ -2,32 +2,20 @@
 
 sd_journal_sources = files(
         'sd-journal/audit-type.c',
-        'sd-journal/audit-type.h',
         'sd-journal/catalog.c',
-        'sd-journal/catalog.h',
-        'sd-journal/journal-def.h',
         'sd-journal/journal-file.c',
-        'sd-journal/journal-file.h',
-        'sd-journal/journal-internal.h',
         'sd-journal/journal-send.c',
-        'sd-journal/journal-send.h',
         'sd-journal/journal-vacuum.c',
-        'sd-journal/journal-vacuum.h',
         'sd-journal/journal-verify.c',
-        'sd-journal/journal-verify.h',
         'sd-journal/lookup3.c',
-        'sd-journal/lookup3.h',
         'sd-journal/mmap-cache.c',
-        'sd-journal/mmap-cache.h',
         'sd-journal/sd-journal.c',
 )
 
 if conf.get('HAVE_GCRYPT') == 1
         sd_journal_sources += files(
                 'sd-journal/fsprg.c',
-                'sd-journal/fsprg.h',
                 'sd-journal/journal-authenticate.c',
-                'sd-journal/journal-authenticate.h',
         )
 endif
 
@@ -58,7 +46,6 @@ sd_journal_sources += [audit_type_to_name]
 
 id128_sources = files(
         'sd-id128/id128-util.c',
-        'sd-id128/id128-util.h',
         'sd-id128/sd-id128.c',
 )
 
@@ -69,9 +56,7 @@ sd_daemon_sources = files('sd-daemon/sd-daemon.c')
 ############################################################
 
 sd_event_sources = files(
-        'sd-event/event-source.h',
         'sd-event/event-util.c',
-        'sd-event/event-util.h',
         'sd-event/sd-event.c',
 )
 
@@ -83,79 +68,46 @@ sd_login_sources = files('sd-login/sd-login.c')
 
 libsystemd_sources = files(
         'sd-bus/bus-common-errors.c',
-        'sd-bus/bus-common-errors.h',
         'sd-bus/bus-container.c',
-        'sd-bus/bus-container.h',
         'sd-bus/bus-control.c',
-        'sd-bus/bus-control.h',
         'sd-bus/bus-convenience.c',
         'sd-bus/bus-creds.c',
-        'sd-bus/bus-creds.h',
         'sd-bus/bus-dump.c',
-        'sd-bus/bus-dump.h',
         'sd-bus/bus-error.c',
-        'sd-bus/bus-error.h',
         'sd-bus/bus-internal.c',
-        'sd-bus/bus-internal.h',
         'sd-bus/bus-introspect.c',
-        'sd-bus/bus-introspect.h',
         'sd-bus/bus-kernel.c',
-        'sd-bus/bus-kernel.h',
         'sd-bus/bus-match.c',
-        'sd-bus/bus-match.h',
         'sd-bus/bus-message.c',
-        'sd-bus/bus-message.h',
         'sd-bus/bus-objects.c',
-        'sd-bus/bus-objects.h',
-        'sd-bus/bus-protocol.h',
         'sd-bus/bus-signature.c',
-        'sd-bus/bus-signature.h',
         'sd-bus/bus-slot.c',
-        'sd-bus/bus-slot.h',
         'sd-bus/bus-socket.c',
-        'sd-bus/bus-socket.h',
         'sd-bus/bus-track.c',
-        'sd-bus/bus-track.h',
         'sd-bus/bus-type.c',
-        'sd-bus/bus-type.h',
         'sd-bus/sd-bus.c',
-        'sd-device/device-enumerator-private.h',
         'sd-device/device-enumerator.c',
         'sd-device/device-filter.c',
-        'sd-device/device-filter.h',
-        'sd-device/device-internal.h',
-        'sd-device/device-monitor-private.h',
         'sd-device/device-monitor.c',
         'sd-device/device-private.c',
-        'sd-device/device-private.h',
         'sd-device/device-util.c',
-        'sd-device/device-util.h',
         'sd-device/sd-device.c',
-        'sd-hwdb/hwdb-internal.h',
         'sd-hwdb/sd-hwdb.c',
         'sd-netlink/netlink-genl.c',
-        'sd-netlink/netlink-genl.h',
-        'sd-netlink/netlink-internal.h',
         'sd-netlink/netlink-message-nfnl.c',
         'sd-netlink/netlink-message-rtnl.c',
         'sd-netlink/netlink-message.c',
         'sd-netlink/netlink-slot.c',
-        'sd-netlink/netlink-slot.h',
         'sd-netlink/netlink-socket.c',
         'sd-netlink/netlink-types-genl.c',
-        'sd-netlink/netlink-types-internal.h',
         'sd-netlink/netlink-types-nfnl.c',
         'sd-netlink/netlink-types-rtnl.c',
         'sd-netlink/netlink-types.c',
-        'sd-netlink/netlink-types.h',
         'sd-netlink/netlink-util.c',
-        'sd-netlink/netlink-util.h',
         'sd-netlink/sd-netlink.c',
         'sd-network/network-util.c',
-        'sd-network/network-util.h',
         'sd-network/sd-network.c',
         'sd-path/sd-path.c',
-        'sd-resolve/resolve-private.h',
         'sd-resolve/sd-resolve.c',
 ) + sd_journal_sources + id128_sources + sd_daemon_sources + sd_event_sources + sd_login_sources
 
@@ -259,8 +211,7 @@ tests += [
          [],
          [threads]],
 
-        [files('sd-bus/test-bus-vtable.c',
-               'sd-bus/test-vtable-data.h')],
+        [files('sd-bus/test-bus-vtable.c')],
 
         [files('sd-bus/test-bus-creds.c')],
 
@@ -271,8 +222,7 @@ tests += [
          [threads],
          [], '', 'manual'],
 
-        [files('sd-bus/test-bus-introspect.c',
-               'sd-bus/test-vtable-data.h')],
+        [files('sd-bus/test-bus-introspect.c')],
 
         [files('sd-event/test-event.c')],
 
diff --git a/src/libudev/meson.build b/src/libudev/meson.build
index 92d54078f0..35c024a0e7 100644
--- a/src/libudev/meson.build
+++ b/src/libudev/meson.build
@@ -2,17 +2,14 @@
 
 libudev_sources = files(
         'libudev-device.c',
-        'libudev-device-internal.h',
         'libudev-enumerate.c',
         'libudev-hwdb.c',
         'libudev-list.c',
-        'libudev-list-internal.h',
         'libudev-monitor.c',
         'libudev-queue.c',
         'libudev-util.c',
-        'libudev-util.h',
         'libudev.c',
-        'libudev.h')
+)
 
 ############################################################
 
diff --git a/src/locale/meson.build b/src/locale/meson.build
index c1ae34069c..fcf2798dd1 100644
--- a/src/locale/meson.build
+++ b/src/locale/meson.build
@@ -2,7 +2,6 @@
 
 systemd_localed_sources = files(
         'localed-util.c',
-        'localed-util.h',
         'localed.c',
 )
 
@@ -31,6 +30,5 @@ endif
 
 tests += [
         [files('test-localed-util.c',
-               'localed-util.c',
-               'localed-util.h')],
+               'localed-util.c')],
 ]
diff --git a/src/login/meson.build b/src/login/meson.build
index 1245c050d9..c93a2fd4c6 100644
--- a/src/login/meson.build
+++ b/src/login/meson.build
@@ -2,7 +2,6 @@
 
 systemd_logind_sources = files(
         'logind.c',
-        'logind.h',
 )
 
 logind_gperf_c = custom_target(
@@ -13,34 +12,20 @@ logind_gperf_c = custom_target(
 
 liblogind_core_sources = files(
         'logind-action.c',
-        'logind-action.h',
         'logind-brightness.c',
-        'logind-brightness.h',
         'logind-button.c',
-        'logind-button.h',
         'logind-core.c',
         'logind-dbus.c',
-        'logind-dbus.h',
         'logind-device.c',
-        'logind-device.h',
         'logind-inhibit.c',
-        'logind-inhibit.h',
         'logind-polkit.c',
-        'logind-polkit.h',
         'logind-seat-dbus.c',
-        'logind-seat-dbus.h',
         'logind-seat.c',
-        'logind-seat.h',
         'logind-session-dbus.c',
-        'logind-session-dbus.h',
         'logind-session-device.c',
-        'logind-session-device.h',
         'logind-session.c',
-        'logind-session.h',
         'logind-user-dbus.c',
-        'logind-user-dbus.h',
         'logind-user.c',
-        'logind-user.h',
         'logind-utmp.c',
 )
 
@@ -55,7 +40,6 @@ liblogind_core = static_library(
 
 loginctl_sources = files(
         'loginctl.c',
-        'sysfs-show.h',
         'sysfs-show.c',
 )
 
diff --git a/src/machine/meson.build b/src/machine/meson.build
index 6297765113..01d0bedd09 100644
--- a/src/machine/meson.build
+++ b/src/machine/meson.build
@@ -2,22 +2,16 @@
 
 systemd_machined_sources = files(
         'machined.c',
-        'machined.h',
 )
 
 libmachine_core_sources = files(
         'image-dbus.c',
-        'image-dbus.h',
         'machine-dbus.c',
-        'machine-dbus.h',
         'machine.c',
-        'machine.h',
         'machined-core.c',
         'machined-dbus.c',
         'machined-varlink.c',
-        'machined-varlink.h',
         'operation.c',
-        'operation.h',
 )
 
 libmachine_core = static_library(
diff --git a/src/network/meson.build b/src/network/meson.build
index b09c18dbbd..f48c4ed182 100644
--- a/src/network/meson.build
+++ b/src/network/meson.build
@@ -2,206 +2,108 @@
 
 sources = files(
         'netdev/bareudp.c',
-        'netdev/bareudp.h',
         'netdev/batadv.c',
-        'netdev/batadv.h',
         'netdev/bond.c',
-        'netdev/bond.h',
         'netdev/bridge.c',
-        'netdev/bridge.h',
         'netdev/dummy.c',
-        'netdev/dummy.h',
         'netdev/fou-tunnel.c',
-        'netdev/fou-tunnel.h',
         'netdev/geneve.c',
-        'netdev/geneve.h',
         'netdev/ifb.c',
-        'netdev/ifb.h',
         'netdev/ipoib.c',
-        'netdev/ipoib.h',
         'netdev/ipvlan.c',
-        'netdev/ipvlan.h',
         'netdev/l2tp-tunnel.c',
-        'netdev/l2tp-tunnel.h',
         'netdev/macsec.c',
-        'netdev/macsec.h',
         'netdev/macvlan.c',
-        'netdev/macvlan.h',
         'netdev/netdev-util.c',
-        'netdev/netdev-util.h',
         'netdev/netdev.c',
-        'netdev/netdev.h',
         'netdev/netdevsim.c',
-        'netdev/netdevsim.h',
         'netdev/nlmon.c',
-        'netdev/nlmon.h',
         'netdev/tunnel.c',
-        'netdev/tunnel.h',
         'netdev/tuntap.c',
-        'netdev/tuntap.h',
         'netdev/vcan.c',
-        'netdev/vcan.h',
         'netdev/veth.c',
-        'netdev/veth.h',
         'netdev/vlan.c',
-        'netdev/vlan.h',
         'netdev/vrf.c',
-        'netdev/vrf.h',
         'netdev/vxcan.c',
-        'netdev/vxcan.h',
         'netdev/vxlan.c',
-        'netdev/vxlan.h',
         'netdev/wireguard.c',
-        'netdev/wireguard.h',
         'netdev/wlan.c',
-        'netdev/wlan.h',
         'netdev/xfrm.c',
-        'netdev/xfrm.h',
         'networkd-address-generation.c',
-        'networkd-address-generation.h',
         'networkd-address-label.c',
-        'networkd-address-label.h',
         'networkd-address-pool.c',
-        'networkd-address-pool.h',
         'networkd-address.c',
-        'networkd-address.h',
         'networkd-bridge-fdb.c',
-        'networkd-bridge-fdb.h',
         'networkd-bridge-mdb.c',
-        'networkd-bridge-mdb.h',
         'networkd-bridge-vlan.c',
-        'networkd-bridge-vlan.h',
         'networkd-can.c',
-        'networkd-can.h',
         'networkd-conf.c',
-        'networkd-conf.h',
         'networkd-dhcp-common.c',
-        'networkd-dhcp-common.h',
         'networkd-dhcp-prefix-delegation.c',
-        'networkd-dhcp-prefix-delegation.h',
         'networkd-dhcp-server-bus.c',
-        'networkd-dhcp-server-bus.h',
         'networkd-dhcp-server-static-lease.c',
-        'networkd-dhcp-server-static-lease.h',
         'networkd-dhcp-server.c',
-        'networkd-dhcp-server.h',
         'networkd-dhcp4.c',
-        'networkd-dhcp4.h',
         'networkd-dhcp6.c',
-        'networkd-dhcp6.h',
         'networkd-ipv4acd.c',
-        'networkd-ipv4acd.h',
         'networkd-ipv4ll.c',
-        'networkd-ipv4ll.h',
         'networkd-ipv6-proxy-ndp.c',
-        'networkd-ipv6-proxy-ndp.h',
         'networkd-ipv6ll.c',
-        'networkd-ipv6ll.h',
         'networkd-json.c',
-        'networkd-json.h',
         'networkd-link-bus.c',
-        'networkd-link-bus.h',
         'networkd-link.c',
-        'networkd-link.h',
         'networkd-lldp-rx.c',
-        'networkd-lldp-rx.h',
         'networkd-lldp-tx.c',
-        'networkd-lldp-tx.h',
         'networkd-manager-bus.c',
-        'networkd-manager-bus.h',
         'networkd-manager.c',
-        'networkd-manager.h',
         'networkd-ndisc.c',
-        'networkd-ndisc.h',
         'networkd-neighbor.c',
-        'networkd-neighbor.h',
         'networkd-netlabel.c',
-        'networkd-netlabel.h',
         'networkd-network-bus.c',
-        'networkd-network-bus.h',
         'networkd-network.c',
-        'networkd-network.h',
         'networkd-nexthop.c',
-        'networkd-nexthop.h',
         'networkd-queue.c',
-        'networkd-queue.h',
         'networkd-radv.c',
-        'networkd-radv.h',
         'networkd-route-util.c',
-        'networkd-route-util.h',
         'networkd-route.c',
-        'networkd-route.h',
         'networkd-routing-policy-rule.c',
-        'networkd-routing-policy-rule.h',
         'networkd-setlink.c',
-        'networkd-setlink.h',
         'networkd-speed-meter.c',
-        'networkd-speed-meter.h',
         'networkd-sriov.c',
-        'networkd-sriov.h',
         'networkd-state-file.c',
-        'networkd-state-file.h',
         'networkd-sysctl.c',
-        'networkd-sysctl.h',
         'networkd-util.c',
-        'networkd-util.h',
         'networkd-wifi.c',
-        'networkd-wifi.h',
         'networkd-wiphy.c',
-        'networkd-wiphy.h',
         'tc/cake.c',
-        'tc/cake.h',
         'tc/codel.c',
-        'tc/codel.h',
         'tc/drr.c',
-        'tc/drr.h',
         'tc/ets.c',
-        'tc/ets.h',
         'tc/fifo.c',
-        'tc/fifo.h',
         'tc/fq-codel.c',
-        'tc/fq-codel.h',
         'tc/fq-pie.c',
-        'tc/fq-pie.h',
         'tc/fq.c',
-        'tc/fq.h',
         'tc/gred.c',
-        'tc/gred.h',
         'tc/hhf.c',
-        'tc/hhf.h',
         'tc/htb.c',
-        'tc/htb.h',
         'tc/netem.c',
-        'tc/netem.h',
         'tc/pie.c',
-        'tc/pie.h',
         'tc/qdisc.c',
-        'tc/qdisc.h',
         'tc/qfq.c',
-        'tc/qfq.h',
         'tc/sfb.c',
-        'tc/sfb.h',
         'tc/sfq.c',
-        'tc/sfq.h',
         'tc/tbf.c',
-        'tc/tbf.h',
         'tc/tc-util.c',
-        'tc/tc-util.h',
         'tc/tc.c',
-        'tc/tc.h',
         'tc/tclass.c',
-        'tc/tclass.h',
         'tc/teql.c',
-        'tc/teql.h',
 )
 
 systemd_networkd_sources = files('networkd.c')
 
 systemd_networkd_wait_online_sources = files(
         'wait-online/link.c',
-        'wait-online/link.h',
         'wait-online/manager.c',
-        'wait-online/manager.h',
         'wait-online/wait-online.c',
 )
 
@@ -210,7 +112,6 @@ networkctl_sources = files('networkctl.c')
 network_generator_sources = files(
         'generator/main.c',
         'generator/network-generator.c',
-        'generator/network-generator.h',
 )
 
 sources += custom_target(
@@ -318,6 +219,5 @@ tests += [
          network_includes],
 
         [files('generator/test-network-generator.c',
-               'generator/network-generator.c',
-               'generator/network-generator.h')],
+               'generator/network-generator.c')],
 ]
diff --git a/src/nspawn/meson.build b/src/nspawn/meson.build
index f6cca7099b..36f0a92686 100644
--- a/src/nspawn/meson.build
+++ b/src/nspawn/meson.build
@@ -2,35 +2,19 @@
 
 libnspawn_core_sources = files(
         'nspawn-bind-user.c',
-        'nspawn-bind-user.h',
         'nspawn-cgroup.c',
-        'nspawn-cgroup.h',
         'nspawn-creds.c',
-        'nspawn-creds.h',
-        'nspawn-def.h',
         'nspawn-expose-ports.c',
-        'nspawn-expose-ports.h',
         'nspawn-mount.c',
-        'nspawn-mount.h',
         'nspawn-network.c',
-        'nspawn-network.h',
         'nspawn-oci.c',
-        'nspawn-oci.h',
         'nspawn-patch-uid.c',
-        'nspawn-patch-uid.h',
         'nspawn-register.c',
-        'nspawn-register.h',
         'nspawn-seccomp.c',
-        'nspawn-seccomp.h',
         'nspawn-settings.c',
-        'nspawn-settings.h',
         'nspawn-setuid.c',
-        'nspawn-setuid.h',
         'nspawn-stub-pid1.c',
-        'nspawn-stub-pid1.h',
         'nspawn-util.c',
-        'nspawn-util.h',
-        'nspawn.h',
 )
 
 nspawn_gperf_c = custom_target(
diff --git a/src/oom/meson.build b/src/oom/meson.build
index 12035183de..1c4e7f1e64 100644
--- a/src/oom/meson.build
+++ b/src/oom/meson.build
@@ -2,11 +2,8 @@
 
 systemd_oomd_sources = files(
         'oomd-manager-bus.c',
-        'oomd-manager-bus.h',
         'oomd-manager.c',
-        'oomd-manager.h',
         'oomd-util.c',
-        'oomd-util.h',
         'oomd.c',
 )
 
@@ -27,8 +24,7 @@ endif
 
 tests += [
         [files('test-oomd-util.c',
-               'oomd-util.c',
-               'oomd-util.h'),
+               'oomd-util.c'),
 	 [],
 	 [libatomic]]
 ]
diff --git a/src/portable/meson.build b/src/portable/meson.build
index 61f7924801..3a151d498e 100644
--- a/src/portable/meson.build
+++ b/src/portable/meson.build
@@ -2,16 +2,11 @@
 
 systemd_portabled_sources = files(
         'portable.c',
-        'portable.h',
         'portabled-bus.c',
         'portabled-image-bus.c',
-        'portabled-image-bus.h',
         'portabled-image.c',
-        'portabled-image.h',
         'portabled-operation.c',
-        'portabled-operation.h',
         'portabled.c',
-        'portabled.h',
 )
 
 if conf.get('ENABLE_PORTABLED') == 1
diff --git a/src/resolve/meson.build b/src/resolve/meson.build
index cd02c88039..331c925814 100644
--- a/src/resolve/meson.build
+++ b/src/resolve/meson.build
@@ -4,79 +4,44 @@ resolve_includes = [includes, include_directories('.')]
 
 basic_dns_sources = files(
         'resolved-dns-dnssec.c',
-        'resolved-dns-dnssec.h',
         'resolved-dns-packet.c',
-        'resolved-dns-packet.h',
         'resolved-dns-rr.c',
-        'resolved-dns-rr.h',
         'resolved-dns-answer.c',
-        'resolved-dns-answer.h',
         'resolved-dns-question.c',
-        'resolved-dns-question.h',
         'resolved-util.c',
-        'resolved-util.h',
         'dns-type.c',
-        'dns-type.h',
 )
 
 systemd_resolved_sources = files(
         'resolved-bus.c',
-        'resolved-bus.h',
         'resolved-conf.c',
-        'resolved-conf.h',
-        'resolved-def.h',
         'resolved-dns-cache.c',
-        'resolved-dns-cache.h',
         'resolved-dns-query.c',
-        'resolved-dns-query.h',
         'resolved-dns-scope.c',
-        'resolved-dns-scope.h',
         'resolved-dns-search-domain.c',
-        'resolved-dns-search-domain.h',
         'resolved-dns-server.c',
-        'resolved-dns-server.h',
         'resolved-dns-stream.c',
-        'resolved-dns-stream.h',
         'resolved-dns-stub.c',
-        'resolved-dns-stub.h',
         'resolved-dns-synthesize.c',
-        'resolved-dns-synthesize.h',
         'resolved-dns-transaction.c',
-        'resolved-dns-transaction.h',
         'resolved-dns-trust-anchor.c',
-        'resolved-dns-trust-anchor.h',
         'resolved-dns-zone.c',
-        'resolved-dns-zone.h',
         'resolved-dnssd-bus.c',
-        'resolved-dnssd-bus.h',
         'resolved-dnssd.c',
-        'resolved-dnssd.h',
-        'resolved-dnstls.h',
         'resolved-etc-hosts.c',
-        'resolved-etc-hosts.h',
         'resolved-link-bus.c',
-        'resolved-link-bus.h',
         'resolved-link.c',
-        'resolved-link.h',
         'resolved-llmnr.c',
-        'resolved-llmnr.h',
         'resolved-manager.c',
-        'resolved-manager.h',
         'resolved-mdns.c',
-        'resolved-mdns.h',
         'resolved-resolv-conf.c',
-        'resolved-resolv-conf.h',
         'resolved-socket-graveyard.c',
-        'resolved-socket-graveyard.h',
         'resolved-varlink.c',
-        'resolved-varlink.h',
 )
 
 resolvectl_sources = files(
-         'resolvconf-compat.c',
-         'resolvconf-compat.h',
-         'resolvectl.c',
-         'resolvectl.h',
+        'resolvconf-compat.c',
+        'resolvectl.c',
 )
 
 ############################################################
@@ -139,13 +104,11 @@ if conf.get('ENABLE_DNS_OVER_TLS') == 1
         if conf.get('DNS_OVER_TLS_USE_GNUTLS') == 1
                 systemd_resolved_sources += files(
                         'resolved-dnstls-gnutls.c',
-                        'resolved-dnstls-gnutls.h',
                 )
                 systemd_resolved_dependencies += libgnutls
         elif conf.get('DNS_OVER_TLS_USE_OPENSSL') == 1
                 systemd_resolved_sources += files(
                         'resolved-dnstls-openssl.c',
-                        'resolved-dnstls-openssl.h',
                 )
                 systemd_resolved_dependencies += libopenssl
         else
@@ -188,8 +151,7 @@ tests += [
           libm]],
 
         [files('test-resolved-etc-hosts.c',
-               'resolved-etc-hosts.c',
-               'resolved-etc-hosts.h'),
+               'resolved-etc-hosts.c'),
          [libsystemd_resolve_core,
           libshared],
          [lib_openssl_or_gcrypt,
@@ -231,8 +193,7 @@ fuzzers += [
          [lib_openssl_or_gcrypt,
           libm]],
         [files('fuzz-etc-hosts.c',
-          'resolved-etc-hosts.c',
-          'resolved-etc-hosts.h'),
+          'resolved-etc-hosts.c'),
          [libsystemd_resolve_core,
           libshared],
          [lib_openssl_or_gcrypt,
diff --git a/src/shared/meson.build b/src/shared/meson.build
index bc1cfa5b4b..f6689788ee 100644
--- a/src/shared/meson.build
+++ b/src/shared/meson.build
@@ -1,358 +1,174 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 shared_sources = files(
-        'acl-util.h',
         'acpi-fpdt.c',
-        'acpi-fpdt.h',
         'apparmor-util.c',
-        'apparmor-util.h',
         'ask-password-api.c',
-        'ask-password-api.h',
         'barrier.c',
-        'barrier.h',
         'base-filesystem.c',
-        'base-filesystem.h',
         'binfmt-util.c',
-        'binfmt-util.h',
         'bitmap.c',
-        'bitmap.h',
-        'blkid-util.h',
         'blockdev-util.c',
-        'blockdev-util.h',
         'bond-util.c',
-        'bond-util.h',
         'boot-timestamps.c',
-        'boot-timestamps.h',
         'bootspec.c',
-        'bootspec.h',
         'bpf-dlopen.c',
-        'bpf-dlopen.h',
         'bpf-program.c',
-        'bpf-program.h',
         'bridge-util.c',
-        'bridge-util.h',
         'btrfs-util.c',
-        'btrfs-util.h',
         'bus-get-properties.c',
-        'bus-get-properties.h',
         'bus-locator.c',
-        'bus-locator.h',
         'bus-log-control-api.c',
-        'bus-log-control-api.h',
         'bus-map-properties.c',
-        'bus-map-properties.h',
         'bus-message-util.c',
-        'bus-message-util.h',
         'bus-object.c',
-        'bus-object.h',
         'bus-polkit.c',
-        'bus-polkit.h',
         'bus-print-properties.c',
-        'bus-print-properties.h',
         'bus-unit-procs.c',
-        'bus-unit-procs.h',
         'bus-unit-util.c',
-        'bus-unit-util.h',
         'bus-util.c',
-        'bus-util.h',
         'bus-wait-for-jobs.c',
-        'bus-wait-for-jobs.h',
         'bus-wait-for-units.c',
-        'bus-wait-for-units.h',
         'calendarspec.c',
-        'calendarspec.h',
         'cgroup-setup.c',
-        'cgroup-setup.h',
         'cgroup-show.c',
-        'cgroup-show.h',
         'chown-recursive.c',
-        'chown-recursive.h',
         'clean-ipc.c',
-        'clean-ipc.h',
         'clock-util.c',
-        'clock-util.h',
         'compare-operator.c',
-        'compare-operator.h',
         'condition.c',
-        'condition.h',
         'conf-parser.c',
-        'conf-parser.h',
         'copy.c',
-        'copy.h',
         'coredump-util.c',
-        'coredump-util.h',
         'cpu-set-util.c',
-        'cpu-set-util.h',
         'creds-util.c',
-        'creds-util.h',
-        'cryptsetup-fido2.h',
         'cryptsetup-util.c',
-        'cryptsetup-util.h',
         'daemon-util.c',
-        'daemon-util.h',
         'data-fd-util.c',
-        'data-fd-util.h',
         'dev-setup.c',
-        'dev-setup.h',
         'device-nodes.c',
-        'device-nodes.h',
-        'devnode-acl.h',
         'discover-image.c',
-        'discover-image.h',
         'dissect-image.c',
-        'dissect-image.h',
         'dlfcn-util.c',
-        'dlfcn-util.h',
         'dm-util.c',
-        'dm-util.h',
         'dns-domain.c',
-        'dns-domain.h',
         'dropin.c',
-        'dropin.h',
         'efi-api.c',
-        'efi-api.h',
         'efi-loader.c',
-        'efi-loader.h',
         'elf-util.c',
-        'elf-util.h',
         'enable-mempool.c',
         'env-file-label.c',
-        'env-file-label.h',
         'ethtool-util.c',
-        'ethtool-util.h',
         'exec-util.c',
-        'exec-util.h',
         'exit-status.c',
-        'exit-status.h',
         'extension-release.c',
-        'extension-release.h',
         'fdset.c',
-        'fdset.h',
         'fileio-label.c',
-        'fileio-label.h',
         'find-esp.c',
-        'find-esp.h',
         'firewall-util-nft.c',
-        'firewall-util-private.h',
         'firewall-util.c',
-        'firewall-util.h',
         'format-table.c',
-        'format-table.h',
-        'fsck-util.h',
         'fstab-util.c',
-        'fstab-util.h',
         'generator.c',
-        'generator.h',
         'geneve-util.c',
-        'geneve-util.h',
         'gpt.c',
-        'gpt.h',
         'group-record.c',
-        'group-record.h',
         'hostname-setup.c',
-        'hostname-setup.h',
         'hwdb-util.c',
-        'hwdb-util.h',
         'id128-print.c',
-        'id128-print.h',
         'idn-util.c',
-        'idn-util.h',
         'ima-util.c',
-        'ima-util.h',
         'import-util.c',
-        'import-util.h',
         'in-addr-prefix-util.c',
-        'in-addr-prefix-util.h',
-        'initreq.h',
         'install-file.c',
-        'install-file.h',
         'install-printf.c',
-        'install-printf.h',
         'install.c',
-        'install.h',
         'ip-protocol-list.c',
-        'ip-protocol-list.h',
         'ipvlan-util.c',
-        'ipvlan-util.h',
         'journal-importer.c',
-        'journal-importer.h',
         'journal-util.c',
-        'journal-util.h',
-        'json-internal.h',
         'json.c',
-        'json.h',
         'kbd-util.c',
-        'kbd-util.h',
         'keyring-util.c',
-        'keyring-util.h',
         'killall.c',
-        'killall.h',
         'label.c',
-        'label.h',
         'libcrypt-util.c',
-        'libcrypt-util.h',
         'libfido2-util.c',
-        'libfido2-util.h',
         'libmount-util.c',
-        'libmount-util.h',
-        'linux/auto_dev-ioctl.h',
-        'linux/bpf.h',
-        'linux/bpf_common.h',
-        'linux/bpf_insn.h',
-        'linux/dm-ioctl.h',
-        'linux/ethtool.h',
         'local-addresses.c',
-        'local-addresses.h',
         'locale-setup.c',
-        'locale-setup.h',
         'lockfile-util.c',
-        'lockfile-util.h',
-        'log-link.h',
         'logs-show.c',
-        'logs-show.h',
         'loop-util.c',
-        'loop-util.h',
         'loopback-setup.c',
-        'loopback-setup.h',
         'machine-id-setup.c',
-        'machine-id-setup.h',
         'machine-pool.c',
-        'machine-pool.h',
         'macvlan-util.c',
-        'macvlan-util.h',
-        'main-func.h',
         'mkdir-label.c',
-        'mkdir-label.h',
         'mkfs-util.c',
-        'mkfs-util.h',
-        'module-util.h',
         'mount-setup.c',
-        'mount-setup.h',
         'mount-util.c',
-        'mount-util.h',
         'net-condition.c',
-        'net-condition.h',
         'netif-naming-scheme.c',
-        'netif-naming-scheme.h',
         'netif-sriov.c',
-        'netif-sriov.h',
         'netif-util.c',
-        'netif-util.h',
-        'nscd-flush.h',
         'nsflags.c',
-        'nsflags.h',
         'numa-util.c',
-        'numa-util.h',
         'open-file.c',
-        'open-file.h',
         'openssl-util.c',
-        'openssl-util.h',
         'output-mode.c',
-        'output-mode.h',
         'pager.c',
-        'pager.h',
         'parse-argument.c',
-        'parse-argument.h',
         'parse-helpers.c',
-        'parse-helpers.h',
         'pcre2-util.c',
-        'pcre2-util.h',
-        'pe-header.h',
         'pkcs11-util.c',
-        'pkcs11-util.h',
         'pretty-print.c',
-        'pretty-print.h',
         'psi-util.c',
-        'psi-util.h',
         'ptyfwd.c',
-        'ptyfwd.h',
         'pwquality-util.c',
-        'pwquality-util.h',
         'qrcode-util.c',
-        'qrcode-util.h',
         'quota-util.c',
-        'quota-util.h',
         'reboot-util.c',
-        'reboot-util.h',
         'recovery-key.c',
-        'recovery-key.h',
         'resize-fs.c',
-        'resize-fs.h',
         'resolve-util.c',
-        'resolve-util.h',
         'rm-rf.c',
-        'rm-rf.h',
-        'seccomp-util.h',
         'securebits-util.c',
-        'securebits-util.h',
         'selinux-util.c',
-        'selinux-util.h',
         'serialize.c',
-        'serialize.h',
         'service-util.c',
-        'service-util.h',
         'sleep-config.c',
-        'sleep-config.h',
         'smack-util.c',
-        'smack-util.h',
         'socket-label.c',
         'socket-netlink.c',
-        'socket-netlink.h',
         'spawn-ask-password-agent.c',
-        'spawn-ask-password-agent.h',
         'spawn-polkit-agent.c',
-        'spawn-polkit-agent.h',
         'specifier.c',
-        'specifier.h',
         'switch-root.c',
-        'switch-root.h',
         'tmpfile-util-label.c',
-        'tmpfile-util-label.h',
         'tomoyo-util.c',
-        'tomoyo-util.h',
         'tpm2-util.c',
-        'tpm2-util.h',
         'udev-util.c',
-        'udev-util.h',
         'uid-alloc-range.c',
-        'uid-alloc-range.h',
         'user-record-nss.c',
-        'user-record-nss.h',
         'user-record-show.c',
-        'user-record-show.h',
         'user-record.c',
-        'user-record.h',
         'userdb-dropin.c',
-        'userdb-dropin.h',
         'userdb.c',
-        'userdb.h',
-        'utmp-wtmp.h',
         'varlink.c',
-        'varlink.h',
-        'varlink-internal.h',
         'verb-log-control.c',
-        'verb-log-control.h',
         'verbs.c',
-        'verbs.h',
         'vlan-util.c',
-        'vlan-util.h',
         'volatile-util.c',
-        'volatile-util.h',
         'watchdog.c',
-        'watchdog.h',
         'web-util.c',
-        'web-util.h',
         'wifi-util.c',
-        'wifi-util.h',
         'xml.c',
-        'xml.h',
 )
 
 if get_option('tests') != 'false'
         shared_sources += files(
-                'test-tables.h',
                 'tests.c',
-                'tests.h',
         )
 endif
 
@@ -389,7 +205,6 @@ endif
 if conf.get('HAVE_LIBBPF') == 1
         shared_sources += files(
                 'bpf-link.c',
-                'bpf-link.h',
         )
 endif
 
@@ -400,7 +215,6 @@ endif
 if conf.get('HAVE_PAM') == 1
         shared_sources += files(
                 'pam-util.c',
-                'pam-util.h',
         )
 endif
 
@@ -501,7 +315,6 @@ libshared = shared_library(
         install_dir : rootpkglibdir)
 
 shared_fdisk_sources = files(
-        'fdisk-util.h',
         'fdisk-util.c',
 )
 
diff --git a/src/shutdown/meson.build b/src/shutdown/meson.build
index 0bd09fd7b2..d62032a4f1 100644
--- a/src/shutdown/meson.build
+++ b/src/shutdown/meson.build
@@ -3,13 +3,11 @@
 systemd_shutdown_sources = files(
         'shutdown.c',
         'umount.c',
-        'umount.h',
 )
 
 tests += [
         [files('test-umount.c',
-               'umount.c',
-               'umount.h'),
+               'umount.c'),
          [],
          [libmount]],
 ]
diff --git a/src/systemctl/meson.build b/src/systemctl/meson.build
index f0d405bb58..30d0f57675 100644
--- a/src/systemctl/meson.build
+++ b/src/systemctl/meson.build
@@ -2,77 +2,42 @@
 
 systemctl_sources = files(
         'systemctl-add-dependency.c',
-        'systemctl-add-dependency.h',
         'systemctl-cancel-job.c',
-        'systemctl-cancel-job.h',
         'systemctl-clean-or-freeze.c',
-        'systemctl-clean-or-freeze.h',
         'systemctl-compat-halt.c',
-        'systemctl-compat-halt.h',
         'systemctl-compat-runlevel.c',
-        'systemctl-compat-runlevel.h',
         'systemctl-compat-shutdown.c',
-        'systemctl-compat-shutdown.h',
         'systemctl-compat-telinit.c',
-        'systemctl-compat-telinit.h',
         'systemctl-daemon-reload.c',
-        'systemctl-daemon-reload.h',
         'systemctl-edit.c',
-        'systemctl-edit.h',
         'systemctl-enable.c',
-        'systemctl-enable.h',
         'systemctl-is-active.c',
-        'systemctl-is-active.h',
         'systemctl-is-enabled.c',
-        'systemctl-is-enabled.h',
         'systemctl-is-system-running.c',
-        'systemctl-is-system-running.h',
         'systemctl-kill.c',
-        'systemctl-kill.h',
         'systemctl-list-dependencies.c',
-        'systemctl-list-dependencies.h',
         'systemctl-list-jobs.c',
-        'systemctl-list-jobs.h',
         'systemctl-list-machines.c',
-        'systemctl-list-machines.h',
         'systemctl-list-unit-files.c',
-        'systemctl-list-unit-files.h',
         'systemctl-list-units.c',
-        'systemctl-list-units.h',
         'systemctl-log-setting.c',
-        'systemctl-log-setting.h',
         'systemctl-logind.c',
-        'systemctl-logind.h',
         'systemctl-mount.c',
-        'systemctl-mount.h',
         'systemctl-preset-all.c',
-        'systemctl-preset-all.h',
         'systemctl-reset-failed.c',
-        'systemctl-reset-failed.h',
         'systemctl-service-watchdogs.c',
-        'systemctl-service-watchdogs.h',
         'systemctl-set-default.c',
-        'systemctl-set-default.h',
         'systemctl-set-environment.c',
-        'systemctl-set-environment.h',
         'systemctl-set-property.c',
-        'systemctl-set-property.h',
         'systemctl-show.c',
-        'systemctl-show.h',
         'systemctl-start-special.c',
-        'systemctl-start-special.h',
         'systemctl-start-unit.c',
-        'systemctl-start-unit.h',
         'systemctl-switch-root.c',
-        'systemctl-switch-root.h',
         'systemctl-sysv-compat.c',
-        'systemctl-sysv-compat.h',
         'systemctl-trivial-method.c',
-        'systemctl-trivial-method.h',
         'systemctl-util.c',
-        'systemctl-util.h',
         'systemctl.c',
-        'systemctl.h')
+)
 
 if get_option('link-systemctl-shared')
         systemctl_link_with = [libshared]
diff --git a/src/test/meson.build b/src/test/meson.build
index 8dfc97c9e8..dc9595ab09 100644
--- a/src/test/meson.build
+++ b/src/test/meson.build
@@ -661,15 +661,13 @@ tests += [
          [], 'HAVE_OPENSSL_OR_GCRYPT'],
 
         [files('test-nss-hosts.c',
-               'nss-test-util.c',
-               'nss-test-util.h'),
+               'nss-test-util.c'),
          [],
          [libdl],
          [], 'ENABLE_NSS', 'timeout=120'],
 
         [files('test-nss-users.c',
-               'nss-test-util.c',
-               'nss-test-util.h'),
+               'nss-test-util.c'),
          [],
          [libdl],
          [], 'ENABLE_NSS'],
diff --git a/src/timesync/meson.build b/src/timesync/meson.build
index 15ca7d2fd5..c215ce72c9 100644
--- a/src/timesync/meson.build
+++ b/src/timesync/meson.build
@@ -2,17 +2,14 @@
 
 sources = files(
         'timesyncd-conf.c',
-        'timesyncd-conf.h',
         'timesyncd-manager.c',
-        'timesyncd-manager.h',
-        'timesyncd-ntp-message.h',
         'timesyncd-server.c',
-        'timesyncd-server.h')
+)
 
 systemd_timesyncd_sources = files(
         'timesyncd.c',
         'timesyncd-bus.c',
-        'timesyncd-bus.h')
+)
 
 sources += custom_target(
         'timesyncd-gperf.c',
diff --git a/src/tmpfiles/meson.build b/src/tmpfiles/meson.build
index cfa3d370a7..816faa93cf 100644
--- a/src/tmpfiles/meson.build
+++ b/src/tmpfiles/meson.build
@@ -3,10 +3,9 @@
 systemd_tmpfiles_sources = files(
         'tmpfiles.c',
         'offline-passwd.c',
-        'offline-passwd.h')
+)
 
 tests += [
         [files('test-offline-passwd.c',
-               'offline-passwd.c',
-               'offline-passwd.h')],
+               'offline-passwd.c')],
 ]
diff --git a/src/udev/meson.build b/src/udev/meson.build
index 08a1d97e81..f17b3c1cf3 100644
--- a/src/udev/meson.build
+++ b/src/udev/meson.build
@@ -2,7 +2,6 @@
 
 udevadm_sources = files(
         'udevadm.c',
-        'udevadm.h',
         'udevadm-control.c',
         'udevadm-hwdb.c',
         'udevadm-info.c',
@@ -13,24 +12,17 @@ udevadm_sources = files(
         'udevadm-test-builtin.c',
         'udevadm-trigger.c',
         'udevadm-util.c',
-        'udevadm-util.h',
         'udevadm-wait.c',
         'udevd.c',
 )
 
 libudevd_core_sources = files(
         'udev-ctrl.c',
-        'udev-ctrl.h',
         'udev-event.c',
-        'udev-event.h',
         'udev-node.c',
-        'udev-node.h',
         'udev-rules.c',
-        'udev-rules.h',
         'udev-watch.c',
-        'udev-watch.h',
         'udev-builtin.c',
-        'udev-builtin.h',
         'udev-builtin-btrfs.c',
         'udev-builtin-hwdb.c',
         'udev-builtin-input_id.c',
@@ -40,7 +32,6 @@ libudevd_core_sources = files(
         'udev-builtin-path_id.c',
         'udev-builtin-usb_id.c',
         'net/link-config.c',
-        'net/link-config.h',
 )
 
 if conf.get('HAVE_KMOD') == 1
@@ -122,15 +113,11 @@ libudevd_core = static_library(
 udev_progs = [['ata_id/ata_id.c'],
               ['cdrom_id/cdrom_id.c'],
               ['fido_id/fido_id.c',
-               'fido_id/fido_id_desc.c',
-               'fido_id/fido_id_desc.h'],
+               'fido_id/fido_id_desc.c'],
               ['scsi_id/scsi_id.c',
-               'scsi_id/scsi_id.h',
-               'scsi_id/scsi_serial.c',
-               'scsi_id/scsi.h'],
+               'scsi_id/scsi_serial.c'],
               ['v4l_id/v4l_id.c'],
               ['mtd_probe/mtd_probe.c',
-               'mtd_probe/mtd_probe.h',
                'mtd_probe/probe_smartmedia.c']]
 
 dmi_arches = ['x86', 'x86_64', 'aarch64', 'arm', 'ia64', 'loongarch64', 'mips']
diff --git a/src/userdb/meson.build b/src/userdb/meson.build
index 2d786611e1..e2dc812f94 100644
--- a/src/userdb/meson.build
+++ b/src/userdb/meson.build
@@ -4,7 +4,6 @@ systemd_userwork_sources = files('userwork.c')
 
 systemd_userdbd_sources = files(
         'userdbd-manager.c',
-        'userdbd-manager.h',
         'userdbd.c',
 )
 
diff --git a/src/xdg-autostart-generator/meson.build b/src/xdg-autostart-generator/meson.build
index cdce66b6fc..5788fd4ae3 100644
--- a/src/xdg-autostart-generator/meson.build
+++ b/src/xdg-autostart-generator/meson.build
@@ -3,16 +3,14 @@
 systemd_xdg_autostart_generator_sources = files(
         'xdg-autostart-generator.c',
         'xdg-autostart-service.c',
-        'xdg-autostart-service.h')
+)
 
 tests += [
         [files('test-xdg-autostart.c',
-               'xdg-autostart-service.c',
-               'xdg-autostart-service.h')],
+               'xdg-autostart-service.c')],
 ]
 
 fuzzers += [
         [files('fuzz-xdg-desktop.c',
-               'xdg-autostart-service.c',
-               'xdg-autostart-service.h')],
+               'xdg-autostart-service.c')],
 ]