From 818bf5463297a72a2861aa3b360b8b4291a3f2a8 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 12 Jun 2018 17:04:27 +0200
Subject: [PATCH] tree-wide: drop 'This file is part of systemd' blurb

This part of the copyright blurb stems from the GPL use recommendations:

https://www.gnu.org/licenses/gpl-howto.en.html

The concept appears to originate in times where version control was per
file, instead of per tree, and was a way to glue the files together.
Ultimately, we nowadays don't live in that world anymore, and this
information is entirely useless anyway, as people are very welcome to
copy these files into any projects they like, and they shouldn't have to
change bits that are part of our copyright header for that.

hence, let's just get rid of this old cruft, and shorten our codebase a
bit.
---
 .mkosi/mkosi.arch                                     | 2 --
 .mkosi/mkosi.debian                                   | 2 --
 .mkosi/mkosi.fedora                                   | 2 --
 catalog/systemd.be.catalog.in                         | 2 --
 catalog/systemd.be@latin.catalog.in                   | 2 --
 catalog/systemd.bg.catalog.in                         | 2 --
 catalog/systemd.catalog.in                            | 2 --
 catalog/systemd.da.catalog.in                         | 2 --
 catalog/systemd.de.catalog.in                         | 2 --
 catalog/systemd.fr.catalog.in                         | 2 --
 catalog/systemd.hr.catalog.in                         | 2 --
 catalog/systemd.hu.catalog.in                         | 2 --
 catalog/systemd.it.catalog.in                         | 2 --
 catalog/systemd.ko.catalog.in                         | 2 --
 catalog/systemd.pl.catalog.in                         | 2 --
 catalog/systemd.pt_BR.catalog.in                      | 2 --
 catalog/systemd.ru.catalog.in                         | 2 --
 catalog/systemd.sr.catalog.in                         | 2 --
 catalog/systemd.zh_CN.catalog.in                      | 2 --
 catalog/systemd.zh_TW.catalog.in                      | 2 --
 hwdb/parse_hwdb.py                                    | 3 +--
 man/binfmt.d.xml                                      | 2 --
 man/bootctl.xml                                       | 2 --
 man/bootup.xml                                        | 2 --
 man/busctl.xml                                        | 2 --
 man/coredump.conf.xml                                 | 2 --
 man/coredumpctl.xml                                   | 2 --
 man/crypttab.xml                                      | 2 --
 man/custom-html.xsl                                   | 2 --
 man/custom-man.xsl                                    | 2 --
 man/daemon.xml                                        | 2 --
 man/dnssec-trust-anchors.d.xml                        | 2 --
 man/environment.d.xml                                 | 2 --
 man/file-hierarchy.xml                                | 2 --
 man/halt.xml                                          | 2 --
 man/hostname.xml                                      | 2 --
 man/hostnamectl.xml                                   | 2 --
 man/hwdb.xml                                          | 2 --
 man/journal-remote.conf.xml                           | 2 --
 man/journal-upload.conf.xml                           | 2 --
 man/journalctl.xml                                    | 2 --
 man/journald.conf.xml                                 | 2 --
 man/kernel-command-line.xml                           | 2 --
 man/kernel-install.xml                                | 2 --
 man/less-variables.xml                                | 2 --
 man/libsystemd-pkgconfig.xml                          | 2 --
 man/libudev.xml                                       | 2 --
 man/locale.conf.xml                                   | 2 --
 man/localectl.xml                                     | 2 --
 man/localtime.xml                                     | 2 --
 man/loginctl.xml                                      | 2 --
 man/logind.conf.xml                                   | 2 --
 man/machine-id.xml                                    | 2 --
 man/machine-info.xml                                  | 2 --
 man/machinectl.xml                                    | 2 --
 man/modules-load.d.xml                                | 2 --
 man/networkctl.xml                                    | 2 --
 man/networkd.conf.xml                                 | 2 --
 man/nss-myhostname.xml                                | 2 --
 man/nss-mymachines.xml                                | 2 --
 man/nss-resolve.xml                                   | 2 --
 man/nss-systemd.xml                                   | 2 --
 man/os-release.xml                                    | 2 --
 man/pam_systemd.xml                                   | 2 --
 man/resolvectl.xml                                    | 2 --
 man/resolved.conf.xml                                 | 2 --
 man/runlevel.xml                                      | 2 --
 man/sd-bus-errors.xml                                 | 2 --
 man/sd-bus.xml                                        | 2 --
 man/sd-daemon.xml                                     | 2 --
 man/sd-event.xml                                      | 2 --
 man/sd-id128.xml                                      | 2 --
 man/sd-journal.xml                                    | 2 --
 man/sd-login.xml                                      | 2 --
 man/sd_booted.xml                                     | 2 --
 man/sd_bus_add_match.xml                              | 2 --
 man/sd_bus_creds_get_pid.xml                          | 2 --
 man/sd_bus_creds_new_from_pid.xml                     | 2 --
 man/sd_bus_default.xml                                | 2 --
 man/sd_bus_error.xml                                  | 2 --
 man/sd_bus_error_add_map.xml                          | 2 --
 man/sd_bus_get_fd.xml                                 | 2 --
 man/sd_bus_get_n_queued_read.xml                      | 2 --
 man/sd_bus_is_open.xml                                | 2 --
 man/sd_bus_message_append.xml                         | 2 --
 man/sd_bus_message_append_array.xml                   | 2 --
 man/sd_bus_message_append_basic.xml                   | 2 --
 man/sd_bus_message_append_string_memfd.xml            | 2 --
 man/sd_bus_message_append_strv.xml                    | 2 --
 man/sd_bus_message_get_cookie.xml                     | 2 --
 man/sd_bus_message_get_monotonic_usec.xml             | 2 --
 man/sd_bus_message_read_basic.xml                     | 2 --
 man/sd_bus_message_set_destination.xml                | 2 --
 man/sd_bus_negotiate_fds.xml                          | 2 --
 man/sd_bus_new.xml                                    | 2 --
 man/sd_bus_path_encode.xml                            | 2 --
 man/sd_bus_process.xml                                | 2 --
 man/sd_bus_request_name.xml                           | 2 --
 man/sd_bus_set_connected_signal.xml                   | 2 --
 man/sd_bus_set_sender.xml                             | 2 --
 man/sd_bus_set_watch_bind.xml                         | 2 --
 man/sd_bus_track_add_name.xml                         | 2 --
 man/sd_bus_track_new.xml                              | 2 --
 man/sd_event_add_child.xml                            | 2 --
 man/sd_event_add_defer.xml                            | 2 --
 man/sd_event_add_io.xml                               | 2 --
 man/sd_event_add_signal.xml                           | 2 --
 man/sd_event_add_time.xml                             | 2 --
 man/sd_event_exit.xml                                 | 2 --
 man/sd_event_get_fd.xml                               | 2 --
 man/sd_event_new.xml                                  | 2 --
 man/sd_event_now.xml                                  | 2 --
 man/sd_event_run.xml                                  | 2 --
 man/sd_event_set_watchdog.xml                         | 2 --
 man/sd_event_source_get_event.xml                     | 2 --
 man/sd_event_source_get_pending.xml                   | 2 --
 man/sd_event_source_set_description.xml               | 2 --
 man/sd_event_source_set_enabled.xml                   | 2 --
 man/sd_event_source_set_prepare.xml                   | 2 --
 man/sd_event_source_set_priority.xml                  | 2 --
 man/sd_event_source_set_userdata.xml                  | 2 --
 man/sd_event_source_unref.xml                         | 2 --
 man/sd_event_wait.xml                                 | 2 --
 man/sd_get_seats.xml                                  | 2 --
 man/sd_id128_get_machine.xml                          | 2 --
 man/sd_id128_randomize.xml                            | 2 --
 man/sd_id128_to_string.xml                            | 2 --
 man/sd_is_fifo.xml                                    | 2 --
 man/sd_journal_add_match.xml                          | 2 --
 man/sd_journal_enumerate_fields.xml                   | 2 --
 man/sd_journal_get_catalog.xml                        | 2 --
 man/sd_journal_get_cursor.xml                         | 2 --
 man/sd_journal_get_cutoff_realtime_usec.xml           | 2 --
 man/sd_journal_get_data.xml                           | 2 --
 man/sd_journal_get_fd.xml                             | 2 --
 man/sd_journal_get_realtime_usec.xml                  | 2 --
 man/sd_journal_get_usage.xml                          | 2 --
 man/sd_journal_has_runtime_files.xml                  | 2 --
 man/sd_journal_next.xml                               | 2 --
 man/sd_journal_open.xml                               | 2 --
 man/sd_journal_print.xml                              | 2 --
 man/sd_journal_query_unique.xml                       | 2 --
 man/sd_journal_seek_head.xml                          | 2 --
 man/sd_journal_stream_fd.xml                          | 2 --
 man/sd_listen_fds.xml                                 | 2 --
 man/sd_login_monitor_new.xml                          | 2 --
 man/sd_machine_get_class.xml                          | 2 --
 man/sd_notify.xml                                     | 2 --
 man/sd_pid_get_owner_uid.xml                          | 2 --
 man/sd_seat_get_active.xml                            | 2 --
 man/sd_session_is_active.xml                          | 2 --
 man/sd_uid_get_state.xml                              | 2 --
 man/sd_watchdog_enabled.xml                           | 2 --
 man/shutdown.xml                                      | 2 --
 man/standard-conf.xml                                 | 2 --
 man/standard-options.xml                              | 2 --
 man/sysctl.d.xml                                      | 2 --
 man/systemctl.xml                                     | 2 --
 man/systemd-analyze.xml                               | 3 ---
 man/systemd-ask-password-console.service.xml          | 2 --
 man/systemd-ask-password.xml                          | 2 --
 man/systemd-backlight@.service.xml                    | 2 --
 man/systemd-binfmt.service.xml                        | 2 --
 man/systemd-cat.xml                                   | 2 --
 man/systemd-cgls.xml                                  | 2 --
 man/systemd-cgtop.xml                                 | 2 --
 man/systemd-coredump.xml                              | 2 --
 man/systemd-cryptsetup-generator.xml                  | 2 --
 man/systemd-cryptsetup@.service.xml                   | 2 --
 man/systemd-debug-generator.xml                       | 2 --
 man/systemd-delta.xml                                 | 2 --
 man/systemd-detect-virt.xml                           | 2 --
 man/systemd-environment-d-generator.xml               | 2 --
 man/systemd-escape.xml                                | 2 --
 man/systemd-firstboot.xml                             | 2 --
 man/systemd-fsck@.service.xml                         | 2 --
 man/systemd-fstab-generator.xml                       | 2 --
 man/systemd-getty-generator.xml                       | 2 --
 man/systemd-gpt-auto-generator.xml                    | 2 --
 man/systemd-halt.service.xml                          | 2 --
 man/systemd-hibernate-resume-generator.xml            | 2 --
 man/systemd-hibernate-resume@.service.xml             | 2 --
 man/systemd-hostnamed.service.xml                     | 2 --
 man/systemd-hwdb.xml                                  | 2 --
 man/systemd-importd.service.xml                       | 2 --
 man/systemd-inhibit.xml                               | 2 --
 man/systemd-initctl.service.xml                       | 2 --
 man/systemd-journal-gatewayd.service.xml              | 2 --
 man/systemd-journal-remote.service.xml                | 2 --
 man/systemd-journal-upload.service.xml                | 2 --
 man/systemd-journald.service.xml                      | 2 --
 man/systemd-localed.service.xml                       | 2 --
 man/systemd-logind.service.xml                        | 2 --
 man/systemd-machine-id-commit.service.xml             | 2 --
 man/systemd-machine-id-setup.xml                      | 2 --
 man/systemd-machined.service.xml                      | 2 --
 man/systemd-makefs@.service.xml                       | 2 --
 man/systemd-modules-load.service.xml                  | 2 --
 man/systemd-mount.xml                                 | 2 --
 man/systemd-networkd-wait-online.service.xml          | 2 --
 man/systemd-networkd.service.xml                      | 2 --
 man/systemd-notify.xml                                | 2 --
 man/systemd-nspawn.xml                                | 2 --
 man/systemd-path.xml                                  | 2 --
 man/systemd-quotacheck.service.xml                    | 2 --
 man/systemd-random-seed.service.xml                   | 2 --
 man/systemd-rc-local-generator.xml                    | 2 --
 man/systemd-remount-fs.service.xml                    | 2 --
 man/systemd-resolved.service.xml                      | 2 --
 man/systemd-rfkill.service.xml                        | 2 --
 man/systemd-run.xml                                   | 2 --
 man/systemd-sleep.conf.xml                            | 2 --
 man/systemd-socket-activate.xml                       | 2 --
 man/systemd-socket-proxyd.xml                         | 2 --
 man/systemd-suspend.service.xml                       | 2 --
 man/systemd-sysctl.service.xml                        | 2 --
 man/systemd-system-update-generator.xml               | 2 --
 man/systemd-system.conf.xml                           | 2 --
 man/systemd-sysusers.xml                              | 2 --
 man/systemd-sysv-generator.xml                        | 2 --
 man/systemd-time-wait-sync.service.xml                | 2 --
 man/systemd-timedated.service.xml                     | 2 --
 man/systemd-timesyncd.service.xml                     | 2 --
 man/systemd-tmpfiles.xml                              | 2 --
 man/systemd-tty-ask-password-agent.xml                | 2 --
 man/systemd-udevd.service.xml                         | 2 --
 man/systemd-update-done.service.xml                   | 2 --
 man/systemd-update-utmp.service.xml                   | 2 --
 man/systemd-user-sessions.service.xml                 | 2 --
 man/systemd-vconsole-setup.service.xml                | 2 --
 man/systemd-veritysetup-generator.xml                 | 2 --
 man/systemd-veritysetup@.service.xml                  | 2 --
 man/systemd-volatile-root.service.xml                 | 2 --
 man/systemd.automount.xml                             | 2 --
 man/systemd.device.xml                                | 2 --
 man/systemd.dnssd.xml                                 | 2 --
 man/systemd.environment-generator.xml                 | 2 --
 man/systemd.exec.xml                                  | 2 --
 man/systemd.generator.xml                             | 2 --
 man/systemd.journal-fields.xml                        | 2 --
 man/systemd.kill.xml                                  | 2 --
 man/systemd.link.xml                                  | 2 --
 man/systemd.mount.xml                                 | 2 --
 man/systemd.netdev.xml                                | 2 --
 man/systemd.network.xml                               | 2 --
 man/systemd.nspawn.xml                                | 2 --
 man/systemd.offline-updates.xml                       | 2 --
 man/systemd.path.xml                                  | 2 --
 man/systemd.preset.xml                                | 2 --
 man/systemd.resource-control.xml                      | 2 --
 man/systemd.scope.xml                                 | 2 --
 man/systemd.service.xml                               | 2 --
 man/systemd.slice.xml                                 | 2 --
 man/systemd.socket.xml                                | 2 --
 man/systemd.special.xml                               | 2 --
 man/systemd.swap.xml                                  | 2 --
 man/systemd.target.xml                                | 2 --
 man/systemd.time.xml                                  | 2 --
 man/systemd.timer.xml                                 | 2 --
 man/systemd.unit.xml                                  | 2 --
 man/systemd.xml                                       | 2 --
 man/sysusers.d.xml                                    | 2 --
 man/telinit.xml                                       | 2 --
 man/timedatectl.xml                                   | 2 --
 man/timesyncd.conf.xml                                | 2 --
 man/tmpfiles.d.xml                                    | 2 --
 man/udev.conf.xml                                     | 2 --
 man/udev.xml                                          | 2 --
 man/udev_device_get_syspath.xml                       | 2 --
 man/udev_device_has_tag.xml                           | 2 --
 man/udev_device_new_from_syspath.xml                  | 2 --
 man/udev_enumerate_add_match_subsystem.xml            | 2 --
 man/udev_enumerate_new.xml                            | 2 --
 man/udev_enumerate_scan_devices.xml                   | 2 --
 man/udev_list_entry.xml                               | 2 --
 man/udev_monitor_filter_update.xml                    | 2 --
 man/udev_monitor_new_from_netlink.xml                 | 2 --
 man/udev_monitor_receive_device.xml                   | 2 --
 man/udev_new.xml                                      | 2 --
 man/udevadm.xml                                       | 2 --
 man/user-system-options.xml                           | 2 --
 man/vconsole.conf.xml                                 | 2 --
 mkosi.build                                           | 2 --
 src/ac-power/ac-power.c                               | 2 --
 src/activate/activate.c                               | 2 --
 src/analyze/analyze-verify.c                          | 2 --
 src/analyze/analyze-verify.h                          | 2 --
 src/analyze/analyze.c                                 | 2 --
 src/ask-password/ask-password.c                       | 2 --
 src/backlight/backlight.c                             | 2 --
 src/basic/af-list.c                                   | 2 --
 src/basic/af-list.h                                   | 2 --
 src/basic/alloc-util.c                                | 2 --
 src/basic/alloc-util.h                                | 2 --
 src/basic/architecture.c                              | 2 --
 src/basic/architecture.h                              | 2 --
 src/basic/arphrd-list.c                               | 2 --
 src/basic/arphrd-list.h                               | 2 --
 src/basic/async.c                                     | 2 --
 src/basic/async.h                                     | 2 --
 src/basic/audit-util.c                                | 2 --
 src/basic/audit-util.h                                | 2 --
 src/basic/barrier.c                                   | 2 --
 src/basic/barrier.h                                   | 2 --
 src/basic/bitmap.c                                    | 2 --
 src/basic/bitmap.h                                    | 2 --
 src/basic/blkid-util.h                                | 2 --
 src/basic/blockdev-util.c                             | 2 --
 src/basic/blockdev-util.h                             | 2 --
 src/basic/bpf-program.c                               | 2 --
 src/basic/bpf-program.h                               | 2 --
 src/basic/btrfs-util.c                                | 2 --
 src/basic/btrfs-util.h                                | 2 --
 src/basic/build.h                                     | 2 --
 src/basic/bus-label.c                                 | 2 --
 src/basic/bus-label.h                                 | 2 --
 src/basic/calendarspec.c                              | 2 --
 src/basic/calendarspec.h                              | 2 --
 src/basic/cap-list.c                                  | 2 --
 src/basic/cap-list.h                                  | 2 --
 src/basic/capability-util.c                           | 2 --
 src/basic/capability-util.h                           | 2 --
 src/basic/cgroup-util.c                               | 2 --
 src/basic/cgroup-util.h                               | 2 --
 src/basic/chattr-util.c                               | 2 --
 src/basic/chattr-util.h                               | 2 --
 src/basic/clock-util.c                                | 2 --
 src/basic/clock-util.h                                | 2 --
 src/basic/conf-files.c                                | 2 --
 src/basic/conf-files.h                                | 2 --
 src/basic/copy.c                                      | 2 --
 src/basic/copy.h                                      | 2 --
 src/basic/cpu-set-util.c                              | 2 --
 src/basic/cpu-set-util.h                              | 2 --
 src/basic/crypt-util.c                                | 2 --
 src/basic/crypt-util.h                                | 2 --
 src/basic/def.h                                       | 2 --
 src/basic/device-nodes.c                              | 2 --
 src/basic/device-nodes.h                              | 2 --
 src/basic/dirent-util.c                               | 2 --
 src/basic/dirent-util.h                               | 2 --
 src/basic/env-util.c                                  | 2 --
 src/basic/env-util.h                                  | 2 --
 src/basic/errno-list.c                                | 2 --
 src/basic/errno-list.h                                | 2 --
 src/basic/escape.c                                    | 2 --
 src/basic/escape.h                                    | 2 --
 src/basic/ether-addr-util.c                           | 2 --
 src/basic/ether-addr-util.h                           | 2 --
 src/basic/exec-util.c                                 | 2 --
 src/basic/exec-util.h                                 | 2 --
 src/basic/exit-status.c                               | 2 --
 src/basic/exit-status.h                               | 2 --
 src/basic/extract-word.c                              | 2 --
 src/basic/extract-word.h                              | 2 --
 src/basic/fd-util.c                                   | 2 --
 src/basic/fd-util.h                                   | 2 --
 src/basic/fileio-label.c                              | 2 --
 src/basic/fileio-label.h                              | 2 --
 src/basic/fileio.c                                    | 2 --
 src/basic/fileio.h                                    | 2 --
 src/basic/format-util.h                               | 2 --
 src/basic/fs-util.c                                   | 2 --
 src/basic/fs-util.h                                   | 2 --
 src/basic/gcrypt-util.c                               | 2 --
 src/basic/gcrypt-util.h                               | 2 --
 src/basic/glob-util.c                                 | 2 --
 src/basic/glob-util.h                                 | 2 --
 src/basic/hash-funcs.c                                | 2 --
 src/basic/hash-funcs.h                                | 2 --
 src/basic/hashmap.c                                   | 2 --
 src/basic/hashmap.h                                   | 2 --
 src/basic/hexdecoct.c                                 | 2 --
 src/basic/hexdecoct.h                                 | 2 --
 src/basic/hostname-util.c                             | 2 --
 src/basic/hostname-util.h                             | 2 --
 src/basic/in-addr-util.c                              | 2 --
 src/basic/in-addr-util.h                              | 2 --
 src/basic/io-util.c                                   | 2 --
 src/basic/io-util.h                                   | 2 --
 src/basic/journal-importer.c                          | 2 --
 src/basic/journal-importer.h                          | 2 --
 src/basic/khash.c                                     | 2 --
 src/basic/khash.h                                     | 2 --
 src/basic/label.c                                     | 2 --
 src/basic/label.h                                     | 2 --
 src/basic/list.h                                      | 2 --
 src/basic/locale-util.c                               | 2 --
 src/basic/locale-util.h                               | 2 --
 src/basic/lockfile-util.c                             | 2 --
 src/basic/lockfile-util.h                             | 2 --
 src/basic/log.c                                       | 2 --
 src/basic/log.h                                       | 2 --
 src/basic/login-util.c                                | 2 --
 src/basic/login-util.h                                | 2 --
 src/basic/macro.h                                     | 2 --
 src/basic/memfd-util.c                                | 2 --
 src/basic/memfd-util.h                                | 2 --
 src/basic/mempool.c                                   | 2 --
 src/basic/mempool.h                                   | 2 --
 src/basic/missing.h                                   | 2 --
 src/basic/missing_syscall.h                           | 2 --
 src/basic/mkdir-label.c                               | 2 --
 src/basic/mkdir.c                                     | 2 --
 src/basic/mkdir.h                                     | 2 --
 src/basic/module-util.h                               | 2 --
 src/basic/mount-util.c                                | 2 --
 src/basic/mount-util.h                                | 2 --
 src/basic/nss-util.h                                  | 2 --
 src/basic/ordered-set.c                               | 2 --
 src/basic/ordered-set.h                               | 2 --
 src/basic/pager.c                                     | 2 --
 src/basic/pager.h                                     | 2 --
 src/basic/parse-util.c                                | 2 --
 src/basic/parse-util.h                                | 2 --
 src/basic/path-util.c                                 | 2 --
 src/basic/path-util.h                                 | 2 --
 src/basic/prioq.c                                     | 2 --
 src/basic/prioq.h                                     | 2 --
 src/basic/proc-cmdline.c                              | 2 --
 src/basic/proc-cmdline.h                              | 2 --
 src/basic/process-util.c                              | 2 --
 src/basic/process-util.h                              | 2 --
 src/basic/random-util.c                               | 2 --
 src/basic/random-util.h                               | 2 --
 src/basic/ratelimit.c                                 | 2 --
 src/basic/ratelimit.h                                 | 2 --
 src/basic/raw-clone.h                                 | 2 --
 src/basic/refcnt.h                                    | 2 --
 src/basic/replace-var.c                               | 2 --
 src/basic/replace-var.h                               | 2 --
 src/basic/rlimit-util.c                               | 2 --
 src/basic/rlimit-util.h                               | 2 --
 src/basic/rm-rf.c                                     | 2 --
 src/basic/rm-rf.h                                     | 2 --
 src/basic/securebits-util.c                           | 2 --
 src/basic/securebits-util.h                           | 2 --
 src/basic/selinux-util.c                              | 2 --
 src/basic/selinux-util.h                              | 2 --
 src/basic/set.h                                       | 2 --
 src/basic/sigbus.c                                    | 2 --
 src/basic/sigbus.h                                    | 2 --
 src/basic/signal-util.c                               | 2 --
 src/basic/signal-util.h                               | 2 --
 src/basic/smack-util.c                                | 2 --
 src/basic/smack-util.h                                | 2 --
 src/basic/socket-label.c                              | 2 --
 src/basic/socket-protocol-list.c                      | 2 --
 src/basic/socket-protocol-list.h                      | 2 --
 src/basic/socket-util.c                               | 2 --
 src/basic/socket-util.h                               | 2 --
 src/basic/special.h                                   | 2 --
 src/basic/stat-util.c                                 | 2 --
 src/basic/stat-util.h                                 | 2 --
 src/basic/stdio-util.h                                | 2 --
 src/basic/strbuf.c                                    | 2 --
 src/basic/strbuf.h                                    | 2 --
 src/basic/string-table.c                              | 2 --
 src/basic/string-table.h                              | 2 --
 src/basic/string-util.c                               | 2 --
 src/basic/string-util.h                               | 2 --
 src/basic/strv.c                                      | 2 --
 src/basic/strv.h                                      | 2 --
 src/basic/strxcpyx.c                                  | 2 --
 src/basic/strxcpyx.h                                  | 2 --
 src/basic/syslog-util.c                               | 2 --
 src/basic/syslog-util.h                               | 2 --
 src/basic/terminal-util.c                             | 2 --
 src/basic/terminal-util.h                             | 2 --
 src/basic/time-util.c                                 | 2 --
 src/basic/time-util.h                                 | 2 --
 src/basic/umask-util.h                                | 2 --
 src/basic/unaligned.h                                 | 2 --
 src/basic/unit-def.c                                  | 2 --
 src/basic/unit-def.h                                  | 2 --
 src/basic/unit-name.c                                 | 2 --
 src/basic/unit-name.h                                 | 2 --
 src/basic/user-util.c                                 | 2 --
 src/basic/user-util.h                                 | 2 --
 src/basic/utf8.c                                      | 2 --
 src/basic/utf8.h                                      | 2 --
 src/basic/util.c                                      | 2 --
 src/basic/util.h                                      | 2 --
 src/basic/verbs.c                                     | 2 --
 src/basic/verbs.h                                     | 2 --
 src/basic/virt.c                                      | 2 --
 src/basic/virt.h                                      | 2 --
 src/basic/web-util.c                                  | 2 --
 src/basic/web-util.h                                  | 2 --
 src/basic/xattr-util.c                                | 2 --
 src/basic/xattr-util.h                                | 2 --
 src/basic/xml.c                                       | 2 --
 src/basic/xml.h                                       | 2 --
 src/binfmt/binfmt.c                                   | 2 --
 src/boot/bootctl.c                                    | 2 --
 src/busctl/busctl-introspect.c                        | 2 --
 src/busctl/busctl-introspect.h                        | 2 --
 src/busctl/busctl.c                                   | 2 --
 src/cgls/cgls.c                                       | 2 --
 src/cgroups-agent/cgroups-agent.c                     | 2 --
 src/cgtop/cgtop.c                                     | 2 --
 src/core/audit-fd.c                                   | 2 --
 src/core/audit-fd.h                                   | 2 --
 src/core/automount.c                                  | 2 --
 src/core/automount.h                                  | 2 --
 src/core/bpf-firewall.c                               | 2 --
 src/core/bpf-firewall.h                               | 2 --
 src/core/cgroup.c                                     | 2 --
 src/core/cgroup.h                                     | 2 --
 src/core/chown-recursive.c                            | 2 --
 src/core/chown-recursive.h                            | 2 --
 src/core/dbus-automount.c                             | 2 --
 src/core/dbus-automount.h                             | 2 --
 src/core/dbus-cgroup.c                                | 2 --
 src/core/dbus-cgroup.h                                | 2 --
 src/core/dbus-device.c                                | 2 --
 src/core/dbus-device.h                                | 2 --
 src/core/dbus-execute.c                               | 2 --
 src/core/dbus-execute.h                               | 2 --
 src/core/dbus-job.c                                   | 2 --
 src/core/dbus-job.h                                   | 2 --
 src/core/dbus-kill.c                                  | 2 --
 src/core/dbus-kill.h                                  | 2 --
 src/core/dbus-manager.c                               | 2 --
 src/core/dbus-manager.h                               | 2 --
 src/core/dbus-mount.c                                 | 2 --
 src/core/dbus-mount.h                                 | 2 --
 src/core/dbus-path.c                                  | 2 --
 src/core/dbus-path.h                                  | 2 --
 src/core/dbus-scope.c                                 | 2 --
 src/core/dbus-scope.h                                 | 2 --
 src/core/dbus-service.c                               | 2 --
 src/core/dbus-service.h                               | 2 --
 src/core/dbus-slice.c                                 | 2 --
 src/core/dbus-slice.h                                 | 2 --
 src/core/dbus-socket.c                                | 2 --
 src/core/dbus-socket.h                                | 2 --
 src/core/dbus-swap.c                                  | 2 --
 src/core/dbus-swap.h                                  | 2 --
 src/core/dbus-target.c                                | 2 --
 src/core/dbus-target.h                                | 2 --
 src/core/dbus-timer.c                                 | 2 --
 src/core/dbus-timer.h                                 | 2 --
 src/core/dbus-unit.c                                  | 2 --
 src/core/dbus-unit.h                                  | 2 --
 src/core/dbus-util.c                                  | 2 --
 src/core/dbus-util.h                                  | 2 --
 src/core/dbus.c                                       | 2 --
 src/core/dbus.h                                       | 2 --
 src/core/device.c                                     | 2 --
 src/core/device.h                                     | 2 --
 src/core/dynamic-user.c                               | 2 --
 src/core/dynamic-user.h                               | 2 --
 src/core/emergency-action.c                           | 2 --
 src/core/emergency-action.h                           | 2 --
 src/core/execute.c                                    | 2 --
 src/core/execute.h                                    | 2 --
 src/core/hostname-setup.c                             | 2 --
 src/core/hostname-setup.h                             | 2 --
 src/core/ima-setup.c                                  | 2 --
 src/core/ima-setup.h                                  | 2 --
 src/core/ip-address-access.c                          | 2 --
 src/core/ip-address-access.h                          | 2 --
 src/core/job.c                                        | 2 --
 src/core/job.h                                        | 2 --
 src/core/kill.c                                       | 2 --
 src/core/kill.h                                       | 2 --
 src/core/killall.c                                    | 2 --
 src/core/killall.h                                    | 2 --
 src/core/kmod-setup.c                                 | 2 --
 src/core/kmod-setup.h                                 | 2 --
 src/core/load-dropin.c                                | 2 --
 src/core/load-dropin.h                                | 2 --
 src/core/load-fragment.c                              | 2 --
 src/core/load-fragment.h                              | 2 --
 src/core/locale-setup.c                               | 2 --
 src/core/locale-setup.h                               | 2 --
 src/core/loopback-setup.c                             | 2 --
 src/core/loopback-setup.h                             | 2 --
 src/core/machine-id-setup.c                           | 2 --
 src/core/machine-id-setup.h                           | 2 --
 src/core/main.c                                       | 2 --
 src/core/manager.c                                    | 2 --
 src/core/manager.h                                    | 2 --
 src/core/mount-setup.c                                | 2 --
 src/core/mount-setup.h                                | 2 --
 src/core/mount.c                                      | 2 --
 src/core/mount.h                                      | 2 --
 src/core/namespace.c                                  | 2 --
 src/core/namespace.h                                  | 2 --
 src/core/path.c                                       | 2 --
 src/core/path.h                                       | 2 --
 src/core/scope.c                                      | 2 --
 src/core/scope.h                                      | 2 --
 src/core/selinux-access.c                             | 2 --
 src/core/selinux-access.h                             | 2 --
 src/core/selinux-setup.c                              | 2 --
 src/core/selinux-setup.h                              | 2 --
 src/core/service.c                                    | 2 --
 src/core/service.h                                    | 2 --
 src/core/show-status.c                                | 2 --
 src/core/show-status.h                                | 2 --
 src/core/shutdown.c                                   | 2 --
 src/core/slice.c                                      | 2 --
 src/core/slice.h                                      | 2 --
 src/core/smack-setup.c                                | 2 --
 src/core/smack-setup.h                                | 2 --
 src/core/socket.c                                     | 2 --
 src/core/socket.h                                     | 2 --
 src/core/swap.c                                       | 2 --
 src/core/swap.h                                       | 2 --
 src/core/target.c                                     | 2 --
 src/core/target.h                                     | 2 --
 src/core/timer.c                                      | 2 --
 src/core/timer.h                                      | 2 --
 src/core/transaction.c                                | 2 --
 src/core/transaction.h                                | 2 --
 src/core/umount.c                                     | 2 --
 src/core/umount.h                                     | 2 --
 src/core/unit-printf.c                                | 2 --
 src/core/unit-printf.h                                | 2 --
 src/core/unit.c                                       | 2 --
 src/core/unit.h                                       | 2 --
 src/coredump/coredump-vacuum.c                        | 2 --
 src/coredump/coredump-vacuum.h                        | 2 --
 src/coredump/coredump.c                               | 2 --
 src/coredump/coredumpctl.c                            | 2 --
 src/coredump/stacktrace.c                             | 2 --
 src/coredump/stacktrace.h                             | 2 --
 src/coredump/test-coredump-vacuum.c                   | 2 --
 src/cryptsetup/cryptsetup-generator.c                 | 2 --
 src/cryptsetup/cryptsetup.c                           | 2 --
 src/debug-generator/debug-generator.c                 | 2 --
 src/delta/delta.c                                     | 2 --
 src/detect-virt/detect-virt.c                         | 2 --
 src/dissect/dissect.c                                 | 2 --
 src/environment-d-generator/environment-d-generator.c | 2 --
 src/escape/escape.c                                   | 2 --
 src/firstboot/firstboot.c                             | 2 --
 src/fsck/fsck.c                                       | 2 --
 src/fstab-generator/fstab-generator.c                 | 2 --
 src/getty-generator/getty-generator.c                 | 2 --
 src/gpt-auto-generator/gpt-auto-generator.c           | 2 --
 src/hibernate-resume/hibernate-resume-generator.c     | 2 --
 src/hibernate-resume/hibernate-resume.c               | 2 --
 src/hostname/hostnamectl.c                            | 2 --
 src/hostname/hostnamed.c                              | 2 --
 src/hostname/org.freedesktop.hostname1.policy         | 2 --
 src/hostname/org.freedesktop.hostname1.service        | 2 --
 src/hwdb/hwdb.c                                       | 2 --
 src/import/curl-util.c                                | 2 --
 src/import/curl-util.h                                | 2 --
 src/import/export-raw.c                               | 2 --
 src/import/export-raw.h                               | 2 --
 src/import/export-tar.c                               | 2 --
 src/import/export-tar.h                               | 2 --
 src/import/export.c                                   | 2 --
 src/import/import-common.c                            | 2 --
 src/import/import-common.h                            | 2 --
 src/import/import-compress.c                          | 2 --
 src/import/import-compress.h                          | 2 --
 src/import/import-raw.c                               | 2 --
 src/import/import-raw.h                               | 2 --
 src/import/import-tar.c                               | 2 --
 src/import/import-tar.h                               | 2 --
 src/import/import.c                                   | 2 --
 src/import/importd.c                                  | 2 --
 src/import/pull-common.c                              | 2 --
 src/import/pull-common.h                              | 2 --
 src/import/pull-job.c                                 | 2 --
 src/import/pull-job.h                                 | 2 --
 src/import/pull-raw.c                                 | 2 --
 src/import/pull-raw.h                                 | 2 --
 src/import/pull-tar.c                                 | 2 --
 src/import/pull-tar.h                                 | 2 --
 src/import/pull.c                                     | 2 --
 src/import/qcow2-util.c                               | 2 --
 src/import/qcow2-util.h                               | 2 --
 src/import/test-qcow2.c                               | 2 --
 src/initctl/initctl.c                                 | 2 --
 src/journal-remote/journal-gatewayd.c                 | 2 --
 src/journal-remote/journal-remote-parse.c             | 2 --
 src/journal-remote/journal-remote-parse.h             | 2 --
 src/journal-remote/journal-remote-write.c             | 2 --
 src/journal-remote/journal-remote-write.h             | 2 --
 src/journal-remote/journal-remote.c                   | 2 --
 src/journal-remote/journal-remote.h                   | 2 --
 src/journal-remote/journal-upload-journal.c           | 2 --
 src/journal-remote/journal-upload.c                   | 2 --
 src/journal-remote/microhttpd-util.c                  | 2 --
 src/journal-remote/microhttpd-util.h                  | 2 --
 src/journal/audit-type.c                              | 2 --
 src/journal/audit-type.h                              | 2 --
 src/journal/cat.c                                     | 2 --
 src/journal/catalog.c                                 | 2 --
 src/journal/catalog.h                                 | 2 --
 src/journal/compress.c                                | 2 --
 src/journal/compress.h                                | 2 --
 src/journal/journal-authenticate.c                    | 2 --
 src/journal/journal-authenticate.h                    | 2 --
 src/journal/journal-def.h                             | 2 --
 src/journal/journal-file.c                            | 2 --
 src/journal/journal-file.h                            | 2 --
 src/journal/journal-internal.h                        | 2 --
 src/journal/journal-qrcode.c                          | 2 --
 src/journal/journal-qrcode.h                          | 2 --
 src/journal/journal-send.c                            | 2 --
 src/journal/journal-vacuum.c                          | 2 --
 src/journal/journal-vacuum.h                          | 2 --
 src/journal/journal-verify.c                          | 2 --
 src/journal/journal-verify.h                          | 2 --
 src/journal/journalctl.c                              | 2 --
 src/journal/journald-audit.c                          | 2 --
 src/journal/journald-audit.h                          | 2 --
 src/journal/journald-console.c                        | 2 --
 src/journal/journald-console.h                        | 2 --
 src/journal/journald-context.c                        | 2 --
 src/journal/journald-context.h                        | 2 --
 src/journal/journald-kmsg.c                           | 2 --
 src/journal/journald-kmsg.h                           | 2 --
 src/journal/journald-native.c                         | 2 --
 src/journal/journald-native.h                         | 2 --
 src/journal/journald-rate-limit.c                     | 2 --
 src/journal/journald-rate-limit.h                     | 2 --
 src/journal/journald-server.c                         | 2 --
 src/journal/journald-server.h                         | 2 --
 src/journal/journald-stream.c                         | 2 --
 src/journal/journald-stream.h                         | 2 --
 src/journal/journald-syslog.c                         | 2 --
 src/journal/journald-syslog.h                         | 2 --
 src/journal/journald-wall.c                           | 2 --
 src/journal/journald-wall.h                           | 2 --
 src/journal/journald.c                                | 2 --
 src/journal/mmap-cache.c                              | 2 --
 src/journal/mmap-cache.h                              | 2 --
 src/journal/sd-journal.c                              | 2 --
 src/journal/test-audit-type.c                         | 2 --
 src/journal/test-catalog.c                            | 2 --
 src/journal/test-compress-benchmark.c                 | 2 --
 src/journal/test-compress.c                           | 2 --
 src/journal/test-journal-config.c                     | 2 --
 src/journal/test-journal-enum.c                       | 2 --
 src/journal/test-journal-flush.c                      | 2 --
 src/journal/test-journal-init.c                       | 2 --
 src/journal/test-journal-interleaving.c               | 2 --
 src/journal/test-journal-match.c                      | 2 --
 src/journal/test-journal-send.c                       | 2 --
 src/journal/test-journal-stream.c                     | 2 --
 src/journal/test-journal-syslog.c                     | 2 --
 src/journal/test-journal-verify.c                     | 2 --
 src/journal/test-journal.c                            | 2 --
 src/journal/test-mmap-cache.c                         | 2 --
 src/libsystemd-network/arp-util.c                     | 2 --
 src/libsystemd-network/arp-util.h                     | 2 --
 src/libsystemd-network/dhcp-identifier.c              | 2 --
 src/libsystemd-network/dhcp-identifier.h              | 2 --
 src/libsystemd-network/dhcp-internal.h                | 2 --
 src/libsystemd-network/dhcp-lease-internal.h          | 2 --
 src/libsystemd-network/dhcp-network.c                 | 2 --
 src/libsystemd-network/dhcp-option.c                  | 2 --
 src/libsystemd-network/dhcp-packet.c                  | 2 --
 src/libsystemd-network/dhcp-protocol.h                | 2 --
 src/libsystemd-network/dhcp-server-internal.h         | 2 --
 src/libsystemd-network/dhcp6-internal.h               | 2 --
 src/libsystemd-network/dhcp6-lease-internal.h         | 2 --
 src/libsystemd-network/dhcp6-network.c                | 2 --
 src/libsystemd-network/dhcp6-option.c                 | 2 --
 src/libsystemd-network/dhcp6-protocol.h               | 2 --
 src/libsystemd-network/icmp6-util.c                   | 2 --
 src/libsystemd-network/icmp6-util.h                   | 2 --
 src/libsystemd-network/lldp-internal.h                | 2 --
 src/libsystemd-network/lldp-neighbor.c                | 2 --
 src/libsystemd-network/lldp-neighbor.h                | 2 --
 src/libsystemd-network/lldp-network.c                 | 2 --
 src/libsystemd-network/lldp-network.h                 | 2 --
 src/libsystemd-network/ndisc-internal.h               | 2 --
 src/libsystemd-network/ndisc-router.c                 | 2 --
 src/libsystemd-network/ndisc-router.h                 | 2 --
 src/libsystemd-network/network-internal.c             | 2 --
 src/libsystemd-network/network-internal.h             | 2 --
 src/libsystemd-network/radv-internal.h                | 2 --
 src/libsystemd-network/sd-dhcp-client.c               | 2 --
 src/libsystemd-network/sd-dhcp-lease.c                | 2 --
 src/libsystemd-network/sd-dhcp-server.c               | 2 --
 src/libsystemd-network/sd-dhcp6-client.c              | 2 --
 src/libsystemd-network/sd-dhcp6-lease.c               | 2 --
 src/libsystemd-network/sd-ipv4acd.c                   | 2 --
 src/libsystemd-network/sd-ipv4ll.c                    | 2 --
 src/libsystemd-network/sd-lldp.c                      | 2 --
 src/libsystemd-network/sd-ndisc.c                     | 2 --
 src/libsystemd-network/sd-radv.c                      | 2 --
 src/libsystemd-network/test-acd.c                     | 2 --
 src/libsystemd-network/test-dhcp-client.c             | 2 --
 src/libsystemd-network/test-dhcp-server.c             | 2 --
 src/libsystemd-network/test-dhcp6-client.c            | 2 --
 src/libsystemd-network/test-ipv4ll-manual.c           | 2 --
 src/libsystemd-network/test-ipv4ll.c                  | 2 --
 src/libsystemd-network/test-lldp.c                    | 2 --
 src/libsystemd-network/test-ndisc-ra.c                | 2 --
 src/libsystemd-network/test-ndisc-rs.c                | 2 --
 src/libsystemd/libsystemd.sym                         | 2 --
 src/libsystemd/sd-bus/bus-common-errors.c             | 2 --
 src/libsystemd/sd-bus/bus-common-errors.h             | 2 --
 src/libsystemd/sd-bus/bus-container.c                 | 2 --
 src/libsystemd/sd-bus/bus-container.h                 | 2 --
 src/libsystemd/sd-bus/bus-control.c                   | 2 --
 src/libsystemd/sd-bus/bus-control.h                   | 2 --
 src/libsystemd/sd-bus/bus-convenience.c               | 2 --
 src/libsystemd/sd-bus/bus-creds.c                     | 2 --
 src/libsystemd/sd-bus/bus-creds.h                     | 2 --
 src/libsystemd/sd-bus/bus-dump.c                      | 2 --
 src/libsystemd/sd-bus/bus-dump.h                      | 2 --
 src/libsystemd/sd-bus/bus-error.c                     | 2 --
 src/libsystemd/sd-bus/bus-error.h                     | 2 --
 src/libsystemd/sd-bus/bus-gvariant.c                  | 2 --
 src/libsystemd/sd-bus/bus-gvariant.h                  | 2 --
 src/libsystemd/sd-bus/bus-internal.c                  | 2 --
 src/libsystemd/sd-bus/bus-internal.h                  | 2 --
 src/libsystemd/sd-bus/bus-introspect.c                | 2 --
 src/libsystemd/sd-bus/bus-introspect.h                | 2 --
 src/libsystemd/sd-bus/bus-kernel.c                    | 2 --
 src/libsystemd/sd-bus/bus-kernel.h                    | 2 --
 src/libsystemd/sd-bus/bus-match.c                     | 2 --
 src/libsystemd/sd-bus/bus-match.h                     | 2 --
 src/libsystemd/sd-bus/bus-message.c                   | 2 --
 src/libsystemd/sd-bus/bus-message.h                   | 2 --
 src/libsystemd/sd-bus/bus-objects.c                   | 2 --
 src/libsystemd/sd-bus/bus-objects.h                   | 2 --
 src/libsystemd/sd-bus/bus-protocol.h                  | 2 --
 src/libsystemd/sd-bus/bus-signature.c                 | 2 --
 src/libsystemd/sd-bus/bus-signature.h                 | 2 --
 src/libsystemd/sd-bus/bus-slot.c                      | 2 --
 src/libsystemd/sd-bus/bus-slot.h                      | 2 --
 src/libsystemd/sd-bus/bus-socket.c                    | 2 --
 src/libsystemd/sd-bus/bus-socket.h                    | 2 --
 src/libsystemd/sd-bus/bus-track.c                     | 2 --
 src/libsystemd/sd-bus/bus-track.h                     | 2 --
 src/libsystemd/sd-bus/bus-type.c                      | 2 --
 src/libsystemd/sd-bus/bus-type.h                      | 2 --
 src/libsystemd/sd-bus/sd-bus.c                        | 2 --
 src/libsystemd/sd-bus/test-bus-benchmark.c            | 2 --
 src/libsystemd/sd-bus/test-bus-chat.c                 | 2 --
 src/libsystemd/sd-bus/test-bus-cleanup.c              | 2 --
 src/libsystemd/sd-bus/test-bus-creds.c                | 2 --
 src/libsystemd/sd-bus/test-bus-error.c                | 2 --
 src/libsystemd/sd-bus/test-bus-gvariant.c             | 2 --
 src/libsystemd/sd-bus/test-bus-introspect.c           | 2 --
 src/libsystemd/sd-bus/test-bus-marshal.c              | 2 --
 src/libsystemd/sd-bus/test-bus-match.c                | 2 --
 src/libsystemd/sd-bus/test-bus-objects.c              | 2 --
 src/libsystemd/sd-bus/test-bus-server.c               | 2 --
 src/libsystemd/sd-bus/test-bus-signature.c            | 2 --
 src/libsystemd/sd-bus/test-bus-track.c                | 2 --
 src/libsystemd/sd-bus/test-bus-watch-bind.c           | 2 --
 src/libsystemd/sd-daemon/sd-daemon.c                  | 2 --
 src/libsystemd/sd-device/device-enumerator-private.h  | 2 --
 src/libsystemd/sd-device/device-enumerator.c          | 2 --
 src/libsystemd/sd-device/device-internal.h            | 2 --
 src/libsystemd/sd-device/device-private.c             | 2 --
 src/libsystemd/sd-device/device-private.h             | 2 --
 src/libsystemd/sd-device/device-util.h                | 2 --
 src/libsystemd/sd-device/sd-device.c                  | 2 --
 src/libsystemd/sd-event/sd-event.c                    | 2 --
 src/libsystemd/sd-event/test-event.c                  | 2 --
 src/libsystemd/sd-hwdb/hwdb-internal.h                | 2 --
 src/libsystemd/sd-hwdb/hwdb-util.h                    | 2 --
 src/libsystemd/sd-hwdb/sd-hwdb.c                      | 2 --
 src/libsystemd/sd-id128/id128-util.c                  | 2 --
 src/libsystemd/sd-id128/id128-util.h                  | 2 --
 src/libsystemd/sd-id128/sd-id128.c                    | 2 --
 src/libsystemd/sd-login/sd-login.c                    | 2 --
 src/libsystemd/sd-login/test-login.c                  | 2 --
 src/libsystemd/sd-netlink/local-addresses.c           | 2 --
 src/libsystemd/sd-netlink/local-addresses.h           | 2 --
 src/libsystemd/sd-netlink/netlink-internal.h          | 2 --
 src/libsystemd/sd-netlink/netlink-message.c           | 2 --
 src/libsystemd/sd-netlink/netlink-socket.c            | 2 --
 src/libsystemd/sd-netlink/netlink-types.c             | 2 --
 src/libsystemd/sd-netlink/netlink-types.h             | 2 --
 src/libsystemd/sd-netlink/netlink-util.c              | 2 --
 src/libsystemd/sd-netlink/netlink-util.h              | 2 --
 src/libsystemd/sd-netlink/rtnl-message.c              | 2 --
 src/libsystemd/sd-netlink/sd-netlink.c                | 2 --
 src/libsystemd/sd-netlink/test-local-addresses.c      | 2 --
 src/libsystemd/sd-netlink/test-netlink.c              | 2 --
 src/libsystemd/sd-network/network-util.c              | 2 --
 src/libsystemd/sd-network/network-util.h              | 2 --
 src/libsystemd/sd-network/sd-network.c                | 2 --
 src/libsystemd/sd-path/sd-path.c                      | 2 --
 src/libsystemd/sd-resolve/sd-resolve.c                | 2 --
 src/libsystemd/sd-resolve/test-resolve.c              | 2 --
 src/libsystemd/sd-utf8/sd-utf8.c                      | 2 --
 src/libudev/libudev-device-internal.h                 | 2 --
 src/libudev/libudev-device-private.c                  | 2 --
 src/libudev/libudev-device.c                          | 2 --
 src/libudev/libudev-enumerate.c                       | 2 --
 src/libudev/libudev-hwdb.c                            | 2 --
 src/libudev/libudev-list.c                            | 2 --
 src/libudev/libudev-monitor.c                         | 2 --
 src/libudev/libudev-private.h                         | 2 --
 src/libudev/libudev-queue.c                           | 2 --
 src/libudev/libudev-util.c                            | 2 --
 src/libudev/libudev.c                                 | 2 --
 src/libudev/libudev.h                                 | 2 --
 src/libudev/libudev.sym                               | 2 --
 src/locale/keymap-util.c                              | 2 --
 src/locale/keymap-util.h                              | 2 --
 src/locale/localectl.c                                | 2 --
 src/locale/localed.c                                  | 2 --
 src/locale/test-keymap-util.c                         | 2 --
 src/login/inhibit.c                                   | 2 --
 src/login/loginctl.c                                  | 2 --
 src/login/logind-acl.c                                | 2 --
 src/login/logind-acl.h                                | 2 --
 src/login/logind-action.c                             | 2 --
 src/login/logind-action.h                             | 2 --
 src/login/logind-button.c                             | 2 --
 src/login/logind-button.h                             | 2 --
 src/login/logind-core.c                               | 2 --
 src/login/logind-dbus.c                               | 2 --
 src/login/logind-device.c                             | 2 --
 src/login/logind-device.h                             | 2 --
 src/login/logind-inhibit.c                            | 2 --
 src/login/logind-inhibit.h                            | 2 --
 src/login/logind-seat-dbus.c                          | 2 --
 src/login/logind-seat.c                               | 2 --
 src/login/logind-seat.h                               | 2 --
 src/login/logind-session-dbus.c                       | 2 --
 src/login/logind-session-device.c                     | 2 --
 src/login/logind-session-device.h                     | 2 --
 src/login/logind-session.c                            | 2 --
 src/login/logind-session.h                            | 2 --
 src/login/logind-user-dbus.c                          | 2 --
 src/login/logind-user.c                               | 2 --
 src/login/logind-user.h                               | 2 --
 src/login/logind-utmp.c                               | 2 --
 src/login/logind.c                                    | 2 --
 src/login/logind.h                                    | 2 --
 src/login/pam_systemd.c                               | 2 --
 src/login/pam_systemd.sym                             | 2 --
 src/login/sysfs-show.c                                | 2 --
 src/login/sysfs-show.h                                | 2 --
 src/login/test-inhibit.c                              | 2 --
 src/login/test-login-shared.c                         | 2 --
 src/login/test-login-tables.c                         | 2 --
 src/machine-id-setup/machine-id-setup-main.c          | 2 --
 src/machine/image-dbus.c                              | 2 --
 src/machine/image-dbus.h                              | 2 --
 src/machine/machine-dbus.c                            | 2 --
 src/machine/machine-dbus.h                            | 2 --
 src/machine/machine.c                                 | 2 --
 src/machine/machine.h                                 | 2 --
 src/machine/machinectl.c                              | 2 --
 src/machine/machined-dbus.c                           | 2 --
 src/machine/machined.c                                | 2 --
 src/machine/machined.h                                | 2 --
 src/machine/operation.c                               | 2 --
 src/machine/operation.h                               | 2 --
 src/machine/test-machine-tables.c                     | 2 --
 src/modules-load/modules-load.c                       | 2 --
 src/mount/mount-tool.c                                | 2 --
 src/network/netdev/bond.c                             | 2 --
 src/network/netdev/bond.h                             | 2 --
 src/network/netdev/bridge.c                           | 2 --
 src/network/netdev/bridge.h                           | 2 --
 src/network/netdev/dummy.c                            | 2 --
 src/network/netdev/dummy.h                            | 2 --
 src/network/netdev/geneve.c                           | 2 --
 src/network/netdev/geneve.h                           | 2 --
 src/network/netdev/ipvlan.c                           | 2 --
 src/network/netdev/ipvlan.h                           | 2 --
 src/network/netdev/macvlan.c                          | 2 --
 src/network/netdev/macvlan.h                          | 2 --
 src/network/netdev/netdev.c                           | 2 --
 src/network/netdev/netdev.h                           | 2 --
 src/network/netdev/netdevsim.c                        | 2 --
 src/network/netdev/netdevsim.h                        | 2 --
 src/network/netdev/tunnel.c                           | 2 --
 src/network/netdev/tunnel.h                           | 2 --
 src/network/netdev/tuntap.c                           | 2 --
 src/network/netdev/tuntap.h                           | 2 --
 src/network/netdev/vcan.c                             | 2 --
 src/network/netdev/vcan.h                             | 2 --
 src/network/netdev/veth.c                             | 2 --
 src/network/netdev/veth.h                             | 2 --
 src/network/netdev/vlan.c                             | 2 --
 src/network/netdev/vlan.h                             | 2 --
 src/network/netdev/vrf.c                              | 2 --
 src/network/netdev/vrf.h                              | 2 --
 src/network/netdev/vxcan.c                            | 2 --
 src/network/netdev/vxcan.h                            | 2 --
 src/network/netdev/vxlan.c                            | 2 --
 src/network/netdev/vxlan.h                            | 2 --
 src/network/netdev/wireguard.c                        | 2 --
 src/network/netdev/wireguard.h                        | 2 --
 src/network/networkctl.c                              | 2 --
 src/network/networkd-address-label.c                  | 2 --
 src/network/networkd-address-label.h                  | 2 --
 src/network/networkd-address-pool.c                   | 2 --
 src/network/networkd-address-pool.h                   | 2 --
 src/network/networkd-address.c                        | 2 --
 src/network/networkd-address.h                        | 2 --
 src/network/networkd-brvlan.c                         | 2 --
 src/network/networkd-brvlan.h                         | 2 --
 src/network/networkd-conf.c                           | 2 --
 src/network/networkd-conf.h                           | 2 --
 src/network/networkd-dhcp4.c                          | 2 --
 src/network/networkd-dhcp6.c                          | 2 --
 src/network/networkd-fdb.c                            | 2 --
 src/network/networkd-fdb.h                            | 2 --
 src/network/networkd-ipv4ll.c                         | 2 --
 src/network/networkd-ipv6-proxy-ndp.c                 | 2 --
 src/network/networkd-ipv6-proxy-ndp.h                 | 2 --
 src/network/networkd-link-bus.c                       | 2 --
 src/network/networkd-link.c                           | 2 --
 src/network/networkd-link.h                           | 2 --
 src/network/networkd-lldp-tx.c                        | 2 --
 src/network/networkd-lldp-tx.h                        | 2 --
 src/network/networkd-manager-bus.c                    | 2 --
 src/network/networkd-manager.c                        | 2 --
 src/network/networkd-manager.h                        | 2 --
 src/network/networkd-ndisc.c                          | 2 --
 src/network/networkd-ndisc.h                          | 2 --
 src/network/networkd-network-bus.c                    | 2 --
 src/network/networkd-network.c                        | 2 --
 src/network/networkd-network.h                        | 2 --
 src/network/networkd-radv.c                           | 2 --
 src/network/networkd-radv.h                           | 2 --
 src/network/networkd-route.c                          | 2 --
 src/network/networkd-route.h                          | 2 --
 src/network/networkd-routing-policy-rule.c            | 2 --
 src/network/networkd-routing-policy-rule.h            | 2 --
 src/network/networkd-util.c                           | 2 --
 src/network/networkd-util.h                           | 2 --
 src/network/networkd.c                                | 2 --
 src/network/test-network.c                            | 2 --
 src/network/test-networkd-conf.c                      | 2 --
 src/network/test-routing-policy-rule.c                | 2 --
 src/network/wait-online/link.c                        | 2 --
 src/network/wait-online/link.h                        | 2 --
 src/network/wait-online/manager.c                     | 2 --
 src/network/wait-online/manager.h                     | 2 --
 src/network/wait-online/wait-online.c                 | 2 --
 src/notify/notify.c                                   | 2 --
 src/nspawn/nspawn-cgroup.c                            | 2 --
 src/nspawn/nspawn-cgroup.h                            | 2 --
 src/nspawn/nspawn-def.h                               | 2 --
 src/nspawn/nspawn-expose-ports.c                      | 2 --
 src/nspawn/nspawn-expose-ports.h                      | 2 --
 src/nspawn/nspawn-mount.c                             | 2 --
 src/nspawn/nspawn-mount.h                             | 2 --
 src/nspawn/nspawn-network.c                           | 2 --
 src/nspawn/nspawn-network.h                           | 2 --
 src/nspawn/nspawn-patch-uid.c                         | 2 --
 src/nspawn/nspawn-patch-uid.h                         | 2 --
 src/nspawn/nspawn-register.c                          | 2 --
 src/nspawn/nspawn-register.h                          | 2 --
 src/nspawn/nspawn-seccomp.c                           | 2 --
 src/nspawn/nspawn-seccomp.h                           | 2 --
 src/nspawn/nspawn-settings.c                          | 2 --
 src/nspawn/nspawn-settings.h                          | 2 --
 src/nspawn/nspawn-setuid.c                            | 2 --
 src/nspawn/nspawn-setuid.h                            | 2 --
 src/nspawn/nspawn-stub-pid1.c                         | 2 --
 src/nspawn/nspawn-stub-pid1.h                         | 2 --
 src/nspawn/nspawn.c                                   | 2 --
 src/nspawn/test-patch-uid.c                           | 2 --
 src/nss-myhostname/nss-myhostname.c                   | 2 --
 src/nss-myhostname/nss-myhostname.sym                 | 2 --
 src/nss-mymachines/nss-mymachines.c                   | 2 --
 src/nss-mymachines/nss-mymachines.sym                 | 2 --
 src/nss-resolve/nss-resolve.c                         | 2 --
 src/nss-resolve/nss-resolve.sym                       | 2 --
 src/nss-systemd/nss-systemd.c                         | 2 --
 src/nss-systemd/nss-systemd.sym                       | 2 --
 src/partition/growfs.c                                | 2 --
 src/partition/makefs.c                                | 2 --
 src/path/path.c                                       | 2 --
 src/quotacheck/quotacheck.c                           | 2 --
 src/random-seed/random-seed.c                         | 2 --
 src/rc-local-generator/rc-local-generator.c           | 2 --
 src/remount-fs/remount-fs.c                           | 2 --
 src/reply-password/reply-password.c                   | 2 --
 src/resolve/dns-type.c                                | 2 --
 src/resolve/dns-type.h                                | 2 --
 src/resolve/resolvectl.c                              | 2 --
 src/resolve/resolved-bus.c                            | 2 --
 src/resolve/resolved-bus.h                            | 2 --
 src/resolve/resolved-conf.c                           | 2 --
 src/resolve/resolved-conf.h                           | 2 --
 src/resolve/resolved-def.h                            | 2 --
 src/resolve/resolved-dns-answer.c                     | 2 --
 src/resolve/resolved-dns-answer.h                     | 2 --
 src/resolve/resolved-dns-cache.c                      | 2 --
 src/resolve/resolved-dns-cache.h                      | 2 --
 src/resolve/resolved-dns-dnssec.c                     | 2 --
 src/resolve/resolved-dns-dnssec.h                     | 2 --
 src/resolve/resolved-dns-packet.c                     | 2 --
 src/resolve/resolved-dns-packet.h                     | 2 --
 src/resolve/resolved-dns-query.c                      | 2 --
 src/resolve/resolved-dns-query.h                      | 2 --
 src/resolve/resolved-dns-question.c                   | 2 --
 src/resolve/resolved-dns-question.h                   | 2 --
 src/resolve/resolved-dns-rr.c                         | 2 --
 src/resolve/resolved-dns-rr.h                         | 2 --
 src/resolve/resolved-dns-scope.c                      | 2 --
 src/resolve/resolved-dns-scope.h                      | 2 --
 src/resolve/resolved-dns-search-domain.c              | 2 --
 src/resolve/resolved-dns-search-domain.h              | 2 --
 src/resolve/resolved-dns-server.c                     | 2 --
 src/resolve/resolved-dns-server.h                     | 2 --
 src/resolve/resolved-dns-stream.c                     | 2 --
 src/resolve/resolved-dns-stream.h                     | 2 --
 src/resolve/resolved-dns-stub.c                       | 2 --
 src/resolve/resolved-dns-stub.h                       | 2 --
 src/resolve/resolved-dns-synthesize.c                 | 2 --
 src/resolve/resolved-dns-synthesize.h                 | 2 --
 src/resolve/resolved-dns-transaction.c                | 2 --
 src/resolve/resolved-dns-transaction.h                | 2 --
 src/resolve/resolved-dns-trust-anchor.c               | 2 --
 src/resolve/resolved-dns-trust-anchor.h               | 2 --
 src/resolve/resolved-dns-zone.c                       | 2 --
 src/resolve/resolved-dns-zone.h                       | 2 --
 src/resolve/resolved-dnssd-bus.c                      | 2 --
 src/resolve/resolved-dnssd-bus.h                      | 2 --
 src/resolve/resolved-dnssd.c                          | 2 --
 src/resolve/resolved-dnssd.h                          | 2 --
 src/resolve/resolved-etc-hosts.c                      | 2 --
 src/resolve/resolved-etc-hosts.h                      | 2 --
 src/resolve/resolved-link-bus.c                       | 2 --
 src/resolve/resolved-link-bus.h                       | 2 --
 src/resolve/resolved-link.c                           | 2 --
 src/resolve/resolved-link.h                           | 2 --
 src/resolve/resolved-llmnr.c                          | 2 --
 src/resolve/resolved-llmnr.h                          | 2 --
 src/resolve/resolved-manager.c                        | 2 --
 src/resolve/resolved-manager.h                        | 2 --
 src/resolve/resolved-mdns.c                           | 2 --
 src/resolve/resolved-mdns.h                           | 2 --
 src/resolve/resolved-resolv-conf.c                    | 2 --
 src/resolve/resolved-resolv-conf.h                    | 2 --
 src/resolve/resolved.c                                | 2 --
 src/resolve/test-dns-packet.c                         | 2 --
 src/resolve/test-dnssec-complex.c                     | 2 --
 src/resolve/test-dnssec.c                             | 2 --
 src/resolve/test-resolve-tables.c                     | 2 --
 src/resolve/test-resolved-packet.c                    | 2 --
 src/rfkill/rfkill.c                                   | 2 --
 src/run/run.c                                         | 2 --
 src/shared/acl-util.c                                 | 2 --
 src/shared/acl-util.h                                 | 2 --
 src/shared/acpi-fpdt.c                                | 2 --
 src/shared/acpi-fpdt.h                                | 2 --
 src/shared/apparmor-util.c                            | 2 --
 src/shared/apparmor-util.h                            | 2 --
 src/shared/ask-password-api.c                         | 2 --
 src/shared/ask-password-api.h                         | 2 --
 src/shared/base-filesystem.c                          | 2 --
 src/shared/base-filesystem.h                          | 2 --
 src/shared/boot-timestamps.c                          | 2 --
 src/shared/boot-timestamps.h                          | 2 --
 src/shared/bootspec.c                                 | 2 --
 src/shared/bootspec.h                                 | 2 --
 src/shared/bus-unit-util.c                            | 2 --
 src/shared/bus-unit-util.h                            | 2 --
 src/shared/bus-util.c                                 | 2 --
 src/shared/bus-util.h                                 | 2 --
 src/shared/cgroup-show.c                              | 2 --
 src/shared/cgroup-show.h                              | 2 --
 src/shared/clean-ipc.c                                | 2 --
 src/shared/clean-ipc.h                                | 2 --
 src/shared/condition.c                                | 2 --
 src/shared/condition.h                                | 2 --
 src/shared/conf-parser.c                              | 2 --
 src/shared/conf-parser.h                              | 2 --
 src/shared/dev-setup.c                                | 2 --
 src/shared/dev-setup.h                                | 2 --
 src/shared/dissect-image.c                            | 2 --
 src/shared/dissect-image.h                            | 2 --
 src/shared/dns-domain.c                               | 2 --
 src/shared/dns-domain.h                               | 2 --
 src/shared/dropin.c                                   | 2 --
 src/shared/dropin.h                                   | 2 --
 src/shared/efivars.c                                  | 2 --
 src/shared/efivars.h                                  | 2 --
 src/shared/fdset.c                                    | 2 --
 src/shared/fdset.h                                    | 2 --
 src/shared/firewall-util.c                            | 2 --
 src/shared/firewall-util.h                            | 2 --
 src/shared/fstab-util.c                               | 2 --
 src/shared/fstab-util.h                               | 2 --
 src/shared/generator.c                                | 2 --
 src/shared/generator.h                                | 2 --
 src/shared/gpt.h                                      | 2 --
 src/shared/ima-util.c                                 | 2 --
 src/shared/ima-util.h                                 | 2 --
 src/shared/import-util.c                              | 2 --
 src/shared/import-util.h                              | 2 --
 src/shared/install-printf.c                           | 2 --
 src/shared/install-printf.h                           | 2 --
 src/shared/install.c                                  | 2 --
 src/shared/install.h                                  | 2 --
 src/shared/journal-util.c                             | 2 --
 src/shared/journal-util.h                             | 2 --
 src/shared/logs-show.c                                | 2 --
 src/shared/logs-show.h                                | 2 --
 src/shared/loop-util.c                                | 2 --
 src/shared/loop-util.h                                | 2 --
 src/shared/machine-image.c                            | 2 --
 src/shared/machine-image.h                            | 2 --
 src/shared/machine-pool.c                             | 2 --
 src/shared/machine-pool.h                             | 2 --
 src/shared/nsflags.c                                  | 2 --
 src/shared/nsflags.h                                  | 2 --
 src/shared/output-mode.c                              | 2 --
 src/shared/output-mode.h                              | 2 --
 src/shared/path-lookup.c                              | 2 --
 src/shared/path-lookup.h                              | 2 --
 src/shared/ptyfwd.c                                   | 2 --
 src/shared/ptyfwd.h                                   | 2 --
 src/shared/resolve-util.c                             | 2 --
 src/shared/resolve-util.h                             | 2 --
 src/shared/seccomp-util.c                             | 2 --
 src/shared/seccomp-util.h                             | 2 --
 src/shared/sleep-config.c                             | 2 --
 src/shared/sleep-config.h                             | 2 --
 src/shared/spawn-ask-password-agent.c                 | 2 --
 src/shared/spawn-ask-password-agent.h                 | 2 --
 src/shared/spawn-polkit-agent.c                       | 2 --
 src/shared/spawn-polkit-agent.h                       | 2 --
 src/shared/specifier.c                                | 2 --
 src/shared/specifier.h                                | 2 --
 src/shared/switch-root.c                              | 2 --
 src/shared/switch-root.h                              | 2 --
 src/shared/sysctl-util.c                              | 2 --
 src/shared/sysctl-util.h                              | 2 --
 src/shared/test-tables.h                              | 2 --
 src/shared/tests.c                                    | 2 --
 src/shared/tests.h                                    | 2 --
 src/shared/tomoyo-util.c                              | 2 --
 src/shared/tomoyo-util.h                              | 2 --
 src/shared/udev-util.c                                | 2 --
 src/shared/udev-util.h                                | 2 --
 src/shared/uid-range.c                                | 2 --
 src/shared/uid-range.h                                | 2 --
 src/shared/utmp-wtmp.c                                | 2 --
 src/shared/utmp-wtmp.h                                | 2 --
 src/shared/vlan-util.c                                | 2 --
 src/shared/vlan-util.h                                | 2 --
 src/shared/volatile-util.c                            | 2 --
 src/shared/volatile-util.h                            | 2 --
 src/shared/watchdog.c                                 | 2 --
 src/shared/watchdog.h                                 | 2 --
 src/sleep/sleep.c                                     | 2 --
 src/socket-proxy/socket-proxyd.c                      | 2 --
 src/stdio-bridge/stdio-bridge.c                       | 2 --
 src/sulogin-shell/sulogin-shell.c                     | 2 --
 src/sysctl/sysctl.c                                   | 2 --
 src/system-update-generator/system-update-generator.c | 2 --
 src/systemctl/systemctl.c                             | 2 --
 src/systemd/_sd-common.h                              | 2 --
 src/systemd/sd-bus-protocol.h                         | 2 --
 src/systemd/sd-bus-vtable.h                           | 2 --
 src/systemd/sd-bus.h                                  | 2 --
 src/systemd/sd-daemon.h                               | 2 --
 src/systemd/sd-device.h                               | 2 --
 src/systemd/sd-dhcp-client.h                          | 2 --
 src/systemd/sd-dhcp-lease.h                           | 2 --
 src/systemd/sd-dhcp-server.h                          | 2 --
 src/systemd/sd-dhcp6-client.h                         | 2 --
 src/systemd/sd-dhcp6-lease.h                          | 2 --
 src/systemd/sd-event.h                                | 2 --
 src/systemd/sd-hwdb.h                                 | 2 --
 src/systemd/sd-id128.h                                | 2 --
 src/systemd/sd-ipv4acd.h                              | 2 --
 src/systemd/sd-ipv4ll.h                               | 2 --
 src/systemd/sd-journal.h                              | 2 --
 src/systemd/sd-lldp.h                                 | 2 --
 src/systemd/sd-login.h                                | 2 --
 src/systemd/sd-messages.h                             | 2 --
 src/systemd/sd-ndisc.h                                | 2 --
 src/systemd/sd-netlink.h                              | 2 --
 src/systemd/sd-network.h                              | 2 --
 src/systemd/sd-path.h                                 | 2 --
 src/systemd/sd-radv.h                                 | 2 --
 src/systemd/sd-resolve.h                              | 2 --
 src/systemd/sd-utf8.h                                 | 2 --
 src/sysusers/sysusers.c                               | 2 --
 src/sysv-generator/sysv-generator.c                   | 2 --
 src/test/test-acl-util.c                              | 2 --
 src/test/test-af-list.c                               | 2 --
 src/test/test-alloc-util.c                            | 2 --
 src/test/test-architecture.c                          | 2 --
 src/test/test-arphrd-list.c                           | 2 --
 src/test/test-ask-password-api.c                      | 2 --
 src/test/test-async.c                                 | 2 --
 src/test/test-barrier.c                               | 2 --
 src/test/test-bitmap.c                                | 2 --
 src/test/test-boot-timestamps.c                       | 2 --
 src/test/test-bpf.c                                   | 2 --
 src/test/test-btrfs.c                                 | 2 --
 src/test/test-calendarspec.c                          | 2 --
 src/test/test-cap-list.c                              | 2 --
 src/test/test-capability.c                            | 2 --
 src/test/test-cgroup-mask.c                           | 2 --
 src/test/test-cgroup-util.c                           | 2 --
 src/test/test-cgroup.c                                | 2 --
 src/test/test-clock.c                                 | 2 --
 src/test/test-condition.c                             | 2 --
 src/test/test-conf-files.c                            | 2 --
 src/test/test-conf-parser.c                           | 2 --
 src/test/test-copy.c                                  | 2 --
 src/test/test-cpu-set-util.c                          | 2 --
 src/test/test-daemon.c                                | 2 --
 src/test/test-date.c                                  | 2 --
 src/test/test-device-nodes.c                          | 2 --
 src/test/test-dissect-image.c                         | 2 --
 src/test/test-dlopen.c                                | 2 --
 src/test/test-dns-domain.c                            | 2 --
 src/test/test-ellipsize.c                             | 2 --
 src/test/test-engine.c                                | 2 --
 src/test/test-env-util.c                              | 2 --
 src/test/test-escape.c                                | 2 --
 src/test/test-exec-util.c                             | 2 --
 src/test/test-execute.c                               | 2 --
 src/test/test-extract-word.c                          | 2 --
 src/test/test-fd-util.c                               | 2 --
 src/test/test-fdset.c                                 | 2 --
 src/test/test-fileio.c                                | 2 --
 src/test/test-firewall-util.c                         | 2 --
 src/test/test-fs-util.c                               | 2 --
 src/test/test-fstab-util.c                            | 2 --
 src/test/test-glob-util.c                             | 2 --
 src/test/test-hash.c                                  | 2 --
 src/test/test-hashmap-plain.c                         | 2 --
 src/test/test-hashmap.c                               | 2 --
 src/test/test-helper.c                                | 2 --
 src/test/test-helper.h                                | 2 --
 src/test/test-hexdecoct.c                             | 2 --
 src/test/test-hostname-util.c                         | 2 --
 src/test/test-hostname.c                              | 2 --
 src/test/test-id128.c                                 | 2 --
 src/test/test-in-addr-util.c                          | 2 --
 src/test/test-install-root.c                          | 2 --
 src/test/test-install.c                               | 2 --
 src/test/test-io-util.c                               | 2 --
 src/test/test-ipcrm.c                                 | 2 --
 src/test/test-job-type.c                              | 2 --
 src/test/test-journal-importer.c                      | 2 --
 src/test/test-libudev.c                               | 2 --
 src/test/test-list.c                                  | 2 --
 src/test/test-locale-util.c                           | 2 --
 src/test/test-log.c                                   | 2 --
 src/test/test-loopback.c                              | 2 --
 src/test/test-mount-util.c                            | 2 --
 src/test/test-namespace.c                             | 2 --
 src/test/test-netlink-manual.c                        | 2 --
 src/test/test-ns.c                                    | 2 --
 src/test/test-nss.c                                   | 2 --
 src/test/test-parse-util.c                            | 2 --
 src/test/test-path-lookup.c                           | 2 --
 src/test/test-path-util.c                             | 2 --
 src/test/test-path.c                                  | 2 --
 src/test/test-prioq.c                                 | 2 --
 src/test/test-proc-cmdline.c                          | 2 --
 src/test/test-process-util.c                          | 2 --
 src/test/test-random-util.c                           | 2 --
 src/test/test-ratelimit.c                             | 2 --
 src/test/test-replace-var.c                           | 2 --
 src/test/test-rlimit-util.c                           | 3 ---
 src/test/test-sched-prio.c                            | 2 --
 src/test/test-seccomp.c                               | 2 --
 src/test/test-selinux.c                               | 2 --
 src/test/test-set.c                                   | 2 --
 src/test/test-sigbus.c                                | 2 --
 src/test/test-signal-util.c                           | 2 --
 src/test/test-siphash24.c                             | 2 --
 src/test/test-sizeof.c                                | 2 --
 src/test/test-sleep.c                                 | 2 --
 src/test/test-socket-util.c                           | 2 --
 src/test/test-specifier.c                             | 2 --
 src/test/test-stat-util.c                             | 2 --
 src/test/test-strbuf.c                                | 2 --
 src/test/test-string-util.c                           | 2 --
 src/test/test-strip-tab-ansi.c                        | 2 --
 src/test/test-strv.c                                  | 2 --
 src/test/test-strxcpyx.c                              | 2 --
 src/test/test-systemd-tmpfiles.py                     | 2 --
 src/test/test-tables.c                                | 2 --
 src/test/test-terminal-util.c                         | 2 --
 src/test/test-time-util.c                             | 2 --
 src/test/test-tmpfiles.c                              | 2 --
 src/test/test-udev.c                                  | 2 --
 src/test/test-uid-range.c                             | 2 --
 src/test/test-unaligned.c                             | 2 --
 src/test/test-unit-file.c                             | 2 --
 src/test/test-unit-name.c                             | 2 --
 src/test/test-user-util.c                             | 2 --
 src/test/test-utf8.c                                  | 2 --
 src/test/test-util.c                                  | 2 --
 src/test/test-verbs.c                                 | 2 --
 src/test/test-watchdog.c                              | 2 --
 src/test/test-web-util.c                              | 2 --
 src/test/test-xattr-util.c                            | 2 --
 src/test/test-xml.c                                   | 2 --
 src/timedate/timedatectl.c                            | 2 --
 src/timedate/timedated.c                              | 2 --
 src/timesync/test-timesync.c                          | 2 --
 src/timesync/timesyncd-conf.c                         | 2 --
 src/timesync/timesyncd-conf.h                         | 2 --
 src/timesync/timesyncd-manager.c                      | 2 --
 src/timesync/timesyncd-manager.h                      | 2 --
 src/timesync/timesyncd-server.c                       | 2 --
 src/timesync/timesyncd-server.h                       | 2 --
 src/timesync/timesyncd.c                              | 2 --
 src/tmpfiles/tmpfiles.c                               | 2 --
 src/tty-ask-password-agent/tty-ask-password-agent.c   | 2 --
 src/udev/net/ethtool-util.c                           | 2 --
 src/udev/net/ethtool-util.h                           | 2 --
 src/udev/net/link-config.c                            | 2 --
 src/udev/net/link-config.h                            | 2 --
 src/udev/udev-builtin-btrfs.c                         | 2 --
 src/udev/udev-builtin-hwdb.c                          | 2 --
 src/udev/udev-builtin-keyboard.c                      | 2 --
 src/udev/udev-builtin-net_id.c                        | 2 --
 src/udev/udev-builtin-net_setup_link.c                | 2 --
 src/udev/udev-builtin.c                               | 2 --
 src/udev/udevadm-hwdb.c                               | 2 --
 src/update-done/update-done.c                         | 2 --
 src/update-utmp/update-utmp.c                         | 2 --
 src/user-sessions/user-sessions.c                     | 2 --
 src/vconsole/vconsole-setup.c                         | 2 --
 src/veritysetup/veritysetup-generator.c               | 2 --
 src/veritysetup/veritysetup.c                         | 2 --
 src/volatile-root/volatile-root.c                     | 2 --
 tools/catalog-report.py                               | 3 +--
 tools/gdb-sd_dump_hashmaps.py                         | 2 --
 tools/make-directive-index.py                         | 2 --
 tools/make-man-index.py                               | 2 --
 tools/make-man-rules.py                               | 2 --
 tools/xml_helper.py                                   | 2 --
 1441 files changed, 2 insertions(+), 2884 deletions(-)

diff --git a/.mkosi/mkosi.arch b/.mkosi/mkosi.arch
index 0f9c28784b8..b722bfb87f6 100644
--- a/.mkosi/mkosi.arch
+++ b/.mkosi/mkosi.arch
@@ -1,7 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1+
 #
-# This file is part of systemd.
-#
 # Copyright 2016 Zeal Jagannatha
 
 # This is a settings file for OS image generation using mkosi (https://github.com/systemd/mkosi).
diff --git a/.mkosi/mkosi.debian b/.mkosi/mkosi.debian
index 5f9428b4f1e..a1cb99fb174 100644
--- a/.mkosi/mkosi.debian
+++ b/.mkosi/mkosi.debian
@@ -1,7 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1+
 #
-# This file is part of systemd.
-#
 # Copyright 2016 Daniel Rusek
 
 # This is a settings file for OS image generation using mkosi (https://github.com/systemd/mkosi).
diff --git a/.mkosi/mkosi.fedora b/.mkosi/mkosi.fedora
index 7f1b555efa3..c40d066c640 100644
--- a/.mkosi/mkosi.fedora
+++ b/.mkosi/mkosi.fedora
@@ -1,7 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1+
 #
-# This file is part of systemd.
-#
 # Copyright 2016 Lennart Poettering
 
 # This is a settings file for OS image generation using mkosi (https://github.com/systemd/mkosi).
diff --git a/catalog/systemd.be.catalog.in b/catalog/systemd.be.catalog.in
index 43f98cd1542..7d0958e3125 100644
--- a/catalog/systemd.be.catalog.in
+++ b/catalog/systemd.be.catalog.in
@@ -1,7 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1+
 #
-#  This file is part of systemd.
-#
 #  Copyright 2012 Lennart Poettering
 #  Copyright 2015, 2016 Viktar Vaŭčkievič
 
diff --git a/catalog/systemd.be@latin.catalog.in b/catalog/systemd.be@latin.catalog.in
index 0aebc3ca7c0..2dca66b9c88 100644
--- a/catalog/systemd.be@latin.catalog.in
+++ b/catalog/systemd.be@latin.catalog.in
@@ -1,7 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1+
 #
-#  This file is part of systemd.
-#
 #  Copyright 2012 Lennart Poettering
 #  Copyright 2015, 2016 Viktar Vaŭčkievič
 
diff --git a/catalog/systemd.bg.catalog.in b/catalog/systemd.bg.catalog.in
index 1dcf1a39614..88e09452454 100644
--- a/catalog/systemd.bg.catalog.in
+++ b/catalog/systemd.bg.catalog.in
@@ -1,7 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1+
 #
-#  This file is part of systemd.
-#
 #  Copyright 2012 Lennart Poettering
 #  Copyright 2016 Alexander Shopov <ash@kambanaria.org>
 
diff --git a/catalog/systemd.catalog.in b/catalog/systemd.catalog.in
index 0b7a3d0c621..64e87929b65 100644
--- a/catalog/systemd.catalog.in
+++ b/catalog/systemd.catalog.in
@@ -1,7 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1+
 #
-#  This file is part of systemd.
-#
 #  Copyright 2012 Lennart Poettering
 
 # Message catalog for systemd's own messages
diff --git a/catalog/systemd.da.catalog.in b/catalog/systemd.da.catalog.in
index 50ff8a571d5..4353ef67497 100644
--- a/catalog/systemd.da.catalog.in
+++ b/catalog/systemd.da.catalog.in
@@ -1,7 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1+
 #
-#  This file is part of systemd.
-#
 #  Copyright 2012 Lennart Poettering
 
 # Message catalog for systemd's own messages
diff --git a/catalog/systemd.de.catalog.in b/catalog/systemd.de.catalog.in
index 616b47b8a79..883c210f0b2 100644
--- a/catalog/systemd.de.catalog.in
+++ b/catalog/systemd.de.catalog.in
@@ -1,7 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1+
 #
-#  This file is part of systemd.
-#
 #  Copyright 2012 Lennart Poettering
 
 -- fc2e22bc6ee647b6b90729ab34a250b1
diff --git a/catalog/systemd.fr.catalog.in b/catalog/systemd.fr.catalog.in
index f48e3f36ed9..e2eaf163e82 100644
--- a/catalog/systemd.fr.catalog.in
+++ b/catalog/systemd.fr.catalog.in
@@ -1,7 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1+
 #
-#  This file is part of systemd.
-#
 #  Copyright 2012 Lennart Poettering
 #  Copyright 2013-2016 Sylvain Plantefève
 
diff --git a/catalog/systemd.hr.catalog.in b/catalog/systemd.hr.catalog.in
index 66fd6aba062..b3a21f66c2c 100644
--- a/catalog/systemd.hr.catalog.in
+++ b/catalog/systemd.hr.catalog.in
@@ -1,7 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1+
 #
-#  This file is part of systemd.
-#
 #  Copyright 2012 Lennart Poettering
 
 # Message catalog for systemd's own messages
diff --git a/catalog/systemd.hu.catalog.in b/catalog/systemd.hu.catalog.in
index a813371593b..9c46c201884 100644
--- a/catalog/systemd.hu.catalog.in
+++ b/catalog/systemd.hu.catalog.in
@@ -1,7 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1+
 #
-#  This file is part of systemd.
-#
 #  Copyright 2012 Lennart Poettering
 #  Copyright 2016 Gabor Kelemen
 
diff --git a/catalog/systemd.it.catalog.in b/catalog/systemd.it.catalog.in
index 5f61cfc5508..3cd8355a808 100644
--- a/catalog/systemd.it.catalog.in
+++ b/catalog/systemd.it.catalog.in
@@ -1,7 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1+
 #
-#  This file is part of systemd.
-#
 #  Copyright 2013 Daniele Medri
 
 # Message catalog for systemd's own messages
diff --git a/catalog/systemd.ko.catalog.in b/catalog/systemd.ko.catalog.in
index f9ac7bf440c..dd84bac59c5 100644
--- a/catalog/systemd.ko.catalog.in
+++ b/catalog/systemd.ko.catalog.in
@@ -1,7 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1+
 #
-#  This file is part of systemd.
-#
 #  Copyright 2012 Lennart Poettering
 
 # Message catalog for systemd's own messages
diff --git a/catalog/systemd.pl.catalog.in b/catalog/systemd.pl.catalog.in
index ae6e5c6ba68..06450f06267 100644
--- a/catalog/systemd.pl.catalog.in
+++ b/catalog/systemd.pl.catalog.in
@@ -1,7 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1+
 #
-#  This file is part of systemd.
-#
 #  Copyright 2012 Lennart Poettering
 #  Copyright 2014-2017 Piotr Drąg
 
diff --git a/catalog/systemd.pt_BR.catalog.in b/catalog/systemd.pt_BR.catalog.in
index 76a193f6738..ec0fb3664ca 100644
--- a/catalog/systemd.pt_BR.catalog.in
+++ b/catalog/systemd.pt_BR.catalog.in
@@ -1,7 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1+
 #
-#  This file is part of systemd.
-#
 #  Copyright 2012 Lennart Poettering
 #  Copyright 2015 Rafael Ferreira (translation)
 
diff --git a/catalog/systemd.ru.catalog.in b/catalog/systemd.ru.catalog.in
index 9d86375c4e5..a77ca53d825 100644
--- a/catalog/systemd.ru.catalog.in
+++ b/catalog/systemd.ru.catalog.in
@@ -1,7 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1+
 #
-#  This file is part of systemd.
-#
 #  Copyright 2012 Lennart Poettering
 #  Copyright 2013-2017 Sergey Ptashnick
 
diff --git a/catalog/systemd.sr.catalog.in b/catalog/systemd.sr.catalog.in
index 5d2199c10ee..5782f429aa8 100644
--- a/catalog/systemd.sr.catalog.in
+++ b/catalog/systemd.sr.catalog.in
@@ -1,7 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1+
 #
-#  This file is part of systemd.
-#
 #  Copyright 2012 Lennart Poettering
 
 # Message catalog for systemd's own messages
diff --git a/catalog/systemd.zh_CN.catalog.in b/catalog/systemd.zh_CN.catalog.in
index 7d99ae36c5b..4f098362950 100644
--- a/catalog/systemd.zh_CN.catalog.in
+++ b/catalog/systemd.zh_CN.catalog.in
@@ -1,7 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1+
 #
-#  This file is part of systemd.
-#
 #  Copyright 2012 Lennart Poettering
 #  Copyright 2015 Boyuan Yang
 
diff --git a/catalog/systemd.zh_TW.catalog.in b/catalog/systemd.zh_TW.catalog.in
index ec4504cf8b5..d375dc336f0 100644
--- a/catalog/systemd.zh_TW.catalog.in
+++ b/catalog/systemd.zh_TW.catalog.in
@@ -1,7 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1+
 #
-#  This file is part of systemd.
-#
 #  Copyright 2012 Lennart Poettering
 #  Copyright 2015 Jeff Huang
 
diff --git a/hwdb/parse_hwdb.py b/hwdb/parse_hwdb.py
index f4cc9c69747..3daf1822e3d 100755
--- a/hwdb/parse_hwdb.py
+++ b/hwdb/parse_hwdb.py
@@ -2,8 +2,7 @@
 # -*- Mode: python; coding: utf-8; indent-tabs-mode: nil -*- */
 #  SPDX-License-Identifier: MIT
 #
-# This file is part of systemd. It is distrubuted under the MIT license, see
-# below.
+# This file is distributed under the MIT license, see below.
 #
 # Copyright 2016 Zbigniew Jędrzejewski-Szmek
 #
diff --git a/man/binfmt.d.xml b/man/binfmt.d.xml
index f60bb82ffba..83a82d0321f 100644
--- a/man/binfmt.d.xml
+++ b/man/binfmt.d.xml
@@ -4,8 +4,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 -->
 <refentry id="binfmt.d" conditional='ENABLE_BINFMT'
diff --git a/man/bootctl.xml b/man/bootctl.xml
index 11b39c080ff..0e34c29500b 100644
--- a/man/bootctl.xml
+++ b/man/bootctl.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  This file is part of systemd.
 -->
 
 <refentry id="bootctl" conditional='ENABLE_EFI'
diff --git a/man/bootup.xml b/man/bootup.xml
index a25dda94e85..b4eb26d4540 100644
--- a/man/bootup.xml
+++ b/man/bootup.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 -->
 
diff --git a/man/busctl.xml b/man/busctl.xml
index 6f176a1539f..a94db9a50f4 100644
--- a/man/busctl.xml
+++ b/man/busctl.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2014 Zbigniew Jędrzejewski-Szmek
 -->
 
diff --git a/man/coredump.conf.xml b/man/coredump.conf.xml
index 49debb219a3..b0722e29039 100644
--- a/man/coredump.conf.xml
+++ b/man/coredump.conf.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2014 Zbigniew Jędrzejewski-Szmek
 -->
 
diff --git a/man/coredumpctl.xml b/man/coredumpctl.xml
index 1f880d7f703..9227f38678a 100644
--- a/man/coredumpctl.xml
+++ b/man/coredumpctl.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Zbigniew Jędrzejewski-Szmek
 -->
 
diff --git a/man/crypttab.xml b/man/crypttab.xml
index 153dc022f4c..ae65b198dad 100644
--- a/man/crypttab.xml
+++ b/man/crypttab.xml
@@ -4,8 +4,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 
   This is based on crypttab(5) from Fedora's initscripts package, which in
diff --git a/man/custom-html.xsl b/man/custom-html.xsl
index 6cd13b53980..49fa58439c4 100644
--- a/man/custom-html.xsl
+++ b/man/custom-html.xsl
@@ -3,8 +3,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 -->
 
diff --git a/man/custom-man.xsl b/man/custom-man.xsl
index 5d87856258b..c491ac82652 100644
--- a/man/custom-man.xsl
+++ b/man/custom-man.xsl
@@ -3,8 +3,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2013 Zbigniew Jędrzejewski-Szmek
 -->
 
diff --git a/man/daemon.xml b/man/daemon.xml
index fbc810c0b4f..ad7021f0a18 100644
--- a/man/daemon.xml
+++ b/man/daemon.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 -->
 
diff --git a/man/dnssec-trust-anchors.d.xml b/man/dnssec-trust-anchors.d.xml
index 68c1c8421cb..70103f9b9d9 100644
--- a/man/dnssec-trust-anchors.d.xml
+++ b/man/dnssec-trust-anchors.d.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 -->
 
diff --git a/man/environment.d.xml b/man/environment.d.xml
index 53473eff0a5..e399bbd6fb4 100644
--- a/man/environment.d.xml
+++ b/man/environment.d.xml
@@ -4,8 +4,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2016 Red Hat, Inc.
   Copyright 2017 Zbigniew Jędrzejewski-Szmek
 -->
diff --git a/man/file-hierarchy.xml b/man/file-hierarchy.xml
index c5ee1b61a29..0027f0e0667 100644
--- a/man/file-hierarchy.xml
+++ b/man/file-hierarchy.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 -->
 
diff --git a/man/halt.xml b/man/halt.xml
index 3642cb73d35..2c2e2c3e547 100644
--- a/man/halt.xml
+++ b/man/halt.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 -->
 
diff --git a/man/hostname.xml b/man/hostname.xml
index ce0acaa7c8e..06eec5d9813 100644
--- a/man/hostname.xml
+++ b/man/hostname.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 -->
 
diff --git a/man/hostnamectl.xml b/man/hostnamectl.xml
index 3f45e0c32b6..249e0ec4d86 100644
--- a/man/hostnamectl.xml
+++ b/man/hostnamectl.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 -->
 
diff --git a/man/hwdb.xml b/man/hwdb.xml
index bcc8591e0f5..40238262e4c 100644
--- a/man/hwdb.xml
+++ b/man/hwdb.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2014 Tom Gundersen
   Copyright 2016 Zbigniew Jędrzejewski-Szmek
 -->
diff --git a/man/journal-remote.conf.xml b/man/journal-remote.conf.xml
index 42ecabc8074..8415d6a3c8b 100644
--- a/man/journal-remote.conf.xml
+++ b/man/journal-remote.conf.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2015 Chris Morgan
 -->
 
diff --git a/man/journal-upload.conf.xml b/man/journal-upload.conf.xml
index cd3335452af..e656bade270 100644
--- a/man/journal-upload.conf.xml
+++ b/man/journal-upload.conf.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2016 Zbigniew Jędrzejewski-Szmek
 -->
 
diff --git a/man/journalctl.xml b/man/journalctl.xml
index 3319e978d72..7b0f52ac5a9 100644
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 -->
 
diff --git a/man/journald.conf.xml b/man/journald.conf.xml
index 760d649a3df..8fc1f25b78e 100644
--- a/man/journald.conf.xml
+++ b/man/journald.conf.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 -->
 
diff --git a/man/kernel-command-line.xml b/man/kernel-command-line.xml
index ec28321b707..e65ed03d5a5 100644
--- a/man/kernel-command-line.xml
+++ b/man/kernel-command-line.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 -->
 
diff --git a/man/kernel-install.xml b/man/kernel-install.xml
index c5508d5776d..78d1a866f60 100644
--- a/man/kernel-install.xml
+++ b/man/kernel-install.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2013 Harald Hoyer
 -->
 
diff --git a/man/less-variables.xml b/man/less-variables.xml
index 6ea8c3d216b..742897496c3 100644
--- a/man/less-variables.xml
+++ b/man/less-variables.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 -->
 
diff --git a/man/libsystemd-pkgconfig.xml b/man/libsystemd-pkgconfig.xml
index 7373415ba30..1b2361be7be 100644
--- a/man/libsystemd-pkgconfig.xml
+++ b/man/libsystemd-pkgconfig.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2014 Zbigniew Jędrzejewski-Szmek
 -->
 
diff --git a/man/libudev.xml b/man/libudev.xml
index 8b00109534f..d6ceb67fa29 100644
--- a/man/libudev.xml
+++ b/man/libudev.xml
@@ -8,8 +8,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2015 David Herrmann <dh.herrmann@gmail.com>
 -->
 
diff --git a/man/locale.conf.xml b/man/locale.conf.xml
index 38c94dc10c2..cc2604994a7 100644
--- a/man/locale.conf.xml
+++ b/man/locale.conf.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 -->
 
diff --git a/man/localectl.xml b/man/localectl.xml
index b32c0fb4d60..8591f8c289f 100644
--- a/man/localectl.xml
+++ b/man/localectl.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 -->
 
diff --git a/man/localtime.xml b/man/localtime.xml
index ba3e2caabc0..2d22016b6c3 100644
--- a/man/localtime.xml
+++ b/man/localtime.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
   Copyright 2012 Shawn Landden
 -->
diff --git a/man/loginctl.xml b/man/loginctl.xml
index 613feea92bb..76e61dcc54e 100644
--- a/man/loginctl.xml
+++ b/man/loginctl.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 -->
 
diff --git a/man/logind.conf.xml b/man/logind.conf.xml
index a35faf15c53..0d270a8ec58 100644
--- a/man/logind.conf.xml
+++ b/man/logind.conf.xml
@@ -8,8 +8,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 -->
 
diff --git a/man/machine-id.xml b/man/machine-id.xml
index c91c043db89..4ff4109770a 100644
--- a/man/machine-id.xml
+++ b/man/machine-id.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 -->
 
diff --git a/man/machine-info.xml b/man/machine-info.xml
index 734e3fc0499..801fc44a3a4 100644
--- a/man/machine-info.xml
+++ b/man/machine-info.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 -->
 
diff --git a/man/machinectl.xml b/man/machinectl.xml
index ef13ee2a107..03a074ee417 100644
--- a/man/machinectl.xml
+++ b/man/machinectl.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2013 Zbigniew Jędrzejewski-Szmek
 -->
 
diff --git a/man/modules-load.d.xml b/man/modules-load.d.xml
index 079dcd1797c..0423a6e2e65 100644
--- a/man/modules-load.d.xml
+++ b/man/modules-load.d.xml
@@ -4,8 +4,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 -->
 <refentry id="modules-load.d" conditional='HAVE_KMOD'
diff --git a/man/networkctl.xml b/man/networkctl.xml
index 6f9bc68b46c..89146daafe9 100644
--- a/man/networkctl.xml
+++ b/man/networkctl.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2015 Zbigniew Jędrzejewski-Szmek
 -->
 
diff --git a/man/networkd.conf.xml b/man/networkd.conf.xml
index dce1428273c..e4d9e5f7f5c 100644
--- a/man/networkd.conf.xml
+++ b/man/networkd.conf.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2014 Vinay Kulkarni
 -->
 
diff --git a/man/nss-myhostname.xml b/man/nss-myhostname.xml
index a3fa4bbbcda..0ed1c7817b6 100644
--- a/man/nss-myhostname.xml
+++ b/man/nss-myhostname.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
   Copyright 2013 Tom Gundersen
 -->
diff --git a/man/nss-mymachines.xml b/man/nss-mymachines.xml
index 4af7d819808..69a4f2b675a 100644
--- a/man/nss-mymachines.xml
+++ b/man/nss-mymachines.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 -->
 
diff --git a/man/nss-resolve.xml b/man/nss-resolve.xml
index fc54038be7c..f99680c4bf1 100644
--- a/man/nss-resolve.xml
+++ b/man/nss-resolve.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
   Copyright 2013 Tom Gundersen
 -->
diff --git a/man/nss-systemd.xml b/man/nss-systemd.xml
index c46ba5bcf93..3ea8ce7f035 100644
--- a/man/nss-systemd.xml
+++ b/man/nss-systemd.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 -->
 
diff --git a/man/os-release.xml b/man/os-release.xml
index ff85ef5f1bd..ffd2c0d5df9 100644
--- a/man/os-release.xml
+++ b/man/os-release.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 -->
 
diff --git a/man/pam_systemd.xml b/man/pam_systemd.xml
index cdf45f8c201..bca73da179f 100644
--- a/man/pam_systemd.xml
+++ b/man/pam_systemd.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 -->
 
diff --git a/man/resolvectl.xml b/man/resolvectl.xml
index 53cff45473e..991d239d833 100644
--- a/man/resolvectl.xml
+++ b/man/resolvectl.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 -->
 
diff --git a/man/resolved.conf.xml b/man/resolved.conf.xml
index a926da8180e..332723f78b3 100644
--- a/man/resolved.conf.xml
+++ b/man/resolved.conf.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2014 Tom Gundersen
 -->
 
diff --git a/man/runlevel.xml b/man/runlevel.xml
index f7305ae095c..9fe0037f438 100644
--- a/man/runlevel.xml
+++ b/man/runlevel.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 -->
 
diff --git a/man/sd-bus-errors.xml b/man/sd-bus-errors.xml
index 28770bbacdc..4531808e474 100644
--- a/man/sd-bus-errors.xml
+++ b/man/sd-bus-errors.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 -->
 
diff --git a/man/sd-bus.xml b/man/sd-bus.xml
index 09a119dd5d2..05f8bec0ddf 100644
--- a/man/sd-bus.xml
+++ b/man/sd-bus.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2016 Zbigniew Jędrzejewski-Szmek
 -->
 
diff --git a/man/sd-daemon.xml b/man/sd-daemon.xml
index 12234dc2d6c..137e1eaca45 100644
--- a/man/sd-daemon.xml
+++ b/man/sd-daemon.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 -->
 
diff --git a/man/sd-event.xml b/man/sd-event.xml
index ecaa2753a38..8e0af4a42a5 100644
--- a/man/sd-event.xml
+++ b/man/sd-event.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 -->
 
diff --git a/man/sd-id128.xml b/man/sd-id128.xml
index f7a147ab305..d79b9a98679 100644
--- a/man/sd-id128.xml
+++ b/man/sd-id128.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 -->
 
diff --git a/man/sd-journal.xml b/man/sd-journal.xml
index ca08684b06d..1a0b82265e8 100644
--- a/man/sd-journal.xml
+++ b/man/sd-journal.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 -->
 
diff --git a/man/sd-login.xml b/man/sd-login.xml
index 347a05e8b02..ae1895ad899 100644
--- a/man/sd-login.xml
+++ b/man/sd-login.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 -->
 
diff --git a/man/sd_booted.xml b/man/sd_booted.xml
index aaacbcd285f..6e19e4e8d97 100644
--- a/man/sd_booted.xml
+++ b/man/sd_booted.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 -->
 
diff --git a/man/sd_bus_add_match.xml b/man/sd_bus_add_match.xml
index 13f2b06af0a..2eb67e16df5 100644
--- a/man/sd_bus_add_match.xml
+++ b/man/sd_bus_add_match.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2016 Julian Orth
 -->
 
diff --git a/man/sd_bus_creds_get_pid.xml b/man/sd_bus_creds_get_pid.xml
index f3d198df38c..a9ca0d7c7dd 100644
--- a/man/sd_bus_creds_get_pid.xml
+++ b/man/sd_bus_creds_get_pid.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2014 Zbigniew Jędrzejewski-Szmek
 -->
 
diff --git a/man/sd_bus_creds_new_from_pid.xml b/man/sd_bus_creds_new_from_pid.xml
index a4edb1fd6ac..6f99966a694 100644
--- a/man/sd_bus_creds_new_from_pid.xml
+++ b/man/sd_bus_creds_new_from_pid.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2014 Zbigniew Jędrzejewski-Szmek
 -->
 
diff --git a/man/sd_bus_default.xml b/man/sd_bus_default.xml
index 78b836bfef3..30dce782ca0 100644
--- a/man/sd_bus_default.xml
+++ b/man/sd_bus_default.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2014 Zbigniew Jędrzejewski-Szmek
 -->
 
diff --git a/man/sd_bus_error.xml b/man/sd_bus_error.xml
index 1552405ac46..cf4823d94b0 100644
--- a/man/sd_bus_error.xml
+++ b/man/sd_bus_error.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2014 Zbigniew Jędrzejewski-Szmek
 -->
 
diff --git a/man/sd_bus_error_add_map.xml b/man/sd_bus_error_add_map.xml
index 3a533093cb3..d9bb694701c 100644
--- a/man/sd_bus_error_add_map.xml
+++ b/man/sd_bus_error_add_map.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 -->
 
diff --git a/man/sd_bus_get_fd.xml b/man/sd_bus_get_fd.xml
index 2914f81848b..4ed03536581 100644
--- a/man/sd_bus_get_fd.xml
+++ b/man/sd_bus_get_fd.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2016 Julian Orth
 -->
 
diff --git a/man/sd_bus_get_n_queued_read.xml b/man/sd_bus_get_n_queued_read.xml
index e465e22abb7..b7ac71f6e1d 100644
--- a/man/sd_bus_get_n_queued_read.xml
+++ b/man/sd_bus_get_n_queued_read.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2018 Lennart Poettering
 -->
 
diff --git a/man/sd_bus_is_open.xml b/man/sd_bus_is_open.xml
index 0650a479ebb..e5abbdb3959 100644
--- a/man/sd_bus_is_open.xml
+++ b/man/sd_bus_is_open.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2017 Lennart Poettering
 -->
 
diff --git a/man/sd_bus_message_append.xml b/man/sd_bus_message_append.xml
index dcabfeaec4f..ebb6afcd936 100644
--- a/man/sd_bus_message_append.xml
+++ b/man/sd_bus_message_append.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2014 Zbigniew Jędrzejewski-Szmek
 -->
 
diff --git a/man/sd_bus_message_append_array.xml b/man/sd_bus_message_append_array.xml
index 76e342f7166..25f3861ecae 100644
--- a/man/sd_bus_message_append_array.xml
+++ b/man/sd_bus_message_append_array.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2014 Zbigniew Jędrzejewski-Szmek
 -->
 
diff --git a/man/sd_bus_message_append_basic.xml b/man/sd_bus_message_append_basic.xml
index 9b1ac34169b..da259607da9 100644
--- a/man/sd_bus_message_append_basic.xml
+++ b/man/sd_bus_message_append_basic.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2014 Zbigniew Jędrzejewski-Szmek
 -->
 
diff --git a/man/sd_bus_message_append_string_memfd.xml b/man/sd_bus_message_append_string_memfd.xml
index 4616bba71a2..b4d14dc1271 100644
--- a/man/sd_bus_message_append_string_memfd.xml
+++ b/man/sd_bus_message_append_string_memfd.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2014 Zbigniew Jędrzejewski-Szmek
 -->
 
diff --git a/man/sd_bus_message_append_strv.xml b/man/sd_bus_message_append_strv.xml
index eb13e63d354..e31a0663ca7 100644
--- a/man/sd_bus_message_append_strv.xml
+++ b/man/sd_bus_message_append_strv.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2014 Zbigniew Jędrzejewski-Szmek
 -->
 
diff --git a/man/sd_bus_message_get_cookie.xml b/man/sd_bus_message_get_cookie.xml
index 5bc0d13ed7f..f673940aeae 100644
--- a/man/sd_bus_message_get_cookie.xml
+++ b/man/sd_bus_message_get_cookie.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 -->
 
diff --git a/man/sd_bus_message_get_monotonic_usec.xml b/man/sd_bus_message_get_monotonic_usec.xml
index f3f66cb2bd3..761834dbcae 100644
--- a/man/sd_bus_message_get_monotonic_usec.xml
+++ b/man/sd_bus_message_get_monotonic_usec.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 -->
 
diff --git a/man/sd_bus_message_read_basic.xml b/man/sd_bus_message_read_basic.xml
index 48c530b2b14..c817a7f857c 100644
--- a/man/sd_bus_message_read_basic.xml
+++ b/man/sd_bus_message_read_basic.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2016 Julian Orth
 -->
 
diff --git a/man/sd_bus_message_set_destination.xml b/man/sd_bus_message_set_destination.xml
index c255cfe9b5c..98b10a27d13 100644
--- a/man/sd_bus_message_set_destination.xml
+++ b/man/sd_bus_message_set_destination.xml
@@ -4,8 +4,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2017 Lennart Poettering
 -->
 
diff --git a/man/sd_bus_negotiate_fds.xml b/man/sd_bus_negotiate_fds.xml
index 44865f352c7..edcb5cb5791 100644
--- a/man/sd_bus_negotiate_fds.xml
+++ b/man/sd_bus_negotiate_fds.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 -->
 
diff --git a/man/sd_bus_new.xml b/man/sd_bus_new.xml
index 4b6905df997..d312450a1ef 100644
--- a/man/sd_bus_new.xml
+++ b/man/sd_bus_new.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2014 Zbigniew Jędrzejewski-Szmek
 -->
 
diff --git a/man/sd_bus_path_encode.xml b/man/sd_bus_path_encode.xml
index f40ec1f9fed..a9cca61eac5 100644
--- a/man/sd_bus_path_encode.xml
+++ b/man/sd_bus_path_encode.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2014 Zbigniew Jędrzejewski-Szmek
 -->
 
diff --git a/man/sd_bus_process.xml b/man/sd_bus_process.xml
index cd146990f90..765b0800091 100644
--- a/man/sd_bus_process.xml
+++ b/man/sd_bus_process.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2016 Julian Orth
 -->
 
diff --git a/man/sd_bus_request_name.xml b/man/sd_bus_request_name.xml
index 94c68b579c9..b3c1faee03a 100644
--- a/man/sd_bus_request_name.xml
+++ b/man/sd_bus_request_name.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 -->
 
diff --git a/man/sd_bus_set_connected_signal.xml b/man/sd_bus_set_connected_signal.xml
index e7d58200523..0db2c8627af 100644
--- a/man/sd_bus_set_connected_signal.xml
+++ b/man/sd_bus_set_connected_signal.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2017 Lennart Poettering
 -->
 
diff --git a/man/sd_bus_set_sender.xml b/man/sd_bus_set_sender.xml
index 41ab5b41b0e..47ec3b569bb 100644
--- a/man/sd_bus_set_sender.xml
+++ b/man/sd_bus_set_sender.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2017 Lennart Poettering
 -->
 
diff --git a/man/sd_bus_set_watch_bind.xml b/man/sd_bus_set_watch_bind.xml
index d6095cc5528..eba0b14b658 100644
--- a/man/sd_bus_set_watch_bind.xml
+++ b/man/sd_bus_set_watch_bind.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2017 Lennart Poettering
 -->
 
diff --git a/man/sd_bus_track_add_name.xml b/man/sd_bus_track_add_name.xml
index 212fa873516..1898693aea0 100644
--- a/man/sd_bus_track_add_name.xml
+++ b/man/sd_bus_track_add_name.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 -->
 
diff --git a/man/sd_bus_track_new.xml b/man/sd_bus_track_new.xml
index 8cdecbfe604..9112925ae1d 100644
--- a/man/sd_bus_track_new.xml
+++ b/man/sd_bus_track_new.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 -->
 
diff --git a/man/sd_event_add_child.xml b/man/sd_event_add_child.xml
index 43c44ab3a39..cd783b6d84e 100644
--- a/man/sd_event_add_child.xml
+++ b/man/sd_event_add_child.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2014 Zbigniew Jędrzejewski-Szmek
 -->
 
diff --git a/man/sd_event_add_defer.xml b/man/sd_event_add_defer.xml
index 54570afdb59..efa1dc1e8fe 100644
--- a/man/sd_event_add_defer.xml
+++ b/man/sd_event_add_defer.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2014 Zbigniew Jędrzejewski-Szmek
 -->
 
diff --git a/man/sd_event_add_io.xml b/man/sd_event_add_io.xml
index bd513a78147..469128c2df8 100644
--- a/man/sd_event_add_io.xml
+++ b/man/sd_event_add_io.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 -->
 
diff --git a/man/sd_event_add_signal.xml b/man/sd_event_add_signal.xml
index 74f0191bc44..caf549f1c17 100644
--- a/man/sd_event_add_signal.xml
+++ b/man/sd_event_add_signal.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2014 Zbigniew Jędrzejewski-Szmek
 -->
 
diff --git a/man/sd_event_add_time.xml b/man/sd_event_add_time.xml
index 90153151050..fbe9dae0e61 100644
--- a/man/sd_event_add_time.xml
+++ b/man/sd_event_add_time.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 -->
 
diff --git a/man/sd_event_exit.xml b/man/sd_event_exit.xml
index 7f18837a0d8..a7af34c40a2 100644
--- a/man/sd_event_exit.xml
+++ b/man/sd_event_exit.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 -->
 
diff --git a/man/sd_event_get_fd.xml b/man/sd_event_get_fd.xml
index 41dceec8811..9f1291edd3a 100644
--- a/man/sd_event_get_fd.xml
+++ b/man/sd_event_get_fd.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2014 Zbigniew Jędrzejewski-Szmek
 -->
 
diff --git a/man/sd_event_new.xml b/man/sd_event_new.xml
index 392e3b983cb..9baa0fa0629 100644
--- a/man/sd_event_new.xml
+++ b/man/sd_event_new.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 -->
 
diff --git a/man/sd_event_now.xml b/man/sd_event_now.xml
index 60600eb9904..dada35c0255 100644
--- a/man/sd_event_now.xml
+++ b/man/sd_event_now.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 -->
 
diff --git a/man/sd_event_run.xml b/man/sd_event_run.xml
index 94ea25577b5..6d31610c63c 100644
--- a/man/sd_event_run.xml
+++ b/man/sd_event_run.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2015 Zbigniew Jędrzejewski-Szmek
 -->
 
diff --git a/man/sd_event_set_watchdog.xml b/man/sd_event_set_watchdog.xml
index 9a2cbd97f96..112534ae851 100644
--- a/man/sd_event_set_watchdog.xml
+++ b/man/sd_event_set_watchdog.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 -->
 
diff --git a/man/sd_event_source_get_event.xml b/man/sd_event_source_get_event.xml
index d4f91555212..e490b4290ff 100644
--- a/man/sd_event_source_get_event.xml
+++ b/man/sd_event_source_get_event.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 -->
 
diff --git a/man/sd_event_source_get_pending.xml b/man/sd_event_source_get_pending.xml
index 417f4ad128f..0c1a6ceada7 100644
--- a/man/sd_event_source_get_pending.xml
+++ b/man/sd_event_source_get_pending.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 -->
 
diff --git a/man/sd_event_source_set_description.xml b/man/sd_event_source_set_description.xml
index 5893e396b7e..51225b4ea68 100644
--- a/man/sd_event_source_set_description.xml
+++ b/man/sd_event_source_set_description.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2014 Zbigniew Jędrzejewski-Szmek
 -->
 
diff --git a/man/sd_event_source_set_enabled.xml b/man/sd_event_source_set_enabled.xml
index dbadef43d1c..854326758e4 100644
--- a/man/sd_event_source_set_enabled.xml
+++ b/man/sd_event_source_set_enabled.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 -->
 
diff --git a/man/sd_event_source_set_prepare.xml b/man/sd_event_source_set_prepare.xml
index c819c621a8a..2c95a197f4c 100644
--- a/man/sd_event_source_set_prepare.xml
+++ b/man/sd_event_source_set_prepare.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 -->
 
diff --git a/man/sd_event_source_set_priority.xml b/man/sd_event_source_set_priority.xml
index 0bc6be9cb95..788c3b6c368 100644
--- a/man/sd_event_source_set_priority.xml
+++ b/man/sd_event_source_set_priority.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 -->
 
diff --git a/man/sd_event_source_set_userdata.xml b/man/sd_event_source_set_userdata.xml
index d0fc280e4b0..4c4e6c01211 100644
--- a/man/sd_event_source_set_userdata.xml
+++ b/man/sd_event_source_set_userdata.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 -->
 
diff --git a/man/sd_event_source_unref.xml b/man/sd_event_source_unref.xml
index 0a6b8bebc5e..664387fc03d 100644
--- a/man/sd_event_source_unref.xml
+++ b/man/sd_event_source_unref.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 -->
 
diff --git a/man/sd_event_wait.xml b/man/sd_event_wait.xml
index bfdafce6376..998e259b491 100644
--- a/man/sd_event_wait.xml
+++ b/man/sd_event_wait.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2015 Zbigniew Jędrzejewski-Szmek
 -->
 
diff --git a/man/sd_get_seats.xml b/man/sd_get_seats.xml
index f522f75d996..3396ee99f13 100644
--- a/man/sd_get_seats.xml
+++ b/man/sd_get_seats.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 -->
 
diff --git a/man/sd_id128_get_machine.xml b/man/sd_id128_get_machine.xml
index 77268da38b0..7245ba5b252 100644
--- a/man/sd_id128_get_machine.xml
+++ b/man/sd_id128_get_machine.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 -->
 
diff --git a/man/sd_id128_randomize.xml b/man/sd_id128_randomize.xml
index f9c72780fe0..df31a4a196d 100644
--- a/man/sd_id128_randomize.xml
+++ b/man/sd_id128_randomize.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 -->
 
diff --git a/man/sd_id128_to_string.xml b/man/sd_id128_to_string.xml
index f4a2097240e..dce1568e25c 100644
--- a/man/sd_id128_to_string.xml
+++ b/man/sd_id128_to_string.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 -->
 
diff --git a/man/sd_is_fifo.xml b/man/sd_is_fifo.xml
index ec6c6532993..b70824c026b 100644
--- a/man/sd_is_fifo.xml
+++ b/man/sd_is_fifo.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 -->
 
diff --git a/man/sd_journal_add_match.xml b/man/sd_journal_add_match.xml
index d50afec5583..0a03cb46be0 100644
--- a/man/sd_journal_add_match.xml
+++ b/man/sd_journal_add_match.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 -->
 
diff --git a/man/sd_journal_enumerate_fields.xml b/man/sd_journal_enumerate_fields.xml
index db39f9bfb51..c686bbd9375 100644
--- a/man/sd_journal_enumerate_fields.xml
+++ b/man/sd_journal_enumerate_fields.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 -->
 
diff --git a/man/sd_journal_get_catalog.xml b/man/sd_journal_get_catalog.xml
index b095f0cd608..d046d69562c 100644
--- a/man/sd_journal_get_catalog.xml
+++ b/man/sd_journal_get_catalog.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 -->
 
diff --git a/man/sd_journal_get_cursor.xml b/man/sd_journal_get_cursor.xml
index 0267609442b..df93e3a0de9 100644
--- a/man/sd_journal_get_cursor.xml
+++ b/man/sd_journal_get_cursor.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 -->
 
diff --git a/man/sd_journal_get_cutoff_realtime_usec.xml b/man/sd_journal_get_cutoff_realtime_usec.xml
index bda21ae35fe..9ce932d709e 100644
--- a/man/sd_journal_get_cutoff_realtime_usec.xml
+++ b/man/sd_journal_get_cutoff_realtime_usec.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 -->
 
diff --git a/man/sd_journal_get_data.xml b/man/sd_journal_get_data.xml
index 505a8bddd41..601571645c6 100644
--- a/man/sd_journal_get_data.xml
+++ b/man/sd_journal_get_data.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 -->
 
diff --git a/man/sd_journal_get_fd.xml b/man/sd_journal_get_fd.xml
index 4525bbbe89c..69c9ff21284 100644
--- a/man/sd_journal_get_fd.xml
+++ b/man/sd_journal_get_fd.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 -->
 
diff --git a/man/sd_journal_get_realtime_usec.xml b/man/sd_journal_get_realtime_usec.xml
index 9ef719a67e2..10272854765 100644
--- a/man/sd_journal_get_realtime_usec.xml
+++ b/man/sd_journal_get_realtime_usec.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 -->
 
diff --git a/man/sd_journal_get_usage.xml b/man/sd_journal_get_usage.xml
index d8eaff1255f..0365d35a00c 100644
--- a/man/sd_journal_get_usage.xml
+++ b/man/sd_journal_get_usage.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 -->
 
diff --git a/man/sd_journal_has_runtime_files.xml b/man/sd_journal_has_runtime_files.xml
index 295bc0cc639..5abad317aaa 100644
--- a/man/sd_journal_has_runtime_files.xml
+++ b/man/sd_journal_has_runtime_files.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2016 Jan Synáček
 -->
 
diff --git a/man/sd_journal_next.xml b/man/sd_journal_next.xml
index 9385315e2e8..83577620cbc 100644
--- a/man/sd_journal_next.xml
+++ b/man/sd_journal_next.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 -->
 
diff --git a/man/sd_journal_open.xml b/man/sd_journal_open.xml
index 4240525aaf8..9ab3de3c49c 100644
--- a/man/sd_journal_open.xml
+++ b/man/sd_journal_open.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 -->
 
diff --git a/man/sd_journal_print.xml b/man/sd_journal_print.xml
index 4c7221e557a..a872def2e93 100644
--- a/man/sd_journal_print.xml
+++ b/man/sd_journal_print.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 -->
 
diff --git a/man/sd_journal_query_unique.xml b/man/sd_journal_query_unique.xml
index 56480b57182..5dfb136aec2 100644
--- a/man/sd_journal_query_unique.xml
+++ b/man/sd_journal_query_unique.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 -->
 
diff --git a/man/sd_journal_seek_head.xml b/man/sd_journal_seek_head.xml
index 7dc9bb439e0..fa101a4902b 100644
--- a/man/sd_journal_seek_head.xml
+++ b/man/sd_journal_seek_head.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 -->
 
diff --git a/man/sd_journal_stream_fd.xml b/man/sd_journal_stream_fd.xml
index 047991381a4..bbbd172533b 100644
--- a/man/sd_journal_stream_fd.xml
+++ b/man/sd_journal_stream_fd.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 -->
 
diff --git a/man/sd_listen_fds.xml b/man/sd_listen_fds.xml
index 9b1a59293eb..b513034a670 100644
--- a/man/sd_listen_fds.xml
+++ b/man/sd_listen_fds.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 -->
 
diff --git a/man/sd_login_monitor_new.xml b/man/sd_login_monitor_new.xml
index f26d88bc8b6..3cc2dac3f3a 100644
--- a/man/sd_login_monitor_new.xml
+++ b/man/sd_login_monitor_new.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 -->
 
diff --git a/man/sd_machine_get_class.xml b/man/sd_machine_get_class.xml
index f48ddf4f0b5..e5a81a802b2 100644
--- a/man/sd_machine_get_class.xml
+++ b/man/sd_machine_get_class.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 -->
 
diff --git a/man/sd_notify.xml b/man/sd_notify.xml
index c5a0363dd68..896b0a45851 100644
--- a/man/sd_notify.xml
+++ b/man/sd_notify.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 -->
 
diff --git a/man/sd_pid_get_owner_uid.xml b/man/sd_pid_get_owner_uid.xml
index 28800b43a49..7da0905c80b 100644
--- a/man/sd_pid_get_owner_uid.xml
+++ b/man/sd_pid_get_owner_uid.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 -->
 
diff --git a/man/sd_seat_get_active.xml b/man/sd_seat_get_active.xml
index 98ff2be1517..dfa51f79130 100644
--- a/man/sd_seat_get_active.xml
+++ b/man/sd_seat_get_active.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 -->
 
diff --git a/man/sd_session_is_active.xml b/man/sd_session_is_active.xml
index b3009dedc69..a7b95bf6ffa 100644
--- a/man/sd_session_is_active.xml
+++ b/man/sd_session_is_active.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 -->
 
diff --git a/man/sd_uid_get_state.xml b/man/sd_uid_get_state.xml
index 317e46a072a..5a5d7a87401 100644
--- a/man/sd_uid_get_state.xml
+++ b/man/sd_uid_get_state.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 -->
 
diff --git a/man/sd_watchdog_enabled.xml b/man/sd_watchdog_enabled.xml
index 3c47c116fb8..5f5f72441eb 100644
--- a/man/sd_watchdog_enabled.xml
+++ b/man/sd_watchdog_enabled.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 -->
 
diff --git a/man/shutdown.xml b/man/shutdown.xml
index 0d4f58c0944..a2f3b74d604 100644
--- a/man/shutdown.xml
+++ b/man/shutdown.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 -->
 
diff --git a/man/standard-conf.xml b/man/standard-conf.xml
index 9c812cec109..006fd39d1b6 100644
--- a/man/standard-conf.xml
+++ b/man/standard-conf.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2015 Zbigniew Jędrzejewski-Szmek
   Copyright 2014 Josh Triplett
 -->
diff --git a/man/standard-options.xml b/man/standard-options.xml
index 4ffe1249053..360243e0085 100644
--- a/man/standard-options.xml
+++ b/man/standard-options.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2014 Zbigniew Jędrzejewski-Szmek
 -->
 
diff --git a/man/sysctl.d.xml b/man/sysctl.d.xml
index 2e0e78255be..ddd0fda4571 100644
--- a/man/sysctl.d.xml
+++ b/man/sysctl.d.xml
@@ -3,8 +3,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 -->
 <refentry id="sysctl.d"
diff --git a/man/systemctl.xml b/man/systemctl.xml
index 60441ff7ab8..6784f3d37e0 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -8,8 +8,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 -->
 
diff --git a/man/systemd-analyze.xml b/man/systemd-analyze.xml
index 06648fca962..61de5a131d3 100644
--- a/man/systemd-analyze.xml
+++ b/man/systemd-analyze.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 -->
 
@@ -204,7 +202,6 @@
       <title>Showing logind configuration</title>
       <programlisting>$ systemd-analyze cat-config systemd/logind.conf
 # /etc/systemd/logind.conf
-#  This file is part of systemd.
 ...
 [Login]
 NAutoVTs=8
diff --git a/man/systemd-ask-password-console.service.xml b/man/systemd-ask-password-console.service.xml
index 2d5575ae43c..529c9801908 100644
--- a/man/systemd-ask-password-console.service.xml
+++ b/man/systemd-ask-password-console.service.xml
@@ -4,8 +4,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 -->
 <refentry id="systemd-ask-password-console.service">
diff --git a/man/systemd-ask-password.xml b/man/systemd-ask-password.xml
index abd93677237..cf01acab08c 100644
--- a/man/systemd-ask-password.xml
+++ b/man/systemd-ask-password.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 -->
 
diff --git a/man/systemd-backlight@.service.xml b/man/systemd-backlight@.service.xml
index 8c7c2c105b2..1519e757b80 100644
--- a/man/systemd-backlight@.service.xml
+++ b/man/systemd-backlight@.service.xml
@@ -4,8 +4,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 -->
 <refentry id="systemd-backlight@.service" conditional='ENABLE_BACKLIGHT'>
diff --git a/man/systemd-binfmt.service.xml b/man/systemd-binfmt.service.xml
index 9de0a50c538..6cb44a93366 100644
--- a/man/systemd-binfmt.service.xml
+++ b/man/systemd-binfmt.service.xml
@@ -4,8 +4,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 -->
 <refentry id="systemd-binfmt.service" conditional='ENABLE_BINFMT'
diff --git a/man/systemd-cat.xml b/man/systemd-cat.xml
index 135086876c3..432b524a4cd 100644
--- a/man/systemd-cat.xml
+++ b/man/systemd-cat.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 -->
 
diff --git a/man/systemd-cgls.xml b/man/systemd-cgls.xml
index 10890dea050..3f1e739adeb 100644
--- a/man/systemd-cgls.xml
+++ b/man/systemd-cgls.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 -->
 
diff --git a/man/systemd-cgtop.xml b/man/systemd-cgtop.xml
index 3ead519d07f..23811492383 100644
--- a/man/systemd-cgtop.xml
+++ b/man/systemd-cgtop.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 -->
 
diff --git a/man/systemd-coredump.xml b/man/systemd-coredump.xml
index 6fba19c2235..6c6c5f04c5a 100644
--- a/man/systemd-coredump.xml
+++ b/man/systemd-coredump.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2014 Zbigniew Jędrzejewski-Szmek
 -->
 
diff --git a/man/systemd-cryptsetup-generator.xml b/man/systemd-cryptsetup-generator.xml
index 0b307c638f7..3b5d153af41 100644
--- a/man/systemd-cryptsetup-generator.xml
+++ b/man/systemd-cryptsetup-generator.xml
@@ -4,8 +4,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 -->
 <refentry id="systemd-cryptsetup-generator" conditional='HAVE_LIBCRYPTSETUP'>
diff --git a/man/systemd-cryptsetup@.service.xml b/man/systemd-cryptsetup@.service.xml
index 7a4b425a779..f024522a0ec 100644
--- a/man/systemd-cryptsetup@.service.xml
+++ b/man/systemd-cryptsetup@.service.xml
@@ -4,8 +4,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 -->
 <refentry id="systemd-cryptsetup@.service" conditional='HAVE_LIBCRYPTSETUP'>
diff --git a/man/systemd-debug-generator.xml b/man/systemd-debug-generator.xml
index 0c2c997178c..5d589639f06 100644
--- a/man/systemd-debug-generator.xml
+++ b/man/systemd-debug-generator.xml
@@ -4,8 +4,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 -->
 <refentry id="systemd-debug-generator">
diff --git a/man/systemd-delta.xml b/man/systemd-delta.xml
index 5a66f682e99..496e02f9ec7 100644
--- a/man/systemd-delta.xml
+++ b/man/systemd-delta.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 -->
 
diff --git a/man/systemd-detect-virt.xml b/man/systemd-detect-virt.xml
index 2175c48fa28..916139bc06a 100644
--- a/man/systemd-detect-virt.xml
+++ b/man/systemd-detect-virt.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 -->
 
diff --git a/man/systemd-environment-d-generator.xml b/man/systemd-environment-d-generator.xml
index d944a551f32..ddbd59db0dd 100644
--- a/man/systemd-environment-d-generator.xml
+++ b/man/systemd-environment-d-generator.xml
@@ -8,8 +8,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2017 Zbigniew Jędrzejewski-Szmek
 -->
 <refentry id="systemd-environment-d-generator" conditional='ENABLE_ENVIRONMENT_D'>
diff --git a/man/systemd-escape.xml b/man/systemd-escape.xml
index fc535eb4cd5..d5343f45597 100644
--- a/man/systemd-escape.xml
+++ b/man/systemd-escape.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 -->
 
diff --git a/man/systemd-firstboot.xml b/man/systemd-firstboot.xml
index 3a534301d76..e16bec20163 100644
--- a/man/systemd-firstboot.xml
+++ b/man/systemd-firstboot.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 -->
 
diff --git a/man/systemd-fsck@.service.xml b/man/systemd-fsck@.service.xml
index 6e886506a04..aeff1a4420c 100644
--- a/man/systemd-fsck@.service.xml
+++ b/man/systemd-fsck@.service.xml
@@ -4,8 +4,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 -->
 <refentry id="systemd-fsck@.service">
diff --git a/man/systemd-fstab-generator.xml b/man/systemd-fstab-generator.xml
index 482cb9f3878..ea80ca26276 100644
--- a/man/systemd-fstab-generator.xml
+++ b/man/systemd-fstab-generator.xml
@@ -4,8 +4,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 -->
 <refentry id="systemd-fstab-generator">
diff --git a/man/systemd-getty-generator.xml b/man/systemd-getty-generator.xml
index 5c7246c381f..a267d36f58c 100644
--- a/man/systemd-getty-generator.xml
+++ b/man/systemd-getty-generator.xml
@@ -4,8 +4,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 -->
 <refentry id="systemd-getty-generator">
diff --git a/man/systemd-gpt-auto-generator.xml b/man/systemd-gpt-auto-generator.xml
index 79c766034b4..9b827825205 100644
--- a/man/systemd-gpt-auto-generator.xml
+++ b/man/systemd-gpt-auto-generator.xml
@@ -4,8 +4,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 -->
 <refentry id="systemd-gpt-auto-generator">
diff --git a/man/systemd-halt.service.xml b/man/systemd-halt.service.xml
index fb9cd219449..f0b39a8828f 100644
--- a/man/systemd-halt.service.xml
+++ b/man/systemd-halt.service.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 -->
 
diff --git a/man/systemd-hibernate-resume-generator.xml b/man/systemd-hibernate-resume-generator.xml
index 8163d40ffd4..a8ac5d34b5d 100644
--- a/man/systemd-hibernate-resume-generator.xml
+++ b/man/systemd-hibernate-resume-generator.xml
@@ -4,8 +4,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2014 Ivan Shapovalov
 -->
 <refentry id="systemd-hibernate-resume-generator" conditional='ENABLE_HIBERNATE'>
diff --git a/man/systemd-hibernate-resume@.service.xml b/man/systemd-hibernate-resume@.service.xml
index f3c0986cd54..61aae212008 100644
--- a/man/systemd-hibernate-resume@.service.xml
+++ b/man/systemd-hibernate-resume@.service.xml
@@ -4,8 +4,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2014 Ivan Shapovalov
 -->
 <refentry id="systemd-hibernate-resume@.service" conditional='ENABLE_HIBERNATE'>
diff --git a/man/systemd-hostnamed.service.xml b/man/systemd-hostnamed.service.xml
index e74eb03f296..86d27ba73fb 100644
--- a/man/systemd-hostnamed.service.xml
+++ b/man/systemd-hostnamed.service.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 -->
 
diff --git a/man/systemd-hwdb.xml b/man/systemd-hwdb.xml
index cd1df4a76eb..eb15eb2a897 100644
--- a/man/systemd-hwdb.xml
+++ b/man/systemd-hwdb.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2014 Tom Gundersen
 -->
 
diff --git a/man/systemd-importd.service.xml b/man/systemd-importd.service.xml
index 22db26cfbcb..ab69226232a 100644
--- a/man/systemd-importd.service.xml
+++ b/man/systemd-importd.service.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 -->
 
diff --git a/man/systemd-inhibit.xml b/man/systemd-inhibit.xml
index 6167fb3592e..f9fd131ba9d 100644
--- a/man/systemd-inhibit.xml
+++ b/man/systemd-inhibit.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 -->
 
diff --git a/man/systemd-initctl.service.xml b/man/systemd-initctl.service.xml
index 86bcf50ac05..8bdba5ed354 100644
--- a/man/systemd-initctl.service.xml
+++ b/man/systemd-initctl.service.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 -->
 
diff --git a/man/systemd-journal-gatewayd.service.xml b/man/systemd-journal-gatewayd.service.xml
index 5ced52237e6..29b9fe46251 100644
--- a/man/systemd-journal-gatewayd.service.xml
+++ b/man/systemd-journal-gatewayd.service.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Zbigniew Jędrzejewski-Szmek
 -->
 
diff --git a/man/systemd-journal-remote.service.xml b/man/systemd-journal-remote.service.xml
index da7200c63a7..33b5f31ee50 100644
--- a/man/systemd-journal-remote.service.xml
+++ b/man/systemd-journal-remote.service.xml
@@ -8,8 +8,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Zbigniew Jędrzejewski-Szmek
 -->
 
diff --git a/man/systemd-journal-upload.service.xml b/man/systemd-journal-upload.service.xml
index 3f76f8755a8..cb34248d28d 100644
--- a/man/systemd-journal-upload.service.xml
+++ b/man/systemd-journal-upload.service.xml
@@ -8,8 +8,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2014 Zbigniew Jędrzejewski-Szmek
 -->
 
diff --git a/man/systemd-journald.service.xml b/man/systemd-journald.service.xml
index 5e7835f8f6e..8224dc293c5 100644
--- a/man/systemd-journald.service.xml
+++ b/man/systemd-journald.service.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 -->
 
diff --git a/man/systemd-localed.service.xml b/man/systemd-localed.service.xml
index f329419be2e..541c5a2944e 100644
--- a/man/systemd-localed.service.xml
+++ b/man/systemd-localed.service.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 -->
 
diff --git a/man/systemd-logind.service.xml b/man/systemd-logind.service.xml
index 50cae5a1d05..48cae5e9e94 100644
--- a/man/systemd-logind.service.xml
+++ b/man/systemd-logind.service.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 -->
 
diff --git a/man/systemd-machine-id-commit.service.xml b/man/systemd-machine-id-commit.service.xml
index 612f68d71c4..8efd0cb80f2 100644
--- a/man/systemd-machine-id-commit.service.xml
+++ b/man/systemd-machine-id-commit.service.xml
@@ -4,8 +4,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2014 Didier Roche
 -->
 <refentry id="systemd-machine-id-commit.service">
diff --git a/man/systemd-machine-id-setup.xml b/man/systemd-machine-id-setup.xml
index 55a0050569c..438fa09fd85 100644
--- a/man/systemd-machine-id-setup.xml
+++ b/man/systemd-machine-id-setup.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 -->
 
diff --git a/man/systemd-machined.service.xml b/man/systemd-machined.service.xml
index 3e3b2527482..8564c30aae5 100644
--- a/man/systemd-machined.service.xml
+++ b/man/systemd-machined.service.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2013 Zbigniew Jędrzejewski-Szmek
 -->
 
diff --git a/man/systemd-makefs@.service.xml b/man/systemd-makefs@.service.xml
index cc4e0f50970..a20122372ed 100644
--- a/man/systemd-makefs@.service.xml
+++ b/man/systemd-makefs@.service.xml
@@ -4,8 +4,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2017 Zbigniew Jędrzejewski-Szmek
 -->
 <refentry id="systemd-makefs@.service">
diff --git a/man/systemd-modules-load.service.xml b/man/systemd-modules-load.service.xml
index 184c623153b..bda52da180e 100644
--- a/man/systemd-modules-load.service.xml
+++ b/man/systemd-modules-load.service.xml
@@ -4,8 +4,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 -->
 <refentry id="systemd-modules-load.service" conditional='HAVE_KMOD'>
diff --git a/man/systemd-mount.xml b/man/systemd-mount.xml
index 1e57cd242ba..eacf92bcd1d 100644
--- a/man/systemd-mount.xml
+++ b/man/systemd-mount.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 -->
 
diff --git a/man/systemd-networkd-wait-online.service.xml b/man/systemd-networkd-wait-online.service.xml
index 14791a8b3fc..39ef1067e97 100644
--- a/man/systemd-networkd-wait-online.service.xml
+++ b/man/systemd-networkd-wait-online.service.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2014 Tom Gundersen
 -->
 
diff --git a/man/systemd-networkd.service.xml b/man/systemd-networkd.service.xml
index ad43d959e01..431542a2237 100644
--- a/man/systemd-networkd.service.xml
+++ b/man/systemd-networkd.service.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2013 Tom Gundersen
 -->
 
diff --git a/man/systemd-notify.xml b/man/systemd-notify.xml
index 15d68b7c964..e0fc44c3dd8 100644
--- a/man/systemd-notify.xml
+++ b/man/systemd-notify.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 -->
 
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index 24913f3eee2..2ddc089d8c4 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -8,8 +8,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 -->
 
diff --git a/man/systemd-path.xml b/man/systemd-path.xml
index 2e52e5b8742..859f175e286 100644
--- a/man/systemd-path.xml
+++ b/man/systemd-path.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 -->
 
diff --git a/man/systemd-quotacheck.service.xml b/man/systemd-quotacheck.service.xml
index 19429f81cfd..fcb63622304 100644
--- a/man/systemd-quotacheck.service.xml
+++ b/man/systemd-quotacheck.service.xml
@@ -4,8 +4,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 -->
 <refentry id="systemd-quotacheck.service" conditional='ENABLE_QUOTACHECK'>
diff --git a/man/systemd-random-seed.service.xml b/man/systemd-random-seed.service.xml
index 1dd73a54adc..04923214278 100644
--- a/man/systemd-random-seed.service.xml
+++ b/man/systemd-random-seed.service.xml
@@ -4,8 +4,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 -->
 <refentry id="systemd-random-seed.service" conditional='ENABLE_RANDOMSEED'>
diff --git a/man/systemd-rc-local-generator.xml b/man/systemd-rc-local-generator.xml
index 506e9c2f951..bcafed2dc74 100644
--- a/man/systemd-rc-local-generator.xml
+++ b/man/systemd-rc-local-generator.xml
@@ -4,8 +4,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2017 Lennart Poettering
 -->
 <refentry id="systemd-rc-local-generator">
diff --git a/man/systemd-remount-fs.service.xml b/man/systemd-remount-fs.service.xml
index 454c4a5326e..7195648fc8c 100644
--- a/man/systemd-remount-fs.service.xml
+++ b/man/systemd-remount-fs.service.xml
@@ -4,8 +4,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 -->
 <refentry id="systemd-remount-fs.service">
diff --git a/man/systemd-resolved.service.xml b/man/systemd-resolved.service.xml
index 96458096167..1ae1cba465d 100644
--- a/man/systemd-resolved.service.xml
+++ b/man/systemd-resolved.service.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2014 Tom Gundersen
 -->
 
diff --git a/man/systemd-rfkill.service.xml b/man/systemd-rfkill.service.xml
index 1d3ddb68e96..4deb6cede83 100644
--- a/man/systemd-rfkill.service.xml
+++ b/man/systemd-rfkill.service.xml
@@ -4,8 +4,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 -->
 <refentry id="systemd-rfkill.service" conditional='ENABLE_RFKILL'>
diff --git a/man/systemd-run.xml b/man/systemd-run.xml
index 294674466b0..447e607346a 100644
--- a/man/systemd-run.xml
+++ b/man/systemd-run.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2013 Zbigniew Jędrzejewski-Szmek
 -->
 
diff --git a/man/systemd-sleep.conf.xml b/man/systemd-sleep.conf.xml
index 84e52d3bd82..c69d2561cf4 100644
--- a/man/systemd-sleep.conf.xml
+++ b/man/systemd-sleep.conf.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2013 Zbigniew Jędrzejewski-Szmek
 -->
 
diff --git a/man/systemd-socket-activate.xml b/man/systemd-socket-activate.xml
index 280dc4cb5d2..e173954d19b 100644
--- a/man/systemd-socket-activate.xml
+++ b/man/systemd-socket-activate.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2013 Zbigniew Jędrzejewski-Szmek
 -->
 
diff --git a/man/systemd-socket-proxyd.xml b/man/systemd-socket-proxyd.xml
index 68baccae30b..624338aa3f7 100644
--- a/man/systemd-socket-proxyd.xml
+++ b/man/systemd-socket-proxyd.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2013 David Strauss
 -->
 <refentry id="systemd-socket-proxyd"
diff --git a/man/systemd-suspend.service.xml b/man/systemd-suspend.service.xml
index d3ee7269b40..40fa3523f73 100644
--- a/man/systemd-suspend.service.xml
+++ b/man/systemd-suspend.service.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
   Copyright 2013 Zbigniew Jędrzejewski-Szmek
 -->
diff --git a/man/systemd-sysctl.service.xml b/man/systemd-sysctl.service.xml
index a5faabe1d34..53bb04a4a40 100644
--- a/man/systemd-sysctl.service.xml
+++ b/man/systemd-sysctl.service.xml
@@ -4,8 +4,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 -->
 <refentry id="systemd-sysctl.service"
diff --git a/man/systemd-system-update-generator.xml b/man/systemd-system-update-generator.xml
index ee1650257bf..3178ea94715 100644
--- a/man/systemd-system-update-generator.xml
+++ b/man/systemd-system-update-generator.xml
@@ -4,8 +4,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 -->
 <refentry id="systemd-system-update-generator">
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index 36bd4aaee50..dc771f738ac 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -8,8 +8,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 -->
 
diff --git a/man/systemd-sysusers.xml b/man/systemd-sysusers.xml
index e862498e80a..e6bfd352aa2 100644
--- a/man/systemd-sysusers.xml
+++ b/man/systemd-sysusers.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 -->
 
diff --git a/man/systemd-sysv-generator.xml b/man/systemd-sysv-generator.xml
index c30afc5d1b4..5f817a91198 100644
--- a/man/systemd-sysv-generator.xml
+++ b/man/systemd-sysv-generator.xml
@@ -4,8 +4,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2014 Zbigniew Jędrzejewski-Szmek
 -->
 <refentry id="systemd-sysv-generator" conditional="HAVE_SYSV_COMPAT">
diff --git a/man/systemd-time-wait-sync.service.xml b/man/systemd-time-wait-sync.service.xml
index d0c861f9211..d183a8073de 100644
--- a/man/systemd-time-wait-sync.service.xml
+++ b/man/systemd-time-wait-sync.service.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2018 Peter A. Bigot
 -->
 
diff --git a/man/systemd-timedated.service.xml b/man/systemd-timedated.service.xml
index 9a37d89a40c..6cfdf3e6879 100644
--- a/man/systemd-timedated.service.xml
+++ b/man/systemd-timedated.service.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 -->
 
diff --git a/man/systemd-timesyncd.service.xml b/man/systemd-timesyncd.service.xml
index 4c1580e7271..540930f3a5f 100644
--- a/man/systemd-timesyncd.service.xml
+++ b/man/systemd-timesyncd.service.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2014 Kay Sievers
 -->
 
diff --git a/man/systemd-tmpfiles.xml b/man/systemd-tmpfiles.xml
index df9dac3548e..4a840fe7079 100644
--- a/man/systemd-tmpfiles.xml
+++ b/man/systemd-tmpfiles.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 -->
 
diff --git a/man/systemd-tty-ask-password-agent.xml b/man/systemd-tty-ask-password-agent.xml
index d7835257a18..5d435fdf56c 100644
--- a/man/systemd-tty-ask-password-agent.xml
+++ b/man/systemd-tty-ask-password-agent.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 -->
 
diff --git a/man/systemd-udevd.service.xml b/man/systemd-udevd.service.xml
index 5b75ae54134..86f1d7e936b 100644
--- a/man/systemd-udevd.service.xml
+++ b/man/systemd-udevd.service.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010-2013 Kay Sievers
 -->
 
diff --git a/man/systemd-update-done.service.xml b/man/systemd-update-done.service.xml
index 2677aff667c..19e1d00cd2d 100644
--- a/man/systemd-update-done.service.xml
+++ b/man/systemd-update-done.service.xml
@@ -4,8 +4,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 -->
 <refentry id="systemd-update-done.service">
diff --git a/man/systemd-update-utmp.service.xml b/man/systemd-update-utmp.service.xml
index 673bf20df09..0e0aba7740b 100644
--- a/man/systemd-update-utmp.service.xml
+++ b/man/systemd-update-utmp.service.xml
@@ -4,8 +4,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 -->
 <refentry id="systemd-update-utmp.service" conditional="ENABLE_UTMP">
diff --git a/man/systemd-user-sessions.service.xml b/man/systemd-user-sessions.service.xml
index 52f7b3962c5..f8273a382e0 100644
--- a/man/systemd-user-sessions.service.xml
+++ b/man/systemd-user-sessions.service.xml
@@ -4,8 +4,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 -->
 <refentry id="systemd-user-sessions.service" conditional='HAVE_PAM'>
diff --git a/man/systemd-vconsole-setup.service.xml b/man/systemd-vconsole-setup.service.xml
index 181fb392fb2..b5988acc215 100644
--- a/man/systemd-vconsole-setup.service.xml
+++ b/man/systemd-vconsole-setup.service.xml
@@ -4,8 +4,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 -->
 <refentry id="systemd-vconsole-setup.service" conditional='ENABLE_VCONSOLE'>
diff --git a/man/systemd-veritysetup-generator.xml b/man/systemd-veritysetup-generator.xml
index 15ce268a9e8..eb6454b33fc 100644
--- a/man/systemd-veritysetup-generator.xml
+++ b/man/systemd-veritysetup-generator.xml
@@ -4,8 +4,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 -->
 <refentry id="systemd-veritysetup-generator" conditional='HAVE_LIBCRYPTSETUP'>
diff --git a/man/systemd-veritysetup@.service.xml b/man/systemd-veritysetup@.service.xml
index e75f1276739..71248511264 100644
--- a/man/systemd-veritysetup@.service.xml
+++ b/man/systemd-veritysetup@.service.xml
@@ -4,8 +4,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 -->
 <refentry id="systemd-veritysetup@.service" conditional='HAVE_LIBCRYPTSETUP'>
diff --git a/man/systemd-volatile-root.service.xml b/man/systemd-volatile-root.service.xml
index 86dfbe5e846..a1039119e75 100644
--- a/man/systemd-volatile-root.service.xml
+++ b/man/systemd-volatile-root.service.xml
@@ -4,8 +4,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 -->
 <refentry id="systemd-volatile-root.service">
diff --git a/man/systemd.automount.xml b/man/systemd.automount.xml
index 44add70d212..b1a8fdd12f2 100644
--- a/man/systemd.automount.xml
+++ b/man/systemd.automount.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 -->
 
diff --git a/man/systemd.device.xml b/man/systemd.device.xml
index 2509b242bab..89c9d02bb00 100644
--- a/man/systemd.device.xml
+++ b/man/systemd.device.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 -->
 
diff --git a/man/systemd.dnssd.xml b/man/systemd.dnssd.xml
index ae439f0886d..b80b39c69b0 100644
--- a/man/systemd.dnssd.xml
+++ b/man/systemd.dnssd.xml
@@ -3,8 +3,6 @@
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
-  This file is part of systemd.
-
   Copyright 2017 Dmitry Rozhkov
 -->
 
diff --git a/man/systemd.environment-generator.xml b/man/systemd.environment-generator.xml
index 2c22b79427d..46538e1df71 100644
--- a/man/systemd.environment-generator.xml
+++ b/man/systemd.environment-generator.xml
@@ -8,8 +8,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2017 Zbigniew Jędrzejewski-Szmek
 -->
 
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index 21bc26ac09c..41234dd84eb 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 -->
 
diff --git a/man/systemd.generator.xml b/man/systemd.generator.xml
index 8b3686c22e3..523fb5ae758 100644
--- a/man/systemd.generator.xml
+++ b/man/systemd.generator.xml
@@ -8,8 +8,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2015 Zbigniew Jędrzejewski-Szmek
 -->
 
diff --git a/man/systemd.journal-fields.xml b/man/systemd.journal-fields.xml
index 4b7f78d99ad..72efa60f87d 100644
--- a/man/systemd.journal-fields.xml
+++ b/man/systemd.journal-fields.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 -->
 
diff --git a/man/systemd.kill.xml b/man/systemd.kill.xml
index 6c2be5ba258..f8a542cf747 100644
--- a/man/systemd.kill.xml
+++ b/man/systemd.kill.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 -->
 
diff --git a/man/systemd.link.xml b/man/systemd.link.xml
index dbe62576234..5850d02e72a 100644
--- a/man/systemd.link.xml
+++ b/man/systemd.link.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2014 Tom Gundersen
 -->
 
diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
index 2cbecaecc56..15065cda974 100644
--- a/man/systemd.mount.xml
+++ b/man/systemd.mount.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 -->
 
diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml
index e88897450c2..ab125f778a6 100644
--- a/man/systemd.netdev.xml
+++ b/man/systemd.netdev.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2013 Tom Gundersen
 -->
 
diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index d2dd7987798..19263872554 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2013 Tom Gundersen
 -->
 
diff --git a/man/systemd.nspawn.xml b/man/systemd.nspawn.xml
index 275f96ca138..f67b2255ceb 100644
--- a/man/systemd.nspawn.xml
+++ b/man/systemd.nspawn.xml
@@ -8,8 +8,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 -->
 
diff --git a/man/systemd.offline-updates.xml b/man/systemd.offline-updates.xml
index 94226fb7d40..68b5bf5839f 100644
--- a/man/systemd.offline-updates.xml
+++ b/man/systemd.offline-updates.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
   Copyright 2016 Zbigniew Jędrzejewski-Szmek
 -->
diff --git a/man/systemd.path.xml b/man/systemd.path.xml
index 513ca706927..2e0206b9895 100644
--- a/man/systemd.path.xml
+++ b/man/systemd.path.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 -->
 
diff --git a/man/systemd.preset.xml b/man/systemd.preset.xml
index 969ba42ebf5..921cc28e8cf 100644
--- a/man/systemd.preset.xml
+++ b/man/systemd.preset.xml
@@ -4,8 +4,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 -->
 <refentry id="systemd.preset">
diff --git a/man/systemd.resource-control.xml b/man/systemd.resource-control.xml
index 482f65777f8..d97ee8fa5db 100644
--- a/man/systemd.resource-control.xml
+++ b/man/systemd.resource-control.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2013 Zbigniew Jędrzejewski-Szmek
 -->
 
diff --git a/man/systemd.scope.xml b/man/systemd.scope.xml
index 317500c3f62..25aeca413ca 100644
--- a/man/systemd.scope.xml
+++ b/man/systemd.scope.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2013 Zbigniew Jędrzejewski-Szmek
 -->
 
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index 3b1c647ef70..91af1fb08bc 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 -->
 
diff --git a/man/systemd.slice.xml b/man/systemd.slice.xml
index 4e87f98c9f4..912a5c4820c 100644
--- a/man/systemd.slice.xml
+++ b/man/systemd.slice.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2013 Zbigniew Jędrzejewski-Szmek
 -->
 
diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
index d11fecd9b77..9e84cf1fbfb 100644
--- a/man/systemd.socket.xml
+++ b/man/systemd.socket.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 -->
 
diff --git a/man/systemd.special.xml b/man/systemd.special.xml
index 23be82d9d28..63e4664271a 100644
--- a/man/systemd.special.xml
+++ b/man/systemd.special.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 -->
 
diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml
index 8f865fcb8ad..10729a2f613 100644
--- a/man/systemd.swap.xml
+++ b/man/systemd.swap.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 -->
 
diff --git a/man/systemd.target.xml b/man/systemd.target.xml
index a5b31ec26e7..9fc00c38837 100644
--- a/man/systemd.target.xml
+++ b/man/systemd.target.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 -->
 
diff --git a/man/systemd.time.xml b/man/systemd.time.xml
index 928751170a1..43c0347f9eb 100644
--- a/man/systemd.time.xml
+++ b/man/systemd.time.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 -->
 
diff --git a/man/systemd.timer.xml b/man/systemd.timer.xml
index fea7f3ff72b..ecde2798b01 100644
--- a/man/systemd.timer.xml
+++ b/man/systemd.timer.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 -->
 
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index 09974e5a049..59a7360893d 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -8,8 +8,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 -->
 
diff --git a/man/systemd.xml b/man/systemd.xml
index 65c7fc2bb12..48c68724902 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 -->
 
diff --git a/man/sysusers.d.xml b/man/sysusers.d.xml
index 534f008757d..062c766ccaf 100644
--- a/man/sysusers.d.xml
+++ b/man/sysusers.d.xml
@@ -4,8 +4,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 -->
 <refentry id="sysusers.d" conditional='ENABLE_SYSUSERS'
diff --git a/man/telinit.xml b/man/telinit.xml
index 2b499bd0c39..e7e26234655 100644
--- a/man/telinit.xml
+++ b/man/telinit.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 -->
 
diff --git a/man/timedatectl.xml b/man/timedatectl.xml
index 1a5ba022e5c..8b3f74a8997 100644
--- a/man/timedatectl.xml
+++ b/man/timedatectl.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 -->
 
diff --git a/man/timesyncd.conf.xml b/man/timesyncd.conf.xml
index 9292373bd98..f143812bcd9 100644
--- a/man/timesyncd.conf.xml
+++ b/man/timesyncd.conf.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 -->
 
diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml
index 809f992994a..3fe1fdee179 100644
--- a/man/tmpfiles.d.xml
+++ b/man/tmpfiles.d.xml
@@ -3,8 +3,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010 Brandon Philips
 -->
 <refentry id="tmpfiles.d">
diff --git a/man/udev.conf.xml b/man/udev.conf.xml
index bf0aea63b6b..3df8daa4a12 100644
--- a/man/udev.conf.xml
+++ b/man/udev.conf.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2014 Zbigniew Jędrzejewski-Szmek
 -->
 
diff --git a/man/udev.xml b/man/udev.xml
index 084c6935c72..e2145253039 100644
--- a/man/udev.xml
+++ b/man/udev.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2012 Kay Sievers
   Copyright 2014 Jason St. John
 -->
diff --git a/man/udev_device_get_syspath.xml b/man/udev_device_get_syspath.xml
index f7eb8a1bad2..9c3eff0fe13 100644
--- a/man/udev_device_get_syspath.xml
+++ b/man/udev_device_get_syspath.xml
@@ -8,8 +8,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2015 David Herrmann <dh.herrmann@gmail.com>
 -->
 
diff --git a/man/udev_device_has_tag.xml b/man/udev_device_has_tag.xml
index 610e1b70a3a..0e807606170 100644
--- a/man/udev_device_has_tag.xml
+++ b/man/udev_device_has_tag.xml
@@ -8,8 +8,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2015 David Herrmann <dh.herrmann@gmail.com>
 -->
 
diff --git a/man/udev_device_new_from_syspath.xml b/man/udev_device_new_from_syspath.xml
index b7069572dd8..e73e59e6bcd 100644
--- a/man/udev_device_new_from_syspath.xml
+++ b/man/udev_device_new_from_syspath.xml
@@ -8,8 +8,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2015 David Herrmann <dh.herrmann@gmail.com>
 -->
 
diff --git a/man/udev_enumerate_add_match_subsystem.xml b/man/udev_enumerate_add_match_subsystem.xml
index 6a3e31c4968..e81b9938023 100644
--- a/man/udev_enumerate_add_match_subsystem.xml
+++ b/man/udev_enumerate_add_match_subsystem.xml
@@ -8,8 +8,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2015 David Herrmann <dh.herrmann@gmail.com>
 -->
 
diff --git a/man/udev_enumerate_new.xml b/man/udev_enumerate_new.xml
index 95e0433ce0e..27103d768cd 100644
--- a/man/udev_enumerate_new.xml
+++ b/man/udev_enumerate_new.xml
@@ -8,8 +8,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2015 David Herrmann <dh.herrmann@gmail.com>
 -->
 
diff --git a/man/udev_enumerate_scan_devices.xml b/man/udev_enumerate_scan_devices.xml
index 7ed603510f0..2af5ee3b5c1 100644
--- a/man/udev_enumerate_scan_devices.xml
+++ b/man/udev_enumerate_scan_devices.xml
@@ -8,8 +8,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2015 David Herrmann <dh.herrmann@gmail.com>
 -->
 
diff --git a/man/udev_list_entry.xml b/man/udev_list_entry.xml
index 92949ca0bf0..c218ec50502 100644
--- a/man/udev_list_entry.xml
+++ b/man/udev_list_entry.xml
@@ -8,8 +8,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2015 David Herrmann <dh.herrmann@gmail.com>
 -->
 
diff --git a/man/udev_monitor_filter_update.xml b/man/udev_monitor_filter_update.xml
index ed542b93b16..4bf24ea8625 100644
--- a/man/udev_monitor_filter_update.xml
+++ b/man/udev_monitor_filter_update.xml
@@ -8,8 +8,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2015 David Herrmann <dh.herrmann@gmail.com>
 -->
 
diff --git a/man/udev_monitor_new_from_netlink.xml b/man/udev_monitor_new_from_netlink.xml
index 476e2d2db9c..af5c084b55f 100644
--- a/man/udev_monitor_new_from_netlink.xml
+++ b/man/udev_monitor_new_from_netlink.xml
@@ -8,8 +8,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2015 David Herrmann <dh.herrmann@gmail.com>
 -->
 
diff --git a/man/udev_monitor_receive_device.xml b/man/udev_monitor_receive_device.xml
index fcef5d9b871..568c53730a2 100644
--- a/man/udev_monitor_receive_device.xml
+++ b/man/udev_monitor_receive_device.xml
@@ -8,8 +8,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2015 David Herrmann <dh.herrmann@gmail.com>
 -->
 
diff --git a/man/udev_new.xml b/man/udev_new.xml
index b4d80d720bd..28b6c395171 100644
--- a/man/udev_new.xml
+++ b/man/udev_new.xml
@@ -8,8 +8,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2015 David Herrmann <dh.herrmann@gmail.com>
 -->
 
diff --git a/man/udevadm.xml b/man/udevadm.xml
index 3a862f540b7..a509eaf6e83 100644
--- a/man/udevadm.xml
+++ b/man/udevadm.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010-2013 Kay Sievers
 -->
 
diff --git a/man/user-system-options.xml b/man/user-system-options.xml
index 23193ea832b..30792188468 100644
--- a/man/user-system-options.xml
+++ b/man/user-system-options.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2014 Zbigniew Jędrzejewski-Szmek
   Copyright 2014 Lennart Poettering
 -->
diff --git a/man/vconsole.conf.xml b/man/vconsole.conf.xml
index 6262883e683..dac0908a79e 100644
--- a/man/vconsole.conf.xml
+++ b/man/vconsole.conf.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 -->
 
diff --git a/mkosi.build b/mkosi.build
index ee9f7d95ad4..a1a395f32ae 100755
--- a/mkosi.build
+++ b/mkosi.build
@@ -1,8 +1,6 @@
 #!/bin/sh
 set -ex
 
-# This file is part of systemd.
-#
 # Copyright 2016 Lennart Poettering
 
 # This is a build script for OS image generation using mkosi (https://github.com/systemd/mkosi).
diff --git a/src/ac-power/ac-power.c b/src/ac-power/ac-power.c
index f446442ebbd..4849dd40047 100644
--- a/src/ac-power/ac-power.c
+++ b/src/ac-power/ac-power.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/activate/activate.c b/src/activate/activate.c
index 9d027432f32..7045d65c94e 100644
--- a/src/activate/activate.c
+++ b/src/activate/activate.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/analyze/analyze-verify.c b/src/analyze/analyze-verify.c
index 694ecc72879..c1ee43385d6 100644
--- a/src/analyze/analyze-verify.c
+++ b/src/analyze/analyze-verify.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/analyze/analyze-verify.h b/src/analyze/analyze-verify.h
index 7b22d0f58b3..c7238cd0e4c 100644
--- a/src/analyze/analyze-verify.h
+++ b/src/analyze/analyze-verify.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c
index 906ddfbc280..ba8ce9d2e4a 100644
--- a/src/analyze/analyze.c
+++ b/src/analyze/analyze.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010-2013 Lennart Poettering
   Copyright 2013 Simon Peeters
 ***/
diff --git a/src/ask-password/ask-password.c b/src/ask-password/ask-password.c
index ddc516baa36..ab539890f3a 100644
--- a/src/ask-password/ask-password.c
+++ b/src/ask-password/ask-password.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c
index bb41462735e..45ddb85a98d 100644
--- a/src/backlight/backlight.c
+++ b/src/backlight/backlight.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/basic/af-list.c b/src/basic/af-list.c
index 7a4daa9143e..a27caf9399e 100644
--- a/src/basic/af-list.c
+++ b/src/basic/af-list.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/basic/af-list.h b/src/basic/af-list.h
index 447a888a0d9..70952834f9e 100644
--- a/src/basic/af-list.h
+++ b/src/basic/af-list.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/basic/alloc-util.c b/src/basic/alloc-util.c
index eceff4f246c..130612c3d24 100644
--- a/src/basic/alloc-util.c
+++ b/src/basic/alloc-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/alloc-util.h b/src/basic/alloc-util.h
index bae6a284513..0e575aff746 100644
--- a/src/basic/alloc-util.h
+++ b/src/basic/alloc-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/architecture.c b/src/basic/architecture.c
index 33e1dd2a15d..a701690c5d6 100644
--- a/src/basic/architecture.c
+++ b/src/basic/architecture.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/basic/architecture.h b/src/basic/architecture.h
index d3fd284670b..01c66c15a8c 100644
--- a/src/basic/architecture.h
+++ b/src/basic/architecture.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/basic/arphrd-list.c b/src/basic/arphrd-list.c
index 806b3e2bb43..ebd43f119b5 100644
--- a/src/basic/arphrd-list.c
+++ b/src/basic/arphrd-list.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/basic/arphrd-list.h b/src/basic/arphrd-list.h
index a9cb7d118dc..61f906a0704 100644
--- a/src/basic/arphrd-list.h
+++ b/src/basic/arphrd-list.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/basic/async.c b/src/basic/async.c
index ad1b2b5766f..5c8c9f53459 100644
--- a/src/basic/async.c
+++ b/src/basic/async.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/basic/async.h b/src/basic/async.h
index 36f333778c8..d8bca80a862 100644
--- a/src/basic/async.h
+++ b/src/basic/async.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/basic/audit-util.c b/src/basic/audit-util.c
index 697a8421eec..504ded9a2a9 100644
--- a/src/basic/audit-util.c
+++ b/src/basic/audit-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/audit-util.h b/src/basic/audit-util.h
index 6713e5348d8..85f98f3394a 100644
--- a/src/basic/audit-util.h
+++ b/src/basic/audit-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/barrier.c b/src/basic/barrier.c
index 8f03f250905..b89167d415d 100644
--- a/src/basic/barrier.c
+++ b/src/basic/barrier.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 David Herrmann <dh.herrmann@gmail.com>
 ***/
 
diff --git a/src/basic/barrier.h b/src/basic/barrier.h
index 1021e9b697a..543b121e923 100644
--- a/src/basic/barrier.h
+++ b/src/basic/barrier.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 David Herrmann <dh.herrmann@gmail.com>
 ***/
 
diff --git a/src/basic/bitmap.c b/src/basic/bitmap.c
index 56947d901cf..6d020488d17 100644
--- a/src/basic/bitmap.c
+++ b/src/basic/bitmap.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2015 Tom Gundersen
 ***/
 
diff --git a/src/basic/bitmap.h b/src/basic/bitmap.h
index d77280dc6f0..a6c30eb4c7f 100644
--- a/src/basic/bitmap.h
+++ b/src/basic/bitmap.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2015 Tom Gundersen
 ***/
 
diff --git a/src/basic/blkid-util.h b/src/basic/blkid-util.h
index 41a2c20fca1..6c4ccc2c072 100644
--- a/src/basic/blkid-util.h
+++ b/src/basic/blkid-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/basic/blockdev-util.c b/src/basic/blockdev-util.c
index 0b090bb2ed9..f8951fa78c5 100644
--- a/src/basic/blockdev-util.c
+++ b/src/basic/blockdev-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/blockdev-util.h b/src/basic/blockdev-util.h
index 34cbffd98fa..fe8253f5d47 100644
--- a/src/basic/blockdev-util.h
+++ b/src/basic/blockdev-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/bpf-program.c b/src/basic/bpf-program.c
index 74a81e81bac..ab7562c17bc 100644
--- a/src/basic/bpf-program.c
+++ b/src/basic/bpf-program.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2016 Daniel Mack
 ***/
 
diff --git a/src/basic/bpf-program.h b/src/basic/bpf-program.h
index 7a1e9ab6efc..7083e097846 100644
--- a/src/basic/bpf-program.h
+++ b/src/basic/bpf-program.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2016 Daniel Mack
 
   [Except for the stuff copy/pasted from the kernel sources, see below]
diff --git a/src/basic/btrfs-util.c b/src/basic/btrfs-util.c
index b325090ed9c..114c9cd7e55 100644
--- a/src/basic/btrfs-util.c
+++ b/src/basic/btrfs-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/basic/btrfs-util.h b/src/basic/btrfs-util.h
index 3ac4a352c76..e4513b44a28 100644
--- a/src/basic/btrfs-util.h
+++ b/src/basic/btrfs-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/basic/build.h b/src/basic/build.h
index 563baed832d..71ec2c2027b 100644
--- a/src/basic/build.h
+++ b/src/basic/build.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/bus-label.c b/src/basic/bus-label.c
index fee38b5055c..c647e8ae08c 100644
--- a/src/basic/bus-label.c
+++ b/src/basic/bus-label.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/basic/bus-label.h b/src/basic/bus-label.h
index 0df46f86bf7..8d480d39657 100644
--- a/src/basic/bus-label.h
+++ b/src/basic/bus-label.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/basic/calendarspec.c b/src/basic/calendarspec.c
index f8c798f31f0..c8e1e5400f3 100644
--- a/src/basic/calendarspec.c
+++ b/src/basic/calendarspec.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/basic/calendarspec.h b/src/basic/calendarspec.h
index b9d6f5c2500..b034269ef2e 100644
--- a/src/basic/calendarspec.h
+++ b/src/basic/calendarspec.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/basic/cap-list.c b/src/basic/cap-list.c
index 01f163b60ca..dd13376a76e 100644
--- a/src/basic/cap-list.c
+++ b/src/basic/cap-list.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/basic/cap-list.h b/src/basic/cap-list.h
index db65d5f0e25..c81c6748b57 100644
--- a/src/basic/cap-list.h
+++ b/src/basic/cap-list.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/basic/capability-util.c b/src/basic/capability-util.c
index a4255808875..a3868d1bfa0 100644
--- a/src/basic/capability-util.c
+++ b/src/basic/capability-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/capability-util.h b/src/basic/capability-util.h
index 7e51791681d..286f50744fc 100644
--- a/src/basic/capability-util.h
+++ b/src/basic/capability-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
index a7214432f5c..f3fc84d6dd0 100644
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/cgroup-util.h b/src/basic/cgroup-util.h
index 4fc81749a37..0e00d90cbf8 100644
--- a/src/basic/cgroup-util.h
+++ b/src/basic/cgroup-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/chattr-util.c b/src/basic/chattr-util.c
index 9651bd7c1c6..cd5a1dde5f8 100644
--- a/src/basic/chattr-util.c
+++ b/src/basic/chattr-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/chattr-util.h b/src/basic/chattr-util.h
index 85fa8f5fb0c..f7e157b4f14 100644
--- a/src/basic/chattr-util.h
+++ b/src/basic/chattr-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/clock-util.c b/src/basic/clock-util.c
index 5ef76d46f20..363a992366d 100644
--- a/src/basic/clock-util.c
+++ b/src/basic/clock-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010-2012 Lennart Poettering
 ***/
 
diff --git a/src/basic/clock-util.h b/src/basic/clock-util.h
index e87d32a7855..380f40061d9 100644
--- a/src/basic/clock-util.h
+++ b/src/basic/clock-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010-2012 Lennart Poettering
 ***/
 
diff --git a/src/basic/conf-files.c b/src/basic/conf-files.c
index 15a066da7fe..bb551e23e98 100644
--- a/src/basic/conf-files.c
+++ b/src/basic/conf-files.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/conf-files.h b/src/basic/conf-files.h
index a3adc0828e2..bc7a4501920 100644
--- a/src/basic/conf-files.h
+++ b/src/basic/conf-files.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010-2012 Lennart Poettering
   Copyright 2010-2012 Kay Sievers
 ***/
diff --git a/src/basic/copy.c b/src/basic/copy.c
index 19210477143..00b60df4f40 100644
--- a/src/basic/copy.c
+++ b/src/basic/copy.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/basic/copy.h b/src/basic/copy.h
index 71a7e4508a6..f9b3565c71f 100644
--- a/src/basic/copy.h
+++ b/src/basic/copy.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/basic/cpu-set-util.c b/src/basic/cpu-set-util.c
index 76158a23029..b31f9f16592 100644
--- a/src/basic/cpu-set-util.c
+++ b/src/basic/cpu-set-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010-2015 Lennart Poettering
   Copyright 2015 Filipe Brandenburger
 ***/
diff --git a/src/basic/cpu-set-util.h b/src/basic/cpu-set-util.h
index 85cc31c5395..16e5781b1d0 100644
--- a/src/basic/cpu-set-util.h
+++ b/src/basic/cpu-set-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010-2015 Lennart Poettering
   Copyright 2015 Filipe Brandenburger
 ***/
diff --git a/src/basic/crypt-util.c b/src/basic/crypt-util.c
index 01a4f24a47b..285f7ecb5ca 100644
--- a/src/basic/crypt-util.c
+++ b/src/basic/crypt-util.c
@@ -1,6 +1,4 @@
 /***
-  This file is part of systemd.
-
   Copyright 2017 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/basic/crypt-util.h b/src/basic/crypt-util.h
index dc9d3b2ddf4..9acb86a7f02 100644
--- a/src/basic/crypt-util.h
+++ b/src/basic/crypt-util.h
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2017 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/basic/def.h b/src/basic/def.h
index 559721754a8..4d42fb93e87 100644
--- a/src/basic/def.h
+++ b/src/basic/def.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/device-nodes.c b/src/basic/device-nodes.c
index bbbe563fa1f..6fde759c63c 100644
--- a/src/basic/device-nodes.c
+++ b/src/basic/device-nodes.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2008-2011 Kay Sievers
 ***/
 
diff --git a/src/basic/device-nodes.h b/src/basic/device-nodes.h
index e76a419bb1b..945382bb1f2 100644
--- a/src/basic/device-nodes.h
+++ b/src/basic/device-nodes.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/basic/dirent-util.c b/src/basic/dirent-util.c
index e093a3bba18..4a061837f29 100644
--- a/src/basic/dirent-util.c
+++ b/src/basic/dirent-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010-2012 Lennart Poettering
 ***/
 
diff --git a/src/basic/dirent-util.h b/src/basic/dirent-util.h
index 00d061b63a6..047ccd2250b 100644
--- a/src/basic/dirent-util.h
+++ b/src/basic/dirent-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/env-util.c b/src/basic/env-util.c
index c17c5f7baea..cce8774ef8c 100644
--- a/src/basic/env-util.c
+++ b/src/basic/env-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/basic/env-util.h b/src/basic/env-util.h
index 3d7e14ccb1d..56b999b7950 100644
--- a/src/basic/env-util.h
+++ b/src/basic/env-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/basic/errno-list.c b/src/basic/errno-list.c
index d70449472d9..a5cdf5d95f6 100644
--- a/src/basic/errno-list.c
+++ b/src/basic/errno-list.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/basic/errno-list.h b/src/basic/errno-list.h
index 6725ae9ad9d..c549b055de2 100644
--- a/src/basic/errno-list.h
+++ b/src/basic/errno-list.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/basic/escape.c b/src/basic/escape.c
index 6734fba1f30..a51d2d9339b 100644
--- a/src/basic/escape.c
+++ b/src/basic/escape.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/escape.h b/src/basic/escape.h
index b47052b1425..7a55ee618e0 100644
--- a/src/basic/escape.h
+++ b/src/basic/escape.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/ether-addr-util.c b/src/basic/ether-addr-util.c
index 99ef936e843..9c0da8bde22 100644
--- a/src/basic/ether-addr-util.c
+++ b/src/basic/ether-addr-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Tom Gundersen
 ***/
 
diff --git a/src/basic/ether-addr-util.h b/src/basic/ether-addr-util.h
index f7e0de54cc8..e8edde7999a 100644
--- a/src/basic/ether-addr-util.h
+++ b/src/basic/ether-addr-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Tom Gundersen
 ***/
 
diff --git a/src/basic/exec-util.c b/src/basic/exec-util.c
index e9203fe578b..7bf382d48dd 100644
--- a/src/basic/exec-util.c
+++ b/src/basic/exec-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/exec-util.h b/src/basic/exec-util.h
index 867331365c3..74f3c62969e 100644
--- a/src/basic/exec-util.h
+++ b/src/basic/exec-util.h
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2017 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/basic/exit-status.c b/src/basic/exit-status.c
index c2064b7ef12..49e1aa3fffb 100644
--- a/src/basic/exit-status.c
+++ b/src/basic/exit-status.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/exit-status.h b/src/basic/exit-status.h
index 9686e31e069..11f8f5e9f1c 100644
--- a/src/basic/exit-status.h
+++ b/src/basic/exit-status.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/extract-word.c b/src/basic/extract-word.c
index 4f482614973..3927660ee47 100644
--- a/src/basic/extract-word.c
+++ b/src/basic/extract-word.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/extract-word.h b/src/basic/extract-word.h
index d2113948f7a..de4f728c8c3 100644
--- a/src/basic/extract-word.h
+++ b/src/basic/extract-word.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/fd-util.c b/src/basic/fd-util.c
index e1bea94c90a..c1353b9e8f0 100644
--- a/src/basic/fd-util.c
+++ b/src/basic/fd-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/fd-util.h b/src/basic/fd-util.h
index b94944972ce..c3b6efbb91e 100644
--- a/src/basic/fd-util.h
+++ b/src/basic/fd-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/fileio-label.c b/src/basic/fileio-label.c
index 836e1832e69..8492a4ee77f 100644
--- a/src/basic/fileio-label.c
+++ b/src/basic/fileio-label.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
   Copyright 2010 Harald Hoyer
 ***/
diff --git a/src/basic/fileio-label.h b/src/basic/fileio-label.h
index ac49fd54208..f27fbb923d8 100644
--- a/src/basic/fileio-label.h
+++ b/src/basic/fileio-label.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
   Copyright 2010 Harald Hoyer
 ***/
diff --git a/src/basic/fileio.c b/src/basic/fileio.c
index 5837163fed1..3c4fa198ec4 100644
--- a/src/basic/fileio.c
+++ b/src/basic/fileio.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/fileio.h b/src/basic/fileio.h
index a5ff1fb6ba5..9f37ba2b314 100644
--- a/src/basic/fileio.h
+++ b/src/basic/fileio.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/format-util.h b/src/basic/format-util.h
index c9e81192beb..4ea34749d13 100644
--- a/src/basic/format-util.h
+++ b/src/basic/format-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2015 Ronny Chevalier
 ***/
 
diff --git a/src/basic/fs-util.c b/src/basic/fs-util.c
index ab6ccf7c86d..5dff5397737 100644
--- a/src/basic/fs-util.c
+++ b/src/basic/fs-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h
index 4d0ed641b4f..69e199f88fc 100644
--- a/src/basic/fs-util.h
+++ b/src/basic/fs-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/gcrypt-util.c b/src/basic/gcrypt-util.c
index 5c304d989b9..54008f0a282 100644
--- a/src/basic/gcrypt-util.c
+++ b/src/basic/gcrypt-util.c
@@ -2,8 +2,6 @@
 /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/basic/gcrypt-util.h b/src/basic/gcrypt-util.h
index 5323d5d6693..9154762fdac 100644
--- a/src/basic/gcrypt-util.h
+++ b/src/basic/gcrypt-util.h
@@ -2,8 +2,6 @@
 /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 /***
-  This file is part of systemd.
-
   Copyright 2016 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/basic/glob-util.c b/src/basic/glob-util.c
index e0a8af54036..b9f378c825f 100644
--- a/src/basic/glob-util.c
+++ b/src/basic/glob-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/glob-util.h b/src/basic/glob-util.h
index da2964f4a63..aef9f36648c 100644
--- a/src/basic/glob-util.h
+++ b/src/basic/glob-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/hash-funcs.c b/src/basic/hash-funcs.c
index 13e357efd4b..3b695a1259f 100644
--- a/src/basic/hash-funcs.c
+++ b/src/basic/hash-funcs.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
   Copyright 2014 Michal Schmidt
 ***/
diff --git a/src/basic/hash-funcs.h b/src/basic/hash-funcs.h
index 0c963af8ef8..343af5d686c 100644
--- a/src/basic/hash-funcs.h
+++ b/src/basic/hash-funcs.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
   Copyright 2014 Michal Schmidt
 ***/
diff --git a/src/basic/hashmap.c b/src/basic/hashmap.c
index cf51167c1aa..91fe402c589 100644
--- a/src/basic/hashmap.c
+++ b/src/basic/hashmap.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
   Copyright 2014 Michal Schmidt
 ***/
diff --git a/src/basic/hashmap.h b/src/basic/hashmap.h
index 701eecbdb02..3d544dc7327 100644
--- a/src/basic/hashmap.h
+++ b/src/basic/hashmap.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
   Copyright 2014 Michal Schmidt
 ***/
diff --git a/src/basic/hexdecoct.c b/src/basic/hexdecoct.c
index b3ea05ce53e..92c16428337 100644
--- a/src/basic/hexdecoct.c
+++ b/src/basic/hexdecoct.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/hexdecoct.h b/src/basic/hexdecoct.h
index c2f11013e59..b49ddc8c21f 100644
--- a/src/basic/hexdecoct.h
+++ b/src/basic/hexdecoct.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/hostname-util.c b/src/basic/hostname-util.c
index 19bd951ade3..136b3161202 100644
--- a/src/basic/hostname-util.c
+++ b/src/basic/hostname-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/basic/hostname-util.h b/src/basic/hostname-util.h
index 8e29e9e1e54..e92222a7b95 100644
--- a/src/basic/hostname-util.h
+++ b/src/basic/hostname-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010-2015 Lennart Poettering
 ***/
 
diff --git a/src/basic/in-addr-util.c b/src/basic/in-addr-util.c
index 5b18bcf7ada..df002f49606 100644
--- a/src/basic/in-addr-util.c
+++ b/src/basic/in-addr-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/basic/in-addr-util.h b/src/basic/in-addr-util.h
index acd567c994d..e07bd86ef70 100644
--- a/src/basic/in-addr-util.h
+++ b/src/basic/in-addr-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/basic/io-util.c b/src/basic/io-util.c
index 593db66da77..dd67389fd17 100644
--- a/src/basic/io-util.c
+++ b/src/basic/io-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/io-util.h b/src/basic/io-util.h
index e4717b6f30d..ab43ca5b516 100644
--- a/src/basic/io-util.h
+++ b/src/basic/io-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/journal-importer.c b/src/basic/journal-importer.c
index 6fd0f937e2c..98bc542ff57 100644
--- a/src/basic/journal-importer.c
+++ b/src/basic/journal-importer.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/basic/journal-importer.h b/src/basic/journal-importer.h
index c3db3d92d00..788e365e3c2 100644
--- a/src/basic/journal-importer.h
+++ b/src/basic/journal-importer.h
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2016 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/basic/khash.c b/src/basic/khash.c
index c66e9faeea6..08859832f61 100644
--- a/src/basic/khash.c
+++ b/src/basic/khash.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 ***/
 
diff --git a/src/basic/khash.h b/src/basic/khash.h
index 3fa867e37da..5c7d306c9b7 100644
--- a/src/basic/khash.h
+++ b/src/basic/khash.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 ***/
 
diff --git a/src/basic/label.c b/src/basic/label.c
index b15419d6598..8da5e930e20 100644
--- a/src/basic/label.c
+++ b/src/basic/label.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/label.h b/src/basic/label.h
index b8e5ae0c35b..c5158ca60f7 100644
--- a/src/basic/label.h
+++ b/src/basic/label.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/list.h b/src/basic/list.h
index 3ec7e73fc58..6ae88ec6b96 100644
--- a/src/basic/list.h
+++ b/src/basic/list.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/locale-util.c b/src/basic/locale-util.c
index b382af192d0..fb31e8ffbb6 100644
--- a/src/basic/locale-util.c
+++ b/src/basic/locale-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/basic/locale-util.h b/src/basic/locale-util.h
index 144e2bc630d..80c2d871a7c 100644
--- a/src/basic/locale-util.h
+++ b/src/basic/locale-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/basic/lockfile-util.c b/src/basic/lockfile-util.c
index b94195cc5dd..e23aa529631 100644
--- a/src/basic/lockfile-util.c
+++ b/src/basic/lockfile-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/lockfile-util.h b/src/basic/lockfile-util.h
index 457a39930a8..d49251d266a 100644
--- a/src/basic/lockfile-util.h
+++ b/src/basic/lockfile-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/basic/log.c b/src/basic/log.c
index 167f0f55334..2909f520b52 100644
--- a/src/basic/log.c
+++ b/src/basic/log.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/log.h b/src/basic/log.h
index 3f56ec68a6e..71a3bb826dd 100644
--- a/src/basic/log.h
+++ b/src/basic/log.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/login-util.c b/src/basic/login-util.c
index d69b413e6e0..59ac08140e3 100644
--- a/src/basic/login-util.c
+++ b/src/basic/login-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/basic/login-util.h b/src/basic/login-util.h
index ed454bd67f1..28c00e148cf 100644
--- a/src/basic/login-util.h
+++ b/src/basic/login-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/basic/macro.h b/src/basic/macro.h
index 05f5e9fa68b..4d33e702829 100644
--- a/src/basic/macro.h
+++ b/src/basic/macro.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/memfd-util.c b/src/basic/memfd-util.c
index ae05a8ce2e9..6997c32eae0 100644
--- a/src/basic/memfd-util.c
+++ b/src/basic/memfd-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/basic/memfd-util.h b/src/basic/memfd-util.h
index 022455fe1f5..1e09bd2c54b 100644
--- a/src/basic/memfd-util.h
+++ b/src/basic/memfd-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/basic/mempool.c b/src/basic/mempool.c
index 2e55639e829..5792ca972fc 100644
--- a/src/basic/mempool.c
+++ b/src/basic/mempool.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010-2014 Lennart Poettering
   Copyright 2014 Michal Schmidt
 ***/
diff --git a/src/basic/mempool.h b/src/basic/mempool.h
index ba0c0bd8f96..dad4a4f9ccb 100644
--- a/src/basic/mempool.h
+++ b/src/basic/mempool.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2011-2014 Lennart Poettering
   Copyright 2014 Michal Schmidt
 ***/
diff --git a/src/basic/missing.h b/src/basic/missing.h
index dbdbd6f2609..4a12274cb44 100644
--- a/src/basic/missing.h
+++ b/src/basic/missing.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h
index 89ca1f062a9..4eacebfb361 100644
--- a/src/basic/missing_syscall.h
+++ b/src/basic/missing_syscall.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
   Copyright 2016 Zbigniew Jędrzejewski-Szmek
 ***/
diff --git a/src/basic/mkdir-label.c b/src/basic/mkdir-label.c
index 6159037d7d0..97fb4c96b0e 100644
--- a/src/basic/mkdir-label.c
+++ b/src/basic/mkdir-label.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
   Copyright 2013 Kay Sievers
 ***/
diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c
index 015529f422e..db64b0ef045 100644
--- a/src/basic/mkdir.c
+++ b/src/basic/mkdir.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/mkdir.h b/src/basic/mkdir.h
index 4fe74fc5ef5..8b579246be5 100644
--- a/src/basic/mkdir.h
+++ b/src/basic/mkdir.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
   Copyright 2013 Kay Sievers
 ***/
diff --git a/src/basic/module-util.h b/src/basic/module-util.h
index 46d9fba6885..37500881f96 100644
--- a/src/basic/module-util.h
+++ b/src/basic/module-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2017 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/basic/mount-util.c b/src/basic/mount-util.c
index 68a83ebae76..bcb7e43288b 100644
--- a/src/basic/mount-util.c
+++ b/src/basic/mount-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/mount-util.h b/src/basic/mount-util.h
index dcd90c07607..f73559a017e 100644
--- a/src/basic/mount-util.h
+++ b/src/basic/mount-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/nss-util.h b/src/basic/nss-util.h
index b13824216e7..ab80b2e3e2f 100644
--- a/src/basic/nss-util.h
+++ b/src/basic/nss-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/basic/ordered-set.c b/src/basic/ordered-set.c
index 9ea057fb7b3..ae52e223327 100644
--- a/src/basic/ordered-set.c
+++ b/src/basic/ordered-set.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 ***/
 
diff --git a/src/basic/ordered-set.h b/src/basic/ordered-set.h
index 1943d06b4fc..87971af7396 100644
--- a/src/basic/ordered-set.h
+++ b/src/basic/ordered-set.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/basic/pager.c b/src/basic/pager.c
index 9005f4337e2..dd5c61154f5 100644
--- a/src/basic/pager.c
+++ b/src/basic/pager.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/pager.h b/src/basic/pager.h
index d79599dc3d7..b72d1745f31 100644
--- a/src/basic/pager.h
+++ b/src/basic/pager.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c
index 33698b06dac..4fd803c9063 100644
--- a/src/basic/parse-util.c
+++ b/src/basic/parse-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/parse-util.h b/src/basic/parse-util.h
index b3edfbaecc0..5a345ac4bf5 100644
--- a/src/basic/parse-util.h
+++ b/src/basic/parse-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/path-util.c b/src/basic/path-util.c
index 2e68de9e63e..bac7152a6d3 100644
--- a/src/basic/path-util.c
+++ b/src/basic/path-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010-2012 Lennart Poettering
 ***/
 
diff --git a/src/basic/path-util.h b/src/basic/path-util.h
index 486046f861a..2e43c0c345f 100644
--- a/src/basic/path-util.h
+++ b/src/basic/path-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010-2012 Lennart Poettering
 ***/
 
diff --git a/src/basic/prioq.c b/src/basic/prioq.c
index 1db2d9efc3d..fd51e0587cb 100644
--- a/src/basic/prioq.c
+++ b/src/basic/prioq.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/basic/prioq.h b/src/basic/prioq.h
index e348c64649a..a3e378a927c 100644
--- a/src/basic/prioq.h
+++ b/src/basic/prioq.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/basic/proc-cmdline.c b/src/basic/proc-cmdline.c
index 7f5bc0bb80a..c5c9d307b76 100644
--- a/src/basic/proc-cmdline.c
+++ b/src/basic/proc-cmdline.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/proc-cmdline.h b/src/basic/proc-cmdline.h
index 4224072fe5d..9430bdad661 100644
--- a/src/basic/proc-cmdline.h
+++ b/src/basic/proc-cmdline.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/process-util.c b/src/basic/process-util.c
index 9062bbb0b59..1fcfb8135f4 100644
--- a/src/basic/process-util.c
+++ b/src/basic/process-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/process-util.h b/src/basic/process-util.h
index 0f8865f1fb6..e51a874cd21 100644
--- a/src/basic/process-util.h
+++ b/src/basic/process-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/random-util.c b/src/basic/random-util.c
index 03117c225e3..c09f13e8e30 100644
--- a/src/basic/random-util.c
+++ b/src/basic/random-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/random-util.h b/src/basic/random-util.h
index 723917057dd..c829da0840b 100644
--- a/src/basic/random-util.h
+++ b/src/basic/random-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/ratelimit.c b/src/basic/ratelimit.c
index 6804364f302..0e9afc1e4d8 100644
--- a/src/basic/ratelimit.c
+++ b/src/basic/ratelimit.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/ratelimit.h b/src/basic/ratelimit.h
index 5a9aeb64863..1b761761ae5 100644
--- a/src/basic/ratelimit.h
+++ b/src/basic/ratelimit.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/raw-clone.h b/src/basic/raw-clone.h
index 6505e5a3cd1..83d5ff7c215 100644
--- a/src/basic/raw-clone.h
+++ b/src/basic/raw-clone.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
   Copyright 2016 Michael Karcher
 ***/
diff --git a/src/basic/refcnt.h b/src/basic/refcnt.h
index 0d5b3f4e1b5..a341fd55bcc 100644
--- a/src/basic/refcnt.h
+++ b/src/basic/refcnt.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/basic/replace-var.c b/src/basic/replace-var.c
index 40967767033..c42a77642de 100644
--- a/src/basic/replace-var.c
+++ b/src/basic/replace-var.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/basic/replace-var.h b/src/basic/replace-var.h
index 807ef9cac00..78db4936208 100644
--- a/src/basic/replace-var.h
+++ b/src/basic/replace-var.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/basic/rlimit-util.c b/src/basic/rlimit-util.c
index 57f90474d8f..e54227e94da 100644
--- a/src/basic/rlimit-util.c
+++ b/src/basic/rlimit-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/rlimit-util.h b/src/basic/rlimit-util.h
index d50fd38c2e2..c5b3cc15331 100644
--- a/src/basic/rlimit-util.h
+++ b/src/basic/rlimit-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/rm-rf.c b/src/basic/rm-rf.c
index 20f094b9a18..465fdb46b10 100644
--- a/src/basic/rm-rf.c
+++ b/src/basic/rm-rf.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/basic/rm-rf.h b/src/basic/rm-rf.h
index 53d8485a4c6..9f74bce08c9 100644
--- a/src/basic/rm-rf.h
+++ b/src/basic/rm-rf.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/basic/securebits-util.c b/src/basic/securebits-util.c
index 4a6782920fb..0054e9079dc 100644
--- a/src/basic/securebits-util.c
+++ b/src/basic/securebits-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2017 Yu Watanabe
 ***/
 
diff --git a/src/basic/securebits-util.h b/src/basic/securebits-util.h
index 41126789fec..560d2e82305 100644
--- a/src/basic/securebits-util.h
+++ b/src/basic/securebits-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2017 Yu Watanabe
 ***/
 
diff --git a/src/basic/selinux-util.c b/src/basic/selinux-util.c
index 61504a673a7..2ab0e074d83 100644
--- a/src/basic/selinux-util.c
+++ b/src/basic/selinux-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/selinux-util.h b/src/basic/selinux-util.h
index 87abf274213..7084beeb6b6 100644
--- a/src/basic/selinux-util.h
+++ b/src/basic/selinux-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/set.h b/src/basic/set.h
index dc0f1e17e62..8874fc67765 100644
--- a/src/basic/set.h
+++ b/src/basic/set.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/sigbus.c b/src/basic/sigbus.c
index d7db5b56ac6..16751a9b3ef 100644
--- a/src/basic/sigbus.c
+++ b/src/basic/sigbus.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/basic/sigbus.h b/src/basic/sigbus.h
index 9c0c66a777d..a262f3c6c38 100644
--- a/src/basic/sigbus.h
+++ b/src/basic/sigbus.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/basic/signal-util.c b/src/basic/signal-util.c
index cd93a98b502..a25628c9d11 100644
--- a/src/basic/signal-util.c
+++ b/src/basic/signal-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/basic/signal-util.h b/src/basic/signal-util.h
index 0c43467b63f..5af448180f2 100644
--- a/src/basic/signal-util.h
+++ b/src/basic/signal-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010-2015 Lennart Poettering
 ***/
 
diff --git a/src/basic/smack-util.c b/src/basic/smack-util.c
index adabc1c3f9a..0c6bbe64c3a 100644
--- a/src/basic/smack-util.c
+++ b/src/basic/smack-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Intel Corporation
 
   Author: Auke Kok <auke-jan.h.kok@intel.com>
diff --git a/src/basic/smack-util.h b/src/basic/smack-util.h
index 30a96acdf78..a4429013651 100644
--- a/src/basic/smack-util.h
+++ b/src/basic/smack-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Intel Corporation
 
   Author: Auke Kok <auke-jan.h.kok@intel.com>
diff --git a/src/basic/socket-label.c b/src/basic/socket-label.c
index 2021146d89b..e34456ff850 100644
--- a/src/basic/socket-label.c
+++ b/src/basic/socket-label.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/socket-protocol-list.c b/src/basic/socket-protocol-list.c
index 4fea78126f6..2ba6df2b8dc 100644
--- a/src/basic/socket-protocol-list.c
+++ b/src/basic/socket-protocol-list.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/basic/socket-protocol-list.h b/src/basic/socket-protocol-list.h
index bb77b70106f..93104a93bb6 100644
--- a/src/basic/socket-protocol-list.h
+++ b/src/basic/socket-protocol-list.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/basic/socket-util.c b/src/basic/socket-util.c
index 508f6a26f78..e2b28d0d755 100644
--- a/src/basic/socket-util.c
+++ b/src/basic/socket-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/socket-util.h b/src/basic/socket-util.h
index 9cd7f9ec546..a247da4b566 100644
--- a/src/basic/socket-util.h
+++ b/src/basic/socket-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/special.h b/src/basic/special.h
index 136a5b2da6e..9a3cbaf95d8 100644
--- a/src/basic/special.h
+++ b/src/basic/special.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/stat-util.c b/src/basic/stat-util.c
index 1f0a75a0e8c..5b4fb3c07fd 100644
--- a/src/basic/stat-util.c
+++ b/src/basic/stat-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010-2012 Lennart Poettering
 ***/
 
diff --git a/src/basic/stat-util.h b/src/basic/stat-util.h
index 02b1c47123b..0ec479dbc61 100644
--- a/src/basic/stat-util.h
+++ b/src/basic/stat-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010-2012 Lennart Poettering
 ***/
 
diff --git a/src/basic/stdio-util.h b/src/basic/stdio-util.h
index 5330789aaab..629abf35eec 100644
--- a/src/basic/stdio-util.h
+++ b/src/basic/stdio-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/strbuf.c b/src/basic/strbuf.c
index 1b08c9c2d35..e30cb32e59d 100644
--- a/src/basic/strbuf.c
+++ b/src/basic/strbuf.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Kay Sievers <kay@vrfy.org>
 ***/
 
diff --git a/src/basic/strbuf.h b/src/basic/strbuf.h
index 84c2e4bfa58..e69e501779e 100644
--- a/src/basic/strbuf.h
+++ b/src/basic/strbuf.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2012 Kay Sievers <kay@vrfy.org>
 ***/
 
diff --git a/src/basic/string-table.c b/src/basic/string-table.c
index 6857202f88c..33a5dbc571d 100644
--- a/src/basic/string-table.c
+++ b/src/basic/string-table.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/string-table.h b/src/basic/string-table.h
index 1786bcfda00..6bc60b65ede 100644
--- a/src/basic/string-table.h
+++ b/src/basic/string-table.h
@@ -3,8 +3,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/string-util.c b/src/basic/string-util.c
index 4c52c560a0a..485cb1bc297 100644
--- a/src/basic/string-util.c
+++ b/src/basic/string-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/string-util.h b/src/basic/string-util.h
index 7e6880b26bc..2e2e0c0351a 100644
--- a/src/basic/string-util.h
+++ b/src/basic/string-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/strv.c b/src/basic/strv.c
index 47ab0ad07f1..aa670f340b9 100644
--- a/src/basic/strv.c
+++ b/src/basic/strv.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/strv.h b/src/basic/strv.h
index 958c5f3a98c..79d42c03133 100644
--- a/src/basic/strv.h
+++ b/src/basic/strv.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/strxcpyx.c b/src/basic/strxcpyx.c
index ed71e23f6d3..3fdc7256363 100644
--- a/src/basic/strxcpyx.c
+++ b/src/basic/strxcpyx.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Kay Sievers
 ***/
 
diff --git a/src/basic/strxcpyx.h b/src/basic/strxcpyx.h
index 7f49f92ad86..11d41ccf834 100644
--- a/src/basic/strxcpyx.h
+++ b/src/basic/strxcpyx.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Kay Sievers
 ***/
 
diff --git a/src/basic/syslog-util.c b/src/basic/syslog-util.c
index 9662c7a8a73..5bb853239d3 100644
--- a/src/basic/syslog-util.c
+++ b/src/basic/syslog-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/syslog-util.h b/src/basic/syslog-util.h
index 3968b4cf10e..09dae9e83d2 100644
--- a/src/basic/syslog-util.h
+++ b/src/basic/syslog-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c
index 234a1722df7..0b0a6974e89 100644
--- a/src/basic/terminal-util.c
+++ b/src/basic/terminal-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/terminal-util.h b/src/basic/terminal-util.h
index 98c6706a24c..4d8daf61beb 100644
--- a/src/basic/terminal-util.h
+++ b/src/basic/terminal-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/time-util.c b/src/basic/time-util.c
index 64ee777d01b..4c6a61d18e2 100644
--- a/src/basic/time-util.c
+++ b/src/basic/time-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/time-util.h b/src/basic/time-util.h
index 54aebfa36bc..15d8ab275e6 100644
--- a/src/basic/time-util.h
+++ b/src/basic/time-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/umask-util.h b/src/basic/umask-util.h
index ce705247d6e..25796883e79 100644
--- a/src/basic/umask-util.h
+++ b/src/basic/umask-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/unaligned.h b/src/basic/unaligned.h
index feddaa91924..0bb62b31955 100644
--- a/src/basic/unaligned.h
+++ b/src/basic/unaligned.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Tom Gundersen
 ***/
 
diff --git a/src/basic/unit-def.c b/src/basic/unit-def.c
index fd42e0a2413..abfa11ab144 100644
--- a/src/basic/unit-def.c
+++ b/src/basic/unit-def.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/unit-def.h b/src/basic/unit-def.h
index 3f13a1c8f33..1d785c43b8a 100644
--- a/src/basic/unit-def.h
+++ b/src/basic/unit-def.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/unit-name.c b/src/basic/unit-name.c
index 4fa00663e49..8115bff14ae 100644
--- a/src/basic/unit-name.c
+++ b/src/basic/unit-name.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/unit-name.h b/src/basic/unit-name.h
index d3e9d3e0186..afbdf7098e4 100644
--- a/src/basic/unit-name.h
+++ b/src/basic/unit-name.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/user-util.c b/src/basic/user-util.c
index 1adb2366d84..57f92013a5f 100644
--- a/src/basic/user-util.c
+++ b/src/basic/user-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/user-util.h b/src/basic/user-util.h
index 400845f135e..de55afb64e5 100644
--- a/src/basic/user-util.h
+++ b/src/basic/user-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/utf8.c b/src/basic/utf8.c
index 8bef153968c..a7df751df1d 100644
--- a/src/basic/utf8.c
+++ b/src/basic/utf8.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2008-2011 Kay Sievers
   Copyright 2012 Lennart Poettering
 ***/
diff --git a/src/basic/utf8.h b/src/basic/utf8.h
index d6936ea46e9..ffe49c12858 100644
--- a/src/basic/utf8.h
+++ b/src/basic/utf8.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/basic/util.c b/src/basic/util.c
index d1580895384..acd95798174 100644
--- a/src/basic/util.c
+++ b/src/basic/util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/util.h b/src/basic/util.h
index ad1931f7b60..f9c91766ab5 100644
--- a/src/basic/util.h
+++ b/src/basic/util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/verbs.c b/src/basic/verbs.c
index 057e35dcd0b..e57c1cda14a 100644
--- a/src/basic/verbs.c
+++ b/src/basic/verbs.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/basic/verbs.h b/src/basic/verbs.h
index fde6a1fdcda..0e5c33cff41 100644
--- a/src/basic/verbs.h
+++ b/src/basic/verbs.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/basic/virt.c b/src/basic/virt.c
index 0ebccd4ebb3..b9eda883823 100644
--- a/src/basic/virt.c
+++ b/src/basic/virt.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/basic/virt.h b/src/basic/virt.h
index 7ec0ad0dfa8..2fa211124ed 100644
--- a/src/basic/virt.h
+++ b/src/basic/virt.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/basic/web-util.c b/src/basic/web-util.c
index eaff7366657..19a3c1c9f44 100644
--- a/src/basic/web-util.c
+++ b/src/basic/web-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/web-util.h b/src/basic/web-util.h
index 4a0065da874..27189a35ea1 100644
--- a/src/basic/web-util.h
+++ b/src/basic/web-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/xattr-util.c b/src/basic/xattr-util.c
index d69b7da92ee..69673132878 100644
--- a/src/basic/xattr-util.c
+++ b/src/basic/xattr-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/xattr-util.h b/src/basic/xattr-util.h
index a638971e20a..8b5a7979583 100644
--- a/src/basic/xattr-util.h
+++ b/src/basic/xattr-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/basic/xml.c b/src/basic/xml.c
index 0abc7d2038a..88f8609cb4d 100644
--- a/src/basic/xml.c
+++ b/src/basic/xml.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/basic/xml.h b/src/basic/xml.h
index 5d73db91e53..6ea40892bcf 100644
--- a/src/basic/xml.h
+++ b/src/basic/xml.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c
index f4af4bef267..b72cf8c7c30 100644
--- a/src/binfmt/binfmt.c
+++ b/src/binfmt/binfmt.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c
index b9659d4860b..6e7fa8443d0 100644
--- a/src/boot/bootctl.c
+++ b/src/boot/bootctl.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013-2015 Kay Sievers
   Copyright 2013 Lennart Poettering
 ***/
diff --git a/src/busctl/busctl-introspect.c b/src/busctl/busctl-introspect.c
index fc384464d6e..a1e48f40c0e 100644
--- a/src/busctl/busctl-introspect.c
+++ b/src/busctl/busctl-introspect.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/busctl/busctl-introspect.h b/src/busctl/busctl-introspect.h
index 9c8cf51aabf..c3a4197888f 100644
--- a/src/busctl/busctl-introspect.h
+++ b/src/busctl/busctl-introspect.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/busctl/busctl.c b/src/busctl/busctl.c
index d6844057d38..00b6fea2652 100644
--- a/src/busctl/busctl.c
+++ b/src/busctl/busctl.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/cgls/cgls.c b/src/cgls/cgls.c
index 4ad84bec93d..9ce4d8d393d 100644
--- a/src/cgls/cgls.c
+++ b/src/cgls/cgls.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/cgroups-agent/cgroups-agent.c b/src/cgroups-agent/cgroups-agent.c
index a9e00bce508..da8c0fd2e2d 100644
--- a/src/cgroups-agent/cgroups-agent.c
+++ b/src/cgroups-agent/cgroups-agent.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/cgtop/cgtop.c b/src/cgtop/cgtop.c
index b2b6a25b489..9cd884f3f29 100644
--- a/src/cgtop/cgtop.c
+++ b/src/cgtop/cgtop.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/core/audit-fd.c b/src/core/audit-fd.c
index 4a522c61ac5..0826a9584c4 100644
--- a/src/core/audit-fd.c
+++ b/src/core/audit-fd.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/core/audit-fd.h b/src/core/audit-fd.h
index 4cc53033761..dc367274d89 100644
--- a/src/core/audit-fd.h
+++ b/src/core/audit-fd.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/core/automount.c b/src/core/automount.c
index 3251e8a5a5f..2ac6a8ab31a 100644
--- a/src/core/automount.c
+++ b/src/core/automount.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/automount.h b/src/core/automount.h
index bdadb554786..00ed0d24801 100644
--- a/src/core/automount.h
+++ b/src/core/automount.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/bpf-firewall.c b/src/core/bpf-firewall.c
index b830b393b33..069342e3e41 100644
--- a/src/core/bpf-firewall.c
+++ b/src/core/bpf-firewall.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2016 Daniel Mack
 ***/
 
diff --git a/src/core/bpf-firewall.h b/src/core/bpf-firewall.h
index a6074ab0268..5feda18fbe9 100644
--- a/src/core/bpf-firewall.h
+++ b/src/core/bpf-firewall.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2016 Daniel Mack
 ***/
 
diff --git a/src/core/cgroup.c b/src/core/cgroup.c
index 0164fdb86d3..6a5995bc0d4 100644
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/core/cgroup.h b/src/core/cgroup.h
index ef3ee14ad0e..406f67d6c70 100644
--- a/src/core/cgroup.h
+++ b/src/core/cgroup.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/core/chown-recursive.c b/src/core/chown-recursive.c
index f05bb7d6a8b..844c692e062 100644
--- a/src/core/chown-recursive.c
+++ b/src/core/chown-recursive.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2017 Lennart Poettering
 ***/
 
diff --git a/src/core/chown-recursive.h b/src/core/chown-recursive.h
index 6b2b6eefb88..947d9cf0371 100644
--- a/src/core/chown-recursive.h
+++ b/src/core/chown-recursive.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2017 Lennart Poettering
 ***/
 
diff --git a/src/core/dbus-automount.c b/src/core/dbus-automount.c
index d5deb0258bb..34c8fb5fc88 100644
--- a/src/core/dbus-automount.c
+++ b/src/core/dbus-automount.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/dbus-automount.h b/src/core/dbus-automount.h
index 755bdab1b6a..be423282f90 100644
--- a/src/core/dbus-automount.h
+++ b/src/core/dbus-automount.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c
index 4eb72269792..236ea887596 100644
--- a/src/core/dbus-cgroup.c
+++ b/src/core/dbus-cgroup.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/core/dbus-cgroup.h b/src/core/dbus-cgroup.h
index 72f135d29c7..71d9f91ea08 100644
--- a/src/core/dbus-cgroup.h
+++ b/src/core/dbus-cgroup.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/core/dbus-device.c b/src/core/dbus-device.c
index fc9bb3a7d80..0462bc79eec 100644
--- a/src/core/dbus-device.c
+++ b/src/core/dbus-device.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/dbus-device.h b/src/core/dbus-device.h
index eca3559d6e1..1e7c4ecfe1b 100644
--- a/src/core/dbus-device.h
+++ b/src/core/dbus-device.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c
index 52d0487c93c..9d8816c0340 100644
--- a/src/core/dbus-execute.c
+++ b/src/core/dbus-execute.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/dbus-execute.h b/src/core/dbus-execute.h
index fbf8b483b18..ac6d06799a9 100644
--- a/src/core/dbus-execute.h
+++ b/src/core/dbus-execute.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/dbus-job.c b/src/core/dbus-job.c
index df6eeb90abf..d043e5e34d9 100644
--- a/src/core/dbus-job.c
+++ b/src/core/dbus-job.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/dbus-job.h b/src/core/dbus-job.h
index 6e332b3082b..abd33c30ec9 100644
--- a/src/core/dbus-job.h
+++ b/src/core/dbus-job.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/dbus-kill.c b/src/core/dbus-kill.c
index 511c78b680f..854cdcb8be0 100644
--- a/src/core/dbus-kill.c
+++ b/src/core/dbus-kill.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/core/dbus-kill.h b/src/core/dbus-kill.h
index 6d5197a0d3a..7cfa483f589 100644
--- a/src/core/dbus-kill.h
+++ b/src/core/dbus-kill.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
index 016741e40b5..07c0f60ac20 100644
--- a/src/core/dbus-manager.c
+++ b/src/core/dbus-manager.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/dbus-manager.h b/src/core/dbus-manager.h
index c0a6ab93cf6..09634476853 100644
--- a/src/core/dbus-manager.h
+++ b/src/core/dbus-manager.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/dbus-mount.c b/src/core/dbus-mount.c
index d9b900abadc..d79814ad88c 100644
--- a/src/core/dbus-mount.c
+++ b/src/core/dbus-mount.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/dbus-mount.h b/src/core/dbus-mount.h
index d6c480f5776..a90c2a8e459 100644
--- a/src/core/dbus-mount.h
+++ b/src/core/dbus-mount.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/dbus-path.c b/src/core/dbus-path.c
index 7bd0acac223..692a89eaf07 100644
--- a/src/core/dbus-path.c
+++ b/src/core/dbus-path.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/dbus-path.h b/src/core/dbus-path.h
index ea12de5fb86..ebdf27a5088 100644
--- a/src/core/dbus-path.h
+++ b/src/core/dbus-path.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/dbus-scope.c b/src/core/dbus-scope.c
index 92db4961904..ee454fbe00d 100644
--- a/src/core/dbus-scope.c
+++ b/src/core/dbus-scope.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/core/dbus-scope.h b/src/core/dbus-scope.h
index 31ccbb47f94..3262a1791bb 100644
--- a/src/core/dbus-scope.h
+++ b/src/core/dbus-scope.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/core/dbus-service.c b/src/core/dbus-service.c
index 92a86c9c893..5600a7e9139 100644
--- a/src/core/dbus-service.c
+++ b/src/core/dbus-service.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/dbus-service.h b/src/core/dbus-service.h
index bc684ac80cb..42bfd7ebb59 100644
--- a/src/core/dbus-service.h
+++ b/src/core/dbus-service.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/dbus-slice.c b/src/core/dbus-slice.c
index 20af751137e..10f003ecd2a 100644
--- a/src/core/dbus-slice.c
+++ b/src/core/dbus-slice.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/core/dbus-slice.h b/src/core/dbus-slice.h
index 5760cd8d61e..374352e7621 100644
--- a/src/core/dbus-slice.h
+++ b/src/core/dbus-slice.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/core/dbus-socket.c b/src/core/dbus-socket.c
index cb0884be13a..d18bafc71cc 100644
--- a/src/core/dbus-socket.c
+++ b/src/core/dbus-socket.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/dbus-socket.h b/src/core/dbus-socket.h
index 59db02686c4..c3f2fcb51a6 100644
--- a/src/core/dbus-socket.h
+++ b/src/core/dbus-socket.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/dbus-swap.c b/src/core/dbus-swap.c
index f4422057775..3a4568711ef 100644
--- a/src/core/dbus-swap.c
+++ b/src/core/dbus-swap.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
   Copyright 2010 Maarten Lankhorst
 ***/
diff --git a/src/core/dbus-swap.h b/src/core/dbus-swap.h
index da089d2ea4b..dd06e8ae9f3 100644
--- a/src/core/dbus-swap.h
+++ b/src/core/dbus-swap.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
   Copyright 2010 Maarten Lankhorst
 ***/
diff --git a/src/core/dbus-target.c b/src/core/dbus-target.c
index 38e74ea934d..cf2663f1d3c 100644
--- a/src/core/dbus-target.c
+++ b/src/core/dbus-target.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/dbus-target.h b/src/core/dbus-target.h
index 76f0f1a34e4..7c180194c76 100644
--- a/src/core/dbus-target.h
+++ b/src/core/dbus-target.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/dbus-timer.c b/src/core/dbus-timer.c
index eef060ff0f6..9a4c2f83395 100644
--- a/src/core/dbus-timer.c
+++ b/src/core/dbus-timer.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/dbus-timer.h b/src/core/dbus-timer.h
index 1cfc9bf9be5..e9502f5df50 100644
--- a/src/core/dbus-timer.h
+++ b/src/core/dbus-timer.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c
index d0910e9dc35..608da453a4f 100644
--- a/src/core/dbus-unit.c
+++ b/src/core/dbus-unit.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/dbus-unit.h b/src/core/dbus-unit.h
index 0c1d44511d6..62e8656485b 100644
--- a/src/core/dbus-unit.h
+++ b/src/core/dbus-unit.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/dbus-util.c b/src/core/dbus-util.c
index 15a3169bef6..16b436571bc 100644
--- a/src/core/dbus-util.c
+++ b/src/core/dbus-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/dbus-util.h b/src/core/dbus-util.h
index 73d1ebd3136..47c954b5cab 100644
--- a/src/core/dbus-util.h
+++ b/src/core/dbus-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/dbus.c b/src/core/dbus.c
index b206f3af56c..b007087bf8c 100644
--- a/src/core/dbus.c
+++ b/src/core/dbus.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/dbus.h b/src/core/dbus.h
index a7a0eb3249d..7d816776c70 100644
--- a/src/core/dbus.h
+++ b/src/core/dbus.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/device.c b/src/core/device.c
index 3219c850ed3..a2cfc3e3124 100644
--- a/src/core/device.c
+++ b/src/core/device.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/device.h b/src/core/device.h
index 51b27e71b5d..991a48e8c8f 100644
--- a/src/core/device.h
+++ b/src/core/device.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/dynamic-user.c b/src/core/dynamic-user.c
index 05ccc8c854e..c60b01679ee 100644
--- a/src/core/dynamic-user.c
+++ b/src/core/dynamic-user.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 ***/
 
diff --git a/src/core/dynamic-user.h b/src/core/dynamic-user.h
index 5278c2e74c4..66b0cd77273 100644
--- a/src/core/dynamic-user.h
+++ b/src/core/dynamic-user.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 ***/
 
diff --git a/src/core/emergency-action.c b/src/core/emergency-action.c
index fd0a90283ba..f6e98906af8 100644
--- a/src/core/emergency-action.c
+++ b/src/core/emergency-action.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
   Copyright 2012 Michael Olbrich
 ***/
diff --git a/src/core/emergency-action.h b/src/core/emergency-action.h
index 4e8e5fc82df..f4208952bad 100644
--- a/src/core/emergency-action.h
+++ b/src/core/emergency-action.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
   Copyright 2012 Michael Olbrich
 ***/
diff --git a/src/core/execute.c b/src/core/execute.c
index 6aa4ec9c78b..e4d942af1c9 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/execute.h b/src/core/execute.h
index cba079c413d..0c152679170 100644
--- a/src/core/execute.h
+++ b/src/core/execute.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/hostname-setup.c b/src/core/hostname-setup.c
index 5e8cca50e3f..12c1702c32d 100644
--- a/src/core/hostname-setup.c
+++ b/src/core/hostname-setup.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/hostname-setup.h b/src/core/hostname-setup.h
index 4823ccadcf9..d91576f5047 100644
--- a/src/core/hostname-setup.h
+++ b/src/core/hostname-setup.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/ima-setup.c b/src/core/ima-setup.c
index 9e68b19fa6a..52bcceb8c56 100644
--- a/src/core/ima-setup.c
+++ b/src/core/ima-setup.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
   Copyright (C) 2012 Roberto Sassu - Politecnico di Torino, Italy
                                      TORSEC group — http://security.polito.it
diff --git a/src/core/ima-setup.h b/src/core/ima-setup.h
index 99fda8385f4..215b2b15afa 100644
--- a/src/core/ima-setup.h
+++ b/src/core/ima-setup.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
   Copyright (C) 2012 Roberto Sassu - Politecnico di Torino, Italy
                                      TORSEC group — http://security.polito.it
diff --git a/src/core/ip-address-access.c b/src/core/ip-address-access.c
index d74d9e68ba2..6b2737dad6b 100644
--- a/src/core/ip-address-access.c
+++ b/src/core/ip-address-access.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2016 Daniel Mack
 ***/
 
diff --git a/src/core/ip-address-access.h b/src/core/ip-address-access.h
index eaa1cc312d9..46dea9a2e12 100644
--- a/src/core/ip-address-access.h
+++ b/src/core/ip-address-access.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2016 Daniel Mack
 ***/
 
diff --git a/src/core/job.c b/src/core/job.c
index 86a7f617336..66ebd722852 100644
--- a/src/core/job.c
+++ b/src/core/job.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/job.h b/src/core/job.h
index 338670e3935..6a3751fb339 100644
--- a/src/core/job.h
+++ b/src/core/job.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/kill.c b/src/core/kill.c
index 646f89b3c79..bf8a13f1eed 100644
--- a/src/core/kill.c
+++ b/src/core/kill.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/core/kill.h b/src/core/kill.h
index b3b18bdb81d..e9655901550 100644
--- a/src/core/kill.h
+++ b/src/core/kill.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/core/killall.c b/src/core/killall.c
index 29db2ae7e33..36ccf14b948 100644
--- a/src/core/killall.c
+++ b/src/core/killall.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 ProFUSION embedded systems
 ***/
 
diff --git a/src/core/killall.h b/src/core/killall.h
index 80622e37002..ed715eebde7 100644
--- a/src/core/killall.h
+++ b/src/core/killall.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c
index a3af2979b47..623b58a0b3a 100644
--- a/src/core/kmod-setup.c
+++ b/src/core/kmod-setup.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/kmod-setup.h b/src/core/kmod-setup.h
index 7187c257978..c63ef11cec6 100644
--- a/src/core/kmod-setup.h
+++ b/src/core/kmod-setup.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/load-dropin.c b/src/core/load-dropin.c
index 9e54614cdee..99d6b6d8f0a 100644
--- a/src/core/load-dropin.c
+++ b/src/core/load-dropin.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/load-dropin.h b/src/core/load-dropin.h
index 583460e3dd7..0d793db2fd9 100644
--- a/src/core/load-dropin.h
+++ b/src/core/load-dropin.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
index 935f6be8077..9d46c88e4e8 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
   Copyright 2012 Holger Hans Peter Freyther
 ***/
diff --git a/src/core/load-fragment.h b/src/core/load-fragment.h
index 9a3ccd9d265..76f49231b71 100644
--- a/src/core/load-fragment.h
+++ b/src/core/load-fragment.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/locale-setup.c b/src/core/locale-setup.c
index dcb70d6fe3c..e138387b404 100644
--- a/src/core/locale-setup.c
+++ b/src/core/locale-setup.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/locale-setup.h b/src/core/locale-setup.h
index f9a1b3755d2..ec4be8c3736 100644
--- a/src/core/locale-setup.h
+++ b/src/core/locale-setup.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/loopback-setup.c b/src/core/loopback-setup.c
index e2d0b7feda2..066d59f2424 100644
--- a/src/core/loopback-setup.c
+++ b/src/core/loopback-setup.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/loopback-setup.h b/src/core/loopback-setup.h
index 0bf893bd52b..8c551ce0d7f 100644
--- a/src/core/loopback-setup.h
+++ b/src/core/loopback-setup.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/machine-id-setup.c b/src/core/machine-id-setup.c
index e8444e69bae..f3f67a87e02 100644
--- a/src/core/machine-id-setup.c
+++ b/src/core/machine-id-setup.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/machine-id-setup.h b/src/core/machine-id-setup.h
index a82b5f8aca2..574d96e5bd5 100644
--- a/src/core/machine-id-setup.h
+++ b/src/core/machine-id-setup.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/main.c b/src/core/main.c
index f396a61e124..b0408bc3649 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/manager.c b/src/core/manager.c
index a6b2edcb83f..e66c0db6a43 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/manager.h b/src/core/manager.h
index 4555a4ff152..ae582ca8a52 100644
--- a/src/core/manager.h
+++ b/src/core/manager.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c
index aa7a71aa877..df1ab1e2158 100644
--- a/src/core/mount-setup.c
+++ b/src/core/mount-setup.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/mount-setup.h b/src/core/mount-setup.h
index 75c9ab22122..e73fee6f8ab 100644
--- a/src/core/mount-setup.h
+++ b/src/core/mount-setup.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/mount.c b/src/core/mount.c
index c588ef92d74..515f142c0f2 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/mount.h b/src/core/mount.h
index 71dac128c22..b6681a0b552 100644
--- a/src/core/mount.h
+++ b/src/core/mount.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/namespace.c b/src/core/namespace.c
index bb19e18e435..0b9892a85b0 100644
--- a/src/core/namespace.c
+++ b/src/core/namespace.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/namespace.h b/src/core/namespace.h
index e0e8e09e0f8..5528b6c40bd 100644
--- a/src/core/namespace.h
+++ b/src/core/namespace.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
   Copyright 2016 Djalal Harouni
 ***/
diff --git a/src/core/path.c b/src/core/path.c
index e97da44700e..3027612779b 100644
--- a/src/core/path.c
+++ b/src/core/path.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/path.h b/src/core/path.h
index 2aa2ca111f0..4a1c018169f 100644
--- a/src/core/path.h
+++ b/src/core/path.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/scope.c b/src/core/scope.c
index f30d135007e..a7c3c302eef 100644
--- a/src/core/scope.c
+++ b/src/core/scope.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/core/scope.h b/src/core/scope.h
index e74014119d7..3b55c56a90b 100644
--- a/src/core/scope.h
+++ b/src/core/scope.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/core/selinux-access.c b/src/core/selinux-access.c
index ce9a9a844ff..4b6e12e4407 100644
--- a/src/core/selinux-access.c
+++ b/src/core/selinux-access.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Dan Walsh
 ***/
 
diff --git a/src/core/selinux-access.h b/src/core/selinux-access.h
index 4325fc75e42..84965427472 100644
--- a/src/core/selinux-access.h
+++ b/src/core/selinux-access.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2012 Dan Walsh
 ***/
 
diff --git a/src/core/selinux-setup.c b/src/core/selinux-setup.c
index 062502287fa..03744ae6db2 100644
--- a/src/core/selinux-setup.c
+++ b/src/core/selinux-setup.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/selinux-setup.h b/src/core/selinux-setup.h
index 2172f08bdc8..7ca4a28a5f9 100644
--- a/src/core/selinux-setup.h
+++ b/src/core/selinux-setup.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/service.c b/src/core/service.c
index 824d283f343..9ebc3b15e2b 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/service.h b/src/core/service.h
index 6d64f8e9e6f..c768beccf6d 100644
--- a/src/core/service.h
+++ b/src/core/service.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/show-status.c b/src/core/show-status.c
index 0f8cb3dbdaa..5e77c6cf862 100644
--- a/src/core/show-status.c
+++ b/src/core/show-status.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/core/show-status.h b/src/core/show-status.h
index 55587f07706..c45f520e5a4 100644
--- a/src/core/show-status.h
+++ b/src/core/show-status.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/core/shutdown.c b/src/core/shutdown.c
index ffd80d7876b..a56c445505e 100644
--- a/src/core/shutdown.c
+++ b/src/core/shutdown.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 ProFUSION embedded systems
 ***/
 
diff --git a/src/core/slice.c b/src/core/slice.c
index f903d51f4a5..88fbe5e6fd5 100644
--- a/src/core/slice.c
+++ b/src/core/slice.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/core/slice.h b/src/core/slice.h
index 0ab479467ce..420c4bbd6af 100644
--- a/src/core/slice.h
+++ b/src/core/slice.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/core/smack-setup.c b/src/core/smack-setup.c
index 980bdf7bd46..816ac1ce74f 100644
--- a/src/core/smack-setup.c
+++ b/src/core/smack-setup.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright (C) 2013 Intel Corporation
   Authors:
         Nathaniel Chen <nathaniel.chen@intel.com>
diff --git a/src/core/smack-setup.h b/src/core/smack-setup.h
index 594c42cd38a..03d14e017c5 100644
--- a/src/core/smack-setup.h
+++ b/src/core/smack-setup.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright (C) 2013 Intel Corporation
   Authors:
         Nathaniel Chen <nathaniel.chen@intel.com>
diff --git a/src/core/socket.c b/src/core/socket.c
index 0a74076f05d..5913b69264f 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/socket.h b/src/core/socket.h
index ffee43cdc5a..d96bee3c31f 100644
--- a/src/core/socket.h
+++ b/src/core/socket.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/swap.c b/src/core/swap.c
index b61eab3e7e8..24429fb2963 100644
--- a/src/core/swap.c
+++ b/src/core/swap.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/swap.h b/src/core/swap.h
index fdb14e667a3..d6b23a98972 100644
--- a/src/core/swap.h
+++ b/src/core/swap.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
   Copyright 2010 Maarten Lankhorst
 ***/
diff --git a/src/core/target.c b/src/core/target.c
index 11175f34567..d107e428789 100644
--- a/src/core/target.c
+++ b/src/core/target.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/target.h b/src/core/target.h
index 4a2dea17ed6..014936a9efa 100644
--- a/src/core/target.h
+++ b/src/core/target.h
@@ -4,8 +4,6 @@
 #include "unit.h"
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/timer.c b/src/core/timer.c
index 5b65e6e370d..598163e1e56 100644
--- a/src/core/timer.c
+++ b/src/core/timer.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/timer.h b/src/core/timer.h
index 0588a96ca24..24719671ba7 100644
--- a/src/core/timer.h
+++ b/src/core/timer.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/transaction.c b/src/core/transaction.c
index 3dfc99819b2..8468f1da544 100644
--- a/src/core/transaction.c
+++ b/src/core/transaction.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/transaction.h b/src/core/transaction.h
index de3db482050..06b49d4a599 100644
--- a/src/core/transaction.h
+++ b/src/core/transaction.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/umount.c b/src/core/umount.c
index c3decf30757..7a72515b2d4 100644
--- a/src/core/umount.c
+++ b/src/core/umount.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 ProFUSION embedded systems
 ***/
 
diff --git a/src/core/umount.h b/src/core/umount.h
index 16190c0c7ef..1aa2275425d 100644
--- a/src/core/umount.h
+++ b/src/core/umount.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 ProFUSION embedded systems
 ***/
 
diff --git a/src/core/unit-printf.c b/src/core/unit-printf.c
index 20891200bad..2c988855511 100644
--- a/src/core/unit-printf.c
+++ b/src/core/unit-printf.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/unit-printf.h b/src/core/unit-printf.h
index a5e93a420c3..caa8ca4c3b1 100644
--- a/src/core/unit-printf.h
+++ b/src/core/unit-printf.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/unit.c b/src/core/unit.c
index 0d9a6b32c66..bea04cd7e04 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/core/unit.h b/src/core/unit.h
index 24315fd12fe..39fb7327eaf 100644
--- a/src/core/unit.h
+++ b/src/core/unit.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/coredump/coredump-vacuum.c b/src/coredump/coredump-vacuum.c
index 8240ad07981..40685e7b79d 100644
--- a/src/coredump/coredump-vacuum.c
+++ b/src/coredump/coredump-vacuum.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/coredump/coredump-vacuum.h b/src/coredump/coredump-vacuum.h
index 2117deb04f9..74295f39cf9 100644
--- a/src/coredump/coredump-vacuum.h
+++ b/src/coredump/coredump-vacuum.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/coredump/coredump.c b/src/coredump/coredump.c
index bacd047dd2a..a6c67ceab74 100644
--- a/src/coredump/coredump.c
+++ b/src/coredump/coredump.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/coredump/coredumpctl.c b/src/coredump/coredumpctl.c
index 2933a449db0..dcb98f344db 100644
--- a/src/coredump/coredumpctl.c
+++ b/src/coredump/coredumpctl.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/coredump/stacktrace.c b/src/coredump/stacktrace.c
index 049d2523ebc..a73da47ebf0 100644
--- a/src/coredump/stacktrace.c
+++ b/src/coredump/stacktrace.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/coredump/stacktrace.h b/src/coredump/stacktrace.h
index 628c5ebede8..5406e5aeef4 100644
--- a/src/coredump/stacktrace.h
+++ b/src/coredump/stacktrace.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/coredump/test-coredump-vacuum.c b/src/coredump/test-coredump-vacuum.c
index 3e2538d626d..c38682593f9 100644
--- a/src/coredump/test-coredump-vacuum.c
+++ b/src/coredump/test-coredump-vacuum.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
index 4103e0eed68..96e0759e380 100644
--- a/src/cryptsetup/cryptsetup-generator.c
+++ b/src/cryptsetup/cryptsetup-generator.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
index 4c0b747d735..1422aaec043 100644
--- a/src/cryptsetup/cryptsetup.c
+++ b/src/cryptsetup/cryptsetup.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/debug-generator/debug-generator.c b/src/debug-generator/debug-generator.c
index 43a44056ec5..443786a1f11 100644
--- a/src/debug-generator/debug-generator.c
+++ b/src/debug-generator/debug-generator.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/delta/delta.c b/src/delta/delta.c
index 383d08e0fd1..58dc084ef27 100644
--- a/src/delta/delta.c
+++ b/src/delta/delta.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
   Copyright 2013 Zbigniew Jędrzejewski-Szmek
 ***/
diff --git a/src/detect-virt/detect-virt.c b/src/detect-virt/detect-virt.c
index 197e526b056..7357b2a4f87 100644
--- a/src/detect-virt/detect-virt.c
+++ b/src/detect-virt/detect-virt.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/dissect/dissect.c b/src/dissect/dissect.c
index 966dd1d4c40..44d2c318c2e 100644
--- a/src/dissect/dissect.c
+++ b/src/dissect/dissect.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 ***/
 
diff --git a/src/environment-d-generator/environment-d-generator.c b/src/environment-d-generator/environment-d-generator.c
index fd039c222bc..88668b4046c 100644
--- a/src/environment-d-generator/environment-d-generator.c
+++ b/src/environment-d-generator/environment-d-generator.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2017 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/escape/escape.c b/src/escape/escape.c
index 6d4ea7ff7a6..cf3be3c2f1d 100644
--- a/src/escape/escape.c
+++ b/src/escape/escape.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Michael Biebl
 ***/
 
diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
index 0fc8bb891b4..02e609839cd 100644
--- a/src/firstboot/firstboot.c
+++ b/src/firstboot/firstboot.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
index bbe3194f9c9..8c29bae9f9d 100644
--- a/src/fsck/fsck.c
+++ b/src/fsck/fsck.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
   Copyright 2014 Holger Hans Peter Freyther
 ***/
diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
index daa8f5cd166..18829de6486 100644
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/getty-generator/getty-generator.c b/src/getty-generator/getty-generator.c
index 1a0ddff5be1..89ff33f8d18 100644
--- a/src/getty-generator/getty-generator.c
+++ b/src/getty-generator/getty-generator.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
index 38a27a4318c..3a6e5d7de98 100644
--- a/src/gpt-auto-generator/gpt-auto-generator.c
+++ b/src/gpt-auto-generator/gpt-auto-generator.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/hibernate-resume/hibernate-resume-generator.c b/src/hibernate-resume/hibernate-resume-generator.c
index c6add245098..c870a1cb1f6 100644
--- a/src/hibernate-resume/hibernate-resume-generator.c
+++ b/src/hibernate-resume/hibernate-resume-generator.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Ivan Shapovalov
 ***/
 
diff --git a/src/hibernate-resume/hibernate-resume.c b/src/hibernate-resume/hibernate-resume.c
index 5ffd9cc6f66..894dc054caa 100644
--- a/src/hibernate-resume/hibernate-resume.c
+++ b/src/hibernate-resume/hibernate-resume.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Ivan Shapovalov
 ***/
 
diff --git a/src/hostname/hostnamectl.c b/src/hostname/hostnamectl.c
index 2cc9324ff3a..f25085b6308 100644
--- a/src/hostname/hostnamectl.c
+++ b/src/hostname/hostnamectl.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
index 28fc628742a..4f990f9c94d 100644
--- a/src/hostname/hostnamed.c
+++ b/src/hostname/hostnamed.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/hostname/org.freedesktop.hostname1.policy b/src/hostname/org.freedesktop.hostname1.policy
index 4ac82c659c9..e1519ce86be 100644
--- a/src/hostname/org.freedesktop.hostname1.policy
+++ b/src/hostname/org.freedesktop.hostname1.policy
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   systemd is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published by
   the Free Software Foundation; either version 2.1 of the License, or
diff --git a/src/hostname/org.freedesktop.hostname1.service b/src/hostname/org.freedesktop.hostname1.service
index 421a8c607b6..98c7bcbd849 100644
--- a/src/hostname/org.freedesktop.hostname1.service
+++ b/src/hostname/org.freedesktop.hostname1.service
@@ -1,7 +1,5 @@
 #  SPDX-License-Identifier: LGPL-2.1+
 #
-#  This file is part of systemd.
-#
 #  systemd is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU Lesser General Public License as published by
 #  the Free Software Foundation; either version 2.1 of the License, or
diff --git a/src/hwdb/hwdb.c b/src/hwdb/hwdb.c
index ac0fec7821f..b0ca69e2280 100644
--- a/src/hwdb/hwdb.c
+++ b/src/hwdb/hwdb.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Kay Sievers <kay@vrfy.org>
 ***/
 
diff --git a/src/import/curl-util.c b/src/import/curl-util.c
index c19a01a266b..1691544ef7f 100644
--- a/src/import/curl-util.c
+++ b/src/import/curl-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/import/curl-util.h b/src/import/curl-util.h
index 2e6d34a60b0..f4ec3dae9e4 100644
--- a/src/import/curl-util.h
+++ b/src/import/curl-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/import/export-raw.c b/src/import/export-raw.c
index c9070acf202..5137ab79466 100644
--- a/src/import/export-raw.c
+++ b/src/import/export-raw.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/import/export-raw.h b/src/import/export-raw.h
index 28d8cdd6058..7a694545174 100644
--- a/src/import/export-raw.h
+++ b/src/import/export-raw.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/import/export-tar.c b/src/import/export-tar.c
index 4c60854972f..62871ca318d 100644
--- a/src/import/export-tar.c
+++ b/src/import/export-tar.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/import/export-tar.h b/src/import/export-tar.h
index 3c6d7fc1f3d..c9fe07959b7 100644
--- a/src/import/export-tar.h
+++ b/src/import/export-tar.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/import/export.c b/src/import/export.c
index 5ff219b0335..89b63a98f58 100644
--- a/src/import/export.c
+++ b/src/import/export.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/import/import-common.c b/src/import/import-common.c
index 5f0fa06b2bf..22d5f79eff6 100644
--- a/src/import/import-common.c
+++ b/src/import/import-common.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/import/import-common.h b/src/import/import-common.h
index bcc9b73df70..253c3a2fb62 100644
--- a/src/import/import-common.h
+++ b/src/import/import-common.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/import/import-compress.c b/src/import/import-compress.c
index ae10a2e3df7..fc77c94e1ac 100644
--- a/src/import/import-compress.c
+++ b/src/import/import-compress.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/import/import-compress.h b/src/import/import-compress.h
index e28c5f2ac14..b4ec21bb1ec 100644
--- a/src/import/import-compress.h
+++ b/src/import/import-compress.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/import/import-raw.c b/src/import/import-raw.c
index 02ff289c1a8..be3bda01258 100644
--- a/src/import/import-raw.c
+++ b/src/import/import-raw.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/import/import-raw.h b/src/import/import-raw.h
index 2d989ae91ed..bab667a78e9 100644
--- a/src/import/import-raw.h
+++ b/src/import/import-raw.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/import/import-tar.c b/src/import/import-tar.c
index 2e748c629d1..0c4e7495e05 100644
--- a/src/import/import-tar.c
+++ b/src/import/import-tar.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/import/import-tar.h b/src/import/import-tar.h
index a522094db7f..09f2e17ca4e 100644
--- a/src/import/import-tar.h
+++ b/src/import/import-tar.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/import/import.c b/src/import/import.c
index 5cef899226b..cd13bd6a319 100644
--- a/src/import/import.c
+++ b/src/import/import.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/import/importd.c b/src/import/importd.c
index 3934be096f5..cb90f777383 100644
--- a/src/import/importd.c
+++ b/src/import/importd.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/import/pull-common.c b/src/import/pull-common.c
index c9f5df017fa..1107ca1ff63 100644
--- a/src/import/pull-common.c
+++ b/src/import/pull-common.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/import/pull-common.h b/src/import/pull-common.h
index a7c8dcd2232..7569ca654d0 100644
--- a/src/import/pull-common.h
+++ b/src/import/pull-common.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/import/pull-job.c b/src/import/pull-job.c
index 4c316da880f..77d967d37ff 100644
--- a/src/import/pull-job.c
+++ b/src/import/pull-job.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/import/pull-job.h b/src/import/pull-job.h
index bf14c5501ae..91cffa24a75 100644
--- a/src/import/pull-job.h
+++ b/src/import/pull-job.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/import/pull-raw.c b/src/import/pull-raw.c
index 87d5d090cc7..aefbe4de3a5 100644
--- a/src/import/pull-raw.c
+++ b/src/import/pull-raw.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/import/pull-raw.h b/src/import/pull-raw.h
index c83a788d0bd..b689ca34598 100644
--- a/src/import/pull-raw.h
+++ b/src/import/pull-raw.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/import/pull-tar.c b/src/import/pull-tar.c
index 8112f946281..4ea3e4ba9be 100644
--- a/src/import/pull-tar.c
+++ b/src/import/pull-tar.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/import/pull-tar.h b/src/import/pull-tar.h
index b78acb08d9b..2268912f34a 100644
--- a/src/import/pull-tar.h
+++ b/src/import/pull-tar.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/import/pull.c b/src/import/pull.c
index dfbdda79f17..6f9a57e01bf 100644
--- a/src/import/pull.c
+++ b/src/import/pull.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/import/qcow2-util.c b/src/import/qcow2-util.c
index 3fab08020e4..c2eb78bf154 100644
--- a/src/import/qcow2-util.c
+++ b/src/import/qcow2-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/import/qcow2-util.h b/src/import/qcow2-util.h
index 980cb417ca9..3f8e89e9bd4 100644
--- a/src/import/qcow2-util.h
+++ b/src/import/qcow2-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/import/test-qcow2.c b/src/import/test-qcow2.c
index e9c0d18dbf7..802588b4274 100644
--- a/src/import/test-qcow2.c
+++ b/src/import/test-qcow2.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/initctl/initctl.c b/src/initctl/initctl.c
index d6e845d7c7e..aa178260cc5 100644
--- a/src/initctl/initctl.c
+++ b/src/initctl/initctl.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c
index a2b7fd6bd97..f1496d9f256 100644
--- a/src/journal-remote/journal-gatewayd.c
+++ b/src/journal-remote/journal-gatewayd.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/journal-remote/journal-remote-parse.c b/src/journal-remote/journal-remote-parse.c
index 645bd7b4cf3..4ca0b0f4263 100644
--- a/src/journal-remote/journal-remote-parse.c
+++ b/src/journal-remote/journal-remote-parse.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/journal-remote/journal-remote-parse.h b/src/journal-remote/journal-remote-parse.h
index 9b569168356..2b45ddfb74a 100644
--- a/src/journal-remote/journal-remote-parse.h
+++ b/src/journal-remote/journal-remote-parse.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/journal-remote/journal-remote-write.c b/src/journal-remote/journal-remote-write.c
index 949fdca372d..a2bf661bfa7 100644
--- a/src/journal-remote/journal-remote-write.c
+++ b/src/journal-remote/journal-remote-write.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/journal-remote/journal-remote-write.h b/src/journal-remote/journal-remote-write.h
index 6cd5e665625..02de3755acf 100644
--- a/src/journal-remote/journal-remote-write.h
+++ b/src/journal-remote/journal-remote-write.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c
index e1810bec191..98a64f0d276 100644
--- a/src/journal-remote/journal-remote.c
+++ b/src/journal-remote/journal-remote.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/journal-remote/journal-remote.h b/src/journal-remote/journal-remote.h
index 884434cb4db..2ca100d663f 100644
--- a/src/journal-remote/journal-remote.h
+++ b/src/journal-remote/journal-remote.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/journal-remote/journal-upload-journal.c b/src/journal-remote/journal-upload-journal.c
index 66af9d5dcbc..394d48db37a 100644
--- a/src/journal-remote/journal-upload-journal.c
+++ b/src/journal-remote/journal-upload-journal.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/journal-remote/journal-upload.c b/src/journal-remote/journal-upload.c
index 4a351079e9a..3952c0fac83 100644
--- a/src/journal-remote/journal-upload.c
+++ b/src/journal-remote/journal-upload.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/journal-remote/microhttpd-util.c b/src/journal-remote/microhttpd-util.c
index 9cb7dfc9203..424f8eb6c05 100644
--- a/src/journal-remote/microhttpd-util.c
+++ b/src/journal-remote/microhttpd-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
   Copyright 2012 Zbigniew Jędrzejewski-Szmek
 ***/
diff --git a/src/journal-remote/microhttpd-util.h b/src/journal-remote/microhttpd-util.h
index cbe396b711b..07e6532577d 100644
--- a/src/journal-remote/microhttpd-util.h
+++ b/src/journal-remote/microhttpd-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2012 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/journal/audit-type.c b/src/journal/audit-type.c
index e1a21814e3e..b1b9b39077d 100644
--- a/src/journal/audit-type.c
+++ b/src/journal/audit-type.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2015 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/journal/audit-type.h b/src/journal/audit-type.h
index deeda683eda..2a5fdd354f8 100644
--- a/src/journal/audit-type.h
+++ b/src/journal/audit-type.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2015 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/journal/cat.c b/src/journal/cat.c
index 21f4be6b576..3461878be00 100644
--- a/src/journal/cat.c
+++ b/src/journal/cat.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/journal/catalog.c b/src/journal/catalog.c
index 24bf427103a..50f07ac5cf8 100644
--- a/src/journal/catalog.c
+++ b/src/journal/catalog.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/journal/catalog.h b/src/journal/catalog.h
index 03d52d19ba7..c6f9352b24e 100644
--- a/src/journal/catalog.h
+++ b/src/journal/catalog.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/journal/compress.c b/src/journal/compress.c
index c09dbb1778c..26f26d265bc 100644
--- a/src/journal/compress.c
+++ b/src/journal/compress.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/journal/compress.h b/src/journal/compress.h
index caf08ae9291..fa8e7f61a62 100644
--- a/src/journal/compress.h
+++ b/src/journal/compress.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/journal/journal-authenticate.c b/src/journal/journal-authenticate.c
index a763cfb90c3..ea5f56799af 100644
--- a/src/journal/journal-authenticate.c
+++ b/src/journal/journal-authenticate.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/journal/journal-authenticate.h b/src/journal/journal-authenticate.h
index 1689103a594..04fcd4c9745 100644
--- a/src/journal/journal-authenticate.h
+++ b/src/journal/journal-authenticate.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/journal/journal-def.h b/src/journal/journal-def.h
index e27dd5c3cb3..5cb1f0289a3 100644
--- a/src/journal/journal-def.h
+++ b/src/journal/journal-def.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
index a4f9b9dcc52..bfa2fd96af3 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/journal/journal-file.h b/src/journal/journal-file.h
index bfd4bbac906..5e6babccc68 100644
--- a/src/journal/journal-file.h
+++ b/src/journal/journal-file.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/journal/journal-internal.h b/src/journal/journal-internal.h
index f92bca7a4fd..8f1d35aec54 100644
--- a/src/journal/journal-internal.h
+++ b/src/journal/journal-internal.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/journal/journal-qrcode.c b/src/journal/journal-qrcode.c
index 63f6915f08b..1dd20bb1ccf 100644
--- a/src/journal/journal-qrcode.c
+++ b/src/journal/journal-qrcode.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/journal/journal-qrcode.h b/src/journal/journal-qrcode.h
index 73cce3326cf..e7d756e6ee1 100644
--- a/src/journal/journal-qrcode.h
+++ b/src/journal/journal-qrcode.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c
index ad7a5ea09c2..cf79c4785f8 100644
--- a/src/journal/journal-send.c
+++ b/src/journal/journal-send.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/journal/journal-vacuum.c b/src/journal/journal-vacuum.c
index 928c556300c..5ad23f4642d 100644
--- a/src/journal/journal-vacuum.c
+++ b/src/journal/journal-vacuum.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/journal/journal-vacuum.h b/src/journal/journal-vacuum.h
index 5a8cac90a28..7f2cdadbfbb 100644
--- a/src/journal/journal-vacuum.h
+++ b/src/journal/journal-vacuum.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/journal/journal-verify.c b/src/journal/journal-verify.c
index 5850dd2d99e..e36c95e2af3 100644
--- a/src/journal/journal-verify.c
+++ b/src/journal/journal-verify.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/journal/journal-verify.h b/src/journal/journal-verify.h
index ae5712450ad..74f14761c2d 100644
--- a/src/journal/journal-verify.h
+++ b/src/journal/journal-verify.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 696abcd4505..e52f89d1adf 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/journal/journald-audit.c b/src/journal/journald-audit.c
index ba8cb7f97ed..6365abe5bb8 100644
--- a/src/journal/journald-audit.c
+++ b/src/journal/journald-audit.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/journal/journald-audit.h b/src/journal/journald-audit.h
index 2ad114cc4c3..de0c304d0bc 100644
--- a/src/journal/journald-audit.h
+++ b/src/journal/journald-audit.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/journal/journald-console.c b/src/journal/journald-console.c
index aed765df55e..935082d30bf 100644
--- a/src/journal/journald-console.c
+++ b/src/journal/journald-console.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/journal/journald-console.h b/src/journal/journald-console.h
index 07b41214953..e6ad620379b 100644
--- a/src/journal/journald-console.h
+++ b/src/journal/journald-console.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/journal/journald-context.c b/src/journal/journald-context.c
index 30fb186b57e..2972c855aef 100644
--- a/src/journal/journald-context.c
+++ b/src/journal/journald-context.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2017 Lennart Poettering
 ***/
 
diff --git a/src/journal/journald-context.h b/src/journal/journald-context.h
index 5ce8b759ea4..57fb294d2f2 100644
--- a/src/journal/journald-context.h
+++ b/src/journal/journald-context.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2017 Lennart Poettering
 ***/
 
diff --git a/src/journal/journald-kmsg.c b/src/journal/journald-kmsg.c
index 7c4dfa8d2be..432e4864733 100644
--- a/src/journal/journald-kmsg.c
+++ b/src/journal/journald-kmsg.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/journal/journald-kmsg.h b/src/journal/journald-kmsg.h
index 6b54b006f2b..89f114437bc 100644
--- a/src/journal/journald-kmsg.h
+++ b/src/journal/journald-kmsg.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c
index 13a0777a4c3..77664551487 100644
--- a/src/journal/journald-native.c
+++ b/src/journal/journald-native.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/journal/journald-native.h b/src/journal/journald-native.h
index 8280569387d..e7a4bcc65dd 100644
--- a/src/journal/journald-native.h
+++ b/src/journal/journald-native.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/journal/journald-rate-limit.c b/src/journal/journald-rate-limit.c
index 43e434b8225..120a1e0d825 100644
--- a/src/journal/journald-rate-limit.c
+++ b/src/journal/journald-rate-limit.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/journal/journald-rate-limit.h b/src/journal/journald-rate-limit.h
index e6f323c74eb..6ecdcb07acd 100644
--- a/src/journal/journald-rate-limit.h
+++ b/src/journal/journald-rate-limit.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index 5db36631ffd..63fefc90ea1 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/journal/journald-server.h b/src/journal/journald-server.h
index 2728ac11690..c42b3d8c9f1 100644
--- a/src/journal/journald-server.h
+++ b/src/journal/journald-server.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c
index 5cf9f40c202..c08f1222293 100644
--- a/src/journal/journald-stream.c
+++ b/src/journal/journald-stream.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/journal/journald-stream.h b/src/journal/journald-stream.h
index fdaee9cc967..3c020fd8e47 100644
--- a/src/journal/journald-stream.h
+++ b/src/journal/journald-stream.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c
index 6124500c9ee..b3538bc37a6 100644
--- a/src/journal/journald-syslog.c
+++ b/src/journal/journald-syslog.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/journal/journald-syslog.h b/src/journal/journald-syslog.h
index 656203d91d2..a1cfd83c7fc 100644
--- a/src/journal/journald-syslog.h
+++ b/src/journal/journald-syslog.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/journal/journald-wall.c b/src/journal/journald-wall.c
index 5963d16faae..234d9888c20 100644
--- a/src/journal/journald-wall.c
+++ b/src/journal/journald-wall.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Sebastian Thorarensen
 ***/
 
diff --git a/src/journal/journald-wall.h b/src/journal/journald-wall.h
index e8d34571d4f..070b8fff72d 100644
--- a/src/journal/journald-wall.h
+++ b/src/journal/journald-wall.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Sebastian Thorarensen
 ***/
 
diff --git a/src/journal/journald.c b/src/journal/journald.c
index afa6ef04e00..9479d181d2d 100644
--- a/src/journal/journald.c
+++ b/src/journal/journald.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/journal/mmap-cache.c b/src/journal/mmap-cache.c
index 980e14bd011..eb47bcbbc4e 100644
--- a/src/journal/mmap-cache.c
+++ b/src/journal/mmap-cache.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/journal/mmap-cache.h b/src/journal/mmap-cache.h
index 6418b359df0..90b9888c242 100644
--- a/src/journal/mmap-cache.h
+++ b/src/journal/mmap-cache.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
index 7d817903565..e3cdb08c5de 100644
--- a/src/journal/sd-journal.c
+++ b/src/journal/sd-journal.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/journal/test-audit-type.c b/src/journal/test-audit-type.c
index 6d802dc645a..09b94224d1a 100644
--- a/src/journal/test-audit-type.c
+++ b/src/journal/test-audit-type.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2015 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/journal/test-catalog.c b/src/journal/test-catalog.c
index 67466cf326d..f2846e6575a 100644
--- a/src/journal/test-catalog.c
+++ b/src/journal/test-catalog.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
   Copyright 2013 Zbigniew Jędrzejewski-Szmek
 ***/
diff --git a/src/journal/test-compress-benchmark.c b/src/journal/test-compress-benchmark.c
index e5bfabe41b2..e51428dd0f3 100644
--- a/src/journal/test-compress-benchmark.c
+++ b/src/journal/test-compress-benchmark.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd
-
   Copyright 2014 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/journal/test-compress.c b/src/journal/test-compress.c
index f27a1f88dbc..e0dbe72d678 100644
--- a/src/journal/test-compress.c
+++ b/src/journal/test-compress.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd
-
   Copyright 2014 Ronny Chevalier
 ***/
 
diff --git a/src/journal/test-journal-config.c b/src/journal/test-journal-config.c
index cd156de3dc7..d5c4664685b 100644
--- a/src/journal/test-journal-config.c
+++ b/src/journal/test-journal-config.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/journal/test-journal-enum.c b/src/journal/test-journal-enum.c
index 4b3619518c3..3f00200adfc 100644
--- a/src/journal/test-journal-enum.c
+++ b/src/journal/test-journal-enum.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/journal/test-journal-flush.c b/src/journal/test-journal-flush.c
index 43925cf9a2a..b14cb3d11ef 100644
--- a/src/journal/test-journal-flush.c
+++ b/src/journal/test-journal-flush.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/journal/test-journal-init.c b/src/journal/test-journal-init.c
index 9b6dbe82d61..a6e7a829827 100644
--- a/src/journal/test-journal-init.c
+++ b/src/journal/test-journal-init.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/journal/test-journal-interleaving.c b/src/journal/test-journal-interleaving.c
index 6c0d0f5645f..69f83b808e1 100644
--- a/src/journal/test-journal-interleaving.c
+++ b/src/journal/test-journal-interleaving.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Marius Vollmer
   Copyright 2013 Zbigniew Jędrzejewski-Szmek
 ***/
diff --git a/src/journal/test-journal-match.c b/src/journal/test-journal-match.c
index 134d914acca..b4803f52aa9 100644
--- a/src/journal/test-journal-match.c
+++ b/src/journal/test-journal-match.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/journal/test-journal-send.c b/src/journal/test-journal-send.c
index 2c52b571bb9..bb9b7c268a2 100644
--- a/src/journal/test-journal-send.c
+++ b/src/journal/test-journal-send.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/journal/test-journal-stream.c b/src/journal/test-journal-stream.c
index 052ea49959c..849b7b4ea6e 100644
--- a/src/journal/test-journal-stream.c
+++ b/src/journal/test-journal-stream.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/journal/test-journal-syslog.c b/src/journal/test-journal-syslog.c
index 0697c46afba..c491924edf7 100644
--- a/src/journal/test-journal-syslog.c
+++ b/src/journal/test-journal-syslog.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/journal/test-journal-verify.c b/src/journal/test-journal-verify.c
index 04b5ccbc22f..46f86590521 100644
--- a/src/journal/test-journal-verify.c
+++ b/src/journal/test-journal-verify.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/journal/test-journal.c b/src/journal/test-journal.c
index 1acb43e6890..f3024559a6e 100644
--- a/src/journal/test-journal.c
+++ b/src/journal/test-journal.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/journal/test-mmap-cache.c b/src/journal/test-mmap-cache.c
index b88b2f70646..8a80b74ef5f 100644
--- a/src/journal/test-mmap-cache.c
+++ b/src/journal/test-mmap-cache.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd-network/arp-util.c b/src/libsystemd-network/arp-util.c
index 7d83a90d284..46c996d89b6 100644
--- a/src/libsystemd-network/arp-util.c
+++ b/src/libsystemd-network/arp-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright (C) 2014 Axis Communications AB. All rights reserved.
   Copyright (C) 2015 Tom Gundersen
 ***/
diff --git a/src/libsystemd-network/arp-util.h b/src/libsystemd-network/arp-util.h
index 86864e9fd5e..773441e03a4 100644
--- a/src/libsystemd-network/arp-util.h
+++ b/src/libsystemd-network/arp-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright (C) 2014 Axis Communications AB. All rights reserved.
 ***/
 
diff --git a/src/libsystemd-network/dhcp-identifier.c b/src/libsystemd-network/dhcp-identifier.c
index 6a9dba1338c..7afba75f296 100644
--- a/src/libsystemd-network/dhcp-identifier.c
+++ b/src/libsystemd-network/dhcp-identifier.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright (C) 2015 Tom Gundersen <teg@jklmen>
 ***/
 
diff --git a/src/libsystemd-network/dhcp-identifier.h b/src/libsystemd-network/dhcp-identifier.h
index c0a10b6c359..c06a46cd7fb 100644
--- a/src/libsystemd-network/dhcp-identifier.h
+++ b/src/libsystemd-network/dhcp-identifier.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright (C) 2015 Tom Gundersen <teg@jklmen>
 ***/
 
diff --git a/src/libsystemd-network/dhcp-internal.h b/src/libsystemd-network/dhcp-internal.h
index f8276222335..a456440e952 100644
--- a/src/libsystemd-network/dhcp-internal.h
+++ b/src/libsystemd-network/dhcp-internal.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright (C) 2013 Intel Corporation. All rights reserved.
   Copyright (C) 2014 Tom Gundersen
 ***/
diff --git a/src/libsystemd-network/dhcp-lease-internal.h b/src/libsystemd-network/dhcp-lease-internal.h
index 66c213e28c0..2d66708079d 100644
--- a/src/libsystemd-network/dhcp-lease-internal.h
+++ b/src/libsystemd-network/dhcp-lease-internal.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright (C) 2013 Intel Corporation. All rights reserved.
   Copyright (C) 2014 Tom Gundersen
 ***/
diff --git a/src/libsystemd-network/dhcp-network.c b/src/libsystemd-network/dhcp-network.c
index e7d3b541d32..bcab79d261b 100644
--- a/src/libsystemd-network/dhcp-network.c
+++ b/src/libsystemd-network/dhcp-network.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright (C) 2013 Intel Corporation. All rights reserved.
 ***/
 
diff --git a/src/libsystemd-network/dhcp-option.c b/src/libsystemd-network/dhcp-option.c
index 4832ee6a2cd..7120d2204db 100644
--- a/src/libsystemd-network/dhcp-option.c
+++ b/src/libsystemd-network/dhcp-option.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright (C) 2013 Intel Corporation. All rights reserved.
 ***/
 
diff --git a/src/libsystemd-network/dhcp-packet.c b/src/libsystemd-network/dhcp-packet.c
index d6f09b2146e..2502a9a81c6 100644
--- a/src/libsystemd-network/dhcp-packet.c
+++ b/src/libsystemd-network/dhcp-packet.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright (C) 2013 Intel Corporation. All rights reserved.
   Copyright (C) 2014 Tom Gundersen
 ***/
diff --git a/src/libsystemd-network/dhcp-protocol.h b/src/libsystemd-network/dhcp-protocol.h
index 2230e094d06..2cff5ce9747 100644
--- a/src/libsystemd-network/dhcp-protocol.h
+++ b/src/libsystemd-network/dhcp-protocol.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright (C) 2013 Intel Corporation. All rights reserved.
 ***/
 
diff --git a/src/libsystemd-network/dhcp-server-internal.h b/src/libsystemd-network/dhcp-server-internal.h
index 60dd3d652f9..d69b4870799 100644
--- a/src/libsystemd-network/dhcp-server-internal.h
+++ b/src/libsystemd-network/dhcp-server-internal.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright (C) 2013 Intel Corporation. All rights reserved.
   Copyright (C) 2014 Tom Gundersen
 ***/
diff --git a/src/libsystemd-network/dhcp6-internal.h b/src/libsystemd-network/dhcp6-internal.h
index 33c43320818..43b67d4f87e 100644
--- a/src/libsystemd-network/dhcp6-internal.h
+++ b/src/libsystemd-network/dhcp6-internal.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright (C) 2014-2015 Intel Corporation. All rights reserved.
 ***/
 
diff --git a/src/libsystemd-network/dhcp6-lease-internal.h b/src/libsystemd-network/dhcp6-lease-internal.h
index 2bf5499770e..f03765b5e3e 100644
--- a/src/libsystemd-network/dhcp6-lease-internal.h
+++ b/src/libsystemd-network/dhcp6-lease-internal.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright (C) 2014 Tom Gundersen
   Copyright (C) 2014-2015 Intel Corporation. All rights reserved.
 ***/
diff --git a/src/libsystemd-network/dhcp6-network.c b/src/libsystemd-network/dhcp6-network.c
index e4b2cbedb64..e2a5991e324 100644
--- a/src/libsystemd-network/dhcp6-network.c
+++ b/src/libsystemd-network/dhcp6-network.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright (C) 2014 Intel Corporation. All rights reserved.
 ***/
 
diff --git a/src/libsystemd-network/dhcp6-option.c b/src/libsystemd-network/dhcp6-option.c
index 977fbeddbd9..606c5ce54b8 100644
--- a/src/libsystemd-network/dhcp6-option.c
+++ b/src/libsystemd-network/dhcp6-option.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright (C) 2014-2015 Intel Corporation. All rights reserved.
 ***/
 
diff --git a/src/libsystemd-network/dhcp6-protocol.h b/src/libsystemd-network/dhcp6-protocol.h
index 18417062d38..f1b1f0e4761 100644
--- a/src/libsystemd-network/dhcp6-protocol.h
+++ b/src/libsystemd-network/dhcp6-protocol.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright (C) 2014 Intel Corporation. All rights reserved.
 ***/
 
diff --git a/src/libsystemd-network/icmp6-util.c b/src/libsystemd-network/icmp6-util.c
index a627f6a70b9..3db229c634c 100644
--- a/src/libsystemd-network/icmp6-util.c
+++ b/src/libsystemd-network/icmp6-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright (C) 2014 Intel Corporation. All rights reserved.
 ***/
 
diff --git a/src/libsystemd-network/icmp6-util.h b/src/libsystemd-network/icmp6-util.h
index cf4c4c5cc83..7003d8fbb71 100644
--- a/src/libsystemd-network/icmp6-util.h
+++ b/src/libsystemd-network/icmp6-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright (C) 2014-2015 Intel Corporation. All rights reserved.
 ***/
 
diff --git a/src/libsystemd-network/lldp-internal.h b/src/libsystemd-network/lldp-internal.h
index 06cf7e8dadb..e175563b9ae 100644
--- a/src/libsystemd-network/lldp-internal.h
+++ b/src/libsystemd-network/lldp-internal.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright (C) 2014 Tom Gundersen
   Copyright (C) 2014 Susant Sahani
 ***/
diff --git a/src/libsystemd-network/lldp-neighbor.c b/src/libsystemd-network/lldp-neighbor.c
index 4aee537fd52..dd3ef4b398f 100644
--- a/src/libsystemd-network/lldp-neighbor.c
+++ b/src/libsystemd-network/lldp-neighbor.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd-network/lldp-neighbor.h b/src/libsystemd-network/lldp-neighbor.h
index fae49c590fd..eb968d2f37a 100644
--- a/src/libsystemd-network/lldp-neighbor.h
+++ b/src/libsystemd-network/lldp-neighbor.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd-network/lldp-network.c b/src/libsystemd-network/lldp-network.c
index 58132b3f1db..122688ac3c8 100644
--- a/src/libsystemd-network/lldp-network.c
+++ b/src/libsystemd-network/lldp-network.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright (C) 2014 Tom Gundersen
   Copyright (C) 2014 Susant Sahani
 ***/
diff --git a/src/libsystemd-network/lldp-network.h b/src/libsystemd-network/lldp-network.h
index 7a1e8b101af..f08f1317bcf 100644
--- a/src/libsystemd-network/lldp-network.h
+++ b/src/libsystemd-network/lldp-network.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright (C) 2014 Tom Gundersen
   Copyright (C) 2014 Susant Sahani
 ***/
diff --git a/src/libsystemd-network/ndisc-internal.h b/src/libsystemd-network/ndisc-internal.h
index b242f66c0ca..a429b1014e9 100644
--- a/src/libsystemd-network/ndisc-internal.h
+++ b/src/libsystemd-network/ndisc-internal.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright (C) 2014 Intel Corporation. All rights reserved.
 ***/
 
diff --git a/src/libsystemd-network/ndisc-router.c b/src/libsystemd-network/ndisc-router.c
index 1b9f4fe09a9..a6a9ac8a9f2 100644
--- a/src/libsystemd-network/ndisc-router.c
+++ b/src/libsystemd-network/ndisc-router.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright (C) 2014 Intel Corporation. All rights reserved.
 ***/
 
diff --git a/src/libsystemd-network/ndisc-router.h b/src/libsystemd-network/ndisc-router.h
index 40d24449363..acc48dd800c 100644
--- a/src/libsystemd-network/ndisc-router.h
+++ b/src/libsystemd-network/ndisc-router.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright (C) 2014 Intel Corporation. All rights reserved.
 ***/
 
diff --git a/src/libsystemd-network/network-internal.c b/src/libsystemd-network/network-internal.c
index f2acb281f5a..921c3a9dd0d 100644
--- a/src/libsystemd-network/network-internal.c
+++ b/src/libsystemd-network/network-internal.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
- This file is part of systemd.
-
  Copyright (C) 2013 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/libsystemd-network/network-internal.h b/src/libsystemd-network/network-internal.h
index 5346a82015a..15608935f53 100644
--- a/src/libsystemd-network/network-internal.h
+++ b/src/libsystemd-network/network-internal.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
- This file is part of systemd.
-
  Copyright (C) 2013 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/libsystemd-network/radv-internal.h b/src/libsystemd-network/radv-internal.h
index 572e38d48f9..c280b2480eb 100644
--- a/src/libsystemd-network/radv-internal.h
+++ b/src/libsystemd-network/radv-internal.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright (C) 2017 Intel Corporation. All rights reserved.
 ***/
 
diff --git a/src/libsystemd-network/sd-dhcp-client.c b/src/libsystemd-network/sd-dhcp-client.c
index 5660271330c..d52695b6b2a 100644
--- a/src/libsystemd-network/sd-dhcp-client.c
+++ b/src/libsystemd-network/sd-dhcp-client.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright (C) 2013 Intel Corporation. All rights reserved.
 ***/
 
diff --git a/src/libsystemd-network/sd-dhcp-lease.c b/src/libsystemd-network/sd-dhcp-lease.c
index 5bc74549574..c880c6688c3 100644
--- a/src/libsystemd-network/sd-dhcp-lease.c
+++ b/src/libsystemd-network/sd-dhcp-lease.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright (C) 2013 Intel Corporation. All rights reserved.
   Copyright (C) 2014 Tom Gundersen
 ***/
diff --git a/src/libsystemd-network/sd-dhcp-server.c b/src/libsystemd-network/sd-dhcp-server.c
index d97bb9a0754..45b813669e5 100644
--- a/src/libsystemd-network/sd-dhcp-server.c
+++ b/src/libsystemd-network/sd-dhcp-server.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright (C) 2013 Intel Corporation. All rights reserved.
   Copyright (C) 2014 Tom Gundersen
 ***/
diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c
index 7cad6ebed4a..2a493588ecf 100644
--- a/src/libsystemd-network/sd-dhcp6-client.c
+++ b/src/libsystemd-network/sd-dhcp6-client.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright (C) 2014-2015 Intel Corporation. All rights reserved.
 ***/
 
diff --git a/src/libsystemd-network/sd-dhcp6-lease.c b/src/libsystemd-network/sd-dhcp6-lease.c
index fc77a788f42..21e9f38bb40 100644
--- a/src/libsystemd-network/sd-dhcp6-lease.c
+++ b/src/libsystemd-network/sd-dhcp6-lease.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright (C) 2014 Tom Gundersen
   Copyright (C) 2014-2015 Intel Corporation. All rights reserved.
 ***/
diff --git a/src/libsystemd-network/sd-ipv4acd.c b/src/libsystemd-network/sd-ipv4acd.c
index bf0900066de..c241eebb911 100644
--- a/src/libsystemd-network/sd-ipv4acd.c
+++ b/src/libsystemd-network/sd-ipv4acd.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright (C) 2014 Axis Communications AB. All rights reserved.
   Copyright (C) 2015 Tom Gundersen
 ***/
diff --git a/src/libsystemd-network/sd-ipv4ll.c b/src/libsystemd-network/sd-ipv4ll.c
index 460fd6708d0..e12cd59813d 100644
--- a/src/libsystemd-network/sd-ipv4ll.c
+++ b/src/libsystemd-network/sd-ipv4ll.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright (C) 2014 Axis Communications AB. All rights reserved.
   Copyright (C) 2015 Tom Gundersen
 ***/
diff --git a/src/libsystemd-network/sd-lldp.c b/src/libsystemd-network/sd-lldp.c
index ad09b9fe4a3..1f2cf1cc92f 100644
--- a/src/libsystemd-network/sd-lldp.c
+++ b/src/libsystemd-network/sd-lldp.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright (C) 2014 Tom Gundersen
   Copyright (C) 2014 Susant Sahani
 ***/
diff --git a/src/libsystemd-network/sd-ndisc.c b/src/libsystemd-network/sd-ndisc.c
index 02fdf38af22..d95200c90da 100644
--- a/src/libsystemd-network/sd-ndisc.c
+++ b/src/libsystemd-network/sd-ndisc.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright (C) 2014 Intel Corporation. All rights reserved.
 ***/
 
diff --git a/src/libsystemd-network/sd-radv.c b/src/libsystemd-network/sd-radv.c
index 54857dc7864..158359b0729 100644
--- a/src/libsystemd-network/sd-radv.c
+++ b/src/libsystemd-network/sd-radv.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright (C) 2017 Intel Corporation. All rights reserved.
 ***/
 
diff --git a/src/libsystemd-network/test-acd.c b/src/libsystemd-network/test-acd.c
index 7888ed67c70..e83f27e76f1 100644
--- a/src/libsystemd-network/test-acd.c
+++ b/src/libsystemd-network/test-acd.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright (C) 2014 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/libsystemd-network/test-dhcp-client.c b/src/libsystemd-network/test-dhcp-client.c
index 7aa121b85c8..b20579c1940 100644
--- a/src/libsystemd-network/test-dhcp-client.c
+++ b/src/libsystemd-network/test-dhcp-client.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright (C) 2013 Intel Corporation. All rights reserved.
 ***/
 
diff --git a/src/libsystemd-network/test-dhcp-server.c b/src/libsystemd-network/test-dhcp-server.c
index 29eb90b2395..2f794898160 100644
--- a/src/libsystemd-network/test-dhcp-server.c
+++ b/src/libsystemd-network/test-dhcp-server.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright (C) 2013 Intel Corporation. All rights reserved.
   Copyright (C) 2014 Tom Gundersen
 ***/
diff --git a/src/libsystemd-network/test-dhcp6-client.c b/src/libsystemd-network/test-dhcp6-client.c
index f139484a863..148c96b0b9d 100644
--- a/src/libsystemd-network/test-dhcp6-client.c
+++ b/src/libsystemd-network/test-dhcp6-client.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright (C) 2014 Intel Corporation. All rights reserved.
 ***/
 
diff --git a/src/libsystemd-network/test-ipv4ll-manual.c b/src/libsystemd-network/test-ipv4ll-manual.c
index 679b06bd008..0c30f359122 100644
--- a/src/libsystemd-network/test-ipv4ll-manual.c
+++ b/src/libsystemd-network/test-ipv4ll-manual.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright (C) 2014 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/libsystemd-network/test-ipv4ll.c b/src/libsystemd-network/test-ipv4ll.c
index 9a6ab8b3812..769abc2c14e 100644
--- a/src/libsystemd-network/test-ipv4ll.c
+++ b/src/libsystemd-network/test-ipv4ll.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright (C) 2014 Axis Communications AB. All rights reserved.
 ***/
 
diff --git a/src/libsystemd-network/test-lldp.c b/src/libsystemd-network/test-lldp.c
index 47aebc5756a..ff4c183db0a 100644
--- a/src/libsystemd-network/test-lldp.c
+++ b/src/libsystemd-network/test-lldp.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright (C) 2014 Tom Gundersen
   Copyright (C) 2014 Susant Sahani
 ***/
diff --git a/src/libsystemd-network/test-ndisc-ra.c b/src/libsystemd-network/test-ndisc-ra.c
index 69622952ae8..41fb12e92b5 100644
--- a/src/libsystemd-network/test-ndisc-ra.c
+++ b/src/libsystemd-network/test-ndisc-ra.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright (C) 2017 Intel Corporation. All rights reserved.
 ***/
 
diff --git a/src/libsystemd-network/test-ndisc-rs.c b/src/libsystemd-network/test-ndisc-rs.c
index b0fe674fc1a..b1b0c7bfc9c 100644
--- a/src/libsystemd-network/test-ndisc-rs.c
+++ b/src/libsystemd-network/test-ndisc-rs.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright (C) 2014 Intel Corporation. All rights reserved.
 ***/
 
diff --git a/src/libsystemd/libsystemd.sym b/src/libsystemd/libsystemd.sym
index 270fe37e9f1..1eec17db504 100644
--- a/src/libsystemd/libsystemd.sym
+++ b/src/libsystemd/libsystemd.sym
@@ -1,8 +1,6 @@
 /***
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   systemd is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published by
   the Free Software Foundation; either version 2.1 of the License, or
diff --git a/src/libsystemd/sd-bus/bus-common-errors.c b/src/libsystemd/sd-bus/bus-common-errors.c
index b815f2f2eb4..280f8336a9e 100644
--- a/src/libsystemd/sd-bus/bus-common-errors.c
+++ b/src/libsystemd/sd-bus/bus-common-errors.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/libsystemd/sd-bus/bus-common-errors.h b/src/libsystemd/sd-bus/bus-common-errors.h
index e34aedc5282..0bee5a64cc9 100644
--- a/src/libsystemd/sd-bus/bus-common-errors.h
+++ b/src/libsystemd/sd-bus/bus-common-errors.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-bus/bus-container.c b/src/libsystemd/sd-bus/bus-container.c
index a9127376c47..47691960a95 100644
--- a/src/libsystemd/sd-bus/bus-container.c
+++ b/src/libsystemd/sd-bus/bus-container.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-bus/bus-container.h b/src/libsystemd/sd-bus/bus-container.h
index 16865846123..54c76c4822f 100644
--- a/src/libsystemd/sd-bus/bus-container.h
+++ b/src/libsystemd/sd-bus/bus-container.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-bus/bus-control.c b/src/libsystemd/sd-bus/bus-control.c
index cf340747a68..ed0705ae901 100644
--- a/src/libsystemd/sd-bus/bus-control.c
+++ b/src/libsystemd/sd-bus/bus-control.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-bus/bus-control.h b/src/libsystemd/sd-bus/bus-control.h
index a9edc8cb700..c3a5f7ce274 100644
--- a/src/libsystemd/sd-bus/bus-control.h
+++ b/src/libsystemd/sd-bus/bus-control.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-bus/bus-convenience.c b/src/libsystemd/sd-bus/bus-convenience.c
index 2ac8cfa63ec..47da334b933 100644
--- a/src/libsystemd/sd-bus/bus-convenience.c
+++ b/src/libsystemd/sd-bus/bus-convenience.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-bus/bus-creds.c b/src/libsystemd/sd-bus/bus-creds.c
index b28041ecc37..d8ee203083a 100644
--- a/src/libsystemd/sd-bus/bus-creds.c
+++ b/src/libsystemd/sd-bus/bus-creds.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-bus/bus-creds.h b/src/libsystemd/sd-bus/bus-creds.h
index 723a833d6e5..fe490a1766d 100644
--- a/src/libsystemd/sd-bus/bus-creds.h
+++ b/src/libsystemd/sd-bus/bus-creds.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-bus/bus-dump.c b/src/libsystemd/sd-bus/bus-dump.c
index 0170c8ae45d..e62c9600c7f 100644
--- a/src/libsystemd/sd-bus/bus-dump.c
+++ b/src/libsystemd/sd-bus/bus-dump.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-bus/bus-dump.h b/src/libsystemd/sd-bus/bus-dump.h
index b1758de0277..a1aa31db6c0 100644
--- a/src/libsystemd/sd-bus/bus-dump.h
+++ b/src/libsystemd/sd-bus/bus-dump.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c
index 5e8846be473..61d727faed5 100644
--- a/src/libsystemd/sd-bus/bus-error.c
+++ b/src/libsystemd/sd-bus/bus-error.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-bus/bus-error.h b/src/libsystemd/sd-bus/bus-error.h
index 4f704627c3e..9d2763c9172 100644
--- a/src/libsystemd/sd-bus/bus-error.h
+++ b/src/libsystemd/sd-bus/bus-error.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-bus/bus-gvariant.c b/src/libsystemd/sd-bus/bus-gvariant.c
index 0edae49d5ac..4c72a3906e6 100644
--- a/src/libsystemd/sd-bus/bus-gvariant.c
+++ b/src/libsystemd/sd-bus/bus-gvariant.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-bus/bus-gvariant.h b/src/libsystemd/sd-bus/bus-gvariant.h
index dcf04609c1f..1d4e087763f 100644
--- a/src/libsystemd/sd-bus/bus-gvariant.h
+++ b/src/libsystemd/sd-bus/bus-gvariant.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-bus/bus-internal.c b/src/libsystemd/sd-bus/bus-internal.c
index 18286277c3e..bf14da42d98 100644
--- a/src/libsystemd/sd-bus/bus-internal.c
+++ b/src/libsystemd/sd-bus/bus-internal.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-bus/bus-internal.h b/src/libsystemd/sd-bus/bus-internal.h
index 05321d4e79e..3e19c7e44d1 100644
--- a/src/libsystemd/sd-bus/bus-internal.h
+++ b/src/libsystemd/sd-bus/bus-internal.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-bus/bus-introspect.c b/src/libsystemd/sd-bus/bus-introspect.c
index 8e9217e247e..7c9c437e541 100644
--- a/src/libsystemd/sd-bus/bus-introspect.c
+++ b/src/libsystemd/sd-bus/bus-introspect.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-bus/bus-introspect.h b/src/libsystemd/sd-bus/bus-introspect.h
index e3f8ced723c..44bd35f87f5 100644
--- a/src/libsystemd/sd-bus/bus-introspect.h
+++ b/src/libsystemd/sd-bus/bus-introspect.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-bus/bus-kernel.c b/src/libsystemd/sd-bus/bus-kernel.c
index 015e73c3db0..48331dbd88b 100644
--- a/src/libsystemd/sd-bus/bus-kernel.c
+++ b/src/libsystemd/sd-bus/bus-kernel.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-bus/bus-kernel.h b/src/libsystemd/sd-bus/bus-kernel.h
index 42ca9e21153..5ab424daa53 100644
--- a/src/libsystemd/sd-bus/bus-kernel.h
+++ b/src/libsystemd/sd-bus/bus-kernel.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-bus/bus-match.c b/src/libsystemd/sd-bus/bus-match.c
index 7a5da73def2..9242240bc8f 100644
--- a/src/libsystemd/sd-bus/bus-match.c
+++ b/src/libsystemd/sd-bus/bus-match.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-bus/bus-match.h b/src/libsystemd/sd-bus/bus-match.h
index 3e7260e6261..babcaa716fa 100644
--- a/src/libsystemd/sd-bus/bus-match.h
+++ b/src/libsystemd/sd-bus/bus-match.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c
index 6fb841eb435..db7de7d491b 100644
--- a/src/libsystemd/sd-bus/bus-message.c
+++ b/src/libsystemd/sd-bus/bus-message.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-bus/bus-message.h b/src/libsystemd/sd-bus/bus-message.h
index 510f93be11b..26d976e73a7 100644
--- a/src/libsystemd/sd-bus/bus-message.h
+++ b/src/libsystemd/sd-bus/bus-message.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c
index 49c312371b6..6713b6ba654 100644
--- a/src/libsystemd/sd-bus/bus-objects.c
+++ b/src/libsystemd/sd-bus/bus-objects.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-bus/bus-objects.h b/src/libsystemd/sd-bus/bus-objects.h
index 218ee678a67..64fa3b58c6f 100644
--- a/src/libsystemd/sd-bus/bus-objects.h
+++ b/src/libsystemd/sd-bus/bus-objects.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-bus/bus-protocol.h b/src/libsystemd/sd-bus/bus-protocol.h
index ed9ecd641a3..df0739ac93f 100644
--- a/src/libsystemd/sd-bus/bus-protocol.h
+++ b/src/libsystemd/sd-bus/bus-protocol.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-bus/bus-signature.c b/src/libsystemd/sd-bus/bus-signature.c
index 662a1eac5f7..707a1e7d14c 100644
--- a/src/libsystemd/sd-bus/bus-signature.c
+++ b/src/libsystemd/sd-bus/bus-signature.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-bus/bus-signature.h b/src/libsystemd/sd-bus/bus-signature.h
index 73c2e1ea23b..c2b1f5a6c33 100644
--- a/src/libsystemd/sd-bus/bus-signature.h
+++ b/src/libsystemd/sd-bus/bus-signature.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-bus/bus-slot.c b/src/libsystemd/sd-bus/bus-slot.c
index db9af9a97e7..77a057e3a1d 100644
--- a/src/libsystemd/sd-bus/bus-slot.c
+++ b/src/libsystemd/sd-bus/bus-slot.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-bus/bus-slot.h b/src/libsystemd/sd-bus/bus-slot.h
index 5352f637945..966957180d3 100644
--- a/src/libsystemd/sd-bus/bus-slot.h
+++ b/src/libsystemd/sd-bus/bus-slot.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c
index 57c5391423e..e32fdb03179 100644
--- a/src/libsystemd/sd-bus/bus-socket.c
+++ b/src/libsystemd/sd-bus/bus-socket.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-bus/bus-socket.h b/src/libsystemd/sd-bus/bus-socket.h
index 0bc5b6360a9..87df7040e1e 100644
--- a/src/libsystemd/sd-bus/bus-socket.h
+++ b/src/libsystemd/sd-bus/bus-socket.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-bus/bus-track.c b/src/libsystemd/sd-bus/bus-track.c
index 1819eaffd4a..846556cb360 100644
--- a/src/libsystemd/sd-bus/bus-track.c
+++ b/src/libsystemd/sd-bus/bus-track.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-bus/bus-track.h b/src/libsystemd/sd-bus/bus-track.h
index 769211dbe8a..facbb6daae8 100644
--- a/src/libsystemd/sd-bus/bus-track.h
+++ b/src/libsystemd/sd-bus/bus-track.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-bus/bus-type.c b/src/libsystemd/sd-bus/bus-type.c
index bea7b4de642..fdf55565806 100644
--- a/src/libsystemd/sd-bus/bus-type.c
+++ b/src/libsystemd/sd-bus/bus-type.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-bus/bus-type.h b/src/libsystemd/sd-bus/bus-type.h
index dd8e552df12..109a3287fa1 100644
--- a/src/libsystemd/sd-bus/bus-type.h
+++ b/src/libsystemd/sd-bus/bus-type.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c
index 8ecb381586b..f52ce6ac3cb 100644
--- a/src/libsystemd/sd-bus/sd-bus.c
+++ b/src/libsystemd/sd-bus/sd-bus.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-bus/test-bus-benchmark.c b/src/libsystemd/sd-bus/test-bus-benchmark.c
index bd298add389..a77cba32afc 100644
--- a/src/libsystemd/sd-bus/test-bus-benchmark.c
+++ b/src/libsystemd/sd-bus/test-bus-benchmark.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-bus/test-bus-chat.c b/src/libsystemd/sd-bus/test-bus-chat.c
index 8223d673476..dac09fca373 100644
--- a/src/libsystemd/sd-bus/test-bus-chat.c
+++ b/src/libsystemd/sd-bus/test-bus-chat.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-bus/test-bus-cleanup.c b/src/libsystemd/sd-bus/test-bus-cleanup.c
index e958bd767c9..54efe72a757 100644
--- a/src/libsystemd/sd-bus/test-bus-cleanup.c
+++ b/src/libsystemd/sd-bus/test-bus-cleanup.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/libsystemd/sd-bus/test-bus-creds.c b/src/libsystemd/sd-bus/test-bus-creds.c
index 32e01f75077..ce18cf5aa97 100644
--- a/src/libsystemd/sd-bus/test-bus-creds.c
+++ b/src/libsystemd/sd-bus/test-bus-creds.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-bus/test-bus-error.c b/src/libsystemd/sd-bus/test-bus-error.c
index 8a35ed50f1d..89339a9350b 100644
--- a/src/libsystemd/sd-bus/test-bus-error.c
+++ b/src/libsystemd/sd-bus/test-bus-error.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-bus/test-bus-gvariant.c b/src/libsystemd/sd-bus/test-bus-gvariant.c
index 833375821ea..2e305d86191 100644
--- a/src/libsystemd/sd-bus/test-bus-gvariant.c
+++ b/src/libsystemd/sd-bus/test-bus-gvariant.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-bus/test-bus-introspect.c b/src/libsystemd/sd-bus/test-bus-introspect.c
index 4b5039a070d..9889c65334d 100644
--- a/src/libsystemd/sd-bus/test-bus-introspect.c
+++ b/src/libsystemd/sd-bus/test-bus-introspect.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-bus/test-bus-marshal.c b/src/libsystemd/sd-bus/test-bus-marshal.c
index 66e7b0c7988..cf03cdc5acc 100644
--- a/src/libsystemd/sd-bus/test-bus-marshal.c
+++ b/src/libsystemd/sd-bus/test-bus-marshal.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-bus/test-bus-match.c b/src/libsystemd/sd-bus/test-bus-match.c
index 1fe3c146258..c4cbdb58112 100644
--- a/src/libsystemd/sd-bus/test-bus-match.c
+++ b/src/libsystemd/sd-bus/test-bus-match.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-bus/test-bus-objects.c b/src/libsystemd/sd-bus/test-bus-objects.c
index a726d83b703..dda05d04296 100644
--- a/src/libsystemd/sd-bus/test-bus-objects.c
+++ b/src/libsystemd/sd-bus/test-bus-objects.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-bus/test-bus-server.c b/src/libsystemd/sd-bus/test-bus-server.c
index 373d596437f..b3ebd34a3e0 100644
--- a/src/libsystemd/sd-bus/test-bus-server.c
+++ b/src/libsystemd/sd-bus/test-bus-server.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-bus/test-bus-signature.c b/src/libsystemd/sd-bus/test-bus-signature.c
index 8a2cd3430b8..e46d72364ef 100644
--- a/src/libsystemd/sd-bus/test-bus-signature.c
+++ b/src/libsystemd/sd-bus/test-bus-signature.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-bus/test-bus-track.c b/src/libsystemd/sd-bus/test-bus-track.c
index d224377481a..2397fc30ee0 100644
--- a/src/libsystemd/sd-bus/test-bus-track.c
+++ b/src/libsystemd/sd-bus/test-bus-track.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-bus/test-bus-watch-bind.c b/src/libsystemd/sd-bus/test-bus-watch-bind.c
index 0cd93a94ea6..cbda84ac5dc 100644
--- a/src/libsystemd/sd-bus/test-bus-watch-bind.c
+++ b/src/libsystemd/sd-bus/test-bus-watch-bind.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2017 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-daemon/sd-daemon.c b/src/libsystemd/sd-daemon/sd-daemon.c
index 2a965075640..0c6d61b958e 100644
--- a/src/libsystemd/sd-daemon/sd-daemon.c
+++ b/src/libsystemd/sd-daemon/sd-daemon.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-device/device-enumerator-private.h b/src/libsystemd/sd-device/device-enumerator-private.h
index dc9dd7aa2c4..8b2fc7685b3 100644
--- a/src/libsystemd/sd-device/device-enumerator-private.h
+++ b/src/libsystemd/sd-device/device-enumerator-private.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2015 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/libsystemd/sd-device/device-enumerator.c b/src/libsystemd/sd-device/device-enumerator.c
index be6e82d810d..38404ee3877 100644
--- a/src/libsystemd/sd-device/device-enumerator.c
+++ b/src/libsystemd/sd-device/device-enumerator.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2008-2012 Kay Sievers <kay@vrfy.org>
   Copyright 2014-2015 Tom Gundersen <teg@jklm.no>
 ***/
diff --git a/src/libsystemd/sd-device/device-internal.h b/src/libsystemd/sd-device/device-internal.h
index 56a991d5a15..8c55a1bb87c 100644
--- a/src/libsystemd/sd-device/device-internal.h
+++ b/src/libsystemd/sd-device/device-internal.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2008-2012 Kay Sievers <kay@vrfy.org>
   Copyright 2014 Tom Gundersen <teg@jklm.no>
 ***/
diff --git a/src/libsystemd/sd-device/device-private.c b/src/libsystemd/sd-device/device-private.c
index de74b3be457..446da870e5a 100644
--- a/src/libsystemd/sd-device/device-private.c
+++ b/src/libsystemd/sd-device/device-private.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2008-2012 Kay Sievers <kay@vrfy.org>
   Copyright 2014 Tom Gundersen <teg@jklm.no>
 ***/
diff --git a/src/libsystemd/sd-device/device-private.h b/src/libsystemd/sd-device/device-private.h
index fde3713633f..34d5077ee9d 100644
--- a/src/libsystemd/sd-device/device-private.h
+++ b/src/libsystemd/sd-device/device-private.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/libsystemd/sd-device/device-util.h b/src/libsystemd/sd-device/device-util.h
index 66203130d1c..fa9d984d2cb 100644
--- a/src/libsystemd/sd-device/device-util.h
+++ b/src/libsystemd/sd-device/device-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014-2015 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c
index 0e92fcbe03a..781783a432c 100644
--- a/src/libsystemd/sd-device/sd-device.c
+++ b/src/libsystemd/sd-device/sd-device.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2008-2012 Kay Sievers <kay@vrfy.org>
   Copyright 2014 Tom Gundersen <teg@jklm.no>
 ***/
diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c
index 196b90d59b3..4af10401d83 100644
--- a/src/libsystemd/sd-event/sd-event.c
+++ b/src/libsystemd/sd-event/sd-event.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-event/test-event.c b/src/libsystemd/sd-event/test-event.c
index db3dd6ad9dc..63be4cf760f 100644
--- a/src/libsystemd/sd-event/test-event.c
+++ b/src/libsystemd/sd-event/test-event.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-hwdb/hwdb-internal.h b/src/libsystemd/sd-hwdb/hwdb-internal.h
index b802f34b9f9..f83d8ceb8ab 100644
--- a/src/libsystemd/sd-hwdb/hwdb-internal.h
+++ b/src/libsystemd/sd-hwdb/hwdb-internal.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2012 Kay Sievers <kay@vrfy.org>
 ***/
 
diff --git a/src/libsystemd/sd-hwdb/hwdb-util.h b/src/libsystemd/sd-hwdb/hwdb-util.h
index 949d9125e16..a31c1650ede 100644
--- a/src/libsystemd/sd-hwdb/hwdb-util.h
+++ b/src/libsystemd/sd-hwdb/hwdb-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/libsystemd/sd-hwdb/sd-hwdb.c b/src/libsystemd/sd-hwdb/sd-hwdb.c
index 4a6a3d07d32..6a9fe7c3cd6 100644
--- a/src/libsystemd/sd-hwdb/sd-hwdb.c
+++ b/src/libsystemd/sd-hwdb/sd-hwdb.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Kay Sievers <kay@vrfy.org>
   Copyright 2008 Alan Jenkins <alan.christopher.jenkins@googlemail.com>
   Copyright 2014 Tom Gundersen <teg@jklm.no>
diff --git a/src/libsystemd/sd-id128/id128-util.c b/src/libsystemd/sd-id128/id128-util.c
index fa28cce3a53..5a1a0e16626 100644
--- a/src/libsystemd/sd-id128/id128-util.c
+++ b/src/libsystemd/sd-id128/id128-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-id128/id128-util.h b/src/libsystemd/sd-id128/id128-util.h
index 9aeb27a2209..b99363bd3bc 100644
--- a/src/libsystemd/sd-id128/id128-util.h
+++ b/src/libsystemd/sd-id128/id128-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-id128/sd-id128.c b/src/libsystemd/sd-id128/sd-id128.c
index 80548fdfcf9..4a6f2960fc9 100644
--- a/src/libsystemd/sd-id128/sd-id128.c
+++ b/src/libsystemd/sd-id128/sd-id128.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-login/sd-login.c b/src/libsystemd/sd-login/sd-login.c
index fdbc29cc38a..092034a1073 100644
--- a/src/libsystemd/sd-login/sd-login.c
+++ b/src/libsystemd/sd-login/sd-login.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-login/test-login.c b/src/libsystemd/sd-login/test-login.c
index 2f2452d43fb..f895b491c53 100644
--- a/src/libsystemd/sd-login/test-login.c
+++ b/src/libsystemd/sd-login/test-login.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-netlink/local-addresses.c b/src/libsystemd/sd-netlink/local-addresses.c
index e167496732e..a201718ec79 100644
--- a/src/libsystemd/sd-netlink/local-addresses.c
+++ b/src/libsystemd/sd-netlink/local-addresses.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2008-2011 Lennart Poettering
   Copyright 2014 Tom Gundersen
 ***/
diff --git a/src/libsystemd/sd-netlink/local-addresses.h b/src/libsystemd/sd-netlink/local-addresses.h
index f1f4db78abc..2f9d11aa728 100644
--- a/src/libsystemd/sd-netlink/local-addresses.h
+++ b/src/libsystemd/sd-netlink/local-addresses.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2008-2011 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-netlink/netlink-internal.h b/src/libsystemd/sd-netlink/netlink-internal.h
index 79a2e7b0d37..82dc2018572 100644
--- a/src/libsystemd/sd-netlink/netlink-internal.h
+++ b/src/libsystemd/sd-netlink/netlink-internal.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/libsystemd/sd-netlink/netlink-message.c b/src/libsystemd/sd-netlink/netlink-message.c
index 3b792dd5a7b..a8d7ef4bfaa 100644
--- a/src/libsystemd/sd-netlink/netlink-message.c
+++ b/src/libsystemd/sd-netlink/netlink-message.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/libsystemd/sd-netlink/netlink-socket.c b/src/libsystemd/sd-netlink/netlink-socket.c
index 54f56c9467a..6a8ffac41b1 100644
--- a/src/libsystemd/sd-netlink/netlink-socket.c
+++ b/src/libsystemd/sd-netlink/netlink-socket.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/libsystemd/sd-netlink/netlink-types.c b/src/libsystemd/sd-netlink/netlink-types.c
index a82b1e1a890..29811c6c4b0 100644
--- a/src/libsystemd/sd-netlink/netlink-types.c
+++ b/src/libsystemd/sd-netlink/netlink-types.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/libsystemd/sd-netlink/netlink-types.h b/src/libsystemd/sd-netlink/netlink-types.h
index 559976c24c2..f1ce3b25b3d 100644
--- a/src/libsystemd/sd-netlink/netlink-types.h
+++ b/src/libsystemd/sd-netlink/netlink-types.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/libsystemd/sd-netlink/netlink-util.c b/src/libsystemd/sd-netlink/netlink-util.c
index 36b11030b0e..064534fb622 100644
--- a/src/libsystemd/sd-netlink/netlink-util.c
+++ b/src/libsystemd/sd-netlink/netlink-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
- This file is part of systemd.
-
  Copyright (C) 2013 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/libsystemd/sd-netlink/netlink-util.h b/src/libsystemd/sd-netlink/netlink-util.h
index c39ded34294..d41113d15bc 100644
--- a/src/libsystemd/sd-netlink/netlink-util.h
+++ b/src/libsystemd/sd-netlink/netlink-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
- This file is part of systemd.
-
  Copyright (C) 2013 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/libsystemd/sd-netlink/rtnl-message.c b/src/libsystemd/sd-netlink/rtnl-message.c
index c87f6eb1976..7f3ea7772c9 100644
--- a/src/libsystemd/sd-netlink/rtnl-message.c
+++ b/src/libsystemd/sd-netlink/rtnl-message.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/libsystemd/sd-netlink/sd-netlink.c b/src/libsystemd/sd-netlink/sd-netlink.c
index 5d9c1a1396a..97bdfeb539b 100644
--- a/src/libsystemd/sd-netlink/sd-netlink.c
+++ b/src/libsystemd/sd-netlink/sd-netlink.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/libsystemd/sd-netlink/test-local-addresses.c b/src/libsystemd/sd-netlink/test-local-addresses.c
index 6008bb4b199..27c8fbae31c 100644
--- a/src/libsystemd/sd-netlink/test-local-addresses.c
+++ b/src/libsystemd/sd-netlink/test-local-addresses.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-netlink/test-netlink.c b/src/libsystemd/sd-netlink/test-netlink.c
index 54149bde0fd..467bef0a244 100644
--- a/src/libsystemd/sd-netlink/test-netlink.c
+++ b/src/libsystemd/sd-netlink/test-netlink.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/libsystemd/sd-network/network-util.c b/src/libsystemd/sd-network/network-util.c
index 1cbb2d7fc9d..724c2b85495 100644
--- a/src/libsystemd/sd-network/network-util.c
+++ b/src/libsystemd/sd-network/network-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-network/network-util.h b/src/libsystemd/sd-network/network-util.h
index 6cac3a2c02b..d06c9c21b35 100644
--- a/src/libsystemd/sd-network/network-util.h
+++ b/src/libsystemd/sd-network/network-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Thomas Hindø Paabøl Andersen
 ***/
 
diff --git a/src/libsystemd/sd-network/sd-network.c b/src/libsystemd/sd-network/sd-network.c
index 79e52fbe03b..471dff47067 100644
--- a/src/libsystemd/sd-network/sd-network.c
+++ b/src/libsystemd/sd-network/sd-network.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
   Copyright 2014 Tom Gundersen
 ***/
diff --git a/src/libsystemd/sd-path/sd-path.c b/src/libsystemd/sd-path/sd-path.c
index b1a1cdc4f48..d31779e1dc9 100644
--- a/src/libsystemd/sd-path/sd-path.c
+++ b/src/libsystemd/sd-path/sd-path.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-resolve/sd-resolve.c b/src/libsystemd/sd-resolve/sd-resolve.c
index fcf4d2ef6db..0f096286833 100644
--- a/src/libsystemd/sd-resolve/sd-resolve.c
+++ b/src/libsystemd/sd-resolve/sd-resolve.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2005-2008 Lennart Poettering
 ***/
 
diff --git a/src/libsystemd/sd-resolve/test-resolve.c b/src/libsystemd/sd-resolve/test-resolve.c
index 7020412ab28..524c8659f99 100644
--- a/src/libsystemd/sd-resolve/test-resolve.c
+++ b/src/libsystemd/sd-resolve/test-resolve.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2005-2008 Lennart Poettering
   Copyright 2014 Daniel Buch
 ***/
diff --git a/src/libsystemd/sd-utf8/sd-utf8.c b/src/libsystemd/sd-utf8/sd-utf8.c
index a33c50975e7..7292838c77f 100644
--- a/src/libsystemd/sd-utf8/sd-utf8.c
+++ b/src/libsystemd/sd-utf8/sd-utf8.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/libudev/libudev-device-internal.h b/src/libudev/libudev-device-internal.h
index 65d24ed2262..33af3ea54fd 100644
--- a/src/libudev/libudev-device-internal.h
+++ b/src/libudev/libudev-device-internal.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2008-2012 Kay Sievers <kay@vrfy.org>
   Copyright 2015 Tom Gundersen <teg@jklm.no>
 ***/
diff --git a/src/libudev/libudev-device-private.c b/src/libudev/libudev-device-private.c
index 552d5346fe8..5949a27cfdd 100644
--- a/src/libudev/libudev-device-private.c
+++ b/src/libudev/libudev-device-private.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2008-2012 Kay Sievers <kay@vrfy.org>
   Copyright 2015 Tom Gundersen <teg@jklm.no>
 ***/
diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c
index b59b713d84d..037634847cf 100644
--- a/src/libudev/libudev-device.c
+++ b/src/libudev/libudev-device.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2008-2012 Kay Sievers <kay@vrfy.org>
   Copyright 2015 Tom Gundersen <teg@jklm.no>
 ***/
diff --git a/src/libudev/libudev-enumerate.c b/src/libudev/libudev-enumerate.c
index 7faaefb0143..941134ec248 100644
--- a/src/libudev/libudev-enumerate.c
+++ b/src/libudev/libudev-enumerate.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2008-2012 Kay Sievers <kay@vrfy.org>
   Copyright 2015 Tom Gundersen <teg@jklm.no>
 ***/
diff --git a/src/libudev/libudev-hwdb.c b/src/libudev/libudev-hwdb.c
index c32aeb5205f..1acffb86e93 100644
--- a/src/libudev/libudev-hwdb.c
+++ b/src/libudev/libudev-hwdb.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/libudev/libudev-list.c b/src/libudev/libudev-list.c
index 00e260193b5..0484d326520 100644
--- a/src/libudev/libudev-list.c
+++ b/src/libudev/libudev-list.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2008-2012 Kay Sievers <kay@vrfy.org>
 ***/
 
diff --git a/src/libudev/libudev-monitor.c b/src/libudev/libudev-monitor.c
index 482baea148b..2b0190d24b8 100644
--- a/src/libudev/libudev-monitor.c
+++ b/src/libudev/libudev-monitor.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2008-2012 Kay Sievers <kay@vrfy.org>
 ***/
 
diff --git a/src/libudev/libudev-private.h b/src/libudev/libudev-private.h
index ad98192188b..c68a292a186 100644
--- a/src/libudev/libudev-private.h
+++ b/src/libudev/libudev-private.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2008-2012 Kay Sievers <kay@vrfy.org>
 ***/
 
diff --git a/src/libudev/libudev-queue.c b/src/libudev/libudev-queue.c
index f06f2224b87..c2fc197caa2 100644
--- a/src/libudev/libudev-queue.c
+++ b/src/libudev/libudev-queue.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2008-2012 Kay Sievers <kay@vrfy.org>
   Copyright 2009 Alan Jenkins <alan-jenkins@tuffmail.co.uk>
 ***/
diff --git a/src/libudev/libudev-util.c b/src/libudev/libudev-util.c
index 9c4e2503eee..f693ae97f27 100644
--- a/src/libudev/libudev-util.c
+++ b/src/libudev/libudev-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2008-2012 Kay Sievers <kay@vrfy.org>
 ***/
 
diff --git a/src/libudev/libudev.c b/src/libudev/libudev.c
index 2f31e65b529..2a6a6f956e6 100644
--- a/src/libudev/libudev.c
+++ b/src/libudev/libudev.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2008-2014 Kay Sievers <kay@vrfy.org>
 ***/
 
diff --git a/src/libudev/libudev.h b/src/libudev/libudev.h
index 1b787ccec94..6e5886b7be1 100644
--- a/src/libudev/libudev.h
+++ b/src/libudev/libudev.h
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2008-2012 Kay Sievers <kay@vrfy.org>
 ***/
 
diff --git a/src/libudev/libudev.sym b/src/libudev/libudev.sym
index 1e8dbfa0561..fb2e03e432d 100644
--- a/src/libudev/libudev.sym
+++ b/src/libudev/libudev.sym
@@ -1,8 +1,6 @@
 /***
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   systemd is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published by
   the Free Software Foundation; either version 2.1 of the License, or
diff --git a/src/locale/keymap-util.c b/src/locale/keymap-util.c
index f1670ae8793..aadb316d0ef 100644
--- a/src/locale/keymap-util.c
+++ b/src/locale/keymap-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
   Copyright 2013 Kay Sievers
 ***/
diff --git a/src/locale/keymap-util.h b/src/locale/keymap-util.h
index 41bdd02862f..f9aed8e1b57 100644
--- a/src/locale/keymap-util.h
+++ b/src/locale/keymap-util.h
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
   Copyright 2013 Kay Sievers
 ***/
diff --git a/src/locale/localectl.c b/src/locale/localectl.c
index 49a44ae8bb9..4940992f3e9 100644
--- a/src/locale/localectl.c
+++ b/src/locale/localectl.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
   Copyright 2013 Kay Sievers
 ***/
diff --git a/src/locale/localed.c b/src/locale/localed.c
index 0b4da63cf00..b9fb2aeac62 100644
--- a/src/locale/localed.c
+++ b/src/locale/localed.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
   Copyright 2013 Kay Sievers
 ***/
diff --git a/src/locale/test-keymap-util.c b/src/locale/test-keymap-util.c
index c2bc2800256..d24f12547ee 100644
--- a/src/locale/test-keymap-util.c
+++ b/src/locale/test-keymap-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2016 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/login/inhibit.c b/src/login/inhibit.c
index 75f5e4d30ec..5ab96be7ff6 100644
--- a/src/login/inhibit.c
+++ b/src/login/inhibit.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/login/loginctl.c b/src/login/loginctl.c
index 43edbb02fca..4e05c28b215 100644
--- a/src/login/loginctl.c
+++ b/src/login/loginctl.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/login/logind-acl.c b/src/login/logind-acl.c
index af3b4a4d2dc..b846b250981 100644
--- a/src/login/logind-acl.c
+++ b/src/login/logind-acl.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/login/logind-acl.h b/src/login/logind-acl.h
index 829996b73b8..f5d326f71a2 100644
--- a/src/login/logind-acl.h
+++ b/src/login/logind-acl.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/login/logind-action.c b/src/login/logind-action.c
index 81a30b73c8b..4e22b365eaf 100644
--- a/src/login/logind-action.c
+++ b/src/login/logind-action.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/login/logind-action.h b/src/login/logind-action.h
index 89c2dfddb4a..5aa1dd2c7aa 100644
--- a/src/login/logind-action.h
+++ b/src/login/logind-action.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/login/logind-button.c b/src/login/logind-button.c
index 39749925c5a..c1492d67c1c 100644
--- a/src/login/logind-button.c
+++ b/src/login/logind-button.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/login/logind-button.h b/src/login/logind-button.h
index 0b3936eb3d8..2fe81dc2c11 100644
--- a/src/login/logind-button.h
+++ b/src/login/logind-button.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/login/logind-core.c b/src/login/logind-core.c
index 66c0796e975..84d17b19dd0 100644
--- a/src/login/logind-core.c
+++ b/src/login/logind-core.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index 21fdc0912dc..4f9f7ebcbb7 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/login/logind-device.c b/src/login/logind-device.c
index 69e89ccb5e3..65a086eac4a 100644
--- a/src/login/logind-device.c
+++ b/src/login/logind-device.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/login/logind-device.h b/src/login/logind-device.h
index f6a4fafa623..09bf341ad34 100644
--- a/src/login/logind-device.h
+++ b/src/login/logind-device.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/login/logind-inhibit.c b/src/login/logind-inhibit.c
index 8bf3e72d22f..5912f6feea8 100644
--- a/src/login/logind-inhibit.c
+++ b/src/login/logind-inhibit.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/login/logind-inhibit.h b/src/login/logind-inhibit.h
index 712260a5a12..bf39955e102 100644
--- a/src/login/logind-inhibit.h
+++ b/src/login/logind-inhibit.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/login/logind-seat-dbus.c b/src/login/logind-seat-dbus.c
index 720140d6e36..93f64d3f870 100644
--- a/src/login/logind-seat-dbus.c
+++ b/src/login/logind-seat-dbus.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/login/logind-seat.c b/src/login/logind-seat.c
index f8d825ffabd..6661a93b21e 100644
--- a/src/login/logind-seat.c
+++ b/src/login/logind-seat.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/login/logind-seat.h b/src/login/logind-seat.h
index 6a4e7bdb363..23242d2c283 100644
--- a/src/login/logind-seat.h
+++ b/src/login/logind-seat.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/login/logind-session-dbus.c b/src/login/logind-session-dbus.c
index 81afc2337da..cc114942ed3 100644
--- a/src/login/logind-session-dbus.c
+++ b/src/login/logind-session-dbus.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/login/logind-session-device.c b/src/login/logind-session-device.c
index 929eab7fcd0..19ad889b3a6 100644
--- a/src/login/logind-session-device.c
+++ b/src/login/logind-session-device.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 David Herrmann
 ***/
 
diff --git a/src/login/logind-session-device.h b/src/login/logind-session-device.h
index e1c0ac38bd1..a7558e5fa1f 100644
--- a/src/login/logind-session-device.h
+++ b/src/login/logind-session-device.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 David Herrmann
 ***/
 
diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index df04a4748e7..1104323e947 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/login/logind-session.h b/src/login/logind-session.h
index 6043048ae9d..d4ff99e94fb 100644
--- a/src/login/logind-session.h
+++ b/src/login/logind-session.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/login/logind-user-dbus.c b/src/login/logind-user-dbus.c
index 48bf2d947aa..f4bc12a1858 100644
--- a/src/login/logind-user-dbus.c
+++ b/src/login/logind-user-dbus.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/login/logind-user.c b/src/login/logind-user.c
index 1dfc5901476..034467833c6 100644
--- a/src/login/logind-user.c
+++ b/src/login/logind-user.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/login/logind-user.h b/src/login/logind-user.h
index 25b52ef792c..f264d471496 100644
--- a/src/login/logind-user.h
+++ b/src/login/logind-user.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/login/logind-utmp.c b/src/login/logind-utmp.c
index 053c8d5b88e..6a411e49f9d 100644
--- a/src/login/logind-utmp.c
+++ b/src/login/logind-utmp.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2015 Daniel Mack
 ***/
 
diff --git a/src/login/logind.c b/src/login/logind.c
index 96f48cbd17f..ef35782f00e 100644
--- a/src/login/logind.c
+++ b/src/login/logind.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/login/logind.h b/src/login/logind.h
index 4a80a0977e7..4ebb5943b0b 100644
--- a/src/login/logind.h
+++ b/src/login/logind.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c
index e1c2615f61f..89c4acd432d 100644
--- a/src/login/pam_systemd.c
+++ b/src/login/pam_systemd.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/login/pam_systemd.sym b/src/login/pam_systemd.sym
index d48b9e8ccdc..62d5d26b04b 100644
--- a/src/login/pam_systemd.sym
+++ b/src/login/pam_systemd.sym
@@ -1,8 +1,6 @@
 /***
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   systemd is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published by
   the Free Software Foundation; either version 2.1 of the License, or
diff --git a/src/login/sysfs-show.c b/src/login/sysfs-show.c
index 65993c49dd9..03e174a5199 100644
--- a/src/login/sysfs-show.c
+++ b/src/login/sysfs-show.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/login/sysfs-show.h b/src/login/sysfs-show.h
index 17963a6fe3f..38ae91a0cb0 100644
--- a/src/login/sysfs-show.h
+++ b/src/login/sysfs-show.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/login/test-inhibit.c b/src/login/test-inhibit.c
index debfc273a22..8de6d895f7a 100644
--- a/src/login/test-inhibit.c
+++ b/src/login/test-inhibit.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/login/test-login-shared.c b/src/login/test-login-shared.c
index 718fb608002..a11a8e14f70 100644
--- a/src/login/test-login-shared.c
+++ b/src/login/test-login-shared.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/login/test-login-tables.c b/src/login/test-login-tables.c
index 8e2f760c928..d05c0b0389a 100644
--- a/src/login/test-login-tables.c
+++ b/src/login/test-login-tables.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd
-
   Copyright 2013 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/machine-id-setup/machine-id-setup-main.c b/src/machine-id-setup/machine-id-setup-main.c
index 938ac94a44a..4471d5fe524 100644
--- a/src/machine-id-setup/machine-id-setup-main.c
+++ b/src/machine-id-setup/machine-id-setup-main.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/machine/image-dbus.c b/src/machine/image-dbus.c
index d2f5dc45936..e00a09ebf2e 100644
--- a/src/machine/image-dbus.c
+++ b/src/machine/image-dbus.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/machine/image-dbus.h b/src/machine/image-dbus.h
index f4b54758502..f6590ca390d 100644
--- a/src/machine/image-dbus.h
+++ b/src/machine/image-dbus.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c
index d7921cf8cf2..3a896ac5108 100644
--- a/src/machine/machine-dbus.c
+++ b/src/machine/machine-dbus.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/machine/machine-dbus.h b/src/machine/machine-dbus.h
index 6b9cdef8c86..b5e4ac88dd1 100644
--- a/src/machine/machine-dbus.h
+++ b/src/machine/machine-dbus.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/machine/machine.c b/src/machine/machine.c
index bb2ebd0dbb0..8cc70928d4d 100644
--- a/src/machine/machine.c
+++ b/src/machine/machine.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/machine/machine.h b/src/machine/machine.h
index 42c1104ce4a..795a662428f 100644
--- a/src/machine/machine.h
+++ b/src/machine/machine.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
index d12c7d646bd..2146390cc0c 100644
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/machine/machined-dbus.c b/src/machine/machined-dbus.c
index f45e5920622..7602168a8b3 100644
--- a/src/machine/machined-dbus.c
+++ b/src/machine/machined-dbus.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/machine/machined.c b/src/machine/machined.c
index 41b4cdad6da..0982e7b0581 100644
--- a/src/machine/machined.c
+++ b/src/machine/machined.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/machine/machined.h b/src/machine/machined.h
index 2f204f05490..20aa0447f4e 100644
--- a/src/machine/machined.h
+++ b/src/machine/machined.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/machine/operation.c b/src/machine/operation.c
index ebe149b7a9a..757052d4eba 100644
--- a/src/machine/operation.c
+++ b/src/machine/operation.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 ***/
 
diff --git a/src/machine/operation.h b/src/machine/operation.h
index 9c3ee1c1bec..2144d9fba2d 100644
--- a/src/machine/operation.h
+++ b/src/machine/operation.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 ***/
 
diff --git a/src/machine/test-machine-tables.c b/src/machine/test-machine-tables.c
index 78ba00c2a4b..62c784428db 100644
--- a/src/machine/test-machine-tables.c
+++ b/src/machine/test-machine-tables.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd
-
   Copyright 2013 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c
index 235a577e261..93d7414e904 100644
--- a/src/modules-load/modules-load.c
+++ b/src/modules-load/modules-load.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/mount/mount-tool.c b/src/mount/mount-tool.c
index 5e22a434f1c..8b964c4fd7d 100644
--- a/src/mount/mount-tool.c
+++ b/src/mount/mount-tool.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 ***/
 
diff --git a/src/network/netdev/bond.c b/src/network/netdev/bond.c
index 166e9521760..f1a008455ee 100644
--- a/src/network/netdev/bond.c
+++ b/src/network/netdev/bond.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014  Tom Gundersen <teg@jklm.no>
   Copyright 2014  Susant Sahani
 ***/
diff --git a/src/network/netdev/bond.h b/src/network/netdev/bond.h
index ed8cc9709bb..a94a6ce9f47 100644
--- a/src/network/netdev/bond.h
+++ b/src/network/netdev/bond.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/network/netdev/bridge.c b/src/network/netdev/bridge.c
index 967c2dfc766..30f9d8310e5 100644
--- a/src/network/netdev/bridge.c
+++ b/src/network/netdev/bridge.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014  Tom Gundersen <teg@jklm.no>
   Copyright 2014  Susant Sahani
 ***/
diff --git a/src/network/netdev/bridge.h b/src/network/netdev/bridge.h
index ba8a9b5bad3..28007620eb0 100644
--- a/src/network/netdev/bridge.h
+++ b/src/network/netdev/bridge.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/network/netdev/dummy.c b/src/network/netdev/dummy.c
index 26f58a52a66..7361d34c0c8 100644
--- a/src/network/netdev/dummy.c
+++ b/src/network/netdev/dummy.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Susant Sahani <susant@redhat.com>
   Copyright 2014 Tom Gundersen
 ***/
diff --git a/src/network/netdev/dummy.h b/src/network/netdev/dummy.h
index 61ad44e61b9..dc0bb67eb38 100644
--- a/src/network/netdev/dummy.h
+++ b/src/network/netdev/dummy.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/network/netdev/geneve.c b/src/network/netdev/geneve.c
index 4e865553ec0..f64547c7645 100644
--- a/src/network/netdev/geneve.c
+++ b/src/network/netdev/geneve.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2017 Susant Sahani
 ***/
 
diff --git a/src/network/netdev/geneve.h b/src/network/netdev/geneve.h
index 77f1d3d30b9..fe0ef8462f9 100644
--- a/src/network/netdev/geneve.h
+++ b/src/network/netdev/geneve.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2017 Susant Sahani
 ***/
 
diff --git a/src/network/netdev/ipvlan.c b/src/network/netdev/ipvlan.c
index 77cfc67e5b2..85396cffd84 100644
--- a/src/network/netdev/ipvlan.c
+++ b/src/network/netdev/ipvlan.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013-2015 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/network/netdev/ipvlan.h b/src/network/netdev/ipvlan.h
index b1d32d10e95..3294e4ca311 100644
--- a/src/network/netdev/ipvlan.h
+++ b/src/network/netdev/ipvlan.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014-2015 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/network/netdev/macvlan.c b/src/network/netdev/macvlan.c
index 2160fffc4b1..33eaa5e25fe 100644
--- a/src/network/netdev/macvlan.c
+++ b/src/network/netdev/macvlan.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/network/netdev/macvlan.h b/src/network/netdev/macvlan.h
index 864d1903213..41f2519cf26 100644
--- a/src/network/netdev/macvlan.h
+++ b/src/network/netdev/macvlan.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c
index bff478f96aa..eb24b7f540d 100644
--- a/src/network/netdev/netdev.c
+++ b/src/network/netdev/netdev.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/network/netdev/netdev.h b/src/network/netdev/netdev.h
index fa90b14f863..91c86dfb9f3 100644
--- a/src/network/netdev/netdev.h
+++ b/src/network/netdev/netdev.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/network/netdev/netdevsim.c b/src/network/netdev/netdevsim.c
index 857a63f3de3..9fd31a0465b 100644
--- a/src/network/netdev/netdevsim.c
+++ b/src/network/netdev/netdevsim.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2018 Susant Sahani
 ***/
 
diff --git a/src/network/netdev/netdevsim.h b/src/network/netdev/netdevsim.h
index 1e560279ff0..d5f738280fd 100644
--- a/src/network/netdev/netdevsim.h
+++ b/src/network/netdev/netdevsim.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2018 Susant Sahani
 ***/
 
diff --git a/src/network/netdev/tunnel.c b/src/network/netdev/tunnel.c
index 2589ea13f47..bd9d00bda2f 100644
--- a/src/network/netdev/tunnel.c
+++ b/src/network/netdev/tunnel.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Susant Sahani
 ***/
 
diff --git a/src/network/netdev/tunnel.h b/src/network/netdev/tunnel.h
index 22f2def111e..60ec64008d4 100644
--- a/src/network/netdev/tunnel.h
+++ b/src/network/netdev/tunnel.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/network/netdev/tuntap.c b/src/network/netdev/tuntap.c
index 3dd962440db..9eb6dc596ad 100644
--- a/src/network/netdev/tuntap.c
+++ b/src/network/netdev/tuntap.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Susant Sahani <susant@redhat.com>
 ***/
 
diff --git a/src/network/netdev/tuntap.h b/src/network/netdev/tuntap.h
index 14ebcdc34fe..99c6fe7c13f 100644
--- a/src/network/netdev/tuntap.h
+++ b/src/network/netdev/tuntap.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/network/netdev/vcan.c b/src/network/netdev/vcan.c
index 8d825690af6..33327a1759f 100644
--- a/src/network/netdev/vcan.c
+++ b/src/network/netdev/vcan.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2016 Susant Sahani
 ***/
 
diff --git a/src/network/netdev/vcan.h b/src/network/netdev/vcan.h
index 9a434abd021..6bc0c8ef665 100644
--- a/src/network/netdev/vcan.h
+++ b/src/network/netdev/vcan.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2016 Susant Sahani
 ***/
 
diff --git a/src/network/netdev/veth.c b/src/network/netdev/veth.c
index b52a57ebe7c..24457c00f82 100644
--- a/src/network/netdev/veth.c
+++ b/src/network/netdev/veth.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Susant Sahani <susant@redhat.com>
 ***/
 
diff --git a/src/network/netdev/veth.h b/src/network/netdev/veth.h
index 90cd5d42d78..034a9c8a471 100644
--- a/src/network/netdev/veth.h
+++ b/src/network/netdev/veth.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/network/netdev/vlan.c b/src/network/netdev/vlan.c
index cf32710e398..055fe7681fc 100644
--- a/src/network/netdev/vlan.c
+++ b/src/network/netdev/vlan.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/network/netdev/vlan.h b/src/network/netdev/vlan.h
index d05b8a5df93..a78053ae0cc 100644
--- a/src/network/netdev/vlan.h
+++ b/src/network/netdev/vlan.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/network/netdev/vrf.c b/src/network/netdev/vrf.c
index 0825695d619..ec3390e2aad 100644
--- a/src/network/netdev/vrf.c
+++ b/src/network/netdev/vrf.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2016 Andreas Rammhold <andreas@rammhold.de>
 ***/
 
diff --git a/src/network/netdev/vrf.h b/src/network/netdev/vrf.h
index e8effb80501..feb6f6ef8ad 100644
--- a/src/network/netdev/vrf.h
+++ b/src/network/netdev/vrf.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2016 Andreas Rammhold <andreas@rammhold.de>
 ***/
 
diff --git a/src/network/netdev/vxcan.c b/src/network/netdev/vxcan.c
index 7cae934f629..512381c7bfc 100644
--- a/src/network/netdev/vxcan.c
+++ b/src/network/netdev/vxcan.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2017 Susant Sahani
 ***/
 
diff --git a/src/network/netdev/vxcan.h b/src/network/netdev/vxcan.h
index a8af01ba33c..e835c3f3cb3 100644
--- a/src/network/netdev/vxcan.h
+++ b/src/network/netdev/vxcan.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2017 Susant Sahani
 ***/
 
diff --git a/src/network/netdev/vxlan.c b/src/network/netdev/vxlan.c
index ce9d27577e0..59a629bf4c0 100644
--- a/src/network/netdev/vxlan.c
+++ b/src/network/netdev/vxlan.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Susant Sahani
 ***/
 
diff --git a/src/network/netdev/vxlan.h b/src/network/netdev/vxlan.h
index 6ab58c55ea8..09d0a263d4c 100644
--- a/src/network/netdev/vxlan.h
+++ b/src/network/netdev/vxlan.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/network/netdev/wireguard.c b/src/network/netdev/wireguard.c
index c79f2d283d6..d534e971273 100644
--- a/src/network/netdev/wireguard.c
+++ b/src/network/netdev/wireguard.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2016-2017 Jörg Thalheim <joerg@thalheim.io>
   Copyright 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
 ***/
diff --git a/src/network/netdev/wireguard.h b/src/network/netdev/wireguard.h
index b6bdeeae4c6..906a1288984 100644
--- a/src/network/netdev/wireguard.h
+++ b/src/network/netdev/wireguard.h
@@ -1,8 +1,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2016 Jörg Thalheim <joerg@thalheim.io>
 ***/
 
diff --git a/src/network/networkctl.c b/src/network/networkctl.c
index ccfab40b4df..d3f4667351b 100644
--- a/src/network/networkctl.c
+++ b/src/network/networkctl.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/network/networkd-address-label.c b/src/network/networkd-address-label.c
index 6cdbd82561f..cb964cbda28 100644
--- a/src/network/networkd-address-label.c
+++ b/src/network/networkd-address-label.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2017 Susant Sahani
 ***/
 
diff --git a/src/network/networkd-address-label.h b/src/network/networkd-address-label.h
index 31c890923bb..d8eff4d5897 100644
--- a/src/network/networkd-address-label.h
+++ b/src/network/networkd-address-label.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2017 Susant Sahani
 ***/
 
diff --git a/src/network/networkd-address-pool.c b/src/network/networkd-address-pool.c
index e594f1f055d..8319ec3ac19 100644
--- a/src/network/networkd-address-pool.c
+++ b/src/network/networkd-address-pool.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/network/networkd-address-pool.h b/src/network/networkd-address-pool.h
index bc335fc70af..fe4486cd401 100644
--- a/src/network/networkd-address-pool.h
+++ b/src/network/networkd-address-pool.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c
index b77586959f6..d019d85bdd2 100644
--- a/src/network/networkd-address.c
+++ b/src/network/networkd-address.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/network/networkd-address.h b/src/network/networkd-address.h
index de26dbad71d..a2c49a6f35c 100644
--- a/src/network/networkd-address.h
+++ b/src/network/networkd-address.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/network/networkd-brvlan.c b/src/network/networkd-brvlan.c
index eb35684ac9e..9ae9e9b4e36 100644
--- a/src/network/networkd-brvlan.c
+++ b/src/network/networkd-brvlan.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright (C) 2016 BISDN GmbH. All rights reserved.
 ***/
 
diff --git a/src/network/networkd-brvlan.h b/src/network/networkd-brvlan.h
index 4bc7b8985ad..714f213b198 100644
--- a/src/network/networkd-brvlan.h
+++ b/src/network/networkd-brvlan.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright (C) 2016 BISDN GmbH. All rights reserved.
 ***/
 
diff --git a/src/network/networkd-conf.c b/src/network/networkd-conf.c
index 72c65d2e498..dc5f17172dc 100644
--- a/src/network/networkd-conf.c
+++ b/src/network/networkd-conf.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Vinay Kulkarni <kulkarniv@vmware.com>
  ***/
 
diff --git a/src/network/networkd-conf.h b/src/network/networkd-conf.h
index dfe463ecfbd..806928eaf5b 100644
--- a/src/network/networkd-conf.h
+++ b/src/network/networkd-conf.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Vinay Kulkarni <kulkarniv@vmware.com>
 ***/
 
diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c
index 3e7c7da5ac5..82f41bc7082 100644
--- a/src/network/networkd-dhcp4.c
+++ b/src/network/networkd-dhcp4.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013-2014 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c
index 3f8346fee8a..08e867ad940 100644
--- a/src/network/networkd-dhcp6.c
+++ b/src/network/networkd-dhcp6.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright (C) 2014 Intel Corporation. All rights reserved.
 ***/
 
diff --git a/src/network/networkd-fdb.c b/src/network/networkd-fdb.c
index 2cb014e83d8..fb249835656 100644
--- a/src/network/networkd-fdb.c
+++ b/src/network/networkd-fdb.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright (C) 2014 Intel Corporation. All rights reserved.
 ***/
 
diff --git a/src/network/networkd-fdb.h b/src/network/networkd-fdb.h
index e3ab53ab9f9..03bacb24fb9 100644
--- a/src/network/networkd-fdb.h
+++ b/src/network/networkd-fdb.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright (C) 2014 Intel Corporation. All rights reserved.
 ***/
 
diff --git a/src/network/networkd-ipv4ll.c b/src/network/networkd-ipv4ll.c
index 2f2da8b5cef..29ac10cbee5 100644
--- a/src/network/networkd-ipv4ll.c
+++ b/src/network/networkd-ipv4ll.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013-2014 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/network/networkd-ipv6-proxy-ndp.c b/src/network/networkd-ipv6-proxy-ndp.c
index 4e4f5fa865b..b1964456724 100644
--- a/src/network/networkd-ipv6-proxy-ndp.c
+++ b/src/network/networkd-ipv6-proxy-ndp.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2017 Florian Klink <flokli@flokli.de>
 ***/
 
diff --git a/src/network/networkd-ipv6-proxy-ndp.h b/src/network/networkd-ipv6-proxy-ndp.h
index b50db8f9fe9..cc7e3717386 100644
--- a/src/network/networkd-ipv6-proxy-ndp.h
+++ b/src/network/networkd-ipv6-proxy-ndp.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2017 Florian Klink <flokli@flokli.de>
 ***/
 
diff --git a/src/network/networkd-link-bus.c b/src/network/networkd-link-bus.c
index a28c93478e0..e03b38b5fd0 100644
--- a/src/network/networkd-link-bus.c
+++ b/src/network/networkd-link-bus.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2015 Tom Gundersen
 ***/
 
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 07827884f33..72227255c44 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/network/networkd-link.h b/src/network/networkd-link.h
index a3ea1f8bf82..a42d084411b 100644
--- a/src/network/networkd-link.h
+++ b/src/network/networkd-link.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/network/networkd-lldp-tx.c b/src/network/networkd-lldp-tx.c
index a2121eb5fff..9356e528afa 100644
--- a/src/network/networkd-lldp-tx.c
+++ b/src/network/networkd-lldp-tx.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 ***/
 
diff --git a/src/network/networkd-lldp-tx.h b/src/network/networkd-lldp-tx.h
index 0e2a49b7621..b06ee1a9972 100644
--- a/src/network/networkd-lldp-tx.h
+++ b/src/network/networkd-lldp-tx.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 ***/
 
diff --git a/src/network/networkd-manager-bus.c b/src/network/networkd-manager-bus.c
index 248427d6bdc..25b6fb23a69 100644
--- a/src/network/networkd-manager-bus.c
+++ b/src/network/networkd-manager-bus.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2015 Tom Gundersen
 ***/
 
diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
index f02b13e28be..ec5cad1bf56 100644
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Tom Gundersen <teg@jklm.no>
  ***/
 
diff --git a/src/network/networkd-manager.h b/src/network/networkd-manager.h
index 01705f4ae33..533a3fb7cd4 100644
--- a/src/network/networkd-manager.h
+++ b/src/network/networkd-manager.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c
index 63b047e4dd1..c3cb9a4e71e 100644
--- a/src/network/networkd-ndisc.c
+++ b/src/network/networkd-ndisc.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright (C) 2014 Intel Corporation. All rights reserved.
 ***/
 
diff --git a/src/network/networkd-ndisc.h b/src/network/networkd-ndisc.h
index e29c0a9ad08..8b6ec4b9a1a 100644
--- a/src/network/networkd-ndisc.h
+++ b/src/network/networkd-ndisc.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/network/networkd-network-bus.c b/src/network/networkd-network-bus.c
index 159537b19ae..b0acb57a512 100644
--- a/src/network/networkd-network-bus.c
+++ b/src/network/networkd-network-bus.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2015 Tom Gundersen
 ***/
 
diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index 7e47245a36a..3b42a754356 100644
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/network/networkd-network.h b/src/network/networkd-network.h
index 0d5f3050a52..25ea1593c1d 100644
--- a/src/network/networkd-network.h
+++ b/src/network/networkd-network.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/network/networkd-radv.c b/src/network/networkd-radv.c
index 14927b04396..cfc8f40da80 100644
--- a/src/network/networkd-radv.c
+++ b/src/network/networkd-radv.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright (C) 2017 Intel Corporation. All rights reserved.
 ***/
 
diff --git a/src/network/networkd-radv.h b/src/network/networkd-radv.h
index 17c961b4114..871d7bc4c3a 100644
--- a/src/network/networkd-radv.h
+++ b/src/network/networkd-radv.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2017 Intel Corporation. All rights reserved.
 ***/
 
diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c
index 369e4534288..ea26cb03a7a 100644
--- a/src/network/networkd-route.c
+++ b/src/network/networkd-route.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/network/networkd-route.h b/src/network/networkd-route.h
index 61a81b4150f..263ce6e4f8b 100644
--- a/src/network/networkd-route.h
+++ b/src/network/networkd-route.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/network/networkd-routing-policy-rule.c b/src/network/networkd-routing-policy-rule.c
index 0abb8803b7a..91cb0155b1a 100644
--- a/src/network/networkd-routing-policy-rule.c
+++ b/src/network/networkd-routing-policy-rule.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2017 Susant Sahani
 ***/
 
diff --git a/src/network/networkd-routing-policy-rule.h b/src/network/networkd-routing-policy-rule.h
index 98d2eeb0e52..03f26ede3a7 100644
--- a/src/network/networkd-routing-policy-rule.h
+++ b/src/network/networkd-routing-policy-rule.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2017 Susant Sahani
 ***/
 
diff --git a/src/network/networkd-util.c b/src/network/networkd-util.c
index e7d28461b76..782e86a943f 100644
--- a/src/network/networkd-util.c
+++ b/src/network/networkd-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/network/networkd-util.h b/src/network/networkd-util.h
index 4e338d0af7b..1f47c355610 100644
--- a/src/network/networkd-util.h
+++ b/src/network/networkd-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/network/networkd.c b/src/network/networkd.c
index 4100b4c219d..5f5697c8701 100644
--- a/src/network/networkd.c
+++ b/src/network/networkd.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/network/test-network.c b/src/network/test-network.c
index 3ffc4b95ab2..9d8e3528a0e 100644
--- a/src/network/test-network.c
+++ b/src/network/test-network.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/network/test-networkd-conf.c b/src/network/test-networkd-conf.c
index 87d9aca8f4c..6ca796d110e 100644
--- a/src/network/test-networkd-conf.c
+++ b/src/network/test-networkd-conf.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2016 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/network/test-routing-policy-rule.c b/src/network/test-routing-policy-rule.c
index b78e747e30d..e1db78d4def 100644
--- a/src/network/test-routing-policy-rule.c
+++ b/src/network/test-routing-policy-rule.c
@@ -1,8 +1,6 @@
 /***
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2017 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/network/wait-online/link.c b/src/network/wait-online/link.c
index 790e1457a41..0daacce09e1 100644
--- a/src/network/wait-online/link.c
+++ b/src/network/wait-online/link.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
   Copyright 2014 Tom Gundersen
 ***/
diff --git a/src/network/wait-online/link.h b/src/network/wait-online/link.h
index ef7c535ad1e..04194cf65af 100644
--- a/src/network/wait-online/link.h
+++ b/src/network/wait-online/link.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
   Copyright 2014 Tom Gundersen
 ***/
diff --git a/src/network/wait-online/manager.c b/src/network/wait-online/manager.c
index 25c9bf55a0a..e60ffcd59f3 100644
--- a/src/network/wait-online/manager.c
+++ b/src/network/wait-online/manager.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/network/wait-online/manager.h b/src/network/wait-online/manager.h
index dcb470bad77..59c9b60a354 100644
--- a/src/network/wait-online/manager.h
+++ b/src/network/wait-online/manager.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/network/wait-online/wait-online.c b/src/network/wait-online/wait-online.c
index c12b073cc7d..782f5f13989 100644
--- a/src/network/wait-online/wait-online.c
+++ b/src/network/wait-online/wait-online.c
@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/notify/notify.c b/src/notify/notify.c
index fc075ac029f..b55f91cbd35 100644
--- a/src/notify/notify.c
+++ b/src/notify/notify.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/nspawn/nspawn-cgroup.c b/src/nspawn/nspawn-cgroup.c
index 761d737dc9d..7c9caa28236 100644
--- a/src/nspawn/nspawn-cgroup.c
+++ b/src/nspawn/nspawn-cgroup.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/nspawn/nspawn-cgroup.h b/src/nspawn/nspawn-cgroup.h
index 7639b483ae7..153b820aeba 100644
--- a/src/nspawn/nspawn-cgroup.h
+++ b/src/nspawn/nspawn-cgroup.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/nspawn/nspawn-def.h b/src/nspawn/nspawn-def.h
index e2bd235c525..68b6206e0ae 100644
--- a/src/nspawn/nspawn-def.h
+++ b/src/nspawn/nspawn-def.h
@@ -1,8 +1,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2017 Lennart Poettering
 ***/
 
diff --git a/src/nspawn/nspawn-expose-ports.c b/src/nspawn/nspawn-expose-ports.c
index 3c7fd5e5b55..96cbf19dad7 100644
--- a/src/nspawn/nspawn-expose-ports.c
+++ b/src/nspawn/nspawn-expose-ports.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/nspawn/nspawn-expose-ports.h b/src/nspawn/nspawn-expose-ports.h
index 89d51b8f5f3..5ba2713f46f 100644
--- a/src/nspawn/nspawn-expose-ports.h
+++ b/src/nspawn/nspawn-expose-ports.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/nspawn/nspawn-mount.c b/src/nspawn/nspawn-mount.c
index 8a4634f53e9..3c27c5be8fb 100644
--- a/src/nspawn/nspawn-mount.c
+++ b/src/nspawn/nspawn-mount.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/nspawn/nspawn-mount.h b/src/nspawn/nspawn-mount.h
index 6a34199b7dd..7a77e795996 100644
--- a/src/nspawn/nspawn-mount.h
+++ b/src/nspawn/nspawn-mount.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/nspawn/nspawn-network.c b/src/nspawn/nspawn-network.c
index bb30ea6154d..257e8203d13 100644
--- a/src/nspawn/nspawn-network.c
+++ b/src/nspawn/nspawn-network.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/nspawn/nspawn-network.h b/src/nspawn/nspawn-network.h
index 0440d77c7e5..02e2d388fb2 100644
--- a/src/nspawn/nspawn-network.h
+++ b/src/nspawn/nspawn-network.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/nspawn/nspawn-patch-uid.c b/src/nspawn/nspawn-patch-uid.c
index 9067d3004dc..edb87ecb1d9 100644
--- a/src/nspawn/nspawn-patch-uid.c
+++ b/src/nspawn/nspawn-patch-uid.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 ***/
 
diff --git a/src/nspawn/nspawn-patch-uid.h b/src/nspawn/nspawn-patch-uid.h
index 3a931b22405..dd215b6512c 100644
--- a/src/nspawn/nspawn-patch-uid.h
+++ b/src/nspawn/nspawn-patch-uid.h
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 ***/
 
diff --git a/src/nspawn/nspawn-register.c b/src/nspawn/nspawn-register.c
index 05849e468bf..d1354238c2e 100644
--- a/src/nspawn/nspawn-register.c
+++ b/src/nspawn/nspawn-register.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/nspawn/nspawn-register.h b/src/nspawn/nspawn-register.h
index 7aa59f674fe..b8f10ebe35d 100644
--- a/src/nspawn/nspawn-register.h
+++ b/src/nspawn/nspawn-register.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/nspawn/nspawn-seccomp.c b/src/nspawn/nspawn-seccomp.c
index fa290685c01..008d013af6b 100644
--- a/src/nspawn/nspawn-seccomp.c
+++ b/src/nspawn/nspawn-seccomp.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 ***/
 
diff --git a/src/nspawn/nspawn-seccomp.h b/src/nspawn/nspawn-seccomp.h
index 1654c586d27..907f5356eb1 100644
--- a/src/nspawn/nspawn-seccomp.h
+++ b/src/nspawn/nspawn-seccomp.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 ***/
 
diff --git a/src/nspawn/nspawn-settings.c b/src/nspawn/nspawn-settings.c
index 126335da582..5dd2405729c 100644
--- a/src/nspawn/nspawn-settings.c
+++ b/src/nspawn/nspawn-settings.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/nspawn/nspawn-settings.h b/src/nspawn/nspawn-settings.h
index 28a0d8b8e10..431d12a8d21 100644
--- a/src/nspawn/nspawn-settings.h
+++ b/src/nspawn/nspawn-settings.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/nspawn/nspawn-setuid.c b/src/nspawn/nspawn-setuid.c
index 40209cea630..8f92608bdc7 100644
--- a/src/nspawn/nspawn-setuid.c
+++ b/src/nspawn/nspawn-setuid.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/nspawn/nspawn-setuid.h b/src/nspawn/nspawn-setuid.h
index 579a3bd47c2..14f11e39c36 100644
--- a/src/nspawn/nspawn-setuid.h
+++ b/src/nspawn/nspawn-setuid.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/nspawn/nspawn-stub-pid1.c b/src/nspawn/nspawn-stub-pid1.c
index fc53931144f..691f35027a3 100644
--- a/src/nspawn/nspawn-stub-pid1.c
+++ b/src/nspawn/nspawn-stub-pid1.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 ***/
 
diff --git a/src/nspawn/nspawn-stub-pid1.h b/src/nspawn/nspawn-stub-pid1.h
index 8ea002a0c21..d9e4fa612de 100644
--- a/src/nspawn/nspawn-stub-pid1.h
+++ b/src/nspawn/nspawn-stub-pid1.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 ***/
 
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 2fcbf64af71..613de2cd233 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/nspawn/test-patch-uid.c b/src/nspawn/test-patch-uid.c
index b69d5ae0cbc..275b1d6f8f4 100644
--- a/src/nspawn/test-patch-uid.c
+++ b/src/nspawn/test-patch-uid.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 ***/
 
diff --git a/src/nss-myhostname/nss-myhostname.c b/src/nss-myhostname/nss-myhostname.c
index 0fdafb69b79..5d8fa645fd8 100644
--- a/src/nss-myhostname/nss-myhostname.c
+++ b/src/nss-myhostname/nss-myhostname.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2008-2011 Lennart Poettering
 ***/
 
diff --git a/src/nss-myhostname/nss-myhostname.sym b/src/nss-myhostname/nss-myhostname.sym
index 0dcdb9bd408..fc7aa99574b 100644
--- a/src/nss-myhostname/nss-myhostname.sym
+++ b/src/nss-myhostname/nss-myhostname.sym
@@ -1,8 +1,6 @@
 /***
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   systemd is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published by
   the Free Software Foundation; either version 2.1 of the License, or
diff --git a/src/nss-mymachines/nss-mymachines.c b/src/nss-mymachines/nss-mymachines.c
index 96e7d69bcb7..36141ccf149 100644
--- a/src/nss-mymachines/nss-mymachines.c
+++ b/src/nss-mymachines/nss-mymachines.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/nss-mymachines/nss-mymachines.sym b/src/nss-mymachines/nss-mymachines.sym
index 056d4276f96..ade64474a2d 100644
--- a/src/nss-mymachines/nss-mymachines.sym
+++ b/src/nss-mymachines/nss-mymachines.sym
@@ -1,8 +1,6 @@
 /***
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   systemd is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published by
   the Free Software Foundation; either version 2.1 of the License, or
diff --git a/src/nss-resolve/nss-resolve.c b/src/nss-resolve/nss-resolve.c
index 2044be9ede9..23d917ff2fe 100644
--- a/src/nss-resolve/nss-resolve.c
+++ b/src/nss-resolve/nss-resolve.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/nss-resolve/nss-resolve.sym b/src/nss-resolve/nss-resolve.sym
index 27570dfce4f..e690a0092f1 100644
--- a/src/nss-resolve/nss-resolve.sym
+++ b/src/nss-resolve/nss-resolve.sym
@@ -1,8 +1,6 @@
 /***
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   systemd is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published by
   the Free Software Foundation; either version 2.1 of the License, or
diff --git a/src/nss-systemd/nss-systemd.c b/src/nss-systemd/nss-systemd.c
index 875a874d19e..ea8fa89034a 100644
--- a/src/nss-systemd/nss-systemd.c
+++ b/src/nss-systemd/nss-systemd.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 ***/
 
diff --git a/src/nss-systemd/nss-systemd.sym b/src/nss-systemd/nss-systemd.sym
index 95038c833b2..ff63382b152 100644
--- a/src/nss-systemd/nss-systemd.sym
+++ b/src/nss-systemd/nss-systemd.sym
@@ -1,8 +1,6 @@
 /***
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   systemd is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published by
   the Free Software Foundation; either version 2.1 of the License, or
diff --git a/src/partition/growfs.c b/src/partition/growfs.c
index 78ae978cc29..6010f7ab23d 100644
--- a/src/partition/growfs.c
+++ b/src/partition/growfs.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2017 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/partition/makefs.c b/src/partition/makefs.c
index aaee6e8d6e1..d932b780acb 100644
--- a/src/partition/makefs.c
+++ b/src/partition/makefs.c
@@ -1,8 +1,6 @@
 /***
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2017 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/path/path.c b/src/path/path.c
index ea6442991b0..2a394f85b49 100644
--- a/src/path/path.c
+++ b/src/path/path.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/quotacheck/quotacheck.c b/src/quotacheck/quotacheck.c
index 6adb30a0157..c6717ab6102 100644
--- a/src/quotacheck/quotacheck.c
+++ b/src/quotacheck/quotacheck.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/random-seed/random-seed.c b/src/random-seed/random-seed.c
index 0fbcb313c9e..64fd542377e 100644
--- a/src/random-seed/random-seed.c
+++ b/src/random-seed/random-seed.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/rc-local-generator/rc-local-generator.c b/src/rc-local-generator/rc-local-generator.c
index e6122d415e7..9e4e67cb268 100644
--- a/src/rc-local-generator/rc-local-generator.c
+++ b/src/rc-local-generator/rc-local-generator.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
   Copyright 2011 Michal Schmidt
 ***/
diff --git a/src/remount-fs/remount-fs.c b/src/remount-fs/remount-fs.c
index 1652e6237cf..9f36e891f40 100644
--- a/src/remount-fs/remount-fs.c
+++ b/src/remount-fs/remount-fs.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/reply-password/reply-password.c b/src/reply-password/reply-password.c
index 7570c278b75..1d8b5de5f8d 100644
--- a/src/reply-password/reply-password.c
+++ b/src/reply-password/reply-password.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/resolve/dns-type.c b/src/resolve/dns-type.c
index d98cff2e4ec..3f77aa4e417 100644
--- a/src/resolve/dns-type.c
+++ b/src/resolve/dns-type.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/resolve/dns-type.h b/src/resolve/dns-type.h
index 4145d01fd53..323f85d20fc 100644
--- a/src/resolve/dns-type.h
+++ b/src/resolve/dns-type.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c
index f8cc2df81e4..b2e4ab24902 100644
--- a/src/resolve/resolvectl.c
+++ b/src/resolve/resolvectl.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/resolve/resolved-bus.c b/src/resolve/resolved-bus.c
index 03a29619f17..976c077a8a6 100644
--- a/src/resolve/resolved-bus.c
+++ b/src/resolve/resolved-bus.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/resolve/resolved-bus.h b/src/resolve/resolved-bus.h
index 1afd01634a4..eb6d4e73f56 100644
--- a/src/resolve/resolved-bus.h
+++ b/src/resolve/resolved-bus.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/resolve/resolved-conf.c b/src/resolve/resolved-conf.c
index 237e3717f2e..60d32a023ee 100644
--- a/src/resolve/resolved-conf.c
+++ b/src/resolve/resolved-conf.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Tom Gundersen <teg@jklm.no>
  ***/
 
diff --git a/src/resolve/resolved-conf.h b/src/resolve/resolved-conf.h
index aa710afa6ca..f439c9e6192 100644
--- a/src/resolve/resolved-conf.h
+++ b/src/resolve/resolved-conf.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/resolve/resolved-def.h b/src/resolve/resolved-def.h
index 61cee37b2dc..b342d9a4384 100644
--- a/src/resolve/resolved-def.h
+++ b/src/resolve/resolved-def.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/resolve/resolved-dns-answer.c b/src/resolve/resolved-dns-answer.c
index d95343f466c..0643ca170ca 100644
--- a/src/resolve/resolved-dns-answer.c
+++ b/src/resolve/resolved-dns-answer.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/resolve/resolved-dns-answer.h b/src/resolve/resolved-dns-answer.h
index ca1e266f131..0f516860b1e 100644
--- a/src/resolve/resolved-dns-answer.h
+++ b/src/resolve/resolved-dns-answer.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/resolve/resolved-dns-cache.c b/src/resolve/resolved-dns-cache.c
index 26698124fa5..7893ac054dc 100644
--- a/src/resolve/resolved-dns-cache.c
+++ b/src/resolve/resolved-dns-cache.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/resolve/resolved-dns-cache.h b/src/resolve/resolved-dns-cache.h
index dbf0c5ddcb4..3231998c13e 100644
--- a/src/resolve/resolved-dns-cache.h
+++ b/src/resolve/resolved-dns-cache.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/resolve/resolved-dns-dnssec.c b/src/resolve/resolved-dns-dnssec.c
index b6944bb1e1f..3376215a584 100644
--- a/src/resolve/resolved-dns-dnssec.c
+++ b/src/resolve/resolved-dns-dnssec.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/resolve/resolved-dns-dnssec.h b/src/resolve/resolved-dns-dnssec.h
index f2201b5d390..f1895f511dd 100644
--- a/src/resolve/resolved-dns-dnssec.h
+++ b/src/resolve/resolved-dns-dnssec.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/resolve/resolved-dns-packet.c b/src/resolve/resolved-dns-packet.c
index 48c799786ca..603648b05d2 100644
--- a/src/resolve/resolved-dns-packet.c
+++ b/src/resolve/resolved-dns-packet.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
  ***/
 
diff --git a/src/resolve/resolved-dns-packet.h b/src/resolve/resolved-dns-packet.h
index 3a3a3e2fd5d..9ca1aab656e 100644
--- a/src/resolve/resolved-dns-packet.h
+++ b/src/resolve/resolved-dns-packet.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
  ***/
 
diff --git a/src/resolve/resolved-dns-query.c b/src/resolve/resolved-dns-query.c
index 4c591690758..c9c6c0aabcc 100644
--- a/src/resolve/resolved-dns-query.c
+++ b/src/resolve/resolved-dns-query.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/resolve/resolved-dns-query.h b/src/resolve/resolved-dns-query.h
index 0ada5b012af..0c836d799c3 100644
--- a/src/resolve/resolved-dns-query.h
+++ b/src/resolve/resolved-dns-query.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/resolve/resolved-dns-question.c b/src/resolve/resolved-dns-question.c
index 5416c474b45..afd8cefbe2f 100644
--- a/src/resolve/resolved-dns-question.c
+++ b/src/resolve/resolved-dns-question.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/resolve/resolved-dns-question.h b/src/resolve/resolved-dns-question.h
index fcfa16f8643..0feb7b601e6 100644
--- a/src/resolve/resolved-dns-question.h
+++ b/src/resolve/resolved-dns-question.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/resolve/resolved-dns-rr.c b/src/resolve/resolved-dns-rr.c
index 4d5682ec7ea..799bde62ca1 100644
--- a/src/resolve/resolved-dns-rr.c
+++ b/src/resolve/resolved-dns-rr.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/resolve/resolved-dns-rr.h b/src/resolve/resolved-dns-rr.h
index d900d6744a3..635ef552902 100644
--- a/src/resolve/resolved-dns-rr.h
+++ b/src/resolve/resolved-dns-rr.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
  ***/
 
diff --git a/src/resolve/resolved-dns-scope.c b/src/resolve/resolved-dns-scope.c
index a056980d02a..510fff01236 100644
--- a/src/resolve/resolved-dns-scope.c
+++ b/src/resolve/resolved-dns-scope.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/resolve/resolved-dns-scope.h b/src/resolve/resolved-dns-scope.h
index 989d0442464..353bd1f236d 100644
--- a/src/resolve/resolved-dns-scope.h
+++ b/src/resolve/resolved-dns-scope.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/resolve/resolved-dns-search-domain.c b/src/resolve/resolved-dns-search-domain.c
index ff1baa87b37..3bc8d084200 100644
--- a/src/resolve/resolved-dns-search-domain.c
+++ b/src/resolve/resolved-dns-search-domain.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/resolve/resolved-dns-search-domain.h b/src/resolve/resolved-dns-search-domain.h
index 3e08ab48edf..fa16c6d4455 100644
--- a/src/resolve/resolved-dns-search-domain.h
+++ b/src/resolve/resolved-dns-search-domain.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/resolve/resolved-dns-server.c b/src/resolve/resolved-dns-server.c
index 1b43b8e82f9..d826889fac3 100644
--- a/src/resolve/resolved-dns-server.c
+++ b/src/resolve/resolved-dns-server.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/resolve/resolved-dns-server.h b/src/resolve/resolved-dns-server.h
index ecdba25df36..acac1b5cc12 100644
--- a/src/resolve/resolved-dns-server.h
+++ b/src/resolve/resolved-dns-server.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/resolve/resolved-dns-stream.c b/src/resolve/resolved-dns-stream.c
index bd37077d503..53a47011c5d 100644
--- a/src/resolve/resolved-dns-stream.c
+++ b/src/resolve/resolved-dns-stream.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/resolve/resolved-dns-stream.h b/src/resolve/resolved-dns-stream.h
index 5542e9e2ba9..f1715272b8e 100644
--- a/src/resolve/resolved-dns-stream.h
+++ b/src/resolve/resolved-dns-stream.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/resolve/resolved-dns-stub.c b/src/resolve/resolved-dns-stub.c
index 298d8132be0..4ae411e87a6 100644
--- a/src/resolve/resolved-dns-stub.c
+++ b/src/resolve/resolved-dns-stub.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 ***/
 
diff --git a/src/resolve/resolved-dns-stub.h b/src/resolve/resolved-dns-stub.h
index 58cf1c476fa..8c48eb0ad65 100644
--- a/src/resolve/resolved-dns-stub.h
+++ b/src/resolve/resolved-dns-stub.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 ***/
 
diff --git a/src/resolve/resolved-dns-synthesize.c b/src/resolve/resolved-dns-synthesize.c
index 3ca8c9badb2..95fdbfb7025 100644
--- a/src/resolve/resolved-dns-synthesize.c
+++ b/src/resolve/resolved-dns-synthesize.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/resolve/resolved-dns-synthesize.h b/src/resolve/resolved-dns-synthesize.h
index 9eefd0c9be4..d7ef478ca3a 100644
--- a/src/resolve/resolved-dns-synthesize.h
+++ b/src/resolve/resolved-dns-synthesize.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 ***/
 
diff --git a/src/resolve/resolved-dns-transaction.c b/src/resolve/resolved-dns-transaction.c
index b72a990783b..e1898411ca8 100644
--- a/src/resolve/resolved-dns-transaction.c
+++ b/src/resolve/resolved-dns-transaction.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/resolve/resolved-dns-transaction.h b/src/resolve/resolved-dns-transaction.h
index 8b44f65f9a7..f9a7200b3ad 100644
--- a/src/resolve/resolved-dns-transaction.h
+++ b/src/resolve/resolved-dns-transaction.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/resolve/resolved-dns-trust-anchor.c b/src/resolve/resolved-dns-trust-anchor.c
index 69e36373302..9ccfe475914 100644
--- a/src/resolve/resolved-dns-trust-anchor.c
+++ b/src/resolve/resolved-dns-trust-anchor.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/resolve/resolved-dns-trust-anchor.h b/src/resolve/resolved-dns-trust-anchor.h
index c5e06778c9d..f3ea70c93a8 100644
--- a/src/resolve/resolved-dns-trust-anchor.h
+++ b/src/resolve/resolved-dns-trust-anchor.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/resolve/resolved-dns-zone.c b/src/resolve/resolved-dns-zone.c
index 6e8d064fc04..647bd70556b 100644
--- a/src/resolve/resolved-dns-zone.c
+++ b/src/resolve/resolved-dns-zone.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/resolve/resolved-dns-zone.h b/src/resolve/resolved-dns-zone.h
index 22e0d83a095..9f2387436f4 100644
--- a/src/resolve/resolved-dns-zone.h
+++ b/src/resolve/resolved-dns-zone.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/resolve/resolved-dnssd-bus.c b/src/resolve/resolved-dnssd-bus.c
index f264031066b..ed4f0477589 100644
--- a/src/resolve/resolved-dnssd-bus.c
+++ b/src/resolve/resolved-dnssd-bus.c
@@ -1,6 +1,4 @@
 /***
-  This file is part of systemd.
-
   Copyright 2017 Dmitry Rozhkov
 ***/
 
diff --git a/src/resolve/resolved-dnssd-bus.h b/src/resolve/resolved-dnssd-bus.h
index 45edaf0307d..10cad841e0d 100644
--- a/src/resolve/resolved-dnssd-bus.h
+++ b/src/resolve/resolved-dnssd-bus.h
@@ -1,8 +1,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2017 Dmitry Rozhkov
 ***/
 
diff --git a/src/resolve/resolved-dnssd.c b/src/resolve/resolved-dnssd.c
index 08b23072d6b..fc2c0634ae8 100644
--- a/src/resolve/resolved-dnssd.c
+++ b/src/resolve/resolved-dnssd.c
@@ -1,6 +1,4 @@
 /***
-  This file is part of systemd.
-
   Copyright 2017 Dmitry Rozhkov
 ***/
 
diff --git a/src/resolve/resolved-dnssd.h b/src/resolve/resolved-dnssd.h
index 2ae8a0b1198..33656b177ed 100644
--- a/src/resolve/resolved-dnssd.h
+++ b/src/resolve/resolved-dnssd.h
@@ -1,8 +1,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2017 Dmitry Rozhkov
 ***/
 
diff --git a/src/resolve/resolved-etc-hosts.c b/src/resolve/resolved-etc-hosts.c
index 179906c607c..0543797fb36 100644
--- a/src/resolve/resolved-etc-hosts.c
+++ b/src/resolve/resolved-etc-hosts.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 ***/
 
diff --git a/src/resolve/resolved-etc-hosts.h b/src/resolve/resolved-etc-hosts.h
index ad0b40d65d6..5d55d813a54 100644
--- a/src/resolve/resolved-etc-hosts.h
+++ b/src/resolve/resolved-etc-hosts.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 ***/
 
diff --git a/src/resolve/resolved-link-bus.c b/src/resolve/resolved-link-bus.c
index 0ef8aebaa00..11d18e8efb6 100644
--- a/src/resolve/resolved-link-bus.c
+++ b/src/resolve/resolved-link-bus.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 ***/
 
diff --git a/src/resolve/resolved-link-bus.h b/src/resolve/resolved-link-bus.h
index 1383f7959ee..77d0af716e9 100644
--- a/src/resolve/resolved-link-bus.h
+++ b/src/resolve/resolved-link-bus.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 ***/
 
diff --git a/src/resolve/resolved-link.c b/src/resolve/resolved-link.c
index 8e7db29f9fd..60ef9e3a439 100644
--- a/src/resolve/resolved-link.c
+++ b/src/resolve/resolved-link.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/resolve/resolved-link.h b/src/resolve/resolved-link.h
index 58a9c239bd8..2ab25541114 100644
--- a/src/resolve/resolved-link.h
+++ b/src/resolve/resolved-link.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/resolve/resolved-llmnr.c b/src/resolve/resolved-llmnr.c
index 9eef59be0df..2de6f7e4a3b 100644
--- a/src/resolve/resolved-llmnr.c
+++ b/src/resolve/resolved-llmnr.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Tom Gundersen <teg@jklm.no>
  ***/
 
diff --git a/src/resolve/resolved-llmnr.h b/src/resolve/resolved-llmnr.h
index 298fbd92886..d8953fe31c0 100644
--- a/src/resolve/resolved-llmnr.h
+++ b/src/resolve/resolved-llmnr.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c
index 39f83f77151..dd41630251d 100644
--- a/src/resolve/resolved-manager.c
+++ b/src/resolve/resolved-manager.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Tom Gundersen <teg@jklm.no>
  ***/
 
diff --git a/src/resolve/resolved-manager.h b/src/resolve/resolved-manager.h
index df4f774f491..fb87b8e60bb 100644
--- a/src/resolve/resolved-manager.h
+++ b/src/resolve/resolved-manager.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/resolve/resolved-mdns.c b/src/resolve/resolved-mdns.c
index f54a204c93a..564593a82c3 100644
--- a/src/resolve/resolved-mdns.c
+++ b/src/resolve/resolved-mdns.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2015 Daniel Mack
  ***/
 
diff --git a/src/resolve/resolved-mdns.h b/src/resolve/resolved-mdns.h
index e09faf059ac..29dd378b7a4 100644
--- a/src/resolve/resolved-mdns.h
+++ b/src/resolve/resolved-mdns.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2015 Daniel Mack
 ***/
 
diff --git a/src/resolve/resolved-resolv-conf.c b/src/resolve/resolved-resolv-conf.c
index e514a1e060a..0fbe4658da8 100644
--- a/src/resolve/resolved-resolv-conf.c
+++ b/src/resolve/resolved-resolv-conf.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Tom Gundersen <teg@jklm.no>
  ***/
 
diff --git a/src/resolve/resolved-resolv-conf.h b/src/resolve/resolved-resolv-conf.h
index 2ce052e4977..e1a141ebb06 100644
--- a/src/resolve/resolved-resolv-conf.h
+++ b/src/resolve/resolved-resolv-conf.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/resolve/resolved.c b/src/resolve/resolved.c
index 5e4b5d3d86e..3f16974f1c9 100644
--- a/src/resolve/resolved.c
+++ b/src/resolve/resolved.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/resolve/test-dns-packet.c b/src/resolve/test-dns-packet.c
index db22868b88e..9aadbd7c180 100644
--- a/src/resolve/test-dns-packet.c
+++ b/src/resolve/test-dns-packet.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd
-
   Copyright 2016 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/resolve/test-dnssec-complex.c b/src/resolve/test-dnssec-complex.c
index 168ea5bc368..e20f6444be3 100644
--- a/src/resolve/test-dnssec-complex.c
+++ b/src/resolve/test-dnssec-complex.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 ***/
 
diff --git a/src/resolve/test-dnssec.c b/src/resolve/test-dnssec.c
index de93c6a9a70..e59c64eabbd 100644
--- a/src/resolve/test-dnssec.c
+++ b/src/resolve/test-dnssec.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/resolve/test-resolve-tables.c b/src/resolve/test-resolve-tables.c
index 40bee9bf950..564243be5ad 100644
--- a/src/resolve/test-resolve-tables.c
+++ b/src/resolve/test-resolve-tables.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd
-
   Copyright 2013 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/resolve/test-resolved-packet.c b/src/resolve/test-resolved-packet.c
index 076984a5d23..ea6f7960110 100644
--- a/src/resolve/test-resolved-packet.c
+++ b/src/resolve/test-resolved-packet.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd
-
   Copyright 2017 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/rfkill/rfkill.c b/src/rfkill/rfkill.c
index 330c4e8629b..49dc416f622 100644
--- a/src/rfkill/rfkill.c
+++ b/src/rfkill/rfkill.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/run/run.c b/src/run/run.c
index 733daffb8cb..02b92904df5 100644
--- a/src/run/run.c
+++ b/src/run/run.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/shared/acl-util.c b/src/shared/acl-util.c
index 8699b3b4a6b..7f6bfde0de1 100644
--- a/src/shared/acl-util.c
+++ b/src/shared/acl-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2011,2013 Lennart Poettering
 ***/
 
diff --git a/src/shared/acl-util.h b/src/shared/acl-util.h
index df71540f459..221266c3877 100644
--- a/src/shared/acl-util.h
+++ b/src/shared/acl-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/shared/acpi-fpdt.c b/src/shared/acpi-fpdt.c
index f2c2ffa9c74..a07ed94327c 100644
--- a/src/shared/acpi-fpdt.c
+++ b/src/shared/acpi-fpdt.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Kay Sievers
 ***/
 
diff --git a/src/shared/acpi-fpdt.h b/src/shared/acpi-fpdt.h
index eb99fb41de3..f59d2566c56 100644
--- a/src/shared/acpi-fpdt.h
+++ b/src/shared/acpi-fpdt.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Kay Sievers
 ***/
 
diff --git a/src/shared/apparmor-util.c b/src/shared/apparmor-util.c
index 88398ed8b77..a52347b3743 100644
--- a/src/shared/apparmor-util.c
+++ b/src/shared/apparmor-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/shared/apparmor-util.h b/src/shared/apparmor-util.h
index a87de1a4502..54544b87349 100644
--- a/src/shared/apparmor-util.h
+++ b/src/shared/apparmor-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/shared/ask-password-api.c b/src/shared/ask-password-api.c
index d70fc309dcc..fdabf68962d 100644
--- a/src/shared/ask-password-api.c
+++ b/src/shared/ask-password-api.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/shared/ask-password-api.h b/src/shared/ask-password-api.h
index cba4541f648..2196dbdf4bd 100644
--- a/src/shared/ask-password-api.h
+++ b/src/shared/ask-password-api.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c
index 5bc10de9fb7..0e54ed29e6c 100644
--- a/src/shared/base-filesystem.c
+++ b/src/shared/base-filesystem.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Kay Sievers
 ***/
 
diff --git a/src/shared/base-filesystem.h b/src/shared/base-filesystem.h
index b7ce668d1c8..d4f339faef7 100644
--- a/src/shared/base-filesystem.h
+++ b/src/shared/base-filesystem.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Kay Sievers
 ***/
 
diff --git a/src/shared/boot-timestamps.c b/src/shared/boot-timestamps.c
index 05ff8dae7cd..62d5c52a781 100644
--- a/src/shared/boot-timestamps.c
+++ b/src/shared/boot-timestamps.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
   Copyright 2013 Kay Sievers
 ***/
diff --git a/src/shared/boot-timestamps.h b/src/shared/boot-timestamps.h
index bcd6b92eb0e..c39c5a2e769 100644
--- a/src/shared/boot-timestamps.h
+++ b/src/shared/boot-timestamps.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
   Copyright 2013 Kay Sievers
 ***/
diff --git a/src/shared/bootspec.c b/src/shared/bootspec.c
index a0d1f81df87..a3fbf2c3f5f 100644
--- a/src/shared/bootspec.c
+++ b/src/shared/bootspec.c
@@ -1,6 +1,4 @@
 /***
-  This file is part of systemd.
-
   Copyright 2017 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/shared/bootspec.h b/src/shared/bootspec.h
index 820c0131e00..6cb0d1a49e7 100644
--- a/src/shared/bootspec.h
+++ b/src/shared/bootspec.h
@@ -1,6 +1,4 @@
 /***
-  This file is part of systemd.
-
   Copyright 2017 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c
index 01d820349ab..222a6ed88d8 100644
--- a/src/shared/bus-unit-util.c
+++ b/src/shared/bus-unit-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 ***/
 
diff --git a/src/shared/bus-unit-util.h b/src/shared/bus-unit-util.h
index 934ca21fc4c..dbceb3b5039 100644
--- a/src/shared/bus-unit-util.h
+++ b/src/shared/bus-unit-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 ***/
 
diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c
index 888002368ad..6eaff20a4ac 100644
--- a/src/shared/bus-util.c
+++ b/src/shared/bus-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/shared/bus-util.h b/src/shared/bus-util.h
index 7a9f2ea78b1..e248099b35b 100644
--- a/src/shared/bus-util.h
+++ b/src/shared/bus-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/shared/cgroup-show.c b/src/shared/cgroup-show.c
index 4db638a8749..24ce622daea 100644
--- a/src/shared/cgroup-show.c
+++ b/src/shared/cgroup-show.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/shared/cgroup-show.h b/src/shared/cgroup-show.h
index fb02415702a..02218463131 100644
--- a/src/shared/cgroup-show.h
+++ b/src/shared/cgroup-show.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/shared/clean-ipc.c b/src/shared/clean-ipc.c
index 21ccfd75e5b..b0c9a45126f 100644
--- a/src/shared/clean-ipc.c
+++ b/src/shared/clean-ipc.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/shared/clean-ipc.h b/src/shared/clean-ipc.h
index c8c6de6d073..b78f94f6637 100644
--- a/src/shared/clean-ipc.h
+++ b/src/shared/clean-ipc.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/shared/condition.c b/src/shared/condition.c
index 18ab1f89f95..9f2b91f79cb 100644
--- a/src/shared/condition.c
+++ b/src/shared/condition.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/shared/condition.h b/src/shared/condition.h
index 814984c8660..ce270781019 100644
--- a/src/shared/condition.h
+++ b/src/shared/condition.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
index b1250850d5a..8570f877e6b 100644
--- a/src/shared/conf-parser.c
+++ b/src/shared/conf-parser.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/shared/conf-parser.h b/src/shared/conf-parser.h
index 3a13e6e71ea..cd972abc3a5 100644
--- a/src/shared/conf-parser.h
+++ b/src/shared/conf-parser.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/shared/dev-setup.c b/src/shared/dev-setup.c
index bb594065364..4f9c0f42851 100644
--- a/src/shared/dev-setup.c
+++ b/src/shared/dev-setup.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010-2012 Lennart Poettering
 ***/
 
diff --git a/src/shared/dev-setup.h b/src/shared/dev-setup.h
index a3f19b5b699..268b57f1a7e 100644
--- a/src/shared/dev-setup.h
+++ b/src/shared/dev-setup.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010-2012 Lennart Poettering
 ***/
 
diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c
index 25d1611f3d2..249f043f96a 100644
--- a/src/shared/dissect-image.c
+++ b/src/shared/dissect-image.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 ***/
 
diff --git a/src/shared/dissect-image.h b/src/shared/dissect-image.h
index 037fbab3f7a..23acc8a5ab6 100644
--- a/src/shared/dissect-image.h
+++ b/src/shared/dissect-image.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 ***/
 
diff --git a/src/shared/dns-domain.c b/src/shared/dns-domain.c
index f7f544c96c7..b2f5dd5b3b2 100644
--- a/src/shared/dns-domain.c
+++ b/src/shared/dns-domain.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
  ***/
 
diff --git a/src/shared/dns-domain.h b/src/shared/dns-domain.h
index e680288344b..d49e07e436d 100644
--- a/src/shared/dns-domain.h
+++ b/src/shared/dns-domain.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
  ***/
 
diff --git a/src/shared/dropin.c b/src/shared/dropin.c
index 0fc02914ac7..ab28e60825c 100644
--- a/src/shared/dropin.c
+++ b/src/shared/dropin.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/shared/dropin.h b/src/shared/dropin.h
index fa6f5402f90..e1b9a3deae4 100644
--- a/src/shared/dropin.h
+++ b/src/shared/dropin.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/shared/efivars.c b/src/shared/efivars.c
index 6a8ded98f79..09b1aae51f8 100644
--- a/src/shared/efivars.c
+++ b/src/shared/efivars.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/shared/efivars.h b/src/shared/efivars.h
index 050649bce2d..9ee90519ed2 100644
--- a/src/shared/efivars.h
+++ b/src/shared/efivars.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/shared/fdset.c b/src/shared/fdset.c
index a6eccff6925..e6ae032d0a5 100644
--- a/src/shared/fdset.c
+++ b/src/shared/fdset.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/shared/fdset.h b/src/shared/fdset.h
index 178b9abf794..986c8785000 100644
--- a/src/shared/fdset.h
+++ b/src/shared/fdset.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/shared/firewall-util.c b/src/shared/firewall-util.c
index a87151d90dd..a047a6969e0 100644
--- a/src/shared/firewall-util.c
+++ b/src/shared/firewall-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/shared/firewall-util.h b/src/shared/firewall-util.h
index 5b56b7a2f4a..d6920d9611e 100644
--- a/src/shared/firewall-util.h
+++ b/src/shared/firewall-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/shared/fstab-util.c b/src/shared/fstab-util.c
index 3b4e51a6d4f..3f8c161a812 100644
--- a/src/shared/fstab-util.c
+++ b/src/shared/fstab-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2015 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/shared/fstab-util.h b/src/shared/fstab-util.h
index 3297a09e826..a1c9457f9e9 100644
--- a/src/shared/fstab-util.h
+++ b/src/shared/fstab-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2015 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/shared/generator.c b/src/shared/generator.c
index d5682871562..d828986b663 100644
--- a/src/shared/generator.c
+++ b/src/shared/generator.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/shared/generator.h b/src/shared/generator.h
index 948dab87435..b2b348425de 100644
--- a/src/shared/generator.h
+++ b/src/shared/generator.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/shared/gpt.h b/src/shared/gpt.h
index 58e034e83c4..18789443a4e 100644
--- a/src/shared/gpt.h
+++ b/src/shared/gpt.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/shared/ima-util.c b/src/shared/ima-util.c
index ae27748de4e..3d9e6457efd 100644
--- a/src/shared/ima-util.c
+++ b/src/shared/ima-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/shared/ima-util.h b/src/shared/ima-util.h
index ccb0580f809..de0a55ac3a9 100644
--- a/src/shared/ima-util.h
+++ b/src/shared/ima-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/shared/import-util.c b/src/shared/import-util.c
index 933229387e3..43ffd1246cc 100644
--- a/src/shared/import-util.c
+++ b/src/shared/import-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/shared/import-util.h b/src/shared/import-util.h
index 4ec98ad13e7..c3bdd2ab32e 100644
--- a/src/shared/import-util.h
+++ b/src/shared/import-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/shared/install-printf.c b/src/shared/install-printf.c
index 599300ceb43..f0a53add60a 100644
--- a/src/shared/install-printf.c
+++ b/src/shared/install-printf.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/shared/install-printf.h b/src/shared/install-printf.h
index 0b929afb21e..3f7a21431d7 100644
--- a/src/shared/install-printf.h
+++ b/src/shared/install-printf.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/shared/install.c b/src/shared/install.c
index 6f2b9db26c5..92c73913c5a 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/shared/install.h b/src/shared/install.h
index be980b128e0..992b258e975 100644
--- a/src/shared/install.h
+++ b/src/shared/install.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/shared/journal-util.c b/src/shared/journal-util.c
index 722e067e0b6..2830923fe3c 100644
--- a/src/shared/journal-util.c
+++ b/src/shared/journal-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Zbigniew Jędrzejewski-Szmek
   Copyright 2015 Lennart Poettering
 ***/
diff --git a/src/shared/journal-util.h b/src/shared/journal-util.h
index f28e4162b35..6834d2fb8dc 100644
--- a/src/shared/journal-util.h
+++ b/src/shared/journal-util.h
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Zbigniew Jędrzejewski-Szmek
   Copyright 2015 Lennart Poettering
 ***/
diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c
index 5af23e44d70..55ee1135f73 100644
--- a/src/shared/logs-show.c
+++ b/src/shared/logs-show.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/shared/logs-show.h b/src/shared/logs-show.h
index 68e234a0ef4..f346a8d63ff 100644
--- a/src/shared/logs-show.h
+++ b/src/shared/logs-show.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/shared/loop-util.c b/src/shared/loop-util.c
index 09139d1629c..9039c8f486d 100644
--- a/src/shared/loop-util.c
+++ b/src/shared/loop-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 ***/
 
diff --git a/src/shared/loop-util.h b/src/shared/loop-util.h
index 94720ce7a31..95e822ef522 100644
--- a/src/shared/loop-util.h
+++ b/src/shared/loop-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 ***/
 
diff --git a/src/shared/machine-image.c b/src/shared/machine-image.c
index 404dd2aace0..a259b183010 100644
--- a/src/shared/machine-image.c
+++ b/src/shared/machine-image.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/shared/machine-image.h b/src/shared/machine-image.h
index 60868fac945..b291ff0992c 100644
--- a/src/shared/machine-image.h
+++ b/src/shared/machine-image.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/shared/machine-pool.c b/src/shared/machine-pool.c
index f2b0bb76a12..dbdbcbfcc7b 100644
--- a/src/shared/machine-pool.c
+++ b/src/shared/machine-pool.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/shared/machine-pool.h b/src/shared/machine-pool.h
index 179c7ffd92a..f76c825f85d 100644
--- a/src/shared/machine-pool.h
+++ b/src/shared/machine-pool.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/shared/nsflags.c b/src/shared/nsflags.c
index baac16bbb4d..81d21260ebf 100644
--- a/src/shared/nsflags.c
+++ b/src/shared/nsflags.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 ***/
 
diff --git a/src/shared/nsflags.h b/src/shared/nsflags.h
index 2133a6c1be9..749956e20a6 100644
--- a/src/shared/nsflags.h
+++ b/src/shared/nsflags.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 ***/
 
diff --git a/src/shared/output-mode.c b/src/shared/output-mode.c
index 1bb161794a7..e1d7bbfa251 100644
--- a/src/shared/output-mode.c
+++ b/src/shared/output-mode.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/shared/output-mode.h b/src/shared/output-mode.h
index a44d5286756..84f78fe2f78 100644
--- a/src/shared/output-mode.h
+++ b/src/shared/output-mode.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c
index e71af2f7cb7..beb38228e68 100644
--- a/src/shared/path-lookup.c
+++ b/src/shared/path-lookup.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/shared/path-lookup.h b/src/shared/path-lookup.h
index 3f1a19b3f19..92083af5f52 100644
--- a/src/shared/path-lookup.h
+++ b/src/shared/path-lookup.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/shared/ptyfwd.c b/src/shared/ptyfwd.c
index 0bd66875217..8be39172d5c 100644
--- a/src/shared/ptyfwd.c
+++ b/src/shared/ptyfwd.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010-2013 Lennart Poettering
 ***/
 
diff --git a/src/shared/ptyfwd.h b/src/shared/ptyfwd.h
index a79f5fab51f..08069e08bc0 100644
--- a/src/shared/ptyfwd.h
+++ b/src/shared/ptyfwd.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010-2013 Lennart Poettering
 ***/
 
diff --git a/src/shared/resolve-util.c b/src/shared/resolve-util.c
index 72f8bca823f..f988f587350 100644
--- a/src/shared/resolve-util.c
+++ b/src/shared/resolve-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 ***/
 
diff --git a/src/shared/resolve-util.h b/src/shared/resolve-util.h
index b7c2fdffc5f..4d962e6167f 100644
--- a/src/shared/resolve-util.h
+++ b/src/shared/resolve-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 ***/
 
diff --git a/src/shared/seccomp-util.c b/src/shared/seccomp-util.c
index cddfc05bd36..8c28651d0b7 100644
--- a/src/shared/seccomp-util.c
+++ b/src/shared/seccomp-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/shared/seccomp-util.h b/src/shared/seccomp-util.h
index d6cb56de2c6..0aba9fcc875 100644
--- a/src/shared/seccomp-util.h
+++ b/src/shared/seccomp-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/shared/sleep-config.c b/src/shared/sleep-config.c
index efc547b6c03..bce6840a404 100644
--- a/src/shared/sleep-config.c
+++ b/src/shared/sleep-config.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Zbigniew Jędrzejewski-Szmek
   Copyright 2018 Dell Inc.
 ***/
diff --git a/src/shared/sleep-config.h b/src/shared/sleep-config.h
index c1f381522a6..ea96f67b40b 100644
--- a/src/shared/sleep-config.h
+++ b/src/shared/sleep-config.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/shared/spawn-ask-password-agent.c b/src/shared/spawn-ask-password-agent.c
index 874799f0de5..9db8b6d1e74 100644
--- a/src/shared/spawn-ask-password-agent.c
+++ b/src/shared/spawn-ask-password-agent.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/shared/spawn-ask-password-agent.h b/src/shared/spawn-ask-password-agent.h
index ee40b8998e6..8c249f5b9cd 100644
--- a/src/shared/spawn-ask-password-agent.h
+++ b/src/shared/spawn-ask-password-agent.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/shared/spawn-polkit-agent.c b/src/shared/spawn-polkit-agent.c
index 062e0210c48..03a1faf686f 100644
--- a/src/shared/spawn-polkit-agent.c
+++ b/src/shared/spawn-polkit-agent.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/shared/spawn-polkit-agent.h b/src/shared/spawn-polkit-agent.h
index c4316ea4739..cf4a473606c 100644
--- a/src/shared/spawn-polkit-agent.h
+++ b/src/shared/spawn-polkit-agent.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/shared/specifier.c b/src/shared/specifier.c
index c4b2bdc12d7..9e77a1f362e 100644
--- a/src/shared/specifier.c
+++ b/src/shared/specifier.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/shared/specifier.h b/src/shared/specifier.h
index 33c0e2727e7..cdd415ba641 100644
--- a/src/shared/specifier.h
+++ b/src/shared/specifier.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/shared/switch-root.c b/src/shared/switch-root.c
index f97984b61aa..4be18ac62f7 100644
--- a/src/shared/switch-root.c
+++ b/src/shared/switch-root.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Harald Hoyer, Lennart Poettering
 ***/
 
diff --git a/src/shared/switch-root.h b/src/shared/switch-root.h
index 0ae5205f77d..01aaaa13d00 100644
--- a/src/shared/switch-root.h
+++ b/src/shared/switch-root.h
@@ -3,8 +3,6 @@
 
 #include <stdbool.h>
 /***
-  This file is part of systemd.
-
   Copyright 2012 Harald Hoyer, Lennart Poettering
 ***/
 
diff --git a/src/shared/sysctl-util.c b/src/shared/sysctl-util.c
index 3b6b67c4494..372baa45403 100644
--- a/src/shared/sysctl-util.c
+++ b/src/shared/sysctl-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/shared/sysctl-util.h b/src/shared/sysctl-util.h
index cbabb3506ae..33b4fd58dcf 100644
--- a/src/shared/sysctl-util.h
+++ b/src/shared/sysctl-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/shared/test-tables.h b/src/shared/test-tables.h
index baef26c2f4c..b8c3df1d6f7 100644
--- a/src/shared/test-tables.h
+++ b/src/shared/test-tables.h
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd
-
   Copyright 2013 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/shared/tests.c b/src/shared/tests.c
index b81768ceb68..05be15ec694 100644
--- a/src/shared/tests.c
+++ b/src/shared/tests.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 ***/
 
diff --git a/src/shared/tests.h b/src/shared/tests.h
index 674a7923a3d..be2375add66 100644
--- a/src/shared/tests.h
+++ b/src/shared/tests.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 ***/
 
diff --git a/src/shared/tomoyo-util.c b/src/shared/tomoyo-util.c
index 04390f13747..ce00165d1cf 100644
--- a/src/shared/tomoyo-util.c
+++ b/src/shared/tomoyo-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2017 Shawn Landden
 ***/
 
diff --git a/src/shared/tomoyo-util.h b/src/shared/tomoyo-util.h
index 5e2bcfe05fb..82e741056dc 100644
--- a/src/shared/tomoyo-util.h
+++ b/src/shared/tomoyo-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2017 Shawn Landden
 ***/
 
diff --git a/src/shared/udev-util.c b/src/shared/udev-util.c
index a5ed8e8f6bf..2a6023cb8ad 100644
--- a/src/shared/udev-util.c
+++ b/src/shared/udev-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2017 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/shared/udev-util.h b/src/shared/udev-util.h
index ce40f695e8b..080c854943f 100644
--- a/src/shared/udev-util.h
+++ b/src/shared/udev-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/shared/uid-range.c b/src/shared/uid-range.c
index 7542bdf15f1..986f5f7f0b8 100644
--- a/src/shared/uid-range.c
+++ b/src/shared/uid-range.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/shared/uid-range.h b/src/shared/uid-range.h
index adb7772d2cf..99b14cd45b4 100644
--- a/src/shared/uid-range.h
+++ b/src/shared/uid-range.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/shared/utmp-wtmp.c b/src/shared/utmp-wtmp.c
index 5ecc23f6e57..1d58a5a2e0f 100644
--- a/src/shared/utmp-wtmp.c
+++ b/src/shared/utmp-wtmp.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/shared/utmp-wtmp.h b/src/shared/utmp-wtmp.h
index 23cb03b31a9..1b7e7eace95 100644
--- a/src/shared/utmp-wtmp.h
+++ b/src/shared/utmp-wtmp.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/shared/vlan-util.c b/src/shared/vlan-util.c
index 35e186d6363..99dc9299f9d 100644
--- a/src/shared/vlan-util.c
+++ b/src/shared/vlan-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 ***/
 
diff --git a/src/shared/vlan-util.h b/src/shared/vlan-util.h
index f28b767b8bf..3d014dae3db 100644
--- a/src/shared/vlan-util.h
+++ b/src/shared/vlan-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 ***/
 
diff --git a/src/shared/volatile-util.c b/src/shared/volatile-util.c
index a20f0b43f45..e4d717d6624 100644
--- a/src/shared/volatile-util.c
+++ b/src/shared/volatile-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/shared/volatile-util.h b/src/shared/volatile-util.h
index 4312c97a995..b3cd4772312 100644
--- a/src/shared/volatile-util.h
+++ b/src/shared/volatile-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 ***/
 
diff --git a/src/shared/watchdog.c b/src/shared/watchdog.c
index ec124a9fd4b..9f4c82f1ebc 100644
--- a/src/shared/watchdog.c
+++ b/src/shared/watchdog.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/shared/watchdog.h b/src/shared/watchdog.h
index 8502ebeb106..2491170762d 100644
--- a/src/shared/watchdog.h
+++ b/src/shared/watchdog.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c
index 4c11001d4eb..508a03429cf 100644
--- a/src/sleep/sleep.c
+++ b/src/sleep/sleep.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
   Copyright 2013 Zbigniew Jędrzejewski-Szmek
   Copyright 2010-2017 Canonical
diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c
index 9fa7359cb75..f5446a131ef 100644
--- a/src/socket-proxy/socket-proxyd.c
+++ b/src/socket-proxy/socket-proxyd.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 David Strauss
  ***/
 
diff --git a/src/stdio-bridge/stdio-bridge.c b/src/stdio-bridge/stdio-bridge.c
index 6be8218da29..8152083bd7e 100644
--- a/src/stdio-bridge/stdio-bridge.c
+++ b/src/stdio-bridge/stdio-bridge.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/sulogin-shell/sulogin-shell.c b/src/sulogin-shell/sulogin-shell.c
index 98b4b2f3668..beff99c43ba 100644
--- a/src/sulogin-shell/sulogin-shell.c
+++ b/src/sulogin-shell/sulogin-shell.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2017 Felipe Sateler
 ***/
 
diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c
index a719ea1f9d8..4572cba7230 100644
--- a/src/sysctl/sysctl.c
+++ b/src/sysctl/sysctl.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/system-update-generator/system-update-generator.c b/src/system-update-generator/system-update-generator.c
index 0741d9a02c1..4e2e0edb5e9 100644
--- a/src/system-update-generator/system-update-generator.c
+++ b/src/system-update-generator/system-update-generator.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index c9d2912e135..50eee328654 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
   Copyright 2013 Marc-Antoine Perennou
 ***/
diff --git a/src/systemd/_sd-common.h b/src/systemd/_sd-common.h
index b4400e7b362..4eceb791e1b 100644
--- a/src/systemd/_sd-common.h
+++ b/src/systemd/_sd-common.h
@@ -3,8 +3,6 @@
 #define foosdcommonhfoo
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 
   systemd is free software; you can redistribute it and/or modify it
diff --git a/src/systemd/sd-bus-protocol.h b/src/systemd/sd-bus-protocol.h
index 63e3702fbf4..9cae64c6e69 100644
--- a/src/systemd/sd-bus-protocol.h
+++ b/src/systemd/sd-bus-protocol.h
@@ -3,8 +3,6 @@
 #define foosdbusprotocolhfoo
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 
   systemd is free software; you can redistribute it and/or modify it
diff --git a/src/systemd/sd-bus-vtable.h b/src/systemd/sd-bus-vtable.h
index 425e38e2e25..ac2cea0a65a 100644
--- a/src/systemd/sd-bus-vtable.h
+++ b/src/systemd/sd-bus-vtable.h
@@ -3,8 +3,6 @@
 #define foosdbusvtablehfoo
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 
   systemd is free software; you can redistribute it and/or modify it
diff --git a/src/systemd/sd-bus.h b/src/systemd/sd-bus.h
index a1b15706633..cb4dcd937ee 100644
--- a/src/systemd/sd-bus.h
+++ b/src/systemd/sd-bus.h
@@ -3,8 +3,6 @@
 #define foosdbushfoo
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 
   systemd is free software; you can redistribute it and/or modify it
diff --git a/src/systemd/sd-daemon.h b/src/systemd/sd-daemon.h
index 9772a05dad2..a2798fc7f3a 100644
--- a/src/systemd/sd-daemon.h
+++ b/src/systemd/sd-daemon.h
@@ -3,8 +3,6 @@
 #define foosddaemonhfoo
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 
   systemd is free software; you can redistribute it and/or modify it
diff --git a/src/systemd/sd-device.h b/src/systemd/sd-device.h
index 6ac0b13c0c2..8ddf02fa8c7 100644
--- a/src/systemd/sd-device.h
+++ b/src/systemd/sd-device.h
@@ -3,8 +3,6 @@
 #define foosddevicehfoo
 
 /***
-  This file is part of systemd.
-
   Copyright 2008-2012 Kay Sievers <kay@vrfy.org>
   Copyright 2014-2015 Tom Gundersen <teg@jklm.no>
 
diff --git a/src/systemd/sd-dhcp-client.h b/src/systemd/sd-dhcp-client.h
index fd0a5693629..9b5ffb322d3 100644
--- a/src/systemd/sd-dhcp-client.h
+++ b/src/systemd/sd-dhcp-client.h
@@ -3,8 +3,6 @@
 #define foosddhcpclienthfoo
 
 /***
-  This file is part of systemd.
-
   Copyright (C) 2013 Intel Corporation. All rights reserved.
 
   systemd is free software; you can redistribute it and/or modify it
diff --git a/src/systemd/sd-dhcp-lease.h b/src/systemd/sd-dhcp-lease.h
index 3cc7fcabe39..b4c8406d97f 100644
--- a/src/systemd/sd-dhcp-lease.h
+++ b/src/systemd/sd-dhcp-lease.h
@@ -3,8 +3,6 @@
 #define foosddhcpleasehfoo
 
 /***
-  This file is part of systemd.
-
   Copyright (C) 2013 Intel Corporation. All rights reserved.
   Copyright (C) 2014 Tom Gundersen
 
diff --git a/src/systemd/sd-dhcp-server.h b/src/systemd/sd-dhcp-server.h
index 9d39e43b98a..c9b2b499176 100644
--- a/src/systemd/sd-dhcp-server.h
+++ b/src/systemd/sd-dhcp-server.h
@@ -3,8 +3,6 @@
 #define foosddhcpserverhfoo
 
 /***
-  This file is part of systemd.
-
   Copyright (C) 2013 Intel Corporation. All rights reserved.
   Copyright (C) 2014 Tom Gundersen
 
diff --git a/src/systemd/sd-dhcp6-client.h b/src/systemd/sd-dhcp6-client.h
index cadb32a0513..4eed81dfc30 100644
--- a/src/systemd/sd-dhcp6-client.h
+++ b/src/systemd/sd-dhcp6-client.h
@@ -3,8 +3,6 @@
 #define foosddhcp6clienthfoo
 
 /***
-  This file is part of systemd.
-
   Copyright (C) 2014 Intel Corporation. All rights reserved.
 
   systemd is free software; you can redistribute it and/or modify it
diff --git a/src/systemd/sd-dhcp6-lease.h b/src/systemd/sd-dhcp6-lease.h
index 22a5f8ce753..8f56ce8be39 100644
--- a/src/systemd/sd-dhcp6-lease.h
+++ b/src/systemd/sd-dhcp6-lease.h
@@ -3,8 +3,6 @@
 #define foosddhcp6leasehfoo
 
 /***
-  This file is part of systemd.
-
   Copyright (C) 2014 Tom Gundersen
   Copyright (C) 2014-2015 Intel Corporation. All rights reserved.
 
diff --git a/src/systemd/sd-event.h b/src/systemd/sd-event.h
index fc5a75b6b64..2fc122a97ff 100644
--- a/src/systemd/sd-event.h
+++ b/src/systemd/sd-event.h
@@ -3,8 +3,6 @@
 #define foosdeventhfoo
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 
   systemd is free software; you can redistribute it and/or modify it
diff --git a/src/systemd/sd-hwdb.h b/src/systemd/sd-hwdb.h
index fd69aaf3d42..b96d6b65f27 100644
--- a/src/systemd/sd-hwdb.h
+++ b/src/systemd/sd-hwdb.h
@@ -3,8 +3,6 @@
 #define foosdhwdbhfoo
 
 /***
-  This file is part of systemd.
-
   Copyright 2008-2012 Kay Sievers <kay@vrfy.org>
   Copyright 2014 Tom Gundersen <teg@jklm.no>
 
diff --git a/src/systemd/sd-id128.h b/src/systemd/sd-id128.h
index 67fc595669f..2da9c7ae137 100644
--- a/src/systemd/sd-id128.h
+++ b/src/systemd/sd-id128.h
@@ -3,8 +3,6 @@
 #define foosdid128hfoo
 
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 
   systemd is free software; you can redistribute it and/or modify it
diff --git a/src/systemd/sd-ipv4acd.h b/src/systemd/sd-ipv4acd.h
index 677ae3b2165..6cee06b9206 100644
--- a/src/systemd/sd-ipv4acd.h
+++ b/src/systemd/sd-ipv4acd.h
@@ -3,8 +3,6 @@
 #define foosdipv4acdfoo
 
 /***
-  This file is part of systemd.
-
   Copyright (C) 2014 Axis Communications AB. All rights reserved.
   Copyright (C) 2015 Tom Gundersen
 
diff --git a/src/systemd/sd-ipv4ll.h b/src/systemd/sd-ipv4ll.h
index c330b0ae9e9..b95f0c6fd11 100644
--- a/src/systemd/sd-ipv4ll.h
+++ b/src/systemd/sd-ipv4ll.h
@@ -3,8 +3,6 @@
 #define foosdipv4llfoo
 
 /***
-  This file is part of systemd.
-
   Copyright (C) 2014 Axis Communications AB. All rights reserved.
 
   systemd is free software; you can redistribute it and/or modify it
diff --git a/src/systemd/sd-journal.h b/src/systemd/sd-journal.h
index 2a70d5e8188..d036a40048a 100644
--- a/src/systemd/sd-journal.h
+++ b/src/systemd/sd-journal.h
@@ -3,8 +3,6 @@
 #define foosdjournalhfoo
 
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 
   systemd is free software; you can redistribute it and/or modify it
diff --git a/src/systemd/sd-lldp.h b/src/systemd/sd-lldp.h
index 0a76fa63143..1f7de1bfcb4 100644
--- a/src/systemd/sd-lldp.h
+++ b/src/systemd/sd-lldp.h
@@ -3,8 +3,6 @@
 #define foosdlldphfoo
 
 /***
-  This file is part of systemd.
-
   Copyright (C) 2014 Tom Gundersen
   Copyright (C) 2014 Susant Sahani
 
diff --git a/src/systemd/sd-login.h b/src/systemd/sd-login.h
index d8e2c6822dd..b4f064d2d63 100644
--- a/src/systemd/sd-login.h
+++ b/src/systemd/sd-login.h
@@ -3,8 +3,6 @@
 #define foosdloginhfoo
 
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 
   systemd is free software; you can redistribute it and/or modify it
diff --git a/src/systemd/sd-messages.h b/src/systemd/sd-messages.h
index 5a3f78bdbc2..d090c1e5496 100644
--- a/src/systemd/sd-messages.h
+++ b/src/systemd/sd-messages.h
@@ -3,8 +3,6 @@
 #define foosdmessageshfoo
 
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 
   systemd is free software; you can redistribute it and/or modify it
diff --git a/src/systemd/sd-ndisc.h b/src/systemd/sd-ndisc.h
index 152114507ae..0a5447593ff 100644
--- a/src/systemd/sd-ndisc.h
+++ b/src/systemd/sd-ndisc.h
@@ -3,8 +3,6 @@
 #define foosdndiscfoo
 
 /***
-  This file is part of systemd.
-
   Copyright (C) 2014 Intel Corporation. All rights reserved.
 
   systemd is free software; you can redistribute it and/or modify it
diff --git a/src/systemd/sd-netlink.h b/src/systemd/sd-netlink.h
index e742807e92c..b390c261e80 100644
--- a/src/systemd/sd-netlink.h
+++ b/src/systemd/sd-netlink.h
@@ -3,8 +3,6 @@
 #define foosdnetlinkhfoo
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Tom Gundersen <teg@jklm.no>
 
   systemd is free software; you can redistribute it and/or modify it
diff --git a/src/systemd/sd-network.h b/src/systemd/sd-network.h
index 45b5ed9c454..230905df52e 100644
--- a/src/systemd/sd-network.h
+++ b/src/systemd/sd-network.h
@@ -3,8 +3,6 @@
 #define foosdnetworkhfoo
 
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
   Copyright 2014 Tom Gundersen
 
diff --git a/src/systemd/sd-path.h b/src/systemd/sd-path.h
index 19f48b73ebb..7c68d0e4fc4 100644
--- a/src/systemd/sd-path.h
+++ b/src/systemd/sd-path.h
@@ -3,8 +3,6 @@
 #define foosdpathhfoo
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 
   systemd is free software; you can redistribute it and/or modify it
diff --git a/src/systemd/sd-radv.h b/src/systemd/sd-radv.h
index 9d4ba87447f..05654aa7471 100644
--- a/src/systemd/sd-radv.h
+++ b/src/systemd/sd-radv.h
@@ -3,8 +3,6 @@
 #define foosdradvfoo
 
 /***
-  This file is part of systemd.
-
   Copyright (C) 2017 Intel Corporation. All rights reserved.
 
   systemd is free software; you can redistribute it and/or modify it
diff --git a/src/systemd/sd-resolve.h b/src/systemd/sd-resolve.h
index d4921e95590..c0e14620c6d 100644
--- a/src/systemd/sd-resolve.h
+++ b/src/systemd/sd-resolve.h
@@ -3,8 +3,6 @@
 #define foosdresolvehfoo
 
 /***
-  This file is part of systemd.
-
   Copyright 2005-2014 Lennart Poettering
 
   systemd is free software; you can redistribute it and/or modify it
diff --git a/src/systemd/sd-utf8.h b/src/systemd/sd-utf8.h
index cd02c6a296f..ea8e779f04b 100644
--- a/src/systemd/sd-utf8.h
+++ b/src/systemd/sd-utf8.h
@@ -3,8 +3,6 @@
 #define foosdutf8hfoo
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 
   systemd is free software; you can redistribute it and/or modify it
diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c
index ccb3fca8f2f..5a6659bb5aa 100644
--- a/src/sysusers/sysusers.c
+++ b/src/sysusers/sysusers.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c
index 24b1c4e0839..43ebcc442d0 100644
--- a/src/sysv-generator/sysv-generator.c
+++ b/src/sysv-generator/sysv-generator.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Thomas H.P. Andersen
   Copyright 2010 Lennart Poettering
   Copyright 2011 Michal Schmidt
diff --git a/src/test/test-acl-util.c b/src/test/test-acl-util.c
index 6be57af277b..f509d94fa40 100644
--- a/src/test/test-acl-util.c
+++ b/src/test/test-acl-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2015 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/test/test-af-list.c b/src/test/test-af-list.c
index f8687b7354a..bf066f2083c 100644
--- a/src/test/test-af-list.c
+++ b/src/test/test-af-list.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd
-
   Copyright 2015 Daniel Mack
 ***/
 
diff --git a/src/test/test-alloc-util.c b/src/test/test-alloc-util.c
index 549925126e0..23f008aeb9e 100644
--- a/src/test/test-alloc-util.c
+++ b/src/test/test-alloc-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/test/test-architecture.c b/src/test/test-architecture.c
index c04a56bb6d2..73d7e55f701 100644
--- a/src/test/test-architecture.c
+++ b/src/test/test-architecture.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Kay Sievers
 ***/
 
diff --git a/src/test/test-arphrd-list.c b/src/test/test-arphrd-list.c
index efcfb5a85f9..48cd835ee22 100644
--- a/src/test/test-arphrd-list.c
+++ b/src/test/test-arphrd-list.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd
-
   Copyright 2015 Daniel Mack
 ***/
 
diff --git a/src/test/test-ask-password-api.c b/src/test/test-ask-password-api.c
index 3bd6e58cf0f..381ff44f4e7 100644
--- a/src/test/test-ask-password-api.c
+++ b/src/test/test-ask-password-api.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2016 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/test/test-async.c b/src/test/test-async.c
index d6523f5deb0..b88ce951cf1 100644
--- a/src/test/test-async.c
+++ b/src/test/test-async.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd
-
   Copyright 2014 Ronny Chevalier
 ***/
 
diff --git a/src/test/test-barrier.c b/src/test/test-barrier.c
index 0fdfa313105..a8b70b84313 100644
--- a/src/test/test-barrier.c
+++ b/src/test/test-barrier.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 David Herrmann <dh.herrmann@gmail.com>
 ***/
 
diff --git a/src/test/test-bitmap.c b/src/test/test-bitmap.c
index 124aacf0684..4ba89f5c857 100644
--- a/src/test/test-bitmap.c
+++ b/src/test/test-bitmap.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd
-
   Copyright 2015 Tom Gundersen
 ***/
 
diff --git a/src/test/test-boot-timestamps.c b/src/test/test-boot-timestamps.c
index 80f82bb63b4..ea2656ee5dd 100644
--- a/src/test/test-boot-timestamps.c
+++ b/src/test/test-boot-timestamps.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
   Copyright 2013 Kay Sievers
 ***/
diff --git a/src/test/test-bpf.c b/src/test/test-bpf.c
index ac7bb517ae0..5e30bb11b86 100644
--- a/src/test/test-bpf.c
+++ b/src/test/test-bpf.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2016 Daniel Mack
 ***/
 
diff --git a/src/test/test-btrfs.c b/src/test/test-btrfs.c
index 2203ea91c41..367b5fa6f20 100644
--- a/src/test/test-btrfs.c
+++ b/src/test/test-btrfs.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/test/test-calendarspec.c b/src/test/test-calendarspec.c
index 8053fdb0936..fb1467a5c70 100644
--- a/src/test/test-calendarspec.c
+++ b/src/test/test-calendarspec.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/test/test-cap-list.c b/src/test/test-cap-list.c
index 69157e9b57f..da0bf49a1d2 100644
--- a/src/test/test-cap-list.c
+++ b/src/test/test-cap-list.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/test/test-capability.c b/src/test/test-capability.c
index bf0e3a917c5..29199be9252 100644
--- a/src/test/test-capability.c
+++ b/src/test/test-capability.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd
-
   Copyright 2014 Ronny Chevalier
 ***/
 
diff --git a/src/test/test-cgroup-mask.c b/src/test/test-cgroup-mask.c
index 90e2cc8edbe..bdd0a87d2d3 100644
--- a/src/test/test-cgroup-mask.c
+++ b/src/test/test-cgroup-mask.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 David Strauss
 ***/
 
diff --git a/src/test/test-cgroup-util.c b/src/test/test-cgroup-util.c
index fc612b3d3a6..3e55efc51be 100644
--- a/src/test/test-cgroup-util.c
+++ b/src/test/test-cgroup-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/test/test-cgroup.c b/src/test/test-cgroup.c
index 352cb8a3710..97f17755d4f 100644
--- a/src/test/test-cgroup.c
+++ b/src/test/test-cgroup.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/test/test-clock.c b/src/test/test-clock.c
index 99cad384c76..fa77b5d25c7 100644
--- a/src/test/test-clock.c
+++ b/src/test/test-clock.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright (C) 2016 Canonical Ltd.
 ***/
 
diff --git a/src/test/test-condition.c b/src/test/test-condition.c
index eeea778679f..6ec9d51179c 100644
--- a/src/test/test-condition.c
+++ b/src/test/test-condition.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd
-
   Copyright 2014 Ronny Chevalier
 ***/
 
diff --git a/src/test/test-conf-files.c b/src/test/test-conf-files.c
index 7ace4828ac6..5654bc0dc8d 100644
--- a/src/test/test-conf-files.c
+++ b/src/test/test-conf-files.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Michael Marineau
 ***/
 
diff --git a/src/test/test-conf-parser.c b/src/test/test-conf-parser.c
index aa6e4f1a953..1dc1197a021 100644
--- a/src/test/test-conf-parser.c
+++ b/src/test/test-conf-parser.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2015 Ronny Chevalier
 ***/
 
diff --git a/src/test/test-copy.c b/src/test/test-copy.c
index a02746c76db..171c17fdc31 100644
--- a/src/test/test-copy.c
+++ b/src/test/test-copy.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd
-
   Copyright 2014 Ronny Chevalier
 ***/
 
diff --git a/src/test/test-cpu-set-util.c b/src/test/test-cpu-set-util.c
index 40956a3594d..104eb8678be 100644
--- a/src/test/test-cpu-set-util.c
+++ b/src/test/test-cpu-set-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/test/test-daemon.c b/src/test/test-daemon.c
index 668b26e86d7..c5c833c95fb 100644
--- a/src/test/test-daemon.c
+++ b/src/test/test-daemon.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/test/test-date.c b/src/test/test-date.c
index 8d6b41e5bdc..de820941b51 100644
--- a/src/test/test-date.c
+++ b/src/test/test-date.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/test/test-device-nodes.c b/src/test/test-device-nodes.c
index b6c179868a4..54c0b9f3542 100644
--- a/src/test/test-device-nodes.c
+++ b/src/test/test-device-nodes.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Dave Reisner
 ***/
 
diff --git a/src/test/test-dissect-image.c b/src/test/test-dissect-image.c
index 7f91dabdbff..fa248513fdc 100644
--- a/src/test/test-dissect-image.c
+++ b/src/test/test-dissect-image.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 ***/
 
diff --git a/src/test/test-dlopen.c b/src/test/test-dlopen.c
index febfc60e00e..56419c40322 100644
--- a/src/test/test-dlopen.c
+++ b/src/test/test-dlopen.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2016 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/test/test-dns-domain.c b/src/test/test-dns-domain.c
index fe03e142512..a6966c5dd98 100644
--- a/src/test/test-dns-domain.c
+++ b/src/test/test-dns-domain.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
  ***/
 
diff --git a/src/test/test-ellipsize.c b/src/test/test-ellipsize.c
index 7d6b2b5449c..8892a723ca2 100644
--- a/src/test/test-ellipsize.c
+++ b/src/test/test-ellipsize.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Shawn Landden
 ***/
 
diff --git a/src/test/test-engine.c b/src/test/test-engine.c
index 6d3b0a16276..adf6211b639 100644
--- a/src/test/test-engine.c
+++ b/src/test/test-engine.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/test/test-env-util.c b/src/test/test-env-util.c
index 504f450772a..6533baf97f6 100644
--- a/src/test/test-env-util.c
+++ b/src/test/test-env-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
   Copyright 2016 Zbigniew Jędrzejewski-Szmek
 ***/
diff --git a/src/test/test-escape.c b/src/test/test-escape.c
index 7364fef8b5f..5d9c4bf7729 100644
--- a/src/test/test-escape.c
+++ b/src/test/test-escape.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/test/test-exec-util.c b/src/test/test-exec-util.c
index c5166c6954a..46291d38b19 100644
--- a/src/test/test-exec-util.c
+++ b/src/test/test-exec-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
   Copyright 2013 Thomas H.P. Andersen
 ***/
diff --git a/src/test/test-execute.c b/src/test/test-execute.c
index 13d9ee54a5c..3f38a387c66 100644
--- a/src/test/test-execute.c
+++ b/src/test/test-execute.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Ronny Chevalier
 ***/
 
diff --git a/src/test/test-extract-word.c b/src/test/test-extract-word.c
index 6caa58b0b32..932705c41cd 100644
--- a/src/test/test-extract-word.c
+++ b/src/test/test-extract-word.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
   Copyright 2013 Thomas H.P. Andersen
 ***/
diff --git a/src/test/test-fd-util.c b/src/test/test-fd-util.c
index b1de8aca5cf..24f411bda40 100644
--- a/src/test/test-fd-util.c
+++ b/src/test/test-fd-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/test/test-fdset.c b/src/test/test-fdset.c
index 09b4f760b42..1c94dffe373 100644
--- a/src/test/test-fdset.c
+++ b/src/test/test-fdset.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd
-
   Copyright 2014 Ronny Chevalier
 ***/
 
diff --git a/src/test/test-fileio.c b/src/test/test-fileio.c
index 3476c412910..6f5adbaa170 100644
--- a/src/test/test-fileio.c
+++ b/src/test/test-fileio.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/test/test-firewall-util.c b/src/test/test-firewall-util.c
index ac70abad1b6..62cd3831542 100644
--- a/src/test/test-firewall-util.c
+++ b/src/test/test-firewall-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/test/test-fs-util.c b/src/test/test-fs-util.c
index 5a60ace9baf..96e3b3643a8 100644
--- a/src/test/test-fs-util.c
+++ b/src/test/test-fs-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/test/test-fstab-util.c b/src/test/test-fstab-util.c
index b87360db52d..05881e47fc5 100644
--- a/src/test/test-fstab-util.c
+++ b/src/test/test-fstab-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2015 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/test/test-glob-util.c b/src/test/test-glob-util.c
index 478e0305783..d725488121e 100644
--- a/src/test/test-glob-util.c
+++ b/src/test/test-glob-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/test/test-hash.c b/src/test/test-hash.c
index 79d9668a166..5b842bc6f97 100644
--- a/src/test/test-hash.c
+++ b/src/test/test-hash.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 ***/
 
diff --git a/src/test/test-hashmap-plain.c b/src/test/test-hashmap-plain.c
index f3b8598d1c8..56298844015 100644
--- a/src/test/test-hashmap-plain.c
+++ b/src/test/test-hashmap-plain.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd
-
   Copyright 2013 Daniel Buch
 ***/
 
diff --git a/src/test/test-hashmap.c b/src/test/test-hashmap.c
index 50fcb364faf..7dbd9636c83 100644
--- a/src/test/test-hashmap.c
+++ b/src/test/test-hashmap.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd
-
   Copyright 2013 Daniel Buch
 ***/
 
diff --git a/src/test/test-helper.c b/src/test/test-helper.c
index d56c75825b9..fac19b701f3 100644
--- a/src/test/test-helper.c
+++ b/src/test/test-helper.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2017 Lennart Poettering
 ***/
 
diff --git a/src/test/test-helper.h b/src/test/test-helper.h
index 01674e6d4a8..0320a2363e5 100644
--- a/src/test/test-helper.h
+++ b/src/test/test-helper.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2013 Holger Hans Peter Freyther
 ***/
 
diff --git a/src/test/test-hexdecoct.c b/src/test/test-hexdecoct.c
index 41ca9805fed..c8642415433 100644
--- a/src/test/test-hexdecoct.c
+++ b/src/test/test-hexdecoct.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/test/test-hostname-util.c b/src/test/test-hostname-util.c
index 6fc964bb03d..9a271136967 100644
--- a/src/test/test-hostname-util.c
+++ b/src/test/test-hostname-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
   Copyright 2013 Thomas H.P. Andersen
   Copyright 2015 Zbigniew Jędrzejewski-Szmek
diff --git a/src/test/test-hostname.c b/src/test/test-hostname.c
index 21545d086d8..feda3a35fbb 100644
--- a/src/test/test-hostname.c
+++ b/src/test/test-hostname.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/test/test-id128.c b/src/test/test-id128.c
index 8ea80531520..7c38385a023 100644
--- a/src/test/test-id128.c
+++ b/src/test/test-id128.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/test/test-in-addr-util.c b/src/test/test-in-addr-util.c
index ed8c790b6d7..f4989b3ad84 100644
--- a/src/test/test-in-addr-util.c
+++ b/src/test/test-in-addr-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd
-
   Copyright 2017 Lennart Poettering
 ***/
 
diff --git a/src/test/test-install-root.c b/src/test/test-install-root.c
index 194e4832945..3eaa8acc3d6 100644
--- a/src/test/test-install-root.c
+++ b/src/test/test-install-root.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/test/test-install.c b/src/test/test-install.c
index ab83a6aa0bd..d5f719ed555 100644
--- a/src/test/test-install.c
+++ b/src/test/test-install.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/test/test-io-util.c b/src/test/test-io-util.c
index c553729f4ba..b0d004eb39b 100644
--- a/src/test/test-io-util.c
+++ b/src/test/test-io-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/test/test-ipcrm.c b/src/test/test-ipcrm.c
index 97bf931000f..b9175778e6f 100644
--- a/src/test/test-ipcrm.c
+++ b/src/test/test-ipcrm.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/test/test-job-type.c b/src/test/test-job-type.c
index fefeecb948c..9033a14320e 100644
--- a/src/test/test-job-type.c
+++ b/src/test/test-job-type.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/test/test-journal-importer.c b/src/test/test-journal-importer.c
index 610952acc5f..85ac1490f37 100644
--- a/src/test/test-journal-importer.c
+++ b/src/test/test-journal-importer.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2016 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/test/test-libudev.c b/src/test/test-libudev.c
index e973b52d92a..483cfaa400d 100644
--- a/src/test/test-libudev.c
+++ b/src/test/test-libudev.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2008-2012 Kay Sievers <kay@vrfy.org>
 ***/
 
diff --git a/src/test/test-list.c b/src/test/test-list.c
index c30803b55b5..a1345d74032 100644
--- a/src/test/test-list.c
+++ b/src/test/test-list.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd
-
   Copyright 2013 Jan Janssen
 ***/
 
diff --git a/src/test/test-locale-util.c b/src/test/test-locale-util.c
index d26e633466d..4d34a12e1e3 100644
--- a/src/test/test-locale-util.c
+++ b/src/test/test-locale-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd
-
   Copyright 2014 Ronny Chevalier
 ***/
 
diff --git a/src/test/test-log.c b/src/test/test-log.c
index 9c698c6654a..ea7fd0434b6 100644
--- a/src/test/test-log.c
+++ b/src/test/test-log.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/test/test-loopback.c b/src/test/test-loopback.c
index c0aa4be31a7..f61c05110f5 100644
--- a/src/test/test-loopback.c
+++ b/src/test/test-loopback.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/test/test-mount-util.c b/src/test/test-mount-util.c
index aa5f7641db5..e2765d0c912 100644
--- a/src/test/test-mount-util.c
+++ b/src/test/test-mount-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 ***/
 
diff --git a/src/test/test-namespace.c b/src/test/test-namespace.c
index 32688323bd2..fb02d9fd5f7 100644
--- a/src/test/test-namespace.c
+++ b/src/test/test-namespace.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/test/test-netlink-manual.c b/src/test/test-netlink-manual.c
index f88a41087c3..08c09d7cf65 100644
--- a/src/test/test-netlink-manual.c
+++ b/src/test/test-netlink-manual.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Susant Sahani
 ***/
 
diff --git a/src/test/test-ns.c b/src/test/test-ns.c
index d2e8b597300..80dbbca69bb 100644
--- a/src/test/test-ns.c
+++ b/src/test/test-ns.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/test/test-nss.c b/src/test/test-nss.c
index 6d4c51d6d8a..3ebb89a4071 100644
--- a/src/test/test-nss.c
+++ b/src/test/test-nss.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2016 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/test/test-parse-util.c b/src/test/test-parse-util.c
index 429eaa479dc..56f9d8d7c9f 100644
--- a/src/test/test-parse-util.c
+++ b/src/test/test-parse-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
   Copyright 2013 Thomas H.P. Andersen
 ***/
diff --git a/src/test/test-path-lookup.c b/src/test/test-path-lookup.c
index 106062873d0..07a38519d01 100644
--- a/src/test/test-path-lookup.c
+++ b/src/test/test-path-lookup.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c
index 454d27accd4..259b9dfb3d5 100644
--- a/src/test/test-path-util.c
+++ b/src/test/test-path-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/test/test-path.c b/src/test/test-path.c
index cdc2375d563..fd954747af4 100644
--- a/src/test/test-path.c
+++ b/src/test/test-path.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Ronny Chevalier
 ***/
 
diff --git a/src/test/test-prioq.c b/src/test/test-prioq.c
index e88166ee22e..c6686f60ffc 100644
--- a/src/test/test-prioq.c
+++ b/src/test/test-prioq.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/test/test-proc-cmdline.c b/src/test/test-proc-cmdline.c
index 813c8c16727..c592cd24554 100644
--- a/src/test/test-proc-cmdline.c
+++ b/src/test/test-proc-cmdline.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/test/test-process-util.c b/src/test/test-process-util.c
index ef18cff70d4..44df4302464 100644
--- a/src/test/test-process-util.c
+++ b/src/test/test-process-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
   Copyright 2013 Thomas H.P. Andersen
 ***/
diff --git a/src/test/test-random-util.c b/src/test/test-random-util.c
index 3862498834a..3db7039b9f7 100644
--- a/src/test/test-random-util.c
+++ b/src/test/test-random-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2017 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/test/test-ratelimit.c b/src/test/test-ratelimit.c
index 7001e821785..213f829ee57 100644
--- a/src/test/test-ratelimit.c
+++ b/src/test/test-ratelimit.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd
-
   Copyright 2014 Ronny Chevalier
 ***/
 
diff --git a/src/test/test-replace-var.c b/src/test/test-replace-var.c
index c29fbe57a10..41468031b3a 100644
--- a/src/test/test-replace-var.c
+++ b/src/test/test-replace-var.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/test/test-rlimit-util.c b/src/test/test-rlimit-util.c
index 38de758cb6a..15701b2712d 100644
--- a/src/test/test-rlimit-util.c
+++ b/src/test/test-rlimit-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  This file is part of systemd
-***/
 
 #include <sys/resource.h>
 
diff --git a/src/test/test-sched-prio.c b/src/test/test-sched-prio.c
index da0f8581423..fd2b0debde8 100644
--- a/src/test/test-sched-prio.c
+++ b/src/test/test-sched-prio.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Holger Hans Peter Freyther
 ***/
 
diff --git a/src/test/test-seccomp.c b/src/test/test-seccomp.c
index 6062ca1baf1..a1df09d1b4f 100644
--- a/src/test/test-seccomp.c
+++ b/src/test/test-seccomp.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 ***/
 
diff --git a/src/test/test-selinux.c b/src/test/test-selinux.c
index 10512d4cb2b..aae818068ac 100644
--- a/src/test/test-selinux.c
+++ b/src/test/test-selinux.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2016 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/test/test-set.c b/src/test/test-set.c
index 9774fbb3801..dbca23dd473 100644
--- a/src/test/test-set.c
+++ b/src/test/test-set.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd
-
   Copyright 2014 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/test/test-sigbus.c b/src/test/test-sigbus.c
index 69e723f77f6..0f7d41b2e2a 100644
--- a/src/test/test-sigbus.c
+++ b/src/test/test-sigbus.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/test/test-signal-util.c b/src/test/test-signal-util.c
index 02e931fc918..398c2ead298 100644
--- a/src/test/test-signal-util.c
+++ b/src/test/test-signal-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 ***/
 
diff --git a/src/test/test-siphash24.c b/src/test/test-siphash24.c
index 47bf28ff0fa..333096a2a26 100644
--- a/src/test/test-siphash24.c
+++ b/src/test/test-siphash24.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2015 Tom Gundersen
 ***/
 
diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c
index 1a136e53847..82c6f280cc7 100644
--- a/src/test/test-sizeof.c
+++ b/src/test/test-sizeof.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2016 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/test/test-sleep.c b/src/test/test-sleep.c
index 47174232548..3351869487b 100644
--- a/src/test/test-sleep.c
+++ b/src/test/test-sleep.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/test/test-socket-util.c b/src/test/test-socket-util.c
index c3e9c2c4535..6502a4d8859 100644
--- a/src/test/test-socket-util.c
+++ b/src/test/test-socket-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd
-
   Copyright 2014 Ronny Chevalier
 ***/
 
diff --git a/src/test/test-specifier.c b/src/test/test-specifier.c
index b08398bec06..107d73bf27e 100644
--- a/src/test/test-specifier.c
+++ b/src/test/test-specifier.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2017 Lennart Poettering
 ***/
 
diff --git a/src/test/test-stat-util.c b/src/test/test-stat-util.c
index 1697b2d777f..9f3716763fb 100644
--- a/src/test/test-stat-util.c
+++ b/src/test/test-stat-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/test/test-strbuf.c b/src/test/test-strbuf.c
index 8e5b8b1d776..26d81c040b8 100644
--- a/src/test/test-strbuf.c
+++ b/src/test/test-strbuf.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Thomas H.P. Andersen
 ***/
 
diff --git a/src/test/test-string-util.c b/src/test/test-string-util.c
index d6eca393ee0..29386104f26 100644
--- a/src/test/test-string-util.c
+++ b/src/test/test-string-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/test/test-strip-tab-ansi.c b/src/test/test-strip-tab-ansi.c
index 641d537887d..eb38d5c9bc5 100644
--- a/src/test/test-strip-tab-ansi.c
+++ b/src/test/test-strip-tab-ansi.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/test/test-strv.c b/src/test/test-strv.c
index ffe75073557..5daf5672512 100644
--- a/src/test/test-strv.c
+++ b/src/test/test-strv.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
   Copyright 2013 Thomas H.P. Andersen
 ***/
diff --git a/src/test/test-strxcpyx.c b/src/test/test-strxcpyx.c
index 4c95ca010c3..b34f79c5b6c 100644
--- a/src/test/test-strxcpyx.c
+++ b/src/test/test-strxcpyx.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Thomas H.P. Andersen
 ***/
 
diff --git a/src/test/test-systemd-tmpfiles.py b/src/test/test-systemd-tmpfiles.py
index 27a403f473a..13a44f3c4ab 100755
--- a/src/test/test-systemd-tmpfiles.py
+++ b/src/test/test-systemd-tmpfiles.py
@@ -1,8 +1,6 @@
 #!/usr/bin/env python3
 #  SPDX-License-Identifier: LGPL-2.1+
 #
-#  This file is part of systemd.
-#
 #  systemd is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU Lesser General Public License as published by
 #  the Free Software Foundation; either version 2.1 of the License, or
diff --git a/src/test/test-tables.c b/src/test/test-tables.c
index 3341fe2e25f..9fed2f397da 100644
--- a/src/test/test-tables.c
+++ b/src/test/test-tables.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd
-
   Copyright 2013 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/test/test-terminal-util.c b/src/test/test-terminal-util.c
index 216c8bef002..91030480fd1 100644
--- a/src/test/test-terminal-util.c
+++ b/src/test/test-terminal-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
   Copyright 2013 Thomas H.P. Andersen
 ***/
diff --git a/src/test/test-time-util.c b/src/test/test-time-util.c
index f2daf401c6b..2d3f7e149b0 100644
--- a/src/test/test-time-util.c
+++ b/src/test/test-time-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/test/test-tmpfiles.c b/src/test/test-tmpfiles.c
index 5f8d1b6da06..038f47cfde5 100644
--- a/src/test/test-tmpfiles.c
+++ b/src/test/test-tmpfiles.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/test/test-udev.c b/src/test/test-udev.c
index c79384847da..9ceb09906be 100644
--- a/src/test/test-udev.c
+++ b/src/test/test-udev.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2003-2004 Greg Kroah-Hartman <greg@kroah.com>
   Copyright 2004-2012 Kay Sievers <kay@vrfy.org>
 ***/
diff --git a/src/test/test-uid-range.c b/src/test/test-uid-range.c
index 85a16c558c6..109af249069 100644
--- a/src/test/test-uid-range.c
+++ b/src/test/test-uid-range.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/test/test-unaligned.c b/src/test/test-unaligned.c
index a394803414e..73ab2a30604 100644
--- a/src/test/test-unaligned.c
+++ b/src/test/test-unaligned.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd
-
   Copyright 2014 Tom Gundersen
 ***/
 
diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c
index 7b74ed0dc3e..04a560bab10 100644
--- a/src/test/test-unit-file.c
+++ b/src/test/test-unit-file.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
   Copyright 2013 Zbigniew Jędrzejewski-Szmek
 ***/
diff --git a/src/test/test-unit-name.c b/src/test/test-unit-name.c
index 692c3f41cff..6d9b8e703ab 100644
--- a/src/test/test-unit-name.c
+++ b/src/test/test-unit-name.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
   Copyright 2013 Zbigniew Jędrzejewski-Szmek
   Copyright 2014 Ronny Chevalier
diff --git a/src/test/test-user-util.c b/src/test/test-user-util.c
index 71797d4be69..198fd952eaa 100644
--- a/src/test/test-user-util.c
+++ b/src/test/test-user-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2015 Lennart Poettering
 ***/
 
diff --git a/src/test/test-utf8.c b/src/test/test-utf8.c
index d645dc95876..faa26bde8d4 100644
--- a/src/test/test-utf8.c
+++ b/src/test/test-utf8.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Dave Reisner
 ***/
 
diff --git a/src/test/test-util.c b/src/test/test-util.c
index af0ada7d2a2..ede1b77612d 100644
--- a/src/test/test-util.c
+++ b/src/test/test-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
   Copyright 2013 Thomas H.P. Andersen
 ***/
diff --git a/src/test/test-verbs.c b/src/test/test-verbs.c
index fb1bbf3419b..02f0a26d8f0 100644
--- a/src/test/test-verbs.c
+++ b/src/test/test-verbs.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 systemd developers
 ***/
 
diff --git a/src/test/test-watchdog.c b/src/test/test-watchdog.c
index ff76af35b81..805630f9ac5 100644
--- a/src/test/test-watchdog.c
+++ b/src/test/test-watchdog.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
 ***/
 
diff --git a/src/test/test-web-util.c b/src/test/test-web-util.c
index dbc7781e060..77a82242dc0 100644
--- a/src/test/test-web-util.c
+++ b/src/test/test-web-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/test/test-xattr-util.c b/src/test/test-xattr-util.c
index f94a0a7da3c..cf91108f26f 100644
--- a/src/test/test-xattr-util.c
+++ b/src/test/test-xattr-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/test/test-xml.c b/src/test/test-xml.c
index a4e7ca84d3f..9e9aebab48c 100644
--- a/src/test/test-xml.c
+++ b/src/test/test-xml.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Lennart Poettering
 ***/
 
diff --git a/src/timedate/timedatectl.c b/src/timedate/timedatectl.c
index e253355405a..9a61d8d930e 100644
--- a/src/timedate/timedatectl.c
+++ b/src/timedate/timedatectl.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Lennart Poettering
   Copyright 2013 Kay Sievers
 ***/
diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
index 175513321f6..c4b5b745327 100644
--- a/src/timedate/timedated.c
+++ b/src/timedate/timedated.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2011 Lennart Poettering
 ***/
 
diff --git a/src/timesync/test-timesync.c b/src/timesync/test-timesync.c
index 2bf484f121e..fccf92b0864 100644
--- a/src/timesync/test-timesync.c
+++ b/src/timesync/test-timesync.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2017 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/timesync/timesyncd-conf.c b/src/timesync/timesyncd-conf.c
index 506781e1cc1..0e4989a8ce9 100644
--- a/src/timesync/timesyncd-conf.c
+++ b/src/timesync/timesyncd-conf.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Kay Sievers, Lennart Poettering
 ***/
 
diff --git a/src/timesync/timesyncd-conf.h b/src/timesync/timesyncd-conf.h
index 1e12d058259..dd2025d3895 100644
--- a/src/timesync/timesyncd-conf.h
+++ b/src/timesync/timesyncd-conf.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Kay Sievers, Lennart Poettering
 ***/
 
diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c
index ce47e355d14..2c5830e9af4 100644
--- a/src/timesync/timesyncd-manager.c
+++ b/src/timesync/timesyncd-manager.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Kay Sievers, Lennart Poettering
 ***/
 
diff --git a/src/timesync/timesyncd-manager.h b/src/timesync/timesyncd-manager.h
index 1f045662544..e4ce7b45790 100644
--- a/src/timesync/timesyncd-manager.h
+++ b/src/timesync/timesyncd-manager.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Kay Sievers, Lennart Poettering
 ***/
 
diff --git a/src/timesync/timesyncd-server.c b/src/timesync/timesyncd-server.c
index 30c51829af3..9991ee74186 100644
--- a/src/timesync/timesyncd-server.c
+++ b/src/timesync/timesyncd-server.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Kay Sievers, Lennart Poettering
 ***/
 
diff --git a/src/timesync/timesyncd-server.h b/src/timesync/timesyncd-server.h
index 945cdfe47e9..5be6645fd23 100644
--- a/src/timesync/timesyncd-server.h
+++ b/src/timesync/timesyncd-server.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
-  This file is part of systemd.
-
   Copyright 2014 Kay Sievers, Lennart Poettering
 ***/
 
diff --git a/src/timesync/timesyncd.c b/src/timesync/timesyncd.c
index dbecfb6ce8b..92c50422aac 100644
--- a/src/timesync/timesyncd.c
+++ b/src/timesync/timesyncd.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Kay Sievers, Lennart Poettering
 ***/
 
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index 183e98b3c16..be3c0085861 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering, Kay Sievers
   Copyright 2015 Zbigniew Jędrzejewski-Szmek
 ***/
diff --git a/src/tty-ask-password-agent/tty-ask-password-agent.c b/src/tty-ask-password-agent/tty-ask-password-agent.c
index 4aefada9978..06d6791f5df 100644
--- a/src/tty-ask-password-agent/tty-ask-password-agent.c
+++ b/src/tty-ask-password-agent/tty-ask-password-agent.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
   Copyright 2015 Werner Fink
 ***/
diff --git a/src/udev/net/ethtool-util.c b/src/udev/net/ethtool-util.c
index 37525ce841b..2e519356932 100644
--- a/src/udev/net/ethtool-util.c
+++ b/src/udev/net/ethtool-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
- This file is part of systemd.
-
  Copyright (C) 2013 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/udev/net/ethtool-util.h b/src/udev/net/ethtool-util.h
index da2a2458f0c..8371533cc9e 100644
--- a/src/udev/net/ethtool-util.h
+++ b/src/udev/net/ethtool-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
- This file is part of systemd.
-
  Copyright (C) 2013 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c
index 2f7aa2f8d9d..cc6eae93718 100644
--- a/src/udev/net/link-config.c
+++ b/src/udev/net/link-config.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
- This file is part of systemd.
-
  Copyright (C) 2013 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/udev/net/link-config.h b/src/udev/net/link-config.h
index cbc532e340c..2057e46c21f 100644
--- a/src/udev/net/link-config.h
+++ b/src/udev/net/link-config.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /***
- This file is part of systemd.
-
  Copyright (C) 2013 Tom Gundersen <teg@jklm.no>
 ***/
 
diff --git a/src/udev/udev-builtin-btrfs.c b/src/udev/udev-builtin-btrfs.c
index cdccbdab0d2..f5a253f588a 100644
--- a/src/udev/udev-builtin-btrfs.c
+++ b/src/udev/udev-builtin-btrfs.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Kay Sievers <kay@vrfy.org>
 ***/
 
diff --git a/src/udev/udev-builtin-hwdb.c b/src/udev/udev-builtin-hwdb.c
index d8c58ea2775..6ffacf45c7b 100644
--- a/src/udev/udev-builtin-hwdb.c
+++ b/src/udev/udev-builtin-hwdb.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Kay Sievers <kay@vrfy.org>
 ***/
 
diff --git a/src/udev/udev-builtin-keyboard.c b/src/udev/udev-builtin-keyboard.c
index 5fb3fc8a878..3d92177b5a5 100644
--- a/src/udev/udev-builtin-keyboard.c
+++ b/src/udev/udev-builtin-keyboard.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Kay Sievers <kay@vrfy.org>
 ***/
 
diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c
index 0a1e5dd7b77..fdee3e17e9a 100644
--- a/src/udev/udev-builtin-net_id.c
+++ b/src/udev/udev-builtin-net_id.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Kay Sievers <kay@vrfy.org>
 ***/
 
diff --git a/src/udev/udev-builtin-net_setup_link.c b/src/udev/udev-builtin-net_setup_link.c
index fe5e865edbd..3733e95522c 100644
--- a/src/udev/udev-builtin-net_setup_link.c
+++ b/src/udev/udev-builtin-net_setup_link.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2013 Tom Gundersen
 ***/
 
diff --git a/src/udev/udev-builtin.c b/src/udev/udev-builtin.c
index 8850903e460..084f1767e32 100644
--- a/src/udev/udev-builtin.c
+++ b/src/udev/udev-builtin.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2007-2012 Kay Sievers <kay@vrfy.org>
 ***/
 
diff --git a/src/udev/udevadm-hwdb.c b/src/udev/udevadm-hwdb.c
index 646c8507f70..55e634ffb9b 100644
--- a/src/udev/udevadm-hwdb.c
+++ b/src/udev/udevadm-hwdb.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2012 Kay Sievers <kay@vrfy.org>
 ***/
 
diff --git a/src/update-done/update-done.c b/src/update-done/update-done.c
index 9a22bc14bdd..c96e4febc98 100644
--- a/src/update-done/update-done.c
+++ b/src/update-done/update-done.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 ***/
 
diff --git a/src/update-utmp/update-utmp.c b/src/update-utmp/update-utmp.c
index ca8870f0d92..2c4e8f3b249 100644
--- a/src/update-utmp/update-utmp.c
+++ b/src/update-utmp/update-utmp.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/user-sessions/user-sessions.c b/src/user-sessions/user-sessions.c
index fc3472bed9b..2b6998c61cb 100644
--- a/src/user-sessions/user-sessions.c
+++ b/src/user-sessions/user-sessions.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Lennart Poettering
 ***/
 
diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c
index 6bf773a1ed6..b1f9f78824c 100644
--- a/src/vconsole/vconsole-setup.c
+++ b/src/vconsole/vconsole-setup.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2010 Kay Sievers
   Copyright 2016 Michal Soltys <soltys@ziu.info>
 ***/
diff --git a/src/veritysetup/veritysetup-generator.c b/src/veritysetup/veritysetup-generator.c
index 511a6f698b4..223af8f5ad1 100644
--- a/src/veritysetup/veritysetup-generator.c
+++ b/src/veritysetup/veritysetup-generator.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 ***/
 
diff --git a/src/veritysetup/veritysetup.c b/src/veritysetup/veritysetup.c
index 7b8fd60bf8f..d33c9732236 100644
--- a/src/veritysetup/veritysetup.c
+++ b/src/veritysetup/veritysetup.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 ***/
 
diff --git a/src/volatile-root/volatile-root.c b/src/volatile-root/volatile-root.c
index f50ab32d31e..cd3a85d0ef8 100644
--- a/src/volatile-root/volatile-root.c
+++ b/src/volatile-root/volatile-root.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  This file is part of systemd.
-
   Copyright 2016 Lennart Poettering
 ***/
 
diff --git a/tools/catalog-report.py b/tools/catalog-report.py
index 426ea0d8916..c30fe0be69e 100755
--- a/tools/catalog-report.py
+++ b/tools/catalog-report.py
@@ -2,8 +2,7 @@
 # -*- Mode: python; coding: utf-8; indent-tabs-mode: nil -*- */
 # SPDX-License-Identifier: MIT
 #
-# This file is part of systemd. It is distrubuted under the MIT license, see
-# below.
+# This file is distributed under the MIT license, see below.
 #
 # Copyright 2016 Zbigniew Jędrzejewski-Szmek
 #
diff --git a/tools/gdb-sd_dump_hashmaps.py b/tools/gdb-sd_dump_hashmaps.py
index 6ec3a0fd980..9f6b4c49822 100644
--- a/tools/gdb-sd_dump_hashmaps.py
+++ b/tools/gdb-sd_dump_hashmaps.py
@@ -2,8 +2,6 @@
 #  -*- Mode: python; coding: utf-8; indent-tabs-mode: nil -*- */
 # SPDX-License-Identifier: LGPL-2.1+
 #
-#  This file is part of systemd.
-#
 #  Copyright 2014 Michal Schmidt
 
 import gdb
diff --git a/tools/make-directive-index.py b/tools/make-directive-index.py
index 464de31223b..3f213ee3b73 100755
--- a/tools/make-directive-index.py
+++ b/tools/make-directive-index.py
@@ -2,8 +2,6 @@
 #  -*- Mode: python; coding: utf-8; indent-tabs-mode: nil -*- */
 # SPDX-License-Identifier: LGPL-2.1+
 #
-#  This file is part of systemd.
-#
 #  Copyright 2012-2013 Zbigniew Jędrzejewski-Szmek
 
 import sys
diff --git a/tools/make-man-index.py b/tools/make-man-index.py
index f7bf9de35b1..5fc42d82e3d 100755
--- a/tools/make-man-index.py
+++ b/tools/make-man-index.py
@@ -2,8 +2,6 @@
 #  -*- Mode: python; coding: utf-8; indent-tabs-mode: nil -*- */
 # SPDX-License-Identifier: LGPL-2.1+
 #
-#  This file is part of systemd.
-#
 #  Copyright 2012 Lennart Poettering
 #  Copyright 2013 Zbigniew Jędrzejewski-Szmek
 
diff --git a/tools/make-man-rules.py b/tools/make-man-rules.py
index 99d737c6555..a9027d128a3 100755
--- a/tools/make-man-rules.py
+++ b/tools/make-man-rules.py
@@ -2,8 +2,6 @@
 #  -*- Mode: python; coding: utf-8; indent-tabs-mode: nil -*- */
 #  SPDX-License-Identifier: LGPL-2.1+
 #
-#  This file is part of systemd.
-#
 #  Copyright 2013, 2017 Zbigniew Jędrzejewski-Szmek
 
 from __future__ import print_function
diff --git a/tools/xml_helper.py b/tools/xml_helper.py
index dddccc5a8b5..199c54ea257 100755
--- a/tools/xml_helper.py
+++ b/tools/xml_helper.py
@@ -2,8 +2,6 @@
 #  -*- Mode: python; coding: utf-8; indent-tabs-mode: nil -*- */
 #  SPDX-License-Identifier: LGPL-2.1+
 #
-#  This file is part of systemd.
-#
 #  Copyright 2012-2013 Zbigniew Jędrzejewski-Szmek
 
 from lxml import etree as tree