diff --git a/obexd/src/dbus.h b/obexd/src/dbus.h
index 659bef1..70b0886 100644
--- a/obexd/src/dbus.h
+++ b/obexd/src/dbus.h
@@ -21,6 +21,14 @@
  *
  */
 
+#include <dbus/dbus.h>
+
+#define OPENOBEX_SERVICE  "org.openobex"
+
+#define OPENOBEX_MANAGER_PATH		"/"
+#define OPENOBEX_MANAGER_INTERFACE	OPENOBEX_SERVICE ".Manager"
+#define ERROR_INTERFACE			OPENOBEX_SERVICE ".Error"
+
 void emit_transfer_started(guint32 id);
 
 void emit_transfer_completed(guint32 id, gboolean success);
@@ -41,3 +49,5 @@ void manager_unregister_session(struct OBEX_session *os);
 void manager_register_transfer(struct OBEX_session *os);
 void manager_unregister_transfer(struct OBEX_session *os);
 void manager_emit_transfer_progress(struct OBEX_session *os);
+
+DBusConnection *obex_dbus_get_connection(void);
diff --git a/obexd/src/manager.c b/obexd/src/manager.c
index 3908c59..97da575 100644
--- a/obexd/src/manager.c
+++ b/obexd/src/manager.c
@@ -816,20 +816,6 @@ static void service_cancel(struct pending_request *pending)
 	g_dbus_send_message(system_conn, msg);
 }
 
-void obex_connect_cb(GIOChannel *io, GError *err, gpointer user_data)
-{
-	struct server *server = user_data;
-
-	if (err) {
-		error("%s", err->message);
-		g_io_channel_shutdown(io, TRUE, NULL);
-		return;
-	}
-
-	if (obex_session_start(io, server) < 0)
-		g_io_channel_shutdown(io, TRUE, NULL);
-}
-
 static void pending_request_free(struct pending_request *pending)
 {
 	if (pending->call)
diff --git a/obexd/src/obex.c b/obexd/src/obex.c
index 2369848..b8e8b5d 100644
--- a/obexd/src/obex.c
+++ b/obexd/src/obex.c
@@ -990,6 +990,20 @@ failed:
 	return FALSE;
 }
 
+void obex_connect_cb(GIOChannel *io, GError *err, gpointer user_data)
+{
+	struct server *server = user_data;
+
+	if (err) {
+		error("%s", err->message);
+		g_io_channel_shutdown(io, TRUE, NULL);
+		return;
+	}
+
+	if (obex_session_start(io, server) < 0)
+		g_io_channel_shutdown(io, TRUE, NULL);
+}
+
 gint obex_session_start(GIOChannel *io, struct server *server)
 {
 	struct obex_session *os;
diff --git a/obexd/src/obex.h b/obexd/src/obex.h
index 76dbdc1..f710a9f 100644
--- a/obexd/src/obex.h
+++ b/obexd/src/obex.h
@@ -85,6 +85,8 @@ struct obex_session {
 /* FIXME: first step to obsfuscate */
 #define OBEX_session obex_session
 
+void obex_connect_cb(GIOChannel *io, GError *err, gpointer user_data);
+
 gint obex_session_start(GIOChannel *io, struct server *server);
 struct obex_session *obex_get_session(gpointer object);
 gint obex_tty_session_stop(void);
diff --git a/obexd/src/obexd.h b/obexd/src/obexd.h
index 94ec795..df21f00 100644
--- a/obexd/src/obexd.h
+++ b/obexd/src/obexd.h
@@ -21,20 +21,8 @@
  *
  */
 
-#include <dbus/dbus.h>
-
-#define OPENOBEX_SERVICE  "org.openobex"
-
-#define OPENOBEX_MANAGER_PATH		"/"
-#define OPENOBEX_MANAGER_INTERFACE	OPENOBEX_SERVICE ".Manager"
-#define ERROR_INTERFACE			OPENOBEX_SERVICE ".Error"
-
-void obex_connect_cb(GIOChannel *io, GError *err, gpointer user_data);
-
-gboolean manager_init(void);
-void manager_cleanup(void);
-
 gboolean plugin_init(void);
 void plugin_cleanup(void);
 
-DBusConnection *obex_dbus_get_connection(void);
+gboolean manager_init(void);
+void manager_cleanup(void);