diff --git a/tools/bdaddr.c b/tools/bdaddr.c
index 73dffce..e3ffa0e 100644
--- a/tools/bdaddr.c
+++ b/tools/bdaddr.c
@@ -36,7 +36,7 @@
 #include <bluetooth/hci.h>
 #include <bluetooth/hci_lib.h>
 
-#include "oui.h"
+#include "src/oui.h"
 
 static int transient = 0;
 
diff --git a/tools/hciconfig.c b/tools/hciconfig.c
index 6c7f8ed..0e536be 100644
--- a/tools/hciconfig.c
+++ b/tools/hciconfig.c
@@ -42,8 +42,8 @@
 #include <bluetooth/hci.h>
 #include <bluetooth/hci_lib.h>
 
-#include "textfile.h"
-#include "csr.h"
+#include "src/textfile.h"
+#include "tools/csr.h"
 
 static struct hci_dev_info di;
 static int all;
diff --git a/tools/hcitool.c b/tools/hcitool.c
index d85ece1..8a92067 100644
--- a/tools/hcitool.c
+++ b/tools/hcitool.c
@@ -46,8 +46,8 @@
 #include <bluetooth/hci.h>
 #include <bluetooth/hci_lib.h>
 
-#include "textfile.h"
-#include "oui.h"
+#include "src/textfile.h"
+#include "src/oui.h"
 
 /* Unofficial value, might still change */
 #define LE_LINK		0x03
diff --git a/tools/sdptool.c b/tools/sdptool.c
index b4b65ec..d6b7006 100644
--- a/tools/sdptool.c
+++ b/tools/sdptool.c
@@ -45,7 +45,7 @@
 
 #include <netinet/in.h>
 
-#include "sdp-xml.h"
+#include "src/sdp-xml.h"
 
 #ifndef APPLE_AGENT_SVCLASS_ID
 #define APPLE_AGENT_SVCLASS_ID 0x2112