diff --git a/Makefile.am b/Makefile.am
index e8a247a..2006e19 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -347,9 +347,7 @@ EXTRA_DIST += doc/manager-api.txt \
 AM_CFLAGS += @DBUS_CFLAGS@ @GLIB_CFLAGS@
 
 AM_CPPFLAGS = -I$(builddir)/lib -I$(builddir)/src -I$(srcdir)/src \
-			-I$(srcdir)/profiles/audio -I$(srcdir)/gdbus \
-			-I$(srcdir)/attrib -I$(srcdir)/btio -I$(srcdir)/tools \
-			-I$(builddir)/tools -I$(srcdir)/monitor
+			-I$(srcdir)/gdbus -I$(srcdir)/btio
 
 if MCAP
 AM_CPPFLAGS += -I$(builddir)/health
diff --git a/emulator/b1ee.c b/emulator/b1ee.c
index 59c0650..17a60fc 100644
--- a/emulator/b1ee.c
+++ b/emulator/b1ee.c
@@ -39,7 +39,7 @@
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/hci.h>
 
-#include "mainloop.h"
+#include "monitor/mainloop.h"
 
 #define DEFAULT_SERVER		"b1ee.com"
 #define DEFAULT_HOST_PORT	"45550"		/* 0xb1ee */
diff --git a/emulator/btdev.c b/emulator/btdev.c
index 188ecf3..700c6a8 100644
--- a/emulator/btdev.c
+++ b/emulator/btdev.c
@@ -31,7 +31,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "bt.h"
+#include "monitor/bt.h"
 #include "btdev.h"
 
 #define le16_to_cpu(val) (val)
diff --git a/emulator/main.c b/emulator/main.c
index bcb2db3..6a30c8c 100644
--- a/emulator/main.c
+++ b/emulator/main.c
@@ -30,7 +30,7 @@
 #include <stdlib.h>
 #include <getopt.h>
 
-#include "mainloop.h"
+#include "monitor/mainloop.h"
 #include "server.h"
 #include "vhci.h"
 
diff --git a/emulator/server.c b/emulator/server.c
index 61f2275..841c2b3 100644
--- a/emulator/server.c
+++ b/emulator/server.c
@@ -42,7 +42,7 @@
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/hci.h>
 
-#include "mainloop.h"
+#include "monitor/mainloop.h"
 #include "btdev.h"
 #include "server.h"
 
diff --git a/emulator/vhci.c b/emulator/vhci.c
index 6b66105..52876ba 100644
--- a/emulator/vhci.c
+++ b/emulator/vhci.c
@@ -33,7 +33,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "mainloop.h"
+#include "monitor/mainloop.h"
 #include "btdev.h"
 #include "vhci.h"
 
diff --git a/plugins/gatt-example.c b/plugins/gatt-example.c
index 2d9ffe2..de090e9 100644
--- a/plugins/gatt-example.c
+++ b/plugins/gatt-example.c
@@ -34,11 +34,11 @@
 #include "plugin.h"
 #include "hcid.h"
 #include "log.h"
-#include "gattrib.h"
-#include "gatt-service.h"
-#include "att.h"
-#include "gatt.h"
-#include "att-database.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"
 
 /* FIXME: Not defined by SIG? UUID128? */
diff --git a/profiles/alert/server.c b/profiles/alert/server.c
index 761a24b..1c92906 100644
--- a/profiles/alert/server.c
+++ b/profiles/alert/server.c
@@ -34,15 +34,15 @@
 #include <stdlib.h>
 
 #include "dbus-common.h"
-#include "att.h"
+#include "attrib/att.h"
 #include "adapter.h"
 #include "device.h"
-#include "att-database.h"
+#include "attrib/att-database.h"
 #include "log.h"
-#include "gatt-service.h"
-#include "gattrib.h"
+#include "attrib/gatt-service.h"
+#include "attrib/gattrib.h"
 #include "attrib-server.h"
-#include "gatt.h"
+#include "attrib/gatt.h"
 #include "server.h"
 #include "profile.h"
 #include "error.h"
diff --git a/profiles/deviceinfo/deviceinfo.c b/profiles/deviceinfo/deviceinfo.c
index 57652a0..9910533 100644
--- a/profiles/deviceinfo/deviceinfo.c
+++ b/profiles/deviceinfo/deviceinfo.c
@@ -31,10 +31,10 @@
 
 #include "adapter.h"
 #include "device.h"
