16 files changed, 19 insertions, 29 deletions
diff --git a/src/grp-resolve/libbasic-dns/dns-type.h b/src/grp-resolve/libbasic-dns/include/basic-dns/dns-type.h
index df1642f85e..df1642f85e 100644
--- a/src/grp-resolve/libbasic-dns/dns-type.h
+++ b/src/grp-resolve/libbasic-dns/include/basic-dns/dns-type.h
diff --git a/src/grp-resolve/libbasic-dns/resolved-dns-answer.h b/src/grp-resolve/libbasic-dns/include/basic-dns/resolved-dns-answer.h
index 447604d008..447604d008 100644
--- a/src/grp-resolve/libbasic-dns/resolved-dns-answer.h
+++ b/src/grp-resolve/libbasic-dns/include/basic-dns/resolved-dns-answer.h
diff --git a/src/grp-resolve/libbasic-dns/resolved-dns-dnssec.h b/src/grp-resolve/libbasic-dns/include/basic-dns/resolved-dns-dnssec.h
index b91abe98ac..b91abe98ac 100644
--- a/src/grp-resolve/libbasic-dns/resolved-dns-dnssec.h
+++ b/src/grp-resolve/libbasic-dns/include/basic-dns/resolved-dns-dnssec.h
diff --git a/src/grp-resolve/libbasic-dns/resolved-dns-packet.h b/src/grp-resolve/libbasic-dns/include/basic-dns/resolved-dns-packet.h
index cb03de8986..b1aec71ccc 100644
--- a/src/grp-resolve/libbasic-dns/resolved-dns-packet.h
+++ b/src/grp-resolve/libbasic-dns/include/basic-dns/resolved-dns-packet.h
@@ -22,6 +22,7 @@
 #include <netinet/ip.h>
 #include <netinet/udp.h>
 
+#include "resolved-def.h"
 #include "systemd-basic/hashmap.h"
 #include "systemd-basic/in-addr-util.h"
 #include "systemd-basic/macro.h"
@@ -30,7 +31,6 @@
 typedef struct DnsPacket DnsPacket;
 typedef struct DnsPacketHeader DnsPacketHeader;
 
-#include "resolved-def.h"
 #include "resolved-dns-answer.h"
 #include "resolved-dns-question.h"
 #include "resolved-dns-rr.h"
diff --git a/src/grp-resolve/libbasic-dns/resolved-dns-question.h b/src/grp-resolve/libbasic-dns/include/basic-dns/resolved-dns-question.h
index fb1b2d2410..fb1b2d2410 100644
--- a/src/grp-resolve/libbasic-dns/resolved-dns-question.h
+++ b/src/grp-resolve/libbasic-dns/include/basic-dns/resolved-dns-question.h
diff --git a/src/grp-resolve/libbasic-dns/resolved-dns-rr.h b/src/grp-resolve/libbasic-dns/include/basic-dns/resolved-dns-rr.h
index 864c7c237f..864c7c237f 100644
--- a/src/grp-resolve/libbasic-dns/resolved-dns-rr.h
+++ b/src/grp-resolve/libbasic-dns/include/basic-dns/resolved-dns-rr.h
diff --git a/src/grp-resolve/libbasic-dns/dns-type.c b/src/grp-resolve/libbasic-dns/src/dns-type.c
index 44e4970fbf..79603c4dfc 100644
--- a/src/grp-resolve/libbasic-dns/dns-type.c
+++ b/src/grp-resolve/libbasic-dns/src/dns-type.c
@@ -19,11 +19,10 @@
 
 #include <sys/socket.h>
 
+#include "basic-dns/dns-type.h"
 #include "systemd-basic/parse-util.h"
 #include "systemd-basic/string-util.h"
 
