Move D-Bus watch functions into libgdbus

12 files changed, 17 insertions, 14 deletions

diff --git a/hcid/adapter.c b/hcid/adapter.c
index 4be0f914..4bc7245e 100644
--- a/hcid/adapter.c
+++ b/hcid/adapter.c
@@ -48,8 +48,9 @@
 
 #include <dbus/dbus.h>
 
+#include <gdbus.h>
+
 #include "hcid.h"
-#include "dbus.h"
 
 #include "adapter.h"
 #include "device.h"
diff --git a/hcid/agent.c b/hcid/agent.c
index 772a56ee..e7bf7d96 100644
--- a/hcid/agent.c
+++ b/hcid/agent.c
@@ -41,7 +41,8 @@
 
 #include <dbus/dbus.h>
 
-#include "dbus.h"
+#include <gdbus.h>
+
 #include "dbus-helper.h"
 #include "hcid.h"
 #include "dbus-common.h"
diff --git a/hcid/dbus-common.c b/hcid/dbus-common.c
index 7aa7b6d1..7a28555d 100644
--- a/hcid/dbus-common.c
+++ b/hcid/dbus-common.c
@@ -52,7 +52,6 @@
 #include <gdbus.h>
 
 #include "hcid.h"
-#include "dbus.h"
 #include "dbus-helper.h"
 #include "dbus-error.h"
 #include "manager.h"
diff --git a/hcid/dbus-database.c b/hcid/dbus-database.c
index 9519975e..370b7658 100644
--- a/hcid/dbus-database.c
+++ b/hcid/dbus-database.c
@@ -40,7 +40,8 @@
 
 #include <dbus/dbus.h>
 
-#include "dbus.h"
+#include <gdbus.h>
+
 #include "dbus-helper.h"
 #include "hcid.h"
 #include "sdpd.h"
diff --git a/hcid/dbus-error.c b/hcid/dbus-error.c
index 20a55c5c..876082a4 100644
--- a/hcid/dbus-error.c
+++ b/hcid/dbus-error.c
@@ -34,7 +34,7 @@
 #include <bluetooth/sdp.h>
 
 #include "hcid.h"
-#include "dbus.h"
+#include "dbus-helper.h"
 #include "dbus-common.h"
 #include "dbus-error.h"
 #include "error.h"
diff --git a/hcid/dbus-hci.c b/hcid/dbus-hci.c
index 2d21c905..ec4e0f50 100644
--- a/hcid/dbus-hci.c
+++ b/hcid/dbus-hci.c
@@ -45,8 +45,9 @@
 
 #include <dbus/dbus.h>
 
+#include <gdbus.h>
+
 #include "hcid.h"
-#include "dbus.h"
 #include "textfile.h"
 #include "manager.h"
 #include "adapter.h"
diff --git a/hcid/dbus-sdp.c b/hcid/dbus-sdp.c
index eceb889d..0b3bc85e 100644
--- a/hcid/dbus-sdp.c
+++ b/hcid/dbus-sdp.c
@@ -49,7 +49,8 @@
 
 #include <dbus/dbus.h>
 
-#include "dbus.h"
+#include <gdbus.h>
+
 #include "dbus-helper.h"
 #include "hcid.h"
 #include "textfile.h"
diff --git a/hcid/dbus-security.c b/hcid/dbus-security.c
index 6b680c70..2e4a8bfe 100644
--- a/hcid/dbus-security.c
+++ b/hcid/dbus-security.c
@@ -42,9 +42,9 @@
 
 #include <dbus/dbus.h>
 
-#include "adapter.h"
+#include <gdbus.h>
 
-#include "dbus.h"
+#include "adapter.h"
 #include "dbus-helper.h"
 #include "hcid.h"
 #include "dbus-common.h"
diff --git a/hcid/dbus-service.c b/hcid/dbus-service.c
index 192ff738..59228a9d 100644
--- a/hcid/dbus-service.c
+++ b/hcid/dbus-service.c
@@ -45,7 +45,6 @@
 
 #include <dbus/dbus.h>
 
-#include "dbus.h"
 #include "dbus-helper.h"
 #include "hcid.h"
 #include "server.h"
diff --git a/hcid/dbus-test.c b/hcid/dbus-test.c
index 37c5c2be..d683a901 100644
--- a/hcid/dbus-test.c
+++ b/hcid/dbus-test.c
@@ -38,7 +38,8 @@
 
 #include <dbus/dbus.h>
 
-#include "dbus.h"
+#include <gdbus.h>
+
 #include "dbus-helper.h"
 #include "hcid.h"
 #include "dbus-common.h"
diff --git a/hcid/manager.c b/hcid/manager.c
index c4288278..0d438217 100644
--- a/hcid/manager.c
+++ b/hcid/manager.c
@@ -43,10 +43,11 @@
 
 #include <dbus/dbus.h>
 
+#include <gdbus.h>
+
 #include "hcid.h"
 #include "sdpd.h"
 #include "adapter.h"
-#include "dbus.h"
 #include "dbus-helper.h"
 #include "dbus-common.h"
 #include "error.h"
diff --git a/hcid/plugin.c b/hcid/plugin.c
index 2a8f4375..f99966bf 100644
--- a/hcid/plugin.c
+++ b/hcid/plugin.c
@@ -34,10 +34,8 @@
 
 #include <bluetooth/bluetooth.h>
 
-#include "dbus.h"
 #include "logging.h"
 
-#include "dbus-service.h"
 #include "plugin.h"
 
 static GSList *plugins = NULL;