From 318e32cddbe2d8b05f886ee3a3cd8b97e0e9c05a Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Sat, 28 Feb 2015 23:58:08 -0800
Subject: [PATCH] profiles: Use local libbluetooth includes

---
 profiles/audio/a2dp.c         |  8 ++++----
 profiles/audio/avctp.c        | 11 +++++------
 profiles/audio/avdtp.c        | 13 ++++++-------
 profiles/audio/avrcp.c        | 12 ++++++------
 profiles/audio/control.c      | 12 ++++++------
 profiles/audio/sink.c         | 10 +++++-----
 profiles/audio/source.c       | 10 +++++-----
 profiles/cups/hcrp.c          | 11 +++++------
 profiles/cups/main.c          |  9 +++++----
 profiles/cups/sdp.c           |  6 +++---
 profiles/cups/spp.c           |  8 ++++----
 profiles/health/hdp_manager.c |  6 +++---
 profiles/health/hdp_util.c    | 15 ++++++---------
 profiles/input/device.c       | 15 +++++++--------
 profiles/input/manager.c      |  9 ++++-----
 profiles/input/server.c       |  9 ++++-----
 profiles/network/bnep.c       | 10 +++++-----
 profiles/network/connection.c | 11 ++++++-----
 profiles/network/manager.c    | 12 +++++-------
 profiles/network/server.c     | 15 ++++++++-------
 profiles/sap/server.c         |  5 +++--
 21 files changed, 105 insertions(+), 112 deletions(-)

diff --git a/profiles/audio/a2dp.c b/profiles/audio/a2dp.c
index 6a86c1937..91b0285fc 100644
--- a/profiles/audio/a2dp.c
+++ b/profiles/audio/a2dp.c
@@ -33,11 +33,11 @@
 #include <dbus/dbus.h>
 #include <glib.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/sdp.h>
-#include <bluetooth/sdp_lib.h>
-
+#include "lib/bluetooth.h"
+#include "lib/sdp.h"
+#include "lib/sdp_lib.h"
 #include "lib/uuid.h"
+
 #include "src/plugin.h"
 #include "src/adapter.h"
 #include "src/device.h"
diff --git a/profiles/audio/avctp.c b/profiles/audio/avctp.c
index 57071b531..9f9f1c9c3 100644
--- a/profiles/audio/avctp.c
+++ b/profiles/audio/avctp.c
@@ -39,17 +39,16 @@
 #include <fcntl.h>
 #include <netinet/in.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/sdp.h>
-#include <bluetooth/l2cap.h>
-
 #include <glib.h>
 
-#include "btio/btio.h"
+#include "lib/bluetooth.h"
+#include "lib/sdp.h"
+#include "lib/l2cap.h"
 #include "lib/uuid.h"
+
+#include "btio/btio.h"
 #include "src/adapter.h"
 #include "src/device.h"
-
 #include "src/log.h"
 #include "src/error.h"
 #include "src/uinput.h"
diff --git a/profiles/audio/avdtp.c b/profiles/audio/avdtp.c
index 926f01ca1..c48651921 100644
--- a/profiles/audio/avdtp.c
+++ b/profiles/audio/avdtp.c
@@ -34,18 +34,17 @@
 #include <unistd.h>
 #include <assert.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/sdp.h>
-#include <bluetooth/sdp_lib.h>
-
 #include <glib.h>
 
+#include "lib/bluetooth.h"
+#include "lib/sdp.h"
+#include "lib/sdp_lib.h"
+#include "lib/uuid.h"
+
+#include "btio/btio.h"
 #include "src/log.h"
 #include "src/shared/util.h"
 #include "src/shared/queue.h"
-
-#include "btio/btio.h"
-#include "lib/uuid.h"
 #include "src/adapter.h"
 #include "src/device.h"
 
diff --git a/profiles/audio/avrcp.c b/profiles/audio/avrcp.c
index 11de6ee27..b1552b15f 100644
--- a/profiles/audio/avrcp.c
+++ b/profiles/audio/avrcp.c
@@ -39,21 +39,21 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/sdp.h>
-#include <bluetooth/sdp_lib.h>
-
 #include <glib.h>
 #include <dbus/dbus.h>
-#include <gdbus/gdbus.h>
 
