monitor: Fix uuid.h includes
Commit e0e7eb08d5d28a952221070a4b50794d63dcc625 tried to fix this, but
missed most of the files concerned.
Without the fix an out-of-tree build (e.g. make distcheck) will throw
errors like this:
CC monitor/l2cap.o
../monitor/l2cap.c:41:18: fatal error: uuid.h: No such file or directory
#include "uuid.h"
diff --git a/monitor/avctp.c b/monitor/avctp.c
index de8c345..94385d2 100644
--- a/monitor/avctp.c
+++ b/monitor/avctp.c
@@ -33,13 +33,13 @@
#include <inttypes.h>
#include "lib/bluetooth.h"
+#include "lib/uuid.h"
#include "src/shared/util.h"
#include "bt.h"
#include "packet.h"
#include "display.h"
#include "l2cap.h"
-#include "uuid.h"
#include "keys.h"
#include "sdp.h"
#include "avctp.h"
diff --git a/monitor/bnep.c b/monitor/bnep.c
index 38fd131..1d9d8fc 100644
--- a/monitor/bnep.c
+++ b/monitor/bnep.c
@@ -33,13 +33,13 @@
#include <inttypes.h>
#include "lib/bluetooth.h"
+#include "lib/uuid.h"
#include "src/shared/util.h"
#include "bt.h"
#include "packet.h"
#include "display.h"
#include "l2cap.h"
-#include "uuid.h"
#include "keys.h"
#include "sdp.h"
#include "bnep.h"
diff --git a/monitor/l2cap.c b/monitor/l2cap.c
index 74f9bd7..c85934a 100644
--- a/monitor/l2cap.c
+++ b/monitor/l2cap.c
@@ -32,13 +32,13 @@
#include <inttypes.h>
#include "lib/bluetooth.h"
+#include "lib/uuid.h"
#include "src/shared/util.h"
#include "bt.h"
#include "packet.h"
#include "display.h"
#include "l2cap.h"
-#include "uuid.h"
#include "keys.h"
#include "sdp.h"
#include "avctp.h"
diff --git a/monitor/rfcomm.c b/monitor/rfcomm.c
index 742bd7f..f3daf95 100644
--- a/monitor/rfcomm.c
+++ b/monitor/rfcomm.c
@@ -33,13 +33,13 @@
#include <inttypes.h>
#include "lib/bluetooth.h"
+#include "lib/uuid.h"
#include "src/shared/util.h"
#include "bt.h"
#include "packet.h"
#include "display.h"
#include "l2cap.h"
-#include "uuid.h"
#include "keys.h"
#include "sdp.h"
#include "rfcomm.h"
diff --git a/monitor/sdp.c b/monitor/sdp.c
index f3a6745..96fbeb8 100644
--- a/monitor/sdp.c
+++ b/monitor/sdp.c
@@ -32,6 +32,7 @@
#include <inttypes.h>
#include "lib/bluetooth.h"
+#include "lib/uuid.h"
#include "src/shared/util.h"
@@ -39,7 +40,6 @@
#include "packet.h"
#include "display.h"
#include "l2cap.h"
-#include "uuid.h"
#include "sdp.h"
#define MAX_TID 16