diff --git a/android/avctp.c b/android/avctp.c
index a70ed52..758dbd4 100644
--- a/android/avctp.c
+++ b/android/avctp.c
@@ -40,10 +40,10 @@
 #include <fcntl.h>
 #include <netinet/in.h>
 
-#include <bluetooth/sdp.h>
-
 #include <glib.h>
 
+#include "lib/sdp.h"
+
 #include "src/log.h"
 #include "src/uinput.h"
 
diff --git a/android/avdtptest.c b/android/avdtptest.c
index 6529423..f42f664 100644
--- a/android/avdtptest.c
+++ b/android/avdtptest.c
@@ -32,14 +32,14 @@
 #include <stdbool.h>
 #include <errno.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 "btio/btio.h"
+#include "src/shared/util.h"
 #include "src/shared/queue.h"
 #include "avdtp.h"
 
diff --git a/android/bas.c b/android/bas.c
index b6891ab..dcbf9de 100644
--- a/android/bas.c
+++ b/android/bas.c
@@ -33,7 +33,9 @@
 #include "src/log.h"
 
 #include "lib/bluetooth.h"
+#include "lib/sdp.h"
 #include "lib/uuid.h"
+
 #include "src/shared/util.h"
 #include "src/shared/queue.h"
 
diff --git a/android/dis.c b/android/dis.c
index 8f8027e..75dbe3d 100644
--- a/android/dis.c
+++ b/android/dis.c
@@ -32,7 +32,9 @@
 #include "src/log.h"
 
 #include "lib/bluetooth.h"
+#include "lib/sdp.h"
 #include "lib/uuid.h"
+
 #include "src/shared/util.h"
 #include "src/shared/queue.h"
 
diff --git a/android/hog.c b/android/hog.c
index 3bfe765..88a5460 100644
--- a/android/hog.c
+++ b/android/hog.c
@@ -36,16 +36,16 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#include <bluetooth/bluetooth.h>
-
 #include <glib.h>
 
-#include "src/log.h"
-
+#include "lib/bluetooth.h"
+#include "lib/sdp.h"
 #include "lib/uuid.h"
+
 #include "src/shared/util.h"
 #include "src/shared/uhid.h"
 #include "src/shared/queue.h"
+#include "src/log.h"
 
 #include "attrib/att.h"
 #include "attrib/gattrib.h"
diff --git a/android/scpp.c b/android/scpp.c
index 4c6c0ec..f8f81f3 100644
--- a/android/scpp.c
+++ b/android/scpp.c
@@ -34,7 +34,9 @@
 #include "src/log.h"
 
 #include "lib/bluetooth.h"
+#include "lib/sdp.h"
 #include "lib/uuid.h"
+
 #include "src/shared/util.h"
 #include "src/shared/queue.h"