+#include "bluetooth/bluetooth.h"
+#include "bluetooth/sdp.h"
+#include "bluetooth/sdp_lib.h"
 #include "lib/uuid.h"
+
+#include "gdbus/gdbus.h"
+
 #include "src/plugin.h"
 #include "src/adapter.h"
 #include "src/device.h"
 #include "src/profile.h"
 #include "src/service.h"
-
 #include "src/log.h"
 #include "src/error.h"
 #include "src/sdpd.h"
diff --git a/profiles/audio/control.c b/profiles/audio/control.c
index 3985362cc..9110b0fb9 100644
--- a/profiles/audio/control.c
+++ b/profiles/audio/control.c
@@ -37,20 +37,20 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/sdp.h>
-#include <bluetooth/sdp_lib.h>
-
 #include <glib.h>
 #include <dbus/dbus.h>
-#include <gdbus/gdbus.h>
 
+#include "lib/bluetooth.h"
+#include "lib/sdp.h"
+#include "lib/sdp_lib.h"
 #include "lib/uuid.h"
+
+#include "gdbus/gdbus.h"
+
 #include "src/adapter.h"
 #include "src/device.h"
 #include "src/profile.h"
 #include "src/service.h"
-
 #include "src/log.h"
 #include "src/error.h"
 #include "src/sdpd.h"
diff --git a/profiles/audio/sink.c b/profiles/audio/sink.c
index 7cf22d9db..14ece4f60 100644
--- a/profiles/audio/sink.c
+++ b/profiles/audio/sink.c
@@ -30,15 +30,15 @@
 #include <stdbool.h>
 #include <errno.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/sdp.h>
-
 #include <glib.h>
 #include <dbus/dbus.h>
-#include <gdbus/gdbus.h>
 
-#include "src/log.h"
+#include "lib/bluetooth.h"
+#include "lib/sdp.h"
 
+#include "gdbus/gdbus.h"
+
+#include "src/log.h"
 #include "src/adapter.h"
 #include "src/device.h"
 #include "src/service.h"
diff --git a/profiles/audio/source.c b/profiles/audio/source.c
index fd6891743..b235a7d9c 100644
--- a/profiles/audio/source.c
+++ b/profiles/audio/source.c
@@ -31,15 +31,15 @@
 #include <stdbool.h>
 #include <errno.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/sdp.h>
-
 #include <glib.h>
 #include <dbus/dbus.h>
-#include <gdbus/gdbus.h>
 
-#include "src/log.h"
+#include "lib/bluetooth.h"
+#include "lib/sdp.h"
 
+#include "gdbus/gdbus.h"
+
+#include "src/log.h"
 #include "src/adapter.h"
 #include "src/device.h"
 #include "src/service.h"
diff --git a/profiles/cups/hcrp.c b/profiles/cups/hcrp.c
index a93dda07e..edaa2cdfd 100644
--- a/profiles/cups/hcrp.c
+++ b/profiles/cups/hcrp.c
@@ -31,14 +31,13 @@
 #include <string.h>
 #include <signal.h>
 #include <sys/socket.h>
-
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/l2cap.h>
-#include <bluetooth/sdp.h>
-#include <bluetooth/sdp_lib.h>
-
 #include <netinet/in.h>
 
+#include "lib/bluetooth.h"
+#include "lib/l2cap.h"
+#include "lib/sdp.h"
+#include "lib/sdp_lib.h"
+
 #include "cups.h"
 
 #define HCRP_PDU_CREDIT_GRANT		0x0001
diff --git a/profiles/cups/main.c b/profiles/cups/main.c
index 11ce72fab..d46f35e4b 100644
--- a/profiles/cups/main.c
+++ b/profiles/cups/main.c
@@ -34,13 +34,14 @@
 #include <assert.h>
 #include <signal.h>
 #include <sys/socket.h>
+
 #include <glib.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/sdp.h>
-#include <bluetooth/sdp_lib.h>
+#include "lib/bluetooth.h"
+#include "lib/sdp.h"
+#include "lib/sdp_lib.h"
 
-#include <gdbus/gdbus.h>
+#include "gdbus/gdbus.h"
 
 #include "cups.h"
 
