fix

45 files changed, 161 insertions, 161 deletions

diff --git a/src/grp-resolve/systemd-resolved/dns-type.c b/src/grp-resolve/systemd-resolved/dns-type.c
index 78d9d5733f..1aa9424222 100644
--- a/src/grp-resolve/systemd-resolved/dns-type.c
+++ b/src/grp-resolve/systemd-resolved/dns-type.c
@@ -20,8 +20,8 @@
 #include <sys/socket.h>
 
 #include "dns-type.h"
-#include "parse-util.h"
-#include "string-util.h"
+#include "basic/parse-util.h"
+#include "basic/string-util.h"
 
 typedef const struct {
         uint16_t type;
diff --git a/src/grp-resolve/systemd-resolved/dns-type.h b/src/grp-resolve/systemd-resolved/dns-type.h
index 7b79d29d7e..a8ee105e16 100644
--- a/src/grp-resolve/systemd-resolved/dns-type.h
+++ b/src/grp-resolve/systemd-resolved/dns-type.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "macro.h"
+#include "basic/macro.h"
 
 /* DNS record types, taken from
  * http://www.iana.org/assignments/dns-parameters/dns-parameters.xhtml.
diff --git a/src/grp-resolve/systemd-resolved/resolve-tool.c b/src/grp-resolve/systemd-resolved/resolve-tool.c
index 65ad9d29db..7824a36d3d 100644
--- a/src/grp-resolve/systemd-resolved/resolve-tool.c
+++ b/src/grp-resolve/systemd-resolved/resolve-tool.c
@@ -22,17 +22,17 @@
 
 #include <systemd/sd-bus.h>
 
-#include "af-list.h"
-#include "alloc-util.h"
+#include "basic/af-list.h"
+#include "basic/alloc-util.h"
 #include "sd-bus/bus-error.h"
 #include "bus-util.h"
-#include "escape.h"
-#include "in-addr-util.h"
+#include "basic/escape.h"
+#include "basic/in-addr-util.h"
 #include "gcrypt-util.h"
-#include "parse-util.h"
+#include "basic/parse-util.h"
 #include "resolved-def.h"
 #include "resolved-dns-packet.h"
-#include "terminal-util.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 5f2c70eedf..49a7addc24 100644
--- a/src/grp-resolve/systemd-resolved/resolved-bus.c
+++ b/src/grp-resolve/systemd-resolved/resolved-bus.c
@@ -17,7 +17,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "sd-bus/bus-common-errors.h"
 #include "bus-util.h"
 #include "dns-domain.h"
diff --git a/src/grp-resolve/systemd-resolved/resolved-conf.c b/src/grp-resolve/systemd-resolved/resolved-conf.c
index 990dc03b60..3b33d45a6a 100644
--- a/src/grp-resolve/systemd-resolved/resolved-conf.c
+++ b/src/grp-resolve/systemd-resolved/resolved-conf.c
@@ -17,13 +17,13 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "conf-parser.h"
-#include "def.h"
-#include "extract-word.h"
-#include "parse-util.h"
+#include "basic/def.h"
+#include "basic/extract-word.h"
+#include "basic/parse-util.h"
 #include "resolved-conf.h"
-#include "string-util.h"
+#include "basic/string-util.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 0dadf8b1dd..bd3aef6e5e 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-answer.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-answer.c
@@ -17,11 +17,11 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "dns-domain.h"
 #include "resolved-dns-answer.h"
 #include "resolved-dns-dnssec.h"
-#include "string-util.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 0679c610f5..b08fef39f5 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-answer.h
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-answer.h
@@ -22,7 +22,7 @@
 typedef struct DnsAnswer DnsAnswer;
 typedef struct DnsAnswerItem DnsAnswerItem;
 
-#include "macro.h"
+#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 77c42d7aad..8b67a7b903 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-cache.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-cache.c
@@ -19,13 +19,13 @@
 
 #include <net/if.h>
 
-#include "af-list.h"
-#include "alloc-util.h"
+#include "basic/af-list.h"
+#include "basic/alloc-util.h"
 #include "dns-domain.h"
 #include "resolved-dns-answer.h"
 #include "resolved-dns-cache.h"
 #include "resolved-dns-packet.h"
-#include "string-util.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-cache.h b/src/grp-resolve/systemd-resolved/resolved-dns-cache.h
index 2293718e86..e7cdd2e27a 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-cache.h
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-cache.h
@@ -19,10 +19,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "hashmap.h"
-#include "list.h"
-#include "prioq.h"
-#include "time-util.h"
+#include "basic/hashmap.h"
+#include "basic/list.h"
+#include "basic/prioq.h"
+#include "basic/time-util.h"
 
 typedef struct DnsCache {
         Hashmap *by_key;
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-dnssec.c b/src/grp-resolve/systemd-resolved/resolved-dns-dnssec.c
index a54aed3a63..94524703b7 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-dnssec.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-dnssec.c
@@ -21,13 +21,13 @@
 #include <gcrypt.h>
 #endif
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "dns-domain.h"
 #include "gcrypt-util.h"
-#include "hexdecoct.h"
+#include "basic/hexdecoct.h"
 #include "resolved-dns-dnssec.h"
 #include "resolved-dns-packet.h"
-#include "string-table.h"
+#include "basic/string-table.h"
 
 #define VERIFY_RRS_MAX 256
 #define MAX_KEY_SIZE (32*1024)
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-packet.c b/src/grp-resolve/systemd-resolved/resolved-dns-packet.c
index b7907bb511..07fc9f5b73 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-packet.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-packet.c
@@ -17,14 +17,14 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "dns-domain.h"
 #include "resolved-dns-packet.h"
-#include "string-table.h"
-#include "strv.h"
-#include "unaligned.h"
-#include "utf8.h"
-#include "util.h"
+#include "basic/string-table.h"
+#include "basic/strv.h"
+#include "basic/unaligned.h"
+#include "basic/utf8.h"
+#include "basic/util.h"
 
 #define EDNS0_OPT_DO (1<<15)
 
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-packet.h b/src/grp-resolve/systemd-resolved/resolved-dns-packet.h
index 416335d0a2..4b9916d8ba 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-packet.h
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-packet.h
@@ -22,10 +22,10 @@
 #include <netinet/ip.h>
 #include <netinet/udp.h>
 
-#include "hashmap.h"
-#include "in-addr-util.h"
-#include "macro.h"
-#include "sparse-endian.h"
+#include "basic/hashmap.h"
+#include "basic/in-addr-util.h"
+#include "basic/macro.h"
+#include "basic/sparse-endian.h"
 
 typedef struct DnsPacketHeader DnsPacketHeader;
 typedef struct DnsPacket DnsPacket;
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-query.c b/src/grp-resolve/systemd-resolved/resolved-dns-query.c
index 20dcab78ff..a1e471be92 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-query.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-query.c
@@ -17,15 +17,15 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "dns-domain.h"
 #include "dns-type.h"
-#include "hostname-util.h"
+#include "basic/hostname-util.h"
 #include "sd-netlink/local-addresses.h"
 #include "resolved-dns-query.h"
 #include "resolved-dns-synthesize.h"
 #include "resolved-etc-hosts.h"
-#include "string-util.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-query.h b/src/grp-resolve/systemd-resolved/resolved-dns-query.h
index 7f7c76ff20..788d303165 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-query.h
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-query.h
@@ -22,7 +22,7 @@
 
 #include <systemd/sd-bus.h>
 
-#include "set.h"
+#include "basic/set.h"
 
 typedef struct DnsQueryCandidate DnsQueryCandidate;
 typedef struct DnsQuery DnsQuery;
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-question.c b/src/grp-resolve/systemd-resolved/resolved-dns-question.c
index c8b502d1cd..9e15ad45dd 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-question.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-question.c
@@ -17,7 +17,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "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 ea41478975..68f9e019b6 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-question.h
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-question.h
@@ -21,7 +21,7 @@
 
 typedef struct DnsQuestion DnsQuestion;
 
-#include "macro.h"
+#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 6a29a93a26..c1a729ce94 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-rr.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-rr.c
@@ -19,18 +19,18 @@
 
 #include <math.h>
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "dns-domain.h"
 #include "dns-type.h"
-#include "escape.h"
-#include "hexdecoct.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 "string-table.h"
-#include "string-util.h"
-#include "strv.h"
-#include "terminal-util.h"
+#include "basic/string-table.h"
+#include "basic/string-util.h"
+#include "basic/strv.h"
+#include "basic/terminal-util.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 020a2abd77..b919de63ef 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-rr.h
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-rr.h
@@ -21,12 +21,12 @@
 
 #include <netinet/in.h>
 
-#include "bitmap.h"
+#include "basic/bitmap.h"
 #include "dns-type.h"
-#include "hashmap.h"
-#include "in-addr-util.h"
-#include "list.h"
-#include "string-util.h"
+#include "basic/hashmap.h"
+#include "basic/in-addr-util.h"
+#include "basic/list.h"
+#include "basic/string-util.h"
 
 typedef struct DnsResourceKey DnsResourceKey;
 typedef struct DnsResourceRecord DnsResourceRecord;
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-scope.c b/src/grp-resolve/systemd-resolved/resolved-dns-scope.c
index 66e4585c18..a77162663d 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-scope.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-scope.c
@@ -19,18 +19,18 @@
 
 #include <netinet/tcp.h>
 
-#include "af-list.h"
-#include "alloc-util.h"
+#include "basic/af-list.h"
+#include "basic/alloc-util.h"
 #include "dns-domain.h"
-#include "fd-util.h"
-#include "hostname-util.h"
-#include "missing.h"
-#include "random-util.h"
+#include "basic/fd-util.h"
+#include "basic/hostname-util.h"
+#include "basic/missing.h"
+#include "basic/random-util.h"
 #include "resolved-dns-scope.h"
 #include "resolved-llmnr.h"
 #include "resolved-mdns.h"
-#include "socket-util.h"
-#include "strv.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-scope.h b/src/grp-resolve/systemd-resolved/resolved-dns-scope.h
index 291e5817d0..7bd40781bd 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-scope.h
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-scope.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "list.h"
+#include "basic/list.h"
 
 typedef struct DnsScope DnsScope;
 
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 732471027b..71824d8c4a 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-search-domain.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-search-domain.c
@@ -17,7 +17,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "dns-domain.h"
 #include "resolved-dns-search-domain.h"
 
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-search-domain.h b/src/grp-resolve/systemd-resolved/resolved-dns-search-domain.h
index eaacef4edc..f047941db2 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-search-domain.h
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-search-domain.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "macro.h"
+#include "basic/macro.h"
 
 typedef struct DnsSearchDomain DnsSearchDomain;
 
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-server.c b/src/grp-resolve/systemd-resolved/resolved-dns-server.c
index dedc9beb19..c8c898a866 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-server.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-server.c
@@ -19,12 +19,12 @@
 
 #include <systemd/sd-messages.h>
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "resolved-dns-server.h"
 #include "resolved-resolv-conf.h"
-#include "siphash24.h"
-#include "string-table.h"
-#include "string-util.h"
+#include "basic/siphash24.h"
+#include "basic/string-table.h"
+#include "basic/string-util.h"
 
 /* After how much time to repeat classic DNS requests */
 #define DNS_TIMEOUT_MIN_USEC (500 * USEC_PER_MSEC)
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-server.h b/src/grp-resolve/systemd-resolved/resolved-dns-server.h
index 9f4a69c37a..2855c97faa 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-server.h
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-server.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "in-addr-util.h"
+#include "basic/in-addr-util.h"
 
 typedef struct DnsServer DnsServer;
 
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-stream.c b/src/grp-resolve/systemd-resolved/resolved-dns-stream.c
index a1040aeff4..4df19e7957 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-stream.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-stream.c
@@ -19,10 +19,10 @@
 
 #include <netinet/tcp.h>
 
-#include "alloc-util.h"
-#include "fd-util.h"
-#include "io-util.h"
-#include "missing.h"
+#include "basic/alloc-util.h"
+#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-stream.h b/src/grp-resolve/systemd-resolved/resolved-dns-stream.h
index 5ccc842249..13879bcec6 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-stream.h
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-stream.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "socket-util.h"
+#include "basic/socket-util.h"
 
 typedef struct DnsStream DnsStream;
 
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-synthesize.c b/src/grp-resolve/systemd-resolved/resolved-dns-synthesize.c
index 5989f049ff..9d7c483271 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-synthesize.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-synthesize.c
@@ -17,8 +17,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "alloc-util.h"
-#include "hostname-util.h"
+#include "basic/alloc-util.h"
+#include "basic/hostname-util.h"
 #include "sd-netlink/local-addresses.h"
 #include "resolved-dns-synthesize.h"
 
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-transaction.c b/src/grp-resolve/systemd-resolved/resolved-dns-transaction.c
index 1b4b2b804b..f5c52a5185 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-transaction.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-transaction.c
@@ -19,16 +19,16 @@
 
 #include <systemd/sd-messages.h>
 
-#include "af-list.h"
-#include "alloc-util.h"
+#include "basic/af-list.h"
+#include "basic/alloc-util.h"
 #include "dns-domain.h"
-#include "errno-list.h"
-#include "fd-util.h"
-#include "random-util.h"
+#include "basic/errno-list.h"
+#include "basic/fd-util.h"
+#include "basic/random-util.h"
 #include "resolved-dns-cache.h"
 #include "resolved-dns-transaction.h"
 #include "resolved-llmnr.h"
-#include "string-table.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 0972792341..f1998f99f7 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.c
@@ -19,19 +19,19 @@
 
 #include <systemd/sd-messages.h>
 
-#include "alloc-util.h"
-#include "conf-files.h"
-#include "def.h"
+#include "basic/alloc-util.h"
+#include "basic/conf-files.h"
+#include "basic/def.h"
 #include "dns-domain.h"
-#include "fd-util.h"
-#include "fileio.h"
-#include "hexdecoct.h"
-#include "parse-util.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 "set.h"
-#include "string-util.h"
-#include "strv.h"
+#include "basic/set.h"
+#include "basic/string-util.h"
+#include "basic/strv.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 635c75fde5..f252628822 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.h
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.h
@@ -21,7 +21,7 @@
 
 typedef struct DnsTrustAnchor DnsTrustAnchor;
 
-#include "hashmap.h"
+#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 850eed8cb8..f78e6da33c 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-zone.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-zone.c
@@ -17,12 +17,12 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "dns-domain.h"
-#include "list.h"
+#include "basic/list.h"
 #include "resolved-dns-packet.h"
 #include "resolved-dns-zone.h"
-#include "string-util.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-dns-zone.h b/src/grp-resolve/systemd-resolved/resolved-dns-zone.h
index 408833c359..baddbc78ec 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-zone.h
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-zone.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "hashmap.h"
+#include "basic/hashmap.h"
 
 typedef struct DnsZone {
         Hashmap *by_key;
diff --git a/src/grp-resolve/systemd-resolved/resolved-etc-hosts.c b/src/grp-resolve/systemd-resolved/resolved-etc-hosts.c
index 40d650949d..c5370129a6 100644
--- a/src/grp-resolve/systemd-resolved/resolved-etc-hosts.c
+++ b/src/grp-resolve/systemd-resolved/resolved-etc-hosts.c
@@ -17,14 +17,14 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "fd-util.h"
-#include "fileio.h"
-#include "hostname-util.h"
+#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 "string-util.h"
-#include "strv.h"
-#include "time-util.h"
+#include "basic/string-util.h"
+#include "basic/strv.h"
+#include "basic/time-util.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-link-bus.c b/src/grp-resolve/systemd-resolved/resolved-link-bus.c
index 7f21891819..2a51c3a1b0 100644
--- a/src/grp-resolve/systemd-resolved/resolved-link-bus.c
+++ b/src/grp-resolve/systemd-resolved/resolved-link-bus.c
@@ -17,13 +17,13 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "bus-util.h"
-#include "parse-util.h"
+#include "basic/parse-util.h"
 #include "resolve-util.h"
 #include "resolved-bus.h"
 #include "resolved-link-bus.h"
-#include "strv.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-link.c b/src/grp-resolve/systemd-resolved/resolved-link.c
index 4eef20599a..6172a763dc 100644
--- a/src/grp-resolve/systemd-resolved/resolved-link.c
+++ b/src/grp-resolve/systemd-resolved/resolved-link.c
@@ -21,12 +21,12 @@
 
 #include <systemd/sd-network.h>
 
-#include "alloc-util.h"
-#include "missing.h"
-#include "parse-util.h"
+#include "basic/alloc-util.h"
+#include "basic/missing.h"
+#include "basic/parse-util.h"
 #include "resolved-link.h"
-#include "string-util.h"
-#include "strv.h"
+#include "basic/string-util.h"
+#include "basic/strv.h"
 
 int link_new(Manager *m, Link **ret, int ifindex) {
         _cleanup_(link_freep) Link *l = NULL;
diff --git a/src/grp-resolve/systemd-resolved/resolved-link.h b/src/grp-resolve/systemd-resolved/resolved-link.h
index f534c12824..051716db96 100644
--- a/src/grp-resolve/systemd-resolved/resolved-link.h
+++ b/src/grp-resolve/systemd-resolved/resolved-link.h
@@ -21,8 +21,8 @@
 
 #include <net/if.h>
 
-#include "in-addr-util.h"
-#include "ratelimit.h"
+#include "basic/in-addr-util.h"
+#include "basic/ratelimit.h"
 #include "resolve-util.h"
 
 typedef struct Link Link;
diff --git a/src/grp-resolve/systemd-resolved/resolved-llmnr.c b/src/grp-resolve/systemd-resolved/resolved-llmnr.c
index 8b1d71a3eb..4b303b6686 100644
--- a/src/grp-resolve/systemd-resolved/resolved-llmnr.c
+++ b/src/grp-resolve/systemd-resolved/resolved-llmnr.c
@@ -20,7 +20,7 @@
 #include <netinet/in.h>
 #include <resolv.h>
 
-#include "fd-util.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 c447ff63af..0294345294 100644
--- a/src/grp-resolve/systemd-resolved/resolved-manager.c
+++ b/src/grp-resolve/systemd-resolved/resolved-manager.c
@@ -21,17 +21,17 @@
 #include <poll.h>
 #include <sys/ioctl.h>
 
-#include "af-list.h"
-#include "alloc-util.h"
+#include "basic/af-list.h"
+#include "basic/alloc-util.h"
 #include "dns-domain.h"
-#include "fd-util.h"
-#include "fileio-label.h"
-#include "hostname-util.h"
-#include "io-util.h"
+#include "basic/fd-util.h"
+#include "basic/fileio-label.h"
+#include "basic/hostname-util.h"
+#include "basic/io-util.h"
 #include "network-internal.h"
-#include "ordered-set.h"
-#include "parse-util.h"
-#include "random-util.h"
+#include "basic/ordered-set.h"
+#include "basic/parse-util.h"
+#include "basic/random-util.h"
 #include "resolved-bus.h"
 #include "resolved-conf.h"
 #include "resolved-etc-hosts.h"
@@ -39,10 +39,10 @@
 #include "resolved-manager.h"
 #include "resolved-mdns.h"
 #include "resolved-resolv-conf.h"
-#include "socket-util.h"
-#include "string-table.h"
-#include "string-util.h"
-#include "utf8.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-manager.h b/src/grp-resolve/systemd-resolved/resolved-manager.h
index 8bef2d2b28..49fac4c346 100644
--- a/src/grp-resolve/systemd-resolved/resolved-manager.h
+++ b/src/grp-resolve/systemd-resolved/resolved-manager.h
@@ -23,9 +23,9 @@
 #include <systemd/sd-netlink.h>
 #include <systemd/sd-network.h>
 
-#include "hashmap.h"
-#include "list.h"
-#include "ordered-set.h"
+#include "basic/hashmap.h"
+#include "basic/list.h"
+#include "basic/ordered-set.h"
 #include "resolve-util.h"
 
 typedef struct Manager Manager;
diff --git a/src/grp-resolve/systemd-resolved/resolved-mdns.c b/src/grp-resolve/systemd-resolved/resolved-mdns.c
index b13b1d0144..4ef3f1b37c 100644
--- a/src/grp-resolve/systemd-resolved/resolved-mdns.c
+++ b/src/grp-resolve/systemd-resolved/resolved-mdns.c
@@ -21,7 +21,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include "fd-util.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 ff03acc772..5e1f293de0 100644
--- a/src/grp-resolve/systemd-resolved/resolved-resolv-conf.c
+++ b/src/grp-resolve/systemd-resolved/resolved-resolv-conf.c
@@ -19,16 +19,16 @@
 
 #include <resolv.h>
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "dns-domain.h"
-#include "fd-util.h"
-#include "fileio-label.h"
-#include "fileio.h"
-#include "ordered-set.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 "string-util.h"
-#include "strv.h"
+#include "basic/string-util.h"
+#include "basic/strv.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 086a2fcac7..a59543d497 100644
--- a/src/grp-resolve/systemd-resolved/resolved.c
+++ b/src/grp-resolve/systemd-resolved/resolved.c
@@ -20,14 +20,14 @@
 #include <systemd/sd-daemon.h>
 #include <systemd/sd-event.h>
 
-#include "capability-util.h"
-#include "mkdir.h"
+#include "basic/capability-util.h"
+#include "basic/mkdir.h"
 #include "resolved-conf.h"
 #include "resolved-manager.h"
 #include "resolved-resolv-conf.h"
-#include "selinux-util.h"
-#include "signal-util.h"
-#include "user-util.h"
+#include "basic/selinux-util.h"
+#include "basic/signal-util.h"
+#include "basic/user-util.h"
 
 int main(int argc, char *argv[]) {
         _cleanup_(manager_freep) Manager *m = NULL;
diff --git a/src/grp-resolve/systemd-resolved/test-dns-packet.c b/src/grp-resolve/systemd-resolved/test-dns-packet.c
index c232a69ce1..8749461e8c 100644
--- a/src/grp-resolve/systemd-resolved/test-dns-packet.c
+++ b/src/grp-resolve/systemd-resolved/test-dns-packet.c
@@ -20,15 +20,15 @@
 #include <net/if.h>
 #include <glob.h>
 
-#include "alloc-util.h"
-#include "fileio.h"
-#include "glob-util.h"
-#include "log.h"
-#include "macro.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 "string-util.h"
-#include "strv.h"
+#include "basic/string-util.h"
+#include "basic/strv.h"
 
 #define HASH_KEY SD_ID128_MAKE(d3,1e,48,90,4b,fa,4c,fe,af,9d,d5,a1,d7,2e,8a,b1)
 
diff --git a/src/grp-resolve/systemd-resolved/test-dnssec-complex.c b/src/grp-resolve/systemd-resolved/test-dnssec-complex.c
index 568400ac77..9662a99409 100644
--- a/src/grp-resolve/systemd-resolved/test-dnssec-complex.c
+++ b/src/grp-resolve/systemd-resolved/test-dnssec-complex.c
@@ -21,13 +21,13 @@
 
 #include <systemd/sd-bus.h>
 
-#include "af-list.h"
-#include "alloc-util.h"
+#include "basic/af-list.h"
+#include "basic/alloc-util.h"
 #include "bus-common-errors.h"
 #include "dns-type.h"
-#include "random-util.h"
-#include "string-util.h"
-#include "time-util.h"
+#include "basic/random-util.h"
+#include "basic/string-util.h"
+#include "basic/time-util.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 b3018e8239..8e1fbad074 100644
--- a/src/grp-resolve/systemd-resolved/test-dnssec.c
+++ b/src/grp-resolve/systemd-resolved/test-dnssec.c
@@ -21,11 +21,11 @@
 #include <netinet/in.h>
 #include <sys/socket.h>
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "resolved-dns-dnssec.h"
 #include "resolved-dns-rr.h"
-#include "string-util.h"
-#include "hexdecoct.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];