146 files changed, 222 insertions, 196 deletions

diff --git a/src/grp-coredump/systemd-coredump/coredump.c b/src/grp-coredump/systemd-coredump/coredump.c
index 681b7f7acf..31127de616 100644
--- a/src/grp-coredump/systemd-coredump/coredump.c
+++ b/src/grp-coredump/systemd-coredump/coredump.c
@@ -32,7 +32,7 @@
 #include <systemd/sd-journal.h>
 #include <systemd/sd-login.h>
 
-#include "journald-native.h"
+#include "journal-core/journald-native.h"
 #include "sd-journal/compress.h"
 #include "systemd-basic/alloc-util.h"
 #include "systemd-basic/capability-util.h"
diff --git a/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote-parse.c b/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote-parse.c
index 71a27fbb06..fdfa692214 100644
--- a/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote-parse.c
+++ b/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote-parse.c
@@ -17,7 +17,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "journald-native.h"
+#include "journal-core/journald-native.h"
 #include "systemd-basic/alloc-util.h"
 #include "systemd-basic/fd-util.h"
 #include "systemd-basic/parse-util.h"
diff --git a/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote.c b/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote.c
index c9478ae164..b77abfc184 100644
--- a/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote.c
+++ b/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote.c
@@ -33,7 +33,7 @@
 
 #include <systemd/sd-daemon.h>
 
-#include "journald-native.h"
+#include "journal-core/journald-native.h"
 #include "sd-journal/journal-file.h"
 #include "systemd-basic/alloc-util.h"
 #include "systemd-basic/def.h"
diff --git a/src/grp-journal/libjournal-core/journald-audit.h b/src/grp-journal/libjournal-core/include/journal-core/journald-audit.h
index 4d5d359d6a..4d5d359d6a 100644
--- a/src/grp-journal/libjournal-core/journald-audit.h
+++ b/src/grp-journal/libjournal-core/include/journal-core/journald-audit.h
diff --git a/src/grp-journal/libjournal-core/journald-console.h b/src/grp-journal/libjournal-core/include/journal-core/journald-console.h
index dda07e2c28..dda07e2c28 100644
--- a/src/grp-journal/libjournal-core/journald-console.h
+++ b/src/grp-journal/libjournal-core/include/journal-core/journald-console.h
diff --git a/src/grp-journal/libjournal-core/journald-kmsg.h b/src/grp-journal/libjournal-core/include/journal-core/journald-kmsg.h
index dab49f1e8c..dab49f1e8c 100644
--- a/src/grp-journal/libjournal-core/journald-kmsg.h
+++ b/src/grp-journal/libjournal-core/include/journal-core/journald-kmsg.h
diff --git a/src/grp-journal/libjournal-core/journald-native.h b/src/grp-journal/libjournal-core/include/journal-core/journald-native.h
index c13b80aa4f..c13b80aa4f 100644
--- a/src/grp-journal/libjournal-core/journald-native.h
+++ b/src/grp-journal/libjournal-core/include/journal-core/journald-native.h
diff --git a/src/grp-journal/libjournal-core/journald-rate-limit.h b/src/grp-journal/libjournal-core/include/journal-core/journald-rate-limit.h
index 4f7764eb1d..4f7764eb1d 100644
--- a/src/grp-journal/libjournal-core/journald-rate-limit.h
+++ b/src/grp-journal/libjournal-core/include/journal-core/journald-rate-limit.h
diff --git a/src/grp-journal/libjournal-core/journald-server.h b/src/grp-journal/libjournal-core/include/journal-core/journald-server.h
index a621d707ca..a621d707ca 100644
--- a/src/grp-journal/libjournal-core/journald-server.h
+++ b/src/grp-journal/libjournal-core/include/journal-core/journald-server.h
diff --git a/src/grp-journal/libjournal-core/journald-stream.h b/src/grp-journal/libjournal-core/include/journal-core/journald-stream.h
index ff38effb1d..ff38effb1d 100644
--- a/src/grp-journal/libjournal-core/journald-stream.h
+++ b/src/grp-journal/libjournal-core/include/journal-core/journald-stream.h
diff --git a/src/grp-journal/libjournal-core/journald-syslog.h b/src/grp-journal/libjournal-core/include/journal-core/journald-syslog.h
index 46ad715314..46ad715314 100644
--- a/src/grp-journal/libjournal-core/journald-syslog.h
+++ b/src/grp-journal/libjournal-core/include/journal-core/journald-syslog.h
diff --git a/src/grp-journal/libjournal-core/journald-wall.h b/src/grp-journal/libjournal-core/include/journal-core/journald-wall.h
index ebc2b89fa8..ebc2b89fa8 100644
--- a/src/grp-journal/libjournal-core/journald-wall.h
+++ b/src/grp-journal/libjournal-core/include/journal-core/journald-wall.h
diff --git a/src/grp-journal/libjournal-core/journald-gperf.gperf b/src/grp-journal/libjournal-core/journald-gperf.gperf
index 851d61bb41..b56872918d 100644
--- a/src/grp-journal/libjournal-core/journald-gperf.gperf
+++ b/src/grp-journal/libjournal-core/journald-gperf.gperf
@@ -2,9 +2,8 @@
 #include <stddef.h>
 #include <sys/socket.h>
 
+#include "journal-core/journald-server.h"
 #include "systemd-shared/conf-parser.h"
-
-#include "journald-server.h"
 %}
 struct ConfigPerfItem;
 %null_strings
diff --git a/src/grp-journal/libjournal-core/journald-audit.c b/src/grp-journal/libjournal-core/src/journald-audit.c
index 6279a25e64..65f925fdc4 100644
--- a/src/grp-journal/libjournal-core/journald-audit.c
+++ b/src/grp-journal/libjournal-core/src/journald-audit.c
@@ -17,6 +17,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "journal-core/journald-audit.h"
 #include "sd-journal/audit-type.h"
 #include "systemd-basic/alloc-util.h"
 #include "systemd-basic/fd-util.h"
@@ -25,8 +26,6 @@
 #include "systemd-basic/missing.h"
 #include "systemd-basic/string-util.h"
 