diff --git a/profiles/cups/sdp.c b/profiles/cups/sdp.c
index c7f17a4ab..de9cd4eeb 100644
--- a/profiles/cups/sdp.c
+++ b/profiles/cups/sdp.c
@@ -31,9 +31,9 @@
 #include <signal.h>
 #include <sys/socket.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/sdp.h>
-#include <bluetooth/sdp_lib.h>
+#include "lib/bluetooth.h"
+#include "lib/sdp.h"
+#include "lib/sdp_lib.h"
 
 #include "cups.h"
 
diff --git a/profiles/cups/spp.c b/profiles/cups/spp.c
index d906ed223..2f1e270f4 100644
--- a/profiles/cups/spp.c
+++ b/profiles/cups/spp.c
@@ -31,10 +31,10 @@
 #include <signal.h>
 #include <sys/socket.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 "cups.h"
 
diff --git a/profiles/health/hdp_manager.c b/profiles/health/hdp_manager.c
index 1882043bc..401adf6e9 100644
--- a/profiles/health/hdp_manager.c
+++ b/profiles/health/hdp_manager.c
@@ -26,11 +26,11 @@
 
 #include <stdbool.h>
 
-#include <bluetooth/sdp.h>
-#include <bluetooth/sdp_lib.h>
+#include "lib/sdp.h"
+#include "lib/sdp_lib.h"
+#include "lib/uuid.h"
 
 #include "btio/btio.h"
-#include "lib/uuid.h"
 #include "src/adapter.h"
 #include "src/device.h"
 #include "src/profile.h"
diff --git a/profiles/health/hdp_util.c b/profiles/health/hdp_util.c
index af50b0191..b459eaacc 100644
--- a/profiles/health/hdp_util.c
+++ b/profiles/health/hdp_util.c
@@ -29,22 +29,19 @@
 
 #include <glib.h>
 
-#include <gdbus/gdbus.h>
+#include "lib/bluetooth.h"
+#include "lib/sdp.h"
+#include "lib/sdp_lib.h"
+#include "lib/uuid.h"
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/sdp.h>
-#include <bluetooth/sdp_lib.h>
+#include "gdbus/gdbus.h"
 
+#include "btio/btio.h"
 #include "src/adapter.h"
 #include "src/device.h"
-
 #include "src/sdpd.h"
 #include "src/sdp-client.h"
 #include "src/uuid-helper.h"
-
-#include "lib/uuid.h"
-#include "btio/btio.h"
-
 #include "src/log.h"
 #include "src/dbus-common.h"
 
diff --git a/profiles/input/device.c b/profiles/input/device.c
index cfa5e231e..a494ea2e3 100644
--- a/profiles/input/device.c
+++ b/profiles/input/device.c
@@ -33,17 +33,16 @@
 #include <unistd.h>
 #include <sys/ioctl.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hidp.h>
-#include <bluetooth/sdp.h>
-#include <bluetooth/sdp_lib.h>
-
-#include <gdbus/gdbus.h>
+#include "lib/bluetooth.h"
+#include "lib/hidp.h"
+#include "lib/sdp.h"
+#include "lib/sdp_lib.h"
+#include "lib/uuid.h"
 
-#include "src/log.h"
+#include "gdbus/gdbus.h"
 
 #include "btio/btio.h"
-#include "lib/uuid.h"
+#include "src/log.h"
 #include "src/adapter.h"
 #include "src/device.h"
 #include "src/profile.h"
diff --git a/profiles/input/manager.c b/profiles/input/manager.c
index 9712d2c8a..1d31b0652 100644
--- a/profiles/input/manager.c
+++ b/profiles/input/manager.c
@@ -28,14 +28,13 @@
 #include <errno.h>
 #include <stdbool.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/sdp.h>
-#include <bluetooth/sdp_lib.h>
+#include "lib/bluetooth.h"
+#include "lib/sdp.h"
+#include "lib/sdp_lib.h"
+#include "lib/uuid.h"
 
 #include "src/log.h"
 #include "src/plugin.h"
-
-#include "lib/uuid.h"
 #include "src/adapter.h"
 #include "src/device.h"
 #include "src/profile.h"
diff --git a/profiles/input/server.c b/profiles/input/server.c
index 50a9074e3..eb3fcf843 100644
--- a/profiles/input/server.c
+++ b/profiles/input/server.c
@@ -29,17 +29,16 @@
 #include <stdbool.h>
 #include <errno.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/sdp.h>
