diff --git a/profiles/alert/server.c b/profiles/alert/server.c
index 4565470..94e9865 100644
--- a/profiles/alert/server.c
+++ b/profiles/alert/server.c
@@ -33,21 +33,21 @@
 #include <stdlib.h>
 
 #include "lib/uuid.h"
-#include "plugin.h"
-#include "dbus-common.h"
+#include "src/plugin.h"
+#include "src/dbus-common.h"
 #include "attrib/att.h"
-#include "adapter.h"
-#include "device.h"
+#include "src/adapter.h"
+#include "src/device.h"
 #include "attrib/att-database.h"
-#include "log.h"
+#include "src/log.h"
 #include "attrib/gatt-service.h"
 #include "attrib/gattrib.h"
-#include "attrib-server.h"
+#include "src/attrib-server.h"
 #include "attrib/gatt.h"
-#include "profile.h"
-#include "error.h"
-#include "textfile.h"
-#include "attio.h"
+#include "src/profile.h"
+#include "src/error.h"
+#include "src/textfile.h"
+#include "src/attio.h"
 
 #define PHONE_ALERT_STATUS_SVC_UUID	0x180E
 #define ALERT_NOTIF_SVC_UUID		0x1811
diff --git a/profiles/audio/a2dp.c b/profiles/audio/a2dp.c
index 29a1593..cabdd66 100644
--- a/profiles/audio/a2dp.c
+++ b/profiles/audio/a2dp.c
@@ -43,14 +43,14 @@
 #include "src/device.h"
 #include "src/profile.h"
 #include "src/service.h"
+#include "src/log.h"
+#include "src/sdpd.h"
 
-#include "log.h"
 #include "avdtp.h"
 #include "sink.h"
 #include "source.h"
 #include "a2dp.h"
 #include "a2dp-codecs.h"
