From 82113a16f3d2da5021c35af72bfbb67b2684f6bc Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Sat, 28 Feb 2015 22:51:31 -0800
Subject: [PATCH] obexd: Use local libbluetooth includes

---
 obexd/client/bluetooth.c        | 10 +++++-----
 obexd/client/map.c              |  9 ++++++---
 obexd/client/pbap.c             | 10 ++++++----
 obexd/plugins/phonebook-ebook.c |  5 +++--
 obexd/plugins/syncevolution.c   |  4 ++--
 5 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/obexd/client/bluetooth.c b/obexd/client/bluetooth.c
index 8e09d032c..1857c65e3 100644
--- a/obexd/client/bluetooth.c
+++ b/obexd/client/bluetooth.c
@@ -30,13 +30,13 @@
 #include <inttypes.h>
 
 #include <glib.h>
-#include <gdbus/gdbus.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/rfcomm.h>
-#include <bluetooth/sdp.h>
-#include <bluetooth/sdp_lib.h>
+#include "lib/bluetooth.h"
+#include "lib/rfcomm.h"
+#include "lib/sdp.h"
+#include "lib/sdp_lib.h"
 
+#include "gdbus/gdbus.h"
 #include "btio/btio.h"
 
 #include "log.h"
diff --git a/obexd/client/map.c b/obexd/client/map.c
index e6c107358..10e2285ad 100644
--- a/obexd/client/map.c
+++ b/obexd/client/map.c
@@ -30,10 +30,13 @@
 #include <stdbool.h>
 #include <inttypes.h>
 #include <stdlib.h>
+
 #include <glib.h>
-#include <gdbus/gdbus.h>
-#include <gobex/gobex-apparam.h>
-#include <bluetooth/sdp.h>
+
+#include "lib/sdp.h"
+
+#include "gobex/gobex-apparam.h"
+#include "gdbus/gdbus.h"
 
 #include "dbus.h"
 #include "log.h"
diff --git a/obexd/client/pbap.c b/obexd/client/pbap.c
index 28203a8cc..6b93ed004 100644
--- a/obexd/client/pbap.c
+++ b/obexd/client/pbap.c
@@ -29,12 +29,14 @@
 #include <errno.h>
 #include <string.h>
 #include <stdio.h>
+
 #include <glib.h>
-#include <gdbus/gdbus.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/sdp.h>
-#include <gobex/gobex-apparam.h>
+#include "lib/bluetooth.h"
+#include "lib/sdp.h"
+
+#include "gobex/gobex-apparam.h"
+#include "gdbus/gdbus.h"
 
 #include "log.h"
 
diff --git a/obexd/plugins/phonebook-ebook.c b/obexd/plugins/phonebook-ebook.c
index 2e4957671..c339240f1 100644
--- a/obexd/plugins/phonebook-ebook.c
+++ b/obexd/plugins/phonebook-ebook.c
@@ -28,11 +28,12 @@
 
 #include <string.h>
 #include <errno.h>
-#include <glib.h>
-#include <bluetooth/bluetooth.h>
 
+#include <glib.h>
 #include <libebook/e-book.h>
 
+#include "lib/bluetooth.h"
+
 #include "log.h"
 #include "obex.h"
 #include "service.h"
diff --git a/obexd/plugins/syncevolution.c b/obexd/plugins/syncevolution.c
index fbeac1e62..f1da94558 100644
--- a/obexd/plugins/syncevolution.c
+++ b/obexd/plugins/syncevolution.c
@@ -34,9 +34,9 @@
 #include <glib.h>
 #include <dbus/dbus.h>
 
-#include <bluetooth/bluetooth.h>
+#include "lib/bluetooth.h"
 
-#include <gdbus/gdbus.h>
+#include "gdbus/gdbus.h"
 
 #include "btio/btio.h"
 #include "plugin.h"
-- 
2.47.3