--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -29,6 +29,10 @@ if test "$OS_ARCH" = "WINNT"; then
   fi
 fi
 
+MOZ_ENABLE_DBUS=0
+NECKO_WIFI=0
+NECKO_WIFI_DBUS=0
+
 # Enable building ./signmar and running libmar signature tests
 MOZ_ENABLE_SIGNMAR=1
 
--- a/ipc/moz.build
+++ b/ipc/moz.build
@@ -11,9 +11,6 @@ DIRS += [
     'testshell',
 ]
 
-if CONFIG['MOZ_ENABLE_DBUS']:
-    DIRS += ['dbus']
-
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     DIRS += ['unixfd', 'unixsocket']
 
--- a/netwerk/moz.build
+++ b/netwerk/moz.build
@@ -25,9 +25,6 @@ if CONFIG['MOZ_SRTP']:
 if CONFIG['MOZ_SCTP']:
     DIRS += ['sctp/src', 'sctp/datachannel']
 
-if CONFIG['NECKO_WIFI']:
-    DIRS += ['wifi']
-
 DIRS += ['locales']
 
 DIRS += ['build']