diff --git a/plugins/autopair.c b/plugins/autopair.c
index 8c98c12..c01d81c 100644
--- a/plugins/autopair.c
+++ b/plugins/autopair.c
@@ -33,11 +33,11 @@
 #include <bluetooth/bluetooth.h>
 #include <glib.h>
 
-#include "plugin.h"
-#include "adapter.h"
-#include "device.h"
-#include "log.h"
-#include "storage.h"
+#include "src/plugin.h"
+#include "src/adapter.h"
+#include "src/device.h"
+#include "src/log.h"
+#include "src/storage.h"
 
 /*
  * Plugin to handle automatic pairing of devices with reduced user
diff --git a/plugins/external-dummy.c b/plugins/external-dummy.c
index ff31290..536ad06 100644
--- a/plugins/external-dummy.c
+++ b/plugins/external-dummy.c
@@ -22,8 +22,8 @@
 #include <config.h>
 #endif
 
-#include "plugin.h"
-#include "log.h"
+#include "src/plugin.h"
+#include "src/log.h"
 
 static int dummy_init(void)
 {
diff --git a/plugins/gatt-example.c b/plugins/gatt-example.c
index 9b4187a..d710917 100644
--- a/plugins/gatt-example.c
+++ b/plugins/gatt-example.c
@@ -28,18 +28,18 @@
 
 #include <glib.h>
 #include <errno.h>
-#include <adapter.h>
 
 #include "lib/uuid.h"
-#include "plugin.h"
-#include "hcid.h"
-#include "log.h"
+#include "src/plugin.h"
+#include "src/adapter.h"
+#include "src/hcid.h"
+#include "src/log.h"
 #include "attrib/gattrib.h"
 #include "attrib/gatt-service.h"
 #include "attrib/att.h"
 #include "attrib/gatt.h"
 #include "attrib/att-database.h"
-#include "attrib-server.h"
+#include "src/attrib-server.h"
 
 /* FIXME: Not defined by SIG? UUID128? */
 #define OPCODES_SUPPORTED_UUID          0xA001
diff --git a/plugins/hostname.c b/plugins/hostname.c
index 92a71e0..d4d72d3 100644
--- a/plugins/hostname.c
+++ b/plugins/hostname.c
@@ -30,10 +30,10 @@
 #include <stdlib.h>
 #include <gdbus/gdbus.h>
 
-#include "dbus-common.h"
-#include "plugin.h"
-#include "adapter.h"
-#include "log.h"
+#include "src/dbus-common.h"
+#include "src/plugin.h"
+#include "src/adapter.h"
+#include "src/log.h"
 
 /* http://www.bluetooth.org/Technical/AssignedNumbers/baseband.htm */
 
diff --git a/plugins/neard.c b/plugins/neard.c
index f0f9f4f..ba3b668 100644
--- a/plugins/neard.c
+++ b/plugins/neard.c
@@ -33,14 +33,14 @@
 #include <bluetooth/hci.h>
 #include <bluetooth/sdp.h>
 
-#include "plugin.h"
-#include "log.h"
-#include "dbus-common.h"
-#include "adapter.h"
-#include "device.h"
-#include "eir.h"
-#include "agent.h"
-#include "hcid.h"
+#include "src/plugin.h"
+#include "src/log.h"
+#include "src/dbus-common.h"
+#include "src/adapter.h"
+#include "src/device.h"
+#include "src/eir.h"
+#include "src/agent.h"
+#include "src/hcid.h"
 
 #define NEARD_NAME "org.neard"
 #define NEARD_PATH "/"
diff --git a/plugins/wiimote.c b/plugins/wiimote.c
index 96a6569..c23607f 100644
--- a/plugins/wiimote.c
+++ b/plugins/wiimote.c
@@ -30,11 +30,11 @@
 #include <bluetooth/bluetooth.h>
 #include <glib.h>
 
-#include "plugin.h"
-#include "adapter.h"
-#include "device.h"
-#include "log.h"
-#include "storage.h"
+#include "src/plugin.h"
+#include "src/adapter.h"
+#include "src/device.h"
+#include "src/log.h"
+#include "src/storage.h"
 
 /*
  * Nintendo Wii Remote devices require the bdaddr of the host as pin input for