-#include "journald-audit.h"
-
 typedef struct MapField {
         const char *audit_field;
         const char *journal_field;
diff --git a/src/grp-journal/libjournal-core/journald-console.c b/src/grp-journal/libjournal-core/src/journald-console.c
index e4ef1e248e..d6d25841f2 100644
--- a/src/grp-journal/libjournal-core/journald-console.c
+++ b/src/grp-journal/libjournal-core/src/journald-console.c
@@ -21,6 +21,8 @@
 #include <sys/socket.h>
 #include <time.h>
 
+#include "journal-core/journald-console.h"
+#include "journal-core/journald-server.h"
 #include "systemd-basic/alloc-util.h"
 #include "systemd-basic/fd-util.h"
 #include "systemd-basic/fileio.h"
@@ -31,9 +33,6 @@
 #include "systemd-basic/stdio-util.h"
 #include "systemd-basic/terminal-util.h"
 
-#include "journald-console.h"
-#include "journald-server.h"
-
 static bool prefix_timestamp(void) {
 
         static int cached_printk_time = -1;
diff --git a/src/grp-journal/libjournal-core/journald-kmsg.c b/src/grp-journal/libjournal-core/src/journald-kmsg.c
index 78f365e4d8..598c2d6c80 100644
--- a/src/grp-journal/libjournal-core/journald-kmsg.c
+++ b/src/grp-journal/libjournal-core/src/journald-kmsg.c
@@ -26,6 +26,9 @@
 #include <libudev.h>
 #include <systemd/sd-messages.h>
 
+#include "journal-core/journald-kmsg.h"
+#include "journal-core/journald-server.h"
+#include "journal-core/journald-syslog.h"
 #include "systemd-basic/escape.h"
 #include "systemd-basic/fd-util.h"
 #include "systemd-basic/formats-util.h"
@@ -35,10 +38,6 @@
 #include "systemd-basic/stdio-util.h"
 #include "systemd-basic/string-util.h"
 
-#include "journald-kmsg.h"
-#include "journald-server.h"
-#include "journald-syslog.h"
-
 void server_forward_kmsg(
         Server *s,
         int priority,
diff --git a/src/grp-journal/libjournal-core/journald-native.c b/src/grp-journal/libjournal-core/src/journald-native.c
index baecc3da85..536765f414 100644
--- a/src/grp-journal/libjournal-core/journald-native.c
+++ b/src/grp-journal/libjournal-core/src/journald-native.c
@@ -23,6 +23,12 @@
 #include <sys/statvfs.h>
 #include <unistd.h>
 
+#include "journal-core/journald-console.h"
+#include "journal-core/journald-kmsg.h"
+#include "journal-core/journald-native.h"
+#include "journal-core/journald-server.h"
+#include "journal-core/journald-syslog.h"
+#include "journal-core/journald-wall.h"
 #include "systemd-basic/alloc-util.h"
 #include "systemd-basic/fd-util.h"
 #include "systemd-basic/fs-util.h"
@@ -34,13 +40,6 @@
 #include "systemd-basic/socket-util.h"
 #include "systemd-basic/string-util.h"
 
-#include "journald-console.h"
-#include "journald-kmsg.h"
-#include "journald-native.h"
-#include "journald-server.h"
-#include "journald-syslog.h"
-#include "journald-wall.h"
-
 bool valid_user_field(const char *p, size_t l, bool allow_protected) {
         const char *a;
 
diff --git a/src/grp-journal/libjournal-core/journald-rate-limit.c b/src/grp-journal/libjournal-core/src/journald-rate-limit.c
index 38ce6ec1d5..a3f17da16d 100644
--- a/src/grp-journal/libjournal-core/journald-rate-limit.c
+++ b/src/grp-journal/libjournal-core/src/journald-rate-limit.c
@@ -20,6 +20,7 @@
 #include <errno.h>
 #include <string.h>
 
+#include "journal-core/journald-rate-limit.h"
 #include "systemd-basic/alloc-util.h"
 #include "systemd-basic/hashmap.h"
 #include "systemd-basic/list.h"
@@ -27,8 +28,6 @@
 #include "systemd-basic/string-util.h"
 #include "systemd-basic/util.h"
 
-#include "journald-rate-limit.h"
-
 #define POOLS_MAX 5
 #define BUCKETS_MAX 127
 #define GROUPS_MAX 2047
diff --git a/src/grp-journal/libjournal-core/journald-server.c b/src/grp-journal/libjournal-core/src/journald-server.c
index 49880bc9bb..b3702d99a6 100644
--- a/src/grp-journal/libjournal-core/journald-server.c
+++ b/src/grp-journal/libjournal-core/src/journald-server.c
@@ -32,6 +32,13 @@
 #include <systemd/sd-journal.h>
 #include <systemd/sd-messages.h>
 
+#include "journal-core/journald-audit.h"
+#include "journal-core/journald-kmsg.h"
+#include "journal-core/journald-native.h"
+#include "journal-core/journald-rate-limit.h"
+#include "journal-core/journald-server.h"
+#include "journal-core/journald-stream.h"
+#include "journal-core/journald-syslog.h"
 #include "sd-journal/journal-authenticate.h"
 #include "sd-journal/journal-file.h"
 #include "sd-journal/journal-internal.h"
@@ -65,14 +72,6 @@
 #include "systemd-shared/acl-util.h"
 #include "systemd-shared/conf-parser.h"
 
-#include "journald-audit.h"
-#include "journald-kmsg.h"
-#include "journald-native.h"
-#include "journald-rate-limit.h"
-#include "journald-server.h"
-#include "journald-stream.h"
-#include "journald-syslog.h"
-
 #define USER_JOURNALS_MAX 1024
 
 #define DEFAULT_SYNC_INTERVAL_USEC (5*USEC_PER_MINUTE)
diff --git a/src/grp-journal/libjournal-core/journald-stream.c b/src/grp-journal/libjournal-core/src/journald-stream.c
index 3b8ceec829..1c56cce0fc 100644
--- a/src/grp-journal/libjournal-core/journald-stream.c
+++ b/src/grp-journal/libjournal-core/src/journald-stream.c
@@ -27,6 +27,12 @@
 #include <systemd/sd-daemon.h>
 #include <systemd/sd-event.h>
 
+#include "journal-core/journald-console.h"
+#include "journal-core/journald-kmsg.h"
+#include "journal-core/journald-server.h"
+#include "journal-core/journald-stream.h"
+#include "journal-core/journald-syslog.h"
+#include "journal-core/journald-wall.h"
 #include "systemd-basic/alloc-util.h"
 #include "systemd-basic/dirent-util.h"
 #include "systemd-basic/escape.h"
@@ -41,13 +47,6 @@
 #include "systemd-basic/string-util.h"
 #include "systemd-basic/syslog-util.h"
 
-#include "journald-console.h"
-#include "journald-kmsg.h"
-#include "journald-server.h"
-#include "journald-stream.h"
-#include "journald-syslog.h"
-#include "journald-wall.h"
-
 #define STDOUT_STREAMS_MAX 4096
 
 typedef enum StdoutStreamState {
diff --git a/src/grp-journal/libjournal-core/journald-syslog.c b/src/grp-journal/libjournal-core/src/journald-syslog.c
index 8e77e086b4..054a44b39f 100644
--- a/src/grp-journal/libjournal-core/journald-syslog.c
+++ b/src/grp-journal/libjournal-core/src/journald-syslog.c
@@ -23,6 +23,11 @@
 
 #include <systemd/sd-messages.h>
 
+#include "journal-core/journald-console.h"
+#include "journal-core/journald-kmsg.h"
+#include "journal-core/journald-server.h"
+#include "journal-core/journald-syslog.h"
+#include "journal-core/journald-wall.h"
 #include "systemd-basic/alloc-util.h"
 #include "systemd-basic/fd-util.h"
 #include "systemd-basic/formats-util.h"
@@ -34,12 +39,6 @@
 #include "systemd-basic/string-util.h"
 #include "systemd-basic/syslog-util.h"
 
-#include "journald-console.h"
-#include "journald-kmsg.h"
-#include "journald-server.h"
-#include "journald-syslog.h"
-#include "journald-wall.h"
-
 /* Warn once every 30s if we missed syslog message */
 #define WARN_FORWARD_SYSLOG_MISSED_USEC (30 * USEC_PER_SEC)
 
diff --git a/src/grp-journal/libjournal-core/journald-wall.c b/src/grp-journal/libjournal-core/src/journald-wall.c
index 7b2e330cc8..242e69f6c3 100644
--- a/src/grp-journal/libjournal-core/journald-wall.c
+++ b/src/grp-journal/libjournal-core/src/journald-wall.c
@@ -17,15 +17,14 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "journal-core/journald-server.h"
+#include "journal-core/journald-wall.h"
 #include "systemd-basic/alloc-util.h"
 #include "systemd-basic/formats-util.h"
 #include "systemd-basic/process-util.h"
 #include "systemd-basic/string-util.h"
 #include "systemd-shared/utmp-wtmp.h"
 
-#include "journald-server.h"
-#include "journald-wall.h"
-
 void server_forward_wall(
                 Server *s,
                 int priority,
diff --git a/src/grp-journal/libjournal-core/test-audit-type.c b/src/grp-journal/libjournal-core/test/test-audit-type.c
index 812a3953ea..812a3953ea 100644
--- a/src/grp-journal/libjournal-core/test-audit-type.c
+++ b/src/grp-journal/libjournal-core/test/test-audit-type.c
diff --git a/src/grp-journal/libjournal-core/test-catalog.c b/src/grp-journal/libjournal-core/test/test-catalog.c
index 8adc3832a6..8adc3832a6 100644
--- a/src/grp-journal/libjournal-core/test-catalog.c
+++ b/src/grp-journal/libjournal-core/test/test-catalog.c
diff --git a/src/grp-journal/libjournal-core/test-compress-benchmark.c b/src/grp-journal/libjournal-core/test/test-compress-benchmark.c
index e3f45a5d67..e3f45a5d67 100644
--- a/src/grp-journal/libjournal-core/test-compress-benchmark.c
+++ b/src/grp-journal/libjournal-core/test/test-compress-benchmark.c
diff --git a/src/grp-journal/libjournal-core/test-compress.c b/src/grp-journal/libjournal-core/test/test-compress.c
index ad9ca34796..ad9ca34796 100644
--- a/src/grp-journal/libjournal-core/test-compress.c
+++ b/src/grp-journal/libjournal-core/test/test-compress.c
diff --git a/src/grp-journal/libjournal-core/test-journal-enum.c b/src/grp-journal/libjournal-core/test/test-journal-enum.c
index 2c529f0544..2c529f0544 100644
--- a/src/grp-journal/libjournal-core/test-journal-enum.c
+++ b/src/grp-journal/libjournal-core/test/test-journal-enum.c
diff --git a/src/grp-journal/libjournal-core/test-journal-flush.c b/src/grp-journal/libjournal-core/test/test-journal-flush.c
index 0ebec91563..0ebec91563 100644
--- a/src/grp-journal/libjournal-core/test-journal-flush.c
+++ b/src/grp-journal/libjournal-core/test/test-journal-flush.c
diff --git a/src/grp-journal/libjournal-core/test-journal-init.c b/src/grp-journal/libjournal-core/test/test-journal-init.c
index 719b99ab77..719b99ab77 100644
--- a/src/grp-journal/libjournal-core/test-journal-init.c
+++ b/src/grp-journal/libjournal-core/test/test-journal-init.c
diff --git a/src/grp-journal/libjournal-core/test-journal-interleaving.c b/src/grp-journal/libjournal-core/test/test-journal-interleaving.c
index 4bf541d2b3..4bf541d2b3 100644
--- a/src/grp-journal/libjournal-core/test-journal-interleaving.c
+++ b/src/grp-journal/libjournal-core/test/test-journal-interleaving.c
diff --git a/src/grp-journal/libjournal-core/test-journal-match.c b/src/grp-journal/libjournal-core/test/test-journal-match.c
index 4d3731b3be..4d3731b3be 100644
--- a/src/grp-journal/libjournal-core/test-journal-match.c
+++ b/src/grp-journal/libjournal-core/test/test-journal-match.c
diff --git a/src/grp-journal/libjournal-core/test-journal-send.c b/src/grp-journal/libjournal-core/test/test-journal-send.c
index bca76fc4df..bca76fc4df 100644
--- a/src/grp-journal/libjournal-core/test-journal-send.c
+++ b/src/grp-journal/libjournal-core/test/test-journal-send.c
diff --git a/src/grp-journal/libjournal-core/test-journal-stream.c b/src/grp-journal/libjournal-core/test/test-journal-stream.c
index 84db1eeeb4..84db1eeeb4 100644
--- a/src/grp-journal/libjournal-core/test-journal-stream.c
+++ b/src/grp-journal/libjournal-core/test/test-journal-stream.c
diff --git a/src/grp-journal/libjournal-core/test-journal-syslog.c b/src/grp-journal/libjournal-core/test/test-journal-syslog.c
index f4755834dc..f86cfb2677 100644
--- a/src/grp-journal/libjournal-core/test-journal-syslog.c
+++ b/src/grp-journal/libjournal-core/test/test-journal-syslog.c
@@ -17,12 +17,11 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "journal-core/journald-syslog.h"
 #include "systemd-basic/alloc-util.h"
 #include "systemd-basic/macro.h"
 #include "systemd-basic/string-util.h"
 
-#include "journald-syslog.h"
-
 static void test_syslog_parse_identifier(const char* str,
                                          const char *ident, const char*pid, int ret) {
         const char *buf = str;
diff --git a/src/grp-journal/libjournal-core/test-journal-verify.c b/src/grp-journal/libjournal-core/test/test-journal-verify.c
index 8a1aa45901..8a1aa45901 100644
--- a/src/grp-journal/libjournal-core/test-journal-verify.c
+++ b/src/grp-journal/libjournal-core/test/test-journal-verify.c
diff --git a/src/grp-journal/libjournal-core/test-journal.c b/src/grp-journal/libjournal-core/test/test-journal.c
index 0792750a61..0792750a61 100644
--- a/src/grp-journal/libjournal-core/test-journal.c
+++ b/src/grp-journal/libjournal-core/test/test-journal.c
diff --git a/src/grp-journal/libjournal-core/test-mmap-cache.c b/src/grp-journal/libjournal-core/test/test-mmap-cache.c
index 636be8c2e3..636be8c2e3 100644
--- a/src/grp-journal/libjournal-core/test-mmap-cache.c
+++ b/src/grp-journal/libjournal-core/test/test-mmap-cache.c
diff --git a/src/grp-journal/systemd-journald/journald.c b/src/grp-journal/systemd-journald/journald.c
index 368c0ab9f1..7306b5f43d 100644
--- a/src/grp-journal/systemd-journald/journald.c
+++ b/src/grp-journal/systemd-journald/journald.c
@@ -22,9 +22,9 @@
 #include <systemd/sd-daemon.h>
 #include <systemd/sd-messages.h>
 
-#include "journald-kmsg.h"
-#include "journald-server.h"
-#include "journald-syslog.h"
+#include "journal-core/journald-kmsg.h"
+#include "journal-core/journald-server.h"
+#include "journal-core/journald-syslog.h"
 #include "sd-journal/journal-authenticate.h"
 #include "systemd-basic/formats-util.h"
 #include "systemd-basic/sigbus.h"
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;
 
diff --git a/src/grp-resolve/systemd-resolve/resolve-tool.c b/src/grp-resolve/systemd-resolve/resolve-tool.c
index 895aff3faa..ed55471b97 100644
--- a/src/grp-resolve/systemd-resolve/resolve-tool.c
+++ b/src/grp-resolve/systemd-resolve/resolve-tool.c
@@ -22,8 +22,8 @@
 
 #include <systemd/sd-bus.h>
 
+#include "basic-dns/resolved-dns-packet.h"
 #include "resolved-def.h"
-#include "resolved-dns-packet.h"
 #include "sd-bus/bus-error.h"
 #include "sd-netlink/netlink-util.h"
 #include "sd-netlink/sd-netlink.h"
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-cache.c b/src/grp-resolve/systemd-resolved/resolved-dns-cache.c
index fa4a2a42d1..1f8811c5de 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-cache.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-cache.c
@@ -19,8 +19,8 @@
 
 #include <net/if.h>
 
-#include "resolved-dns-answer.h"
-#include "resolved-dns-packet.h"
+#include "basic-dns/resolved-dns-answer.h"
+#include "basic-dns/resolved-dns-packet.h"
 #include "systemd-basic/af-list.h"
 #include "systemd-basic/alloc-util.h"
 #include "systemd-basic/string-util.h"
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-cache.h b/src/grp-resolve/systemd-resolved/resolved-dns-cache.h
index 5c3d850bc8..c2b6a987b9 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-cache.h
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-cache.h
@@ -31,10 +31,10 @@ typedef struct DnsCache {
         unsigned n_miss;
 } DnsCache;
 
-#include "resolved-dns-answer.h"
-#include "resolved-dns-packet.h"
-#include "resolved-dns-question.h"
-#include "resolved-dns-rr.h"
+#include "basic-dns/resolved-dns-answer.h"
+#include "basic-dns/resolved-dns-packet.h"
+#include "basic-dns/resolved-dns-question.h"
+#include "basic-dns/resolved-dns-rr.h"
 
 void dns_cache_flush(DnsCache *c);
 void dns_cache_prune(DnsCache *c);
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-query.c b/src/grp-resolve/systemd-resolved/resolved-dns-query.c
index 5b5cc8b532..7c270ccd2b 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-query.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-query.c
@@ -17,7 +17,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "dns-type.h"
+#include "basic-dns/dns-type.h"
 #include "sd-netlink/local-addresses.h"
 #include "systemd-basic/alloc-util.h"
 #include "systemd-basic/hostname-util.h"
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-query.h b/src/grp-resolve/systemd-resolved/resolved-dns-query.h
index 04d3034499..bc26a58f21 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-query.h
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-query.h
@@ -22,8 +22,8 @@
 
 #include <systemd/sd-bus.h>
 
-#include "resolved-dns-answer.h"
-#include "resolved-dns-question.h"
+#include "basic-dns/resolved-dns-answer.h"
+#include "basic-dns/resolved-dns-question.h"
 #include "systemd-basic/set.h"
 
 typedef struct DnsQuery DnsQuery;
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-scope.h b/src/grp-resolve/systemd-resolved/resolved-dns-scope.h
index 121b123058..8f35fd841a 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-scope.h
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-scope.h
@@ -19,8 +19,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "resolved-dns-dnssec.h"
-#include "resolved-dns-packet.h"
+#include "basic-dns/resolved-dns-dnssec.h"
+#include "basic-dns/resolved-dns-packet.h"
 #include "systemd-basic/list.h"
 
 typedef struct DnsScope DnsScope;
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-stream.h b/src/grp-resolve/systemd-resolved/resolved-dns-stream.h
index 680179008c..bea93487de 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 "resolved-dns-packet.h"
+#include "basic-dns/resolved-dns-packet.h"
 #include "systemd-basic/socket-util.h"
 
 typedef struct DnsStream DnsStream;
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-synthesize.h b/src/grp-resolve/systemd-resolved/resolved-dns-synthesize.h
index 2309105068..23b05587ac 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-synthesize.h
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-synthesize.h
@@ -19,8 +19,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "resolved-dns-answer.h"
-#include "resolved-dns-question.h"
+#include "basic-dns/resolved-dns-answer.h"
+#include "basic-dns/resolved-dns-question.h"
 
 #include "resolved-manager.h"
 
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-transaction.h b/src/grp-resolve/systemd-resolved/resolved-dns-transaction.h
index 26307f84ac..cdc598fa9c 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-transaction.h
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-transaction.h
@@ -55,9 +55,9 @@ enum DnsTransactionSource {
         _DNS_TRANSACTION_SOURCE_INVALID = -1
 };
 
-#include "resolved-dns-answer.h"
-#include "resolved-dns-packet.h"
-#include "resolved-dns-question.h"
+#include "basic-dns/resolved-dns-answer.h"
+#include "basic-dns/resolved-dns-packet.h"
+#include "basic-dns/resolved-dns-question.h"
 
 #include "resolved-dns-scope.h"
 
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 fb0e76b917..53cd9d8f55 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.c
@@ -19,7 +19,7 @@
 
 #include <systemd/sd-messages.h>
 
-#include "resolved-dns-dnssec.h"
+#include "basic-dns/resolved-dns-dnssec.h"
 #include "systemd-basic/alloc-util.h"
 #include "systemd-basic/conf-files.h"
 #include "systemd-basic/def.h"
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 6d1b2d3655..9039bd7aa3 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.h
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.h
@@ -19,8 +19,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "resolved-dns-answer.h"
-#include "resolved-dns-rr.h"
+#include "basic-dns/resolved-dns-answer.h"
+#include "basic-dns/resolved-dns-rr.h"
 #include "systemd-basic/hashmap.h"
 
 typedef struct DnsTrustAnchor DnsTrustAnchor;
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-zone.c b/src/grp-resolve/systemd-resolved/resolved-dns-zone.c
index 4b6f571447..723df26454 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-zone.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-zone.c
@@ -17,7 +17,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "resolved-dns-packet.h"
+#include "basic-dns/resolved-dns-packet.h"
 #include "systemd-basic/alloc-util.h"
 #include "systemd-basic/list.h"
 #include "systemd-basic/string-util.h"
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-zone.h b/src/grp-resolve/systemd-resolved/resolved-dns-zone.h
index c5ba404cbf..fe656be793 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-zone.h
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-zone.h
@@ -26,9 +26,9 @@ typedef struct DnsZone {
         Hashmap *by_name;
 } DnsZone;
 
-#include "resolved-dns-answer.h"
-#include "resolved-dns-question.h"
-#include "resolved-dns-rr.h"
+#include "basic-dns/resolved-dns-answer.h"
+#include "basic-dns/resolved-dns-question.h"
+#include "basic-dns/resolved-dns-rr.h"
 
 typedef enum DnsZoneItemState DnsZoneItemState;
 typedef struct DnsZoneItem DnsZoneItem;
diff --git a/src/grp-resolve/systemd-resolved/resolved-etc-hosts.h b/src/grp-resolve/systemd-resolved/resolved-etc-hosts.h
index e68d87417e..49e449b56d 100644
--- a/src/grp-resolve/systemd-resolved/resolved-etc-hosts.h
+++ b/src/grp-resolve/systemd-resolved/resolved-etc-hosts.h
@@ -19,8 +19,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "resolved-dns-answer.h"
-#include "resolved-dns-question.h"
+#include "basic-dns/resolved-dns-answer.h"
+#include "basic-dns/resolved-dns-question.h"
 
 #include "resolved-manager.h"
 
diff --git a/src/grp-resolve/systemd-resolved/resolved-link.h b/src/grp-resolve/systemd-resolved/resolved-link.h
index fdc7161b7b..8860b878bb 100644
--- a/src/grp-resolve/systemd-resolved/resolved-link.h
+++ b/src/grp-resolve/systemd-resolved/resolved-link.h
@@ -21,7 +21,7 @@
 
 #include <net/if.h>
 
-#include "resolved-dns-rr.h"
+#include "basic-dns/resolved-dns-rr.h"
 #include "systemd-basic/in-addr-util.h"
 #include "systemd-basic/ratelimit.h"
 #include "systemd-shared/resolve-util.h"
diff --git a/src/grp-system/libcore/src/automount.c b/src/grp-system/libcore/src/automount.c
index c4568cec25..9cd7aaffa3 100644
--- a/src/grp-system/libcore/src/automount.c
+++ b/src/grp-system/libcore/src/automount.c
@@ -29,7 +29,6 @@
 #include <linux/auto_fs4.h>
 
 #include "core/automount.h"
-#include "core/dbus-automount.h"
 #include "core/mount.h"
 #include "core/unit.h"
 #include "sd-bus/bus-error.h"
@@ -51,6 +50,8 @@
 #include "systemd-basic/unit-name.h"
 #include "systemd-shared/bus-util.h"
 
+#include "dbus-automount.h"
+
 static const UnitActiveState state_translation_table[_AUTOMOUNT_STATE_MAX] = {
         [AUTOMOUNT_DEAD] = UNIT_INACTIVE,
         [AUTOMOUNT_WAITING] = UNIT_ACTIVE,
diff --git a/src/grp-system/libcore/src/busname.c b/src/grp-system/libcore/src/busname.c
index e31cfd25de..07168fcd75 100644
--- a/src/grp-system/libcore/src/busname.c
+++ b/src/grp-system/libcore/src/busname.c
@@ -21,7 +21,6 @@
 
 #include "core/bus-policy.h"
 #include "core/busname.h"
-#include "core/dbus-busname.h"
 #include "core/service.h"
 #include "sd-bus/bus-internal.h"
 #include "sd-bus/bus-kernel.h"
@@ -37,6 +36,8 @@
 #include "systemd-basic/string-util.h"
 #include "systemd-shared/bus-util.h"
 
+#include "dbus-busname.h"
+
 static const UnitActiveState state_translation_table[_BUSNAME_STATE_MAX] = {
         [BUSNAME_DEAD] = UNIT_INACTIVE,
         [BUSNAME_MAKING] = UNIT_ACTIVATING,
diff --git a/src/grp-system/libcore/src/dbus-automount.c b/src/grp-system/libcore/src/dbus-automount.c
index bd07882d6b..62daf2ae52 100644
--- a/src/grp-system/libcore/src/dbus-automount.c
+++ b/src/grp-system/libcore/src/dbus-automount.c
@@ -18,10 +18,11 @@
 ***/
 
 #include "core/automount.h"
-#include "core/dbus-automount.h"
 #include "systemd-basic/string-util.h"
 #include "systemd-shared/bus-util.h"
 
+#include "dbus-automount.h"
+
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_result, automount_result, AutomountResult);
 
 const sd_bus_vtable bus_automount_vtable[] = {
diff --git a/src/grp-system/libcore/include/core/dbus-automount.h b/src/grp-system/libcore/src/dbus-automount.h
index 7b51eb973a..7b51eb973a 100644
--- a/src/grp-system/libcore/include/core/dbus-automount.h
+++ b/src/grp-system/libcore/src/dbus-automount.h
diff --git a/src/grp-system/libcore/src/dbus-busname.c b/src/grp-system/libcore/src/dbus-busname.c
index b90582d6ee..6fcb129037 100644
--- a/src/grp-system/libcore/src/dbus-busname.c
+++ b/src/grp-system/libcore/src/dbus-busname.c
@@ -18,11 +18,12 @@
 ***/
 
 #include "core/busname.h"
-#include "core/dbus-busname.h"
 #include "core/unit.h"
 #include "systemd-basic/string-util.h"
 #include "systemd-shared/bus-util.h"
 
+#include "dbus-busname.h"
+
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_result, busname_result, BusNameResult);
 
 const sd_bus_vtable bus_busname_vtable[] = {
diff --git a/src/grp-system/libcore/include/core/dbus-busname.h b/src/grp-system/libcore/src/dbus-busname.h
index 8643d1a404..8643d1a404 100644
--- a/src/grp-system/libcore/include/core/dbus-busname.h
+++ b/src/grp-system/libcore/src/dbus-busname.h
diff --git a/src/grp-system/libcore/src/dbus-cgroup.c b/src/grp-system/libcore/src/dbus-cgroup.c
index 0da198e1a8..a9049bff23 100644
--- a/src/grp-system/libcore/src/dbus-cgroup.c
+++ b/src/grp-system/libcore/src/dbus-cgroup.c
@@ -18,7 +18,6 @@
 ***/
 
 #include "core/cgroup.h"
-#include "core/dbus-cgroup.h"
 #include "systemd-basic/alloc-util.h"
 #include "systemd-basic/cgroup-util.h"
 #include "systemd-basic/fd-util.h"
@@ -26,6 +25,8 @@
 #include "systemd-basic/path-util.h"
 #include "systemd-shared/bus-util.h"
 
+#include "dbus-cgroup.h"
+
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_cgroup_device_policy, cgroup_device_policy, CGroupDevicePolicy);
 
 static int property_get_io_device_weight(
diff --git a/src/grp-system/libcore/include/core/dbus-cgroup.h b/src/grp-system/libcore/src/dbus-cgroup.h
index 84d0f1ba04..b61ca2fcef 100644
--- a/src/grp-system/libcore/include/core/dbus-cgroup.h
+++ b/src/grp-system/libcore/src/dbus-cgroup.h
@@ -21,7 +21,7 @@
 
 #include <systemd/sd-bus.h>
 
-#include "cgroup.h"
+#include "core/cgroup.h"
 
 extern const sd_bus_vtable bus_cgroup_vtable[];
 
diff --git a/src/grp-system/libcore/src/dbus-device.c b/src/grp-system/libcore/src/dbus-device.c
index 6737f27a88..75e9beb55e 100644
--- a/src/grp-system/libcore/src/dbus-device.c
+++ b/src/grp-system/libcore/src/dbus-device.c
@@ -17,10 +17,11 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "core/dbus-device.h"
 #include "core/device.h"
 #include "core/unit.h"
 
+#include "dbus-device.h"
+
 const sd_bus_vtable bus_device_vtable[] = {
         SD_BUS_VTABLE_START(0),
         SD_BUS_PROPERTY("SysFSPath", "s", NULL, offsetof(Device, sysfs), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
diff --git a/src/grp-system/libcore/include/core/dbus-device.h b/src/grp-system/libcore/src/dbus-device.h
index eb1d8c3278..84b7ed56ec 100644
--- a/src/grp-system/libcore/include/core/dbus-device.h
+++ b/src/grp-system/libcore/src/dbus-device.h
@@ -19,6 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "unit.h"
+#include "core/unit.h"
 
 extern const sd_bus_vtable bus_device_vtable[];
diff --git a/src/grp-system/libcore/src/dbus-execute.c b/src/grp-system/libcore/src/dbus-execute.c
index 2c759f9a24..1b8973fb1c 100644
--- a/src/grp-system/libcore/src/dbus-execute.c
+++ b/src/grp-system/libcore/src/dbus-execute.c
@@ -23,7 +23,6 @@
 #include <seccomp.h>
 #endif
 
-#include "core/dbus-execute.h"
 #include "core/execute.h"
 #include "core/namespace.h"
 #include "systemd-basic/af-list.h"
@@ -39,6 +38,8 @@
 #include "systemd-basic/process-util.h"
 #include "systemd-basic/rlimit-util.h"
 #include "systemd-shared/bus-util.h"
+
+#include "dbus-execute.h"
 #ifdef HAVE_SECCOMP
 #include "systemd-shared/seccomp-util.h"
 #endif
diff --git a/src/grp-system/libcore/include/core/dbus-execute.h b/src/grp-system/libcore/src/dbus-execute.h
index bdfef41db4..25137d9516 100644
--- a/src/grp-system/libcore/include/core/dbus-execute.h
+++ b/src/grp-system/libcore/src/dbus-execute.h
@@ -21,7 +21,7 @@
 
 #include <systemd/sd-bus.h>
 
-#include "execute.h"
+#include "core/execute.h"
 
 #define BUS_EXEC_STATUS_VTABLE(prefix, offset, flags)                   \
         BUS_PROPERTY_DUAL_TIMESTAMP(prefix "StartTimestamp", (offset) + offsetof(ExecStatus, start_timestamp), flags), \
diff --git a/src/grp-system/libcore/src/dbus-job.c b/src/grp-system/libcore/src/dbus-job.c
index 805d3c19bd..5231cb4607 100644
--- a/src/grp-system/libcore/src/dbus-job.c
+++ b/src/grp-system/libcore/src/dbus-job.c
@@ -19,14 +19,15 @@
 
 #include <systemd/sd-bus.h>
 
-#include "core/dbus-job.h"
-#include "core/dbus.h"
 #include "core/job.h"
 #include "core/selinux-access.h"
 #include "systemd-basic/alloc-util.h"
 #include "systemd-basic/log.h"
 #include "systemd-basic/string-util.h"
 
+#include "dbus-job.h"
+#include "dbus.h"
+
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_type, job_type, JobType);
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_state, job_state, JobState);
 
diff --git a/src/grp-system/libcore/include/core/dbus-job.h b/src/grp-system/libcore/src/dbus-job.h
index 95664cb90c..4e2d4f086d 100644
--- a/src/grp-system/libcore/include/core/dbus-job.h
+++ b/src/grp-system/libcore/src/dbus-job.h
@@ -21,7 +21,7 @@
 
 #include <systemd/sd-bus.h>
 
-#include "job.h"
+#include "core/job.h"
 
 extern const sd_bus_vtable bus_job_vtable[];
 
diff --git a/src/grp-system/libcore/src/dbus-kill.c b/src/grp-system/libcore/src/dbus-kill.c
index a72b6170fd..aa31d21542 100644
--- a/src/grp-system/libcore/src/dbus-kill.c
+++ b/src/grp-system/libcore/src/dbus-kill.c
@@ -17,11 +17,12 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "core/dbus-kill.h"
 #include "core/kill.h"
 #include "systemd-basic/signal-util.h"
 #include "systemd-shared/bus-util.h"
 
+#include "dbus-kill.h"
+
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_kill_mode, kill_mode, KillMode);
 
 const sd_bus_vtable bus_kill_vtable[] = {
diff --git a/src/grp-system/libcore/include/core/dbus-kill.h b/src/grp-system/libcore/src/dbus-kill.h
index b32ce9d223..3f908c40d9 100644
--- a/src/grp-system/libcore/include/core/dbus-kill.h
+++ b/src/grp-system/libcore/src/dbus-kill.h
@@ -21,8 +21,8 @@
 
 #include <systemd/sd-bus.h>
 
-#include "kill.h"
-#include "unit.h"
+#include "core/kill.h"
+#include "core/unit.h"
 
 extern const sd_bus_vtable bus_kill_vtable[];
 
diff --git a/src/grp-system/libcore/src/dbus-manager.c b/src/grp-system/libcore/src/dbus-manager.c
index 7810dadda6..89b93164ec 100644
--- a/src/grp-system/libcore/src/dbus-manager.c
+++ b/src/grp-system/libcore/src/dbus-manager.c
@@ -21,11 +21,6 @@
 #include <sys/prctl.h>
 #include <unistd.h>
 
-#include "core/dbus-execute.h"
-#include "core/dbus-job.h"
-#include "core/dbus-manager.h"
-#include "core/dbus-unit.h"
-#include "core/dbus.h"
 #include "core/selinux-access.h"
 #include "sd-bus/bus-common-errors.h"
 #include "systemd-basic/alloc-util.h"
@@ -46,6 +41,12 @@
 #include "systemd-shared/install.h"
 #include "systemd-shared/watchdog.h"
 
+#include "dbus-execute.h"
+#include "dbus-job.h"
+#include "dbus-manager.h"
+#include "dbus-unit.h"
+#include "dbus.h"
+
 static int property_get_version(
                 sd_bus *bus,
                 const char *path,
diff --git a/src/grp-system/libcore/include/core/dbus-manager.h b/src/grp-system/libcore/src/dbus-manager.h
index 36a2e9481b..8f54e84bfb 100644
--- a/src/grp-system/libcore/include/core/dbus-manager.h
+++ b/src/grp-system/libcore/src/dbus-manager.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "manager.h"
+#include "core/manager.h"
 
 extern const sd_bus_vtable bus_manager_vtable[];
 
diff --git a/src/grp-system/libcore/src/dbus-mount.c b/src/grp-system/libcore/src/dbus-mount.c
index 8ff5c53928..841c11b9d5 100644
--- a/src/grp-system/libcore/src/dbus-mount.c
+++ b/src/grp-system/libcore/src/dbus-mount.c
@@ -17,15 +17,16 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "core/dbus-cgroup.h"
-#include "core/dbus-execute.h"
-#include "core/dbus-kill.h"
-#include "core/dbus-mount.h"
 #include "core/mount.h"
 #include "core/unit.h"
 #include "systemd-basic/string-util.h"
 #include "systemd-shared/bus-util.h"
 
+#include "dbus-cgroup.h"
+#include "dbus-execute.h"
+#include "dbus-kill.h"
+#include "dbus-mount.h"
+
 static int property_get_what(
                 sd_bus *bus,
                 const char *path,
diff --git a/src/grp-system/libcore/include/core/dbus-mount.h b/src/grp-system/libcore/src/dbus-mount.h
index f9844e449d..81ef769a44 100644
--- a/src/grp-system/libcore/include/core/dbus-mount.h
+++ b/src/grp-system/libcore/src/dbus-mount.h
@@ -21,7 +21,7 @@
 
 #include <systemd/sd-bus.h>
 
-#include "unit.h"
+#include "core/unit.h"
 
 extern const sd_bus_vtable bus_mount_vtable[];
 
diff --git a/src/grp-system/libcore/src/dbus-path.c b/src/grp-system/libcore/src/dbus-path.c
index b1021c1ab2..8819ad26d2 100644
--- a/src/grp-system/libcore/src/dbus-path.c
+++ b/src/grp-system/libcore/src/dbus-path.c
@@ -17,12 +17,13 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "core/dbus-path.h"
 #include "core/path.h"
 #include "core/unit.h"
 #include "systemd-basic/string-util.h"
 #include "systemd-shared/bus-util.h"
 
+#include "dbus-path.h"
+
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_result, path_result, PathResult);
 
 static int property_get_paths(
diff --git a/src/grp-system/libcore/include/core/dbus-path.h b/src/grp-system/libcore/src/dbus-path.h
index d3c19e0c2b..d3c19e0c2b 100644
--- a/src/grp-system/libcore/include/core/dbus-path.h
+++ b/src/grp-system/libcore/src/dbus-path.h
diff --git a/src/grp-system/libcore/src/dbus-scope.c b/src/grp-system/libcore/src/dbus-scope.c
index 956f34f6da..97d0873ae4 100644
--- a/src/grp-system/libcore/src/dbus-scope.c
+++ b/src/grp-system/libcore/src/dbus-scope.c
@@ -17,11 +17,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "core/dbus-cgroup.h"
-#include "core/dbus-kill.h"
-#include "core/dbus-scope.h"
-#include "core/dbus-unit.h"
-#include "core/dbus.h"
 #include "core/scope.h"
 #include "core/selinux-access.h"
 #include "core/unit.h"
@@ -30,6 +25,12 @@
 #include "systemd-basic/alloc-util.h"
 #include "systemd-shared/bus-util.h"
 
+#include "dbus-cgroup.h"
+#include "dbus-kill.h"
+#include "dbus-scope.h"
+#include "dbus-unit.h"
+#include "dbus.h"
+
 static int bus_scope_abandon(sd_bus_message *message, void *userdata, sd_bus_error *error) {
         Scope *s = userdata;
         int r;
diff --git a/src/grp-system/libcore/include/core/dbus-scope.h b/src/grp-system/libcore/src/dbus-scope.h
index f96ddef0cf..ad1cb52adc 100644
--- a/src/grp-system/libcore/include/core/dbus-scope.h
+++ b/src/grp-system/libcore/src/dbus-scope.h
@@ -21,7 +21,7 @@
 
 #include <systemd/sd-bus.h>
 
-#include "unit.h"
+#include "core/unit.h"
 
 extern const sd_bus_vtable bus_scope_vtable[];
 
diff --git a/src/grp-system/libcore/src/dbus-service.c b/src/grp-system/libcore/src/dbus-service.c
index f670dbc660..26ce513841 100644
--- a/src/grp-system/libcore/src/dbus-service.c
+++ b/src/grp-system/libcore/src/dbus-service.c
@@ -17,10 +17,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "core/dbus-cgroup.h"
-#include "core/dbus-execute.h"
-#include "core/dbus-kill.h"
-#include "core/dbus-service.h"
 #include "core/service.h"
 #include "core/unit.h"
 #include "systemd-basic/alloc-util.h"
@@ -32,6 +28,11 @@
 #include "systemd-basic/strv.h"
 #include "systemd-shared/bus-util.h"
 
+#include "dbus-cgroup.h"
+#include "dbus-execute.h"
+#include "dbus-kill.h"
+#include "dbus-service.h"
+
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_type, service_type, ServiceType);
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_result, service_result, ServiceResult);
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_restart, service_restart, ServiceRestart);
diff --git a/src/grp-system/libcore/include/core/dbus-service.h b/src/grp-system/libcore/src/dbus-service.h
index 291959325c..1d3df67bf0 100644
--- a/src/grp-system/libcore/include/core/dbus-service.h
+++ b/src/grp-system/libcore/src/dbus-service.h
@@ -21,7 +21,7 @@
 
 #include <systemd/sd-bus.h>
 
-#include "unit.h"
+#include "core/unit.h"
 
 extern const sd_bus_vtable bus_service_vtable[];
 
diff --git a/src/grp-system/libcore/src/dbus-slice.c b/src/grp-system/libcore/src/dbus-slice.c
index 642fb19ec2..ce357cadae 100644
--- a/src/grp-system/libcore/src/dbus-slice.c
+++ b/src/grp-system/libcore/src/dbus-slice.c
@@ -17,11 +17,12 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "core/dbus-cgroup.h"
-#include "core/dbus-slice.h"
 #include "core/slice.h"
 #include "core/unit.h"
 
+#include "dbus-cgroup.h"
+#include "dbus-slice.h"
+
 const sd_bus_vtable bus_slice_vtable[] = {
         SD_BUS_VTABLE_START(0),
         SD_BUS_VTABLE_END
diff --git a/src/grp-system/libcore/include/core/dbus-slice.h b/src/grp-system/libcore/src/dbus-slice.h
index 8e4cabbf8a..fa039b2c0b 100644
--- a/src/grp-system/libcore/include/core/dbus-slice.h
+++ b/src/grp-system/libcore/src/dbus-slice.h
@@ -21,7 +21,7 @@
 
 #include <systemd/sd-bus.h>
 
-#include "unit.h"
+#include "core/unit.h"
 
 extern const sd_bus_vtable bus_slice_vtable[];
 
diff --git a/src/grp-system/libcore/src/dbus-socket.c b/src/grp-system/libcore/src/dbus-socket.c
index 31e4e0ca0b..3e22d1a687 100644
--- a/src/grp-system/libcore/src/dbus-socket.c
+++ b/src/grp-system/libcore/src/dbus-socket.c
@@ -17,15 +17,16 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "core/dbus-cgroup.h"
-#include "core/dbus-execute.h"
-#include "core/dbus-socket.h"
 #include "core/socket.h"
 #include "core/unit.h"
 #include "systemd-basic/alloc-util.h"
 #include "systemd-basic/string-util.h"
 #include "systemd-shared/bus-util.h"
 
+#include "dbus-cgroup.h"
+#include "dbus-execute.h"
+#include "dbus-socket.h"
+
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_result, socket_result, SocketResult);
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_bind_ipv6_only, socket_address_bind_ipv6_only, SocketAddressBindIPv6Only);
 
diff --git a/src/grp-system/libcore/include/core/dbus-socket.h b/src/grp-system/libcore/src/dbus-socket.h
index a31906feea..e68d33ace7 100644
--- a/src/grp-system/libcore/include/core/dbus-socket.h
+++ b/src/grp-system/libcore/src/dbus-socket.h
@@ -21,7 +21,7 @@
 
 #include <systemd/sd-bus.h>
 
-#include "unit.h"
+#include "core/unit.h"
 
 extern const sd_bus_vtable bus_socket_vtable[];
 
diff --git a/src/grp-system/libcore/src/dbus-swap.c b/src/grp-system/libcore/src/dbus-swap.c
index 3a2cb70c68..dcf8a45ad3 100644
--- a/src/grp-system/libcore/src/dbus-swap.c
+++ b/src/grp-system/libcore/src/dbus-swap.c
@@ -18,14 +18,15 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "core/dbus-cgroup.h"
-#include "core/dbus-execute.h"
-#include "core/dbus-swap.h"
 #include "core/swap.h"
 #include "core/unit.h"
 #include "systemd-basic/string-util.h"
 #include "systemd-shared/bus-util.h"
 
+#include "dbus-cgroup.h"
+#include "dbus-execute.h"
+#include "dbus-swap.h"
+
 static int property_get_priority(
                 sd_bus *bus,
                 const char *path,
diff --git a/src/grp-system/libcore/include/core/dbus-swap.h b/src/grp-system/libcore/src/dbus-swap.h
index 19151fb771..6c1b862665 100644
--- a/src/grp-system/libcore/include/core/dbus-swap.h
+++ b/src/grp-system/libcore/src/dbus-swap.h
@@ -22,7 +22,7 @@
 
 #include <systemd/sd-bus.h>
 
-#include "unit.h"
+#include "core/unit.h"
 
 extern const sd_bus_vtable bus_swap_vtable[];
 
diff --git a/src/grp-system/libcore/src/dbus-target.c b/src/grp-system/libcore/src/dbus-target.c
index 06a114a1b1..5a846432d0 100644
--- a/src/grp-system/libcore/src/dbus-target.c
+++ b/src/grp-system/libcore/src/dbus-target.c
@@ -17,9 +17,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "core/dbus-target.h"
 #include "core/unit.h"
 
+#include "dbus-target.h"
+
 const sd_bus_vtable bus_target_vtable[] = {
         SD_BUS_VTABLE_START(0),
         SD_BUS_VTABLE_END
diff --git a/src/grp-system/libcore/include/core/dbus-target.h b/src/grp-system/libcore/src/dbus-target.h
index c97a9d626e..c97a9d626e 100644
--- a/src/grp-system/libcore/include/core/dbus-target.h
+++ b/src/grp-system/libcore/src/dbus-target.h
diff --git a/src/grp-system/libcore/src/dbus-timer.c b/src/grp-system/libcore/src/dbus-timer.c
index 0c7ec4040f..a8acd24d3d 100644
--- a/src/grp-system/libcore/src/dbus-timer.c
+++ b/src/grp-system/libcore/src/dbus-timer.c
@@ -17,13 +17,14 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "core/dbus-timer.h"
 #include "core/timer.h"
 #include "core/unit.h"
 #include "systemd-basic/alloc-util.h"
 #include "systemd-basic/strv.h"
 #include "systemd-shared/bus-util.h"
 
+#include "dbus-timer.h"
+
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_result, timer_result, TimerResult);
 
 static int property_get_monotonic_timers(
diff --git a/src/grp-system/libcore/include/core/dbus-timer.h b/src/grp-system/libcore/src/dbus-timer.h
index 505fb5df72..5e366918f8 100644
--- a/src/grp-system/libcore/include/core/dbus-timer.h
+++ b/src/grp-system/libcore/src/dbus-timer.h
@@ -21,7 +21,7 @@
 
 #include <systemd/sd-bus.h>
 
-#include "unit.h"
+#include "core/unit.h"
 
 extern const sd_bus_vtable bus_timer_vtable[];
 
diff --git a/src/grp-system/libcore/src/dbus-unit.c b/src/grp-system/libcore/src/dbus-unit.c
index e7dd70e40a..cdd564ae91 100644
--- a/src/grp-system/libcore/src/dbus-unit.c
+++ b/src/grp-system/libcore/src/dbus-unit.c
@@ -19,8 +19,6 @@
 
 #include <systemd/sd-bus.h>
 
-#include "core/dbus-unit.h"
-#include "core/dbus.h"
 #include "core/selinux-access.h"
 #include "sd-bus/bus-common-errors.h"
 #include "systemd-basic/alloc-util.h"
@@ -35,6 +33,9 @@
 #include "systemd-basic/strv.h"
 #include "systemd-basic/user-util.h"
 
+#include "dbus-unit.h"
+#include "dbus.h"
+
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_load_state, unit_load_state, UnitLoadState);
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_job_mode, job_mode, JobMode);
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_failure_action, failure_action, FailureAction);
diff --git a/src/grp-system/libcore/include/core/dbus-unit.h b/src/grp-system/libcore/src/dbus-unit.h
index 758045a47c..d6351f9552 100644
--- a/src/grp-system/libcore/include/core/dbus-unit.h
+++ b/src/grp-system/libcore/src/dbus-unit.h
@@ -21,7 +21,7 @@
 
 #include <systemd/sd-bus.h>
 
-#include "unit.h"
+#include "core/unit.h"
 
 extern const sd_bus_vtable bus_unit_vtable[];
 extern const sd_bus_vtable bus_unit_cgroup_vtable[];
diff --git a/src/grp-system/libcore/src/dbus.c b/src/grp-system/libcore/src/dbus.c
index a1cc910e32..9b4360dbbc 100644
--- a/src/grp-system/libcore/src/dbus.c
+++ b/src/grp-system/libcore/src/dbus.c
@@ -23,13 +23,6 @@
 
 #include <systemd/sd-bus.h>
 
-#include "core/dbus-cgroup.h"
-#include "core/dbus-execute.h"
-#include "core/dbus-job.h"
-#include "core/dbus-kill.h"
-#include "core/dbus-manager.h"
-#include "core/dbus-unit.h"
-#include "core/dbus.h"
 #include "core/selinux-access.h"
 #include "sd-bus/bus-common-errors.h"
 #include "sd-bus/bus-error.h"
@@ -46,6 +39,14 @@
 #include "systemd-basic/user-util.h"
 #include "systemd-shared/bus-util.h"
 
+#include "dbus-cgroup.h"
+#include "dbus-execute.h"
+#include "dbus-job.h"
+#include "dbus-kill.h"
+#include "dbus-manager.h"
+#include "dbus-unit.h"
+#include "dbus.h"
+
 #define CONNECTIONS_MAX 4096
 
 static void destroy_bus(Manager *m, sd_bus **bus);
diff --git a/src/grp-system/libcore/include/core/dbus.h b/src/grp-system/libcore/src/dbus.h
index 6baaffbd75..36f8d34a1d 100644
--- a/src/grp-system/libcore/include/core/dbus.h
+++ b/src/grp-system/libcore/src/dbus.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "manager.h"
+#include "core/manager.h"
 
 int bus_send_queued_message(Manager *m);
 
diff --git a/src/grp-system/libcore/src/device.c b/src/grp-system/libcore/src/device.c
index 9ccc825185..a147de3280 100644
--- a/src/grp-system/libcore/src/device.c
+++ b/src/grp-system/libcore/src/device.c
@@ -22,7 +22,6 @@
 
 #include <libudev.h>
 
-#include "core/dbus-device.h"
 #include "core/device.h"
 #include "core/swap.h"
 #include "core/unit.h"
@@ -35,6 +34,8 @@
 #include "systemd-basic/unit-name.h"
 #include "systemd-shared/udev-util.h"
 
+#include "dbus-device.h"
+
 static const UnitActiveState state_translation_table[_DEVICE_STATE_MAX] = {
         [DEVICE_DEAD] = UNIT_INACTIVE,
         [DEVICE_TENTATIVE] = UNIT_ACTIVATING,
diff --git a/src/grp-system/libcore/src/job.c b/src/grp-system/libcore/src/job.c
index 31845af5d9..5c28ea1bd6 100644
--- a/src/grp-system/libcore/src/job.c
+++ b/src/grp-system/libcore/src/job.c
@@ -22,8 +22,6 @@
 #include <systemd/sd-id128.h>
 #include <systemd/sd-messages.h>
 
-#include "core/dbus-job.h"
-#include "core/dbus.h"
 #include "core/job.h"
 #include "core/unit.h"
 #include "systemd-basic/alloc-util.h"
@@ -41,6 +39,9 @@
 #include "systemd-basic/terminal-util.h"
 #include "systemd-basic/virt.h"
 
+#include "dbus-job.h"
+#include "dbus.h"
+
 Job* job_new_raw(Unit *unit) {
         Job *j;
 
diff --git a/src/grp-system/libcore/linux/auto_dev-ioctl.h b/src/grp-system/libcore/src/linux/auto_dev-ioctl.h
index aeaeb3ea7a..aeaeb3ea7a 100644
--- a/src/grp-system/libcore/linux/auto_dev-ioctl.h
+++ b/src/grp-system/libcore/src/linux/auto_dev-ioctl.h
diff --git a/src/grp-system/libcore/src/manager.c b/src/grp-system/libcore/src/manager.c
index 0d9673fec2..9a5bceb2dd 100644
--- a/src/grp-system/libcore/src/manager.c
+++ b/src/grp-system/libcore/src/manager.c
@@ -40,10 +40,6 @@
 #include <systemd/sd-messages.h>
 
 #include "core/audit-fd.h"
-#include "core/dbus-job.h"
-#include "core/dbus-manager.h"
-#include "core/dbus-unit.h"
-#include "core/dbus.h"
 #include "core/locale-setup.h"
 #include "core/manager.h"
 #include "core/transaction.h"
@@ -86,6 +82,11 @@
 #include "systemd-shared/path-lookup.h"
 #include "systemd-shared/watchdog.h"
 
+#include "dbus-job.h"
+#include "dbus-manager.h"
+#include "dbus-unit.h"
+#include "dbus.h"
+
 #define NOTIFY_RCVBUF_SIZE (8*1024*1024)
 #define CGROUPS_AGENT_RCVBUF_SIZE (8*1024*1024)
 
diff --git a/src/grp-system/libcore/src/mount.c b/src/grp-system/libcore/src/mount.c
index 82608d4efd..b0c3b6722c 100644
--- a/src/grp-system/libcore/src/mount.c
+++ b/src/grp-system/libcore/src/mount.c
@@ -24,7 +24,6 @@
 
 #include <systemd/sd-messages.h>
 
-#include "core/dbus-mount.h"
 #include "core/manager.h"
 #include "core/mount-setup.h"
 #include "core/mount.h"
@@ -46,6 +45,8 @@
 #include "systemd-basic/unit-name.h"
 #include "systemd-shared/fstab-util.h"
 
+#include "dbus-mount.h"
+
 #define RETRY_UMOUNT_MAX 32
 
 DEFINE_TRIVIAL_CLEANUP_FUNC(struct libmnt_table*, mnt_free_table);
diff --git a/src/grp-system/libcore/src/path.c b/src/grp-system/libcore/src/path.c
index 4196a82df6..affe6a592d 100644
--- a/src/grp-system/libcore/src/path.c
+++ b/src/grp-system/libcore/src/path.c
@@ -22,7 +22,6 @@
 #include <sys/inotify.h>
 #include <unistd.h>
 
-#include "core/dbus-path.h"
 #include "core/path.h"
 #include "core/unit.h"
 #include "sd-bus/bus-error.h"
@@ -38,6 +37,8 @@
 #include "systemd-basic/unit-name.h"
 #include "systemd-shared/bus-util.h"
 
+#include "dbus-path.h"
+
 static const UnitActiveState state_translation_table[_PATH_STATE_MAX] = {
         [PATH_DEAD] = UNIT_INACTIVE,
         [PATH_WAITING] = UNIT_ACTIVE,
diff --git a/src/grp-system/libcore/src/scope.c b/src/grp-system/libcore/src/scope.c
index 2b61a5fddc..708d75360d 100644
--- a/src/grp-system/libcore/src/scope.c
+++ b/src/grp-system/libcore/src/scope.c
@@ -20,7 +20,6 @@
 #include <errno.h>
 #include <unistd.h>
 
-#include "core/dbus-scope.h"
 #include "core/load-dropin.h"
 #include "core/scope.h"
 #include "core/unit.h"
@@ -32,6 +31,8 @@
 #include "systemd-basic/strv.h"
 #include "systemd-basic/unit-name.h"
 
+#include "dbus-scope.h"
+
 static const UnitActiveState state_translation_table[_SCOPE_STATE_MAX] = {
         [SCOPE_DEAD] = UNIT_INACTIVE,
         [SCOPE_RUNNING] = UNIT_ACTIVE,
diff --git a/src/grp-system/libcore/src/service.c b/src/grp-system/libcore/src/service.c
index 2e4429d2f8..e499a088da 100644
--- a/src/grp-system/libcore/src/service.c
+++ b/src/grp-system/libcore/src/service.c
@@ -21,7 +21,6 @@
 #include <signal.h>
 #include <unistd.h>
 
-#include "core/dbus-service.h"
 #include "core/load-dropin.h"
 #include "core/load-fragment.h"
 #include "core/manager.h"
@@ -54,6 +53,8 @@
 #include "systemd-basic/util.h"
 #include "systemd-shared/bus-util.h"
 
+#include "dbus-service.h"
+
 static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = {
         [SERVICE_DEAD] = UNIT_INACTIVE,
         [SERVICE_START_PRE] = UNIT_ACTIVATING,
diff --git a/src/grp-system/libcore/src/slice.c b/src/grp-system/libcore/src/slice.c
index cb663bead7..4ab5548572 100644
--- a/src/grp-system/libcore/src/slice.c
+++ b/src/grp-system/libcore/src/slice.c
@@ -19,7 +19,6 @@
 
 #include <errno.h>
 
-#include "core/dbus-slice.h"
 #include "core/slice.h"
 #include "core/unit.h"
 #include "systemd-basic/alloc-util.h"
@@ -29,6 +28,8 @@
 #include "systemd-basic/strv.h"
 #include "systemd-basic/unit-name.h"
 
+#include "dbus-slice.h"
+
 static const UnitActiveState state_translation_table[_SLICE_STATE_MAX] = {
         [SLICE_DEAD] = UNIT_INACTIVE,
         [SLICE_ACTIVE] = UNIT_ACTIVE
diff --git a/src/grp-system/libcore/src/socket.c b/src/grp-system/libcore/src/socket.c
index f871f577a7..2d6b5b322c 100644
--- a/src/grp-system/libcore/src/socket.c
+++ b/src/grp-system/libcore/src/socket.c
@@ -29,7 +29,6 @@
 
 #include <linux/sctp.h>
 
-#include "core/dbus-socket.h"
 #include "core/socket.h"
 #include "core/unit-printf.h"
 #include "core/unit.h"
@@ -59,6 +58,8 @@
 #include "systemd-basic/user-util.h"
 #include "systemd-shared/bus-util.h"
 
+#include "dbus-socket.h"
+
 static const UnitActiveState state_translation_table[_SOCKET_STATE_MAX] = {
         [SOCKET_DEAD] = UNIT_INACTIVE,
         [SOCKET_START_PRE] = UNIT_ACTIVATING,
diff --git a/src/grp-system/libcore/src/swap.c b/src/grp-system/libcore/src/swap.c
index 7d87d5768f..29f3971720 100644
--- a/src/grp-system/libcore/src/swap.c
+++ b/src/grp-system/libcore/src/swap.c
@@ -24,7 +24,6 @@
 
 #include <libudev.h>
 
-#include "core/dbus-swap.h"
 #include "core/swap.h"
 #include "core/unit.h"
 #include "systemd-basic/alloc-util.h"
@@ -43,6 +42,8 @@
 #include "systemd-shared/fstab-util.h"
 #include "systemd-shared/udev-util.h"
 
+#include "dbus-swap.h"
+
 static const UnitActiveState state_translation_table[_SWAP_STATE_MAX] = {
         [SWAP_DEAD] = UNIT_INACTIVE,
         [SWAP_ACTIVATING] = UNIT_ACTIVATING,
diff --git a/src/grp-system/libcore/src/target.c b/src/grp-system/libcore/src/target.c
index 0b62019b4b..991dbccb10 100644
--- a/src/grp-system/libcore/src/target.c
+++ b/src/grp-system/libcore/src/target.c
@@ -17,7 +17,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "core/dbus-target.h"
 #include "core/target.h"
 #include "core/unit.h"
 #include "systemd-basic/log.h"
@@ -25,6 +24,8 @@
 #include "systemd-basic/string-util.h"
 #include "systemd-basic/unit-name.h"
 
+#include "dbus-target.h"
+
 static const UnitActiveState state_translation_table[_TARGET_STATE_MAX] = {
         [TARGET_DEAD] = UNIT_INACTIVE,
         [TARGET_ACTIVE] = UNIT_ACTIVE
diff --git a/src/grp-system/libcore/src/timer.c b/src/grp-system/libcore/src/timer.c
index 2de644eaea..98360cff51 100644
--- a/src/grp-system/libcore/src/timer.c
+++ b/src/grp-system/libcore/src/timer.c
@@ -19,7 +19,6 @@
 
 #include <errno.h>
 
-#include "core/dbus-timer.h"
 #include "core/timer.h"
 #include "core/unit.h"
 #include "sd-bus/bus-error.h"
@@ -35,6 +34,8 @@
 #include "systemd-basic/virt.h"
 #include "systemd-shared/bus-util.h"
 
+#include "dbus-timer.h"
+
 static const UnitActiveState state_translation_table[_TIMER_STATE_MAX] = {
         [TIMER_DEAD] = UNIT_INACTIVE,
         [TIMER_WAITING] = UNIT_ACTIVE,
diff --git a/src/grp-system/libcore/src/transaction.c b/src/grp-system/libcore/src/transaction.c
index fbf4fe6e8e..3d375d2e1e 100644
--- a/src/grp-system/libcore/src/transaction.c
+++ b/src/grp-system/libcore/src/transaction.c
@@ -20,13 +20,14 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "core/dbus-unit.h"
 #include "core/transaction.h"
 #include "sd-bus/bus-common-errors.h"
 #include "sd-bus/bus-error.h"
 #include "systemd-basic/alloc-util.h"
 #include "systemd-basic/terminal-util.h"
 
+#include "dbus-unit.h"
+
 static void transaction_unlink_job(Transaction *tr, Job *j, bool delete_dependencies);
 
 static void transaction_delete_job(Transaction *tr, Job *j, bool delete_dependencies) {
diff --git a/src/grp-system/libcore/src/unit.c b/src/grp-system/libcore/src/unit.c
index b7c4baea3c..f17f18c679 100644
--- a/src/grp-system/libcore/src/unit.c
+++ b/src/grp-system/libcore/src/unit.c
@@ -26,8 +26,6 @@
 #include <systemd/sd-id128.h>
 #include <systemd/sd-messages.h>
 
-#include "core/dbus-unit.h"
-#include "core/dbus.h"
 #include "core/execute.h"
 #include "core/load-dropin.h"
 #include "core/load-fragment.h"
@@ -59,6 +57,9 @@
 #include "systemd-shared/bus-util.h"
 #include "systemd-shared/dropin.h"
 
+#include "dbus-unit.h"
+#include "dbus.h"
+
 const UnitVTable * const unit_vtable[_UNIT_TYPE_MAX] = {
         [UNIT_SERVICE] = &service_vtable,
         [UNIT_SOCKET] = &socket_vtable,
diff --git a/src/grp-system/systemd/main.c b/src/grp-system/systemd/main.c
index 4877aeeb30..8f88e1e119 100644
--- a/src/grp-system/systemd/main.c
+++ b/src/grp-system/systemd/main.c
@@ -38,7 +38,6 @@
 #include <systemd/sd-bus.h>
 #include <systemd/sd-daemon.h>
 
-#include "core/dbus-manager.h"
 #include "core/hostname-setup.h"
 #include "core/ima-setup.h"
 #include "core/killall.h"
@@ -50,6 +49,7 @@
 #include "core/mount-setup.h"
 #include "core/selinux-setup.h"
 #include "core/smack-setup.h"
+#include "dbus-manager.h"
 #include "sd-bus/bus-error.h"
 #include "systemd-basic/alloc-util.h"
 #include "systemd-basic/architecture.h"
diff --git a/src/grp-udev/.gitignore b/src/grp-udev/.gitignore
index f5d8be3dc1..f8e0aae978 100644
--- a/src/grp-udev/.gitignore
+++ b/src/grp-udev/.gitignore
@@ -2,3 +2,4 @@
 /keyboard-keys-from-name.gperf
 /keyboard-keys-from-name.h
 /keyboard-keys-list.txt
+/99-systemd.rules
diff --git a/src/grp-udev/rules/50-udev-default.rules b/src/grp-udev/50-udev-default.rules
index e9eeb8518e..e9eeb8518e 100644
--- a/src/grp-udev/rules/50-udev-default.rules
+++ b/src/grp-udev/50-udev-default.rules
diff --git a/src/grp-udev/rules/60-block.rules b/src/grp-udev/60-block.rules
index 42c75974a5..42c75974a5 100644
--- a/src/grp-udev/rules/60-block.rules
+++ b/src/grp-udev/60-block.rules
diff --git a/src/grp-udev/rules/60-drm.rules b/src/grp-udev/60-drm.rules
index 1ed3e445f2..1ed3e445f2 100644
--- a/src/grp-udev/rules/60-drm.rules
+++ b/src/grp-udev/60-drm.rules
diff --git a/src/grp-udev/rules/60-evdev.rules b/src/grp-udev/60-evdev.rules
index ade7e7f646..ade7e7f646 100644
--- a/src/grp-udev/rules/60-evdev.rules
+++ b/src/grp-udev/60-evdev.rules
diff --git a/src/grp-udev/rules/60-persistent-alsa.rules b/src/grp-udev/60-persistent-alsa.rules
index 8154e2dbb5..8154e2dbb5 100644
--- a/src/grp-udev/rules/60-persistent-alsa.rules
+++ b/src/grp-udev/60-persistent-alsa.rules
diff --git a/src/grp-udev/rules/60-persistent-input.rules b/src/grp-udev/60-persistent-input.rules
index 607144bf8a..607144bf8a 100644
--- a/src/grp-udev/rules/60-persistent-input.rules
+++ b/src/grp-udev/60-persistent-input.rules
diff --git a/src/grp-udev/rules/60-persistent-storage-tape.rules b/src/grp-udev/60-persistent-storage-tape.rules
index b604864ee8..b604864ee8 100644
--- a/src/grp-udev/rules/60-persistent-storage-tape.rules
+++ b/src/grp-udev/60-persistent-storage-tape.rules
diff --git a/src/grp-udev/rules/60-persistent-storage.rules b/src/grp-udev/60-persistent-storage.rules
index d7bbbf9866..d7bbbf9866 100644
--- a/src/grp-udev/rules/60-persistent-storage.rules
+++ b/src/grp-udev/60-persistent-storage.rules
diff --git a/src/grp-udev/rules/60-serial.rules b/src/grp-udev/60-serial.rules
index f303e27fd5..f303e27fd5 100644
--- a/src/grp-udev/rules/60-serial.rules
+++ b/src/grp-udev/60-serial.rules
diff --git a/src/grp-udev/rules/64-btrfs.rules b/src/grp-udev/64-btrfs.rules
index fe0100131e..fe0100131e 100644
--- a/src/grp-udev/rules/64-btrfs.rules
+++ b/src/grp-udev/64-btrfs.rules
diff --git a/src/grp-udev/rules/70-mouse.rules b/src/grp-udev/70-mouse.rules
index 3ea743aff9..3ea743aff9 100644
--- a/src/grp-udev/rules/70-mouse.rules
+++ b/src/grp-udev/70-mouse.rules
diff --git a/src/grp-udev/rules/70-touchpad.rules b/src/grp-udev/70-touchpad.rules
index 7bede02dec..7bede02dec 100644
--- a/src/grp-udev/rules/70-touchpad.rules
+++ b/src/grp-udev/70-touchpad.rules
diff --git a/src/grp-udev/rules/75-net-description.rules b/src/grp-udev/75-net-description.rules
index 7e62f8b26b..7e62f8b26b 100644
--- a/src/grp-udev/rules/75-net-description.rules
+++ b/src/grp-udev/75-net-description.rules
diff --git a/src/grp-udev/rules/78-sound-card.rules b/src/grp-udev/78-sound-card.rules
index 04740e8b97..04740e8b97 100644
--- a/src/grp-udev/rules/78-sound-card.rules
+++ b/src/grp-udev/78-sound-card.rules
diff --git a/src/grp-udev/rules/80-drivers.rules b/src/grp-udev/80-drivers.rules
index 8551f47a4b..8551f47a4b 100644
--- a/src/grp-udev/rules/80-drivers.rules
+++ b/src/grp-udev/80-drivers.rules
diff --git a/src/grp-udev/rules/80-net-setup-link.rules b/src/grp-udev/80-net-setup-link.rules
index 6e411a91f0..6e411a91f0 100644
--- a/src/grp-udev/rules/80-net-setup-link.rules
+++ b/src/grp-udev/80-net-setup-link.rules
diff --git a/src/grp-udev/rules/99-systemd.rules.in b/src/grp-udev/99-systemd.rules.in
index ca52cf165b..ca52cf165b 100644
--- a/src/grp-udev/rules/99-systemd.rules.in
+++ b/src/grp-udev/99-systemd.rules.in
diff --git a/src/grp-udev/rules/.gitignore b/src/grp-udev/rules/.gitignore
deleted file mode 100644
index 93a50ddd80..0000000000
--- a/src/grp-udev/rules/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/99-systemd.rules
diff --git a/src/test/test-tables.c b/src/test/test-tables.c
index 0ee780bef4..92f9c48c27 100644
--- a/src/test/test-tables.c
+++ b/src/test/test-tables.c
@@ -34,7 +34,7 @@
 #include "core/target.h"
 #include "core/timer.h"
 #include "core/unit.h"
-#include "journald-server.h"
+#include "journal-core/journald-server.h"
 #include "link-config.h"
 #include "sd-journal/compress.h"
 #include "systemd-basic/architecture.h"
diff --git a/tools/notsd-move b/tools/notsd-move
index 21609485a9..3b29039883 100755
--- a/tools/notsd-move
+++ b/tools/notsd-move
@@ -133,6 +133,10 @@ move_files() (
 	split_lib src/libsystemd-shared
 	split_lib src/libsystemd-network
 
+	mv -t src/libcore/src \
+	   src/libcore/linux \
+	   src/libcore/include/core/dbus*.h
+
 	mv src/libsystemd-shared/{test,include/systemd-shared}/test-tables.h
 	rmdir src/libsystemd-shared/test
 
@@ -154,6 +158,7 @@ move_files() (
 	   src/resolve/.gitignore \
 	   src/resolve/*
 	rmdir src/resolve
+	split_lib src/libbasic-dns
 
 	# src/import => src/{libimport,systemd-{export,importd,import}}
 	mkdir src/libimport
@@ -179,7 +184,7 @@ move_files() (
 	   src/import/curl-util*
 	rmdir src/import
 
-	# src/journal => src/..
+	# src/journal => src/...
 	mkdir src/libjournal-core
 	mv -t src/libjournal-core \
 	   src/journal/.gitignore \
@@ -222,6 +227,7 @@ move_files() (
 	   src/journal/mmap-cache.h \
 	   src/journal/sd-journal.c
 	rmdir src/journal
+	split_lib src/libjournal-core
 
 	# src/network => src/...
 	mkdir src/systemd-networkd-wait-online
@@ -649,6 +655,12 @@ move_files() (
 	    src/systemd-path \
 	    src/systemd-socket-activate
 
+	mv -t src/grp-udev \
+	   src/grp-udev/rules/*
+	cat src/grp-udev/rules/.gitignore >> src/grp-udev/.gitignore
+	rm src/grp-udev/rules/.gitignore
+	rmdir src/grp-udev/rules
+
 	mv -t src/systemd-timesyncd system-preset/??-timesyncd.preset
 	for file in system-preset/??-*.preset; do
 		base="${file##*/??-}"