-
 #include <glib.h>
 #include <dbus/dbus.h>
 
-#include "src/log.h"
+#include "lib/bluetooth.h"
+#include "lib/sdp.h"
+#include "lib/uuid.h"
 
+#include "src/log.h"
 #include "src/uuid-helper.h"
 #include "btio/btio.h"
-#include "lib/uuid.h"
 #include "src/adapter.h"
 #include "src/device.h"
 #include "src/profile.h"
diff --git a/profiles/network/bnep.c b/profiles/network/bnep.c
index 09d4b65c5..7280820ee 100644
--- a/profiles/network/bnep.c
+++ b/profiles/network/bnep.c
@@ -36,15 +36,15 @@
 #include <net/if.h>
 #include <linux/sockios.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/l2cap.h>
-#include <bluetooth/bnep.h>
-
 #include <glib.h>
 
+#include "lib/bluetooth.h"
+#include "lib/l2cap.h"
+#include "lib/bnep.h"
+#include "lib/uuid.h"
+
 #include "src/log.h"
 #include "src/shared/util.h"
-#include "lib/uuid.h"
 #include "btio/btio.h"
 
 #include "bnep.h"
diff --git a/profiles/network/connection.c b/profiles/network/connection.c
index cc73989ff..8f1a65b8c 100644
--- a/profiles/network/connection.c
+++ b/profiles/network/connection.c
@@ -31,12 +31,13 @@
 #include <unistd.h>
 #include <netinet/in.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/bnep.h>
-#include <bluetooth/sdp.h>
-
 #include <glib.h>
-#include <gdbus/gdbus.h>
+
+#include "lib/bluetooth.h"
+#include "lib/bnep.h"
+#include "lib/sdp.h"
+
+#include "gdbus/gdbus.h"
 
 #include "btio/btio.h"
 #include "src/log.h"
diff --git a/profiles/network/manager.c b/profiles/network/manager.c
index 0fe98a04a..41377fb83 100644
--- a/profiles/network/manager.c
+++ b/profiles/network/manager.c
@@ -28,17 +28,15 @@
 #include <errno.h>
 #include <stdbool.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/bnep.h>
-#include <bluetooth/sdp.h>
-
 #include <glib.h>
-#include <gdbus/gdbus.h>
+
+#include "lib/bluetooth.h"
+#include "lib/bnep.h"
+#include "lib/sdp.h"
+#include "lib/uuid.h"
 
 #include "src/log.h"
 #include "src/plugin.h"
-
-#include "lib/uuid.h"
 #include "src/adapter.h"
 #include "src/device.h"
 #include "src/profile.h"
diff --git a/profiles/network/server.c b/profiles/network/server.c
index 3fb031fa3..d0e88a12a 100644
--- a/profiles/network/server.c
+++ b/profiles/network/server.c
@@ -29,18 +29,19 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <errno.h>
-
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/bnep.h>
-#include <bluetooth/sdp.h>
-#include <bluetooth/sdp_lib.h>
 #include <netinet/in.h>
 
 #include <glib.h>
-#include <gdbus/gdbus.h>
 
-#include "btio/btio.h"
+#include "lib/bluetooth.h"
+#include "lib/bnep.h"
+#include "lib/sdp.h"
+#include "lib/sdp_lib.h"
 #include "lib/uuid.h"
+
+#include "gdbus/gdbus.h"
+
+#include "btio/btio.h"
 #include "src/dbus-common.h"
 #include "src/adapter.h"
 #include "src/log.h"
diff --git a/profiles/sap/server.c b/profiles/sap/server.c
index 20c6cab7c..a95876189 100644
--- a/profiles/sap/server.c
+++ b/profiles/sap/server.c
@@ -30,10 +30,11 @@
 
 #include <errno.h>
 #include <glib.h>
-#include <bluetooth/sdp.h>
-#include <bluetooth/sdp_lib.h>
 
+#include "lib/sdp.h"
+#include "lib/sdp_lib.h"
 #include "lib/uuid.h"
+
 #include "btio/btio.h"
 #include "src/adapter.h"
 #include "src/sdpd.h"
-- 
2.47.3