-#include "gattrib.h"
+#include "attrib/gattrib.h"
 #include "attio.h"
-#include "att.h"
-#include "gatt.h"
+#include "attrib/att.h"
+#include "attrib/gatt.h"
 #include "log.h"
 #include "deviceinfo.h"
 
diff --git a/profiles/deviceinfo/manager.c b/profiles/deviceinfo/manager.c
index 3217283..8eab62c 100644
--- a/profiles/deviceinfo/manager.c
+++ b/profiles/deviceinfo/manager.c
@@ -28,9 +28,9 @@
 #include "adapter.h"
 #include "device.h"
 #include "profile.h"
-#include "att.h"
-#include "gattrib.h"
-#include "gatt.h"
+#include "attrib/att.h"
+#include "attrib/gattrib.h"
+#include "attrib/gatt.h"
 #include "deviceinfo.h"
 #include "manager.h"
 
diff --git a/profiles/gatt/gas.c b/profiles/gatt/gas.c
index 793a3af..0e82097 100644
--- a/profiles/gatt/gas.c
+++ b/profiles/gatt/gas.c
@@ -36,11 +36,11 @@
 
 #include "adapter.h"
 #include "device.h"
-#include "att.h"
-#include "gattrib.h"
+#include "attrib/att.h"
+#include "attrib/gattrib.h"
 #include "attio.h"
 #include "btio.h"
-#include "gatt.h"
+#include "attrib/gatt.h"
 #include "log.h"
 #include "textfile.h"
 #include "gas.h"
diff --git a/profiles/gatt/manager.c b/profiles/gatt/manager.c
index 747760b..3d8051e 100644
--- a/profiles/gatt/manager.c
+++ b/profiles/gatt/manager.c
@@ -28,9 +28,9 @@
 #include "adapter.h"
 #include "device.h"
 #include "profile.h"
-#include "att.h"
-#include "gattrib.h"
-#include "gatt.h"
+#include "attrib/att.h"
+#include "attrib/gattrib.h"
+#include "attrib/gatt.h"
 #include "gas.h"
 #include "log.h"
 #include "manager.h"
diff --git a/profiles/heartrate/heartrate.c b/profiles/heartrate/heartrate.c
index f0eb7a4..535d55b 100644
--- a/profiles/heartrate/heartrate.c
+++ b/profiles/heartrate/heartrate.c
@@ -34,9 +34,9 @@
 #include "dbus-common.h"
 #include "device.h"
 #include "error.h"
-#include "gattrib.h"
-#include "att.h"
-#include "gatt.h"
+#include "attrib/gattrib.h"
+#include "attrib/att.h"
+#include "attrib/gatt.h"
 #include "attio.h"
 #include "log.h"
 #include "heartrate.h"
diff --git a/profiles/heartrate/manager.c b/profiles/heartrate/manager.c
index 19b18a8..aeb69f4 100644
--- a/profiles/heartrate/manager.c
+++ b/profiles/heartrate/manager.c
@@ -28,9 +28,9 @@
 #include "adapter.h"
 #include "device.h"
 #include "profile.h"
-#include "att.h"
-#include "gattrib.h"
-#include "gatt.h"
+#include "attrib/att.h"
+#include "attrib/gattrib.h"
+#include "attrib/gatt.h"
 #include "heartrate.h"
 #include "manager.h"
 
diff --git a/profiles/input/hog_device.c b/profiles/input/hog_device.c
index f6e945e..d231e00 100644
--- a/profiles/input/hog_device.c
+++ b/profiles/input/hog_device.c
@@ -43,13 +43,13 @@
 
 #include "log.h"
 
-#include "../src/adapter.h"
-#include "../src/device.h"
+#include "src/adapter.h"
+#include "src/device.h"
 
-#include "att.h"
-#include "gattrib.h"
+#include "attrib/att.h"
+#include "attrib/gattrib.h"
 #include "attio.h"
-#include "gatt.h"
+#include "attrib/gatt.h"
 
 #include "hog_device.h"
 
diff --git a/profiles/input/hog_manager.c b/profiles/input/hog_manager.c
index d37b903..21ceb79 100644
--- a/profiles/input/hog_manager.c
+++ b/profiles/input/hog_manager.c
@@ -33,17 +33,17 @@
 #include <bluetooth/uuid.h>
 
 #include "log.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 "plugin.h"
 #include "hcid.h"
 #include "device.h"
 #include "suspend.h"
