From 211412b840d94372bcbad0f5fc6e8388a6a38fa9 Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Wed, 9 Jan 2013 20:30:30 -0800
Subject: [PATCH] profiles: Fix includes for uuid.h

---
 profiles/audio/avctp.c               | 2 +-
 profiles/audio/avdtp.c               | 2 +-
 profiles/audio/avrcp.c               | 2 +-
 profiles/audio/control.c             | 2 +-
 profiles/audio/manager.c             | 2 +-
 profiles/audio/media.c               | 3 +--
 profiles/audio/transport.c           | 3 +--
 profiles/cyclingspeed/cyclingspeed.c | 2 +-
 profiles/deviceinfo/deviceinfo.c     | 2 +-
 profiles/gatt/manager.c              | 2 +-
 profiles/health/hdp_manager.c        | 2 +-
 profiles/health/hdp_util.c           | 6 +++---
 profiles/heartrate/heartrate.c       | 2 +-
 profiles/input/manager.c             | 3 ++-
 profiles/input/server.c              | 4 ++--
 profiles/network/common.c            | 2 +-
 profiles/network/manager.c           | 2 +-
 profiles/network/server.c            | 2 +-
 profiles/proximity/manager.c         | 2 +-
 profiles/sap/server.c                | 4 ++--
 profiles/thermometer/thermometer.c   | 3 +--
 21 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/profiles/audio/avctp.c b/profiles/audio/avctp.c
index d39bbabe5..4309c6092 100644
--- a/profiles/audio/avctp.c
+++ b/profiles/audio/avctp.c
@@ -41,12 +41,12 @@
 
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/sdp.h>
-#include <bluetooth/uuid.h>
 #include <bluetooth/l2cap.h>
 
 #include <glib.h>
 #include <btio/btio.h>
 
+#include "lib/uuid.h"
 #include "adapter.h"
 #include "../src/device.h"
 
diff --git a/profiles/audio/avdtp.c b/profiles/audio/avdtp.c
index 29a561976..4921fdcb7 100644
--- a/profiles/audio/avdtp.c
+++ b/profiles/audio/avdtp.c
@@ -39,7 +39,6 @@
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
-#include <bluetooth/uuid.h>
 
 #include <glib.h>
 #include <dbus/dbus.h>
@@ -47,6 +46,7 @@
 
 #include "log.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 ce070cd39..a139606df 100644
--- a/profiles/audio/avrcp.c
+++ b/profiles/audio/avrcp.c
@@ -41,12 +41,12 @@
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
-#include <bluetooth/uuid.h>
 
 #include <glib.h>
 #include <dbus/dbus.h>
 #include <gdbus/gdbus.h>
 
+#include "lib/uuid.h"
 #include "../src/adapter.h"
 #include "../src/device.h"
 
diff --git a/profiles/audio/control.c b/profiles/audio/control.c
index 642fdd544..18c8478ba 100644
--- a/profiles/audio/control.c
+++ b/profiles/audio/control.c
@@ -40,12 +40,12 @@
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
-#include <bluetooth/uuid.h>
 
 #include <glib.h>
 #include <dbus/dbus.h>
 #include <gdbus/gdbus.h>
 
+#include "lib/uuid.h"
 #include "../src/adapter.h"
 #include "../src/device.h"
 
diff --git a/profiles/audio/manager.c b/profiles/audio/manager.c
index f0df8ed3a..934227e55 100644
--- a/profiles/audio/manager.c
+++ b/profiles/audio/manager.c
@@ -42,13 +42,13 @@
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
-#include <bluetooth/uuid.h>
 
 #include <glib.h>
 #include <dbus/dbus.h>
 #include <btio/btio.h>
 #include <gdbus/gdbus.h>
 
+#include "lib/uuid.h"
 #include "glib-helper.h"
 #include "../src/adapter.h"
 #include "../src/device.h"
diff --git a/profiles/audio/media.c b/profiles/audio/media.c
index e4206e3dd..00aa2f406 100644
--- a/profiles/audio/media.c
+++ b/profiles/audio/media.c
@@ -29,11 +29,10 @@
 
 #include <errno.h>
 
