diff --git a/attrib/gatttool.c b/attrib/gatttool.c
index 39b3c81..a234e36 100644
--- a/attrib/gatttool.c
+++ b/attrib/gatttool.c
@@ -32,7 +32,6 @@
 #include <unistd.h>
 
 #include <bluetooth/bluetooth.h>
-#include <bluetooth/l2cap.h>
 #include <bluetooth/hci.h>
 #include <bluetooth/hci_lib.h>
 #include <bluetooth/sdp.h>
diff --git a/audio/avdtp.c b/audio/avdtp.c
index ac01f15..1683e7c 100644
--- a/audio/avdtp.c
+++ b/audio/avdtp.c
@@ -57,8 +57,6 @@
 #include "sink.h"
 #include "source.h"
 
-#include <bluetooth/l2cap.h>
-
 #define AVDTP_PSM 25
 
 #define MAX_SEID 0x3E
diff --git a/audio/control.c b/audio/control.c
index 76f46e9..ce34eb4 100644
--- a/audio/control.c
+++ b/audio/control.c
@@ -40,7 +40,6 @@
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
-#include <bluetooth/l2cap.h>
 
 #include <glib.h>
 #include <dbus/dbus.h>
diff --git a/audio/device.c b/audio/device.c
index 6b93b36..30ae30d 100644
--- a/audio/device.c
+++ b/audio/device.c
@@ -34,8 +34,6 @@
 #include <netinet/in.h>
 
 #include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/hci_lib.h>
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
 
diff --git a/audio/gateway.c b/audio/gateway.c
index 07ebdd4..e5f92a7 100644
--- a/audio/gateway.c
+++ b/audio/gateway.c
@@ -39,9 +39,6 @@
 #include <gdbus.h>
 
 #include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/hci_lib.h>
-#include <bluetooth/sco.h>
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
 
diff --git a/audio/headset.c b/audio/headset.c
index 0763585..2fa0a55 100644
--- a/audio/headset.c
+++ b/audio/headset.c
@@ -40,10 +40,6 @@
 #include <assert.h>
 
 #include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/hci_lib.h>
-#include <bluetooth/sco.h>
-#include <bluetooth/rfcomm.h>
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
 
diff --git a/audio/manager.c b/audio/manager.c
index 8a5616d..12671c7 100644
--- a/audio/manager.c
+++ b/audio/manager.c
@@ -39,9 +39,6 @@
 #include <signal.h>
 
 #include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/hci_lib.h>
-#include <bluetooth/rfcomm.h>
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
 
diff --git a/compat/bnep.c b/compat/bnep.c
index 2e4fb9d..9b0d8b8 100644
--- a/compat/bnep.c
+++ b/compat/bnep.c
@@ -34,7 +34,6 @@
 #include <sys/ioctl.h>
 
 #include <bluetooth/bluetooth.h>
-#include <bluetooth/l2cap.h>
 #include <bluetooth/bnep.h>
 
 #include <netinet/in.h>
diff --git a/input/device.c b/input/device.c
index c85d89c..e09a6cf 100644
--- a/input/device.c
+++ b/input/device.c
@@ -34,11 +34,7 @@
 #include <sys/socket.h>
 
 #include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/hci_lib.h>
 #include <bluetooth/hidp.h>
-#include <bluetooth/l2cap.h>
-#include <bluetooth/rfcomm.h>
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
 
diff --git a/input/fakehid.c b/input/fakehid.c
index 00fcee2..ab10f9c 100644
--- a/input/fakehid.c
+++ b/input/fakehid.c
@@ -33,7 +33,6 @@
 #include <sys/types.h>
 
 #include <bluetooth/bluetooth.h>
-#include <bluetooth/l2cap.h>
 #include <bluetooth/hidp.h>
 #include <bluetooth/sdp.h>
 
diff --git a/network/connection.c b/network/connection.c
index a3f2aca..7380cbe 100644
--- a/network/connection.c
+++ b/network/connection.c
@@ -31,7 +31,6 @@
 #include <netinet/in.h>
 
 #include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
 #include <bluetooth/bnep.h>
 #include <bluetooth/sdp.h>
 
diff --git a/network/manager.c b/network/manager.c
index c910148..321640b 100644
--- a/network/manager.c
+++ b/network/manager.c
@@ -26,7 +26,6 @@
 #endif
 
 #include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
 #include <bluetooth/bnep.h>
 #include <bluetooth/sdp.h>
 
