deleted file mode 100644
--- a/dom/base/Makefile.in
+++ /dev/null
@@ -1,8 +0,0 @@
- # This Source Code Form is subject to the terms of the Mozilla Public
- # License, v. 2.0. If a copy of the MPL was not distributed with this
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-INSTALL_TARGETS += usecounterlist
-usecounterlist_FILES := UseCounterList.h
-usecounterlist_DEST = $(DIST)/include/mozilla/dom
-usecounterlist_TARGET := export

--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@@ -145,16 +145,17 @@ EXPORTS.mozilla += [
     'ConsoleReportCollector.h',
     'CORSMode.h',
     'FeedWriterEnabled.h',
     'TextInputProcessor.h',
     'UseCounter.h',
 ]
 
 EXPORTS.mozilla.dom += [
+    '!UseCounterList.h',
     'AnonymousContent.h',
     'Attr.h',
     'BarProps.h',
     'BlobSet.h',
     'ChildIterator.h',
     'ChromeNodeList.h',
     'ChromeUtils.h',
     'Comment.h',

--- a/layout/style/Makefile.in
+++ b/layout/style/Makefile.in
@@ -1,17 +1,12 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-INSTALL_TARGETS += structlist
-structlist_FILES := nsStyleStructList.h
-structlist_DEST = $(DIST)/include
-structlist_TARGET := export
-
 # TODO This list should be emitted to a .pp file via
 # GenerateCSSPropsGenerated.py.
 csspropsidlnames_dependencies = \
   $(srcdir)/nsCSSPropList.h \
   $(srcdir)/nsCSSPropAliasList.h \
   $(srcdir)/nsCSSPropsGenerated.inc.in \
   $(srcdir)/PythonCSSProps.h \
   $(srcdir)/GenerateCSSPropsGenerated.py \

--- a/layout/style/moz.build
+++ b/layout/style/moz.build
@@ -24,16 +24,17 @@ TEST_DIRS += ['test']
 
 XPIDL_SOURCES += [
     'nsICSSUnprefixingService.idl',
 ]
 
 XPIDL_MODULE = 'layout_base'
 
 EXPORTS += [
+    '!nsStyleStructList.h',
     'AnimationCommon.h',
     'CounterStyleManager.h',
     'nsAnimationManager.h',
     'nsComputedDOMStylePropertyList.h',
     'nsCSSAnonBoxes.h',
     'nsCSSAnonBoxList.h',
     'nsCSSCounterDescList.h',
     'nsCSSFontDescList.h',

--- a/toolkit/components/telemetry/Makefile.in
+++ b/toolkit/components/telemetry/Makefile.in
@@ -1,21 +1,16 @@
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 USE_RCS_MK := 1
 include $(topsrcdir)/config/makefiles/rcs.mk
 
-INSTALL_TARGETS += histoenums
-histoenums_FILES := TelemetryHistogramEnums.h
-histoenums_DEST = $(DIST)/include/mozilla
-histoenums_TARGET := export
-
 include $(topsrcdir)/config/rules.mk
 
 # This is so hacky. Waiting on bug 988938.
 addondir = $(srcdir)/tests/addons
 testdir = $(topobjdir)/_tests/xpcshell/toolkit/components/telemetry/tests/unit
 
 misc:: $(call mkdir_deps,$(testdir))
 	$(EXIT_ON_ERROR) \

--- a/toolkit/components/telemetry/moz.build
+++ b/toolkit/components/telemetry/moz.build
@@ -10,16 +10,17 @@ XPCSHELL_TESTS_MANIFESTS += ['tests/unit
 
 XPIDL_SOURCES += [
     'nsITelemetry.idl',
 ]
 
 XPIDL_MODULE = 'telemetry'
 
 EXPORTS.mozilla += [
+    '!TelemetryHistogramEnums.h',
     'ProcessedStack.h',
     'Telemetry.h',
     'ThreadHangStats.h',
 ]
 
 SOURCES += [
     'Telemetry.cpp',
     'WebrtcTelemetry.cpp',

--- a/widget/android/bindings/Makefile.in
+++ b/widget/android/bindings/Makefile.in
@@ -16,21 +16,8 @@ sdk_processor := \
 
 # For the benefit of readers: the following pattern rule says that,
 # for example, MediaCodec.cpp and MediaCodec.h can be produced from
 # MediaCodec-classes.txt.  This formulation invokes the SDK processor
 # at most once.
 
 %.cpp %.h: $(ANDROID_SDK)/android.jar %-classes.txt
 	$(sdk_processor) $(ANDROID_SDK)/android.jar $(srcdir)/$*-classes.txt $(CURDIR) $* 16
-
-# We'd like these to be defined in a future GENERATED_EXPORTS list.
-bindings_exports_FILES := \
-	AndroidRect.h \
-  Bundle.h \
-  KeyEvent.h \
-  MediaCodec.h \
-  MotionEvent.h \
-  SurfaceTexture.h \
-  $(NULL)
-bindings_exports_DEST = $(DIST)/include
-bindings_exports_TARGET := export
-INSTALL_TARGETS += bindings_exports

--- a/widget/android/bindings/moz.build
+++ b/widget/android/bindings/moz.build
@@ -12,16 +12,18 @@ generated = [
     'KeyEvent',
     'MediaCodec',
     'MotionEvent',
     'SurfaceTexture'
 ]
 
 SOURCES += ['!%s.cpp' % stem for stem in generated]
 
+EXPORTS += ['!%s.h' % stem for stem in generated]
+
 # We'd like to add these to a future GENERATED_EXPORTS list, but for now we mark
 # them as generated here and manually install them in Makefile.in.
 GENERATED_FILES += [stem + '.h' for stem in generated]
 
 # There is an unfortunate race condition when using generated SOURCES and
 # pattern rules (see Makefile.in) that manifests itself as a VPATH resolution
 # conflict: MediaCodec.o looks for MediaCodec.cpp and $(CURDIR)/MediaCodec.cpp,
 # and the pattern rule is matched but doesn't resolve both sources, causing a