diff --git a/.mkosi/mkosi.fedora b/.mkosi/mkosi.fedora
index c40d066c64..63027d9fc7 100644
--- a/.mkosi/mkosi.fedora
+++ b/.mkosi/mkosi.fedora
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright 2016 Lennart Poettering
 
 # This is a settings file for OS image generation using mkosi (https://github.com/systemd/mkosi).
 # Simply invoke "mkosi" in the project directory to build an OS image.
diff --git a/catalog/systemd.be.catalog.in b/catalog/systemd.be.catalog.in
index 7d0958e312..9e3b4c08bd 100644
--- a/catalog/systemd.be.catalog.in
+++ b/catalog/systemd.be.catalog.in
@@ -1,6 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1+
 #
-#  Copyright 2012 Lennart Poettering
 #  Copyright 2015, 2016 Viktar Vaŭčkievič
 
 # Message catalog for systemd's own messages
diff --git a/catalog/systemd.be@latin.catalog.in b/catalog/systemd.be@latin.catalog.in
index 2dca66b9c8..db2f7afd78 100644
--- a/catalog/systemd.be@latin.catalog.in
+++ b/catalog/systemd.be@latin.catalog.in
@@ -1,6 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1+
 #
-#  Copyright 2012 Lennart Poettering
 #  Copyright 2015, 2016 Viktar Vaŭčkievič
 
 # Message catalog for systemd's own messages
diff --git a/catalog/systemd.bg.catalog.in b/catalog/systemd.bg.catalog.in
index 88e0945245..a3a1671250 100644
--- a/catalog/systemd.bg.catalog.in
+++ b/catalog/systemd.bg.catalog.in
@@ -1,6 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1+
 #
-#  Copyright 2012 Lennart Poettering
 #  Copyright 2016 Alexander Shopov <ash@kambanaria.org>
 
 # Message catalog for systemd's own messages
diff --git a/catalog/systemd.catalog.in b/catalog/systemd.catalog.in
index 64e87929b6..f1bddc6f7d 100644
--- a/catalog/systemd.catalog.in
+++ b/catalog/systemd.catalog.in
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1+
-#
-#  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 4353ef6749..4e2bec8a0f 100644
--- a/catalog/systemd.da.catalog.in
+++ b/catalog/systemd.da.catalog.in
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1+
-#
-#  Copyright 2012 Lennart Poettering
 
 # Message catalog for systemd's own messages
 # Danish translation
diff --git a/catalog/systemd.de.catalog.in b/catalog/systemd.de.catalog.in
index 883c210f0b..d10111b0d6 100644
--- a/catalog/systemd.de.catalog.in
+++ b/catalog/systemd.de.catalog.in
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1+
-#
-#  Copyright 2012 Lennart Poettering
 
 -- fc2e22bc6ee647b6b90729ab34a250b1
 Subject: Speicherabbild für Prozess @COREDUMP_PID@ (@COREDUMP_COMM) generiert
diff --git a/catalog/systemd.fr.catalog.in b/catalog/systemd.fr.catalog.in
index e2eaf163e8..4a728adf6c 100644
--- a/catalog/systemd.fr.catalog.in
+++ b/catalog/systemd.fr.catalog.in
@@ -1,6 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1+
 #
-#  Copyright 2012 Lennart Poettering
 #  Copyright 2013-2016 Sylvain Plantefève
 
 # Message catalog for systemd's own messages
diff --git a/catalog/systemd.hr.catalog.in b/catalog/systemd.hr.catalog.in
index b3a21f66c2..c4808b4c7d 100644
--- a/catalog/systemd.hr.catalog.in
+++ b/catalog/systemd.hr.catalog.in
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1+
-#
-#  Copyright 2012 Lennart Poettering
 
 # Message catalog for systemd's own messages
 # Croatian translation
diff --git a/catalog/systemd.hu.catalog.in b/catalog/systemd.hu.catalog.in
index 9c46c20188..3532a87c50 100644
--- a/catalog/systemd.hu.catalog.in
+++ b/catalog/systemd.hu.catalog.in
@@ -1,6 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1+
 #
-#  Copyright 2012 Lennart Poettering
 #  Copyright 2016 Gabor Kelemen
 
 # Message catalog for systemd's own messages
diff --git a/catalog/systemd.ko.catalog.in b/catalog/systemd.ko.catalog.in
index dd84bac59c..fc0faad02c 100644
--- a/catalog/systemd.ko.catalog.in
+++ b/catalog/systemd.ko.catalog.in
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1+
-#
-#  Copyright 2012 Lennart Poettering
 
 # Message catalog for systemd's own messages
 # Korean translation
diff --git a/catalog/systemd.pl.catalog.in b/catalog/systemd.pl.catalog.in
index 06450f0626..f3b1ba3514 100644
--- a/catalog/systemd.pl.catalog.in
+++ b/catalog/systemd.pl.catalog.in
@@ -1,6 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1+
 #
-#  Copyright 2012 Lennart Poettering
 #  Copyright 2014-2017 Piotr Drąg
 
 # Message catalog for systemd's own messages
diff --git a/catalog/systemd.pt_BR.catalog.in b/catalog/systemd.pt_BR.catalog.in
index ec0fb3664c..8046b50156 100644
--- a/catalog/systemd.pt_BR.catalog.in
+++ b/catalog/systemd.pt_BR.catalog.in
@@ -1,6 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1+
 #
-#  Copyright 2012 Lennart Poettering
 #  Copyright 2015 Rafael Ferreira (translation)
 
 # Catálogo de mensagens para as mensagens do próprio systemd
diff --git a/catalog/systemd.ru.catalog.in b/catalog/systemd.ru.catalog.in
index a77ca53d82..89aa95a72f 100644
--- a/catalog/systemd.ru.catalog.in
+++ b/catalog/systemd.ru.catalog.in
@@ -1,6 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1+
 #
-#  Copyright 2012 Lennart Poettering
 #  Copyright 2013-2017 Sergey Ptashnick
 
 # Message catalog for systemd's own messages
diff --git a/catalog/systemd.sr.catalog.in b/catalog/systemd.sr.catalog.in
index 5782f429aa..f5746715a4 100644
--- a/catalog/systemd.sr.catalog.in
+++ b/catalog/systemd.sr.catalog.in
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1+
-#
-#  Copyright 2012 Lennart Poettering
 
 # Message catalog for systemd's own messages
 # Serbian translation
diff --git a/catalog/systemd.zh_CN.catalog.in b/catalog/systemd.zh_CN.catalog.in
index 4f09836295..4a846b2e73 100644
--- a/catalog/systemd.zh_CN.catalog.in
+++ b/catalog/systemd.zh_CN.catalog.in
@@ -1,6 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1+
 #
-#  Copyright 2012 Lennart Poettering
 #  Copyright 2015 Boyuan Yang
 
 # Message catalog for systemd's own messages
diff --git a/catalog/systemd.zh_TW.catalog.in b/catalog/systemd.zh_TW.catalog.in
index d375dc336f..4c03e8576c 100644
--- a/catalog/systemd.zh_TW.catalog.in
+++ b/catalog/systemd.zh_TW.catalog.in
@@ -1,6 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1+
 #
-#  Copyright 2012 Lennart Poettering
 #  Copyright 2015 Jeff Huang
 
 # Message catalog for systemd's own messages
diff --git a/man/binfmt.d.xml b/man/binfmt.d.xml
index 83a82d0321..5e7f0690dc 100644
--- a/man/binfmt.d.xml
+++ b/man/binfmt.d.xml
@@ -3,8 +3,6 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2011 Lennart Poettering
 -->
 <refentry id="binfmt.d" conditional='ENABLE_BINFMT'
     xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/bootup.xml b/man/bootup.xml
index b4eb26d454..23779fd1d4 100644
--- a/man/bootup.xml
+++ b/man/bootup.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2012 Lennart Poettering
 -->
 
 <refentry id="bootup">
diff --git a/man/crypttab.xml b/man/crypttab.xml
index ae65b198da..e923c7c9ef 100644
--- a/man/crypttab.xml
+++ b/man/crypttab.xml
@@ -4,13 +4,10 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  Copyright 2012 Lennart Poettering
-
   This is based on crypttab(5) from Fedora's initscripts package, which in
   turn is based on Debian's version.
 
   The Red Hat version has been written by Miloslav Trmac <mitr@redhat.com>.
-
 -->
 <refentry id="crypttab" conditional='HAVE_LIBCRYPTSETUP'>
 
diff --git a/man/custom-html.xsl b/man/custom-html.xsl
index 49fa58439c..fccaf51ff5 100644
--- a/man/custom-html.xsl
+++ b/man/custom-html.xsl
@@ -3,7 +3,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  Copyright 2011 Lennart Poettering
 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
diff --git a/man/daemon.xml b/man/daemon.xml
index ad7021f0a1..0b456b7559 100644
--- a/man/daemon.xml
+++ b/man/daemon.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2010 Lennart Poettering
 -->
 
 <refentry id="daemon">
diff --git a/man/dnssec-trust-anchors.d.xml b/man/dnssec-trust-anchors.d.xml
index 70103f9b9d..fd934e2139 100644
--- a/man/dnssec-trust-anchors.d.xml
+++ b/man/dnssec-trust-anchors.d.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2016 Lennart Poettering
 -->
 
 <refentry id="dnssec-trust-anchors.d" conditional='ENABLE_RESOLVE'
diff --git a/man/file-hierarchy.xml b/man/file-hierarchy.xml
index 0027f0e066..c19dd239d5 100644
--- a/man/file-hierarchy.xml
+++ b/man/file-hierarchy.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2014 Lennart Poettering
 -->
 
 <refentry id="file-hierarchy">
diff --git a/man/halt.xml b/man/halt.xml
index 2c2e2c3e54..097d0bdba3 100644
--- a/man/halt.xml
+++ b/man/halt.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2010 Lennart Poettering
 -->
 
 <refentry id="halt"
diff --git a/man/hostname.xml b/man/hostname.xml
index 06eec5d981..ef9d815c17 100644
--- a/man/hostname.xml
+++ b/man/hostname.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2010 Lennart Poettering
 -->
 
 <refentry id="hostname">
diff --git a/man/hostnamectl.xml b/man/hostnamectl.xml
index 249e0ec4d8..7b57c2ce2a 100644
--- a/man/hostnamectl.xml
+++ b/man/hostnamectl.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2012 Lennart Poettering
 -->
 
 <refentry id="hostnamectl" conditional='ENABLE_HOSTNAMED'
diff --git a/man/journalctl.xml b/man/journalctl.xml
index 7b0f52ac5a..ae877b983d 100644
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2012 Lennart Poettering
 -->
 
   <refentry id="journalctl"
diff --git a/man/journald.conf.xml b/man/journald.conf.xml
index 8fc1f25b78..afd1f157a4 100644
--- a/man/journald.conf.xml
+++ b/man/journald.conf.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2010 Lennart Poettering
 -->
 
 <refentry id="journald.conf"
diff --git a/man/kernel-command-line.xml b/man/kernel-command-line.xml
index e65ed03d5a..8d8f8f918f 100644
--- a/man/kernel-command-line.xml
+++ b/man/kernel-command-line.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2012 Lennart Poettering
 -->
 
 <refentry id="kernel-command-line">
diff --git a/man/less-variables.xml b/man/less-variables.xml
index 742897496c..a3faa38997 100644
--- a/man/less-variables.xml
+++ b/man/less-variables.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2016 Lennart Poettering
 -->
 
 <refsect1>
diff --git a/man/locale.conf.xml b/man/locale.conf.xml
index cc2604994a..c61d9b40d1 100644
--- a/man/locale.conf.xml
+++ b/man/locale.conf.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2010 Lennart Poettering
 -->
 
 <refentry id="locale.conf">
diff --git a/man/localectl.xml b/man/localectl.xml
index 8591f8c289..1c6e6b347a 100644
--- a/man/localectl.xml
+++ b/man/localectl.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2012 Lennart Poettering
 -->
 
 <refentry id="localectl" conditional='ENABLE_LOCALED'
diff --git a/man/localtime.xml b/man/localtime.xml
index 2d22016b6c..8ac1939c4c 100644
--- a/man/localtime.xml
+++ b/man/localtime.xml
@@ -5,7 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  Copyright 2010 Lennart Poettering
   Copyright 2012 Shawn Landden
 -->
 
diff --git a/man/loginctl.xml b/man/loginctl.xml
index 76e61dcc54..60f98ba7a5 100644
--- a/man/loginctl.xml
+++ b/man/loginctl.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2010 Lennart Poettering
 -->
 
 <refentry id="loginctl" conditional='ENABLE_LOGIND'
diff --git a/man/logind.conf.xml b/man/logind.conf.xml
index 0d270a8ec5..7c96445797 100644
--- a/man/logind.conf.xml
+++ b/man/logind.conf.xml
@@ -7,8 +7,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2010 Lennart Poettering
 -->
 
 <refentry id="logind.conf" conditional='ENABLE_LOGIND'
diff --git a/man/machine-id.xml b/man/machine-id.xml
index 4ff4109770..8fb405d0b1 100644
--- a/man/machine-id.xml
+++ b/man/machine-id.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2010 Lennart Poettering
 -->
 
 <refentry id="machine-id">
diff --git a/man/machine-info.xml b/man/machine-info.xml
index 801fc44a3a..0dfbaf10de 100644
--- a/man/machine-info.xml
+++ b/man/machine-info.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2010 Lennart Poettering
 -->
 
 <refentry id="machine-info">
diff --git a/man/modules-load.d.xml b/man/modules-load.d.xml
index 0423a6e2e6..6f508ba618 100644
--- a/man/modules-load.d.xml
+++ b/man/modules-load.d.xml
@@ -3,8 +3,6 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2011 Lennart Poettering
 -->
 <refentry id="modules-load.d" conditional='HAVE_KMOD'
     xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/nss-myhostname.xml b/man/nss-myhostname.xml
index 0ed1c7817b..492cf00046 100644
--- a/man/nss-myhostname.xml
+++ b/man/nss-myhostname.xml
@@ -5,7 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  Copyright 2011 Lennart Poettering
   Copyright 2013 Tom Gundersen
 -->
 
diff --git a/man/nss-mymachines.xml b/man/nss-mymachines.xml
index 69a4f2b675..00e2754413 100644
--- a/man/nss-mymachines.xml
+++ b/man/nss-mymachines.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2014 Lennart Poettering
 -->
 
 <refentry id="nss-mymachines" conditional='ENABLE_MACHINED'>
diff --git a/man/nss-resolve.xml b/man/nss-resolve.xml
index f99680c4bf..18ddf814a4 100644
--- a/man/nss-resolve.xml
+++ b/man/nss-resolve.xml
@@ -5,7 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  Copyright 2011 Lennart Poettering
   Copyright 2013 Tom Gundersen
 -->
 
diff --git a/man/nss-systemd.xml b/man/nss-systemd.xml
index 3ea8ce7f03..e42e08122b 100644
--- a/man/nss-systemd.xml
+++ b/man/nss-systemd.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2016 Lennart Poettering
 -->
 
 <refentry id="nss-systemd" conditional='ENABLE_NSS_SYSTEMD'>
diff --git a/man/os-release.xml b/man/os-release.xml
index ffd2c0d5df..40742adcba 100644
--- a/man/os-release.xml
+++ b/man/os-release.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2010 Lennart Poettering
 -->
 
 <refentry id="os-release">
diff --git a/man/pam_systemd.xml b/man/pam_systemd.xml
index bca73da179..8ae98b9bb2 100644
--- a/man/pam_systemd.xml
+++ b/man/pam_systemd.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2010 Lennart Poettering
 -->
 
 <refentry id="pam_systemd" conditional='HAVE_PAM'>
diff --git a/man/resolvectl.xml b/man/resolvectl.xml
index 991d239d83..8cdf3a493d 100644
--- a/man/resolvectl.xml
+++ b/man/resolvectl.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2016 Lennart Poettering
 -->
 
 <refentry id="resolvectl" conditional='ENABLE_RESOLVE'
diff --git a/man/runlevel.xml b/man/runlevel.xml
index 9fe0037f43..ed2ab8062f 100644
--- a/man/runlevel.xml
+++ b/man/runlevel.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2010 Lennart Poettering
 -->
 
 <refentry id="runlevel"
diff --git a/man/sd-bus-errors.xml b/man/sd-bus-errors.xml
index 4531808e47..b11174493e 100644
--- a/man/sd-bus-errors.xml
+++ b/man/sd-bus-errors.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2015 Lennart Poettering
 -->
 
 <refentry id="sd-bus-errors">
diff --git a/man/sd-daemon.xml b/man/sd-daemon.xml
index 137e1eaca4..62cf15ff91 100644
--- a/man/sd-daemon.xml
+++ b/man/sd-daemon.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2010 Lennart Poettering
 -->
 
 <refentry id="sd-daemon"
diff --git a/man/sd-event.xml b/man/sd-event.xml
index 8e0af4a42a..508fe7cc2b 100644
--- a/man/sd-event.xml
+++ b/man/sd-event.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2015 Lennart Poettering
 -->
 
 <refentry id="sd-event" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd-id128.xml b/man/sd-id128.xml
index d79b9a9867..1a1ea714fc 100644
--- a/man/sd-id128.xml
+++ b/man/sd-id128.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2012 Lennart Poettering
 -->
 
 <refentry id="sd-id128"
diff --git a/man/sd-journal.xml b/man/sd-journal.xml
index 1a0b82265e..3f17c4d955 100644
--- a/man/sd-journal.xml
+++ b/man/sd-journal.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2012 Lennart Poettering
 -->
 
 <refentry id="sd-journal"
diff --git a/man/sd-login.xml b/man/sd-login.xml
index ae1895ad89..87dc4f05bc 100644
--- a/man/sd-login.xml
+++ b/man/sd-login.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2010 Lennart Poettering
 -->
 
 <refentry id="sd-login" conditional='HAVE_PAM'
diff --git a/man/sd_booted.xml b/man/sd_booted.xml
index 6e19e4e8d9..6cf5707c9f 100644
--- a/man/sd_booted.xml
+++ b/man/sd_booted.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2010 Lennart Poettering
 -->
 
 <refentry id="sd_booted"
diff --git a/man/sd_bus_error_add_map.xml b/man/sd_bus_error_add_map.xml
index d9bb694701..8d3fa2836f 100644
--- a/man/sd_bus_error_add_map.xml
+++ b/man/sd_bus_error_add_map.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2015 Lennart Poettering
 -->
 
 <refentry id="sd_bus_error_add_map">
diff --git a/man/sd_bus_get_n_queued_read.xml b/man/sd_bus_get_n_queued_read.xml
index b7ac71f6e1..3dd68c17d8 100644
--- a/man/sd_bus_get_n_queued_read.xml
+++ b/man/sd_bus_get_n_queued_read.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2018 Lennart Poettering
 -->
 
 <refentry id="sd_bus_get_n_queued_read">
diff --git a/man/sd_bus_is_open.xml b/man/sd_bus_is_open.xml
index e5abbdb395..ce53d76719 100644
--- a/man/sd_bus_is_open.xml
+++ b/man/sd_bus_is_open.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2017 Lennart Poettering
 -->
 
 <refentry id="sd_bus_is_open">
diff --git a/man/sd_bus_message_get_cookie.xml b/man/sd_bus_message_get_cookie.xml
index f673940aea..551630a855 100644
--- a/man/sd_bus_message_get_cookie.xml
+++ b/man/sd_bus_message_get_cookie.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2013 Lennart Poettering
 -->
 
 <refentry id="sd_bus_message_get_cookie"
diff --git a/man/sd_bus_message_get_monotonic_usec.xml b/man/sd_bus_message_get_monotonic_usec.xml
index 761834dbca..f060f96601 100644
--- a/man/sd_bus_message_get_monotonic_usec.xml
+++ b/man/sd_bus_message_get_monotonic_usec.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2013 Lennart Poettering
 -->
 
 <refentry id="sd_bus_message_get_monotonic_usec"
diff --git a/man/sd_bus_message_set_destination.xml b/man/sd_bus_message_set_destination.xml
index 98b10a27d1..0d3eac6a58 100644
--- a/man/sd_bus_message_set_destination.xml
+++ b/man/sd_bus_message_set_destination.xml
@@ -3,8 +3,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2017 Lennart Poettering
 -->
 
 <refentry id="sd_bus_message_set_destination" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_bus_negotiate_fds.xml b/man/sd_bus_negotiate_fds.xml
index edcb5cb579..76c020a253 100644
--- a/man/sd_bus_negotiate_fds.xml
+++ b/man/sd_bus_negotiate_fds.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2014 Lennart Poettering
 -->
 
 <refentry id="sd_bus_negotiate_fds" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_bus_request_name.xml b/man/sd_bus_request_name.xml
index b3c1faee03..d3601e2c97 100644
--- a/man/sd_bus_request_name.xml
+++ b/man/sd_bus_request_name.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2013 Lennart Poettering
 -->
 
 <refentry id="sd_bus_request_name">
diff --git a/man/sd_bus_set_connected_signal.xml b/man/sd_bus_set_connected_signal.xml
index 0db2c8627a..45d3b406ae 100644
--- a/man/sd_bus_set_connected_signal.xml
+++ b/man/sd_bus_set_connected_signal.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2017 Lennart Poettering
 -->
 
 <refentry id="sd_bus_set_connected_signal">
diff --git a/man/sd_bus_set_sender.xml b/man/sd_bus_set_sender.xml
index 47ec3b569b..b4762fad2d 100644
--- a/man/sd_bus_set_sender.xml
+++ b/man/sd_bus_set_sender.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2017 Lennart Poettering
 -->
 
 <refentry id="sd_bus_set_sender">
diff --git a/man/sd_bus_set_watch_bind.xml b/man/sd_bus_set_watch_bind.xml
index eba0b14b65..196f9b5c84 100644
--- a/man/sd_bus_set_watch_bind.xml
+++ b/man/sd_bus_set_watch_bind.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2017 Lennart Poettering
 -->
 
 <refentry id="sd_bus_set_watch_bind">
diff --git a/man/sd_bus_track_add_name.xml b/man/sd_bus_track_add_name.xml
index 1898693aea..3d1e12efe8 100644
--- a/man/sd_bus_track_add_name.xml
+++ b/man/sd_bus_track_add_name.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2016 Lennart Poettering
 -->
 
 <refentry id="sd_bus_track_add_name" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_bus_track_new.xml b/man/sd_bus_track_new.xml
index 9112925ae1..2b15e05a2d 100644
--- a/man/sd_bus_track_new.xml
+++ b/man/sd_bus_track_new.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2016 Lennart Poettering
 -->
 
 <refentry id="sd_bus_track_new" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_event_add_io.xml b/man/sd_event_add_io.xml
index 469128c2df..fa845f4808 100644
--- a/man/sd_event_add_io.xml
+++ b/man/sd_event_add_io.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2015 Lennart Poettering
 -->
 
 <refentry id="sd_event_add_io" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_event_add_time.xml b/man/sd_event_add_time.xml
index fbe9dae0e6..92121ce9a8 100644
--- a/man/sd_event_add_time.xml
+++ b/man/sd_event_add_time.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2014 Lennart Poettering
 -->
 
 <refentry id="sd_event_add_time" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_event_exit.xml b/man/sd_event_exit.xml
index a7af34c40a..680104ae79 100644
--- a/man/sd_event_exit.xml
+++ b/man/sd_event_exit.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2015 Lennart Poettering
 -->
 
 <refentry id="sd_event_exit" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_event_new.xml b/man/sd_event_new.xml
index 9baa0fa062..14fe0855e3 100644
--- a/man/sd_event_new.xml
+++ b/man/sd_event_new.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2014 Lennart Poettering
 -->
 
 <refentry id="sd_event_new" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_event_now.xml b/man/sd_event_now.xml
index dada35c025..2b7092b0a9 100644
--- a/man/sd_event_now.xml
+++ b/man/sd_event_now.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2015 Lennart Poettering
 -->
 
 <refentry id="sd_event_now" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_event_set_watchdog.xml b/man/sd_event_set_watchdog.xml
index 112534ae85..a8ca42344c 100644
--- a/man/sd_event_set_watchdog.xml
+++ b/man/sd_event_set_watchdog.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2015 Lennart Poettering
 -->
 
 <refentry id="sd_event_set_watchdog" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_event_source_get_event.xml b/man/sd_event_source_get_event.xml
index e490b4290f..62ba339c5f 100644
--- a/man/sd_event_source_get_event.xml
+++ b/man/sd_event_source_get_event.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2015 Lennart Poettering
 -->
 
 <refentry id="sd_event_source_get_event" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_event_source_get_pending.xml b/man/sd_event_source_get_pending.xml
index 0c1a6ceada..325bba9030 100644
--- a/man/sd_event_source_get_pending.xml
+++ b/man/sd_event_source_get_pending.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2015 Lennart Poettering
 -->
 
 <refentry id="sd_event_source_get_pending" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_event_source_set_enabled.xml b/man/sd_event_source_set_enabled.xml
index 854326758e..189a41a03e 100644
--- a/man/sd_event_source_set_enabled.xml
+++ b/man/sd_event_source_set_enabled.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2015 Lennart Poettering
 -->
 
 <refentry id="sd_event_source_set_enabled" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_event_source_set_prepare.xml b/man/sd_event_source_set_prepare.xml
index 2c95a197f4..8930fc7edb 100644
--- a/man/sd_event_source_set_prepare.xml
+++ b/man/sd_event_source_set_prepare.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2015 Lennart Poettering
 -->
 
 <refentry id="sd_event_source_set_prepare" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_event_source_set_priority.xml b/man/sd_event_source_set_priority.xml
index 788c3b6c36..26c882954c 100644
--- a/man/sd_event_source_set_priority.xml
+++ b/man/sd_event_source_set_priority.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2015 Lennart Poettering
 -->
 
 <refentry id="sd_event_source_set_priority" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_event_source_set_userdata.xml b/man/sd_event_source_set_userdata.xml
index 4c4e6c0121..a6d16e7ecf 100644
--- a/man/sd_event_source_set_userdata.xml
+++ b/man/sd_event_source_set_userdata.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2015 Lennart Poettering
 -->
 
 <refentry id="sd_event_source_set_userdata" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_event_source_unref.xml b/man/sd_event_source_unref.xml
index 664387fc03..2d356e5fd8 100644
--- a/man/sd_event_source_unref.xml
+++ b/man/sd_event_source_unref.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2015 Lennart Poettering
 -->
 
 <refentry id="sd_event_source_unref" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_get_seats.xml b/man/sd_get_seats.xml
index 3396ee99f1..6211308208 100644
--- a/man/sd_get_seats.xml
+++ b/man/sd_get_seats.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2010 Lennart Poettering
 -->
 
 <refentry id="sd_get_seats" conditional='HAVE_PAM'
diff --git a/man/sd_id128_get_machine.xml b/man/sd_id128_get_machine.xml
index 7245ba5b25..6f6ce7ad56 100644
--- a/man/sd_id128_get_machine.xml
+++ b/man/sd_id128_get_machine.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2012 Lennart Poettering
 -->
 
 <refentry id="sd_id128_get_machine" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_id128_randomize.xml b/man/sd_id128_randomize.xml
index df31a4a196..3687884c5b 100644
--- a/man/sd_id128_randomize.xml
+++ b/man/sd_id128_randomize.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2012 Lennart Poettering
 -->
 
 <refentry id="sd_id128_randomize" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_id128_to_string.xml b/man/sd_id128_to_string.xml
index dce1568e25..fee7b4b5e0 100644
--- a/man/sd_id128_to_string.xml
+++ b/man/sd_id128_to_string.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2012 Lennart Poettering
 -->
 
 <refentry id="sd_id128_to_string" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_is_fifo.xml b/man/sd_is_fifo.xml
index b70824c026..7217231a7a 100644
--- a/man/sd_is_fifo.xml
+++ b/man/sd_is_fifo.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2010 Lennart Poettering
 -->
 
 <refentry id="sd_is_fifo"
diff --git a/man/sd_journal_add_match.xml b/man/sd_journal_add_match.xml
index 0a03cb46be..47275ff1db 100644
--- a/man/sd_journal_add_match.xml
+++ b/man/sd_journal_add_match.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2012 Lennart Poettering
 -->
 
 <refentry id="sd_journal_add_match" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_journal_enumerate_fields.xml b/man/sd_journal_enumerate_fields.xml
index c686bbd937..080a1eed02 100644
--- a/man/sd_journal_enumerate_fields.xml
+++ b/man/sd_journal_enumerate_fields.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2016 Lennart Poettering
 -->
 
 <refentry id="sd_journal_enumerate_fields" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_journal_get_catalog.xml b/man/sd_journal_get_catalog.xml
index d046d69562..19a967452e 100644
--- a/man/sd_journal_get_catalog.xml
+++ b/man/sd_journal_get_catalog.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2012 Lennart Poettering
 -->
 
 <refentry id="sd_journal_get_catalog" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_journal_get_cursor.xml b/man/sd_journal_get_cursor.xml
index df93e3a0de..d118566f12 100644
--- a/man/sd_journal_get_cursor.xml
+++ b/man/sd_journal_get_cursor.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2012 Lennart Poettering
 -->
 
 <refentry id="sd_journal_get_cursor" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_journal_get_cutoff_realtime_usec.xml b/man/sd_journal_get_cutoff_realtime_usec.xml
index 9ce932d709..b3a7f436fe 100644
--- a/man/sd_journal_get_cutoff_realtime_usec.xml
+++ b/man/sd_journal_get_cutoff_realtime_usec.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2012 Lennart Poettering
 -->
 
 <refentry id="sd_journal_get_cutoff_realtime_usec" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_journal_get_data.xml b/man/sd_journal_get_data.xml
index 601571645c..706b6afde9 100644
--- a/man/sd_journal_get_data.xml
+++ b/man/sd_journal_get_data.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2012 Lennart Poettering
 -->
 
 <refentry id="sd_journal_get_data" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_journal_get_fd.xml b/man/sd_journal_get_fd.xml
index 69c9ff2128..21670030fe 100644
--- a/man/sd_journal_get_fd.xml
+++ b/man/sd_journal_get_fd.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2012 Lennart Poettering
 -->
 
 <refentry id="sd_journal_get_fd" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_journal_get_realtime_usec.xml b/man/sd_journal_get_realtime_usec.xml
index 1027285476..a58fed4541 100644
--- a/man/sd_journal_get_realtime_usec.xml
+++ b/man/sd_journal_get_realtime_usec.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2012 Lennart Poettering
 -->
 
 <refentry id="sd_journal_get_realtime_usec"
diff --git a/man/sd_journal_get_usage.xml b/man/sd_journal_get_usage.xml
index 0365d35a00..9ac18c7cda 100644
--- a/man/sd_journal_get_usage.xml
+++ b/man/sd_journal_get_usage.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2012 Lennart Poettering
 -->
 
 <refentry id="sd_journal_get_usage" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_journal_next.xml b/man/sd_journal_next.xml
index 83577620cb..dd592f1ea4 100644
--- a/man/sd_journal_next.xml
+++ b/man/sd_journal_next.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2012 Lennart Poettering
 -->
 
 <refentry id="sd_journal_next" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_journal_open.xml b/man/sd_journal_open.xml
index 9ab3de3c49..932418c257 100644
--- a/man/sd_journal_open.xml
+++ b/man/sd_journal_open.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2012 Lennart Poettering
 -->
 
 <refentry id="sd_journal_open">
diff --git a/man/sd_journal_print.xml b/man/sd_journal_print.xml
index a872def2e9..331a0ee9e3 100644
--- a/man/sd_journal_print.xml
+++ b/man/sd_journal_print.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2012 Lennart Poettering
 -->
 
 <refentry id="sd_journal_print" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_journal_query_unique.xml b/man/sd_journal_query_unique.xml
index 5dfb136aec..67d0e7cb21 100644
--- a/man/sd_journal_query_unique.xml
+++ b/man/sd_journal_query_unique.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2012 Lennart Poettering
 -->
 
 <refentry id="sd_journal_query_unique" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_journal_seek_head.xml b/man/sd_journal_seek_head.xml
index fa101a4902..c78a02ce86 100644
--- a/man/sd_journal_seek_head.xml
+++ b/man/sd_journal_seek_head.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2012 Lennart Poettering
 -->
 
 <refentry id="sd_journal_seek_head" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_journal_stream_fd.xml b/man/sd_journal_stream_fd.xml
index bbbd172533..b3d1ccfdc5 100644
--- a/man/sd_journal_stream_fd.xml
+++ b/man/sd_journal_stream_fd.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2012 Lennart Poettering
 -->
 
 <refentry id="sd_journal_stream_fd" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_listen_fds.xml b/man/sd_listen_fds.xml
index b513034a67..7b4beafd16 100644
--- a/man/sd_listen_fds.xml
+++ b/man/sd_listen_fds.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2010 Lennart Poettering
 -->
 
 <refentry id="sd_listen_fds"
diff --git a/man/sd_login_monitor_new.xml b/man/sd_login_monitor_new.xml
index 3cc2dac3f3..8daf329e74 100644
--- a/man/sd_login_monitor_new.xml
+++ b/man/sd_login_monitor_new.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2010 Lennart Poettering
 -->
 
 <refentry id="sd_login_monitor_new" conditional='HAVE_PAM'
diff --git a/man/sd_machine_get_class.xml b/man/sd_machine_get_class.xml
index e5a81a802b..dd1b4d55b8 100644
--- a/man/sd_machine_get_class.xml
+++ b/man/sd_machine_get_class.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2014 Lennart Poettering
 -->
 
 <refentry id="sd_machine_get_class" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_notify.xml b/man/sd_notify.xml
index 896b0a4585..41d4392f0e 100644
--- a/man/sd_notify.xml
+++ b/man/sd_notify.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2010 Lennart Poettering
 -->
 
 <refentry id="sd_notify"
diff --git a/man/sd_pid_get_owner_uid.xml b/man/sd_pid_get_owner_uid.xml
index 7da0905c80..a44e483cc2 100644
--- a/man/sd_pid_get_owner_uid.xml
+++ b/man/sd_pid_get_owner_uid.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2010 Lennart Poettering
 -->
 
 <refentry id="sd_pid_get_owner_uid" conditional='HAVE_PAM'
diff --git a/man/sd_seat_get_active.xml b/man/sd_seat_get_active.xml
index dfa51f7913..f41717113b 100644
--- a/man/sd_seat_get_active.xml
+++ b/man/sd_seat_get_active.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2010 Lennart Poettering
 -->
 
 <refentry id="sd_seat_get_active" conditional='HAVE_PAM'
diff --git a/man/sd_session_is_active.xml b/man/sd_session_is_active.xml
index a7b95bf6ff..e078235a6a 100644
--- a/man/sd_session_is_active.xml
+++ b/man/sd_session_is_active.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2010 Lennart Poettering
 -->
 
 <refentry id="sd_session_is_active" conditional='HAVE_PAM'
diff --git a/man/sd_uid_get_state.xml b/man/sd_uid_get_state.xml
index 5a5d7a8740..229af6223c 100644
--- a/man/sd_uid_get_state.xml
+++ b/man/sd_uid_get_state.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2010 Lennart Poettering
 -->
 
 <refentry id="sd_uid_get_state" conditional='HAVE_PAM'
diff --git a/man/sd_watchdog_enabled.xml b/man/sd_watchdog_enabled.xml
index 5f5f72441e..a4396d07bd 100644
--- a/man/sd_watchdog_enabled.xml
+++ b/man/sd_watchdog_enabled.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2013 Lennart Poettering
 -->
 
 <refentry id="sd_watchdog_enabled"
diff --git a/man/shutdown.xml b/man/shutdown.xml
index a2f3b74d60..52e2f85baa 100644
--- a/man/shutdown.xml
+++ b/man/shutdown.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2010 Lennart Poettering
 -->
 
 <refentry id="shutdown"
diff --git a/man/sysctl.d.xml b/man/sysctl.d.xml
index ddd0fda457..99c88c3920 100644
--- a/man/sysctl.d.xml
+++ b/man/sysctl.d.xml
@@ -2,8 +2,6 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2011 Lennart Poettering
 -->
 <refentry id="sysctl.d"
     xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/systemctl.xml b/man/systemctl.xml
index 6784f3d37e..2224200723 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -7,8 +7,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2010 Lennart Poettering
 -->
 
 <refentry id="systemctl"