-#include "sdpd.h"
 #include "media.h"
 
 /* The duration that streams without users are allowed to stay in
diff --git a/profiles/audio/avctp.c b/profiles/audio/avctp.c
index 6669ddc..1b55f7b 100644
--- a/profiles/audio/avctp.c
+++ b/profiles/audio/avctp.c
@@ -50,9 +50,10 @@
 #include "src/adapter.h"
 #include "src/device.h"
 
-#include "log.h"
-#include "error.h"
-#include "uinput.h"
+#include "src/log.h"
+#include "src/error.h"
+#include "src/uinput.h"
+
 #include "avctp.h"
 #include "avrcp.h"
 
diff --git a/profiles/audio/avdtp.c b/profiles/audio/avdtp.c
index f866b39..b3d8351 100644
--- a/profiles/audio/avdtp.c
+++ b/profiles/audio/avdtp.c
@@ -41,7 +41,7 @@
 #include <glib.h>
 #include <btio/btio.h>
 
-#include "log.h"
+#include "src/log.h"
 
 #include "lib/uuid.h"
 #include "src/adapter.h"
diff --git a/profiles/audio/avrcp.c b/profiles/audio/avrcp.c
index dbeaf38..b673c5e 100644
--- a/profiles/audio/avrcp.c
+++ b/profiles/audio/avrcp.c
@@ -53,12 +53,13 @@
 #include "src/profile.h"
 #include "src/service.h"
 
-#include "log.h"
-#include "error.h"
+#include "src/log.h"
+#include "src/error.h"
+#include "src/sdpd.h"
+#include "src/dbus-common.h"
+
 #include "avctp.h"
 #include "avrcp.h"
-#include "sdpd.h"
-#include "dbus-common.h"
 #include "control.h"
 #include "player.h"
 #include "transport.h"
diff --git a/profiles/audio/control.c b/profiles/audio/control.c
index 4692ef0..ab94a57 100644
--- a/profiles/audio/control.c
+++ b/profiles/audio/control.c
@@ -51,13 +51,14 @@
 #include "src/profile.h"
 #include "src/service.h"
 
-#include "log.h"
-#include "error.h"
+#include "src/log.h"
+#include "src/error.h"
+#include "src/sdpd.h"
+#include "src/uuid-helper.h"
+#include "src/dbus-common.h"
+
 #include "avctp.h"
 #include "control.h"
-#include "sdpd.h"
-#include "uuid-helper.h"
-#include "dbus-common.h"
 
 static GSList *devices = NULL;
 
diff --git a/profiles/audio/media.c b/profiles/audio/media.c
index 12e23a5..b71196a 100644
--- a/profiles/audio/media.c
+++ b/profiles/audio/media.c
@@ -40,9 +40,10 @@
 #include "src/dbus-common.h"
 #include "src/profile.h"
 
-#include "uuid-helper.h"
-#include "log.h"
-#include "error.h"
+#include "src/uuid-helper.h"
+#include "src/log.h"
+#include "src/error.h"
+
 #include "avdtp.h"
 #include "media.h"
 #include "transport.h"
diff --git a/profiles/audio/player.c b/profiles/audio/player.c
index 6150c8a..e6d24eb 100644
--- a/profiles/audio/player.c
+++ b/profiles/audio/player.c
@@ -38,10 +38,11 @@
 #include <dbus/dbus.h>
 #include <gdbus/gdbus.h>
 
-#include "log.h"
+#include "src/log.h"
+#include "src/dbus-common.h"
+#include "src/error.h"
+
 #include "player.h"
-#include "dbus-common.h"
-#include "error.h"
 
 #define MEDIA_PLAYER_INTERFACE "org.bluez.MediaPlayer1"
 #define MEDIA_FOLDER_INTERFACE "org.bluez.MediaFolder1"
diff --git a/profiles/audio/sink.c b/profiles/audio/sink.c
index 4f39622..d16af23 100644
--- a/profiles/audio/sink.c
+++ b/profiles/audio/sink.c
@@ -37,18 +37,18 @@
 #include <dbus/dbus.h>
 #include <gdbus/gdbus.h>
 
-#include "log.h"
+#include "src/log.h"
 
 #include "src/adapter.h"
 #include "src/device.h"
 #include "src/service.h"
+#include "src/error.h"
+#include "src/dbus-common.h"
 
 #include "avdtp.h"
 #include "media.h"
 #include "a2dp.h"
-#include "error.h"
 #include "sink.h"
-#include "dbus-common.h"
 
 #define STREAM_SETUP_RETRY_TIMER 2
 
diff --git a/profiles/audio/source.c b/profiles/audio/source.c
index 7b129b7..843b3e8 100644
--- a/profiles/audio/source.c
+++ b/profiles/audio/source.c
@@ -38,18 +38,18 @@
 #include <dbus/dbus.h>
 #include <gdbus/gdbus.h>
 
-#include "log.h"
+#include "src/log.h"
 
 #include "src/adapter.h"
 #include "src/device.h"
 #include "src/service.h"
+#include "src/error.h"
+#include "src/dbus-common.h"
 
 #include "avdtp.h"
 #include "media.h"
 #include "a2dp.h"
-#include "error.h"
 #include "source.h"
-#include "dbus-common.h"
 
 struct source {
 	struct btd_service *service;
diff --git a/profiles/audio/transport.c b/profiles/audio/transport.c
index 087c0ee..c82fbb5 100644
--- a/profiles/audio/transport.c
+++ b/profiles/audio/transport.c
@@ -36,8 +36,9 @@
 #include "src/device.h"
 #include "src/dbus-common.h"
 
-#include "log.h"
-#include "error.h"
+#include "src/log.h"
+#include "src/error.h"
+
 #include "avdtp.h"
 #include "media.h"
 #include "transport.h"
diff --git a/profiles/cyclingspeed/cyclingspeed.c b/profiles/cyclingspeed/cyclingspeed.c
index b6d881a..f78c224 100644
--- a/profiles/cyclingspeed/cyclingspeed.c
+++ b/profiles/cyclingspeed/cyclingspeed.c
@@ -30,18 +30,18 @@
 #include <gdbus/gdbus.h>
 
 #include "lib/uuid.h"
-#include "plugin.h"
-#include "adapter.h"
-#include "device.h"
-#include "profile.h"
-#include "service.h"
-#include "dbus-common.h"
-#include "error.h"
+#include "src/plugin.h"
+#include "src/adapter.h"
+#include "src/device.h"
+#include "src/profile.h"
+#include "src/service.h"
+#include "src/dbus-common.h"
+#include "src/error.h"
 #include "attrib/gattrib.h"
 #include "attrib/att.h"
 #include "attrib/gatt.h"
-#include "attio.h"
-#include "log.h"
+#include "src/attio.h"
+#include "src/log.h"
 
 /* min length for ATT indication or notification: opcode (1b) + handle (2b) */
 #define ATT_HDR_LEN 3