-#include "att.h"
-#include "gattrib.h"
-#include "gatt.h"
+#include "attrib/att.h"
+#include "attrib/gattrib.h"
+#include "attrib/gatt.h"
 #include "hog_device.h"
 
 static gboolean suspend_supported = FALSE;
diff --git a/profiles/proximity/immalert.c b/profiles/proximity/immalert.c
index 77b4966..5c4592b 100644
--- a/profiles/proximity/immalert.c
+++ b/profiles/proximity/immalert.c
@@ -34,11 +34,11 @@
 #include <gdbus.h>
 
 #include "log.h"
-#include "gattrib.h"
-#include "att.h"
-#include "gatt.h"
-#include "att-database.h"
-#include "gatt-service.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"
diff --git a/profiles/proximity/linkloss.c b/profiles/proximity/linkloss.c
index 40510d8..d4ef3e1 100644
--- a/profiles/proximity/linkloss.c
+++ b/profiles/proximity/linkloss.c
@@ -34,11 +34,11 @@
 #include <gdbus.h>
 
 #include "log.h"
-#include "att-database.h"
-#include "gattrib.h"
-#include "att.h"
-#include "gatt.h"
-#include "gatt-service.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"
diff --git a/profiles/proximity/manager.c b/profiles/proximity/manager.c
index 58e5193..fb34e8f 100644
--- a/profiles/proximity/manager.c
+++ b/profiles/proximity/manager.c
@@ -35,9 +35,9 @@
 #include "adapter.h"
 #include "device.h"
 #include "profile.h"
-#include "att.h"
-#include "gattrib.h"
-#include "gatt.h"
+#include "attrib/att.h"
+#include "attrib/gattrib.h"
+#include "attrib/gatt.h"
 #include "monitor.h"
 #include "reporter.h"
 #include "manager.h"
diff --git a/profiles/proximity/monitor.c b/profiles/proximity/monitor.c
index e45fa4a..9e3d4fb 100644
--- a/profiles/proximity/monitor.c
+++ b/profiles/proximity/monitor.c
@@ -43,9 +43,9 @@
 #include "device.h"
 #include "error.h"
 #include "log.h"
-#include "att.h"
-#include "gattrib.h"
-#include "gatt.h"
+#include "attrib/att.h"
+#include "attrib/gattrib.h"
+#include "attrib/gatt.h"
 #include "attio.h"
 #include "monitor.h"
 #include "textfile.h"
diff --git a/profiles/proximity/reporter.c b/profiles/proximity/reporter.c
index 6ec5f73..929dca4 100644
--- a/profiles/proximity/reporter.c
+++ b/profiles/proximity/reporter.c
@@ -43,10 +43,10 @@
 #include "device.h"
 #include "profile.h"
 #include "hcid.h"
-#include "gattrib.h"
-#include "att.h"
-#include "gatt.h"
-#include "att-database.h"
+#include "attrib/gattrib.h"
+#include "attrib/att.h"
+#include "attrib/gatt.h"
+#include "attrib/att-database.h"
 #include "attrib-server.h"
 #include "reporter.h"
 #include "linkloss.h"
diff --git a/profiles/scanparam/manager.c b/profiles/scanparam/manager.c
index 24d1e78..cea2b29 100644
--- a/profiles/scanparam/manager.c
+++ b/profiles/scanparam/manager.c
@@ -35,9 +35,9 @@
 #include "adapter.h"
 #include "device.h"
 #include "profile.h"
-#include "att.h"
-#include "gattrib.h"
-#include "gatt.h"
+#include "attrib/att.h"
+#include "attrib/gattrib.h"
+#include "attrib/gatt.h"
 #include "manager.h"
 #include "scan.h"
 
diff --git a/profiles/scanparam/scan.c b/profiles/scanparam/scan.c
index 09fbe1f..849336e 100644
--- a/profiles/scanparam/scan.c
+++ b/profiles/scanparam/scan.c
@@ -34,9 +34,9 @@
 #include "log.h"
 #include "adapter.h"
 #include "device.h"
