find src \( -name '*.h' -o -name '*.c' \) -type f -exec ./fixup_includes {} \;

36 files changed, 96 insertions, 62 deletions

diff --git a/src/grp-resolve/nss-resolve/nss-resolve.c b/src/grp-resolve/nss-resolve/nss-resolve.c
index 7e10498156..e316803a58 100644
--- a/src/grp-resolve/nss-resolve/nss-resolve.c
+++ b/src/grp-resolve/nss-resolve/nss-resolve.c
@@ -26,13 +26,13 @@
 
 #include <systemd/sd-bus.h>
 
-#include "sd-bus/bus-common-errors.h"
 #include "basic/in-addr-util.h"
 #include "basic/macro.h"
 #include "basic/nss-util.h"
+#include "basic/signal-util.h"
 #include "basic/string-util.h"
 #include "basic/util.h"
-#include "basic/signal-util.h"
+#include "sd-bus/bus-common-errors.h"
 
 NSS_GETHOSTBYNAME_PROTOTYPES(resolve);
 NSS_GETHOSTBYADDR_PROTOTYPES(resolve);
diff --git a/src/grp-resolve/systemd-resolved/dns-type.c b/src/grp-resolve/systemd-resolved/dns-type.c
index 1aa9424222..6d5b9d616f 100644
--- a/src/grp-resolve/systemd-resolved/dns-type.c
+++ b/src/grp-resolve/systemd-resolved/dns-type.c
@@ -19,10 +19,11 @@
 
 #include <sys/socket.h>
 
-#include "dns-type.h"
 #include "basic/parse-util.h"
 #include "basic/string-util.h"
 
