diff --git a/tools/amptest.c b/tools/amptest.c
index bba0a9a..5574707 100644
--- a/tools/amptest.c
+++ b/tools/amptest.c
@@ -36,9 +36,9 @@
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/hci_lib.h>
+#include "lib/bluetooth.h"
+#include "lib/hci.h"
+#include "lib/hci_lib.h"
 
 static int activate_amp_controller(int dev_id)
 {
diff --git a/tools/avinfo.c b/tools/avinfo.c
index d9f809b..3f406ca 100644
--- a/tools/avinfo.c
+++ b/tools/avinfo.c
@@ -39,12 +39,12 @@
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 
-#include "profiles/audio/a2dp-codecs.h"
+#include "lib/bluetooth.h"
+#include "lib/hci.h"
+#include "lib/hci_lib.h"
+#include "lib/l2cap.h"
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/hci_lib.h>
-#include <bluetooth/l2cap.h>
+#include "profiles/audio/a2dp-codecs.h"
 
 #define AVDTP_PSM			25
 
diff --git a/tools/avtest.c b/tools/avtest.c
index 541b3cd..70c9b65 100644
--- a/tools/avtest.c
+++ b/tools/avtest.c
@@ -35,11 +35,11 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/hci_lib.h>
-#include <bluetooth/l2cap.h>
-#include <bluetooth/sdp.h>
+#include "lib/bluetooth.h"
+#include "lib/hci.h"
+#include "lib/hci_lib.h"
+#include "lib/l2cap.h"
+#include "lib/sdp.h"
 
 #define AVDTP_PKT_TYPE_SINGLE		0x00
 #define AVDTP_PKT_TYPE_START		0x01
diff --git a/tools/bccmd.c b/tools/bccmd.c
index 2646660..7cce426 100644
--- a/tools/bccmd.c
+++ b/tools/bccmd.c
@@ -31,9 +31,9 @@
 #include <getopt.h>
 #include <sys/socket.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/hci_lib.h>
+#include "lib/bluetooth.h"
+#include "lib/hci.h"
+#include "lib/hci_lib.h"
 
 #include "csr.h"
 
diff --git a/tools/bdaddr.c b/tools/bdaddr.c
index 8356a8d..952e990 100644
--- a/tools/bdaddr.c
+++ b/tools/bdaddr.c
@@ -33,9 +33,9 @@
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/hci_lib.h>
+#include "lib/bluetooth.h"
+#include "lib/hci.h"
+#include "lib/hci_lib.h"
 
 #include "src/oui.h"
 
diff --git a/tools/btattach.c b/tools/btattach.c
index 9957d36..b7948a3 100644
--- a/tools/btattach.c
+++ b/tools/btattach.c
@@ -37,9 +37,9 @@
 #include <sys/ioctl.h>
 #include <poll.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/hci_lib.h>
+#include "lib/bluetooth.h"
+#include "lib/hci.h"
+#include "lib/hci_lib.h"
 
 #include "hciattach.h"
 #include "monitor/bt.h"
diff --git a/tools/btgatt-client.c b/tools/btgatt-client.c
index 95e9b69..c90f265 100644
--- a/tools/btgatt-client.c
+++ b/tools/btgatt-client.c
@@ -33,10 +33,10 @@
 #include <limits.h>
 #include <errno.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/hci_lib.h>
-#include <bluetooth/l2cap.h>
+#include "lib/bluetooth.h"
+#include "lib/hci.h"
+#include "lib/hci_lib.h"
+#include "lib/l2cap.h"
 #include "lib/uuid.h"
 
 #include "src/shared/mainloop.h"
diff --git a/tools/btgatt-server.c b/tools/btgatt-server.c
index 9eeea3b..b4fbe60 100644
--- a/tools/btgatt-server.c
+++ b/tools/btgatt-server.c
@@ -29,10 +29,10 @@
 #include <unistd.h>
 #include <errno.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/hci_lib.h>
-#include <bluetooth/l2cap.h>
+#include "lib/bluetooth.h"
+#include "lib/hci.h"
+#include "lib/hci_lib.h"
+#include "lib/l2cap.h"
 #include "lib/uuid.h"
 
 #include "src/shared/mainloop.h"
diff --git a/tools/btiotest.c b/tools/btiotest.c
index 6a87ffd..10e78d5 100644
--- a/tools/btiotest.c
+++ b/tools/btiotest.c
@@ -35,7 +35,7 @@
 
 #include <glib.h>
 
-#include <bluetooth/bluetooth.h>
+#include "lib/bluetooth.h"
 
 #include "btio/btio.h"
 
diff --git a/tools/btmgmt.c b/tools/btmgmt.c
index e9df5a8..69f0498 100644
--- a/tools/btmgmt.c
+++ b/tools/btmgmt.c
@@ -43,11 +43,11 @@
 #include <readline/readline.h>
 #include <readline/history.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/hci_lib.h>
-#include <bluetooth/sdp.h>
-#include <bluetooth/sdp_lib.h>
+#include "lib/bluetooth.h"
+#include "lib/hci.h"
+#include "lib/hci_lib.h"
+#include "lib/sdp.h"
+#include "lib/sdp_lib.h"
 
 #include "src/uuid-helper.h"
 #include "lib/mgmt.h"
diff --git a/tools/ciptool.c b/tools/ciptool.c
index 3ff9fb1..e60493d 100644
--- a/tools/ciptool.c
+++ b/tools/ciptool.c
@@ -36,13 +36,13 @@
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/hci_lib.h>
-#include <bluetooth/l2cap.h>
-#include <bluetooth/sdp.h>
-#include <bluetooth/sdp_lib.h>
-#include <bluetooth/cmtp.h>
+#include "lib/bluetooth.h"
+#include "lib/hci.h"
+#include "lib/hci_lib.h"
+#include "lib/l2cap.h"
+#include "lib/sdp.h"
+#include "lib/sdp_lib.h"
+#include "lib/cmtp.h"
 
 static volatile sig_atomic_t __io_canceled = 0;
 
diff --git a/tools/cltest.c b/tools/cltest.c
index 6a19276..95fa7b6 100644
--- a/tools/cltest.c
+++ b/tools/cltest.c
@@ -36,10 +36,10 @@
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/hci_lib.h>
-#include <bluetooth/l2cap.h>
+#include "lib/bluetooth.h"
+#include "lib/hci.h"
+#include "lib/hci_lib.h"
+#include "lib/l2cap.h"
 
 #include "src/shared/mainloop.h"
 
diff --git a/tools/csr_hci.c b/tools/csr_hci.c
index 6bd37c3..d2e4ab9 100644
--- a/tools/csr_hci.c
+++ b/tools/csr_hci.c
@@ -30,9 +30,9 @@
 #include <string.h>
 #include <sys/socket.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/hci_lib.h>
+#include "lib/bluetooth.h"
+#include "lib/hci.h"
+#include "lib/hci_lib.h"
 
 #include "csr.h"
 
diff --git a/tools/hcieventmask.c b/tools/hcieventmask.c
index 87beac9..b5f818d 100644
--- a/tools/hcieventmask.c
+++ b/tools/hcieventmask.c
@@ -31,9 +31,9 @@
 #include <getopt.h>
 #include <sys/socket.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/hci_lib.h>
+#include "lib/bluetooth.h"
+#include "lib/hci.h"
+#include "lib/hci_lib.h"
 
 static struct option main_options[] = {
 	{ "device",	1, 0, 'i' },
diff --git a/tools/hcisecfilter.c b/tools/hcisecfilter.c
index 9ad4ce0..18c9033 100644
--- a/tools/hcisecfilter.c
+++ b/tools/hcisecfilter.c
@@ -29,11 +29,11 @@
 #include <stdio.h>
 #include <sys/socket.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/hci_lib.h>
+#include "lib/bluetooth.h"
+#include "lib/hci.h"
+#include "lib/hci_lib.h"
 
-int main(void)
+int main(int argc, char *argv[])
 {
 	uint32_t type_mask;
 	uint32_t event_mask[2];
diff --git a/tools/hwdb.c b/tools/hwdb.c
index 3b712e1..8a42dce 100644
--- a/tools/hwdb.c
+++ b/tools/hwdb.c
@@ -27,7 +27,7 @@
 
 #include <stdio.h>
 
-#include <bluetooth/bluetooth.h>
+#include "lib/bluetooth.h"
 
 static const struct {
 	uint16_t vendor;
diff --git a/tools/l2ping.c b/tools/l2ping.c
index 3dd437e..fa97fe3 100644
--- a/tools/l2ping.c
+++ b/tools/l2ping.c
@@ -38,10 +38,10 @@
 #include <poll.h>
 #include <sys/socket.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/hci_lib.h>
-#include <bluetooth/l2cap.h>
+#include "lib/bluetooth.h"
+#include "lib/hci.h"
+#include "lib/hci_lib.h"
+#include "lib/l2cap.h"
 
 /* Defaults */
 static bdaddr_t bdaddr;
diff --git a/tools/l2test.c b/tools/l2test.c
index 71ad109..8065578 100644
--- a/tools/l2test.c
+++ b/tools/l2test.c
@@ -42,10 +42,10 @@
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/hci_lib.h>
-#include <bluetooth/l2cap.h>
+#include "lib/bluetooth.h"
+#include "lib/hci.h"
+#include "lib/hci_lib.h"
+#include "lib/l2cap.h"
 
 #include "src/shared/util.h"
 
diff --git a/tools/mcaptest.c b/tools/mcaptest.c
index 6aba7a5..3092873 100644
--- a/tools/mcaptest.c
+++ b/tools/mcaptest.c
@@ -30,12 +30,12 @@
 #include <getopt.h>
 #include <unistd.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 "btio/btio.h"
 #include "lib/l2cap.h"
 #include "profiles/health/mcap.h"
diff --git a/tools/rctest.c b/tools/rctest.c
index 11ae37f..bdc1eb5 100644
--- a/tools/rctest.c
+++ b/tools/rctest.c
@@ -40,12 +40,12 @@
 #include <sys/socket.h>
 #include <sys/stat.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/hci_lib.h>
-#include <bluetooth/rfcomm.h>
-#include <bluetooth/sdp.h>
-#include <bluetooth/sdp_lib.h>
+#include "lib/bluetooth.h"
+#include "lib/hci.h"
+#include "lib/hci_lib.h"
+#include "lib/rfcomm.h"
+#include "lib/sdp.h"
+#include "lib/sdp_lib.h"
 
 #include "src/shared/util.h"
 
diff --git a/tools/rfcomm.c b/tools/rfcomm.c
index 659bbec..809c240 100644
--- a/tools/rfcomm.c
+++ b/tools/rfcomm.c
@@ -40,10 +40,10 @@
 #include <sys/socket.h>
 #include <sys/wait.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/hci_lib.h>
-#include <bluetooth/rfcomm.h>
+#include "lib/bluetooth.h"
+#include "lib/hci.h"
+#include "lib/hci_lib.h"
+#include "lib/rfcomm.h"
 
 static int rfcomm_raw_tty = 0;
 static int auth = 0;
diff --git a/tools/scotest.c b/tools/scotest.c
index d033ae0..596e403 100644
--- a/tools/scotest.c
+++ b/tools/scotest.c
@@ -37,8 +37,8 @@
 #include <sys/time.h>
 #include <sys/socket.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/sco.h>
+#include "lib/bluetooth.h"
+#include "lib/sco.h"
 
 #include "src/shared/util.h"
 
diff --git a/tools/sdptool.c b/tools/sdptool.c
index 17561b1..257964d 100644
--- a/tools/sdptool.c
+++ b/tools/sdptool.c
@@ -36,15 +36,14 @@
 #include <string.h>
 #include <getopt.h>
 #include <sys/socket.h>
-
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/hci_lib.h>
-#include <bluetooth/sdp.h>
-#include <bluetooth/sdp_lib.h>
-
 #include <netinet/in.h>
 
+#include "lib/bluetooth.h"
+#include "lib/hci.h"
+#include "lib/hci_lib.h"
+#include "lib/sdp.h"
+#include "lib/sdp_lib.h"
+
 #include "src/sdp-xml.h"
 
 #ifndef APPLE_AGENT_SVCLASS_ID