-#include <bluetooth/uuid.h>
-
 #include <glib.h>
 #include <gdbus/gdbus.h>
 
+#include "lib/uuid.h"
 #include "../src/adapter.h"
 #include "../src/device.h"
 #include "../src/dbus-common.h"
diff --git a/profiles/audio/transport.c b/profiles/audio/transport.c
index 58240ac03..a4370a58a 100644
--- a/profiles/audio/transport.c
+++ b/profiles/audio/transport.c
@@ -28,11 +28,10 @@
 
 #include <errno.h>
 
-#include <bluetooth/uuid.h>
-
 #include <glib.h>
 #include <gdbus/gdbus.h>
 
+#include "lib/uuid.h"
 #include "../src/adapter.h"
 #include "../src/device.h"
 #include "../src/dbus-common.h"
diff --git a/profiles/cyclingspeed/cyclingspeed.c b/profiles/cyclingspeed/cyclingspeed.c
index f01613197..fc727916c 100644
--- a/profiles/cyclingspeed/cyclingspeed.c
+++ b/profiles/cyclingspeed/cyclingspeed.c
@@ -27,9 +27,9 @@
 #include <errno.h>
 #include <stdbool.h>
 #include <glib.h>
-#include <bluetooth/uuid.h>
 #include <gdbus/gdbus.h>
 
+#include "lib/uuid.h"
 #include "plugin.h"
 #include "adapter.h"
 #include "device.h"
diff --git a/profiles/deviceinfo/deviceinfo.c b/profiles/deviceinfo/deviceinfo.c
index 7a97ecc6c..fb423fa44 100644
--- a/profiles/deviceinfo/deviceinfo.c
+++ b/profiles/deviceinfo/deviceinfo.c
@@ -28,8 +28,8 @@
 #include <errno.h>
 
 #include <glib.h>
-#include <bluetooth/uuid.h>
 
+#include "lib/uuid.h"
 #include "plugin.h"
 #include "adapter.h"
 #include "device.h"
diff --git a/profiles/gatt/manager.c b/profiles/gatt/manager.c
index 151d60fc7..2f2bd14ee 100644
--- a/profiles/gatt/manager.c
+++ b/profiles/gatt/manager.c
@@ -27,8 +27,8 @@
 #include <glib.h>
 #include <errno.h>
 #include <stdbool.h>
-#include <bluetooth/uuid.h>
 
+#include "lib/uuid.h"
 #include "adapter.h"
 #include "device.h"
 #include "profile.h"
diff --git a/profiles/health/hdp_manager.c b/profiles/health/hdp_manager.c
index b80170604..87e70cd78 100644
--- a/profiles/health/hdp_manager.c
+++ b/profiles/health/hdp_manager.c
@@ -28,8 +28,8 @@
 
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
-#include <bluetooth/uuid.h>
 
+#include "lib/uuid.h"
 #include <btio/btio.h>
 #include <adapter.h>
 #include <device.h>
diff --git a/profiles/health/hdp_util.c b/profiles/health/hdp_util.c
index ed987e39e..b53f1dbc0 100644
--- a/profiles/health/hdp_util.c
+++ b/profiles/health/hdp_util.c
@@ -36,13 +36,13 @@
 
 #include <sdpd.h>
 #include <bluetooth/sdp_lib.h>
-#include <bluetooth/uuid.h>
 #include <sdp-client.h>
 #include <glib-helper.h>
 
-#include <btio/btio.h>
+#include "lib/uuid.h"
+#include "btio/btio.h"
 
-#include <log.h>
+#include "log.h"
 
 #include "dbus-common.h"
 #include "mcap.h"
diff --git a/profiles/heartrate/heartrate.c b/profiles/heartrate/heartrate.c
index bc986836c..5c56d3fc2 100644
--- a/profiles/heartrate/heartrate.c
+++ b/profiles/heartrate/heartrate.c
@@ -27,9 +27,9 @@
 #include <errno.h>
 #include <stdbool.h>
 #include <glib.h>
-#include <bluetooth/uuid.h>
 #include <gdbus/gdbus.h>
 