+#include "dns-type.h"
+
 typedef const struct {
         uint16_t type;
         const char *name;
diff --git a/src/grp-resolve/systemd-resolved/resolve-tool.c b/src/grp-resolve/systemd-resolved/resolve-tool.c
index f140820e0f..d9f28576b7 100644
--- a/src/grp-resolve/systemd-resolved/resolve-tool.c
+++ b/src/grp-resolve/systemd-resolved/resolve-tool.c
@@ -24,15 +24,16 @@
 
 #include "basic/af-list.h"
 #include "basic/alloc-util.h"
-#include "sd-bus/bus-error.h"
-#include "shared/bus-util.h"
 #include "basic/escape.h"
 #include "basic/in-addr-util.h"
-#include "shared/gcrypt-util.h"
 #include "basic/parse-util.h"
+#include "basic/terminal-util.h"
+#include "sd-bus/bus-error.h"
+#include "shared/bus-util.h"
+#include "shared/gcrypt-util.h"
+
 #include "resolved-def.h"
 #include "resolved-dns-packet.h"
-#include "basic/terminal-util.h"
 
 #define DNS_CALL_TIMEOUT_USEC (45*USEC_PER_SEC)
 
diff --git a/src/grp-resolve/systemd-resolved/resolved-bus.c b/src/grp-resolve/systemd-resolved/resolved-bus.c
index ff0bcdfef4..31c6999743 100644
--- a/src/grp-resolve/systemd-resolved/resolved-bus.c
+++ b/src/grp-resolve/systemd-resolved/resolved-bus.c
@@ -21,6 +21,7 @@
 #include "sd-bus/bus-common-errors.h"
 #include "shared/bus-util.h"
 #include "shared/dns-domain.h"
+
 #include "resolved-bus.h"
 #include "resolved-def.h"
 #include "resolved-dns-synthesize.h"
diff --git a/src/grp-resolve/systemd-resolved/resolved-conf.c b/src/grp-resolve/systemd-resolved/resolved-conf.c
index e22f107419..4dc169094b 100644
--- a/src/grp-resolve/systemd-resolved/resolved-conf.c
+++ b/src/grp-resolve/systemd-resolved/resolved-conf.c
@@ -18,12 +18,13 @@
  ***/
 
 #include "basic/alloc-util.h"
-#include "shared/conf-parser.h"
 #include "basic/def.h"
 #include "basic/extract-word.h"
 #include "basic/parse-util.h"
-#include "resolved-conf.h"
 #include "basic/string-util.h"
+#include "shared/conf-parser.h"
+
+#include "resolved-conf.h"
 
 int manager_add_dns_server_by_string(Manager *m, DnsServerType type, const char *word) {
         union in_addr_union address;
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-answer.c b/src/grp-resolve/systemd-resolved/resolved-dns-answer.c
index f9f7e91c1a..1ade0507db 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-answer.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-answer.c
@@ -18,10 +18,11 @@
 ***/
 
 #include "basic/alloc-util.h"
+#include "basic/string-util.h"
 #include "shared/dns-domain.h"
+
 #include "resolved-dns-answer.h"
 #include "resolved-dns-dnssec.h"
-#include "basic/string-util.h"
 
 DnsAnswer *dns_answer_new(unsigned n) {
         DnsAnswer *a;
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-answer.h b/src/grp-resolve/systemd-resolved/resolved-dns-answer.h
index b08fef39f5..920a3136d8 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-answer.h
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-answer.h
@@ -23,6 +23,7 @@ typedef struct DnsAnswer DnsAnswer;
 typedef struct DnsAnswerItem DnsAnswerItem;
 
 #include "basic/macro.h"
+
 #include "resolved-dns-rr.h"
 
 /* A simple array of resource records. We keep track of the
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-cache.c b/src/grp-resolve/systemd-resolved/resolved-dns-cache.c
index 0527c57e1c..8ef2048c49 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-cache.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-cache.c
@@ -21,11 +21,12 @@
 
 #include "basic/af-list.h"
 #include "basic/alloc-util.h"
+#include "basic/string-util.h"
 #include "shared/dns-domain.h"
+
 #include "resolved-dns-answer.h"
 #include "resolved-dns-cache.h"
 #include "resolved-dns-packet.h"
-#include "basic/string-util.h"
 
 /* Never cache more than 4K entries. RFC 1536, Section 5 suggests to
  * leave DNS caches unbounded, but that's crazy. */
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-dnssec.h b/src/grp-resolve/systemd-resolved/resolved-dns-dnssec.h
index c2ebff767f..81879e287f 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-dnssec.h
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-dnssec.h
@@ -23,6 +23,7 @@ typedef enum DnssecResult DnssecResult;
 typedef enum DnssecVerdict DnssecVerdict;
 
 #include "shared/dns-domain.h"
+
 #include "resolved-dns-answer.h"
 #include "resolved-dns-rr.h"
 
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-packet.c b/src/grp-resolve/systemd-resolved/resolved-dns-packet.c
index b379b2bb97..37c0244b7e 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-packet.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-packet.c
@@ -18,13 +18,14 @@
  ***/
 
 #include "basic/alloc-util.h"
-#include "shared/dns-domain.h"
-#include "resolved-dns-packet.h"
 #include "basic/string-table.h"
 #include "basic/strv.h"
 #include "basic/unaligned.h"
 #include "basic/utf8.h"
 #include "basic/util.h"
+#include "shared/dns-domain.h"
+
+#include "resolved-dns-packet.h"
 
 #define EDNS0_OPT_DO (1<<15)
 
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-query.c b/src/grp-resolve/systemd-resolved/resolved-dns-query.c
index 0a62571af7..f512748f8d 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-query.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-query.c
@@ -18,14 +18,15 @@
 ***/
 
 #include "basic/alloc-util.h"
-#include "shared/dns-domain.h"
-#include "dns-type.h"
 #include "basic/hostname-util.h"
+#include "basic/string-util.h"
 #include "sd-netlink/local-addresses.h"
+#include "shared/dns-domain.h"
+
+#include "dns-type.h"
 #include "resolved-dns-query.h"
 #include "resolved-dns-synthesize.h"
 #include "resolved-etc-hosts.h"
-#include "basic/string-util.h"
 
 /* How long to wait for the query in total */
 #define QUERY_TIMEOUT_USEC (30 * USEC_PER_SEC)
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-question.c b/src/grp-resolve/systemd-resolved/resolved-dns-question.c
index cdbbecc488..ee53dbff9d 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-question.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-question.c
@@ -19,6 +19,7 @@
 
 #include "basic/alloc-util.h"
 #include "shared/dns-domain.h"
+
 #include "dns-type.h"
 #include "resolved-dns-question.h"
 
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-question.h b/src/grp-resolve/systemd-resolved/resolved-dns-question.h
index 68f9e019b6..3f9aa8fbe0 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-question.h
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-question.h
@@ -22,6 +22,7 @@
 typedef struct DnsQuestion DnsQuestion;
 
 #include "basic/macro.h"
+
 #include "resolved-dns-rr.h"
 
 /* A simple array of resource keys */
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-rr.c b/src/grp-resolve/systemd-resolved/resolved-dns-rr.c
index e53b2c1831..c6a60b65b7 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-rr.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-rr.c
@@ -20,17 +20,18 @@
 #include <math.h>
 
 #include "basic/alloc-util.h"
-#include "shared/dns-domain.h"
-#include "dns-type.h"
 #include "basic/escape.h"
 #include "basic/hexdecoct.h"
-#include "resolved-dns-dnssec.h"
-#include "resolved-dns-packet.h"
-#include "resolved-dns-rr.h"
 #include "basic/string-table.h"
 #include "basic/string-util.h"
 #include "basic/strv.h"
 #include "basic/terminal-util.h"
+#include "shared/dns-domain.h"
+
+#include "dns-type.h"
+#include "resolved-dns-dnssec.h"
+#include "resolved-dns-packet.h"
+#include "resolved-dns-rr.h"
 
 DnsResourceKey* dns_resource_key_new(uint16_t class, uint16_t type, const char *name) {
         DnsResourceKey *k;
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-rr.h b/src/grp-resolve/systemd-resolved/resolved-dns-rr.h
index b919de63ef..daf9c8c210 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-rr.h
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-rr.h
@@ -22,12 +22,13 @@
 #include <netinet/in.h>
 
 #include "basic/bitmap.h"
-#include "dns-type.h"
 #include "basic/hashmap.h"
 #include "basic/in-addr-util.h"
 #include "basic/list.h"
 #include "basic/string-util.h"
 
+#include "dns-type.h"
+
 typedef struct DnsResourceKey DnsResourceKey;
 typedef struct DnsResourceRecord DnsResourceRecord;
 typedef struct DnsTxtItem DnsTxtItem;
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-scope.c b/src/grp-resolve/systemd-resolved/resolved-dns-scope.c
index 98897ff41c..cf878cc783 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-scope.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-scope.c
@@ -21,16 +21,17 @@
 
 #include "basic/af-list.h"
 #include "basic/alloc-util.h"
-#include "shared/dns-domain.h"
 #include "basic/fd-util.h"
 #include "basic/hostname-util.h"
 #include "basic/missing.h"
 #include "basic/random-util.h"
+#include "basic/socket-util.h"
+#include "basic/strv.h"
+#include "shared/dns-domain.h"
+
 #include "resolved-dns-scope.h"
 #include "resolved-llmnr.h"
 #include "resolved-mdns.h"
-#include "basic/socket-util.h"
-#include "basic/strv.h"
 
 #define MULTICAST_RATELIMIT_INTERVAL_USEC (1*USEC_PER_SEC)
 #define MULTICAST_RATELIMIT_BURST 1000
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-search-domain.c b/src/grp-resolve/systemd-resolved/resolved-dns-search-domain.c
index d3b8bf3b4d..7798c498a0 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-search-domain.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-search-domain.c
@@ -19,6 +19,7 @@
 
 #include "basic/alloc-util.h"
 #include "shared/dns-domain.h"
+
 #include "resolved-dns-search-domain.h"
 
 int dns_search_domain_new(
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-server.c b/src/grp-resolve/systemd-resolved/resolved-dns-server.c
index c8c898a866..be11cfa743 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-server.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-server.c
@@ -20,12 +20,13 @@
 #include <systemd/sd-messages.h>
 
 #include "basic/alloc-util.h"
-#include "resolved-dns-server.h"
-#include "resolved-resolv-conf.h"
 #include "basic/siphash24.h"
 #include "basic/string-table.h"
 #include "basic/string-util.h"
 
+#include "resolved-dns-server.h"
+#include "resolved-resolv-conf.h"
+
 /* After how much time to repeat classic DNS requests */
 #define DNS_TIMEOUT_MIN_USEC (500 * USEC_PER_MSEC)
 #define DNS_TIMEOUT_MAX_USEC (5 * USEC_PER_SEC)
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-stream.c b/src/grp-resolve/systemd-resolved/resolved-dns-stream.c
index 4df19e7957..0c55f6d6c7 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-stream.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-stream.c
@@ -23,6 +23,7 @@
 #include "basic/fd-util.h"
 #include "basic/io-util.h"
 #include "basic/missing.h"
+
 #include "resolved-dns-stream.h"
 
 #define DNS_STREAM_TIMEOUT_USEC (10 * USEC_PER_SEC)
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-synthesize.c b/src/grp-resolve/systemd-resolved/resolved-dns-synthesize.c
index 9d7c483271..16e0410f98 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-synthesize.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-synthesize.c
@@ -20,6 +20,7 @@
 #include "basic/alloc-util.h"
 #include "basic/hostname-util.h"
 #include "sd-netlink/local-addresses.h"
+
 #include "resolved-dns-synthesize.h"
 
 int dns_synthesize_ifindex(int ifindex) {
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-transaction.c b/src/grp-resolve/systemd-resolved/resolved-dns-transaction.c
index abaa11d803..3a19b12b47 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-transaction.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-transaction.c
@@ -21,14 +21,15 @@
 
 #include "basic/af-list.h"
 #include "basic/alloc-util.h"
-#include "shared/dns-domain.h"
 #include "basic/errno-list.h"
 #include "basic/fd-util.h"
 #include "basic/random-util.h"
+#include "basic/string-table.h"
+#include "shared/dns-domain.h"
+
 #include "resolved-dns-cache.h"
 #include "resolved-dns-transaction.h"
 #include "resolved-llmnr.h"
-#include "basic/string-table.h"
 
 #define TRANSACTIONS_MAX 4096
 
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.c b/src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.c
index f810c82848..b7c0b08fba 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.c
@@ -22,16 +22,17 @@
 #include "basic/alloc-util.h"
 #include "basic/conf-files.h"
 #include "basic/def.h"
-#include "shared/dns-domain.h"
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
 #include "basic/hexdecoct.h"
 #include "basic/parse-util.h"
-#include "resolved-dns-trust-anchor.h"
-#include "resolved-dns-dnssec.h"
 #include "basic/set.h"
 #include "basic/string-util.h"
 #include "basic/strv.h"
+#include "shared/dns-domain.h"
+
+#include "resolved-dns-dnssec.h"
+#include "resolved-dns-trust-anchor.h"
 
 static const char trust_anchor_dirs[] = CONF_PATHS_NULSTR("dnssec-trust-anchors.d");
 
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.h b/src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.h
index f252628822..5f4e3e236c 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.h
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.h
@@ -22,6 +22,7 @@
 typedef struct DnsTrustAnchor DnsTrustAnchor;
 
 #include "basic/hashmap.h"
+
 #include "resolved-dns-answer.h"
 #include "resolved-dns-rr.h"
 
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-zone.c b/src/grp-resolve/systemd-resolved/resolved-dns-zone.c
index 97048c45d1..192811fc17 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-zone.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-zone.c
@@ -18,11 +18,12 @@
 ***/
 
 #include "basic/alloc-util.h"
-#include "shared/dns-domain.h"
 #include "basic/list.h"
+#include "basic/string-util.h"
+#include "shared/dns-domain.h"
+
 #include "resolved-dns-packet.h"
 #include "resolved-dns-zone.h"
-#include "basic/string-util.h"
 
 /* Never allow more than 1K entries */
 #define ZONE_MAX 1024
diff --git a/src/grp-resolve/systemd-resolved/resolved-etc-hosts.c b/src/grp-resolve/systemd-resolved/resolved-etc-hosts.c
index c5370129a6..2bab6fdc35 100644
--- a/src/grp-resolve/systemd-resolved/resolved-etc-hosts.c
+++ b/src/grp-resolve/systemd-resolved/resolved-etc-hosts.c
@@ -20,12 +20,13 @@
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
 #include "basic/hostname-util.h"
-#include "resolved-etc-hosts.h"
-#include "resolved-dns-synthesize.h"
 #include "basic/string-util.h"
 #include "basic/strv.h"
 #include "basic/time-util.h"
 
+#include "resolved-dns-synthesize.h"
+#include "resolved-etc-hosts.h"
+
 /* Recheck /etc/hosts at most once every 2s */
 #define ETC_HOSTS_RECHECK_USEC (2*USEC_PER_SEC)
 
diff --git a/src/grp-resolve/systemd-resolved/resolved-etc-hosts.h b/src/grp-resolve/systemd-resolved/resolved-etc-hosts.h
index 9d5a175f18..047443a896 100644
--- a/src/grp-resolve/systemd-resolved/resolved-etc-hosts.h
+++ b/src/grp-resolve/systemd-resolved/resolved-etc-hosts.h
@@ -19,9 +19,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "resolved-manager.h"
-#include "resolved-dns-question.h"
 #include "resolved-dns-answer.h"
+#include "resolved-dns-question.h"
+#include "resolved-manager.h"
 
 void manager_etc_hosts_flush(Manager *m);
 int manager_etc_hosts_read(Manager *m);
diff --git a/src/grp-resolve/systemd-resolved/resolved-link-bus.c b/src/grp-resolve/systemd-resolved/resolved-link-bus.c
index 3c0c032fac..122c4dd45d 100644
--- a/src/grp-resolve/systemd-resolved/resolved-link-bus.c
+++ b/src/grp-resolve/systemd-resolved/resolved-link-bus.c
@@ -18,12 +18,13 @@
 ***/
 
 #include "basic/alloc-util.h"
-#include "shared/bus-util.h"
 #include "basic/parse-util.h"
+#include "basic/strv.h"
+#include "shared/bus-util.h"
 #include "shared/resolve-util.h"
+
 #include "resolved-bus.h"
 #include "resolved-link-bus.h"
-#include "basic/strv.h"
 
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_resolve_support, resolve_support, ResolveSupport);
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_dnssec_mode, dnssec_mode, DnssecMode);
diff --git a/src/grp-resolve/systemd-resolved/resolved-llmnr.c b/src/grp-resolve/systemd-resolved/resolved-llmnr.c
index 4b303b6686..24b7a4784f 100644
--- a/src/grp-resolve/systemd-resolved/resolved-llmnr.c
+++ b/src/grp-resolve/systemd-resolved/resolved-llmnr.c
@@ -21,6 +21,7 @@
 #include <resolv.h>
 
 #include "basic/fd-util.h"
+
 #include "resolved-llmnr.h"
 #include "resolved-manager.h"
 
diff --git a/src/grp-resolve/systemd-resolved/resolved-manager.c b/src/grp-resolve/systemd-resolved/resolved-manager.c
index b5bd140a54..a326823c3a 100644
--- a/src/grp-resolve/systemd-resolved/resolved-manager.c
+++ b/src/grp-resolve/systemd-resolved/resolved-manager.c
@@ -23,15 +23,20 @@
 
 #include "basic/af-list.h"
 #include "basic/alloc-util.h"
-#include "shared/dns-domain.h"
 #include "basic/fd-util.h"
 #include "basic/fileio-label.h"
 #include "basic/hostname-util.h"
 #include "basic/io-util.h"
-#include "systemd-network/network-internal.h"
 #include "basic/ordered-set.h"
 #include "basic/parse-util.h"
 #include "basic/random-util.h"
+#include "basic/socket-util.h"
+#include "basic/string-table.h"
+#include "basic/string-util.h"
+#include "basic/utf8.h"
+#include "shared/dns-domain.h"
+#include "systemd-network/network-internal.h"
+
 #include "resolved-bus.h"
 #include "resolved-conf.h"
 #include "resolved-etc-hosts.h"
@@ -39,10 +44,6 @@
 #include "resolved-manager.h"
 #include "resolved-mdns.h"
 #include "resolved-resolv-conf.h"
-#include "basic/socket-util.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
-#include "basic/utf8.h"
 
 #define SEND_TIMEOUT_USEC (200 * USEC_PER_MSEC)
 
diff --git a/src/grp-resolve/systemd-resolved/resolved-mdns.c b/src/grp-resolve/systemd-resolved/resolved-mdns.c
index 4ef3f1b37c..0c78f7bda5 100644
--- a/src/grp-resolve/systemd-resolved/resolved-mdns.c
+++ b/src/grp-resolve/systemd-resolved/resolved-mdns.c
@@ -17,11 +17,12 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
 
-#include <resolv.h>
-#include <netinet/in.h>
 #include <arpa/inet.h>
+#include <netinet/in.h>
+#include <resolv.h>
 
 #include "basic/fd-util.h"
+
 #include "resolved-manager.h"
 #include "resolved-mdns.h"
 
diff --git a/src/grp-resolve/systemd-resolved/resolved-resolv-conf.c b/src/grp-resolve/systemd-resolved/resolved-resolv-conf.c
index 70f9173c22..c50796de2e 100644
--- a/src/grp-resolve/systemd-resolved/resolved-resolv-conf.c
+++ b/src/grp-resolve/systemd-resolved/resolved-resolv-conf.c
@@ -20,15 +20,16 @@
 #include <resolv.h>
 
 #include "basic/alloc-util.h"
-#include "shared/dns-domain.h"
 #include "basic/fd-util.h"
 #include "basic/fileio-label.h"
 #include "basic/fileio.h"
 #include "basic/ordered-set.h"
-#include "resolved-conf.h"
-#include "resolved-resolv-conf.h"
 #include "basic/string-util.h"
 #include "basic/strv.h"
+#include "shared/dns-domain.h"
+
+#include "resolved-conf.h"
+#include "resolved-resolv-conf.h"
 
 int manager_read_resolv_conf(Manager *m) {
         _cleanup_fclose_ FILE *f = NULL;
diff --git a/src/grp-resolve/systemd-resolved/resolved.c b/src/grp-resolve/systemd-resolved/resolved.c
index a59543d497..07952227ce 100644
--- a/src/grp-resolve/systemd-resolved/resolved.c
+++ b/src/grp-resolve/systemd-resolved/resolved.c
@@ -22,13 +22,14 @@
 
 #include "basic/capability-util.h"
 #include "basic/mkdir.h"
-#include "resolved-conf.h"
-#include "resolved-manager.h"
-#include "resolved-resolv-conf.h"
 #include "basic/selinux-util.h"
 #include "basic/signal-util.h"
 #include "basic/user-util.h"
 
+#include "resolved-conf.h"
+#include "resolved-manager.h"
+#include "resolved-resolv-conf.h"
+
 int main(int argc, char *argv[]) {
         _cleanup_(manager_freep) Manager *m = NULL;
         const char *user = "systemd-resolve";
diff --git a/src/grp-resolve/systemd-resolved/test-dns-packet.c b/src/grp-resolve/systemd-resolved/test-dns-packet.c
index 8749461e8c..18d04b930d 100644
--- a/src/grp-resolve/systemd-resolved/test-dns-packet.c
+++ b/src/grp-resolve/systemd-resolved/test-dns-packet.c
@@ -17,19 +17,20 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <net/if.h>
 #include <glob.h>
+#include <net/if.h>
 
 #include "basic/alloc-util.h"
 #include "basic/fileio.h"
 #include "basic/glob-util.h"
 #include "basic/log.h"
 #include "basic/macro.h"
-#include "resolved-dns-packet.h"
-#include "resolved-dns-rr.h"
 #include "basic/string-util.h"
 #include "basic/strv.h"
 
+#include "resolved-dns-packet.h"
+#include "resolved-dns-rr.h"
+
 #define HASH_KEY SD_ID128_MAKE(d3,1e,48,90,4b,fa,4c,fe,af,9d,d5,a1,d7,2e,8a,b1)
 
 static uint64_t hash(DnsResourceRecord *rr) {
diff --git a/src/grp-resolve/systemd-resolved/test-dnssec-complex.c b/src/grp-resolve/systemd-resolved/test-dnssec-complex.c
index 9662a99409..ef78cd1ea5 100644
--- a/src/grp-resolve/systemd-resolved/test-dnssec-complex.c
+++ b/src/grp-resolve/systemd-resolved/test-dnssec-complex.c
@@ -23,11 +23,12 @@
 
 #include "basic/af-list.h"
 #include "basic/alloc-util.h"
-#include "bus-common-errors.h"
-#include "dns-type.h"
 #include "basic/random-util.h"
 #include "basic/string-util.h"
 #include "basic/time-util.h"
+#include "sd-bus/bus-common-errors.h"
+
+#include "dns-type.h"
 
 #define DNS_CALL_TIMEOUT_USEC (45*USEC_PER_SEC)
 
diff --git a/src/grp-resolve/systemd-resolved/test-dnssec.c b/src/grp-resolve/systemd-resolved/test-dnssec.c
index 8e1fbad074..1f05196d8e 100644
--- a/src/grp-resolve/systemd-resolved/test-dnssec.c
+++ b/src/grp-resolve/systemd-resolved/test-dnssec.c
@@ -22,10 +22,11 @@
 #include <sys/socket.h>
 
 #include "basic/alloc-util.h"
+#include "basic/hexdecoct.h"
+#include "basic/string-util.h"
+
 #include "resolved-dns-dnssec.h"
 #include "resolved-dns-rr.h"
-#include "basic/string-util.h"
-#include "basic/hexdecoct.h"
 
 static void test_dnssec_canonicalize_one(const char *original, const char *canonical, int r) {
         char canonicalized[DNSSEC_CANONICAL_HOSTNAME_MAX];
diff --git a/src/grp-resolve/systemd-resolved/test-resolve-tables.c b/src/grp-resolve/systemd-resolved/test-resolve-tables.c
index 0307c6485f..0eaab70687 100644
--- a/src/grp-resolve/systemd-resolved/test-resolve-tables.c
+++ b/src/grp-resolve/systemd-resolved/test-resolve-tables.c
@@ -17,9 +17,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "dns-type.h"
 #include "shared/test-tables.h"
 
+#include "dns-type.h"
+
 int main(int argc, char **argv) {
         uint16_t i;