-#include "dns-type.h"
-
 typedef const struct {
         uint16_t type;
         const char *name;
diff --git a/src/grp-resolve/libbasic-dns/resolved-dns-answer.c b/src/grp-resolve/libbasic-dns/src/resolved-dns-answer.c
index 95c1398056..afb0d3cafa 100644
--- a/src/grp-resolve/libbasic-dns/resolved-dns-answer.c
+++ b/src/grp-resolve/libbasic-dns/src/resolved-dns-answer.c
@@ -17,13 +17,12 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "basic-dns/resolved-dns-answer.h"
+#include "basic-dns/resolved-dns-dnssec.h"
 #include "systemd-basic/alloc-util.h"
 #include "systemd-basic/string-util.h"
 #include "systemd-shared/dns-domain.h"
 
-#include "resolved-dns-answer.h"
-#include "resolved-dns-dnssec.h"
-
 DnsAnswer *dns_answer_new(unsigned n) {
         DnsAnswer *a;
 
diff --git a/src/grp-resolve/libbasic-dns/resolved-dns-dnssec.c b/src/grp-resolve/libbasic-dns/src/resolved-dns-dnssec.c
index 1eddec8373..26ee159d60 100644
--- a/src/grp-resolve/libbasic-dns/resolved-dns-dnssec.c
+++ b/src/grp-resolve/libbasic-dns/src/resolved-dns-dnssec.c
@@ -21,15 +21,14 @@
 #include <gcrypt.h>
 #endif
 
+#include "basic-dns/resolved-dns-dnssec.h"
+#include "basic-dns/resolved-dns-packet.h"
 #include "systemd-basic/alloc-util.h"
 #include "systemd-basic/hexdecoct.h"
 #include "systemd-basic/string-table.h"
 #include "systemd-shared/dns-domain.h"
 #include "systemd-shared/gcrypt-util.h"
 
-#include "resolved-dns-dnssec.h"
-#include "resolved-dns-packet.h"
-
 #define VERIFY_RRS_MAX 256
 #define MAX_KEY_SIZE (32*1024)
 
diff --git a/src/grp-resolve/libbasic-dns/resolved-dns-packet.c b/src/grp-resolve/libbasic-dns/src/resolved-dns-packet.c
index 28667bb3e8..e142832211 100644
--- a/src/grp-resolve/libbasic-dns/resolved-dns-packet.c
+++ b/src/grp-resolve/libbasic-dns/src/resolved-dns-packet.c
@@ -17,6 +17,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
 
+#include "basic-dns/resolved-dns-packet.h"
 #include "systemd-basic/alloc-util.h"
 #include "systemd-basic/string-table.h"
 #include "systemd-basic/strv.h"
@@ -25,8 +26,6 @@
 #include "systemd-basic/util.h"
 #include "systemd-shared/dns-domain.h"
 
-#include "resolved-dns-packet.h"
-
 #define EDNS0_OPT_DO (1<<15)
 
 typedef struct DnsPacketRewinder {
diff --git a/src/grp-resolve/libbasic-dns/resolved-dns-question.c b/src/grp-resolve/libbasic-dns/src/resolved-dns-question.c
index 686bc01a09..672ef6207d 100644
--- a/src/grp-resolve/libbasic-dns/resolved-dns-question.c
+++ b/src/grp-resolve/libbasic-dns/src/resolved-dns-question.c
@@ -17,12 +17,11 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "basic-dns/dns-type.h"
+#include "basic-dns/resolved-dns-question.h"
 #include "systemd-basic/alloc-util.h"
 #include "systemd-shared/dns-domain.h"
 
-#include "dns-type.h"
-#include "resolved-dns-question.h"
-
 DnsQuestion *dns_question_new(unsigned n) {
         DnsQuestion *q;
 
diff --git a/src/grp-resolve/libbasic-dns/resolved-dns-rr.c b/src/grp-resolve/libbasic-dns/src/resolved-dns-rr.c
index fbe0ff65d6..35d389b802 100644
--- a/src/grp-resolve/libbasic-dns/resolved-dns-rr.c
+++ b/src/grp-resolve/libbasic-dns/src/resolved-dns-rr.c
@@ -19,6 +19,10 @@
 
 #include <math.h>
 
+#include "basic-dns/dns-type.h"
+#include "basic-dns/resolved-dns-dnssec.h"
+#include "basic-dns/resolved-dns-packet.h"
+#include "basic-dns/resolved-dns-rr.h"
 #include "systemd-basic/alloc-util.h"
 #include "systemd-basic/escape.h"
 #include "systemd-basic/hexdecoct.h"
@@ -28,11 +32,6 @@
 #include "systemd-basic/terminal-util.h"
 #include "systemd-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;
         size_t l;
diff --git a/src/grp-resolve/libbasic-dns/test-dns-packet.c b/src/grp-resolve/libbasic-dns/src/test-dns-packet.c
index 059011513c..7a012c13dd 100644
--- a/src/grp-resolve/libbasic-dns/test-dns-packet.c
+++ b/src/grp-resolve/libbasic-dns/src/test-dns-packet.c
@@ -20,6 +20,8 @@
 #include <glob.h>
 #include <net/if.h>
 
+#include "basic-dns/resolved-dns-packet.h"
+#include "basic-dns/resolved-dns-rr.h"
 #include "systemd-basic/alloc-util.h"
 #include "systemd-basic/fileio.h"
 #include "systemd-basic/glob-util.h"
@@ -29,9 +31,6 @@
 #include "systemd-basic/strv.h"
 #include "systemd-basic/unaligned.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 void verify_rr_copy(DnsResourceRecord *rr) {
diff --git a/src/grp-resolve/libbasic-dns/test-dnssec-complex.c b/src/grp-resolve/libbasic-dns/src/test-dnssec-complex.c
index afa01d9858..2eb4cfe1c2 100644
--- a/src/grp-resolve/libbasic-dns/test-dnssec-complex.c
+++ b/src/grp-resolve/libbasic-dns/src/test-dnssec-complex.c
@@ -21,6 +21,7 @@
 
 #include <systemd/sd-bus.h>
 
+#include "basic-dns/dns-type.h"
 #include "sd-bus/bus-common-errors.h"
 #include "systemd-basic/af-list.h"
 #include "systemd-basic/alloc-util.h"
@@ -28,8 +29,6 @@
 #include "systemd-basic/string-util.h"
 #include "systemd-basic/time-util.h"
 
-#include "dns-type.h"
-
 #define DNS_CALL_TIMEOUT_USEC (45*USEC_PER_SEC)
 
 static void prefix_random(const char *name, char **ret) {
diff --git a/src/grp-resolve/libbasic-dns/test-dnssec.c b/src/grp-resolve/libbasic-dns/src/test-dnssec.c
index 1e7b4913b0..c2b8a74944 100644
--- a/src/grp-resolve/libbasic-dns/test-dnssec.c
+++ b/src/grp-resolve/libbasic-dns/src/test-dnssec.c
@@ -21,13 +21,12 @@
 #include <netinet/in.h>
 #include <sys/socket.h>
 
+#include "basic-dns/resolved-dns-dnssec.h"
+#include "basic-dns/resolved-dns-rr.h"
 #include "systemd-basic/alloc-util.h"
 #include "systemd-basic/hexdecoct.h"
 #include "systemd-basic/string-util.h"
 
-#include "resolved-dns-dnssec.h"
-#include "resolved-dns-rr.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/libbasic-dns/test-resolve-tables.c b/src/grp-resolve/libbasic-dns/src/test-resolve-tables.c
index 6f96235dec..98474b1abf 100644
--- a/src/grp-resolve/libbasic-dns/test-resolve-tables.c
+++ b/src/grp-resolve/libbasic-dns/src/test-resolve-tables.c
@@ -17,10 +17,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "basic-dns/dns-type.h"
 #include "systemd-shared/test-tables.h"
 
-#include "dns-type.h"
-
 int main(int argc, char **argv) {
         uint16_t i;