diff --git a/man/systemd-analyze.xml b/man/systemd-analyze.xml
index 61de5a131d..30d3033376 100644
--- a/man/systemd-analyze.xml
+++ b/man/systemd-analyze.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2012 Lennart Poettering
 -->
 
 <refentry id="systemd-analyze"
diff --git a/man/systemd-ask-password-console.service.xml b/man/systemd-ask-password-console.service.xml
index 529c980190..64a5c97897 100644
--- a/man/systemd-ask-password-console.service.xml
+++ b/man/systemd-ask-password-console.service.xml
@@ -3,8 +3,6 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  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 cf01acab08..c38583e611 100644
--- a/man/systemd-ask-password.xml
+++ b/man/systemd-ask-password.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2011 Lennart Poettering
 -->
 
 <refentry id="systemd-ask-password"
diff --git a/man/systemd-backlight@.service.xml b/man/systemd-backlight@.service.xml
index 1519e757b8..135179f06d 100644
--- a/man/systemd-backlight@.service.xml
+++ b/man/systemd-backlight@.service.xml
@@ -3,8 +3,6 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  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 6cb44a9336..fe4babd0bb 100644
--- a/man/systemd-binfmt.service.xml
+++ b/man/systemd-binfmt.service.xml
@@ -3,8 +3,6 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2012 Lennart Poettering
 -->
 <refentry id="systemd-binfmt.service" conditional='ENABLE_BINFMT'
     xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/systemd-cat.xml b/man/systemd-cat.xml
index 432b524a4c..c373f305e5 100644
--- a/man/systemd-cat.xml
+++ b/man/systemd-cat.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2012 Lennart Poettering
 -->
 
 <refentry id="systemd-cat"
diff --git a/man/systemd-cgls.xml b/man/systemd-cgls.xml
index 3f1e739ade..d751f9e880 100644
--- a/man/systemd-cgls.xml
+++ b/man/systemd-cgls.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2010 Lennart Poettering
 -->
 
 <refentry id="systemd-cgls"
diff --git a/man/systemd-cgtop.xml b/man/systemd-cgtop.xml
index 2381149238..57636e55bc 100644
--- a/man/systemd-cgtop.xml
+++ b/man/systemd-cgtop.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2012 Lennart Poettering
 -->
 
 <refentry id="systemd-cgtop"
diff --git a/man/systemd-cryptsetup-generator.xml b/man/systemd-cryptsetup-generator.xml
index 3b5d153af4..8be6f22a26 100644
--- a/man/systemd-cryptsetup-generator.xml
+++ b/man/systemd-cryptsetup-generator.xml
@@ -3,8 +3,6 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  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 f024522a0e..6894d23b06 100644
--- a/man/systemd-cryptsetup@.service.xml
+++ b/man/systemd-cryptsetup@.service.xml
@@ -3,8 +3,6 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  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 5d589639f0..9ceafd152f 100644
--- a/man/systemd-debug-generator.xml
+++ b/man/systemd-debug-generator.xml
@@ -3,8 +3,6 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2014 Lennart Poettering
 -->
 <refentry id="systemd-debug-generator">
 
diff --git a/man/systemd-delta.xml b/man/systemd-delta.xml
index 496e02f9ec..c0c1f4726d 100644
--- a/man/systemd-delta.xml
+++ b/man/systemd-delta.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2012 Lennart Poettering
 -->
 
 <refentry id="systemd-delta"
diff --git a/man/systemd-detect-virt.xml b/man/systemd-detect-virt.xml
index 916139bc06..0cde28985d 100644
--- a/man/systemd-detect-virt.xml
+++ b/man/systemd-detect-virt.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2010 Lennart Poettering
 -->
 
 <refentry id="systemd-detect-virt"
diff --git a/man/systemd-escape.xml b/man/systemd-escape.xml
index d5343f4559..aaf0b9c41b 100644
--- a/man/systemd-escape.xml
+++ b/man/systemd-escape.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2014 Lennart Poettering
 -->
 
 <refentry id="systemd-escape"
diff --git a/man/systemd-firstboot.xml b/man/systemd-firstboot.xml
index e16bec2016..dd166b838a 100644
--- a/man/systemd-firstboot.xml
+++ b/man/systemd-firstboot.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2014 Lennart Poettering
 -->
 
 <refentry id="systemd-firstboot" conditional='ENABLE_FIRSTBOOT'
diff --git a/man/systemd-fsck@.service.xml b/man/systemd-fsck@.service.xml
index aeff1a4420..5cd8591a06 100644
--- a/man/systemd-fsck@.service.xml
+++ b/man/systemd-fsck@.service.xml
@@ -3,8 +3,6 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2012 Lennart Poettering
 -->
 <refentry id="systemd-fsck@.service">
 
diff --git a/man/systemd-fstab-generator.xml b/man/systemd-fstab-generator.xml
index ea80ca2627..f89e22b5b2 100644
--- a/man/systemd-fstab-generator.xml
+++ b/man/systemd-fstab-generator.xml
@@ -3,8 +3,6 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2012 Lennart Poettering
 -->
 <refentry id="systemd-fstab-generator">
 
diff --git a/man/systemd-getty-generator.xml b/man/systemd-getty-generator.xml
index a267d36f58..c40e8c812b 100644
--- a/man/systemd-getty-generator.xml
+++ b/man/systemd-getty-generator.xml
@@ -3,8 +3,6 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  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 9b82782520..98f69256c3 100644
--- a/man/systemd-gpt-auto-generator.xml
+++ b/man/systemd-gpt-auto-generator.xml
@@ -3,8 +3,6 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  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 f0b39a8828..1f83d2aad8 100644
--- a/man/systemd-halt.service.xml
+++ b/man/systemd-halt.service.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2012 Lennart Poettering
 -->
 
 <refentry id="systemd-halt.service">
diff --git a/man/systemd-hostnamed.service.xml b/man/systemd-hostnamed.service.xml
index 86d27ba73f..ea4fa34d27 100644
--- a/man/systemd-hostnamed.service.xml
+++ b/man/systemd-hostnamed.service.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2012 Lennart Poettering
 -->
 
 <refentry id="systemd-hostnamed.service" conditional='ENABLE_HOSTNAMED'>
diff --git a/man/systemd-importd.service.xml b/man/systemd-importd.service.xml
index ab69226232..7d3dafacde 100644
--- a/man/systemd-importd.service.xml
+++ b/man/systemd-importd.service.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2016 Lennart Poettering
 -->
 
 <refentry id="systemd-importd.service" conditional='ENABLE_IMPORTD'>
diff --git a/man/systemd-inhibit.xml b/man/systemd-inhibit.xml
index f9fd131ba9..fb3a5b1038 100644
--- a/man/systemd-inhibit.xml
+++ b/man/systemd-inhibit.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2012 Lennart Poettering
 -->
 
 <refentry id="systemd-inhibit"
diff --git a/man/systemd-initctl.service.xml b/man/systemd-initctl.service.xml
index 8bdba5ed35..502bbfd2b2 100644
--- a/man/systemd-initctl.service.xml
+++ b/man/systemd-initctl.service.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2012 Lennart Poettering
 -->
 
 <refentry id="systemd-initctl.service">
diff --git a/man/systemd-journald.service.xml b/man/systemd-journald.service.xml
index 8224dc293c..8a2bdc162a 100644
--- a/man/systemd-journald.service.xml
+++ b/man/systemd-journald.service.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2010 Lennart Poettering
 -->
 
 <refentry id="systemd-journald.service">
diff --git a/man/systemd-localed.service.xml b/man/systemd-localed.service.xml
index 541c5a2944..1d444e930b 100644
--- a/man/systemd-localed.service.xml
+++ b/man/systemd-localed.service.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2012 Lennart Poettering
 -->
 
 <refentry id="systemd-localed.service" conditional='ENABLE_LOCALED'>
diff --git a/man/systemd-logind.service.xml b/man/systemd-logind.service.xml
index 48cae5e9e9..eb58dc3abd 100644
--- a/man/systemd-logind.service.xml
+++ b/man/systemd-logind.service.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2010 Lennart Poettering
 -->
 
 <refentry id="systemd-logind.service" conditional='ENABLE_LOGIND'>
diff --git a/man/systemd-machine-id-setup.xml b/man/systemd-machine-id-setup.xml
index 438fa09fd8..8974ad2f39 100644
--- a/man/systemd-machine-id-setup.xml
+++ b/man/systemd-machine-id-setup.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2012 Lennart Poettering
 -->
 
 <refentry id="systemd-machine-id-setup"
diff --git a/man/systemd-modules-load.service.xml b/man/systemd-modules-load.service.xml
index bda52da180..4121bba5a4 100644
--- a/man/systemd-modules-load.service.xml
+++ b/man/systemd-modules-load.service.xml
@@ -3,8 +3,6 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  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 eacf92bcd1..e873ac3cb5 100644
--- a/man/systemd-mount.xml
+++ b/man/systemd-mount.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2016 Lennart Poettering
 -->
 
 <refentry id="systemd-mount"
diff --git a/man/systemd-notify.xml b/man/systemd-notify.xml
index e0fc44c3dd..b32536ddfa 100644
--- a/man/systemd-notify.xml
+++ b/man/systemd-notify.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2010 Lennart Poettering
 -->
 
 <refentry id="systemd-notify"
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index 2ddc089d8c..6ede58e33c 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -7,8 +7,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2010 Lennart Poettering
 -->
 
 <refentry id="systemd-nspawn"
diff --git a/man/systemd-path.xml b/man/systemd-path.xml
index 859f175e28..5f966805f2 100644
--- a/man/systemd-path.xml
+++ b/man/systemd-path.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2014 Lennart Poettering
 -->
 
 <refentry id="systemd-path"
diff --git a/man/systemd-quotacheck.service.xml b/man/systemd-quotacheck.service.xml
index fcb6362230..83bff94397 100644
--- a/man/systemd-quotacheck.service.xml
+++ b/man/systemd-quotacheck.service.xml
@@ -3,8 +3,6 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  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 0492321427..e03bdca4d8 100644
--- a/man/systemd-random-seed.service.xml
+++ b/man/systemd-random-seed.service.xml
@@ -3,8 +3,6 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  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 bcafed2dc7..268743e84f 100644
--- a/man/systemd-rc-local-generator.xml
+++ b/man/systemd-rc-local-generator.xml
@@ -3,8 +3,6 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  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 7195648fc8..8599f1fe2b 100644
--- a/man/systemd-remount-fs.service.xml
+++ b/man/systemd-remount-fs.service.xml
@@ -3,8 +3,6 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2012 Lennart Poettering
 -->
 <refentry id="systemd-remount-fs.service">
 
diff --git a/man/systemd-rfkill.service.xml b/man/systemd-rfkill.service.xml
index 4deb6cede8..808fc0b83a 100644
--- a/man/systemd-rfkill.service.xml
+++ b/man/systemd-rfkill.service.xml
@@ -3,8 +3,6 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2013 Lennart Poettering
 -->
 <refentry id="systemd-rfkill.service" conditional='ENABLE_RFKILL'>
 
diff --git a/man/systemd-suspend.service.xml b/man/systemd-suspend.service.xml
index 40fa3523f7..f23471dbe5 100644
--- a/man/systemd-suspend.service.xml
+++ b/man/systemd-suspend.service.xml
@@ -5,7 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  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 53bb04a4a4..067e0cdb1b 100644
--- a/man/systemd-sysctl.service.xml
+++ b/man/systemd-sysctl.service.xml
@@ -3,8 +3,6 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2012 Lennart Poettering
 -->
 <refentry id="systemd-sysctl.service"
     xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/systemd-system-update-generator.xml b/man/systemd-system-update-generator.xml
index 3178ea9471..7200358c74 100644
--- a/man/systemd-system-update-generator.xml
+++ b/man/systemd-system-update-generator.xml
@@ -3,8 +3,6 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  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 dc771f738a..96fe912c90 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -7,8 +7,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2010 Lennart Poettering
 -->
 
 <refentry id="systemd-system.conf"
diff --git a/man/systemd-sysusers.xml b/man/systemd-sysusers.xml
index e6bfd352aa..351bde198b 100644
--- a/man/systemd-sysusers.xml
+++ b/man/systemd-sysusers.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2014 Lennart Poettering
 -->
 
 <refentry id="systemd-sysusers"
diff --git a/man/systemd-timedated.service.xml b/man/systemd-timedated.service.xml
index 6cfdf3e687..d92388ffce 100644
--- a/man/systemd-timedated.service.xml
+++ b/man/systemd-timedated.service.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2010 Lennart Poettering
 -->
 
 <refentry id="systemd-timedated.service" conditional='ENABLE_TIMEDATED'>
diff --git a/man/systemd-tmpfiles.xml b/man/systemd-tmpfiles.xml
index 4a840fe707..79ae9394f5 100644
--- a/man/systemd-tmpfiles.xml
+++ b/man/systemd-tmpfiles.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2010 Lennart Poettering
 -->
 
 <refentry id="systemd-tmpfiles"
diff --git a/man/systemd-tty-ask-password-agent.xml b/man/systemd-tty-ask-password-agent.xml
index 5d435fdf56..5740916c56 100644
--- a/man/systemd-tty-ask-password-agent.xml
+++ b/man/systemd-tty-ask-password-agent.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2010 Lennart Poettering
 -->
 
 <refentry id="systemd-tty-ask-password-agent"
diff --git a/man/systemd-update-done.service.xml b/man/systemd-update-done.service.xml
index 19e1d00cd2..04d71b9af9 100644
--- a/man/systemd-update-done.service.xml
+++ b/man/systemd-update-done.service.xml
@@ -3,8 +3,6 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  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 0e0aba7740..30d0809bf7 100644
--- a/man/systemd-update-utmp.service.xml
+++ b/man/systemd-update-utmp.service.xml
@@ -3,8 +3,6 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  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 f8273a382e..40d06e8d34 100644
--- a/man/systemd-user-sessions.service.xml
+++ b/man/systemd-user-sessions.service.xml
@@ -3,8 +3,6 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  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 b5988acc21..c872b223ae 100644
--- a/man/systemd-vconsole-setup.service.xml
+++ b/man/systemd-vconsole-setup.service.xml
@@ -3,8 +3,6 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  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 eb6454b33f..677c137bd2 100644
--- a/man/systemd-veritysetup-generator.xml
+++ b/man/systemd-veritysetup-generator.xml
@@ -3,8 +3,6 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  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 7124851126..89e34e59e7 100644
--- a/man/systemd-veritysetup@.service.xml
+++ b/man/systemd-veritysetup@.service.xml
@@ -3,8 +3,6 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  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 a1039119e7..3a897e3b85 100644
--- a/man/systemd-volatile-root.service.xml
+++ b/man/systemd-volatile-root.service.xml
@@ -3,8 +3,6 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2016 Lennart Poettering
 -->
 <refentry id="systemd-volatile-root.service">
 
diff --git a/man/systemd.automount.xml b/man/systemd.automount.xml
index b1a8fdd12f..f09e27b267 100644
--- a/man/systemd.automount.xml
+++ b/man/systemd.automount.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2010 Lennart Poettering
 -->
 
 <refentry id="systemd.automount">
diff --git a/man/systemd.device.xml b/man/systemd.device.xml
index 89c9d02bb0..88ec1d85a8 100644
--- a/man/systemd.device.xml
+++ b/man/systemd.device.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2010 Lennart Poettering
 -->
 
 <refentry id="systemd.device">
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index 41234dd84e..f66cb74a4a 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2010 Lennart Poettering
 -->
 
 <refentry id="systemd.exec">
diff --git a/man/systemd.journal-fields.xml b/man/systemd.journal-fields.xml
index 72efa60f87..fd52e62185 100644
--- a/man/systemd.journal-fields.xml
+++ b/man/systemd.journal-fields.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2010 Lennart Poettering
 -->
 
 <refentry id="systemd.journal-fields">
diff --git a/man/systemd.kill.xml b/man/systemd.kill.xml
index f8a542cf74..c268615ad6 100644
--- a/man/systemd.kill.xml
+++ b/man/systemd.kill.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2012 Lennart Poettering
 -->
 
 <refentry id="systemd.kill">
diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
index 15065cda97..cb0a0a19cb 100644
--- a/man/systemd.mount.xml
+++ b/man/systemd.mount.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2010 Lennart Poettering
 -->
 
 <refentry id="systemd.mount">
diff --git a/man/systemd.nspawn.xml b/man/systemd.nspawn.xml
index f67b2255ce..13f7816cd7 100644
--- a/man/systemd.nspawn.xml
+++ b/man/systemd.nspawn.xml
@@ -7,8 +7,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2015 Lennart Poettering
 -->
 
 <refentry id="systemd.nspawn">
diff --git a/man/systemd.offline-updates.xml b/man/systemd.offline-updates.xml
index 68b5bf5839..6b8c44d8fa 100644
--- a/man/systemd.offline-updates.xml
+++ b/man/systemd.offline-updates.xml
@@ -5,7 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  Copyright 2013 Lennart Poettering
   Copyright 2016 Zbigniew Jędrzejewski-Szmek
 -->
 
diff --git a/man/systemd.path.xml b/man/systemd.path.xml
index 2e0206b989..ba2ea6aa91 100644
--- a/man/systemd.path.xml
+++ b/man/systemd.path.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2010 Lennart Poettering
 -->
 
 <refentry id="systemd.path">
diff --git a/man/systemd.preset.xml b/man/systemd.preset.xml
index 921cc28e8c..60452d87f7 100644
--- a/man/systemd.preset.xml
+++ b/man/systemd.preset.xml
@@ -3,8 +3,6 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2011 Lennart Poettering
 -->
 <refentry id="systemd.preset">
 
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index 91af1fb08b..59d5736841 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2010 Lennart Poettering
 -->
 
 <refentry id="systemd.service">
diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
index 9e84cf1fbf..a10372fceb 100644
--- a/man/systemd.socket.xml
+++ b/man/systemd.socket.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2010 Lennart Poettering
 -->
 
 <refentry id="systemd.socket">
diff --git a/man/systemd.special.xml b/man/systemd.special.xml
index 63e4664271..769c3dc08c 100644
--- a/man/systemd.special.xml
+++ b/man/systemd.special.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2010 Lennart Poettering
 -->
 
 <refentry id="systemd.special">
diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml
index 10729a2f61..03c590a680 100644
--- a/man/systemd.swap.xml
+++ b/man/systemd.swap.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2010 Lennart Poettering
 -->
 
 <refentry id="systemd.swap">
diff --git a/man/systemd.target.xml b/man/systemd.target.xml
index 9fc00c3883..778511203a 100644
--- a/man/systemd.target.xml
+++ b/man/systemd.target.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2010 Lennart Poettering
 -->
 
 <refentry id="systemd.target">
diff --git a/man/systemd.time.xml b/man/systemd.time.xml
index 43c0347f9e..0d3a7c9e68 100644
--- a/man/systemd.time.xml
+++ b/man/systemd.time.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2010 Lennart Poettering
 -->
 
 <refentry id="systemd.time">
diff --git a/man/systemd.timer.xml b/man/systemd.timer.xml
index ecde2798b0..8fb8be0802 100644
--- a/man/systemd.timer.xml
+++ b/man/systemd.timer.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2010 Lennart Poettering
 -->
 
 <refentry id="systemd.timer">
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index 59a7360893..025b3fe757 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -7,8 +7,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2010 Lennart Poettering
 -->
 
 <refentry id="systemd.unit">
diff --git a/man/systemd.xml b/man/systemd.xml
index 48c6872490..110508db9f 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2010 Lennart Poettering
 -->
 
 <refentry id="systemd"
diff --git a/man/sysusers.d.xml b/man/sysusers.d.xml
index 062c766cca..1a5a001f50 100644
--- a/man/sysusers.d.xml
+++ b/man/sysusers.d.xml
@@ -3,8 +3,6 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2014 Lennart Poettering
 -->
 <refentry id="sysusers.d" conditional='ENABLE_SYSUSERS'
     xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/telinit.xml b/man/telinit.xml
index e7e2623465..8aac9ad956 100644
--- a/man/telinit.xml
+++ b/man/telinit.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2010 Lennart Poettering
 -->
 
 <refentry id="telinit"
diff --git a/man/timedatectl.xml b/man/timedatectl.xml
index 8b3f74a899..d152d20033 100644
--- a/man/timedatectl.xml
+++ b/man/timedatectl.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2012 Lennart Poettering
 -->
 
 <refentry id="timedatectl" conditional='ENABLE_TIMEDATECTL'
diff --git a/man/timesyncd.conf.xml b/man/timesyncd.conf.xml
index f143812bcd..2ca7b9addd 100644
--- a/man/timesyncd.conf.xml
+++ b/man/timesyncd.conf.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2014 Lennart Poettering
 -->
 
 <refentry id="timesyncd.conf" conditional='ENABLE_TIMESYNCD'
diff --git a/man/user-system-options.xml b/man/user-system-options.xml
index 3079218846..b0de29cb32 100644
--- a/man/user-system-options.xml
+++ b/man/user-system-options.xml
@@ -6,7 +6,6 @@
   SPDX-License-Identifier: LGPL-2.1+
 
   Copyright 2014 Zbigniew Jędrzejewski-Szmek
-  Copyright 2014 Lennart Poettering
 -->
 
 <variablelist>
diff --git a/man/vconsole.conf.xml b/man/vconsole.conf.xml
index dac0908a79..dc874d2a49 100644
--- a/man/vconsole.conf.xml
+++ b/man/vconsole.conf.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2010 Lennart Poettering
 -->
 
 <refentry id="vconsole.conf" conditional='ENABLE_VCONSOLE'>
diff --git a/mkosi.build b/mkosi.build
index a1a395f32a..b7b8c50a2b 100755
--- a/mkosi.build
+++ b/mkosi.build
@@ -1,8 +1,6 @@
 #!/bin/sh
 set -ex
 
-# Copyright 2016 Lennart Poettering
-
 # This is a build script for OS image generation using mkosi (https://github.com/systemd/mkosi).
 # Simply invoke "mkosi" in the project directory to build an OS image.
 
diff --git a/src/ac-power/ac-power.c b/src/ac-power/ac-power.c
index 4849dd4004..7ca72ef5f5 100644
--- a/src/ac-power/ac-power.c
+++ b/src/ac-power/ac-power.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <getopt.h>
 
diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c
index ba8ce9d2e4..ec3fe89ee1 100644
--- a/src/analyze/analyze.c
+++ b/src/analyze/analyze.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  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 ab539890f3..8e1d834ab4 100644
--- a/src/ask-password/ask-password.c
+++ b/src/ask-password/ask-password.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <getopt.h>
diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c
index 45ddb85a98..2b1a1683e2 100644
--- a/src/backlight/backlight.c
+++ b/src/backlight/backlight.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2013 Lennart Poettering
-***/
 
 #include "libudev.h"
 
diff --git a/src/basic/af-list.c b/src/basic/af-list.c
index a27caf9399..866a1d4317 100644
--- a/src/basic/af-list.c
+++ b/src/basic/af-list.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2013 Lennart Poettering
-***/
 
 #include <string.h>
 #include <sys/socket.h>
diff --git a/src/basic/af-list.h b/src/basic/af-list.h
index 70952834f9..8342323b8a 100644
--- a/src/basic/af-list.h
+++ b/src/basic/af-list.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2014 Lennart Poettering
-***/
-
 #include <sys/socket.h>
 
 #include "string-util.h"
diff --git a/src/basic/alloc-util.c b/src/basic/alloc-util.c
index 130612c3d2..405445eac1 100644
--- a/src/basic/alloc-util.c
+++ b/src/basic/alloc-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <stdint.h>
 #include <string.h>
diff --git a/src/basic/alloc-util.h b/src/basic/alloc-util.h
index 0e575aff74..ebe42889ea 100644
--- a/src/basic/alloc-util.h
+++ b/src/basic/alloc-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include <alloca.h>
 #include <stddef.h>
 #include <stdlib.h>
diff --git a/src/basic/architecture.c b/src/basic/architecture.c
index a701690c5d..85837b5ebf 100644
--- a/src/basic/architecture.c
+++ b/src/basic/architecture.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2014 Lennart Poettering
-***/
 
 #include <sys/utsname.h>
 
diff --git a/src/basic/architecture.h b/src/basic/architecture.h
index 01c66c15a8..443e890eab 100644
--- a/src/basic/architecture.h
+++ b/src/basic/architecture.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2014 Lennart Poettering
-***/
-
 #include <endian.h>
 
 #include "macro.h"
diff --git a/src/basic/arphrd-list.c b/src/basic/arphrd-list.c
index ebd43f119b..a7ae4b8162 100644
--- a/src/basic/arphrd-list.c
+++ b/src/basic/arphrd-list.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2014 Lennart Poettering
-***/
 
 #include <net/if_arp.h>
 #include <string.h>
diff --git a/src/basic/arphrd-list.h b/src/basic/arphrd-list.h
index 61f906a070..5dcfe5e12d 100644
--- a/src/basic/arphrd-list.h
+++ b/src/basic/arphrd-list.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2014 Lennart Poettering
-***/
-
 const char *arphrd_to_name(int id);
 int arphrd_from_name(const char *name);
 
diff --git a/src/basic/async.c b/src/basic/async.c
index 5c8c9f5345..1c4b575b05 100644
--- a/src/basic/async.c
+++ b/src/basic/async.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2013 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <pthread.h>
diff --git a/src/basic/async.h b/src/basic/async.h
index d8bca80a86..3160613184 100644
--- a/src/basic/async.h
+++ b/src/basic/async.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2013 Lennart Poettering
-***/
-
 int asynchronous_job(void* (*func)(void *p), void *arg);
 
 int asynchronous_sync(pid_t *ret_pid);
diff --git a/src/basic/audit-util.c b/src/basic/audit-util.c
index 504ded9a2a..5cbaef3eba 100644
--- a/src/basic/audit-util.c
+++ b/src/basic/audit-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <linux/netlink.h>
diff --git a/src/basic/audit-util.h b/src/basic/audit-util.h
index 85f98f3394..c9fc49871d 100644
--- a/src/basic/audit-util.h
+++ b/src/basic/audit-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include <stdbool.h>
 #include <stdint.h>
 #include <sys/types.h>
diff --git a/src/basic/blkid-util.h b/src/basic/blkid-util.h
index 6c4ccc2c07..e4eb600ed6 100644
--- a/src/basic/blkid-util.h
+++ b/src/basic/blkid-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2014 Lennart Poettering
-***/
-
 #if HAVE_BLKID
 #include <blkid.h>
 #endif
diff --git a/src/basic/blockdev-util.c b/src/basic/blockdev-util.c
index f8951fa78c..42b311eccd 100644
--- a/src/basic/blockdev-util.c
+++ b/src/basic/blockdev-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <sys/stat.h>
 #include <sys/statfs.h>
diff --git a/src/basic/blockdev-util.h b/src/basic/blockdev-util.h
index fe8253f5d4..6d8a796568 100644
--- a/src/basic/blockdev-util.h
+++ b/src/basic/blockdev-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include <sys/types.h>
 
 #include "macro.h"
diff --git a/src/basic/btrfs-util.c b/src/basic/btrfs-util.c
index 114c9cd7e5..6d2490f3d7 100644
--- a/src/basic/btrfs-util.c
+++ b/src/basic/btrfs-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2014 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/src/basic/btrfs-util.h b/src/basic/btrfs-util.h
index e4513b44a2..a594387b5a 100644
--- a/src/basic/btrfs-util.h
+++ b/src/basic/btrfs-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2014 Lennart Poettering
-***/
-
 #include <stdbool.h>
 #include <stdint.h>
 #include <sys/types.h>
diff --git a/src/basic/build.h b/src/basic/build.h
index 71ec2c2027..2c46550300 100644
--- a/src/basic/build.h
+++ b/src/basic/build.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #if HAVE_PAM
 #define _PAM_FEATURE_ "+PAM"
 #else
diff --git a/src/basic/bus-label.c b/src/basic/bus-label.c
index c647e8ae08..1613cf7fd7 100644
--- a/src/basic/bus-label.c
+++ b/src/basic/bus-label.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2013 Lennart Poettering
-***/
 
 #include <stdlib.h>
 
diff --git a/src/basic/bus-label.h b/src/basic/bus-label.h
index 8d480d3965..664cfaf67f 100644
--- a/src/basic/bus-label.h
+++ b/src/basic/bus-label.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2013 Lennart Poettering
-***/
-
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/basic/calendarspec.c b/src/basic/calendarspec.c
index c8e1e5400f..8cb645aeac 100644
--- a/src/basic/calendarspec.c
+++ b/src/basic/calendarspec.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2012 Lennart Poettering
-***/
 
 #include <alloca.h>
 #include <ctype.h>
diff --git a/src/basic/calendarspec.h b/src/basic/calendarspec.h
index b034269ef2..3bf8a39e1a 100644
--- a/src/basic/calendarspec.h
+++ b/src/basic/calendarspec.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2012 Lennart Poettering
-***/
-
 /* A structure for specifying (possibly repetitive) points in calendar
  * time, a la cron */
 
diff --git a/src/basic/cap-list.c b/src/basic/cap-list.c
index dd13376a76..bfcda33520 100644
--- a/src/basic/cap-list.c
+++ b/src/basic/cap-list.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2014 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <string.h>
diff --git a/src/basic/cap-list.h b/src/basic/cap-list.h
index c81c6748b5..ab41924d9c 100644
--- a/src/basic/cap-list.h
+++ b/src/basic/cap-list.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2014 Lennart Poettering
-***/
-
 const char *capability_to_name(int id);
 int capability_from_name(const char *name);
 int capability_list_length(void);
diff --git a/src/basic/capability-util.c b/src/basic/capability-util.c
index a3868d1bfa..6ae35e078b 100644
--- a/src/basic/capability-util.c
+++ b/src/basic/capability-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <grp.h>
diff --git a/src/basic/capability-util.h b/src/basic/capability-util.h
index 286f50744f..4a4a86093a 100644
--- a/src/basic/capability-util.h
+++ b/src/basic/capability-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include <stdbool.h>
 #include <stdint.h>
 #include <sys/capability.h>
diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
index f3fc84d6dd..038ece4b06 100644
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <dirent.h>
 #include <errno.h>
diff --git a/src/basic/cgroup-util.h b/src/basic/cgroup-util.h
index 0e00d90cbf..1a28a8163a 100644
--- a/src/basic/cgroup-util.h
+++ b/src/basic/cgroup-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include <dirent.h>
 #include <stdbool.h>
 #include <stdint.h>
diff --git a/src/basic/chattr-util.c b/src/basic/chattr-util.c
index cd5a1dde5f..4ec14515eb 100644
--- a/src/basic/chattr-util.c
+++ b/src/basic/chattr-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/src/basic/chattr-util.h b/src/basic/chattr-util.h
index f7e157b4f1..0c0816344a 100644
--- a/src/basic/chattr-util.h
+++ b/src/basic/chattr-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 int chattr_fd(int fd, unsigned value, unsigned mask);
 int chattr_path(const char *p, unsigned value, unsigned mask);
 
diff --git a/src/basic/clock-util.c b/src/basic/clock-util.c
index 363a992366..3ea016af0e 100644
--- a/src/basic/clock-util.c
+++ b/src/basic/clock-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010-2012 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/src/basic/clock-util.h b/src/basic/clock-util.h
index 380f40061d..b9db54eac9 100644
--- a/src/basic/clock-util.h
+++ b/src/basic/clock-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010-2012 Lennart Poettering
-***/
-
 #include <time.h>
 
 int clock_is_localtime(const char* adjtime_path);
diff --git a/src/basic/conf-files.c b/src/basic/conf-files.c
index bb551e23e9..d6ef0e941e 100644
--- a/src/basic/conf-files.c
+++ b/src/basic/conf-files.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <dirent.h>
 #include <errno.h>
diff --git a/src/basic/conf-files.h b/src/basic/conf-files.h
index bc7a450192..0bb6593994 100644
--- a/src/basic/conf-files.h
+++ b/src/basic/conf-files.h
@@ -2,7 +2,6 @@
 #pragma once
 
 /***
-  Copyright 2010-2012 Lennart Poettering
   Copyright 2010-2012 Kay Sievers
 ***/
 
diff --git a/src/basic/copy.c b/src/basic/copy.c
index 00b60df4f4..e2a96d4fbd 100644
--- a/src/basic/copy.c
+++ b/src/basic/copy.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2014 Lennart Poettering
-***/
 
 #include <dirent.h>
 #include <errno.h>
diff --git a/src/basic/copy.h b/src/basic/copy.h
index f9b3565c71..6a0a6bc9b3 100644
--- a/src/basic/copy.h
+++ b/src/basic/copy.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2014 Lennart Poettering
-***/
-
 #include <inttypes.h>
 #include <stdbool.h>
 #include <stdint.h>
diff --git a/src/basic/cpu-set-util.c b/src/basic/cpu-set-util.c
index b31f9f1659..65ed5c3b22 100644
--- a/src/basic/cpu-set-util.c
+++ b/src/basic/cpu-set-util.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  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 16e5781b1d..01fc544c71 100644
--- a/src/basic/cpu-set-util.h
+++ b/src/basic/cpu-set-util.h
@@ -2,7 +2,6 @@
 #pragma once
 
 /***
-  Copyright 2010-2015 Lennart Poettering
   Copyright 2015 Filipe Brandenburger
 ***/
 
diff --git a/src/basic/def.h b/src/basic/def.h
index 4d42fb93e8..4d515c11b6 100644
--- a/src/basic/def.h
+++ b/src/basic/def.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include "util.h"
 
 #define DEFAULT_TIMEOUT_USEC (90*USEC_PER_SEC)
diff --git a/src/basic/device-nodes.h b/src/basic/device-nodes.h
index 945382bb1f..3840e6d307 100644
--- a/src/basic/device-nodes.h
+++ b/src/basic/device-nodes.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2012 Lennart Poettering
-***/
-
 #include <stddef.h>
 #include <sys/types.h>
 
diff --git a/src/basic/dirent-util.c b/src/basic/dirent-util.c
index 4a061837f2..d1d2c0ef46 100644
--- a/src/basic/dirent-util.c
+++ b/src/basic/dirent-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010-2012 Lennart Poettering
-***/
 
 #include <fcntl.h>
 #include <sys/stat.h>
diff --git a/src/basic/dirent-util.h b/src/basic/dirent-util.h
index 047ccd2250..b1b87679dc 100644
--- a/src/basic/dirent-util.h
+++ b/src/basic/dirent-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include <dirent.h>
 #include <errno.h>
 #include <stdbool.h>
diff --git a/src/basic/env-util.c b/src/basic/env-util.c
index cce8774ef8..a784a30e1d 100644
--- a/src/basic/env-util.c
+++ b/src/basic/env-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2012 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <limits.h>
diff --git a/src/basic/env-util.h b/src/basic/env-util.h
index 56b999b795..ef9398e618 100644
--- a/src/basic/env-util.h
+++ b/src/basic/env-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2013 Lennart Poettering
-***/
-
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdio.h>
diff --git a/src/basic/errno-list.c b/src/basic/errno-list.c
index a5cdf5d95f..1b72bbf3ad 100644
--- a/src/basic/errno-list.c
+++ b/src/basic/errno-list.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2013 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <string.h>
diff --git a/src/basic/errno-list.h b/src/basic/errno-list.h
index c549b055de..9c639b4f55 100644
--- a/src/basic/errno-list.h
+++ b/src/basic/errno-list.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2013 Lennart Poettering
-***/
-
 #include <stdbool.h>
 /*
  * MAX_ERRNO is defined as 4095 in linux/err.h
diff --git a/src/basic/escape.c b/src/basic/escape.c
index a51d2d9339..5004763d97 100644
--- a/src/basic/escape.c
+++ b/src/basic/escape.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <stdlib.h>
diff --git a/src/basic/escape.h b/src/basic/escape.h
index 7a55ee618e..2e07c73b9e 100644
--- a/src/basic/escape.h
+++ b/src/basic/escape.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include <inttypes.h>
 #include <stddef.h>
 #include <stdint.h>
diff --git a/src/basic/exec-util.c b/src/basic/exec-util.c
index 7bf382d48d..7e336f9ce1 100644
--- a/src/basic/exec-util.c
+++ b/src/basic/exec-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <dirent.h>
 #include <errno.h>
diff --git a/src/basic/exit-status.c b/src/basic/exit-status.c
index 49e1aa3fff..21af8c4c71 100644
--- a/src/basic/exit-status.c
+++ b/src/basic/exit-status.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <signal.h>
 #include <stdlib.h>
diff --git a/src/basic/exit-status.h b/src/basic/exit-status.h
index 11f8f5e9f1..c41e8b82c3 100644
--- a/src/basic/exit-status.h
+++ b/src/basic/exit-status.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include <stdbool.h>
 
 #include "hashmap.h"
diff --git a/src/basic/extract-word.c b/src/basic/extract-word.c
index 3927660ee4..a861b56653 100644
--- a/src/basic/extract-word.c
+++ b/src/basic/extract-word.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <stdarg.h>
diff --git a/src/basic/extract-word.h b/src/basic/extract-word.h
index de4f728c8c..8c63b7c306 100644
--- a/src/basic/extract-word.h
+++ b/src/basic/extract-word.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include "macro.h"
 
 typedef enum ExtractFlags {
diff --git a/src/basic/fd-util.c b/src/basic/fd-util.c
index c1353b9e8f..e085dc23b4 100644
--- a/src/basic/fd-util.c
+++ b/src/basic/fd-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/src/basic/fd-util.h b/src/basic/fd-util.h
index c3b6efbb91..8adc959da8 100644
--- a/src/basic/fd-util.h
+++ b/src/basic/fd-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include <dirent.h>
 #include <stdbool.h>
 #include <stdio.h>
diff --git a/src/basic/fileio-label.c b/src/basic/fileio-label.c
index 8492a4ee77..35733697e8 100644
--- a/src/basic/fileio-label.c
+++ b/src/basic/fileio-label.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2010 Lennart Poettering
   Copyright 2010 Harald Hoyer
 ***/
 