diff --git a/network/server.c b/network/server.c
index e6706ec..bb119ce 100644
--- a/network/server.c
+++ b/network/server.c
@@ -31,9 +31,7 @@
 #include <errno.h>
 
 #include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
 #include <bluetooth/bnep.h>
-#include <bluetooth/l2cap.h>
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
 #include <netinet/in.h>
diff --git a/plugins/formfactor.c b/plugins/formfactor.c
index 98e5f78..758d481 100644
--- a/plugins/formfactor.c
+++ b/plugins/formfactor.c
@@ -29,8 +29,6 @@
 #include <errno.h>
 
 #include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/hci_lib.h>
 
 #include "plugin.h"
 #include "adapter.h"
diff --git a/plugins/hal.c b/plugins/hal.c
index f6121c5..05a1c46 100644
--- a/plugins/hal.c
+++ b/plugins/hal.c
@@ -29,8 +29,6 @@
 #include <dbus/dbus.h>
 
 #include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/hci_lib.h>
 
 #include "plugin.h"
 #include "adapter.h"
diff --git a/plugins/service.c b/plugins/service.c
index f6b9da7..f37db7f 100644
--- a/plugins/service.c
+++ b/plugins/service.c
@@ -31,8 +31,6 @@
 #include <string.h>
 
 #include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/hci_lib.h>
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
 
diff --git a/serial/manager.c b/serial/manager.c
index 1b3f1d6..eba8a91 100644
--- a/serial/manager.c
+++ b/serial/manager.c
@@ -42,8 +42,6 @@
 #include <sys/un.h>
 
 #include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/hci_lib.h>
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
 #include <bluetooth/rfcomm.h>
diff --git a/serial/proxy.c b/serial/proxy.c
index 3aaabf3..2211583 100644
--- a/serial/proxy.c
+++ b/serial/proxy.c
@@ -42,8 +42,6 @@
 #include <sys/un.h>
 
 #include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/hci_lib.h>
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
 #include <bluetooth/rfcomm.h>
diff --git a/src/adapter.c b/src/adapter.c
index 3edbdd9..acf5dd8 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -34,8 +34,6 @@
 #include <sys/ioctl.h>
 
 #include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/hci_lib.h>
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
 
diff --git a/src/agent.c b/src/agent.c
index 94c09a2..076362c 100644
--- a/src/agent.c
+++ b/src/agent.c
@@ -33,8 +33,6 @@
 #include <sys/ioctl.h>
 
 #include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/hci_lib.h>
 #include <bluetooth/sdp.h>
 
 #include <glib.h>
diff --git a/src/dbus-common.c b/src/dbus-common.c
index 7b46535..a072014 100644
--- a/src/dbus-common.c
+++ b/src/dbus-common.c
@@ -35,8 +35,6 @@
 #include <sys/ioctl.h>
 
 #include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/l2cap.h>
 
 #include <glib.h>
 #include <dbus/dbus.h>
diff --git a/src/device.c b/src/device.c
index 5082561..77353a4 100644
--- a/src/device.c
+++ b/src/device.c
@@ -35,9 +35,6 @@
 #include <errno.h>
 
 #include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/hci_lib.h>
-#include <bluetooth/l2cap.h>
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
 
diff --git a/src/event.c b/src/event.c
index daab71a..47b50c4 100644
--- a/src/event.c
+++ b/src/event.c
@@ -37,8 +37,6 @@
 #include <sys/socket.h>
 
 #include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/hci_lib.h>
 #include <bluetooth/sdp.h>
 
 #include <glib.h>
diff --git a/src/glib-helper.c b/src/glib-helper.c
index 4941d99..26ac0df 100644
--- a/src/glib-helper.c
+++ b/src/glib-helper.c
@@ -32,11 +32,6 @@
 #include <sys/socket.h>
 
 #include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/hci_lib.h>
-#include <bluetooth/rfcomm.h>
-#include <bluetooth/l2cap.h>
-#include <bluetooth/sco.h>
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
 
diff --git a/src/main.c b/src/main.c
index 9abdd60..1aaa181 100644
--- a/src/main.c
+++ b/src/main.c
@@ -39,8 +39,6 @@
 #include <sys/types.h>
 
 #include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/hci_lib.h>
 
 #include <glib.h>
 
diff --git a/src/manager.c b/src/manager.c
index 3fad9e6..27eeea7 100644
--- a/src/manager.c
+++ b/src/manager.c
@@ -34,8 +34,6 @@
 #include <sys/socket.h>
 
 #include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/hci_lib.h>
 
 #include <glib.h>