diff --git a/src/rfkill.c b/src/rfkill.c
index bac9efd..6f040c9 100644
--- a/src/rfkill.c
+++ b/src/rfkill.c
@@ -37,7 +37,6 @@
 
 #include "log.h"
 #include "adapter.h"
-#include "manager.h"
 #include "hcid.h"
 
 enum rfkill_type {
@@ -128,7 +127,7 @@ static gboolean rfkill_event(GIOChannel *chan,
 	if (id < 0)
 		return TRUE;
 
-	adapter = manager_find_adapter_by_id(id);
+	adapter = adapter_find_by_id(id);
 	if (!adapter)
 		return TRUE;
 
diff --git a/src/sdpd-database.c b/src/sdpd-database.c
index 177ca96..d4ff115 100644
--- a/src/sdpd-database.c
+++ b/src/sdpd-database.c
@@ -192,7 +192,7 @@ void sdp_record_add(const bdaddr_t *device, sdp_record_t *rec)
 		return;
 	}
 
-	adapter = manager_find_adapter(device);
+	adapter = adapter_find(device);
 	if (adapter)
 		adapter_service_insert(adapter, rec);
 }
@@ -267,7 +267,7 @@ int sdp_record_remove(uint32_t handle)
 	a = p->data;
 
 	if (bacmp(&a->device, BDADDR_ANY) != 0) {
-		struct btd_adapter *adapter = manager_find_adapter(&a->device);
+		struct btd_adapter *adapter = adapter_find(&a->device);
 		if (adapter)
 			adapter_service_remove(adapter, r);
 	} else