--- a/ipc/moz.build
+++ b/ipc/moz.build
@@ -11,9 +11,6 @@
     'testshell',
 ]
 
-if CONFIG['MOZ_ENABLE_DBUS']:
-    DIRS += ['dbus']
-
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
     DIRS += ['contentproc']
 
--- a/netwerk/moz.build
+++ b/netwerk/moz.build
@@ -27,10 +27,7 @@
 if CONFIG['MOZ_SCTP']:
     DIRS += ['sctp/src', 'sctp/datachannel']
 
-if CONFIG['NECKO_WIFI']:
-    DIRS += ['wifi']
-
 DIRS += ['locales']
 
 DIRS += ['build']
 TEST_DIRS += ['test']
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -60,6 +60,10 @@
   ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-release
   MAR_CHANNEL_ID=firefox-mozilla-release
 fi
+MOZ_ENABLE_DBUS=0
+NECKO_WIFI=0
+NECKO_WIFI_DBUS=0
+
 MOZ_PROFILE_MIGRATOR=1
 
 # Enable checking that add-ons are signed by the trusted root