+#include "lib/uuid.h"
 #include "plugin.h"
 #include "adapter.h"
 #include "dbus-common.h"
diff --git a/profiles/input/manager.c b/profiles/input/manager.c
index a06edd26e..6ed12eeb8 100644
--- a/profiles/input/manager.c
+++ b/profiles/input/manager.c
@@ -31,10 +31,11 @@
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
-#include <bluetooth/uuid.h>
 
 #include "log.h"
 #include "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 8476b7c91..e15ae8850 100644
--- a/profiles/input/server.c
+++ b/profiles/input/server.c
@@ -31,7 +31,6 @@
 
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/sdp.h>
-#include <bluetooth/uuid.h>
 
 #include <glib.h>
 #include <dbus/dbus.h>
@@ -39,7 +38,8 @@
 #include "log.h"
 
 #include "glib-helper.h"
-#include <btio/btio.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/common.c b/profiles/network/common.c
index 34bdc0e6e..e069892ea 100644
--- a/profiles/network/common.c
+++ b/profiles/network/common.c
@@ -39,12 +39,12 @@
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/l2cap.h>
 #include <bluetooth/bnep.h>
-#include <bluetooth/uuid.h>
 
 #include <glib.h>
 
 #include "log.h"
 #include "common.h"
+#include "lib/uuid.h"
 
 static int ctl;
 
diff --git a/profiles/network/manager.c b/profiles/network/manager.c
index 79517d09e..bc553c466 100644
--- a/profiles/network/manager.c
+++ b/profiles/network/manager.c
@@ -30,7 +30,6 @@
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/bnep.h>
 #include <bluetooth/sdp.h>
-#include <bluetooth/uuid.h>
 
 #include <glib.h>
 #include <gdbus/gdbus.h>
@@ -38,6 +37,7 @@
 #include "log.h"
 #include "plugin.h"
 
+#include "lib/uuid.h"
 #include "adapter.h"
 #include "device.h"
 #include "profile.h"
diff --git a/profiles/network/server.c b/profiles/network/server.c
index 2869c288a..864b49c1a 100644
--- a/profiles/network/server.c
+++ b/profiles/network/server.c
@@ -34,13 +34,13 @@
 #include <bluetooth/bnep.h>
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
-#include <bluetooth/uuid.h>
 #include <netinet/in.h>
 
 #include <glib.h>
 #include <gdbus/gdbus.h>
 #include <btio/btio.h>
 
+#include "lib/uuid.h"
 #include "../src/dbus-common.h"
 #include "../src/adapter.h"
 
diff --git a/profiles/proximity/manager.c b/profiles/proximity/manager.c
index c3d0933bc..b405f15fc 100644
--- a/profiles/proximity/manager.c
+++ b/profiles/proximity/manager.c
@@ -30,8 +30,8 @@
 
 #include <glib.h>
 #include <gdbus/gdbus.h>
-#include <bluetooth/uuid.h>
 
+#include "lib/uuid.h"
 #include "adapter.h"
 #include "device.h"
 #include "profile.h"
diff --git a/profiles/sap/server.c b/profiles/sap/server.c
index 0fa4e7cd8..dfcf0f125 100644
--- a/profiles/sap/server.c
+++ b/profiles/sap/server.c
@@ -32,10 +32,10 @@
 #include <glib.h>
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
-#include <bluetooth/uuid.h>
 
+#include "lib/uuid.h"
+#include "btio/btio.h"
 #include "adapter.h"
-#include <btio/btio.h>
 #include "sdpd.h"
 #include "log.h"
 #include "error.h"
diff --git a/profiles/thermometer/thermometer.c b/profiles/thermometer/thermometer.c
index 2a07eac2a..0cf14e6a2 100644
--- a/profiles/thermometer/thermometer.c
+++ b/profiles/thermometer/thermometer.c
@@ -27,10 +27,9 @@
 #include <stdbool.h>
 #include <errno.h>
 
-#include <bluetooth/uuid.h>
-
 #include <gdbus/gdbus.h>
 
+#include "lib/uuid.h"
 #include "plugin.h"
 #include "dbus-common.h"
 #include "adapter.h"
-- 
2.47.3