aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2018-06-14 12:47:16 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2018-06-14 13:03:20 +0200
commit0cd41d4dff5f0f7fd651a2c8ad86d1932313e666 (patch)
treeba30903a612b6815f7b54f8cf509281c0cb1ff1d
parentMerge pull request #9274 from poettering/comment-header-cleanup (diff)
downloadsystemd-0cd41d4dff5f0f7fd651a2c8ad86d1932313e666.tar.gz
systemd-0cd41d4dff5f0f7fd651a2c8ad86d1932313e666.tar.bz2
systemd-0cd41d4dff5f0f7fd651a2c8ad86d1932313e666.zip
Drop my copyright headers
perl -i -0pe 's/\s*Copyright © .... Zbigniew Jędrzejewski.*?\n/\n/gms' man/*xml git grep -e 'Copyright.*Jędrzejewski' -l | xargs perl -i -0pe 's/(#\n)?# +Copyright © [0-9, -]+ Zbigniew Jędrzejewski.*?\n//gms' git grep -e 'Copyright.*Jędrzejewski' -l | xargs perl -i -0pe 's/\s*\/\*\*\*\s+Copyright © [0-9, -]+ Zbigniew Jędrzejewski[^\n]*?\s*\*\*\*\/\s*/\n\n/gms' git grep -e 'Copyright.*Jędrzejewski' -l | xargs perl -i -0pe 's/\s+Copyright © [0-9, -]+ Zbigniew Jędrzejewski[^\n]*//gms'
-rw-r--r--catalog/meson.build2
-rw-r--r--doc/sysvinit/meson.build2
-rw-r--r--doc/var-log/meson.build2
-rw-r--r--hwdb/meson.build2
-rwxr-xr-xhwdb/parse_hwdb.py2
-rw-r--r--man/busctl.xml2
-rw-r--r--man/coredump.conf.xml2
-rw-r--r--man/coredumpctl.xml2
-rw-r--r--man/custom-man.xsl2
-rw-r--r--man/environment.d.xml1
-rw-r--r--man/hwdb.xml1
-rw-r--r--man/journal-upload.conf.xml2
-rw-r--r--man/libsystemd-pkgconfig.xml2
-rw-r--r--man/machinectl.xml2
-rw-r--r--man/meson.build2
-rw-r--r--man/networkctl.xml2
-rw-r--r--man/sd-bus.xml2
-rw-r--r--man/sd_bus_creds_get_pid.xml2
-rw-r--r--man/sd_bus_creds_new_from_pid.xml2
-rw-r--r--man/sd_bus_default.xml2
-rw-r--r--man/sd_bus_error.xml2
-rw-r--r--man/sd_bus_message_append.xml2
-rw-r--r--man/sd_bus_message_append_array.xml2
-rw-r--r--man/sd_bus_message_append_basic.xml2
-rw-r--r--man/sd_bus_message_append_string_memfd.xml2
-rw-r--r--man/sd_bus_message_append_strv.xml2
-rw-r--r--man/sd_bus_new.xml2
-rw-r--r--man/sd_bus_path_encode.xml2
-rw-r--r--man/sd_event_add_child.xml2
-rw-r--r--man/sd_event_add_defer.xml2
-rw-r--r--man/sd_event_add_signal.xml2
-rw-r--r--man/sd_event_get_fd.xml2
-rw-r--r--man/sd_event_run.xml2
-rw-r--r--man/sd_event_source_set_description.xml2
-rw-r--r--man/sd_event_wait.xml2
-rw-r--r--man/standard-conf.xml2
-rw-r--r--man/standard-options.xml2
-rw-r--r--man/systemd-coredump.xml2
-rw-r--r--man/systemd-environment-d-generator.xml2
-rw-r--r--man/systemd-journal-gatewayd.service.xml2
-rw-r--r--man/systemd-journal-remote.service.xml2
-rw-r--r--man/systemd-journal-upload.service.xml2
-rw-r--r--man/systemd-machined.service.xml2
-rw-r--r--man/systemd-makefs@.service.xml2
-rw-r--r--man/systemd-run.xml2
-rw-r--r--man/systemd-sleep.conf.xml2
-rw-r--r--man/systemd-socket-activate.xml2
-rw-r--r--man/systemd-suspend.service.xml2
-rw-r--r--man/systemd-sysv-generator.xml2
-rw-r--r--man/systemd.environment-generator.xml2
-rw-r--r--man/systemd.generator.xml2
-rw-r--r--man/systemd.offline-updates.xml2
-rw-r--r--man/systemd.resource-control.xml2
-rw-r--r--man/systemd.scope.xml2
-rw-r--r--man/systemd.slice.xml2
-rw-r--r--man/udev.conf.xml2
-rw-r--r--man/user-system-options.xml2
-rw-r--r--meson.build2
-rw-r--r--meson_options.txt2
-rw-r--r--network/meson.build2
-rw-r--r--po/meson.build2
-rw-r--r--presets/meson.build2
-rw-r--r--rules/meson.build2
-rw-r--r--shell-completion/bash/busctl2
-rw-r--r--shell-completion/bash/meson.build2
-rw-r--r--shell-completion/bash/systemd-resolve2
-rw-r--r--shell-completion/bash/systemd-run2
-rw-r--r--shell-completion/zsh/_busctl2
-rw-r--r--shell-completion/zsh/_systemd-resolve2
-rw-r--r--shell-completion/zsh/meson.build2
-rw-r--r--src/activate/activate.c3
-rw-r--r--src/analyze/analyze-verify.c3
-rw-r--r--src/analyze/analyze-verify.h4
-rw-r--r--src/analyze/meson.build2
-rw-r--r--src/basic/crypt-util.c4
-rw-r--r--src/basic/crypt-util.h3
-rw-r--r--src/basic/exec-util.h3
-rw-r--r--src/basic/gcrypt-util.h4
-rw-r--r--src/basic/journal-importer.c3
-rw-r--r--src/basic/journal-importer.h3
-rw-r--r--src/basic/login-util.c3
-rw-r--r--src/basic/login-util.h4
-rw-r--r--src/basic/meson.build2
-rw-r--r--src/basic/missing_syscall.h4
-rw-r--r--src/basic/module-util.h4
-rw-r--r--src/boot/efi/meson.build2
-rw-r--r--src/core/meson.build2
-rw-r--r--src/core/triggers.systemd.in2
-rw-r--r--src/coredump/coredumpctl.c3
-rw-r--r--src/coredump/meson.build2
-rw-r--r--src/coredump/test-coredump-vacuum.c3
-rw-r--r--src/delta/delta.c3
-rw-r--r--src/environment-d-generator/environment-d-generator.c3
-rw-r--r--src/hostname/meson.build2
-rw-r--r--src/import/meson.build2
-rw-r--r--src/journal-remote/journal-remote-parse.c3
-rw-r--r--src/journal-remote/journal-remote-parse.h4
-rw-r--r--src/journal-remote/journal-remote-write.c3
-rw-r--r--src/journal-remote/journal-remote-write.h4
-rw-r--r--src/journal-remote/journal-remote.c3
-rw-r--r--src/journal-remote/journal-remote.h4
-rw-r--r--src/journal-remote/journal-upload-journal.c3
-rw-r--r--src/journal-remote/journal-upload.c3
-rw-r--r--src/journal-remote/meson.build2
-rw-r--r--src/journal-remote/microhttpd-util.c3
-rw-r--r--src/journal-remote/microhttpd-util.h4
-rw-r--r--src/journal/audit-type.c3
-rw-r--r--src/journal/audit-type.h4
-rw-r--r--src/journal/meson.build2
-rw-r--r--src/journal/test-audit-type.c3
-rw-r--r--src/journal/test-catalog.c3
-rw-r--r--src/journal/test-compress-benchmark.c3
-rw-r--r--src/journal/test-journal-init.c3
-rw-r--r--src/journal/test-journal-interleaving.c1
-rw-r--r--src/kernel-install/meson.build2
-rw-r--r--src/libsystemd-network/meson.build2
-rw-r--r--src/libsystemd/meson.build2
-rw-r--r--src/libsystemd/sd-bus/bus-common-errors.c3
-rw-r--r--src/libsystemd/sd-bus/test-bus-cleanup.c3
-rw-r--r--src/libudev/meson.build2
-rw-r--r--src/locale/meson.build2
-rw-r--r--src/locale/test-keymap-util.c3
-rw-r--r--src/login/meson.build2
-rw-r--r--src/login/test-login-shared.c3
-rw-r--r--src/login/test-login-tables.c3
-rw-r--r--src/machine/meson.build2
-rw-r--r--src/machine/test-machine-tables.c3
-rw-r--r--src/network/meson.build2
-rw-r--r--src/network/test-networkd-conf.c3
-rw-r--r--src/network/test-routing-policy-rule.c2
-rw-r--r--src/nspawn/meson.build2
-rw-r--r--src/partition/growfs.c3
-rw-r--r--src/partition/makefs.c2
-rw-r--r--src/resolve/dns-type.c3
-rw-r--r--src/resolve/dns-type.h4
-rw-r--r--src/resolve/meson.build2
-rw-r--r--src/resolve/resolvectl.c3
-rw-r--r--src/resolve/test-dns-packet.c3
-rw-r--r--src/resolve/test-resolve-tables.c3
-rw-r--r--src/resolve/test-resolved-packet.c3
-rw-r--r--src/shared/bootspec.c4
-rw-r--r--src/shared/bootspec.h4
-rw-r--r--src/shared/dropin.c3
-rw-r--r--src/shared/dropin.h4
-rw-r--r--src/shared/fstab-util.c3
-rw-r--r--src/shared/fstab-util.h4
-rw-r--r--src/shared/install-printf.c3
-rw-r--r--src/shared/install-printf.h4
-rw-r--r--src/shared/journal-util.c3
-rw-r--r--src/shared/journal-util.h3
-rw-r--r--src/shared/meson.build2
-rw-r--r--src/shared/sleep-config.c1
-rw-r--r--src/shared/sleep-config.h4
-rw-r--r--src/shared/test-tables.h3
-rw-r--r--src/shared/udev-util.c3
-rw-r--r--src/shared/udev-util.h4
-rw-r--r--src/sleep/sleep.c1
-rw-r--r--src/systemd/meson.build2
-rw-r--r--src/test/meson.build2
-rw-r--r--src/test/test-acl-util.c3
-rw-r--r--src/test/test-ask-password-api.c3
-rw-r--r--src/test/test-cgroup-util.c3
-rw-r--r--src/test/test-dlopen.c3
-rw-r--r--src/test/test-env-util.c3
-rw-r--r--src/test/test-fstab-util.c3
-rw-r--r--src/test/test-gcrypt-util.c2
-rw-r--r--src/test/test-hostname-util.c1
-rw-r--r--src/test/test-journal-importer.c3
-rw-r--r--src/test/test-namespace.c3
-rw-r--r--src/test/test-nss.c3
-rw-r--r--src/test/test-path-lookup.c3
-rw-r--r--src/test/test-path-util.c3
-rw-r--r--src/test/test-random-util.c3
-rw-r--r--src/test/test-selinux.c3
-rw-r--r--src/test/test-set.c3
-rw-r--r--src/test/test-sizeof.c3
-rw-r--r--src/test/test-tables.c3
-rw-r--r--src/test/test-tmpfiles.c3
-rw-r--r--src/test/test-unit-file.c3
-rw-r--r--src/test/test-unit-name.c1
-rw-r--r--src/timedate/meson.build2
-rw-r--r--src/timesync/meson.build2
-rw-r--r--src/timesync/test-timesync.c3
-rw-r--r--src/tmpfiles/tmpfiles.c1
-rw-r--r--src/udev/meson.build2
-rw-r--r--src/udev/udevadm-util.h2
-rw-r--r--src/vconsole/meson.build2
-rw-r--r--sysctl.d/meson.build2
-rw-r--r--sysusers.d/meson.build2
-rw-r--r--test/fuzz-regressions/meson.build2
-rw-r--r--test/meson.build2
-rw-r--r--tmpfiles.d/meson.build2
-rwxr-xr-xtools/catalog-report.py2
-rwxr-xr-xtools/make-directive-index.py2
-rwxr-xr-xtools/make-man-index.py2
-rwxr-xr-xtools/make-man-rules.py2
-rwxr-xr-xtools/xml_helper.py2
-rw-r--r--units/meson.build2
-rw-r--r--units/user/meson.build2
199 files changed, 4 insertions, 485 deletions
diff --git a/catalog/meson.build b/catalog/meson.build
index 4598a318a..1b1315089 100644
--- a/catalog/meson.build
+++ b/catalog/meson.build
@@ -1,6 +1,4 @@
# SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
in_files = '''
systemd.bg.catalog
diff --git a/doc/sysvinit/meson.build b/doc/sysvinit/meson.build
index 7404321ba..fbac59ae4 100644
--- a/doc/sysvinit/meson.build
+++ b/doc/sysvinit/meson.build
@@ -1,6 +1,4 @@
# SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
file = configure_file(
input : 'README.in',
diff --git a/doc/var-log/meson.build b/doc/var-log/meson.build
index 88ef5b1b4..0ddff20ce 100644
--- a/doc/var-log/meson.build
+++ b/doc/var-log/meson.build
@@ -1,6 +1,4 @@
# SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
file = configure_file(
input : 'README.in',
diff --git a/hwdb/meson.build b/hwdb/meson.build
index 7a39e02c4..158292c71 100644
--- a/hwdb/meson.build
+++ b/hwdb/meson.build
@@ -1,6 +1,4 @@
# SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
hwdb_files = files('''
20-pci-vendor-model.hwdb
diff --git a/hwdb/parse_hwdb.py b/hwdb/parse_hwdb.py
index c6cbacb60..4900a2577 100755
--- a/hwdb/parse_hwdb.py
+++ b/hwdb/parse_hwdb.py
@@ -4,8 +4,6 @@
#
# This file is distributed under the MIT license, see below.
#
-# Copyright © 2016 Zbigniew Jędrzejewski-Szmek
-#
# The MIT License (MIT)
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/man/busctl.xml b/man/busctl.xml
index b4de71080..b72493f04 100644
--- a/man/busctl.xml
+++ b/man/busctl.xml
@@ -4,8 +4,6 @@
<!--
SPDX-License-Identifier: LGPL-2.1+
-
- Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-->
<refentry id="busctl"
diff --git a/man/coredump.conf.xml b/man/coredump.conf.xml
index 447a90831..81391cfcf 100644
--- a/man/coredump.conf.xml
+++ b/man/coredump.conf.xml
@@ -4,8 +4,6 @@
<!--
SPDX-License-Identifier: LGPL-2.1+
-
- Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-->
<refentry id="coredump.conf" conditional="ENABLE_COREDUMP"
diff --git a/man/coredumpctl.xml b/man/coredumpctl.xml
index bc88a28e0..31f8fa14f 100644
--- a/man/coredumpctl.xml
+++ b/man/coredumpctl.xml
@@ -4,8 +4,6 @@
<!--
SPDX-License-Identifier: LGPL-2.1+
-
- Copyright © 2012 Zbigniew Jędrzejewski-Szmek
-->
<refentry id="coredumpctl" conditional='ENABLE_COREDUMP'
diff --git a/man/custom-man.xsl b/man/custom-man.xsl
index 4156a0673..d9af519d3 100644
--- a/man/custom-man.xsl
+++ b/man/custom-man.xsl
@@ -2,8 +2,6 @@
<!--
SPDX-License-Identifier: LGPL-2.1+
-
- Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
diff --git a/man/environment.d.xml b/man/environment.d.xml
index 82bb20873..53b26c8f2 100644
--- a/man/environment.d.xml
+++ b/man/environment.d.xml
@@ -5,7 +5,6 @@
SPDX-License-Identifier: LGPL-2.1+
Copyright © 2016 Red Hat, Inc.
- Copyright © 2017 Zbigniew Jędrzejewski-Szmek
-->
<refentry id="environment.d" conditional='ENABLE_ENVIRONMENT_D'
xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/hwdb.xml b/man/hwdb.xml
index 590c0a480..f35ce9eea 100644
--- a/man/hwdb.xml
+++ b/man/hwdb.xml
@@ -6,7 +6,6 @@
SPDX-License-Identifier: LGPL-2.1+
Copyright © 2014 Tom Gundersen
- Copyright © 2016 Zbigniew Jędrzejewski-Szmek
-->
<refentry id="hwdb" conditional="ENABLE_HWDB">
diff --git a/man/journal-upload.conf.xml b/man/journal-upload.conf.xml
index 21944b8e0..ea738655f 100644
--- a/man/journal-upload.conf.xml
+++ b/man/journal-upload.conf.xml
@@ -4,8 +4,6 @@
<!--
SPDX-License-Identifier: LGPL-2.1+
-
- Copyright © 2016 Zbigniew Jędrzejewski-Szmek
-->
<refentry id="journal-upload.conf" conditional='HAVE_MICROHTTPD'
diff --git a/man/libsystemd-pkgconfig.xml b/man/libsystemd-pkgconfig.xml
index 81ecde465..a177fbe46 100644
--- a/man/libsystemd-pkgconfig.xml
+++ b/man/libsystemd-pkgconfig.xml
@@ -4,8 +4,6 @@
<!--
SPDX-License-Identifier: LGPL-2.1+
-
- Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-->
<refsect1>
diff --git a/man/machinectl.xml b/man/machinectl.xml
index 6c4f2a574..c96ffcaf7 100644
--- a/man/machinectl.xml
+++ b/man/machinectl.xml
@@ -4,8 +4,6 @@
<!--
SPDX-License-Identifier: LGPL-2.1+
-
- Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-->
<refentry id="machinectl" conditional='ENABLE_MACHINED'
diff --git a/man/meson.build b/man/meson.build
index 58a2343eb..ec05d73bc 100644
--- a/man/meson.build
+++ b/man/meson.build
@@ -1,6 +1,4 @@
# SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
# This is lame, I know, but meson has no other include mechanism
subdir('rules')
diff --git a/man/networkctl.xml b/man/networkctl.xml
index 64e0f0127..8d0f1cc83 100644
--- a/man/networkctl.xml
+++ b/man/networkctl.xml
@@ -4,8 +4,6 @@
<!--
SPDX-License-Identifier: LGPL-2.1+
-
- Copyright © 2015 Zbigniew Jędrzejewski-Szmek
-->
<refentry id="networkctl" conditional='ENABLE_NETWORKD'
diff --git a/man/sd-bus.xml b/man/sd-bus.xml
index 6cff1d7d4..642b686f3 100644
--- a/man/sd-bus.xml
+++ b/man/sd-bus.xml
@@ -4,8 +4,6 @@
<!--
SPDX-License-Identifier: LGPL-2.1+
-
- Copyright © 2016 Zbigniew Jędrzejewski-Szmek
-->
<refentry id="sd-bus" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_bus_creds_get_pid.xml b/man/sd_bus_creds_get_pid.xml
index 0425e60c5..0c11d8ccf 100644
--- a/man/sd_bus_creds_get_pid.xml
+++ b/man/sd_bus_creds_get_pid.xml
@@ -4,8 +4,6 @@
<!--
SPDX-License-Identifier: LGPL-2.1+
-
- Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-->
<refentry id="sd_bus_creds_get_pid" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_bus_creds_new_from_pid.xml b/man/sd_bus_creds_new_from_pid.xml
index 63c29a82d..c5adbaff8 100644
--- a/man/sd_bus_creds_new_from_pid.xml
+++ b/man/sd_bus_creds_new_from_pid.xml
@@ -4,8 +4,6 @@
<!--
SPDX-License-Identifier: LGPL-2.1+
-
- Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-->
<refentry id="sd_bus_creds_new_from_pid" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_bus_default.xml b/man/sd_bus_default.xml
index 2d9d99087..cf027e413 100644
--- a/man/sd_bus_default.xml
+++ b/man/sd_bus_default.xml
@@ -4,8 +4,6 @@
<!--
SPDX-License-Identifier: LGPL-2.1+
-
- Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-->
<refentry id="sd_bus_default" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_bus_error.xml b/man/sd_bus_error.xml
index 8a383089b..064db3701 100644
--- a/man/sd_bus_error.xml
+++ b/man/sd_bus_error.xml
@@ -4,8 +4,6 @@
<!--
SPDX-License-Identifier: LGPL-2.1+
-
- Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-->
<refentry id="sd_bus_error" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_bus_message_append.xml b/man/sd_bus_message_append.xml
index f971cb35f..bf037356f 100644
--- a/man/sd_bus_message_append.xml
+++ b/man/sd_bus_message_append.xml
@@ -4,8 +4,6 @@
<!--
SPDX-License-Identifier: LGPL-2.1+
-
- Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-->
<refentry id="sd_bus_message_append"
diff --git a/man/sd_bus_message_append_array.xml b/man/sd_bus_message_append_array.xml
index 8365ae78b..fb38670dd 100644
--- a/man/sd_bus_message_append_array.xml
+++ b/man/sd_bus_message_append_array.xml
@@ -4,8 +4,6 @@
<!--
SPDX-License-Identifier: LGPL-2.1+
-
- Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-->
<refentry id="sd_bus_message_append_array"
diff --git a/man/sd_bus_message_append_basic.xml b/man/sd_bus_message_append_basic.xml
index a84df2c95..20740a9a7 100644
--- a/man/sd_bus_message_append_basic.xml
+++ b/man/sd_bus_message_append_basic.xml
@@ -4,8 +4,6 @@
<!--
SPDX-License-Identifier: LGPL-2.1+
-
- Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-->
<refentry id="sd_bus_message_append_basic" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_bus_message_append_string_memfd.xml b/man/sd_bus_message_append_string_memfd.xml
index 88e3407a8..8b693ac71 100644
--- a/man/sd_bus_message_append_string_memfd.xml
+++ b/man/sd_bus_message_append_string_memfd.xml
@@ -4,8 +4,6 @@
<!--
SPDX-License-Identifier: LGPL-2.1+
-
- Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-->
<refentry id="sd_bus_message_append_string_memfd"
diff --git a/man/sd_bus_message_append_strv.xml b/man/sd_bus_message_append_strv.xml
index 0ca0bcc92..e10b2f3ef 100644
--- a/man/sd_bus_message_append_strv.xml
+++ b/man/sd_bus_message_append_strv.xml
@@ -4,8 +4,6 @@
<!--
SPDX-License-Identifier: LGPL-2.1+
-
- Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-->
<refentry id="sd_bus_message_append_strv"
diff --git a/man/sd_bus_new.xml b/man/sd_bus_new.xml
index 4771beabf..56f6491e3 100644
--- a/man/sd_bus_new.xml
+++ b/man/sd_bus_new.xml
@@ -4,8 +4,6 @@
<!--
SPDX-License-Identifier: LGPL-2.1+
-
- Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-->
<refentry id="sd_bus_new" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_bus_path_encode.xml b/man/sd_bus_path_encode.xml
index 16d0ef099..972775874 100644
--- a/man/sd_bus_path_encode.xml
+++ b/man/sd_bus_path_encode.xml
@@ -4,8 +4,6 @@
<!--
SPDX-License-Identifier: LGPL-2.1+
-
- Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-->
<refentry id="sd_bus_path_encode">
diff --git a/man/sd_event_add_child.xml b/man/sd_event_add_child.xml
index 771b22d7d..1bbb55520 100644
--- a/man/sd_event_add_child.xml
+++ b/man/sd_event_add_child.xml
@@ -4,8 +4,6 @@
<!--
SPDX-License-Identifier: LGPL-2.1+
-
- Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-->
<refentry id="sd_event_add_child" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_event_add_defer.xml b/man/sd_event_add_defer.xml
index f9b392343..7fd0a9e84 100644
--- a/man/sd_event_add_defer.xml
+++ b/man/sd_event_add_defer.xml
@@ -4,8 +4,6 @@
<!--
SPDX-License-Identifier: LGPL-2.1+
-
- Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-->
<refentry id="sd_event_add_defer" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_event_add_signal.xml b/man/sd_event_add_signal.xml
index a1ff7d440..7b1db8aae 100644
--- a/man/sd_event_add_signal.xml
+++ b/man/sd_event_add_signal.xml
@@ -4,8 +4,6 @@
<!--
SPDX-License-Identifier: LGPL-2.1+
-
- Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-->
<refentry id="sd_event_add_signal" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_event_get_fd.xml b/man/sd_event_get_fd.xml
index 06555212f..25f1b9bdd 100644
--- a/man/sd_event_get_fd.xml
+++ b/man/sd_event_get_fd.xml
@@ -4,8 +4,6 @@
<!--
SPDX-License-Identifier: LGPL-2.1+
-
- Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-->
<refentry id="sd_event_get_fd" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_event_run.xml b/man/sd_event_run.xml
index 01f8d25e0..3b872e3d6 100644
--- a/man/sd_event_run.xml
+++ b/man/sd_event_run.xml
@@ -4,8 +4,6 @@
<!--
SPDX-License-Identifier: LGPL-2.1+
-
- Copyright © 2015 Zbigniew Jędrzejewski-Szmek
-->
<refentry id="sd_event_run" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_event_source_set_description.xml b/man/sd_event_source_set_description.xml
index ef3dcbaf2..9c540b7df 100644
--- a/man/sd_event_source_set_description.xml
+++ b/man/sd_event_source_set_description.xml
@@ -4,8 +4,6 @@
<!--
SPDX-License-Identifier: LGPL-2.1+
-
- Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-->
<refentry id="sd_event_source_set_description" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_event_wait.xml b/man/sd_event_wait.xml
index ca9647b99..5d44c963b 100644
--- a/man/sd_event_wait.xml
+++ b/man/sd_event_wait.xml
@@ -4,8 +4,6 @@
<!--
SPDX-License-Identifier: LGPL-2.1+
-
- Copyright © 2015 Zbigniew Jędrzejewski-Szmek
-->
<refentry id="sd_event_wait" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/standard-conf.xml b/man/standard-conf.xml
index 8a170f745..e1cb7d31e 100644
--- a/man/standard-conf.xml
+++ b/man/standard-conf.xml
@@ -4,8 +4,6 @@
<!--
SPDX-License-Identifier: LGPL-2.1+
-
- Copyright © 2015 Zbigniew Jędrzejewski-Szmek
Copyright © 2014 Josh Triplett
-->
diff --git a/man/standard-options.xml b/man/standard-options.xml
index 4941710a2..bea92e89f 100644
--- a/man/standard-options.xml
+++ b/man/standard-options.xml
@@ -4,8 +4,6 @@
<!--
SPDX-License-Identifier: LGPL-2.1+
-
- Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-->
<variablelist>
diff --git a/man/systemd-coredump.xml b/man/systemd-coredump.xml
index 42e46af8d..ea0b1efdf 100644
--- a/man/systemd-coredump.xml
+++ b/man/systemd-coredump.xml
@@ -4,8 +4,6 @@
<!--
SPDX-License-Identifier: LGPL-2.1+
-
- Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-->
<refentry id="systemd-coredump" conditional='ENABLE_COREDUMP'
diff --git a/man/systemd-environment-d-generator.xml b/man/systemd-environment-d-generator.xml
index c6a872db0..1d282b4a8 100644
--- a/man/systemd-environment-d-generator.xml
+++ b/man/systemd-environment-d-generator.xml
@@ -7,8 +7,6 @@
<!--
SPDX-License-Identifier: LGPL-2.1+
-
- Copyright © 2017 Zbigniew Jędrzejewski-Szmek
-->
<refentry id="systemd-environment-d-generator" conditional='ENABLE_ENVIRONMENT_D'>
diff --git a/man/systemd-journal-gatewayd.service.xml b/man/systemd-journal-gatewayd.service.xml
index aa9291e0f..c4752368c 100644
--- a/man/systemd-journal-gatewayd.service.xml
+++ b/man/systemd-journal-gatewayd.service.xml
@@ -4,8 +4,6 @@
<!--
SPDX-License-Identifier: LGPL-2.1+
-
- Copyright © 2012 Zbigniew Jędrzejewski-Szmek
-->
<refentry id="systemd-journal-gatewayd.service" conditional='HAVE_MICROHTTPD'
diff --git a/man/systemd-journal-remote.service.xml b/man/systemd-journal-remote.service.xml
index 1ee709f2f..52e7f0dd3 100644
--- a/man/systemd-journal-remote.service.xml
+++ b/man/systemd-journal-remote.service.xml
@@ -7,8 +7,6 @@
<!--
SPDX-License-Identifier: LGPL-2.1+
-
- Copyright © 2012 Zbigniew Jędrzejewski-Szmek
-->
<refentry id="systemd-journal-remote" conditional='HAVE_MICROHTTPD'
diff --git a/man/systemd-journal-upload.service.xml b/man/systemd-journal-upload.service.xml
index c0e869f7f..b380156b2 100644
--- a/man/systemd-journal-upload.service.xml
+++ b/man/systemd-journal-upload.service.xml
@@ -7,8 +7,6 @@
<!--
SPDX-License-Identifier: LGPL-2.1+
-
- Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-->
<refentry id="systemd-journal-upload" conditional='HAVE_MICROHTTPD'
diff --git a/man/systemd-machined.service.xml b/man/systemd-machined.service.xml
index a18c11aeb..e99bf11d5 100644
--- a/man/systemd-machined.service.xml
+++ b/man/systemd-machined.service.xml
@@ -4,8 +4,6 @@
<!--
SPDX-License-Identifier: LGPL-2.1+
-
- Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-->
<refentry id="systemd-machined.service" conditional='ENABLE_MACHINED'>
diff --git a/man/systemd-makefs@.service.xml b/man/systemd-makefs@.service.xml
index 380934f9c..f9a7f0f12 100644
--- a/man/systemd-makefs@.service.xml
+++ b/man/systemd-makefs@.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 © 2017 Zbigniew Jędrzejewski-Szmek
-->
<refentry id="systemd-makefs@.service">
diff --git a/man/systemd-run.xml b/man/systemd-run.xml
index 67d357c55..3334efab9 100644
--- a/man/systemd-run.xml
+++ b/man/systemd-run.xml
@@ -4,8 +4,6 @@
<!--
SPDX-License-Identifier: LGPL-2.1+
-
- Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-->
<refentry id="systemd-run"
diff --git a/man/systemd-sleep.conf.xml b/man/systemd-sleep.conf.xml
index 7ed630fdb..ed2e4e667 100644
--- a/man/systemd-sleep.conf.xml
+++ b/man/systemd-sleep.conf.xml
@@ -4,8 +4,6 @@
<!--
SPDX-License-Identifier: LGPL-2.1+
-
- Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-->
<refentry id="systemd-sleep.conf"
diff --git a/man/systemd-socket-activate.xml b/man/systemd-socket-activate.xml
index 5bae313f9..a708c9c22 100644
--- a/man/systemd-socket-activate.xml
+++ b/man/systemd-socket-activate.xml
@@ -4,8 +4,6 @@
<!--
SPDX-License-Identifier: LGPL-2.1+
-
- Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-->
<refentry id="systemd-socket-activate"
diff --git a/man/systemd-suspend.service.xml b/man/systemd-suspend.service.xml
index 1f55f4fbd..a4e63778d 100644
--- a/man/systemd-suspend.service.xml
+++ b/man/systemd-suspend.service.xml
@@ -4,8 +4,6 @@
<!--
SPDX-License-Identifier: LGPL-2.1+
-
- Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-->
<refentry id="systemd-suspend.service"
diff --git a/man/systemd-sysv-generator.xml b/man/systemd-sysv-generator.xml
index 16d10f743..84bbb3f3a 100644
--- a/man/systemd-sysv-generator.xml
+++ b/man/systemd-sysv-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 Zbigniew Jędrzejewski-Szmek
-->
<refentry id="systemd-sysv-generator" conditional="HAVE_SYSV_COMPAT">
diff --git a/man/systemd.environment-generator.xml b/man/systemd.environment-generator.xml
index 3e3e94136..4941cd208 100644
--- a/man/systemd.environment-generator.xml
+++ b/man/systemd.environment-generator.xml
@@ -7,8 +7,6 @@
<!--
SPDX-License-Identifier: LGPL-2.1+
-
- Copyright © 2017 Zbigniew Jędrzejewski-Szmek
-->
<refentry id="systemd.environment-generator" conditional='ENABLE_ENVIRONMENT_D'
diff --git a/man/systemd.generator.xml b/man/systemd.generator.xml
index 208dd8013..97f3965c3 100644
--- a/man/systemd.generator.xml
+++ b/man/systemd.generator.xml
@@ -7,8 +7,6 @@
<!--
SPDX-License-Identifier: LGPL-2.1+
-
- Copyright © 2015 Zbigniew Jędrzejewski-Szmek
-->
<refentry id="systemd.generator">
diff --git a/man/systemd.offline-updates.xml b/man/systemd.offline-updates.xml
index b74b2852b..260c8ffa8 100644
--- a/man/systemd.offline-updates.xml
+++ b/man/systemd.offline-updates.xml
@@ -4,8 +4,6 @@
<!--
SPDX-License-Identifier: LGPL-2.1+
-
- Copyright © 2016 Zbigniew Jędrzejewski-Szmek
-->
<refentry id="systemd.offline-updates">
diff --git a/man/systemd.resource-control.xml b/man/systemd.resource-control.xml
index 75497f0b3..5d95fb67c 100644
--- a/man/systemd.resource-control.xml
+++ b/man/systemd.resource-control.xml
@@ -4,8 +4,6 @@
<!--
SPDX-License-Identifier: LGPL-2.1+
-
- Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-->
<refentry id="systemd.resource-control">
diff --git a/man/systemd.scope.xml b/man/systemd.scope.xml
index 2a2903639..c6c68b7e2 100644
--- a/man/systemd.scope.xml
+++ b/man/systemd.scope.xml
@@ -4,8 +4,6 @@
<!--
SPDX-License-Identifier: LGPL-2.1+
-
- Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-->
<refentry id="systemd.scope">
diff --git a/man/systemd.slice.xml b/man/systemd.slice.xml
index 73cedee82..163f479ca 100644
--- a/man/systemd.slice.xml
+++ b/man/systemd.slice.xml
@@ -4,8 +4,6 @@
<!--
SPDX-License-Identifier: LGPL-2.1+
-
- Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-->
<refentry id="systemd.slice">
diff --git a/man/udev.conf.xml b/man/udev.conf.xml
index 7c915406f..6010fc5c0 100644
--- a/man/udev.conf.xml
+++ b/man/udev.conf.xml
@@ -4,8 +4,6 @@
<!--
SPDX-License-Identifier: LGPL-2.1+
-
- Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-->
<refentry id="udev.conf"
diff --git a/man/user-system-options.xml b/man/user-system-options.xml
index 6aeda8e44..eb875661d 100644
--- a/man/user-system-options.xml
+++ b/man/user-system-options.xml
@@ -4,8 +4,6 @@
<!--
SPDX-License-Identifier: LGPL-2.1+
-
- Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-->
<variablelist>
diff --git a/meson.build b/meson.build
index 889494528..a97168961 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,4 @@
# SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
project('systemd', 'c',
version : '238',
diff --git a/meson_options.txt b/meson_options.txt
index 4da96f5d9..58ee0daad 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,7 +1,5 @@
# -*- mode: meson -*-
# SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
option('split-usr', type : 'combo', choices : ['auto', 'true', 'false'],
description : '''/bin, /sbin aren't symlinks into /usr''')
diff --git a/network/meson.build b/network/meson.build
index a7d0431e5..59d4be1a1 100644
--- a/network/meson.build
+++ b/network/meson.build
@@ -1,6 +1,4 @@
# SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
if conf.get('ENABLE_NETWORKD') == 1
install_data('80-container-host0.network',
diff --git a/po/meson.build b/po/meson.build
index f1872c0f7..3611ac90f 100644
--- a/po/meson.build
+++ b/po/meson.build
@@ -1,6 +1,4 @@
# SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
i18n = import('i18n')
i18n.gettext(meson.project_name(),
diff --git a/presets/meson.build b/presets/meson.build
index 4068370db..0b16acf59 100644
--- a/presets/meson.build
+++ b/presets/meson.build
@@ -1,6 +1,4 @@
# SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
install_data('90-systemd.preset',
install_dir : systempresetdir)
diff --git a/rules/meson.build b/rules/meson.build
index 170873d88..b6a32ba77 100644
--- a/rules/meson.build
+++ b/rules/meson.build
@@ -1,6 +1,4 @@
# SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
rules = files('''
60-block.rules
diff --git a/shell-completion/bash/busctl b/shell-completion/bash/busctl
index 586b826ca..47b9fabe8 100644
--- a/shell-completion/bash/busctl
+++ b/shell-completion/bash/busctl
@@ -2,8 +2,6 @@
# SPDX-License-Identifier: LGPL-2.1+
#
# This file is part of systemd.
-#
-# Copyright © 2013 Zbigniew Jędrzejewski-Szmek
# Copyright © 2014 Thomas H.P. Andersen
#
# systemd is free software; you can redistribute it and/or modify it
diff --git a/shell-completion/bash/meson.build b/shell-completion/bash/meson.build
index d783e622e..e7fabe29a 100644
--- a/shell-completion/bash/meson.build
+++ b/shell-completion/bash/meson.build
@@ -1,6 +1,4 @@
# SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
bashcompletiondir = get_option('bashcompletiondir')
if bashcompletiondir == ''
diff --git a/shell-completion/bash/systemd-resolve b/shell-completion/bash/systemd-resolve
index 18bcfbb06..86b8db2cf 100644
--- a/shell-completion/bash/systemd-resolve
+++ b/shell-completion/bash/systemd-resolve
@@ -3,8 +3,6 @@
#
# This file is part of systemd.
#
-# Copyright © 2016 Zbigniew Jędrzejewski-Szmek
-#
# systemd is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2.1 of the License, or
diff --git a/shell-completion/bash/systemd-run b/shell-completion/bash/systemd-run
index ec9c21add..d317466b2 100644
--- a/shell-completion/bash/systemd-run
+++ b/shell-completion/bash/systemd-run
@@ -3,8 +3,6 @@
#
# This file is part of systemd.
#
-# Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-#
# systemd is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2.1 of the License, or
diff --git a/shell-completion/zsh/_busctl b/shell-completion/zsh/_busctl
index 0e2e5c60a..801ed4801 100644
--- a/shell-completion/zsh/_busctl
+++ b/shell-completion/zsh/_busctl
@@ -5,8 +5,6 @@
#
# This file is part of systemd.
#
-# Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-#
# systemd is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2.1 of the License, or
diff --git a/shell-completion/zsh/_systemd-resolve b/shell-completion/zsh/_systemd-resolve
index 51033aa6a..b54d22f81 100644
--- a/shell-completion/zsh/_systemd-resolve
+++ b/shell-completion/zsh/_systemd-resolve
@@ -4,8 +4,6 @@
#
# This file is part of systemd.
#
-# Copyright © 2016 Zbigniew Jędrzejewski-Szmek
-#
# systemd is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2.1 of the License, or
diff --git a/shell-completion/zsh/meson.build b/shell-completion/zsh/meson.build
index 6776d3a11..7fc9fcfc7 100644
--- a/shell-completion/zsh/meson.build
+++ b/shell-completion/zsh/meson.build
@@ -1,6 +1,4 @@
# SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
zshcompletiondir = get_option('zshcompletiondir')
if zshcompletiondir == ''
diff --git a/src/activate/activate.c b/src/activate/activate.c
index 18a8e932b..45386a38f 100644
--- a/src/activate/activate.c
+++ b/src/activate/activate.c
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-***/
#include <getopt.h>
#include <sys/epoll.h>
diff --git a/src/analyze/analyze-verify.c b/src/analyze/analyze-verify.c
index 4d2479e5b..ae39c3149 100644
--- a/src/analyze/analyze-verify.c
+++ b/src/analyze/analyze-verify.c
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-***/
#include <stdlib.h>
diff --git a/src/analyze/analyze-verify.h b/src/analyze/analyze-verify.h
index ca4929b5a..f6b7f5496 100644
--- a/src/analyze/analyze-verify.h
+++ b/src/analyze/analyze-verify.h
@@ -1,10 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
#pragma once
-/***
- Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-***/
-
#include <stdbool.h>
#include "path-lookup.h"
diff --git a/src/analyze/meson.build b/src/analyze/meson.build
index d99ea3089..3a69a259b 100644
--- a/src/analyze/meson.build
+++ b/src/analyze/meson.build
@@ -1,6 +1,4 @@
# SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
systemd_analyze_sources = files('''
analyze.c
diff --git a/src/basic/crypt-util.c b/src/basic/crypt-util.c
index f977fa469..9fa886ed3 100644
--- a/src/basic/crypt-util.c
+++ b/src/basic/crypt-util.c
@@ -1,6 +1,4 @@
-/***
- Copyright © 2017 Zbigniew Jędrzejewski-Szmek
-***/
+
#if HAVE_LIBCRYPTSETUP
#include "crypt-util.h"
diff --git a/src/basic/crypt-util.h b/src/basic/crypt-util.h
index b87e40b3d..5b03cb072 100644
--- a/src/basic/crypt-util.h
+++ b/src/basic/crypt-util.h
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2017 Zbigniew Jędrzejewski-Szmek
-***/
#if HAVE_LIBCRYPTSETUP
#include <libcryptsetup.h>
diff --git a/src/basic/exec-util.h b/src/basic/exec-util.h
index 4b0bddbb8..8b1f18139 100644
--- a/src/basic/exec-util.h
+++ b/src/basic/exec-util.h
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2017 Zbigniew Jędrzejewski-Szmek
-***/
#include <stdbool.h>
diff --git a/src/basic/gcrypt-util.h b/src/basic/gcrypt-util.h
index f5e286fb3..87eb60689 100644
--- a/src/basic/gcrypt-util.h
+++ b/src/basic/gcrypt-util.h
@@ -1,9 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2016 Zbigniew Jędrzejewski-Szmek
-***/
-
#pragma once
#include <errno.h>
diff --git a/src/basic/journal-importer.c b/src/basic/journal-importer.c
index b07523d6b..ca203bbbf 100644
--- a/src/basic/journal-importer.c
+++ b/src/basic/journal-importer.c
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-***/
#include <errno.h>
#include <unistd.h>
diff --git a/src/basic/journal-importer.h b/src/basic/journal-importer.h
index 04501d474..f49ce734a 100644
--- a/src/basic/journal-importer.h
+++ b/src/basic/journal-importer.h
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2016 Zbigniew Jędrzejewski-Szmek
-***/
#pragma once
diff --git a/src/basic/login-util.c b/src/basic/login-util.c
index 499bc2120..085ccd091 100644
--- a/src/basic/login-util.c
+++ b/src/basic/login-util.c
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-***/
#include <string.h>
diff --git a/src/basic/login-util.h b/src/basic/login-util.h
index 9fddd86eb..e1e62e12b 100644
--- a/src/basic/login-util.h
+++ b/src/basic/login-util.h
@@ -1,10 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
#pragma once
-/***
- Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-***/
-
#include <stdbool.h>
#include <unistd.h>
diff --git a/src/basic/meson.build b/src/basic/meson.build
index 1836a3438..31625b178 100644
--- a/src/basic/meson.build
+++ b/src/basic/meson.build
@@ -1,6 +1,4 @@
# SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
basic_sources = files('''
MurmurHash2.c
diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h
index dd427af38..93c60458b 100644
--- a/src/basic/missing_syscall.h
+++ b/src/basic/missing_syscall.h
@@ -1,10 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
#pragma once
-/***
- Copyright © 2016 Zbigniew Jędrzejewski-Szmek
-***/
-
/* Missing glibc definitions to access certain kernel APIs */
#include <sys/types.h>
diff --git a/src/basic/module-util.h b/src/basic/module-util.h
index 2ec6c169b..8fa121ed9 100644
--- a/src/basic/module-util.h
+++ b/src/basic/module-util.h
@@ -1,10 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
#pragma once
-/***
- Copyright © 2017 Zbigniew Jędrzejewski-Szmek
-***/
-
#include <libkmod.h>
#include "macro.h"
diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build
index 3d5db86a6..8ec1fa7be 100644
--- a/src/boot/efi/meson.build
+++ b/src/boot/efi/meson.build
@@ -1,6 +1,4 @@
# SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
efi_headers = files('''
console.h
diff --git a/src/core/meson.build b/src/core/meson.build
index c02b0c70d..3852c5e9d 100644
--- a/src/core/meson.build
+++ b/src/core/meson.build
@@ -1,6 +1,4 @@
# SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
libcore_la_sources = '''
audit-fd.c
diff --git a/src/core/triggers.systemd.in b/src/core/triggers.systemd.in
index c88f55a58..10b1889b5 100644
--- a/src/core/triggers.systemd.in
+++ b/src/core/triggers.systemd.in
@@ -2,8 +2,6 @@
# SPDX-License-Identifier: LGPL-2.1+
#
# This file is part of systemd.
-#
-# Copyright © 2015 Zbigniew Jędrzejewski-Szmek
# Copyright © 2018 Neal Gompa
# The contents of this are an example to be copied into systemd.spec.
diff --git a/src/coredump/coredumpctl.c b/src/coredump/coredumpctl.c
index 7f8d9843f..99d07c14f 100644
--- a/src/coredump/coredumpctl.c
+++ b/src/coredump/coredumpctl.c
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2012 Zbigniew Jędrzejewski-Szmek
-***/
#include <fcntl.h>
#include <getopt.h>
diff --git a/src/coredump/meson.build b/src/coredump/meson.build
index 550fbe095..bfba7ef58 100644
--- a/src/coredump/meson.build
+++ b/src/coredump/meson.build
@@ -1,6 +1,4 @@
# SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
systemd_coredump_sources = files('''
coredump.c
diff --git a/src/coredump/test-coredump-vacuum.c b/src/coredump/test-coredump-vacuum.c
index 839f234d8..75fb44287 100644
--- a/src/coredump/test-coredump-vacuum.c
+++ b/src/coredump/test-coredump-vacuum.c
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2012 Zbigniew Jędrzejewski-Szmek
-***/
#include <stdlib.h>
diff --git a/src/delta/delta.c b/src/delta/delta.c
index 44a36a7e4..21cce7e8b 100644
--- a/src/delta/delta.c
+++ b/src/delta/delta.c
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-***/
#include <errno.h>
#include <getopt.h>
diff --git a/src/environment-d-generator/environment-d-generator.c b/src/environment-d-generator/environment-d-generator.c
index ea18cd60b..1719b69b9 100644
--- a/src/environment-d-generator/environment-d-generator.c
+++ b/src/environment-d-generator/environment-d-generator.c
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2017 Zbigniew Jędrzejewski-Szmek
-***/
#include "sd-path.h"
diff --git a/src/hostname/meson.build b/src/hostname/meson.build
index 732f33de9..db66ba553 100644
--- a/src/hostname/meson.build
+++ b/src/hostname/meson.build
@@ -1,6 +1,4 @@
# SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
if conf.get('ENABLE_HOSTNAMED') == 1
install_data('org.freedesktop.hostname1.conf',
diff --git a/src/import/meson.build b/src/import/meson.build
index 2fb4232d5..283ba08c6 100644
--- a/src/import/meson.build
+++ b/src/import/meson.build
@@ -1,6 +1,4 @@
# SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
systemd_importd_sources = files('''
importd.c
diff --git a/src/journal-remote/journal-remote-parse.c b/src/journal-remote/journal-remote-parse.c
index 0a8a0c144..535d06ac7 100644
--- a/src/journal-remote/journal-remote-parse.c
+++ b/src/journal-remote/journal-remote-parse.c
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-***/
#include "alloc-util.h"
#include "fd-util.h"
diff --git a/src/journal-remote/journal-remote-parse.h b/src/journal-remote/journal-remote-parse.h
index 8b605bbc1..d6c77360a 100644
--- a/src/journal-remote/journal-remote-parse.h
+++ b/src/journal-remote/journal-remote-parse.h
@@ -1,10 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
#pragma once
-/***
- Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-***/
-
#include "sd-event.h"
#include "journal-importer.h"
diff --git a/src/journal-remote/journal-remote-write.c b/src/journal-remote/journal-remote-write.c
index 844f8f231..9211e7df8 100644
--- a/src/journal-remote/journal-remote-write.c
+++ b/src/journal-remote/journal-remote-write.c
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2012 Zbigniew Jędrzejewski-Szmek
-***/
#include "alloc-util.h"
#include "journal-remote.h"
diff --git a/src/journal-remote/journal-remote-write.h b/src/journal-remote/journal-remote-write.h
index 745deace8..7ed32aa5a 100644
--- a/src/journal-remote/journal-remote-write.h
+++ b/src/journal-remote/journal-remote-write.h
@@ -1,10 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
#pragma once
-/***
- Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-***/
-
#include "journal-file.h"
#include "journal-importer.h"
diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c
index 150c057c7..beb75a1cb 100644
--- a/src/journal-remote/journal-remote.c
+++ b/src/journal-remote/journal-remote.c
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2012 Zbigniew Jędrzejewski-Szmek
-***/
#include <errno.h>
#include <fcntl.h>
diff --git a/src/journal-remote/journal-remote.h b/src/journal-remote/journal-remote.h
index eb7f814c5..e083ea9c7 100644
--- a/src/journal-remote/journal-remote.h
+++ b/src/journal-remote/journal-remote.h
@@ -1,10 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
#pragma once
-/***
- Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-***/
-
#include "sd-event.h"
#include "hashmap.h"
diff --git a/src/journal-remote/journal-upload-journal.c b/src/journal-remote/journal-upload-journal.c
index 71fbcf85d..3991dcb7d 100644
--- a/src/journal-remote/journal-upload-journal.c
+++ b/src/journal-remote/journal-upload-journal.c
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-***/
#include <curl/curl.h>
#include <stdbool.h>
diff --git a/src/journal-remote/journal-upload.c b/src/journal-remote/journal-upload.c
index 2e9bdc6d3..209e5011d 100644
--- a/src/journal-remote/journal-upload.c
+++ b/src/journal-remote/journal-upload.c
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-***/
#include <curl/curl.h>
#include <fcntl.h>
diff --git a/src/journal-remote/meson.build b/src/journal-remote/meson.build
index 7a8d01647..2887daa4b 100644
--- a/src/journal-remote/meson.build
+++ b/src/journal-remote/meson.build
@@ -1,6 +1,4 @@
# SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
systemd_journal_upload_sources = files('''
journal-upload.h
diff --git a/src/journal-remote/microhttpd-util.c b/src/journal-remote/microhttpd-util.c
index 9eb7c1bff..34dd9ea55 100644
--- a/src/journal-remote/microhttpd-util.c
+++ b/src/journal-remote/microhttpd-util.c
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2012 Zbigniew Jędrzejewski-Szmek
-***/
#include <stddef.h>
#include <stdio.h>
diff --git a/src/journal-remote/microhttpd-util.h b/src/journal-remote/microhttpd-util.h
index a9c03d455..a50a2a75c 100644
--- a/src/journal-remote/microhttpd-util.h
+++ b/src/journal-remote/microhttpd-util.h
@@ -1,10 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
#pragma once
-/***
- Copyright © 2012 Zbigniew Jędrzejewski-Szmek
-***/
-
#include <microhttpd.h>
#include <stdarg.h>
diff --git a/src/journal/audit-type.c b/src/journal/audit-type.c
index 9061bf82d..b30963da6 100644
--- a/src/journal/audit-type.c
+++ b/src/journal/audit-type.c
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2015 Zbigniew Jędrzejewski-Szmek
-***/
#include <stdio.h>
#include <linux/audit.h>
diff --git a/src/journal/audit-type.h b/src/journal/audit-type.h
index 971545e04..965b044cb 100644
--- a/src/journal/audit-type.h
+++ b/src/journal/audit-type.h
@@ -1,10 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
#pragma once
-/***
- Copyright © 2015 Zbigniew Jędrzejewski-Szmek
-***/
-
#include "macro.h"
const char *audit_type_to_string(int type);
diff --git a/src/journal/meson.build b/src/journal/meson.build
index 9cab720da..807dece54 100644
--- a/src/journal/meson.build
+++ b/src/journal/meson.build
@@ -1,6 +1,4 @@
# SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
journal_client_sources = files('''
audit-type.c
diff --git a/src/journal/test-audit-type.c b/src/journal/test-audit-type.c
index a3f6537d2..20e654b59 100644
--- a/src/journal/test-audit-type.c
+++ b/src/journal/test-audit-type.c
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2015 Zbigniew Jędrzejewski-Szmek
-***/
#include <stdio.h>
#include <linux/audit.h>
diff --git a/src/journal/test-catalog.c b/src/journal/test-catalog.c
index 836e38049..8eae99378 100644
--- a/src/journal/test-catalog.c
+++ b/src/journal/test-catalog.c
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-***/
#include <errno.h>
#include <fcntl.h>
diff --git a/src/journal/test-compress-benchmark.c b/src/journal/test-compress-benchmark.c
index 4eedd841d..dd5347689 100644
--- a/src/journal/test-compress-benchmark.c
+++ b/src/journal/test-compress-benchmark.c
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-***/
#include "alloc-util.h"
#include "compress.h"
diff --git a/src/journal/test-journal-init.c b/src/journal/test-journal-init.c
index 1eb0d0581..a43672b6e 100644
--- a/src/journal/test-journal-init.c
+++ b/src/journal/test-journal-init.c
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-***/
#include "sd-journal.h"
diff --git a/src/journal/test-journal-interleaving.c b/src/journal/test-journal-interleaving.c
index 22811a311..1f0c9f8f2 100644
--- a/src/journal/test-journal-interleaving.c
+++ b/src/journal/test-journal-interleaving.c
@@ -1,7 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
Copyright © 2013 Marius Vollmer
- Copyright © 2013 Zbigniew Jędrzejewski-Szmek
***/
#include <fcntl.h>
diff --git a/src/kernel-install/meson.build b/src/kernel-install/meson.build
index bfab25cb2..c6e6f816d 100644
--- a/src/kernel-install/meson.build
+++ b/src/kernel-install/meson.build
@@ -1,6 +1,4 @@
# SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
install_data('kernel-install',
install_mode : 'rwxr-xr-x',
diff --git a/src/libsystemd-network/meson.build b/src/libsystemd-network/meson.build
index 3c1bbff72..56d470ff6 100644
--- a/src/libsystemd-network/meson.build
+++ b/src/libsystemd-network/meson.build
@@ -1,6 +1,4 @@
# SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
sources = files('''
sd-dhcp-client.c
diff --git a/src/libsystemd/meson.build b/src/libsystemd/meson.build
index a494b7cec..070fd6c63 100644
--- a/src/libsystemd/meson.build
+++ b/src/libsystemd/meson.build
@@ -1,6 +1,4 @@
# SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
id128_sources = files('''
sd-id128/id128-util.c
diff --git a/src/libsystemd/sd-bus/bus-common-errors.c b/src/libsystemd/sd-bus/bus-common-errors.c
index ca1aa4879..ff0790bf5 100644
--- a/src/libsystemd/sd-bus/bus-common-errors.c
+++ b/src/libsystemd/sd-bus/bus-common-errors.c
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-***/
#include <errno.h>
diff --git a/src/libsystemd/sd-bus/test-bus-cleanup.c b/src/libsystemd/sd-bus/test-bus-cleanup.c
index 58fef014e..d1d962ebb 100644
--- a/src/libsystemd/sd-bus/test-bus-cleanup.c
+++ b/src/libsystemd/sd-bus/test-bus-cleanup.c
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-***/
#include <stdio.h>
diff --git a/src/libudev/meson.build b/src/libudev/meson.build
index 2b6a01d8f..323c7e97d 100644
--- a/src/libudev/meson.build
+++ b/src/libudev/meson.build
@@ -1,6 +1,4 @@
# SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
libudev_sources = files('''
libudev-private.h
diff --git a/src/locale/meson.build b/src/locale/meson.build
index f3d894b46..e87a10ebe 100644
--- a/src/locale/meson.build
+++ b/src/locale/meson.build
@@ -1,6 +1,4 @@
# SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
systemd_localed_sources = files('''
localed.c
diff --git a/src/locale/test-keymap-util.c b/src/locale/test-keymap-util.c
index 9fa5a59c6..e20731b25 100644
--- a/src/locale/test-keymap-util.c
+++ b/src/locale/test-keymap-util.c
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2016 Zbigniew Jędrzejewski-Szmek
-***/
#include "alloc-util.h"
#include "keymap-util.h"
diff --git a/src/login/meson.build b/src/login/meson.build
index 70d7a784f..4326a452c 100644
--- a/src/login/meson.build
+++ b/src/login/meson.build
@@ -1,6 +1,4 @@
# SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
systemd_logind_sources = files('''
logind.c
diff --git a/src/login/test-login-shared.c b/src/login/test-login-shared.c
index 08153b0b3..02ff57ab1 100644
--- a/src/login/test-login-shared.c
+++ b/src/login/test-login-shared.c
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-***/
#include "login-util.h"
#include "macro.h"
diff --git a/src/login/test-login-tables.c b/src/login/test-login-tables.c
index 642a81dea..02b871968 100644
--- a/src/login/test-login-tables.c
+++ b/src/login/test-login-tables.c
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-***/
#include "logind-action.h"
#include "logind-session.h"
diff --git a/src/machine/meson.build b/src/machine/meson.build
index 3b8ce24a1..d51587713 100644
--- a/src/machine/meson.build
+++ b/src/machine/meson.build
@@ -1,6 +1,4 @@
# SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
systemd_machined_sources = files('''
machined.c
diff --git a/src/machine/test-machine-tables.c b/src/machine/test-machine-tables.c
index cfd349826..04db7d825 100644
--- a/src/machine/test-machine-tables.c
+++ b/src/machine/test-machine-tables.c
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-***/
#include "machine.h"
#include "test-tables.h"
diff --git a/src/network/meson.build b/src/network/meson.build
index 78d3b6b01..8f5544ea0 100644
--- a/src/network/meson.build
+++ b/src/network/meson.build
@@ -1,6 +1,4 @@
# SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
sources = files('''
netdev/bond.c
diff --git a/src/network/test-networkd-conf.c b/src/network/test-networkd-conf.c
index a826ce97a..fc1646f4b 100644
--- a/src/network/test-networkd-conf.c
+++ b/src/network/test-networkd-conf.c
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2016 Zbigniew Jędrzejewski-Szmek
-***/
#include "ether-addr-util.h"
#include "hexdecoct.h"
diff --git a/src/network/test-routing-policy-rule.c b/src/network/test-routing-policy-rule.c
index e91290e8b..9920f516b 100644
--- a/src/network/test-routing-policy-rule.c
+++ b/src/network/test-routing-policy-rule.c
@@ -1,7 +1,5 @@
/***
SPDX-License-Identifier: LGPL-2.1+
-
- Copyright © 2017 Zbigniew Jędrzejewski-Szmek
***/
#include "fd-util.h"
diff --git a/src/nspawn/meson.build b/src/nspawn/meson.build
index 6b91c2be8..be54ba36c 100644
--- a/src/nspawn/meson.build
+++ b/src/nspawn/meson.build
@@ -1,6 +1,4 @@
# SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
libnspawn_core_sources = files('''
nspawn-cgroup.c
diff --git a/src/partition/growfs.c b/src/partition/growfs.c
index e1946b72f..d2053cd39 100644
--- a/src/partition/growfs.c
+++ b/src/partition/growfs.c
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2017 Zbigniew Jędrzejewski-Szmek
-***/
#include <errno.h>
#include <fcntl.h>
diff --git a/src/partition/makefs.c b/src/partition/makefs.c
index ae060d47e..8c2a783e9 100644
--- a/src/partition/makefs.c
+++ b/src/partition/makefs.c
@@ -1,7 +1,5 @@
/***
SPDX-License-Identifier: LGPL-2.1+
-
- Copyright © 2017 Zbigniew Jędrzejewski-Szmek
***/
#include <fcntl.h>
diff --git a/src/resolve/dns-type.c b/src/resolve/dns-type.c
index af55085ab..c96f60a06 100644
--- a/src/resolve/dns-type.c
+++ b/src/resolve/dns-type.c
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-***/
#include <sys/socket.h>
#include <errno.h>
diff --git a/src/resolve/dns-type.h b/src/resolve/dns-type.h
index 866b7b47e..8721536b5 100644
--- a/src/resolve/dns-type.h
+++ b/src/resolve/dns-type.h
@@ -1,10 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
#pragma once
-/***
- Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-***/
-
#include "macro.h"
/* DNS record types, taken from
diff --git a/src/resolve/meson.build b/src/resolve/meson.build
index aae5faf5c..759d1395d 100644
--- a/src/resolve/meson.build
+++ b/src/resolve/meson.build
@@ -1,6 +1,4 @@
# SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
basic_dns_sources = files('''
resolved-dns-dnssec.c
diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c
index 5780f60df..e96c13fea 100644
--- a/src/resolve/resolvectl.c
+++ b/src/resolve/resolvectl.c
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-***/
#include <getopt.h>
#include <net/if.h>
diff --git a/src/resolve/test-dns-packet.c b/src/resolve/test-dns-packet.c
index 2b773d996..905f000dc 100644
--- a/src/resolve/test-dns-packet.c
+++ b/src/resolve/test-dns-packet.c
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2016 Zbigniew Jędrzejewski-Szmek
-***/
#include <net/if.h>
#include <glob.h>
diff --git a/src/resolve/test-resolve-tables.c b/src/resolve/test-resolve-tables.c
index ec7cc1142..842d42b31 100644
--- a/src/resolve/test-resolve-tables.c
+++ b/src/resolve/test-resolve-tables.c
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-***/
#include "dns-type.h"
#include "test-tables.h"
diff --git a/src/resolve/test-resolved-packet.c b/src/resolve/test-resolved-packet.c
index 3db6fbb04..22ae26ce1 100644
--- a/src/resolve/test-resolved-packet.c
+++ b/src/resolve/test-resolved-packet.c
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2017 Zbigniew Jędrzejewski-Szmek
-***/
#include "log.h"
#include "resolved-dns-packet.h"
diff --git a/src/shared/bootspec.c b/src/shared/bootspec.c
index a48a12407..db8c04711 100644
--- a/src/shared/bootspec.c
+++ b/src/shared/bootspec.c
@@ -1,6 +1,4 @@
-/***
- Copyright © 2017 Zbigniew Jędrzejewski-Szmek
-***/
+
#include <stdio.h>
#include <linux/magic.h>
diff --git a/src/shared/bootspec.h b/src/shared/bootspec.h
index 4adc971ae..63083dc0d 100644
--- a/src/shared/bootspec.h
+++ b/src/shared/bootspec.h
@@ -1,6 +1,4 @@
-/***
- Copyright © 2017 Zbigniew Jędrzejewski-Szmek
-***/
+
#pragma once
diff --git a/src/shared/dropin.c b/src/shared/dropin.c
index 49c79a5bb..357c66d80 100644
--- a/src/shared/dropin.c
+++ b/src/shared/dropin.c
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-***/
#include <errno.h>
#include <stdarg.h>
diff --git a/src/shared/dropin.h b/src/shared/dropin.h
index 576974629..ae7379bee 100644
--- a/src/shared/dropin.h
+++ b/src/shared/dropin.h
@@ -1,10 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
#pragma once
-/***
- Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-***/
-
#include "hashmap.h"
#include "macro.h"
#include "set.h"
diff --git a/src/shared/fstab-util.c b/src/shared/fstab-util.c
index 9a07ce728..6fd9866c0 100644
--- a/src/shared/fstab-util.c
+++ b/src/shared/fstab-util.c
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2015 Zbigniew Jędrzejewski-Szmek
-***/
#include <errno.h>
#include <mntent.h>
diff --git a/src/shared/fstab-util.h b/src/shared/fstab-util.h
index a88a692fe..9820f78ca 100644
--- a/src/shared/fstab-util.h
+++ b/src/shared/fstab-util.h
@@ -1,10 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
#pragma once
-/***
- Copyright © 2015 Zbigniew Jędrzejewski-Szmek
-***/
-
#include <stdbool.h>
#include <stddef.h>
diff --git a/src/shared/install-printf.c b/src/shared/install-printf.c
index 8cd4c1523..078d5734b 100644
--- a/src/shared/install-printf.c
+++ b/src/shared/install-printf.c
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-***/
#include <errno.h>
#include <stdio.h>
diff --git a/src/shared/install-printf.h b/src/shared/install-printf.h
index a6aaea8fa..378b3bfd9 100644
--- a/src/shared/install-printf.h
+++ b/src/shared/install-printf.h
@@ -1,10 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
#pragma once
-/***
- Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-***/
-
#include "install.h"
int install_full_printf(UnitFileInstallInfo *i, const char *format, char **ret);
diff --git a/src/shared/journal-util.c b/src/shared/journal-util.c
index b8c71f261..89b76af5b 100644
--- a/src/shared/journal-util.c
+++ b/src/shared/journal-util.c
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-***/
#include "acl-util.h"
#include "fs-util.h"
diff --git a/src/shared/journal-util.h b/src/shared/journal-util.h
index 0fbe4834a..404fa53b3 100644
--- a/src/shared/journal-util.h
+++ b/src/shared/journal-util.h
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-***/
#include <stdbool.h>
#include <sys/types.h>
diff --git a/src/shared/meson.build b/src/shared/meson.build
index d81c2af47..54e77e9af 100644
--- a/src/shared/meson.build
+++ b/src/shared/meson.build
@@ -1,6 +1,4 @@
# SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
shared_sources = files('''
acl-util.h
diff --git a/src/shared/sleep-config.c b/src/shared/sleep-config.c
index 8fa0d6ff8..9e4ce183d 100644
--- a/src/shared/sleep-config.c
+++ b/src/shared/sleep-config.c
@@ -1,6 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- Copyright © 2013 Zbigniew Jędrzejewski-Szmek
Copyright © 2018 Dell Inc.
***/
diff --git a/src/shared/sleep-config.h b/src/shared/sleep-config.h
index 65a532c51..6bf035969 100644
--- a/src/shared/sleep-config.h
+++ b/src/shared/sleep-config.h
@@ -1,10 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
#pragma once
-/***
- Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-***/
-
#include <linux/fiemap.h>
#include "time-util.h"
diff --git a/src/shared/test-tables.h b/src/shared/test-tables.h
index e328b96ea..4eeda3b1b 100644
--- a/src/shared/test-tables.h
+++ b/src/shared/test-tables.h
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-***/
#include <stdio.h>
#include <stdlib.h>
diff --git a/src/shared/udev-util.c b/src/shared/udev-util.c
index 203605911..16a0eed84 100644
--- a/src/shared/udev-util.c
+++ b/src/shared/udev-util.c
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2017 Zbigniew Jędrzejewski-Szmek
-***/
#include <string.h>
diff --git a/src/shared/udev-util.h b/src/shared/udev-util.h
index 26bf848fd..f36c568b5 100644
--- a/src/shared/udev-util.h
+++ b/src/shared/udev-util.h
@@ -1,10 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
#pragma once
-/***
- Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-***/
-
#include "udev.h"
#include "util.h"
diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c
index 7e8594357..f26aa453c 100644
--- a/src/sleep/sleep.c
+++ b/src/sleep/sleep.c
@@ -1,6 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- Copyright © 2013 Zbigniew Jędrzejewski-Szmek
Copyright © 2010-2017 Canonical
Copyright © 2018 Dell Inc.
***/
diff --git a/src/systemd/meson.build b/src/systemd/meson.build
index c560b51d6..5f84439a5 100644
--- a/src/systemd/meson.build
+++ b/src/systemd/meson.build
@@ -1,6 +1,4 @@
# SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
_systemd_headers = '''
sd-bus.h
diff --git a/src/test/meson.build b/src/test/meson.build
index e4ddff9b5..7da7e3a22 100644
--- a/src/test/meson.build
+++ b/src/test/meson.build
@@ -1,6 +1,4 @@
# SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
awkscript = 'test-hashmap-ordered.awk'
test_hashmap_ordered_c = custom_target(
diff --git a/src/test/test-acl-util.c b/src/test/test-acl-util.c
index 589ed6705..81eb40444 100644
--- a/src/test/test-acl-util.c
+++ b/src/test/test-acl-util.c
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2015 Zbigniew Jędrzejewski-Szmek
-***/
#include <fcntl.h>
#include <stdlib.h>
diff --git a/src/test/test-ask-password-api.c b/src/test/test-ask-password-api.c
index f5456987b..ffd6da80f 100644
--- a/src/test/test-ask-password-api.c
+++ b/src/test/test-ask-password-api.c
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2016 Zbigniew Jędrzejewski-Szmek
-***/
#include "alloc-util.h"
#include "ask-password-api.h"
diff --git a/src/test/test-cgroup-util.c b/src/test/test-cgroup-util.c
index 77fecd401..d49356315 100644
--- a/src/test/test-cgroup-util.c
+++ b/src/test/test-cgroup-util.c
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-***/
#include "alloc-util.h"
#include "build.h"
diff --git a/src/test/test-dlopen.c b/src/test/test-dlopen.c
index d9dff0fe4..148ebaa4d 100644
--- a/src/test/test-dlopen.c
+++ b/src/test/test-dlopen.c
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2016 Zbigniew Jędrzejewski-Szmek
-***/
#include <dlfcn.h>
#include <stdlib.h>
diff --git a/src/test/test-env-util.c b/src/test/test-env-util.c
index f63e5a4cc..e645d4968 100644
--- a/src/test/test-env-util.c
+++ b/src/test/test-env-util.c
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2016 Zbigniew Jędrzejewski-Szmek
-***/
#include <string.h>
diff --git a/src/test/test-fstab-util.c b/src/test/test-fstab-util.c
index 37ea77c28..bd873a39b 100644
--- a/src/test/test-fstab-util.c
+++ b/src/test/test-fstab-util.c
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2015 Zbigniew Jędrzejewski-Szmek
-***/
#include "alloc-util.h"
#include "fstab-util.h"
diff --git a/src/test/test-gcrypt-util.c b/src/test/test-gcrypt-util.c
index 730c92055..d97523251 100644
--- a/src/test/test-gcrypt-util.c
+++ b/src/test/test-gcrypt-util.c
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+
- * Copyright © 2018 Zbigniew Jędrzejewski-Szmek
+ *
*/
#include "alloc-util.h"
diff --git a/src/test/test-hostname-util.c b/src/test/test-hostname-util.c
index b8e9abd8f..0f4e2d62c 100644
--- a/src/test/test-hostname-util.c
+++ b/src/test/test-hostname-util.c
@@ -1,7 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
Copyright © 2013 Thomas H.P. Andersen
- Copyright © 2015 Zbigniew Jędrzejewski-Szmek
***/
#include "alloc-util.h"
diff --git a/src/test/test-journal-importer.c b/src/test/test-journal-importer.c
index 1c8c21750..56bf6a129 100644
--- a/src/test/test-journal-importer.c
+++ b/src/test/test-journal-importer.c
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2016 Zbigniew Jędrzejewski-Szmek
-***/
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/src/test/test-namespace.c b/src/test/test-namespace.c
index 08025a570..b20273971 100644
--- a/src/test/test-namespace.c
+++ b/src/test/test-namespace.c
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-***/
#include <sys/socket.h>
diff --git a/src/test/test-nss.c b/src/test/test-nss.c
index 201c1d46f..9e543e755 100644
--- a/src/test/test-nss.c
+++ b/src/test/test-nss.c
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2016 Zbigniew Jędrzejewski-Szmek
-***/
#include <dlfcn.h>
#include <stdlib.h>
diff --git a/src/test/test-path-lookup.c b/src/test/test-path-lookup.c
index 56deda739..892293cb1 100644
--- a/src/test/test-path-lookup.c
+++ b/src/test/test-path-lookup.c
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-***/
#include <stdlib.h>
#include <sys/stat.h>
diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c
index 9ce467ee4..35b27bced 100644
--- a/src/test/test-path-util.c
+++ b/src/test/test-path-util.c
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-***/
#include <stdio.h>
#include <unistd.h>
diff --git a/src/test/test-random-util.c b/src/test/test-random-util.c
index 3fd0fe3f4..a4760b54a 100644
--- a/src/test/test-random-util.c
+++ b/src/test/test-random-util.c
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2017 Zbigniew Jędrzejewski-Szmek
-***/
#include "hexdecoct.h"
#include "random-util.h"
diff --git a/src/test/test-selinux.c b/src/test/test-selinux.c
index e867030da..6caeb843f 100644
--- a/src/test/test-selinux.c
+++ b/src/test/test-selinux.c
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2016 Zbigniew Jędrzejewski-Szmek
-***/
#include <sys/stat.h>
diff --git a/src/test/test-set.c b/src/test/test-set.c
index 331a87ca5..6307403e4 100644
--- a/src/test/test-set.c
+++ b/src/test/test-set.c
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-***/
#include "set.h"
diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c
index c2d5105ca..b948db35a 100644
--- a/src/test/test-sizeof.c
+++ b/src/test/test-sizeof.c
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2016 Zbigniew Jędrzejewski-Szmek
-***/
#include <stdio.h>
#include <string.h>
diff --git a/src/test/test-tables.c b/src/test/test-tables.c
index 4a57c7ef5..944104a25 100644
--- a/src/test/test-tables.c
+++ b/src/test/test-tables.c
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-***/
#include "architecture.h"
#include "automount.h"
diff --git a/src/test/test-tmpfiles.c b/src/test/test-tmpfiles.c
index 3398027c2..381779023 100644
--- a/src/test/test-tmpfiles.c
+++ b/src/test/test-tmpfiles.c
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-***/
#include <fcntl.h>
#include <stdio.h>
diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c
index 9203532f0..09b0179fa 100644
--- a/src/test/test-unit-file.c
+++ b/src/test/test-unit-file.c
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-***/
#include <fcntl.h>
#include <stddef.h>
diff --git a/src/test/test-unit-name.c b/src/test/test-unit-name.c
index 290f8c96b..3713fa4e2 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 © 2013 Zbigniew Jędrzejewski-Szmek
Copyright © 2014 Ronny Chevalier
***/
diff --git a/src/timedate/meson.build b/src/timedate/meson.build
index 5b2b2851a..46c7360da 100644
--- a/src/timedate/meson.build
+++ b/src/timedate/meson.build
@@ -1,6 +1,4 @@
# SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
if conf.get('ENABLE_TIMEDATED') == 1
install_data('org.freedesktop.timedate1.conf',
diff --git a/src/timesync/meson.build b/src/timesync/meson.build
index 9b6ffe4be..b79ef0827 100644
--- a/src/timesync/meson.build
+++ b/src/timesync/meson.build
@@ -1,6 +1,4 @@
# SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
systemd_timesyncd_sources = files('''
timesyncd.c
diff --git a/src/timesync/test-timesync.c b/src/timesync/test-timesync.c
index a044b3c39..a045eeeec 100644
--- a/src/timesync/test-timesync.c
+++ b/src/timesync/test-timesync.c
@@ -1,7 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2017 Zbigniew Jędrzejewski-Szmek
-***/
/* Some unit tests for the helper functions in timesyncd. */
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index a98ef2e63..c8d7532b7 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -1,7 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
Copyright © 2010 Kay Sievers
- Copyright © 2015 Zbigniew Jędrzejewski-Szmek
***/
#include <errno.h>
diff --git a/src/udev/meson.build b/src/udev/meson.build
index b4389a458..3bcd2bd3d 100644
--- a/src/udev/meson.build
+++ b/src/udev/meson.build
@@ -1,6 +1,4 @@
# SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
udevadm_sources = files('''
udevadm.c
diff --git a/src/udev/udevadm-util.h b/src/udev/udevadm-util.h
index 8fa2024b7..3ae78c7bc 100644
--- a/src/udev/udevadm-util.h
+++ b/src/udev/udevadm-util.h
@@ -2,8 +2,6 @@
#pragma once
/*
- * Copyright © 2014 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
- *
* 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
* the Free Software Foundation, either version 2 of the License, or
diff --git a/src/vconsole/meson.build b/src/vconsole/meson.build
index ddcb7f320..03065ec26 100644
--- a/src/vconsole/meson.build
+++ b/src/vconsole/meson.build
@@ -1,6 +1,4 @@
# SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
if conf.get('ENABLE_VCONSOLE') == 1
vconsole_rules = configure_file(
diff --git a/sysctl.d/meson.build b/sysctl.d/meson.build
index 27364c69b..64f6ce942 100644
--- a/sysctl.d/meson.build
+++ b/sysctl.d/meson.build
@@ -1,6 +1,4 @@
# SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
install_data(
'50-default.conf',
diff --git a/sysusers.d/meson.build b/sysusers.d/meson.build
index 05c94cdd7..eb99957e2 100644
--- a/sysusers.d/meson.build
+++ b/sysusers.d/meson.build
@@ -1,6 +1,4 @@
# SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
in_files = ['basic.conf']
diff --git a/test/fuzz-regressions/meson.build b/test/fuzz-regressions/meson.build
index 6f5efd521..3a2c30649 100644
--- a/test/fuzz-regressions/meson.build
+++ b/test/fuzz-regressions/meson.build
@@ -1,6 +1,4 @@
# SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2018 Zbigniew Jędrzejewski-Szmek
sanitize_address = custom_target(
'sanitize-address-fuzzers',
diff --git a/test/meson.build b/test/meson.build
index 37d466590..826e684e5 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -1,6 +1,4 @@
# SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
test_data_files = '''
a.service
diff --git a/tmpfiles.d/meson.build b/tmpfiles.d/meson.build
index 631fbb659..35eea2be5 100644
--- a/tmpfiles.d/meson.build
+++ b/tmpfiles.d/meson.build
@@ -1,6 +1,4 @@
# SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
enable_tmpfiles = conf.get('ENABLE_TMPFILES') == 1
diff --git a/tools/catalog-report.py b/tools/catalog-report.py
index cdae0f1b5..b65869d02 100755
--- a/tools/catalog-report.py
+++ b/tools/catalog-report.py
@@ -4,8 +4,6 @@
#
# This file is distributed under the MIT license, see below.
#
-# Copyright © 2016 Zbigniew Jędrzejewski-Szmek
-#
# The MIT License (MIT)
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/tools/make-directive-index.py b/tools/make-directive-index.py
index 9b3b96b64..cc306b817 100755
--- a/tools/make-directive-index.py
+++ b/tools/make-directive-index.py
@@ -1,8 +1,6 @@
#!/usr/bin/env python3
# -*- Mode: python; coding: utf-8; indent-tabs-mode: nil -*- */
# SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2012-2013 Zbigniew Jędrzejewski-Szmek
import sys
import collections
diff --git a/tools/make-man-index.py b/tools/make-man-index.py
index 453c97842..3c318cb75 100755
--- a/tools/make-man-index.py
+++ b/tools/make-man-index.py
@@ -1,8 +1,6 @@
#!/usr/bin/env python3
# -*- Mode: python; coding: utf-8; indent-tabs-mode: nil -*- */
# SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2013 Zbigniew Jędrzejewski-Szmek
import collections
import sys
diff --git a/tools/make-man-rules.py b/tools/make-man-rules.py
index 6f6347fe5..42a48bc98 100755
--- a/tools/make-man-rules.py
+++ b/tools/make-man-rules.py
@@ -1,8 +1,6 @@
#!/usr/bin/env python3
# -*- Mode: python; coding: utf-8; indent-tabs-mode: nil -*- */
# SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2013, 2017 Zbigniew Jędrzejewski-Szmek
from __future__ import print_function
import collections
diff --git a/tools/xml_helper.py b/tools/xml_helper.py
index 5b5fd0a5d..19e343b4e 100755
--- a/tools/xml_helper.py
+++ b/tools/xml_helper.py
@@ -1,8 +1,6 @@
#!/usr/bin/env python3
# -*- Mode: python; coding: utf-8; indent-tabs-mode: nil -*- */
# SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2012-2013 Zbigniew Jędrzejewski-Szmek
from lxml import etree as tree
diff --git a/units/meson.build b/units/meson.build
index 7857304a0..77d52c108 100644
--- a/units/meson.build
+++ b/units/meson.build
@@ -1,6 +1,4 @@
# SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
units = [
['basic.target', ''],
diff --git a/units/user/meson.build b/units/user/meson.build
index e32dcdc37..b1c2e9559 100644
--- a/units/user/meson.build
+++ b/units/user/meson.build
@@ -1,6 +1,4 @@
# SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
units = [
'basic.target',