diff --git a/profiles/deviceinfo/deviceinfo.c b/profiles/deviceinfo/deviceinfo.c
index bfecfc2..661a5dc 100644
--- a/profiles/deviceinfo/deviceinfo.c
+++ b/profiles/deviceinfo/deviceinfo.c
@@ -30,16 +30,16 @@
 #include <glib.h>
 
 #include "lib/uuid.h"
-#include "plugin.h"
-#include "adapter.h"
-#include "device.h"
-#include "profile.h"
-#include "service.h"
+#include "src/plugin.h"
+#include "src/adapter.h"
+#include "src/device.h"
+#include "src/profile.h"
+#include "src/service.h"
 #include "attrib/gattrib.h"
-#include "attio.h"
+#include "src/attio.h"
 #include "attrib/att.h"
 #include "attrib/gatt.h"
-#include "log.h"
+#include "src/log.h"
 
 #define PNP_ID_SIZE	7
 
diff --git a/profiles/gatt/gas.c b/profiles/gatt/gas.c
index de07464..f10db99 100644
--- a/profiles/gatt/gas.c
+++ b/profiles/gatt/gas.c
@@ -35,17 +35,17 @@
 #include <btio/btio.h>
 
 #include "lib/uuid.h"
-#include "plugin.h"
-#include "adapter.h"
-#include "device.h"
-#include "profile.h"
-#include "service.h"
+#include "src/plugin.h"
+#include "src/adapter.h"
+#include "src/device.h"
+#include "src/profile.h"
+#include "src/service.h"
 #include "attrib/att.h"
 #include "attrib/gattrib.h"
-#include "attio.h"
+#include "src/attio.h"
 #include "attrib/gatt.h"
