diff --git a/attrib/att.c b/attrib/att.c
index de11811..b26273e 100644
--- a/attrib/att.c
+++ b/attrib/att.c
#include <stdlib.h>
#include <bluetooth/bluetooth.h>
-#include <bluetooth/uuid.h>
#include <glib.h>
+#include "lib/uuid.h"
#include "att.h"
const char *att_ecode2str(uint8_t status)
diff --git a/attrib/gatt-service.c b/attrib/gatt-service.c
index e8788d9..bdb12cd 100644
--- a/attrib/gatt-service.c
+++ b/attrib/gatt-service.c
#endif
#include <glib.h>
-#include <bluetooth/uuid.h>
#include <bluetooth/sdp.h>
#include <adapter.h>
+#include "lib/uuid.h"
#include "gattrib.h"
#include "att.h"
#include "gatt.h"
diff --git a/attrib/gatt.c b/attrib/gatt.c
index 38c050e..d54feac 100644
--- a/attrib/gatt.c
+++ b/attrib/gatt.c
#include <stdint.h>
#include <stdlib.h>
#include <glib.h>
-#include <bluetooth/uuid.h>
#include <bluetooth/sdp.h>
#include <bluetooth/sdp_lib.h>
+#include "lib/uuid.h"
#include "att.h"
#include "gattrib.h"
#include "gatt.h"
diff --git a/attrib/gattrib.c b/attrib/gattrib.c
index bf40532..58f19d0 100644
--- a/attrib/gattrib.c
+++ b/attrib/gattrib.c
#include <stdio.h>
#include <bluetooth/bluetooth.h>
-#include <bluetooth/uuid.h>
-
#include <btio/btio.h>
+
+#include "lib/uuid.h"
#include "log.h"
#include "att.h"
#include "gattrib.h"
diff --git a/attrib/gatttool.c b/attrib/gatttool.c
index e66059d..29e3261 100644
--- a/attrib/gatttool.c
+++ b/attrib/gatttool.c
#include <bluetooth/bluetooth.h>
#include <bluetooth/hci.h>
#include <bluetooth/hci_lib.h>
-#include <bluetooth/uuid.h>
+#include "lib/uuid.h"
#include "att.h"
#include <btio/btio.h>
#include "gattrib.h"
diff --git a/attrib/interactive.c b/attrib/interactive.c
index 51f620a..a99ad0a 100644
--- a/attrib/interactive.c
+++ b/attrib/interactive.c
#include <stdio.h>
#include <glib.h>
-#include <bluetooth/uuid.h>
-
#include <readline/readline.h>
#include <readline/history.h>
+#include "lib/uuid.h"
#include <btio/btio.h>
#include "att.h"
#include "gattrib.h"
diff --git a/attrib/utils.c b/attrib/utils.c
index 43244c2..f9813d1 100644
--- a/attrib/utils.c
+++ b/attrib/utils.c
#include <bluetooth/bluetooth.h>
#include <bluetooth/hci.h>
#include <bluetooth/hci_lib.h>
-#include <bluetooth/uuid.h>
#include <bluetooth/sdp.h>
+#include "lib/uuid.h"
#include <btio/btio.h>
#include "att.h"
#include "gattrib.h"