diff --git a/src/basic/fileio-label.h b/src/basic/fileio-label.h
index f27fbb923d..7803bf2baf 100644
--- a/src/basic/fileio-label.h
+++ b/src/basic/fileio-label.h
@@ -2,7 +2,6 @@
 #pragma once
 
 /***
-  Copyright 2010 Lennart Poettering
   Copyright 2010 Harald Hoyer
 ***/
 
diff --git a/src/basic/fileio.c b/src/basic/fileio.c
index 3c4fa198ec..3b6920b365 100644
--- a/src/basic/fileio.c
+++ b/src/basic/fileio.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/src/basic/fileio.h b/src/basic/fileio.h
index 9f37ba2b31..77e6206e95 100644
--- a/src/basic/fileio.h
+++ b/src/basic/fileio.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include <dirent.h>
 #include <stdbool.h>
 #include <stddef.h>
diff --git a/src/basic/fs-util.c b/src/basic/fs-util.c
index 5dff539773..7a1c57dcb1 100644
--- a/src/basic/fs-util.c
+++ b/src/basic/fs-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <stddef.h>
diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h
index 69e199f88f..7cac259a0a 100644
--- a/src/basic/fs-util.h
+++ b/src/basic/fs-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include <dirent.h>
 #include <fcntl.h>
 #include <limits.h>
diff --git a/src/basic/gcrypt-util.c b/src/basic/gcrypt-util.c
index 9e13c9df83..f304a2bab6 100644
--- a/src/basic/gcrypt-util.c
+++ b/src/basic/gcrypt-util.c
@@ -1,9 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-/***
-  Copyright 2012 Lennart Poettering
-***/
-
 #if HAVE_GCRYPT
 #include <gcrypt.h>
 
diff --git a/src/basic/glob-util.c b/src/basic/glob-util.c
index b9f378c825..9fac676f2b 100644
--- a/src/basic/glob-util.c
+++ b/src/basic/glob-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <dirent.h>
 #include <errno.h>
diff --git a/src/basic/glob-util.h b/src/basic/glob-util.h
index aef9f36648..8e226c1ee2 100644
--- a/src/basic/glob-util.h
+++ b/src/basic/glob-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include <glob.h>
 #include <stdbool.h>
 #include <string.h>
diff --git a/src/basic/hash-funcs.c b/src/basic/hash-funcs.c
index 3b695a1259..87c01178cb 100644
--- a/src/basic/hash-funcs.c
+++ b/src/basic/hash-funcs.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2010 Lennart Poettering
   Copyright 2014 Michal Schmidt
 ***/
 
diff --git a/src/basic/hash-funcs.h b/src/basic/hash-funcs.h
index 343af5d686..c08616556b 100644
--- a/src/basic/hash-funcs.h
+++ b/src/basic/hash-funcs.h
@@ -2,7 +2,6 @@
 #pragma once
 
 /***
-  Copyright 2010 Lennart Poettering
   Copyright 2014 Michal Schmidt
 ***/
 
diff --git a/src/basic/hashmap.c b/src/basic/hashmap.c
index 91fe402c58..784fbe3106 100644
--- a/src/basic/hashmap.c
+++ b/src/basic/hashmap.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2010 Lennart Poettering
   Copyright 2014 Michal Schmidt
 ***/
 
diff --git a/src/basic/hashmap.h b/src/basic/hashmap.h
index 3d544dc732..a9c8ad56fc 100644
--- a/src/basic/hashmap.h
+++ b/src/basic/hashmap.h
@@ -2,7 +2,6 @@
 #pragma once
 
 /***
-  Copyright 2010 Lennart Poettering
   Copyright 2014 Michal Schmidt
 ***/
 
diff --git a/src/basic/hexdecoct.c b/src/basic/hexdecoct.c
index 92c1642833..7748e8352c 100644
--- a/src/basic/hexdecoct.c
+++ b/src/basic/hexdecoct.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <ctype.h>
 #include <errno.h>
diff --git a/src/basic/hexdecoct.h b/src/basic/hexdecoct.h
index b49ddc8c21..9477d16e37 100644
--- a/src/basic/hexdecoct.h
+++ b/src/basic/hexdecoct.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdio.h>
diff --git a/src/basic/hostname-util.c b/src/basic/hostname-util.c
index 136b316120..09fabe077b 100644
--- a/src/basic/hostname-util.c
+++ b/src/basic/hostname-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2015 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <limits.h>
diff --git a/src/basic/hostname-util.h b/src/basic/hostname-util.h
index e92222a7b9..749481723d 100644
--- a/src/basic/hostname-util.h
+++ b/src/basic/hostname-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010-2015 Lennart Poettering
-***/
-
 #include <stdbool.h>
 #include <stdio.h>
 
diff --git a/src/basic/in-addr-util.c b/src/basic/in-addr-util.c
index df002f4960..aed7601d50 100644
--- a/src/basic/in-addr-util.c
+++ b/src/basic/in-addr-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2014 Lennart Poettering
-***/
 
 #include <arpa/inet.h>
 #include <endian.h>
diff --git a/src/basic/in-addr-util.h b/src/basic/in-addr-util.h
index e07bd86ef7..956c00a850 100644
--- a/src/basic/in-addr-util.h
+++ b/src/basic/in-addr-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2014 Lennart Poettering
-***/
-
 #include <netinet/in.h>
 #include <stddef.h>
 #include <sys/socket.h>
diff --git a/src/basic/io-util.c b/src/basic/io-util.c
index dd67389fd1..1f64cc933b 100644
--- a/src/basic/io-util.c
+++ b/src/basic/io-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <limits.h>
diff --git a/src/basic/io-util.h b/src/basic/io-util.h
index ab43ca5b51..ed189b5820 100644
--- a/src/basic/io-util.h
+++ b/src/basic/io-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
diff --git a/src/basic/khash.c b/src/basic/khash.c
index 08859832f6..847f2572a6 100644
--- a/src/basic/khash.c
+++ b/src/basic/khash.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2016 Lennart Poettering
-***/
 
 #include <linux/if_alg.h>
 #include <stdbool.h>
diff --git a/src/basic/khash.h b/src/basic/khash.h
index 5c7d306c9b..a3013b9d61 100644
--- a/src/basic/khash.h
+++ b/src/basic/khash.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2016 Lennart Poettering
-***/
-
 #include <inttypes.h>
 #include <sys/types.h>
 #include <sys/uio.h>
diff --git a/src/basic/label.c b/src/basic/label.c
index 8da5e930e2..12a7fb0945 100644
--- a/src/basic/label.c
+++ b/src/basic/label.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <sys/stat.h>
diff --git a/src/basic/label.h b/src/basic/label.h
index c5158ca60f..08fd109bcf 100644
--- a/src/basic/label.h
+++ b/src/basic/label.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include <stdbool.h>
 #include <sys/types.h>
 
diff --git a/src/basic/list.h b/src/basic/list.h
index 6ae88ec6b9..643e0bea88 100644
--- a/src/basic/list.h
+++ b/src/basic/list.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 /* The head of the linked list. Use this in the structure that shall
  * contain the head of the linked list */
 #define LIST_HEAD(t,name)                                               \
diff --git a/src/basic/locale-util.c b/src/basic/locale-util.c
index fb31e8ffbb..3ad352f22f 100644
--- a/src/basic/locale-util.c
+++ b/src/basic/locale-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2014 Lennart Poettering
-***/
 
 #include <dirent.h>
 #include <errno.h>
diff --git a/src/basic/locale-util.h b/src/basic/locale-util.h
index 80c2d871a7..775fe8bc72 100644
--- a/src/basic/locale-util.h
+++ b/src/basic/locale-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2014 Lennart Poettering
-***/
-
 #include <libintl.h>
 #include <stdbool.h>
 #include <locale.h>
diff --git a/src/basic/lockfile-util.c b/src/basic/lockfile-util.c
index e23aa52963..4bae23b243 100644
--- a/src/basic/lockfile-util.c
+++ b/src/basic/lockfile-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/src/basic/lockfile-util.h b/src/basic/lockfile-util.h
index d49251d266..c2abd9956f 100644
--- a/src/basic/lockfile-util.h
+++ b/src/basic/lockfile-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2011 Lennart Poettering
-***/
-
 #include <stddef.h>
 
 #include "macro.h"
diff --git a/src/basic/log.c b/src/basic/log.c
index 2909f520b5..48c094b548 100644
--- a/src/basic/log.c
+++ b/src/basic/log.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/src/basic/log.h b/src/basic/log.h
index 71a3bb826d..e1f5fd30cd 100644
--- a/src/basic/log.h
+++ b/src/basic/log.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdlib.h>
diff --git a/src/basic/macro.h b/src/basic/macro.h
index 4d33e70282..d1365f7058 100644
--- a/src/basic/macro.h
+++ b/src/basic/macro.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include <inttypes.h>
 #include <stdbool.h>
 #include <sys/param.h>
diff --git a/src/basic/memfd-util.c b/src/basic/memfd-util.c
index 6997c32eae..f88f0fc80c 100644
--- a/src/basic/memfd-util.c
+++ b/src/basic/memfd-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2013 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/src/basic/memfd-util.h b/src/basic/memfd-util.h
index 1e09bd2c54..5ebb519931 100644
--- a/src/basic/memfd-util.h
+++ b/src/basic/memfd-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2013 Lennart Poettering
-***/
-
 #include <inttypes.h>
 #include <stddef.h>
 #include <stdint.h>
diff --git a/src/basic/mempool.c b/src/basic/mempool.c
index 5792ca972f..76fdba781b 100644
--- a/src/basic/mempool.c
+++ b/src/basic/mempool.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2010-2014 Lennart Poettering
   Copyright 2014 Michal Schmidt
 ***/
 
diff --git a/src/basic/mempool.h b/src/basic/mempool.h
index dad4a4f9cc..0aa8a39074 100644
--- a/src/basic/mempool.h
+++ b/src/basic/mempool.h
@@ -2,7 +2,6 @@
 #pragma once
 
 /***
-  Copyright 2011-2014 Lennart Poettering
   Copyright 2014 Michal Schmidt
 ***/
 
diff --git a/src/basic/missing.h b/src/basic/missing.h
index 4a12274cb4..71a07d0574 100644
--- a/src/basic/missing.h
+++ b/src/basic/missing.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 /* Missing glibc definitions to access certain kernel APIs */
 
 #include <errno.h>
diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h
index 4eacebfb36..ca108944d8 100644
--- a/src/basic/missing_syscall.h
+++ b/src/basic/missing_syscall.h
@@ -2,7 +2,6 @@
 #pragma once
 
 /***
-  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 97fb4c96b0..a9246ae5b6 100644
--- a/src/basic/mkdir-label.c
+++ b/src/basic/mkdir-label.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2010 Lennart Poettering
   Copyright 2013 Kay Sievers
 ***/
 
diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c
index db64b0ef04..6ab1b4422b 100644
--- a/src/basic/mkdir.c
+++ b/src/basic/mkdir.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <stdbool.h>
diff --git a/src/basic/mkdir.h b/src/basic/mkdir.h
index 8b579246be..a347fa4cc0 100644
--- a/src/basic/mkdir.h
+++ b/src/basic/mkdir.h
@@ -2,7 +2,6 @@
 #pragma once
 
 /***
-  Copyright 2010 Lennart Poettering
   Copyright 2013 Kay Sievers
 ***/
 
diff --git a/src/basic/mount-util.c b/src/basic/mount-util.c
index bcb7e43288..ebe41a4c6c 100644
--- a/src/basic/mount-util.c
+++ b/src/basic/mount-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <stdio_ext.h>
diff --git a/src/basic/mount-util.h b/src/basic/mount-util.h
index f73559a017..3cfea3bb20 100644
--- a/src/basic/mount-util.h
+++ b/src/basic/mount-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include <fcntl.h>
 #include <mntent.h>
 #include <stdbool.h>
diff --git a/src/basic/nss-util.h b/src/basic/nss-util.h
index ab80b2e3e2..2045175d1c 100644
--- a/src/basic/nss-util.h
+++ b/src/basic/nss-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2014 Lennart Poettering
-***/
-
 #include <grp.h>
 #include <netdb.h>
 #include <nss.h>
diff --git a/src/basic/ordered-set.c b/src/basic/ordered-set.c
index ae52e22332..ed9ba776a4 100644
--- a/src/basic/ordered-set.c
+++ b/src/basic/ordered-set.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2016 Lennart Poettering
-***/
 
 #include "ordered-set.h"
 #include "strv.h"
diff --git a/src/basic/ordered-set.h b/src/basic/ordered-set.h
index 87971af739..e7c054d8e4 100644
--- a/src/basic/ordered-set.h
+++ b/src/basic/ordered-set.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2015 Lennart Poettering
-***/
-
 #include "hashmap.h"
 
 typedef struct OrderedSet OrderedSet;
diff --git a/src/basic/pager.c b/src/basic/pager.c
index dd5c61154f..f241261119 100644
--- a/src/basic/pager.c
+++ b/src/basic/pager.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <signal.h>
diff --git a/src/basic/pager.h b/src/basic/pager.h
index b72d1745f3..e0fd34af97 100644
--- a/src/basic/pager.h
+++ b/src/basic/pager.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include <stdbool.h>
 
 #include "macro.h"
diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c
index 4fd803c906..6becf85878 100644
--- a/src/basic/parse-util.c
+++ b/src/basic/parse-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <inttypes.h>
diff --git a/src/basic/parse-util.h b/src/basic/parse-util.h
index 5a345ac4bf..f3267f4cfe 100644
--- a/src/basic/parse-util.h
+++ b/src/basic/parse-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include <inttypes.h>
 #include <limits.h>
 #include <stddef.h>
diff --git a/src/basic/path-util.c b/src/basic/path-util.c
index bac7152a6d..d214c72916 100644
--- a/src/basic/path-util.c
+++ b/src/basic/path-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010-2012 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <limits.h>
diff --git a/src/basic/path-util.h b/src/basic/path-util.h
index 2e43c0c345..8277c6b916 100644
--- a/src/basic/path-util.h
+++ b/src/basic/path-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010-2012 Lennart Poettering
-***/
-
 #include <alloca.h>
 #include <stdbool.h>
 #include <stddef.h>
diff --git a/src/basic/prioq.c b/src/basic/prioq.c
index fd51e0587c..ef28a086d1 100644
--- a/src/basic/prioq.c
+++ b/src/basic/prioq.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2013 Lennart Poettering
-***/
 
 /*
  * Priority Queue
diff --git a/src/basic/prioq.h b/src/basic/prioq.h
index a3e378a927..e036175260 100644
--- a/src/basic/prioq.h
+++ b/src/basic/prioq.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2013 Lennart Poettering
-***/
-
 #include <stdbool.h>
 
 #include "hashmap.h"
diff --git a/src/basic/proc-cmdline.c b/src/basic/proc-cmdline.c
index c5c9d307b7..add481c2ae 100644
--- a/src/basic/proc-cmdline.c
+++ b/src/basic/proc-cmdline.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <stdbool.h>
 #include <stddef.h>
diff --git a/src/basic/proc-cmdline.h b/src/basic/proc-cmdline.h
index 9430bdad66..4a9e6e0f62 100644
--- a/src/basic/proc-cmdline.h
+++ b/src/basic/proc-cmdline.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include <stdbool.h>
 
 #include "log.h"
diff --git a/src/basic/process-util.c b/src/basic/process-util.c
index 1fcfb8135f..0a4f917cbd 100644
--- a/src/basic/process-util.c
+++ b/src/basic/process-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <ctype.h>
 #include <errno.h>
diff --git a/src/basic/process-util.h b/src/basic/process-util.h
index e51a874cd2..a5bb072b25 100644
--- a/src/basic/process-util.h
+++ b/src/basic/process-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include <alloca.h>
 #include <errno.h>
 #include <sched.h>
diff --git a/src/basic/random-util.c b/src/basic/random-util.c
index c09f13e8e3..91481559db 100644
--- a/src/basic/random-util.c
+++ b/src/basic/random-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <elf.h>
 #include <errno.h>
diff --git a/src/basic/random-util.h b/src/basic/random-util.h
index c829da0840..9a103f0e94 100644
--- a/src/basic/random-util.h
+++ b/src/basic/random-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
diff --git a/src/basic/ratelimit.c b/src/basic/ratelimit.c
index 0e9afc1e4d..4e04e04426 100644
--- a/src/basic/ratelimit.c
+++ b/src/basic/ratelimit.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <sys/time.h>
 
diff --git a/src/basic/ratelimit.h b/src/basic/ratelimit.h
index 1b761761ae..de91def28d 100644
--- a/src/basic/ratelimit.h
+++ b/src/basic/ratelimit.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include <stdbool.h>
 
 #include "time-util.h"
diff --git a/src/basic/raw-clone.h b/src/basic/raw-clone.h
index 83d5ff7c21..e96bc3bed6 100644
--- a/src/basic/raw-clone.h
+++ b/src/basic/raw-clone.h
@@ -2,7 +2,6 @@
 #pragma once
 
 /***
-  Copyright 2010 Lennart Poettering
   Copyright 2016 Michael Karcher
 ***/
 
diff --git a/src/basic/refcnt.h b/src/basic/refcnt.h
index a341fd55bc..d2be6086d2 100644
--- a/src/basic/refcnt.h
+++ b/src/basic/refcnt.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2013 Lennart Poettering
-***/
-
 /* A type-safe atomic refcounter.
  *
  * DO NOT USE THIS UNLESS YOU ACTUALLY CARE ABOUT THREAD SAFETY! */
diff --git a/src/basic/replace-var.c b/src/basic/replace-var.c
index c42a77642d..fd2b5c104f 100644
--- a/src/basic/replace-var.c
+++ b/src/basic/replace-var.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2012 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <stddef.h>
diff --git a/src/basic/replace-var.h b/src/basic/replace-var.h
index 78db493620..e6a489feee 100644
--- a/src/basic/replace-var.h
+++ b/src/basic/replace-var.h
@@ -1,8 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2012 Lennart Poettering
-***/
-
 char *replace_var(const char *text, char *(*lookup)(const char *variable, void *userdata), void *userdata);
diff --git a/src/basic/rlimit-util.c b/src/basic/rlimit-util.c
index e54227e94d..be1ba615ec 100644
--- a/src/basic/rlimit-util.c
+++ b/src/basic/rlimit-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <sys/resource.h>
diff --git a/src/basic/rlimit-util.h b/src/basic/rlimit-util.h
index c5b3cc1533..c2ea6f846b 100644
--- a/src/basic/rlimit-util.h
+++ b/src/basic/rlimit-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include <sys/resource.h>
 
 #include "macro.h"
diff --git a/src/basic/rm-rf.c b/src/basic/rm-rf.c
index 465fdb46b1..54f6dc2059 100644
--- a/src/basic/rm-rf.c
+++ b/src/basic/rm-rf.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2015 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/src/basic/rm-rf.h b/src/basic/rm-rf.h
index 9f74bce08c..0a2d7f0358 100644
--- a/src/basic/rm-rf.h
+++ b/src/basic/rm-rf.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2015 Lennart Poettering
-***/
-
 #include <sys/stat.h>
 
 #include "util.h"
diff --git a/src/basic/selinux-util.c b/src/basic/selinux-util.c
index 2ab0e074d8..e15bd7e1fa 100644
--- a/src/basic/selinux-util.c
+++ b/src/basic/selinux-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <malloc.h>
diff --git a/src/basic/selinux-util.h b/src/basic/selinux-util.h
index 7084beeb6b..08314057fb 100644
--- a/src/basic/selinux-util.h
+++ b/src/basic/selinux-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include <stdbool.h>
 #include <sys/socket.h>
 #include <sys/types.h>
diff --git a/src/basic/set.h b/src/basic/set.h
index 8874fc6776..664713810d 100644
--- a/src/basic/set.h
+++ b/src/basic/set.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include "extract-word.h"
 #include "hashmap.h"
 #include "macro.h"
diff --git a/src/basic/sigbus.c b/src/basic/sigbus.c
index 16751a9b3e..70afba6bcf 100644
--- a/src/basic/sigbus.c
+++ b/src/basic/sigbus.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2014 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <signal.h>
diff --git a/src/basic/sigbus.h b/src/basic/sigbus.h
index a262f3c6c3..459e19fcaa 100644
--- a/src/basic/sigbus.h
+++ b/src/basic/sigbus.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2014 Lennart Poettering
-***/
-
 void sigbus_install(void);
 void sigbus_reset(void);
 
diff --git a/src/basic/signal-util.c b/src/basic/signal-util.c
index a25628c9d1..fb8a63fb9a 100644
--- a/src/basic/signal-util.c
+++ b/src/basic/signal-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2015 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <stdarg.h>
diff --git a/src/basic/signal-util.h b/src/basic/signal-util.h
index 5af448180f..92f2804cd2 100644
--- a/src/basic/signal-util.h
+++ b/src/basic/signal-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010-2015 Lennart Poettering
-***/
-
 #include <signal.h>
 
 #include "macro.h"
diff --git a/src/basic/socket-label.c b/src/basic/socket-label.c
index e34456ff85..35e14e567c 100644
--- a/src/basic/socket-label.c
+++ b/src/basic/socket-label.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <netinet/in.h>
diff --git a/src/basic/socket-protocol-list.c b/src/basic/socket-protocol-list.c
index 2ba6df2b8d..8041b84958 100644
--- a/src/basic/socket-protocol-list.c
+++ b/src/basic/socket-protocol-list.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2014 Lennart Poettering
-***/
 
 #include <netinet/in.h>
 #include <string.h>
diff --git a/src/basic/socket-protocol-list.h b/src/basic/socket-protocol-list.h
index 93104a93bb..458904dbb3 100644
--- a/src/basic/socket-protocol-list.h
+++ b/src/basic/socket-protocol-list.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2014 Lennart Poettering
-***/
-
 const char *socket_protocol_to_name(int id);
 int socket_protocol_from_name(const char *name);
 
diff --git a/src/basic/socket-util.c b/src/basic/socket-util.c
index e2b28d0d75..69f2c41e9d 100644
--- a/src/basic/socket-util.c
+++ b/src/basic/socket-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <arpa/inet.h>
 #include <errno.h>
diff --git a/src/basic/socket-util.h b/src/basic/socket-util.h
index a247da4b56..8e23cf2dbd 100644
--- a/src/basic/socket-util.h
+++ b/src/basic/socket-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include <netinet/ether.h>
 #include <netinet/in.h>
 #include <stdbool.h>
diff --git a/src/basic/special.h b/src/basic/special.h
index 9a3cbaf95d..379a3d7979 100644
--- a/src/basic/special.h
+++ b/src/basic/special.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #define SPECIAL_DEFAULT_TARGET "default.target"
 
 /* Shutdown targets */
diff --git a/src/basic/stat-util.c b/src/basic/stat-util.c
index 5b4fb3c07f..07154e25bb 100644
--- a/src/basic/stat-util.c
+++ b/src/basic/stat-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010-2012 Lennart Poettering
-***/
 
 #include <dirent.h>
 #include <errno.h>
diff --git a/src/basic/stat-util.h b/src/basic/stat-util.h
index 0ec479dbc6..f8014ed30b 100644
--- a/src/basic/stat-util.h
+++ b/src/basic/stat-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010-2012 Lennart Poettering
-***/
-
 #include <stdbool.h>
 #include <stddef.h>
 #include <sys/stat.h>
diff --git a/src/basic/stdio-util.h b/src/basic/stdio-util.h
index 629abf35ee..73c03274c7 100644
--- a/src/basic/stdio-util.h
+++ b/src/basic/stdio-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include <printf.h>
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/src/basic/string-table.c b/src/basic/string-table.c
index 33a5dbc571..34931b03d8 100644
--- a/src/basic/string-table.c
+++ b/src/basic/string-table.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include "string-table.h"
 #include "string-util.h"
diff --git a/src/basic/string-table.h b/src/basic/string-table.h
index 6bc60b65ed..9bd7879355 100644
--- a/src/basic/string-table.h
+++ b/src/basic/string-table.h
@@ -2,10 +2,6 @@
 
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include <errno.h>
 #include <stddef.h>
 #include <stdio.h>
diff --git a/src/basic/string-util.c b/src/basic/string-util.c
index 485cb1bc29..0a40683493 100644
--- a/src/basic/string-util.c
+++ b/src/basic/string-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <stdarg.h>
diff --git a/src/basic/string-util.h b/src/basic/string-util.h
index 2e2e0c0351..c0cc4e78d7 100644
--- a/src/basic/string-util.h
+++ b/src/basic/string-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include <alloca.h>
 #include <stdbool.h>
 #include <stddef.h>
diff --git a/src/basic/strv.c b/src/basic/strv.c
index aa670f340b..b3716233b5 100644
--- a/src/basic/strv.c
+++ b/src/basic/strv.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <fnmatch.h>
diff --git a/src/basic/strv.h b/src/basic/strv.h
index 79d42c0313..51d03db940 100644
--- a/src/basic/strv.h
+++ b/src/basic/strv.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include <fnmatch.h>
 #include <stdarg.h>
 #include <stdbool.h>
diff --git a/src/basic/syslog-util.c b/src/basic/syslog-util.c
index 5bb853239d..21461fa581 100644
--- a/src/basic/syslog-util.c
+++ b/src/basic/syslog-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <string.h>
 #include <syslog.h>
diff --git a/src/basic/syslog-util.h b/src/basic/syslog-util.h
index 09dae9e83d..8f419e8151 100644
--- a/src/basic/syslog-util.h
+++ b/src/basic/syslog-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include <stdbool.h>
 
 int log_facility_unshifted_to_string_alloc(int i, char **s);
diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c
index 0b0a6974e8..f4af0e6522 100644
--- a/src/basic/terminal-util.c
+++ b/src/basic/terminal-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/src/basic/terminal-util.h b/src/basic/terminal-util.h
index 4d8daf61be..c0bd0e67a6 100644
--- a/src/basic/terminal-util.h
+++ b/src/basic/terminal-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdio.h>
diff --git a/src/basic/time-util.c b/src/basic/time-util.c
index 4c6a61d18e..fe201c398d 100644
--- a/src/basic/time-util.c
+++ b/src/basic/time-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <limits.h>
diff --git a/src/basic/time-util.h b/src/basic/time-util.h
index 15d8ab275e..344f2dc52e 100644
--- a/src/basic/time-util.h
+++ b/src/basic/time-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include <inttypes.h>
 #include <stdbool.h>
 #include <stddef.h>
diff --git a/src/basic/umask-util.h b/src/basic/umask-util.h
index 25796883e7..e964292eaf 100644
--- a/src/basic/umask-util.h
+++ b/src/basic/umask-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include <stdbool.h>
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/src/basic/unit-def.c b/src/basic/unit-def.c
index abfa11ab14..ac6a9b37e8 100644
--- a/src/basic/unit-def.c
+++ b/src/basic/unit-def.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include "alloc-util.h"
 #include "bus-label.h"
diff --git a/src/basic/unit-def.h b/src/basic/unit-def.h
index 1d785c43b8..d7e2d74669 100644
--- a/src/basic/unit-def.h
+++ b/src/basic/unit-def.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include <stdbool.h>
 
 #include "macro.h"
diff --git a/src/basic/unit-name.c b/src/basic/unit-name.c
index 8115bff14a..1b81fe268f 100644
--- a/src/basic/unit-name.c
+++ b/src/basic/unit-name.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <stddef.h>
diff --git a/src/basic/unit-name.h b/src/basic/unit-name.h
index afbdf7098e..61abcd585b 100644
--- a/src/basic/unit-name.h
+++ b/src/basic/unit-name.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include <stdbool.h>
 
 #include "macro.h"
diff --git a/src/basic/user-util.c b/src/basic/user-util.c
index 57f92013a5..a562a397c7 100644
--- a/src/basic/user-util.c
+++ b/src/basic/user-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <alloca.h>
 #include <errno.h>
diff --git a/src/basic/user-util.h b/src/basic/user-util.h
index de55afb64e..b74f168859 100644
--- a/src/basic/user-util.h
+++ b/src/basic/user-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include <grp.h>
 #include <gshadow.h>
 #include <pwd.h>
diff --git a/src/basic/utf8.c b/src/basic/utf8.c
index a7df751df1..ccb0228339 100644
--- a/src/basic/utf8.c
+++ b/src/basic/utf8.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
   Copyright 2008-2011 Kay Sievers
-  Copyright 2012 Lennart Poettering
 ***/
 
 /* Parts of this file are based on the GLIB utf8 validation functions. The
diff --git a/src/basic/utf8.h b/src/basic/utf8.h
index ffe49c1285..e8af7a576b 100644
--- a/src/basic/utf8.h
+++ b/src/basic/utf8.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2012 Lennart Poettering
-***/
-
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
diff --git a/src/basic/util.c b/src/basic/util.c
index acd9579817..8f2d6061da 100644
--- a/src/basic/util.c
+++ b/src/basic/util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <alloca.h>
 #include <errno.h>
diff --git a/src/basic/util.h b/src/basic/util.h
index f9c91766ab..9699d228f9 100644
--- a/src/basic/util.h
+++ b/src/basic/util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include <alloca.h>
 #include <errno.h>
 #include <fcntl.h>
