core: include sd-bus-vtable.h in dbus-*.h

19 files changed, 27 insertions, 2 deletions

diff --git a/src/core/dbus-automount.h b/src/core/dbus-automount.h
index 2d4079a7b4..755bdab1b6 100644
--- a/src/core/dbus-automount.h
+++ b/src/core/dbus-automount.h
@@ -7,6 +7,11 @@
   Copyright 2010 Lennart Poettering
 ***/
 
+#include "sd-bus.h"
+#include "sd-bus-vtable.h"
+
+#include "unit.h"
+
 extern const sd_bus_vtable bus_automount_vtable[];
 
 int bus_automount_set_property(Unit *u, const char *name, sd_bus_message *message, UnitWriteFlags flags, sd_bus_error *error);
diff --git a/src/core/dbus-cgroup.h b/src/core/dbus-cgroup.h
index b0cd63ebc3..72f135d29c 100644
--- a/src/core/dbus-cgroup.h
+++ b/src/core/dbus-cgroup.h
@@ -8,6 +8,7 @@
 ***/
 
 #include "sd-bus.h"
+#include "sd-bus-vtable.h"
 
 #include "unit.h"
 #include "cgroup.h"
diff --git a/src/core/dbus-device.h b/src/core/dbus-device.h
index c0f8f79adf..eca3559d6e 100644
--- a/src/core/dbus-device.h
+++ b/src/core/dbus-device.h
@@ -7,6 +7,6 @@
   Copyright 2010 Lennart Poettering
 ***/
 
-#include "unit.h"
+#include "sd-bus-vtable.h"
 
 extern const sd_bus_vtable bus_device_vtable[];
diff --git a/src/core/dbus-execute.h b/src/core/dbus-execute.h
index 56b04b5721..fbf8b483b1 100644
--- a/src/core/dbus-execute.h
+++ b/src/core/dbus-execute.h
@@ -8,6 +8,7 @@
 ***/
 
 #include "sd-bus.h"
+#include "sd-bus-vtable.h"
 
 #include "execute.h"
 
diff --git a/src/core/dbus-job.h b/src/core/dbus-job.h
index 819e69f3d4..6e332b3082 100644
--- a/src/core/dbus-job.h
+++ b/src/core/dbus-job.h
@@ -8,6 +8,7 @@
 ***/
 
 #include "sd-bus.h"
+#include "sd-bus-vtable.h"
 
 #include "job.h"
 
diff --git a/src/core/dbus-kill.h b/src/core/dbus-kill.h
index e764e4e101..6d5197a0d3 100644
--- a/src/core/dbus-kill.h
+++ b/src/core/dbus-kill.h
@@ -8,6 +8,7 @@
 ***/
 
 #include "sd-bus.h"
+#include "sd-bus-vtable.h"
 
 #include "kill.h"
 #include "unit.h"
diff --git a/src/core/dbus-manager.h b/src/core/dbus-manager.h
index 86f33931a9..c0a6ab93cf 100644
--- a/src/core/dbus-manager.h
+++ b/src/core/dbus-manager.h
@@ -7,6 +7,8 @@
   Copyright 2010 Lennart Poettering
 ***/
 
+#include "sd-bus-vtable.h"
+
 #include "manager.h"
 
 extern const sd_bus_vtable bus_manager_vtable[];
diff --git a/src/core/dbus-mount.h b/src/core/dbus-mount.h
index 66a675935e..d6c480f577 100644
--- a/src/core/dbus-mount.h
+++ b/src/core/dbus-mount.h
@@ -8,6 +8,7 @@
 ***/
 
 #include "sd-bus.h"
+#include "sd-bus-vtable.h"
 
 #include "unit.h"
 
diff --git a/src/core/dbus-path.h b/src/core/dbus-path.h
index 5d729cdefc..ea12de5fb8 100644
--- a/src/core/dbus-path.h
+++ b/src/core/dbus-path.h
@@ -8,6 +8,7 @@
 ***/
 
 #include "sd-bus.h"
+#include "sd-bus-vtable.h"
 
 #include "unit.h"
 
