fix (mostly adjust #includes to have sd- prefix)

18 files changed, 28 insertions, 29 deletions

diff --git a/src/libcore/Makefile b/src/libcore/Makefile
index 53059eda20..23032ea6f7 100644
--- a/src/libcore/Makefile
+++ b/src/libcore/Makefile
@@ -166,7 +166,6 @@ libcore_la_LIBADD = \
 $(outdir)/load-fragment-gperf-nulstr.c: $(outdir)/load-fragment-gperf.gperf
 	$(AM_V_GEN)$(AWK) 'BEGIN{ keywords=0 ; FS="," ; print "extern const char load_fragment_gperf_nulstr[];" ; print "const char load_fragment_gperf_nulstr[] ="} ; keyword==1 { print "\"" $$1 "\\0\"" } ; /%%/ { keyword=1} ; END { print ";" }' < $< > $@
 
-systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus
 systemd.CPPFLAGS += -I$(topsrcdir)/src/libudev/src
 systemd.CPPFLAGS += -DMOUNT_PATH=\"$(MOUNT_PATH)\"
 systemd.CPPFLAGS += -DUMOUNT_PATH=\"$(UMOUNT_PATH)\"
diff --git a/src/libcore/automount.c b/src/libcore/automount.c
index f06d837e30..fdd23327e2 100644
--- a/src/libcore/automount.c
+++ b/src/libcore/automount.c
@@ -30,7 +30,7 @@
 #include "alloc-util.h"
 #include "async.h"
 #include "automount.h"
-#include "bus-error.h"
+#include "sd-bus/bus-error.h"
 #include "bus-util.h"
 #include "dbus-automount.h"
 #include "fd-util.h"
diff --git a/src/libcore/bus-policy.c b/src/libcore/bus-policy.c
index 4907c268e8..4976908b90 100644
--- a/src/libcore/bus-policy.c
+++ b/src/libcore/bus-policy.c
@@ -20,9 +20,9 @@
 #include <stdlib.h>
 
 #include "alloc-util.h"
-#include "bus-kernel.h"
+#include "sd-bus/bus-kernel.h"
 #include "bus-policy.h"
-#include "kdbus.h"
+#include "sd-bus/kdbus.h"
 #include "string-table.h"
 #include "user-util.h"
 #include "util.h"
diff --git a/src/libcore/bus-policy.h b/src/libcore/bus-policy.h
index 5b2c4d5953..2b3b382826 100644
--- a/src/libcore/bus-policy.h
+++ b/src/libcore/bus-policy.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "kdbus.h"
+#include "sd-bus/kdbus.h"
 #include "list.h"
 #include "macro.h"
 
diff --git a/src/libcore/busname.c b/src/libcore/busname.c
index f03a95c24e..206f76787a 100644
--- a/src/libcore/busname.c
+++ b/src/libcore/busname.c
@@ -20,15 +20,15 @@
 #include <sys/mman.h>
 
 #include "alloc-util.h"
-#include "bus-internal.h"
-#include "bus-kernel.h"
+#include "sd-bus/bus-internal.h"
+#include "sd-bus/bus-kernel.h"
 #include "bus-policy.h"
 #include "bus-util.h"
 #include "busname.h"
 #include "dbus-busname.h"
 #include "fd-util.h"
 #include "formats-util.h"
-#include "kdbus.h"
+#include "sd-bus/kdbus.h"
 #include "parse-util.h"
 #include "process-util.h"
 #include "service.h"
diff --git a/src/libcore/dbus-manager.c b/src/libcore/dbus-manager.c
index 86722e1162..4d2f425692 100644
--- a/src/libcore/dbus-manager.c
+++ b/src/libcore/dbus-manager.c
@@ -24,7 +24,7 @@
 #include "alloc-util.h"
 #include "architecture.h"
 #include "build.h"
-#include "bus-common-errors.h"
+#include "sd-bus/bus-common-errors.h"
 #include "clock-util.h"
 #include "dbus-execute.h"
 #include "dbus-job.h"
diff --git a/src/libcore/dbus-scope.c b/src/libcore/dbus-scope.c
index 34ee9a8fa9..b5a3072544 100644
--- a/src/libcore/dbus-scope.c
+++ b/src/libcore/dbus-scope.c
@@ -18,8 +18,8 @@
 ***/
 
 #include "alloc-util.h"
-#include "bus-common-errors.h"
-#include "bus-internal.h"
+#include "sd-bus/bus-common-errors.h"
+#include "sd-bus/bus-internal.h"
 #include "bus-util.h"
 #include "dbus-cgroup.h"
 #include "dbus-kill.h"
diff --git a/src/libcore/dbus-unit.c b/src/libcore/dbus-unit.c
index dcd8db0898..8d5b1bad85 100644
--- a/src/libcore/dbus-unit.c
+++ b/src/libcore/dbus-unit.c
@@ -20,7 +20,7 @@
 #include <systemd/sd-bus.h>
 
 #include "alloc-util.h"
-#include "bus-common-errors.h"
+#include "sd-bus/bus-common-errors.h"
 #include "cgroup-util.h"
 #include "dbus-unit.h"
 #include "dbus.h"
diff --git a/src/libcore/dbus.c b/src/libcore/dbus.c
index 1b217da303..987b7fe5f1 100644
--- a/src/libcore/dbus.c
+++ b/src/libcore/dbus.c
@@ -24,9 +24,9 @@
 #include <systemd/sd-bus.h>
 
 #include "alloc-util.h"
-#include "bus-common-errors.h"
-#include "bus-error.h"
-#include "bus-internal.h"
+#include "sd-bus/bus-common-errors.h"
+#include "sd-bus/bus-error.h"
+#include "sd-bus/bus-internal.h"
 #include "bus-util.h"
 #include "dbus-cgroup.h"
 #include "dbus-execute.h"
diff --git a/src/libcore/failure-action.c b/src/libcore/failure-action.c
index ddae46190f..b40c8b0dbc 100644
--- a/src/libcore/failure-action.c
+++ b/src/libcore/failure-action.c
@@ -21,7 +21,7 @@
 #include <sys/reboot.h>
 #include <linux/reboot.h>
 
-#include "bus-error.h"
+#include "sd-bus/bus-error.h"
 #include "bus-util.h"
 #include "failure-action.h"
 #include "special.h"
diff --git a/src/libcore/load-fragment.c b/src/libcore/load-fragment.c
index 86b4fb071b..d793f12563 100644
--- a/src/libcore/load-fragment.c
+++ b/src/libcore/load-fragment.c
@@ -32,8 +32,8 @@
 
 #include "af-list.h"
 #include "alloc-util.h"
-#include "bus-error.h"
-#include "bus-internal.h"
+#include "sd-bus/bus-error.h"
+#include "sd-bus/bus-internal.h"
 #include "bus-util.h"
 #include "cap-list.h"
 #include "capability-util.h"
diff --git a/src/libcore/manager.c b/src/libcore/manager.c
index 831fdbaabf..1b8d61fc70 100644
--- a/src/libcore/manager.c
+++ b/src/libcore/manager.c
@@ -41,9 +41,9 @@
 #include "alloc-util.h"
 #include "audit-fd.h"
 #include "boot-timestamps.h"
-#include "bus-common-errors.h"
-#include "bus-error.h"
-#include "bus-kernel.h"
+#include "sd-bus/bus-common-errors.h"
+#include "sd-bus/bus-error.h"
+#include "sd-bus/bus-kernel.h"
 #include "bus-util.h"
 #include "dbus-job.h"
 #include "dbus-manager.h"
diff --git a/src/libcore/path.c b/src/libcore/path.c
index 0dd0d375d8..968bd5057e 100644
--- a/src/libcore/path.c
+++ b/src/libcore/path.c
@@ -22,7 +22,7 @@
 #include <sys/inotify.h>
 #include <unistd.h>
 
-#include "bus-error.h"
+#include "sd-bus/bus-error.h"
 #include "bus-util.h"
 #include "dbus-path.h"
 #include "fd-util.h"
diff --git a/src/libcore/service.c b/src/libcore/service.c
index 7ebabca5d6..f585743a32 100644
--- a/src/libcore/service.c
+++ b/src/libcore/service.c
@@ -23,8 +23,8 @@
 
 #include "alloc-util.h"
 #include "async.h"
-#include "bus-error.h"
-#include "bus-kernel.h"
+#include "sd-bus/bus-error.h"
+#include "sd-bus/bus-kernel.h"
 #include "bus-util.h"
 #include "dbus-service.h"
 #include "def.h"
diff --git a/src/libcore/socket.c b/src/libcore/socket.c
index f6204d04bf..fd4ea5f9a9 100644
--- a/src/libcore/socket.c
+++ b/src/libcore/socket.c
@@ -29,7 +29,7 @@
 #include <linux/sctp.h>
 
 #include "alloc-util.h"
-#include "bus-error.h"
+#include "sd-bus/bus-error.h"
 #include "bus-util.h"
 #include "copy.h"
 #include "dbus-socket.h"
diff --git a/src/libcore/timer.c b/src/libcore/timer.c
index 3206296f09..cf7249af09 100644
--- a/src/libcore/timer.c
+++ b/src/libcore/timer.c
@@ -20,7 +20,7 @@
 #include <errno.h>
 
 #include "alloc-util.h"
-#include "bus-error.h"
+#include "sd-bus/bus-error.h"
 #include "bus-util.h"
 #include "dbus-timer.h"
 #include "fs-util.h"
diff --git a/src/libcore/transaction.c b/src/libcore/transaction.c
index e06a48a2f1..5233f89204 100644
--- a/src/libcore/transaction.c
+++ b/src/libcore/transaction.c
@@ -21,8 +21,8 @@
 #include <unistd.h>
 
 #include "alloc-util.h"
-#include "bus-common-errors.h"
-#include "bus-error.h"
+#include "sd-bus/bus-common-errors.h"
+#include "sd-bus/bus-error.h"
 #include "terminal-util.h"
 #include "transaction.h"
 #include "dbus-unit.h"
diff --git a/src/libcore/unit.c b/src/libcore/unit.c
index 8bd39f87f9..416c1ec7e9 100644
--- a/src/libcore/unit.c
+++ b/src/libcore/unit.c
@@ -27,7 +27,7 @@
 #include <systemd/sd-messages.h>
 
 #include "alloc-util.h"
-#include "bus-common-errors.h"
+#include "sd-bus/bus-common-errors.h"
 #include "bus-util.h"
 #include "cgroup-util.h"
 #include "dbus-unit.h"