diff --git a/src/basic/verbs.c b/src/basic/verbs.c
index e57c1cda14..1893ea3733 100644
--- a/src/basic/verbs.c
+++ b/src/basic/verbs.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2014 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <getopt.h>
diff --git a/src/basic/verbs.h b/src/basic/verbs.h
index 0e5c33cff4..e174255a76 100644
--- a/src/basic/verbs.h
+++ b/src/basic/verbs.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2014 Lennart Poettering
-***/
-
 #define VERB_ANY ((unsigned) -1)
 
 typedef enum VerbFlags {
diff --git a/src/basic/virt.c b/src/basic/virt.c
index b9eda88382..d347732bb3 100644
--- a/src/basic/virt.c
+++ b/src/basic/virt.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2011 Lennart Poettering
-***/
 
 #if defined(__i386__) || defined(__x86_64__)
 #include <cpuid.h>
diff --git a/src/basic/virt.h b/src/basic/virt.h
index 2fa211124e..c4cf4bfeab 100644
--- a/src/basic/virt.h
+++ b/src/basic/virt.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2011 Lennart Poettering
-***/
-
 #include <stdbool.h>
 
 #include "macro.h"
diff --git a/src/basic/web-util.c b/src/basic/web-util.c
index 19a3c1c9f4..82221af194 100644
--- a/src/basic/web-util.c
+++ b/src/basic/web-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <stdbool.h>
 
diff --git a/src/basic/web-util.h b/src/basic/web-util.h
index 27189a35ea..c9e67e5c0a 100644
--- a/src/basic/web-util.h
+++ b/src/basic/web-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include <stdbool.h>
 
 #include "macro.h"
diff --git a/src/basic/xattr-util.c b/src/basic/xattr-util.c
index 6967313287..c5c55ea846 100644
--- a/src/basic/xattr-util.c
+++ b/src/basic/xattr-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/src/basic/xattr-util.h b/src/basic/xattr-util.h
index 8b5a797958..9fa85d7129 100644
--- a/src/basic/xattr-util.h
+++ b/src/basic/xattr-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include <stdbool.h>
 #include <stddef.h>
 #include <sys/types.h>
diff --git a/src/basic/xml.c b/src/basic/xml.c
index 88f8609cb4..cb34d870c1 100644
--- a/src/basic/xml.c
+++ b/src/basic/xml.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2013 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <stddef.h>
diff --git a/src/basic/xml.h b/src/basic/xml.h
index 6ea40892bc..8da2ff5f75 100644
--- a/src/basic/xml.h
+++ b/src/basic/xml.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2013 Lennart Poettering
-***/
-
 enum {
         XML_END,
         XML_TEXT,
diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c
index b72cf8c7c3..697e16c53a 100644
--- a/src/binfmt/binfmt.c
+++ b/src/binfmt/binfmt.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <getopt.h>
diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c
index 6e7fa8443d..72981f0710 100644
--- a/src/boot/bootctl.c
+++ b/src/boot/bootctl.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
   Copyright 2013-2015 Kay Sievers
-  Copyright 2013 Lennart Poettering
 ***/
 
 #include <blkid.h>
diff --git a/src/busctl/busctl-introspect.c b/src/busctl/busctl-introspect.c
index a1e48f40c0..4af3481a5f 100644
--- a/src/busctl/busctl-introspect.c
+++ b/src/busctl/busctl-introspect.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2014 Lennart Poettering
-***/
 
 #include "sd-bus.h"
 
diff --git a/src/busctl/busctl-introspect.h b/src/busctl/busctl-introspect.h
index c3a4197888..b17800e83e 100644
--- a/src/busctl/busctl-introspect.h
+++ b/src/busctl/busctl-introspect.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2014 Lennart Poettering
-***/
-
 #include <stdbool.h>
 
 typedef struct XMLIntrospectOps {
diff --git a/src/busctl/busctl.c b/src/busctl/busctl.c
index 00b6fea265..073005ca6a 100644
--- a/src/busctl/busctl.c
+++ b/src/busctl/busctl.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2013 Lennart Poettering
-***/
 
 #include <getopt.h>
 #include <stdio_ext.h>
diff --git a/src/cgls/cgls.c b/src/cgls/cgls.c
index 9ce4d8d393..9c2f591dc6 100644
--- a/src/cgls/cgls.c
+++ b/src/cgls/cgls.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <getopt.h>
diff --git a/src/cgroups-agent/cgroups-agent.c b/src/cgroups-agent/cgroups-agent.c
index da8c0fd2e2..27a28d1414 100644
--- a/src/cgroups-agent/cgroups-agent.c
+++ b/src/cgroups-agent/cgroups-agent.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <stdlib.h>
 #include <sys/socket.h>
diff --git a/src/cgtop/cgtop.c b/src/cgtop/cgtop.c
index 9cd884f3f2..8dda08ab4c 100644
--- a/src/cgtop/cgtop.c
+++ b/src/cgtop/cgtop.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2012 Lennart Poettering
-***/
 
 #include <alloca.h>
 #include <errno.h>
diff --git a/src/core/audit-fd.c b/src/core/audit-fd.c
index 0826a9584c..fdef433923 100644
--- a/src/core/audit-fd.c
+++ b/src/core/audit-fd.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2012 Lennart Poettering
-***/
 
 #include <errno.h>
 
diff --git a/src/core/audit-fd.h b/src/core/audit-fd.h
index dc367274d8..8c1e471b96 100644
--- a/src/core/audit-fd.h
+++ b/src/core/audit-fd.h
@@ -1,9 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2012 Lennart Poettering
-***/
-
 int get_audit_fd(void);
 void close_audit_fd(void);
diff --git a/src/core/automount.c b/src/core/automount.c
index 2ac6a8ab31..1b96a52c00 100644
--- a/src/core/automount.c
+++ b/src/core/automount.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/src/core/automount.h b/src/core/automount.h
index 00ed0d2480..21dd1c0774 100644
--- a/src/core/automount.h
+++ b/src/core/automount.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 typedef struct Automount Automount;
 
 #include "unit.h"
diff --git a/src/core/cgroup.c b/src/core/cgroup.c
index 6a5995bc0d..bb02436203 100644
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2013 Lennart Poettering
-***/
 
 #include <fcntl.h>
 #include <fnmatch.h>
diff --git a/src/core/cgroup.h b/src/core/cgroup.h
index 406f67d6c7..2d2ff6fc3c 100644
--- a/src/core/cgroup.h
+++ b/src/core/cgroup.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2013 Lennart Poettering
-***/
-
 #include <stdbool.h>
 
 #include "cgroup-util.h"
diff --git a/src/core/chown-recursive.c b/src/core/chown-recursive.c
index 844c692e06..c4794501c2 100644
--- a/src/core/chown-recursive.c
+++ b/src/core/chown-recursive.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2017 Lennart Poettering
-***/
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/core/chown-recursive.h b/src/core/chown-recursive.h
index 947d9cf037..f3fa40a656 100644
--- a/src/core/chown-recursive.h
+++ b/src/core/chown-recursive.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2017 Lennart Poettering
-***/
-
 #include <sys/types.h>
 
 int path_chown_recursive(const char *path, uid_t uid, gid_t gid);
diff --git a/src/core/dbus-automount.c b/src/core/dbus-automount.c
index 34c8fb5fc8..bd6e6a9dde 100644
--- a/src/core/dbus-automount.c
+++ b/src/core/dbus-automount.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include "automount.h"
 #include "bus-util.h"
diff --git a/src/core/dbus-automount.h b/src/core/dbus-automount.h
index be423282f9..3e165b0566 100644
--- a/src/core/dbus-automount.h
+++ b/src/core/dbus-automount.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include "sd-bus.h"
 #include "sd-bus-vtable.h"
 
diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c
index 236ea88759..540bc77aed 100644
--- a/src/core/dbus-cgroup.c
+++ b/src/core/dbus-cgroup.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2013 Lennart Poettering
-***/
 
 #include <arpa/inet.h>
 #include <stdio_ext.h>
diff --git a/src/core/dbus-cgroup.h b/src/core/dbus-cgroup.h
index 71d9f91ea0..188baa99e9 100644
--- a/src/core/dbus-cgroup.h
+++ b/src/core/dbus-cgroup.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2013 Lennart Poettering
-***/
-
 #include "sd-bus.h"
 #include "sd-bus-vtable.h"
 
diff --git a/src/core/dbus-device.c b/src/core/dbus-device.c
index 0462bc79ee..6cf7f58e02 100644
--- a/src/core/dbus-device.c
+++ b/src/core/dbus-device.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include "dbus-device.h"
 #include "device.h"
diff --git a/src/core/dbus-device.h b/src/core/dbus-device.h
index 1e7c4ecfe1..077a2bf128 100644
--- a/src/core/dbus-device.h
+++ b/src/core/dbus-device.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include "sd-bus-vtable.h"
 
 extern const sd_bus_vtable bus_device_vtable[];
diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c
index 9d8816c034..e2afeba19c 100644
--- a/src/core/dbus-execute.c
+++ b/src/core/dbus-execute.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <sys/mount.h>
 #include <sys/prctl.h>
diff --git a/src/core/dbus-execute.h b/src/core/dbus-execute.h
index ac6d06799a..84051700ab 100644
--- a/src/core/dbus-execute.h
+++ b/src/core/dbus-execute.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include "sd-bus.h"
 #include "sd-bus-vtable.h"
 
diff --git a/src/core/dbus-job.c b/src/core/dbus-job.c
index d043e5e34d..5551c56d0e 100644
--- a/src/core/dbus-job.c
+++ b/src/core/dbus-job.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include "sd-bus.h"
 
diff --git a/src/core/dbus-job.h b/src/core/dbus-job.h
index abd33c30ec..3cc60f22ee 100644
--- a/src/core/dbus-job.h
+++ b/src/core/dbus-job.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include "sd-bus.h"
 #include "sd-bus-vtable.h"
 
diff --git a/src/core/dbus-kill.c b/src/core/dbus-kill.c
index 854cdcb8be..028e7ec1c1 100644
--- a/src/core/dbus-kill.c
+++ b/src/core/dbus-kill.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2012 Lennart Poettering
-***/
 
 #include "bus-util.h"
 #include "dbus-kill.h"
diff --git a/src/core/dbus-kill.h b/src/core/dbus-kill.h
index 7cfa483f58..8192e94fbb 100644
--- a/src/core/dbus-kill.h
+++ b/src/core/dbus-kill.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2012 Lennart Poettering
-***/
-
 #include "sd-bus.h"
 #include "sd-bus-vtable.h"
 
diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
index 07c0f60ac2..1363804eac 100644
--- a/src/core/dbus-manager.c
+++ b/src/core/dbus-manager.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <sys/prctl.h>
diff --git a/src/core/dbus-manager.h b/src/core/dbus-manager.h
index 0963447685..d0306adc70 100644
--- a/src/core/dbus-manager.h
+++ b/src/core/dbus-manager.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include "sd-bus-vtable.h"
 
 #include "manager.h"
diff --git a/src/core/dbus-mount.c b/src/core/dbus-mount.c
index d79814ad88..3f98d3ecf0 100644
--- a/src/core/dbus-mount.c
+++ b/src/core/dbus-mount.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include "bus-util.h"
 #include "dbus-cgroup.h"
diff --git a/src/core/dbus-mount.h b/src/core/dbus-mount.h
index a90c2a8e45..f7112a9f02 100644
--- a/src/core/dbus-mount.h
+++ b/src/core/dbus-mount.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include "sd-bus.h"
 #include "sd-bus-vtable.h"
 
diff --git a/src/core/dbus-path.c b/src/core/dbus-path.c
index 692a89eaf0..1a97d62486 100644
--- a/src/core/dbus-path.c
+++ b/src/core/dbus-path.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include "alloc-util.h"
 #include "bus-util.h"
diff --git a/src/core/dbus-path.h b/src/core/dbus-path.h
index ebdf27a508..ad42b23662 100644
--- a/src/core/dbus-path.h
+++ b/src/core/dbus-path.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include "sd-bus.h"
 #include "sd-bus-vtable.h"
 
diff --git a/src/core/dbus-scope.c b/src/core/dbus-scope.c
index ee454fbe00..6725f62794 100644
--- a/src/core/dbus-scope.c
+++ b/src/core/dbus-scope.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2013 Lennart Poettering
-***/
 
 #include "alloc-util.h"
 #include "bus-common-errors.h"
diff --git a/src/core/dbus-scope.h b/src/core/dbus-scope.h
index 3262a1791b..7c080dbcf7 100644
--- a/src/core/dbus-scope.h
+++ b/src/core/dbus-scope.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2013 Lennart Poettering
-***/
-
 #include "sd-bus.h"
 #include "sd-bus-vtable.h"
 
diff --git a/src/core/dbus-service.c b/src/core/dbus-service.c
index 5600a7e913..1b4c98c7d2 100644
--- a/src/core/dbus-service.c
+++ b/src/core/dbus-service.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <stdio_ext.h>
 
diff --git a/src/core/dbus-service.h b/src/core/dbus-service.h
index 42bfd7ebb5..22d2b887b4 100644
--- a/src/core/dbus-service.h
+++ b/src/core/dbus-service.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include "sd-bus.h"
 #include "sd-bus-vtable.h"
 
diff --git a/src/core/dbus-slice.c b/src/core/dbus-slice.c
index 10f003ecd2..722a5688a5 100644
--- a/src/core/dbus-slice.c
+++ b/src/core/dbus-slice.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2013 Lennart Poettering
-***/
 
 #include "dbus-cgroup.h"
 #include "dbus-slice.h"
diff --git a/src/core/dbus-slice.h b/src/core/dbus-slice.h
index 374352e762..88cc48c808 100644
--- a/src/core/dbus-slice.h
+++ b/src/core/dbus-slice.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2013 Lennart Poettering
-***/
-
 #include "sd-bus.h"
 #include "sd-bus-vtable.h"
 
diff --git a/src/core/dbus-socket.c b/src/core/dbus-socket.c
index d18bafc71c..913cc74918 100644
--- a/src/core/dbus-socket.c
+++ b/src/core/dbus-socket.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include "alloc-util.h"
 #include "bus-util.h"
diff --git a/src/core/dbus-socket.h b/src/core/dbus-socket.h
index c3f2fcb51a..9aa8133d18 100644
--- a/src/core/dbus-socket.h
+++ b/src/core/dbus-socket.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include "sd-bus.h"
 #include "sd-bus-vtable.h"
 
diff --git a/src/core/dbus-swap.c b/src/core/dbus-swap.c
index 3a4568711e..397437d059 100644
--- a/src/core/dbus-swap.c
+++ b/src/core/dbus-swap.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2010 Lennart Poettering
   Copyright 2010 Maarten Lankhorst
 ***/
 
diff --git a/src/core/dbus-swap.h b/src/core/dbus-swap.h
index dd06e8ae9f..67d55c0e2c 100644
--- a/src/core/dbus-swap.h
+++ b/src/core/dbus-swap.h
@@ -2,7 +2,6 @@
 #pragma once
 
 /***
-  Copyright 2010 Lennart Poettering
   Copyright 2010 Maarten Lankhorst
 ***/
 
diff --git a/src/core/dbus-target.c b/src/core/dbus-target.c
index cf2663f1d3..ba50113641 100644
--- a/src/core/dbus-target.c
+++ b/src/core/dbus-target.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include "dbus-target.h"
 #include "unit.h"
diff --git a/src/core/dbus-target.h b/src/core/dbus-target.h
index 7c180194c7..ad02a1db74 100644
--- a/src/core/dbus-target.h
+++ b/src/core/dbus-target.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include "sd-bus-vtable.h"
 
 extern const sd_bus_vtable bus_target_vtable[];
diff --git a/src/core/dbus-timer.c b/src/core/dbus-timer.c
index 9a4c2f8339..b9d2f3d07e 100644
--- a/src/core/dbus-timer.c
+++ b/src/core/dbus-timer.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include "alloc-util.h"
 #include "bus-util.h"
diff --git a/src/core/dbus-timer.h b/src/core/dbus-timer.h
index e9502f5df5..bb126b22dc 100644
--- a/src/core/dbus-timer.h
+++ b/src/core/dbus-timer.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include "sd-bus.h"
 #include "sd-bus-vtable.h"
 
diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c
index 608da453a4..ae0410414e 100644
--- a/src/core/dbus-unit.c
+++ b/src/core/dbus-unit.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include "sd-bus.h"
 
diff --git a/src/core/dbus-unit.h b/src/core/dbus-unit.h
index 62e8656485..68eb621836 100644
--- a/src/core/dbus-unit.h
+++ b/src/core/dbus-unit.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include "sd-bus.h"
 #include "sd-bus-vtable.h"
 
diff --git a/src/core/dbus-util.c b/src/core/dbus-util.c
index 16b436571b..f4fbb72cb9 100644
--- a/src/core/dbus-util.c
+++ b/src/core/dbus-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include "bus-util.h"
 #include "dbus-util.h"
diff --git a/src/core/dbus-util.h b/src/core/dbus-util.h
index 47c954b5ca..12b055e4ac 100644
--- a/src/core/dbus-util.h
+++ b/src/core/dbus-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include "sd-bus.h"
 
 #include "unit.h"
diff --git a/src/core/dbus.c b/src/core/dbus.c
index b007087bf8..bf5917696e 100644
--- a/src/core/dbus.c
+++ b/src/core/dbus.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <sys/epoll.h>
diff --git a/src/core/dbus.h b/src/core/dbus.h
index 7d816776c7..382a96da7d 100644
--- a/src/core/dbus.h
+++ b/src/core/dbus.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include "sd-bus.h"
 
 #include "manager.h"
diff --git a/src/core/device.c b/src/core/device.c
index a2cfc3e312..4bffb94726 100644
--- a/src/core/device.c
+++ b/src/core/device.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <sys/epoll.h>
diff --git a/src/core/device.h b/src/core/device.h
index 991a48e8c8..a5f9bbe58c 100644
--- a/src/core/device.h
+++ b/src/core/device.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include "unit.h"
 
 typedef struct Device Device;
diff --git a/src/core/dynamic-user.c b/src/core/dynamic-user.c
index c60b01679e..270b4eb8fa 100644
--- a/src/core/dynamic-user.c
+++ b/src/core/dynamic-user.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2016 Lennart Poettering
-***/
 
 #include <grp.h>
 #include <pwd.h>
diff --git a/src/core/dynamic-user.h b/src/core/dynamic-user.h
index 66b0cd7727..791a8ba0ef 100644
--- a/src/core/dynamic-user.h
+++ b/src/core/dynamic-user.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2016 Lennart Poettering
-***/
-
 typedef struct DynamicUser DynamicUser;
 
 typedef struct DynamicCreds {
diff --git a/src/core/emergency-action.c b/src/core/emergency-action.c
index f6e98906af..b87a9b4852 100644
--- a/src/core/emergency-action.c
+++ b/src/core/emergency-action.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2014 Lennart Poettering
   Copyright 2012 Michael Olbrich
 ***/
 
diff --git a/src/core/emergency-action.h b/src/core/emergency-action.h
index f4208952ba..0334f29dc0 100644
--- a/src/core/emergency-action.h
+++ b/src/core/emergency-action.h
@@ -2,7 +2,6 @@
 #pragma once
 
 /***
-  Copyright 2014 Lennart Poettering
   Copyright 2012 Michael Olbrich
 ***/
 
diff --git a/src/core/execute.c b/src/core/execute.c
index e4d942af1c..aea53de3d5 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/src/core/execute.h b/src/core/execute.h
index 0c15267917..77ffe82323 100644
--- a/src/core/execute.h
+++ b/src/core/execute.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 typedef struct ExecStatus ExecStatus;
 typedef struct ExecCommand ExecCommand;
 typedef struct ExecContext ExecContext;
diff --git a/src/core/hostname-setup.c b/src/core/hostname-setup.c
index 12c1702c32..83cce88131 100644
--- a/src/core/hostname-setup.c
+++ b/src/core/hostname-setup.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <stdio.h>
diff --git a/src/core/hostname-setup.h b/src/core/hostname-setup.h
index d91576f504..dc7b9a6262 100644
--- a/src/core/hostname-setup.h
+++ b/src/core/hostname-setup.h
@@ -1,8 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 int hostname_setup(void);
diff --git a/src/core/ima-setup.c b/src/core/ima-setup.c
index 4c4e3283bb..013d6c5de3 100644
--- a/src/core/ima-setup.c
+++ b/src/core/ima-setup.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2010 Lennart Poettering
   Copyright © 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 936cc2b4ce..cf478795a1 100644
--- a/src/core/ima-setup.h
+++ b/src/core/ima-setup.h
@@ -2,7 +2,6 @@
 #pragma once
 
 /***
-  Copyright 2010 Lennart Poettering
   Copyright © 2012 Roberto Sassu - Politecnico di Torino, Italy
                                    TORSEC group — http://security.polito.it
 ***/
diff --git a/src/core/job.c b/src/core/job.c
index 66ebd72285..734756b666 100644
--- a/src/core/job.c
+++ b/src/core/job.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 
diff --git a/src/core/job.h b/src/core/job.h
index 6a3751fb33..2f5f3f3989 100644
--- a/src/core/job.h
+++ b/src/core/job.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include <stdbool.h>
 
 #include "sd-event.h"
diff --git a/src/core/kill.c b/src/core/kill.c
index bf8a13f1ee..929eebfe37 100644
--- a/src/core/kill.c
+++ b/src/core/kill.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2012 Lennart Poettering
-***/
 
 #include "kill.h"
 #include "signal-util.h"
diff --git a/src/core/kill.h b/src/core/kill.h
index e965590155..2d6aa943a6 100644
--- a/src/core/kill.h
+++ b/src/core/kill.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2012 Lennart Poettering
-***/
-
 typedef struct KillContext KillContext;
 
 #include <stdbool.h>
diff --git a/src/core/killall.h b/src/core/killall.h
index ed715eebde..cbd202651c 100644
--- a/src/core/killall.h
+++ b/src/core/killall.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2012 Lennart Poettering
-***/
-
 #include "time-util.h"
 
 void broadcast_signal(int sig, bool wait_for_exit, bool send_sighup, usec_t timeout);
diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c
index 623b58a0b3..9251929558 100644
--- a/src/core/kmod-setup.c
+++ b/src/core/kmod-setup.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <ftw.h>
 #include <string.h>
diff --git a/src/core/kmod-setup.h b/src/core/kmod-setup.h
index c63ef11cec..801c7bf699 100644
--- a/src/core/kmod-setup.h
+++ b/src/core/kmod-setup.h
@@ -1,8 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 int kmod_setup(void);
diff --git a/src/core/load-dropin.c b/src/core/load-dropin.c
index 99d6b6d8f0..4b422cc54e 100644
--- a/src/core/load-dropin.c
+++ b/src/core/load-dropin.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include "conf-parser.h"
 #include "fs-util.h"
diff --git a/src/core/load-dropin.h b/src/core/load-dropin.h
index 0d793db2fd..bb10a76338 100644
--- a/src/core/load-dropin.h
+++ b/src/core/load-dropin.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include "dropin.h"
 #include "unit.h"
 
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
index 9d46c88e4e..a9e6f12eb5 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  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 76f49231b7..dad281ef72 100644
--- a/src/core/load-fragment.h
+++ b/src/core/load-fragment.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include "conf-parser.h"
 #include "unit.h"
 
diff --git a/src/core/locale-setup.c b/src/core/locale-setup.c
index e138387b40..c14523fee9 100644
--- a/src/core/locale-setup.c
+++ b/src/core/locale-setup.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <stdlib.h>
diff --git a/src/core/locale-setup.h b/src/core/locale-setup.h
index ec4be8c373..01fadd06c7 100644
--- a/src/core/locale-setup.h
+++ b/src/core/locale-setup.h
@@ -1,8 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 int locale_setup(char ***environment);
diff --git a/src/core/loopback-setup.c b/src/core/loopback-setup.c
index 066d59f242..835553ec8f 100644
--- a/src/core/loopback-setup.c
+++ b/src/core/loopback-setup.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <net/if.h>
 #include <stdlib.h>
diff --git a/src/core/loopback-setup.h b/src/core/loopback-setup.h
index 8c551ce0d7..c0eea100ed 100644
--- a/src/core/loopback-setup.h
+++ b/src/core/loopback-setup.h
@@ -1,8 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 int loopback_setup(void);
diff --git a/src/core/machine-id-setup.c b/src/core/machine-id-setup.c
index f3f67a87e0..11528f83c4 100644
--- a/src/core/machine-id-setup.c
+++ b/src/core/machine-id-setup.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <fcntl.h>
 #include <sched.h>
diff --git a/src/core/machine-id-setup.h b/src/core/machine-id-setup.h
index 574d96e5bd..d6ac62a882 100644
--- a/src/core/machine-id-setup.h
+++ b/src/core/machine-id-setup.h
@@ -1,9 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 int machine_id_commit(const char *root);
 int machine_id_setup(const char *root, sd_id128_t requested, sd_id128_t *ret);
diff --git a/src/core/main.c b/src/core/main.c
index b0408bc364..7b77bf3d55 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/src/core/manager.c b/src/core/manager.c
index e66c0db6a4..df2f424f33 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <fcntl.h>
@@ -1340,7 +1337,6 @@ static void manager_enumerate_perpetual(Manager *m) {
         }
 }
 
-
 static void manager_enumerate(Manager *m) {
         UnitType c;
 
diff --git a/src/core/manager.h b/src/core/manager.h
index ae582ca8a5..ea5d425030 100644
--- a/src/core/manager.h
+++ b/src/core/manager.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include <stdbool.h>
 #include <stdio.h>
 
diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c
index df1ab1e215..16880e6157 100644
--- a/src/core/mount-setup.c
+++ b/src/core/mount-setup.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <ftw.h>
diff --git a/src/core/mount-setup.h b/src/core/mount-setup.h
index e73fee6f8a..43cd8908de 100644
--- a/src/core/mount-setup.h
+++ b/src/core/mount-setup.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include <stdbool.h>
 
 int mount_setup_early(void);
diff --git a/src/core/mount.c b/src/core/mount.c
index 515f142c0f..21437dad08 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <signal.h>
diff --git a/src/core/mount.h b/src/core/mount.h
index b6681a0b55..67ab8ecf93 100644
--- a/src/core/mount.h
+++ b/src/core/mount.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 typedef struct Mount Mount;
 
 #include "kill.h"
diff --git a/src/core/namespace.c b/src/core/namespace.c
index 0b9892a85b..726a26fe71 100644
--- a/src/core/namespace.c
+++ b/src/core/namespace.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <sched.h>
diff --git a/src/core/namespace.h b/src/core/namespace.h
index 5528b6c40b..c530565239 100644
--- a/src/core/namespace.h
+++ b/src/core/namespace.h
@@ -2,7 +2,6 @@
 #pragma once
 
 /***
-  Copyright 2010 Lennart Poettering
   Copyright 2016 Djalal Harouni
 ***/
 
diff --git a/src/core/path.c b/src/core/path.c
index 3027612779..68b13b610a 100644
--- a/src/core/path.c
+++ b/src/core/path.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <sys/epoll.h>
diff --git a/src/core/path.h b/src/core/path.h
index 4a1c018169..4d4b6236c2 100644
--- a/src/core/path.h
+++ b/src/core/path.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 typedef struct Path Path;
 typedef struct PathSpec PathSpec;
 
diff --git a/src/core/scope.c b/src/core/scope.c
index a7c3c302ee..751556fecf 100644
--- a/src/core/scope.c
+++ b/src/core/scope.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2013 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <unistd.h>
diff --git a/src/core/scope.h b/src/core/scope.h
index 3b55c56a90..c38afb5e5d 100644
--- a/src/core/scope.h
+++ b/src/core/scope.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2013 Lennart Poettering
-***/
-
 typedef struct Scope Scope;
 
 #include "cgroup.h"
diff --git a/src/core/selinux-setup.c b/src/core/selinux-setup.c
index 03744ae6db..bac1aa3ff6 100644
--- a/src/core/selinux-setup.c
+++ b/src/core/selinux-setup.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <stdio.h>
diff --git a/src/core/selinux-setup.h b/src/core/selinux-setup.h
index 7ca4a28a5f..ad0d4f65dc 100644
--- a/src/core/selinux-setup.h
+++ b/src/core/selinux-setup.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include <stdbool.h>
 
 int mac_selinux_setup(bool *loaded_policy);
diff --git a/src/core/service.c b/src/core/service.c
index 9ebc3b15e2..db1356c417 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <signal.h>
diff --git a/src/core/service.h b/src/core/service.h
index c768beccf6..9c06e91883 100644
--- a/src/core/service.h
+++ b/src/core/service.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 typedef struct Service Service;
 typedef struct ServiceFDStore ServiceFDStore;
 
diff --git a/src/core/show-status.c b/src/core/show-status.c
index 5e77c6cf86..63262cc716 100644
--- a/src/core/show-status.c
+++ b/src/core/show-status.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2014 Lennart Poettering
-***/
 
 #include "alloc-util.h"
 #include "fd-util.h"
diff --git a/src/core/show-status.h b/src/core/show-status.h
index c45f520e5a..1a80de33d9 100644
--- a/src/core/show-status.h
+++ b/src/core/show-status.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2014 Lennart Poettering
-***/
-
 #include <stdbool.h>
 
 #include "macro.h"
diff --git a/src/core/slice.c b/src/core/slice.c
index 88fbe5e6fd..58f18a4dad 100644
--- a/src/core/slice.c
+++ b/src/core/slice.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2013 Lennart Poettering
-***/
 
 #include <errno.h>
 
diff --git a/src/core/slice.h b/src/core/slice.h
index 420c4bbd6a..4678c085c3 100644
--- a/src/core/slice.h
+++ b/src/core/slice.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2013 Lennart Poettering
-***/
-
 #include "unit.h"
 
 typedef struct Slice Slice;
diff --git a/src/core/socket.c b/src/core/socket.c
index 5913b69264..56d32225c4 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <arpa/inet.h>
 #include <errno.h>
diff --git a/src/core/socket.h b/src/core/socket.h
index d96bee3c31..c4e25db1fc 100644
--- a/src/core/socket.h
+++ b/src/core/socket.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 typedef struct Socket Socket;
 typedef struct SocketPeer SocketPeer;
 
diff --git a/src/core/swap.c b/src/core/swap.c
index 24429fb296..b78b1aa266 100644
--- a/src/core/swap.c
+++ b/src/core/swap.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <sys/epoll.h>
diff --git a/src/core/swap.h b/src/core/swap.h
index d6b23a9897..4a7c80bf0a 100644
--- a/src/core/swap.h
+++ b/src/core/swap.h
@@ -2,7 +2,6 @@
 #pragma once
 
 /***
-  Copyright 2010 Lennart Poettering
   Copyright 2010 Maarten Lankhorst
 ***/
 
diff --git a/src/core/target.c b/src/core/target.c
index d107e42878..6446767504 100644
--- a/src/core/target.c
+++ b/src/core/target.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include "dbus-target.h"
 #include "log.h"
diff --git a/src/core/target.h b/src/core/target.h
index 014936a9ef..28f78888dc 100644
--- a/src/core/target.h
+++ b/src/core/target.h
@@ -3,10 +3,6 @@
 
 #include "unit.h"
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 typedef struct Target Target;
 
 struct Target {
diff --git a/src/core/timer.c b/src/core/timer.c
index 598163e1e5..db202971d3 100644
--- a/src/core/timer.c
+++ b/src/core/timer.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 
diff --git a/src/core/timer.h b/src/core/timer.h
index 24719671ba..833aadb0b8 100644
--- a/src/core/timer.h
+++ b/src/core/timer.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 typedef struct Timer Timer;
 
 #include "calendarspec.h"
diff --git a/src/core/transaction.c b/src/core/transaction.c
index 8468f1da54..1c7efb207a 100644
--- a/src/core/transaction.c
+++ b/src/core/transaction.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <fcntl.h>
 #include <unistd.h>
diff --git a/src/core/transaction.h b/src/core/transaction.h
index 06b49d4a59..70d74a4ccb 100644
--- a/src/core/transaction.h
+++ b/src/core/transaction.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 typedef struct Transaction Transaction;
 
 #include "hashmap.h"
diff --git a/src/core/unit-printf.c b/src/core/unit-printf.c
index 2c98885551..92896d90be 100644
--- a/src/core/unit-printf.c
+++ b/src/core/unit-printf.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include "alloc-util.h"
 #include "cgroup-util.h"
diff --git a/src/core/unit-printf.h b/src/core/unit-printf.h
index caa8ca4c3b..5bd1d77bb2 100644
--- a/src/core/unit-printf.h
+++ b/src/core/unit-printf.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include "unit.h"
 
 int unit_name_printf(Unit *u, const char* text, char **ret);
diff --git a/src/core/unit.c b/src/core/unit.c
index bea04cd7e0..e0485e1f46 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <stdlib.h>
diff --git a/src/core/unit.h b/src/core/unit.h
index 39fb7327ea..b3131eba1b 100644
--- a/src/core/unit.h
+++ b/src/core/unit.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include <stdbool.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/src/coredump/coredump-vacuum.c b/src/coredump/coredump-vacuum.c
index 40685e7b79..6ce5dfc71d 100644
--- a/src/coredump/coredump-vacuum.c
+++ b/src/coredump/coredump-vacuum.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2014 Lennart Poettering
-***/
 
 #include <sys/statvfs.h>
 
diff --git a/src/coredump/coredump-vacuum.h b/src/coredump/coredump-vacuum.h
index 74295f39cf..0db116736c 100644
--- a/src/coredump/coredump-vacuum.h
+++ b/src/coredump/coredump-vacuum.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2014 Lennart Poettering
-***/
-
 #include <inttypes.h>
 #include <sys/types.h>
 
diff --git a/src/coredump/coredump.c b/src/coredump/coredump.c
index a6c67ceab7..d2b4ba2a21 100644
--- a/src/coredump/coredump.c
+++ b/src/coredump/coredump.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2012 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <stdio.h>
diff --git a/src/coredump/stacktrace.c b/src/coredump/stacktrace.c
index a73da47ebf..dab4c1ad9b 100644
--- a/src/coredump/stacktrace.c
+++ b/src/coredump/stacktrace.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2014 Lennart Poettering
-***/
 
 #include <dwarf.h>
 #include <elfutils/libdwfl.h>
diff --git a/src/coredump/stacktrace.h b/src/coredump/stacktrace.h
index 5406e5aeef..52900424a7 100644
--- a/src/coredump/stacktrace.h
+++ b/src/coredump/stacktrace.h
@@ -1,8 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2014 Lennart Poettering
-***/
-
 int coredump_make_stack_trace(int fd, const char *executable, char **ret);
diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
index 96e0759e38..f5a81829b9 100644
--- a/src/cryptsetup/cryptsetup-generator.c
+++ b/src/cryptsetup/cryptsetup-generator.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <stdio_ext.h>
diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
index 1422aaec04..832168184a 100644
--- a/src/cryptsetup/cryptsetup.c
+++ b/src/cryptsetup/cryptsetup.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <mntent.h>
diff --git a/src/debug-generator/debug-generator.c b/src/debug-generator/debug-generator.c
index 443786a1f1..dd6ab94fa2 100644
--- a/src/debug-generator/debug-generator.c
+++ b/src/debug-generator/debug-generator.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2014 Lennart Poettering
-***/
 
 #include "alloc-util.h"
 #include "mkdir.h"
diff --git a/src/delta/delta.c b/src/delta/delta.c
index 58dc084ef2..bd0d19d772 100644
--- a/src/delta/delta.c
+++ b/src/delta/delta.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  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 7357b2a4f8..e8c6362a9c 100644
--- a/src/detect-virt/detect-virt.c
+++ b/src/detect-virt/detect-virt.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <getopt.h>
diff --git a/src/dissect/dissect.c b/src/dissect/dissect.c
index 44d2c318c2..0adeee6691 100644
--- a/src/dissect/dissect.c
+++ b/src/dissect/dissect.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2016 Lennart Poettering
-***/
 
 #include <fcntl.h>
 #include <stdio.h>
diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
index 02e609839c..a98e53b3a3 100644
--- a/src/firstboot/firstboot.c
+++ b/src/firstboot/firstboot.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2014 Lennart Poettering
-***/
 
 #include <fcntl.h>
 #include <getopt.h>
diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
index 8c29bae9f9..551186e5f3 100644
--- a/src/fsck/fsck.c
+++ b/src/fsck/fsck.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  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 18829de648..482229b4a5 100644
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2012 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <mntent.h>
diff --git a/src/getty-generator/getty-generator.c b/src/getty-generator/getty-generator.c
index 89ff33f8d1..6af4c39137 100644
--- a/src/getty-generator/getty-generator.c
+++ b/src/getty-generator/getty-generator.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
index 3a6e5d7de9..f72a55c20a 100644
--- a/src/gpt-auto-generator/gpt-auto-generator.c
+++ b/src/gpt-auto-generator/gpt-auto-generator.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2013 Lennart Poettering
-***/
 
 #include <blkid.h>
 #include <stdlib.h>
diff --git a/src/hostname/hostnamectl.c b/src/hostname/hostnamectl.c
index f25085b630..8587f5c59f 100644
--- a/src/hostname/hostnamectl.c
+++ b/src/hostname/hostnamectl.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2012 Lennart Poettering
-***/
 
 #include <getopt.h>
 #include <locale.h>
diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
index 4f990f9c94..ee51002ece 100644
--- a/src/hostname/hostnamed.c
+++ b/src/hostname/hostnamed.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2011 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <string.h>
diff --git a/src/import/curl-util.c b/src/import/curl-util.c
index 1691544ef7..b85462176d 100644
--- a/src/import/curl-util.c
+++ b/src/import/curl-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2014 Lennart Poettering
-***/
 
 #include "alloc-util.h"
 #include "curl-util.h"
diff --git a/src/import/curl-util.h b/src/import/curl-util.h
index f4ec3dae9e..6626eefc56 100644
--- a/src/import/curl-util.h
+++ b/src/import/curl-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2014 Lennart Poettering
-***/
-
 #include <curl/curl.h>
 #include <sys/types.h>
 
diff --git a/src/import/export-raw.c b/src/import/export-raw.c
index 5137ab7946..f97ae461c5 100644
--- a/src/import/export-raw.c
+++ b/src/import/export-raw.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2015 Lennart Poettering
-***/
 
 #include <sys/sendfile.h>
 
diff --git a/src/import/export-raw.h b/src/import/export-raw.h
index 7a69454517..196b8ef28f 100644
--- a/src/import/export-raw.h
+++ b/src/import/export-raw.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2015 Lennart Poettering
-***/
-
 #include "sd-event.h"
 
 #include "import-compress.h"
diff --git a/src/import/export-tar.c b/src/import/export-tar.c
index 62871ca318..9e7c0eaa9d 100644
--- a/src/import/export-tar.c
+++ b/src/import/export-tar.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2015 Lennart Poettering
-***/
 
 #include "sd-daemon.h"
 
diff --git a/src/import/export-tar.h b/src/import/export-tar.h
index c9fe07959b..6abb7d383a 100644
--- a/src/import/export-tar.h
+++ b/src/import/export-tar.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2015 Lennart Poettering
-***/
-
 #include "sd-event.h"
 
 #include "import-compress.h"
diff --git a/src/import/export.c b/src/import/export.c
index 89b63a98f5..03eb3e40b2 100644
--- a/src/import/export.c
+++ b/src/import/export.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2015 Lennart Poettering
-***/
 
 #include <getopt.h>
 
diff --git a/src/import/import-common.c b/src/import/import-common.c
index 22d5f79eff..e2de2c2dd0 100644
--- a/src/import/import-common.c
+++ b/src/import/import-common.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2015 Lennart Poettering
-***/
 
 #include <sched.h>
 #include <sys/prctl.h>
diff --git a/src/import/import-common.h b/src/import/import-common.h
index 253c3a2fb6..99ac5fe970 100644
--- a/src/import/import-common.h
+++ b/src/import/import-common.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2015 Lennart Poettering
-***/
-
 int import_make_read_only_fd(int fd);
 int import_make_read_only(const char *path);
 
diff --git a/src/import/import-compress.c b/src/import/import-compress.c
index fc77c94e1a..1cf29e26f1 100644
--- a/src/import/import-compress.c
+++ b/src/import/import-compress.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2015 Lennart Poettering
-***/
 
 #include "import-compress.h"
 #include "string-table.h"
diff --git a/src/import/import-compress.h b/src/import/import-compress.h
index b4ec21bb1e..6fb87ccdfb 100644
--- a/src/import/import-compress.h
+++ b/src/import/import-compress.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2015 Lennart Poettering
-***/
-
 #include <bzlib.h>
 #include <lzma.h>
 #include <sys/types.h>
diff --git a/src/import/import-raw.c b/src/import/import-raw.c
index be3bda0125..f31432cd04 100644
--- a/src/import/import-raw.c
+++ b/src/import/import-raw.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2015 Lennart Poettering
-***/
 
 #include <linux/fs.h>
 
diff --git a/src/import/import-raw.h b/src/import/import-raw.h
index bab667a78e..de4c3ea337 100644
--- a/src/import/import-raw.h
+++ b/src/import/import-raw.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2015 Lennart Poettering
-***/
-
 #include "sd-event.h"
 
 #include "import-util.h"
diff --git a/src/import/import-tar.c b/src/import/import-tar.c
index 0c4e7495e0..89c95af279 100644
--- a/src/import/import-tar.c
+++ b/src/import/import-tar.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2015 Lennart Poettering
-***/
 
 #include <linux/fs.h>
 
diff --git a/src/import/import-tar.h b/src/import/import-tar.h
index 09f2e17ca4..347f522614 100644
--- a/src/import/import-tar.h
+++ b/src/import/import-tar.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2015 Lennart Poettering
-***/
-
 #include "sd-event.h"
 
 #include "import-util.h"
diff --git a/src/import/import.c b/src/import/import.c
index cd13bd6a31..35c8e6d630 100644
--- a/src/import/import.c
+++ b/src/import/import.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2015 Lennart Poettering
-***/
 
 #include <getopt.h>
 
diff --git a/src/import/importd.c b/src/import/importd.c
index cb90f77738..04563fb098 100644
--- a/src/import/importd.c
+++ b/src/import/importd.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2015 Lennart Poettering
-***/
 
 #include <sys/prctl.h>
 #include <sys/wait.h>
diff --git a/src/import/pull-common.c b/src/import/pull-common.c
index 1107ca1ff6..4117ed2e6a 100644
--- a/src/import/pull-common.c
+++ b/src/import/pull-common.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2015 Lennart Poettering
-***/
 
 #include <sys/prctl.h>
 
diff --git a/src/import/pull-common.h b/src/import/pull-common.h
index 7569ca654d..65f239da2e 100644
--- a/src/import/pull-common.h
+++ b/src/import/pull-common.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2015 Lennart Poettering
-***/
-
 #include <stdbool.h>
 
 #include "import-util.h"
diff --git a/src/import/pull-job.c b/src/import/pull-job.c
index 77d967d37f..89dd20afa3 100644
--- a/src/import/pull-job.c
+++ b/src/import/pull-job.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2015 Lennart Poettering
-***/
 
 #include <sys/xattr.h>
 
diff --git a/src/import/pull-job.h b/src/import/pull-job.h
index 91cffa24a7..0c104af758 100644
--- a/src/import/pull-job.h
+++ b/src/import/pull-job.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2015 Lennart Poettering
-***/
-
 #include <gcrypt.h>
 
 #include "curl-util.h"
diff --git a/src/import/pull-raw.c b/src/import/pull-raw.c
index aefbe4de3a..e68f197c79 100644
--- a/src/import/pull-raw.c
+++ b/src/import/pull-raw.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2014 Lennart Poettering
-***/
 
 #include <curl/curl.h>
 #include <linux/fs.h>
diff --git a/src/import/pull-raw.h b/src/import/pull-raw.h
index b689ca3459..4ccd65b7e6 100644
--- a/src/import/pull-raw.h
+++ b/src/import/pull-raw.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2014 Lennart Poettering
-***/
-
 #include "sd-event.h"
 
 #include "import-util.h"
diff --git a/src/import/pull-tar.c b/src/import/pull-tar.c
index 4ea3e4ba9b..56ec252e98 100644
--- a/src/import/pull-tar.c
+++ b/src/import/pull-tar.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2015 Lennart Poettering
-***/
 
 #include <curl/curl.h>
 #include <sys/prctl.h>
diff --git a/src/import/pull-tar.h b/src/import/pull-tar.h
index 2268912f34..76f920eea9 100644
--- a/src/import/pull-tar.h
+++ b/src/import/pull-tar.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2015 Lennart Poettering
-***/
-
 #include "sd-event.h"
 
 #include "import-util.h"
diff --git a/src/import/pull.c b/src/import/pull.c
index 6f9a57e01b..26be5bbf0b 100644
--- a/src/import/pull.c
+++ b/src/import/pull.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2014 Lennart Poettering
-***/
 
 #include <getopt.h>
 
diff --git a/src/import/qcow2-util.c b/src/import/qcow2-util.c
index c2eb78bf15..e927b60fce 100644
--- a/src/import/qcow2-util.c
+++ b/src/import/qcow2-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2015 Lennart Poettering
-***/
 
 #include <zlib.h>
 
diff --git a/src/import/qcow2-util.h b/src/import/qcow2-util.h
index 3f8e89e9bd..7393d9837a 100644
--- a/src/import/qcow2-util.h
+++ b/src/import/qcow2-util.h
@@ -1,9 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2015 Lennart Poettering
-***/
-
 int qcow2_detect(int fd);
 int qcow2_convert(int qcow2_fd, int raw_fd);
diff --git a/src/import/test-qcow2.c b/src/import/test-qcow2.c
index 802588b427..bd2b458219 100644
--- a/src/import/test-qcow2.c
+++ b/src/import/test-qcow2.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2015 Lennart Poettering
-***/
 
 #include "fd-util.h"
 #include "log.h"
diff --git a/src/initctl/initctl.c b/src/initctl/initctl.c
index aa178260cc..0c5aab6968 100644
--- a/src/initctl/initctl.c
+++ b/src/initctl/initctl.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <ctype.h>
 #include <errno.h>
diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c
index f1496d9f25..9e77e314ff 100644
--- a/src/journal-remote/journal-gatewayd.c
+++ b/src/journal-remote/journal-gatewayd.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2012 Lennart Poettering
-***/
 
 #include <fcntl.h>
 #include <getopt.h>
diff --git a/src/journal-remote/microhttpd-util.c b/src/journal-remote/microhttpd-util.c
index 424f8eb6c0..6cd88eb60d 100644
--- a/src/journal-remote/microhttpd-util.c
+++ b/src/journal-remote/microhttpd-util.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2012 Lennart Poettering
   Copyright 2012 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/journal/cat.c b/src/journal/cat.c
index 3461878be0..8a11c8c3d1 100644
--- a/src/journal/cat.c
+++ b/src/journal/cat.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2012 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/src/journal/catalog.c b/src/journal/catalog.c
index 50f07ac5cf..f9118f0b62 100644
--- a/src/journal/catalog.c
+++ b/src/journal/catalog.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2012 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/src/journal/catalog.h b/src/journal/catalog.h
index c6f9352b24..4e6f161af3 100644
--- a/src/journal/catalog.h
+++ b/src/journal/catalog.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2012 Lennart Poettering
-***/
-
 #include <stdbool.h>
 
 #include "sd-id128.h"
diff --git a/src/journal/compress.c b/src/journal/compress.c
index 26f26d265b..6baf15c8ff 100644
--- a/src/journal/compress.c
+++ b/src/journal/compress.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2011 Lennart Poettering
-***/
 
 #include <inttypes.h>
 #include <stdlib.h>
diff --git a/src/journal/compress.h b/src/journal/compress.h
index fa8e7f61a6..56411484ce 100644
--- a/src/journal/compress.h
+++ b/src/journal/compress.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2011 Lennart Poettering
-***/
-
 #include <unistd.h>
 
 #include "journal-def.h"
diff --git a/src/journal/journal-authenticate.c b/src/journal/journal-authenticate.c
index ea5f56799a..8a9ce8a0d0 100644
--- a/src/journal/journal-authenticate.c
+++ b/src/journal/journal-authenticate.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2012 Lennart Poettering
-***/
 
 #include <fcntl.h>
 #include <sys/mman.h>
diff --git a/src/journal/journal-authenticate.h b/src/journal/journal-authenticate.h
index 04fcd4c974..2ef0133040 100644
--- a/src/journal/journal-authenticate.h
+++ b/src/journal/journal-authenticate.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2012 Lennart Poettering
-***/
-
 #include <stdbool.h>
 
 #include "journal-file.h"
diff --git a/src/journal/journal-def.h b/src/journal/journal-def.h
index 5cb1f0289a..43f70c861a 100644
--- a/src/journal/journal-def.h
+++ b/src/journal/journal-def.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2011 Lennart Poettering
-***/
-
 #include "sd-id128.h"
 
 #include "macro.h"
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
index bfa2fd96af..62e7f68a13 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2011 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/src/journal/journal-file.h b/src/journal/journal-file.h
index 5e6babccc6..c8114ee2d0 100644
--- a/src/journal/journal-file.h
+++ b/src/journal/journal-file.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2011 Lennart Poettering
-***/
-
 #include <inttypes.h>
 
 #if HAVE_GCRYPT
diff --git a/src/journal/journal-internal.h b/src/journal/journal-internal.h
index 8f1d35aec5..80a69da4d8 100644
--- a/src/journal/journal-internal.h
+++ b/src/journal/journal-internal.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2011 Lennart Poettering
-***/
-
 #include <inttypes.h>
 #include <stdbool.h>
 #include <sys/types.h>
diff --git a/src/journal/journal-qrcode.c b/src/journal/journal-qrcode.c
index 1dd20bb1cc..35d6ec4593 100644
--- a/src/journal/journal-qrcode.c
+++ b/src/journal/journal-qrcode.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2012 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <qrencode.h>
diff --git a/src/journal/journal-qrcode.h b/src/journal/journal-qrcode.h
index e7d756e6ee..0774608edf 100644
--- a/src/journal/journal-qrcode.h
+++ b/src/journal/journal-qrcode.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2012 Lennart Poettering
-***/
-
 #include <inttypes.h>
 #include <stdio.h>
 
diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c
index cf79c4785f..a0621524a9 100644
--- a/src/journal/journal-send.c
+++ b/src/journal/journal-send.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2011 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/src/journal/journal-vacuum.c b/src/journal/journal-vacuum.c
index 5ad23f4642..8d3ae71440 100644
--- a/src/journal/journal-vacuum.c
+++ b/src/journal/journal-vacuum.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2011 Lennart Poettering
-***/
 
 #include <fcntl.h>
 #include <sys/stat.h>
diff --git a/src/journal/journal-vacuum.h b/src/journal/journal-vacuum.h
index 7f2cdadbfb..0b336ac013 100644
--- a/src/journal/journal-vacuum.h
+++ b/src/journal/journal-vacuum.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2011 Lennart Poettering
-***/
-
 #include <inttypes.h>
 #include <stdbool.h>
 
diff --git a/src/journal/journal-verify.c b/src/journal/journal-verify.c
index e36c95e2af..c2f0467c6e 100644
--- a/src/journal/journal-verify.c
+++ b/src/journal/journal-verify.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2012 Lennart Poettering
-***/
 
 #include <fcntl.h>
 #include <stddef.h>
diff --git a/src/journal/journal-verify.h b/src/journal/journal-verify.h
index 74f14761c2..f0ea31abc1 100644
--- a/src/journal/journal-verify.h
+++ b/src/journal/journal-verify.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2011 Lennart Poettering
-***/
-
 #include "journal-file.h"
 
 int journal_file_verify(JournalFile *f, const char *key, usec_t *first_contained, usec_t *last_validated, usec_t *last_contained, bool show_progress);
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index e52f89d1ad..2773d8554a 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2011 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/src/journal/journald-audit.c b/src/journal/journald-audit.c
index 6365abe5bb..058c921c5e 100644
--- a/src/journal/journald-audit.c
+++ b/src/journal/journald-audit.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2014 Lennart Poettering
-***/
 
 #include "alloc-util.h"
 #include "audit-type.h"
diff --git a/src/journal/journald-audit.h b/src/journal/journald-audit.h
index de0c304d0b..57bb1711c9 100644
--- a/src/journal/journald-audit.h
+++ b/src/journal/journald-audit.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2014 Lennart Poettering
-***/
-
 #include "journald-server.h"
 #include "socket-util.h"
 
diff --git a/src/journal/journald-console.c b/src/journal/journald-console.c
index 935082d30b..80e2958597 100644
--- a/src/journal/journald-console.c
+++ b/src/journal/journald-console.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2011 Lennart Poettering
-***/
 
 #include <fcntl.h>
 #include <sys/socket.h>
diff --git a/src/journal/journald-console.h b/src/journal/journald-console.h
index e6ad620379..3def00ad5d 100644
--- a/src/journal/journald-console.h
+++ b/src/journal/journald-console.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2011 Lennart Poettering
-***/
-
 #include "journald-server.h"
 
 void server_forward_console(Server *s, int priority, const char *identifier, const char *message, const struct ucred *ucred);
diff --git a/src/journal/journald-context.c b/src/journal/journald-context.c
index 2972c855ae..ce07de1bfb 100644
--- a/src/journal/journald-context.c
+++ b/src/journal/journald-context.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2017 Lennart Poettering
-***/
 
 #if HAVE_SELINUX
 #include <selinux/selinux.h>
diff --git a/src/journal/journald-context.h b/src/journal/journald-context.h
index 57fb294d2f..9df3a38eff 100644
--- a/src/journal/journald-context.h
+++ b/src/journal/journald-context.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2017 Lennart Poettering
-***/
-
 #include <inttypes.h>
 #include <sys/types.h>
 
diff --git a/src/journal/journald-kmsg.c b/src/journal/journald-kmsg.c
index 432e486473..e9aff13168 100644
--- a/src/journal/journald-kmsg.c
+++ b/src/journal/journald-kmsg.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2011 Lennart Poettering
-***/
 
 #include <fcntl.h>
 #include <sys/epoll.h>
diff --git a/src/journal/journald-kmsg.h b/src/journal/journald-kmsg.h
index 89f114437b..bff24ac310 100644
--- a/src/journal/journald-kmsg.h
+++ b/src/journal/journald-kmsg.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2011 Lennart Poettering
-***/
-
 #include "journald-server.h"
 
 int server_open_dev_kmsg(Server *s);
diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c
index 7766455148..5ff22a10af 100644
--- a/src/journal/journald-native.c
+++ b/src/journal/journald-native.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2011 Lennart Poettering
-***/
 
 #include <stddef.h>
 #include <sys/epoll.h>
diff --git a/src/journal/journald-native.h b/src/journal/journald-native.h
index e7a4bcc65d..7211d4fab4 100644
--- a/src/journal/journald-native.h
+++ b/src/journal/journald-native.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2011 Lennart Poettering
-***/
-
 #include "journald-server.h"
 
 void server_process_native_message(
diff --git a/src/journal/journald-rate-limit.c b/src/journal/journald-rate-limit.c
index 120a1e0d82..6a8a36a736 100644
--- a/src/journal/journald-rate-limit.c
+++ b/src/journal/journald-rate-limit.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2011 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <string.h>
diff --git a/src/journal/journald-rate-limit.h b/src/journal/journald-rate-limit.h
index 6ecdcb07ac..3a7f106de0 100644
--- a/src/journal/journald-rate-limit.h
+++ b/src/journal/journald-rate-limit.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2011 Lennart Poettering
-***/
-
 #include "util.h"
 
 typedef struct JournalRateLimit JournalRateLimit;
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index 63fefc90ea..4f1550ec5b 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2011 Lennart Poettering
-***/
 
 #if HAVE_SELINUX
 #include <selinux/selinux.h>
diff --git a/src/journal/journald-server.h b/src/journal/journald-server.h
index c42b3d8c9f..983be8bb89 100644
--- a/src/journal/journald-server.h
+++ b/src/journal/journald-server.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2011 Lennart Poettering
-***/
-
 #include <stdbool.h>
 #include <sys/types.h>
 
diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c
index c08f122229..dbf3503a82 100644
--- a/src/journal/journald-stream.c
+++ b/src/journal/journald-stream.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2011 Lennart Poettering
-***/
 
 #include <stddef.h>
 #include <unistd.h>
diff --git a/src/journal/journald-stream.h b/src/journal/journald-stream.h
index 3c020fd8e4..bc5622ab3b 100644
--- a/src/journal/journald-stream.h
+++ b/src/journal/journald-stream.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2011 Lennart Poettering
-***/
-
 typedef struct StdoutStream StdoutStream;
 
 #include "fdset.h"
diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c
index b3538bc37a..9dea116722 100644
--- a/src/journal/journald-syslog.c
+++ b/src/journal/journald-syslog.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2011 Lennart Poettering
-***/
 
 #include <stddef.h>
 #include <sys/epoll.h>
diff --git a/src/journal/journald-syslog.h b/src/journal/journald-syslog.h
index a1cfd83c7f..7ca5897264 100644
--- a/src/journal/journald-syslog.h
+++ b/src/journal/journald-syslog.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2011 Lennart Poettering
-***/
-
 #include "journald-server.h"
 
 int syslog_fixup_facility(int priority) _const_;
diff --git a/src/journal/journald.c b/src/journal/journald.c
index 9479d181d2..5e7b1dcb4a 100644
--- a/src/journal/journald.c
+++ b/src/journal/journald.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2011 Lennart Poettering
-***/
 
 #include <unistd.h>
 
diff --git a/src/journal/mmap-cache.c b/src/journal/mmap-cache.c
index eb47bcbbc4..2366055f0a 100644
--- a/src/journal/mmap-cache.c
+++ b/src/journal/mmap-cache.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2012 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <stdlib.h>
diff --git a/src/journal/mmap-cache.h b/src/journal/mmap-cache.h
index 90b9888c24..bf70d32027 100644
--- a/src/journal/mmap-cache.h
+++ b/src/journal/mmap-cache.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2012 Lennart Poettering
-***/
-
 #include <stdbool.h>
 #include <sys/stat.h>
 
diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
index e3cdb08c5d..83abd82d1c 100644
--- a/src/journal/sd-journal.c
+++ b/src/journal/sd-journal.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2011 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/src/journal/test-catalog.c b/src/journal/test-catalog.c
index f2846e6575..55560b8bcb 100644
--- a/src/journal/test-catalog.c
+++ b/src/journal/test-catalog.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2012 Lennart Poettering
   Copyright 2013 Zbigniew Jędrzejewski-Szmek
 ***/
 
diff --git a/src/journal/test-journal-config.c b/src/journal/test-journal-config.c
index d5c4664685..1482490411 100644
--- a/src/journal/test-journal-config.c
+++ b/src/journal/test-journal-config.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2011 Lennart Poettering
-***/
 
 #include <stdbool.h>
 
diff --git a/src/journal/test-journal-enum.c b/src/journal/test-journal-enum.c
index 3f00200adf..b25a983498 100644
--- a/src/journal/test-journal-enum.c
+++ b/src/journal/test-journal-enum.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2012 Lennart Poettering
-***/
 
 #include <stdio.h>
 
diff --git a/src/journal/test-journal-flush.c b/src/journal/test-journal-flush.c
index b14cb3d11e..81dbc22a70 100644
--- a/src/journal/test-journal-flush.c
+++ b/src/journal/test-journal-flush.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2013 Lennart Poettering
-***/
 
 #include <fcntl.h>
 
diff --git a/src/journal/test-journal-match.c b/src/journal/test-journal-match.c
index b4803f52aa..4e5ad1791a 100644
--- a/src/journal/test-journal-match.c
+++ b/src/journal/test-journal-match.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2012 Lennart Poettering
-***/
 
 #include <stdio.h>
 
diff --git a/src/journal/test-journal-send.c b/src/journal/test-journal-send.c
index bb9b7c268a..484308e56e 100644
--- a/src/journal/test-journal-send.c
+++ b/src/journal/test-journal-send.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2011 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <stdlib.h>
diff --git a/src/journal/test-journal-stream.c b/src/journal/test-journal-stream.c
index 849b7b4ea6..ae35c91eff 100644
--- a/src/journal/test-journal-stream.c
+++ b/src/journal/test-journal-stream.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2012 Lennart Poettering
-***/
 
 #include <fcntl.h>
 #include <unistd.h>
diff --git a/src/journal/test-journal-syslog.c b/src/journal/test-journal-syslog.c
index c491924edf..9ba86f6c8a 100644
--- a/src/journal/test-journal-syslog.c
+++ b/src/journal/test-journal-syslog.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2011 Lennart Poettering
-***/
 
 #include "alloc-util.h"
 #include "journald-syslog.h"
diff --git a/src/journal/test-journal-verify.c b/src/journal/test-journal-verify.c
index 46f8659052..c1c3a82c42 100644
--- a/src/journal/test-journal-verify.c
+++ b/src/journal/test-journal-verify.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2012 Lennart Poettering
-***/
 
 #include <fcntl.h>
 #include <stdio.h>
diff --git a/src/journal/test-journal.c b/src/journal/test-journal.c
index f3024559a6..69bdff6760 100644
--- a/src/journal/test-journal.c
+++ b/src/journal/test-journal.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2011 Lennart Poettering
-***/
 
 #include <fcntl.h>
 #include <unistd.h>
diff --git a/src/journal/test-mmap-cache.c b/src/journal/test-mmap-cache.c
index 8a80b74ef5..5c55b35f57 100644
--- a/src/journal/test-mmap-cache.c
+++ b/src/journal/test-mmap-cache.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2012 Lennart Poettering
-***/
 
 #include <fcntl.h>
 #include <stdlib.h>
diff --git a/src/libsystemd-network/lldp-neighbor.c b/src/libsystemd-network/lldp-neighbor.c
index dd3ef4b398..5dcb051373 100644
--- a/src/libsystemd-network/lldp-neighbor.c
+++ b/src/libsystemd-network/lldp-neighbor.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2016 Lennart Poettering
-***/
 
 #include "alloc-util.h"
 #include "escape.h"
diff --git a/src/libsystemd-network/lldp-neighbor.h b/src/libsystemd-network/lldp-neighbor.h
index eb968d2f37..494bc51760 100644
--- a/src/libsystemd-network/lldp-neighbor.h
+++ b/src/libsystemd-network/lldp-neighbor.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2016 Lennart Poettering
-***/
-
 #include <inttypes.h>
 #include <stdbool.h>
 #include <sys/types.h>
diff --git a/src/libsystemd/sd-bus/bus-common-errors.h b/src/libsystemd/sd-bus/bus-common-errors.h
index 0bee5a64cc..3945c7f6ac 100644
--- a/src/libsystemd/sd-bus/bus-common-errors.h
+++ b/src/libsystemd/sd-bus/bus-common-errors.h
@@ -2,7 +2,6 @@
 #pragma once
 
 /***
-  Copyright 2013 Lennart Poettering
 ***/
 
 #include "bus-error.h"
diff --git a/src/libsystemd/sd-bus/bus-container.c b/src/libsystemd/sd-bus/bus-container.c
index 47691960a9..f50274a6a4 100644
--- a/src/libsystemd/sd-bus/bus-container.c
+++ b/src/libsystemd/sd-bus/bus-container.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2013 Lennart Poettering
 ***/
 
 #include <fcntl.h>
diff --git a/src/libsystemd/sd-bus/bus-container.h b/src/libsystemd/sd-bus/bus-container.h
index 54c76c4822..dd115b4e24 100644
--- a/src/libsystemd/sd-bus/bus-container.h
+++ b/src/libsystemd/sd-bus/bus-container.h
@@ -2,7 +2,6 @@
 #pragma once
 
 /***
-  Copyright 2013 Lennart Poettering
 ***/
 
 #include "sd-bus.h"
diff --git a/src/libsystemd/sd-bus/bus-control.c b/src/libsystemd/sd-bus/bus-control.c
index ed0705ae90..18a2cc2c9b 100644
--- a/src/libsystemd/sd-bus/bus-control.c
+++ b/src/libsystemd/sd-bus/bus-control.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2013 Lennart Poettering
 ***/
 
 #if HAVE_VALGRIND_MEMCHECK_H
diff --git a/src/libsystemd/sd-bus/bus-control.h b/src/libsystemd/sd-bus/bus-control.h
index c3a5f7ce27..9017297496 100644
--- a/src/libsystemd/sd-bus/bus-control.h
+++ b/src/libsystemd/sd-bus/bus-control.h
@@ -2,7 +2,6 @@
 #pragma once
 
 /***
-  Copyright 2013 Lennart Poettering
 ***/
 
 #include "sd-bus.h"
diff --git a/src/libsystemd/sd-bus/bus-convenience.c b/src/libsystemd/sd-bus/bus-convenience.c
index 47da334b93..41910515db 100644
--- a/src/libsystemd/sd-bus/bus-convenience.c
+++ b/src/libsystemd/sd-bus/bus-convenience.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2013 Lennart Poettering
 ***/
 
 #include "bus-internal.h"
diff --git a/src/libsystemd/sd-bus/bus-creds.c b/src/libsystemd/sd-bus/bus-creds.c
index d8ee203083..aae9fcd58b 100644
--- a/src/libsystemd/sd-bus/bus-creds.c
+++ b/src/libsystemd/sd-bus/bus-creds.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2013 Lennart Poettering
 ***/
 
 #include <linux/capability.h>
diff --git a/src/libsystemd/sd-bus/bus-creds.h b/src/libsystemd/sd-bus/bus-creds.h
index fe490a1766..7b77a1d735 100644
--- a/src/libsystemd/sd-bus/bus-creds.h
+++ b/src/libsystemd/sd-bus/bus-creds.h
@@ -2,7 +2,6 @@
 #pragma once
 
 /***
-  Copyright 2013 Lennart Poettering
 ***/
 
 #include <stdbool.h>
diff --git a/src/libsystemd/sd-bus/bus-dump.c b/src/libsystemd/sd-bus/bus-dump.c
index e62c9600c7..3a28c7c6e3 100644
--- a/src/libsystemd/sd-bus/bus-dump.c
+++ b/src/libsystemd/sd-bus/bus-dump.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2013 Lennart Poettering
 ***/
 
 #include "alloc-util.h"
diff --git a/src/libsystemd/sd-bus/bus-dump.h b/src/libsystemd/sd-bus/bus-dump.h
index a1aa31db6c..8e47411a45 100644
--- a/src/libsystemd/sd-bus/bus-dump.h
+++ b/src/libsystemd/sd-bus/bus-dump.h
@@ -2,7 +2,6 @@
 #pragma once
 
 /***
-  Copyright 2013 Lennart Poettering
 ***/
 
 #include <stdbool.h>
diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c
index 61d727faed..ec359ac13c 100644
--- a/src/libsystemd/sd-bus/bus-error.c
+++ b/src/libsystemd/sd-bus/bus-error.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2013 Lennart Poettering
 ***/
 
 #include <errno.h>
diff --git a/src/libsystemd/sd-bus/bus-error.h b/src/libsystemd/sd-bus/bus-error.h
index 9d2763c917..93cb9acd91 100644
--- a/src/libsystemd/sd-bus/bus-error.h
+++ b/src/libsystemd/sd-bus/bus-error.h
@@ -2,7 +2,6 @@
 #pragma once
 
 /***
-  Copyright 2013 Lennart Poettering
 ***/
 
 #include <stdbool.h>
diff --git a/src/libsystemd/sd-bus/bus-gvariant.c b/src/libsystemd/sd-bus/bus-gvariant.c
index 4c72a3906e..05b17589dd 100644
--- a/src/libsystemd/sd-bus/bus-gvariant.c
+++ b/src/libsystemd/sd-bus/bus-gvariant.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2013 Lennart Poettering
 ***/
 
 #include <errno.h>
diff --git a/src/libsystemd/sd-bus/bus-gvariant.h b/src/libsystemd/sd-bus/bus-gvariant.h
index 1d4e087763..40e3053ec6 100644
--- a/src/libsystemd/sd-bus/bus-gvariant.h
+++ b/src/libsystemd/sd-bus/bus-gvariant.h
@@ -2,7 +2,6 @@
 #pragma once
 
 /***
-  Copyright 2013 Lennart Poettering
 ***/
 
 #include "macro.h"
diff --git a/src/libsystemd/sd-bus/bus-internal.c b/src/libsystemd/sd-bus/bus-internal.c
index bf14da42d9..7bb653338d 100644
--- a/src/libsystemd/sd-bus/bus-internal.c
+++ b/src/libsystemd/sd-bus/bus-internal.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2013 Lennart Poettering
 ***/
 
 #include "alloc-util.h"
diff --git a/src/libsystemd/sd-bus/bus-internal.h b/src/libsystemd/sd-bus/bus-internal.h
index 3e19c7e44d..2087ef8eeb 100644
--- a/src/libsystemd/sd-bus/bus-internal.h
+++ b/src/libsystemd/sd-bus/bus-internal.h
@@ -2,7 +2,6 @@
 #pragma once
 
 /***
-  Copyright 2013 Lennart Poettering
 ***/
 
 #include <pthread.h>
diff --git a/src/libsystemd/sd-bus/bus-introspect.c b/src/libsystemd/sd-bus/bus-introspect.c
index 7c9c437e54..cfcbd8b072 100644
--- a/src/libsystemd/sd-bus/bus-introspect.c
+++ b/src/libsystemd/sd-bus/bus-introspect.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2013 Lennart Poettering
 ***/
 
 #include <stdio_ext.h>
diff --git a/src/libsystemd/sd-bus/bus-introspect.h b/src/libsystemd/sd-bus/bus-introspect.h
index 44bd35f87f..5dcaeace9d 100644
--- a/src/libsystemd/sd-bus/bus-introspect.h
+++ b/src/libsystemd/sd-bus/bus-introspect.h
@@ -2,7 +2,6 @@
 #pragma once
 
 /***
-  Copyright 2013 Lennart Poettering
 ***/
 
 #include <stdio.h>
diff --git a/src/libsystemd/sd-bus/bus-kernel.c b/src/libsystemd/sd-bus/bus-kernel.c
index 48331dbd88..1f61bd3f95 100644
--- a/src/libsystemd/sd-bus/bus-kernel.c
+++ b/src/libsystemd/sd-bus/bus-kernel.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2013 Lennart Poettering
 ***/
 
 #if HAVE_VALGRIND_MEMCHECK_H
diff --git a/src/libsystemd/sd-bus/bus-kernel.h b/src/libsystemd/sd-bus/bus-kernel.h
index 5ab424daa5..44c9a76311 100644
--- a/src/libsystemd/sd-bus/bus-kernel.h
+++ b/src/libsystemd/sd-bus/bus-kernel.h
@@ -2,7 +2,6 @@
 #pragma once
 
 /***
-  Copyright 2013 Lennart Poettering
 ***/
 
 #include "sd-bus.h"
diff --git a/src/libsystemd/sd-bus/bus-match.c b/src/libsystemd/sd-bus/bus-match.c
index 9242240bc8..7d04cc4bd1 100644
--- a/src/libsystemd/sd-bus/bus-match.c
+++ b/src/libsystemd/sd-bus/bus-match.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2013 Lennart Poettering
 ***/
 
 #include <stdio_ext.h>
diff --git a/src/libsystemd/sd-bus/bus-match.h b/src/libsystemd/sd-bus/bus-match.h
index babcaa716f..050f4ba033 100644
--- a/src/libsystemd/sd-bus/bus-match.h
+++ b/src/libsystemd/sd-bus/bus-match.h
@@ -2,7 +2,6 @@
 #pragma once
 
 /***
-  Copyright 2013 Lennart Poettering
 ***/
 
 #include "sd-bus.h"
diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c
index db7de7d491..caabe88ae8 100644
--- a/src/libsystemd/sd-bus/bus-message.c
+++ b/src/libsystemd/sd-bus/bus-message.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2013 Lennart Poettering
 ***/
 
 #include <errno.h>
diff --git a/src/libsystemd/sd-bus/bus-message.h b/src/libsystemd/sd-bus/bus-message.h
index 26d976e73a..97f6060e30 100644
--- a/src/libsystemd/sd-bus/bus-message.h
+++ b/src/libsystemd/sd-bus/bus-message.h
@@ -2,7 +2,6 @@
 #pragma once
 
 /***
-  Copyright 2013 Lennart Poettering
 ***/
 
 #include <byteswap.h>
diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c
index 6713b6ba65..9609834fa9 100644
--- a/src/libsystemd/sd-bus/bus-objects.c
+++ b/src/libsystemd/sd-bus/bus-objects.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2013 Lennart Poettering
 ***/
 
 #include "alloc-util.h"
diff --git a/src/libsystemd/sd-bus/bus-objects.h b/src/libsystemd/sd-bus/bus-objects.h
index 64fa3b58c6..e8e1a522cb 100644
--- a/src/libsystemd/sd-bus/bus-objects.h
+++ b/src/libsystemd/sd-bus/bus-objects.h
@@ -2,7 +2,6 @@
 #pragma once
 
 /***
-  Copyright 2013 Lennart Poettering
 ***/
 
 #include "bus-internal.h"
diff --git a/src/libsystemd/sd-bus/bus-protocol.h b/src/libsystemd/sd-bus/bus-protocol.h
index df0739ac93..20d19d4022 100644
--- a/src/libsystemd/sd-bus/bus-protocol.h
+++ b/src/libsystemd/sd-bus/bus-protocol.h
@@ -2,7 +2,6 @@
 #pragma once
 
 /***
-  Copyright 2013 Lennart Poettering
 ***/
 
 #include <endian.h>
diff --git a/src/libsystemd/sd-bus/bus-signature.c b/src/libsystemd/sd-bus/bus-signature.c
index 707a1e7d14..18c91e8707 100644
--- a/src/libsystemd/sd-bus/bus-signature.c
+++ b/src/libsystemd/sd-bus/bus-signature.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2013 Lennart Poettering
 ***/
 
 #include <util.h>
diff --git a/src/libsystemd/sd-bus/bus-signature.h b/src/libsystemd/sd-bus/bus-signature.h
index c2b1f5a6c3..d4b43bac00 100644
--- a/src/libsystemd/sd-bus/bus-signature.h
+++ b/src/libsystemd/sd-bus/bus-signature.h
@@ -2,7 +2,6 @@
 #pragma once
 
 /***
-  Copyright 2013 Lennart Poettering
 ***/
 
 #include <stdbool.h>
diff --git a/src/libsystemd/sd-bus/bus-slot.c b/src/libsystemd/sd-bus/bus-slot.c
index 77a057e3a1..fbf37320d3 100644
--- a/src/libsystemd/sd-bus/bus-slot.c
+++ b/src/libsystemd/sd-bus/bus-slot.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2013 Lennart Poettering
 ***/
 
 #include "sd-bus.h"
diff --git a/src/libsystemd/sd-bus/bus-slot.h b/src/libsystemd/sd-bus/bus-slot.h
index 966957180d..f1e1e23ac6 100644
--- a/src/libsystemd/sd-bus/bus-slot.h
+++ b/src/libsystemd/sd-bus/bus-slot.h
@@ -2,7 +2,6 @@
 #pragma once
 
 /***
-  Copyright 2014 Lennart Poettering
 ***/
 
 #include "sd-bus.h"
diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c
index e32fdb0317..7303313635 100644
--- a/src/libsystemd/sd-bus/bus-socket.c
+++ b/src/libsystemd/sd-bus/bus-socket.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2013 Lennart Poettering
 ***/
 
 #include <endian.h>
diff --git a/src/libsystemd/sd-bus/bus-socket.h b/src/libsystemd/sd-bus/bus-socket.h
index 87df7040e1..d1118ca1d4 100644
--- a/src/libsystemd/sd-bus/bus-socket.h
+++ b/src/libsystemd/sd-bus/bus-socket.h
@@ -2,7 +2,6 @@
 #pragma once
 
 /***
-  Copyright 2013 Lennart Poettering
 ***/
 
 #include "sd-bus.h"
diff --git a/src/libsystemd/sd-bus/bus-track.c b/src/libsystemd/sd-bus/bus-track.c
index 846556cb36..16bf615f50 100644
--- a/src/libsystemd/sd-bus/bus-track.c
+++ b/src/libsystemd/sd-bus/bus-track.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2013 Lennart Poettering
 ***/
 
 #include "sd-bus.h"
diff --git a/src/libsystemd/sd-bus/bus-track.h b/src/libsystemd/sd-bus/bus-track.h
index facbb6daae..f9590265d7 100644
--- a/src/libsystemd/sd-bus/bus-track.h
+++ b/src/libsystemd/sd-bus/bus-track.h
@@ -2,7 +2,6 @@
 #pragma once
 
 /***
-  Copyright 2013 Lennart Poettering
 ***/
 
 void bus_track_dispatch(sd_bus_track *track);
diff --git a/src/libsystemd/sd-bus/bus-type.c b/src/libsystemd/sd-bus/bus-type.c
index fdf5556580..bc6726f9cf 100644
--- a/src/libsystemd/sd-bus/bus-type.c
+++ b/src/libsystemd/sd-bus/bus-type.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2013 Lennart Poettering
 ***/
 
 #include <errno.h>
diff --git a/src/libsystemd/sd-bus/bus-type.h b/src/libsystemd/sd-bus/bus-type.h
index 109a3287fa..cdac55c62e 100644
--- a/src/libsystemd/sd-bus/bus-type.h
+++ b/src/libsystemd/sd-bus/bus-type.h
@@ -2,7 +2,6 @@
 #pragma once
 
 /***
-  Copyright 2013 Lennart Poettering
 ***/
 
 #include <stdbool.h>
diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c
index f52ce6ac3c..089b51a6d9 100644
--- a/src/libsystemd/sd-bus/sd-bus.c
+++ b/src/libsystemd/sd-bus/sd-bus.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2013 Lennart Poettering
 ***/
 
 #include <endian.h>
diff --git a/src/libsystemd/sd-bus/test-bus-benchmark.c b/src/libsystemd/sd-bus/test-bus-benchmark.c
index a77cba32af..8134abba2f 100644
--- a/src/libsystemd/sd-bus/test-bus-benchmark.c
+++ b/src/libsystemd/sd-bus/test-bus-benchmark.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2013 Lennart Poettering
 ***/
 
 #include <sys/wait.h>
diff --git a/src/libsystemd/sd-bus/test-bus-chat.c b/src/libsystemd/sd-bus/test-bus-chat.c
index dac09fca37..1e25e94586 100644
--- a/src/libsystemd/sd-bus/test-bus-chat.c
+++ b/src/libsystemd/sd-bus/test-bus-chat.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2013 Lennart Poettering
 ***/
 
 #include <fcntl.h>
diff --git a/src/libsystemd/sd-bus/test-bus-creds.c b/src/libsystemd/sd-bus/test-bus-creds.c
index ce18cf5aa9..6746c0973e 100644
--- a/src/libsystemd/sd-bus/test-bus-creds.c
+++ b/src/libsystemd/sd-bus/test-bus-creds.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2013 Lennart Poettering
 ***/
 
 #include "sd-bus.h"
diff --git a/src/libsystemd/sd-bus/test-bus-error.c b/src/libsystemd/sd-bus/test-bus-error.c
index 89339a9350..250657b18e 100644
--- a/src/libsystemd/sd-bus/test-bus-error.c
+++ b/src/libsystemd/sd-bus/test-bus-error.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2013 Lennart Poettering
 ***/
 
 #include "sd-bus.h"
diff --git a/src/libsystemd/sd-bus/test-bus-gvariant.c b/src/libsystemd/sd-bus/test-bus-gvariant.c
index 2e305d8619..75804f3458 100644
--- a/src/libsystemd/sd-bus/test-bus-gvariant.c
+++ b/src/libsystemd/sd-bus/test-bus-gvariant.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2013 Lennart Poettering
 ***/
 
 #if HAVE_GLIB
diff --git a/src/libsystemd/sd-bus/test-bus-introspect.c b/src/libsystemd/sd-bus/test-bus-introspect.c
index 9889c65334..00167cb643 100644
--- a/src/libsystemd/sd-bus/test-bus-introspect.c
+++ b/src/libsystemd/sd-bus/test-bus-introspect.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2013 Lennart Poettering
 ***/
 
 #include "bus-introspect.h"
diff --git a/src/libsystemd/sd-bus/test-bus-marshal.c b/src/libsystemd/sd-bus/test-bus-marshal.c
index cf03cdc5ac..c647f0ff12 100644
--- a/src/libsystemd/sd-bus/test-bus-marshal.c
+++ b/src/libsystemd/sd-bus/test-bus-marshal.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2013 Lennart Poettering
 ***/
 
 #include <math.h>
diff --git a/src/libsystemd/sd-bus/test-bus-match.c b/src/libsystemd/sd-bus/test-bus-match.c
index c4cbdb5811..2822a8f82a 100644
--- a/src/libsystemd/sd-bus/test-bus-match.c
+++ b/src/libsystemd/sd-bus/test-bus-match.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2013 Lennart Poettering
 ***/
 
 #include "bus-match.h"
diff --git a/src/libsystemd/sd-bus/test-bus-objects.c b/src/libsystemd/sd-bus/test-bus-objects.c
index dda05d0429..094dd6c8a0 100644
--- a/src/libsystemd/sd-bus/test-bus-objects.c
+++ b/src/libsystemd/sd-bus/test-bus-objects.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2013 Lennart Poettering
 ***/
 
 #include <pthread.h>
diff --git a/src/libsystemd/sd-bus/test-bus-server.c b/src/libsystemd/sd-bus/test-bus-server.c
index b3ebd34a3e..31b54e252c 100644
--- a/src/libsystemd/sd-bus/test-bus-server.c
+++ b/src/libsystemd/sd-bus/test-bus-server.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2013 Lennart Poettering
 ***/
 
 #include <pthread.h>
diff --git a/src/libsystemd/sd-bus/test-bus-signature.c b/src/libsystemd/sd-bus/test-bus-signature.c
index e46d72364e..1ba1909198 100644
--- a/src/libsystemd/sd-bus/test-bus-signature.c
+++ b/src/libsystemd/sd-bus/test-bus-signature.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2013 Lennart Poettering
 ***/
 
 #include "bus-internal.h"
diff --git a/src/libsystemd/sd-bus/test-bus-track.c b/src/libsystemd/sd-bus/test-bus-track.c
index 2397fc30ee..48d708b258 100644
--- a/src/libsystemd/sd-bus/test-bus-track.c
+++ b/src/libsystemd/sd-bus/test-bus-track.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2016 Lennart Poettering
 ***/
 
 #include <errno.h>
diff --git a/src/libsystemd/sd-bus/test-bus-watch-bind.c b/src/libsystemd/sd-bus/test-bus-watch-bind.c
index cbda84ac5d..42a9ce5301 100644
--- a/src/libsystemd/sd-bus/test-bus-watch-bind.c
+++ b/src/libsystemd/sd-bus/test-bus-watch-bind.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2017 Lennart Poettering
 ***/
 
 #include <pthread.h>
diff --git a/src/libsystemd/sd-daemon/sd-daemon.c b/src/libsystemd/sd-daemon/sd-daemon.c
index 0c6d61b958..9e9b115557 100644
--- a/src/libsystemd/sd-daemon/sd-daemon.c
+++ b/src/libsystemd/sd-daemon/sd-daemon.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2010 Lennart Poettering
 ***/
 
 #include <errno.h>
diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c
index 4af10401d8..d53b9a7026 100644
--- a/src/libsystemd/sd-event/sd-event.c
+++ b/src/libsystemd/sd-event/sd-event.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2013 Lennart Poettering
 ***/
 
 #include <sys/epoll.h>
diff --git a/src/libsystemd/sd-event/test-event.c b/src/libsystemd/sd-event/test-event.c
index 63be4cf760..fcb3599e89 100644
--- a/src/libsystemd/sd-event/test-event.c
+++ b/src/libsystemd/sd-event/test-event.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2013 Lennart Poettering
 ***/
 
 #include <sys/wait.h>
diff --git a/src/libsystemd/sd-id128/id128-util.c b/src/libsystemd/sd-id128/id128-util.c
index 5a1a0e1662..edee985e44 100644
--- a/src/libsystemd/sd-id128/id128-util.c
+++ b/src/libsystemd/sd-id128/id128-util.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2016 Lennart Poettering
 ***/
 
 #include <errno.h>
diff --git a/src/libsystemd/sd-id128/id128-util.h b/src/libsystemd/sd-id128/id128-util.h
index b99363bd3b..f0b4eca581 100644
--- a/src/libsystemd/sd-id128/id128-util.h
+++ b/src/libsystemd/sd-id128/id128-util.h
@@ -2,7 +2,6 @@
 #pragma once
 
 /***
-  Copyright 2016 Lennart Poettering
 ***/
 
 #include <stdbool.h>
diff --git a/src/libsystemd/sd-id128/sd-id128.c b/src/libsystemd/sd-id128/sd-id128.c
index 4a6f2960fc..b7123280f3 100644
--- a/src/libsystemd/sd-id128/sd-id128.c
+++ b/src/libsystemd/sd-id128/sd-id128.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2011 Lennart Poettering
 ***/
 
 #include <errno.h>
diff --git a/src/libsystemd/sd-login/sd-login.c b/src/libsystemd/sd-login/sd-login.c
index 092034a107..c2f7133e42 100644
--- a/src/libsystemd/sd-login/sd-login.c
+++ b/src/libsystemd/sd-login/sd-login.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2011 Lennart Poettering
 ***/
 
 #include <errno.h>
diff --git a/src/libsystemd/sd-login/test-login.c b/src/libsystemd/sd-login/test-login.c
index f895b491c5..ccb1905a46 100644
--- a/src/libsystemd/sd-login/test-login.c
+++ b/src/libsystemd/sd-login/test-login.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2011 Lennart Poettering
 ***/
 
 #include <poll.h>
diff --git a/src/libsystemd/sd-netlink/local-addresses.c b/src/libsystemd/sd-netlink/local-addresses.c
index a201718ec7..c61ae3f90f 100644
--- a/src/libsystemd/sd-netlink/local-addresses.c
+++ b/src/libsystemd/sd-netlink/local-addresses.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  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 2f9d11aa72..4fc3477e47 100644
--- a/src/libsystemd/sd-netlink/local-addresses.h
+++ b/src/libsystemd/sd-netlink/local-addresses.h
@@ -2,7 +2,6 @@
 #pragma once
 
 /***
-  Copyright 2008-2011 Lennart Poettering
 ***/
 
 #include "sd-netlink.h"
diff --git a/src/libsystemd/sd-netlink/test-local-addresses.c b/src/libsystemd/sd-netlink/test-local-addresses.c
index 27c8fbae31..921ce289d4 100644
--- a/src/libsystemd/sd-netlink/test-local-addresses.c
+++ b/src/libsystemd/sd-netlink/test-local-addresses.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2014 Lennart Poettering
 ***/
 
 #include "af-list.h"
diff --git a/src/libsystemd/sd-network/network-util.c b/src/libsystemd/sd-network/network-util.c
index 724c2b8549..256d4a27a5 100644
--- a/src/libsystemd/sd-network/network-util.c
+++ b/src/libsystemd/sd-network/network-util.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2014 Lennart Poettering
 ***/
 
 #include "alloc-util.h"
diff --git a/src/libsystemd/sd-network/sd-network.c b/src/libsystemd/sd-network/sd-network.c
index 471dff4706..99b6ec6ab1 100644
--- a/src/libsystemd/sd-network/sd-network.c
+++ b/src/libsystemd/sd-network/sd-network.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  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 d31779e1dc..2845f91e1b 100644
--- a/src/libsystemd/sd-path/sd-path.c
+++ b/src/libsystemd/sd-path/sd-path.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2014 Lennart Poettering
 ***/
 
 #include "sd-path.h"
diff --git a/src/libsystemd/sd-resolve/sd-resolve.c b/src/libsystemd/sd-resolve/sd-resolve.c
index 0f09628683..a189f140f8 100644
--- a/src/libsystemd/sd-resolve/sd-resolve.c
+++ b/src/libsystemd/sd-resolve/sd-resolve.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2005-2008 Lennart Poettering
 ***/
 
 #include <errno.h>
diff --git a/src/libsystemd/sd-resolve/test-resolve.c b/src/libsystemd/sd-resolve/test-resolve.c
index 524c8659f9..3656c62405 100644
--- a/src/libsystemd/sd-resolve/test-resolve.c
+++ b/src/libsystemd/sd-resolve/test-resolve.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  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 7292838c77..79909c9af1 100644
--- a/src/libsystemd/sd-utf8/sd-utf8.c
+++ b/src/libsystemd/sd-utf8/sd-utf8.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2013 Lennart Poettering
 ***/
 
 #include "sd-utf8.h"
diff --git a/src/locale/keymap-util.c b/src/locale/keymap-util.c
index aadb316d0e..69691d3d11 100644
--- a/src/locale/keymap-util.c
+++ b/src/locale/keymap-util.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2011 Lennart Poettering
   Copyright 2013 Kay Sievers
 ***/
 
diff --git a/src/locale/keymap-util.h b/src/locale/keymap-util.h
index f9aed8e1b5..d767613930 100644
--- a/src/locale/keymap-util.h
+++ b/src/locale/keymap-util.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2011 Lennart Poettering
   Copyright 2013 Kay Sievers
 ***/
 
diff --git a/src/locale/localectl.c b/src/locale/localectl.c
index 4940992f3e..67a0c7982a 100644
--- a/src/locale/localectl.c
+++ b/src/locale/localectl.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2012 Lennart Poettering
   Copyright 2013 Kay Sievers
 ***/
 
diff --git a/src/locale/localed.c b/src/locale/localed.c
index b9fb2aeac6..cb471ee2d7 100644
--- a/src/locale/localed.c
+++ b/src/locale/localed.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2011 Lennart Poettering
   Copyright 2013 Kay Sievers
 ***/
 
diff --git a/src/login/inhibit.c b/src/login/inhibit.c
index 5ab96be7ff..b0bb8de57e 100644
--- a/src/login/inhibit.c
+++ b/src/login/inhibit.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2012 Lennart Poettering
-***/
 
 #include <fcntl.h>
 #include <getopt.h>
diff --git a/src/login/loginctl.c b/src/login/loginctl.c
index 4e05c28b21..b88c166e29 100644
--- a/src/login/loginctl.c
+++ b/src/login/loginctl.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <getopt.h>
diff --git a/src/login/logind-acl.c b/src/login/logind-acl.c
index b846b25098..cafeb8822f 100644
--- a/src/login/logind-acl.c
+++ b/src/login/logind-acl.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2011 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <string.h>
diff --git a/src/login/logind-acl.h b/src/login/logind-acl.h
index f5d326f71a..79700670cc 100644
--- a/src/login/logind-acl.h
+++ b/src/login/logind-acl.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2011 Lennart Poettering
-***/
-
 #include <stdbool.h>
 #include <sys/types.h>
 
diff --git a/src/login/logind-action.c b/src/login/logind-action.c
index 4e22b365ea..08e41af81a 100644
--- a/src/login/logind-action.c
+++ b/src/login/logind-action.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2012 Lennart Poettering
-***/
 
 #include <unistd.h>
 
diff --git a/src/login/logind-action.h b/src/login/logind-action.h
index 5aa1dd2c7a..a45aab7854 100644
--- a/src/login/logind-action.h
+++ b/src/login/logind-action.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2012 Lennart Poettering
-***/
-
 #include "conf-parser.h"
 
 typedef enum HandleAction {
diff --git a/src/login/logind-button.c b/src/login/logind-button.c
index c1492d67c1..0defa6b9ba 100644
--- a/src/login/logind-button.c
+++ b/src/login/logind-button.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2012 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/src/login/logind-button.h b/src/login/logind-button.h
index 2fe81dc2c1..740cf0b786 100644
--- a/src/login/logind-button.h
+++ b/src/login/logind-button.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2012 Lennart Poettering
-***/
-
 typedef struct Button Button;
 
 #include "logind.h"
diff --git a/src/login/logind-core.c b/src/login/logind-core.c
index 84d17b19dd..dbae4bf5af 100644
--- a/src/login/logind-core.c
+++ b/src/login/logind-core.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2011 Lennart Poettering
-***/
 
 #include <fcntl.h>
 #include <pwd.h>
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index 4f9f7ebcbb..13298cc855 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2011 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <pwd.h>
diff --git a/src/login/logind-device.c b/src/login/logind-device.c
index 65a086eac4..9b5b3e8798 100644
--- a/src/login/logind-device.c
+++ b/src/login/logind-device.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2011 Lennart Poettering
-***/
 
 #include <string.h>
 
diff --git a/src/login/logind-device.h b/src/login/logind-device.h
index 09bf341ad3..cc6e523675 100644
--- a/src/login/logind-device.h
+++ b/src/login/logind-device.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2011 Lennart Poettering
-***/
-
 typedef struct Device Device;
 
 #include "list.h"
diff --git a/src/login/logind-inhibit.c b/src/login/logind-inhibit.c
index 5912f6feea..b1f45baaca 100644
--- a/src/login/logind-inhibit.c
+++ b/src/login/logind-inhibit.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2012 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/src/login/logind-inhibit.h b/src/login/logind-inhibit.h
index bf39955e10..d358a48559 100644
--- a/src/login/logind-inhibit.h
+++ b/src/login/logind-inhibit.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2012 Lennart Poettering
-***/
-
 typedef struct Inhibitor Inhibitor;
 
 typedef enum InhibitWhat {
diff --git a/src/login/logind-seat-dbus.c b/src/login/logind-seat-dbus.c
index 93f64d3f87..c4d9b067c6 100644
--- a/src/login/logind-seat-dbus.c
+++ b/src/login/logind-seat-dbus.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2011 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <string.h>
diff --git a/src/login/logind-seat.c b/src/login/logind-seat.c
index 6661a93b21..63253db5bf 100644
--- a/src/login/logind-seat.c
+++ b/src/login/logind-seat.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2011 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/src/login/logind-seat.h b/src/login/logind-seat.h
index 23242d2c28..70878bbe52 100644
--- a/src/login/logind-seat.h
+++ b/src/login/logind-seat.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2011 Lennart Poettering
-***/
-
 typedef struct Seat Seat;
 
 #include "list.h"
diff --git a/src/login/logind-session-dbus.c b/src/login/logind-session-dbus.c
index cc114942ed..25c4981dc0 100644
--- a/src/login/logind-session-dbus.c
+++ b/src/login/logind-session-dbus.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2011 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <string.h>
diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index 1104323e94..69d5a10319 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2011 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/src/login/logind-session.h b/src/login/logind-session.h
index d4ff99e94f..29ca399daf 100644
--- a/src/login/logind-session.h
+++ b/src/login/logind-session.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2011 Lennart Poettering
-***/
-
 typedef struct Session Session;
 typedef enum KillWho KillWho;
 
diff --git a/src/login/logind-user-dbus.c b/src/login/logind-user-dbus.c
index f4bc12a185..c662a26b9f 100644
--- a/src/login/logind-user-dbus.c
+++ b/src/login/logind-user-dbus.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2011 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <string.h>
diff --git a/src/login/logind-user.c b/src/login/logind-user.c
index 034467833c..8c4cd54a29 100644
--- a/src/login/logind-user.c
+++ b/src/login/logind-user.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2011 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <string.h>
diff --git a/src/login/logind-user.h b/src/login/logind-user.h
index f264d47149..eba2325284 100644
--- a/src/login/logind-user.h
+++ b/src/login/logind-user.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2011 Lennart Poettering
-***/
-
 typedef struct User User;
 
 #include "conf-parser.h"
diff --git a/src/login/logind.c b/src/login/logind.c
index ef35782f00..52fcee933c 100644
--- a/src/login/logind.c
+++ b/src/login/logind.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2011 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/src/login/logind.h b/src/login/logind.h
index 4ebb5943b0..a6ebc9e152 100644
--- a/src/login/logind.h
+++ b/src/login/logind.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2011 Lennart Poettering
-***/
-
 #include <stdbool.h>
 
 #include "libudev.h"
diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c
index 89c4acd432..1fbf6ba585 100644
--- a/src/login/pam_systemd.c
+++ b/src/login/pam_systemd.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <endian.h>
 #include <errno.h>
diff --git a/src/login/sysfs-show.c b/src/login/sysfs-show.c
index 03e174a519..d5c347be0c 100644
--- a/src/login/sysfs-show.c
+++ b/src/login/sysfs-show.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <string.h>
diff --git a/src/login/sysfs-show.h b/src/login/sysfs-show.h
index 38ae91a0cb..c05b977532 100644
--- a/src/login/sysfs-show.h
+++ b/src/login/sysfs-show.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2011 Lennart Poettering
-***/
-
 #include <sys/types.h>
 
 #include "output-mode.h"
diff --git a/src/login/test-inhibit.c b/src/login/test-inhibit.c
index 8de6d895f7..75c9303ff3 100644
--- a/src/login/test-inhibit.c
+++ b/src/login/test-inhibit.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2012 Lennart Poettering
-***/
 
 #include <unistd.h>
 
diff --git a/src/machine-id-setup/machine-id-setup-main.c b/src/machine-id-setup/machine-id-setup-main.c
index 4471d5fe52..966fd8e404 100644
--- a/src/machine-id-setup/machine-id-setup-main.c
+++ b/src/machine-id-setup/machine-id-setup-main.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <getopt.h>
diff --git a/src/machine/image-dbus.c b/src/machine/image-dbus.c
index e00a09ebf2..89df274544 100644
--- a/src/machine/image-dbus.c
+++ b/src/machine/image-dbus.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2014 Lennart Poettering
-***/
 
 #include <sys/file.h>
 #include <sys/mount.h>
diff --git a/src/machine/image-dbus.h b/src/machine/image-dbus.h
index f6590ca390..a918b77d38 100644
--- a/src/machine/image-dbus.h
+++ b/src/machine/image-dbus.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2014 Lennart Poettering
-***/
-
 #include "machined.h"
 
 extern const sd_bus_vtable image_vtable[];
diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c
index 3a896ac510..7f41465ccd 100644
--- a/src/machine/machine-dbus.c
+++ b/src/machine/machine-dbus.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2011 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <string.h>
diff --git a/src/machine/machine-dbus.h b/src/machine/machine-dbus.h
index b5e4ac88dd..f880803dc2 100644
--- a/src/machine/machine-dbus.h
+++ b/src/machine/machine-dbus.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2013 Lennart Poettering
-***/
-
 #include "sd-bus.h"
 
 #include "machine.h"
diff --git a/src/machine/machine.c b/src/machine/machine.c
index 8cc70928d4..b645f614c4 100644
--- a/src/machine/machine.c
+++ b/src/machine/machine.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2011 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <string.h>
diff --git a/src/machine/machine.h b/src/machine/machine.h
index 795a662428..946838f86f 100644
--- a/src/machine/machine.h
+++ b/src/machine/machine.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2013 Lennart Poettering
-***/
-
 typedef struct Machine Machine;
 typedef enum KillWho KillWho;
 
diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
index 2146390cc0..375ea41843 100644
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2013 Lennart Poettering
-***/
 
 #include <arpa/inet.h>
 #include <errno.h>
diff --git a/src/machine/machined-dbus.c b/src/machine/machined-dbus.c
index 7602168a8b..32c0b04283 100644
--- a/src/machine/machined-dbus.c
+++ b/src/machine/machined-dbus.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2011 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <string.h>
diff --git a/src/machine/machined.c b/src/machine/machined.c
index 0982e7b058..a6f0d847d5 100644
--- a/src/machine/machined.c
+++ b/src/machine/machined.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2013 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <string.h>
diff --git a/src/machine/machined.h b/src/machine/machined.h
index 20aa0447f4..3197c1aade 100644
--- a/src/machine/machined.h
+++ b/src/machine/machined.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2013 Lennart Poettering
-***/
-
 #include <stdbool.h>
 
 #include "sd-bus.h"
diff --git a/src/machine/operation.c b/src/machine/operation.c
index 757052d4eb..42c51f3654 100644
--- a/src/machine/operation.c
+++ b/src/machine/operation.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2016 Lennart Poettering
-***/
 
 #include <sys/wait.h>
 
diff --git a/src/machine/operation.h b/src/machine/operation.h
index 2144d9fba2..0e3302856f 100644
--- a/src/machine/operation.h
+++ b/src/machine/operation.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2016 Lennart Poettering
-***/
-
 #include <sys/types.h>
 
 #include "sd-bus.h"
diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c
index 93d7414e90..c49a6b7a76 100644
--- a/src/modules-load/modules-load.c
+++ b/src/modules-load/modules-load.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <getopt.h>
diff --git a/src/mount/mount-tool.c b/src/mount/mount-tool.c
index 8b964c4fd7..e3fc94df16 100644
--- a/src/mount/mount-tool.c
+++ b/src/mount/mount-tool.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2016 Lennart Poettering
-***/
 
 #include <getopt.h>
 
diff --git a/src/network/networkctl.c b/src/network/networkctl.c
index d3f4667351..3ab06f28e9 100644
--- a/src/network/networkctl.c
+++ b/src/network/networkctl.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2014 Lennart Poettering
-***/
 
 #include <getopt.h>
 #include <linux/if_addrlabel.h>
diff --git a/src/network/networkd-address-pool.c b/src/network/networkd-address-pool.c
index 8319ec3ac1..2e35f77093 100644
--- a/src/network/networkd-address-pool.c
+++ b/src/network/networkd-address-pool.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2014 Lennart Poettering
-***/
 
 #include "alloc-util.h"
 #include "networkd-address-pool.h"
diff --git a/src/network/networkd-address-pool.h b/src/network/networkd-address-pool.h
index fe4486cd40..bd479a517d 100644
--- a/src/network/networkd-address-pool.h
+++ b/src/network/networkd-address-pool.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2014 Lennart Poettering
-***/
-
 typedef struct AddressPool AddressPool;
 
 #include "in-addr-util.h"
diff --git a/src/network/networkd-lldp-tx.c b/src/network/networkd-lldp-tx.c
index 9356e528af..51fadc8125 100644
--- a/src/network/networkd-lldp-tx.c
+++ b/src/network/networkd-lldp-tx.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2016 Lennart Poettering
-***/
 
 #include <endian.h>
 #include <inttypes.h>
diff --git a/src/network/networkd-lldp-tx.h b/src/network/networkd-lldp-tx.h
index b06ee1a997..860065cc6d 100644
--- a/src/network/networkd-lldp-tx.h
+++ b/src/network/networkd-lldp-tx.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2016 Lennart Poettering
-***/
-
 #include "networkd-link.h"
 
 typedef enum LLDPEmit {
diff --git a/src/network/wait-online/link.c b/src/network/wait-online/link.c
index 0daacce09e..c7feeba522 100644
--- a/src/network/wait-online/link.c
+++ b/src/network/wait-online/link.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  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 04194cf65a..41c0fe75af 100644
--- a/src/network/wait-online/link.h
+++ b/src/network/wait-online/link.h
@@ -2,7 +2,6 @@
 #pragma once
 
 /***
-  Copyright 2014 Lennart Poettering
   Copyright 2014 Tom Gundersen
 ***/
 
diff --git a/src/notify/notify.c b/src/notify/notify.c
index b55f91cbd3..e928094d9a 100644
--- a/src/notify/notify.c
+++ b/src/notify/notify.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <getopt.h>
diff --git a/src/nspawn/nspawn-cgroup.c b/src/nspawn/nspawn-cgroup.c
index 7c9caa2823..d8a39a6959 100644
--- a/src/nspawn/nspawn-cgroup.c
+++ b/src/nspawn/nspawn-cgroup.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2015 Lennart Poettering
-***/
 
 #include <sys/mount.h>
 
diff --git a/src/nspawn/nspawn-cgroup.h b/src/nspawn/nspawn-cgroup.h
index 153b820aeb..6783c3a39f 100644
--- a/src/nspawn/nspawn-cgroup.h
+++ b/src/nspawn/nspawn-cgroup.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2015 Lennart Poettering
-***/
-
 #include <stdbool.h>
 #include <sys/types.h>
 
diff --git a/src/nspawn/nspawn-def.h b/src/nspawn/nspawn-def.h
index 68b6206e0a..9b54cda2f7 100644
--- a/src/nspawn/nspawn-def.h
+++ b/src/nspawn/nspawn-def.h
@@ -1,9 +1,5 @@
 #pragma once
 
-/***
-  Copyright 2017 Lennart Poettering
-***/
-
 #include <sys/types.h>
 
 /* While we are chmod()ing a directory tree, we set the top-level UID base to this "busy" base, so that we can always
diff --git a/src/nspawn/nspawn-expose-ports.c b/src/nspawn/nspawn-expose-ports.c
index 96cbf19dad..07da7922f1 100644
--- a/src/nspawn/nspawn-expose-ports.c
+++ b/src/nspawn/nspawn-expose-ports.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2015 Lennart Poettering
-***/
 
 #include "sd-netlink.h"
 
diff --git a/src/nspawn/nspawn-expose-ports.h b/src/nspawn/nspawn-expose-ports.h
index 5ba2713f46..7ed7bee03f 100644
--- a/src/nspawn/nspawn-expose-ports.h
+++ b/src/nspawn/nspawn-expose-ports.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2015 Lennart Poettering
-***/
-
 #include <inttypes.h>
 
 #include "sd-event.h"
diff --git a/src/nspawn/nspawn-mount.c b/src/nspawn/nspawn-mount.c
index 3c27c5be8f..b5df65e2a4 100644
--- a/src/nspawn/nspawn-mount.c
+++ b/src/nspawn/nspawn-mount.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2015 Lennart Poettering
-***/
 
 #include <sys/mount.h>
 #include <linux/magic.h>
diff --git a/src/nspawn/nspawn-mount.h b/src/nspawn/nspawn-mount.h
index 7a77e79599..b823282cbd 100644
--- a/src/nspawn/nspawn-mount.h
+++ b/src/nspawn/nspawn-mount.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2015 Lennart Poettering
-***/
-
 #include <stdbool.h>
 
 #include "cgroup-util.h"
diff --git a/src/nspawn/nspawn-network.c b/src/nspawn/nspawn-network.c
index 257e8203d1..01c57bef56 100644
--- a/src/nspawn/nspawn-network.c
+++ b/src/nspawn/nspawn-network.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2015 Lennart Poettering
-***/
 
 #include <linux/veth.h>
 #include <net/if.h>
diff --git a/src/nspawn/nspawn-network.h b/src/nspawn/nspawn-network.h
index 02e2d388fb..32ea21ccc8 100644
--- a/src/nspawn/nspawn-network.h
+++ b/src/nspawn/nspawn-network.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2015 Lennart Poettering
-***/
-
 #include <net/if.h>
 #include <stdbool.h>
 #include <sys/types.h>
diff --git a/src/nspawn/nspawn-patch-uid.c b/src/nspawn/nspawn-patch-uid.c
index edb87ecb1d..4a46a25eac 100644
--- a/src/nspawn/nspawn-patch-uid.c
+++ b/src/nspawn/nspawn-patch-uid.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2016 Lennart Poettering
-***/
 
 #include <fcntl.h>
 #include <linux/magic.h>
diff --git a/src/nspawn/nspawn-patch-uid.h b/src/nspawn/nspawn-patch-uid.h
index dd215b6512..31d2491234 100644
--- a/src/nspawn/nspawn-patch-uid.h
+++ b/src/nspawn/nspawn-patch-uid.h
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2016 Lennart Poettering
-***/
 
 #pragma once
 
diff --git a/src/nspawn/nspawn-register.c b/src/nspawn/nspawn-register.c
index d1354238c2..93185ecaaa 100644
--- a/src/nspawn/nspawn-register.c
+++ b/src/nspawn/nspawn-register.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2015 Lennart Poettering
-***/
 
 #include "sd-bus.h"
 
diff --git a/src/nspawn/nspawn-register.h b/src/nspawn/nspawn-register.h
index b8f10ebe35..30807b9687 100644
--- a/src/nspawn/nspawn-register.h
+++ b/src/nspawn/nspawn-register.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2015 Lennart Poettering
-***/
-
 #include <sys/types.h>
 
 #include "sd-id128.h"
diff --git a/src/nspawn/nspawn-seccomp.c b/src/nspawn/nspawn-seccomp.c
index 008d013af6..eb1964bb6d 100644
--- a/src/nspawn/nspawn-seccomp.c
+++ b/src/nspawn/nspawn-seccomp.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2016 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <linux/netlink.h>
diff --git a/src/nspawn/nspawn-seccomp.h b/src/nspawn/nspawn-seccomp.h
index 907f5356eb..d852eef638 100644
--- a/src/nspawn/nspawn-seccomp.h
+++ b/src/nspawn/nspawn-seccomp.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2016 Lennart Poettering
-***/
-
 #include <sys/types.h>
 
 int setup_seccomp(uint64_t cap_list_retain, char **syscall_whitelist, char **syscall_blacklist);
diff --git a/src/nspawn/nspawn-settings.c b/src/nspawn/nspawn-settings.c
index 5dd2405729..62a3486952 100644
--- a/src/nspawn/nspawn-settings.c
+++ b/src/nspawn/nspawn-settings.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2015 Lennart Poettering
-***/
 
 #include "alloc-util.h"
 #include "cap-list.h"
diff --git a/src/nspawn/nspawn-settings.h b/src/nspawn/nspawn-settings.h
index 431d12a8d2..d522f3cb36 100644
--- a/src/nspawn/nspawn-settings.h
+++ b/src/nspawn/nspawn-settings.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2015 Lennart Poettering
-***/
-
 #include <sched.h>
 #include <stdio.h>
 
diff --git a/src/nspawn/nspawn-setuid.c b/src/nspawn/nspawn-setuid.c
index 8f92608bdc..44f5b17675 100644
--- a/src/nspawn/nspawn-setuid.c
+++ b/src/nspawn/nspawn-setuid.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2015 Lennart Poettering
-***/
 
 #include <grp.h>
 #include <sys/types.h>
diff --git a/src/nspawn/nspawn-setuid.h b/src/nspawn/nspawn-setuid.h
index 14f11e39c3..0ae47cb6b3 100644
--- a/src/nspawn/nspawn-setuid.h
+++ b/src/nspawn/nspawn-setuid.h
@@ -1,8 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2015 Lennart Poettering
-***/
-
 int change_uid_gid(const char *user, char **ret);
diff --git a/src/nspawn/nspawn-stub-pid1.c b/src/nspawn/nspawn-stub-pid1.c
index 691f35027a..c83d55cb86 100644
--- a/src/nspawn/nspawn-stub-pid1.c
+++ b/src/nspawn/nspawn-stub-pid1.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2016 Lennart Poettering
-***/
 
 #include <sys/reboot.h>
 #include <sys/wait.h>
diff --git a/src/nspawn/nspawn-stub-pid1.h b/src/nspawn/nspawn-stub-pid1.h
index d9e4fa612d..8982d5034e 100644
--- a/src/nspawn/nspawn-stub-pid1.h
+++ b/src/nspawn/nspawn-stub-pid1.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2016 Lennart Poettering
-***/
-
 #include "sd-id128.h"
 
 int stub_pid1(sd_id128_t uuid);
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 613de2cd23..56877bd932 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #if HAVE_BLKID
 #include <blkid.h>
diff --git a/src/nspawn/test-patch-uid.c b/src/nspawn/test-patch-uid.c
index 275b1d6f8f..8e29d3e806 100644
--- a/src/nspawn/test-patch-uid.c
+++ b/src/nspawn/test-patch-uid.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2016 Lennart Poettering
-***/
 
 #include <stdlib.h>
 
diff --git a/src/nss-myhostname/nss-myhostname.c b/src/nss-myhostname/nss-myhostname.c
index 5d8fa645fd..f82ce59f2c 100644
--- a/src/nss-myhostname/nss-myhostname.c
+++ b/src/nss-myhostname/nss-myhostname.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2008-2011 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <net/if.h>
diff --git a/src/nss-mymachines/nss-mymachines.c b/src/nss-mymachines/nss-mymachines.c
index 36141ccf14..3bd8165a9f 100644
--- a/src/nss-mymachines/nss-mymachines.c
+++ b/src/nss-mymachines/nss-mymachines.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2014 Lennart Poettering
-***/
 
 #include <netdb.h>
 #include <nss.h>
diff --git a/src/nss-resolve/nss-resolve.c b/src/nss-resolve/nss-resolve.c
index 23d917ff2f..eb3d2d977f 100644
--- a/src/nss-resolve/nss-resolve.c
+++ b/src/nss-resolve/nss-resolve.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2014 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <netdb.h>
diff --git a/src/nss-systemd/nss-systemd.c b/src/nss-systemd/nss-systemd.c
index ea8fa89034..f516b84c63 100644
--- a/src/nss-systemd/nss-systemd.c
+++ b/src/nss-systemd/nss-systemd.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2016 Lennart Poettering
-***/
 
 #include <nss.h>
 #include <pthread.h>
diff --git a/src/path/path.c b/src/path/path.c
index 2a394f85b4..7bd30f22d4 100644
--- a/src/path/path.c
+++ b/src/path/path.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2014 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <getopt.h>
diff --git a/src/quotacheck/quotacheck.c b/src/quotacheck/quotacheck.c
index c6717ab610..d891f18b65 100644
--- a/src/quotacheck/quotacheck.c
+++ b/src/quotacheck/quotacheck.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <stdbool.h>
diff --git a/src/random-seed/random-seed.c b/src/random-seed/random-seed.c
index 64fd542377..223b56306c 100644
--- a/src/random-seed/random-seed.c
+++ b/src/random-seed/random-seed.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/src/rc-local-generator/rc-local-generator.c b/src/rc-local-generator/rc-local-generator.c
index 9e4e67cb26..998948f9b0 100644
--- a/src/rc-local-generator/rc-local-generator.c
+++ b/src/rc-local-generator/rc-local-generator.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  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 9f36e891f4..9220a00215 100644
--- a/src/remount-fs/remount-fs.c
+++ b/src/remount-fs/remount-fs.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <mntent.h>
diff --git a/src/reply-password/reply-password.c b/src/reply-password/reply-password.c
index 1d8b5de5f8..efb68a354f 100644
--- a/src/reply-password/reply-password.c
+++ b/src/reply-password/reply-password.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <stddef.h>
diff --git a/src/resolve/resolved-bus.c b/src/resolve/resolved-bus.c
index 976c077a8a..da0a909dd6 100644
--- a/src/resolve/resolved-bus.c
+++ b/src/resolve/resolved-bus.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2014 Lennart Poettering
-***/
 
 #include "alloc-util.h"
 #include "bus-common-errors.h"
diff --git a/src/resolve/resolved-bus.h b/src/resolve/resolved-bus.h
index eb6d4e73f5..a52bb0fa69 100644
--- a/src/resolve/resolved-bus.h
+++ b/src/resolve/resolved-bus.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2014 Lennart Poettering
-***/
-
 #include "resolved-manager.h"
 
 int manager_connect_bus(Manager *m);
diff --git a/src/resolve/resolved-def.h b/src/resolve/resolved-def.h
index b342d9a438..ea2851b7b1 100644
--- a/src/resolve/resolved-def.h
+++ b/src/resolve/resolved-def.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2014 Lennart Poettering
-***/
-
 #include <inttypes.h>
 
 #include "time-util.h"
diff --git a/src/resolve/resolved-dns-answer.c b/src/resolve/resolved-dns-answer.c
index 0643ca170c..26caa63f94 100644
--- a/src/resolve/resolved-dns-answer.c
+++ b/src/resolve/resolved-dns-answer.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2014 Lennart Poettering
-***/
 
 #include "alloc-util.h"
 #include "dns-domain.h"
diff --git a/src/resolve/resolved-dns-answer.h b/src/resolve/resolved-dns-answer.h
index 0f516860b1..aff594a00e 100644
--- a/src/resolve/resolved-dns-answer.h
+++ b/src/resolve/resolved-dns-answer.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2014 Lennart Poettering
-***/
-
 typedef struct DnsAnswer DnsAnswer;
 typedef struct DnsAnswerItem DnsAnswerItem;
 
diff --git a/src/resolve/resolved-dns-cache.c b/src/resolve/resolved-dns-cache.c
index 7893ac054d..a44872b93d 100644
--- a/src/resolve/resolved-dns-cache.c
+++ b/src/resolve/resolved-dns-cache.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2014 Lennart Poettering
-***/
 
 #include <net/if.h>
 
diff --git a/src/resolve/resolved-dns-cache.h b/src/resolve/resolved-dns-cache.h
index 3231998c13..48a3bde98b 100644
--- a/src/resolve/resolved-dns-cache.h
+++ b/src/resolve/resolved-dns-cache.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2014 Lennart Poettering
-***/
-
 #include "hashmap.h"
 #include "list.h"
 #include "prioq.h"
diff --git a/src/resolve/resolved-dns-dnssec.c b/src/resolve/resolved-dns-dnssec.c
index 3376215a58..0a6f482cc1 100644
--- a/src/resolve/resolved-dns-dnssec.c
+++ b/src/resolve/resolved-dns-dnssec.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2015 Lennart Poettering
-***/
 
 #include <stdio_ext.h>
 
diff --git a/src/resolve/resolved-dns-dnssec.h b/src/resolve/resolved-dns-dnssec.h
index f1895f511d..dfee7232c0 100644
--- a/src/resolve/resolved-dns-dnssec.h
+++ b/src/resolve/resolved-dns-dnssec.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2015 Lennart Poettering
-***/
-
 typedef enum DnssecResult DnssecResult;
 typedef enum DnssecVerdict DnssecVerdict;
 
diff --git a/src/resolve/resolved-dns-packet.c b/src/resolve/resolved-dns-packet.c
index 603648b05d..5266014581 100644
--- a/src/resolve/resolved-dns-packet.c
+++ b/src/resolve/resolved-dns-packet.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2014 Lennart Poettering
  ***/
 
 #if HAVE_GCRYPT
diff --git a/src/resolve/resolved-dns-packet.h b/src/resolve/resolved-dns-packet.h
index 9ca1aab656..8e9d74a71a 100644
--- a/src/resolve/resolved-dns-packet.h
+++ b/src/resolve/resolved-dns-packet.h
@@ -2,7 +2,6 @@
 #pragma once
 
 /***
-  Copyright 2014 Lennart Poettering
  ***/
 
 #include <netinet/ip.h>
diff --git a/src/resolve/resolved-dns-query.c b/src/resolve/resolved-dns-query.c
index c9c6c0aabc..c921fe841f 100644
--- a/src/resolve/resolved-dns-query.c
+++ b/src/resolve/resolved-dns-query.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2014 Lennart Poettering
-***/
 
 #include "alloc-util.h"
 #include "dns-domain.h"
diff --git a/src/resolve/resolved-dns-query.h b/src/resolve/resolved-dns-query.h
index 0c836d799c..5ee946bc75 100644
--- a/src/resolve/resolved-dns-query.h
+++ b/src/resolve/resolved-dns-query.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2014 Lennart Poettering
-***/
-
 #include "sd-bus.h"
 
 #include "set.h"
diff --git a/src/resolve/resolved-dns-question.c b/src/resolve/resolved-dns-question.c
index afd8cefbe2..68fb3b9eac 100644
--- a/src/resolve/resolved-dns-question.c
+++ b/src/resolve/resolved-dns-question.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2014 Lennart Poettering
-***/
 
 #include "alloc-util.h"
 #include "dns-domain.h"
diff --git a/src/resolve/resolved-dns-question.h b/src/resolve/resolved-dns-question.h
index 0feb7b601e..f513bf0328 100644
--- a/src/resolve/resolved-dns-question.h
+++ b/src/resolve/resolved-dns-question.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2014 Lennart Poettering
-***/
-
 typedef struct DnsQuestion DnsQuestion;
 
 #include "macro.h"
diff --git a/src/resolve/resolved-dns-rr.c b/src/resolve/resolved-dns-rr.c
index 799bde62ca..b993223145 100644
--- a/src/resolve/resolved-dns-rr.c
+++ b/src/resolve/resolved-dns-rr.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2014 Lennart Poettering
-***/
 
 #include <math.h>
 
diff --git a/src/resolve/resolved-dns-rr.h b/src/resolve/resolved-dns-rr.h
index 635ef55290..2f08b6119e 100644
--- a/src/resolve/resolved-dns-rr.h
+++ b/src/resolve/resolved-dns-rr.h
@@ -2,7 +2,6 @@
 #pragma once
 
 /***
-  Copyright 2014 Lennart Poettering
  ***/
 
 #include <netinet/in.h>
diff --git a/src/resolve/resolved-dns-scope.c b/src/resolve/resolved-dns-scope.c
index 510fff0123..38ea7fea0a 100644
--- a/src/resolve/resolved-dns-scope.c
+++ b/src/resolve/resolved-dns-scope.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2014 Lennart Poettering
-***/
 
 #include <netinet/tcp.h>
 
diff --git a/src/resolve/resolved-dns-scope.h b/src/resolve/resolved-dns-scope.h
index 353bd1f236..04e93f8f73 100644
--- a/src/resolve/resolved-dns-scope.h
+++ b/src/resolve/resolved-dns-scope.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2014 Lennart Poettering
-***/
-
 #include "list.h"
 
 typedef struct DnsScope DnsScope;
diff --git a/src/resolve/resolved-dns-search-domain.c b/src/resolve/resolved-dns-search-domain.c
index 3bc8d08420..c3817acf11 100644
--- a/src/resolve/resolved-dns-search-domain.c
+++ b/src/resolve/resolved-dns-search-domain.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2015 Lennart Poettering
-***/
 
 #include "alloc-util.h"
 #include "dns-domain.h"
diff --git a/src/resolve/resolved-dns-search-domain.h b/src/resolve/resolved-dns-search-domain.h
index fa16c6d445..d0c2914d36 100644
--- a/src/resolve/resolved-dns-search-domain.h
+++ b/src/resolve/resolved-dns-search-domain.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2015 Lennart Poettering
-***/
-
 #include "macro.h"
 
 typedef struct DnsSearchDomain DnsSearchDomain;
diff --git a/src/resolve/resolved-dns-server.c b/src/resolve/resolved-dns-server.c
index d826889fac..1413f3d147 100644
--- a/src/resolve/resolved-dns-server.c
+++ b/src/resolve/resolved-dns-server.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2014 Lennart Poettering
-***/
 
 #include "sd-messages.h"
 
diff --git a/src/resolve/resolved-dns-server.h b/src/resolve/resolved-dns-server.h
index acac1b5cc1..027559e3d4 100644
--- a/src/resolve/resolved-dns-server.h
+++ b/src/resolve/resolved-dns-server.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2014 Lennart Poettering
-***/
-
 #include "in-addr-util.h"
 
 #if HAVE_GNUTLS
diff --git a/src/resolve/resolved-dns-stream.c b/src/resolve/resolved-dns-stream.c
index 53a47011c5..4ab15ebcaa 100644
--- a/src/resolve/resolved-dns-stream.c
+++ b/src/resolve/resolved-dns-stream.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2014 Lennart Poettering
-***/
 
 #include <netinet/tcp.h>
 
diff --git a/src/resolve/resolved-dns-stream.h b/src/resolve/resolved-dns-stream.h
index f1715272b8..d194fb5a9d 100644
--- a/src/resolve/resolved-dns-stream.h
+++ b/src/resolve/resolved-dns-stream.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2014 Lennart Poettering
-***/
-
 #include "socket-util.h"
 
 typedef struct DnsStream DnsStream;
diff --git a/src/resolve/resolved-dns-stub.c b/src/resolve/resolved-dns-stub.c
index 4ae411e87a..5ddf13081e 100644
--- a/src/resolve/resolved-dns-stub.c
+++ b/src/resolve/resolved-dns-stub.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2016 Lennart Poettering
-***/
 
 #include "fd-util.h"
 #include "resolved-dns-stub.h"
diff --git a/src/resolve/resolved-dns-stub.h b/src/resolve/resolved-dns-stub.h
index 8c48eb0ad6..f34e9db1af 100644
--- a/src/resolve/resolved-dns-stub.h
+++ b/src/resolve/resolved-dns-stub.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2016 Lennart Poettering
-***/
-
 #include "resolved-manager.h"
 
 void manager_dns_stub_stop(Manager *m);
diff --git a/src/resolve/resolved-dns-synthesize.c b/src/resolve/resolved-dns-synthesize.c
index 95fdbfb702..9a8ce7ae2d 100644
--- a/src/resolve/resolved-dns-synthesize.c
+++ b/src/resolve/resolved-dns-synthesize.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2014 Lennart Poettering
-***/
 
 #include "alloc-util.h"
 #include "hostname-util.h"
diff --git a/src/resolve/resolved-dns-synthesize.h b/src/resolve/resolved-dns-synthesize.h
index d7ef478ca3..0d9d17bac7 100644
--- a/src/resolve/resolved-dns-synthesize.h
+++ b/src/resolve/resolved-dns-synthesize.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2016 Lennart Poettering
-***/
-
 #include "resolved-dns-answer.h"
 #include "resolved-dns-question.h"
 #include "resolved-manager.h"
diff --git a/src/resolve/resolved-dns-transaction.c b/src/resolve/resolved-dns-transaction.c
index e1898411ca..ecebf59dd3 100644
--- a/src/resolve/resolved-dns-transaction.c
+++ b/src/resolve/resolved-dns-transaction.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2014 Lennart Poettering
-***/
 
 #include "sd-messages.h"
 
diff --git a/src/resolve/resolved-dns-transaction.h b/src/resolve/resolved-dns-transaction.h
index f9a7200b3a..bdfcbc1acc 100644
--- a/src/resolve/resolved-dns-transaction.h
+++ b/src/resolve/resolved-dns-transaction.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2014 Lennart Poettering
-***/
-
 typedef struct DnsTransaction DnsTransaction;
 typedef enum DnsTransactionState DnsTransactionState;
 typedef enum DnsTransactionSource DnsTransactionSource;
diff --git a/src/resolve/resolved-dns-trust-anchor.c b/src/resolve/resolved-dns-trust-anchor.c
index 9ccfe47591..533e438fae 100644
--- a/src/resolve/resolved-dns-trust-anchor.c
+++ b/src/resolve/resolved-dns-trust-anchor.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2015 Lennart Poettering
-***/
 
 #include "sd-messages.h"
 
diff --git a/src/resolve/resolved-dns-trust-anchor.h b/src/resolve/resolved-dns-trust-anchor.h
index f3ea70c93a..df49777e26 100644
--- a/src/resolve/resolved-dns-trust-anchor.h
+++ b/src/resolve/resolved-dns-trust-anchor.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2015 Lennart Poettering
-***/
-
 typedef struct DnsTrustAnchor DnsTrustAnchor;
 
 #include "hashmap.h"
diff --git a/src/resolve/resolved-dns-zone.c b/src/resolve/resolved-dns-zone.c
index 647bd70556..c2d9f3d33d 100644
--- a/src/resolve/resolved-dns-zone.c
+++ b/src/resolve/resolved-dns-zone.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2014 Lennart Poettering
-***/
 
 #include "alloc-util.h"
 #include "dns-domain.h"
diff --git a/src/resolve/resolved-dns-zone.h b/src/resolve/resolved-dns-zone.h
index 9f2387436f..2719b2188a 100644
--- a/src/resolve/resolved-dns-zone.h
+++ b/src/resolve/resolved-dns-zone.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2014 Lennart Poettering
-***/
-
 #include "hashmap.h"
 
 typedef struct DnsZone {
diff --git a/src/resolve/resolved-etc-hosts.c b/src/resolve/resolved-etc-hosts.c
index 0543797fb3..507f68b47f 100644
--- a/src/resolve/resolved-etc-hosts.c
+++ b/src/resolve/resolved-etc-hosts.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2016 Lennart Poettering
-***/
 
 #include "fd-util.h"
 #include "fileio.h"
diff --git a/src/resolve/resolved-etc-hosts.h b/src/resolve/resolved-etc-hosts.h
index 5d55d813a5..b8e04c393b 100644
--- a/src/resolve/resolved-etc-hosts.h
+++ b/src/resolve/resolved-etc-hosts.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2016 Lennart Poettering
-***/
-
 #include "resolved-manager.h"
 #include "resolved-dns-question.h"
 #include "resolved-dns-answer.h"
diff --git a/src/resolve/resolved-link-bus.c b/src/resolve/resolved-link-bus.c
index 11d18e8efb..b1581740d8 100644
--- a/src/resolve/resolved-link-bus.c
+++ b/src/resolve/resolved-link-bus.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2016 Lennart Poettering
-***/
 
 #include "alloc-util.h"
 #include "bus-common-errors.h"
diff --git a/src/resolve/resolved-link-bus.h b/src/resolve/resolved-link-bus.h
index 77d0af716e..6b8092fdb4 100644
--- a/src/resolve/resolved-link-bus.h
+++ b/src/resolve/resolved-link-bus.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2016 Lennart Poettering
-***/
-
 #include "sd-bus.h"
 
 #include "resolved-link.h"
diff --git a/src/resolve/resolved-link.c b/src/resolve/resolved-link.c
index 60ef9e3a43..30fd542be1 100644
--- a/src/resolve/resolved-link.c
+++ b/src/resolve/resolved-link.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2014 Lennart Poettering
-***/
 
 #include <net/if.h>
 #include <stdio_ext.h>
diff --git a/src/resolve/resolved-link.h b/src/resolve/resolved-link.h
index 2ab2554111..063d3f35c3 100644
--- a/src/resolve/resolved-link.h
+++ b/src/resolve/resolved-link.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2014 Lennart Poettering
-***/
-
 #include <net/if.h>
 
 #include "in-addr-util.h"
diff --git a/src/resolve/resolved-llmnr.h b/src/resolve/resolved-llmnr.h
index d8953fe31c..a3b12cf38c 100644
--- a/src/resolve/resolved-llmnr.h
+++ b/src/resolve/resolved-llmnr.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2014 Lennart Poettering
-***/
-
 #include "resolved-manager.h"
 
 #define LLMNR_PORT 5355
diff --git a/src/resolve/test-dnssec-complex.c b/src/resolve/test-dnssec-complex.c
index e20f6444be..ccd62a14d1 100644
--- a/src/resolve/test-dnssec-complex.c
+++ b/src/resolve/test-dnssec-complex.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2016 Lennart Poettering
-***/
 
 #include <netinet/ip.h>
 
diff --git a/src/resolve/test-dnssec.c b/src/resolve/test-dnssec.c
index e59c64eabb..568d8e0790 100644
--- a/src/resolve/test-dnssec.c
+++ b/src/resolve/test-dnssec.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2015 Lennart Poettering
-***/
 
 #include <arpa/inet.h>
 #if HAVE_GCRYPT
diff --git a/src/rfkill/rfkill.c b/src/rfkill/rfkill.c
index 49dc416f62..7f3e055b1a 100644
--- a/src/rfkill/rfkill.c
+++ b/src/rfkill/rfkill.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2013 Lennart Poettering
-***/
 
 #include <linux/rfkill.h>
 #include <poll.h>
diff --git a/src/run/run.c b/src/run/run.c
index 02b92904df..2910fcb272 100644
--- a/src/run/run.c
+++ b/src/run/run.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2013 Lennart Poettering
-***/
 
 #include <getopt.h>
 #include <stdio.h>
diff --git a/src/shared/acl-util.c b/src/shared/acl-util.c
index 7f6bfde0de..1eaf653103 100644
--- a/src/shared/acl-util.c
+++ b/src/shared/acl-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2011,2013 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <stdbool.h>
diff --git a/src/shared/acl-util.h b/src/shared/acl-util.h
index 221266c387..10b2a3d9f0 100644
--- a/src/shared/acl-util.h
+++ b/src/shared/acl-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2011 Lennart Poettering
-***/
-
 #if HAVE_ACL
 
 #include <acl/libacl.h>
diff --git a/src/shared/apparmor-util.c b/src/shared/apparmor-util.c
index a52347b374..c4a4b04d22 100644
--- a/src/shared/apparmor-util.c
+++ b/src/shared/apparmor-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2013 Lennart Poettering
-***/
 
 #include <stddef.h>
 
diff --git a/src/shared/apparmor-util.h b/src/shared/apparmor-util.h
index 54544b8734..7fbaf90dcc 100644
--- a/src/shared/apparmor-util.h
+++ b/src/shared/apparmor-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2013 Lennart Poettering
-***/
-
 #include <stdbool.h>
 
 bool mac_apparmor_use(void);
diff --git a/src/shared/ask-password-api.c b/src/shared/ask-password-api.c
index fdabf68962..682dc754fc 100644
--- a/src/shared/ask-password-api.c
+++ b/src/shared/ask-password-api.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/src/shared/ask-password-api.h b/src/shared/ask-password-api.h
index 2196dbdf4b..93ca8bff52 100644
--- a/src/shared/ask-password-api.h
+++ b/src/shared/ask-password-api.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include <stdbool.h>
 
 #include "time-util.h"
diff --git a/src/shared/boot-timestamps.c b/src/shared/boot-timestamps.c
index 62d5c52a78..03e6b3ecf5 100644
--- a/src/shared/boot-timestamps.c
+++ b/src/shared/boot-timestamps.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2012 Lennart Poettering
   Copyright 2013 Kay Sievers
 ***/
 
diff --git a/src/shared/boot-timestamps.h b/src/shared/boot-timestamps.h
index c39c5a2e76..6fc712940d 100644
--- a/src/shared/boot-timestamps.h
+++ b/src/shared/boot-timestamps.h
@@ -2,7 +2,6 @@
 #pragma once
 
 /***
-  Copyright 2012 Lennart Poettering
   Copyright 2013 Kay Sievers
 ***/
 
diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c
index 222a6ed88d..5cff6c03c2 100644
--- a/src/shared/bus-unit-util.c
+++ b/src/shared/bus-unit-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2016 Lennart Poettering
-***/
 
 #include "alloc-util.h"
 #include "bus-internal.h"
diff --git a/src/shared/bus-unit-util.h b/src/shared/bus-unit-util.h
index dbceb3b503..4fc94b0f4e 100644
--- a/src/shared/bus-unit-util.h
+++ b/src/shared/bus-unit-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2016 Lennart Poettering
-***/
-
 #include "install.h"
 #include "output-mode.h"
 #include "sd-bus.h"
diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c
index 6eaff20a4a..a4f2deba31 100644
--- a/src/shared/bus-util.c
+++ b/src/shared/bus-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2013 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/src/shared/bus-util.h b/src/shared/bus-util.h
index e248099b35..b400eb81e2 100644
--- a/src/shared/bus-util.h
+++ b/src/shared/bus-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2013 Lennart Poettering
-***/
-
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
diff --git a/src/shared/cgroup-show.c b/src/shared/cgroup-show.c
index 24ce622dae..4d1a90bd55 100644
--- a/src/shared/cgroup-show.c
+++ b/src/shared/cgroup-show.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <dirent.h>
 #include <errno.h>
diff --git a/src/shared/cgroup-show.h b/src/shared/cgroup-show.h
index 0221846313..4e510fb73c 100644
--- a/src/shared/cgroup-show.h
+++ b/src/shared/cgroup-show.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include <stdbool.h>
 #include <sys/types.h>
 
diff --git a/src/shared/clean-ipc.c b/src/shared/clean-ipc.c
index b0c9a45126..08dc7b9e43 100644
--- a/src/shared/clean-ipc.c
+++ b/src/shared/clean-ipc.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2014 Lennart Poettering
-***/
 
 #include <dirent.h>
 #include <errno.h>
diff --git a/src/shared/clean-ipc.h b/src/shared/clean-ipc.h
index b78f94f663..eaff47d4b7 100644
--- a/src/shared/clean-ipc.h
+++ b/src/shared/clean-ipc.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2014 Lennart Poettering
-***/
-
 #include <sys/types.h>
 
 #include "user-util.h"
diff --git a/src/shared/condition.c b/src/shared/condition.c
index 9f2b91f79c..525cc94936 100644
--- a/src/shared/condition.c
+++ b/src/shared/condition.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/src/shared/condition.h b/src/shared/condition.h
index ce27078101..e69fc366f7 100644
--- a/src/shared/condition.h
+++ b/src/shared/condition.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include <stdbool.h>
 #include <stdio.h>
 
diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
index 8570f877e6..2d62fdf05d 100644
--- a/src/shared/conf-parser.c
+++ b/src/shared/conf-parser.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <limits.h>
diff --git a/src/shared/conf-parser.h b/src/shared/conf-parser.h
index cd972abc3a..16f042d894 100644
--- a/src/shared/conf-parser.h
+++ b/src/shared/conf-parser.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include <errno.h>
 #include <stdbool.h>
 #include <stddef.h>
diff --git a/src/shared/dev-setup.c b/src/shared/dev-setup.c
index 4f9c0f4285..d117fbfda0 100644
--- a/src/shared/dev-setup.c
+++ b/src/shared/dev-setup.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010-2012 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <stdlib.h>
diff --git a/src/shared/dev-setup.h b/src/shared/dev-setup.h
index 268b57f1a7..f105f2f20f 100644
--- a/src/shared/dev-setup.h
+++ b/src/shared/dev-setup.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010-2012 Lennart Poettering
-***/
-
 #include <sys/types.h>
 
 int dev_setup(const char *prefix, uid_t uid, gid_t gid);
diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c
index 249f043f96..fa1cf26ee1 100644
--- a/src/shared/dissect-image.c
+++ b/src/shared/dissect-image.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2016 Lennart Poettering
-***/
 
 #include <sys/mount.h>
 #include <sys/prctl.h>
diff --git a/src/shared/dissect-image.h b/src/shared/dissect-image.h
index 23acc8a5ab..0033921fa0 100644
--- a/src/shared/dissect-image.h
+++ b/src/shared/dissect-image.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2016 Lennart Poettering
-***/
-
 #include <stdbool.h>
 
 #include "sd-id128.h"
diff --git a/src/shared/dns-domain.c b/src/shared/dns-domain.c
index b2f5dd5b3b..de2fcca8b2 100644
--- a/src/shared/dns-domain.c
+++ b/src/shared/dns-domain.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2014 Lennart Poettering
  ***/
 
 #if HAVE_LIBIDN2
diff --git a/src/shared/dns-domain.h b/src/shared/dns-domain.h
index d49e07e436..0fd72cb029 100644
--- a/src/shared/dns-domain.h
+++ b/src/shared/dns-domain.h
@@ -2,7 +2,6 @@
 #pragma once
 
 /***
-  Copyright 2014 Lennart Poettering
  ***/
 
 #include <errno.h>
diff --git a/src/shared/efivars.c b/src/shared/efivars.c
index 09b1aae51f..fcc0db8b0b 100644
--- a/src/shared/efivars.c
+++ b/src/shared/efivars.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2013 Lennart Poettering
-***/
 
 #include <dirent.h>
 #include <errno.h>
diff --git a/src/shared/efivars.h b/src/shared/efivars.h
index 9ee90519ed..dac66da9f8 100644
--- a/src/shared/efivars.h
+++ b/src/shared/efivars.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2013 Lennart Poettering
-***/
-
 #if ! ENABLE_EFI
 #include <errno.h>
 #endif
diff --git a/src/shared/fdset.c b/src/shared/fdset.c
index e6ae032d0a..8c852f1137 100644
--- a/src/shared/fdset.c
+++ b/src/shared/fdset.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <alloca.h>
 #include <errno.h>
diff --git a/src/shared/fdset.h b/src/shared/fdset.h
index 986c878500..d31062b5c6 100644
--- a/src/shared/fdset.h
+++ b/src/shared/fdset.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include <stdbool.h>
 
 #include "hashmap.h"
diff --git a/src/shared/firewall-util.c b/src/shared/firewall-util.c
index a047a6969e..eb4f5ff616 100644
--- a/src/shared/firewall-util.c
+++ b/src/shared/firewall-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2015 Lennart Poettering
-***/
 
 /* Temporary work-around for broken glibc vs. linux kernel header definitions
  * This is already fixed upstream, remove this when distributions have updated.
diff --git a/src/shared/firewall-util.h b/src/shared/firewall-util.h
index d6920d9611..4fc71dade2 100644
--- a/src/shared/firewall-util.h
+++ b/src/shared/firewall-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2015 Lennart Poettering
-***/
-
 #include <stdbool.h>
 #include <stdint.h>
 
diff --git a/src/shared/generator.c b/src/shared/generator.c
index d828986b66..8d4fd3267b 100644
--- a/src/shared/generator.c
+++ b/src/shared/generator.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2014 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <stdio_ext.h>
diff --git a/src/shared/generator.h b/src/shared/generator.h
index b2b348425d..f0a493b21e 100644
--- a/src/shared/generator.h
+++ b/src/shared/generator.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2014 Lennart Poettering
-***/
-
 #include <stdio.h>
 
 int generator_open_unit_file(
diff --git a/src/shared/gpt.h b/src/shared/gpt.h
index 18789443a4..fd953fabc7 100644
--- a/src/shared/gpt.h
+++ b/src/shared/gpt.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2014 Lennart Poettering
-***/
-
 #include <endian.h>
 
 #include "sd-id128.h"
diff --git a/src/shared/ima-util.c b/src/shared/ima-util.c
index 3d9e6457ef..0d4ce3cafc 100644
--- a/src/shared/ima-util.c
+++ b/src/shared/ima-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2013 Lennart Poettering
-***/
 
 #include <unistd.h>
 
diff --git a/src/shared/ima-util.h b/src/shared/ima-util.h
index de0a55ac3a..8f20741c33 100644
--- a/src/shared/ima-util.h
+++ b/src/shared/ima-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2013 Lennart Poettering
-***/
-
 #include <stdbool.h>
 
 bool use_ima(void);
diff --git a/src/shared/import-util.c b/src/shared/import-util.c
index 43ffd1246c..d53b90796f 100644
--- a/src/shared/import-util.c
+++ b/src/shared/import-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2015 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <string.h>
diff --git a/src/shared/import-util.h b/src/shared/import-util.h
index c3bdd2ab32..0f2a5170c8 100644
--- a/src/shared/import-util.h
+++ b/src/shared/import-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2015 Lennart Poettering
-***/
-
 #include <stdbool.h>
 
 #include "macro.h"
diff --git a/src/shared/install.c b/src/shared/install.c
index 92c73913c5..77ae812878 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2011 Lennart Poettering
-***/
 
 #include <dirent.h>
 #include <errno.h>
diff --git a/src/shared/install.h b/src/shared/install.h
index 992b258e97..e452940991 100644
--- a/src/shared/install.h
+++ b/src/shared/install.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2011 Lennart Poettering
-***/
-
 typedef enum UnitFileScope UnitFileScope;
 typedef enum UnitFileState UnitFileState;
 typedef enum UnitFilePresetMode UnitFilePresetMode;
diff --git a/src/shared/journal-util.c b/src/shared/journal-util.c
index 2830923fe3..5ca6c2eb50 100644
--- a/src/shared/journal-util.c
+++ b/src/shared/journal-util.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
   Copyright 2013 Zbigniew Jędrzejewski-Szmek
-  Copyright 2015 Lennart Poettering
 ***/
 
 #include "acl-util.h"
diff --git a/src/shared/journal-util.h b/src/shared/journal-util.h
index 6834d2fb8d..7859a57e7e 100644
--- a/src/shared/journal-util.h
+++ b/src/shared/journal-util.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
   Copyright 2013 Zbigniew Jędrzejewski-Szmek
-  Copyright 2015 Lennart Poettering
 ***/
 
 #include <stdbool.h>
diff --git a/src/shared/linux/libbpf.h b/src/shared/linux/libbpf.h
index 1989e3a869..ad131fcb12 100644
--- a/src/shared/linux/libbpf.h
+++ b/src/shared/linux/libbpf.h
@@ -104,7 +104,6 @@ struct bpf_insn;
 #define BPF_LD_MAP_FD(DST, MAP_FD)				\
         BPF_LD_IMM64_RAW(DST, BPF_PSEUDO_MAP_FD, MAP_FD)
 
-
 /* Direct packet access, R0 = *(uint *) (skb->data + imm32) */
 
 #define BPF_LD_ABS(SIZE, IMM)					\
diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c
index 55ee1135f7..33afbe2f7f 100644
--- a/src/shared/logs-show.c
+++ b/src/shared/logs-show.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2012 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/src/shared/logs-show.h b/src/shared/logs-show.h
index f346a8d63f..002d06af84 100644
--- a/src/shared/logs-show.h
+++ b/src/shared/logs-show.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2012 Lennart Poettering
-***/
-
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdio.h>
diff --git a/src/shared/loop-util.c b/src/shared/loop-util.c
index 9039c8f486..872c25c3dc 100644
--- a/src/shared/loop-util.c
+++ b/src/shared/loop-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2016 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/src/shared/loop-util.h b/src/shared/loop-util.h
index 95e822ef52..d78466c5ee 100644
--- a/src/shared/loop-util.h
+++ b/src/shared/loop-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2016 Lennart Poettering
-***/
-
 #include "macro.h"
 
 typedef struct LoopDevice LoopDevice;
diff --git a/src/shared/machine-image.c b/src/shared/machine-image.c
index a259b18301..ff9a2103a0 100644
--- a/src/shared/machine-image.c
+++ b/src/shared/machine-image.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2013 Lennart Poettering
-***/
 
 #include <dirent.h>
 #include <errno.h>
diff --git a/src/shared/machine-image.h b/src/shared/machine-image.h
index b291ff0992..2e38522acd 100644
--- a/src/shared/machine-image.h
+++ b/src/shared/machine-image.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2014 Lennart Poettering
-***/
-
 #include <stdbool.h>
 #include <stdint.h>
 
diff --git a/src/shared/machine-pool.c b/src/shared/machine-pool.c
index dbdbcbfcc7..53c5609f9b 100644
--- a/src/shared/machine-pool.c
+++ b/src/shared/machine-pool.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2015 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/src/shared/machine-pool.h b/src/shared/machine-pool.h
index f76c825f85..fd09296f23 100644
--- a/src/shared/machine-pool.h
+++ b/src/shared/machine-pool.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2015 Lennart Poettering
-***/
-
 #include <stdint.h>
 
 #include "sd-bus.h"
diff --git a/src/shared/nsflags.c b/src/shared/nsflags.c
index 81d21260eb..a5beb9200f 100644
--- a/src/shared/nsflags.c
+++ b/src/shared/nsflags.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2016 Lennart Poettering
-***/
 
 #include <sched.h>
 
diff --git a/src/shared/nsflags.h b/src/shared/nsflags.h
index 749956e20a..7cc26a441d 100644
--- a/src/shared/nsflags.h
+++ b/src/shared/nsflags.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2016 Lennart Poettering
-***/
-
 #include <sched.h>
 
 #include "missing.h"
diff --git a/src/shared/output-mode.c b/src/shared/output-mode.c
index e1d7bbfa25..bb33ba3d10 100644
--- a/src/shared/output-mode.c
+++ b/src/shared/output-mode.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2012 Lennart Poettering
-***/
 
 #include "output-mode.h"
 #include "string-table.h"
diff --git a/src/shared/output-mode.h b/src/shared/output-mode.h
index 84f78fe2f7..fe3903b3c5 100644
--- a/src/shared/output-mode.h
+++ b/src/shared/output-mode.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2013 Lennart Poettering
-***/
-
 #include "macro.h"
 
 typedef enum OutputMode {
diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c
index beb38228e6..13ab5310e3 100644
--- a/src/shared/path-lookup.c
+++ b/src/shared/path-lookup.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <stdio.h>
diff --git a/src/shared/path-lookup.h b/src/shared/path-lookup.h
index 92083af5f5..963e09db67 100644
--- a/src/shared/path-lookup.h
+++ b/src/shared/path-lookup.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include <stdbool.h>
 
 typedef struct LookupPaths LookupPaths;
diff --git a/src/shared/ptyfwd.c b/src/shared/ptyfwd.c
index 8be39172d5..c38ec81bbc 100644
--- a/src/shared/ptyfwd.c
+++ b/src/shared/ptyfwd.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010-2013 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <limits.h>
diff --git a/src/shared/ptyfwd.h b/src/shared/ptyfwd.h
index 08069e08bc..e4a083ac24 100644
--- a/src/shared/ptyfwd.h
+++ b/src/shared/ptyfwd.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010-2013 Lennart Poettering
-***/
-
 #include <stdbool.h>
 
 #include "sd-event.h"
diff --git a/src/shared/resolve-util.c b/src/shared/resolve-util.c
index f988f58735..a5d4a14344 100644
--- a/src/shared/resolve-util.c
+++ b/src/shared/resolve-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2016 Lennart Poettering
-***/
 
 #include "conf-parser.h"
 #include "resolve-util.h"
diff --git a/src/shared/resolve-util.h b/src/shared/resolve-util.h
index 4d962e6167..5883342e65 100644
--- a/src/shared/resolve-util.h
+++ b/src/shared/resolve-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2016 Lennart Poettering
-***/
-
 #include "conf-parser.h"
 #include "macro.h"
 
diff --git a/src/shared/seccomp-util.c b/src/shared/seccomp-util.c
index 8c28651d0b..517a1b4509 100644
--- a/src/shared/seccomp-util.c
+++ b/src/shared/seccomp-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2014 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <linux/seccomp.h>
diff --git a/src/shared/seccomp-util.h b/src/shared/seccomp-util.h
index 0aba9fcc87..7dfff9df78 100644
--- a/src/shared/seccomp-util.h
+++ b/src/shared/seccomp-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2014 Lennart Poettering
-***/
-
 #include <seccomp.h>
 #include <stdbool.h>
 #include <stdint.h>
diff --git a/src/shared/spawn-ask-password-agent.c b/src/shared/spawn-ask-password-agent.c
index 9db8b6d1e7..309071c89d 100644
--- a/src/shared/spawn-ask-password-agent.c
+++ b/src/shared/spawn-ask-password-agent.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2011 Lennart Poettering
-***/
 
 #include <signal.h>
 #include <stdlib.h>
diff --git a/src/shared/spawn-ask-password-agent.h b/src/shared/spawn-ask-password-agent.h
index 8c249f5b9c..97e73bda44 100644
--- a/src/shared/spawn-ask-password-agent.h
+++ b/src/shared/spawn-ask-password-agent.h
@@ -1,9 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2011 Lennart Poettering
-***/
-
 int ask_password_agent_open(void);
 void ask_password_agent_close(void);
diff --git a/src/shared/spawn-polkit-agent.c b/src/shared/spawn-polkit-agent.c
index 03a1faf686..180cb7964c 100644
--- a/src/shared/spawn-polkit-agent.c
+++ b/src/shared/spawn-polkit-agent.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2011 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <poll.h>
diff --git a/src/shared/spawn-polkit-agent.h b/src/shared/spawn-polkit-agent.h
index cf4a473606..190b970b6f 100644
--- a/src/shared/spawn-polkit-agent.h
+++ b/src/shared/spawn-polkit-agent.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2012 Lennart Poettering
-***/
-
 #include "bus-util.h"
 
 int polkit_agent_open(void);
diff --git a/src/shared/specifier.c b/src/shared/specifier.c
index 9e77a1f362..d698b42e07 100644
--- a/src/shared/specifier.c
+++ b/src/shared/specifier.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <stdbool.h>
diff --git a/src/shared/specifier.h b/src/shared/specifier.h
index cdd415ba64..e1895129d7 100644
--- a/src/shared/specifier.h
+++ b/src/shared/specifier.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include "string-util.h"
 
 typedef int (*SpecifierCallback)(char specifier, void *data, void *userdata, char **ret);
diff --git a/src/shared/switch-root.c b/src/shared/switch-root.c
index 4be18ac62f..8368bedfc3 100644
--- a/src/shared/switch-root.c
+++ b/src/shared/switch-root.c
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2012 Harald Hoyer, Lennart Poettering
+  Copyright 2012 Harald Hoyer
 ***/
 
 #include <errno.h>
diff --git a/src/shared/switch-root.h b/src/shared/switch-root.h
index 01aaaa13d0..5cf7eb1a7c 100644
--- a/src/shared/switch-root.h
+++ b/src/shared/switch-root.h
@@ -1,9 +1,10 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-#include <stdbool.h>
 /***
-  Copyright 2012 Harald Hoyer, Lennart Poettering
+  Copyright 2012 Harald Hoyer
 ***/
 
+#include <stdbool.h>
+
 int switch_root(const char *new_root, const char *oldroot, bool detach_oldroot, unsigned long mountflags);
diff --git a/src/shared/sysctl-util.c b/src/shared/sysctl-util.c
index 372baa4540..326652273c 100644
--- a/src/shared/sysctl-util.c
+++ b/src/shared/sysctl-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/src/shared/sysctl-util.h b/src/shared/sysctl-util.h
index 33b4fd58dc..fd7c78b2b8 100644
--- a/src/shared/sysctl-util.h
+++ b/src/shared/sysctl-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2011 Lennart Poettering
-***/
-
 char *sysctl_normalize(char *s);
 int sysctl_read(const char *property, char **value);
 int sysctl_write(const char *property, const char *value);
diff --git a/src/shared/tests.c b/src/shared/tests.c
index 05be15ec69..6b3df0aa07 100644
--- a/src/shared/tests.c
+++ b/src/shared/tests.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2016 Lennart Poettering
-***/
 
 #include <alloc-util.h>
 #include <fs-util.h>
diff --git a/src/shared/tests.h b/src/shared/tests.h
index be2375add6..b88135ed93 100644
--- a/src/shared/tests.h
+++ b/src/shared/tests.h
@@ -1,9 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2016 Lennart Poettering
-***/
-
 char* setup_fake_runtime_dir(void);
 const char* get_testdata_dir(const char *suffix);
diff --git a/src/shared/uid-range.c b/src/shared/uid-range.c
index 986f5f7f0b..434ce6ff4d 100644
--- a/src/shared/uid-range.c
+++ b/src/shared/uid-range.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2014 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <stdlib.h>
diff --git a/src/shared/uid-range.h b/src/shared/uid-range.h
index 99b14cd45b..49ba38287e 100644
--- a/src/shared/uid-range.h
+++ b/src/shared/uid-range.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2014 Lennart Poettering
-***/
-
 #include <stdbool.h>
 #include <sys/types.h>
 
diff --git a/src/shared/utmp-wtmp.c b/src/shared/utmp-wtmp.c
index 1d58a5a2e0..ef9427fa7b 100644
--- a/src/shared/utmp-wtmp.c
+++ b/src/shared/utmp-wtmp.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/src/shared/utmp-wtmp.h b/src/shared/utmp-wtmp.h
index 1b7e7eace9..9e433cf73e 100644
--- a/src/shared/utmp-wtmp.h
+++ b/src/shared/utmp-wtmp.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2010 Lennart Poettering
-***/
-
 #include <stdbool.h>
 #include <sys/types.h>
 
diff --git a/src/shared/vlan-util.c b/src/shared/vlan-util.c
index 99dc9299f9..400994a354 100644
--- a/src/shared/vlan-util.c
+++ b/src/shared/vlan-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2016 Lennart Poettering
-***/
 
 #include "conf-parser.h"
 #include "parse-util.h"
diff --git a/src/shared/vlan-util.h b/src/shared/vlan-util.h
index 3d014dae3d..ebe4331ed4 100644
--- a/src/shared/vlan-util.h
+++ b/src/shared/vlan-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2016 Lennart Poettering
-***/
-
 #include <stdbool.h>
 #include <inttypes.h>
 
diff --git a/src/shared/volatile-util.c b/src/shared/volatile-util.c
index e4d717d662..4d75bc0e96 100644
--- a/src/shared/volatile-util.c
+++ b/src/shared/volatile-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2015 Lennart Poettering
-***/
 
 #include <errno.h>
 
diff --git a/src/shared/volatile-util.h b/src/shared/volatile-util.h
index b3cd477231..8761c44ab8 100644
--- a/src/shared/volatile-util.h
+++ b/src/shared/volatile-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2016 Lennart Poettering
-***/
-
 typedef enum VolatileMode {
         VOLATILE_NO,
         VOLATILE_YES,
diff --git a/src/shared/watchdog.c b/src/shared/watchdog.c
index 9f4c82f1eb..c423af6917 100644
--- a/src/shared/watchdog.c
+++ b/src/shared/watchdog.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2012 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/src/shared/watchdog.h b/src/shared/watchdog.h
index 2491170762..a345e4ba7d 100644
--- a/src/shared/watchdog.h
+++ b/src/shared/watchdog.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright 2012 Lennart Poettering
-***/
-
 #include <stdbool.h>
 
 #include "time-util.h"
diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c
index 508a03429c..464ce3a55b 100644
--- a/src/sleep/sleep.c
+++ b/src/sleep/sleep.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2012 Lennart Poettering
   Copyright 2013 Zbigniew Jędrzejewski-Szmek
   Copyright 2010-2017 Canonical
   Copyright 2018 Dell Inc.
diff --git a/src/stdio-bridge/stdio-bridge.c b/src/stdio-bridge/stdio-bridge.c
index 8152083bd7..519a92a094 100644
--- a/src/stdio-bridge/stdio-bridge.c
+++ b/src/stdio-bridge/stdio-bridge.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <getopt.h>
diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c
index 4572cba723..0151f7dabe 100644
--- a/src/sysctl/sysctl.c
+++ b/src/sysctl/sysctl.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <getopt.h>
diff --git a/src/system-update-generator/system-update-generator.c b/src/system-update-generator/system-update-generator.c
index 4e2e0edb5e..6e1bb6c825 100644
--- a/src/system-update-generator/system-update-generator.c
+++ b/src/system-update-generator/system-update-generator.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2012 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <unistd.h>
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 50eee32865..b9aab1f0f6 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2010 Lennart Poettering
   Copyright 2013 Marc-Antoine Perennou
 ***/
 
@@ -4161,7 +4160,6 @@ static void print_status_info(
                 printf("\n");
         }
 
-
         LIST_FOREACH(exec, p, i->exec) {
                 _cleanup_free_ char *argv = NULL;
                 bool good;
diff --git a/src/systemd/_sd-common.h b/src/systemd/_sd-common.h
index 4eceb791e1..7b54d179eb 100644
--- a/src/systemd/_sd-common.h
+++ b/src/systemd/_sd-common.h
@@ -3,7 +3,6 @@
 #define foosdcommonhfoo
 
 /***
-  Copyright 2013 Lennart Poettering
 
   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
diff --git a/src/systemd/sd-bus-protocol.h b/src/systemd/sd-bus-protocol.h
index 9cae64c6e6..acff670f7f 100644
--- a/src/systemd/sd-bus-protocol.h
+++ b/src/systemd/sd-bus-protocol.h
@@ -3,7 +3,6 @@
 #define foosdbusprotocolhfoo
 
 /***
-  Copyright 2013 Lennart Poettering
 
   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
diff --git a/src/systemd/sd-bus-vtable.h b/src/systemd/sd-bus-vtable.h
index ac2cea0a65..1268085498 100644
--- a/src/systemd/sd-bus-vtable.h
+++ b/src/systemd/sd-bus-vtable.h
@@ -3,7 +3,6 @@
 #define foosdbusvtablehfoo
 
 /***
-  Copyright 2013 Lennart Poettering
 
   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
diff --git a/src/systemd/sd-bus.h b/src/systemd/sd-bus.h
index cb4dcd937e..54c4b1ca83 100644
--- a/src/systemd/sd-bus.h
+++ b/src/systemd/sd-bus.h
@@ -3,7 +3,6 @@
 #define foosdbushfoo
 
 /***
-  Copyright 2013 Lennart Poettering
 
   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
diff --git a/src/systemd/sd-daemon.h b/src/systemd/sd-daemon.h
index a2798fc7f3..59ca6c2785 100644
--- a/src/systemd/sd-daemon.h
+++ b/src/systemd/sd-daemon.h
@@ -3,7 +3,6 @@
 #define foosddaemonhfoo
 
 /***
-  Copyright 2013 Lennart Poettering
 
   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
diff --git a/src/systemd/sd-event.h b/src/systemd/sd-event.h
index 2fc122a97f..7fcae4ac49 100644
--- a/src/systemd/sd-event.h
+++ b/src/systemd/sd-event.h
@@ -3,7 +3,6 @@
 #define foosdeventhfoo
 
 /***
-  Copyright 2013 Lennart Poettering
 
   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
diff --git a/src/systemd/sd-id128.h b/src/systemd/sd-id128.h
index 2da9c7ae13..b24fd06f01 100644
--- a/src/systemd/sd-id128.h
+++ b/src/systemd/sd-id128.h
@@ -3,7 +3,6 @@
 #define foosdid128hfoo
 
 /***
-  Copyright 2011 Lennart Poettering
 
   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
diff --git a/src/systemd/sd-journal.h b/src/systemd/sd-journal.h
index d036a40048..d34c201293 100644
--- a/src/systemd/sd-journal.h
+++ b/src/systemd/sd-journal.h
@@ -3,7 +3,6 @@
 #define foosdjournalhfoo
 
 /***
-  Copyright 2011 Lennart Poettering
 
   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
diff --git a/src/systemd/sd-login.h b/src/systemd/sd-login.h
index b4f064d2d6..a4f70ef7cd 100644
--- a/src/systemd/sd-login.h
+++ b/src/systemd/sd-login.h
@@ -3,7 +3,6 @@
 #define foosdloginhfoo
 
 /***
-  Copyright 2011 Lennart Poettering
 
   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
diff --git a/src/systemd/sd-messages.h b/src/systemd/sd-messages.h
index d090c1e549..2adfe16062 100644
--- a/src/systemd/sd-messages.h
+++ b/src/systemd/sd-messages.h
@@ -3,7 +3,6 @@
 #define foosdmessageshfoo
 
 /***
-  Copyright 2012 Lennart Poettering
 
   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
diff --git a/src/systemd/sd-network.h b/src/systemd/sd-network.h
index 230905df52..c9cdb662fe 100644
--- a/src/systemd/sd-network.h
+++ b/src/systemd/sd-network.h
@@ -3,7 +3,6 @@
 #define foosdnetworkhfoo
 
 /***
-  Copyright 2011 Lennart Poettering
   Copyright 2014 Tom Gundersen
 
   systemd is free software; you can redistribute it and/or modify it
diff --git a/src/systemd/sd-path.h b/src/systemd/sd-path.h
index 7c68d0e4fc..65178b63a1 100644
--- a/src/systemd/sd-path.h
+++ b/src/systemd/sd-path.h
@@ -3,7 +3,6 @@
 #define foosdpathhfoo
 
 /***
-  Copyright 2014 Lennart Poettering
 
   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
diff --git a/src/systemd/sd-resolve.h b/src/systemd/sd-resolve.h
index c0e14620c6..4c6499815a 100644
--- a/src/systemd/sd-resolve.h
+++ b/src/systemd/sd-resolve.h
@@ -3,7 +3,6 @@
 #define foosdresolvehfoo
 
 /***
-  Copyright 2005-2014 Lennart Poettering
 
   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
diff --git a/src/systemd/sd-utf8.h b/src/systemd/sd-utf8.h
index ea8e779f04..7f2af65049 100644
--- a/src/systemd/sd-utf8.h
+++ b/src/systemd/sd-utf8.h
@@ -3,7 +3,6 @@
 #define foosdutf8hfoo
 
 /***
-  Copyright 2013 Lennart Poettering
 
   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
diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c
index 5a6659bb5a..e6d327265f 100644
--- a/src/sysusers/sysusers.c
+++ b/src/sysusers/sysusers.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2014 Lennart Poettering
-***/
 
 #include <getopt.h>
 #include <utmp.h>
diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c
index 43ebcc442d..70ea9bd92a 100644
--- a/src/sysv-generator/sysv-generator.c
+++ b/src/sysv-generator/sysv-generator.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
   Copyright 2014 Thomas H.P. Andersen
-  Copyright 2010 Lennart Poettering
   Copyright 2011 Michal Schmidt
 ***/
 
diff --git a/src/test/test-alloc-util.c b/src/test/test-alloc-util.c
index 23f008aeb9..40c32d7114 100644
--- a/src/test/test-alloc-util.c
+++ b/src/test/test-alloc-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <stdint.h>
 
diff --git a/src/test/test-boot-timestamps.c b/src/test/test-boot-timestamps.c
index ea2656ee5d..0cf05c9a2e 100644
--- a/src/test/test-boot-timestamps.c
+++ b/src/test/test-boot-timestamps.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2013 Lennart Poettering
   Copyright 2013 Kay Sievers
 ***/
 
diff --git a/src/test/test-btrfs.c b/src/test/test-btrfs.c
index 367b5fa6f2..5e5638cd72 100644
--- a/src/test/test-btrfs.c
+++ b/src/test/test-btrfs.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2014 Lennart Poettering
-***/
 
 #include <fcntl.h>
 
diff --git a/src/test/test-calendarspec.c b/src/test/test-calendarspec.c
index fb1467a5c7..10c9f63b9b 100644
--- a/src/test/test-calendarspec.c
+++ b/src/test/test-calendarspec.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2012 Lennart Poettering
-***/
 
 #include <string.h>
 
diff --git a/src/test/test-cap-list.c b/src/test/test-cap-list.c
index da0bf49a1d..de5fa729cc 100644
--- a/src/test/test-cap-list.c
+++ b/src/test/test-cap-list.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2014 Lennart Poettering
-***/
 
 #include <sys/prctl.h>
 
diff --git a/src/test/test-cgroup.c b/src/test/test-cgroup.c
index 97f17755d4..9211c996ac 100644
--- a/src/test/test-cgroup.c
+++ b/src/test/test-cgroup.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <string.h>
 #include <unistd.h>
diff --git a/src/test/test-cpu-set-util.c b/src/test/test-cpu-set-util.c
index 104eb8678b..c9272459b4 100644
--- a/src/test/test-cpu-set-util.c
+++ b/src/test/test-cpu-set-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include "alloc-util.h"
 #include "cpu-set-util.h"
diff --git a/src/test/test-daemon.c b/src/test/test-daemon.c
index c5c833c95f..c8a83f0fc9 100644
--- a/src/test/test-daemon.c
+++ b/src/test/test-daemon.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <unistd.h>
 
diff --git a/src/test/test-date.c b/src/test/test-date.c
index de820941b5..99b6f2eb9e 100644
--- a/src/test/test-date.c
+++ b/src/test/test-date.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2012 Lennart Poettering
-***/
 
 #include <string.h>
 
diff --git a/src/test/test-dissect-image.c b/src/test/test-dissect-image.c
index fa248513fd..a0a909baf0 100644
--- a/src/test/test-dissect-image.c
+++ b/src/test/test-dissect-image.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2016 Lennart Poettering
-***/
 
 #include <fcntl.h>
 #include <stdio.h>
diff --git a/src/test/test-dns-domain.c b/src/test/test-dns-domain.c
index a6966c5dd9..8ed7dbd1e6 100644
--- a/src/test/test-dns-domain.c
+++ b/src/test/test-dns-domain.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2014 Lennart Poettering
  ***/
 
 #include "alloc-util.h"
diff --git a/src/test/test-engine.c b/src/test/test-engine.c
index adf6211b63..f0b95a33e9 100644
--- a/src/test/test-engine.c
+++ b/src/test/test-engine.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <stdio.h>
diff --git a/src/test/test-env-util.c b/src/test/test-env-util.c
index 6533baf97f..8550425eaa 100644
--- a/src/test/test-env-util.c
+++ b/src/test/test-env-util.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  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 5d9c4bf772..650a9a058d 100644
--- a/src/test/test-escape.c
+++ b/src/test/test-escape.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include "alloc-util.h"
 #include "escape.h"
diff --git a/src/test/test-exec-util.c b/src/test/test-exec-util.c
index 46291d38b1..119645e8f3 100644
--- a/src/test/test-exec-util.c
+++ b/src/test/test-exec-util.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2010 Lennart Poettering
   Copyright 2013 Thomas H.P. Andersen
 ***/
 
diff --git a/src/test/test-extract-word.c b/src/test/test-extract-word.c
index 932705c41c..009e351025 100644
--- a/src/test/test-extract-word.c
+++ b/src/test/test-extract-word.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  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 24f411bda4..a04403d748 100644
--- a/src/test/test-fd-util.c
+++ b/src/test/test-fd-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <fcntl.h>
 #include <unistd.h>
diff --git a/src/test/test-fileio.c b/src/test/test-fileio.c
index 6f5adbaa17..14ba075144 100644
--- a/src/test/test-fileio.c
+++ b/src/test/test-fileio.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2013 Lennart Poettering
-***/
 
 #include <fcntl.h>
 #include <stdio.h>
diff --git a/src/test/test-firewall-util.c b/src/test/test-firewall-util.c
index 62cd383154..1b62590b49 100644
--- a/src/test/test-firewall-util.c
+++ b/src/test/test-firewall-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2015 Lennart Poettering
-***/
 
 #include "firewall-util.h"
 #include "log.h"
diff --git a/src/test/test-fs-util.c b/src/test/test-fs-util.c
index 96e3b3643a..fc650b513e 100644
--- a/src/test/test-fs-util.c
+++ b/src/test/test-fs-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <unistd.h>
 
diff --git a/src/test/test-glob-util.c b/src/test/test-glob-util.c
index d725488121..d78d6223c0 100644
--- a/src/test/test-glob-util.c
+++ b/src/test/test-glob-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <fcntl.h>
 #include <glob.h>
diff --git a/src/test/test-hash.c b/src/test/test-hash.c
index 5b842bc6f9..f5bc131846 100644
--- a/src/test/test-hash.c
+++ b/src/test/test-hash.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2016 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <stdio.h>
diff --git a/src/test/test-helper.c b/src/test/test-helper.c
index fac19b701f..9cf9972380 100644
--- a/src/test/test-helper.c
+++ b/src/test/test-helper.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2017 Lennart Poettering
-***/
 
 #include "test-helper.h"
 #include "random-util.h"
diff --git a/src/test/test-hexdecoct.c b/src/test/test-hexdecoct.c
index c864241543..da9f3008bb 100644
--- a/src/test/test-hexdecoct.c
+++ b/src/test/test-hexdecoct.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 
diff --git a/src/test/test-hostname-util.c b/src/test/test-hostname-util.c
index 9a27113696..6dd4ea033c 100644
--- a/src/test/test-hostname-util.c
+++ b/src/test/test-hostname-util.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  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 feda3a35fb..710c0572e6 100644
--- a/src/test/test-hostname.c
+++ b/src/test/test-hostname.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include "hostname-setup.h"
 #include "util.h"
diff --git a/src/test/test-id128.c b/src/test/test-id128.c
index 7c38385a02..e3d07a69f3 100644
--- a/src/test/test-id128.c
+++ b/src/test/test-id128.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2011 Lennart Poettering
-***/
 
 #include <string.h>
 
diff --git a/src/test/test-in-addr-util.c b/src/test/test-in-addr-util.c
index f4989b3ad8..5b6e87bf5a 100644
--- a/src/test/test-in-addr-util.c
+++ b/src/test/test-in-addr-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2017 Lennart Poettering
-***/
 
 #include <netinet/in.h>
 
diff --git a/src/test/test-install-root.c b/src/test/test-install-root.c
index 3eaa8acc3d..15dd3c6966 100644
--- a/src/test/test-install-root.c
+++ b/src/test/test-install-root.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2011 Lennart Poettering
-***/
 
 #include "alloc-util.h"
 #include "fileio.h"
diff --git a/src/test/test-install.c b/src/test/test-install.c
index d5f719ed55..7dfc7e4272 100644
--- a/src/test/test-install.c
+++ b/src/test/test-install.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2011 Lennart Poettering
-***/
 
 #include <stdio.h>
 #include <string.h>
diff --git a/src/test/test-io-util.c b/src/test/test-io-util.c
index b0d004eb39..42e632a8a2 100644
--- a/src/test/test-io-util.c
+++ b/src/test/test-io-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <fcntl.h>
 #include <stdlib.h>
diff --git a/src/test/test-ipcrm.c b/src/test/test-ipcrm.c
index b9175778e6..106c29951e 100644
--- a/src/test/test-ipcrm.c
+++ b/src/test/test-ipcrm.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2014 Lennart Poettering
-***/
 
 #include "clean-ipc.h"
 #include "user-util.h"
diff --git a/src/test/test-job-type.c b/src/test/test-job-type.c
index 9033a14320..dc5f9eae83 100644
--- a/src/test/test-job-type.c
+++ b/src/test/test-job-type.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <stdio.h>
 
diff --git a/src/test/test-log.c b/src/test/test-log.c
index ea7fd0434b..c09f40c356 100644
--- a/src/test/test-log.c
+++ b/src/test/test-log.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2012 Lennart Poettering
-***/
 
 #include <stddef.h>
 #include <unistd.h>
diff --git a/src/test/test-loopback.c b/src/test/test-loopback.c
index f61c05110f..eaea9e4c76 100644
--- a/src/test/test-loopback.c
+++ b/src/test/test-loopback.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <stdio.h>
 #include <string.h>
diff --git a/src/test/test-mount-util.c b/src/test/test-mount-util.c
index e2765d0c91..c10e1681fb 100644
--- a/src/test/test-mount-util.c
+++ b/src/test/test-mount-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2016 Lennart Poettering
-***/
 
 #include <sys/mount.h>
 
diff --git a/src/test/test-ns.c b/src/test/test-ns.c
index 80dbbca69b..4ab70f2306 100644
--- a/src/test/test-ns.c
+++ b/src/test/test-ns.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <stdlib.h>
diff --git a/src/test/test-parse-util.c b/src/test/test-parse-util.c
index 56f9d8d7c9..68a5426458 100644
--- a/src/test/test-parse-util.c
+++ b/src/test/test-parse-util.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2010 Lennart Poettering
   Copyright 2013 Thomas H.P. Andersen
 ***/
 
diff --git a/src/test/test-prioq.c b/src/test/test-prioq.c
index c6686f60ff..89c41d8ce7 100644
--- a/src/test/test-prioq.c
+++ b/src/test/test-prioq.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2013 Lennart Poettering
-***/
 
 #include <stdlib.h>
 
diff --git a/src/test/test-proc-cmdline.c b/src/test/test-proc-cmdline.c
index c592cd2455..8f77e084b6 100644
--- a/src/test/test-proc-cmdline.c
+++ b/src/test/test-proc-cmdline.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include "alloc-util.h"
 #include "log.h"
diff --git a/src/test/test-process-util.c b/src/test/test-process-util.c
index 44df430246..a3d5e6eec2 100644
--- a/src/test/test-process-util.c
+++ b/src/test/test-process-util.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2010 Lennart Poettering
   Copyright 2013 Thomas H.P. Andersen
 ***/
 
diff --git a/src/test/test-replace-var.c b/src/test/test-replace-var.c
index 41468031b3..55208b179f 100644
--- a/src/test/test-replace-var.c
+++ b/src/test/test-replace-var.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2012 Lennart Poettering
-***/
 
 #include <string.h>
 
diff --git a/src/test/test-seccomp.c b/src/test/test-seccomp.c
index a1df09d1b4..33ec680753 100644
--- a/src/test/test-seccomp.c
+++ b/src/test/test-seccomp.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2016 Lennart Poettering
-***/
 
 #include <poll.h>
 #include <sched.h>
diff --git a/src/test/test-sigbus.c b/src/test/test-sigbus.c
index 0f7d41b2e2..c9343364d4 100644
--- a/src/test/test-sigbus.c
+++ b/src/test/test-sigbus.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2014 Lennart Poettering
-***/
 
 #include <sys/mman.h>
 
diff --git a/src/test/test-signal-util.c b/src/test/test-signal-util.c
index 398c2ead29..8ea4163790 100644
--- a/src/test/test-signal-util.c
+++ b/src/test/test-signal-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2016 Lennart Poettering
-***/
 
 #include <signal.h>
 #include <unistd.h>
diff --git a/src/test/test-sleep.c b/src/test/test-sleep.c
index 3351869487..5286442e26 100644
--- a/src/test/test-sleep.c
+++ b/src/test/test-sleep.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2012 Lennart Poettering
-***/
 
 #include <linux/fiemap.h>
 #include <stdio.h>
diff --git a/src/test/test-specifier.c b/src/test/test-specifier.c
index 107d73bf27..9c7c352b51 100644
--- a/src/test/test-specifier.c
+++ b/src/test/test-specifier.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2017 Lennart Poettering
-***/
 
 #include "alloc-util.h"
 #include "log.h"
diff --git a/src/test/test-stat-util.c b/src/test/test-stat-util.c
index 9f3716763f..43f56a6c20 100644
--- a/src/test/test-stat-util.c
+++ b/src/test/test-stat-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <fcntl.h>
 #include <linux/magic.h>
diff --git a/src/test/test-string-util.c b/src/test/test-string-util.c
index 29386104f2..3e72ce2c0a 100644
--- a/src/test/test-string-util.c
+++ b/src/test/test-string-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2015 Lennart Poettering
-***/
 
 #include "alloc-util.h"
 #include "locale-util.h"
diff --git a/src/test/test-strip-tab-ansi.c b/src/test/test-strip-tab-ansi.c
index eb38d5c9bc..362f862221 100644
--- a/src/test/test-strip-tab-ansi.c
+++ b/src/test/test-strip-tab-ansi.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2012 Lennart Poettering
-***/
 
 #include <stdio.h>
 
diff --git a/src/test/test-strv.c b/src/test/test-strv.c
index 5daf567251..ef706b7fca 100644
--- a/src/test/test-strv.c
+++ b/src/test/test-strv.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2010 Lennart Poettering
   Copyright 2013 Thomas H.P. Andersen
 ***/
 
diff --git a/src/test/test-terminal-util.c b/src/test/test-terminal-util.c
index 91030480fd..d15fd0ec3f 100644
--- a/src/test/test-terminal-util.c
+++ b/src/test/test-terminal-util.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  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 2d3f7e149b..87de8d172c 100644
--- a/src/test/test-time-util.c
+++ b/src/test/test-time-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2013 Lennart Poettering
-***/
 
 #include "random-util.h"
 #include "string-util.h"
diff --git a/src/test/test-uid-range.c b/src/test/test-uid-range.c
index 109af24906..65a556c9c6 100644
--- a/src/test/test-uid-range.c
+++ b/src/test/test-uid-range.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2014 Lennart Poettering
-***/
 
 #include <stddef.h>
 
diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c
index 04a560bab1..cf418b8f6c 100644
--- a/src/test/test-unit-file.c
+++ b/src/test/test-unit-file.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  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 6d9b8e703a..b24740a07d 100644
--- a/src/test/test-unit-name.c
+++ b/src/test/test-unit-name.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  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 198fd952ea..c1428fab02 100644
--- a/src/test/test-user-util.c
+++ b/src/test/test-user-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2015 Lennart Poettering
-***/
 
 #include "alloc-util.h"
 #include "log.h"
diff --git a/src/test/test-util.c b/src/test/test-util.c
index ede1b77612..5137bcd046 100644
--- a/src/test/test-util.c
+++ b/src/test/test-util.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2010 Lennart Poettering
   Copyright 2013 Thomas H.P. Andersen
 ***/
 
diff --git a/src/test/test-watchdog.c b/src/test/test-watchdog.c
index 805630f9ac..2aba3b5a26 100644
--- a/src/test/test-watchdog.c
+++ b/src/test/test-watchdog.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2012 Lennart Poettering
-***/
 
 #include <string.h>
 #include <unistd.h>
diff --git a/src/test/test-web-util.c b/src/test/test-web-util.c
index 77a82242dc..dd1df8c247 100644
--- a/src/test/test-web-util.c
+++ b/src/test/test-web-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include "macro.h"
 #include "web-util.h"
diff --git a/src/test/test-xattr-util.c b/src/test/test-xattr-util.c
index cf91108f26..72720dccb8 100644
--- a/src/test/test-xattr-util.c
+++ b/src/test/test-xattr-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/src/test/test-xml.c b/src/test/test-xml.c
index 9e9aebab48..63e7a10e7b 100644
--- a/src/test/test-xml.c
+++ b/src/test/test-xml.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2013 Lennart Poettering
-***/
 
 #include <stdarg.h>
 
diff --git a/src/timedate/timedatectl.c b/src/timedate/timedatectl.c
index 9a61d8d930..ffba6b5437 100644
--- a/src/timedate/timedatectl.c
+++ b/src/timedate/timedatectl.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2012 Lennart Poettering
   Copyright 2013 Kay Sievers
 ***/
 
diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
index c4b5b74532..82eb213e95 100644
--- a/src/timedate/timedated.c
+++ b/src/timedate/timedated.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2011 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <string.h>
diff --git a/src/timesync/timesyncd-conf.c b/src/timesync/timesyncd-conf.c
index 0e4989a8ce..8abd65fe40 100644
--- a/src/timesync/timesyncd-conf.c
+++ b/src/timesync/timesyncd-conf.c
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2014 Kay Sievers, Lennart Poettering
+  Copyright 2014 Kay Sievers
 ***/
 
 #include "alloc-util.h"
diff --git a/src/timesync/timesyncd-conf.h b/src/timesync/timesyncd-conf.h
index dd2025d389..025670e4b3 100644
--- a/src/timesync/timesyncd-conf.h
+++ b/src/timesync/timesyncd-conf.h
@@ -2,7 +2,7 @@
 #pragma once
 
 /***
-  Copyright 2014 Kay Sievers, Lennart Poettering
+  Copyright 2014 Kay Sievers
 ***/
 
 #include "conf-parser.h"
diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c
index 2c5830e9af..48c2f5368a 100644
--- a/src/timesync/timesyncd-manager.c
+++ b/src/timesync/timesyncd-manager.c
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2014 Kay Sievers, Lennart Poettering
+  Copyright 2014 Kay Sievers
 ***/
 
 #include <errno.h>
diff --git a/src/timesync/timesyncd-manager.h b/src/timesync/timesyncd-manager.h
index e4ce7b4579..f2200d483b 100644
--- a/src/timesync/timesyncd-manager.h
+++ b/src/timesync/timesyncd-manager.h
@@ -2,7 +2,7 @@
 #pragma once
 
 /***
-  Copyright 2014 Kay Sievers, Lennart Poettering
+  Copyright 2014 Kay Sievers
 ***/
 
 #include <sys/timex.h>
diff --git a/src/timesync/timesyncd-server.h b/src/timesync/timesyncd-server.h
index 5be6645fd2..7fc40d6e71 100644
--- a/src/timesync/timesyncd-server.h
+++ b/src/timesync/timesyncd-server.h
@@ -2,7 +2,7 @@
 #pragma once
 
 /***
-  Copyright 2014 Kay Sievers, Lennart Poettering
+  Copyright 2014 Kay Sievers
 ***/
 
 #include "list.h"
diff --git a/src/timesync/timesyncd.c b/src/timesync/timesyncd.c
index 92c50422aa..66e9051996 100644
--- a/src/timesync/timesyncd.c
+++ b/src/timesync/timesyncd.c
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2014 Kay Sievers, Lennart Poettering
+  Copyright 2014 Kay Sievers
 ***/
 
 #include "sd-daemon.h"
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index be3c008586..6278465fdb 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2010 Lennart Poettering, Kay Sievers
+  Copyright 2010 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 06d6791f5d..1df4e1c1b3 100644
--- a/src/tty-ask-password-agent/tty-ask-password-agent.c
+++ b/src/tty-ask-password-agent/tty-ask-password-agent.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright 2010 Lennart Poettering
   Copyright 2015 Werner Fink
 ***/
 
diff --git a/src/udev/ata_id/ata_id.c b/src/udev/ata_id/ata_id.c
index 4e216f6a04..f7f88c7af6 100644
--- a/src/udev/ata_id/ata_id.c
+++ b/src/udev/ata_id/ata_id.c
@@ -3,7 +3,6 @@
  * ata_id - reads product/serial number from ATA drives
  *
  * Copyright © 2005-2008 Kay Sievers <kay@vrfy.org>
- * Copyright © 2009 Lennart Poettering <lennart@poettering.net>
  * Copyright © 2009-2010 David Zeuthen <zeuthen@gmail.com>
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/src/udev/udev-builtin-uaccess.c b/src/udev/udev-builtin-uaccess.c
index edea242e65..98c3ed9265 100644
--- a/src/udev/udev-builtin-uaccess.c
+++ b/src/udev/udev-builtin-uaccess.c
@@ -3,7 +3,6 @@
  * manage device node user ACL
  *
  * Copyright 2010-2012 Kay Sievers <kay@vrfy.org>
- * Copyright 2010 Lennart Poettering
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/update-done/update-done.c b/src/update-done/update-done.c
index c96e4febc9..22faf19fa3 100644
--- a/src/update-done/update-done.c
+++ b/src/update-done/update-done.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2014 Lennart Poettering
-***/
 
 #include "alloc-util.h"
 #include "fileio-label.h"
diff --git a/src/update-utmp/update-utmp.c b/src/update-utmp/update-utmp.c
index 2c4e8f3b24..70ed723a8e 100644
--- a/src/update-utmp/update-utmp.c
+++ b/src/update-utmp/update-utmp.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <string.h>
diff --git a/src/user-sessions/user-sessions.c b/src/user-sessions/user-sessions.c
index 2b6998c61c..89c4b0005d 100644
--- a/src/user-sessions/user-sessions.c
+++ b/src/user-sessions/user-sessions.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <unistd.h>
diff --git a/src/veritysetup/veritysetup-generator.c b/src/veritysetup/veritysetup-generator.c
index 223af8f5ad..0c63c5eaad 100644
--- a/src/veritysetup/veritysetup-generator.c
+++ b/src/veritysetup/veritysetup-generator.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2016 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <stdbool.h>
diff --git a/src/veritysetup/veritysetup.c b/src/veritysetup/veritysetup.c
index d33c973223..795af77aa6 100644
--- a/src/veritysetup/veritysetup.c
+++ b/src/veritysetup/veritysetup.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2016 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <stdio.h>
diff --git a/src/volatile-root/volatile-root.c b/src/volatile-root/volatile-root.c
index cd3a85d0ef..bc786c9734 100644
--- a/src/volatile-root/volatile-root.c
+++ b/src/volatile-root/volatile-root.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright 2016 Lennart Poettering
-***/
 
 #include <sys/mount.h>
 
diff --git a/tools/make-man-index.py b/tools/make-man-index.py
index 5fc42d82e3..21f8f42e7e 100755
--- a/tools/make-man-index.py
+++ b/tools/make-man-index.py
@@ -2,7 +2,6 @@
 #  -*- Mode: python; coding: utf-8; indent-tabs-mode: nil -*- */
 # SPDX-License-Identifier: LGPL-2.1+
 #
-#  Copyright 2012 Lennart Poettering
 #  Copyright 2013 Zbigniew Jędrzejewski-Szmek
 
 import collections