diff --git a/attrib/att.c b/attrib/att.c
index 2680458..826b3c1 100644
--- a/attrib/att.c
+++ b/attrib/att.c
@@ -30,12 +30,12 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#include <bluetooth/bluetooth.h>
-
 #include <glib.h>
 
-#include "src/shared/util.h"
+#include "lib/bluetooth.h"
 #include "lib/uuid.h"
+
+#include "src/shared/util.h"
 #include "att.h"
 
 static inline void put_uuid_le(const bt_uuid_t *src, void *dst)
diff --git a/attrib/gatt.c b/attrib/gatt.c
index ea5c1cf..480f874 100644
--- a/attrib/gatt.c
+++ b/attrib/gatt.c
@@ -28,12 +28,14 @@
 
 #include <stdint.h>
 #include <stdlib.h>
+
 #include <glib.h>
-#include <bluetooth/sdp.h>
-#include <bluetooth/sdp_lib.h>
 
-#include "src/shared/util.h"
+#include "lib/sdp.h"
+#include "lib/sdp_lib.h"
 #include "lib/uuid.h"
+
+#include "src/shared/util.h"
 #include "att.h"
 #include "gattrib.h"
 #include "gatt.h"
diff --git a/attrib/gatt.h b/attrib/gatt.h
index f6db10f..63b2940 100644
--- a/attrib/gatt.h
+++ b/attrib/gatt.h
@@ -22,8 +22,6 @@
  *
  */
 
-#include <bluetooth/sdp.h>
-
 /*
  * GATT Characteristic Property bit field
  * Reference: Core SPEC 4.1 page 2183 (Table 3.5: Characteristic Properties
diff --git a/attrib/gattrib.c b/attrib/gattrib.c
index c36a207..514fc8f 100644
--- a/attrib/gattrib.c
+++ b/attrib/gattrib.c
@@ -26,14 +26,14 @@
 #include "config.h"
 #endif
 
+#include <stdio.h>
 #include <stdint.h>
 #include <stdbool.h>
 #include <string.h>
-#include <glib.h>
 
-#include <stdio.h>
+#include <glib.h>
 
-#include <bluetooth/bluetooth.h>
+#include "lib/bluetooth.h"
 
 #include "btio/btio.h"
 #include "src/log.h"
diff --git a/attrib/gatttool.c b/attrib/gatttool.c
index b8e0f68..1a40c94 100644
--- a/attrib/gatttool.c
+++ b/attrib/gatttool.c
@@ -27,16 +27,18 @@
 #endif
 
 #include <errno.h>
-#include <glib.h>
 #include <stdlib.h>
 #include <unistd.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/hci_lib.h>
+#include <glib.h>
 
-#include "src/shared/util.h"
+#include "lib/bluetooth.h"
+#include "lib/hci.h"
+#include "lib/hci_lib.h"
+#include "lib/sdp.h"
 #include "lib/uuid.h"
+
+#include "src/shared/util.h"
 #include "att.h"
 #include "btio/btio.h"
 #include "gattrib.h"
diff --git a/attrib/interactive.c b/attrib/interactive.c
index 8db1094..451be23 100644
--- a/attrib/interactive.c
+++ b/attrib/interactive.c
@@ -38,9 +38,11 @@
 #include <readline/readline.h>
 #include <readline/history.h>
 
-#include "src/shared/util.h"
 #include "lib/bluetooth.h"
+#include "lib/sdp.h"
 #include "lib/uuid.h"
+
+#include "src/shared/util.h"
 #include "btio/btio.h"
 #include "att.h"
 #include "gattrib.h"
diff --git a/attrib/utils.c b/attrib/utils.c
index 8f9a4c0..8e2fc1a 100644
--- a/attrib/utils.c
+++ b/attrib/utils.c
@@ -26,13 +26,15 @@
 #endif
 
 #include <stdlib.h>
-#include <glib.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/hci_lib.h>
+#include <glib.h>
 
+#include "lib/bluetooth.h"
+#include "lib/hci.h"
+#include "lib/hci_lib.h"
+#include "lib/sdp.h"
 #include "lib/uuid.h"
+
 #include "btio/btio.h"
 #include "att.h"
 #include "gattrib.h"