Move D-Bus object and interface helpers into libgdbus

12 files changed, 5 insertions, 33 deletions

diff --git a/hcid/adapter.c b/hcid/adapter.c
index 4bc7245e..1383ed50 100644
--- a/hcid/adapter.c
+++ b/hcid/adapter.c
@@ -45,9 +45,7 @@
 #include <bluetooth/sdp_lib.h>
 
 #include <glib.h>
-
 #include <dbus/dbus.h>
-
 #include <gdbus.h>
 
 #include "hcid.h"
@@ -58,7 +56,6 @@
 #include "textfile.h"
 #include "oui.h"
 #include "dbus-common.h"
-#include "dbus-helper.h"
 #include "dbus-hci.h"
 #include "dbus-sdp.h"
 #include "dbus-database.h"
diff --git a/hcid/agent.c b/hcid/agent.c
index e7bf7d96..330d00e4 100644
--- a/hcid/agent.c
+++ b/hcid/agent.c
@@ -38,12 +38,9 @@
 #include <bluetooth/sdp.h>
 
 #include <glib.h>
-
 #include <dbus/dbus.h>
-
 #include <gdbus.h>
 
-#include "dbus-helper.h"
 #include "hcid.h"
 #include "dbus-common.h"
 #include "dbus-service.h"
diff --git a/hcid/dbus-common.c b/hcid/dbus-common.c
index 7a28555d..5acec28d 100644
--- a/hcid/dbus-common.c
+++ b/hcid/dbus-common.c
@@ -46,13 +46,10 @@
 #include <bluetooth/sdp_lib.h>
 
 #include <glib.h>
-
 #include <dbus/dbus.h>
-
 #include <gdbus.h>
 
 #include "hcid.h"
-#include "dbus-helper.h"
 #include "dbus-error.h"
 #include "manager.h"
 #include "adapter.h"
diff --git a/hcid/dbus-database.c b/hcid/dbus-database.c
index 370b7658..acf5301c 100644
--- a/hcid/dbus-database.c
+++ b/hcid/dbus-database.c
@@ -37,12 +37,9 @@
 #include <bluetooth/sdp_lib.h>
 
 #include <glib.h>
-
 #include <dbus/dbus.h>
-
 #include <gdbus.h>
 
-#include "dbus-helper.h"
 #include "hcid.h"
 #include "sdpd.h"
 #include "sdp-xml.h"
diff --git a/hcid/dbus-error.c b/hcid/dbus-error.c
index 876082a4..b08cf33b 100644
--- a/hcid/dbus-error.c
+++ b/hcid/dbus-error.c
@@ -29,12 +29,12 @@
 #include <stdio.h>
 #include <errno.h>
 
-#include <dbus/dbus.h>
-
 #include <bluetooth/sdp.h>
 
+#include <dbus/dbus.h>
+#include <gdbus.h>
+
 #include "hcid.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 ec4e0f50..319d7cbd 100644
--- a/hcid/dbus-hci.c
+++ b/hcid/dbus-hci.c
@@ -42,9 +42,7 @@
 #include <bluetooth/sdp.h>
 
 #include <glib.h>
-
 #include <dbus/dbus.h>
-
 #include <gdbus.h>
 
 #include "hcid.h"
@@ -53,7 +51,6 @@
 #include "adapter.h"
 #include "device.h"
 #include "error.h"
-#include "dbus-helper.h"
 #include "glib-helper.h"
 #include "dbus-common.h"
 #include "dbus-error.h"
diff --git a/hcid/dbus-sdp.c b/hcid/dbus-sdp.c
index 0b3bc85e..2a0aa583 100644
--- a/hcid/dbus-sdp.c
+++ b/hcid/dbus-sdp.c
@@ -46,12 +46,9 @@
 #include <netinet/in.h>
 
 #include <glib.h>
-
 #include <dbus/dbus.h>
-
 #include <gdbus.h>
 
-#include "dbus-helper.h"
 #include "hcid.h"
 #include "textfile.h"
 #include "adapter.h"
diff --git a/hcid/dbus-security.c b/hcid/dbus-security.c
index 2e4a8bfe..cecb39af 100644
--- a/hcid/dbus-security.c
+++ b/hcid/dbus-security.c
@@ -39,13 +39,10 @@
 #include <bluetooth/sdp.h>
 
 #include <glib.h>
-
 #include <dbus/dbus.h>
-
 #include <gdbus.h>
 
 #include "adapter.h"
-#include "dbus-helper.h"
 #include "hcid.h"
 #include "dbus-common.h"
 #include "dbus-service.h"
diff --git a/hcid/dbus-service.c b/hcid/dbus-service.c
index 59228a9d..4e8ff33c 100644
--- a/hcid/dbus-service.c
+++ b/hcid/dbus-service.c
@@ -42,10 +42,9 @@
 #include <bluetooth/sdp.h>
 
 #include <glib.h>
-
 #include <dbus/dbus.h>
+#include <gdbus.h>
 
-#include "dbus-helper.h"
 #include "hcid.h"
 #include "server.h"
 #include "dbus-common.h"
diff --git a/hcid/dbus-test.c b/hcid/dbus-test.c
index d683a901..f63f9b45 100644
--- a/hcid/dbus-test.c
+++ b/hcid/dbus-test.c
@@ -35,12 +35,9 @@
 #include <bluetooth/sdp.h>
 
 #include <glib.h>
-
 #include <dbus/dbus.h>
-
 #include <gdbus.h>
 
-#include "dbus-helper.h"
 #include "hcid.h"
 #include "dbus-common.h"
 #include "adapter.h"
diff --git a/hcid/device.c b/hcid/device.c
index 56a70ec2..850ce1af 100644
--- a/hcid/device.c
+++ b/hcid/device.c
@@ -42,10 +42,8 @@
 #include <bluetooth/sdp_lib.h>
 
 #include <glib.h>
-
 #include <dbus/dbus.h>
-
-#include "dbus-helper.h"
+#include <gdbus.h>
 
 #include "hcid.h"
 #include "sdpd.h"
diff --git a/hcid/manager.c b/hcid/manager.c
index 0d438217..be92b1b3 100644
--- a/hcid/manager.c
+++ b/hcid/manager.c
@@ -48,7 +48,6 @@
 #include "hcid.h"
 #include "sdpd.h"
 #include "adapter.h"
-#include "dbus-helper.h"
 #include "dbus-common.h"
 #include "error.h"
 #include "dbus-error.h"