diff --git a/obexd/plugins/ftp.c b/obexd/plugins/ftp.c
index fb7887f..d5820b2 100644
--- a/obexd/plugins/ftp.c
+++ b/obexd/plugins/ftp.c
@@ -48,7 +48,7 @@
 #include "plugin.h"
 #include "log.h"
 #include "obex.h"
-#include "dbus.h"
+#include "manager.h"
 #include "mimetype.h"
 #include "service.h"
 #include "ftp.h"
diff --git a/obexd/plugins/irmc.c b/obexd/plugins/irmc.c
index 2bb9221..3499ca7 100644
--- a/obexd/plugins/irmc.c
+++ b/obexd/plugins/irmc.c
@@ -46,7 +46,7 @@
 #include "phonebook.h"
 #include "mimetype.h"
 #include "filesystem.h"
-#include "dbus.h"
+#include "manager.h"
 
 #define IRMC_CHANNEL	14
 
diff --git a/obexd/plugins/mas.c b/obexd/plugins/mas.c
index d130c48..ba56a0c 100644
--- a/obexd/plugins/mas.c
+++ b/obexd/plugins/mas.c
@@ -37,7 +37,7 @@
 #include "service.h"
 #include "mimetype.h"
 #include "filesystem.h"
-#include "dbus.h"
+#include "manager.h"
 
 #include "messages.h"
 
diff --git a/obexd/plugins/opp.c b/obexd/plugins/opp.c
index 2e93732..20ac5d1 100644
--- a/obexd/plugins/opp.c
+++ b/obexd/plugins/opp.c
@@ -39,7 +39,7 @@
 #include "obex.h"
 #include "service.h"
 #include "log.h"
-#include "dbus.h"
+#include "manager.h"
 #include "filesystem.h"
 
 #define VCARD_TYPE "text/x-vcard"
diff --git a/obexd/plugins/pbap.c b/obexd/plugins/pbap.c
index 081d881..a03f07c 100644
--- a/obexd/plugins/pbap.c
+++ b/obexd/plugins/pbap.c
@@ -48,7 +48,7 @@
 #include "phonebook.h"
 #include "mimetype.h"
 #include "filesystem.h"
-#include "dbus.h"
+#include "manager.h"
 #include "glib-helper.h"
 
 #define PHONEBOOK_TYPE		"x-bt/phonebook"
diff --git a/obexd/plugins/pcsuite.c b/obexd/plugins/pcsuite.c
index 5de4cc3..b93bd65 100644
--- a/obexd/plugins/pcsuite.c
+++ b/obexd/plugins/pcsuite.c
@@ -49,7 +49,6 @@
 #include "plugin.h"
 #include "log.h"
 #include "obex.h"
-#include "dbus.h"
 #include "mimetype.h"
 #include "service.h"
 #include "ftp.h"
diff --git a/obexd/plugins/phonebook-tracker.c b/obexd/plugins/phonebook-tracker.c
index 1fd8c8b..a15bf20 100644
--- a/obexd/plugins/phonebook-tracker.c
+++ b/obexd/plugins/phonebook-tracker.c
@@ -36,7 +36,6 @@
 #include "service.h"
 #include "mimetype.h"
 #include "phonebook.h"
-#include "dbus.h"
 #include "vcard.h"
 #include "glib-helper.h"
 
diff --git a/obexd/plugins/syncevolution.c b/obexd/plugins/syncevolution.c
index 0644b5a..ae13e43 100644
--- a/obexd/plugins/syncevolution.c
+++ b/obexd/plugins/syncevolution.c
@@ -42,7 +42,7 @@
 #include "service.h"
 #include "mimetype.h"
 #include "log.h"
-#include "dbus.h"
+#include "manager.h"
 #include "btio.h"
 #include "obexd.h"
 #include "gdbus.h"
diff --git a/obexd/src/manager.c b/obexd/src/manager.c
index ceed767..dc6608b 100644
--- a/obexd/src/manager.c
+++ b/obexd/src/manager.c
@@ -41,7 +41,7 @@
 #include "obex.h"
 #include "obex-priv.h"
 #include "server.h"
-#include "dbus.h"
+#include "manager.h"
 #include "log.h"
 #include "btio.h"
 #include "service.h"
diff --git a/obexd/src/dbus.h b/obexd/src/manager.h
similarity index 100%
rename from obexd/src/dbus.h
rename to obexd/src/manager.h
diff --git a/obexd/src/obex.c b/obexd/src/obex.c
index 41644e8..6916d8d 100644
--- a/obexd/src/obex.c
+++ b/obexd/src/obex.c
@@ -47,7 +47,7 @@
 #include "obex.h"
 #include "obex-priv.h"
 #include "server.h"
-#include "dbus.h"
+#include "manager.h"
 #include "mimetype.h"
 #include "service.h"
 #include "transport.h"
diff --git a/obexd/src/server.c b/obexd/src/server.c
index 54c1b34..44a501c 100644
--- a/obexd/src/server.c
+++ b/obexd/src/server.c
@@ -42,7 +42,6 @@
 #include "obex.h"
 #include "obex-priv.h"
 #include "server.h"
-#include "dbus.h"
 #include "service.h"
 #include "transport.h"