From 031651a57a9a8e406b9aa944abd3c8a592b60d6f Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 25 Jun 2018 16:19:32 +0900
Subject: [PATCH 1/7] bus-util: drop unnecessary !!

---
 src/shared/bus-util.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c
index acbc98ad2a..8b02c6be26 100644
--- a/src/shared/bus-util.c
+++ b/src/shared/bus-util.c
@@ -500,7 +500,7 @@ int bus_verify_polkit_async(
         if (r < 0)
                 return r;
 
-        r = sd_bus_message_append(pk, "us", !!interactive, NULL);
+        r = sd_bus_message_append(pk, "us", interactive, NULL);
         if (r < 0)
                 return r;
 

From 599c44e6e22ba5242086c02584512368e66504d6 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 25 Jun 2018 21:04:22 +0900
Subject: [PATCH 2/7] network: update log message

Closes #9396.
---
 src/network/networkd-dhcp4.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c
index 9fd46ed764..1b2e9dafde 100644
--- a/src/network/networkd-dhcp4.c
+++ b/src/network/networkd-dhcp4.c
@@ -81,7 +81,9 @@ static int link_set_dhcp_routes(Link *link) {
                 return log_link_warning_errno(link, r, "DHCP error: could not get address: %m");
 
         n = sd_dhcp_lease_get_routes(link->dhcp_lease, &static_routes);
-        if (n < 0)
+        if (n == -ENODATA)
+                log_link_debug_errno(link, n, "DHCP: No routes received from DHCP server: %m");
+        else if (n < 0)
                 log_link_debug_errno(link, n, "DHCP error: could not get routes: %m");
 
         for (i = 0; i < n; i++) {

From 1e089bf8055ec2db761b8a43c0cf26caf7c107d8 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 29 Jun 2018 10:50:23 +0900
Subject: [PATCH 3/7] tree-wide: drop empty lines in the begining of comments

---
 src/systemd/_sd-common.h      | 1 -
 src/systemd/sd-bus-protocol.h | 1 -
 src/systemd/sd-bus-vtable.h   | 1 -
 src/systemd/sd-bus.h          | 1 -
 src/systemd/sd-daemon.h       | 1 -
 src/systemd/sd-event.h        | 1 -
 src/systemd/sd-id128.h        | 1 -
 src/systemd/sd-journal.h      | 1 -
 src/systemd/sd-login.h        | 1 -
 src/systemd/sd-messages.h     | 1 -
 src/systemd/sd-path.h         | 1 -
 src/systemd/sd-resolve.h      | 1 -
 src/systemd/sd-utf8.h         | 1 -
 13 files changed, 13 deletions(-)

diff --git a/src/systemd/_sd-common.h b/src/systemd/_sd-common.h
index 7b54d179eb..4742b2e742 100644
--- a/src/systemd/_sd-common.h
+++ b/src/systemd/_sd-common.h
@@ -3,7 +3,6 @@
 #define foosdcommonhfoo
 
 /***
-
   systemd is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published by
   the Free Software Foundation; either version 2.1 of the License, or
diff --git a/src/systemd/sd-bus-protocol.h b/src/systemd/sd-bus-protocol.h
index acff670f7f..a3f4e74359 100644
--- a/src/systemd/sd-bus-protocol.h
+++ b/src/systemd/sd-bus-protocol.h
@@ -3,7 +3,6 @@
 #define foosdbusprotocolhfoo
 
 /***
-
   systemd is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published by
   the Free Software Foundation; either version 2.1 of the License, or
diff --git a/src/systemd/sd-bus-vtable.h b/src/systemd/sd-bus-vtable.h
index 1268085498..4350a8c705 100644
--- a/src/systemd/sd-bus-vtable.h
+++ b/src/systemd/sd-bus-vtable.h
@@ -3,7 +3,6 @@
 #define foosdbusvtablehfoo
 
 /***
-
   systemd is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published by
   the Free Software Foundation; either version 2.1 of the License, or
diff --git a/src/systemd/sd-bus.h b/src/systemd/sd-bus.h
index 54c4b1ca83..3ede01ad43 100644
--- a/src/systemd/sd-bus.h
+++ b/src/systemd/sd-bus.h
@@ -3,7 +3,6 @@
 #define foosdbushfoo
 
 /***
-
   systemd is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published by
   the Free Software Foundation; either version 2.1 of the License, or
diff --git a/src/systemd/sd-daemon.h b/src/systemd/sd-daemon.h
index 59ca6c2785..62b0f723c7 100644
--- a/src/systemd/sd-daemon.h
+++ b/src/systemd/sd-daemon.h
@@ -3,7 +3,6 @@
 #define foosddaemonhfoo
 
 /***
-
   systemd is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published by
   the Free Software Foundation; either version 2.1 of the License, or
diff --git a/src/systemd/sd-event.h b/src/systemd/sd-event.h
index 7fcae4ac49..eb35b83431 100644
--- a/src/systemd/sd-event.h
+++ b/src/systemd/sd-event.h
@@ -3,7 +3,6 @@
 #define foosdeventhfoo
 
 /***
-
   systemd is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published by
   the Free Software Foundation; either version 2.1 of the License, or
diff --git a/src/systemd/sd-id128.h b/src/systemd/sd-id128.h
index b24fd06f01..143a0ffb5e 100644
--- a/src/systemd/sd-id128.h
+++ b/src/systemd/sd-id128.h
@@ -3,7 +3,6 @@
 #define foosdid128hfoo
 
 /***
-
   systemd is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published by
   the Free Software Foundation; either version 2.1 of the License, or
diff --git a/src/systemd/sd-journal.h b/src/systemd/sd-journal.h
index d34c201293..b4bf3b9176 100644
--- a/src/systemd/sd-journal.h
+++ b/src/systemd/sd-journal.h
@@ -3,7 +3,6 @@
 #define foosdjournalhfoo
 
 /***
-
   systemd is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published by
   the Free Software Foundation; either version 2.1 of the License, or
diff --git a/src/systemd/sd-login.h b/src/systemd/sd-login.h
index a4f70ef7cd..50be5433db 100644
--- a/src/systemd/sd-login.h
+++ b/src/systemd/sd-login.h
@@ -3,7 +3,6 @@
 #define foosdloginhfoo
 
 /***
-
   systemd is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published by
   the Free Software Foundation; either version 2.1 of the License, or
diff --git a/src/systemd/sd-messages.h b/src/systemd/sd-messages.h
index 2adfe16062..2f0e8966ab 100644
--- a/src/systemd/sd-messages.h
+++ b/src/systemd/sd-messages.h
@@ -3,7 +3,6 @@
 #define foosdmessageshfoo
 
 /***
-
   systemd is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published by
   the Free Software Foundation; either version 2.1 of the License, or
diff --git a/src/systemd/sd-path.h b/src/systemd/sd-path.h
index 65178b63a1..d9b99de0d8 100644
--- a/src/systemd/sd-path.h
+++ b/src/systemd/sd-path.h
@@ -3,7 +3,6 @@
 #define foosdpathhfoo
 
 /***
-
   systemd is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published by
   the Free Software Foundation; either version 2.1 of the License, or
diff --git a/src/systemd/sd-resolve.h b/src/systemd/sd-resolve.h
index 4c6499815a..954b9f0206 100644
--- a/src/systemd/sd-resolve.h
+++ b/src/systemd/sd-resolve.h
@@ -3,7 +3,6 @@
 #define foosdresolvehfoo
 
 /***
-
   systemd is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published by
   the Free Software Foundation; either version 2.1 of the License, or
diff --git a/src/systemd/sd-utf8.h b/src/systemd/sd-utf8.h
index 7f2af65049..151b423d51 100644
--- a/src/systemd/sd-utf8.h
+++ b/src/systemd/sd-utf8.h
@@ -3,7 +3,6 @@
 #define foosdutf8hfoo
 
 /***
-
   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

From 8f5dd8c094d15da43731ef7aaf463161d3661282 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 29 Jun 2018 11:00:30 +0900
Subject: [PATCH 4/7] tree-wide: drop empty comments

---
 src/libsystemd/sd-bus/bus-common-errors.h        | 2 --
 src/libsystemd/sd-bus/bus-container.c            | 2 --
 src/libsystemd/sd-bus/bus-container.h            | 2 --
 src/libsystemd/sd-bus/bus-control.c              | 2 --
 src/libsystemd/sd-bus/bus-control.h              | 2 --
 src/libsystemd/sd-bus/bus-convenience.c          | 2 --
 src/libsystemd/sd-bus/bus-creds.c                | 2 --
 src/libsystemd/sd-bus/bus-creds.h                | 2 --
 src/libsystemd/sd-bus/bus-dump.c                 | 2 --
 src/libsystemd/sd-bus/bus-dump.h                 | 2 --
 src/libsystemd/sd-bus/bus-error.c                | 2 --
 src/libsystemd/sd-bus/bus-error.h                | 2 --
 src/libsystemd/sd-bus/bus-gvariant.c             | 2 --
 src/libsystemd/sd-bus/bus-gvariant.h             | 2 --
 src/libsystemd/sd-bus/bus-internal.c             | 2 --
 src/libsystemd/sd-bus/bus-internal.h             | 2 --
 src/libsystemd/sd-bus/bus-introspect.c           | 2 --
 src/libsystemd/sd-bus/bus-introspect.h           | 2 --
 src/libsystemd/sd-bus/bus-kernel.c               | 2 --
 src/libsystemd/sd-bus/bus-kernel.h               | 2 --
 src/libsystemd/sd-bus/bus-match.c                | 2 --
 src/libsystemd/sd-bus/bus-match.h                | 2 --
 src/libsystemd/sd-bus/bus-message.c              | 2 --
 src/libsystemd/sd-bus/bus-message.h              | 2 --
 src/libsystemd/sd-bus/bus-objects.c              | 2 --
 src/libsystemd/sd-bus/bus-objects.h              | 2 --
 src/libsystemd/sd-bus/bus-protocol.h             | 2 --
 src/libsystemd/sd-bus/bus-signature.c            | 2 --
 src/libsystemd/sd-bus/bus-signature.h            | 2 --
 src/libsystemd/sd-bus/bus-slot.c                 | 2 --
 src/libsystemd/sd-bus/bus-slot.h                 | 2 --
 src/libsystemd/sd-bus/bus-socket.c               | 2 --
 src/libsystemd/sd-bus/bus-socket.h               | 2 --
 src/libsystemd/sd-bus/bus-track.c                | 2 --
 src/libsystemd/sd-bus/bus-track.h                | 2 --
 src/libsystemd/sd-bus/bus-type.c                 | 2 --
 src/libsystemd/sd-bus/bus-type.h                 | 2 --
 src/libsystemd/sd-bus/sd-bus.c                   | 2 --
 src/libsystemd/sd-bus/test-bus-benchmark.c       | 2 --
 src/libsystemd/sd-bus/test-bus-chat.c            | 2 --
 src/libsystemd/sd-bus/test-bus-creds.c           | 2 --
 src/libsystemd/sd-bus/test-bus-error.c           | 2 --
 src/libsystemd/sd-bus/test-bus-gvariant.c        | 2 --
 src/libsystemd/sd-bus/test-bus-introspect.c      | 2 --
 src/libsystemd/sd-bus/test-bus-marshal.c         | 2 --
 src/libsystemd/sd-bus/test-bus-match.c           | 2 --
 src/libsystemd/sd-bus/test-bus-objects.c         | 2 --
 src/libsystemd/sd-bus/test-bus-server.c          | 2 --
 src/libsystemd/sd-bus/test-bus-signature.c       | 2 --
 src/libsystemd/sd-bus/test-bus-track.c           | 2 --
 src/libsystemd/sd-bus/test-bus-watch-bind.c      | 2 --
 src/libsystemd/sd-daemon/sd-daemon.c             | 2 --
 src/libsystemd/sd-event/sd-event.c               | 2 --
 src/libsystemd/sd-event/test-event.c             | 2 --
 src/libsystemd/sd-id128/id128-util.c             | 2 --
 src/libsystemd/sd-id128/id128-util.h             | 2 --
 src/libsystemd/sd-id128/sd-id128.c               | 2 --
 src/libsystemd/sd-login/sd-login.c               | 2 --
 src/libsystemd/sd-login/test-login.c             | 2 --
 src/libsystemd/sd-netlink/local-addresses.h      | 2 --
 src/libsystemd/sd-netlink/test-local-addresses.c | 2 --
 src/libsystemd/sd-network/network-util.c         | 2 --
 src/libsystemd/sd-path/sd-path.c                 | 2 --
 src/libsystemd/sd-resolve/sd-resolve.c           | 2 --
 src/libsystemd/sd-utf8/sd-utf8.c                 | 2 --
 src/resolve/resolved-dns-packet.c                | 2 --
 src/resolve/resolved-dns-packet.h                | 2 --
 src/resolve/resolved-dns-rr.h                    | 2 --
 src/shared/dns-domain.c                          | 2 --
 src/shared/dns-domain.h                          | 2 --
 src/test/test-dns-domain.c                       | 2 --
 71 files changed, 142 deletions(-)

diff --git a/src/libsystemd/sd-bus/bus-common-errors.h b/src/libsystemd/sd-bus/bus-common-errors.h
index 3945c7f6ac..6b2c04fb32 100644
--- a/src/libsystemd/sd-bus/bus-common-errors.h
+++ b/src/libsystemd/sd-bus/bus-common-errors.h
@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-***/
 
 #include "bus-error.h"
 
diff --git a/src/libsystemd/sd-bus/bus-container.c b/src/libsystemd/sd-bus/bus-container.c
index f50274a6a4..38023087a3 100644
--- a/src/libsystemd/sd-bus/bus-container.c
+++ b/src/libsystemd/sd-bus/bus-container.c
@@ -1,6 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-***/
 
 #include <fcntl.h>
 #include <unistd.h>
diff --git a/src/libsystemd/sd-bus/bus-container.h b/src/libsystemd/sd-bus/bus-container.h
index dd115b4e24..e2ccd0d77b 100644
--- a/src/libsystemd/sd-bus/bus-container.h
+++ b/src/libsystemd/sd-bus/bus-container.h
@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-***/
 
 #include "sd-bus.h"
 
diff --git a/src/libsystemd/sd-bus/bus-control.c b/src/libsystemd/sd-bus/bus-control.c
index 18a2cc2c9b..2787e8505b 100644
--- a/src/libsystemd/sd-bus/bus-control.c
+++ b/src/libsystemd/sd-bus/bus-control.c
@@ -1,6 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-***/
 
 #if HAVE_VALGRIND_MEMCHECK_H
 #include <valgrind/memcheck.h>
diff --git a/src/libsystemd/sd-bus/bus-control.h b/src/libsystemd/sd-bus/bus-control.h
index 9017297496..c53361d558 100644
--- a/src/libsystemd/sd-bus/bus-control.h
+++ b/src/libsystemd/sd-bus/bus-control.h
@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-***/
 
 #include "sd-bus.h"
 
diff --git a/src/libsystemd/sd-bus/bus-convenience.c b/src/libsystemd/sd-bus/bus-convenience.c
index 41910515db..c4d4016fc0 100644
--- a/src/libsystemd/sd-bus/bus-convenience.c
+++ b/src/libsystemd/sd-bus/bus-convenience.c
@@ -1,6 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-***/
 
 #include "bus-internal.h"
 #include "bus-message.h"
diff --git a/src/libsystemd/sd-bus/bus-creds.c b/src/libsystemd/sd-bus/bus-creds.c
index aae9fcd58b..738c922ce0 100644
--- a/src/libsystemd/sd-bus/bus-creds.c
+++ b/src/libsystemd/sd-bus/bus-creds.c
@@ -1,6 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-***/
 
 #include <linux/capability.h>
 #include <stdlib.h>
diff --git a/src/libsystemd/sd-bus/bus-creds.h b/src/libsystemd/sd-bus/bus-creds.h
index 7b77a1d735..55e53501c2 100644
--- a/src/libsystemd/sd-bus/bus-creds.h
+++ b/src/libsystemd/sd-bus/bus-creds.h
@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-***/
 
 #include <stdbool.h>
 
diff --git a/src/libsystemd/sd-bus/bus-dump.c b/src/libsystemd/sd-bus/bus-dump.c
index 3a28c7c6e3..888f161768 100644
--- a/src/libsystemd/sd-bus/bus-dump.c
+++ b/src/libsystemd/sd-bus/bus-dump.c
@@ -1,6 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-***/
 
 #include "alloc-util.h"
 #include "bus-dump.h"
diff --git a/src/libsystemd/sd-bus/bus-dump.h b/src/libsystemd/sd-bus/bus-dump.h
index 8e47411a45..97fce1b7d6 100644
--- a/src/libsystemd/sd-bus/bus-dump.h
+++ b/src/libsystemd/sd-bus/bus-dump.h
@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-***/
 
 #include <stdbool.h>
 #include <stdio.h>
diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c
index ec359ac13c..0f79ddc427 100644
--- a/src/libsystemd/sd-bus/bus-error.c
+++ b/src/libsystemd/sd-bus/bus-error.c
@@ -1,6 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-***/
 
 #include <errno.h>
 #include <stdarg.h>
diff --git a/src/libsystemd/sd-bus/bus-error.h b/src/libsystemd/sd-bus/bus-error.h
index 93cb9acd91..97acb4839f 100644
--- a/src/libsystemd/sd-bus/bus-error.h
+++ b/src/libsystemd/sd-bus/bus-error.h
@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-***/
 
 #include <stdbool.h>
 
diff --git a/src/libsystemd/sd-bus/bus-gvariant.c b/src/libsystemd/sd-bus/bus-gvariant.c
index 05b17589dd..ba503b3213 100644
--- a/src/libsystemd/sd-bus/bus-gvariant.c
+++ b/src/libsystemd/sd-bus/bus-gvariant.c
@@ -1,6 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-***/
 
 #include <errno.h>
 #include <string.h>
diff --git a/src/libsystemd/sd-bus/bus-gvariant.h b/src/libsystemd/sd-bus/bus-gvariant.h
index 40e3053ec6..b9fed26da1 100644
--- a/src/libsystemd/sd-bus/bus-gvariant.h
+++ b/src/libsystemd/sd-bus/bus-gvariant.h
@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-***/
 
 #include "macro.h"
 
diff --git a/src/libsystemd/sd-bus/bus-internal.c b/src/libsystemd/sd-bus/bus-internal.c
index 7bb653338d..1310cf91e5 100644
--- a/src/libsystemd/sd-bus/bus-internal.c
+++ b/src/libsystemd/sd-bus/bus-internal.c
@@ -1,6 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-***/
 
 #include "alloc-util.h"
 #include "bus-internal.h"
diff --git a/src/libsystemd/sd-bus/bus-internal.h b/src/libsystemd/sd-bus/bus-internal.h
index 4c07d55b61..4586e49034 100644
--- a/src/libsystemd/sd-bus/bus-internal.h
+++ b/src/libsystemd/sd-bus/bus-internal.h
@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-***/
 
 #include <pthread.h>
 #include <sys/socket.h>
diff --git a/src/libsystemd/sd-bus/bus-introspect.c b/src/libsystemd/sd-bus/bus-introspect.c
index 582e723e2e..f623dd9ce0 100644
--- a/src/libsystemd/sd-bus/bus-introspect.c
+++ b/src/libsystemd/sd-bus/bus-introspect.c
@@ -1,6 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-***/
 
 #include <stdio_ext.h>
 
diff --git a/src/libsystemd/sd-bus/bus-introspect.h b/src/libsystemd/sd-bus/bus-introspect.h
index 5dcaeace9d..eb4a6887f5 100644
--- a/src/libsystemd/sd-bus/bus-introspect.h
+++ b/src/libsystemd/sd-bus/bus-introspect.h
@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-***/
 
 #include <stdio.h>
 
diff --git a/src/libsystemd/sd-bus/bus-kernel.c b/src/libsystemd/sd-bus/bus-kernel.c
index 1f61bd3f95..34c8a9f8c8 100644
--- a/src/libsystemd/sd-bus/bus-kernel.c
+++ b/src/libsystemd/sd-bus/bus-kernel.c
@@ -1,6 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-***/
 
 #if HAVE_VALGRIND_MEMCHECK_H
 #include <valgrind/memcheck.h>
diff --git a/src/libsystemd/sd-bus/bus-kernel.h b/src/libsystemd/sd-bus/bus-kernel.h
index 44c9a76311..fac02a69c1 100644
--- a/src/libsystemd/sd-bus/bus-kernel.h
+++ b/src/libsystemd/sd-bus/bus-kernel.h
@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-***/
 
 #include "sd-bus.h"
 
diff --git a/src/libsystemd/sd-bus/bus-match.c b/src/libsystemd/sd-bus/bus-match.c
index 7d04cc4bd1..6ac57d48e3 100644
--- a/src/libsystemd/sd-bus/bus-match.c
+++ b/src/libsystemd/sd-bus/bus-match.c
@@ -1,6 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-***/
 
 #include <stdio_ext.h>
 
diff --git a/src/libsystemd/sd-bus/bus-match.h b/src/libsystemd/sd-bus/bus-match.h
index 050f4ba033..f7c7205aae 100644
--- a/src/libsystemd/sd-bus/bus-match.h
+++ b/src/libsystemd/sd-bus/bus-match.h
@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-***/
 
 #include "sd-bus.h"
 
diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c
index 8d92bc2002..6331a5e099 100644
--- a/src/libsystemd/sd-bus/bus-message.c
+++ b/src/libsystemd/sd-bus/bus-message.c
@@ -1,6 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-***/
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/src/libsystemd/sd-bus/bus-message.h b/src/libsystemd/sd-bus/bus-message.h
index 97f6060e30..d17cec4b78 100644
--- a/src/libsystemd/sd-bus/bus-message.h
+++ b/src/libsystemd/sd-bus/bus-message.h
@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-***/
 
 #include <byteswap.h>
 #include <stdbool.h>
diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c
index 9609834fa9..0d4e75ccde 100644
--- a/src/libsystemd/sd-bus/bus-objects.c
+++ b/src/libsystemd/sd-bus/bus-objects.c
@@ -1,6 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-***/
 
 #include "alloc-util.h"
 #include "bus-internal.h"
diff --git a/src/libsystemd/sd-bus/bus-objects.h b/src/libsystemd/sd-bus/bus-objects.h
index e8e1a522cb..961aabe88e 100644
--- a/src/libsystemd/sd-bus/bus-objects.h
+++ b/src/libsystemd/sd-bus/bus-objects.h
@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-***/
 
 #include "bus-internal.h"
 
diff --git a/src/libsystemd/sd-bus/bus-protocol.h b/src/libsystemd/sd-bus/bus-protocol.h
index 20d19d4022..a44f530e27 100644
--- a/src/libsystemd/sd-bus/bus-protocol.h
+++ b/src/libsystemd/sd-bus/bus-protocol.h
@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-***/
 
 #include <endian.h>
 
diff --git a/src/libsystemd/sd-bus/bus-signature.c b/src/libsystemd/sd-bus/bus-signature.c
index 18c91e8707..06ef1ee4cb 100644
--- a/src/libsystemd/sd-bus/bus-signature.c
+++ b/src/libsystemd/sd-bus/bus-signature.c
@@ -1,6 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-***/
 
 #include <util.h>
 
diff --git a/src/libsystemd/sd-bus/bus-signature.h b/src/libsystemd/sd-bus/bus-signature.h
index d4b43bac00..58b1e4794a 100644
--- a/src/libsystemd/sd-bus/bus-signature.h
+++ b/src/libsystemd/sd-bus/bus-signature.h
@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-***/
 
 #include <stdbool.h>
 
diff --git a/src/libsystemd/sd-bus/bus-slot.c b/src/libsystemd/sd-bus/bus-slot.c
index fbf37320d3..984322a320 100644
--- a/src/libsystemd/sd-bus/bus-slot.c
+++ b/src/libsystemd/sd-bus/bus-slot.c
@@ -1,6 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-***/
 
 #include "sd-bus.h"
 
diff --git a/src/libsystemd/sd-bus/bus-slot.h b/src/libsystemd/sd-bus/bus-slot.h
index f1e1e23ac6..cf0ed4f755 100644
--- a/src/libsystemd/sd-bus/bus-slot.h
+++ b/src/libsystemd/sd-bus/bus-slot.h
@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-***/
 
 #include "sd-bus.h"
 
diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c
index b147a3843a..be491c957f 100644
--- a/src/libsystemd/sd-bus/bus-socket.c
+++ b/src/libsystemd/sd-bus/bus-socket.c
@@ -1,6 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-***/
 
 #include <endian.h>
 #include <poll.h>
diff --git a/src/libsystemd/sd-bus/bus-socket.h b/src/libsystemd/sd-bus/bus-socket.h
index d1118ca1d4..a21cbdd7d9 100644
--- a/src/libsystemd/sd-bus/bus-socket.h
+++ b/src/libsystemd/sd-bus/bus-socket.h
@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-***/
 
 #include "sd-bus.h"
 
diff --git a/src/libsystemd/sd-bus/bus-track.c b/src/libsystemd/sd-bus/bus-track.c
index 16bf615f50..d183eb57dc 100644
--- a/src/libsystemd/sd-bus/bus-track.c
+++ b/src/libsystemd/sd-bus/bus-track.c
@@ -1,6 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-***/
 
 #include "sd-bus.h"
 
diff --git a/src/libsystemd/sd-bus/bus-track.h b/src/libsystemd/sd-bus/bus-track.h
index f9590265d7..602647f8e3 100644
--- a/src/libsystemd/sd-bus/bus-track.h
+++ b/src/libsystemd/sd-bus/bus-track.h
@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-***/
 
 void bus_track_dispatch(sd_bus_track *track);
 void bus_track_close(sd_bus_track *track);
diff --git a/src/libsystemd/sd-bus/bus-type.c b/src/libsystemd/sd-bus/bus-type.c
index bc6726f9cf..63eed99d28 100644
--- a/src/libsystemd/sd-bus/bus-type.c
+++ b/src/libsystemd/sd-bus/bus-type.c
@@ -1,6 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-***/
 
 #include <errno.h>
 
diff --git a/src/libsystemd/sd-bus/bus-type.h b/src/libsystemd/sd-bus/bus-type.h
index cdac55c62e..a6e1de276d 100644
--- a/src/libsystemd/sd-bus/bus-type.h
+++ b/src/libsystemd/sd-bus/bus-type.h
@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-***/
 
 #include <stdbool.h>
 
diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c
index 089b51a6d9..ce49580edb 100644
--- a/src/libsystemd/sd-bus/sd-bus.c
+++ b/src/libsystemd/sd-bus/sd-bus.c
@@ -1,6 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-***/
 
 #include <endian.h>
 #include <netdb.h>
diff --git a/src/libsystemd/sd-bus/test-bus-benchmark.c b/src/libsystemd/sd-bus/test-bus-benchmark.c
index 8134abba2f..92624909e0 100644
--- a/src/libsystemd/sd-bus/test-bus-benchmark.c
+++ b/src/libsystemd/sd-bus/test-bus-benchmark.c
@@ -1,6 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-***/
 
 #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 1e25e94586..f3ff856e42 100644
--- a/src/libsystemd/sd-bus/test-bus-chat.c
+++ b/src/libsystemd/sd-bus/test-bus-chat.c
@@ -1,6 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-***/
 
 #include <fcntl.h>
 #include <pthread.h>
diff --git a/src/libsystemd/sd-bus/test-bus-creds.c b/src/libsystemd/sd-bus/test-bus-creds.c
index 6746c0973e..69f1f3e345 100644
--- a/src/libsystemd/sd-bus/test-bus-creds.c
+++ b/src/libsystemd/sd-bus/test-bus-creds.c
@@ -1,6 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-***/
 
 #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 250657b18e..8f1fc54520 100644
--- a/src/libsystemd/sd-bus/test-bus-error.c
+++ b/src/libsystemd/sd-bus/test-bus-error.c
@@ -1,6 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-***/
 
 #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 75804f3458..33f4d1ee0b 100644
--- a/src/libsystemd/sd-bus/test-bus-gvariant.c
+++ b/src/libsystemd/sd-bus/test-bus-gvariant.c
@@ -1,6 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-***/
 
 #if HAVE_GLIB
 #include <glib.h>
diff --git a/src/libsystemd/sd-bus/test-bus-introspect.c b/src/libsystemd/sd-bus/test-bus-introspect.c
index 00167cb643..940dbfe0e7 100644
--- a/src/libsystemd/sd-bus/test-bus-introspect.c
+++ b/src/libsystemd/sd-bus/test-bus-introspect.c
@@ -1,6 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-***/
 
 #include "bus-introspect.h"
 #include "log.h"
diff --git a/src/libsystemd/sd-bus/test-bus-marshal.c b/src/libsystemd/sd-bus/test-bus-marshal.c
index c647f0ff12..cc1b61ce58 100644
--- a/src/libsystemd/sd-bus/test-bus-marshal.c
+++ b/src/libsystemd/sd-bus/test-bus-marshal.c
@@ -1,6 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-***/
 
 #include <math.h>
 #include <stdlib.h>
diff --git a/src/libsystemd/sd-bus/test-bus-match.c b/src/libsystemd/sd-bus/test-bus-match.c
index 2822a8f82a..2f1d057eb9 100644
--- a/src/libsystemd/sd-bus/test-bus-match.c
+++ b/src/libsystemd/sd-bus/test-bus-match.c
@@ -1,6 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-***/
 
 #include "bus-match.h"
 #include "bus-message.h"
diff --git a/src/libsystemd/sd-bus/test-bus-objects.c b/src/libsystemd/sd-bus/test-bus-objects.c
index 094dd6c8a0..c12795b033 100644
--- a/src/libsystemd/sd-bus/test-bus-objects.c
+++ b/src/libsystemd/sd-bus/test-bus-objects.c
@@ -1,6 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-***/
 
 #include <pthread.h>
 #include <stdlib.h>
diff --git a/src/libsystemd/sd-bus/test-bus-server.c b/src/libsystemd/sd-bus/test-bus-server.c
index 31b54e252c..17e46e5a2b 100644
--- a/src/libsystemd/sd-bus/test-bus-server.c
+++ b/src/libsystemd/sd-bus/test-bus-server.c
@@ -1,6 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-***/
 
 #include <pthread.h>
 #include <stdlib.h>
diff --git a/src/libsystemd/sd-bus/test-bus-signature.c b/src/libsystemd/sd-bus/test-bus-signature.c
index 1ba1909198..ab59d04e20 100644
--- a/src/libsystemd/sd-bus/test-bus-signature.c
+++ b/src/libsystemd/sd-bus/test-bus-signature.c
@@ -1,6 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-***/
 
 #include "bus-internal.h"
 #include "bus-signature.h"
diff --git a/src/libsystemd/sd-bus/test-bus-track.c b/src/libsystemd/sd-bus/test-bus-track.c
index 48d708b258..b75703f14f 100644
--- a/src/libsystemd/sd-bus/test-bus-track.c
+++ b/src/libsystemd/sd-bus/test-bus-track.c
@@ -1,6 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-***/
 
 #include <errno.h>
 #include <sys/socket.h>
diff --git a/src/libsystemd/sd-bus/test-bus-watch-bind.c b/src/libsystemd/sd-bus/test-bus-watch-bind.c
index 42a9ce5301..1796feaa2f 100644
--- a/src/libsystemd/sd-bus/test-bus-watch-bind.c
+++ b/src/libsystemd/sd-bus/test-bus-watch-bind.c
@@ -1,6 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-***/
 
 #include <pthread.h>
 
diff --git a/src/libsystemd/sd-daemon/sd-daemon.c b/src/libsystemd/sd-daemon/sd-daemon.c
index 9e9b115557..c8b5c67d18 100644
--- a/src/libsystemd/sd-daemon/sd-daemon.c
+++ b/src/libsystemd/sd-daemon/sd-daemon.c
@@ -1,6 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-***/
 
 #include <errno.h>
 #include <limits.h>
diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c
index 0ccd3edcae..6e50fcc4c6 100644
--- a/src/libsystemd/sd-event/sd-event.c
+++ b/src/libsystemd/sd-event/sd-event.c
@@ -1,6 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-***/
 
 #include <sys/epoll.h>
 #include <sys/timerfd.h>
diff --git a/src/libsystemd/sd-event/test-event.c b/src/libsystemd/sd-event/test-event.c
index bde00cf719..1f08b4d4b8 100644
--- a/src/libsystemd/sd-event/test-event.c
+++ b/src/libsystemd/sd-event/test-event.c
@@ -1,6 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-***/
 
 #include <sys/wait.h>
 
diff --git a/src/libsystemd/sd-id128/id128-util.c b/src/libsystemd/sd-id128/id128-util.c
index edee985e44..95c9e1138c 100644
--- a/src/libsystemd/sd-id128/id128-util.c
+++ b/src/libsystemd/sd-id128/id128-util.c
@@ -1,6 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-***/
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/src/libsystemd/sd-id128/id128-util.h b/src/libsystemd/sd-id128/id128-util.h
index f0b4eca581..ffd6d61f08 100644
--- a/src/libsystemd/sd-id128/id128-util.h
+++ b/src/libsystemd/sd-id128/id128-util.h
@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-***/
 
 #include <stdbool.h>
 
diff --git a/src/libsystemd/sd-id128/sd-id128.c b/src/libsystemd/sd-id128/sd-id128.c
index b7123280f3..9d93732d7e 100644
--- a/src/libsystemd/sd-id128/sd-id128.c
+++ b/src/libsystemd/sd-id128/sd-id128.c
@@ -1,6 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-***/
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/src/libsystemd/sd-login/sd-login.c b/src/libsystemd/sd-login/sd-login.c
index c2f7133e42..9dfba51cea 100644
--- a/src/libsystemd/sd-login/sd-login.c
+++ b/src/libsystemd/sd-login/sd-login.c
@@ -1,6 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-***/
 
 #include <errno.h>
 #include <poll.h>
diff --git a/src/libsystemd/sd-login/test-login.c b/src/libsystemd/sd-login/test-login.c
index ccb1905a46..1789e547b8 100644
--- a/src/libsystemd/sd-login/test-login.c
+++ b/src/libsystemd/sd-login/test-login.c
@@ -1,6 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-***/
 
 #include <poll.h>
 #include <string.h>
diff --git a/src/libsystemd/sd-netlink/local-addresses.h b/src/libsystemd/sd-netlink/local-addresses.h
index 4fc3477e47..628f00871d 100644
--- a/src/libsystemd/sd-netlink/local-addresses.h
+++ b/src/libsystemd/sd-netlink/local-addresses.h
@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-***/
 
 #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 921ce289d4..cb05d05a89 100644
--- a/src/libsystemd/sd-netlink/test-local-addresses.c
+++ b/src/libsystemd/sd-netlink/test-local-addresses.c
@@ -1,6 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-***/
 
 #include "af-list.h"
 #include "alloc-util.h"
diff --git a/src/libsystemd/sd-network/network-util.c b/src/libsystemd/sd-network/network-util.c
index 256d4a27a5..df5ce86842 100644
--- a/src/libsystemd/sd-network/network-util.c
+++ b/src/libsystemd/sd-network/network-util.c
@@ -1,6 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-***/
 
 #include "alloc-util.h"
 #include "fd-util.h"
diff --git a/src/libsystemd/sd-path/sd-path.c b/src/libsystemd/sd-path/sd-path.c
index 2845f91e1b..ec6e597ec0 100644
--- a/src/libsystemd/sd-path/sd-path.c
+++ b/src/libsystemd/sd-path/sd-path.c
@@ -1,6 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-***/
 
 #include "sd-path.h"
 
diff --git a/src/libsystemd/sd-resolve/sd-resolve.c b/src/libsystemd/sd-resolve/sd-resolve.c
index a189f140f8..c4fefb1b9a 100644
--- a/src/libsystemd/sd-resolve/sd-resolve.c
+++ b/src/libsystemd/sd-resolve/sd-resolve.c
@@ -1,6 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-***/
 
 #include <errno.h>
 #include <poll.h>
diff --git a/src/libsystemd/sd-utf8/sd-utf8.c b/src/libsystemd/sd-utf8/sd-utf8.c
index 79909c9af1..78323cf7cb 100644
--- a/src/libsystemd/sd-utf8/sd-utf8.c
+++ b/src/libsystemd/sd-utf8/sd-utf8.c
@@ -1,6 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-***/
 
 #include "sd-utf8.h"
 
diff --git a/src/resolve/resolved-dns-packet.c b/src/resolve/resolved-dns-packet.c
index 5266014581..097942ee0a 100644
--- a/src/resolve/resolved-dns-packet.c
+++ b/src/resolve/resolved-dns-packet.c
@@ -1,6 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- ***/
 
 #if HAVE_GCRYPT
 #include <gcrypt.h>
diff --git a/src/resolve/resolved-dns-packet.h b/src/resolve/resolved-dns-packet.h
index 8e9d74a71a..bddeb58f10 100644
--- a/src/resolve/resolved-dns-packet.h
+++ b/src/resolve/resolved-dns-packet.h
@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
- ***/
 
 #include <netinet/ip.h>
 #include <netinet/udp.h>
diff --git a/src/resolve/resolved-dns-rr.h b/src/resolve/resolved-dns-rr.h
index 2f08b6119e..fa4dedb359 100644
--- a/src/resolve/resolved-dns-rr.h
+++ b/src/resolve/resolved-dns-rr.h
@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
- ***/
 
 #include <netinet/in.h>
 
diff --git a/src/shared/dns-domain.c b/src/shared/dns-domain.c
index de2fcca8b2..e7730a5175 100644
--- a/src/shared/dns-domain.c
+++ b/src/shared/dns-domain.c
@@ -1,6 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- ***/
 
 #if HAVE_LIBIDN2
 #  include <idn2.h>
diff --git a/src/shared/dns-domain.h b/src/shared/dns-domain.h
index 0fd72cb029..dc55dd8a48 100644
--- a/src/shared/dns-domain.h
+++ b/src/shared/dns-domain.h
@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
- ***/
 
 #include <errno.h>
 #include <stdbool.h>
diff --git a/src/test/test-dns-domain.c b/src/test/test-dns-domain.c
index 8ed7dbd1e6..7fa887e4d2 100644
--- a/src/test/test-dns-domain.c
+++ b/src/test/test-dns-domain.c
@@ -1,6 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- ***/
 
 #include "alloc-util.h"
 #include "dns-domain.h"

From afb76fdbff6b17ab8d44b5721517cec519eac455 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 29 Jun 2018 11:02:17 +0900
Subject: [PATCH 5/7] tree-wide: drop double newline

---
 src/basic/barrier.h                                  | 1 -
 src/basic/bitmap.h                                   | 1 -
 src/basic/conf-files.h                               | 1 -
 src/basic/cpu-set-util.h                             | 1 -
 src/basic/ether-addr-util.h                          | 1 -
 src/basic/fileio-label.h                             | 1 -
 src/basic/format-util.h                              | 1 -
 src/basic/hash-funcs.h                               | 1 -
 src/basic/hashmap.h                                  | 1 -
 src/basic/mempool.h                                  | 1 -
 src/basic/mkdir.h                                    | 1 -
 src/basic/securebits-util.h                          | 1 -
 src/basic/strbuf.h                                   | 1 -
 src/basic/strxcpyx.h                                 | 1 -
 src/basic/unaligned.h                                | 1 -
 src/core/bpf-firewall.h                              | 1 -
 src/core/ip-address-access.h                         | 1 -
 src/core/selinux-access.h                            | 1 -
 src/libsystemd-network/dhcp-identifier.h             | 1 -
 src/libsystemd-network/lldp-internal.h               | 1 -
 src/libsystemd-network/lldp-network.h                | 1 -
 src/libsystemd-network/network-internal.h            | 1 -
 src/libsystemd/sd-bus/bus-common-errors.h            | 1 -
 src/libsystemd/sd-bus/bus-container.h                | 1 -
 src/libsystemd/sd-bus/bus-control.h                  | 1 -
 src/libsystemd/sd-bus/bus-creds.h                    | 1 -
 src/libsystemd/sd-bus/bus-dump.h                     | 1 -
 src/libsystemd/sd-bus/bus-error.h                    | 1 -
 src/libsystemd/sd-bus/bus-gvariant.h                 | 1 -
 src/libsystemd/sd-bus/bus-internal.h                 | 1 -
 src/libsystemd/sd-bus/bus-introspect.h               | 1 -
 src/libsystemd/sd-bus/bus-kernel.h                   | 1 -
 src/libsystemd/sd-bus/bus-match.h                    | 1 -
 src/libsystemd/sd-bus/bus-message.h                  | 1 -
 src/libsystemd/sd-bus/bus-objects.h                  | 1 -
 src/libsystemd/sd-bus/bus-protocol.h                 | 1 -
 src/libsystemd/sd-bus/bus-signature.h                | 1 -
 src/libsystemd/sd-bus/bus-slot.h                     | 1 -
 src/libsystemd/sd-bus/bus-socket.h                   | 1 -
 src/libsystemd/sd-bus/bus-track.h                    | 1 -
 src/libsystemd/sd-bus/bus-type.h                     | 1 -
 src/libsystemd/sd-device/device-enumerator-private.h | 1 -
 src/libsystemd/sd-device/device-internal.h           | 1 -
 src/libsystemd/sd-device/device-private.h            | 1 -
 src/libsystemd/sd-device/device-util.h               | 1 -
 src/libsystemd/sd-hwdb/hwdb-internal.h               | 1 -
 src/libsystemd/sd-hwdb/hwdb-util.h                   | 1 -
 src/libsystemd/sd-id128/id128-util.h                 | 1 -
 src/libsystemd/sd-netlink/local-addresses.h          | 1 -
 src/libsystemd/sd-netlink/netlink-internal.h         | 1 -
 src/libsystemd/sd-netlink/netlink-types.h            | 1 -
 src/libsystemd/sd-netlink/netlink-util.h             | 1 -
 src/libsystemd/sd-network/network-util.h             | 1 -
 src/libudev/libudev-device-internal.h                | 1 -
 src/libudev/libudev-private.h                        | 1 -
 src/login/logind-session-device.h                    | 1 -
 src/network/netdev/bond.h                            | 1 -
 src/network/netdev/bridge.h                          | 1 -
 src/network/netdev/dummy.h                           | 1 -
 src/network/netdev/geneve.h                          | 1 -
 src/network/netdev/ipvlan.h                          | 1 -
 src/network/netdev/macvlan.h                         | 1 -
 src/network/netdev/netdev.h                          | 1 -
 src/network/netdev/netdevsim.h                       | 1 -
 src/network/netdev/tunnel.h                          | 1 -
 src/network/netdev/tuntap.h                          | 1 -
 src/network/netdev/vcan.h                            | 1 -
 src/network/netdev/veth.h                            | 1 -
 src/network/netdev/vlan.h                            | 1 -
 src/network/netdev/vxcan.h                           | 1 -
 src/network/netdev/vxlan.h                           | 1 -
 src/network/netdev/wireguard.h                       | 1 -
 src/network/networkd-address-label.h                 | 1 -
 src/network/networkd-address.h                       | 1 -
 src/network/networkd-ipv6-proxy-ndp.h                | 1 -
 src/network/networkd-link.h                          | 1 -
 src/network/networkd-manager.h                       | 1 -
 src/network/networkd-ndisc.h                         | 1 -
 src/network/networkd-network.h                       | 1 -
 src/network/networkd-route.h                         | 1 -
 src/network/networkd-routing-policy-rule.h           | 1 -
 src/network/networkd-util.h                          | 1 -
 src/network/wait-online/link.h                       | 1 -
 src/network/wait-online/manager.h                    | 1 -
 src/network/wait-online/wait-online.c                | 1 -
 src/resolve/resolved-conf.h                          | 1 -
 src/resolve/resolved-dns-packet.h                    | 1 -
 src/resolve/resolved-dns-rr.h                        | 1 -
 src/resolve/resolved-dnssd-bus.h                     | 1 -
 src/resolve/resolved-dnssd.h                         | 1 -
 src/resolve/resolved-manager.h                       | 1 -
 src/resolve/resolved-mdns.h                          | 1 -
 src/resolve/resolved-resolv-conf.h                   | 1 -
 src/shared/acpi-fpdt.h                               | 1 -
 src/shared/base-filesystem.h                         | 1 -
 src/shared/boot-timestamps.h                         | 1 -
 src/shared/dns-domain.h                              | 1 -
 src/shared/switch-root.h                             | 1 -
 src/shared/tomoyo-util.h                             | 1 -
 src/timesync/timesyncd-conf.h                        | 1 -
 src/timesync/timesyncd-manager.h                     | 1 -
 src/timesync/timesyncd-server.h                      | 1 -
 src/udev/net/ethtool-util.h                          | 1 -
 src/udev/net/link-config.h                           | 1 -
 104 files changed, 104 deletions(-)

diff --git a/src/basic/barrier.h b/src/basic/barrier.h
index 96a9955c6f..fb7004c0f2 100644
--- a/src/basic/barrier.h
+++ b/src/basic/barrier.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include <stdbool.h>
 #include <stdint.h>
 #include <sys/types.h>
diff --git a/src/basic/bitmap.h b/src/basic/bitmap.h
index 7ff5cffd26..843d27d24d 100644
--- a/src/basic/bitmap.h
+++ b/src/basic/bitmap.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include <stdbool.h>
 
 #include "hashmap.h"
diff --git a/src/basic/conf-files.h b/src/basic/conf-files.h
index 9da03ed228..744ff80c09 100644
--- a/src/basic/conf-files.h
+++ b/src/basic/conf-files.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 enum {
         CONF_FILES_EXECUTABLE    = 1 << 0,
         CONF_FILES_REGULAR       = 1 << 1,
diff --git a/src/basic/cpu-set-util.h b/src/basic/cpu-set-util.h
index ec76f1a97e..1b6bd35b1c 100644
--- a/src/basic/cpu-set-util.h
+++ b/src/basic/cpu-set-util.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include <sched.h>
 
 #include "macro.h"
diff --git a/src/basic/ether-addr-util.h b/src/basic/ether-addr-util.h
index f12f1215d2..3be0370049 100644
--- a/src/basic/ether-addr-util.h
+++ b/src/basic/ether-addr-util.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include <net/ethernet.h>
 #include <stdbool.h>
 
diff --git a/src/basic/fileio-label.h b/src/basic/fileio-label.h
index 80b1ccc5af..d11112debd 100644
--- a/src/basic/fileio-label.h
+++ b/src/basic/fileio-label.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include <stdio.h>
 
 #include "fileio.h"
diff --git a/src/basic/format-util.h b/src/basic/format-util.h
index 160550cd68..dece5d3a67 100644
--- a/src/basic/format-util.h
+++ b/src/basic/format-util.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include <inttypes.h>
 
 #if SIZEOF_PID_T == 4
diff --git a/src/basic/hash-funcs.h b/src/basic/hash-funcs.h
index 5e5989f021..fa45cfe256 100644
--- a/src/basic/hash-funcs.h
+++ b/src/basic/hash-funcs.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include "macro.h"
 #include "siphash24.h"
 
diff --git a/src/basic/hashmap.h b/src/basic/hashmap.h
index 5c70c102d7..274afb395c 100644
--- a/src/basic/hashmap.h
+++ b/src/basic/hashmap.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include <limits.h>
 #include <stdbool.h>
 #include <stddef.h>
diff --git a/src/basic/mempool.h b/src/basic/mempool.h
index 2a41cb358c..4098535c6f 100644
--- a/src/basic/mempool.h
+++ b/src/basic/mempool.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include <stddef.h>
 
 struct pool;
diff --git a/src/basic/mkdir.h b/src/basic/mkdir.h
index 8e83fb102b..bdca15460e 100644
--- a/src/basic/mkdir.h
+++ b/src/basic/mkdir.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include <sys/types.h>
 
 typedef enum MkdirFlags {
diff --git a/src/basic/securebits-util.h b/src/basic/securebits-util.h
index 10a221d6a0..3cb3cb3d08 100644
--- a/src/basic/securebits-util.h
+++ b/src/basic/securebits-util.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include "securebits.h"
 
 int secure_bits_to_string_alloc(int i, char **s);
diff --git a/src/basic/strbuf.h b/src/basic/strbuf.h
index 75ed30b05b..a36944ad39 100644
--- a/src/basic/strbuf.h
+++ b/src/basic/strbuf.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include <stddef.h>
 #include <stdint.h>
 #include <sys/types.h>
diff --git a/src/basic/strxcpyx.h b/src/basic/strxcpyx.h
index 458f9f2568..0f2b7499ba 100644
--- a/src/basic/strxcpyx.h
+++ b/src/basic/strxcpyx.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include <stddef.h>
 
 #include "macro.h"
diff --git a/src/basic/unaligned.h b/src/basic/unaligned.h
index 8a1d06445e..e62188d1a7 100644
--- a/src/basic/unaligned.h
+++ b/src/basic/unaligned.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include <endian.h>
 #include <stdint.h>
 
diff --git a/src/core/bpf-firewall.h b/src/core/bpf-firewall.h
index e2d08a0fc8..7d38483dbd 100644
--- a/src/core/bpf-firewall.h
+++ b/src/core/bpf-firewall.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include <inttypes.h>
 
 #include "unit.h"
diff --git a/src/core/ip-address-access.h b/src/core/ip-address-access.h
index 7babf19562..77078e1f14 100644
--- a/src/core/ip-address-access.h
+++ b/src/core/ip-address-access.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include "conf-parser.h"
 #include "in-addr-util.h"
 #include "list.h"
diff --git a/src/core/selinux-access.h b/src/core/selinux-access.h
index 8736bdeef1..1e75930f57 100644
--- a/src/core/selinux-access.h
+++ b/src/core/selinux-access.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include "sd-bus.h"
 
 #include "bus-util.h"
diff --git a/src/libsystemd-network/dhcp-identifier.h b/src/libsystemd-network/dhcp-identifier.h
index b92c580d40..8250c76598 100644
--- a/src/libsystemd-network/dhcp-identifier.h
+++ b/src/libsystemd-network/dhcp-identifier.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include "sd-id128.h"
 
 #include "macro.h"
diff --git a/src/libsystemd-network/lldp-internal.h b/src/libsystemd-network/lldp-internal.h
index 7c10a67a35..328d51f8ea 100644
--- a/src/libsystemd-network/lldp-internal.h
+++ b/src/libsystemd-network/lldp-internal.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include "sd-event.h"
 #include "sd-lldp.h"
 
diff --git a/src/libsystemd-network/lldp-network.h b/src/libsystemd-network/lldp-network.h
index 914139793c..e4ed2898a5 100644
--- a/src/libsystemd-network/lldp-network.h
+++ b/src/libsystemd-network/lldp-network.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include "sd-event.h"
 
 int lldp_network_bind_raw_socket(int ifindex);
diff --git a/src/libsystemd-network/network-internal.h b/src/libsystemd-network/network-internal.h
index 883f34b95c..c4d79cca22 100644
--- a/src/libsystemd-network/network-internal.h
+++ b/src/libsystemd-network/network-internal.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include <stdbool.h>
 
 #include "sd-dhcp-lease.h"
diff --git a/src/libsystemd/sd-bus/bus-common-errors.h b/src/libsystemd/sd-bus/bus-common-errors.h
index 6b2c04fb32..daf7cdae67 100644
--- a/src/libsystemd/sd-bus/bus-common-errors.h
+++ b/src/libsystemd/sd-bus/bus-common-errors.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include "bus-error.h"
 
 #define BUS_ERROR_NO_SUCH_UNIT "org.freedesktop.systemd1.NoSuchUnit"
diff --git a/src/libsystemd/sd-bus/bus-container.h b/src/libsystemd/sd-bus/bus-container.h
index e2ccd0d77b..f6ef688032 100644
--- a/src/libsystemd/sd-bus/bus-container.h
+++ b/src/libsystemd/sd-bus/bus-container.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include "sd-bus.h"
 
 int bus_container_connect_socket(sd_bus *b);
diff --git a/src/libsystemd/sd-bus/bus-control.h b/src/libsystemd/sd-bus/bus-control.h
index c53361d558..3fb52b67c6 100644
--- a/src/libsystemd/sd-bus/bus-control.h
+++ b/src/libsystemd/sd-bus/bus-control.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include "sd-bus.h"
 
 int bus_add_match_internal(sd_bus *bus, const char *match);
diff --git a/src/libsystemd/sd-bus/bus-creds.h b/src/libsystemd/sd-bus/bus-creds.h
index 55e53501c2..508ef9d352 100644
--- a/src/libsystemd/sd-bus/bus-creds.h
+++ b/src/libsystemd/sd-bus/bus-creds.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include <stdbool.h>
 
 #include "sd-bus.h"
diff --git a/src/libsystemd/sd-bus/bus-dump.h b/src/libsystemd/sd-bus/bus-dump.h
index 97fce1b7d6..373a86dd4f 100644
--- a/src/libsystemd/sd-bus/bus-dump.h
+++ b/src/libsystemd/sd-bus/bus-dump.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include <stdbool.h>
 #include <stdio.h>
 
diff --git a/src/libsystemd/sd-bus/bus-error.h b/src/libsystemd/sd-bus/bus-error.h
index 97acb4839f..06c478a362 100644
--- a/src/libsystemd/sd-bus/bus-error.h
+++ b/src/libsystemd/sd-bus/bus-error.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include <stdbool.h>
 
 #include "sd-bus.h"
diff --git a/src/libsystemd/sd-bus/bus-gvariant.h b/src/libsystemd/sd-bus/bus-gvariant.h
index b9fed26da1..644b5f4b20 100644
--- a/src/libsystemd/sd-bus/bus-gvariant.h
+++ b/src/libsystemd/sd-bus/bus-gvariant.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include "macro.h"
 
 int bus_gvariant_get_size(const char *signature) _pure_;
diff --git a/src/libsystemd/sd-bus/bus-internal.h b/src/libsystemd/sd-bus/bus-internal.h
index 4586e49034..251fc9b42d 100644
--- a/src/libsystemd/sd-bus/bus-internal.h
+++ b/src/libsystemd/sd-bus/bus-internal.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include <pthread.h>
 #include <sys/socket.h>
 
diff --git a/src/libsystemd/sd-bus/bus-introspect.h b/src/libsystemd/sd-bus/bus-introspect.h
index eb4a6887f5..bb2dd7ef7b 100644
--- a/src/libsystemd/sd-bus/bus-introspect.h
+++ b/src/libsystemd/sd-bus/bus-introspect.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include <stdio.h>
 
 #include "sd-bus.h"
diff --git a/src/libsystemd/sd-bus/bus-kernel.h b/src/libsystemd/sd-bus/bus-kernel.h
index fac02a69c1..fbbc43f6fa 100644
--- a/src/libsystemd/sd-bus/bus-kernel.h
+++ b/src/libsystemd/sd-bus/bus-kernel.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include "sd-bus.h"
 
 #define MEMFD_CACHE_MAX 32
diff --git a/src/libsystemd/sd-bus/bus-match.h b/src/libsystemd/sd-bus/bus-match.h
index f7c7205aae..b9c0fcec90 100644
--- a/src/libsystemd/sd-bus/bus-match.h
+++ b/src/libsystemd/sd-bus/bus-match.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include "sd-bus.h"
 
 #include "hashmap.h"
diff --git a/src/libsystemd/sd-bus/bus-message.h b/src/libsystemd/sd-bus/bus-message.h
index d17cec4b78..ef6ddc1cc0 100644
--- a/src/libsystemd/sd-bus/bus-message.h
+++ b/src/libsystemd/sd-bus/bus-message.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include <byteswap.h>
 #include <stdbool.h>
 #include <sys/socket.h>
diff --git a/src/libsystemd/sd-bus/bus-objects.h b/src/libsystemd/sd-bus/bus-objects.h
index 961aabe88e..a119ff95c0 100644
--- a/src/libsystemd/sd-bus/bus-objects.h
+++ b/src/libsystemd/sd-bus/bus-objects.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include "bus-internal.h"
 
 int bus_process_object(sd_bus *bus, sd_bus_message *m);
diff --git a/src/libsystemd/sd-bus/bus-protocol.h b/src/libsystemd/sd-bus/bus-protocol.h
index a44f530e27..a5f4724aa9 100644
--- a/src/libsystemd/sd-bus/bus-protocol.h
+++ b/src/libsystemd/sd-bus/bus-protocol.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include <endian.h>
 
 #include "macro.h"
diff --git a/src/libsystemd/sd-bus/bus-signature.h b/src/libsystemd/sd-bus/bus-signature.h
index 58b1e4794a..b87bec8329 100644
--- a/src/libsystemd/sd-bus/bus-signature.h
+++ b/src/libsystemd/sd-bus/bus-signature.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include <stdbool.h>
 
 bool signature_is_single(const char *s, bool allow_dict_entry);
diff --git a/src/libsystemd/sd-bus/bus-slot.h b/src/libsystemd/sd-bus/bus-slot.h
index cf0ed4f755..555afac9a6 100644
--- a/src/libsystemd/sd-bus/bus-slot.h
+++ b/src/libsystemd/sd-bus/bus-slot.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include "sd-bus.h"
 
 #include "bus-internal.h"
diff --git a/src/libsystemd/sd-bus/bus-socket.h b/src/libsystemd/sd-bus/bus-socket.h
index a21cbdd7d9..f8d24556c9 100644
--- a/src/libsystemd/sd-bus/bus-socket.h
+++ b/src/libsystemd/sd-bus/bus-socket.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include "sd-bus.h"
 
 void bus_socket_setup(sd_bus *b);
diff --git a/src/libsystemd/sd-bus/bus-track.h b/src/libsystemd/sd-bus/bus-track.h
index 602647f8e3..209b989d27 100644
--- a/src/libsystemd/sd-bus/bus-track.h
+++ b/src/libsystemd/sd-bus/bus-track.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 void bus_track_dispatch(sd_bus_track *track);
 void bus_track_close(sd_bus_track *track);
diff --git a/src/libsystemd/sd-bus/bus-type.h b/src/libsystemd/sd-bus/bus-type.h
index a6e1de276d..b518461b16 100644
--- a/src/libsystemd/sd-bus/bus-type.h
+++ b/src/libsystemd/sd-bus/bus-type.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include <stdbool.h>
 
 #include "macro.h"
diff --git a/src/libsystemd/sd-device/device-enumerator-private.h b/src/libsystemd/sd-device/device-enumerator-private.h
index 5d58ac93ca..56a953d33b 100644
--- a/src/libsystemd/sd-device/device-enumerator-private.h
+++ b/src/libsystemd/sd-device/device-enumerator-private.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include "sd-device.h"
 
 int device_enumerator_scan_devices(sd_device_enumerator *enumeartor);
diff --git a/src/libsystemd/sd-device/device-internal.h b/src/libsystemd/sd-device/device-internal.h
index 64da0501fe..f60d54af1b 100644
--- a/src/libsystemd/sd-device/device-internal.h
+++ b/src/libsystemd/sd-device/device-internal.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include "hashmap.h"
 #include "set.h"
 
diff --git a/src/libsystemd/sd-device/device-private.h b/src/libsystemd/sd-device/device-private.h
index 800c9ba7bd..22d7d8013e 100644
--- a/src/libsystemd/sd-device/device-private.h
+++ b/src/libsystemd/sd-device/device-private.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include <inttypes.h>
 #include <stdbool.h>
 #include <sys/types.h>
diff --git a/src/libsystemd/sd-device/device-util.h b/src/libsystemd/sd-device/device-util.h
index 6dcd2645e6..42461c1991 100644
--- a/src/libsystemd/sd-device/device-util.h
+++ b/src/libsystemd/sd-device/device-util.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include "util.h"
 
 #define FOREACH_DEVICE_PROPERTY(device, key, value)                \
diff --git a/src/libsystemd/sd-hwdb/hwdb-internal.h b/src/libsystemd/sd-hwdb/hwdb-internal.h
index 1fc6d31aed..d186c85184 100644
--- a/src/libsystemd/sd-hwdb/hwdb-internal.h
+++ b/src/libsystemd/sd-hwdb/hwdb-internal.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include "sparse-endian.h"
 #include "util.h"
 
diff --git a/src/libsystemd/sd-hwdb/hwdb-util.h b/src/libsystemd/sd-hwdb/hwdb-util.h
index 2998249199..43ddccdbe9 100644
--- a/src/libsystemd/sd-hwdb/hwdb-util.h
+++ b/src/libsystemd/sd-hwdb/hwdb-util.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include "sd-hwdb.h"
 
 #include "util.h"
diff --git a/src/libsystemd/sd-id128/id128-util.h b/src/libsystemd/sd-id128/id128-util.h
index ffd6d61f08..44f159c0b6 100644
--- a/src/libsystemd/sd-id128/id128-util.h
+++ b/src/libsystemd/sd-id128/id128-util.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include <stdbool.h>
 
 #include "sd-id128.h"
diff --git a/src/libsystemd/sd-netlink/local-addresses.h b/src/libsystemd/sd-netlink/local-addresses.h
index 628f00871d..e88c5e5d21 100644
--- a/src/libsystemd/sd-netlink/local-addresses.h
+++ b/src/libsystemd/sd-netlink/local-addresses.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include "sd-netlink.h"
 
 #include "in-addr-util.h"
diff --git a/src/libsystemd/sd-netlink/netlink-internal.h b/src/libsystemd/sd-netlink/netlink-internal.h
index dd4fa9d2af..661323e05f 100644
--- a/src/libsystemd/sd-netlink/netlink-internal.h
+++ b/src/libsystemd/sd-netlink/netlink-internal.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include <linux/netlink.h>
 
 #include "sd-netlink.h"
diff --git a/src/libsystemd/sd-netlink/netlink-types.h b/src/libsystemd/sd-netlink/netlink-types.h
index d411ffa6c2..e8443aacd6 100644
--- a/src/libsystemd/sd-netlink/netlink-types.h
+++ b/src/libsystemd/sd-netlink/netlink-types.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include "macro.h"
 
 enum {
diff --git a/src/libsystemd/sd-netlink/netlink-util.h b/src/libsystemd/sd-netlink/netlink-util.h
index 7c35a2cfa7..b326ceecaf 100644
--- a/src/libsystemd/sd-netlink/netlink-util.h
+++ b/src/libsystemd/sd-netlink/netlink-util.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include "sd-netlink.h"
 
 #include "util.h"
diff --git a/src/libsystemd/sd-network/network-util.h b/src/libsystemd/sd-network/network-util.h
index 62260d09dd..e868bc2e27 100644
--- a/src/libsystemd/sd-network/network-util.h
+++ b/src/libsystemd/sd-network/network-util.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include "sd-network.h"
 
 bool network_is_online(void);
diff --git a/src/libudev/libudev-device-internal.h b/src/libudev/libudev-device-internal.h
index 7a78deff79..45763f2c99 100644
--- a/src/libudev/libudev-device-internal.h
+++ b/src/libudev/libudev-device-internal.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include "libudev.h"
 #include "sd-device.h"
 
diff --git a/src/libudev/libudev-private.h b/src/libudev/libudev-private.h
index 384be98e79..749c78da49 100644
--- a/src/libudev/libudev-private.h
+++ b/src/libudev/libudev-private.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include <signal.h>
 #include <stdbool.h>
 #include <stdint.h>
diff --git a/src/login/logind-session-device.h b/src/login/logind-session-device.h
index f42c0218c0..91ce2fd546 100644
--- a/src/login/logind-session-device.h
+++ b/src/login/logind-session-device.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 typedef enum DeviceType DeviceType;
 typedef struct SessionDevice SessionDevice;
 
diff --git a/src/network/netdev/bond.h b/src/network/netdev/bond.h
index fd68a18985..be03d72087 100644
--- a/src/network/netdev/bond.h
+++ b/src/network/netdev/bond.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include "in-addr-util.h"
 #include "list.h"
 
diff --git a/src/network/netdev/bridge.h b/src/network/netdev/bridge.h
index 4854e46953..3edc93a767 100644
--- a/src/network/netdev/bridge.h
+++ b/src/network/netdev/bridge.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include "netdev/netdev.h"
 
 typedef struct Bridge {
diff --git a/src/network/netdev/dummy.h b/src/network/netdev/dummy.h
index f4679a640d..93e0651f7d 100644
--- a/src/network/netdev/dummy.h
+++ b/src/network/netdev/dummy.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include "netdev/netdev.h"
 
 typedef struct Dummy {
diff --git a/src/network/netdev/geneve.h b/src/network/netdev/geneve.h
index dab9a4a553..2b38a92e4b 100644
--- a/src/network/netdev/geneve.h
+++ b/src/network/netdev/geneve.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 typedef struct Geneve Geneve;
 
 #include "in-addr-util.h"
diff --git a/src/network/netdev/ipvlan.h b/src/network/netdev/ipvlan.h
index 8b698ebd1a..f181132720 100644
--- a/src/network/netdev/ipvlan.h
+++ b/src/network/netdev/ipvlan.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include <linux/if_link.h>
 
 #include "missing.h"
diff --git a/src/network/netdev/macvlan.h b/src/network/netdev/macvlan.h
index dcc0a3fd35..6b1587d86f 100644
--- a/src/network/netdev/macvlan.h
+++ b/src/network/netdev/macvlan.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 typedef struct MacVlan MacVlan;
 
 #include "netdev/netdev.h"
diff --git a/src/network/netdev/netdev.h b/src/network/netdev/netdev.h
index 8df26c0ac3..bdab18043b 100644
--- a/src/network/netdev/netdev.h
+++ b/src/network/netdev/netdev.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include "sd-netlink.h"
 
 #include "list.h"
diff --git a/src/network/netdev/netdevsim.h b/src/network/netdev/netdevsim.h
index 7287360f15..d3ed0c0d4f 100644
--- a/src/network/netdev/netdevsim.h
+++ b/src/network/netdev/netdevsim.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 typedef struct NetDevSim NetDevSim;
 
 #include "netdev/netdev.h"
diff --git a/src/network/netdev/tunnel.h b/src/network/netdev/tunnel.h
index b54b58ddee..029d845378 100644
--- a/src/network/netdev/tunnel.h
+++ b/src/network/netdev/tunnel.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include "in-addr-util.h"
 
 #include "netdev/netdev.h"
diff --git a/src/network/netdev/tuntap.h b/src/network/netdev/tuntap.h
index 6e8c66a000..9d9f9922b5 100644
--- a/src/network/netdev/tuntap.h
+++ b/src/network/netdev/tuntap.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 typedef struct TunTap TunTap;
 
 #include "netdev/netdev.h"
diff --git a/src/network/netdev/vcan.h b/src/network/netdev/vcan.h
index d2540645c8..6f62686d08 100644
--- a/src/network/netdev/vcan.h
+++ b/src/network/netdev/vcan.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 typedef struct VCan VCan;
 
 #include <linux/can/netlink.h>
diff --git a/src/network/netdev/veth.h b/src/network/netdev/veth.h
index 29cddab573..0bb9947bbd 100644
--- a/src/network/netdev/veth.h
+++ b/src/network/netdev/veth.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 typedef struct Veth Veth;
 
 #include "netdev/netdev.h"
diff --git a/src/network/netdev/vlan.h b/src/network/netdev/vlan.h
index f3629f903b..b815e03dc5 100644
--- a/src/network/netdev/vlan.h
+++ b/src/network/netdev/vlan.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 typedef struct VLan VLan;
 
 #include "netdev/netdev.h"
diff --git a/src/network/netdev/vxcan.h b/src/network/netdev/vxcan.h
index 84a39ee3cb..417672c474 100644
--- a/src/network/netdev/vxcan.h
+++ b/src/network/netdev/vxcan.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 typedef struct VxCan VxCan;
 
 #if HAVE_VXCAN_INFO_PEER
diff --git a/src/network/netdev/vxlan.h b/src/network/netdev/vxlan.h
index e5eb20f187..bb5c4b9c51 100644
--- a/src/network/netdev/vxlan.h
+++ b/src/network/netdev/vxlan.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 typedef struct VxLan VxLan;
 
 #include "in-addr-util.h"
diff --git a/src/network/netdev/wireguard.h b/src/network/netdev/wireguard.h
index 95b48d7635..80a5bf87a0 100644
--- a/src/network/netdev/wireguard.h
+++ b/src/network/netdev/wireguard.h
@@ -1,6 +1,5 @@
 #pragma once
 
-
 typedef struct Wireguard Wireguard;
 
 #include "netdev.h"
diff --git a/src/network/networkd-address-label.h b/src/network/networkd-address-label.h
index 77687edcba..70b8de7b2a 100644
--- a/src/network/networkd-address-label.h
+++ b/src/network/networkd-address-label.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include <inttypes.h>
 #include <stdbool.h>
 
diff --git a/src/network/networkd-address.h b/src/network/networkd-address.h
index 63e8f5d1ec..cd80741cb0 100644
--- a/src/network/networkd-address.h
+++ b/src/network/networkd-address.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include <inttypes.h>
 #include <stdbool.h>
 
diff --git a/src/network/networkd-ipv6-proxy-ndp.h b/src/network/networkd-ipv6-proxy-ndp.h
index 928630c2d8..546e8561f1 100644
--- a/src/network/networkd-ipv6-proxy-ndp.h
+++ b/src/network/networkd-ipv6-proxy-ndp.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include "conf-parser.h"
 #include "list.h"
 #include "macro.h"
diff --git a/src/network/networkd-link.h b/src/network/networkd-link.h
index 7e22dfd504..d3028bae50 100644
--- a/src/network/networkd-link.h
+++ b/src/network/networkd-link.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include <endian.h>
 
 #include "sd-bus.h"
diff --git a/src/network/networkd-manager.h b/src/network/networkd-manager.h
index fbb7f5413a..9c16359d51 100644
--- a/src/network/networkd-manager.h
+++ b/src/network/networkd-manager.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include <arpa/inet.h>
 
 #include "sd-bus.h"
diff --git a/src/network/networkd-ndisc.h b/src/network/networkd-ndisc.h
index 351fc695c6..762f42d43e 100644
--- a/src/network/networkd-ndisc.h
+++ b/src/network/networkd-ndisc.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include "networkd-link.h"
 
 typedef struct NDiscRDNSS {
diff --git a/src/network/networkd-network.h b/src/network/networkd-network.h
index 2d46d393ac..0cd1c75f14 100644
--- a/src/network/networkd-network.h
+++ b/src/network/networkd-network.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include "sd-bus.h"
 #include "udev.h"
 
diff --git a/src/network/networkd-route.h b/src/network/networkd-route.h
index 75da0e3a71..7283f48304 100644
--- a/src/network/networkd-route.h
+++ b/src/network/networkd-route.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include "conf-parser.h"
 
 typedef struct Route Route;
diff --git a/src/network/networkd-routing-policy-rule.h b/src/network/networkd-routing-policy-rule.h
index f4a0d5138f..7843a54db4 100644
--- a/src/network/networkd-routing-policy-rule.h
+++ b/src/network/networkd-routing-policy-rule.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include <inttypes.h>
 #include <stdbool.h>
 
diff --git a/src/network/networkd-util.h b/src/network/networkd-util.h
index 0fb41caaf6..435fdb7ca8 100644
--- a/src/network/networkd-util.h
+++ b/src/network/networkd-util.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include "conf-parser.h"
 #include "macro.h"
 
diff --git a/src/network/wait-online/link.h b/src/network/wait-online/link.h
index f1096c99d9..57e8f12e03 100644
--- a/src/network/wait-online/link.h
+++ b/src/network/wait-online/link.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include "sd-netlink.h"
 
 typedef struct Link Link;
diff --git a/src/network/wait-online/manager.h b/src/network/wait-online/manager.h
index 21f0381dda..0fde272ddb 100644
--- a/src/network/wait-online/manager.h
+++ b/src/network/wait-online/manager.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include "sd-event.h"
 #include "sd-netlink.h"
 #include "sd-network.h"
diff --git a/src/network/wait-online/wait-online.c b/src/network/wait-online/wait-online.c
index a96b2c8fe5..c67ff95c76 100644
--- a/src/network/wait-online/wait-online.c
+++ b/src/network/wait-online/wait-online.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-
 #include <getopt.h>
 
 #include "sd-daemon.h"
diff --git a/src/resolve/resolved-conf.h b/src/resolve/resolved-conf.h
index 0a0a110534..f6efa175fc 100644
--- a/src/resolve/resolved-conf.h
+++ b/src/resolve/resolved-conf.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include "conf-parser.h"
 
 typedef enum DnsStubListenerMode DnsStubListenerMode;
diff --git a/src/resolve/resolved-dns-packet.h b/src/resolve/resolved-dns-packet.h
index bddeb58f10..d616c32993 100644
--- a/src/resolve/resolved-dns-packet.h
+++ b/src/resolve/resolved-dns-packet.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include <netinet/ip.h>
 #include <netinet/udp.h>
 
diff --git a/src/resolve/resolved-dns-rr.h b/src/resolve/resolved-dns-rr.h
index fa4dedb359..83acf3b880 100644
--- a/src/resolve/resolved-dns-rr.h
+++ b/src/resolve/resolved-dns-rr.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include <netinet/in.h>
 
 #include "bitmap.h"
diff --git a/src/resolve/resolved-dnssd-bus.h b/src/resolve/resolved-dnssd-bus.h
index 403cb00a53..9ee2ce17ec 100644
--- a/src/resolve/resolved-dnssd-bus.h
+++ b/src/resolve/resolved-dnssd-bus.h
@@ -1,6 +1,5 @@
 #pragma once
 
-
 #include "sd-bus.h"
 
 extern const sd_bus_vtable dnssd_vtable[];
diff --git a/src/resolve/resolved-dnssd.h b/src/resolve/resolved-dnssd.h
index f49cfe2515..f2e101452d 100644
--- a/src/resolve/resolved-dnssd.h
+++ b/src/resolve/resolved-dnssd.h
@@ -1,6 +1,5 @@
 #pragma once
 
-
 #include "list.h"
 
 typedef struct DnssdService DnssdService;
diff --git a/src/resolve/resolved-manager.h b/src/resolve/resolved-manager.h
index d94b2888ab..6bbb15dbfb 100644
--- a/src/resolve/resolved-manager.h
+++ b/src/resolve/resolved-manager.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include "sd-event.h"
 #include "sd-netlink.h"
 #include "sd-network.h"
diff --git a/src/resolve/resolved-mdns.h b/src/resolve/resolved-mdns.h
index d2bce6fcd9..2f69478681 100644
--- a/src/resolve/resolved-mdns.h
+++ b/src/resolve/resolved-mdns.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include "resolved-manager.h"
 
 #define MDNS_PORT 5353
diff --git a/src/resolve/resolved-resolv-conf.h b/src/resolve/resolved-resolv-conf.h
index e60beb40b7..f69cf2a441 100644
--- a/src/resolve/resolved-resolv-conf.h
+++ b/src/resolve/resolved-resolv-conf.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include "resolved-manager.h"
 
 int manager_check_resolv_conf(const Manager *m);
diff --git a/src/shared/acpi-fpdt.h b/src/shared/acpi-fpdt.h
index 47bfefc5a0..8d288937ef 100644
--- a/src/shared/acpi-fpdt.h
+++ b/src/shared/acpi-fpdt.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include <time-util.h>
 
 int acpi_get_boot_usec(usec_t *loader_start, usec_t *loader_exit);
diff --git a/src/shared/base-filesystem.h b/src/shared/base-filesystem.h
index d1d4eaa662..39d970811d 100644
--- a/src/shared/base-filesystem.h
+++ b/src/shared/base-filesystem.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include <sys/types.h>
 
 int base_filesystem_create(const char *root, uid_t uid, gid_t gid);
diff --git a/src/shared/boot-timestamps.h b/src/shared/boot-timestamps.h
index c719dd3602..4e648f18e2 100644
--- a/src/shared/boot-timestamps.h
+++ b/src/shared/boot-timestamps.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include <time-util.h>
 
 int boot_timestamps(const dual_timestamp *n, dual_timestamp *firmware, dual_timestamp *loader);
diff --git a/src/shared/dns-domain.h b/src/shared/dns-domain.h
index dc55dd8a48..1e9b57059b 100644
--- a/src/shared/dns-domain.h
+++ b/src/shared/dns-domain.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include <errno.h>
 #include <stdbool.h>
 #include <stddef.h>
diff --git a/src/shared/switch-root.h b/src/shared/switch-root.h
index 6bfaa3a6eb..f4d48cb431 100644
--- a/src/shared/switch-root.h
+++ b/src/shared/switch-root.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include <stdbool.h>
 
 int switch_root(const char *new_root, const char *oldroot, bool detach_oldroot, unsigned long mountflags);
diff --git a/src/shared/tomoyo-util.h b/src/shared/tomoyo-util.h
index 03e6975469..06e8227857 100644
--- a/src/shared/tomoyo-util.h
+++ b/src/shared/tomoyo-util.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include <stdbool.h>
 
 bool mac_tomoyo_use(void);
diff --git a/src/timesync/timesyncd-conf.h b/src/timesync/timesyncd-conf.h
index ebdb143f0b..bbe27cf2ac 100644
--- a/src/timesync/timesyncd-conf.h
+++ b/src/timesync/timesyncd-conf.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include "conf-parser.h"
 #include "timesyncd-manager.h"
 
diff --git a/src/timesync/timesyncd-manager.h b/src/timesync/timesyncd-manager.h
index 18347416d1..49d7205b09 100644
--- a/src/timesync/timesyncd-manager.h
+++ b/src/timesync/timesyncd-manager.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include <sys/timex.h>
 
 #include "sd-bus.h"
diff --git a/src/timesync/timesyncd-server.h b/src/timesync/timesyncd-server.h
index 8972706f20..d30bd2a3ce 100644
--- a/src/timesync/timesyncd-server.h
+++ b/src/timesync/timesyncd-server.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include "list.h"
 #include "socket-util.h"
 
diff --git a/src/udev/net/ethtool-util.h b/src/udev/net/ethtool-util.h
index 064bf4d2bd..d57a7565df 100644
--- a/src/udev/net/ethtool-util.h
+++ b/src/udev/net/ethtool-util.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include <macro.h>
 #include <linux/ethtool.h>
 
diff --git a/src/udev/net/link-config.h b/src/udev/net/link-config.h
index 4798bb101c..713513edad 100644
--- a/src/udev/net/link-config.h
+++ b/src/udev/net/link-config.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-
 #include "libudev.h"
 
 #include "condition.h"

From 825862972e75b942a51e84f99391b046d68f1c2a Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 29 Jun 2018 12:35:36 +0900
Subject: [PATCH 6/7] bus-util: update comment

Originally, request_name_handler_may_reload_dbus() was written for
timesyncd. But now it is also called by networkd or resolved.
---
 src/shared/bus-util.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c
index 8b02c6be26..c739849bf2 100644
--- a/src/shared/bus-util.c
+++ b/src/shared/bus-util.c
@@ -1793,11 +1793,10 @@ static int request_name_handler_may_reload_dbus(sd_bus_message *m, void *userdat
                                 "Unable to request name, will retry after reloading DBus configuration: %s",
                                 e->message);
 
-                /* If systemd-timesyncd.service enables DynamicUser= and dbus.service
-                 * started before the dynamic user is realized, then the DBus policy
-                 * about timesyncd has not been enabled yet. So, let's try to reload
-                 * DBus configuration, and after that request the name again. Note that it
-                 * seems that no privileges are necessary to call the following method. */
+                /* If a service enables DynamicUser= and dbus.service started before the dynamic user is realized,
+                 * then the DBus policy about the service has not been enabled yet. So, let's try to reload DBus
+                 * configuration, and after that request the name again. Note that it seems that no privileges are
+                 * necessary to call the following method. */
 
                 r = sd_bus_call_method_async(
                                 sd_bus_message_get_bus(m),

From 69ae75d7ae47ed23b00c54cf21800c1b68491f34 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 29 Jun 2018 12:40:27 +0900
Subject: [PATCH 7/7] man: add missing parentheses

---
 man/sd_bus_slot_set_destroy_callback.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/man/sd_bus_slot_set_destroy_callback.xml b/man/sd_bus_slot_set_destroy_callback.xml
index a54b7e2d61..cc5a835aa6 100644
--- a/man/sd_bus_slot_set_destroy_callback.xml
+++ b/man/sd_bus_slot_set_destroy_callback.xml
@@ -79,7 +79,7 @@
     for <parameter>slot</parameter> in the <parameter>callback</parameter> parameter.</para>
 
     <para><function>sd_bus_track_set_destroy_callback()</function> and
-    <function>sd_bus_track_get_destroy_callback</function> provide equivalent functionality for the
+    <function>sd_bus_track_get_destroy_callback()</function> provide equivalent functionality for the
     <parameter>userdata</parameter> pointer associated with bus peer tracking objects. For details about bus peer
     tracking objects, see
     <citerefentry><refentrytitle>sd_bus_track_new</refentrytitle><manvolnum>3</manvolnum></citerefentry>.</para>
@@ -93,7 +93,7 @@
     negative errno-style error code.</para>
 
     <para><function>sd_bus_slot_get_destroy_callback()</function> and
-    <function>sd_bus_track_get_destroy_callback</function> return positive if the destroy callback function is set, 0
+    <function>sd_bus_track_get_destroy_callback()</function> return positive if the destroy callback function is set, 0
     if not. On failure, they return a negative errno-style error code.</para>
   </refsect1>