diff --git a/obexd/src/bluetooth.c b/obexd/src/bluetooth.c
index 8094a7b..acc1b98 100644
--- a/obexd/src/bluetooth.c
+++ b/obexd/src/bluetooth.c
@@ -43,6 +43,7 @@
 #include <openobex/obex_const.h>
 
 #include "logging.h"
+#include "bluetooth.h"
 #include "obex.h"
 #include "dbus.h"
 
diff --git a/obexd/src/logging.c b/obexd/src/logging.c
index c1e489c..a0f95e7 100644
--- a/obexd/src/logging.c
+++ b/obexd/src/logging.c
@@ -31,6 +31,8 @@
 
 #include <openobex/obex.h>
 
+#include "logging.h"
+
 static volatile int debug_enabled = 0;
 
 static inline void vinfo(const char *format, va_list ap)
diff --git a/obexd/src/manager.c b/obexd/src/manager.c
index bec63be..41536ae 100644
--- a/obexd/src/manager.c
+++ b/obexd/src/manager.c
@@ -40,6 +40,7 @@
 #include "bluetooth.h"
 #include "obexd.h"
 #include "obex.h"
+#include "dbus.h"
 #include "logging.h"
 
 static const gchar *opp_record = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>	\
@@ -580,9 +581,8 @@ failed:
 	return ret;
 }
 
-void register_record(gpointer data, gpointer user_data)
+void register_record(struct server *server, gpointer user_data)
 {
-	struct server *server = data;
 	gchar *xml;
 	gint ret;
 
diff --git a/obexd/src/plugin.c b/obexd/src/plugin.c
index b6320d4..32010b2 100644
--- a/obexd/src/plugin.c
+++ b/obexd/src/plugin.c
@@ -32,6 +32,7 @@
 
 #include <glib.h>
 
+#include "obexd.h"
 #include "plugin.h"
 #include "logging.h"