-#include "att.h"
-#include "gattrib.h"
-#include "gatt.h"
+#include "attrib/att.h"
+#include "attrib/gattrib.h"
+#include "attrib/gatt.h"
 #include "attio.h"
 #include "scan.h"
 
diff --git a/profiles/thermometer/manager.c b/profiles/thermometer/manager.c
index 6057633..167df37 100644
--- a/profiles/thermometer/manager.c
+++ b/profiles/thermometer/manager.c
@@ -27,9 +27,9 @@
 #include "adapter.h"
 #include "device.h"
 #include "profile.h"
-#include "att.h"
-#include "gattrib.h"
-#include "gatt.h"
+#include "attrib/att.h"
+#include "attrib/gattrib.h"
+#include "attrib/gatt.h"
 #include "thermometer.h"
 #include "manager.h"
 
diff --git a/profiles/thermometer/thermometer.c b/profiles/thermometer/thermometer.c
index 4d1df1d..46e2b7c 100644
--- a/profiles/thermometer/thermometer.c
+++ b/profiles/thermometer/thermometer.c
@@ -36,10 +36,10 @@
 #include "device.h"
 #include "error.h"
 #include "log.h"
-#include "gattrib.h"
+#include "attrib/gattrib.h"
 #include "attio.h"
-#include "att.h"
-#include "gatt.h"
+#include "attrib/att.h"
+#include "attrib/gatt.h"
 #include "thermometer.h"
 
 #define THERMOMETER_INTERFACE		"org.bluez.Thermometer"
diff --git a/profiles/time/server.c b/profiles/time/server.c
index bd75037..0a17b83 100644
--- a/profiles/time/server.c
+++ b/profiles/time/server.c
@@ -37,12 +37,12 @@
 #include <device.h>
 #include <profile.h>
 
-#include "gattrib.h"
-#include "att.h"
-#include "gatt.h"
-#include "att-database.h"
+#include "attrib/gattrib.h"
+#include "attrib/att.h"
+#include "attrib/gatt.h"
+#include "attrib/att-database.h"
 #include "attrib-server.h"
-#include "gatt-service.h"
+#include "attrib/gatt-service.h"
 #include "log.h"
 #include "server.h"
 
diff --git a/src/adapter.c b/src/adapter.c
index 5c17a6e..0f6a078 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -58,9 +58,9 @@
 #include "glib-helper.h"
 #include "agent.h"
 #include "storage.h"
-#include "gattrib.h"
-#include "att.h"
-#include "gatt.h"
+#include "attrib/gattrib.h"
+#include "attrib/att.h"
+#include "attrib/gatt.h"
 #include "attrib-server.h"
 #include "eir.h"
 #include "mgmt.h"
diff --git a/src/attrib-server.c b/src/attrib-server.c
index 4489edc..8e20903 100644
--- a/src/attrib-server.c
+++ b/src/attrib-server.c
@@ -46,10 +46,10 @@
 #include "adapter.h"
 #include "device.h"
 #include "manager.h"
-#include "gattrib.h"
-#include "att.h"
-#include "gatt.h"
-#include "att-database.h"
+#include "attrib/gattrib.h"
+#include "attrib/att.h"
+#include "attrib/gatt.h"
+#include "attrib/att-database.h"
 #include "storage.h"
 
 #include "attrib-server.h"
diff --git a/src/device.c b/src/device.c
index 6c79c43..0f21692 100644
--- a/src/device.c
+++ b/src/device.c
@@ -47,10 +47,10 @@
 
 #include "log.h"
 
-#include "att.h"
+#include "attrib/att.h"
 #include "hcid.h"
 #include "adapter.h"
-#include "gattrib.h"
+#include "attrib/gattrib.h"
 #include "attio.h"
 #include "device.h"
 #include "profile.h"
@@ -58,7 +58,7 @@
 #include "error.h"
 #include "glib-helper.h"
 #include "sdp-client.h"
-#include "gatt.h"
+#include "attrib/gatt.h"
 #include "agent.h"
 #include "sdp-xml.h"
 #include "storage.h"
diff --git a/tools/avinfo.c b/tools/avinfo.c
index f036cf8..d237742 100644
--- a/tools/avinfo.c
+++ b/tools/avinfo.c
@@ -39,7 +39,7 @@
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 
-#include <a2dp-codecs.h>
+#include "profiles/audio/a2dp-codecs.h"
 
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/hci.h>