--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -25,25 +25,16 @@ nsinstall$(HOST_BIN_SUFFIX): $(HOST_PROG
 
 NSINSTALL_EXECUTABLES := nsinstall$(HOST_BIN_SUFFIX)
 NSINSTALL_DEST := $(DIST)/bin
 NSINSTALL_TARGET := host
 INSTALL_TARGETS += NSINSTALL
 endif
 endif
 
-ifndef JS_STANDALONE
-HEADERS_FILES = \
-	$(DEPTH)/mozilla-config.h \
-	$(NULL)
-HEADERS_DEST := $(DIST)/include
-HEADERS_TARGET := export
-INSTALL_TARGETS += HEADERS
-endif
-
 include $(topsrcdir)/config/rules.mk
 
 ifndef JS_STANDALONE
 ifndef MOZ_PROFILE_USE
 # Generate a new buildid every time we "export" in config... that's only
 # supposed to be once per-build!
 export:: buildid
 

--- a/moz.build
+++ b/moz.build
@@ -23,16 +23,19 @@ DIRS += [
 
 if not CONFIG['JS_STANDALONE']:
     CONFIGURE_SUBST_FILES += [
         'tools/update-packaging/Makefile',
     ]
     CONFIGURE_DEFINE_FILES += [
         'mozilla-config.h',
     ]
+    EXPORTS += [
+        '!mozilla-config.h',
+    ]
 
     DIRS += [
         'build',
         'probes',
     ]
 
 DIRS += [
     'config/external/zlib',