diff --git a/src/core/dbus-scope.h b/src/core/dbus-scope.h
index 115886b134..31ccbb47f9 100644
--- a/src/core/dbus-scope.h
+++ b/src/core/dbus-scope.h
@@ -8,8 +8,10 @@
 ***/
 
 #include "sd-bus.h"
+#include "sd-bus-vtable.h"
 
 #include "scope.h"
+#include "unit.h"
 
 extern const sd_bus_vtable bus_scope_vtable[];
 
diff --git a/src/core/dbus-service.h b/src/core/dbus-service.h
index f96d426a9c..bc684ac80c 100644
--- a/src/core/dbus-service.h
+++ b/src/core/dbus-service.h
@@ -8,6 +8,7 @@
 ***/
 
 #include "sd-bus.h"
+#include "sd-bus-vtable.h"
 
 #include "unit.h"
 
diff --git a/src/core/dbus-slice.h b/src/core/dbus-slice.h
index 3a02fa64d0..5760cd8d61 100644
--- a/src/core/dbus-slice.h
+++ b/src/core/dbus-slice.h
@@ -8,6 +8,7 @@
 ***/
 
 #include "sd-bus.h"
+#include "sd-bus-vtable.h"
 
 #include "unit.h"
 
diff --git a/src/core/dbus-socket.h b/src/core/dbus-socket.h
index 7743031a10..59db02686c 100644
--- a/src/core/dbus-socket.h
+++ b/src/core/dbus-socket.h
@@ -8,6 +8,7 @@
 ***/
 
 #include "sd-bus.h"
+#include "sd-bus-vtable.h"
 
 #include "unit.h"
 
diff --git a/src/core/dbus-swap.h b/src/core/dbus-swap.h
index 88e2b211ad..da089d2ea4 100644
--- a/src/core/dbus-swap.h
+++ b/src/core/dbus-swap.h
@@ -9,6 +9,7 @@
 ***/
 
 #include "sd-bus.h"
+#include "sd-bus-vtable.h"
 
 #include "unit.h"
 
diff --git a/src/core/dbus-target.h b/src/core/dbus-target.h
index 8c1a5ec523..76f0f1a34e 100644
--- a/src/core/dbus-target.h
+++ b/src/core/dbus-target.h
@@ -7,6 +7,6 @@
   Copyright 2010 Lennart Poettering
 ***/
 
-#include "sd-bus.h"
+#include "sd-bus-vtable.h"
 
 extern const sd_bus_vtable bus_target_vtable[];
diff --git a/src/core/dbus-timer.h b/src/core/dbus-timer.h
index ff3ad6cf6d..1cfc9bf9be 100644
--- a/src/core/dbus-timer.h
+++ b/src/core/dbus-timer.h
@@ -8,6 +8,7 @@
 ***/
 
 #include "sd-bus.h"
+#include "sd-bus-vtable.h"
 
 #include "unit.h"
 
diff --git a/src/core/dbus-unit.h b/src/core/dbus-unit.h
index 7fce07d1e9..8c55d7dfdf 100644
--- a/src/core/dbus-unit.h
+++ b/src/core/dbus-unit.h
@@ -8,7 +8,9 @@
 ***/
 
 #include "sd-bus.h"
+#include "sd-bus-vtable.h"
 
+#include "job.h"
 #include "unit.h"
 
 extern const sd_bus_vtable bus_unit_vtable[];
diff --git a/src/core/dbus-util.h b/src/core/dbus-util.h
index b1f7b69d79..73d1ebd313 100644
--- a/src/core/dbus-util.h
+++ b/src/core/dbus-util.h
@@ -8,6 +8,7 @@
 ***/
 
 #include "sd-bus.h"
+
 #include "unit.h"
 
 int bus_property_get_triggered_unit(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, void *userdata, sd_bus_error *error);
diff --git a/src/core/dbus.h b/src/core/dbus.h
index f13f607111..1ef1fa27fd 100644
--- a/src/core/dbus.h
+++ b/src/core/dbus.h
@@ -7,6 +7,8 @@
   Copyright 2010 Lennart Poettering
 ***/
 
+#include "sd-bus.h"
+
 #include "manager.h"
 
 int bus_send_queued_message(Manager *m);