diff --git a/obexd/src/bluetooth.c b/obexd/src/bluetooth.c
index c62e98d..48b50fd 100644
--- a/obexd/src/bluetooth.c
+++ b/obexd/src/bluetooth.c
@@ -32,16 +32,10 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/rfcomm.h>
-
 #include <glib.h>
 
 #include <openobex/obex.h>
-#include <openobex/obex_const.h>
 
-#include "obexd.h"
 #include "logging.h"
 #include "bluetooth.h"
 #include "obex.h"
diff --git a/obexd/src/dbus.h b/obexd/src/dbus.h
index bcce914..e322d4f 100644
--- a/obexd/src/dbus.h
+++ b/obexd/src/dbus.h
@@ -25,7 +25,6 @@
 
 #define OPENOBEX_SERVICE  "org.openobex"
 
-
 void register_record(struct server *server);
 gint request_service_authorization(struct server *server, GIOChannel *io,
 					const char *address);
diff --git a/obexd/src/manager.c b/obexd/src/manager.c
index a3f69c2..f2687e5 100644
--- a/obexd/src/manager.c
+++ b/obexd/src/manager.c
@@ -25,6 +25,7 @@
 #include <config.h>
 #endif
 
+#include <stdio.h>
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
@@ -32,7 +33,6 @@
 #include <sys/socket.h>
 
 #include <bluetooth/bluetooth.h>
-#include <bluetooth/l2cap.h>
 #include <bluetooth/rfcomm.h>
 
 #include <openobex/obex.h>
diff --git a/obexd/src/mimetype.h b/obexd/src/mimetype.h
index a089ce8..69059cf 100644
--- a/obexd/src/mimetype.h
+++ b/obexd/src/mimetype.h
@@ -21,8 +21,6 @@
  *
  */
 
-#define TARGET_SIZE 16
-
 typedef gboolean (*obex_object_io_func) (gpointer object, int flags, int err,
 					gpointer user_data);
 
diff --git a/obexd/src/obex.c b/obexd/src/obex.c
index a774d88..1994851 100644
--- a/obexd/src/obex.c
+++ b/obexd/src/obex.c
@@ -41,7 +41,6 @@
 #include <glib.h>
 
 #include <openobex/obex.h>
-#include <openobex/obex_const.h>
 
 #include "logging.h"
 #include "obex.h"
diff --git a/obexd/src/obex.h b/obexd/src/obex.h
index 69b5dfe..8d5cd91 100644
--- a/obexd/src/obex.h
+++ b/obexd/src/obex.h
@@ -26,8 +26,6 @@
 #include <config.h>
 #endif
 
-#include <glib.h>
-
 #define OBJECT_SIZE_UNKNOWN -1
 #define OBJECT_SIZE_DELETE -2
 
@@ -40,9 +38,6 @@
 
 #define TARGET_SIZE 16
 
-struct obex_service_driver;
-struct obex_mime_type_driver;
-
 struct server {
 	gboolean	auto_accept;
 	gchar		*folder;
diff --git a/obexd/src/service.c b/obexd/src/service.c
index 2a376be..7093f30 100644
--- a/obexd/src/service.c
+++ b/obexd/src/service.c
@@ -30,7 +30,6 @@
 #include <glib.h>
 
 #include <openobex/obex.h>
-#include <openobex/obex_const.h>
 
 #include "obex.h"
 #include "service.h"