fix

39 files changed, 53 insertions, 53 deletions

diff --git a/src/libcore/automount.c b/src/libcore/automount.c
index 88c3c0cda0..145ed5ab5d 100644
--- a/src/libcore/automount.c
+++ b/src/libcore/automount.c
@@ -31,7 +31,7 @@
 #include "basic/async.h"
 #include "automount.h"
 #include "sd-bus/bus-error.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "dbus-automount.h"
 #include "basic/fd-util.h"
 #include "basic/formats-util.h"
diff --git a/src/libcore/busname.c b/src/libcore/busname.c
index 7098e0cbd8..765fd7a442 100644
--- a/src/libcore/busname.c
+++ b/src/libcore/busname.c
@@ -23,7 +23,7 @@
 #include "sd-bus/bus-internal.h"
 #include "sd-bus/bus-kernel.h"
 #include "bus-policy.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "busname.h"
 #include "dbus-busname.h"
 #include "basic/fd-util.h"
diff --git a/src/libcore/dbus-automount.c b/src/libcore/dbus-automount.c
index 333ccb6303..bc44dc1c0a 100644
--- a/src/libcore/dbus-automount.c
+++ b/src/libcore/dbus-automount.c
@@ -18,7 +18,7 @@
 ***/
 
 #include "automount.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "dbus-automount.h"
 #include "basic/string-util.h"
 
diff --git a/src/libcore/dbus-busname.c b/src/libcore/dbus-busname.c
index f5180d645c..80e7484f46 100644
--- a/src/libcore/dbus-busname.c
+++ b/src/libcore/dbus-busname.c
@@ -17,7 +17,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "busname.h"
 #include "dbus-busname.h"
 #include "basic/string-util.h"
diff --git a/src/libcore/dbus-cgroup.c b/src/libcore/dbus-cgroup.c
index ca865f9b90..86f7c626c4 100644
--- a/src/libcore/dbus-cgroup.c
+++ b/src/libcore/dbus-cgroup.c
@@ -18,7 +18,7 @@
 ***/
 
 #include "basic/alloc-util.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/cgroup-util.h"
 #include "cgroup.h"
 #include "dbus-cgroup.h"
diff --git a/src/libcore/dbus-execute.c b/src/libcore/dbus-execute.c
index 6cb69ff9b9..b5530d945e 100644
--- a/src/libcore/dbus-execute.c
+++ b/src/libcore/dbus-execute.c
@@ -25,7 +25,7 @@
 
 #include "basic/af-list.h"
 #include "basic/alloc-util.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/capability-util.h"
 #include "dbus-execute.h"
 #include "basic/env-util.h"
@@ -40,7 +40,7 @@
 #include "basic/process-util.h"
 #include "basic/rlimit-util.h"
 #ifdef HAVE_SECCOMP
-#include "seccomp-util.h"
+#include "shared/seccomp-util.h"
 #endif
 #include "basic/strv.h"
 #include "basic/syslog-util.h"
diff --git a/src/libcore/dbus-kill.c b/src/libcore/dbus-kill.c
index 3a8fdab808..cd76682298 100644
--- a/src/libcore/dbus-kill.c
+++ b/src/libcore/dbus-kill.c
@@ -17,7 +17,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "dbus-kill.h"
 #include "kill.h"
 #include "basic/signal-util.h"
diff --git a/src/libcore/dbus-manager.c b/src/libcore/dbus-manager.c
index 7fe22646b5..59f8a7908a 100644
--- a/src/libcore/dbus-manager.c
+++ b/src/libcore/dbus-manager.c
@@ -35,7 +35,7 @@
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
 #include "basic/formats-util.h"
-#include "install.h"
+#include "shared/install.h"
 #include "basic/log.h"
 #include "basic/path-util.h"
 #include "selinux-access.h"
@@ -44,7 +44,7 @@
 #include "basic/strv.h"
 #include "basic/syslog-util.h"
 #include "basic/virt.h"
