diff --git a/src/adapter.c b/src/adapter.c
index e376b8e..a8cbf9c 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -37,20 +37,22 @@
 #include <sys/stat.h>
 #include <dirent.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/sdp.h>
-#include <bluetooth/sdp_lib.h>
-
 #include <glib.h>
 #include <dbus/dbus.h>
-#include <gdbus/gdbus.h>
+
+#include "bluetooth/bluetooth.h"
+#include "bluetooth/hci.h"
+#include "bluetooth/hci_lib.h"
+#include "bluetooth/sdp.h"
+#include "bluetooth/sdp_lib.h"
+#include "lib/uuid.h"
+#include "lib/mgmt.h"
+
+#include "gdbus/gdbus.h"
 
 #include "log.h"
 #include "textfile.h"
 
-#include "lib/uuid.h"
-#include "lib/mgmt.h"
 #include "src/shared/mgmt.h"
 #include "src/shared/util.h"
 #include "src/shared/queue.h"
diff --git a/src/adapter.h b/src/adapter.h
index 867f4e3..0c95f5d 100644
--- a/src/adapter.h
+++ b/src/adapter.h
@@ -22,13 +22,9 @@
  *
  */
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/sdp.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/hci_lib.h>
+#include <stdbool.h>
 #include <dbus/dbus.h>
 #include <glib.h>
-#include <stdbool.h>
 
 #define MAX_NAME_LENGTH		248
 
diff --git a/src/agent.c b/src/agent.c
index 73b2fdd..12e369a 100644
--- a/src/agent.c
+++ b/src/agent.c
@@ -33,12 +33,13 @@
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/sdp.h>
-
 #include <glib.h>
 #include <dbus/dbus.h>
-#include <gdbus/gdbus.h>
+
+#include "lib/bluetooth.h"
+#include "lib/sdp.h"
+
+#include "gdbus/gdbus.h"
 
 #include "log.h"
 #include "error.h"
diff --git a/src/attrib-server.c b/src/attrib-server.c
index f2674aa..fe127e6 100644
--- a/src/attrib-server.c
+++ b/src/attrib-server.c
@@ -34,11 +34,11 @@
 #include <glib.h>
 #include <sys/stat.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/sdp.h>
-#include <bluetooth/sdp_lib.h>
-
+#include "lib/bluetooth.h"
+#include "lib/sdp.h"
+#include "lib/sdp_lib.h"
 #include "lib/uuid.h"
+
 #include "btio/btio.h"
 #include "log.h"
 #include "adapter.h"
diff --git a/src/device.c b/src/device.c
index 78e314a..9e23c19 100644
--- a/src/device.c
+++ b/src/device.c
@@ -35,17 +35,17 @@
 #include <dirent.h>
 #include <time.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/sdp.h>
-#include <bluetooth/sdp_lib.h>
-
 #include <glib.h>
 #include <dbus/dbus.h>
-#include <gdbus/gdbus.h>
-
-#include "log.h"
 
+#include "lib/bluetooth.h"
+#include "lib/sdp.h"
+#include "lib/sdp_lib.h"
 #include "lib/uuid.h"
+
+#include "gdbus/gdbus.h"
+
+#include "log.h"
 #include "src/shared/util.h"
 #include "src/shared/att.h"
 #include "src/shared/queue.h"
diff --git a/src/eir.c b/src/eir.c
index 2ea8731..bc17305 100644
--- a/src/eir.c
+++ b/src/eir.c
@@ -33,9 +33,9 @@
 #include <stdbool.h>
 #include <glib.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/sdp.h>
+#include "lib/bluetooth.h"
+#include "lib/hci.h"
+#include "lib/sdp.h"
 
 #include "src/shared/util.h"
 #include "uuid-helper.h"
diff --git a/src/gatt-client.c b/src/gatt-client.c
index 63358c2..a85b9d2 100644
--- a/src/gatt-client.c
+++ b/src/gatt-client.c
@@ -25,15 +25,17 @@
 #include <stdint.h>
 
 #include <dbus/dbus.h>
-#include <gdbus/gdbus.h>
 
-#include <bluetooth/bluetooth.h>
+#include "lib/bluetooth.h"
+#include "lib/sdp.h"
+#include "lib/uuid.h"
+
+#include "gdbus/gdbus.h"
 
 #include "log.h"
 #include "error.h"
 #include "adapter.h"
 #include "device.h"
-#include "lib/uuid.h"
 #include "src/shared/queue.h"
 #include "src/shared/att.h"
 #include "src/shared/gatt-db.h"
