diff --git a/Makefile.am b/Makefile.am
index 5ac76d8..daf34b6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -223,11 +223,7 @@ test_scripts =
 unit_tests =
 
 include Makefile.tools
-
-if OBEX
 include Makefile.obexd
-endif
-
 include android/Makefile.am
 
 if HID2HCI
diff --git a/Makefile.obexd b/Makefile.obexd
index 6eb80c4..cd3ace4 100644
--- a/Makefile.obexd
+++ b/Makefile.obexd
@@ -1,5 +1,3 @@
-if OBEX
-
 if SYSTEMD
 systemduserunitdir = @SYSTEMD_USERUNITDIR@
 systemduserunit_DATA = obexd/src/obex.service
@@ -10,6 +8,8 @@ endif
 
 EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service
 
+if OBEX
+
 obex_plugindir = $(libdir)/obex/plugins
 
 obexd_builtin_modules =
@@ -90,6 +90,8 @@ obexd_src_obexd_CFLAGS = $(AM_CFLAGS) @GLIB_CFLAGS@ @DBUS_CFLAGS@ \
 
 obexd_src_obexd_CPPFLAGS = -I$(builddir)/lib -I$(builddir)/obexd/src
 
+endif
+
 obexd_src_obexd_SHORTNAME = obexd
 
 obexd_builtin_files = obexd/src/builtin.h $(obexd_builtin_nodist)
@@ -106,5 +108,3 @@ obexd/src/builtin.h: obexd/src/genbuiltin $(obexd_builtin_sources)
 CLEANFILES += obexd/src/builtin.h $(builtin_files) obexd/src/obex.service
 
 EXTRA_DIST += obexd/src/genbuiltin
-
-endif