-#include "watchdog.h"
+#include "shared/watchdog.h"
 
 static int property_get_version(
                 sd_bus *bus,
diff --git a/src/libcore/dbus-mount.c b/src/libcore/dbus-mount.c
index 3adf12d377..e6e824b6b9 100644
--- a/src/libcore/dbus-mount.c
+++ b/src/libcore/dbus-mount.c
@@ -17,7 +17,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "dbus-cgroup.h"
 #include "dbus-execute.h"
 #include "dbus-kill.h"
diff --git a/src/libcore/dbus-path.c b/src/libcore/dbus-path.c
index 83eb38fe9a..2f2a65d4c1 100644
--- a/src/libcore/dbus-path.c
+++ b/src/libcore/dbus-path.c
@@ -17,7 +17,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "dbus-path.h"
 #include "path.h"
 #include "basic/string-util.h"
diff --git a/src/libcore/dbus-scope.c b/src/libcore/dbus-scope.c
index 5059416d65..3a9c3b98ec 100644
--- a/src/libcore/dbus-scope.c
+++ b/src/libcore/dbus-scope.c
@@ -20,7 +20,7 @@
 #include "basic/alloc-util.h"
 #include "sd-bus/bus-common-errors.h"
 #include "sd-bus/bus-internal.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "dbus-cgroup.h"
 #include "dbus-kill.h"
 #include "dbus-scope.h"
diff --git a/src/libcore/dbus-service.c b/src/libcore/dbus-service.c
index ecffd45b20..463d9da4e1 100644
--- a/src/libcore/dbus-service.c
+++ b/src/libcore/dbus-service.c
@@ -19,7 +19,7 @@
 
 #include "basic/alloc-util.h"
 #include "basic/async.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "dbus-cgroup.h"
 #include "dbus-execute.h"
 #include "dbus-kill.h"
diff --git a/src/libcore/dbus-socket.c b/src/libcore/dbus-socket.c
index 6007c3e1f0..53c9911991 100644
--- a/src/libcore/dbus-socket.c
+++ b/src/libcore/dbus-socket.c
@@ -18,7 +18,7 @@
 ***/
 
 #include "basic/alloc-util.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "dbus-cgroup.h"
 #include "dbus-execute.h"
 #include "dbus-socket.h"
diff --git a/src/libcore/dbus-swap.c b/src/libcore/dbus-swap.c
index baae9b83b4..2cfc8bd496 100644
--- a/src/libcore/dbus-swap.c
+++ b/src/libcore/dbus-swap.c
@@ -18,7 +18,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "dbus-cgroup.h"
 #include "dbus-execute.h"
 #include "dbus-swap.h"
diff --git a/src/libcore/dbus-timer.c b/src/libcore/dbus-timer.c
index b03809341a..be84522036 100644
--- a/src/libcore/dbus-timer.c
+++ b/src/libcore/dbus-timer.c
@@ -18,7 +18,7 @@
 ***/
 
 #include "basic/alloc-util.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "dbus-timer.h"
 #include "basic/strv.h"
 #include "timer.h"
diff --git a/src/libcore/dbus.c b/src/libcore/dbus.c
index c864c4e2f8..d1d6248041 100644
--- a/src/libcore/dbus.c
+++ b/src/libcore/dbus.c
@@ -27,7 +27,7 @@
 #include "sd-bus/bus-common-errors.h"
 #include "sd-bus/bus-error.h"
 #include "sd-bus/bus-internal.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "dbus-cgroup.h"
 #include "dbus-execute.h"
 #include "dbus-job.h"
diff --git a/src/libcore/device.c b/src/libcore/device.c
index 162a6cdb85..10e9e9ae76 100644
--- a/src/libcore/device.c
+++ b/src/libcore/device.c
@@ -31,7 +31,7 @@
 #include "basic/stat-util.h"
 #include "basic/string-util.h"
 #include "swap.h"
-#include "udev-util.h"
+#include "shared/udev-util.h"
 #include "basic/unit-name.h"
 #include "unit.h"
 
diff --git a/src/libcore/execute.c b/src/libcore/execute.c
index 32382ad6b8..e7628bceb3 100644
--- a/src/libcore/execute.c
+++ b/src/libcore/execute.c
@@ -54,7 +54,7 @@
 #include "basic/af-list.h"
 #include "basic/alloc-util.h"
 #ifdef HAVE_APPARMOR
-#include "apparmor-util.h"
+#include "shared/apparmor-util.h"
 #endif
 #include "basic/async.h"
 #include "basic/barrier.h"
@@ -83,7 +83,7 @@
 #include "basic/rlimit-util.h"
 #include "basic/rm-rf.h"
 #ifdef HAVE_SECCOMP
-#include "seccomp-util.h"
+#include "shared/seccomp-util.h"
 #endif
 #include "basic/securebits.h"
 #include "basic/selinux-util.h"
@@ -97,7 +97,7 @@
 #include "unit.h"
 #include "basic/user-util.h"
 #include "basic/util.h"
-#include "utmp-wtmp.h"
+#include "shared/utmp-wtmp.h"
 
 #define IDLE_TIMEOUT_USEC (5*USEC_PER_SEC)
 #define IDLE_TIMEOUT2_USEC (1*USEC_PER_SEC)
diff --git a/src/libcore/failure-action.c b/src/libcore/failure-action.c
index d8d2100287..be76c15a37 100644
--- a/src/libcore/failure-action.c
+++ b/src/libcore/failure-action.c
@@ -22,7 +22,7 @@
 #include <linux/reboot.h>
 
 #include "sd-bus/bus-error.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "failure-action.h"
 #include "basic/special.h"
 #include "basic/string-table.h"
diff --git a/src/libcore/kmod-setup.c b/src/libcore/kmod-setup.c
index 0f7ba5c235..6ddf1137ec 100644
--- a/src/libcore/kmod-setup.c
+++ b/src/libcore/kmod-setup.c
@@ -24,7 +24,7 @@
 #include <libkmod.h>
 #endif
 
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/capability-util.h"
 #include "kmod-setup.h"
 #include "basic/macro.h"
diff --git a/src/libcore/load-dropin.c b/src/libcore/load-dropin.c
index d142dc9618..bb6cf0f989 100644
--- a/src/libcore/load-dropin.c
+++ b/src/libcore/load-dropin.c
@@ -18,7 +18,7 @@
 ***/
 
 
-#include "conf-parser.h"
+#include "shared/conf-parser.h"
 #include "load-dropin.h"
 #include "load-fragment.h"
 #include "basic/log.h"
diff --git a/src/libcore/load-dropin.h b/src/libcore/load-dropin.h
index 942d26724e..067661b1ff 100644
--- a/src/libcore/load-dropin.h
+++ b/src/libcore/load-dropin.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "dropin.h"
+#include "shared/dropin.h"
 #include "unit.h"
 
 /* Read service data supplementary drop-in directories */
diff --git a/src/libcore/load-fragment-gperf.gperf.m4 b/src/libcore/load-fragment-gperf.gperf.m4
index bee0431538..c9f6e6acf7 100644
--- a/src/libcore/load-fragment-gperf.gperf.m4
+++ b/src/libcore/load-fragment-gperf.gperf.m4
@@ -1,6 +1,6 @@
 %{
 #include <stddef.h>
-#include "conf-parser.h"
+#include "shared/conf-parser.h"
 #include "load-fragment.h"
 #include "basic/missing.h"
 %}
diff --git a/src/libcore/load-fragment.c b/src/libcore/load-fragment.c
index cf99d5c9d4..6d9100b189 100644
--- a/src/libcore/load-fragment.c
+++ b/src/libcore/load-fragment.c
@@ -34,11 +34,11 @@
 #include "basic/alloc-util.h"
 #include "sd-bus/bus-error.h"
 #include "sd-bus/bus-internal.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/cap-list.h"
 #include "basic/capability-util.h"
 #include "cgroup.h"
-#include "conf-parser.h"
+#include "shared/conf-parser.h"
 #include "basic/cpu-set-util.h"
 #include "basic/env-util.h"
 #include "basic/errno-list.h"
@@ -54,7 +54,7 @@
 #include "basic/process-util.h"
 #include "basic/rlimit-util.h"
 #ifdef HAVE_SECCOMP
-#include "seccomp-util.h"
+#include "shared/seccomp-util.h"
 #endif
 #include "basic/securebits.h"
 #include "basic/signal-util.h"
diff --git a/src/libcore/manager.c b/src/libcore/manager.c
index 75ee77599a..9019967300 100644
--- a/src/libcore/manager.c
+++ b/src/libcore/manager.c
@@ -40,11 +40,11 @@
 
 #include "basic/alloc-util.h"
 #include "audit-fd.h"
-#include "boot-timestamps.h"
+#include "shared/boot-timestamps.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 "shared/bus-util.h"
 #include "dbus-job.h"
 #include "dbus-manager.h"
 #include "dbus-unit.h"
@@ -66,7 +66,7 @@
 #include "basic/mkdir.h"
 #include "basic/mkdir.h"
 #include "basic/parse-util.h"
-#include "path-lookup.h"
+#include "shared/path-lookup.h"
 #include "basic/path-util.h"
 #include "basic/process-util.h"
 #include "basic/ratelimit.h"
@@ -84,7 +84,7 @@
 #include "basic/unit-name.h"
 #include "basic/util.h"
 #include "basic/virt.h"
-#include "watchdog.h"
+#include "shared/watchdog.h"
 
 #define NOTIFY_RCVBUF_SIZE (8*1024*1024)
 #define CGROUPS_AGENT_RCVBUF_SIZE (8*1024*1024)
diff --git a/src/libcore/manager.h b/src/libcore/manager.h
index f1c21940a9..87186b6e40 100644
--- a/src/libcore/manager.h
+++ b/src/libcore/manager.h
@@ -70,7 +70,7 @@ typedef enum StatusType {
 
 #include "execute.h"
 #include "job.h"
-#include "path-lookup.h"
+#include "shared/path-lookup.h"
 #include "show-status.h"
 #include "basic/unit-name.h"
 
diff --git a/src/libcore/mount-setup.c b/src/libcore/mount-setup.c
index 443c24dfe9..09df45c567 100644
--- a/src/libcore/mount-setup.c
+++ b/src/libcore/mount-setup.c
@@ -24,10 +24,10 @@
 #include <unistd.h>
 
 #include "basic/alloc-util.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/cgroup-util.h"
-#include "dev-setup.h"
-#include "efivars.h"
+#include "shared/dev-setup.h"
+#include "shared/efivars.h"
 #include "basic/label.h"
 #include "basic/log.h"
 #include "basic/macro.h"
diff --git a/src/libcore/mount.c b/src/libcore/mount.c
index 4e2476dc2a..ab6efd4a9c 100644
--- a/src/libcore/mount.c
+++ b/src/libcore/mount.c
@@ -29,7 +29,7 @@
 #include "basic/escape.h"
 #include "basic/exit-status.h"
 #include "basic/formats-util.h"
-#include "fstab-util.h"
+#include "shared/fstab-util.h"
 #include "basic/log.h"
 #include "manager.h"
 #include "basic/mkdir.h"
diff --git a/src/libcore/namespace.c b/src/libcore/namespace.c
index 868c0a9d5d..f7c5364437 100644
--- a/src/libcore/namespace.c
+++ b/src/libcore/namespace.c
@@ -27,7 +27,7 @@
 #include <linux/fs.h>
 
 #include "basic/alloc-util.h"
-#include "dev-setup.h"
+#include "shared/dev-setup.h"
 #include "basic/fd-util.h"
 #include "loopback-setup.h"
 #include "basic/missing.h"
diff --git a/src/libcore/path.c b/src/libcore/path.c
index c659b4eb38..782e085174 100644
--- a/src/libcore/path.c
+++ b/src/libcore/path.c
@@ -23,7 +23,7 @@
 #include <unistd.h>
 
 #include "sd-bus/bus-error.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "dbus-path.h"
 #include "basic/fd-util.h"
 #include "basic/fs-util.h"
diff --git a/src/libcore/selinux-access.c b/src/libcore/selinux-access.c
index 6fbc4893c0..a259e128c1 100644
--- a/src/libcore/selinux-access.c
+++ b/src/libcore/selinux-access.c
@@ -33,7 +33,7 @@
 
 #include "basic/alloc-util.h"
 #include "audit-fd.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/log.h"
 #include "basic/path-util.h"
 #include "basic/selinux-util.h"
diff --git a/src/libcore/selinux-access.h b/src/libcore/selinux-access.h
index cbf33ef6c4..1b1a8418ec 100644
--- a/src/libcore/selinux-access.h
+++ b/src/libcore/selinux-access.h
@@ -21,7 +21,7 @@
 
 #include <systemd/sd-bus.h>
 
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "manager.h"
 
 int mac_selinux_generic_access_check(sd_bus_message *message, const char *path, const char *permission, sd_bus_error *error);
diff --git a/src/libcore/service.c b/src/libcore/service.c
index 4b37b99013..2845a841c3 100644
--- a/src/libcore/service.c
+++ b/src/libcore/service.c
@@ -25,7 +25,7 @@
 #include "basic/async.h"
 #include "sd-bus/bus-error.h"
 #include "sd-bus/bus-kernel.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "dbus-service.h"
 #include "basic/def.h"
 #include "basic/env-util.h"
diff --git a/src/libcore/socket.c b/src/libcore/socket.c
index 7800c7f9d0..7ee5edfef8 100644
--- a/src/libcore/socket.c
+++ b/src/libcore/socket.c
@@ -30,7 +30,7 @@
 
 #include "basic/alloc-util.h"
 #include "sd-bus/bus-error.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/copy.h"
 #include "dbus-socket.h"
 #include "basic/def.h"
diff --git a/src/libcore/swap.c b/src/libcore/swap.c
index 4311caec12..c08057a9fe 100644
--- a/src/libcore/swap.c
+++ b/src/libcore/swap.c
@@ -30,7 +30,7 @@
 #include "basic/exit-status.h"
 #include "basic/fd-util.h"
 #include "basic/formats-util.h"
-#include "fstab-util.h"
+#include "shared/fstab-util.h"
 #include "basic/parse-util.h"
 #include "basic/path-util.h"
 #include "basic/process-util.h"
@@ -38,7 +38,7 @@
 #include "basic/string-table.h"
 #include "basic/string-util.h"
 #include "swap.h"
-#include "udev-util.h"
+#include "shared/udev-util.h"
 #include "basic/unit-name.h"
 #include "unit.h"
 #include "basic/virt.h"
diff --git a/src/libcore/timer.c b/src/libcore/timer.c
index fced3df4cc..45eec02dee 100644
--- a/src/libcore/timer.c
+++ b/src/libcore/timer.c
@@ -21,7 +21,7 @@
 
 #include "basic/alloc-util.h"
 #include "sd-bus/bus-error.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "dbus-timer.h"
 #include "basic/fs-util.h"
 #include "basic/parse-util.h"
diff --git a/src/libcore/unit-printf.c b/src/libcore/unit-printf.c
index b04582a6de..c64d45e251 100644
--- a/src/libcore/unit-printf.c
+++ b/src/libcore/unit-printf.c
@@ -21,7 +21,7 @@
 #include "basic/cgroup-util.h"
 #include "basic/formats-util.h"
 #include "basic/macro.h"
-#include "specifier.h"
+#include "shared/specifier.h"
 #include "basic/string-util.h"
 #include "basic/strv.h"
 #include "basic/unit-name.h"
diff --git a/src/libcore/unit.c b/src/libcore/unit.c
index c310c5e9d7..3caa8baa26 100644
--- a/src/libcore/unit.c
+++ b/src/libcore/unit.c
@@ -28,11 +28,11 @@
 
 #include "basic/alloc-util.h"
 #include "sd-bus/bus-common-errors.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
 #include "basic/cgroup-util.h"
 #include "dbus-unit.h"
 #include "dbus.h"
-#include "dropin.h"
+#include "shared/dropin.h"
 #include "basic/escape.h"
 #include "execute.h"
 #include "basic/fileio-label.h"
diff --git a/src/libcore/unit.h b/src/libcore/unit.h
index bc5227b3c3..df1174b837 100644
--- a/src/libcore/unit.h
+++ b/src/libcore/unit.h
@@ -28,9 +28,9 @@ typedef struct UnitVTable UnitVTable;
 typedef struct UnitRef UnitRef;
 typedef struct UnitStatusMessageFormats UnitStatusMessageFormats;
 
-#include "condition.h"
+#include "shared/condition.h"
 #include "failure-action.h"
-#include "install.h"
+#include "shared/install.h"
 #include "basic/list.h"
 #include "basic/unit-name.h"