diff --git a/obexd/plugins/bluetooth.c b/obexd/plugins/bluetooth.c
index 1fccf3e33..1c9d92e1d 100644
--- a/obexd/plugins/bluetooth.c
+++ b/obexd/plugins/bluetooth.c
@@ -35,6 +35,7 @@
 #include <glib.h>
 #include <gdbus.h>
 
+#include "obexd.h"
 #include "plugin.h"
 #include "server.h"
 #include "obex.h"
diff --git a/obexd/plugins/filesystem.c b/obexd/plugins/filesystem.c
index b05dc3a34..27855ad14 100644
--- a/obexd/plugins/filesystem.c
+++ b/obexd/plugins/filesystem.c
@@ -45,6 +45,7 @@
 #include <openobex/obex.h>
 #include <openobex/obex_const.h>
 
+#include "obexd.h"
 #include "plugin.h"
 #include "log.h"
 #include "obex.h"
diff --git a/obexd/plugins/ftp.c b/obexd/plugins/ftp.c
index fb9ba5818..fb7887f7e 100644
--- a/obexd/plugins/ftp.c
+++ b/obexd/plugins/ftp.c
@@ -44,6 +44,7 @@
 #include <openobex/obex.h>
 #include <openobex/obex_const.h>
 
+#include "obexd.h"
 #include "plugin.h"
 #include "log.h"
 #include "obex.h"
diff --git a/obexd/plugins/irmc.c b/obexd/plugins/irmc.c
index 57a66b781..2bb922138 100644
--- a/obexd/plugins/irmc.c
+++ b/obexd/plugins/irmc.c
@@ -38,6 +38,7 @@
 #include <openobex/obex.h>
 #include <openobex/obex_const.h>
 
+#include "obexd.h"
 #include "plugin.h"
 #include "log.h"
 #include "obex.h"
diff --git a/obexd/plugins/mas.c b/obexd/plugins/mas.c
index 8c25d8464..d130c48e2 100644
--- a/obexd/plugins/mas.c
+++ b/obexd/plugins/mas.c
@@ -30,6 +30,7 @@
 #include <openobex/obex.h>
 #include <fcntl.h>
 
+#include "obexd.h"
 #include "plugin.h"
 #include "log.h"
 #include "obex.h"
diff --git a/obexd/plugins/opp.c b/obexd/plugins/opp.c
index a7a0dea16..2e937321a 100644
--- a/obexd/plugins/opp.c
+++ b/obexd/plugins/opp.c
@@ -34,6 +34,7 @@
 
 #include <glib.h>
 
+#include "obexd.h"
 #include "plugin.h"
 #include "obex.h"
 #include "service.h"
diff --git a/obexd/plugins/pbap.c b/obexd/plugins/pbap.c
index e10fa8cb6..081d8812f 100644
--- a/obexd/plugins/pbap.c
+++ b/obexd/plugins/pbap.c
@@ -40,6 +40,7 @@
 #include <openobex/obex.h>
 #include <openobex/obex_const.h>
 
+#include "obexd.h"
 #include "plugin.h"
 #include "log.h"
 #include "obex.h"
diff --git a/obexd/plugins/pcsuite.c b/obexd/plugins/pcsuite.c
index 5276ed9ef..5de4cc3f0 100644
--- a/obexd/plugins/pcsuite.c
+++ b/obexd/plugins/pcsuite.c
@@ -45,6 +45,7 @@
 #include <openobex/obex.h>
 #include <openobex/obex_const.h>
 
+#include "obexd.h"
 #include "plugin.h"
 #include "log.h"
 #include "obex.h"
diff --git a/obexd/plugins/usb.c b/obexd/plugins/usb.c
index 466dc99d2..a0ec21b54 100644
--- a/obexd/plugins/usb.c
+++ b/obexd/plugins/usb.c
@@ -41,6 +41,7 @@
 #include <glib.h>
 #include <gdbus.h>
 
+#include "obexd.h"
 #include "plugin.h"
 #include "server.h"
 #include "obex.h"
diff --git a/obexd/src/main.c b/obexd/src/main.c
index 52ab11c70..7cfced768 100644
--- a/obexd/src/main.c
+++ b/obexd/src/main.c
@@ -31,6 +31,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <signal.h>
+#include <stdint.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
@@ -42,15 +43,9 @@
 
 #include <gdbus.h>
 
-#include <openobex/obex.h>
-#include <openobex/obex_const.h>
-
 #include "log.h"
 #include "obexd.h"
-#include "obex.h"
-#include "obex-priv.h"
 #include "server.h"
-#include "service.h"
 
 #define DEFAULT_ROOT_PATH "/tmp"
 
diff --git a/obexd/src/obex.c b/obexd/src/obex.c
index dca3a0b47..41644e834 100644
--- a/obexd/src/obex.c
+++ b/obexd/src/obex.c
@@ -42,6 +42,7 @@
 
 #include <openobex/obex.h>
 
+#include "obexd.h"
 #include "log.h"
 #include "obex.h"
 #include "obex-priv.h"
diff --git a/obexd/src/obex.h b/obexd/src/obex.h
index 03243f120..6b7dc7edf 100644
--- a/obexd/src/obex.h
+++ b/obexd/src/obex.h
@@ -29,15 +29,6 @@
 #define OBJECT_SIZE_UNKNOWN -1
 #define OBJECT_SIZE_DELETE -2
 
-#define OBEX_OPP	(1 << 1)
-#define OBEX_FTP	(1 << 2)
-#define OBEX_BIP	(1 << 3)
-#define OBEX_PBAP	(1 << 4)
-#define OBEX_IRMC	(1 << 5)
-#define OBEX_PCSUITE	(1 << 6)
-#define OBEX_SYNCEVOLUTION	(1 << 7)
-#define OBEX_MAS	(1 << 8)
-
 #define TARGET_SIZE 16
 
 struct obex_session;
@@ -68,8 +59,5 @@ ssize_t obex_aparam_read(struct obex_session *os, obex_object_t *obj,
 int obex_aparam_write(struct obex_session *os, obex_object_t *obj,
 				const uint8_t *buffer, unsigned int size);
 
-const char *obex_option_root_folder(void);
-gboolean obex_option_symlinks(void);
-
 /* Just a thin wrapper around memcmp to deal with NULL values */
 int memncmp0(const void *a, size_t na, const void *b, size_t nb);
diff --git a/obexd/src/obexd.h b/obexd/src/obexd.h
index 37106b734..d18df5b24 100644
--- a/obexd/src/obexd.h
+++ b/obexd/src/obexd.h
@@ -21,8 +21,20 @@
  *
  */
 
+#define OBEX_OPP	(1 << 1)
+#define OBEX_FTP	(1 << 2)
+#define OBEX_BIP	(1 << 3)
+#define OBEX_PBAP	(1 << 4)
+#define OBEX_IRMC	(1 << 5)
+#define OBEX_PCSUITE	(1 << 6)
+#define OBEX_SYNCEVOLUTION	(1 << 7)
+#define OBEX_MAS	(1 << 8)
+
 gboolean plugin_init(const char *pattern, const char *exclude);
 void plugin_cleanup(void);
 
 gboolean manager_init(void);
 void manager_cleanup(void);
+
+const char *obex_option_root_folder(void);
+gboolean obex_option_symlinks(void);