core: rearrange code so that libsystemd/sd-bus/ does not include header files from core

Stuff in src/shared or src/libsystemd should *never* include code from
src/core or any of the tools, so don't do that here either. It's not OK!

4 files changed, 5 insertions, 6 deletions

diff --git a/src/bus-proxyd/bus-proxyd.c b/src/bus-proxyd/bus-proxyd.c
index 6da7fb9b55..64c11ffd16 100644
--- a/src/bus-proxyd/bus-proxyd.c
+++ b/src/bus-proxyd/bus-proxyd.c
@@ -44,9 +44,10 @@
 #include "strv.h"
 #include "def.h"
 #include "capability.h"
-#include "bus-policy.h"
 #include "bus-control.h"
 #include "smack-util.h"
+#include "set.h"
+#include "bus-xml-policy.h"
 
 static char *arg_address = NULL;
 static char *arg_command_line_buffer = NULL;
diff --git a/src/bus-proxyd/bus-policy.c b/src/bus-proxyd/bus-xml-policy.c
index 59cc1d788b..ac0e14b4f9 100644
--- a/src/bus-proxyd/bus-policy.c
+++ b/src/bus-proxyd/bus-xml-policy.c
@@ -25,7 +25,7 @@
 #include "conf-files.h"
 #include "bus-internal.h"
 #include "bus-message.h"
-#include "bus-policy.h"
+#include "bus-xml-policy.h"
 
 static void policy_item_free(PolicyItem *i) {
         assert(i);
diff --git a/src/bus-proxyd/bus-policy.h b/src/bus-proxyd/bus-xml-policy.h
index 933a53ceb5..933a53ceb5 100644
--- a/src/bus-proxyd/bus-policy.h
+++ b/src/bus-proxyd/bus-xml-policy.h
diff --git a/src/bus-proxyd/test-bus-policy.c b/src/bus-proxyd/test-bus-xml-policy.c
index 91ab33da4a..b0f4ed7d3d 100644
--- a/src/bus-proxyd/test-bus-policy.c
+++ b/src/bus-proxyd/test-bus-xml-policy.c
@@ -40,11 +40,9 @@
 #include "strv.h"
 #include "def.h"
 #include "capability.h"
+#include "bus-xml-policy.h"
 
-#include <bus-proxyd/bus-policy.h>
-
-static int test_policy_load(Policy *p, const char *name)
-{
+static int test_policy_load(Policy *p, const char *name) {
         _cleanup_free_ char *path = NULL;
         int r = 0;