profiles: Fix includes for uuid.h

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"
 

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"
 

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"
 

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"
 

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"

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"

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"

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"

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"

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"

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>

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"

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"

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"

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"

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;
 

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"

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"
 

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"

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"

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"