diff --git a/config/Makefile.in b/config/Makefile.in
index c08f2a76da4..790077e67bd 100644
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -30,15 +30,6 @@ 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
diff --git a/moz.build b/moz.build
index 3c6d856edec..db2215ad800 100644
--- a/moz.build
+++ b/moz.build
@@ -28,6 +28,9 @@ if not CONFIG['JS_STANDALONE']:
     CONFIGURE_DEFINE_FILES += [
         'mozilla-config.h',
     ]
+    EXPORTS += [
+        '!mozilla-config.h',
+    ]
 
     DIRS += [
         'build',