diff --git a/src/adapter.c b/src/adapter.c
index 54685d7..cb2ebf0 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -3199,7 +3199,7 @@ int btd_register_adapter_driver(struct btd_adapter_driver *driver)
 	if (driver->probe == NULL)
 		return 0;
 
-	manager_foreach_adapter(probe_driver, driver);
+	adapter_foreach(probe_driver, driver);
 
 	return 0;
 }
@@ -3218,7 +3218,7 @@ void btd_unregister_adapter_driver(struct btd_adapter_driver *driver)
 {
 	adapter_drivers = g_slist_remove(adapter_drivers, driver);
 
-	manager_foreach_adapter(unload_driver, driver);
+	adapter_foreach(unload_driver, driver);
 }
 
 static void agent_auth_cb(struct agent *agent, DBusError *derr,
diff --git a/src/agent.c b/src/agent.c
index 9b3fd28..5fe5492 100644
--- a/src/agent.c
+++ b/src/agent.c
@@ -45,7 +45,6 @@
 #include "dbus-common.h"
 #include "adapter.h"
 #include "device.h"
-#include "manager.h"
 #include "agent.h"
 
 #define IO_CAPABILITY_DISPLAYONLY	0x00
@@ -161,7 +160,7 @@ static void set_default_agent(struct agent *agent)
 
 	default_agent = agent;
 
-	manager_foreach_adapter(set_io_cap, agent);
+	adapter_foreach(set_io_cap, agent);
 }
 
 static void agent_disconnect(DBusConnection *conn, void *user_data)
diff --git a/src/profile.c b/src/profile.c
index bf165f2..59219ee 100644
--- a/src/profile.c
+++ b/src/profile.c
@@ -48,7 +48,6 @@
 #include "sdp-client.h"
 #include "sdp-xml.h"
 #include "adapter.h"
-#include "manager.h"
 #include "device.h"
 #include "profile.h"
 
@@ -2097,14 +2096,14 @@ static struct ext_profile *create_ext(const char *owner, const char *path,
 
 	ext_profiles = g_slist_append(ext_profiles, ext);
 
-	manager_foreach_adapter(adapter_add_profile, &ext->p);
+	adapter_foreach(adapter_add_profile, &ext->p);
 
 	return ext;
 }
 
 static void remove_ext(struct ext_profile *ext)
 {
-	manager_foreach_adapter(adapter_remove_profile, &ext->p);
+	adapter_foreach(adapter_remove_profile, &ext->p);
 
 	ext_profiles = g_slist_remove(ext_profiles, ext);
 
diff --git a/src/sdpd-database.c b/src/sdpd-database.c
index d4ff115..b40e408 100644
--- a/src/sdpd-database.c
+++ b/src/sdpd-database.c
@@ -41,7 +41,6 @@
 #include "sdpd.h"
 #include "log.h"
 #include "adapter.h"
-#include "manager.h"
 
 static sdp_list_t *service_db;
 static sdp_list_t *access_db;
@@ -188,7 +187,7 @@ void sdp_record_add(const bdaddr_t *device, sdp_record_t *rec)
 	access_db = sdp_list_insert_sorted(access_db, dev, access_sort);
 
 	if (bacmp(device, BDADDR_ANY) == 0) {
-		manager_foreach_adapter(adapter_service_insert, rec);
+		adapter_foreach(adapter_service_insert, rec);
 		return;
 	}
 
@@ -271,7 +270,7 @@ int sdp_record_remove(uint32_t handle)
 		if (adapter)
 			adapter_service_remove(adapter, r);
 	} else
-		manager_foreach_adapter(adapter_service_remove, r);
+		adapter_foreach(adapter_service_remove, r);
 
 	access_db = sdp_list_remove(access_db, a);
 	access_free(a);
@@ -336,6 +335,6 @@ void sdp_init_services_list(bdaddr_t *device)
 
 		SDPDBG("adding record with handle %x", access->handle);
 
-		manager_foreach_adapter(adapter_service_insert, rec);
+		adapter_foreach(adapter_service_insert, rec);
 	}
 }