diff --git a/tools/bneptest.c b/tools/bneptest.c
index 7f004d0..98ee9b1 100644
--- a/tools/bneptest.c
+++ b/tools/bneptest.c
#include <netinet/in.h>
#include <linux/if_bridge.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 "src/log.h"
#include "src/shared/util.h"
#include "btio/btio.h"
diff --git a/tools/rfcomm-tester.c b/tools/rfcomm-tester.c
index 55b6ac6..b20d70d 100644
--- a/tools/rfcomm-tester.c
+++ b/tools/rfcomm-tester.c
#include <glib.h>
#include "lib/bluetooth.h"
+#include "lib/rfcomm.h"
#include "lib/mgmt.h"
-#include "bluetooth/rfcomm.h"
#include "monitor/bt.h"
#include "emulator/bthost.h"