diff --git a/src/gatt-dbus.c b/src/gatt-dbus.c
index c22e8af..8adf2a2 100644
--- a/src/gatt-dbus.c
+++ b/src/gatt-dbus.c
@@ -30,14 +30,17 @@
 
 #include <glib.h>
 #include <dbus/dbus.h>
-#include <gdbus/gdbus.h>
+
+#include "lib/bluetooth.h"
+#include "lib/sdp.h"
+#include "lib/uuid.h"
+
+#include "gdbus/gdbus.h"
 
 #include "adapter.h"
 #include "device.h"
-#include "lib/uuid.h"
 #include "dbus-common.h"
 #include "log.h"
-
 #include "error.h"
 #include "attrib/gattrib.h"
 #include "attrib/att.h"
diff --git a/src/main.c b/src/main.c
index 05eb13d..d033b11 100644
--- a/src/main.c
+++ b/src/main.c
@@ -38,13 +38,14 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include <bluetooth/bluetooth.h>
-
 #include <glib.h>
 
 #include <dbus/dbus.h>
 
-#include <gdbus/gdbus.h>
+#include "lib/bluetooth.h"
+#include "lib/sdp.h"
+
+#include "gdbus/gdbus.h"
 
 #include "log.h"
 
diff --git a/src/plugin.c b/src/plugin.c
index edb47db..39310a7 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -30,10 +30,10 @@
 #include <string.h>
 #include <sys/stat.h>
 
-#include <bluetooth/bluetooth.h>
-
 #include <glib.h>
 
+#include "lib/bluetooth.h"
+
 #include "btio/btio.h"
 #include "src/plugin.h"
 #include "src/log.h"
diff --git a/src/profile.c b/src/profile.c
index b30dbf8..ca1dfec 100644
--- a/src/profile.c
+++ b/src/profile.c
@@ -32,14 +32,15 @@
 
 #include <glib.h>
 #include <dbus/dbus.h>
-#include <gdbus/gdbus.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/sdp.h>
-#include <bluetooth/sdp_lib.h>
+#include "lib/bluetooth.h"
+#include "lib/sdp.h"
+#include "lib/sdp_lib.h"
+#include "lib/uuid.h"
+
+#include "gdbus/gdbus.h"
 
 #include "btio/btio.h"
-#include "lib/uuid.h"
 #include "sdpd.h"
 #include "log.h"
 #include "error.h"
diff --git a/src/rfkill.c b/src/rfkill.c
index 70588c0..74eeb6a 100644
--- a/src/rfkill.c
+++ b/src/rfkill.c
@@ -35,6 +35,9 @@
 
 #include <glib.h>
 
+#include "lib/bluetooth.h"
+#include "lib/sdp.h"
+
 #include "log.h"
 #include "adapter.h"
 #include "hcid.h"
diff --git a/src/sdp-client.c b/src/sdp-client.c
index bca2496..413cf30 100644
--- a/src/sdp-client.c
+++ b/src/sdp-client.c
@@ -27,12 +27,12 @@
 
 #include <errno.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/sdp.h>
-#include <bluetooth/sdp_lib.h>
-
 #include <glib.h>
 
+#include "lib/bluetooth.h"
+#include "lib/sdp.h"
+#include "lib/sdp_lib.h"
+
 #include "btio/btio.h"
 #include "log.h"
 #include "sdp-client.h"
diff --git a/src/sdp-xml.c b/src/sdp-xml.c
index 0535d09..0a3eb60 100644
--- a/src/sdp-xml.c
+++ b/src/sdp-xml.c
@@ -34,8 +34,8 @@
 
 #include <glib.h>
 
-#include <bluetooth/sdp.h>
-#include <bluetooth/sdp_lib.h>
+#include "lib/sdp.h"
+#include "lib/sdp_lib.h"
 
 #include "sdp-xml.h"
 
diff --git a/src/sdp-xml.h b/src/sdp-xml.h
index d6a2f73..80a4f44 100644
--- a/src/sdp-xml.h
+++ b/src/sdp-xml.h
@@ -21,15 +21,7 @@
  *
  */
 
-
-#ifndef __SDP_XML_H
-#define __SDP_XML_H
-
-#include <bluetooth/sdp.h>
-
 void convert_sdp_record_to_xml(sdp_record_t *rec,
 		void *user_data, void (*append_func) (void *, const char *));
 
 sdp_record_t *sdp_xml_parse_record(const char *data, int size);
