diff --git a/tools/bluetooth-player.c b/tools/bluetooth-player.c
index f10d9be..9e19997 100644
--- a/tools/bluetooth-player.c
+++ b/tools/bluetooth-player.c
@@ -36,9 +36,9 @@
 #include <readline/readline.h>
 #include <readline/history.h>
 #include <glib.h>
-#include <gdbus.h>
 
-#include <client/display.h>
+#include "gdbus/gdbus.h"
+#include "client/display.h"
 
 /* String display constants */
 #define COLORED_NEW	COLOR_GREEN "NEW" COLOR_OFF
diff --git a/tools/gap-tester.c b/tools/gap-tester.c
index 2a0be91..2aa4042 100644
--- a/tools/gap-tester.c
+++ b/tools/gap-tester.c
@@ -25,7 +25,7 @@
 #include <config.h>
 #endif
 
-#include <gdbus.h>
+#include "gdbus/gdbus.h"
 
 #include "src/shared/tester.h"
 #include "emulator/hciemu.h"
diff --git a/tools/gatt-service.c b/tools/gatt-service.c
index 6bca404..33e0d6a 100644
--- a/tools/gatt-service.c
+++ b/tools/gatt-service.c
@@ -33,7 +33,8 @@
 
 #include <glib.h>
 #include <dbus/dbus.h>
-#include <gdbus/gdbus.h>
+
+#include "gdbus/gdbus.h"
 
 #include "src/error.h"
 
diff --git a/tools/mpris-proxy.c b/tools/mpris-proxy.c
index 397f064..693055e 100644
--- a/tools/mpris-proxy.c
+++ b/tools/mpris-proxy.c
@@ -36,7 +36,8 @@
 
 #include <dbus/dbus.h>
 #include <glib.h>
-#include <gdbus/gdbus.h>
+
+#include "gdbus/gdbus.h"
 
 #define BLUEZ_BUS_NAME "org.bluez"
 #define BLUEZ_PATH "/org/bluez"
diff --git a/tools/obexctl.c b/tools/obexctl.c
index b4fdc1c..8dcada8 100644
--- a/tools/obexctl.c
+++ b/tools/obexctl.c
@@ -38,9 +38,9 @@
 #include <readline/readline.h>
 #include <readline/history.h>
 #include <glib.h>
-#include <gdbus.h>
 
-#include <client/display.h>
+#include "gdbus/gdbus.h"
+#include "client/display.h"
 
 /* String display constants */
 #define COLORED_NEW	COLOR_GREEN "NEW" COLOR_OFF