-#include "log.h"
-#include "textfile.h"
+#include "src/log.h"
+#include "src/textfile.h"
 
 /* Generic Attribute/Access Service */
 struct gas {
diff --git a/profiles/health/hdp.c b/profiles/health/hdp.c
index 6203fa8..ccaa1b1 100644
--- a/profiles/health/hdp.c
+++ b/profiles/health/hdp.c
@@ -27,18 +27,19 @@
 #include <stdlib.h>
 #include <stdint.h>
 #include <stdbool.h>
-#include <sdpd.h>
 #include <unistd.h>
 
 #include <glib.h>
 
+#include <bluetooth/bluetooth.h>
 #include <bluetooth/l2cap.h>
 #include <gdbus/gdbus.h>
-#include <dbus-common.h>
-#include <log.h>
-#include <error.h>
-#include <adapter.h>
-#include <device.h>
+#include "src/dbus-common.h"
+#include "src/log.h"
+#include "src/error.h"
+#include "src/adapter.h"
+#include "src/device.h"
+#include "src/sdpd.h"
 #include <btio/btio.h>
 
 #include "mcap_lib.h"
diff --git a/profiles/health/hdp_main.c b/profiles/health/hdp_main.c
index e705ee9..6dc9acf 100644
--- a/profiles/health/hdp_main.c
+++ b/profiles/health/hdp_main.c
@@ -25,10 +25,10 @@
 #endif
 
 #include <errno.h>
-
 #include <gdbus/gdbus.h>
 
-#include "plugin.h"
+#include "src/plugin.h"
+
 #include "hdp_manager.h"
 
 static int hdp_init(void)
diff --git a/profiles/health/hdp_manager.c b/profiles/health/hdp_manager.c
index 168281f..c6d2149 100644
--- a/profiles/health/hdp_manager.c
+++ b/profiles/health/hdp_manager.c
@@ -29,17 +29,16 @@
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
 
-#include "lib/uuid.h"
 #include <btio/btio.h>
-#include <adapter.h>
-#include <device.h>
-#include <profile.h>
-#include <service.h>
-#include <uuid-helper.h>
-#include <log.h>
+#include "lib/uuid.h"
+#include "src/adapter.h"
+#include "src/device.h"
+#include "src/profile.h"
+#include "src/service.h"
+#include "src/uuid-helper.h"
+#include "src/log.h"
 
 #include "hdp_types.h"
-
 #include "hdp_manager.h"
 #include "hdp.h"
 
diff --git a/profiles/health/hdp_util.c b/profiles/health/hdp_util.c
index 4335930..58770b5 100644
--- a/profiles/health/hdp_util.c
+++ b/profiles/health/hdp_util.c
@@ -31,20 +31,23 @@
 
 #include <gdbus/gdbus.h>
 
-#include <adapter.h>
-#include <device.h>
-
-#include <sdpd.h>
+#include <bluetooth/bluetooth.h>
+#include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
-#include <sdp-client.h>
-#include <uuid-helper.h>
+
+#include "src/adapter.h"
+#include "src/device.h"
+
+#include "src/sdpd.h"
+#include "src/sdp-client.h"
+#include "src/uuid-helper.h"
 
 #include "lib/uuid.h"
 #include "btio/btio.h"
 
-#include "log.h"
+#include "src/log.h"
+#include "src/dbus-common.h"
 
-#include "dbus-common.h"
 #include "mcap.h"
 #include "mcap_lib.h"
 #include "hdp_types.h"
diff --git a/profiles/health/mcap.c b/profiles/health/mcap.c
index 6d821f3..1463a25 100644
--- a/profiles/health/mcap.c
+++ b/profiles/health/mcap.c
@@ -35,8 +35,8 @@
 #include <bluetooth/l2cap.h>
 
 #include <btio/btio.h>
-#include <log.h>
-#include <error.h>
+#include "src/log.h"
+#include "src/error.h"
 
 #include "mcap.h"
 #include "mcap_lib.h"
diff --git a/profiles/health/mcap_sync.c b/profiles/health/mcap_sync.c
index cba7a2a..dc990d1 100644
--- a/profiles/health/mcap_sync.c
+++ b/profiles/health/mcap_sync.c
@@ -33,9 +33,9 @@
 
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/l2cap.h>
-#include <adapter.h>
 #include <btio/btio.h>
-#include <log.h>
+#include "src/adapter.h"
+#include "src/log.h"
 
 #include "mcap.h"
 #include "mcap_lib.h"
diff --git a/profiles/heartrate/heartrate.c b/profiles/heartrate/heartrate.c
index 3be8f9e..97af02e 100644
--- a/profiles/heartrate/heartrate.c
+++ b/profiles/heartrate/heartrate.c
@@ -30,18 +30,18 @@
 #include <gdbus/gdbus.h>
 
 #include "lib/uuid.h"
-#include "plugin.h"
-#include "adapter.h"
-#include "dbus-common.h"
-#include "device.h"
-#include "profile.h"
-#include "service.h"
-#include "error.h"
+#include "src/plugin.h"
+#include "src/adapter.h"
+#include "src/dbus-common.h"
+#include "src/device.h"
+#include "src/profile.h"
+#include "src/service.h"
+#include "src/error.h"
 #include "attrib/gattrib.h"
 #include "attrib/att.h"
 #include "attrib/gatt.h"
-#include "attio.h"
-#include "log.h"
+#include "src/attio.h"
+#include "src/log.h"
 
 #define HEART_RATE_INTERFACE		"org.bluez.HeartRate1"
 #define HEART_RATE_MANAGER_INTERFACE	"org.bluez.HeartRateManager1"
diff --git a/profiles/input/device.c b/profiles/input/device.c
index 62f6dbb..8351147 100644
--- a/profiles/input/device.c
+++ b/profiles/input/device.c
@@ -39,21 +39,21 @@
 
 #include <gdbus/gdbus.h>
 
-#include "log.h"
+#include "src/log.h"
 
 #include "lib/uuid.h"
-#include "../src/adapter.h"
-#include "../src/device.h"
-#include "../src/profile.h"
-#include "../src/service.h"
-#include "../src/storage.h"
-#include "../src/dbus-common.h"
+#include "src/adapter.h"
+#include "src/device.h"
+#include "src/profile.h"
+#include "src/service.h"
+#include "src/storage.h"
+#include "src/dbus-common.h"
+#include "src/error.h"
+#include "src/sdp-client.h"
 
 #include "device.h"
-#include "error.h"
-#include <btio/btio.h>
 
-#include "sdp-client.h"
+#include <btio/btio.h>
 
 #define INPUT_INTERFACE "org.bluez.Input1"
 
diff --git a/profiles/input/hog.c b/profiles/input/hog.c
index e357aa0..ded6303 100644
--- a/profiles/input/hog.c
+++ b/profiles/input/hog.c
@@ -40,7 +40,7 @@
 
 #include <glib.h>
 
-#include "log.h"
+#include "src/log.h"
 
 #include "lib/uuid.h"
 #include "src/adapter.h"
@@ -48,11 +48,12 @@
 #include "src/profile.h"
 #include "src/service.h"
 
-#include "plugin.h"
+#include "src/plugin.h"
+
 #include "suspend.h"
 #include "attrib/att.h"
 #include "attrib/gattrib.h"
-#include "attio.h"
+#include "src/attio.h"
 #include "attrib/gatt.h"
 
 #define HOG_UUID		"00001812-0000-1000-8000-00805f9b34fb"
diff --git a/profiles/input/manager.c b/profiles/input/manager.c
index 660043e..6ef83f4 100644
--- a/profiles/input/manager.c
+++ b/profiles/input/manager.c
@@ -32,14 +32,14 @@
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
 
-#include "log.h"
-#include "plugin.h"
+#include "src/log.h"
+#include "src/plugin.h"
 
 #include "lib/uuid.h"
-#include "../src/adapter.h"
-#include "../src/device.h"
-#include "../src/profile.h"
-#include "../src/service.h"
+#include "src/adapter.h"
+#include "src/device.h"
+#include "src/profile.h"
+#include "src/service.h"
 
 #include "device.h"
 #include "server.h"
diff --git a/profiles/input/server.c b/profiles/input/server.c
index 7a07d08..650ece1 100644
--- a/profiles/input/server.c
+++ b/profiles/input/server.c
@@ -35,14 +35,14 @@
 #include <glib.h>
 #include <dbus/dbus.h>
 
-#include "log.h"
+#include "src/log.h"
 
-#include "uuid-helper.h"
+#include "src/uuid-helper.h"
 #include "btio/btio.h"
 #include "lib/uuid.h"
-#include "../src/adapter.h"
-#include "../src/device.h"
-#include "../src/profile.h"
+#include "src/adapter.h"
+#include "src/device.h"
+#include "src/profile.h"
 
 #include "device.h"
 #include "server.h"
diff --git a/profiles/input/suspend-dummy.c b/profiles/input/suspend-dummy.c
index 75dd536..542ae25 100644
--- a/profiles/input/suspend-dummy.c
+++ b/profiles/input/suspend-dummy.c
@@ -37,7 +37,7 @@
 
 #include <glib.h>
 
-#include "log.h"
+#include "src/log.h"
 #include "suspend.h"
 
 #define HOG_SUSPEND_FIFO	"/tmp/hogsuspend"
diff --git a/profiles/network/bnep.c b/profiles/network/bnep.c
index 2a74016..303489d 100644
--- a/profiles/network/bnep.c
+++ b/profiles/network/bnep.c
@@ -43,10 +43,11 @@
 
 #include <glib.h>
 
-#include "log.h"
-#include "bnep.h"
+#include "src/log.h"
 #include "lib/uuid.h"
 
+#include "bnep.h"
+
 #define CON_SETUP_RETRIES      3
 #define CON_SETUP_TO           9
 
diff --git a/profiles/network/connection.c b/profiles/network/connection.c
index c66987d..d4697c5 100644
--- a/profiles/network/connection.c
+++ b/profiles/network/connection.c
@@ -39,14 +39,14 @@
 #include <gdbus/gdbus.h>
 #include <btio/btio.h>
 
-#include "log.h"
-#include "dbus-common.h"
-#include "adapter.h"
-#include "device.h"
-#include "profile.h"
-#include "service.h"
-
-#include "error.h"
+#include "src/log.h"
+#include "src/dbus-common.h"
+#include "src/adapter.h"
+#include "src/device.h"
+#include "src/profile.h"
+#include "src/service.h"
+#include "src/error.h"
+
 #include "bnep.h"
 #include "connection.h"
 
diff --git a/profiles/network/manager.c b/profiles/network/manager.c
index 47aebcb..0fe98a0 100644
--- a/profiles/network/manager.c
+++ b/profiles/network/manager.c
@@ -35,14 +35,15 @@
 #include <glib.h>
 #include <gdbus/gdbus.h>
 
-#include "log.h"
-#include "plugin.h"
+#include "src/log.h"
+#include "src/plugin.h"
 
 #include "lib/uuid.h"
-#include "adapter.h"
-#include "device.h"
-#include "profile.h"
-#include "service.h"
+#include "src/adapter.h"
+#include "src/device.h"
+#include "src/profile.h"
+#include "src/service.h"
+
 #include "bnep.h"
 #include "connection.h"
 #include "server.h"
diff --git a/profiles/network/server.c b/profiles/network/server.c
index 7cb5a1e..5f42b85 100644
--- a/profiles/network/server.c
+++ b/profiles/network/server.c
@@ -41,12 +41,11 @@
 #include <btio/btio.h>
 
 #include "lib/uuid.h"
-#include "../src/dbus-common.h"
-#include "../src/adapter.h"
-
-#include "log.h"
-#include "error.h"
-#include "sdpd.h"
+#include "src/dbus-common.h"
+#include "src/adapter.h"
+#include "src/log.h"
+#include "src/error.h"
+#include "src/sdpd.h"
 
 #include "bnep.h"
 #include "server.h"
diff --git a/profiles/proximity/immalert.c b/profiles/proximity/immalert.c
index 2f8d4e7..1638cf9 100644
--- a/profiles/proximity/immalert.c
+++ b/profiles/proximity/immalert.c
@@ -27,23 +27,24 @@
 #include <stdbool.h>
 
 #include <glib.h>
-#include <adapter.h>
 
 #include <dbus/dbus.h>
 #include <gdbus/gdbus.h>
 
 #include "lib/uuid.h"
-#include "log.h"
+#include "src/log.h"
+#include "src/adapter.h"
 #include "attrib/gattrib.h"
 #include "attrib/att.h"
 #include "attrib/gatt.h"
 #include "attrib/att-database.h"
 #include "attrib/gatt-service.h"
-#include "attrib-server.h"
-#include "device.h"
-#include "profile.h"
-#include "attio.h"
-#include "dbus-common.h"
+#include "src/attrib-server.h"
+#include "src/device.h"
+#include "src/profile.h"
+#include "src/attio.h"
+#include "src/dbus-common.h"
+
 #include "reporter.h"
 #include "immalert.h"
 
diff --git a/profiles/proximity/linkloss.c b/profiles/proximity/linkloss.c
index a7ed96c..db16820 100644
--- a/profiles/proximity/linkloss.c
+++ b/profiles/proximity/linkloss.c
@@ -27,23 +27,25 @@
 #include <stdbool.h>
 
 #include <glib.h>
-#include <adapter.h>
 
 #include <dbus/dbus.h>
 #include <gdbus/gdbus.h>
 
 #include "lib/uuid.h"
-#include "log.h"
+#include "src/log.h"
+#include "src/adapter.h"
+#include "src/device.h"
 #include "attrib/att-database.h"
 #include "attrib/gattrib.h"
 #include "attrib/att.h"
 #include "attrib/gatt.h"
 #include "attrib/gatt-service.h"
-#include "attrib-server.h"
-#include "device.h"
-#include "profile.h"
-#include "attio.h"
-#include "dbus-common.h"
+#include "src/attrib-server.h"
+#include "src/service.h"
+#include "src/profile.h"
+#include "src/attio.h"
+#include "src/dbus-common.h"
+
 #include "reporter.h"
 #include "linkloss.h"
 
diff --git a/profiles/proximity/main.c b/profiles/proximity/main.c
index 46468d2..d4fe419 100644
--- a/profiles/proximity/main.c
+++ b/profiles/proximity/main.c
@@ -31,10 +31,10 @@
 #include <glib.h>
 #include <gdbus/gdbus.h>
 
-#include "log.h"
-#include "plugin.h"
+#include "src/log.h"
+#include "src/plugin.h"
+#include "src/hcid.h"
 #include "manager.h"
-#include "hcid.h"
 
 static GKeyFile *config = NULL;
 
diff --git a/profiles/proximity/manager.c b/profiles/proximity/manager.c
index 7dab23f..3f0f63c 100644
--- a/profiles/proximity/manager.c
+++ b/profiles/proximity/manager.c
@@ -32,10 +32,10 @@
 #include <gdbus/gdbus.h>
 
 #include "lib/uuid.h"
-#include "adapter.h"
-#include "device.h"
-#include "profile.h"
-#include "service.h"
+#include "src/adapter.h"
+#include "src/device.h"
+#include "src/profile.h"
+#include "src/service.h"
 #include "attrib/att.h"
 #include "attrib/gattrib.h"
 #include "attrib/gatt.h"
diff --git a/profiles/proximity/monitor.c b/profiles/proximity/monitor.c
index e78bfc3..f2e0739 100644
--- a/profiles/proximity/monitor.c
+++ b/profiles/proximity/monitor.c
@@ -39,17 +39,18 @@
 #include <bluetooth/bluetooth.h>
 
 #include "lib/uuid.h"
-#include "dbus-common.h"
-#include "adapter.h"
-#include "device.h"
-#include "error.h"
-#include "log.h"
+#include "src/dbus-common.h"
+#include "src/adapter.h"
+#include "src/device.h"
+#include "src/error.h"
+#include "src/log.h"
 #include "attrib/att.h"
 #include "attrib/gattrib.h"
 #include "attrib/gatt.h"
-#include "attio.h"
+#include "src/attio.h"
+#include "src/textfile.h"
+
 #include "monitor.h"
-#include "textfile.h"
 
 #define PROXIMITY_INTERFACE "org.bluez.ProximityMonitor1"
 
diff --git a/profiles/proximity/reporter.c b/profiles/proximity/reporter.c
index dbb593a..bda993d 100644
--- a/profiles/proximity/reporter.c
+++ b/profiles/proximity/reporter.c
@@ -30,25 +30,26 @@
 #include <errno.h>
 
 #include <glib.h>
-#include <adapter.h>
 
 #include <dbus/dbus.h>
 #include <gdbus/gdbus.h>
 
-#include "log.h"
+#include "src/log.h"
 
 #include "lib/uuid.h"
-#include "dbus-common.h"
-#include "error.h"
-#include "device.h"
-#include "profile.h"
-#include "service.h"
-#include "hcid.h"
+#include "src/dbus-common.h"
+#include "src/error.h"
+#include "src/adapter.h"
+#include "src/device.h"
+#include "src/profile.h"
+#include "src/service.h"
+#include "src/hcid.h"
 #include "attrib/gattrib.h"
 #include "attrib/att.h"
 #include "attrib/gatt.h"
 #include "attrib/att-database.h"
-#include "attrib-server.h"
+#include "src/attrib-server.h"
+
 #include "reporter.h"
 #include "linkloss.h"
 #include "immalert.h"
diff --git a/profiles/sap/main.c b/profiles/sap/main.c
index 8cc9533..ad55cd2 100644
--- a/profiles/sap/main.c
+++ b/profiles/sap/main.c
@@ -24,7 +24,7 @@
 
 #include <errno.h>
 #include <gdbus/gdbus.h>
-#include "plugin.h"
+#include "src/plugin.h"
 #include "manager.h"
 
 static int sap_init(void)
diff --git a/profiles/sap/manager.c b/profiles/sap/manager.c
index bfb81a5..5c2a0f1 100644
--- a/profiles/sap/manager.c
+++ b/profiles/sap/manager.c
@@ -24,11 +24,11 @@
 
 #include <stdbool.h>
 
-#include "log.h"
-#include "adapter.h"
-#include "device.h"
-#include "profile.h"
-#include "service.h"
+#include "src/log.h"
+#include "src/adapter.h"
+#include "src/device.h"
+#include "src/profile.h"
+#include "src/service.h"
 
 #include "manager.h"
 #include "server.h"
diff --git a/profiles/sap/sap-dummy.c b/profiles/sap/sap-dummy.c
index 47dedf7..854105e 100644
--- a/profiles/sap/sap-dummy.c
+++ b/profiles/sap/sap-dummy.c
@@ -30,9 +30,9 @@
 #include <gdbus/gdbus.h>
 #include <stdint.h>
 
-#include "dbus-common.h"
-#include "error.h"
-#include "log.h"
+#include "src/dbus-common.h"
+#include "src/error.h"
+#include "src/log.h"
 #include "sap.h"
 
 #define SAP_DUMMY_IFACE "org.bluez.SimAccessTest1"
diff --git a/profiles/sap/sap-u8500.c b/profiles/sap/sap-u8500.c
index 39169a0..d043029 100644
--- a/profiles/sap/sap-u8500.c
+++ b/profiles/sap/sap-u8500.c
@@ -36,7 +36,7 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 
-#include "log.h"
+#include "src/log.h"
 #include "sap.h"
 
 #define STE_SIMD_SOCK  "/dev/socket/catd_a"
diff --git a/profiles/sap/server.c b/profiles/sap/server.c
index 119862d..711853f 100644
--- a/profiles/sap/server.c
+++ b/profiles/sap/server.c
@@ -35,11 +35,11 @@
 
 #include "lib/uuid.h"
 #include "btio/btio.h"
-#include "adapter.h"
-#include "sdpd.h"
-#include "log.h"
-#include "error.h"
-#include "dbus-common.h"
+#include "src/adapter.h"
+#include "src/sdpd.h"
+#include "src/log.h"
+#include "src/error.h"
+#include "src/dbus-common.h"
 #include "sap.h"
 #include "server.h"
 
diff --git a/profiles/scanparam/scan.c b/profiles/scanparam/scan.c
index d3f3aa5..4fd8f53 100644
--- a/profiles/scanparam/scan.c
+++ b/profiles/scanparam/scan.c
@@ -30,16 +30,16 @@
 #include <errno.h>
 
 #include "lib/uuid.h"
-#include "log.h"
-#include "plugin.h"
-#include "adapter.h"
-#include "device.h"
-#include "profile.h"
-#include "service.h"
+#include "src/log.h"
+#include "src/plugin.h"
+#include "src/adapter.h"
+#include "src/device.h"
+#include "src/profile.h"
+#include "src/service.h"
 #include "attrib/att.h"
 #include "attrib/gattrib.h"
 #include "attrib/gatt.h"
-#include "attio.h"
+#include "src/attio.h"
 
 #define SCAN_PARAMETERS_UUID		"00001813-0000-1000-8000-00805f9b34fb"
 
diff --git a/profiles/thermometer/thermometer.c b/profiles/thermometer/thermometer.c
index 85cca03..c9ab759 100644
--- a/profiles/thermometer/thermometer.c
+++ b/profiles/thermometer/thermometer.c
@@ -30,16 +30,16 @@
 #include <gdbus/gdbus.h>
 
 #include "lib/uuid.h"
-#include "plugin.h"
-#include "dbus-common.h"
-#include "adapter.h"
-#include "device.h"
-#include "profile.h"
-#include "service.h"
-#include "error.h"
-#include "log.h"
+#include "src/plugin.h"
+#include "src/dbus-common.h"
+#include "src/adapter.h"
+#include "src/device.h"
+#include "src/profile.h"
+#include "src/service.h"
+#include "src/error.h"
+#include "src/log.h"
 #include "attrib/gattrib.h"
-#include "attio.h"
+#include "src/attio.h"
 #include "attrib/att.h"
 #include "attrib/gatt.h"
 
diff --git a/profiles/time/server.c b/profiles/time/server.c
index 178d4d2..142d15c 100644
--- a/profiles/time/server.c
+++ b/profiles/time/server.c
@@ -31,19 +31,19 @@
 #include <errno.h>
 #include <stdbool.h>
 
-#include <adapter.h>
-#include <device.h>
-#include <profile.h>
-#include <plugin.h>
+#include "src/adapter.h"
+#include "src/device.h"
+#include "src/profile.h"
+#include "src/plugin.h"
 
 #include "lib/uuid.h"
 #include "attrib/gattrib.h"
 #include "attrib/att.h"
 #include "attrib/gatt.h"
 #include "attrib/att-database.h"
-#include "attrib-server.h"
+#include "src/attrib-server.h"
 #include "attrib/gatt-service.h"
-#include "log.h"
+#include "src/log.h"
 
 #define CURRENT_TIME_SVC_UUID		0x1805
 #define REF_TIME_UPDATE_SVC_UUID	0x1806