-
-#endif /* __SDP_XML_H */
diff --git a/src/sdpd-database.c b/src/sdpd-database.c
index e3b9e09..843b6d0 100644
--- a/src/sdpd-database.c
+++ b/src/sdpd-database.c
@@ -31,9 +31,9 @@
 #include <stdlib.h>
 #include <stdbool.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/sdp.h>
-#include <bluetooth/sdp_lib.h>
+#include "lib/bluetooth.h"
+#include "lib/sdp.h"
+#include "lib/sdp_lib.h"
 
 #include "sdpd.h"
 #include "log.h"
diff --git a/src/sdpd-request.c b/src/sdpd-request.c
index 081e7c8..1eefdce 100644
--- a/src/sdpd-request.c
+++ b/src/sdpd-request.c
@@ -33,10 +33,10 @@
 #include <limits.h>
 #include <stdbool.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/l2cap.h>
-#include <bluetooth/sdp.h>
-#include <bluetooth/sdp_lib.h>
+#include "lib/bluetooth.h"
+#include "lib/l2cap.h"
+#include "lib/sdp.h"
+#include "lib/sdp_lib.h"
 
 #include "src/shared/util.h"
 
diff --git a/src/sdpd-server.c b/src/sdpd-server.c
index 8ecda9b..e6b611a 100644
--- a/src/sdpd-server.c
+++ b/src/sdpd-server.c
@@ -33,16 +33,15 @@
 #include <stdlib.h>
 #include <stdbool.h>
 #include <sys/stat.h>
-
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/l2cap.h>
-#include <bluetooth/sdp.h>
-#include <bluetooth/sdp_lib.h>
-
 #include <sys/un.h>
 
 #include <glib.h>
 
+#include "lib/bluetooth.h"
+#include "lib/l2cap.h"
+#include "lib/sdp.h"
+#include "lib/sdp_lib.h"
+
 #include "log.h"
 #include "sdpd.h"
 
diff --git a/src/sdpd-service.c b/src/sdpd-service.c
index 40aef62..c3ee3eb 100644
--- a/src/sdpd-service.c
+++ b/src/sdpd-service.c
@@ -34,12 +34,12 @@
 #include <sys/time.h>
 #include <stdbool.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/sdp.h>
-#include <bluetooth/sdp_lib.h>
-
 #include <glib.h>
 
+#include "lib/bluetooth.h"
+#include "lib/sdp.h"
+#include "lib/sdp_lib.h"
+
 #include "src/shared/util.h"
 #include "sdpd.h"
 #include "log.h"
diff --git a/src/sdpd.h b/src/sdpd.h
index 4425c87..49cd98a 100644
--- a/src/sdpd.h
+++ b/src/sdpd.h
@@ -24,9 +24,6 @@
  *
  */
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/sdp.h>
-
 #ifdef SDP_DEBUG
 #include <syslog.h>
 #define SDPDBG(fmt, arg...) syslog(LOG_DEBUG, "%s: " fmt "\n", __func__ , ## arg)
diff --git a/src/service.c b/src/service.c
index 8c85cd1..4d1f1cb 100644
--- a/src/service.c
+++ b/src/service.c
@@ -35,10 +35,11 @@
 #include <sys/ioctl.h>
 #include <errno.h>
 
-#include <bluetooth/bluetooth.h>
-
 #include <glib.h>
 
+#include "lib/bluetooth.h"
+#include "lib/sdp.h"
+
 #include "log.h"
 
 #include "adapter.h"
diff --git a/src/storage.c b/src/storage.c
index 127af55..734a9e0 100644
--- a/src/storage.c
+++ b/src/storage.c
@@ -38,11 +38,11 @@
 
 #include <glib.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/sdp.h>
-#include <bluetooth/sdp_lib.h>
-
+#include "lib/bluetooth.h"
+#include "lib/sdp.h"
+#include "lib/sdp_lib.h"
 #include "lib/uuid.h"
+
 #include "textfile.h"
 #include "uuid-helper.h"
 #include "storage.h"
diff --git a/src/uuid-helper.c b/src/uuid-helper.c
index bce36b0..d751817 100644
--- a/src/uuid-helper.c
+++ b/src/uuid-helper.c
@@ -31,9 +31,9 @@
 #include <errno.h>
 #include <arpa/inet.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/sdp.h>
-#include <bluetooth/sdp_lib.h>
+#include "lib/bluetooth.h"
+#include "lib/sdp.h"
+#include "lib/sdp_lib.h"
 
 #include "uuid-helper.h"