diff --git a/tools/hciattach.c b/tools/hciattach.c
index 14d3511..da154df 100644
--- a/tools/hciattach.c
+++ b/tools/hciattach.c
#include <sys/param.h>
#include <sys/ioctl.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"
diff --git a/tools/hciattach_ath3k.c b/tools/hciattach_ath3k.c
index d31732e..a76b448 100644
--- a/tools/hciattach_ath3k.c
+++ b/tools/hciattach_ath3k.c
#include <sys/param.h>
#include <sys/ioctl.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"
diff --git a/tools/hciattach_bcm43xx.c b/tools/hciattach_bcm43xx.c
index 3d36c20..81f38cb 100644
--- a/tools/hciattach_bcm43xx.c
+++ b/tools/hciattach_bcm43xx.c
#include <time.h>
#include <limits.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"
diff --git a/tools/hciattach_intel.c b/tools/hciattach_intel.c
index 749098e..2650dcb 100644
--- a/tools/hciattach_intel.c
+++ b/tools/hciattach_intel.c
#include <sys/ioctl.h>
#include <time.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"
diff --git a/tools/hciattach_qualcomm.c b/tools/hciattach_qualcomm.c
index 0e25905..22ac629 100644
--- a/tools/hciattach_qualcomm.c
+++ b/tools/hciattach_qualcomm.c
#include <sys/ioctl.h>
#include <sys/uio.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"
diff --git a/tools/hciattach_st.c b/tools/hciattach_st.c
index dbb7c47..474545a 100644
--- a/tools/hciattach_st.c
+++ b/tools/hciattach_st.c
#include <dirent.h>
#include <sys/param.h>
-#include <bluetooth/bluetooth.h>
+#include "lib/bluetooth.h"
#include "hciattach.h"
diff --git a/tools/hciattach_ti.c b/tools/hciattach_ti.c
index 8322b45..828dd61 100644
--- a/tools/hciattach_ti.c
+++ b/tools/hciattach_ti.c
#include <sys/param.h>
#include <sys/ioctl.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"
diff --git a/tools/hciattach_tialt.c b/tools/hciattach_tialt.c
index a7c1706..f6ef068 100644
--- a/tools/hciattach_tialt.c
+++ b/tools/hciattach_tialt.c
#include <sys/ioctl.h>
#include <sys/uio.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"