From f710a7cb1dd5f38d15a3ea5317017f1749683b1f Mon Sep 17 00:00:00 2001
From: David Burns <dburns@mozilla.com>
Date: Wed, 4 Sep 2013 09:05:43 +0100
Subject: [PATCH 01/86] Bug 912244: Correct screenshot with element
 highlighting in Marionette; r=jgriffin

---
 .../client/marionette/marionette.py           |  5 ++++-
 .../marionette/tests/unit/test_screenshot.py  |  7 +++++++
 testing/marionette/marionette-listener.js     | 20 ++++---------------
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/testing/marionette/client/marionette/marionette.py b/testing/marionette/client/marionette/marionette.py
index 035dafed5698..5ce6ca8ab27a 100644
--- a/testing/marionette/client/marionette/marionette.py
+++ b/testing/marionette/client/marionette/marionette.py
@@ -1255,4 +1255,7 @@ class Marionette(object):
         '''
         if element is not None:
             element = element.id
-        return self._send_message("screenShot", 'value', element=element, highlights=highlights)
+        lights = None
+        if highlights is not None:
+            lights = [highlight.id for highlight in highlights if highlights]
+        return self._send_message("screenShot", 'value', element=element, highlights=lights)
diff --git a/testing/marionette/client/marionette/tests/unit/test_screenshot.py b/testing/marionette/client/marionette/tests/unit/test_screenshot.py
index 5fcd49fa9fc4..c693a34a905f 100644
--- a/testing/marionette/client/marionette/tests/unit/test_screenshot.py
+++ b/testing/marionette/client/marionette/tests/unit/test_screenshot.py
@@ -10,6 +10,13 @@ class ScreenshotTests(MarionetteTestCase):
         self.assertEqual('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAAVUlEQVRoge3PsQ0AIAzAsI78fzBwBhHykD2ePev80LweAAGJB1ILpBZILZBaILVAaoHUAqkFUgukFkgtkFogtUBqgdQCqQVSC6QWSC2QWiC1QGp9A7ma+7nyXgOpzQAAAABJRU5ErkJggg==',
                          self.marionette.screenshot(element=el))
 
+    def testWeCanTakeAScreenShotWithHighlightOfAnElement(self):
+        test_url = self.marionette.absolute_url('html5Page.html')
+        self.marionette.navigate(test_url)
+        el = self.marionette.find_element('id', 'green')
+        self.assertEqual('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAAV0lEQVRoge3PQRGAQAwAsWINvXgsNnI3+4iAzM7sDWZn9vneoxXRFNEU0RTRFNEU0RTRFNEU0RTRFNEU0RTRFNEU0RTRFNEU0RTRFNEU0RTRFNHcF7nBD/Ha5Ye4BbsYAAAAAElFTkSuQmCC',
+                         self.marionette.screenshot(element=el, highlights=[el]))
+
     def testWeCanTakeAScreenShotEntireCanvas(self):
         test_url = self.marionette.absolute_url('html5Page.html')
         self.marionette.navigate(test_url)
diff --git a/testing/marionette/marionette-listener.js b/testing/marionette/marionette-listener.js
index 58505052c3c0..0e2d8365408a 100644
--- a/testing/marionette/marionette-listener.js
+++ b/testing/marionette/marionette-listener.js
@@ -1789,7 +1789,7 @@ function screenShot(msg) {
   let highlights = msg.json.highlights;
 
   var document = curWindow.document;
-  var rect, win, width, height, left, top, needsOffset;
+  var rect, win, width, height, left, top;
   // node can be either a window or an arbitrary DOM node
   if (node == curWindow) {
     // node is a window
@@ -1798,8 +1798,6 @@ function screenShot(msg) {
     height = win.innerHeight;
     top = 0;
     left = 0;
-    // offset needed for highlights to take 'outerHeight' of window into account
-    needsOffset = true;
   }
   else {
     // node is an arbitrary DOM node
@@ -1809,8 +1807,6 @@ function screenShot(msg) {
     height = rect.height;
     top = rect.top;
     left = rect.left;
-    // offset for highlights not needed as they will be relative to this node
-    needsOffset = false;
   }
 
   var canvas = document.createElementNS("http://www.w3.org/1999/xhtml", "canvas");
@@ -1827,19 +1823,11 @@ function screenShot(msg) {
     ctx.save();
 
     for (var i = 0; i < highlights.length; ++i) {
-      var elem = highlights[i];
+      var elem = elementManager.getKnownElement(highlights[i], curWindow)
       rect = elem.getBoundingClientRect();
 
-      var offsetY = 0, offsetX = 0;
-      if (needsOffset) {
-        var offset = getChromeOffset(elem);
-        offsetX = offset.x;
-        offsetY = offset.y;
-      } else {
-        // Don't need to offset the window chrome, just make relative to containing node
-        offsetY = -top;
-        offsetX = -left;
-      }
+      var offsetY = -top;
+      var offsetX = -left;
 
       // Draw the rectangle
       ctx.strokeRect(rect.left + offsetX, rect.top + offsetY, rect.width, rect.height);

From ea490cb122e98753deb2ded0f6ec7eb8590dad72 Mon Sep 17 00:00:00 2001
From: Gregory Szorc <gps@mozilla.com>
Date: Tue, 3 Sep 2013 22:51:58 -0700
Subject: [PATCH 02/86] Bug 896797 - Part 3: Use install manifests for managing
 dist/include; r=glandium

---
 Makefile.in                                   |  1 +
 js/src/Makefile.in                            |  1 +
 .../action/process_install_manifest.py        |  9 +++--
 .../mozbuild/backend/recursivemake.py         | 34 +++++++----------
 python/mozbuild/mozbuild/frontend/data.py     |  6 ++-
 python/mozbuild/mozbuild/frontend/emitter.py  |  3 +-
 .../test/backend/test_recursivemake.py        | 38 +++++--------------
 7 files changed, 38 insertions(+), 54 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 3d3bc0f5bceb..923f7c263a25 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -99,6 +99,7 @@ TIER_precompile_CUSTOM := 1
 include $(topsrcdir)/config/rules.mk
 
 default all alldep::
+	$(call py_action,process_install_manifest,$(DIST)/include _build_manifests/install/dist_include js/src/_build_manifests/install/dist_include)
 	$(call BUILDSTATUS,TIERS $(TIERS))
 	$(foreach tier,$(TIERS),$(call SUBMAKE,tier_$(tier)))
 
diff --git a/js/src/Makefile.in b/js/src/Makefile.in
index 2439e81e72bd..8e6996e1e484 100644
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -177,6 +177,7 @@ MOZILLA_DTRACE_SRC = $(srcdir)/devtools/javascript-trace.d
 endif
 
 default::
+	$(call py_action,process_install_manifest,--no-remove $(DIST)/include _build_manifests/install/dist_include)
 
 ifneq (,$(CROSS_COMPILE)$(filter-out WINNT OS2,$(OS_ARCH)))
 # nsinstall doesn't get built until we enter config/ in the exports phase,
diff --git a/python/mozbuild/mozbuild/action/process_install_manifest.py b/python/mozbuild/mozbuild/action/process_install_manifest.py
index 33468703145c..9c5aec14196e 100644
--- a/python/mozbuild/mozbuild/action/process_install_manifest.py
+++ b/python/mozbuild/mozbuild/action/process_install_manifest.py
@@ -13,14 +13,14 @@ COMPLETE = 'From {dest}: Kept {existing} existing; Added/updated {updated}; ' \
     'Removed {rm_files} files and {rm_dirs} directories.'
 
 
-def process_manifest(destdir, *paths):
+def process_manifest(destdir, paths, remove_unaccounted=True):
     manifest = InstallManifest()
     for path in paths:
         manifest |= InstallManifest(path=path)
 
     copier = FileCopier()
     manifest.populate_registry(copier)
-    return copier.copy(destdir)
+    return copier.copy(destdir, remove_unaccounted=remove_unaccounted)
 
 
 if __name__ == '__main__':
@@ -29,10 +29,13 @@ if __name__ == '__main__':
 
     parser.add_argument('destdir', help='Destination directory.')
     parser.add_argument('manifests', nargs='+', help='Path to manifest file(s).')
+    parser.add_argument('--no-remove', action='store_true',
+        help='Do not remove unaccounted files from destination.')
 
     args = parser.parse_args()
 
-    result = process_manifest(args.destdir, *args.manifests)
+    result = process_manifest(args.destdir, args.manifests,
+        remove_unaccounted=not args.no_remove)
 
     print(COMPLETE.format(dest=args.destdir,
         existing=result.existing_files_count,
diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild/mozbuild/backend/recursivemake.py
index 4527e3cf477c..765f329d004f 100644
--- a/python/mozbuild/mozbuild/backend/recursivemake.py
+++ b/python/mozbuild/mozbuild/backend/recursivemake.py
@@ -149,11 +149,8 @@ class RecursiveMakeBackend(CommonBackend):
         self.backend_input_files.add(os.path.join(self.environment.topobjdir,
             'config', 'autoconf.mk'))
 
-        self._install_manifests = dict()
-
         self._purge_manifests = dict(
             dist_bin=PurgeManifest(relpath='dist/bin'),
-            dist_include=PurgeManifest(relpath='dist/include'),
             dist_private=PurgeManifest(relpath='dist/private'),
             dist_public=PurgeManifest(relpath='dist/public'),
             dist_sdk=PurgeManifest(relpath='dist/sdk'),
@@ -163,6 +160,7 @@ class RecursiveMakeBackend(CommonBackend):
 
         self._install_manifests = dict(
             dist_idl=InstallManifest(),
+            dist_include=InstallManifest(),
         )
 
     def _update_from_avoid_write(self, result):
@@ -368,27 +366,22 @@ class RecursiveMakeBackend(CommonBackend):
                 ' '.join(obj.parallel_external_make_dirs))
 
     def _process_exports(self, obj, exports, backend_file, namespace=""):
+        # This may not be needed, but is present for backwards compatibility
+        # with the old make rules, just in case.
+        if not obj.dist_install:
+            return
+
         strings = exports.get_strings()
         if namespace:
-            if strings:
-                backend_file.write('EXPORTS_NAMESPACES += %s\n' % namespace)
-            export_name = 'EXPORTS_%s' % namespace
             namespace += '/'
-        else:
-            export_name = 'EXPORTS'
 
-        # Iterate over the list of export filenames, printing out an EXPORTS
-        # declaration for each.
-        if strings:
-            backend_file.write('%s += %s\n' % (export_name, ' '.join(strings)))
+        for s in strings:
+            source = os.path.normpath(os.path.join(obj.srcdir, s))
+            dest = '%s%s' % (namespace, os.path.basename(s))
+            self._install_manifests['dist_include'].add_symlink(source, dest)
 
-            for s in strings:
-                source = os.path.normpath(os.path.join(obj.srcdir, s))
-                if not os.path.isfile(source):
-                    raise Exception('File listed in EXPORTS does not exist: %s' % source)
-
-                p = '%s%s' % (namespace, s)
-                self._purge_manifests['dist_include'].add(p)
+            if not os.path.exists(source):
+                raise Exception('File listed in EXPORTS does not exist: %s' % source)
 
         children = exports.get_children()
         for subdir in sorted(children):
@@ -405,7 +398,8 @@ class RecursiveMakeBackend(CommonBackend):
         for idl in manager.idls.values():
             self._install_manifests['dist_idl'].add_symlink(idl['source'],
                 idl['basename'])
-            self._purge_manifests['dist_include'].add('%s.h' % idl['root'])
+            self._install_manifests['dist_include'].add_optional_exists('%s.h'
+                % idl['root'])
             build_files.add(mozpath.join('headers', '%s.h' % idl['root']))
 
         for module in manager.modules:
diff --git a/python/mozbuild/mozbuild/frontend/data.py b/python/mozbuild/mozbuild/frontend/data.py
index 0ca88f36cdf8..9db3d89079c4 100644
--- a/python/mozbuild/mozbuild/frontend/data.py
+++ b/python/mozbuild/mozbuild/frontend/data.py
@@ -161,11 +161,13 @@ class Exports(SandboxDerived):
     this object fills that role. It just has a reference to the underlying
     HierarchicalStringList, which is created when parsing EXPORTS.
     """
-    __slots__ = ('exports')
+    __slots__ = ('exports', 'dist_install')
 
-    def __init__(self, sandbox, exports):
+    def __init__(self, sandbox, exports, dist_install=True):
         SandboxDerived.__init__(self, sandbox)
         self.exports = exports
+        self.dist_install = dist_install
+
 
 class IPDLFile(SandboxDerived):
     """Describes an individual .ipdl source file."""
diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozbuild/frontend/emitter.py
index 4979e8b02c5f..3e8bd677582d 100644
--- a/python/mozbuild/mozbuild/frontend/emitter.py
+++ b/python/mozbuild/mozbuild/frontend/emitter.py
@@ -154,7 +154,8 @@ class TreeMetadataEmitter(LoggingMixin):
 
         exports = sandbox.get('EXPORTS')
         if exports:
-            yield Exports(sandbox, exports)
+            yield Exports(sandbox, exports,
+                dist_install=not sandbox.get('NO_DIST_INSTALL', False))
 
         program = sandbox.get('PROGRAM')
         if program:
diff --git a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py b/python/mozbuild/mozbuild/test/backend/test_recursivemake.py
index ff411d2701c2..a2d64e8b31c3 100644
--- a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py
+++ b/python/mozbuild/mozbuild/test/backend/test_recursivemake.py
@@ -234,33 +234,16 @@ class TestRecursiveMakeBackend(BackendTester):
             self.assertEqual(found, val)
 
     def test_exports(self):
-        """Ensure EXPORTS is written out correctly."""
+        """Ensure EXPORTS is handled properly."""
         env = self._consume('exports', RecursiveMakeBackend)
 
-        backend_path = os.path.join(env.topobjdir, 'backend.mk')
-        lines = [l.strip() for l in open(backend_path, 'rt').readlines()[2:]]
-
-        self.assertEqual(lines, [
-            'MOZBUILD_DERIVED := 1',
-            'NO_MAKEFILE_RULE := 1',
-            'NO_SUBMAKEFILES_RULE := 1',
-            'EXPORTS += foo.h',
-            'EXPORTS_NAMESPACES += mozilla',
-            'EXPORTS_mozilla += mozilla1.h mozilla2.h',
-            'EXPORTS_NAMESPACES += mozilla/dom',
-            'EXPORTS_mozilla/dom += dom1.h dom2.h',
-            'EXPORTS_NAMESPACES += mozilla/gfx',
-            'EXPORTS_mozilla/gfx += gfx.h',
-            'EXPORTS_NAMESPACES += nspr/private',
-            'EXPORTS_nspr/private += pprio.h',
-        ])
-
-        # EXPORTS files should appear in the dist_include purge manifest.
-        m = PurgeManifest(path=os.path.join(env.topobjdir,
-            '_build_manifests', 'purge', 'dist_include'))
-        self.assertIn('foo.h', m.entries)
-        self.assertIn('mozilla/mozilla1.h', m.entries)
-        self.assertIn('mozilla/dom/dom2.h', m.entries)
+        # EXPORTS files should appear in the dist_include install manifest.
+        m = InstallManifest(path=os.path.join(env.topobjdir,
+            '_build_manifests', 'install', 'dist_include'))
+        self.assertEqual(len(m), 7)
+        self.assertIn('foo.h', m)
+        self.assertIn('mozilla/mozilla1.h', m)
+        self.assertIn('mozilla/dom/dom2.h', m)
 
     def test_xpcshell_manifests(self):
         """Ensure XPCSHELL_TESTS_MANIFESTS is written out correctly."""
@@ -297,8 +280,8 @@ class TestRecursiveMakeBackend(BackendTester):
         self.assertIn('bar.idl', m)
         self.assertIn('foo.idl', m)
 
-        m = PurgeManifest(path=os.path.join(purge_dir, 'dist_include'))
-        self.assertIn('foo.h', m.entries)
+        m = InstallManifest(path=os.path.join(install_dir, 'dist_include'))
+        self.assertIn('foo.h', m)
 
         p = os.path.join(env.topobjdir, 'config/makefiles/xpidl')
         self.assertTrue(os.path.isdir(p))
@@ -325,7 +308,6 @@ class TestRecursiveMakeBackend(BackendTester):
 
         expected = [
             'dist_bin',
-            'dist_include',
             'dist_private',
             'dist_public',
             'dist_sdk',

From cac20eed1e2ad87daae9bb2c28278fec8776f28b Mon Sep 17 00:00:00 2001
From: Karl Tomlinson <karlt+@karlt.net>
Date: Wed, 4 Sep 2013 15:02:04 +1200
Subject: [PATCH 03/86] revert 3171b6ad0055 b=907986

--HG--
extra : transplant_source : K%83%1FS%27%A7%20%82%C4P%08%E5n%8C%830%B6%2C%24%97
---
 content/media/webaudio/PannerNode.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/content/media/webaudio/PannerNode.cpp b/content/media/webaudio/PannerNode.cpp
index 3c9c3c9edcc3..eda79dd31a2f 100644
--- a/content/media/webaudio/PannerNode.cpp
+++ b/content/media/webaudio/PannerNode.cpp
@@ -444,8 +444,11 @@ PannerNodeEngine::ComputeConeGain()
   ThreeDPoint sourceToListener = mListenerPosition - mPosition;
   sourceToListener.Normalize();
 
+  ThreeDPoint normalizedSourceOrientation = mOrientation;
+  normalizedSourceOrientation.Normalize();
+
   // Angle between the source orientation vector and the source-listener vector
-  double dotProduct = sourceToListener.DotProduct(mOrientation);
+  double dotProduct = sourceToListener.DotProduct(normalizedSourceOrientation);
   double angle = 180 * acos(dotProduct) / M_PI;
   double absAngle = fabs(angle);
 

From 21298924c4824f694a3a1bd4ea313d7b389857d2 Mon Sep 17 00:00:00 2001
From: Karl Tomlinson <karlt+@karlt.net>
Date: Wed, 4 Sep 2013 21:10:32 +1200
Subject: [PATCH 04/86] crashtests for bug 907986

--HG--
extra : transplant_source : %1A%09%7D%14MM%B2_p%2B%27%C4M%C3%A2%83%F3C%C4%DC
---
 content/media/test/crashtests/907986-1.html   | 17 +++++++++++++++++
 content/media/test/crashtests/907986-2.html   | 17 +++++++++++++++++
 content/media/test/crashtests/907986-3.html   | 17 +++++++++++++++++
 content/media/test/crashtests/907986-4.html   | 15 +++++++++++++++
 content/media/test/crashtests/crashtests.list |  4 ++++
 5 files changed, 70 insertions(+)
 create mode 100644 content/media/test/crashtests/907986-1.html
 create mode 100644 content/media/test/crashtests/907986-2.html
 create mode 100644 content/media/test/crashtests/907986-3.html
 create mode 100644 content/media/test/crashtests/907986-4.html

diff --git a/content/media/test/crashtests/907986-1.html b/content/media/test/crashtests/907986-1.html
new file mode 100644
index 000000000000..320b8eadd0cf
--- /dev/null
+++ b/content/media/test/crashtests/907986-1.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<script>
+var context = new window.OfflineAudioContext(1, 100, 48000);
+context.oncomplete = function(e) {
+    document.documentElement.removeAttribute("class");
+};
+// zero front vector
+context.listener.setOrientation(0, 0, 0, 6.311749985202524e+307, 0, 0);
+var panner = context.createPanner();
+panner.setPosition(6.311749985202524e+307, 4, 6.311749985202524e+307);
+panner.connect(context.destination);
+var source = context.createOscillator();
+source.connect(panner);
+source.start(0);
+context.startRendering();
+</script>
diff --git a/content/media/test/crashtests/907986-2.html b/content/media/test/crashtests/907986-2.html
new file mode 100644
index 000000000000..e0626ba2c26b
--- /dev/null
+++ b/content/media/test/crashtests/907986-2.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<script>
+var context = new window.OfflineAudioContext(1, 100, 48000);
+context.oncomplete = function(e) {
+    document.documentElement.removeAttribute("class");
+};
+// zero up vector
+context.listener.setOrientation(0, 6.311749985202524e+307, 0, 0, 0, 0);
+var panner = context.createPanner();
+panner.setPosition(1, 2, 3);
+panner.connect(context.destination);
+var source = context.createOscillator();
+source.connect(panner);
+source.start(0);
+context.startRendering();
+</script>
diff --git a/content/media/test/crashtests/907986-3.html b/content/media/test/crashtests/907986-3.html
new file mode 100644
index 000000000000..75b756c36347
--- /dev/null
+++ b/content/media/test/crashtests/907986-3.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<script>
+var context = new window.OfflineAudioContext(1, 100, 48000);
+context.oncomplete = function(e) {
+    document.documentElement.removeAttribute("class");
+};
+// linearly dependent
+context.listener.setOrientation(0, 0, -6.311749985202524e+307, 0, 0, 6.311749985202524e+307);
+var panner = context.createPanner();
+panner.setPosition(1, 2, 3);
+panner.connect(context.destination);
+var source = context.createOscillator();
+source.connect(panner);
+source.start(0);
+context.startRendering();
+</script>
diff --git a/content/media/test/crashtests/907986-4.html b/content/media/test/crashtests/907986-4.html
new file mode 100644
index 000000000000..a73500efcac9
--- /dev/null
+++ b/content/media/test/crashtests/907986-4.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<script>
+var context = new window.OfflineAudioContext(1, 100, 48000);
+context.oncomplete = function(e) {
+    document.documentElement.removeAttribute("class");
+};
+var panner = context.createPanner();
+panner.setPosition(0, 3, 0);  // directly overhead
+panner.connect(context.destination);
+var source = context.createOscillator();
+source.connect(panner);
+source.start(0);
+context.startRendering();
+</script>
diff --git a/content/media/test/crashtests/crashtests.list b/content/media/test/crashtests/crashtests.list
index 42195b4111fe..c78dc38eea44 100644
--- a/content/media/test/crashtests/crashtests.list
+++ b/content/media/test/crashtests/crashtests.list
@@ -51,3 +51,7 @@ test-pref(media.webvtt.enabled,true) load 882549.html
 load 884459.html
 load 889042.html
 test-pref(media.webvtt.enabled,true) load 894104.html
+load 907986-1.html
+load 907986-2.html
+load 907986-3.html
+load 907986-4.html

From ce7c2ca91b2a7558aa7b2effdc88e34fb019990b Mon Sep 17 00:00:00 2001
From: Karl Tomlinson <karlt+@karlt.net>
Date: Wed, 4 Sep 2013 21:20:58 +1200
Subject: [PATCH 05/86] b=907986 don't calculate upProjection twice r=padenot

--HG--
extra : transplant_source : %8E%E1r%9F%AC%EB%C6%9A%EE_%10%0F%B9%1D%EF%85%EBu%CD%96
---
 content/media/webaudio/PannerNode.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/media/webaudio/PannerNode.cpp b/content/media/webaudio/PannerNode.cpp
index eda79dd31a2f..c218f6a410e1 100644
--- a/content/media/webaudio/PannerNode.cpp
+++ b/content/media/webaudio/PannerNode.cpp
@@ -422,7 +422,7 @@ PannerNodeEngine::ComputeAzimuthAndElevation(float& aAzimuth, float& aElevation)
     aAzimuth = 450 - aAzimuth;
   }
 
-  aElevation = 90 - 180 * acos(sourceListener.DotProduct(up)) / M_PI;
+  aElevation = 90 - 180 * acos(upProjection) / M_PI;
 
   if (aElevation > 90) {
     aElevation = 180 - aElevation;

From de80c0afe2b7dc136512f27209f2836d07fd5607 Mon Sep 17 00:00:00 2001
From: Karl Tomlinson <karlt+@karlt.net>
Date: Wed, 4 Sep 2013 21:20:58 +1200
Subject: [PATCH 06/86] b=907986 avoid under and overflow in Normalize()
 r=padenot

--HG--
extra : transplant_source : %83%C5%A4%92%28%2Bf%7DHT%13%DE7L%26%B89x%E4%FF
---
 content/media/webaudio/ThreeDPoint.h | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/content/media/webaudio/ThreeDPoint.h b/content/media/webaudio/ThreeDPoint.h
index 847e53bfbbcb..45aaed5cac7e 100644
--- a/content/media/webaudio/ThreeDPoint.h
+++ b/content/media/webaudio/ThreeDPoint.h
@@ -8,6 +8,7 @@
 #define ThreeDPoint_h_
 
 #include <cmath>
+#include <algorithm>
 
 namespace mozilla {
 
@@ -34,6 +35,12 @@ struct ThreeDPoint {
 
   void Normalize()
   {
+    // Normalize with the maximum norm first to avoid overflow and underflow.
+    double invMax = 1 / MaxNorm();
+    x *= invMax;
+    y *= invMax;
+    z *= invMax;
+
     double invDistance = 1 / Magnitude();
     x *= invDistance;
     y *= invDistance;
@@ -62,6 +69,12 @@ struct ThreeDPoint {
     return x == 0 && y == 0 && z == 0;
   }
   double x, y, z;
+
+private:
+  double MaxNorm() const
+  {
+    return std::max(fabs(x), std::max(fabs(y), fabs(z)));
+  }
 };
 
 ThreeDPoint operator-(const ThreeDPoint& lhs, const ThreeDPoint& rhs);

From 4affe59604b66629497c67693dabacec864d327b Mon Sep 17 00:00:00 2001
From: Karl Tomlinson <karlt+@karlt.net>
Date: Wed, 4 Sep 2013 21:20:59 +1200
Subject: [PATCH 07/86] b=907986 normalize orientation vectors early and keep
 existing state if directions are undefined r=padenot

Normalizing the AudioListener front orientation vectors before taking their
cross product avoids the possibility of overflow.

The panning effect and the azimuth and elevation calculation in the Web Audio
spec becomes undefined with linearly dependent listener vectors, so keep
existing state in these situations.

PannerNode orientation is normalized for consistency, but zero is permitted
for this vector because the sound cone algorithm in the Web Audio specifies
behavior for this case.

--HG--
extra : transplant_source : %DA%C7e%E7%90%14%AF%EA%08%94x%C1%A2g%F1%9A%EE%16%EB%29
---
 content/media/webaudio/AudioListener.cpp | 42 +++++++++++++++++++++---
 content/media/webaudio/AudioListener.h   | 24 ++------------
 content/media/webaudio/PannerNode.cpp    | 30 +++++++----------
 content/media/webaudio/PannerNode.h      | 18 +++++-----
 content/media/webaudio/ThreeDPoint.cpp   |  9 +++++
 content/media/webaudio/ThreeDPoint.h     |  4 +++
 6 files changed, 74 insertions(+), 53 deletions(-)

diff --git a/content/media/webaudio/AudioListener.cpp b/content/media/webaudio/AudioListener.cpp
index 1d52a41673f1..7e1ad8d50a09 100644
--- a/content/media/webaudio/AudioListener.cpp
+++ b/content/media/webaudio/AudioListener.cpp
@@ -19,8 +19,8 @@ NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(AudioListener, Release)
 AudioListener::AudioListener(AudioContext* aContext)
   : mContext(aContext)
   , mPosition()
-  , mOrientation(0., 0., -1.)
-  , mUpVector(0., 1., 0.)
+  , mFrontVector(0., 0., -1.)
+  , mRightVector(1., 0., 0.)
   , mVelocity()
   , mDopplerFactor(1.)
   , mSpeedOfSound(343.3) // meters/second
@@ -35,6 +35,40 @@ AudioListener::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
   return AudioListenerBinding::Wrap(aCx, aScope, this);
 }
 
+void
+AudioListener::SetOrientation(double aX, double aY, double aZ,
+                              double aXUp, double aYUp, double aZUp)
+{
+  ThreeDPoint front(aX, aY, aZ);
+  // The panning effect and the azimuth and elevation calculation in the Web
+  // Audio spec becomes undefined with linearly dependent vectors, so keep
+  // existing state in these situations.
+  if (front.IsZero()) {
+    return;
+  }
+  // Normalize before using CrossProduct() to avoid overflow.
+  front.Normalize();
+  ThreeDPoint up(aXUp, aYUp, aZUp);
+  if (up.IsZero()) {
+    return;
+  }
+  up.Normalize();
+  ThreeDPoint right = front.CrossProduct(up);
+  if (right.IsZero()) {
+    return;
+  }
+  right.Normalize();
+
+  if (!mFrontVector.FuzzyEqual(front)) {
+    mFrontVector = front;
+    SendThreeDPointParameterToStream(PannerNode::LISTENER_FRONT_VECTOR, front);
+  }
+  if (!mRightVector.FuzzyEqual(right)) {
+    mRightVector = right;
+    SendThreeDPointParameterToStream(PannerNode::LISTENER_RIGHT_VECTOR, right);
+  }
+}
+
 void
 AudioListener::RegisterPannerNode(PannerNode* aPannerNode)
 {
@@ -42,8 +76,8 @@ AudioListener::RegisterPannerNode(PannerNode* aPannerNode)
 
   // Let the panner node know about our parameters
   aPannerNode->SendThreeDPointParameterToStream(PannerNode::LISTENER_POSITION, mPosition);
-  aPannerNode->SendThreeDPointParameterToStream(PannerNode::LISTENER_ORIENTATION, mOrientation);
-  aPannerNode->SendThreeDPointParameterToStream(PannerNode::LISTENER_UPVECTOR, mUpVector);
+  aPannerNode->SendThreeDPointParameterToStream(PannerNode::LISTENER_FRONT_VECTOR, mFrontVector);
+  aPannerNode->SendThreeDPointParameterToStream(PannerNode::LISTENER_RIGHT_VECTOR, mRightVector);
   aPannerNode->SendThreeDPointParameterToStream(PannerNode::LISTENER_VELOCITY, mVelocity);
   aPannerNode->SendDoubleParameterToStream(PannerNode::LISTENER_DOPPLER_FACTOR, mDopplerFactor);
   aPannerNode->SendDoubleParameterToStream(PannerNode::LISTENER_SPEED_OF_SOUND, mSpeedOfSound);
diff --git a/content/media/webaudio/AudioListener.h b/content/media/webaudio/AudioListener.h
index 91bd4733529e..4fb1ef18a2f8 100644
--- a/content/media/webaudio/AudioListener.h
+++ b/content/media/webaudio/AudioListener.h
@@ -84,25 +84,7 @@ public:
   }
 
   void SetOrientation(double aX, double aY, double aZ,
-                      double aXUp, double aYUp, double aZUp)
-  {
-    if (WebAudioUtils::FuzzyEqual(mOrientation.x, aX) &&
-        WebAudioUtils::FuzzyEqual(mOrientation.y, aY) &&
-        WebAudioUtils::FuzzyEqual(mOrientation.z, aZ) &&
-        WebAudioUtils::FuzzyEqual(mUpVector.x, aX) &&
-        WebAudioUtils::FuzzyEqual(mUpVector.y, aY) &&
-        WebAudioUtils::FuzzyEqual(mUpVector.z, aZ)) {
-      return;
-    }
-    mOrientation.x = aX;
-    mOrientation.y = aY;
-    mOrientation.z = aZ;
-    mUpVector.x = aXUp;
-    mUpVector.y = aYUp;
-    mUpVector.z = aZUp;
-    SendThreeDPointParameterToStream(PannerNode::LISTENER_ORIENTATION, mOrientation);
-    SendThreeDPointParameterToStream(PannerNode::LISTENER_UPVECTOR, mUpVector);
-  }
+                      double aXUp, double aYUp, double aZUp);
 
   const ThreeDPoint& Velocity() const
   {
@@ -135,8 +117,8 @@ private:
   friend class PannerNode;
   nsRefPtr<AudioContext> mContext;
   ThreeDPoint mPosition;
-  ThreeDPoint mOrientation;
-  ThreeDPoint mUpVector;
+  ThreeDPoint mFrontVector;
+  ThreeDPoint mRightVector;
   ThreeDPoint mVelocity;
   double mDopplerFactor;
   double mSpeedOfSound;
diff --git a/content/media/webaudio/PannerNode.cpp b/content/media/webaudio/PannerNode.cpp
index c218f6a410e1..ef77af59d5a2 100644
--- a/content/media/webaudio/PannerNode.cpp
+++ b/content/media/webaudio/PannerNode.cpp
@@ -109,8 +109,8 @@ public:
   {
     switch (aIndex) {
     case PannerNode::LISTENER_POSITION: mListenerPosition = aParam; break;
-    case PannerNode::LISTENER_ORIENTATION: mListenerOrientation = aParam; break;
-    case PannerNode::LISTENER_UPVECTOR: mListenerUpVector = aParam; break;
+    case PannerNode::LISTENER_FRONT_VECTOR: mListenerFrontVector = aParam; break;
+    case PannerNode::LISTENER_RIGHT_VECTOR: mListenerRightVector = aParam; break;
     case PannerNode::LISTENER_VELOCITY: mListenerVelocity = aParam; break;
     case PannerNode::POSITION: mPosition = aParam; break;
     case PannerNode::ORIENTATION: mOrientation = aParam; break;
@@ -178,8 +178,8 @@ public:
   double mConeOuterAngle;
   double mConeOuterGain;
   ThreeDPoint mListenerPosition;
-  ThreeDPoint mListenerOrientation;
-  ThreeDPoint mListenerUpVector;
+  ThreeDPoint mListenerFrontVector;
+  ThreeDPoint mListenerRightVector;
   ThreeDPoint mListenerVelocity;
   double mListenerDopplerFactor;
   double mListenerSpeedOfSound;
@@ -376,7 +376,7 @@ PannerNodeEngine::DistanceAndConeGain(AudioChunk* aChunk, float aGain)
   AudioBufferInPlaceScale(samples, channelCount, aGain);
 }
 
-// This algorithm is specicied in the webaudio spec.
+// This algorithm is specified in the webaudio spec.
 void
 PannerNodeEngine::ComputeAzimuthAndElevation(float& aAzimuth, float& aElevation)
 {
@@ -391,14 +391,9 @@ PannerNodeEngine::ComputeAzimuthAndElevation(float& aAzimuth, float& aElevation)
   sourceListener.Normalize();
 
   // Project the source-listener vector on the x-z plane.
-  ThreeDPoint& listenerFront = mListenerOrientation;
-  ThreeDPoint listenerRightNorm = listenerFront.CrossProduct(mListenerUpVector);
-  listenerRightNorm.Normalize();
-
-  ThreeDPoint listenerFrontNorm(listenerFront);
-  listenerFrontNorm.Normalize();
-
-  ThreeDPoint up = listenerRightNorm.CrossProduct(listenerFrontNorm);
+  const ThreeDPoint& listenerFront = mListenerFrontVector;
+  const ThreeDPoint& listenerRight = mListenerRightVector;
+  ThreeDPoint up = listenerRight.CrossProduct(listenerFront);
 
   double upProjection = sourceListener.DotProduct(up);
 
@@ -406,11 +401,11 @@ PannerNodeEngine::ComputeAzimuthAndElevation(float& aAzimuth, float& aElevation)
   projectedSource.Normalize();
 
   // Actually compute the angle, and convert to degrees
-  double projection = projectedSource.DotProduct(listenerRightNorm);
+  double projection = projectedSource.DotProduct(listenerRight);
   aAzimuth = 180 * acos(projection) / M_PI;
 
   // Compute whether the source is in front or behind the listener.
-  double frontBack = projectedSource.DotProduct(listenerFrontNorm);
+  double frontBack = projectedSource.DotProduct(listenerFront);
   if (frontBack < 0) {
     aAzimuth = 360 - aAzimuth;
   }
@@ -444,11 +439,8 @@ PannerNodeEngine::ComputeConeGain()
   ThreeDPoint sourceToListener = mListenerPosition - mPosition;
   sourceToListener.Normalize();
 
-  ThreeDPoint normalizedSourceOrientation = mOrientation;
-  normalizedSourceOrientation.Normalize();
-
   // Angle between the source orientation vector and the source-listener vector
-  double dotProduct = sourceToListener.DotProduct(normalizedSourceOrientation);
+  double dotProduct = sourceToListener.DotProduct(mOrientation);
   double angle = 180 * acos(dotProduct) / M_PI;
   double absAngle = fabs(angle);
 
diff --git a/content/media/webaudio/PannerNode.h b/content/media/webaudio/PannerNode.h
index 9d06f97191fd..eb8e764e8df3 100644
--- a/content/media/webaudio/PannerNode.h
+++ b/content/media/webaudio/PannerNode.h
@@ -120,14 +120,14 @@ public:
 
   void SetOrientation(double aX, double aY, double aZ)
   {
-    if (WebAudioUtils::FuzzyEqual(mOrientation.x, aX) &&
-        WebAudioUtils::FuzzyEqual(mOrientation.y, aY) &&
-        WebAudioUtils::FuzzyEqual(mOrientation.z, aZ)) {
+    ThreeDPoint orientation(aX, aY, aZ);
+    if (!orientation.IsZero()) {
+      orientation.Normalize();
+    }
+    if (mOrientation.FuzzyEqual(orientation)) {
       return;
     }
-    mOrientation.x = aX;
-    mOrientation.y = aY;
-    mOrientation.z = aZ;
+    mOrientation = orientation;
     SendThreeDPointParameterToStream(ORIENTATION, mOrientation);
   }
 
@@ -233,15 +233,15 @@ private:
   friend class PannerNodeEngine;
   enum EngineParameters {
     LISTENER_POSITION,
-    LISTENER_ORIENTATION,
-    LISTENER_UPVECTOR,
+    LISTENER_FRONT_VECTOR, // unit length
+    LISTENER_RIGHT_VECTOR, // unit length, orthogonal to LISTENER_FRONT_VECTOR
     LISTENER_VELOCITY,
     LISTENER_DOPPLER_FACTOR,
     LISTENER_SPEED_OF_SOUND,
     PANNING_MODEL,
     DISTANCE_MODEL,
     POSITION,
-    ORIENTATION,
+    ORIENTATION, // unit length or zero
     VELOCITY,
     REF_DISTANCE,
     MAX_DISTANCE,
diff --git a/content/media/webaudio/ThreeDPoint.cpp b/content/media/webaudio/ThreeDPoint.cpp
index f4187e7b37f9..422c36078ace 100644
--- a/content/media/webaudio/ThreeDPoint.cpp
+++ b/content/media/webaudio/ThreeDPoint.cpp
@@ -9,11 +9,20 @@
  */
 
 #include "ThreeDPoint.h"
+#include "WebAudioUtils.h"
 
 namespace mozilla {
 
 namespace dom {
 
+bool
+ThreeDPoint::FuzzyEqual(const ThreeDPoint& other)
+{
+  return WebAudioUtils::FuzzyEqual(x, other.x) &&
+    WebAudioUtils::FuzzyEqual(y, other.y) &&
+    WebAudioUtils::FuzzyEqual(z, other.z);
+}
+
 ThreeDPoint operator-(const ThreeDPoint& lhs, const ThreeDPoint& rhs)
 {
   return ThreeDPoint(lhs.x - rhs.x, lhs.y - rhs.y, lhs.z - rhs.z);
diff --git a/content/media/webaudio/ThreeDPoint.h b/content/media/webaudio/ThreeDPoint.h
index 45aaed5cac7e..c9c8eba068d4 100644
--- a/content/media/webaudio/ThreeDPoint.h
+++ b/content/media/webaudio/ThreeDPoint.h
@@ -68,6 +68,10 @@ struct ThreeDPoint {
   {
     return x == 0 && y == 0 && z == 0;
   }
+
+  // For comparing two vectors of close to unit magnitude.
+  bool FuzzyEqual(const ThreeDPoint& other);
+
   double x, y, z;
 
 private:

From 23ae39aad238b411cd6966a487be55b36d37ac7b Mon Sep 17 00:00:00 2001
From: Karl Tomlinson <karlt+@karlt.net>
Date: Wed, 4 Sep 2013 21:20:59 +1200
Subject: [PATCH 08/86] test equalpower panning effect with panner directly
 above b=907986

--HG--
extra : transplant_source : %8E%99%9B%F8%288%5C%A5%E8%D1%C3%E2%9F%89%5C%D0C%B1l%B0
---
 content/media/webaudio/test/Makefile.in       |  1 +
 .../webaudio/test/test_pannerNodeAbove.html   | 50 +++++++++++++++++++
 2 files changed, 51 insertions(+)
 create mode 100644 content/media/webaudio/test/test_pannerNodeAbove.html

diff --git a/content/media/webaudio/test/Makefile.in b/content/media/webaudio/test/Makefile.in
index 2fe44cb346c3..e687f81dfc39 100644
--- a/content/media/webaudio/test/Makefile.in
+++ b/content/media/webaudio/test/Makefile.in
@@ -82,6 +82,7 @@ MOCHITEST_FILES := \
   test_oscillatorNode.html \
   test_oscillatorNodeStart.html \
   test_pannerNode.html \
+  test_pannerNodeAbove.html \
   test_pannerNode_equalPower.html \
   test_periodicWave.html \
   test_scriptProcessorNode.html \
diff --git a/content/media/webaudio/test/test_pannerNodeAbove.html b/content/media/webaudio/test/test_pannerNodeAbove.html
new file mode 100644
index 000000000000..d7a6e6cb4dfa
--- /dev/null
+++ b/content/media/webaudio/test/test_pannerNodeAbove.html
@@ -0,0 +1,50 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Test PannerNode directly above</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+</head>
+<body>
+<pre id="test">
+<script src="webaudio.js" type="text/javascript"></script>
+<script class="testbody" type="text/javascript">
+
+var gTest = {
+  numberOfChannels: 2,
+  createGraph: function(context) {
+    // An up vector will be made perpendicular to the front vector, in the
+    // front-up plane.
+    context.listener.setOrientation(0, 6.311749985202524e+307, 0, 0.1, 1000, 0);
+    // Linearly dependent vectors are ignored.
+    context.listener.setOrientation(0, 0, -6.311749985202524e+307, 0, 0, 6.311749985202524e+307);
+    var panner = context.createPanner();
+    panner.setPosition(2, 0, 0); // directly above
+    panner.rolloffFactor = 0; // no distance gain
+    panner.panningModel = "equalpower"; // no effect when directly above
+
+    var source = context.createBufferSource();
+    source.buffer = this.buffer;
+    source.connect(panner);
+    source.start(0);
+
+    return panner;
+  },
+  createExpectedBuffers: function(context) {
+    var expectedBuffer = context.createBuffer(2, 2048, context.sampleRate);
+    for (var i = 0; i < 2048; ++i) {
+      // Different signals in left and right buffers
+      expectedBuffer.getChannelData(0)[i] = Math.sin(440 * 2 * Math.PI * i / context.sampleRate);
+      expectedBuffer.getChannelData(1)[i] = Math.sin(220 * 2 * Math.PI * i / context.sampleRate);
+    }
+    this.buffer = expectedBuffer;
+    return expectedBuffer;
+  },
+};
+
+runTest();
+
+</script>
+</pre>
+</body>
+</html>

From 95c6c435c149c1224e64db14c25bccafb9102228 Mon Sep 17 00:00:00 2001
From: Karl Tomlinson <karlt+@karlt.net>
Date: Wed, 4 Sep 2013 21:20:59 +1200
Subject: [PATCH 09/86] b=907986 handle zero front-right plane projection
 without NaNs r=padenot

The azimuth calculation in the Web Audio spec becomes undefined in this
situation as it requires normalizing a zero vector.  The panning effect should
not depend on azimuth when the source is directly above the listener (because
position does not depend on azimuth), but the specified "equalpower" panning
model does depend on azimuth even at this elevation.  Setting azimuth to zero
produces the same result as if the normalized projection were replaced with a
zero vector.

--HG--
extra : transplant_source : f%A4h%CB7%7Bp%87%AE%09%9F%2Cu%D7%CD%9D%5E%A8%EC%0D
---
 content/media/webaudio/PannerNode.cpp | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/content/media/webaudio/PannerNode.cpp b/content/media/webaudio/PannerNode.cpp
index ef77af59d5a2..481fb08e870b 100644
--- a/content/media/webaudio/PannerNode.cpp
+++ b/content/media/webaudio/PannerNode.cpp
@@ -396,8 +396,20 @@ PannerNodeEngine::ComputeAzimuthAndElevation(float& aAzimuth, float& aElevation)
   ThreeDPoint up = listenerRight.CrossProduct(listenerFront);
 
   double upProjection = sourceListener.DotProduct(up);
+  aElevation = 90 - 180 * acos(upProjection) / M_PI;
+
+  if (aElevation > 90) {
+    aElevation = 180 - aElevation;
+  } else if (aElevation < -90) {
+    aElevation = -180 - aElevation;
+  }
 
   ThreeDPoint projectedSource = sourceListener - up * upProjection;
+  if (projectedSource.IsZero()) {
+    // source - listener direction is up or down.
+    aAzimuth = 0.0;
+    return;
+  }
   projectedSource.Normalize();
 
   // Actually compute the angle, and convert to degrees
@@ -416,14 +428,6 @@ PannerNodeEngine::ComputeAzimuthAndElevation(float& aAzimuth, float& aElevation)
   } else {
     aAzimuth = 450 - aAzimuth;
   }
-
-  aElevation = 90 - 180 * acos(upProjection) / M_PI;
-
-  if (aElevation > 90) {
-    aElevation = 180 - aElevation;
-  } else if (aElevation < -90) {
-    aElevation = -180 - aElevation;
-  }
 }
 
 // This algorithm is described in the WebAudio spec.

From 07f97e64236b03035d40322396be127f2eab0b2a Mon Sep 17 00:00:00 2001
From: Karl Tomlinson <karlt+@karlt.net>
Date: Wed, 4 Sep 2013 21:21:00 +1200
Subject: [PATCH 10/86] b=907986 remove unused ThreeDPoint::Distance()
 r=padenot

--HG--
extra : transplant_source : %19%DD%A9%CB%CC%B1%C42%E2%8EY%CE%22%89o_%97i%03_
---
 content/media/webaudio/ThreeDPoint.h | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/content/media/webaudio/ThreeDPoint.h b/content/media/webaudio/ThreeDPoint.h
index c9c8eba068d4..24a6a32e0d2d 100644
--- a/content/media/webaudio/ThreeDPoint.h
+++ b/content/media/webaudio/ThreeDPoint.h
@@ -59,11 +59,6 @@ struct ThreeDPoint {
     return x * rhs.x + y * rhs.y + z * rhs.z;
   }
 
-  double Distance(const ThreeDPoint& rhs)
-  {
-    return sqrt(hypot(rhs.x, x) + hypot(rhs.y, y) + hypot(rhs.z, z));
-  }
-
   bool IsZero() const
   {
     return x == 0 && y == 0 && z == 0;

From e18bfe88a52d287cc9517247005b59ee0d90e597 Mon Sep 17 00:00:00 2001
From: Karl Tomlinson <karlt+@karlt.net>
Date: Thu, 5 Sep 2013 07:44:04 +1200
Subject: [PATCH 11/86] tests for convolver and panner channelCount b=906966

--HG--
extra : transplant_source : %17%A2WFH%18%7E-c%2CZVC%AAc%85%FB%02%BE%BD
---
 content/media/webaudio/test/Makefile.in       |  7 +++
 .../test/test_convolverNodeChannelCount.html  | 61 +++++++++++++++++++
 .../test/test_pannerNodeChannelCount.html     | 50 +++++++++++++++
 3 files changed, 118 insertions(+)
 create mode 100644 content/media/webaudio/test/test_convolverNodeChannelCount.html
 create mode 100644 content/media/webaudio/test/test_pannerNodeChannelCount.html

diff --git a/content/media/webaudio/test/Makefile.in b/content/media/webaudio/test/Makefile.in
index e687f81dfc39..afeb3635d2c8 100644
--- a/content/media/webaudio/test/Makefile.in
+++ b/content/media/webaudio/test/Makefile.in
@@ -115,8 +115,15 @@ MOCHITEST_FILES := \
 
 ifneq ($(MOZ_DEBUG)+$(MOZ_WIDGET_TOOLKIT),+gtk2) # bug 911777
 MOCHITEST_FILES += \
+  test_convolverNodeChannelCount.html \
   test_delayNodeAtMax.html \
   $(NULL)
+endif # bug 911777
+
+ifneq ($(OS_TARGET),Android) # bug 912474
+MOCHITEST_FILES += \
+  test_pannerNodeChannelCount.html \
+  $(NULL)
 endif
 
 include $(topsrcdir)/config/rules.mk
diff --git a/content/media/webaudio/test/test_convolverNodeChannelCount.html b/content/media/webaudio/test/test_convolverNodeChannelCount.html
new file mode 100644
index 000000000000..3e85fa033795
--- /dev/null
+++ b/content/media/webaudio/test/test_convolverNodeChannelCount.html
@@ -0,0 +1,61 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Test PannerNode directly above</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+</head>
+<body>
+<pre id="test">
+<script src="webaudio.js" type="text/javascript"></script>
+<script class="testbody" type="text/javascript">
+
+const signalLength = 2048;
+const responseLength = 1000;
+const outputLength = 4096; // > signalLength + responseLength to work around bug 910171
+
+var gTest = {
+  length: outputLength,
+  numberOfChannels: 2,
+  createGraph: function(context) {
+    var buffer = context.createBuffer(2, signalLength, context.sampleRate);
+    for (var i = 0; i < signalLength; ++i) {
+      var sample = Math.sin(440 * 2 * Math.PI * i / context.sampleRate);
+      // When mixed into a single channel, this produces silence
+      buffer.getChannelData(0)[i] = sample;
+      buffer.getChannelData(1)[i] = -sample;
+    }
+
+    var response = context.createBuffer(2, responseLength, context.sampleRate);
+    for (var i = 0; i < responseLength; ++i) {
+      response.getChannelData(0)[i] = i / responseLength;
+      response.getChannelData(1)[i] = 1 - (i / responseLength);
+    }
+
+    var convolver = context.createConvolver();
+    convolver.buffer = response;
+    convolver.channelCount = 1;
+
+    expectException(function() { convolver.channelCount = 3; },
+                    DOMException.NOT_SUPPORTED_ERR);
+    convolver.channelCountMode = "explicit";
+    expectException(function() { convolver.channelCountMode = "max"; },
+                    DOMException.NOT_SUPPORTED_ERR);
+    convolver.channelInterpretation = "discrete";
+    convolver.channelInterpretation = "speakers";
+
+    var source = context.createBufferSource();
+    source.buffer = buffer;
+    source.connect(convolver);
+    source.start(0);
+
+    return convolver;
+  },
+};
+
+runTest();
+
+</script>
+</pre>
+</body>
+</html>
diff --git a/content/media/webaudio/test/test_pannerNodeChannelCount.html b/content/media/webaudio/test/test_pannerNodeChannelCount.html
new file mode 100644
index 000000000000..636fdaa677c8
--- /dev/null
+++ b/content/media/webaudio/test/test_pannerNodeChannelCount.html
@@ -0,0 +1,50 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Test PannerNode directly above</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+</head>
+<body>
+<pre id="test">
+<script src="webaudio.js" type="text/javascript"></script>
+<script class="testbody" type="text/javascript">
+
+var gTest = {
+  length: 2048,
+  numberOfChannels: 2,
+  createGraph: function(context) {
+    var buffer = context.createBuffer(2, 2048, context.sampleRate);
+    for (var i = 0; i < 2048; ++i) {
+      var sample = Math.sin(440 * 2 * Math.PI * i / context.sampleRate);
+      // When mixed into a single channel, this produces silence
+      buffer.getChannelData(0)[i] = sample;
+      buffer.getChannelData(1)[i] = -sample;
+    }
+
+    var panner = context.createPanner();
+    panner.setPosition(1, 2, 3);
+    panner.channelCount = 1;
+    expectException(function() { panner.channelCount = 3; },
+                    DOMException.NOT_SUPPORTED_ERR);
+    panner.channelCountMode = "explicit";
+    expectException(function() { panner.channelCountMode = "max"; },
+                    DOMException.NOT_SUPPORTED_ERR);
+    panner.channelInterpretation = "discrete";
+    panner.channelInterpretation = "speakers";
+
+    var source = context.createBufferSource();
+    source.buffer = buffer;
+    source.connect(panner);
+    source.start(0);
+
+    return panner;
+  },
+};
+
+runTest();
+
+</script>
+</pre>
+</body>
+</html>

From 3d1ac8d90cb5901c212c67f28a58bca9951c3169 Mon Sep 17 00:00:00 2001
From: Karl Tomlinson <karlt+@karlt.net>
Date: Thu, 5 Sep 2013 07:44:35 +1200
Subject: [PATCH 12/86] b=906966 limit ConvolverNode and PannerNode input
 channel count through channelCount and channelCountMode r=ehsan

--HG--
extra : transplant_source : %8A%FB%BC%D3%D0%F3Ct%A5%D1%B1%AF%3D%9Bk%896%7F%7F%1F
---
 content/media/webaudio/AudioNode.h          |  2 +-
 content/media/webaudio/ConvolverNode.h      | 16 ++++++++++++++++
 content/media/webaudio/PannerNode.h         | 17 +++++++++++++++++
 content/media/webaudio/blink/HRTFPanner.cpp |  5 ++---
 content/media/webaudio/blink/Reverb.cpp     |  5 +----
 dom/webidl/AudioNode.webidl                 |  1 +
 6 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/content/media/webaudio/AudioNode.h b/content/media/webaudio/AudioNode.h
index 2ee253abbfd2..cd58f51abe39 100644
--- a/content/media/webaudio/AudioNode.h
+++ b/content/media/webaudio/AudioNode.h
@@ -171,7 +171,7 @@ public:
   {
     return mChannelCountMode;
   }
-  void SetChannelCountModeValue(ChannelCountMode aMode)
+  virtual void SetChannelCountModeValue(ChannelCountMode aMode, ErrorResult& aRv)
   {
     mChannelCountMode = aMode;
     SendChannelMixingParametersToStream();
diff --git a/content/media/webaudio/ConvolverNode.h b/content/media/webaudio/ConvolverNode.h
index 3f2a2b870e18..03ce38ced503 100644
--- a/content/media/webaudio/ConvolverNode.h
+++ b/content/media/webaudio/ConvolverNode.h
@@ -40,6 +40,22 @@ public:
 
   void SetNormalize(bool aNormal);
 
+  virtual void SetChannelCount(uint32_t aChannelCount, ErrorResult& aRv) MOZ_OVERRIDE
+  {
+    if (aChannelCount > 2) {
+      aRv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
+      return;
+    }
+    AudioNode::SetChannelCount(aChannelCount, aRv);
+  }
+  virtual void SetChannelCountModeValue(ChannelCountMode aMode, ErrorResult& aRv) MOZ_OVERRIDE
+  {
+    if (aMode == ChannelCountMode::Max) {
+      aRv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
+      return;
+    }
+    AudioNode::SetChannelCountModeValue(aMode, aRv);
+  }
   virtual void NotifyInputConnected() MOZ_OVERRIDE
   {
     mMediaStreamGraphUpdateIndexAtLastInputConnection =
diff --git a/content/media/webaudio/PannerNode.h b/content/media/webaudio/PannerNode.h
index eb8e764e8df3..81b0e08c0107 100644
--- a/content/media/webaudio/PannerNode.h
+++ b/content/media/webaudio/PannerNode.h
@@ -34,6 +34,23 @@ public:
 
   virtual void DestroyMediaStream() MOZ_OVERRIDE;
 
+  virtual void SetChannelCount(uint32_t aChannelCount, ErrorResult& aRv) MOZ_OVERRIDE
+  {
+    if (aChannelCount > 2) {
+      aRv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
+      return;
+    }
+    AudioNode::SetChannelCount(aChannelCount, aRv);
+  }
+  virtual void SetChannelCountModeValue(ChannelCountMode aMode, ErrorResult& aRv) MOZ_OVERRIDE
+  {
+    if (aMode == ChannelCountMode::Max) {
+      aRv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
+      return;
+    }
+    AudioNode::SetChannelCountModeValue(aMode, aRv);
+  }
+
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(PannerNode, AudioNode)
 
diff --git a/content/media/webaudio/blink/HRTFPanner.cpp b/content/media/webaudio/blink/HRTFPanner.cpp
index a14893706119..2af45ef4d1b9 100644
--- a/content/media/webaudio/blink/HRTFPanner.cpp
+++ b/content/media/webaudio/blink/HRTFPanner.cpp
@@ -115,14 +115,13 @@ void HRTFPanner::pan(double desiredAzimuth, double elevation, const AudioChunk*
     unsigned numInputChannels =
         inputBus->IsNull() ? 0 : inputBus->mChannelData.Length();
 
-    bool isInputGood = inputBus && numInputChannels <= 2;
-    MOZ_ASSERT(isInputGood);
+    MOZ_ASSERT(numInputChannels <= 2);
     MOZ_ASSERT(framesToProcess <= inputBus->mDuration);
 
     bool isOutputGood = outputBus && outputBus->mChannelData.Length() == 2 && framesToProcess <= outputBus->mDuration;
     MOZ_ASSERT(isOutputGood);
 
-    if (!isInputGood || !isOutputGood) {
+    if (!isOutputGood) {
         if (outputBus)
             outputBus->SetNull(outputBus->mDuration);
         return;
diff --git a/content/media/webaudio/blink/Reverb.cpp b/content/media/webaudio/blink/Reverb.cpp
index 213f38295a13..997abefc7967 100644
--- a/content/media/webaudio/blink/Reverb.cpp
+++ b/content/media/webaudio/blink/Reverb.cpp
@@ -146,10 +146,7 @@ void Reverb::process(const AudioChunk* sourceBus, AudioChunk* destinationBus, si
         return;
 
     // For now only handle mono or stereo output
-    if (destinationBus->mChannelData.Length() > 2) {
-        destinationBus->SetNull(destinationBus->mDuration);
-        return;
-    }
+    MOZ_ASSERT(destinationBus->mChannelData.Length() <= 2);
 
     float* destinationChannelL = static_cast<float*>(const_cast<void*>(destinationBus->mChannelData[0]));
     const float* sourceBusL = static_cast<const float*>(sourceBus->mChannelData[0]);
diff --git a/dom/webidl/AudioNode.webidl b/dom/webidl/AudioNode.webidl
index 8f5805386b39..460fda837049 100644
--- a/dom/webidl/AudioNode.webidl
+++ b/dom/webidl/AudioNode.webidl
@@ -38,6 +38,7 @@ interface AudioNode : EventTarget {
     // Channel up-mixing and down-mixing rules for all inputs.
     [SetterThrows]
     attribute unsigned long channelCount;
+    [SetterThrows]
     attribute ChannelCountMode channelCountMode;
     attribute ChannelInterpretation channelInterpretation;
 

From 57d8fb0391773201cc33be3d6574b91c8aff990f Mon Sep 17 00:00:00 2001
From: Karl Tomlinson <karlt+@karlt.net>
Date: Thu, 5 Sep 2013 07:44:37 +1200
Subject: [PATCH 13/86] b=906966 limit ScriptProcessorNode input channel count
 through channelCount and channelCountMode r=ehsan

--HG--
extra : transplant_source : %E6-%8A%10%BEb%FEg%8C%C3f%2C%1F%C6%859%E5%27%1C%60
---
 .../media/webaudio/ScriptProcessorNode.cpp    | 26 +++----------------
 content/media/webaudio/ScriptProcessorNode.h  | 15 +++++++++++
 .../test_scriptProcessorNodeChannelCount.html |  9 +++++--
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/content/media/webaudio/ScriptProcessorNode.cpp b/content/media/webaudio/ScriptProcessorNode.cpp
index 65b4a14a3319..7a2bc8f25c16 100644
--- a/content/media/webaudio/ScriptProcessorNode.cpp
+++ b/content/media/webaudio/ScriptProcessorNode.cpp
@@ -213,10 +213,11 @@ public:
     , mSource(nullptr)
     , mDestination(static_cast<AudioNodeStream*> (aDestination->Stream()))
     , mBufferSize(aBufferSize)
-    , mDefaultNumberOfInputChannels(aNumberOfInputChannels)
     , mInputWriteIndex(0)
     , mSeenNonSilenceInput(false)
   {
+    mInputChannels.SetLength(aNumberOfInputChannels);
+    AllocateInputBlock();
   }
 
   void SetSourceStream(AudioNodeStream* aSource)
@@ -237,8 +238,6 @@ public:
       return;
     }
 
-    EnsureInputChannels(aInput.mChannelData.Length());
-
     // First, record our input buffer
     for (uint32_t i = 0; i < mInputChannels.Length(); ++i) {
       if (aInput.IsNull()) {
@@ -247,6 +246,7 @@ public:
       } else {
         mSeenNonSilenceInput = true;
         MOZ_ASSERT(aInput.GetDuration() == WEBAUDIO_BLOCK_SIZE, "sanity check");
+        MOZ_ASSERT(aInput.mChannelData.Length() == mInputChannels.Length());
         AudioBlockCopyChannelWithScale(static_cast<const float*>(aInput.mChannelData[i]),
                                        aInput.mVolume,
                                        mInputChannels[i] + mInputWriteIndex);
@@ -277,25 +277,6 @@ private:
     }
   }
 
-  void EnsureInputChannels(uint32_t aNumberOfChannels)
-  {
-    if (aNumberOfChannels == 0) {
-      aNumberOfChannels = mDefaultNumberOfInputChannels;
-    }
-    if (mInputChannels.Length() == 0) {
-      mInputChannels.SetLength(aNumberOfChannels);
-      AllocateInputBlock();
-    } else if (aNumberOfChannels < mInputChannels.Length()) {
-      mInputChannels.SetLength(aNumberOfChannels);
-    } else if (aNumberOfChannels > mInputChannels.Length()) {
-      uint32_t oldLength = mInputChannels.Length();
-      mInputChannels.SetLength(aNumberOfChannels);
-      for (uint32_t i = oldLength; i < aNumberOfChannels; ++i) {
-        mInputChannels[i] = new float[mBufferSize];
-      }
-    }
-  }
-
   void SendBuffersToMainThread(AudioNodeStream* aStream)
   {
     MOZ_ASSERT(!NS_IsMainThread());
@@ -411,7 +392,6 @@ private:
   AudioNodeStream* mDestination;
   InputChannels mInputChannels;
   const uint32_t mBufferSize;
-  const uint32_t mDefaultNumberOfInputChannels;
   // The write index into the current input buffer
   uint32_t mInputWriteIndex;
   bool mSeenNonSilenceInput;
diff --git a/content/media/webaudio/ScriptProcessorNode.h b/content/media/webaudio/ScriptProcessorNode.h
index b8dbd358d30c..efda98864cb0 100644
--- a/content/media/webaudio/ScriptProcessorNode.h
+++ b/content/media/webaudio/ScriptProcessorNode.h
@@ -59,6 +59,21 @@ public:
     }
   }
 
+  virtual void SetChannelCount(uint32_t aChannelCount, ErrorResult& aRv) MOZ_OVERRIDE
+  {
+    if (aChannelCount != ChannelCount()) {
+      aRv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
+    }
+    return;
+  }
+  virtual void SetChannelCountModeValue(ChannelCountMode aMode, ErrorResult& aRv) MOZ_OVERRIDE
+  {
+    if (aMode != ChannelCountMode::Explicit) {
+      aRv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
+    }
+    return;
+  }
+
   uint32_t BufferSize() const
   {
     return mBufferSize;
diff --git a/content/media/webaudio/test/test_scriptProcessorNodeChannelCount.html b/content/media/webaudio/test/test_scriptProcessorNodeChannelCount.html
index 2fead4ed363c..45b9cd9915fe 100644
--- a/content/media/webaudio/test/test_scriptProcessorNodeChannelCount.html
+++ b/content/media/webaudio/test/test_scriptProcessorNodeChannelCount.html
@@ -32,9 +32,14 @@ addLoadEvent(function() {
 
   var source = context.createBufferSource();
 
-  var sp = context.createScriptProcessor(2048);
-  sp.channelCount = 3;
+  var sp = context.createScriptProcessor(2048, 3);
+  expectException(function() { sp.channelCount = 2; },
+                  DOMException.NOT_SUPPORTED_ERR);
   sp.channelCountMode = "explicit";
+  expectException(function() { sp.channelCountMode = "max"; },
+                  DOMException.NOT_SUPPORTED_ERR);
+  expectException(function() { sp.channelCountMode = "clamped-max"; },
+                  DOMException.NOT_SUPPORTED_ERR);
   sp.channelInterpretation = "discrete";
   source.start(0);
   source.buffer = buffer;

From d47399769eb9aff4e6b4aae284c0fcea4af06b89 Mon Sep 17 00:00:00 2001
From: Patrick McManus <mcmanus@ducksong.com>
Date: Wed, 4 Sep 2013 16:39:25 -0400
Subject: [PATCH 14/86] bug 907800 - only retry http 408 when it is suspected
 of being a persistent reuse race r=jduell

---
 netwerk/protocol/http/nsHttpConnection.cpp | 37 ++++++++++++++--------
 netwerk/protocol/http/nsHttpConnection.h   |  1 +
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/netwerk/protocol/http/nsHttpConnection.cpp b/netwerk/protocol/http/nsHttpConnection.cpp
index 5300c6e2fce6..d8aeefd53254 100644
--- a/netwerk/protocol/http/nsHttpConnection.cpp
+++ b/netwerk/protocol/http/nsHttpConnection.cpp
@@ -120,7 +120,7 @@ nsHttpConnection::Init(nsHttpConnectionInfo *info,
     NS_ENSURE_TRUE(!mConnInfo, NS_ERROR_ALREADY_INITIALIZED);
 
     mConnInfo = info;
-    mLastReadTime = PR_IntervalNow();
+    mLastWriteTime = mLastReadTime = PR_IntervalNow();
     mSupportsPipelining =
         gHttpHandler->ConnMgr()->SupportsPipelining(mConnInfo);
     mRtt = rtt;
@@ -315,7 +315,7 @@ nsHttpConnection::Activate(nsAHttpTransaction *trans, uint32_t caps, int32_t pri
     NS_ENSURE_TRUE(!mTransaction, NS_ERROR_IN_PROGRESS);
 
     // reset the read timers to wash away any idle time
-    mLastReadTime = PR_IntervalNow();
+    mLastWriteTime = mLastReadTime = PR_IntervalNow();
 
     // Update security callbacks
     nsCOMPtr<nsIInterfaceRequestor> callbacks;
@@ -702,17 +702,6 @@ nsHttpConnection::OnHeadersAvailable(nsAHttpTransaction *trans,
     NS_ENSURE_ARG_POINTER(trans);
     MOZ_ASSERT(responseHead, "No response head?");
 
-    // If the server issued an explicit timeout, then we need to close down the
-    // socket transport.  We pass an error code of NS_ERROR_NET_RESET to
-    // trigger the transactions 'restart' mechanism.  We tell it to reset its
-    // response headers so that it will be ready to receive the new response.
-    uint16_t responseStatus = responseHead->Status();
-    if (responseStatus == 408) {
-        Close(NS_ERROR_NET_RESET);
-        *reset = true;
-        return NS_OK;
-    }
-
     // we won't change our keep-alive policy unless the server has explicitly
     // told us to do so.
 
@@ -727,6 +716,27 @@ nsHttpConnection::OnHeadersAvailable(nsAHttpTransaction *trans,
         explicitKeepAlive = responseHead->HasHeaderValue(nsHttp::Connection, "keep-alive") ||
             responseHead->HasHeaderValue(nsHttp::Proxy_Connection, "keep-alive");
 
+    // deal with 408 Server Timeouts
+    uint16_t responseStatus = responseHead->Status();
+    static const PRIntervalTime k1000ms  = PR_MillisecondsToInterval(1000);
+    if (responseStatus == 408) {
+        // If this error could be due to a persistent connection reuse then
+        // we pass an error code of NS_ERROR_NET_RESET to
+        // trigger the transaction 'restart' mechanism.  We tell it to reset its
+        // response headers so that it will be ready to receive the new response.
+        if (mIsReused && ((PR_IntervalNow() - mLastWriteTime) < k1000ms)) {
+            Close(NS_ERROR_NET_RESET);
+            *reset = true;
+            return NS_OK;
+        }
+
+        // timeouts that are not caused by persistent connection reuse should
+        // not be retried for browser compatibility reasons. bug 907800. The
+        // server driven close is implicit in the 408.
+        explicitClose = true;
+        explicitKeepAlive = false;
+    }
+
     // reset to default (the server may have changed since we last checked)
     mSupportsPipelining = false;
 
@@ -1219,6 +1229,7 @@ nsHttpConnection::OnReadSegment(const char *buf,
     else if (*countRead == 0)
         mSocketOutCondition = NS_BASE_STREAM_CLOSED;
     else {
+        mLastWriteTime = PR_IntervalNow();
         mSocketOutCondition = NS_OK; // reset condition
         if (!mProxyConnectInProgress)
             mTotalBytesWritten += *countRead;
diff --git a/netwerk/protocol/http/nsHttpConnection.h b/netwerk/protocol/http/nsHttpConnection.h
index b40fffd41277..bc047fe57063 100644
--- a/netwerk/protocol/http/nsHttpConnection.h
+++ b/netwerk/protocol/http/nsHttpConnection.h
@@ -214,6 +214,7 @@ private:
     nsRefPtr<nsHttpConnectionInfo> mConnInfo;
 
     PRIntervalTime                  mLastReadTime;
+    PRIntervalTime                  mLastWriteTime;
     PRIntervalTime                  mMaxHangTime;    // max download time before dropping keep-alive status
     PRIntervalTime                  mIdleTimeout;    // value of keep-alive: timeout=
     PRIntervalTime                  mConsiderReusedAfterInterval;

From 85316040d32d6f491e77bbf46c5c36e1efcf4458 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Wed, 4 Sep 2013 16:43:12 -0400
Subject: [PATCH 15/86] Bug 910795 part 1.  Add a way to Rebind() an nsString
 to be a dependent string.  r=bsmedberg

---
 xpcom/string/public/nsTDependentString.h | 20 ++++----------------
 xpcom/string/public/nsTString.h          | 14 +++++++++++++-
 xpcom/string/src/nsTDependentString.cpp  | 12 ------------
 xpcom/string/src/nsTString.cpp           | 12 ++++++++++++
 4 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/xpcom/string/public/nsTDependentString.h b/xpcom/string/public/nsTDependentString.h
index 530d9316e7cf..4ed17315ce73 100644
--- a/xpcom/string/public/nsTDependentString.h
+++ b/xpcom/string/public/nsTDependentString.h
@@ -24,17 +24,6 @@ class nsTDependentString_CharT : public nsTString_CharT
 
     public:
 
-        /**
-         * verify restrictions
-         */
-      void AssertValid()
-        {
-          NS_ASSERTION(mData, "nsTDependentString must wrap a non-NULL buffer");
-          NS_ASSERTION(mLength != size_type(-1), "nsTDependentString has bogus length");
-          NS_ASSERTION(mData[mLength] == 0, "nsTDependentString must wrap only null-terminated strings");
-        }
-
-
         /**
          * constructors
          */
@@ -42,20 +31,20 @@ class nsTDependentString_CharT : public nsTString_CharT
       nsTDependentString_CharT( const char_type* start, const char_type* end )
         : string_type(const_cast<char_type*>(start), uint32_t(end - start), F_TERMINATED)
         {
-          AssertValid();
+          AssertValidDepedentString();
         }
 
       nsTDependentString_CharT( const char_type* data, uint32_t length )
         : string_type(const_cast<char_type*>(data), length, F_TERMINATED)
         {
-          AssertValid();
+          AssertValidDepedentString();
         }
 
       explicit
       nsTDependentString_CharT( const char_type* data )
         : string_type(const_cast<char_type*>(data), uint32_t(char_traits::length(data)), F_TERMINATED)
         {
-          AssertValid();
+          AssertValidDepedentString();
         }
 
       nsTDependentString_CharT( const string_type& str, uint32_t startPos )
@@ -78,13 +67,12 @@ class nsTDependentString_CharT : public nsTString_CharT
          * allow this class to be bound to a different string...
          */
 
+      using nsTString_CharT::Rebind;
       void Rebind( const char_type* data )
         {
           Rebind(data, uint32_t(char_traits::length(data)));
         }
 
-      void Rebind( const char_type* data, size_type length );
-
       void Rebind( const char_type* start, const char_type* end )
         {
           Rebind(start, uint32_t(end - start));
diff --git a/xpcom/string/public/nsTString.h b/xpcom/string/public/nsTString.h
index be633bd56e27..ca694736f26c 100644
--- a/xpcom/string/public/nsTString.h
+++ b/xpcom/string/public/nsTString.h
@@ -358,6 +358,18 @@ class nsTString_CharT : public nsTSubstring_CharT
 
 #endif // !MOZ_STRING_WITH_OBSOLETE_API
 
+      void Rebind( const char_type* data, size_type length );
+
+        /**
+         * verify restrictions for dependent strings
+         */
+      void AssertValidDepedentString()
+        {
+          NS_ASSERTION(mData, "nsTDependentString must wrap a non-NULL buffer");
+          NS_ASSERTION(mLength != size_type(-1), "nsTDependentString has bogus length");
+          NS_ASSERTION(mData[mLength] == 0, "nsTDependentString must wrap only null-terminated strings");
+        }
+
 
     protected:
 
@@ -368,7 +380,7 @@ class nsTString_CharT : public nsTSubstring_CharT
         // allow subclasses to initialize fields directly
       nsTString_CharT( char_type* data, size_type length, uint32_t flags )
         : substring_type(data, length, flags) {}
-  };
+};
 
 
 class nsTFixedString_CharT : public nsTString_CharT
diff --git a/xpcom/string/src/nsTDependentString.cpp b/xpcom/string/src/nsTDependentString.cpp
index f9c401f153c1..230df222036e 100644
--- a/xpcom/string/src/nsTDependentString.cpp
+++ b/xpcom/string/src/nsTDependentString.cpp
@@ -4,18 +4,6 @@
  * 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/. */
 
-void
-nsTDependentString_CharT::Rebind( const char_type* data, size_type length )
-  {
-    // If we currently own a buffer, release it.
-    Finalize();
-
-    mData = const_cast<char_type*>(data);
-    mLength = length;
-    SetDataFlags(F_TERMINATED);
-    AssertValid();
-  }
-
 void
 nsTDependentString_CharT::Rebind( const string_type& str, uint32_t startPos )
   {
diff --git a/xpcom/string/src/nsTString.cpp b/xpcom/string/src/nsTString.cpp
index 4957e82edb8f..561e99eef71e 100644
--- a/xpcom/string/src/nsTString.cpp
+++ b/xpcom/string/src/nsTString.cpp
@@ -36,3 +36,15 @@ nsTAdoptingString_CharT::operator=( const self_type& str )
     return *this;
   }
 
+void
+nsTString_CharT::Rebind( const char_type* data, size_type length )
+  {
+    // If we currently own a buffer, release it.
+    Finalize();
+
+    mData = const_cast<char_type*>(data);
+    mLength = length;
+    SetDataFlags(F_TERMINATED);
+    AssertValidDepedentString();
+  }
+

From 0931f880af223b92f5abf4df475d0be1877f8e05 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Wed, 4 Sep 2013 16:43:12 -0400
Subject: [PATCH 16/86] Bug 910795 part 2.  Use the new Rebind() setup to avoid
 creating string copies for variadic string arguments.  r=smaug

---
 content/base/src/nsDOMTokenList.cpp | 21 ++++++++++-----------
 dom/bindings/BindingUtils.h         | 10 ++++++++++
 dom/bindings/Codegen.py             | 16 ++++++++++++----
 3 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/content/base/src/nsDOMTokenList.cpp b/content/base/src/nsDOMTokenList.cpp
index 5737cbe65ba7..08688dc42acf 100644
--- a/content/base/src/nsDOMTokenList.cpp
+++ b/content/base/src/nsDOMTokenList.cpp
@@ -140,7 +140,6 @@ nsDOMTokenList::AddInternal(const nsAttrValue* aAttr,
 
   bool oneWasAdded = false;
   nsAutoTArray<nsString, 10> addedClasses;
-  addedClasses.SetCapacity(aTokens.Length());
 
   for (uint32_t i = 0, l = aTokens.Length(); i < l; ++i) {
     const nsString& aToken = aTokens[i];
@@ -180,9 +179,9 @@ nsDOMTokenList::Add(const nsTArray<nsString>& aTokens, ErrorResult& aError)
 void
 nsDOMTokenList::Add(const nsAString& aToken, mozilla::ErrorResult& aError)
 {
-  nsAutoTArray<nsString, 1> aTokens;
-  aTokens.AppendElement(aToken);
-  Add(aTokens, aError);
+  nsAutoTArray<nsString, 1> tokens;
+  tokens.AppendElement(aToken);
+  Add(tokens, aError);
 }
 
 void
@@ -266,9 +265,9 @@ nsDOMTokenList::Remove(const nsTArray<nsString>& aTokens, ErrorResult& aError)
 void
 nsDOMTokenList::Remove(const nsAString& aToken, mozilla::ErrorResult& aError)
 {
-  nsAutoTArray<nsString, 1> aTokens;
-  aTokens.AppendElement(aToken);
-  Remove(aTokens, aError);
+  nsAutoTArray<nsString, 1> tokens;
+  tokens.AppendElement(aToken);
+  Remove(tokens, aError);
 }
 
 bool
@@ -286,17 +285,17 @@ nsDOMTokenList::Toggle(const nsAString& aToken,
   const bool forceOff = aForce.WasPassed() && !aForce.Value();
 
   bool isPresent = attr && attr->Contains(aToken);
-  nsAutoTArray<nsString, 1> aTokens;
-  aTokens.AppendElement(aToken);
+  nsAutoTArray<nsString, 1> tokens;
+  (*tokens.AppendElement()).Rebind(aToken.Data(), aToken.Length());
 
   if (isPresent) {
     if (!forceOn) {
-      RemoveInternal(attr, aTokens);
+      RemoveInternal(attr, tokens);
       isPresent = false;
     }
   } else {
     if (!forceOff) {
-      AddInternal(attr, aTokens);
+      AddInternal(attr, tokens);
       isPresent = true;
     }
   }
diff --git a/dom/bindings/BindingUtils.h b/dom/bindings/BindingUtils.h
index a4e09b055794..c469cee47372 100644
--- a/dom/bindings/BindingUtils.h
+++ b/dom/bindings/BindingUtils.h
@@ -1513,6 +1513,16 @@ struct FakeDependentString {
     mFlags |= nsDependentString::F_VOIDED;
   }
 
+  const nsDependentString::char_type* Data() const
+  {
+    return mData;
+  }
+
+  nsDependentString::size_type Length() const
+  {
+    return mLength;
+  }
+
   // If this ever changes, change the corresponding code in the
   // Optional<nsAString> specialization as well.
   const nsAString* ToAStringPtr() const {
diff --git a/dom/bindings/Codegen.py b/dom/bindings/Codegen.py
index d1aa360775fb..cfbf934e3723 100644
--- a/dom/bindings/Codegen.py
+++ b/dom/bindings/Codegen.py
@@ -3396,15 +3396,23 @@ for (uint32_t i = 0; i < length; ++i) {
             return handleDefault(conversionCode, defaultCode)
 
         if isMember:
-            # We have to make a copy, because our jsval may well not
-            # live as long as our string needs to.
+            # We have to make a copy, except in the variadic case, because our
+            # jsval may well not live as long as our string needs to.
             declType = CGGeneric("nsString")
+            if isMember == "Variadic":
+                # The string is kept alive by the argument, so we can just
+                # depend on it.
+                assignString = "${declName}.Rebind(str.Data(), str.Length())"
+            else:
+                assignString = "${declName} = str"
             return JSToNativeConversionInfo(
                 "{\n"
                 "  FakeDependentString str;\n"
                 "%s\n"
-                "  ${declName} = str;\n"
-                "}\n" % CGIndenter(CGGeneric(getConversionCode("str"))).define(),
+                "  %s;\n"
+                "}\n" % (
+                    CGIndenter(CGGeneric(getConversionCode("str"))).define(),
+                    assignString),
                 declType=declType, dealWithOptional=isOptional)
 
         if isOptional:

From a45b31c6ac9dc739024fe5ca1c619d279c10fac9 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Wed, 4 Sep 2013 16:43:12 -0400
Subject: [PATCH 17/86] Bug 911771.  Remove uses of MOZ_DEBUG in .cpp files,
 since there is no such thing there.  Use DEBUG instead.  r=glandium

---
 content/base/src/nsContentSink.cpp           | 4 ++--
 layout/generic/nsSelection.cpp               | 2 +-
 toolkit/crashreporter/nsExceptionHandler.cpp | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/content/base/src/nsContentSink.cpp b/content/base/src/nsContentSink.cpp
index ad4c1c843e09..266ee39fd3a4 100644
--- a/content/base/src/nsContentSink.cpp
+++ b/content/base/src/nsContentSink.cpp
@@ -1220,7 +1220,7 @@ nsContentSink::Notify(nsITimer *timer)
     return NS_OK;
   }
   
-#ifdef MOZ_DEBUG
+#ifdef DEBUG
   {
     PRTime now = PR_Now();
 
@@ -1232,7 +1232,7 @@ nsContentSink::Notify(nsITimer *timer)
                ("nsContentSink::Notify: reflow on a timer: %d milliseconds "
                 "late, backoff count: %d", delay, mBackoffCount));
   }
-#endif
+#endif // DEBUG
 
   if (WaitForPendingSheets()) {
     mDeferredFlushTags = true;
diff --git a/layout/generic/nsSelection.cpp b/layout/generic/nsSelection.cpp
index 46926d061f8c..2017311f7ad4 100644
--- a/layout/generic/nsSelection.cpp
+++ b/layout/generic/nsSelection.cpp
@@ -92,7 +92,7 @@ static void printRange(nsRange *aDomRange);
 #define DEBUG_OUT_RANGE(x)  printRange(x)
 #else
 #define DEBUG_OUT_RANGE(x)  
-#endif //MOZ_DEBUG
+#endif // PRINT_RANGE
 
 
 
diff --git a/toolkit/crashreporter/nsExceptionHandler.cpp b/toolkit/crashreporter/nsExceptionHandler.cpp
index 67413ff128b3..c674ce2349f8 100644
--- a/toolkit/crashreporter/nsExceptionHandler.cpp
+++ b/toolkit/crashreporter/nsExceptionHandler.cpp
@@ -802,7 +802,7 @@ nsresult SetExceptionHandler(nsIFile* aXREDirectory,
   if (gExceptionHandler)
     return NS_ERROR_ALREADY_INITIALIZED;
 
-#if defined(MOZ_DEBUG)
+#if defined(DEBUG)
   // In debug builds, disable the crash reporter by default, and allow to
   // enable it with the MOZ_CRASHREPORTER environment variable.
   const char *envvar = PR_GetEnv("MOZ_CRASHREPORTER");

From 0819e225af2424a629ff70ae7eb61cffc6cc0087 Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Wed, 4 Sep 2013 13:47:24 -0700
Subject: [PATCH 18/86] Bug 859807: Request longer timeout for
 test_transitions_per_property.html. r=dbaron

---
 layout/style/test/test_transitions_per_property.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/layout/style/test/test_transitions_per_property.html b/layout/style/test/test_transitions_per_property.html
index 079ff9bdc1eb..2d03f0660271 100644
--- a/layout/style/test/test_transitions_per_property.html
+++ b/layout/style/test/test_transitions_per_property.html
@@ -41,6 +41,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=435441
 
 /** Test for Bug 435441 **/
 
+SimpleTest.requestLongerTimeout(2);
 SimpleTest.waitForExplicitFinish();
 
 function has_num(str)

From 409c5e42ea2f23d18ef023f6818d15aa182909b9 Mon Sep 17 00:00:00 2001
From: Neil Rashbrook <neil@parkwaycc.co.uk>
Date: Wed, 4 Sep 2013 21:52:51 +0100
Subject: [PATCH 19/86] Bug 910899 Plugin placeholder XBL anonymous elements
 need anonids r=jaws

---
 .../mozapps/plugins/content/pluginProblem.xml | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/toolkit/mozapps/plugins/content/pluginProblem.xml b/toolkit/mozapps/plugins/content/pluginProblem.xml
index a68aba2cfe5f..0546f95f859c 100644
--- a/toolkit/mozapps/plugins/content/pluginProblem.xml
+++ b/toolkit/mozapps/plugins/content/pluginProblem.xml
@@ -22,12 +22,12 @@
     </resources>
 
     <content>
-        <html:div class="mainBox" chromedir="&locale.dir;">
+        <html:div class="mainBox" anonid="main" chromedir="&locale.dir;">
             <html:div class="hoverBox">
                 <html:label>
-                    <html:button class="icon"/>
+                    <html:button class="icon" anonid="icon"/>
                     <html:div class="msg msgTapToPlay">&tapToPlayPlugin;</html:div>
-                    <html:div class="msg msgClickToPlay">&clickToActivatePlugin;</html:div>
+                    <html:div class="msg msgClickToPlay" anonid="clickToPlay">&clickToActivatePlugin;</html:div>
                     <html:div class="msg msgVulnerabilityStatus" anonid="vulnerabilityStatus"><!-- set at runtime --></html:div>
                 </html:label>
 
@@ -36,27 +36,29 @@
                 <html:div class="msg msgDisabled">&disabledPlugin;</html:div>
                 <html:div class="msg msgBlocked">&blockedPlugin.label;</html:div>
                 <html:div class="msg msgCrashed">
-                    <html:div class="msgCrashedText"><!-- set at runtime --></html:div>
+                    <html:div class="msgCrashedText" anonid="crashedText"><!-- set at runtime --></html:div>
                     <!-- link href set at runtime -->
-                    <html:div class="msgReload">&reloadPlugin.pre;<html:a class="reloadLink" href="">&reloadPlugin.middle;</html:a>&reloadPlugin.post;</html:div>
+                    <html:div class="msgReload">&reloadPlugin.pre;<html:a class="reloadLink" anonid="reloadLink" href="">&reloadPlugin.middle;</html:a>&reloadPlugin.post;</html:div>
                 </html:div>
 
-                <html:div class="installStatus">
-                    <html:div class="msg msgInstallPlugin">
+                <html:div class="installStatus" anonid="installStatus">
+                    <html:div class="msg msgInstallPlugin"/>
 		        <html:a class="action-link" anonid="installPluginLink" href="">&installPlugin;</html:a>
 		    </html:div>
                 </html:div>
                 <html:div class="msg msgManagePlugins"><html:a class="action-link" anonid="managePluginsLink" href="">&managePlugins;</html:a></html:div>
-                <html:div class="submitStatus">
+                <html:div class="submitStatus" anonid="submitStatus">
                     <html:div class="msg msgPleaseSubmit">
                         <html:textarea class="submitComment"
+                                       anonid="submitComment"
                                        placeholder="&report.comment;"/>
                         <html:div class="submitURLOptInBox">
-                            <html:label><html:input class="submitURLOptIn" type="checkbox"/> &report.pageURL;</html:label>
+                            <html:label><html:input class="submitURLOptIn" anonid="submitURLOptIn" type="checkbox"/> &report.pageURL;</html:label>
                         </html:div>
                         <html:div class="submitButtonBox">
-                            <html:span class="helpIcon" role="link"/>
+                            <html:span class="helpIcon" anonid="helpIcon" role="link"/>
                             <html:input class="submitButton" type="button"
+                                        anonid="submitButton"
                                         value="&report.please;"/>
                         </html:div>
                     </html:div>
@@ -70,7 +72,7 @@
             </html:div>
             <html:button class="closeIcon" anonid="closeIcon" title="&hidePluginBtn.label;"/>
         </html:div>
-        <html:div class="previewPluginContent"><!-- iframe and its src will be set at runtime --></html:div>
+        <html:div class="previewPluginContent" anonid="previewPluginContent"><!-- iframe and its src will be set at runtime --></html:div>
         <html:div style="display:none;"><children/></html:div>
     </content>
     <implementation>

From f488d3c533108d436dae396d6281c6fc1ad01d0d Mon Sep 17 00:00:00 2001
From: Benoit Girard <b56girard@gmail.com>
Date: Wed, 4 Sep 2013 16:53:54 -0400
Subject: [PATCH 20/86] Bug 907544 - Pass the D3DSurface9 down into Cairo for
 LockRect. r=jrmuizel

--HG--
extra : rebase_source : 71c0f776360435d242987ffd3e2cbab8a3535c67
---
 gfx/cairo/README                              |   2 +
 gfx/cairo/cairo/src/cairo-rename.h            |   1 +
 .../cairo/src/cairo-win32-printing-surface.c  |   1 +
 gfx/cairo/cairo/src/cairo-win32-private.h     |   2 +
 gfx/cairo/cairo/src/cairo-win32-surface.c     | 166 +++++--
 gfx/cairo/cairo/src/cairo-win32.h             |   5 +-
 gfx/cairo/win32-d3dsurface9.patch             | 464 ++++++++++++++++++
 gfx/layers/d3d9/ThebesLayerD3D9.cpp           |  38 +-
 gfx/thebes/gfxWindowsSurface.cpp              |  15 +
 gfx/thebes/gfxWindowsSurface.h                |   8 +-
 layout/media/symbols.def.in                   |   1 +
 11 files changed, 663 insertions(+), 40 deletions(-)
 create mode 100644 gfx/cairo/win32-d3dsurface9.patch

diff --git a/gfx/cairo/README b/gfx/cairo/README
index 4fe0e2567d1d..b27e4b2b6ffd 100644
--- a/gfx/cairo/README
+++ b/gfx/cairo/README
@@ -234,6 +234,8 @@ use-show-text-glyphs-if-glyph-path-fails.patch: fall back to show_text_glyphs ev
 
 pixman-enable-altivec-acceleration.patch: enable building the altivec acceleration
 
+win32-d3dsurface9.patch: Create a win32 d3d9 surface to support LockRect
+
 ==== disable printing patch ====
 
 disable-printing.patch:  allows us to use NS_PRINTING to disable printing.
diff --git a/gfx/cairo/cairo/src/cairo-rename.h b/gfx/cairo/cairo/src/cairo-rename.h
index cf7349a2635c..c44577f5062a 100644
--- a/gfx/cairo/cairo/src/cairo-rename.h
+++ b/gfx/cairo/cairo/src/cairo-rename.h
@@ -340,6 +340,7 @@
 #define cairo_win32_scaled_font_get_metrics_factor _moz_cairo_win32_scaled_font_get_metrics_factor
 #define cairo_win32_scaled_font_select_font _moz_cairo_win32_scaled_font_select_font
 #define cairo_win32_surface_create _moz_cairo_win32_surface_create
+#define cairo_win32_surface_create_with_d3dsurface9 _moz_cairo_win32_surface_create_with_d3dsurface9
 #define cairo_win32_surface_create_with_ddb _moz_cairo_win32_surface_create_with_ddb
 #define cairo_win32_surface_create_with_dib _moz_cairo_win32_surface_create_with_dib
 #define cairo_win32_surface_get_dc _moz_cairo_win32_surface_get_dc
diff --git a/gfx/cairo/cairo/src/cairo-win32-printing-surface.c b/gfx/cairo/cairo/src/cairo-win32-printing-surface.c
index be3856e263e2..8ecd003b3846 100644
--- a/gfx/cairo/cairo/src/cairo-win32-printing-surface.c
+++ b/gfx/cairo/cairo/src/cairo-win32-printing-surface.c
@@ -1857,6 +1857,7 @@ cairo_win32_printing_surface_create (HDC hdc)
     surface->image = NULL;
     surface->format = CAIRO_FORMAT_RGB24;
     surface->content = CAIRO_CONTENT_COLOR_ALPHA;
+    surface->d3d9surface = NULL;
 
     surface->dc = hdc;
     surface->bitmap = NULL;
diff --git a/gfx/cairo/cairo/src/cairo-win32-private.h b/gfx/cairo/cairo/src/cairo-win32-private.h
index 83887d909b61..44c38535fef9 100644
--- a/gfx/cairo/cairo/src/cairo-win32-private.h
+++ b/gfx/cairo/cairo/src/cairo-win32-private.h
@@ -59,6 +59,8 @@ typedef struct _cairo_win32_surface {
 
     HDC dc;
 
+    struct IDirect3DSurface9 *d3d9surface;
+
     /* We create off-screen surfaces as DIBs or DDBs, based on what we created
      * originally*/
     HBITMAP bitmap;
diff --git a/gfx/cairo/cairo/src/cairo-win32-surface.c b/gfx/cairo/cairo/src/cairo-win32-surface.c
index e38f3653b187..0d038ae700ce 100644
--- a/gfx/cairo/cairo/src/cairo-win32-surface.c
+++ b/gfx/cairo/cairo/src/cairo-win32-surface.c
@@ -59,6 +59,7 @@
 #include "cairo-private.h"
 #include <wchar.h>
 #include <windows.h>
+#include <D3D9.h>
 
 #if defined(__MINGW32__) && !defined(ETO_PDY)
 # define ETO_PDY 0x2000
@@ -389,6 +390,7 @@ _cairo_win32_surface_create_for_dc (HDC             original_dc,
 	goto FAIL;
 
     surface->format = format;
+    surface->d3d9surface = NULL;
 
     surface->clip_rect.x = 0;
     surface->clip_rect.y = 0;
@@ -486,6 +488,11 @@ _cairo_win32_surface_finish (void *abstract_surface)
 	_cairo_win32_restore_initial_clip (surface);
     }
 
+    if (surface->d3d9surface) {
+        IDirect3DSurface9_ReleaseDC (surface->d3d9surface, surface->dc);
+        IDirect3DSurface9_Release (surface->d3d9surface);
+    }
+
     if (surface->initial_clip_rgn)
 	DeleteObject (surface->initial_clip_rgn);
 
@@ -495,6 +502,48 @@ _cairo_win32_surface_finish (void *abstract_surface)
     return CAIRO_STATUS_SUCCESS;
 }
 
+static cairo_status_t
+_cairo_win32_surface_d3d9_lock_rect (cairo_win32_surface_t  *surface,
+				   int                     x,
+				   int                     y,
+				   int                     width,
+				   int                     height,
+				   cairo_image_surface_t **local_out)
+{
+    cairo_image_surface_t *local;
+    cairo_int_status_t status;
+
+    RECT rectin = { x, y, x+width, y+height };
+    D3DLOCKED_RECT rectout;
+    HRESULT hr;
+    hr = IDirect3DSurface9_ReleaseDC (surface->d3d9surface, surface->dc);
+    hr = IDirect3DSurface9_LockRect (surface->d3d9surface,
+	                             &rectout, &rectin, 0);
+    surface->dc = 0; // Don't use the DC when this is locked!
+    if (hr) {
+        IDirect3DSurface9_GetDC (surface->d3d9surface, &surface->dc);
+        return CAIRO_INT_STATUS_UNSUPPORTED;
+    }
+    local = cairo_image_surface_create_for_data (rectout.pBits,
+	                                         surface->format,
+						 width, height,
+						 rectout.Pitch);
+    if (local == NULL) {
+	IDirect3DSurface9_UnlockRect (surface->d3d9surface);
+	IDirect3DSurface9_GetDC (surface->d3d9surface, &surface->dc);
+        return CAIRO_INT_STATUS_UNSUPPORTED;
+    }
+    if (local->base.status) {
+	IDirect3DSurface9_UnlockRect (surface->d3d9surface);
+	IDirect3DSurface9_GetDC (surface->d3d9surface, &surface->dc);
+        return local->base.status;
+    }
+
+    *local_out = local;
+
+    return CAIRO_STATUS_SUCCESS;
+}
+
 static cairo_status_t
 _cairo_win32_surface_get_subimage (cairo_win32_surface_t  *surface,
 				   int                     x,
@@ -604,7 +653,6 @@ _cairo_win32_surface_acquire_source_image (void                    *abstract_sur
 					   void                   **image_extra)
 {
     cairo_win32_surface_t *surface = abstract_surface;
-    cairo_win32_surface_t *local;
     cairo_status_t status;
 
     if (!surface->image && !surface->is_dib && surface->bitmap &&
@@ -624,14 +672,30 @@ _cairo_win32_surface_acquire_source_image (void                    *abstract_sur
 	return CAIRO_STATUS_SUCCESS;
     }
 
-    status = _cairo_win32_surface_get_subimage (abstract_surface, 0, 0,
-						surface->extents.width,
-						surface->extents.height, &local);
-    if (status)
-	return status;
+    if (surface->d3d9surface) {
+	cairo_image_surface_t *local;
+	status = _cairo_win32_surface_d3d9_lock_rect (abstract_surface, 0, 0,
+						      surface->extents.width,
+						      surface->extents.height, &local);
+	if (status)
+	    return status;
+
+	*image_out = local;
+	*image_extra = surface;
+    } else {
+	cairo_win32_surface_t *local;
+	status = _cairo_win32_surface_get_subimage (abstract_surface, 0, 0,
+						    surface->extents.width,
+						    surface->extents.height, &local);
+	if (status)
+	    return status;
+
+	*image_out = (cairo_image_surface_t *)local->image;
+	*image_extra = local;
+    }
+    // image_extra is always of type cairo_win32_surface_t. For d3d9surface it points
+    // to the original surface to get back the d3d9surface and properly unlock.
 
-    *image_out = (cairo_image_surface_t *)local->image;
-    *image_extra = local;
     return CAIRO_STATUS_SUCCESS;
 }
 
@@ -640,10 +704,16 @@ _cairo_win32_surface_release_source_image (void                   *abstract_surf
 					   cairo_image_surface_t  *image,
 					   void                   *image_extra)
 {
+    cairo_win32_surface_t *surface = abstract_surface;
     cairo_win32_surface_t *local = image_extra;
 
-    if (local)
+    if (local && local->d3d9surface) {
+	IDirect3DSurface9_UnlockRect (local->d3d9surface);
+	IDirect3DSurface9_GetDC (local->d3d9surface, &local->dc);
+	cairo_surface_destroy ((cairo_surface_t *)image);
+    } else {
 	cairo_surface_destroy ((cairo_surface_t *)local);
+    }
 }
 
 static cairo_status_t
@@ -654,7 +724,6 @@ _cairo_win32_surface_acquire_dest_image (void                    *abstract_surfa
 					 void                   **image_extra)
 {
     cairo_win32_surface_t *surface = abstract_surface;
-    cairo_win32_surface_t *local = NULL;
     cairo_status_t status;
 
     if (surface->image) {
@@ -666,17 +735,36 @@ _cairo_win32_surface_acquire_dest_image (void                    *abstract_surfa
 	return CAIRO_STATUS_SUCCESS;
     }
 
-    status = _cairo_win32_surface_get_subimage (abstract_surface,
+    if (surface->d3d9surface) {
+	cairo_image_surface_t *local = NULL;
+	status = _cairo_win32_surface_d3d9_lock_rect (abstract_surface,
 						interest_rect->x,
 						interest_rect->y,
 						interest_rect->width,
-						interest_rect->height,
-						&local);
-    if (status)
-	return status;
+						interest_rect->height, &local);
+
+	if (status)
+	    return status;
+
+	*image_out = local;
+	*image_extra = surface;
+    } else {
+	cairo_win32_surface_t *local = NULL;
+	status = _cairo_win32_surface_get_subimage (abstract_surface,
+						interest_rect->x,
+						interest_rect->y,
+						interest_rect->width,
+						interest_rect->height, &local);
+
+	if (status)
+	    return status;
+
+	*image_out = (cairo_image_surface_t *) local->image;
+	*image_extra = local;
+    }
+    // image_extra is always of type cairo_win32_surface_t. For d3d9surface it points
+    // to the original surface to get back the d3d9surface and properly unlock.
 
-    *image_out = (cairo_image_surface_t *) local->image;
-    *image_extra = local;
     *image_rect = *interest_rect;
     return CAIRO_STATUS_SUCCESS;
 }
@@ -694,19 +782,27 @@ _cairo_win32_surface_release_dest_image (void                    *abstract_surfa
     if (!local)
 	return;
 
-    /* clear any clip that's currently set on the surface
-       so that we can blit uninhibited. */
-    _cairo_win32_surface_set_clip_region (surface, NULL);
+    if (local->d3d9surface) {
+	IDirect3DSurface9_UnlockRect (local->d3d9surface);
+	IDirect3DSurface9_GetDC (local->d3d9surface, &local->dc);
+	cairo_surface_destroy ((cairo_surface_t *)image);
+    } else {
 
-    if (!BitBlt (surface->dc,
-		 image_rect->x, image_rect->y,
-		 image_rect->width, image_rect->height,
-		 local->dc,
-		 0, 0,
-		 SRCCOPY))
-	_cairo_win32_print_gdi_error ("_cairo_win32_surface_release_dest_image");
+	/* clear any clip that's currently set on the surface
+	   so that we can blit uninhibited. */
+	_cairo_win32_surface_set_clip_region (surface, NULL);
+
+	if (!BitBlt (surface->dc,
+		     image_rect->x, image_rect->y,
+		     image_rect->width, image_rect->height,
+		     local->dc,
+		     0, 0,
+		     SRCCOPY))
+	    _cairo_win32_print_gdi_error ("_cairo_win32_surface_release_dest_image");
+
+	cairo_surface_destroy ((cairo_surface_t *)local);
+    }
 
-    cairo_surface_destroy ((cairo_surface_t *)local);
 }
 
 cairo_status_t
@@ -1854,6 +1950,7 @@ cairo_win32_surface_create_internal (HDC hdc, cairo_format_t format)
     surface->image = NULL;
     surface->format = format;
 
+    surface->d3d9surface = NULL;
     surface->dc = hdc;
     surface->bitmap = NULL;
     surface->is_dib = FALSE;
@@ -2014,6 +2111,19 @@ FINISH:
     return (cairo_surface_t*) new_surf;
 }
 
+cairo_public cairo_surface_t *
+cairo_win32_surface_create_with_d3dsurface9 (IDirect3DSurface9 *surface)
+{
+    HDC dc;
+    cairo_win32_surface_t *win_surface;
+
+    IDirect3DSurface9_AddRef (surface);
+    IDirect3DSurface9_GetDC (surface, &dc);
+    win_surface = cairo_win32_surface_create_internal(dc, CAIRO_FORMAT_RGB24);
+    win_surface->d3d9surface = surface;
+    return (cairo_surface_t*) win_surface;
+
+}
 /**
  * _cairo_surface_is_win32:
  * @surface: a #cairo_surface_t
diff --git a/gfx/cairo/cairo/src/cairo-win32.h b/gfx/cairo/cairo/src/cairo-win32.h
index 07a7557838a1..5330a954d1ac 100644
--- a/gfx/cairo/cairo/src/cairo-win32.h
+++ b/gfx/cairo/cairo/src/cairo-win32.h
@@ -64,7 +64,6 @@ cairo_public cairo_surface_t *
 cairo_win32_surface_create_with_dib (cairo_format_t format,
                                      int width,
                                      int height);
-
 cairo_public HDC
 cairo_win32_surface_get_dc (cairo_surface_t *surface);
 
@@ -148,6 +147,10 @@ cairo_dwrite_get_cleartype_rendering_mode();
 
 #endif /* CAIRO_HAS_DWRITE_FONT */
 
+cairo_public cairo_surface_t *
+cairo_win32_surface_create_with_d3dsurface9 (struct IDirect3DSurface9 *surface);
+
+
 #if CAIRO_HAS_D2D_SURFACE
 
 struct _cairo_device
diff --git a/gfx/cairo/win32-d3dsurface9.patch b/gfx/cairo/win32-d3dsurface9.patch
new file mode 100644
index 000000000000..92d0244be290
--- /dev/null
+++ b/gfx/cairo/win32-d3dsurface9.patch
@@ -0,0 +1,464 @@
+diff --git a/gfx/cairo/cairo/src/cairo-rename.h b/gfx/cairo/cairo/src/cairo-rename.h
+--- a/gfx/cairo/cairo/src/cairo-rename.h
++++ b/gfx/cairo/cairo/src/cairo-rename.h
+@@ -335,16 +335,17 @@
+ #define cairo_win32_font_face_create_for_logfontw_hfont _moz_cairo_win32_font_face_create_for_logfontw_hfont
+ #define cairo_win32_printing_surface_create _moz_cairo_win32_printing_surface_create
+ #define cairo_win32_scaled_font_done_font _moz_cairo_win32_scaled_font_done_font
+ #define cairo_win32_scaled_font_get_device_to_logical _moz_cairo_win32_scaled_font_get_device_to_logical
+ #define cairo_win32_scaled_font_get_logical_to_device _moz_cairo_win32_scaled_font_get_logical_to_device
+ #define cairo_win32_scaled_font_get_metrics_factor _moz_cairo_win32_scaled_font_get_metrics_factor
+ #define cairo_win32_scaled_font_select_font _moz_cairo_win32_scaled_font_select_font
+ #define cairo_win32_surface_create _moz_cairo_win32_surface_create
++#define cairo_win32_surface_create_with_d3dsurface9 _moz_cairo_win32_surface_create_with_d3dsurface9
+ #define cairo_win32_surface_create_with_ddb _moz_cairo_win32_surface_create_with_ddb
+ #define cairo_win32_surface_create_with_dib _moz_cairo_win32_surface_create_with_dib
+ #define cairo_win32_surface_get_dc _moz_cairo_win32_surface_get_dc
+ #define cairo_win32_surface_get_image _moz_cairo_win32_surface_get_image
+ #define cairo_xcb_surface_create _moz_cairo_xcb_surface_create
+ #define cairo_xcb_surface_create_for_bitmap _moz_cairo_xcb_surface_create_for_bitmap
+ #define cairo_xcb_surface_create_with_xrender_format _moz_cairo_xcb_surface_create_with_xrender_format
+ #define cairo_xcb_surface_set_size _moz_cairo_xcb_surface_set_size
+diff --git a/gfx/cairo/cairo/src/cairo-win32-printing-surface.c b/gfx/cairo/cairo/src/cairo-win32-printing-surface.c
+--- a/gfx/cairo/cairo/src/cairo-win32-printing-surface.c
++++ b/gfx/cairo/cairo/src/cairo-win32-printing-surface.c
+@@ -1852,16 +1852,17 @@ cairo_win32_printing_surface_create (HDC
+     }
+ 
+     _cairo_surface_clipper_init (&surface->clipper,
+ 				 _cairo_win32_printing_surface_clipper_intersect_clip_path);
+ 
+     surface->image = NULL;
+     surface->format = CAIRO_FORMAT_RGB24;
+     surface->content = CAIRO_CONTENT_COLOR_ALPHA;
++    surface->d3d9surface = NULL;
+ 
+     surface->dc = hdc;
+     surface->bitmap = NULL;
+     surface->is_dib = FALSE;
+     surface->saved_dc_bitmap = NULL;
+     surface->brush = NULL;
+     surface->old_brush = NULL;
+     surface->font_subsets = _cairo_scaled_font_subsets_create_scaled ();
+diff --git a/gfx/cairo/cairo/src/cairo-win32-private.h b/gfx/cairo/cairo/src/cairo-win32-private.h
+--- a/gfx/cairo/cairo/src/cairo-win32-private.h
++++ b/gfx/cairo/cairo/src/cairo-win32-private.h
+@@ -54,16 +54,18 @@ CAIRO_BEGIN_DECLS
+ 
+ typedef struct _cairo_win32_surface {
+     cairo_surface_t base;
+ 
+     cairo_format_t format;
+ 
+     HDC dc;
+ 
++    struct IDirect3DSurface9 *d3d9surface;
++
+     /* We create off-screen surfaces as DIBs or DDBs, based on what we created
+      * originally*/
+     HBITMAP bitmap;
+     cairo_bool_t is_dib;
+ 
+     /* Used to save the initial 1x1 monochrome bitmap for the DC to
+      * select back into the DC before deleting the DC and our
+      * bitmap. For Windows XP, this doesn't seem to be necessary
+diff --git a/gfx/cairo/cairo/src/cairo-win32-surface.c b/gfx/cairo/cairo/src/cairo-win32-surface.c
+--- a/gfx/cairo/cairo/src/cairo-win32-surface.c
++++ b/gfx/cairo/cairo/src/cairo-win32-surface.c
+@@ -54,16 +54,17 @@
+ #include "cairo-win32-private.h"
+ #include "cairo-scaled-font-subsets-private.h"
+ #include "cairo-surface-fallback-private.h"
+ #include "cairo-surface-clipper-private.h"
+ #include "cairo-gstate-private.h"
+ #include "cairo-private.h"
+ #include <wchar.h>
+ #include <windows.h>
++#include <D3D9.h>
+ 
+ #if defined(__MINGW32__) && !defined(ETO_PDY)
+ # define ETO_PDY 0x2000
+ #endif
+ 
+ #undef DEBUG_COMPOSITE
+ 
+ /* for older SDKs */
+@@ -384,16 +385,17 @@ static cairo_surface_t *
+ 
+     surface->image = cairo_image_surface_create_for_data (bits, format,
+ 							  width, height, rowstride);
+     status = surface->image->status;
+     if (status)
+ 	goto FAIL;
+ 
+     surface->format = format;
++    surface->d3d9surface = NULL;
+ 
+     surface->clip_rect.x = 0;
+     surface->clip_rect.y = 0;
+     surface->clip_rect.width = width;
+     surface->clip_rect.height = height;
+ 
+     surface->initial_clip_rgn = NULL;
+     surface->had_simple_clip = FALSE;
+@@ -481,26 +483,73 @@ cairo_status_t
+     if (surface->bitmap) {
+ 	SelectObject (surface->dc, surface->saved_dc_bitmap);
+ 	DeleteObject (surface->bitmap);
+ 	DeleteDC (surface->dc);
+     } else {
+ 	_cairo_win32_restore_initial_clip (surface);
+     }
+ 
++    if (surface->d3d9surface) {
++        IDirect3DSurface9_ReleaseDC (surface->d3d9surface, surface->dc);
++        IDirect3DSurface9_Release (surface->d3d9surface);
++    }
++
+     if (surface->initial_clip_rgn)
+ 	DeleteObject (surface->initial_clip_rgn);
+ 
+     if (surface->font_subsets != NULL)
+ 	_cairo_scaled_font_subsets_destroy (surface->font_subsets);
+ 
+     return CAIRO_STATUS_SUCCESS;
+ }
+ 
+ static cairo_status_t
++_cairo_win32_surface_d3d9_lock_rect (cairo_win32_surface_t  *surface,
++				   int                     x,
++				   int                     y,
++				   int                     width,
++				   int                     height,
++				   cairo_image_surface_t **local_out)
++{
++    cairo_image_surface_t *local;
++    cairo_int_status_t status;
++
++    RECT rectin = { x, y, x+width, y+height };
++    D3DLOCKED_RECT rectout;
++    HRESULT hr;
++    hr = IDirect3DSurface9_ReleaseDC (surface->d3d9surface, surface->dc);
++    hr = IDirect3DSurface9_LockRect (surface->d3d9surface,
++	                             &rectout, &rectin, 0);
++    surface->dc = 0; // Don't use the DC when this is locked!
++    if (hr) {
++        IDirect3DSurface9_GetDC (surface->d3d9surface, &surface->dc);
++        return CAIRO_INT_STATUS_UNSUPPORTED;
++    }
++    local = cairo_image_surface_create_for_data (rectout.pBits,
++	                                         surface->format,
++						 width, height,
++						 rectout.Pitch);
++    if (local == NULL) {
++	IDirect3DSurface9_UnlockRect (surface->d3d9surface);
++	IDirect3DSurface9_GetDC (surface->d3d9surface, &surface->dc);
++        return CAIRO_INT_STATUS_UNSUPPORTED;
++    }
++    if (local->base.status) {
++	IDirect3DSurface9_UnlockRect (surface->d3d9surface);
++	IDirect3DSurface9_GetDC (surface->d3d9surface, &surface->dc);
++        return local->base.status;
++    }
++
++    *local_out = local;
++
++    return CAIRO_STATUS_SUCCESS;
++}
++
++static cairo_status_t
+ _cairo_win32_surface_get_subimage (cairo_win32_surface_t  *surface,
+ 				   int                     x,
+ 				   int                     y,
+ 				   int                     width,
+ 				   int                     height,
+ 				   cairo_win32_surface_t **local_out)
+ {
+     cairo_win32_surface_t *local;
+@@ -599,17 +648,16 @@ static void
+ }
+ 
+ static cairo_status_t
+ _cairo_win32_surface_acquire_source_image (void                    *abstract_surface,
+ 					   cairo_image_surface_t  **image_out,
+ 					   void                   **image_extra)
+ {
+     cairo_win32_surface_t *surface = abstract_surface;
+-    cairo_win32_surface_t *local;
+     cairo_status_t status;
+ 
+     if (!surface->image && !surface->is_dib && surface->bitmap &&
+ 	(surface->flags & CAIRO_WIN32_SURFACE_CAN_CONVERT_TO_DIB) != 0)
+     {
+ 	/* This is a DDB, and we're being asked to use it as a source for
+ 	 * something that we couldn't support natively.  So turn it into
+ 	 * a DIB, so that we have an equivalent image surface, as long
+@@ -619,69 +667,109 @@ static cairo_status_t
+     }
+ 
+     if (surface->image) {
+ 	*image_out = (cairo_image_surface_t *)surface->image;
+ 	*image_extra = NULL;
+ 	return CAIRO_STATUS_SUCCESS;
+     }
+ 
+-    status = _cairo_win32_surface_get_subimage (abstract_surface, 0, 0,
+-						surface->extents.width,
+-						surface->extents.height, &local);
+-    if (status)
+-	return status;
+-
+-    *image_out = (cairo_image_surface_t *)local->image;
+-    *image_extra = local;
++    if (surface->d3d9surface) {
++	cairo_image_surface_t *local;
++	status = _cairo_win32_surface_d3d9_lock_rect (abstract_surface, 0, 0,
++						      surface->extents.width,
++						      surface->extents.height, &local);
++	if (status)
++	    return status;
++
++	*image_out = local;
++	*image_extra = surface;
++    } else {
++	cairo_win32_surface_t *local;
++	status = _cairo_win32_surface_get_subimage (abstract_surface, 0, 0,
++						    surface->extents.width,
++						    surface->extents.height, &local);
++	if (status)
++	    return status;
++
++	*image_out = (cairo_image_surface_t *)local->image;
++	*image_extra = local;
++    }
++    // image_extra is always of type cairo_win32_surface_t. For d3d9surface it points
++    // to the original surface to get back the d3d9surface and properly unlock.
++
+     return CAIRO_STATUS_SUCCESS;
+ }
+ 
+ static void
+ _cairo_win32_surface_release_source_image (void                   *abstract_surface,
+ 					   cairo_image_surface_t  *image,
+ 					   void                   *image_extra)
+ {
++    cairo_win32_surface_t *surface = abstract_surface;
+     cairo_win32_surface_t *local = image_extra;
+ 
+-    if (local)
++    if (local && local->d3d9surface) {
++	IDirect3DSurface9_UnlockRect (local->d3d9surface);
++	IDirect3DSurface9_GetDC (local->d3d9surface, &local->dc);
++	cairo_surface_destroy ((cairo_surface_t *)image);
++    } else {
+ 	cairo_surface_destroy ((cairo_surface_t *)local);
++    }
+ }
+ 
+ static cairo_status_t
+ _cairo_win32_surface_acquire_dest_image (void                    *abstract_surface,
+ 					 cairo_rectangle_int_t   *interest_rect,
+ 					 cairo_image_surface_t  **image_out,
+ 					 cairo_rectangle_int_t   *image_rect,
+ 					 void                   **image_extra)
+ {
+     cairo_win32_surface_t *surface = abstract_surface;
+-    cairo_win32_surface_t *local = NULL;
+     cairo_status_t status;
+ 
+     if (surface->image) {
+ 	GdiFlush();
+ 
+ 	*image_out = (cairo_image_surface_t *) surface->image;
+ 	*image_extra = NULL;
+ 	*image_rect = surface->extents;
+ 	return CAIRO_STATUS_SUCCESS;
+     }
+ 
+-    status = _cairo_win32_surface_get_subimage (abstract_surface,
++    if (surface->d3d9surface) {
++	cairo_image_surface_t *local = NULL;
++	status = _cairo_win32_surface_d3d9_lock_rect (abstract_surface,
+ 						interest_rect->x,
+ 						interest_rect->y,
+ 						interest_rect->width,
+-						interest_rect->height,
+-						&local);
+-    if (status)
+-	return status;
+-
+-    *image_out = (cairo_image_surface_t *) local->image;
+-    *image_extra = local;
++						interest_rect->height, &local);
++
++	if (status)
++	    return status;
++
++	*image_out = local;
++	*image_extra = surface;
++    } else {
++	cairo_win32_surface_t *local = NULL;
++	status = _cairo_win32_surface_get_subimage (abstract_surface,
++						interest_rect->x,
++						interest_rect->y,
++						interest_rect->width,
++						interest_rect->height, &local);
++
++	if (status)
++	    return status;
++
++	*image_out = (cairo_image_surface_t *) local->image;
++	*image_extra = local;
++    }
++    // image_extra is always of type cairo_win32_surface_t. For d3d9surface it points
++    // to the original surface to get back the d3d9surface and properly unlock.
++
+     *image_rect = *interest_rect;
+     return CAIRO_STATUS_SUCCESS;
+ }
+ 
+ static void
+ _cairo_win32_surface_release_dest_image (void                    *abstract_surface,
+ 					 cairo_rectangle_int_t   *interest_rect,
+ 					 cairo_image_surface_t   *image,
+@@ -689,29 +777,37 @@ static void
+ 					 void                    *image_extra)
+ {
+     cairo_win32_surface_t *surface = abstract_surface;
+     cairo_win32_surface_t *local = image_extra;
+ 
+     if (!local)
+ 	return;
+ 
+-    /* clear any clip that's currently set on the surface
+-       so that we can blit uninhibited. */
+-    _cairo_win32_surface_set_clip_region (surface, NULL);
+-
+-    if (!BitBlt (surface->dc,
+-		 image_rect->x, image_rect->y,
+-		 image_rect->width, image_rect->height,
+-		 local->dc,
+-		 0, 0,
+-		 SRCCOPY))
+-	_cairo_win32_print_gdi_error ("_cairo_win32_surface_release_dest_image");
+-
+-    cairo_surface_destroy ((cairo_surface_t *)local);
++    if (local->d3d9surface) {
++	IDirect3DSurface9_UnlockRect (local->d3d9surface);
++	IDirect3DSurface9_GetDC (local->d3d9surface, &local->dc);
++	cairo_surface_destroy ((cairo_surface_t *)image);
++    } else {
++
++	/* clear any clip that's currently set on the surface
++	   so that we can blit uninhibited. */
++	_cairo_win32_surface_set_clip_region (surface, NULL);
++
++	if (!BitBlt (surface->dc,
++		     image_rect->x, image_rect->y,
++		     image_rect->width, image_rect->height,
++		     local->dc,
++		     0, 0,
++		     SRCCOPY))
++	    _cairo_win32_print_gdi_error ("_cairo_win32_surface_release_dest_image");
++
++	cairo_surface_destroy ((cairo_surface_t *)local);
++    }
++
+ }
+ 
+ cairo_status_t
+ _cairo_win32_surface_set_clip_region (void           *abstract_surface,
+ 				      cairo_region_t *region)
+ {
+     cairo_win32_surface_t *surface = abstract_surface;
+     cairo_status_t status = CAIRO_STATUS_SUCCESS;
+@@ -1849,16 +1945,17 @@ cairo_win32_surface_create_internal (HDC
+ 	free (surface);
+ 	return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_NO_MEMORY));
+     }
+ 
+     surface->clip_region = NULL;
+     surface->image = NULL;
+     surface->format = format;
+ 
++    surface->d3d9surface = NULL;
+     surface->dc = hdc;
+     surface->bitmap = NULL;
+     surface->is_dib = FALSE;
+     surface->saved_dc_bitmap = NULL;
+     surface->brush = NULL;
+     surface->old_brush = NULL;
+     surface->font_subsets = NULL;
+ 
+@@ -2009,16 +2106,29 @@ cairo_win32_surface_create_with_ddb (HDC
+ 
+ FINISH:
+     if (screen_dc)
+ 	ReleaseDC (NULL, screen_dc);
+ 
+     return (cairo_surface_t*) new_surf;
+ }
+ 
++cairo_public cairo_surface_t *
++cairo_win32_surface_create_with_d3dsurface9 (IDirect3DSurface9 *surface)
++{
++    HDC dc;
++    cairo_win32_surface_t *win_surface;
++
++    IDirect3DSurface9_AddRef (surface);
++    IDirect3DSurface9_GetDC (surface, &dc);
++    win_surface = cairo_win32_surface_create_internal(dc, CAIRO_FORMAT_RGB24);
++    win_surface->d3d9surface = surface;
++    return (cairo_surface_t*) win_surface;
++
++}
+ /**
+  * _cairo_surface_is_win32:
+  * @surface: a #cairo_surface_t
+  *
+  * Checks if a surface is a win32 surface.  This will
+  * return False if this is a win32 printing surface; use
+  * _cairo_surface_is_win32_printing() to check for that.
+  *
+diff --git a/gfx/cairo/cairo/src/cairo-win32.h b/gfx/cairo/cairo/src/cairo-win32.h
+--- a/gfx/cairo/cairo/src/cairo-win32.h
++++ b/gfx/cairo/cairo/src/cairo-win32.h
+@@ -59,17 +59,16 @@ cairo_win32_surface_create_with_ddb (HDC
+                                      cairo_format_t format,
+                                      int width,
+                                      int height);
+ 
+ cairo_public cairo_surface_t *
+ cairo_win32_surface_create_with_dib (cairo_format_t format,
+                                      int width,
+                                      int height);
+-
+ cairo_public HDC
+ cairo_win32_surface_get_dc (cairo_surface_t *surface);
+ 
+ cairo_public HDC
+ cairo_win32_get_dc_with_clip (cairo_t *cr);
+ 
+ cairo_public cairo_surface_t *
+ cairo_win32_surface_get_image (cairo_surface_t *surface);
+@@ -143,16 +142,20 @@ cairo_dwrite_scaled_font_get_force_GDI_c
+ void
+ cairo_dwrite_set_cleartype_params(FLOAT gamma, FLOAT contrast, FLOAT level, int geometry, int mode);
+ 
+ int
+ cairo_dwrite_get_cleartype_rendering_mode();
+ 
+ #endif /* CAIRO_HAS_DWRITE_FONT */
+ 
++cairo_public cairo_surface_t *
++cairo_win32_surface_create_with_d3dsurface9 (struct IDirect3DSurface9 *surface);
++
++
+ #if CAIRO_HAS_D2D_SURFACE
+ 
+ struct _cairo_device
+ {
+     int type;
+     int refcount;
+ };
+ 
diff --git a/gfx/layers/d3d9/ThebesLayerD3D9.cpp b/gfx/layers/d3d9/ThebesLayerD3D9.cpp
index 906475f5d768..01efe8dc74a1 100644
--- a/gfx/layers/d3d9/ThebesLayerD3D9.cpp
+++ b/gfx/layers/d3d9/ThebesLayerD3D9.cpp
@@ -343,7 +343,7 @@ ThebesLayerD3D9::VerifyContentType(SurfaceMode aMode)
 class OpaqueRenderer {
 public:
   OpaqueRenderer(const nsIntRegion& aUpdateRegion) :
-    mUpdateRegion(aUpdateRegion), mDC(nullptr) {}
+    mUpdateRegion(aUpdateRegion) {}
   ~OpaqueRenderer() { End(); }
   already_AddRefed<gfxWindowsSurface> Begin(LayerD3D9* aLayer);
   void End();
@@ -353,7 +353,7 @@ private:
   const nsIntRegion& mUpdateRegion;
   nsRefPtr<IDirect3DTexture9> mTmpTexture;
   nsRefPtr<IDirect3DSurface9> mSurface;
-  HDC mDC;
+  nsRefPtr<gfxWindowsSurface> mD3D9ThebesSurface;
 };
 
 already_AddRefed<gfxWindowsSurface>
@@ -378,24 +378,32 @@ OpaqueRenderer::Begin(LayerD3D9* aLayer)
     return nullptr;
   }
 
-  hr = mSurface->GetDC(&mDC);
-  if (FAILED(hr)) {
-    NS_WARNING("Failed to get device context for texture surface.");
+  nsRefPtr<gfxWindowsSurface> result = new gfxWindowsSurface(mSurface);
+  if (!result) {
+    NS_WARNING("Failed to d3d9 cairo surface.");
     return nullptr;
   }
+  mD3D9ThebesSurface = result;
 
-  nsRefPtr<gfxWindowsSurface> result = new gfxWindowsSurface(mDC);
   return result.forget();
 }
 
 void
 OpaqueRenderer::End()
 {
-  if (mSurface && mDC) {
-    mSurface->ReleaseDC(mDC);
-    mSurface = nullptr;
-    mDC = nullptr;
+  mSurface = nullptr;
+  // gfxWindowsSurface returned from ::Begin() should be released before the
+  // texture is used. This will assert that this is the case
+#if 1
+  if (mD3D9ThebesSurface) {
+    mD3D9ThebesSurface->AddRef();
+    nsrefcnt c = mD3D9ThebesSurface->Release();
+    if (c != 1)
+      NS_RUNTIMEABORT("Reference mD3D9ThebesSurface must be released by caller of Begin() before calling End()");
   }
+#endif
+  mD3D9ThebesSurface = nullptr;
+
 }
 
 static void
@@ -503,11 +511,16 @@ ThebesLayerD3D9::DrawRegion(nsIntRegion &aRegion, SurfaceMode aMode,
     }
   }
 
+  // Release the cairo d3d9 surface before we try to composite it
+  context = nullptr;
+
   nsAutoTArray<IDirect3DTexture9*,2> srcTextures;
   nsAutoTArray<IDirect3DTexture9*,2> destTextures;
   switch (aMode)
   {
     case SURFACE_OPAQUE:
+      // Must release reference to dest surface before ending drawing
+      destinationSurface = nullptr;
       opaqueRenderer.End();
       srcTextures.AppendElement(opaqueRenderer.GetTexture());
       destTextures.AppendElement(mTexture);
@@ -535,6 +548,8 @@ ThebesLayerD3D9::DrawRegion(nsIntRegion &aRegion, SurfaceMode aMode,
         context->Paint();
       }
 
+      // Must release reference to dest surface before ending drawing
+      destinationSurface = nullptr;
       imgSurface = nullptr;
 
       srcTextures.AppendElement(tmpTexture);
@@ -543,6 +558,8 @@ ThebesLayerD3D9::DrawRegion(nsIntRegion &aRegion, SurfaceMode aMode,
     }
 
     case SURFACE_COMPONENT_ALPHA: {
+      // Must release reference to dest surface before ending drawing
+      destinationSurface = nullptr;
       opaqueRenderer.End();
       opaqueRendererOnWhite.End();
       srcTextures.AppendElement(opaqueRenderer.GetTexture());
@@ -553,6 +570,7 @@ ThebesLayerD3D9::DrawRegion(nsIntRegion &aRegion, SurfaceMode aMode,
     }
   }
   NS_ASSERTION(srcTextures.Length() == destTextures.Length(), "Mismatched lengths");
+  
 
   // Copy to the texture.
   for (uint32_t i = 0; i < srcTextures.Length(); ++i) {
diff --git a/gfx/thebes/gfxWindowsSurface.cpp b/gfx/thebes/gfxWindowsSurface.cpp
index 0fe3ee969f88..b94070975cc3 100644
--- a/gfx/thebes/gfxWindowsSurface.cpp
+++ b/gfx/thebes/gfxWindowsSurface.cpp
@@ -34,6 +34,14 @@ gfxWindowsSurface::gfxWindowsSurface(HDC dc, uint32_t flags) :
     InitWithDC(flags);
 }
 
+gfxWindowsSurface::gfxWindowsSurface(IDirect3DSurface9 *surface, uint32_t flags) :
+    mOwnsDC(false), mForPrinting(false), mDC(0), mWnd(nullptr)
+{
+    cairo_surface_t *surf = cairo_win32_surface_create_with_d3dsurface9(surface);
+    Init(surf);
+}
+
+
 void
 gfxWindowsSurface::MakeInvalid(gfxIntSize& size)
 {
@@ -161,6 +169,13 @@ gfxWindowsSurface::GetDCWithClip(gfxContext *ctx)
     return cairo_win32_get_dc_with_clip (ctx->GetCairo());
 }
 
+HDC
+gfxWindowsSurface::GetDC()
+{
+    return cairo_win32_surface_get_dc (CairoSurface());
+}
+
+
 already_AddRefed<gfxImageSurface>
 gfxWindowsSurface::GetAsImageSurface()
 {
diff --git a/gfx/thebes/gfxWindowsSurface.h b/gfx/thebes/gfxWindowsSurface.h
index 1e8cc92627f9..1bb6cd838573 100644
--- a/gfx/thebes/gfxWindowsSurface.h
+++ b/gfx/thebes/gfxWindowsSurface.h
@@ -11,6 +11,9 @@
 
 /* include windows.h for the HWND and HDC definitions that we need. */
 #include <windows.h>
+
+struct IDirect3DSurface9;
+
 /* undefine LoadImage because our code uses that name */
 #undef LoadImage
 
@@ -27,6 +30,9 @@ public:
     gfxWindowsSurface(HWND wnd, uint32_t flags = 0);
     gfxWindowsSurface(HDC dc, uint32_t flags = 0);
 
+    // Create from a shared d3d9surface
+    gfxWindowsSurface(IDirect3DSurface9 *surface, uint32_t flags = 0);
+
     // Create a DIB surface
     gfxWindowsSurface(const gfxIntSize& size,
                       gfxImageFormat imageFormat = ImageFormatRGB24);
@@ -45,7 +51,7 @@ public:
 
     virtual ~gfxWindowsSurface();
 
-    HDC GetDC() { return mDC; }
+    HDC GetDC();
 
     HDC GetDCWithClip(gfxContext *);
 
diff --git a/layout/media/symbols.def.in b/layout/media/symbols.def.in
index 120c0257de5e..34e99c7771bc 100644
--- a/layout/media/symbols.def.in
+++ b/layout/media/symbols.def.in
@@ -476,6 +476,7 @@ _moz_cairo_win32_font_face_create_for_logfontw_hfont
 _moz_cairo_win32_printing_surface_create
 _moz_cairo_win32_scaled_font_select_font
 _moz_cairo_win32_surface_create
+_moz_cairo_win32_surface_create_with_d3dsurface9
 _moz_cairo_win32_surface_create_with_ddb
 _moz_cairo_win32_surface_create_with_dib
 _moz_cairo_win32_surface_get_dc

From ff55e5d0b4b0f01794f1210d6d657093e28127d0 Mon Sep 17 00:00:00 2001
From: Patrick McManus <mcmanus@ducksong.com>
Date: Wed, 4 Sep 2013 17:01:02 -0400
Subject: [PATCH 21/86] bug 912582 - false start rc4 and rsa accomodations need
 exact principal matches r=dkeeler

---
 netwerk/protocol/http/nsHttpChannel.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp
index 3b66e859ea31..3a5e6de10bf5 100644
--- a/netwerk/protocol/http/nsHttpChannel.cpp
+++ b/netwerk/protocol/http/nsHttpChannel.cpp
@@ -724,14 +724,17 @@ nsHttpChannel::RetrieveSSLOptions()
         return;
 
     uint32_t perm;
-    nsresult rv = permMgr->TestPermissionFromPrincipal(principal,
-                                                       "falsestart-rsa", &perm);
+    nsresult rv = permMgr->TestExactPermissionFromPrincipal(principal,
+                                                            "falsestart-rsa",
+                                                            &perm);
     if (NS_SUCCEEDED(rv) && perm == nsIPermissionManager::ALLOW_ACTION) {
         LOG(("nsHttpChannel::RetrieveSSLOptions [this=%p] "
              "falsestart-rsa permission found\n", this));
         mCaps |= NS_HTTP_ALLOW_RSA_FALSESTART;
     }
-    rv = permMgr->TestPermissionFromPrincipal(principal, "falsestart-rc4", &perm);
+    rv = permMgr->TestExactPermissionFromPrincipal(principal,
+                                                   "falsestart-rc4",
+                                                   &perm);
     if (NS_SUCCEEDED(rv) && perm == nsIPermissionManager::ALLOW_ACTION) {
         LOG(("nsHttpChannel::RetrieveSSLOptions [this=%p] "
              "falsestart-rc4 permission found\n", this));

From 89ee39c30da013ca21c7716bd874638226204302 Mon Sep 17 00:00:00 2001
From: Randell Jesup <rjesup@jesup.org>
Date: Wed, 4 Sep 2013 17:01:48 -0400
Subject: [PATCH 22/86] Bug 912450: remove WEBRTC_EXPORT to avoid exporting
 webrtc symbols from xul.dll r=ted

---
 media/webrtc/trunk/webrtc/build/common.gypi | 1 -
 1 file changed, 1 deletion(-)

diff --git a/media/webrtc/trunk/webrtc/build/common.gypi b/media/webrtc/trunk/webrtc/build/common.gypi
index a5e18c84d6fa..5b8a0761926d 100644
--- a/media/webrtc/trunk/webrtc/build/common.gypi
+++ b/media/webrtc/trunk/webrtc/build/common.gypi
@@ -325,7 +325,6 @@
       ['OS=="win"', {
         'defines': [
           'WEBRTC_WIN',
-	  'WEBRTC_EXPORT',
         ],
         # TODO(andrew): enable all warnings when possible.
         # TODO(phoglund): get rid of 4373 supression when

From 7367a3a5b867c266d3206e90b0fae5ea76d6d6a0 Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Wed, 4 Sep 2013 14:06:54 -0700
Subject: [PATCH 23/86] Bug 899367 - Only use JSOPTION_UNROOTED_GLOBAL for DOM
 JSContexts. r=mccr8

We don't cycle collect any other kind, so there's no difference between marking
them gray and letting the JS engine mark them black. This also gets rid of that
nasty code which reset the flag, which billm theorizes has to do with faulty
logic in ContextHolder when creating ephemeral sandbox cxes. The assertion in
this patch should catch us if anything goes wrong.
---
 dom/base/nsJSEnvironment.cpp           |  3 ++-
 dom/workers/RuntimeService.cpp         |  3 +--
 js/xpconnect/src/XPCJSRuntime.cpp      |  2 +-
 xpcom/base/CycleCollectedJSRuntime.cpp | 31 +++++---------------------
 xpcom/base/CycleCollectedJSRuntime.h   |  5 +----
 5 files changed, 11 insertions(+), 33 deletions(-)

diff --git a/dom/base/nsJSEnvironment.cpp b/dom/base/nsJSEnvironment.cpp
index f128832b7f14..ab87ddd64aac 100644
--- a/dom/base/nsJSEnvironment.cpp
+++ b/dom/base/nsJSEnvironment.cpp
@@ -851,7 +851,8 @@ nsJSContext::nsJSContext(bool aGCOnDestruction,
 
   ++sContextCount;
 
-  mDefaultJSOptions = JSOPTION_PRIVATE_IS_NSISUPPORTS;
+  mDefaultJSOptions = JSOPTION_PRIVATE_IS_NSISUPPORTS |
+                      JSOPTION_UNROOTED_GLOBAL;
 
   mContext = ::JS_NewContext(sRuntime, gStackSize);
   if (mContext) {
diff --git a/dom/workers/RuntimeService.cpp b/dom/workers/RuntimeService.cpp
index 8c342c4b4d8c..df60c974fbc9 100644
--- a/dom/workers/RuntimeService.cpp
+++ b/dom/workers/RuntimeService.cpp
@@ -831,8 +831,7 @@ public:
   // call to JS_SetGCParameter inside CreateJSContextForWorker.
   WorkerJSRuntime(WorkerPrivate* aWorkerPrivate)
   : CycleCollectedJSRuntime(WORKER_DEFAULT_RUNTIME_HEAPSIZE,
-                            JS_NO_HELPER_THREADS,
-                            false),
+                            JS_NO_HELPER_THREADS),
     mWorkerPrivate(aWorkerPrivate)
   {
     // We need to ensure that a JSContext outlives the cycle collector, and
diff --git a/js/xpconnect/src/XPCJSRuntime.cpp b/js/xpconnect/src/XPCJSRuntime.cpp
index 59a2be26a8f9..02c3a6cd93bc 100644
--- a/js/xpconnect/src/XPCJSRuntime.cpp
+++ b/js/xpconnect/src/XPCJSRuntime.cpp
@@ -2874,7 +2874,7 @@ SourceHook(JSContext *cx, JS::Handle<JSScript*> script, jschar **src,
 }
 
 XPCJSRuntime::XPCJSRuntime(nsXPConnect* aXPConnect)
-   : CycleCollectedJSRuntime(32L * 1024L * 1024L, JS_USE_HELPER_THREADS, true),
+   : CycleCollectedJSRuntime(32L * 1024L * 1024L, JS_USE_HELPER_THREADS),
    mJSContextStack(new XPCJSContextStack()),
    mCallContext(nullptr),
    mAutoRoots(nullptr),
diff --git a/xpcom/base/CycleCollectedJSRuntime.cpp b/xpcom/base/CycleCollectedJSRuntime.cpp
index 1b0587687ca4..219f50e9bcce 100644
--- a/xpcom/base/CycleCollectedJSRuntime.cpp
+++ b/xpcom/base/CycleCollectedJSRuntime.cpp
@@ -475,12 +475,10 @@ NoteJSChildGrayWrapperShim(void* aData, void* aThing)
 static const JSZoneParticipant sJSZoneCycleCollectorGlobal;
 
 CycleCollectedJSRuntime::CycleCollectedJSRuntime(uint32_t aMaxbytes,
-                                                 JSUseHelperThreads aUseHelperThreads,
-                                                 bool aExpectUnrootedGlobals)
+                                                 JSUseHelperThreads aUseHelperThreads)
   : mGCThingCycleCollectorGlobal(sGCThingCycleCollectorGlobal),
     mJSZoneCycleCollectorGlobal(sJSZoneCycleCollectorGlobal),
-    mJSRuntime(nullptr),
-    mExpectUnrootedGlobals(aExpectUnrootedGlobals)
+    mJSRuntime(nullptr)
 #ifdef DEBUG
   , mObjectToUnlink(nullptr)
 #endif
@@ -545,7 +543,10 @@ CycleCollectedJSRuntime::MaybeTraceGlobals(JSTracer* aTracer) const
 {
   JSContext* iter = nullptr;
   while (JSContext* acx = JS_ContextIterator(Runtime(), &iter)) {
-    MOZ_ASSERT(js::HasUnrootedGlobal(acx) == mExpectUnrootedGlobals);
+    // DOM JSContexts are the only JSContexts that cycle-collect their default
+    // compartment object, so they're the only ones that we need to do the
+    // JSOPTION_UNROOTED_GLOBAL dance for. The other ones are just marked black.
+    MOZ_ASSERT(js::HasUnrootedGlobal(acx) == !!GetScriptContextFromJSContext(acx));
     if (!js::HasUnrootedGlobal(acx)) {
       continue;
     }
@@ -1187,21 +1188,7 @@ CycleCollectedJSRuntime::OnGC(JSGCStatus aStatus)
 {
   switch (aStatus) {
     case JSGC_BEGIN:
-    {
-      // XXXkhuey do we still need this?
-      // We seem to sometime lose the unrooted global flag. Restore it
-      // here. FIXME: bug 584495.
-      if (mExpectUnrootedGlobals){
-        JSContext* iter = nullptr;
-        while (JSContext* acx = JS_ContextIterator(Runtime(), &iter)) {
-          if (!js::HasUnrootedGlobal(acx)) {
-            JS_ToggleOptions(acx, JSOPTION_UNROOTED_GLOBAL);
-          }
-        }
-      }
-
       break;
-    }
     case JSGC_END:
     {
       /*
@@ -1230,11 +1217,5 @@ CycleCollectedJSRuntime::OnGC(JSGCStatus aStatus)
 bool
 CycleCollectedJSRuntime::OnContext(JSContext* aCx, unsigned aOperation)
 {
-  if (mExpectUnrootedGlobals && aOperation == JSCONTEXT_NEW) {
-    // XXXkhuey bholley is going to make this go away, but for now XPConnect
-    // needs it.
-    JS_ToggleOptions(aCx, JSOPTION_UNROOTED_GLOBAL);
-  }
-
   return CustomContextCallback(aCx, aOperation);
 }
diff --git a/xpcom/base/CycleCollectedJSRuntime.h b/xpcom/base/CycleCollectedJSRuntime.h
index d8ed35c38652..d317e0efb4b3 100644
--- a/xpcom/base/CycleCollectedJSRuntime.h
+++ b/xpcom/base/CycleCollectedJSRuntime.h
@@ -83,8 +83,7 @@ class CycleCollectedJSRuntime
   friend class IncrementalFinalizeRunnable;
 protected:
   CycleCollectedJSRuntime(uint32_t aMaxbytes,
-                          JSUseHelperThreads aUseHelperThreads,
-                          bool aExpectUnrootedGlobals);
+                          JSUseHelperThreads aUseHelperThreads);
   virtual ~CycleCollectedJSRuntime();
 
   size_t SizeOfExcludingThis(mozilla::MallocSizeOf aMallocSizeOf) const;
@@ -223,8 +222,6 @@ private:
 
   nsRefPtr<IncrementalFinalizeRunnable> mFinalizeRunnable;
 
-  bool mExpectUnrootedGlobals;
-
 #ifdef DEBUG
   void* mObjectToUnlink;
 #endif

From b239d46a8b012030c1108c54d8dee3a5a130bdc1 Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Wed, 4 Sep 2013 14:06:54 -0700
Subject: [PATCH 24/86] Bug 899367 - Add an API to determine if we're marking
 gray. r=billm

This allows us to assert that certain callbacks get invoked during the gray
phase of a marking GC.
---
 js/src/jsapi.cpp | 9 +++++++++
 js/src/jsapi.h   | 6 ++++++
 2 files changed, 15 insertions(+)

diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index 88b5aa9ad21d..28e89ff3190b 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -2379,6 +2379,15 @@ JS_IsGCMarkingTracer(JSTracer *trc)
     return IS_GC_MARKING_TRACER(trc);
 }
 
+#ifdef DEBUG
+extern JS_PUBLIC_API(bool)
+JS_IsMarkingGray(JSTracer *trc)
+{
+    JS_ASSERT(JS_IsGCMarkingTracer(trc));
+    return trc->callback == GCMarker::GrayCallback;
+}
+#endif
+
 JS_PUBLIC_API(void)
 JS_GC(JSRuntime *rt)
 {
diff --git a/js/src/jsapi.h b/js/src/jsapi.h
index 4dce3f78cfbf..d3229ed00f4c 100644
--- a/js/src/jsapi.h
+++ b/js/src/jsapi.h
@@ -2210,6 +2210,12 @@ JS_SetFinalizeCallback(JSRuntime *rt, JSFinalizeCallback cb);
 extern JS_PUBLIC_API(bool)
 JS_IsGCMarkingTracer(JSTracer *trc);
 
+/* For assertions only. */
+#ifdef DEBUG
+extern JS_PUBLIC_API(bool)
+JS_IsMarkingGray(JSTracer *trc);
+#endif
+
 /*
  * JS_IsAboutToBeFinalized checks if the given object is going to be finalized
  * at the end of the current GC. When called outside of the context of a GC,

From 6188191d877f5135730818fdd6e82787a00daa97 Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Wed, 4 Sep 2013 14:06:54 -0700
Subject: [PATCH 25/86] Bug 899367 - Explicitly trace outer windows, rather
 than doing it via JSContext iteration. r=mccr8

---
 dom/base/nsJSEnvironment.cpp           | 15 +++++++++++++++
 dom/base/nsJSEnvironment.h             | 11 +++++++++++
 js/xpconnect/src/XPCJSRuntime.cpp      |  4 ++++
 xpcom/base/CycleCollectedJSRuntime.cpp | 22 ----------------------
 xpcom/base/CycleCollectedJSRuntime.h   |  3 ---
 5 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/dom/base/nsJSEnvironment.cpp b/dom/base/nsJSEnvironment.cpp
index ab87ddd64aac..659a71c5d040 100644
--- a/dom/base/nsJSEnvironment.cpp
+++ b/dom/base/nsJSEnvironment.cpp
@@ -2940,6 +2940,21 @@ mozilla::dom::ShutdownJSEnvironment()
   sDidShutdown = true;
 }
 
+void
+mozilla::dom::TraceOuterWindows(JSTracer* aTracer)
+{
+  MOZ_ASSERT_IF(JS_IsGCMarkingTracer(aTracer), JS_IsMarkingGray(aTracer));
+  for (nsJSContext* cx = sContextList; cx; cx = cx->mNext) {
+    JSObject* outer;
+    if (cx->mContext &&
+        (outer = js::DefaultObjectForContextOrNull(cx->mContext)))
+    {
+      JS::AssertGCThingMustBeTenured(outer);
+      JS_CallObjectTracer(aTracer, &outer, "Outer Window");
+    }
+  }
+}
+
 // A fast-array class for JS.  This class supports both nsIJSScriptArray and
 // nsIArray.  If it is JS itself providing and consuming this class, all work
 // can be done via nsIJSScriptArray, and avoid the conversion of elements
diff --git a/dom/base/nsJSEnvironment.h b/dom/base/nsJSEnvironment.h
index 20aaf87cc28f..6c46f981c452 100644
--- a/dom/base/nsJSEnvironment.h
+++ b/dom/base/nsJSEnvironment.h
@@ -29,6 +29,14 @@ template <class> class Maybe;
 // a page) and doing the actual GC.
 #define NS_GC_DELAY                 4000 // ms
 
+namespace mozilla {
+namespace dom {
+
+void TraceOuterWindows(JSTracer *aTracer);
+
+} /* namespace dom */
+} /* namespace mozilla */
+
 class nsJSContext : public nsIScriptContext
 {
 public:
@@ -172,6 +180,9 @@ private:
   nsJSContext *mNext;
   nsJSContext **mPrev;
 
+  /* This function needs access to the linked list members above. */
+  friend void mozilla::dom::TraceOuterWindows(JSTracer *aTracer);
+
   // mGlobalObjectRef ensures that the outer window stays alive as long as the
   // context does. It is eventually collected by the cycle collector.
   nsCOMPtr<nsIScriptGlobalObject> mGlobalObjectRef;
diff --git a/js/xpconnect/src/XPCJSRuntime.cpp b/js/xpconnect/src/XPCJSRuntime.cpp
index 02c3a6cd93bc..e1a70a460b2f 100644
--- a/js/xpconnect/src/XPCJSRuntime.cpp
+++ b/js/xpconnect/src/XPCJSRuntime.cpp
@@ -496,6 +496,10 @@ void XPCJSRuntime::TraceAdditionalNativeGrayRoots(JSTracer *trc)
 {
     XPCAutoLock lock(mMapLock);
 
+    // Trace outer windows, which are the default compartment objects for DOM
+    // JSContexts.
+    dom::TraceOuterWindows(trc);
+
     XPCWrappedNativeScope::TraceWrappedNativesInAllScopes(trc, this);
 
     for (XPCRootSetElem *e = mVariantRoots; e ; e = e->GetNextRoot())
diff --git a/xpcom/base/CycleCollectedJSRuntime.cpp b/xpcom/base/CycleCollectedJSRuntime.cpp
index 219f50e9bcce..afb13e44c632 100644
--- a/xpcom/base/CycleCollectedJSRuntime.cpp
+++ b/xpcom/base/CycleCollectedJSRuntime.cpp
@@ -538,26 +538,6 @@ CycleCollectedJSRuntime::UnmarkSkippableJSHolders()
   mJSHolders.Enumerate(UnmarkJSHolder, nullptr);
 }
 
-void
-CycleCollectedJSRuntime::MaybeTraceGlobals(JSTracer* aTracer) const
-{
-  JSContext* iter = nullptr;
-  while (JSContext* acx = JS_ContextIterator(Runtime(), &iter)) {
-    // DOM JSContexts are the only JSContexts that cycle-collect their default
-    // compartment object, so they're the only ones that we need to do the
-    // JSOPTION_UNROOTED_GLOBAL dance for. The other ones are just marked black.
-    MOZ_ASSERT(js::HasUnrootedGlobal(acx) == !!GetScriptContextFromJSContext(acx));
-    if (!js::HasUnrootedGlobal(acx)) {
-      continue;
-    }
-
-    if (JSObject* global = js::DefaultObjectForContextOrNull(acx)) {
-      JS::AssertGCThingMustBeTenured(global);
-      JS_CallObjectTracer(aTracer, &global, "Global Object");
-    }
-  }
-}
-
 void
 CycleCollectedJSRuntime::DescribeGCThing(bool aIsMarked, void* aThing,
                                          JSGCTraceKind aTraceKind,
@@ -840,8 +820,6 @@ TraceJSHolder(void* aHolder, nsScriptObjectTracer*& aTracer, void* aArg)
 void
 CycleCollectedJSRuntime::TraceNativeGrayRoots(JSTracer* aTracer)
 {
-  MaybeTraceGlobals(aTracer);
-
   // NB: This is here just to preserve the existing XPConnect order. I doubt it
   // would hurt to do this after the JS holders.
   TraceAdditionalNativeGrayRoots(aTracer);
diff --git a/xpcom/base/CycleCollectedJSRuntime.h b/xpcom/base/CycleCollectedJSRuntime.h
index d317e0efb4b3..339fc432dc0c 100644
--- a/xpcom/base/CycleCollectedJSRuntime.h
+++ b/xpcom/base/CycleCollectedJSRuntime.h
@@ -146,9 +146,6 @@ private:
 
   void TraverseNativeRoots(nsCycleCollectionNoteRootCallback& aCb);
 
-  void MaybeTraceGlobals(JSTracer* aTracer) const;
-
-
   static void TraceBlackJS(JSTracer* aTracer, void* aData);
   static void TraceGrayJS(JSTracer* aTracer, void* aData);
   static void GCCallback(JSRuntime* aRuntime, JSGCStatus aStatus, void* aData);

From d4eab5f3afb61955ed2d13be9e8e1a37e70c382f Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Wed, 4 Sep 2013 14:06:54 -0700
Subject: [PATCH 26/86] Bug 899367 - Explicitly traverse outer windows, rather
 than doing it via JSContext iteration. r=mccr8

Note that this machinery will go away in further patches. But we want to be
deliberate about each of these steps.
---
 dom/base/nsJSEnvironment.cpp           | 17 +++++++++++++++++
 dom/base/nsJSEnvironment.h             |  3 +++
 js/xpconnect/src/XPCJSRuntime.cpp      |  4 ++++
 xpcom/base/CycleCollectedJSRuntime.cpp | 23 -----------------------
 xpcom/base/CycleCollectedJSRuntime.h   |  2 --
 5 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/dom/base/nsJSEnvironment.cpp b/dom/base/nsJSEnvironment.cpp
index 659a71c5d040..5fb6d9418b98 100644
--- a/dom/base/nsJSEnvironment.cpp
+++ b/dom/base/nsJSEnvironment.cpp
@@ -79,7 +79,9 @@
 #include "mozilla/dom/BindingUtils.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/dom/CanvasRenderingContext2DBinding.h"
+#include "mozilla/CycleCollectedJSRuntime.h"
 
+#include "nsCycleCollectionNoteRootCallback.h"
 #include "GeckoProfiler.h"
 
 using namespace mozilla;
@@ -2955,6 +2957,21 @@ mozilla::dom::TraceOuterWindows(JSTracer* aTracer)
   }
 }
 
+void
+mozilla::dom::TraverseOuterWindows(nsCycleCollectionNoteRootCallback& aCb)
+{
+  nsCycleCollectionParticipant* participant = mozilla::CycleCollectedJSRuntime::JSContextParticipant();
+  for (nsJSContext* cx = sContextList; cx; cx = cx->mNext) {
+    JSObject* outer;
+    if (cx->mContext &&
+        (outer = js::DefaultObjectForContextOrNull(cx->mContext)) &&
+        xpc_IsGrayGCThing(outer))
+    {
+      aCb.NoteNativeRoot(cx->mContext, participant);
+    }
+  }
+}
+
 // A fast-array class for JS.  This class supports both nsIJSScriptArray and
 // nsIArray.  If it is JS itself providing and consuming this class, all work
 // can be done via nsIJSScriptArray, and avoid the conversion of elements
diff --git a/dom/base/nsJSEnvironment.h b/dom/base/nsJSEnvironment.h
index 6c46f981c452..b200347a522f 100644
--- a/dom/base/nsJSEnvironment.h
+++ b/dom/base/nsJSEnvironment.h
@@ -20,6 +20,7 @@ class nsICycleCollectorListener;
 class nsIXPConnectJSObjectHolder;
 class nsRootedJSValueArray;
 class nsScriptNameSpaceManager;
+class nsCycleCollectionNoteRootCallback;
 
 namespace mozilla {
 template <class> class Maybe;
@@ -33,6 +34,7 @@ namespace mozilla {
 namespace dom {
 
 void TraceOuterWindows(JSTracer *aTracer);
+void TraverseOuterWindows(nsCycleCollectionNoteRootCallback& aCb);
 
 } /* namespace dom */
 } /* namespace mozilla */
@@ -182,6 +184,7 @@ private:
 
   /* This function needs access to the linked list members above. */
   friend void mozilla::dom::TraceOuterWindows(JSTracer *aTracer);
+  friend void mozilla::dom::TraverseOuterWindows(nsCycleCollectionNoteRootCallback& aCb);
 
   // mGlobalObjectRef ensures that the outer window stays alive as long as the
   // context does. It is eventually collected by the cycle collector.
diff --git a/js/xpconnect/src/XPCJSRuntime.cpp b/js/xpconnect/src/XPCJSRuntime.cpp
index e1a70a460b2f..736a379ae222 100644
--- a/js/xpconnect/src/XPCJSRuntime.cpp
+++ b/js/xpconnect/src/XPCJSRuntime.cpp
@@ -561,6 +561,10 @@ XPCJSRuntime::TraverseAdditionalNativeRoots(nsCycleCollectionNoteRootCallback &c
 {
     XPCAutoLock lock(mMapLock);
 
+    // Traverse outer windows, which are the default compartment objects for DOM
+    // JSContexts.
+    dom::TraverseOuterWindows(cb);
+
     XPCWrappedNativeScope::SuspectAllWrappers(this, cb);
 
     for (XPCRootSetElem *e = mVariantRoots; e ; e = e->GetNextRoot()) {
diff --git a/xpcom/base/CycleCollectedJSRuntime.cpp b/xpcom/base/CycleCollectedJSRuntime.cpp
index afb13e44c632..5a46af9ca63f 100644
--- a/xpcom/base/CycleCollectedJSRuntime.cpp
+++ b/xpcom/base/CycleCollectedJSRuntime.cpp
@@ -715,32 +715,9 @@ CycleCollectedJSRuntime::TraverseObjectShim(void* aData, void* aThing)
                                  JSTRACE_OBJECT, closure->cb);
 }
 
-// For all JS objects that are held by native objects but aren't held
-// through rooting or locking, we need to add all the native objects that
-// hold them so that the JS objects are colored correctly in the cycle
-// collector. This includes JSContexts that don't have outstanding requests,
-// because their global object wasn't marked by the JS GC. All other JS
-// roots were marked by the JS GC and will be colored correctly in the cycle
-// collector.
-void
-CycleCollectedJSRuntime::MaybeTraverseGlobals(nsCycleCollectionNoteRootCallback& aCb) const
-{
-  JSContext *iter = nullptr, *acx;
-  while ((acx = JS_ContextIterator(Runtime(), &iter))) {
-    // Add the context to the CC graph only if traversing it would
-    // end up doing something.
-    JSObject* global = js::DefaultObjectForContextOrNull(acx);
-    if (global && xpc_IsGrayGCThing(global)) {
-      aCb.NoteNativeRoot(acx, JSContextParticipant());
-    }
-  }
-}
-
 void
 CycleCollectedJSRuntime::TraverseNativeRoots(nsCycleCollectionNoteRootCallback& aCb)
 {
-  MaybeTraverseGlobals(aCb);
-
   // NB: This is here just to preserve the existing XPConnect order. I doubt it
   // would hurt to do this after the JS holders.
   TraverseAdditionalNativeRoots(aCb);
diff --git a/xpcom/base/CycleCollectedJSRuntime.h b/xpcom/base/CycleCollectedJSRuntime.h
index 339fc432dc0c..fe3ad22b878f 100644
--- a/xpcom/base/CycleCollectedJSRuntime.h
+++ b/xpcom/base/CycleCollectedJSRuntime.h
@@ -142,8 +142,6 @@ private:
   static void
   TraverseObjectShim(void* aData, void* aThing);
 
-  void MaybeTraverseGlobals(nsCycleCollectionNoteRootCallback& aCb) const;
-
   void TraverseNativeRoots(nsCycleCollectionNoteRootCallback& aCb);
 
   static void TraceBlackJS(JSTracer* aTracer, void* aData);

From a699320c1da255c265a51f89b68eb42408a7a37a Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Wed, 4 Sep 2013 14:06:55 -0700
Subject: [PATCH 27/86] Bug 899367 - Add an API to opt out of default
 compartment objects. r=luke

We need this explicit API because otherwise the default compartment object will
get set implicitly during the first call to InitClasses.
---
 js/src/jsapi.h            |  6 +++++-
 js/src/jscntxt.h          |  5 ++++-
 js/src/jscntxtinlines.h   |  6 +++++-
 js/src/vm/SelfHosting.cpp | 12 +++++++++---
 4 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/js/src/jsapi.h b/js/src/jsapi.h
index d3229ed00f4c..ba2bdf71cb71 100644
--- a/js/src/jsapi.h
+++ b/js/src/jsapi.h
@@ -1526,7 +1526,11 @@ JS_StringToVersion(const char *string);
 
 /* JS_BIT(10) is currently unused. */
 
-/* JS_BIT(11) is currently unused. */
+#define JSOPTION_NO_DEFAULT_COMPARTMENT_OBJECT JS_BIT(11)     /* This JSContext does not use a
+                                                                 default compartment object. Such
+                                                                 an object will not be set implicitly,
+                                                                 and attempts to get or set it will
+                                                                 assert. */
 
 #define JSOPTION_NO_SCRIPT_RVAL JS_BIT(12)      /* A promise to the compiler
                                                    that a null rval out-param
diff --git a/js/src/jscntxt.h b/js/src/jscntxt.h
index 9344245a6d76..9ef434396d9b 100644
--- a/js/src/jscntxt.h
+++ b/js/src/jscntxt.h
@@ -449,7 +449,10 @@ struct JSContext : public js::ExclusiveContext,
   public:
     inline void setDefaultCompartmentObject(JSObject *obj);
     inline void setDefaultCompartmentObjectIfUnset(JSObject *obj);
-    JSObject *maybeDefaultCompartmentObject() const { return defaultCompartmentObject_; }
+    JSObject *maybeDefaultCompartmentObject() const {
+        JS_ASSERT(!hasOption(JSOPTION_NO_DEFAULT_COMPARTMENT_OBJECT));
+        return defaultCompartmentObject_;
+    }
 
     /* Wrap cx->exception for the current compartment. */
     void wrapPendingException();
diff --git a/js/src/jscntxtinlines.h b/js/src/jscntxtinlines.h
index c1c6cc3c97ea..466cb1b4cfca 100644
--- a/js/src/jscntxtinlines.h
+++ b/js/src/jscntxtinlines.h
@@ -438,14 +438,18 @@ JSContext::setPendingException(js::Value v) {
 inline void
 JSContext::setDefaultCompartmentObject(JSObject *obj)
 {
+    JS_ASSERT(!hasOption(JSOPTION_NO_DEFAULT_COMPARTMENT_OBJECT));
     defaultCompartmentObject_ = obj;
 }
 
 inline void
 JSContext::setDefaultCompartmentObjectIfUnset(JSObject *obj)
 {
-    if (!defaultCompartmentObject_)
+    if (!hasOption(JSOPTION_NO_DEFAULT_COMPARTMENT_OBJECT) &&
+        !defaultCompartmentObject_)
+    {
         setDefaultCompartmentObject(obj);
+    }
 }
 
 inline void
diff --git a/js/src/vm/SelfHosting.cpp b/js/src/vm/SelfHosting.cpp
index a8590b2c9ad6..2a6471fb1cda 100644
--- a/js/src/vm/SelfHosting.cpp
+++ b/js/src/vm/SelfHosting.cpp
@@ -682,12 +682,17 @@ bool
 JSRuntime::initSelfHosting(JSContext *cx)
 {
     JS_ASSERT(!selfHostingGlobal_);
-    RootedObject savedGlobal(cx, js::DefaultObjectForContextOrNull(cx));
+
+    bool receivesDefaultObject = !cx->hasOption(JSOPTION_NO_DEFAULT_COMPARTMENT_OBJECT);
+    RootedObject savedGlobal(cx, receivesDefaultObject
+                                 ? js::DefaultObjectForContextOrNull(cx)
+                                 : NULL);
     if (!(selfHostingGlobal_ = JS_NewGlobalObject(cx, &self_hosting_global_class,
                                                   NULL, JS::DontFireOnNewGlobalHook)))
         return false;
     JSAutoCompartment ac(cx, selfHostingGlobal_);
-    js::SetDefaultObjectForContext(cx, selfHostingGlobal_);
+    if (receivesDefaultObject)
+        js::SetDefaultObjectForContext(cx, selfHostingGlobal_);
     Rooted<GlobalObject*> shg(cx, &selfHostingGlobal_->as<GlobalObject>());
     /*
      * During initialization of standard classes for the self-hosting global,
@@ -756,7 +761,8 @@ JSRuntime::initSelfHosting(JSContext *cx)
         ok = Evaluate(cx, shg, options, src, srcLen, &rv);
     }
     JS_SetErrorReporter(cx, oldReporter);
-    js::SetDefaultObjectForContext(cx, savedGlobal);
+    if (receivesDefaultObject)
+        js::SetDefaultObjectForContext(cx, savedGlobal);
     return ok;
 }
 

From 921c772767e704eeba3eed69c4c84725a3b8b3c1 Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Wed, 4 Sep 2013 14:06:55 -0700
Subject: [PATCH 28/86] Bug 899367 - Stop depending on the default compartment
 object for DOM JSContexts. r=mccr8

---
 dom/base/nsDOMJSUtils.h                |  2 ++
 dom/base/nsJSUtils.cpp                 | 23 ++++++++++++++++++++++-
 js/jsd/jsd_xpc.cpp                     |  3 ++-
 js/xpconnect/src/XPCJSContextStack.cpp |  8 ++++++--
 js/xpconnect/src/nsCxPusher.cpp        |  8 ++++++--
 5 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/dom/base/nsDOMJSUtils.h b/dom/base/nsDOMJSUtils.h
index 1d0a62207442..bac8aff65983 100644
--- a/dom/base/nsDOMJSUtils.h
+++ b/dom/base/nsDOMJSUtils.h
@@ -28,6 +28,8 @@ GetScriptContextFromJSContext(JSContext *cx)
   return scx;
 }
 
+JSObject* GetDefaultScopeFromJSContext(JSContext *cx);
+
 // A factory function for turning a JS::Value argv into an nsIArray
 // but also supports an effecient way of extracting the original argv.
 // Bug 312003 describes why this must be "void *", but argv will be cast to
diff --git a/dom/base/nsJSUtils.cpp b/dom/base/nsJSUtils.cpp
index 872b30e82c1c..985b8505471b 100644
--- a/dom/base/nsJSUtils.cpp
+++ b/dom/base/nsJSUtils.cpp
@@ -14,6 +14,7 @@
 #include "nsJSUtils.h"
 #include "jsapi.h"
 #include "js/OldDebugAPI.h"
+#include "jsfriendapi.h"
 #include "nsIScriptContext.h"
 #include "nsIScriptGlobalObject.h"
 #include "nsIXPConnect.h"
@@ -140,7 +141,11 @@ nsJSUtils::ReportPendingException(JSContext *aContext)
   if (JS_IsExceptionPending(aContext)) {
     bool saved = JS_SaveFrameChain(aContext);
     {
-      JSAutoCompartment ac(aContext, js::DefaultObjectForContextOrNull(aContext));
+      nsIScriptContext* scx = GetScriptContextFromJSContext(aContext);
+      JS::Rooted<JSObject*> scope(aContext);
+      scope = scx ? scx->GetNativeGlobal()
+                  : js::DefaultObjectForContextOrNull(aContext);
+      JSAutoCompartment ac(aContext, scope);
       JS_ReportPendingException(aContext);
     }
     if (saved) {
@@ -287,3 +292,19 @@ nsJSUtils::EvaluateString(JSContext* aCx,
     return NS_ERROR_OUT_OF_MEMORY;
   return rv;
 }
+
+//
+// nsDOMJSUtils.h
+//
+
+JSObject* GetDefaultScopeFromJSContext(JSContext *cx)
+{
+  // DOM JSContexts don't store their default compartment object on
+  // the cx, so in those cases we need to fetch it via the scx
+  // instead.
+  nsIScriptContext *scx = GetScriptContextFromJSContext(cx);
+  if (scx) {
+    return scx->GetNativeGlobal();
+  }
+  return js::DefaultObjectForContextOrNull(cx);
+}
diff --git a/js/jsd/jsd_xpc.cpp b/js/jsd/jsd_xpc.cpp
index 3175fba345ab..a480882659f6 100644
--- a/js/jsd/jsd_xpc.cpp
+++ b/js/jsd/jsd_xpc.cpp
@@ -30,6 +30,7 @@
 
 /* XXX DOM dependency */
 #include "nsIScriptContext.h"
+#include "nsDOMJSUtils.h"
 #include "SandboxPrivate.h"
 #include "nsJSPrincipals.h"
 #include "nsContentUtils.h"
@@ -1696,7 +1697,7 @@ NS_IMETHODIMP
 jsdContext::GetGlobalObject (jsdIValue **_rval)
 {
     ASSERT_VALID_EPHEMERAL;
-    JSObject *glob = js::DefaultObjectForContextOrNull(mJSCx);
+    JSObject *glob = GetDefaultScopeFromJSContext(mJSCx);
     JSDValue *jsdv = JSD_NewValue (mJSDCx, OBJECT_TO_JSVAL(glob));
     if (!jsdv)
         return NS_ERROR_FAILURE;
diff --git a/js/xpconnect/src/XPCJSContextStack.cpp b/js/xpconnect/src/XPCJSContextStack.cpp
index f5b987d6b2af..798938b1709f 100644
--- a/js/xpconnect/src/XPCJSContextStack.cpp
+++ b/js/xpconnect/src/XPCJSContextStack.cpp
@@ -70,10 +70,14 @@ XPCJSContextStack::Push(JSContext *cx)
         // compartment that's same-origin with the current one, we can skip it.
         nsIScriptSecurityManager* ssm = XPCWrapper::GetSecurityManager();
         if ((e.cx == cx) && ssm) {
-            RootedObject defaultGlobal(cx, js::DefaultObjectForContextOrNull(cx));
+            // DOM JSContexts don't store their default compartment object on
+            // the cx, so in those cases we need to fetch it via the scx
+            // instead.
+            RootedObject defaultScope(cx, GetDefaultScopeFromJSContext(cx));
+
             nsIPrincipal *currentPrincipal =
               GetCompartmentPrincipal(js::GetContextCompartment(cx));
-            nsIPrincipal *defaultPrincipal = GetObjectPrincipal(defaultGlobal);
+            nsIPrincipal *defaultPrincipal = GetObjectPrincipal(defaultScope);
             bool equal = false;
             currentPrincipal->Equals(defaultPrincipal, &equal);
             if (equal) {
diff --git a/js/xpconnect/src/nsCxPusher.cpp b/js/xpconnect/src/nsCxPusher.cpp
index 260fe671b538..b35082691d1a 100644
--- a/js/xpconnect/src/nsCxPusher.cpp
+++ b/js/xpconnect/src/nsCxPusher.cpp
@@ -129,8 +129,12 @@ AutoCxPusher::AutoCxPusher(JSContext* cx, bool allowNull)
   // old XPCAutoRequest as well.
   if (cx) {
     mAutoRequest.construct(cx);
-    if (js::DefaultObjectForContextOrNull(cx))
-      mAutoCompartment.construct(cx, js::DefaultObjectForContextOrNull(cx));
+
+    // DOM JSContexts don't store their default compartment object on the cx.
+    JSObject *compartmentObject = mScx ? mScx->GetNativeGlobal()
+                                       : js::DefaultObjectForContextOrNull(cx);
+    if (compartmentObject)
+      mAutoCompartment.construct(cx, compartmentObject);
     xpc_UnmarkGrayContext(cx);
   }
 }

From c8fbffcb9d6e91b49e60abab7e929fa4b0588e2f Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Wed, 4 Sep 2013 14:06:55 -0700
Subject: [PATCH 29/86] Bug 899367 - Have nsGlobalWindow go through nsJSContext
 to access the outer. r=mccr8

---
 dom/base/nsGlobalWindow.cpp            | 11 ++++-------
 dom/base/nsIScriptContext.h            | 11 +++++++++--
 dom/base/nsJSEnvironment.cpp           | 20 +++++++++++++++++++-
 dom/base/nsJSEnvironment.h             |  4 ++++
 xpcom/base/CycleCollectedJSRuntime.cpp |  2 +-
 5 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index 630067d10e4c..e808f92e7901 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -2049,8 +2049,9 @@ nsGlobalWindow::SetOuterObject(JSContext* aCx, JS::Handle<JSObject*> aOuterObjec
 {
   JSAutoCompartment ac(aCx, aOuterObject);
 
-  // Indicate the default compartment object associated with this cx.
-  js::SetDefaultObjectForContext(aCx, aOuterObject);
+  // Inform the nsJSContext, which is the canonical holder of the outer.
+  MOZ_ASSERT(IsOuterWindow());
+  mContext->SetWindowProxy(aOuterObject);
 
   // Set up the prototype for the outer object.
   JS::Rooted<JSObject*> inner(aCx, JS_GetParent(aOuterObject));
@@ -2446,11 +2447,7 @@ nsGlobalWindow::SetNewDocument(nsIDocument* aDocument,
         newInnerWindow->FastGetGlobalJSObject());
 #endif
 
-    // Now that we're connecting the outer global to the inner one,
-    // we must have transplanted it. The JS engine tries to maintain
-    // the global object's compartment as its default compartment,
-    // so update that now since it might have changed.
-    js::SetDefaultObjectForContext(cx, mJSObject);
+    MOZ_ASSERT(mContext->GetWindowProxy() == mJSObject);
 #ifdef DEBUG
     JS::Rooted<JSObject*> rootedJSObject(cx, mJSObject);
     JS::Rooted<JSObject*> proto1(cx), proto2(cx);
diff --git a/dom/base/nsIScriptContext.h b/dom/base/nsIScriptContext.h
index 5c72e4781526..8d09d52f735a 100644
--- a/dom/base/nsIScriptContext.h
+++ b/dom/base/nsIScriptContext.h
@@ -27,8 +27,8 @@ class nsIDOMWindow;
 class nsIURI;
 
 #define NS_ISCRIPTCONTEXT_IID \
-{ 0x1d931a17, 0x453a, 0x47fb, \
-  { 0x94, 0x66, 0x2d, 0x3e, 0xd1, 0xef, 0x7a, 0xc5 } }
+{ 0x03c0874e, 0xcb49, 0x41c8, \
+  { 0xa3, 0x0b, 0xef, 0x3e, 0xc1, 0x88, 0xb1, 0x1f } }
 
 /* This MUST match JSVERSION_DEFAULT.  This version stuff if we don't
    know what language we have is a little silly... */
@@ -165,6 +165,13 @@ public:
    * Tell the context we're done reinitializing it.
    */
   virtual void DidInitializeContext() = 0;
+
+  /**
+   * Access the Window Proxy. The setter should only be called by nsGlobalWindow.
+   */
+  virtual void SetWindowProxy(JS::Handle<JSObject*> aWindowProxy) = 0;
+  virtual JSObject* GetWindowProxy() = 0;
+  virtual JSObject* GetWindowProxyPreserveColor() = 0;
 };
 
 NS_DEFINE_STATIC_IID_ACCESSOR(nsIScriptContext, NS_ISCRIPTCONTEXT_IID)
diff --git a/dom/base/nsJSEnvironment.cpp b/dom/base/nsJSEnvironment.cpp
index 5fb6d9418b98..9c1bd22d1e52 100644
--- a/dom/base/nsJSEnvironment.cpp
+++ b/dom/base/nsJSEnvironment.cpp
@@ -1152,7 +1152,7 @@ nsJSContext::GetGlobalObject()
 JSObject*
 nsJSContext::GetNativeGlobal()
 {
-    return js::DefaultObjectForContextOrNull(mContext);
+    return GetWindowProxy();
 }
 
 JSContext*
@@ -2598,6 +2598,24 @@ nsJSContext::ReportPendingException()
   }
 }
 
+void
+nsJSContext::SetWindowProxy(JS::Handle<JSObject*> aWindowProxy)
+{
+  js::SetDefaultObjectForContext(mContext, aWindowProxy);
+}
+
+JSObject*
+nsJSContext::GetWindowProxy()
+{
+  return xpc_UnmarkGrayObject(GetWindowProxyPreserveColor());
+}
+
+JSObject*
+nsJSContext::GetWindowProxyPreserveColor()
+{
+  return js::DefaultObjectForContextOrNull(mContext);
+}
+
 void
 nsJSContext::LikelyShortLivingObjectCreated()
 {
diff --git a/dom/base/nsJSEnvironment.h b/dom/base/nsJSEnvironment.h
index b200347a522f..cf23ecf0bfcb 100644
--- a/dom/base/nsJSEnvironment.h
+++ b/dom/base/nsJSEnvironment.h
@@ -81,6 +81,10 @@ public:
   virtual void WillInitializeContext() MOZ_OVERRIDE;
   virtual void DidInitializeContext() MOZ_OVERRIDE;
 
+  virtual void SetWindowProxy(JS::Handle<JSObject*> aWindowProxy) MOZ_OVERRIDE;
+  virtual JSObject* GetWindowProxy() MOZ_OVERRIDE;
+  virtual JSObject* GetWindowProxyPreserveColor() MOZ_OVERRIDE;
+
   static void LoadStart();
   static void LoadEnd();
 
diff --git a/xpcom/base/CycleCollectedJSRuntime.cpp b/xpcom/base/CycleCollectedJSRuntime.cpp
index 5a46af9ca63f..b2fda0236169 100644
--- a/xpcom/base/CycleCollectedJSRuntime.cpp
+++ b/xpcom/base/CycleCollectedJSRuntime.cpp
@@ -932,7 +932,7 @@ CycleCollectedJSRuntime::UsefulToMergeZones() const
     // NativeGlobal() is not an outer window (this happens with XUL Prototype
     // compilation scopes, for example, which we're not interested in).
     nsIScriptContext* scx = GetScriptContextFromJSContext(cx);
-    JS::RootedObject global(cx, scx ? scx->GetNativeGlobal() : nullptr);
+    JS::RootedObject global(cx, scx ? scx->GetWindowProxyPreserveColor() : nullptr);
     if (!global || !js::GetObjectParent(global)) {
       continue;
     }

From 44f0d562b57c8ae646347b52a4c67aa7b1ae3ce5 Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Wed, 4 Sep 2013 14:06:56 -0700
Subject: [PATCH 30/86] Bug 899367 - Stop storing the window proxy on the
 JSContext. r=mccr8

We need to simultaneously report the new Heap Pointer to the cycle collector,
and remove the old machinery for cycle-collecting the default object via the
JSContext.
---
 dom/base/nsJSEnvironment.cpp           | 50 ++++++--------------------
 dom/base/nsJSEnvironment.h             | 15 ++------
 js/xpconnect/idl/nsIXPConnect.idl      | 17 +--------
 js/xpconnect/src/XPCJSRuntime.cpp      |  8 -----
 js/xpconnect/src/nsXPConnect.cpp       |  8 -----
 js/xpconnect/src/xpcpublic.h           |  7 +++-
 xpcom/base/CycleCollectedJSRuntime.cpp | 48 -------------------------
 xpcom/base/CycleCollectedJSRuntime.h   |  3 --
 8 files changed, 19 insertions(+), 137 deletions(-)

diff --git a/dom/base/nsJSEnvironment.cpp b/dom/base/nsJSEnvironment.cpp
index 9c1bd22d1e52..9e358f2f4ed3 100644
--- a/dom/base/nsJSEnvironment.cpp
+++ b/dom/base/nsJSEnvironment.cpp
@@ -839,7 +839,8 @@ nsJSContext::JSOptionChangedCallback(const char *pref, void *data)
 
 nsJSContext::nsJSContext(bool aGCOnDestruction,
                          nsIScriptGlobalObject* aGlobalObject)
-  : mGCOnDestruction(aGCOnDestruction)
+  : mWindowProxy(nullptr)
+  , mGCOnDestruction(aGCOnDestruction)
   , mGlobalObjectRef(aGlobalObject)
 {
   EnsureStatics();
@@ -854,7 +855,7 @@ nsJSContext::nsJSContext(bool aGCOnDestruction,
   ++sContextCount;
 
   mDefaultJSOptions = JSOPTION_PRIVATE_IS_NSISUPPORTS |
-                      JSOPTION_UNROOTED_GLOBAL;
+                      JSOPTION_NO_DEFAULT_COMPARTMENT_OBJECT;
 
   mContext = ::JS_NewContext(sRuntime, gStackSize);
   if (mContext) {
@@ -873,6 +874,7 @@ nsJSContext::nsJSContext(bool aGCOnDestruction,
   mIsInitialized = false;
   mScriptsEnabled = true;
   mProcessingScriptTag = false;
+  NS_HOLD_JS_OBJECTS(this, nsJSContext);
 }
 
 nsJSContext::~nsJSContext()
@@ -923,12 +925,14 @@ nsJSContext::DestroyJSContext()
 
   JS_DestroyContextNoGC(mContext);
   mContext = nullptr;
+  NS_DROP_JS_OBJECTS(this, nsJSContext);
 }
 
 // QueryInterface implementation for nsJSContext
 NS_IMPL_CYCLE_COLLECTION_CLASS(nsJSContext)
 
 NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN(nsJSContext)
+  NS_IMPL_CYCLE_COLLECTION_TRACE_JS_MEMBER_CALLBACK(mWindowProxy)
 NS_IMPL_CYCLE_COLLECTION_TRACE_END
 
 NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsJSContext)
@@ -936,18 +940,14 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsJSContext)
                "Trying to unlink a context with outstanding requests.");
   tmp->mIsInitialized = false;
   tmp->mGCOnDestruction = false;
-  if (tmp->mContext) {
-    JSAutoRequest ar(tmp->mContext);
-    js::SetDefaultObjectForContext(tmp->mContext, nullptr);
-  }
+  tmp->mWindowProxy = nullptr;
   tmp->DestroyJSContext();
   NS_IMPL_CYCLE_COLLECTION_UNLINK(mGlobalObjectRef)
 NS_IMPL_CYCLE_COLLECTION_UNLINK_END
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INTERNAL(nsJSContext)
   NS_IMPL_CYCLE_COLLECTION_DESCRIBE(nsJSContext, tmp->GetCCRefcnt())
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mGlobalObjectRef)
-  NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(cb, "mContext");
-  nsContentUtils::XPConnect()->NoteJSContext(tmp->mContext, cb);
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_SCRIPT_OBJECTS
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsJSContext)
@@ -2601,7 +2601,7 @@ nsJSContext::ReportPendingException()
 void
 nsJSContext::SetWindowProxy(JS::Handle<JSObject*> aWindowProxy)
 {
-  js::SetDefaultObjectForContext(mContext, aWindowProxy);
+  mWindowProxy = aWindowProxy;
 }
 
 JSObject*
@@ -2613,7 +2613,7 @@ nsJSContext::GetWindowProxy()
 JSObject*
 nsJSContext::GetWindowProxyPreserveColor()
 {
-  return js::DefaultObjectForContextOrNull(mContext);
+  return mWindowProxy;
 }
 
 void
@@ -2960,36 +2960,6 @@ mozilla::dom::ShutdownJSEnvironment()
   sDidShutdown = true;
 }
 
-void
-mozilla::dom::TraceOuterWindows(JSTracer* aTracer)
-{
-  MOZ_ASSERT_IF(JS_IsGCMarkingTracer(aTracer), JS_IsMarkingGray(aTracer));
-  for (nsJSContext* cx = sContextList; cx; cx = cx->mNext) {
-    JSObject* outer;
-    if (cx->mContext &&
-        (outer = js::DefaultObjectForContextOrNull(cx->mContext)))
-    {
-      JS::AssertGCThingMustBeTenured(outer);
-      JS_CallObjectTracer(aTracer, &outer, "Outer Window");
-    }
-  }
-}
-
-void
-mozilla::dom::TraverseOuterWindows(nsCycleCollectionNoteRootCallback& aCb)
-{
-  nsCycleCollectionParticipant* participant = mozilla::CycleCollectedJSRuntime::JSContextParticipant();
-  for (nsJSContext* cx = sContextList; cx; cx = cx->mNext) {
-    JSObject* outer;
-    if (cx->mContext &&
-        (outer = js::DefaultObjectForContextOrNull(cx->mContext)) &&
-        xpc_IsGrayGCThing(outer))
-    {
-      aCb.NoteNativeRoot(cx->mContext, participant);
-    }
-  }
-}
-
 // A fast-array class for JS.  This class supports both nsIJSScriptArray and
 // nsIArray.  If it is JS itself providing and consuming this class, all work
 // can be done via nsIJSScriptArray, and avoid the conversion of elements
diff --git a/dom/base/nsJSEnvironment.h b/dom/base/nsJSEnvironment.h
index cf23ecf0bfcb..7ce497d12b19 100644
--- a/dom/base/nsJSEnvironment.h
+++ b/dom/base/nsJSEnvironment.h
@@ -30,15 +30,6 @@ template <class> class Maybe;
 // a page) and doing the actual GC.
 #define NS_GC_DELAY                 4000 // ms
 
-namespace mozilla {
-namespace dom {
-
-void TraceOuterWindows(JSTracer *aTracer);
-void TraverseOuterWindows(nsCycleCollectionNoteRootCallback& aCb);
-
-} /* namespace dom */
-} /* namespace mozilla */
-
 class nsJSContext : public nsIScriptContext
 {
 public:
@@ -165,12 +156,14 @@ protected:
   // function will set aside the frame chain on mContext before
   // reporting.
   void ReportPendingException();
+
 private:
   void DestroyJSContext();
 
   nsrefcnt GetCCRefcnt();
 
   JSContext *mContext;
+  JS::Heap<JSObject*> mWindowProxy;
 
   bool mIsInitialized;
   bool mScriptsEnabled;
@@ -186,10 +179,6 @@ private:
   nsJSContext *mNext;
   nsJSContext **mPrev;
 
-  /* This function needs access to the linked list members above. */
-  friend void mozilla::dom::TraceOuterWindows(JSTracer *aTracer);
-  friend void mozilla::dom::TraverseOuterWindows(nsCycleCollectionNoteRootCallback& aCb);
-
   // mGlobalObjectRef ensures that the outer window stays alive as long as the
   // context does. It is eventually collected by the cycle collector.
   nsCOMPtr<nsIScriptGlobalObject> mGlobalObjectRef;
diff --git a/js/xpconnect/idl/nsIXPConnect.idl b/js/xpconnect/idl/nsIXPConnect.idl
index 85dd06151f36..e4b9d2502361 100644
--- a/js/xpconnect/idl/nsIXPConnect.idl
+++ b/js/xpconnect/idl/nsIXPConnect.idl
@@ -43,8 +43,6 @@ class nsWrapperCache;
       native JSEqualityOp(JSEqualityOp);
 [ptr] native JSScriptPtr(JSScript);
 [ptr] native voidPtrPtr(void*);
-[ptr] native nsScriptObjectTracerPtr(nsScriptObjectTracer);
-[ref] native nsCCTraversalCallbackRef(nsCycleCollectionTraversalCallback);
 [ptr] native nsAXPCNativeCallContextPtr(nsAXPCNativeCallContext);
 [ptr] native nsWrapperCachePtr(nsWrapperCache);
 [ref] native JSCompartmentOptions(JS::CompartmentOptions);
@@ -61,11 +59,6 @@ interface nsIInterfaceInfo;
 interface nsIXPCSecurityManager;
 interface nsIPrincipal;
 
-%{C++
-class nsCycleCollectionTraversalCallback;
-class nsScriptObjectTracer;
-%}
-
 /***************************************************************************/
 [uuid(909e8641-7c54-4dff-9b94-ba631f057b33)]
 interface nsIXPConnectJSObjectHolder : nsISupports
@@ -294,7 +287,7 @@ interface nsIXPCFunctionThisTranslator : nsISupports
     { 0xbd, 0xd6, 0x0, 0x0, 0x64, 0x65, 0x73, 0x74 } }
 %}
 
-[uuid(0ebc00f0-f3ad-11e2-b778-0800200c9a66)]
+[uuid(c4d0187c-6a78-4bdf-9cd9-d218644b715a)]
 interface nsIXPConnect : nsISupports
 {
 %{ C++
@@ -562,14 +555,6 @@ interface nsIXPConnect : nsISupports
                                          in JSObjectPtr sandbox,
                                          in boolean returnStringOnly);
 
-    /**
-     * Note aJSContext as a child to the cycle collector.
-     * @param aJSContext The JSContext to note.
-     * @param aCb The cycle collection traversal callback.
-     */
-    [noscript,notxpcom] void noteJSContext(in JSContextPtr aJSContext,
-                                           in nsCCTraversalCallbackRef aCb);
-
     /**
      * Whether or not XPConnect should report all JS exceptions when returning
      * from JS into C++. False by default, although any value set in the
diff --git a/js/xpconnect/src/XPCJSRuntime.cpp b/js/xpconnect/src/XPCJSRuntime.cpp
index 736a379ae222..02c3a6cd93bc 100644
--- a/js/xpconnect/src/XPCJSRuntime.cpp
+++ b/js/xpconnect/src/XPCJSRuntime.cpp
@@ -496,10 +496,6 @@ void XPCJSRuntime::TraceAdditionalNativeGrayRoots(JSTracer *trc)
 {
     XPCAutoLock lock(mMapLock);
 
-    // Trace outer windows, which are the default compartment objects for DOM
-    // JSContexts.
-    dom::TraceOuterWindows(trc);
-
     XPCWrappedNativeScope::TraceWrappedNativesInAllScopes(trc, this);
 
     for (XPCRootSetElem *e = mVariantRoots; e ; e = e->GetNextRoot())
@@ -561,10 +557,6 @@ XPCJSRuntime::TraverseAdditionalNativeRoots(nsCycleCollectionNoteRootCallback &c
 {
     XPCAutoLock lock(mMapLock);
 
-    // Traverse outer windows, which are the default compartment objects for DOM
-    // JSContexts.
-    dom::TraverseOuterWindows(cb);
-
     XPCWrappedNativeScope::SuspectAllWrappers(this, cb);
 
     for (XPCRootSetElem *e = mVariantRoots; e ; e = e->GetNextRoot()) {
diff --git a/js/xpconnect/src/nsXPConnect.cpp b/js/xpconnect/src/nsXPConnect.cpp
index 45796a8f5534..559c29bb933a 100644
--- a/js/xpconnect/src/nsXPConnect.cpp
+++ b/js/xpconnect/src/nsXPConnect.cpp
@@ -342,14 +342,6 @@ xpc_TryUnmarkWrappedGrayObject(nsISupports* aWrappedJS)
     }
 }
 
-NS_IMETHODIMP_(void)
-nsXPConnect::NoteJSContext(JSContext *aJSContext,
-                           nsCycleCollectionTraversalCallback &aCb)
-{
-    aCb.NoteNativeChild(aJSContext, mozilla::CycleCollectedJSRuntime::JSContextParticipant());
-}
-
-
 /***************************************************************************/
 /***************************************************************************/
 // nsIXPConnect interface methods...
diff --git a/js/xpconnect/src/xpcpublic.h b/js/xpconnect/src/xpcpublic.h
index ad9df47d6eb7..b36369032960 100644
--- a/js/xpconnect/src/xpcpublic.h
+++ b/js/xpconnect/src/xpcpublic.h
@@ -24,6 +24,7 @@
 #include "nsStringBuffer.h"
 #include "nsIGlobalObject.h"
 #include "mozilla/dom/BindingDeclarations.h"
+#include "nsDOMJSUtils.h"
 
 class nsIPrincipal;
 class nsIXPConnectWrappedJS;
@@ -166,7 +167,11 @@ xpc_UnmarkGrayScript(JSScript *script)
 inline JSContext *
 xpc_UnmarkGrayContext(JSContext *cx)
 {
-    if (cx) {
+    // There's no default compartment object for DOM JSContexts, so we have
+    // nothing to do in that case. In fact, this whole function is obsolete,
+    // because nothing else is ever gray. But for now let's be deliberate.
+    // We'll remove this thing in the next patch.
+    if (cx && !GetScriptContextFromJSContext(cx)) {
         JSObject *global = js::DefaultObjectForContextOrNull(cx);
         xpc_UnmarkGrayObject(global);
         if (global && JS_IsInRequest(JS_GetRuntime(cx))) {
diff --git a/xpcom/base/CycleCollectedJSRuntime.cpp b/xpcom/base/CycleCollectedJSRuntime.cpp
index b2fda0236169..35c721e2f6db 100644
--- a/xpcom/base/CycleCollectedJSRuntime.cpp
+++ b/xpcom/base/CycleCollectedJSRuntime.cpp
@@ -278,47 +278,6 @@ private:
   bool mAnyMarked;
 };
 
-class JSContextParticipant : public nsCycleCollectionParticipant
-{
-public:
-  NS_IMETHOD Root(void *n)
-  {
-    return NS_OK;
-  }
-  NS_IMETHOD Unlink(void *n)
-  {
-    return NS_OK;
-  }
-  NS_IMETHOD Unroot(void *n)
-  {
-    return NS_OK;
-  }
-  NS_IMETHOD_(void) DeleteCycleCollectable(void *n)
-  {
-  }
-  NS_IMETHOD Traverse(void *n, nsCycleCollectionTraversalCallback &cb)
-  {
-    JSContext *cx = static_cast<JSContext*>(n);
-
-    // JSContexts do not have an internal refcount and always have a single
-    // owner (e.g., nsJSContext). Thus, the default refcount is 1. However,
-    // in the (abnormal) case of synchronous cycle-collection, the context
-    // may be actively executing code in which case we want to treat it as
-    // rooted by adding an extra refcount.
-    unsigned refCount = js::ContextHasOutstandingRequests(cx) ? 2 : 1;
-
-    cb.DescribeRefCountedNode(refCount, "JSContext");
-    if (JSObject *global = js::DefaultObjectForContextOrNull(cx)) {
-      NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(cb, "[global object]");
-      cb.NoteJSChild(global);
-    }
-
-    return NS_OK;
-  }
-};
-
-static JSContextParticipant JSContext_cycleCollectorGlobal;
-
 struct Closure
 {
   bool cycleCollectionEnabled;
@@ -872,13 +831,6 @@ CycleCollectedJSRuntime::AssertNoObjectsToTrace(void* aPossibleJSHolder)
 }
 #endif
 
-// static
-nsCycleCollectionParticipant*
-CycleCollectedJSRuntime::JSContextParticipant()
-{
-  return &JSContext_cycleCollectorGlobal;
-}
-
 nsCycleCollectionParticipant*
 CycleCollectedJSRuntime::GCThingParticipant()
 {
diff --git a/xpcom/base/CycleCollectedJSRuntime.h b/xpcom/base/CycleCollectedJSRuntime.h
index fe3ad22b878f..36d3d42c4217 100644
--- a/xpcom/base/CycleCollectedJSRuntime.h
+++ b/xpcom/base/CycleCollectedJSRuntime.h
@@ -172,9 +172,6 @@ public:
   void AssertNoObjectsToTrace(void* aPossibleJSHolder);
 #endif
 
-  // This returns the singleton nsCycleCollectionParticipant for JSContexts.
-  static nsCycleCollectionParticipant* JSContextParticipant();
-
   nsCycleCollectionParticipant* GCThingParticipant();
   nsCycleCollectionParticipant* ZoneParticipant();
 

From 9ea45e61e6387ca823c2b306e1c9c8760adbdeb0 Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Wed, 4 Sep 2013 14:06:56 -0700
Subject: [PATCH 31/86] Bug 899367 - Remove JSOPTION_UNROOTED_GLOBAL.
 r=luke,mccr8

\o/
---
 js/src/jsapi.h         | 6 ++----
 js/src/jscntxt.cpp     | 2 +-
 js/src/jsfriendapi.cpp | 6 ------
 js/src/jsfriendapi.h   | 3 ---
 4 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/js/src/jsapi.h b/js/src/jsapi.h
index ba2bdf71cb71..b2721ffa52cb 100644
--- a/js/src/jsapi.h
+++ b/js/src/jsapi.h
@@ -1536,10 +1536,8 @@ JS_StringToVersion(const char *string);
                                                    that a null rval out-param
                                                    will be passed to each call
                                                    to JS_ExecuteScript. */
-#define JSOPTION_UNROOTED_GLOBAL JS_BIT(13)     /* The GC will not root the
-                                                   contexts' default compartment
-                                                   object, leaving that up to the
-                                                   embedding. */
+
+/* JS_BIT(13) is currently unused. */
 
 #define JSOPTION_BASELINE       JS_BIT(14)      /* Baseline compiler. */
 
diff --git a/js/src/jscntxt.cpp b/js/src/jscntxt.cpp
index 7f8783fd2f26..156c18468cf7 100644
--- a/js/src/jscntxt.cpp
+++ b/js/src/jscntxt.cpp
@@ -1285,7 +1285,7 @@ JSContext::mark(JSTracer *trc)
     /* Stack frames and slots are traced by StackSpace::mark. */
 
     /* Mark other roots-by-definition in the JSContext. */
-    if (defaultCompartmentObject_ && !hasOption(JSOPTION_UNROOTED_GLOBAL))
+    if (defaultCompartmentObject_)
         MarkObjectRoot(trc, &defaultCompartmentObject_, "default compartment object");
     if (isExceptionPending())
         MarkValueRoot(trc, &exception, "exception");
diff --git a/js/src/jsfriendapi.cpp b/js/src/jsfriendapi.cpp
index 0f60b2a48342..f90b00d04e69 100644
--- a/js/src/jsfriendapi.cpp
+++ b/js/src/jsfriendapi.cpp
@@ -805,12 +805,6 @@ js::ContextHasOutstandingRequests(const JSContext *cx)
 }
 #endif
 
-JS_FRIEND_API(bool)
-js::HasUnrootedGlobal(const JSContext *cx)
-{
-    return cx->hasOption(JSOPTION_UNROOTED_GLOBAL);
-}
-
 JS_FRIEND_API(void)
 js::SetActivityCallback(JSRuntime *rt, ActivityCallback cb, void *arg)
 {
diff --git a/js/src/jsfriendapi.h b/js/src/jsfriendapi.h
index 763adebd77a9..e32dabc39d62 100644
--- a/js/src/jsfriendapi.h
+++ b/js/src/jsfriendapi.h
@@ -676,9 +676,6 @@ JS_FRIEND_API(bool)
 ContextHasOutstandingRequests(const JSContext *cx);
 #endif
 
-JS_FRIEND_API(bool)
-HasUnrootedGlobal(const JSContext *cx);
-
 typedef void
 (* ActivityCallback)(void *arg, bool active);
 

From 666aaa00ac6ebfbee88c502207c1e6823f7c8c5e Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Wed, 4 Sep 2013 14:06:56 -0700
Subject: [PATCH 32/86] Bug 899367 - Remove xpc_UnmarkGrayContext. r=mccr8

Default compartment objects are never gray anymore.
---
 dom/base/nsJSEnvironment.cpp           |  2 +-
 js/xpconnect/src/XPCWrappedJSClass.cpp |  2 +-
 js/xpconnect/src/nsCxPusher.cpp        |  4 ----
 js/xpconnect/src/nsXPConnect.cpp       |  3 +--
 js/xpconnect/src/xpcpublic.h           | 20 --------------------
 5 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/dom/base/nsJSEnvironment.cpp b/dom/base/nsJSEnvironment.cpp
index 9e358f2f4ed3..423d0dea6f6c 100644
--- a/dom/base/nsJSEnvironment.cpp
+++ b/dom/base/nsJSEnvironment.cpp
@@ -1158,7 +1158,7 @@ nsJSContext::GetNativeGlobal()
 JSContext*
 nsJSContext::GetNativeContext()
 {
-  return xpc_UnmarkGrayContext(mContext);
+  return mContext;
 }
 
 nsresult
diff --git a/js/xpconnect/src/XPCWrappedJSClass.cpp b/js/xpconnect/src/XPCWrappedJSClass.cpp
index 0c563f4da6fc..f82b1455a5e5 100644
--- a/js/xpconnect/src/XPCWrappedJSClass.cpp
+++ b/js/xpconnect/src/XPCWrappedJSClass.cpp
@@ -1152,7 +1152,7 @@ nsXPCWrappedJSClass::CallMethod(nsXPCWrappedJS* wrapper, uint16_t methodIndex,
         return retval;
 
     XPCContext *xpcc = ccx.GetXPCContext();
-    JSContext *cx = xpc_UnmarkGrayContext(ccx.GetJSContext());
+    JSContext *cx = ccx.GetJSContext();
 
     if (!cx || !xpcc || !IsReflectable(methodIndex))
         return NS_ERROR_FAILURE;
diff --git a/js/xpconnect/src/nsCxPusher.cpp b/js/xpconnect/src/nsCxPusher.cpp
index b35082691d1a..b9be9343543d 100644
--- a/js/xpconnect/src/nsCxPusher.cpp
+++ b/js/xpconnect/src/nsCxPusher.cpp
@@ -124,9 +124,6 @@ AutoCxPusher::AutoCxPusher(JSContext* cx, bool allowNull)
 
   // Enter a request and a compartment for the duration that the cx is on the
   // stack if non-null.
-  //
-  // NB: We call UnmarkGrayContext so that this can obsolete the need for the
-  // old XPCAutoRequest as well.
   if (cx) {
     mAutoRequest.construct(cx);
 
@@ -135,7 +132,6 @@ AutoCxPusher::AutoCxPusher(JSContext* cx, bool allowNull)
                                        : js::DefaultObjectForContextOrNull(cx);
     if (compartmentObject)
       mAutoCompartment.construct(cx, compartmentObject);
-    xpc_UnmarkGrayContext(cx);
   }
 }
 
diff --git a/js/xpconnect/src/nsXPConnect.cpp b/js/xpconnect/src/nsXPConnect.cpp
index 559c29bb933a..61ea9fb7fda2 100644
--- a/js/xpconnect/src/nsXPConnect.cpp
+++ b/js/xpconnect/src/nsXPConnect.cpp
@@ -1315,8 +1315,7 @@ xpc_ActivateDebugMode()
 JSContext*
 nsXPConnect::GetCurrentJSContext()
 {
-    JSContext *cx = GetRuntime()->GetJSContextStack()->Peek();
-    return xpc_UnmarkGrayContext(cx);
+    return GetRuntime()->GetJSContextStack()->Peek();
 }
 
 /* virtual */
diff --git a/js/xpconnect/src/xpcpublic.h b/js/xpconnect/src/xpcpublic.h
index b36369032960..430791f2caef 100644
--- a/js/xpconnect/src/xpcpublic.h
+++ b/js/xpconnect/src/xpcpublic.h
@@ -24,7 +24,6 @@
 #include "nsStringBuffer.h"
 #include "nsIGlobalObject.h"
 #include "mozilla/dom/BindingDeclarations.h"
-#include "nsDOMJSUtils.h"
 
 class nsIPrincipal;
 class nsIXPConnectWrappedJS;
@@ -164,25 +163,6 @@ xpc_UnmarkGrayScript(JSScript *script)
     return script;
 }
 
-inline JSContext *
-xpc_UnmarkGrayContext(JSContext *cx)
-{
-    // There's no default compartment object for DOM JSContexts, so we have
-    // nothing to do in that case. In fact, this whole function is obsolete,
-    // because nothing else is ever gray. But for now let's be deliberate.
-    // We'll remove this thing in the next patch.
-    if (cx && !GetScriptContextFromJSContext(cx)) {
-        JSObject *global = js::DefaultObjectForContextOrNull(cx);
-        xpc_UnmarkGrayObject(global);
-        if (global && JS_IsInRequest(JS_GetRuntime(cx))) {
-            JSObject *scope = JS::CurrentGlobalOrNull(cx);
-            if (scope != global)
-                xpc_UnmarkGrayObject(scope);
-        }
-    }
-    return cx;
-}
-
 // If aVariant is an XPCVariant, this marks the object to be in aGeneration.
 // This also unmarks the gray JSObject.
 extern void

From b2a143459c757138e34389c5e4ffc776e74702c2 Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Wed, 4 Sep 2013 14:06:56 -0700
Subject: [PATCH 33/86] Bug 899367 - Remove check for non-WindowProxy objects
 on an scx. r=mccr8

---
 xpcom/base/CycleCollectedJSRuntime.cpp | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/xpcom/base/CycleCollectedJSRuntime.cpp b/xpcom/base/CycleCollectedJSRuntime.cpp
index 35c721e2f6db..b155e3cf68f7 100644
--- a/xpcom/base/CycleCollectedJSRuntime.cpp
+++ b/xpcom/base/CycleCollectedJSRuntime.cpp
@@ -880,19 +880,18 @@ CycleCollectedJSRuntime::UsefulToMergeZones() const
   JSContext* cx;
   JSAutoRequest ar(nsContentUtils::GetSafeJSContext());
   while ((cx = JS_ContextIterator(mJSRuntime, &iter))) {
-    // Skip anything without an nsIScriptContext, as well as any scx whose
-    // NativeGlobal() is not an outer window (this happens with XUL Prototype
-    // compilation scopes, for example, which we're not interested in).
+    // Skip anything without an nsIScriptContext.
     nsIScriptContext* scx = GetScriptContextFromJSContext(cx);
-    JS::RootedObject global(cx, scx ? scx->GetWindowProxyPreserveColor() : nullptr);
-    if (!global || !js::GetObjectParent(global)) {
+    JS::RootedObject obj(cx, scx ? scx->GetWindowProxyPreserveColor() : nullptr);
+    if (!obj) {
       continue;
     }
+    MOZ_ASSERT(js::IsOuterObject(obj));
     // Grab the inner from the outer.
-    global = JS_ObjectToInnerObject(cx, global);
-    MOZ_ASSERT(!js::GetObjectParent(global));
-    if (JS::GCThingIsMarkedGray(global) &&
-        !js::IsSystemCompartment(js::GetObjectCompartment(global))) {
+    obj = JS_ObjectToInnerObject(cx, obj);
+    MOZ_ASSERT(!js::GetObjectParent(obj));
+    if (JS::GCThingIsMarkedGray(obj) &&
+        !js::IsSystemCompartment(js::GetObjectCompartment(obj))) {
       return true;
     }
   }

From 83c76ab7608c98755a582c365dcca50f0ca42eed Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Wed, 4 Sep 2013 14:06:57 -0700
Subject: [PATCH 34/86] Bug 899367 - Make GetNativeGlobal consumers call
 GetWindowProxy and rm the former. r=mccr8

Some of the uses of this are a bit nonsensical now, but that's a problem for
another day.
---
 caps/src/nsSecurityManagerFactory.cpp                |  2 +-
 content/events/src/nsEventListenerManager.cpp        |  2 +-
 dom/base/nsGlobalWindow.cpp                          |  2 +-
 dom/base/nsIScriptContext.h                          | 10 ++--------
 dom/base/nsJSEnvironment.cpp                         | 12 +++---------
 dom/base/nsJSEnvironment.h                           |  3 +--
 dom/base/nsJSUtils.cpp                               |  4 ++--
 dom/bluetooth/BluetoothManager.cpp                   |  2 +-
 dom/file/ArchiveRequest.cpp                          |  2 +-
 dom/file/FileRequest.cpp                             |  2 +-
 dom/mobilemessage/src/MobileMessageCallback.cpp      |  2 +-
 .../src/MobileMessageCursorCallback.cpp              |  2 +-
 dom/mobilemessage/src/MobileMessageManager.cpp       |  2 +-
 js/xpconnect/src/nsCxPusher.cpp                      |  2 +-
 14 files changed, 18 insertions(+), 31 deletions(-)

diff --git a/caps/src/nsSecurityManagerFactory.cpp b/caps/src/nsSecurityManagerFactory.cpp
index e13971c82c67..071bef3ffa1b 100644
--- a/caps/src/nsSecurityManagerFactory.cpp
+++ b/caps/src/nsSecurityManagerFactory.cpp
@@ -66,7 +66,7 @@ NS_IMETHODIMP
 nsSecurityNameSet::InitializeNameSet(nsIScriptContext* aScriptContext)
 {
     AutoJSContext cx;
-    JS::Rooted<JSObject*> global(cx, aScriptContext->GetNativeGlobal());
+    JS::Rooted<JSObject*> global(cx, aScriptContext->GetWindowProxy());
     JSAutoCompartment ac(cx, global);
 
     /*
diff --git a/content/events/src/nsEventListenerManager.cpp b/content/events/src/nsEventListenerManager.cpp
index 1a0b0e525b96..2fb03b248043 100644
--- a/content/events/src/nsEventListenerManager.cpp
+++ b/content/events/src/nsEventListenerManager.cpp
@@ -893,7 +893,7 @@ nsEventListenerManager::CompileEventHandlerInternal(nsListenerStruct *aListenerS
                                      aListenerStruct->mTypeAtom,
                                      &argCount, &argNames);
 
-    JSAutoCompartment ac(cx, context->GetNativeGlobal());
+    JSAutoCompartment ac(cx, context->GetWindowProxy());
     JS::CompileOptions options(cx);
     options.setFileAndLine(url.get(), lineNo)
            .setVersion(SCRIPTVERSION_DEFAULT);
diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index e808f92e7901..33d2baf800a9 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -2363,7 +2363,7 @@ nsGlobalWindow::SetNewDocument(nsIDocument* aDocument,
       CreateOuterObject(newInnerWindow);
       mContext->DidInitializeContext();
 
-      mJSObject = mContext->GetNativeGlobal();
+      mJSObject = mContext->GetWindowProxy();
       SetWrapper(mJSObject);
     } else {
       JS::Rooted<JSObject*> global(cx,
diff --git a/dom/base/nsIScriptContext.h b/dom/base/nsIScriptContext.h
index 8d09d52f735a..931867a6e757 100644
--- a/dom/base/nsIScriptContext.h
+++ b/dom/base/nsIScriptContext.h
@@ -27,8 +27,8 @@ class nsIDOMWindow;
 class nsIURI;
 
 #define NS_ISCRIPTCONTEXT_IID \
-{ 0x03c0874e, 0xcb49, 0x41c8, \
-  { 0xa3, 0x0b, 0xef, 0x3e, 0xc1, 0x88, 0xb1, 0x1f } }
+{ 0xf3859ce7, 0x7551, 0x4760, \
+  { 0x84, 0x29, 0x64, 0x4f, 0x26, 0x1e, 0xdb, 0x91 } }
 
 /* This MUST match JSVERSION_DEFAULT.  This version stuff if we don't
    know what language we have is a little silly... */
@@ -103,12 +103,6 @@ public:
    **/
   virtual JSContext* GetNativeContext() = 0;
 
-  /**
-   * Return the native global object for this context.
-   *
-   **/
-  virtual JSObject* GetNativeGlobal() = 0;
-
   /**
    * Initialize the context generally. Does not create a global object.
    **/
diff --git a/dom/base/nsJSEnvironment.cpp b/dom/base/nsJSEnvironment.cpp
index 423d0dea6f6c..a703d6b58d37 100644
--- a/dom/base/nsJSEnvironment.cpp
+++ b/dom/base/nsJSEnvironment.cpp
@@ -1100,7 +1100,7 @@ nsIScriptGlobalObject *
 nsJSContext::GetGlobalObject()
 {
   AutoJSContext cx;
-  JS::Rooted<JSObject*> global(mContext, GetNativeGlobal());
+  JS::Rooted<JSObject*> global(mContext, GetWindowProxy());
   if (!global) {
     return nullptr;
   }
@@ -1149,12 +1149,6 @@ nsJSContext::GetGlobalObject()
   return sgo;
 }
 
-JSObject*
-nsJSContext::GetNativeGlobal()
-{
-    return GetWindowProxy();
-}
-
 JSContext*
 nsJSContext::GetNativeContext()
 {
@@ -1198,7 +1192,7 @@ nsJSContext::SetProperty(JS::Handle<JSObject*> aTarget, const char* aPropName, n
 
   Maybe<nsRootedJSValueArray> tempStorage;
 
-  JS::Rooted<JSObject*> global(mContext, GetNativeGlobal());
+  JS::Rooted<JSObject*> global(mContext, GetWindowProxy());
   nsresult rv =
     ConvertSupportsTojsvals(aArgs, global, &argc, &argv, tempStorage);
   NS_ENSURE_SUCCESS(rv, rv);
@@ -1494,7 +1488,7 @@ nsJSContext::AddSupportsPrimitiveTojsvals(nsISupports *aArg, JS::Value *aArgv)
       AutoFree iidGuard(iid); // Free iid upon destruction.
 
       nsCOMPtr<nsIXPConnectJSObjectHolder> wrapper;
-      JS::Rooted<JSObject*> global(cx, xpc_UnmarkGrayObject(GetNativeGlobal()));
+      JS::Rooted<JSObject*> global(cx, GetWindowProxy());
       JS::Rooted<JS::Value> v(cx);
       nsresult rv = nsContentUtils::WrapNative(cx, global,
                                                data, iid, v.address(),
diff --git a/dom/base/nsJSEnvironment.h b/dom/base/nsJSEnvironment.h
index 7ce497d12b19..090663241faa 100644
--- a/dom/base/nsJSEnvironment.h
+++ b/dom/base/nsJSEnvironment.h
@@ -55,7 +55,6 @@ public:
   inline nsIScriptGlobalObject *GetGlobalObjectRef() { return mGlobalObjectRef; }
 
   virtual JSContext* GetNativeContext() MOZ_OVERRIDE;
-  virtual JSObject* GetNativeGlobal() MOZ_OVERRIDE;
   virtual nsresult InitContext() MOZ_OVERRIDE;
   virtual bool IsContextInitialized() MOZ_OVERRIDE;
 
@@ -131,7 +130,7 @@ public:
   {
     // Verify that we have a global so that this
     // does always return a null when GetGlobalObject() is null.
-    JSObject* global = GetNativeGlobal();
+    JSObject* global = GetWindowProxy();
     return global ? mGlobalObjectRef.get() : nullptr;
   }
 protected:
diff --git a/dom/base/nsJSUtils.cpp b/dom/base/nsJSUtils.cpp
index 985b8505471b..8157ffa926eb 100644
--- a/dom/base/nsJSUtils.cpp
+++ b/dom/base/nsJSUtils.cpp
@@ -143,7 +143,7 @@ nsJSUtils::ReportPendingException(JSContext *aContext)
     {
       nsIScriptContext* scx = GetScriptContextFromJSContext(aContext);
       JS::Rooted<JSObject*> scope(aContext);
-      scope = scx ? scx->GetNativeGlobal()
+      scope = scx ? scx->GetWindowProxy()
                   : js::DefaultObjectForContextOrNull(aContext);
       JSAutoCompartment ac(aContext, scope);
       JS_ReportPendingException(aContext);
@@ -304,7 +304,7 @@ JSObject* GetDefaultScopeFromJSContext(JSContext *cx)
   // instead.
   nsIScriptContext *scx = GetScriptContextFromJSContext(cx);
   if (scx) {
-    return scx->GetNativeGlobal();
+    return scx->GetWindowProxy();
   }
   return js::DefaultObjectForContextOrNull(cx);
 }
diff --git a/dom/bluetooth/BluetoothManager.cpp b/dom/bluetooth/BluetoothManager.cpp
index 43118c15fa39..1fcce356898c 100644
--- a/dom/bluetooth/BluetoothManager.cpp
+++ b/dom/bluetooth/BluetoothManager.cpp
@@ -68,7 +68,7 @@ public:
 
     AutoPushJSContext cx(sc->GetNativeContext());
 
-    JS::Rooted<JSObject*> global(cx, sc->GetNativeGlobal());
+    JS::Rooted<JSObject*> global(cx, sc->GetWindowProxy());
     rv = nsContentUtils::WrapNative(cx, global, adapter, aValue);
     if (NS_FAILED(rv)) {
       NS_WARNING("Cannot create native object!");
diff --git a/dom/file/ArchiveRequest.cpp b/dom/file/ArchiveRequest.cpp
index 5d2230bc76c9..e66fa3e24208 100644
--- a/dom/file/ArchiveRequest.cpp
+++ b/dom/file/ArchiveRequest.cpp
@@ -135,7 +135,7 @@ ArchiveRequest::ReaderReady(nsTArray<nsCOMPtr<nsIDOMFile> >& aFileList,
   AutoPushJSContext cx(sc->GetNativeContext());
   NS_ASSERTION(cx, "Failed to get a context!");
 
-  JS::Rooted<JSObject*> global(cx, sc->GetNativeGlobal());
+  JS::Rooted<JSObject*> global(cx, sc->GetWindowProxy());
   NS_ASSERTION(global, "Failed to get global object!");
 
   JSAutoCompartment ac(cx, global);
diff --git a/dom/file/FileRequest.cpp b/dom/file/FileRequest.cpp
index 0893466bb9b6..7de459f2bfcc 100644
--- a/dom/file/FileRequest.cpp
+++ b/dom/file/FileRequest.cpp
@@ -79,7 +79,7 @@ FileRequest::NotifyHelperCompleted(FileHelper* aFileHelper)
 
   JS::Rooted<JS::Value> result(cx);
 
-  JS::Rooted<JSObject*> global(cx, sc->GetNativeGlobal());
+  JS::Rooted<JSObject*> global(cx, sc->GetWindowProxy());
   NS_ASSERTION(global, "Failed to get global object!");
 
   JSAutoCompartment ac(cx, global);
diff --git a/dom/mobilemessage/src/MobileMessageCallback.cpp b/dom/mobilemessage/src/MobileMessageCallback.cpp
index f81dd5432843..05951a234223 100644
--- a/dom/mobilemessage/src/MobileMessageCallback.cpp
+++ b/dom/mobilemessage/src/MobileMessageCallback.cpp
@@ -56,7 +56,7 @@ MobileMessageCallback::NotifySuccess(nsISupports *aMessage)
   AutoPushJSContext cx(scriptContext->GetNativeContext());
   NS_ENSURE_TRUE(cx, NS_ERROR_FAILURE);
 
-  JS::Rooted<JSObject*> global(cx, scriptContext->GetNativeGlobal());
+  JS::Rooted<JSObject*> global(cx, scriptContext->GetWindowProxy());
   NS_ENSURE_TRUE(global, NS_ERROR_FAILURE);
 
   JSAutoCompartment ac(cx, global);
diff --git a/dom/mobilemessage/src/MobileMessageCursorCallback.cpp b/dom/mobilemessage/src/MobileMessageCursorCallback.cpp
index 77af8722e44d..c22030e4f947 100644
--- a/dom/mobilemessage/src/MobileMessageCursorCallback.cpp
+++ b/dom/mobilemessage/src/MobileMessageCursorCallback.cpp
@@ -67,7 +67,7 @@ MobileMessageCursorCallback::NotifyCursorResult(nsISupports* aResult)
   AutoPushJSContext cx(scriptContext->GetNativeContext());
   NS_ENSURE_TRUE(cx, NS_ERROR_FAILURE);
 
-  JS::Rooted<JSObject*> global(cx, scriptContext->GetNativeGlobal());
+  JS::Rooted<JSObject*> global(cx, scriptContext->GetWindowProxy());
   NS_ENSURE_TRUE(global, NS_ERROR_FAILURE);
 
   JSAutoCompartment ac(cx, global);
diff --git a/dom/mobilemessage/src/MobileMessageManager.cpp b/dom/mobilemessage/src/MobileMessageManager.cpp
index 57724428403f..76e896442194 100644
--- a/dom/mobilemessage/src/MobileMessageManager.cpp
+++ b/dom/mobilemessage/src/MobileMessageManager.cpp
@@ -155,7 +155,7 @@ MobileMessageManager::Send(const JS::Value& aNumber_, const nsAString& aMessage,
     return NS_ERROR_INVALID_ARG;
   }
 
-  JS::Rooted<JSObject*> global(cx, sc->GetNativeGlobal());
+  JS::Rooted<JSObject*> global(cx, sc->GetWindowProxy());
   NS_ASSERTION(global, "Failed to get global object!");
 
   JSAutoCompartment ac(cx, global);
diff --git a/js/xpconnect/src/nsCxPusher.cpp b/js/xpconnect/src/nsCxPusher.cpp
index b9be9343543d..c762318dd434 100644
--- a/js/xpconnect/src/nsCxPusher.cpp
+++ b/js/xpconnect/src/nsCxPusher.cpp
@@ -128,7 +128,7 @@ AutoCxPusher::AutoCxPusher(JSContext* cx, bool allowNull)
     mAutoRequest.construct(cx);
 
     // DOM JSContexts don't store their default compartment object on the cx.
-    JSObject *compartmentObject = mScx ? mScx->GetNativeGlobal()
+    JSObject *compartmentObject = mScx ? mScx->GetWindowProxy()
                                        : js::DefaultObjectForContextOrNull(cx);
     if (compartmentObject)
       mAutoCompartment.construct(cx, compartmentObject);

From 63d2cabdae6c8a305946c03adf962e18c7efdc8b Mon Sep 17 00:00:00 2001
From: Georg Fritzsche <georg.fritzsche@googlemail.com>
Date: Wed, 4 Sep 2013 16:05:21 +0200
Subject: [PATCH 35/86] Bug 899080 - Let all plugins except Flash default to
 click-to-play. r=bsmedberg

---
 browser/app/profile/firefox.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index f2b93c002b2d..736acfd4a68a 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -641,6 +641,10 @@ pref("plugins.update.notifyUser", false);
 
 pref("plugins.click_to_play", true);
 
+// let all plugins except Flash default to click-to-play
+pref("plugin.default.state", 1);
+pref("plugin.state.flash", 2);
+
 // display door hanger if flash not installed
 pref("plugins.notifyMissingFlash", true);
 

From 613349b08263e5f72e5195fc46fd2603524dbf3c Mon Sep 17 00:00:00 2001
From: Georg Fritzsche <georg.fritzsche@googlemail.com>
Date: Wed, 4 Sep 2013 16:05:31 +0200
Subject: [PATCH 36/86] Bug 899080 - Test fixup part 1 - Always enable
 test-plugins for reftests. r=jmaher

---
 layout/tools/reftest/reftest.js | 36 +++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/layout/tools/reftest/reftest.js b/layout/tools/reftest/reftest.js
index 41305e0ccade..6f7ad3ea81ea 100644
--- a/layout/tools/reftest/reftest.js
+++ b/layout/tools/reftest/reftest.js
@@ -109,6 +109,9 @@ var gUnexpectedCrashDumpFiles = { };
 var gCrashDumpDir;
 var gFailedNoPaint = false;
 
+// The enabled-state of the test-plugins, stored so they can be reset later
+var gTestPluginEnabledStates = null;
+
 const TYPE_REFTEST_EQUAL = '==';
 const TYPE_REFTEST_NOTEQUAL = '!=';
 const TYPE_LOAD = 'load';     // test without a reference (just test that it does
@@ -208,6 +211,20 @@ function IDForEventTarget(event)
     }
 }
 
+function getTestPlugin(aName) {
+  var ph = CC["@mozilla.org/plugin/host;1"].getService(CI.nsIPluginHost);
+  var tags = ph.getPluginTags();
+
+  // Find the test plugin
+  for (var i = 0; i < tags.length; i++) {
+    if (tags[i].name == aName)
+      return tags[i];
+  }
+
+  LogWarning("Failed to find the test-plugin.");
+  return null;
+}
+
 this.OnRefTestLoad = function OnRefTestLoad(win)
 {
     gCrashDumpDir = CC[NS_DIRECTORY_SERVICE_CONTRACTID]
@@ -267,6 +284,17 @@ this.OnRefTestLoad = function OnRefTestLoad(win)
     document.getElementById("reftest-window").appendChild(gBrowser);
 #endif
 
+    // reftests should have the test plugins enabled, not click-to-play
+    let plugin1 = getTestPlugin("Test Plug-in");
+    let plugin2 = getTestPlugin("Second Test Plug-in");
+    if (plugin1 && plugin2) {
+      gTestPluginEnabledStates = [plugin1.enabledState, plugin2.enabledState];
+      plugin1.enabledState = CI.nsIPluginTag.STATE_ENABLED;
+      plugin2.enabledState = CI.nsIPluginTag.STATE_ENABLED;
+    } else {
+      LogWarning("Could not get test plugin tags.");
+    }
+
     gBrowserMessageManager = gBrowser.QueryInterface(CI.nsIFrameLoaderOwner)
                                      .frameLoader.messageManager;
     // The content script waits for the initial onload, then notifies
@@ -498,6 +526,14 @@ function StartTests()
 
 function OnRefTestUnload()
 {
+  let plugin1 = getTestPlugin("Test Plug-in");
+  let plugin2 = getTestPlugin("Second Test Plug-in");
+  if (plugin1 && plugin2) {
+    plugin1.enabledState = gTestPluginEnabledStates[0];
+    plugin2.enabledState = gTestPluginEnabledStates[1];
+  } else {
+    LogWarning("Failed to get test plugin tags.");
+  }
 }
 
 // Read all available data from an input stream and return it

From ce4d217ed21bf06234a455a41a23d1c3e1668215 Mon Sep 17 00:00:00 2001
From: Georg Fritzsche <georg.fritzsche@googlemail.com>
Date: Wed, 4 Sep 2013 16:05:40 +0200
Subject: [PATCH 37/86] Bug 899080 - Test fixup part 2 - dom/plugins.
 r=bsmedberg

---
 dom/plugins/test/mochitest/test_GCrace.html   |  6 ++-
 .../mochitest/test_NPNVdocumentOrigin.html    |  6 ++-
 ...test_NPPVpluginWantsAllNetworkStreams.html | 15 ++++--
 dom/plugins/test/mochitest/test_bug479979.xul |  6 ++-
 .../test/mochitest/test_bug532208.html        |  7 ++-
 .../test/mochitest/test_bug539565-1.html      |  2 +
 .../test/mochitest/test_bug539565-2.html      |  2 +
 .../test/mochitest/test_bug751809.html        | 20 +-------
 .../test/mochitest/test_bug771202.html        |  2 +
 .../test/mochitest/test_bug777098.html        |  2 +
 .../test/mochitest/test_bug784131.html        |  6 +++
 .../test/mochitest/test_bug813906.html        | 20 ++++----
 .../test/mochitest/test_bug854082.html        |  2 +
 .../test/mochitest/test_bug863792.html        |  2 +
 dom/plugins/test/mochitest/test_busy_hang.xul |  4 ++
 .../test/mochitest/test_clear_site_data.html  |  5 ++
 .../test/mochitest/test_cocoa_focus.html      |  2 +
 .../mochitest/test_cocoa_window_focus.html    |  2 +
 .../test/mochitest/test_convertpoint.xul      |  4 ++
 dom/plugins/test/mochitest/test_cookies.html  |  6 ++-
 dom/plugins/test/mochitest/test_copyText.html |  2 +
 .../mochitest/test_crash_nested_loop.html     |  2 +
 .../test/mochitest/test_crash_notify.xul      |  4 ++
 .../mochitest/test_crash_notify_no_report.xul |  4 ++
 .../test/mochitest/test_crash_submit.xul      |  4 ++
 dom/plugins/test/mochitest/test_crashing.html |  2 +
 .../test/mochitest/test_crashing2.html        |  2 +
 .../test/mochitest/test_defaultValue.html     |  6 ++-
 .../test/mochitest/test_enumerate.html        | 10 ++--
 dom/plugins/test/mochitest/test_fullpage.html |  2 +
 .../mochitest/test_getauthenticationinfo.html |  3 ++
 .../test/mochitest/test_hang_submit.xul       |  4 ++
 dom/plugins/test/mochitest/test_hanging.html  |  2 +
 dom/plugins/test/mochitest/test_idle_hang.xul |  4 ++
 .../mochitest/test_instance_re-parent.html    | 36 +++++++------
 .../mochitest/test_instance_unparent1.html    | 14 ++---
 .../mochitest/test_instance_unparent2.html    | 26 +++++-----
 .../mochitest/test_instance_unparent3.html    | 18 ++++---
 .../test/mochitest/test_instantiation.html    |  2 +
 .../test_multipleinstanceobjects.html         |  8 +--
 .../mochitest/test_newstreamondestroy.html    | 10 ++--
 .../test/mochitest/test_npn_asynccall.html    | 16 +++---
 .../test/mochitest/test_npn_timers.html       | 16 +++---
 .../test/mochitest/test_npobject_getters.html |  6 ++-
 dom/plugins/test/mochitest/test_npruntime.xul |  4 ++
 .../mochitest/test_npruntime_construct.html   |  5 ++
 .../mochitest/test_npruntime_identifiers.html |  2 +
 .../mochitest/test_npruntime_npnevaluate.html | 51 ++++++++++---------
 .../mochitest/test_npruntime_npninvoke.html   | 13 +++--
 .../test_npruntime_npninvokedefault.html      | 16 +++---
 .../test_npruntime_npnsetexception.html       | 14 ++---
 dom/plugins/test/mochitest/test_painting.html | 29 ++++++-----
 .../test_plugin_scroll_painting.html          |  4 ++
 .../test_plugin_tag_clicktoplay.html          | 26 +++++-----
 .../mochitest/test_pluginstream_asfile.html   |  4 ++
 .../test_pluginstream_asfileonly.html         |  4 ++
 .../test/mochitest/test_pluginstream_err.html |  2 +
 .../mochitest/test_pluginstream_geturl.html   |  4 ++
 .../test_pluginstream_geturlnotify.html       |  4 ++
 .../test_pluginstream_newstream.html          |  4 ++
 .../mochitest/test_pluginstream_post.html     |  4 ++
 .../test_pluginstream_poststream.html         |  4 ++
 .../mochitest/test_pluginstream_referer.html  | 11 ++--
 .../mochitest/test_pluginstream_seek.html     |  4 ++
 .../test_pluginstream_seek_close.html         |  2 +
 .../test/mochitest/test_pluginstream_src.html |  4 ++
 .../test_pluginstream_src_dynamic.html        |  4 ++
 .../test_pluginstream_src_referer.html        |  2 +
 .../test/mochitest/test_positioning.html      | 10 ++--
 .../test_privatemode_perwindowpb.xul          |  4 ++
 .../mochitest/test_propertyAndMethod.html     |  6 ++-
 .../test_queryContentsScaleFactor.html        |  6 ++-
 .../mochitest/test_redirect_handling.html     | 15 ++++--
 .../test_refresh_navigator_plugins.html       |  3 ++
 .../test/mochitest/test_secondPlugin.html     |  7 ++-
 .../test/mochitest/test_src_url_change.html   | 14 ++---
 .../test/mochitest/test_streamNotify.html     |  6 ++-
 .../test/mochitest/test_streamatclose.html    | 15 +++---
 .../test/mochitest/test_twostreams.html       |  2 +
 .../test/mochitest/test_visibility.html       |  1 +
 .../mochitest/test_windowed_invalidate.html   | 25 +++++----
 dom/plugins/test/mochitest/test_wmode.xul     |  4 ++
 .../test_xulbrowser_plugin_visibility.xul     |  2 +
 .../test/mochitest/test_zero_opacity.html     | 13 +++--
 dom/plugins/test/mochitest/utils.js           | 27 ++++++++++
 85 files changed, 483 insertions(+), 222 deletions(-)

diff --git a/dom/plugins/test/mochitest/test_GCrace.html b/dom/plugins/test/mochitest/test_GCrace.html
index 3300c9fef0d4..027bc5b78e2e 100644
--- a/dom/plugins/test/mochitest/test_GCrace.html
+++ b/dom/plugins/test/mochitest/test_GCrace.html
@@ -3,15 +3,15 @@
 
   <script type="text/javascript"
 	  src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="utils.js"></script>
   <link rel="stylesheet" type="text/css"
 	href="/tests/SimpleTest/test.css" />
 <body onload="start()">
   <p id="display"></p>
 
-  <embed id="p" type="application/x-test" wmode="window"></embed>
-
   <script class="testbody" type="application/javascript">
     SimpleTest.waitForExplicitFinish();
+    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
 
     function start() {
       if (!SimpleTest.testPluginIsOOP()) {
@@ -68,3 +68,5 @@
       }, 2000);
     }
   </script>
+
+  <embed id="p" type="application/x-test" wmode="window"></embed>
diff --git a/dom/plugins/test/mochitest/test_NPNVdocumentOrigin.html b/dom/plugins/test/mochitest/test_NPNVdocumentOrigin.html
index c8db4176e155..9a7ff19416da 100644
--- a/dom/plugins/test/mochitest/test_NPNVdocumentOrigin.html
+++ b/dom/plugins/test/mochitest/test_NPNVdocumentOrigin.html
@@ -2,12 +2,12 @@
 <head>
   <title>Test NPNVdocumentOrigin</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="utils.js"></script>
 </head>
 <body onload="runTest()">
-  <embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
-
   <script class="testbody" type="application/javascript">
     SimpleTest.waitForExplicitFinish();
+    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
 
     function runTest() {
       "use strict";
@@ -39,5 +39,7 @@
       SimpleTest.finish();
     }
   </script>
+
+  <embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
 </body>
 </html>
diff --git a/dom/plugins/test/mochitest/test_NPPVpluginWantsAllNetworkStreams.html b/dom/plugins/test/mochitest/test_NPPVpluginWantsAllNetworkStreams.html
index 1a1f7ccb950f..6baed937130f 100644
--- a/dom/plugins/test/mochitest/test_NPPVpluginWantsAllNetworkStreams.html
+++ b/dom/plugins/test/mochitest/test_NPPVpluginWantsAllNetworkStreams.html
@@ -2,14 +2,14 @@
 <head>
   <title>Test NPPVpluginWantsAllNetworkStreams</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="utils.js"></script>
 </head>
-<body onload="runNextTest()">
-  <embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
-
+<body onload="runTests()">
   <script class="testbody" type="application/javascript">
     SimpleTest.waitForExplicitFinish();
+    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
 
-    var p = document.getElementById("plugin1");
+    var p = null;
 
     var missingDoc = "not-found.html";
 
@@ -65,6 +65,13 @@
         SimpleTest.finish();
       }
     }
+
+    function runTests() {
+      p = document.getElementById("plugin1");
+      runNextTest();
+    }
   </script>
+
+  <embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
 </body>
 </html>
diff --git a/dom/plugins/test/mochitest/test_bug479979.xul b/dom/plugins/test/mochitest/test_bug479979.xul
index 47154f1c9322..473b299f149c 100644
--- a/dom/plugins/test/mochitest/test_bug479979.xul
+++ b/dom/plugins/test/mochitest/test_bug479979.xul
@@ -8,12 +8,12 @@
   <title>NPAPI Set Undefined Value Test</title>
   <script type="application/javascript"
           src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
+  <script type="application/javascript" src="utils.js"></script>
 <body xmlns="http://www.w3.org/1999/xhtml" onload="runTests()">
-<embed id="plugin1" type="application/x-test" width="300" height="300"></embed>
-</body>
 <script class="testbody" type="application/javascript">
 <![CDATA[
 SimpleTest.waitForExplicitFinish();
+setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
 
 function runTests() {
   var pluginElement1 = document.getElementById("plugin1");
@@ -32,4 +32,6 @@ function runTests() {
 }
 ]]>
 </script>
+<embed id="plugin1" type="application/x-test" width="300" height="300"></embed>
+</body>
 </window>
diff --git a/dom/plugins/test/mochitest/test_bug532208.html b/dom/plugins/test/mochitest/test_bug532208.html
index 7afb5187da8e..85fad098eb81 100644
--- a/dom/plugins/test/mochitest/test_bug532208.html
+++ b/dom/plugins/test/mochitest/test_bug532208.html
@@ -4,13 +4,13 @@
 
 <script type="application/javascript"
 src="/tests/SimpleTest/SimpleTest.js"></script>
+<script type="application/javascript" src="utils.js"></script>
 
 <body onload="setTimeout(runTests, 2000)">
-  <embed id="plugin1" type="application/x-test" width="400"
-  height="400" src="large-pic.jpg" functiontofail="npp_write_rpc" streammode="normal"></embed>
 
 <script class="testbody" type="application/javascript">
 SimpleTest.waitForExplicitFinish();
+setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
 
 function runTests() {
   try {
@@ -23,3 +23,6 @@ function runTests() {
   SimpleTest.finish();
 }
 </script>
+
+<embed id="plugin1" type="application/x-test" width="400"
+  height="400" src="large-pic.jpg" functiontofail="npp_write_rpc" streammode="normal"></embed>
diff --git a/dom/plugins/test/mochitest/test_bug539565-1.html b/dom/plugins/test/mochitest/test_bug539565-1.html
index 69f26cc7d8cb..9f0c21a220aa 100644
--- a/dom/plugins/test/mochitest/test_bug539565-1.html
+++ b/dom/plugins/test/mochitest/test_bug539565-1.html
@@ -7,6 +7,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=539565
   <title>Test #1 for Bug 539565</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
+  <script type="application/javascript" src="utils.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 
   <script class="testbody" type="text/javascript">
@@ -85,6 +86,7 @@ function runTests() {
 }
 
 SimpleTest.waitForExplicitFinish();
+setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
 
   </script>
 </head>
diff --git a/dom/plugins/test/mochitest/test_bug539565-2.html b/dom/plugins/test/mochitest/test_bug539565-2.html
index 843309a5319d..2eef252042b3 100644
--- a/dom/plugins/test/mochitest/test_bug539565-2.html
+++ b/dom/plugins/test/mochitest/test_bug539565-2.html
@@ -7,6 +7,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=539565
   <title>Test #2 for Bug 539565</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
+  <script type="application/javascript" src="utils.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 
   <script class="testbody" type="text/javascript">
@@ -105,6 +106,7 @@ function runTests() {
 }
 
 SimpleTest.waitForExplicitFinish();
+setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
 
   </script>
 </head>
diff --git a/dom/plugins/test/mochitest/test_bug751809.html b/dom/plugins/test/mochitest/test_bug751809.html
index 344bd7489af9..27a6b8800bc8 100644
--- a/dom/plugins/test/mochitest/test_bug751809.html
+++ b/dom/plugins/test/mochitest/test_bug751809.html
@@ -4,25 +4,11 @@
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"></script>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/paint_listener.js"></script>
+  <script type="application/javascript" src="utils.js"></script>
   <script type="application/javascript;version=1.7">
-  function getTestPlugin() {
-    let ph = Components.classes["@mozilla.org/plugin/host;1"]
-               .getService(Components.interfaces.nsIPluginHost);
-    let tags = ph.getPluginTags();
-
-    // Find the test plugin
-    for (let i = 0; i < tags.length; i++) {
-      if (tags[i].name == "Test Plug-in")
-        return tags[i];
-    }
-      ok(false, "Unable to find plugin");
-      return null;
-    }
-
   Components.utils.import("resource://gre/modules/Services.jsm");
   Services.prefs.setBoolPref("plugins.click_to_play", true);
-  let plugin = getTestPlugin();
-  plugin.enabledState = Components.interfaces.nsIPluginTag.STATE_CLICKTOPLAY;
+  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_CLICKTOPLAY);
   </script>
 </head>
 
@@ -104,8 +90,6 @@
     }
 
     Services.prefs.clearUserPref("plugins.click_to_play");
-    let plugin = getTestPlugin();
-    plugin.enabledState = Components.interfaces.nsIPluginTag.STATE_ENABLED;
     SimpleTest.finish();
   }
 
diff --git a/dom/plugins/test/mochitest/test_bug771202.html b/dom/plugins/test/mochitest/test_bug771202.html
index 83f6787a0936..26252f4e005e 100644
--- a/dom/plugins/test/mochitest/test_bug771202.html
+++ b/dom/plugins/test/mochitest/test_bug771202.html
@@ -7,6 +7,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=771202
   <meta charset="utf-8">
   <title>Test for Bug 771202</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="utils.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
 <body>
@@ -16,6 +17,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=771202
 
 /** Test for recreating spliced plugin prototype chains after tranplant. **/
 SimpleTest.waitForExplicitFinish();
+setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
 
 function go() {
   // Set things up.
diff --git a/dom/plugins/test/mochitest/test_bug777098.html b/dom/plugins/test/mochitest/test_bug777098.html
index 6b1385dedd38..79a2559ff068 100644
--- a/dom/plugins/test/mochitest/test_bug777098.html
+++ b/dom/plugins/test/mochitest/test_bug777098.html
@@ -7,6 +7,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=777098
   <meta charset="utf-8">
   <title>Test for Bug 777098</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="utils.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
 <body onload="go();">
@@ -16,6 +17,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=777098
 
 /** Test for passing dead NPObjects back into plugins. **/
 SimpleTest.waitForExplicitFinish();
+setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
 
 function go() {
   var plugin = document.getElementById('plugin');
diff --git a/dom/plugins/test/mochitest/test_bug784131.html b/dom/plugins/test/mochitest/test_bug784131.html
index deed04d981c1..eac426bb628f 100644
--- a/dom/plugins/test/mochitest/test_bug784131.html
+++ b/dom/plugins/test/mochitest/test_bug784131.html
@@ -3,6 +3,7 @@
 <head>
   <title>Test for Bug 784131</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="utils.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 
   <meta http-equiv="content-type" content="text/html; charset=utf-8">
@@ -10,10 +11,15 @@
 </head>
 <body>
 
+<script type="text/javascript">
+  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
+</script>
+
 <embed id="body" type="application/x-test">
 <div>
   <embed id="nested" type="application/x-test">
 </div>
+
 <script type="application/javascript">
   function getObjectValue(obj) {
     try {
diff --git a/dom/plugins/test/mochitest/test_bug813906.html b/dom/plugins/test/mochitest/test_bug813906.html
index 8dca8db9255d..0cd95e15dc94 100644
--- a/dom/plugins/test/mochitest/test_bug813906.html
+++ b/dom/plugins/test/mochitest/test_bug813906.html
@@ -3,6 +3,7 @@
 <head>
   <title>Test for Bug 813906</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="utils.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 
   <meta http-equiv="content-type" content="text/html; charset=utf-8">
@@ -16,17 +17,9 @@ function f() {
 }
 </script>
 
-<svg>
-  <symbol id="a">
-    <foreignObject>
-      <object bugmode="813906" frame="frame1"></object>
-    </foreignObject>
-  </symbol>
-  <use />
-</svg>
-
 <script type="application/javascript">
 SimpleTest.waitForExplicitFinish();
+setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
 
 // When the document is torn down or <svg> is removed, we hit bug 621618
 SimpleTest.expectAssertions(1);
@@ -49,6 +42,15 @@ function frameLoaded() {
 }
 </script>
 
+<svg>
+  <symbol id="a">
+    <foreignObject>
+      <object bugmode="813906" frame="frame1"></object>
+    </foreignObject>
+  </symbol>
+  <use />
+</svg>
+
 <iframe name="frame1" onload="frameLoaded()"></iframe>
 </body>
 </html>
diff --git a/dom/plugins/test/mochitest/test_bug854082.html b/dom/plugins/test/mochitest/test_bug854082.html
index 6561d02eef80..22e133c7aa94 100644
--- a/dom/plugins/test/mochitest/test_bug854082.html
+++ b/dom/plugins/test/mochitest/test_bug854082.html
@@ -3,6 +3,7 @@
 <head>
   <title>Test for Bug 854082</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="utils.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 
   <meta http-equiv="content-type" content="text/html; charset=utf-8">
@@ -14,6 +15,7 @@
   // crash
 
   SimpleTest.waitForExplicitFinish();
+  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
 
   // Create an object that will spawn asynchronously
   var o = document.createElement("object");
diff --git a/dom/plugins/test/mochitest/test_bug863792.html b/dom/plugins/test/mochitest/test_bug863792.html
index 0b0b8412a060..0bb60f89e74e 100644
--- a/dom/plugins/test/mochitest/test_bug863792.html
+++ b/dom/plugins/test/mochitest/test_bug863792.html
@@ -3,6 +3,7 @@
 <head>
   <title>Test for Bug 863792</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="utils.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 
   <meta http-equiv="content-type" content="text/html; charset=utf-8">
@@ -14,6 +15,7 @@
 // inside NPP_New. We should not leak the instance. See also test_bug854082
 
 SimpleTest.waitForExplicitFinish();
+setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
 
 var i = document.createElement("iframe");
 i.src = "file_bug863792.html";
diff --git a/dom/plugins/test/mochitest/test_busy_hang.xul b/dom/plugins/test/mochitest/test_busy_hang.xul
index f4842c07e921..b385a0ffebe6 100644
--- a/dom/plugins/test/mochitest/test_busy_hang.xul
+++ b/dom/plugins/test/mochitest/test_busy_hang.xul
@@ -10,6 +10,10 @@
           src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
   <script type="application/javascript"
           src="http://mochi.test:8888/chrome/dom/plugins/test/mochitest/hang_test.js" />
+  <script type="application/javascript" src="utils.js"></script>
+  <script type="application/javascript">
+    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
+  </script>
   <body xmlns="http://www.w3.org/1999/xhtml" onload="runTests()">
     <embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
   </body>
diff --git a/dom/plugins/test/mochitest/test_clear_site_data.html b/dom/plugins/test/mochitest/test_clear_site_data.html
index dce7c5cb3f92..749376d8deff 100644
--- a/dom/plugins/test/mochitest/test_clear_site_data.html
+++ b/dom/plugins/test/mochitest/test_clear_site_data.html
@@ -3,8 +3,13 @@
   <title>NPAPI ClearSiteData/GetSitesWithData Functionality</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/ChromeUtils.js"></script>
+  <script type="application/javascript" src="utils.js"></script>
 </head>
 <body>
+  <script type="application/javascript">
+    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
+  </script>
+
   <embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
 
   <script class="testbody" type="application/javascript">
diff --git a/dom/plugins/test/mochitest/test_cocoa_focus.html b/dom/plugins/test/mochitest/test_cocoa_focus.html
index 34026fd21b14..c1f53132017f 100644
--- a/dom/plugins/test/mochitest/test_cocoa_focus.html
+++ b/dom/plugins/test/mochitest/test_cocoa_focus.html
@@ -2,11 +2,13 @@
 <head>
   <title>NPCocoaEventFocusChanged Tests</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="utils.js"></script>
 </head>
 
 <body onload="runTests()">
   <script class="testbody" type="application/javascript">
     SimpleTest.waitForExplicitFinish();
+    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
 
     var gOtherWindow;
 
diff --git a/dom/plugins/test/mochitest/test_cocoa_window_focus.html b/dom/plugins/test/mochitest/test_cocoa_window_focus.html
index 26b149023d13..dc728bd8150d 100644
--- a/dom/plugins/test/mochitest/test_cocoa_window_focus.html
+++ b/dom/plugins/test/mochitest/test_cocoa_window_focus.html
@@ -2,11 +2,13 @@
 <head>
   <title>NPCocoaEventWindowFocusChanged Tests</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="utils.js"></script>
 </head>
 
 <body onload="runTests()">
   <script class="testbody" type="application/javascript">
     SimpleTest.waitForExplicitFinish();
+    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
 
     var gOtherWindow;
 
diff --git a/dom/plugins/test/mochitest/test_convertpoint.xul b/dom/plugins/test/mochitest/test_convertpoint.xul
index f6d4fbf91f59..4d71777dae06 100644
--- a/dom/plugins/test/mochitest/test_convertpoint.xul
+++ b/dom/plugins/test/mochitest/test_convertpoint.xul
@@ -8,6 +8,10 @@
   <title>NPN_ConvertPoint Tests</title>
   <script type="application/javascript"
           src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
+  <script type="application/javascript" src="utils.js"></script>
+  <script type="application/javascript">
+    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
+  </script>
 <body xmlns="http://www.w3.org/1999/xhtml" onload="runTests()">
 <embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
 </body>
diff --git a/dom/plugins/test/mochitest/test_cookies.html b/dom/plugins/test/mochitest/test_cookies.html
index 7cd22d517fed..6e1934994fd0 100644
--- a/dom/plugins/test/mochitest/test_cookies.html
+++ b/dom/plugins/test/mochitest/test_cookies.html
@@ -2,12 +2,14 @@
 <head>
   <title>NPAPI Cookie Tests</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="utils.js"></script>
 </head>
 
 <body onload="runTests()">
-  <embed id="plugin1" type="application/x-test" width="400" height="400"></embed>
   <script class="testbody" type="application/javascript">
     SimpleTest.waitForExplicitFinish();
+    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
+
     function runTests() {
       var pluginElement = document.getElementById("plugin1");
       pluginElement.setCookie("foo");
@@ -15,5 +17,7 @@
       SimpleTest.finish();
     }
   </script>
+
+  <embed id="plugin1" type="application/x-test" width="400" height="400"></embed>
 </body>
 </html>
diff --git a/dom/plugins/test/mochitest/test_copyText.html b/dom/plugins/test/mochitest/test_copyText.html
index 032c94c27f31..86e67da81df2 100644
--- a/dom/plugins/test/mochitest/test_copyText.html
+++ b/dom/plugins/test/mochitest/test_copyText.html
@@ -3,6 +3,7 @@
 <head>
   <title>Test copying text from browser to plugin</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="utils.js"></script>
 
   <script class="testbody" type="text/javascript">
 function runTests() {
@@ -23,6 +24,7 @@ function runTests() {
 }
 
 SimpleTest.waitForExplicitFinish();
+setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
 
   </script>
 </head>
diff --git a/dom/plugins/test/mochitest/test_crash_nested_loop.html b/dom/plugins/test/mochitest/test_crash_nested_loop.html
index 702a3bf69935..2d20e63db7a7 100644
--- a/dom/plugins/test/mochitest/test_crash_nested_loop.html
+++ b/dom/plugins/test/mochitest/test_crash_nested_loop.html
@@ -1,10 +1,12 @@
 <head>
   <title>Plugin crashing in nested loop</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="utils.js"></script>
 
 <body>
   <script class="testbody" type="application/javascript">
   SimpleTest.waitForExplicitFinish();
+  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
 
   window.frameLoaded = function frameLoaded_toCrash() {
     if (!SimpleTest.testPluginIsOOP()) {
diff --git a/dom/plugins/test/mochitest/test_crash_notify.xul b/dom/plugins/test/mochitest/test_crash_notify.xul
index 230cc283dd28..3186c842b35b 100644
--- a/dom/plugins/test/mochitest/test_crash_notify.xul
+++ b/dom/plugins/test/mochitest/test_crash_notify.xul
@@ -8,6 +8,10 @@
   <title>Plugin Crash Notification Test</title>
   <script type="application/javascript"
           src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
+  <script type="application/javascript" src="utils.js"></script>
+  <script type="application/javascript">
+    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
+  </script>
 <body xmlns="http://www.w3.org/1999/xhtml" onload="runTests()">
 <embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
 </body>
diff --git a/dom/plugins/test/mochitest/test_crash_notify_no_report.xul b/dom/plugins/test/mochitest/test_crash_notify_no_report.xul
index 9f3a1429aa72..3e0a64e745de 100644
--- a/dom/plugins/test/mochitest/test_crash_notify_no_report.xul
+++ b/dom/plugins/test/mochitest/test_crash_notify_no_report.xul
@@ -8,6 +8,10 @@
   <title>Plugin Crash Notification Test</title>
   <script type="application/javascript"
           src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
+  <script type="application/javascript" src="utils.js"></script>
+  <script type="application/javascript">
+    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
+  </script>
 <body xmlns="http://www.w3.org/1999/xhtml" onload="runTests()">
 <embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
 </body>
diff --git a/dom/plugins/test/mochitest/test_crash_submit.xul b/dom/plugins/test/mochitest/test_crash_submit.xul
index 78a3ec1ce436..ba8044f38e23 100644
--- a/dom/plugins/test/mochitest/test_crash_submit.xul
+++ b/dom/plugins/test/mochitest/test_crash_submit.xul
@@ -10,6 +10,10 @@
           src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
   <script type="application/javascript"
           src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js" />
+  <script type="application/javascript" src="utils.js"></script>
+  <script type="application/javascript">
+    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
+  </script>
 <body xmlns="http://www.w3.org/1999/xhtml" onload="runTests()">
 <embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
 </body>
diff --git a/dom/plugins/test/mochitest/test_crashing.html b/dom/plugins/test/mochitest/test_crashing.html
index 3878ff0943f3..4fa6f7bb549a 100644
--- a/dom/plugins/test/mochitest/test_crashing.html
+++ b/dom/plugins/test/mochitest/test_crashing.html
@@ -1,10 +1,12 @@
 <head>
   <title>Plugin crashing</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="utils.js"></script>
 
 <body>
   <script class="testbody" type="application/javascript">
   SimpleTest.waitForExplicitFinish();
+  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
 
   window.frameLoaded = function frameLoaded_toCrash() {
    if (!SimpleTest.testPluginIsOOP()) {
diff --git a/dom/plugins/test/mochitest/test_crashing2.html b/dom/plugins/test/mochitest/test_crashing2.html
index a04e5530f7f5..7da236af068b 100644
--- a/dom/plugins/test/mochitest/test_crashing2.html
+++ b/dom/plugins/test/mochitest/test_crashing2.html
@@ -1,12 +1,14 @@
 <head>
   <title>Plugin crashing</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="utils.js"></script>
 
 <body onload="mainLoaded()">
   <iframe id="iframe1" src="about:blank" width="600" height="600"></iframe>
 
   <script class="testbody" type="application/javascript">
   SimpleTest.waitForExplicitFinish();
+  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
 
   var iframe = document.getElementById('iframe1');
 
diff --git a/dom/plugins/test/mochitest/test_defaultValue.html b/dom/plugins/test/mochitest/test_defaultValue.html
index 1960cc7bdc14..d886aed6d61e 100644
--- a/dom/plugins/test/mochitest/test_defaultValue.html
+++ b/dom/plugins/test/mochitest/test_defaultValue.html
@@ -3,15 +3,15 @@
     <title>NPObject [[DefaultValue]] implementation</title>
 
     <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+    <script type="text/javascript" src="utils.js"></script>
     <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
   </head>
 
   <body onload="run()">
 
-    <embed id="plugin" type="application/x-test" wmode="window"></embed>
-
     <script class="testbody" type="application/javascript">
       SimpleTest.waitForExplicitFinish();
+      setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
 
       function run() {
         var plugin = document.getElementById("plugin");
@@ -32,5 +32,7 @@
         SimpleTest.finish();
       }
     </script>
+
+    <embed id="plugin" type="application/x-test" wmode="window"></embed>
   </body>
 </html>
diff --git a/dom/plugins/test/mochitest/test_enumerate.html b/dom/plugins/test/mochitest/test_enumerate.html
index 0d7ad96ce839..035c42eb5aae 100644
--- a/dom/plugins/test/mochitest/test_enumerate.html
+++ b/dom/plugins/test/mochitest/test_enumerate.html
@@ -2,17 +2,17 @@
 <head>
   <title>NPAPI Cookie Tests</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="utils.js"></script>
 
   <link rel="stylesheet" type="text/css" 
         href="/tests/SimpleTest/test.css" />
 </head>
 
 <body onload="runTests()">
-  <p id="display"></p>
-
-  <embed id="plugin1" type="application/x-test" width="400" height="400"></embed>
   <script class="testbody" type="application/javascript">
     SimpleTest.waitForExplicitFinish();
+    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
+
     function runTests() {
       var pluginElement = document.getElementById("plugin1");
       var c = 0;
@@ -28,5 +28,9 @@
       SimpleTest.finish();
     }
   </script>
+
+  <p id="display"></p>
+
+  <embed id="plugin1" type="application/x-test" width="400" height="400"></embed>
 </body>
 </html>
diff --git a/dom/plugins/test/mochitest/test_fullpage.html b/dom/plugins/test/mochitest/test_fullpage.html
index 5a348cde0d11..18ef16380d93 100644
--- a/dom/plugins/test/mochitest/test_fullpage.html
+++ b/dom/plugins/test/mochitest/test_fullpage.html
@@ -3,6 +3,7 @@
 
   <script type="text/javascript"
           src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="utils.js"></script>
   <link rel="stylesheet" type="text/css"
         href="/tests/SimpleTest/test.css">
 
@@ -11,6 +12,7 @@
 
   <script type="application/javascript">
     SimpleTest.waitForExplicitFinish();
+    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
 
     function frameLoaded() {
       var testframe = document.getElementById('testframe');
diff --git a/dom/plugins/test/mochitest/test_getauthenticationinfo.html b/dom/plugins/test/mochitest/test_getauthenticationinfo.html
index 77c725e477b9..6735812112d9 100644
--- a/dom/plugins/test/mochitest/test_getauthenticationinfo.html
+++ b/dom/plugins/test/mochitest/test_getauthenticationinfo.html
@@ -3,6 +3,7 @@
 <head>
   <title>Test for Login Manager</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>  
+  <script type="text/javascript" src="utils.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
@@ -58,6 +59,8 @@ function iframeLoad() {
 }
 
 SimpleTest.waitForExplicitFinish();
+setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
+
 var iframe = document.getElementById("iframe");
 var am = Cc["@mozilla.org/network/http-auth-manager;1"].
          getService(Ci.nsIHttpAuthManager);
diff --git a/dom/plugins/test/mochitest/test_hang_submit.xul b/dom/plugins/test/mochitest/test_hang_submit.xul
index be2fa48a3788..24a26723c2e5 100644
--- a/dom/plugins/test/mochitest/test_hang_submit.xul
+++ b/dom/plugins/test/mochitest/test_hang_submit.xul
@@ -10,6 +10,10 @@
           src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
   <script type="application/javascript"
           src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js" />
+  <script type="application/javascript" src="utils.js"></script>
+  <script type="application/javascript">
+    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
+  </script>
 <body xmlns="http://www.w3.org/1999/xhtml" onload="runTests()">
 <embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
 </body>
diff --git a/dom/plugins/test/mochitest/test_hanging.html b/dom/plugins/test/mochitest/test_hanging.html
index bd4cfa7779c9..cecf0a8ee86e 100644
--- a/dom/plugins/test/mochitest/test_hanging.html
+++ b/dom/plugins/test/mochitest/test_hanging.html
@@ -1,10 +1,12 @@
 <head>
   <title>Plugin hanging</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="utils.js"></script>
 
 <body>
   <script class="testbody" type="application/javascript">
   SimpleTest.waitForExplicitFinish();
+  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
 
   window.frameLoaded = function frameLoaded_toCrash() {
     if (!SimpleTest.testPluginIsOOP()) {
diff --git a/dom/plugins/test/mochitest/test_idle_hang.xul b/dom/plugins/test/mochitest/test_idle_hang.xul
index e56412ef944f..9c551be34b4f 100644
--- a/dom/plugins/test/mochitest/test_idle_hang.xul
+++ b/dom/plugins/test/mochitest/test_idle_hang.xul
@@ -10,6 +10,10 @@
           src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
   <script type="application/javascript"
           src="http://mochi.test:8888/chrome/dom/plugins/test/mochitest/hang_test.js" />
+  <script type="application/javascript" src="utils.js"></script>
+  <script type="application/javascript">
+    getTestPlugin().enabledState = Ci.nsIPluginTag.STATE_ENABLED;
+  </script>
 <body xmlns="http://www.w3.org/1999/xhtml" onload="runTests()">
 <embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
 </body>
diff --git a/dom/plugins/test/mochitest/test_instance_re-parent.html b/dom/plugins/test/mochitest/test_instance_re-parent.html
index 3eb2d722f19f..fd2d1f9676b2 100644
--- a/dom/plugins/test/mochitest/test_instance_re-parent.html
+++ b/dom/plugins/test/mochitest/test_instance_re-parent.html
@@ -5,27 +5,17 @@
   <script type="text/javascript" src="/MochiKit/packed.js"></script>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+  <script type="text/javascript" src="utils.js"></script>
 </head>
 <body onload="begin()">
-  <p id="display"></p>
-
-  <div id="div1">
-    <!-- This embed has to have a "src" attribute. Part of this test involves seeing if we
-         properly restart plugins that have been added back to a document without a change
-         in URL. Not re-loading an object when the URL hasn't changed is a shortcut used for
-         some object types. Without a URL, this won't be tested. -->
-    <embed id="plugin1" src="loremipsum.txt" type="application/x-test" width="200" height="200"></embed>
-  </div>
-  <div id="div2">
-  </div>
-
   <script type="application/javascript;version=1.8">
   SimpleTest.waitForExplicitFinish();
+  getTestPlugin().enabledState = SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED;
 
   var exceptionThrown = false;
-  var p = document.getElementById('plugin1');
-  var d1 = document.getElementById('div1');
-  var d2 = document.getElementById('div2');
+  var p = null;
+  var d1 = null;
+  var d2 = null;
 
   var destroyed = false;
 
@@ -49,6 +39,10 @@
   }
 
   function runTests(callback) {
+    p = document.getElementById('plugin1');
+    d1 = document.getElementById('div1');
+    d2 = document.getElementById('div2');
+
     // First tests involve moving the instance from one div to another.
     p.startWatchingInstanceCount();
     p.callOnDestroy(function() {
@@ -96,5 +90,17 @@
     });
   }
   </script>
+
+  <p id="display"></p>
+
+  <div id="div1">
+    <!-- This embed has to have a "src" attribute. Part of this test involves seeing if we
+         properly restart plugins that have been added back to a document without a change
+         in URL. Not re-loading an object when the URL hasn't changed is a shortcut used for
+         some object types. Without a URL, this won't be tested. -->
+    <embed id="plugin1" src="loremipsum.txt" type="application/x-test" width="200" height="200"></embed>
+  </div>
+  <div id="div2">
+  </div>
 </body>
 </html>
diff --git a/dom/plugins/test/mochitest/test_instance_unparent1.html b/dom/plugins/test/mochitest/test_instance_unparent1.html
index a9dea72489a2..b8d42addd0d3 100644
--- a/dom/plugins/test/mochitest/test_instance_unparent1.html
+++ b/dom/plugins/test/mochitest/test_instance_unparent1.html
@@ -4,17 +4,13 @@
   <title>Test removing an instance's DOM node</title>
   <script type="text/javascript" src="/MochiKit/packed.js"></script>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="utils.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body onload="startTest()">
-  <p id="display"></p>
-
-  <div id="div1">
-    <embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
-  </div>
-
   <script type="application/javascript;version=1.8">
   SimpleTest.waitForExplicitFinish();
+  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
 
   var destroyed = false;
   function onDestroy() {
@@ -37,5 +33,11 @@
     d1.removeChild(p1);
   }
   </script>
+
+  <p id="display"></p>
+
+  <div id="div1">
+    <embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
+  </div>
 </body>
 </html>
diff --git a/dom/plugins/test/mochitest/test_instance_unparent2.html b/dom/plugins/test/mochitest/test_instance_unparent2.html
index 7756c0e2db32..6b251b896ec3 100644
--- a/dom/plugins/test/mochitest/test_instance_unparent2.html
+++ b/dom/plugins/test/mochitest/test_instance_unparent2.html
@@ -4,23 +4,13 @@
   <title>Test removing an instance's DOM node</title>
   <script type="text/javascript" src="/MochiKit/packed.js"></script>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="utils.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body onload="startTest()">
-  <p id="display"></p>
-
-  <div id="div1">
-    <embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
-  </div>
-
-  <div id="div2">
-    <div id="div3">
-        <embed id="plugin2" type="application/x-test" width="200" height="200"></embed>
-    </div>
-  </div>
-
   <script type="application/javascript;version=1.8">
   SimpleTest.waitForExplicitFinish();
+  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
 
   var destroyed = false;
   function onDestroy() {
@@ -46,5 +36,17 @@
     d1.removeChild(p1);
   }
   </script>
+
+  <p id="display"></p>
+
+  <div id="div1">
+    <embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
+  </div>
+
+  <div id="div2">
+    <div id="div3">
+        <embed id="plugin2" type="application/x-test" width="200" height="200"></embed>
+    </div>
+  </div>
 </body>
 </html>
diff --git a/dom/plugins/test/mochitest/test_instance_unparent3.html b/dom/plugins/test/mochitest/test_instance_unparent3.html
index 92f8e89765e7..8e454e784aad 100644
--- a/dom/plugins/test/mochitest/test_instance_unparent3.html
+++ b/dom/plugins/test/mochitest/test_instance_unparent3.html
@@ -4,19 +4,13 @@
   <title>Test removing an instance's DOM node</title>
   <script type="text/javascript" src="/MochiKit/packed.js"></script>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="utils.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body onload="startTest()">
-  <p id="display"></p>
-
-  <div id="div1">
-    <div id="div2">
-      <embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
-    </div<
-  </div>
-
   <script type="application/javascript;version=1.8">
   SimpleTest.waitForExplicitFinish();
+  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
 
   var destroyed = false;
   function onDestroy() {
@@ -40,5 +34,13 @@
     d1.removeChild(d2);
   }
   </script>
+
+  <p id="display"></p>
+
+  <div id="div1">
+    <div id="div2">
+      <embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
+    </div<
+  </div>
 </body>
 </html>
diff --git a/dom/plugins/test/mochitest/test_instantiation.html b/dom/plugins/test/mochitest/test_instantiation.html
index 732cf5e073ff..d84d39ebdd30 100644
--- a/dom/plugins/test/mochitest/test_instantiation.html
+++ b/dom/plugins/test/mochitest/test_instantiation.html
@@ -1,12 +1,14 @@
 <head>
   <title>Plugin instantiation</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="utils.js"></script>
 
 <body onload="mainLoaded()">
   <iframe id="iframe1" src="about:blank" width="600" height="600"></iframe>
 
   <script class="testbody" type="application/javascript">
   SimpleTest.waitForExplicitFinish();
+  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
 
   var iframe = document.getElementById('iframe1');
 
diff --git a/dom/plugins/test/mochitest/test_multipleinstanceobjects.html b/dom/plugins/test/mochitest/test_multipleinstanceobjects.html
index 7428271052b3..eb54ecec6710 100644
--- a/dom/plugins/test/mochitest/test_multipleinstanceobjects.html
+++ b/dom/plugins/test/mochitest/test_multipleinstanceobjects.html
@@ -1,13 +1,12 @@
 <head>
   <title>NPNV*NPObject accessibility tests</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="utils.js"></script>
 
 <body onload="runTests()">
-  <embed id="plugin1" type="application/x-test" width="400" height="400"></embed>
-  <embed id="plugin2" type="application/x-test" width="400" height="400"></embed>
-
   <script class="testbody" type="application/javascript">
   SimpleTest.waitForExplicitFinish();
+  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
 
   function runTests() {
     var p1 = document.getElementById('plugin1');
@@ -20,3 +19,6 @@
     SimpleTest.finish();
   }
   </script>
+
+  <embed id="plugin1" type="application/x-test" width="400" height="400"></embed>
+  <embed id="plugin2" type="application/x-test" width="400" height="400"></embed>
diff --git a/dom/plugins/test/mochitest/test_newstreamondestroy.html b/dom/plugins/test/mochitest/test_newstreamondestroy.html
index 811465ae8efb..9f1c56beeb2d 100644
--- a/dom/plugins/test/mochitest/test_newstreamondestroy.html
+++ b/dom/plugins/test/mochitest/test_newstreamondestroy.html
@@ -1,17 +1,15 @@
 <head>
   <title>NPN_GetURL called from NPP_Destroy</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="utils.js"></script>
 
   <link rel="stylesheet" type="text/css"
 	href="/tests/SimpleTest/test.css">
 
 <body onload="runTest()">
-  <p id="display"></p>
-
-  <embed id="plugin1" type="application/x-test"></embed>
-
   <script class="testbody" type="application/javascript">
   SimpleTest.waitForExplicitFinish();
+  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
 
   function runTest() {
     var p = document.getElementById('plugin1');
@@ -31,3 +29,7 @@
     }, 1000);
   }
   </script>
+
+  <p id="display"></p>
+
+  <embed id="plugin1" type="application/x-test"></embed>
diff --git a/dom/plugins/test/mochitest/test_npn_asynccall.html b/dom/plugins/test/mochitest/test_npn_asynccall.html
index 64dc5bfcd62c..14617aa5f277 100644
--- a/dom/plugins/test/mochitest/test_npn_asynccall.html
+++ b/dom/plugins/test/mochitest/test_npn_asynccall.html
@@ -3,19 +3,16 @@
   <title>NPN_AsyncCallback Tests</title>
   <script type="text/javascript" 
           src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="utils.js"></script>
   <link rel="stylesheet" type="text/css" 
         href="/tests/SimpleTest/test.css" />
 </head>
 <body onload="runTests()">
-  <p id="display"></p>
-
-  <embed id="plugin1" type="application/x-test" width="400" height="100">
-  </embed>
-
   <script class="testbody" type="application/javascript">
   
   SimpleTest.waitForExplicitFinish();
-  
+  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
+
   function asyncTestsComplete(result) {
     ok(result, "asyncCallback tests completed");
     SimpleTest.finish();
@@ -26,6 +23,11 @@
     plugin.asyncCallbackTest("asyncTestsComplete");
   }
   </script>
-  
+
+  <p id="display"></p>
+
+  <embed id="plugin1" type="application/x-test" width="400" height="100">
+  </embed>
+
  </body>
  </html>
diff --git a/dom/plugins/test/mochitest/test_npn_timers.html b/dom/plugins/test/mochitest/test_npn_timers.html
index 4d2ad8cac087..076c04f0dace 100644
--- a/dom/plugins/test/mochitest/test_npn_timers.html
+++ b/dom/plugins/test/mochitest/test_npn_timers.html
@@ -3,19 +3,16 @@
   <title>NPN_Timer Tests</title>
   <script type="text/javascript" 
           src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="utils.js"></script>
   <link rel="stylesheet" type="text/css" 
         href="/tests/SimpleTest/test.css" />
 </head>
 <body onload="runTests()">
-  <p id="display"></p>
-
-  <embed id="plugin1" type="application/x-test" width="400" height="100">
-  </embed>
-
   <script class="testbody" type="application/javascript">
   
   SimpleTest.waitForExplicitFinish();
-  
+  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
+
   function pluginTimerTestFinish(result) {
     ok(result, "timer tests completed");
     SimpleTest.finish();
@@ -26,6 +23,11 @@
     plugin.timerTest("pluginTimerTestFinish");
   }
   </script>
-  
+
+  <p id="display"></p>
+
+  <embed id="plugin1" type="application/x-test" width="400" height="100">
+  </embed>
+
  </body>
  </html>
diff --git a/dom/plugins/test/mochitest/test_npobject_getters.html b/dom/plugins/test/mochitest/test_npobject_getters.html
index b6105207a720..4c3a6981477b 100644
--- a/dom/plugins/test/mochitest/test_npobject_getters.html
+++ b/dom/plugins/test/mochitest/test_npobject_getters.html
@@ -1,14 +1,14 @@
 <head>
   <title>NPNV*NPObject accessibility tests</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="utils.js"></script>
 
 <body onload="runTests()">
-  <embed id="plugin1" type="application/x-test" width="400" height="400"></embed>
-
   <script class="testbody" type="application/javascript">
   dump('lastScript');
 
   SimpleTest.waitForExplicitFinish();
+  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
 
   function runTests() {
     ok(document.getElementById('plugin1').pluginFoundElement, "plugin1.pluginFoundElement (NPNVPluginElementNPObject)", document.getElementById('plugin1').pluginFoundElement);
@@ -17,3 +17,5 @@
     SimpleTest.finish();
   }
   </script>
+
+  <embed id="plugin1" type="application/x-test" width="400" height="400"></embed>
diff --git a/dom/plugins/test/mochitest/test_npruntime.xul b/dom/plugins/test/mochitest/test_npruntime.xul
index 7a335500b827..2d8f83ee6714 100644
--- a/dom/plugins/test/mochitest/test_npruntime.xul
+++ b/dom/plugins/test/mochitest/test_npruntime.xul
@@ -8,6 +8,10 @@
   <title>Basic Plugin Tests</title>
   <script type="application/javascript"
           src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
+  <script type="application/javascript" src="utils.js"></script>
+  <script type="application/javascript">
+    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
+  </script>
 <body xmlns="http://www.w3.org/1999/xhtml" onload="runTests()">
 <embed id="plugin1" type="application/x-test" width="400" height="400"></embed>
 </body>
diff --git a/dom/plugins/test/mochitest/test_npruntime_construct.html b/dom/plugins/test/mochitest/test_npruntime_construct.html
index a8845c470e50..f481884f9f96 100644
--- a/dom/plugins/test/mochitest/test_npruntime_construct.html
+++ b/dom/plugins/test/mochitest/test_npruntime_construct.html
@@ -3,9 +3,14 @@
 <head>
   <title>Test whether windowless plugins receive correct visible/invisible notifications.</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="utils.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 
 <body>
+  <script type="text/javascript">
+    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
+  </script>
+
   <p id="display"></p>
 
   <embed id="theplugin" type="application/x-test"></embed>
diff --git a/dom/plugins/test/mochitest/test_npruntime_identifiers.html b/dom/plugins/test/mochitest/test_npruntime_identifiers.html
index 158c9638ff7a..cba0355440c1 100644
--- a/dom/plugins/test/mochitest/test_npruntime_identifiers.html
+++ b/dom/plugins/test/mochitest/test_npruntime_identifiers.html
@@ -3,6 +3,7 @@
   <title>NPN_Invoke Tests</title>
   <script type="text/javascript" 
           src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="utils.js"></script>
   <link rel="stylesheet" type="text/css" 
         href="/tests/SimpleTest/test.css" />
 </head>
@@ -15,6 +16,7 @@
   // that identifiers are translated to values correctly.
   
   SimpleTest.waitForExplicitFinish();
+  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
 
   var testsRun = 0;
 
diff --git a/dom/plugins/test/mochitest/test_npruntime_npnevaluate.html b/dom/plugins/test/mochitest/test_npruntime_npnevaluate.html
index f365b2d83934..1223c55e859e 100644
--- a/dom/plugins/test/mochitest/test_npruntime_npnevaluate.html
+++ b/dom/plugins/test/mochitest/test_npruntime_npnevaluate.html
@@ -3,18 +3,15 @@
   <title>NPN_Evaluate Tests</title>
   <script type="text/javascript" 
           src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="utils.js"></script>
   <link rel="stylesheet" type="text/css" 
         href="/tests/SimpleTest/test.css" />
 </head>
 <body onload="runTests()">
-  <p id="display"></p>
-
-  <embed id="plugin1" type="application/x-test" width="400" height="100">
-  </embed>
-
   <script class="testbody" type="application/javascript">
   
   SimpleTest.waitForExplicitFinish();
+  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
   
   // global test function
   function testMe(arg) {
@@ -33,25 +30,26 @@
   // members:  the first is a string to eval, and the second is 
   // the expected result of the eval.
   //
-  var tests = [
-    ["3", 3],
-    ["3 + 3", 6],
-    ["'3'", "3"],
-    ["function test() { return 3; } test();", 3],
-    ["testMe(3)", 6],
-    ["testMe(new Object(3))", 6],
-    ["new Object(3)", new Object(3)],
-    ["new Array(1, 2, 3, 4)", [1, 2, 3, 4]],
-    ["document.getElementById('display')", 
-        document.getElementById("display")],
-    ["encodeURI('a = b')", "a%20=%20b"],
-    ["document.getElementById('testdiv').innerHTML = 'Hello world!'", 
-        "Hello world!"],
-    ["function test2() { var x = {a: '1', b: '2'}; return x; } test2();", 
-        {a: '1', b: '2'}],
-  ];
- 
+
   function runTests() {
+    var tests = [
+      ["3", 3],
+      ["3 + 3", 6],
+      ["'3'", "3"],
+      ["function test() { return 3; } test();", 3],
+      ["testMe(3)", 6],
+      ["testMe(new Object(3))", 6],
+      ["new Object(3)", new Object(3)],
+      ["new Array(1, 2, 3, 4)", [1, 2, 3, 4]],
+      ["document.getElementById('display')", 
+          document.getElementById("display")],
+      ["encodeURI('a = b')", "a%20=%20b"],
+      ["document.getElementById('testdiv').innerHTML = 'Hello world!'", 
+          "Hello world!"],
+      ["function test2() { var x = {a: '1', b: '2'}; return x; } test2();", 
+          {a: '1', b: '2'}],
+    ];
+
     var plugin = document.getElementById("plugin1");
 
     // Test calling NPN_Evaluate from within plugin code.
@@ -88,7 +86,12 @@
     SimpleTest.finish();
   }
   </script>
-  
+
+  <p id="display"></p>
+
+  <embed id="plugin1" type="application/x-test" width="400" height="100">
+  </embed>
+
   <div id="verbose">
   </div>
   <div id="testdiv">
diff --git a/dom/plugins/test/mochitest/test_npruntime_npninvoke.html b/dom/plugins/test/mochitest/test_npruntime_npninvoke.html
index 885266c2a9a7..86eb04c23714 100644
--- a/dom/plugins/test/mochitest/test_npruntime_npninvoke.html
+++ b/dom/plugins/test/mochitest/test_npruntime_npninvoke.html
@@ -3,14 +3,11 @@
   <title>NPN_Invoke Tests</title>
   <script type="text/javascript" 
           src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="utils.js"></script>
   <link rel="stylesheet" type="text/css" 
         href="/tests/SimpleTest/test.css" />
 </head>
 <body onload="runTests()">
-  <p id="display"></p>
-
-  <embed id="plugin1" type="application/x-test" width="400" height="100">
-  </embed>
 
   <script class="testbody" type="application/javascript">
   ////
@@ -22,6 +19,7 @@
   //
   
   SimpleTest.waitForExplicitFinish();
+  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
 
   // This function returns all the arguments passed to it, either as a
   // single variable (in the caes of 1 argument), or as an array.
@@ -152,7 +150,12 @@
     SimpleTest.finish();
   }
   </script>
-  
+
+  <p id="display"></p>
+
+  <embed id="plugin1" type="application/x-test" width="400" height="100">
+  </embed>
+
   <div id="verbose">
   </div>
  </body>
diff --git a/dom/plugins/test/mochitest/test_npruntime_npninvokedefault.html b/dom/plugins/test/mochitest/test_npruntime_npninvokedefault.html
index bb24d3b20de6..597db0cc1c96 100644
--- a/dom/plugins/test/mochitest/test_npruntime_npninvokedefault.html
+++ b/dom/plugins/test/mochitest/test_npruntime_npninvokedefault.html
@@ -3,19 +3,16 @@
   <title>NPN_Invoke_Default Tests</title>
   <script type="text/javascript" 
           src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="utils.js"></script>
   <link rel="stylesheet" type="text/css" 
         href="/tests/SimpleTest/test.css" />
 </head>
 <body onload="runTests()">
-  <p id="display"></p>
-
-  <embed id="plugin1" type="application/x-test" width="400" height="100">
-  </embed>
-
   <script class="testbody" type="application/javascript">
   
   SimpleTest.waitForExplicitFinish();
-  
+  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
+
   // global test function
   function testMe(arg) {
     var result = arg+arg;
@@ -144,7 +141,12 @@
     SimpleTest.finish();
   }
   </script>
-  
+
+  <p id="display"></p>
+
+  <embed id="plugin1" type="application/x-test" width="400" height="100">
+  </embed>
+
   <div id="verbose">
   </div>
  </body>
diff --git a/dom/plugins/test/mochitest/test_npruntime_npnsetexception.html b/dom/plugins/test/mochitest/test_npruntime_npnsetexception.html
index e5de74cefc7d..a926a2ad19c6 100644
--- a/dom/plugins/test/mochitest/test_npruntime_npnsetexception.html
+++ b/dom/plugins/test/mochitest/test_npruntime_npnsetexception.html
@@ -3,17 +3,14 @@
   <title>NPN_SetException Tests</title>
   <script type="text/javascript" 
           src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="utils.js"></script>
   <link rel="stylesheet" type="text/css" 
         href="/tests/SimpleTest/test.css" />
 </head>
 <body onload="runTests()">
-  <p id="display"></p>
-
-  <embed id="plugin1" type="application/x-test" width="400" height="100">
-  </embed>
-
   <script class="testbody" type="application/javascript">
   SimpleTest.waitForExplicitFinish();
+  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
 
   function runTests() {
     // test a single exception thrown in scriptable invoke
@@ -50,7 +47,12 @@
     SimpleTest.finish();
   }
   </script>
-  
+
+  <p id="display"></p>
+
+  <embed id="plugin1" type="application/x-test" width="400" height="100">
+  </embed>
+
   <div id="verbose">
   </div>
  </body>
diff --git a/dom/plugins/test/mochitest/test_painting.html b/dom/plugins/test/mochitest/test_painting.html
index a8a6e973f15b..44bbeb3f274c 100644
--- a/dom/plugins/test/mochitest/test_painting.html
+++ b/dom/plugins/test/mochitest/test_painting.html
@@ -37,23 +37,11 @@
   </style>
 </head>
 <body onload="initialize()">
-<p id="display"></p>
-<div id="container">
-  <embed id="paint-waiter" type="application/x-test"/>
-  <div id="clip">
-    <embed id="clipped" type="application/x-test"
-           drawmode="solid" color="FF808080"/>
-  </div>
-</div>
-<div id="content" style="display: none">
-
-</div>
-<pre id="test">
-</pre>
 
 <script type="application/javascript" src="utils.js"></script>
 <script type="application/javascript">
 SimpleTest.waitForExplicitFinish();
+setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
 
 var paint_waiter;
 var clip;
@@ -113,5 +101,20 @@ function waitForPaintHelper(func) {
 }
 
 </script>
+
+<p id="display"></p>
+<div id="container">
+  <embed id="paint-waiter" type="application/x-test"/>
+  <div id="clip">
+    <embed id="clipped" type="application/x-test"
+           drawmode="solid" color="FF808080"/>
+  </div>
+</div>
+<div id="content" style="display: none">
+
+</div>
+<pre id="test">
+</pre>
+
 </body>
 </html>
diff --git a/dom/plugins/test/mochitest/test_plugin_scroll_painting.html b/dom/plugins/test/mochitest/test_plugin_scroll_painting.html
index e065e9f6558a..cfb363125c77 100644
--- a/dom/plugins/test/mochitest/test_plugin_scroll_painting.html
+++ b/dom/plugins/test/mochitest/test_plugin_scroll_painting.html
@@ -3,6 +3,10 @@
 <head>
   <title>Test that scrolling a windowless plugin doesn't force us to repaint it</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="utils.js"></script>
+  <script type="text/javascript">
+    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
+  </script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body onload="runTest()">
diff --git a/dom/plugins/test/mochitest/test_plugin_tag_clicktoplay.html b/dom/plugins/test/mochitest/test_plugin_tag_clicktoplay.html
index 27bb8a07fdb0..fcc84fdd59e2 100644
--- a/dom/plugins/test/mochitest/test_plugin_tag_clicktoplay.html
+++ b/dom/plugins/test/mochitest/test_plugin_tag_clicktoplay.html
@@ -5,30 +5,30 @@
     <title>Test Modifying Plugin click-to-play Flag</title>
     <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
     <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/ChromeUtils.js"></script>
+    <script type="application/javascript" src="utils.js"></script>
   </head>
   <body>
     <script class="testbody" type="application/javascript">
       Components.utils.import("resource://gre/modules/Services.jsm");
+      Services.prefs.setBoolPref("plugins.click_to_play", true);
       var pluginHost = Components.classes["@mozilla.org/plugin/host;1"]
                        .getService(Components.interfaces.nsIPluginHost);
-      is(pluginHost.getStateForType("application/x-test"), Components.interfaces.nsIPluginTag.STATE_ENABLED, "click-to-play should be off to begin with");
-      Services.prefs.setBoolPref("plugins.click_to_play", true);
 
-      var pluginTags = pluginHost.getPluginTags();
-      var testPlugin = null;
-      for (var plugin of pluginTags) {
-        if (plugin.name == "Test Plug-in") {
-          testPlugin = plugin;
-          break;
-        }
-      }
+      var testPlugin = getTestPlugin();
+      var secondTestPlugin = getTestPlugin("Second Test Plug-in");
       ok(testPlugin, "Should have Test Plug-in");
-      testPlugin.enabledState = Components.interfaces.nsIPluginTag.STATE_CLICKTOPLAY;
-      is(pluginHost.getStateForType("application/x-test"), Components.interfaces.nsIPluginTag.STATE_CLICKTOPLAY, "click-to-play should be on for Test Plug-in now");
-      is(pluginHost.getStateForType("application/x-second-test"), Components.interfaces.nsIPluginTag.STATE_ENABLED, "click-to-play should still be off for the Second Test Plug-in");
+      ok(secondTestPlugin, "Should have Second Test Plug-in");
+
+      // make sure both start off as click-to-play
+      setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_CLICKTOPLAY);
+      setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_CLICKTOPLAY, "Second Test Plug-in");
 
       testPlugin.enabledState = Components.interfaces.nsIPluginTag.STATE_ENABLED;
       is(pluginHost.getStateForType("application/x-test"), Components.interfaces.nsIPluginTag.STATE_ENABLED, "click-to-play should be off for Test Plug-in now");
+      is(pluginHost.getStateForType("application/x-second-test"), Components.interfaces.nsIPluginTag.STATE_CLICKTOPLAY, "click-to-play should still be on for the Second Test Plug-in");
+
+      testPlugin.enabledState = Components.interfaces.nsIPluginTag.STATE_CLICKTOPLAY;
+      is(pluginHost.getStateForType("application/x-test"), Components.interfaces.nsIPluginTag.STATE_CLICKTOPLAY, "click-to-play should be on for Test Plug-in now");
 
       Services.prefs.clearUserPref("plugins.click_to_play");
     </script>
diff --git a/dom/plugins/test/mochitest/test_pluginstream_asfile.html b/dom/plugins/test/mochitest/test_pluginstream_asfile.html
index 1418479510c5..af7110b6a5a5 100644
--- a/dom/plugins/test/mochitest/test_pluginstream_asfile.html
+++ b/dom/plugins/test/mochitest/test_pluginstream_asfile.html
@@ -5,6 +5,10 @@
           src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" 
           src="pluginstream.js"></script>
+  <script type="text/javascript" src="utils.js"></script>
+  <script type="text/javascript">
+    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
+  </script>
   <link rel="stylesheet" type="text/css" 
         href="/tests/SimpleTest/test.css" />
 </head>
diff --git a/dom/plugins/test/mochitest/test_pluginstream_asfileonly.html b/dom/plugins/test/mochitest/test_pluginstream_asfileonly.html
index 05dcd1df1535..be49cc4601c1 100644
--- a/dom/plugins/test/mochitest/test_pluginstream_asfileonly.html
+++ b/dom/plugins/test/mochitest/test_pluginstream_asfileonly.html
@@ -5,6 +5,10 @@
           src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" 
           src="pluginstream.js"></script>
+  <script type="text/javascript" src="utils.js"></script>
+  <script type="text/javascript">
+    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
+  </script>
   <link rel="stylesheet" type="text/css" 
         href="/tests/SimpleTest/test.css" />
 </head>
diff --git a/dom/plugins/test/mochitest/test_pluginstream_err.html b/dom/plugins/test/mochitest/test_pluginstream_err.html
index 8e8d234c44b3..dc5d598f3998 100644
--- a/dom/plugins/test/mochitest/test_pluginstream_err.html
+++ b/dom/plugins/test/mochitest/test_pluginstream_err.html
@@ -9,6 +9,7 @@ Tests for plugin stream error conditions.
   <title>NPAPI Stream Error Tests</title>
   <script type="text/javascript" 
           src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="utils.js"></script>
   <link rel="stylesheet" type="text/css" 
         href="/tests/SimpleTest/test.css" />
 </head>
@@ -32,6 +33,7 @@ Tests for plugin stream error conditions.
 function $(id) { return document.getElementById(id); }
 
 SimpleTest.waitForExplicitFinish();
+setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
 
 
 var tests = [
diff --git a/dom/plugins/test/mochitest/test_pluginstream_geturl.html b/dom/plugins/test/mochitest/test_pluginstream_geturl.html
index 36c8c7ac1b0f..12de91f70e3e 100644
--- a/dom/plugins/test/mochitest/test_pluginstream_geturl.html
+++ b/dom/plugins/test/mochitest/test_pluginstream_geturl.html
@@ -5,6 +5,10 @@
           src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" 
           src="pluginstream.js"></script>
+  <script type="text/javascript" src="utils.js"></script>
+  <script type="text/javascript">
+    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
+  </script>
   <link rel="stylesheet" type="text/css" 
         href="/tests/SimpleTest/test.css" />
 </head>
diff --git a/dom/plugins/test/mochitest/test_pluginstream_geturlnotify.html b/dom/plugins/test/mochitest/test_pluginstream_geturlnotify.html
index 58def7682c3a..07a813d6f4bf 100644
--- a/dom/plugins/test/mochitest/test_pluginstream_geturlnotify.html
+++ b/dom/plugins/test/mochitest/test_pluginstream_geturlnotify.html
@@ -5,6 +5,10 @@
           src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" 
           src="pluginstream.js"></script>
+  <script type="text/javascript" src="utils.js"></script>
+  <script type="text/javascript">
+    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
+  </script>
   <link rel="stylesheet" type="text/css" 
         href="/tests/SimpleTest/test.css" />
 </head>
diff --git a/dom/plugins/test/mochitest/test_pluginstream_newstream.html b/dom/plugins/test/mochitest/test_pluginstream_newstream.html
index f03d59fb28e4..a499196f0d24 100644
--- a/dom/plugins/test/mochitest/test_pluginstream_newstream.html
+++ b/dom/plugins/test/mochitest/test_pluginstream_newstream.html
@@ -5,6 +5,10 @@
           src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" 
           src="pluginstream.js"></script>
+  <script type="text/javascript" src="utils.js"></script>
+  <script type="text/javascript">
+    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
+  </script>
   <link rel="stylesheet" type="text/css" 
         href="/tests/SimpleTest/test.css" />
 </head>
diff --git a/dom/plugins/test/mochitest/test_pluginstream_post.html b/dom/plugins/test/mochitest/test_pluginstream_post.html
index bf0c0a3e702a..a74e0e6f4254 100644
--- a/dom/plugins/test/mochitest/test_pluginstream_post.html
+++ b/dom/plugins/test/mochitest/test_pluginstream_post.html
@@ -5,6 +5,10 @@
           src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" 
           src="pluginstream.js"></script>
+  <script type="text/javascript" src="utils.js"></script>
+  <script type="text/javascript">
+    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
+  </script>
   <link rel="stylesheet" type="text/css" 
         href="/tests/SimpleTest/test.css" />
 </head>
diff --git a/dom/plugins/test/mochitest/test_pluginstream_poststream.html b/dom/plugins/test/mochitest/test_pluginstream_poststream.html
index 4d642d8357df..f32ff7cf7985 100644
--- a/dom/plugins/test/mochitest/test_pluginstream_poststream.html
+++ b/dom/plugins/test/mochitest/test_pluginstream_poststream.html
@@ -5,6 +5,10 @@
           src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" 
           src="pluginstream.js"></script>
+  <script type="text/javascript" src="utils.js"></script>
+  <script type="text/javascript">
+    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
+  </script>
   <link rel="stylesheet" type="text/css" 
         href="/tests/SimpleTest/test.css" />
 </head>
diff --git a/dom/plugins/test/mochitest/test_pluginstream_referer.html b/dom/plugins/test/mochitest/test_pluginstream_referer.html
index 66cf523b658a..e0b3409928d2 100644
--- a/dom/plugins/test/mochitest/test_pluginstream_referer.html
+++ b/dom/plugins/test/mochitest/test_pluginstream_referer.html
@@ -2,17 +2,14 @@
   <title>Do plugin stream requests send the Referer header correctly?</title>
   <script type="application/javascript"
 	  src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="utils.js"></script>
   <link rel="stylesheet" type="text/css" 
         href="/tests/SimpleTest/test.css" />
 
 <body onload="runTests()">
-  <p id="display"></p>
-
-  <embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
-  <embed id="plugin2" type="application/x-test" src="loremipsum.xtest" width="200" height="200"></embed>
-
   <script class="testbody" type="application/javascript">
   SimpleTest.waitForExplicitFinish();
+  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
 
   var pending = 3;
   function testDone() {
@@ -52,3 +49,7 @@
   }
   </script>
 
+  <p id="display"></p>
+
+  <embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
+  <embed id="plugin2" type="application/x-test" src="loremipsum.xtest" width="200" height="200"></embed>
diff --git a/dom/plugins/test/mochitest/test_pluginstream_seek.html b/dom/plugins/test/mochitest/test_pluginstream_seek.html
index 63b409642457..984d43d3b013 100644
--- a/dom/plugins/test/mochitest/test_pluginstream_seek.html
+++ b/dom/plugins/test/mochitest/test_pluginstream_seek.html
@@ -5,6 +5,10 @@
           src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" 
           src="pluginstream.js"></script>
+  <script type="text/javascript" src="utils.js"></script>
+  <script type="text/javascript">
+    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
+  </script>
   <link rel="stylesheet" type="text/css" 
         href="/tests/SimpleTest/test.css" />
 </head>
diff --git a/dom/plugins/test/mochitest/test_pluginstream_seek_close.html b/dom/plugins/test/mochitest/test_pluginstream_seek_close.html
index af127582f888..07958ddd7b41 100644
--- a/dom/plugins/test/mochitest/test_pluginstream_seek_close.html
+++ b/dom/plugins/test/mochitest/test_pluginstream_seek_close.html
@@ -3,12 +3,14 @@
   <title>NPAPI Seekable NPStream Test</title>
   <script type="text/javascript" 
           src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="utils.js"></script>
   <link rel="stylesheet" type="text/css" 
         href="/tests/SimpleTest/test.css" />
 <script>
   SimpleTest.expectAssertions(0, 1);
 
   SimpleTest.waitForExplicitFinish();
+  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
 
   function frameLoaded() {
     var testframe = document.getElementById('testframe');
diff --git a/dom/plugins/test/mochitest/test_pluginstream_src.html b/dom/plugins/test/mochitest/test_pluginstream_src.html
index 1c4d3a31000d..acbd25ed330e 100644
--- a/dom/plugins/test/mochitest/test_pluginstream_src.html
+++ b/dom/plugins/test/mochitest/test_pluginstream_src.html
@@ -5,6 +5,10 @@
           src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" 
           src="pluginstream.js"></script>
+  <script type="text/javascript" src="utils.js"></script>
+  <script type="text/javascript">
+    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
+  </script>
   <link rel="stylesheet" type="text/css" 
         href="/tests/SimpleTest/test.css" />
 </head>
diff --git a/dom/plugins/test/mochitest/test_pluginstream_src_dynamic.html b/dom/plugins/test/mochitest/test_pluginstream_src_dynamic.html
index 921d36c21b32..b679008a3dcf 100644
--- a/dom/plugins/test/mochitest/test_pluginstream_src_dynamic.html
+++ b/dom/plugins/test/mochitest/test_pluginstream_src_dynamic.html
@@ -5,6 +5,10 @@
           src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" 
           src="pluginstream.js"></script>
+  <script type="text/javascript" src="utils.js"></script>
+  <script type="text/javascript">
+    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
+  </script>
   <link rel="stylesheet" type="text/css" 
         href="/tests/SimpleTest/test.css" />
 </head>
diff --git a/dom/plugins/test/mochitest/test_pluginstream_src_referer.html b/dom/plugins/test/mochitest/test_pluginstream_src_referer.html
index fe85de4d069a..9a191b82c6fa 100644
--- a/dom/plugins/test/mochitest/test_pluginstream_src_referer.html
+++ b/dom/plugins/test/mochitest/test_pluginstream_src_referer.html
@@ -2,6 +2,7 @@
   <title>Do plugin stream src requests send the Referer header correctly?</title>
   <script type="application/javascript"
 	  src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="utils.js"></script>
   <link rel="stylesheet" type="text/css" 
         href="/tests/SimpleTest/test.css" />
 
@@ -10,6 +11,7 @@
 
   <script class="testbody" type="application/javascript">
   SimpleTest.waitForExplicitFinish();
+  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
 
   function frameLoaded() {
     var testframe = document.getElementById('pluginframe');
diff --git a/dom/plugins/test/mochitest/test_positioning.html b/dom/plugins/test/mochitest/test_positioning.html
index 95fa622ab6c9..666a841a73b0 100644
--- a/dom/plugins/test/mochitest/test_positioning.html
+++ b/dom/plugins/test/mochitest/test_positioning.html
@@ -3,6 +3,7 @@
 <head>
   <title>Test whether windowless plugins receive correct visible/invisible notifications.</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="utils.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 
   <style type="text/css">
@@ -14,14 +15,15 @@
 <body onload="startTest()">
   <p id="display"></p>
 
-  <embed id="theplugin" type="application/x-test" width="200" height="200"></embed>
-
   <script type="application/javascript;version=1.8">
   SimpleTest.waitForExplicitFinish();
+  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
 
-  var p = document.getElementById('theplugin');
+  var p = null;
 
   function startTest() {
+    p = document.getElementById('theplugin');
+
     // Wait for the plugin to have painted once
     var interval = setInterval(function() {
       if (!p.getPaintCount())
@@ -50,3 +52,5 @@
     SimpleTest.finish();
   }
   </script>
+
+  <embed id="theplugin" type="application/x-test" width="200" height="200"></embed>
diff --git a/dom/plugins/test/mochitest/test_privatemode_perwindowpb.xul b/dom/plugins/test/mochitest/test_privatemode_perwindowpb.xul
index f60bbb0b065e..c3c42074acb4 100644
--- a/dom/plugins/test/mochitest/test_privatemode_perwindowpb.xul
+++ b/dom/plugins/test/mochitest/test_privatemode_perwindowpb.xul
@@ -10,6 +10,10 @@
           src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
   <script type="application/javascript"
           src="chrome://mochikit/content/chrome-harness.js" />
+  <script type="application/javascript" src="utils.js"></script>
+  <script type="application/javascript">
+    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
+  </script>
 <body xmlns="http://www.w3.org/1999/xhtml" onload="runTests()">
 <embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
 <embed id="plugin2" type="application/x-test" width="200" height="200"></embed>
diff --git a/dom/plugins/test/mochitest/test_propertyAndMethod.html b/dom/plugins/test/mochitest/test_propertyAndMethod.html
index 0aaea9a05a06..db08715a645c 100644
--- a/dom/plugins/test/mochitest/test_propertyAndMethod.html
+++ b/dom/plugins/test/mochitest/test_propertyAndMethod.html
@@ -3,13 +3,12 @@
     <title>NPObject with property and method with the same name</title>
 
     <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+    <script type="text/javascript" src="utils.js"></script>
     <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
   </head>
 
   <body onload="run()">
 
-    <embed id="plugin" type="application/x-test" wmode="window"></embed>
-
     <script class="testbody" type="application/javascript">
       if (typeof Object.getPrototypeOf !== "function") {
         if (typeof "test".__proto__ === "object") {
@@ -25,6 +24,7 @@
       }
 
       SimpleTest.waitForExplicitFinish();
+      setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
 
       function run() {
         var plugin = document.getElementById("plugin");
@@ -45,5 +45,7 @@
         SimpleTest.finish();
       }
     </script>
+
+    <embed id="plugin" type="application/x-test" wmode="window"></embed>
   </body>
 </html>
diff --git a/dom/plugins/test/mochitest/test_queryContentsScaleFactor.html b/dom/plugins/test/mochitest/test_queryContentsScaleFactor.html
index 67692126d834..a3372252c3ea 100644
--- a/dom/plugins/test/mochitest/test_queryContentsScaleFactor.html
+++ b/dom/plugins/test/mochitest/test_queryContentsScaleFactor.html
@@ -2,12 +2,14 @@
 <head>
   <title>NPAPI NPNVcontentsScaleFactor Test</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="utils.js"></script>
 </head>
 
 <body onload="runTests()">
-  <embed id="plugin" type="application/x-test" width="400" height="400"></embed>
   <script class="testbody" type="application/javascript">
     SimpleTest.waitForExplicitFinish();
+    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
+
     function runTests() {
       var pluginElement = document.getElementById("plugin");
       var contentsScaleFactor;
@@ -22,5 +24,7 @@
       SimpleTest.finish();
     }
   </script>
+
+  <embed id="plugin" type="application/x-test" width="400" height="400"></embed>
 </body>
 </html>
diff --git a/dom/plugins/test/mochitest/test_redirect_handling.html b/dom/plugins/test/mochitest/test_redirect_handling.html
index e947d22a7366..cbf1c6c2b63c 100644
--- a/dom/plugins/test/mochitest/test_redirect_handling.html
+++ b/dom/plugins/test/mochitest/test_redirect_handling.html
@@ -2,14 +2,14 @@
 <head>
   <title>Basic NPAPI Redirect Handling</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="utils.js"></script>
 </head>
-<body onload="runNextTest()">
-  <embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
-
+<body onload="runTests()">
   <script class="testbody" type="application/javascript">
     SimpleTest.waitForExplicitFinish();
+    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
 
-    var p = document.getElementById("plugin1");
+    var p = null;
 
     var redirectingURL = "307-xo-redirect.sjs";
     var redirectTargetURL = "http://example.org/tests/dom/plugins/test/mochitest/loremipsum.txt";
@@ -55,6 +55,13 @@
         SimpleTest.finish();
       }
     }
+
+    function runTests() {
+      p = document.getElementById("plugin1");
+      runNextTest();
+    }
   </script>
+
+  <embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
 </body>
 </html>
diff --git a/dom/plugins/test/mochitest/test_refresh_navigator_plugins.html b/dom/plugins/test/mochitest/test_refresh_navigator_plugins.html
index da3fba631b32..3efff30a5b50 100644
--- a/dom/plugins/test/mochitest/test_refresh_navigator_plugins.html
+++ b/dom/plugins/test/mochitest/test_refresh_navigator_plugins.html
@@ -6,10 +6,13 @@
     <title>Test Refreshing navigator.plugins (bug 820708)</title>
     <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
     <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/ChromeUtils.js"></script>
+    <script type="application/javascript" src="utils.js"></script>
   </head>
   <body>
     <script class="testbody" type="application/javascript">
       SimpleTest.waitForExplicitFinish();
+      setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
+
       var pluginHost = Components.classes["@mozilla.org/plugin/host;1"]
                        .getService(Components.interfaces.nsIPluginHost);
       var pluginTags = pluginHost.getPluginTags();
diff --git a/dom/plugins/test/mochitest/test_secondPlugin.html b/dom/plugins/test/mochitest/test_secondPlugin.html
index b71bffb56166..c546439717c0 100644
--- a/dom/plugins/test/mochitest/test_secondPlugin.html
+++ b/dom/plugins/test/mochitest/test_secondPlugin.html
@@ -3,14 +3,15 @@
      <title>Second Test Plug-in Test</title>
 
     <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+    <script type="text/javascript" src="utils.js"></script>
     <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
   </head>
 
   <body onload="run()">
-    <object id="plugin" type="application/x-second-test" width=200 height=200></object>
-
     <script class="testbody" type="application/javascript">
       SimpleTest.waitForExplicitFinish();
+      setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
+      setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED, "Second Test Plug-in");
 
       function run() {
         var foundFirstPlugin = false;
@@ -29,5 +30,7 @@
         SimpleTest.finish();
       }
     </script>
+
+    <object id="plugin" type="application/x-second-test" width=200 height=200></object>
   </body>
 </html>
diff --git a/dom/plugins/test/mochitest/test_src_url_change.html b/dom/plugins/test/mochitest/test_src_url_change.html
index 386a41f67c85..1450e7eeed70 100644
--- a/dom/plugins/test/mochitest/test_src_url_change.html
+++ b/dom/plugins/test/mochitest/test_src_url_change.html
@@ -4,17 +4,13 @@
   <title>Test changing src attribute</title>
   <script type="text/javascript" src="/MochiKit/packed.js"></script>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="utils.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body onload="runTests()">
-  <p id="display"></p>
-
-  <embed id="plugin1" src="about:blank" type="application/x-test" width="200" height="200"></embed>
-
   <script type="application/javascript;version=1.8">
   SimpleTest.waitForExplicitFinish();
-
-  var p = document.getElementById('plugin1');
+  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
 
   var destroyed = false;
   function onDestroy() {
@@ -22,6 +18,8 @@
   }
 
   function runTests() {
+    p = document.getElementById('plugin1');
+
     p.startWatchingInstanceCount();
     p.callOnDestroy(onDestroy);
 
@@ -35,6 +33,10 @@
     SimpleTest.finish();
   }
   </script>
+
+  <p id="display"></p>
+
+  <embed id="plugin1" src="about:blank" type="application/x-test" width="200" height="200"></embed>
 </body>
 </html>
 
diff --git a/dom/plugins/test/mochitest/test_streamNotify.html b/dom/plugins/test/mochitest/test_streamNotify.html
index 390a080e7bf2..a7c7a3186641 100644
--- a/dom/plugins/test/mochitest/test_streamNotify.html
+++ b/dom/plugins/test/mochitest/test_streamNotify.html
@@ -1,12 +1,12 @@
 <head>
   <title>NPN_Get/PostURLNotify tests</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="utils.js"></script>
 
 <body onload="runTests()">
-  <embed id="plugin1" type="application/x-test" width="400" height="400"></embed>
-
   <script class="testbody" type="application/javascript">
   SimpleTest.waitForExplicitFinish();
+  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
 
   var pending = 5;
   function testDone() {
@@ -84,3 +84,5 @@
                      }, null, true), "streamTest GET bad data: URI");
   }
   </script>
+
+  <embed id="plugin1" type="application/x-test" width="400" height="400"></embed>
diff --git a/dom/plugins/test/mochitest/test_streamatclose.html b/dom/plugins/test/mochitest/test_streamatclose.html
index dadf8913957b..9056b04ab907 100644
--- a/dom/plugins/test/mochitest/test_streamatclose.html
+++ b/dom/plugins/test/mochitest/test_streamatclose.html
@@ -3,23 +3,21 @@
   <title>Stream open at NPP_Destroy</title>
   <script type="text/javascript"
 	  src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="utils.js"></script>
   <link rel="stylesheet" type="text/css"
 	href="/tests/SimpleTest/test.css">
 
 <body onload="startTest()">
-  <p id="display"></p>
-
-  <embed id="embedtest"
-	 style="width: 400px; height: 100px;" type="application/x-test"></embed>
-
   <script type="text/javascript">
   SimpleTest.waitForExplicitFinish();
+  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
 
   var urlnotified = false;
 
-  var p = document.getElementById('embedtest');
+  var p = null;
 
   function startTest() {
+    p = document.getElementById('embedtest');
     ok(p.streamTest("neverending.sjs", false, null, null,
                     function(r, t) {
                       is(r, 2, "Stream should have failed");
@@ -40,3 +38,8 @@
   }
 
   </script>
+
+  <p id="display"></p>
+
+  <embed id="embedtest"
+   style="width: 400px; height: 100px;" type="application/x-test"></embed>
\ No newline at end of file
diff --git a/dom/plugins/test/mochitest/test_twostreams.html b/dom/plugins/test/mochitest/test_twostreams.html
index cd9fe686f83d..1e69aa165502 100644
--- a/dom/plugins/test/mochitest/test_twostreams.html
+++ b/dom/plugins/test/mochitest/test_twostreams.html
@@ -3,6 +3,7 @@
   <title>Dual NPAPI NP_ASFILEONLY NPStream Test</title>
   <script type="text/javascript" 
           src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="utils.js"></script>
   <link rel="stylesheet" type="text/css" 
         href="/tests/SimpleTest/test.css" />
 </head>
@@ -13,6 +14,7 @@
   SimpleTest.expectAssertions(0, 2);
 
   SimpleTest.waitForExplicitFinish();
+  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
 
   var framesToLoad = 2;
   function frameLoaded(id) {
diff --git a/dom/plugins/test/mochitest/test_visibility.html b/dom/plugins/test/mochitest/test_visibility.html
index dfdefbbc74af..cb98689bcfa4 100644
--- a/dom/plugins/test/mochitest/test_visibility.html
+++ b/dom/plugins/test/mochitest/test_visibility.html
@@ -15,6 +15,7 @@
   <script type="application/javascript" src="utils.js"></script>
   <script type="application/javascript">
   SimpleTest.waitForExplicitFinish();
+  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
 
   var didPaint = function() {};
 
diff --git a/dom/plugins/test/mochitest/test_windowed_invalidate.html b/dom/plugins/test/mochitest/test_windowed_invalidate.html
index 2b5def9a54e3..11b56bb6f152 100644
--- a/dom/plugins/test/mochitest/test_windowed_invalidate.html
+++ b/dom/plugins/test/mochitest/test_windowed_invalidate.html
@@ -3,21 +3,17 @@
   <title>Test NPN_Invalidate working for a windowed plugin</title>
   <script type="text/javascript" 
           src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="utils.js"></script>
   <link rel="stylesheet" type="text/css" 
         href="/tests/SimpleTest/test.css" />
 </head>
-<body onload="checkPaintCountStabilized()">
-  <p id="display"></p>
-
-  <embed id="p" type="application/x-test" wmode="window" drawmode="solid"
-         color="FFFF0000">
-  </embed>
-
+<body onload="runTests()">
   <script class="testbody" type="application/javascript">
   SimpleTest.waitForExplicitFinish();
+  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
 
   var lastPaintCount;
-  var p = document.getElementById("p");
+  var p = null;
 
   function checkPainted() {
     if (p.getPaintCount() > lastPaintCount) {
@@ -50,8 +46,19 @@
       }
     }, 1000);
   }
+
+  function runTests() {
+    p = document.getElementById("p");
+    checkPaintCountStabilized();
+  }
   </script>
-  
+
+  <p id="display"></p>
+
+  <embed id="p" type="application/x-test" wmode="window" drawmode="solid"
+         color="FFFF0000">
+  </embed>
+
   <div id="verbose">
   </div>
  </body>
diff --git a/dom/plugins/test/mochitest/test_wmode.xul b/dom/plugins/test/mochitest/test_wmode.xul
index 2823260b39be..70d2b31eff09 100644
--- a/dom/plugins/test/mochitest/test_wmode.xul
+++ b/dom/plugins/test/mochitest/test_wmode.xul
@@ -8,6 +8,10 @@
   <title>WMode Tests</title>
   <script type="application/javascript"
           src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
+  <script type="application/javascript" src="utils.js"></script>
+  <script type="application/javascript">
+    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
+  </script>
 <body xmlns="http://www.w3.org/1999/xhtml" onload="runTests()">
 <embed id="plugin2" type="application/x-test" width="400" height="400" wmode="window"></embed>
 <embed id="plugin1" type="application/x-test" width="400" height="400"></embed>
diff --git a/dom/plugins/test/mochitest/test_xulbrowser_plugin_visibility.xul b/dom/plugins/test/mochitest/test_xulbrowser_plugin_visibility.xul
index 83631df86ff3..3872eb0eb0b1 100644
--- a/dom/plugins/test/mochitest/test_xulbrowser_plugin_visibility.xul
+++ b/dom/plugins/test/mochitest/test_xulbrowser_plugin_visibility.xul
@@ -5,9 +5,11 @@
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <script type="application/javascript"
 	  src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
+  <script type="application/javascript" src="utils.js"></script>
 
   <script>
   SimpleTest.waitForExplicitFinish();
+  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
 
   var w = window.open('xulbrowser_plugin_visibility.xul', '_blank', 'chrome,resizable=yes,width=400,height=600');
 
diff --git a/dom/plugins/test/mochitest/test_zero_opacity.html b/dom/plugins/test/mochitest/test_zero_opacity.html
index 55c8409b3f08..5c868e482e3e 100644
--- a/dom/plugins/test/mochitest/test_zero_opacity.html
+++ b/dom/plugins/test/mochitest/test_zero_opacity.html
@@ -3,19 +3,18 @@
 <head>
   <title>Test whether windowed plugins with opacity:0 get their window set correctly</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="utils.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 
 <body onload="startTest()">
-  <p id="display"></p>
-
-  <embed id="theplugin" type="application/x-test" width="100" height="50" style="opacity:0" wmode="window"></embed>
-
   <script type="application/javascript;version=1.8">
   SimpleTest.waitForExplicitFinish();
+  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
 
-  var p = document.getElementById('theplugin');
+  var p = null;
 
   function startTest() {
+    p = document.getElementById('theplugin');
     if (!p.hasWidget()) {
       todo(false, "This test is only relevant for windowed plugins");
       SimpleTest.finish();
@@ -39,3 +38,7 @@
     is(p.getClipRegionRectEdge(0,3) - p.getClipRegionRectEdge(0,1), 50, "height of clip region rect");
   }
   </script>
+
+  <p id="display"></p>
+
+  <embed id="theplugin" type="application/x-test" width="100" height="50" style="opacity:0" wmode="window"></embed>
\ No newline at end of file
diff --git a/dom/plugins/test/mochitest/utils.js b/dom/plugins/test/mochitest/utils.js
index 36a8ed20c721..dcb8786de067 100644
--- a/dom/plugins/test/mochitest/utils.js
+++ b/dom/plugins/test/mochitest/utils.js
@@ -15,3 +15,30 @@ function paintCountIs(plugin, expected, msg) {
      " independent paints, expected " + realExpected + " logged paints, got " +
      count + " actual paints)");
 }
+
+function getTestPlugin(pluginName) {
+  var ph = SpecialPowers.Cc["@mozilla.org/plugin/host;1"]
+                                 .getService(SpecialPowers.Ci.nsIPluginHost);
+  var tags = ph.getPluginTags();
+  var name = pluginName || "Test Plug-in";
+  for (var tag of tags) {
+    if (tag.name == name) {
+      return tag;
+    }
+  }
+
+  ok(false, "Could not find plugin tag with plugin name '" + name + "'");
+  return null;
+}
+
+// call this to set the test plugin(s) initially expected enabled state.
+// it will automatically be reset to it's previous value after the test
+// ends
+function setTestPluginEnabledState(newEnabledState, pluginName) {
+  var plugin = getTestPlugin(pluginName);
+  var oldEnabledState = plugin.enabledState;
+  plugin.enabledState = newEnabledState;
+  SimpleTest.registerCleanupFunction(function() {
+    getTestPlugin(pluginName).enabledState = oldEnabledState;
+  });
+}

From a118d60707d788a9cb7369ba882acf1f1b171483 Mon Sep 17 00:00:00 2001
From: Georg Fritzsche <georg.fritzsche@googlemail.com>
Date: Wed, 4 Sep 2013 16:07:30 +0200
Subject: [PATCH 38/86] Bug 899080 - Test fixup part 3 - toolkit. r=bsmedberg

---
 toolkit/mozapps/extensions/test/xpcshell/test_plugins.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_plugins.js b/toolkit/mozapps/extensions/test/xpcshell/test_plugins.js
index 7051ca14470b..d9ef812bd44d 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_plugins.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_plugins.js
@@ -86,13 +86,13 @@ function run_test_1() {
       do_check_eq(p.creator, null);
       do_check_eq(p.version, "1.0.0.0");
       do_check_eq(p.type, "plugin");
-      do_check_false(p.userDisabled);
+      do_check_eq(p.userDisabled, "askToActivate");
       do_check_false(p.appDisabled);
       do_check_true(p.isActive);
       do_check_true(p.isCompatible);
       do_check_true(p.providesUpdatesSecurely);
       do_check_eq(p.blocklistState, 0);
-      do_check_eq(p.permissions, AddonManager.PERM_CAN_DISABLE | AddonManager.PERM_CAN_ASK_TO_ACTIVATE);
+      do_check_eq(p.permissions, AddonManager.PERM_CAN_DISABLE | AddonManager.PERM_CAN_ENABLE);
       do_check_eq(p.pendingOperations, 0);
       do_check_true(p.size > 0);
       do_check_eq(p.size, getFileSize(testPlugin));
@@ -112,7 +112,8 @@ function run_test_2(p) {
   let test = {};
   test[gID] = [
     ["onDisabling", false],
-    "onDisabled"
+    "onDisabled",
+    ["onPropertyChanged", ["userDisabled"]]
   ];
   prepare_test(test);
 

From 48069b57c166df4be7669941baf3e59ab5610d74 Mon Sep 17 00:00:00 2001
From: Georg Fritzsche <georg.fritzsche@googlemail.com>
Date: Wed, 4 Sep 2013 16:07:52 +0200
Subject: [PATCH 39/86] Bug 899080 - Test fixup part 4 - content. r=smaug

---
 content/base/test/test_mixed_content_blocker.html | 9 +++++++++
 content/base/test/test_object.html                | 9 +++++++++
 2 files changed, 18 insertions(+)

diff --git a/content/base/test/test_mixed_content_blocker.html b/content/base/test/test_mixed_content_blocker.html
index 86302f237ba6..d2b8e9b8fc42 100644
--- a/content/base/test/test_mixed_content_blocker.html
+++ b/content/base/test/test_mixed_content_blocker.html
@@ -11,6 +11,15 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=62178
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 
   <script>
+  var ph = SpecialPowers.Cc["@mozilla.org/plugin/host;1"]
+                        .getService(SpecialPowers.Ci.nsIPluginHost);
+  var tags = ph.getPluginTags();
+  for (var tag of tags) {
+    if (tag.name == "Test Plug-in") {
+      tag.enabledState = SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED;;
+    }
+  }
+
 
   var origBlockDisplay = SpecialPowers.getBoolPref("security.mixed_content.block_display_content");
   var origBlockActive = SpecialPowers.getBoolPref("security.mixed_content.block_active_content");
diff --git a/content/base/test/test_object.html b/content/base/test/test_object.html
index 9a74404362df..f8998b1ed8d5 100644
--- a/content/base/test/test_object.html
+++ b/content/base/test/test_object.html
@@ -11,6 +11,15 @@
       "use strict";
       SimpleTest.waitForExplicitFinish();
 
+      var pluginHost = SpecialPowers.Cc["@mozilla.org/plugin/host;1"]
+                        .getService(SpecialPowers.Ci.nsIPluginHost);
+      var pluginTags = pluginHost.getPluginTags();
+      for (var tag of pluginTags) {
+        if (tag.name == "Test Plug-in") {
+          tag.enabledState = SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED;;
+        }
+      }
+
       // This can go away once embed also is on WebIDL
       let OBJLC = SpecialPowers.Ci.nsIObjectLoadingContent;
 

From 1355e7da5730098e85b0900482bf18044f326e26 Mon Sep 17 00:00:00 2001
From: Georg Fritzsche <georg.fritzsche@googlemail.com>
Date: Wed, 4 Sep 2013 16:07:53 +0200
Subject: [PATCH 40/86] Bug 899080 - Test fixup part 5 - layout. r=roc

---
 layout/base/tests/Makefile.in                 |  1 +
 layout/base/tests/enableTestPlugin.js         | 25 +++++++++++++++++++
 layout/base/tests/test_bug629838.html         |  1 +
 layout/base/tests/test_mozPaintCount.html     |  1 +
 layout/generic/test/Makefile.in               |  1 +
 .../test_invalidate_during_plugin_paint.html  |  1 +
 layout/generic/test/test_plugin_focus.html    |  1 +
 .../test/test_plugin_mouse_coords.html        |  1 +
 8 files changed, 32 insertions(+)
 create mode 100644 layout/base/tests/enableTestPlugin.js

diff --git a/layout/base/tests/Makefile.in b/layout/base/tests/Makefile.in
index d7369a124a9f..06ff1081ded4 100644
--- a/layout/base/tests/Makefile.in
+++ b/layout/base/tests/Makefile.in
@@ -151,6 +151,7 @@ MOCHITEST_FILES =	\
 		test_bug851445.html \
 		  bug851445_helper.html \
 		test_emulateMedium.html \
+		enableTestPlugin.js \
 		$(NULL)
 
 ifeq (,$(filter gonk,$(MOZ_WIDGET_TOOLKIT)))
diff --git a/layout/base/tests/enableTestPlugin.js b/layout/base/tests/enableTestPlugin.js
new file mode 100644
index 000000000000..63c481807e0e
--- /dev/null
+++ b/layout/base/tests/enableTestPlugin.js
@@ -0,0 +1,25 @@
+// this automatically sets the test plugin to be enabled (not e.g. click-to-play)
+// and resets this afterwards
+
+(function() {
+  function getTestPlugin(aPluginName) {
+    var ph = SpecialPowers.Cc["@mozilla.org/plugin/host;1"]
+                          .getService(SpecialPowers.Ci.nsIPluginHost);
+    var tags = ph.getPluginTags();
+    for (var tag of tags) {
+      if (tag.name == aPluginName) {
+       return tag;
+      }
+    }
+
+    ok(false, "Could not find plugin tag with plugin name '" + name + "'");
+    return null;
+  }
+
+  var plugin = getTestPlugin("Test Plug-in");
+  var oldEnabledState = plugin.enabledState;
+  plugin.enabledState = SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED;
+  SimpleTest.registerCleanupFunction(function() {
+    getTestPlugin("Test Plug-in").enabledState = oldEnabledState;
+  });
+})();
diff --git a/layout/base/tests/test_bug629838.html b/layout/base/tests/test_bug629838.html
index 1c5f24dd507d..4f19c0c78f52 100644
--- a/layout/base/tests/test_bug629838.html
+++ b/layout/base/tests/test_bug629838.html
@@ -3,6 +3,7 @@
 <head>
   <title>Tests for MozAfterPaint</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="enableTestPlugin.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
diff --git a/layout/base/tests/test_mozPaintCount.html b/layout/base/tests/test_mozPaintCount.html
index e7a054e44532..4dc3f8f3aafb 100644
--- a/layout/base/tests/test_mozPaintCount.html
+++ b/layout/base/tests/test_mozPaintCount.html
@@ -3,6 +3,7 @@
 <head>
   <title>Tests for mozPaintCount</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="enableTestPlugin.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body onload="doBackgroundFlicker()">
diff --git a/layout/generic/test/Makefile.in b/layout/generic/test/Makefile.in
index 1cd315e11b4f..45c331b682d4 100644
--- a/layout/generic/test/Makefile.in
+++ b/layout/generic/test/Makefile.in
@@ -106,6 +106,7 @@ MOCHITEST_FILES = \
   test_bug791616.html \
   test_bug831780.html \
   test_bug841361.html \
+  $(srcdir)/../../base/tests/enableTestPlugin.js \
   $(NULL)
 
 # Disable the caret movement by word test on Linux because the shortcut keys
diff --git a/layout/generic/test/test_invalidate_during_plugin_paint.html b/layout/generic/test/test_invalidate_during_plugin_paint.html
index b6c076ddde38..564ffef95baa 100644
--- a/layout/generic/test/test_invalidate_during_plugin_paint.html
+++ b/layout/generic/test/test_invalidate_during_plugin_paint.html
@@ -3,6 +3,7 @@
 <head>
   <title>Test handling plugins invalidating during paint</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>    
+  <script type="text/javascript" src="enableTestPlugin.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
   <style>
   embed { width:200px; height:200px; display:block; }
diff --git a/layout/generic/test/test_plugin_focus.html b/layout/generic/test/test_plugin_focus.html
index fd3fff0ff997..508c8152968f 100644
--- a/layout/generic/test/test_plugin_focus.html
+++ b/layout/generic/test/test_plugin_focus.html
@@ -1,6 +1,7 @@
 <html title="Test plugin focus control">
 <head>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="enableTestPlugin.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
diff --git a/layout/generic/test/test_plugin_mouse_coords.html b/layout/generic/test/test_plugin_mouse_coords.html
index 74d66478ca89..b52ea27cb6ea 100644
--- a/layout/generic/test/test_plugin_mouse_coords.html
+++ b/layout/generic/test/test_plugin_mouse_coords.html
@@ -4,6 +4,7 @@
   <title>Test delivering mouse events to plugins</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>    
   <script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
+  <script type="text/javascript" src="enableTestPlugin.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
   <style>
   embed { width:200px; height:200px; display:block; }

From e742daab14eefee139a53b1de4604cb56da25aa1 Mon Sep 17 00:00:00 2001
From: Georg Fritzsche <georg.fritzsche@googlemail.com>
Date: Wed, 4 Sep 2013 16:07:53 +0200
Subject: [PATCH 41/86] Bug 899080 - Test fixup part 6 - widget. r=roc

---
 widget/tests/test_plugin_input_event.html         | 11 +++++++++++
 widget/tests/test_plugin_scroll_consistency.html  | 11 +++++++++++
 widget/tests/test_plugin_scroll_invalidation.html | 11 +++++++++++
 3 files changed, 33 insertions(+)

diff --git a/widget/tests/test_plugin_input_event.html b/widget/tests/test_plugin_input_event.html
index 0552fa78f9a4..baf514dba36a 100644
--- a/widget/tests/test_plugin_input_event.html
+++ b/widget/tests/test_plugin_input_event.html
@@ -12,6 +12,17 @@
           href="chrome://mochikit/content/tests/SimpleTest/test.css" />
 </head>
 <body>
+<script type="application/javascript">
+var pluginHost = SpecialPowers.Cc["@mozilla.org/plugin/host;1"]
+                        .getService(SpecialPowers.Ci.nsIPluginHost);
+var pluginTags = pluginHost.getPluginTags();
+for (var tag of pluginTags) {
+  if (tag.name == "Test Plug-in") {
+    tag.enabledState = SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED;;
+  }
+}
+</script>
+
 <p id="display">
   <embed id="plugin" type="application/x-test" wmode="opaque">
 </p>
diff --git a/widget/tests/test_plugin_scroll_consistency.html b/widget/tests/test_plugin_scroll_consistency.html
index 4b7a9f8577a7..a026bf3352f7 100644
--- a/widget/tests/test_plugin_scroll_consistency.html
+++ b/widget/tests/test_plugin_scroll_consistency.html
@@ -7,6 +7,17 @@
           href="chrome://mochikit/content/tests/SimpleTest/test.css" />
 </head>
 <body onload="setTimeout(runTests, 0)">
+<script type="application/javascript">
+var pluginHost = SpecialPowers.Cc["@mozilla.org/plugin/host;1"]
+                        .getService(SpecialPowers.Ci.nsIPluginHost);
+var pluginTags = pluginHost.getPluginTags();
+for (var tag of pluginTags) {
+  if (tag.name == "Test Plug-in") {
+    tag.enabledState = SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED;;
+  }
+}
+</script>
+
 <p id="display">
   <div style="overflow:hidden; height:100px;" id="scroll">
     <embed type="application/x-test" wmode="window" width="100" height="800" id="plugin"></object>
diff --git a/widget/tests/test_plugin_scroll_invalidation.html b/widget/tests/test_plugin_scroll_invalidation.html
index 04e5f5015680..d99ca69522e9 100644
--- a/widget/tests/test_plugin_scroll_invalidation.html
+++ b/widget/tests/test_plugin_scroll_invalidation.html
@@ -6,6 +6,17 @@
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body onload="initialize()">
+<script type="application/javascript">
+var pluginHost = SpecialPowers.Cc["@mozilla.org/plugin/host;1"]
+                        .getService(SpecialPowers.Ci.nsIPluginHost);
+var pluginTags = pluginHost.getPluginTags();
+for (var tag of pluginTags) {
+  if (tag.name == "Test Plug-in") {
+    tag.enabledState = SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED;;
+  }
+}
+</script>
+
 <p id="display">
   <iframe id="i" src="plugin_scroll_invalidation.html"
    width="50" height="50" scrolling="no"></iframe>

From fd370d9d56e87d4aa13abeb28dd4791558865894 Mon Sep 17 00:00:00 2001
From: Georg Fritzsche <georg.fritzsche@googlemail.com>
Date: Wed, 4 Sep 2013 16:07:53 +0200
Subject: [PATCH 42/86] Bug 899080 - Test fixup part 7 - accessible. r=surkov

---
 accessible/tests/mochitest/common.js          | 31 +++++++++++++++++++
 .../tests/mochitest/elm/test_HTMLSpec.html    |  2 +-
 .../tests/mochitest/elm/test_plugin.html      |  1 +
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/accessible/tests/mochitest/common.js b/accessible/tests/mochitest/common.js
index a6da5331d024..8841bf563430 100644
--- a/accessible/tests/mochitest/common.js
+++ b/accessible/tests/mochitest/common.js
@@ -754,6 +754,21 @@ function getMainChromeWindow(aWindow)
                 .getInterface(Components.interfaces.nsIDOMWindow);
 }
 
+/** Sets the test plugin(s) initially expected enabled state.
+ * It will automatically be reset to it's previous value after the test
+ * ends.
+ * @param aNewEnabledState [in] the enabled state, e.g. SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED
+ * @param aPluginName [in, optional] The name of the plugin, defaults to "Test Plug-in"
+ */
+function setTestPluginEnabledState(aNewEnabledState, aPluginName)
+{
+  var plugin = getTestPluginTag(aPluginName);
+  var oldEnabledState = plugin.enabledState;
+  plugin.enabledState = aNewEnabledState;
+  SimpleTest.registerCleanupFunction(function() {
+    getTestPluginTag(aPluginName).enabledState = oldEnabledState;
+  });
+}
 
 ////////////////////////////////////////////////////////////////////////////////
 // Private
@@ -789,3 +804,19 @@ function getObjAddress(aObj)
 
   return aObj.toString();
 }
+
+function getTestPluginTag(aPluginName)
+{
+  var ph = SpecialPowers.Cc["@mozilla.org/plugin/host;1"]
+                        .getService(SpecialPowers.Ci.nsIPluginHost);
+  var tags = ph.getPluginTags();
+  var name = aPluginName || "Test Plug-in";
+  for (var tag of tags) {
+    if (tag.name == name) {
+      return tag;
+    }
+  }
+
+  ok(false, "Could not find plugin tag with plugin name '" + name + "'");
+  return null;
+}
diff --git a/accessible/tests/mochitest/elm/test_HTMLSpec.html b/accessible/tests/mochitest/elm/test_HTMLSpec.html
index 86aca39f731a..59ecd2786de0 100644
--- a/accessible/tests/mochitest/elm/test_HTMLSpec.html
+++ b/accessible/tests/mochitest/elm/test_HTMLSpec.html
@@ -1239,8 +1239,8 @@
 
     SimpleTest.waitForExplicitFinish();
     addA11yLoadEvent(doTest);
+    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
 
-  
     </script>
 </head>
 <body>
diff --git a/accessible/tests/mochitest/elm/test_plugin.html b/accessible/tests/mochitest/elm/test_plugin.html
index 819d0ff05820..c8f400c54ab0 100644
--- a/accessible/tests/mochitest/elm/test_plugin.html
+++ b/accessible/tests/mochitest/elm/test_plugin.html
@@ -38,6 +38,7 @@
 
     SimpleTest.waitForExplicitFinish();
     addA11yLoadEvent(doTest);
+    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
   </script>
 </head>
 <body>

From 6de83617842f6c66d6f59ea7d8f3065c566b85de Mon Sep 17 00:00:00 2001
From: Benjamin Smedberg <benjamin@smedbergs.us>
Date: Wed, 4 Sep 2013 16:07:54 +0200
Subject: [PATCH 43/86] Bug 902075 - Add telemetry for plugin click-to-activate
 doorhanger UI, r=vladan

---
 browser/base/content/browser-plugins.js      | 15 +++++++++++++++
 toolkit/components/telemetry/Histograms.json | 14 ++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/browser/base/content/browser-plugins.js b/browser/base/content/browser-plugins.js
index 485bd5bcfdb1..726c1f7c8e71 100644
--- a/browser/base/content/browser-plugins.js
+++ b/browser/base/content/browser-plugins.js
@@ -623,6 +623,8 @@ var gPluginHandler = {
   _clickToPlayNotificationEventCallback: function PH_ctpEventCallback(event) {
     if (event == "showing") {
       gPluginHandler._makeCenterActions(this);
+      Services.telemetry.getHistogramById("PLUGINS_NOTIFICATION_SHOWN")
+        .add(!this.options.primaryPlugin);
     }
     else if (event == "dismissed") {
       // Once the popup is dismissed, clicking the icon should show the full
@@ -703,6 +705,14 @@ var gPluginHandler = {
     });
 
     notification.options.centerActions = centerActions;
+
+    // Histograms always start at 0, even though our data starts at 1
+    let histogramCount = centerActions.length - 1;
+    if (histogramCount > 4) {
+      histogramCount = 4;
+    }
+    Services.telemetry.getHistogramById("PLUGINS_NOTIFICATION_PLUGIN_COUNT")
+      .add(histogramCount);
   },
 
   /**
@@ -714,12 +724,15 @@ var gPluginHandler = {
     let permission;
     let expireType;
     let expireTime;
+    let histogram =
+      Services.telemetry.getHistogramById("PLUGINS_NOTIFICATION_USER_ACTION");
 
     switch (aNewState) {
       case "allownow":
         permission = Ci.nsIPermissionManager.ALLOW_ACTION;
         expireType = Ci.nsIPermissionManager.EXPIRE_SESSION;
         expireTime = Date.now() + Services.prefs.getIntPref(this.PREF_SESSION_PERSIST_MINUTES) * 60 * 1000;
+        histogram.add(0);
         break;
 
       case "allowalways":
@@ -727,12 +740,14 @@ var gPluginHandler = {
         expireType = Ci.nsIPermissionManager.EXPIRE_TIME;
         expireTime = Date.now() +
           Services.prefs.getIntPref(this.PREF_PERSISTENT_DAYS) * 24 * 60 * 60 * 1000;
+        histogram.add(1);
         break;
 
       case "block":
         permission = Ci.nsIPermissionManager.PROMPT_ACTION;
         expireType = Ci.nsIPermissionManager.EXPIRE_NEVER;
         expireTime = 0;
+        histogram.add(2);
         break;
 
       // In case a plugin has already been allowed in another tab, the "continue allowing" button
diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/telemetry/Histograms.json
index 7db94ec3f105..44552a2f00d2 100644
--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -3201,6 +3201,20 @@
     "n_buckets": 50,
     "description": "Time spent to display first page in PDF Viewer (ms)"
   },
+  "PLUGINS_NOTIFICATION_SHOWN": {
+    "kind": "boolean",
+    "description": "The number of times the click-to-activate notification was shown: false: shown by in-content activation true: shown by location bar activation"
+  },
+  "PLUGINS_NOTIFICATION_PLUGIN_COUNT": {
+    "kind": "enumerated",
+    "n_values": 5,
+    "description": "The number of plugins present in the click-to-activate notification, minus one (1, 2, 3, 4, more than 4)"
+  },
+  "PLUGINS_NOTIFICATION_USER_ACTION": {
+    "kind": "enumerated",
+    "n_values": 3,
+    "description": "User actions taken in the plugin notification: 0: allownow 1: allowalways 2: block"
+  },
   "POPUP_NOTIFICATION_MAINACTION_TRIGGERED_MS": {
     "kind": "linear",
     "low": 25,

From f25370e210a98217b96459ba24769f4f4909f9e5 Mon Sep 17 00:00:00 2001
From: Robert Longson <longsonr@gmail.com>
Date: Wed, 4 Sep 2013 22:14:10 +0100
Subject: [PATCH 44/86] Bug 906601 - filter processing memory allocation should
 be fallible. r=jwatt

---
 content/svg/content/src/SVGFEConvolveMatrixElement.cpp | 3 ++-
 content/svg/content/src/SVGFEGaussianBlurElement.cpp   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/content/svg/content/src/SVGFEConvolveMatrixElement.cpp b/content/svg/content/src/SVGFEConvolveMatrixElement.cpp
index 296b22d25aff..54024d766457 100644
--- a/content/svg/content/src/SVGFEConvolveMatrixElement.cpp
+++ b/content/svg/content/src/SVGFEConvolveMatrixElement.cpp
@@ -306,7 +306,8 @@ SVGFEConvolveMatrixElement::Filter(nsSVGFilterInstance* instance,
   if (orderX > NS_SVG_OFFSCREEN_MAX_DIMENSION ||
       orderY > NS_SVG_OFFSCREEN_MAX_DIMENSION)
     return NS_ERROR_FAILURE;
-  nsAutoArrayPtr<float> kernel(new float[orderX * orderY]);
+  const fallible_t fallible = fallible_t();
+  nsAutoArrayPtr<float> kernel(new (fallible) float[orderX * orderY]);
   if (!kernel)
     return NS_ERROR_FAILURE;
   for (uint32_t i = 0; i < kmLength; i++) {
diff --git a/content/svg/content/src/SVGFEGaussianBlurElement.cpp b/content/svg/content/src/SVGFEGaussianBlurElement.cpp
index 6c85b5788cb5..44b5bef5eede 100644
--- a/content/svg/content/src/SVGFEGaussianBlurElement.cpp
+++ b/content/svg/content/src/SVGFEGaussianBlurElement.cpp
@@ -236,7 +236,8 @@ SVGFEGaussianBlurElement::GaussianBlur(const Image* aSource,
   NS_ASSERTION(nsIntRect(0, 0, aTarget->mImage->Width(), aTarget->mImage->Height()).Contains(aDataRect),
                "aDataRect out of bounds");
 
-  nsAutoArrayPtr<uint8_t> tmp(new uint8_t[aTarget->mImage->GetDataSize()]);
+  const fallible_t fallible = fallible_t();
+  nsAutoArrayPtr<uint8_t> tmp(new (fallible) uint8_t[aTarget->mImage->GetDataSize()]);
   if (!tmp)
     return;
   memset(tmp, 0, aTarget->mImage->GetDataSize());

From 3c1ca057311fa6f508a166c7f4feab27afa2c827 Mon Sep 17 00:00:00 2001
From: Botond Ballo <botond@mozilla.com>
Date: Fri, 30 Aug 2013 13:22:33 -0400
Subject: [PATCH 45/86] Bug 904533 - Compute FrameMetrics::mCompositionBounds
 correctly for subframes. r=tn

---
 dom/base/nsDOMWindowUtils.cpp |  2 +-
 layout/base/Units.h           | 17 ++++++++++----
 layout/base/nsDisplayList.cpp | 44 +++++++++++++++++++++--------------
 3 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/dom/base/nsDOMWindowUtils.cpp b/dom/base/nsDOMWindowUtils.cpp
index a2fcc495ad41..a4a1f5bfb4fc 100644
--- a/dom/base/nsDOMWindowUtils.cpp
+++ b/dom/base/nsDOMWindowUtils.cpp
@@ -623,7 +623,7 @@ static LayoutDeviceIntPoint
 ToWidgetPoint(const CSSPoint& aPoint, const nsPoint& aOffset,
               nsPresContext* aPresContext)
 {
-  return LayoutDeviceIntPoint::FromAppUnits(
+  return LayoutDeviceIntPoint::FromAppUnitsRounded(
     CSSPoint::ToAppUnits(aPoint) + aOffset,
     aPresContext->AppUnitsPerDevPixel());
 }
diff --git a/layout/base/Units.h b/layout/base/Units.h
index c229fa3f89a2..c6c8084d7b43 100644
--- a/layout/base/Units.h
+++ b/layout/base/Units.h
@@ -148,17 +148,24 @@ struct LayoutDevicePixel {
     return LayoutDeviceIntRect(aRect.x, aRect.y, aRect.width, aRect.height);
   }
 
-  static LayoutDeviceIntPoint FromAppUnits(const nsPoint& aPoint, nscoord aAppUnitsPerDevPixel) {
+  static LayoutDeviceRect FromAppUnits(const nsRect& aRect, nscoord aAppUnitsPerDevPixel) {
+    return LayoutDeviceRect(NSAppUnitsToFloatPixels(aRect.x, float(aAppUnitsPerDevPixel)),
+                            NSAppUnitsToFloatPixels(aRect.y, float(aAppUnitsPerDevPixel)),
+                            NSAppUnitsToFloatPixels(aRect.width, float(aAppUnitsPerDevPixel)),
+                            NSAppUnitsToFloatPixels(aRect.height, float(aAppUnitsPerDevPixel)));
+  }
+
+  static LayoutDeviceIntPoint FromAppUnitsRounded(const nsPoint& aPoint, nscoord aAppUnitsPerDevPixel) {
     return LayoutDeviceIntPoint(NSAppUnitsToIntPixels(aPoint.x, aAppUnitsPerDevPixel),
                                 NSAppUnitsToIntPixels(aPoint.y, aAppUnitsPerDevPixel));
   }
 
-  static LayoutDeviceIntPoint FromAppUnitsToNearest(const nsPoint& aPoint, nscoord appUnitsPerDevPixel) {
-    return FromUntyped(aPoint.ToNearestPixels(appUnitsPerDevPixel));
+  static LayoutDeviceIntPoint FromAppUnitsToNearest(const nsPoint& aPoint, nscoord aAppUnitsPerDevPixel) {
+    return FromUntyped(aPoint.ToNearestPixels(aAppUnitsPerDevPixel));
   }
 
-  static LayoutDeviceIntRect FromAppUnitsToNearest(const nsRect& aRect, nscoord appUnitsPerDevPixel) {
-    return FromUntyped(aRect.ToNearestPixels(appUnitsPerDevPixel));
+  static LayoutDeviceIntRect FromAppUnitsToNearest(const nsRect& aRect, nscoord aAppUnitsPerDevPixel) {
+    return FromUntyped(aRect.ToNearestPixels(aAppUnitsPerDevPixel));
   }
 };
 
diff --git a/layout/base/nsDisplayList.cpp b/layout/base/nsDisplayList.cpp
index 520df5f3d7ff..16076ce47de0 100644
--- a/layout/base/nsDisplayList.cpp
+++ b/layout/base/nsDisplayList.cpp
@@ -44,6 +44,7 @@
 #include "ImageLayers.h"
 #include "ImageContainer.h"
 #include "nsCanvasFrame.h"
+#include "mozilla/LookAndFeel.h"
 
 #include <stdint.h>
 #include <algorithm>
@@ -671,28 +672,37 @@ static void RecordFrameMetrics(nsIFrame* aForFrame,
   metrics.mDevPixelsPerCSSPixel = CSSToLayoutDeviceScale(
     (float)nsPresContext::AppUnitsPerCSSPixel() / auPerDevPixel);
 
-  // Provide an initial zoom to the AsyncPanZoomController so that it
-  // renders the content to the screen at the painted resolution.
+  // Initially, AsyncPanZoomController should render the content to the screen
+  // at the painted resolution.
+  const LayerToScreenScale layerToScreenScale(1.0f);
   metrics.mZoom = metrics.mResolution * metrics.mDevPixelsPerCSSPixel
-                * LayerToScreenScale(1.0f);
+                * layerToScreenScale;
 
   metrics.mMayHaveTouchListeners = aMayHaveTouchListeners;
 
-  if (nsIWidget* widget = aForFrame->GetNearestWidget()) {
-    nsIntRect bounds;
-    widget->GetBounds(bounds);
-    metrics.mCompositionBounds = ScreenIntRect::FromUnknownRect(
-      mozilla::gfx::IntRect(bounds.x, bounds.y, bounds.width, bounds.height));
-  }
+  if (aScrollFrame) {
+    metrics.mCompositionBounds = RoundedToInt(LayoutDeviceRect::FromAppUnits(
+        aScrollFrame->GetScreenRectInAppUnits(), auPerDevPixel)
+                               * metrics.mResolution
+                               * layerToScreenScale);
 
-  // Adjust for the size of scroll bars.
-  if (scrollableFrame) {
-    nsMargin sizes = scrollableFrame->GetActualScrollbarSizes();
-    ScreenIntMargin boundMargins(nsPresContext::AppUnitsToIntCSSPixels(sizes.top),
-                                 nsPresContext::AppUnitsToIntCSSPixels(sizes.right),
-                                 nsPresContext::AppUnitsToIntCSSPixels(sizes.bottom),
-                                 nsPresContext::AppUnitsToIntCSSPixels(sizes.left));
-    metrics.mCompositionBounds.Deflate(boundMargins);
+    // Adjust for the size of scroll bars.
+    if (scrollableFrame && !LookAndFeel::GetInt(LookAndFeel::eIntID_UseOverlayScrollbars)) {
+      nsMargin sizes = scrollableFrame->GetActualScrollbarSizes();
+      // Scrollbars are not subject to scaling, so CSS pixels = screen pixels for them.
+      ScreenIntMargin boundMargins(nsPresContext::AppUnitsToIntCSSPixels(sizes.top),
+                                   nsPresContext::AppUnitsToIntCSSPixels(sizes.right),
+                                   nsPresContext::AppUnitsToIntCSSPixels(sizes.bottom),
+                                   nsPresContext::AppUnitsToIntCSSPixels(sizes.left));
+      metrics.mCompositionBounds.Deflate(boundMargins);
+    }
+  } else {
+    // We are in a document without a root scroll frame, so it's a xul document.
+    // In this case, use the size of the viewport frame.
+    metrics.mCompositionBounds = RoundedToInt(LayoutDeviceRect::FromAppUnits(
+        aForFrame->GetScreenRectInAppUnits(), auPerDevPixel)
+                               * metrics.mResolution
+                               * layerToScreenScale);
   }
 
   metrics.mPresShellId = presShell->GetPresShellId();

From 34a75d76f1faa4b54b18c6291c20766b080b8b7d Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Wed, 4 Sep 2013 17:38:23 -0400
Subject: [PATCH 46/86] Bug 911771 followup.  Just nuke the broken code. 
 r=CLOSED TREE

---
 content/base/src/nsContentSink.cpp | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/content/base/src/nsContentSink.cpp b/content/base/src/nsContentSink.cpp
index 266ee39fd3a4..3d1a140e2dd9 100644
--- a/content/base/src/nsContentSink.cpp
+++ b/content/base/src/nsContentSink.cpp
@@ -1220,20 +1220,6 @@ nsContentSink::Notify(nsITimer *timer)
     return NS_OK;
   }
   
-#ifdef DEBUG
-  {
-    PRTime now = PR_Now();
-
-    int64_t interval = GetNotificationInterval();
-    delay = int32_t(now - mLastNotificationTime - interval) / PR_USEC_PER_MSEC;
-
-    mBackoffCount--;
-    SINK_TRACE(gContentSinkLogModuleInfo, SINK_TRACE_REFLOW,
-               ("nsContentSink::Notify: reflow on a timer: %d milliseconds "
-                "late, backoff count: %d", delay, mBackoffCount));
-  }
-#endif // DEBUG
-
   if (WaitForPendingSheets()) {
     mDeferredFlushTags = true;
   } else {

From d5c8bbe0ba70d004d8c3c025556fe148e852ab21 Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Wed, 4 Sep 2013 14:58:23 -0700
Subject: [PATCH 47/86] Bug 899367 - Followup bustage fix for some functions
 that were renamed out from under me. r=me CLOSED TREE

---
 dom/base/nsJSEnvironment.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dom/base/nsJSEnvironment.cpp b/dom/base/nsJSEnvironment.cpp
index a703d6b58d37..43df9c29921d 100644
--- a/dom/base/nsJSEnvironment.cpp
+++ b/dom/base/nsJSEnvironment.cpp
@@ -874,7 +874,7 @@ nsJSContext::nsJSContext(bool aGCOnDestruction,
   mIsInitialized = false;
   mScriptsEnabled = true;
   mProcessingScriptTag = false;
-  NS_HOLD_JS_OBJECTS(this, nsJSContext);
+  HoldJSObjects(this);
 }
 
 nsJSContext::~nsJSContext()
@@ -925,7 +925,7 @@ nsJSContext::DestroyJSContext()
 
   JS_DestroyContextNoGC(mContext);
   mContext = nullptr;
-  NS_DROP_JS_OBJECTS(this, nsJSContext);
+  DropJSObjects(this);
 }
 
 // QueryInterface implementation for nsJSContext

From fd9ee9c6e865660234cc3279b2c0bca58543dece Mon Sep 17 00:00:00 2001
From: Wes Kocher <wkocher@mozilla.com>
Date: Wed, 4 Sep 2013 16:25:23 -0700
Subject: [PATCH 48/86] Backed out changeset 365e150efda0 (bug 910899) for
 multiple test failures on a CLOSED TREE

---
 .../mozapps/plugins/content/pluginProblem.xml | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/toolkit/mozapps/plugins/content/pluginProblem.xml b/toolkit/mozapps/plugins/content/pluginProblem.xml
index 0546f95f859c..a68aba2cfe5f 100644
--- a/toolkit/mozapps/plugins/content/pluginProblem.xml
+++ b/toolkit/mozapps/plugins/content/pluginProblem.xml
@@ -22,12 +22,12 @@
     </resources>
 
     <content>
-        <html:div class="mainBox" anonid="main" chromedir="&locale.dir;">
+        <html:div class="mainBox" chromedir="&locale.dir;">
             <html:div class="hoverBox">
                 <html:label>
-                    <html:button class="icon" anonid="icon"/>
+                    <html:button class="icon"/>
                     <html:div class="msg msgTapToPlay">&tapToPlayPlugin;</html:div>
-                    <html:div class="msg msgClickToPlay" anonid="clickToPlay">&clickToActivatePlugin;</html:div>
+                    <html:div class="msg msgClickToPlay">&clickToActivatePlugin;</html:div>
                     <html:div class="msg msgVulnerabilityStatus" anonid="vulnerabilityStatus"><!-- set at runtime --></html:div>
                 </html:label>
 
@@ -36,29 +36,27 @@
                 <html:div class="msg msgDisabled">&disabledPlugin;</html:div>
                 <html:div class="msg msgBlocked">&blockedPlugin.label;</html:div>
                 <html:div class="msg msgCrashed">
-                    <html:div class="msgCrashedText" anonid="crashedText"><!-- set at runtime --></html:div>
+                    <html:div class="msgCrashedText"><!-- set at runtime --></html:div>
                     <!-- link href set at runtime -->
-                    <html:div class="msgReload">&reloadPlugin.pre;<html:a class="reloadLink" anonid="reloadLink" href="">&reloadPlugin.middle;</html:a>&reloadPlugin.post;</html:div>
+                    <html:div class="msgReload">&reloadPlugin.pre;<html:a class="reloadLink" href="">&reloadPlugin.middle;</html:a>&reloadPlugin.post;</html:div>
                 </html:div>
 
-                <html:div class="installStatus" anonid="installStatus">
-                    <html:div class="msg msgInstallPlugin"/>
+                <html:div class="installStatus">
+                    <html:div class="msg msgInstallPlugin">
 		        <html:a class="action-link" anonid="installPluginLink" href="">&installPlugin;</html:a>
 		    </html:div>
                 </html:div>
                 <html:div class="msg msgManagePlugins"><html:a class="action-link" anonid="managePluginsLink" href="">&managePlugins;</html:a></html:div>
-                <html:div class="submitStatus" anonid="submitStatus">
+                <html:div class="submitStatus">
                     <html:div class="msg msgPleaseSubmit">
                         <html:textarea class="submitComment"
-                                       anonid="submitComment"
                                        placeholder="&report.comment;"/>
                         <html:div class="submitURLOptInBox">
-                            <html:label><html:input class="submitURLOptIn" anonid="submitURLOptIn" type="checkbox"/> &report.pageURL;</html:label>
+                            <html:label><html:input class="submitURLOptIn" type="checkbox"/> &report.pageURL;</html:label>
                         </html:div>
                         <html:div class="submitButtonBox">
-                            <html:span class="helpIcon" anonid="helpIcon" role="link"/>
+                            <html:span class="helpIcon" role="link"/>
                             <html:input class="submitButton" type="button"
-                                        anonid="submitButton"
                                         value="&report.please;"/>
                         </html:div>
                     </html:div>
@@ -72,7 +70,7 @@
             </html:div>
             <html:button class="closeIcon" anonid="closeIcon" title="&hidePluginBtn.label;"/>
         </html:div>
-        <html:div class="previewPluginContent" anonid="previewPluginContent"><!-- iframe and its src will be set at runtime --></html:div>
+        <html:div class="previewPluginContent"><!-- iframe and its src will be set at runtime --></html:div>
         <html:div style="display:none;"><children/></html:div>
     </content>
     <implementation>

From 1e3173b1fe2eaa12ec5b0ac77a5c4375e15f6d94 Mon Sep 17 00:00:00 2001
From: "Adam Roach [:abr]" <adam@nostrum.com>
Date: Wed, 4 Sep 2013 18:50:28 -0500
Subject: [PATCH 49/86] Bug 906843 - Instrument signaling for isolation of
 system delays r=ehugg

---
 dom/media/bridge/Makefile.in                  |   1 +
 media/webrtc/signaling/include/CC_Call.h      |  16 ++-
 media/webrtc/signaling/include/CC_CallInfo.h  |  12 ++
 media/webrtc/signaling/signaling.gyp          |   5 +
 .../src/common/time_profiling/timecard.c      | 124 ++++++++++++++++++
 .../src/common/time_profiling/timecard.h      |  81 ++++++++++++
 .../src/peerconnection/PeerConnectionImpl.cpp |  91 ++++++++++---
 .../src/peerconnection/PeerConnectionImpl.h   |  11 ++
 .../src/sipcc/core/ccapp/CCProvider.h         |   7 +
 .../src/sipcc/core/ccapp/cc_call_feature.c    |  45 ++++---
 .../src/sipcc/core/ccapp/ccapi_call.c         |  33 +++--
 .../src/sipcc/core/ccapp/ccapi_call_info.c    |  20 +++
 .../src/sipcc/core/ccapp/ccprovider.c         |  35 +++--
 .../signaling/src/sipcc/core/common/ui.c      |  24 +++-
 .../signaling/src/sipcc/core/gsm/ccapi.c      |  29 ++--
 .../signaling/src/sipcc/core/gsm/fsmdef.c     |  98 ++++++++++----
 .../signaling/src/sipcc/core/includes/ccapi.h |  25 +++-
 .../src/sipcc/core/includes/sessionTypes.h    |   8 ++
 .../signaling/src/sipcc/core/includes/uiapi.h |   6 +
 .../src/sipcc/include/cc_call_feature.h       |  28 +++-
 .../signaling/src/sipcc/include/ccapi_call.h  |  28 +++-
 .../src/sipcc/include/ccapi_call_info.h       |  13 ++
 .../src/softphonewrapper/CC_SIPCCCall.cpp     |  31 +++--
 .../src/softphonewrapper/CC_SIPCCCall.h       |  16 ++-
 .../src/softphonewrapper/CC_SIPCCCallInfo.cpp |   5 +
 .../src/softphonewrapper/CC_SIPCCCallInfo.h   |   1 +
 media/webrtc/signaling/test/Makefile.in       |   1 +
 media/webrtc/signaling/test/sdp_unittests.cpp |   2 +
 28 files changed, 670 insertions(+), 126 deletions(-)
 create mode 100644 media/webrtc/signaling/src/common/time_profiling/timecard.c
 create mode 100644 media/webrtc/signaling/src/common/time_profiling/timecard.h

diff --git a/dom/media/bridge/Makefile.in b/dom/media/bridge/Makefile.in
index 7a3160977712..7642fcba44bd 100644
--- a/dom/media/bridge/Makefile.in
+++ b/dom/media/bridge/Makefile.in
@@ -18,6 +18,7 @@ LOCAL_INCLUDES += \
   -I$(topsrcdir)/media/webrtc/signaling/src/peerconnection \
   -I$(topsrcdir)/media/webrtc/signaling/src/mediapipeline \
   -I$(topsrcdir)/media/webrtc/signaling/src/media-conduit \
+  -I$(topsrcdir)/media/webrtc/signaling/src/common/time_profiling \
   -I$(topsrcdir)/ipc/chromium/src \
   $(NULL)
 
diff --git a/media/webrtc/signaling/include/CC_Call.h b/media/webrtc/signaling/include/CC_Call.h
index 121c6af0c8c6..db9184ceec5e 100644
--- a/media/webrtc/signaling/include/CC_Call.h
+++ b/media/webrtc/signaling/include/CC_Call.h
@@ -13,6 +13,12 @@ extern "C"
 #include "ccapi_types.h"
 }
 
+#if defined(__cplusplus) && __cplusplus >= 201103L
+typedef struct Timecard Timecard;
+#else
+#include "timecard.h"
+#endif
+
 namespace CSF
 {
     class ECC_API CC_Call
@@ -272,13 +278,13 @@ namespace CSF
           */
         virtual void originateP2PCall (cc_sdp_direction_t video_pref, const std::string & digits, const std::string & ip) = 0;
 
-        virtual void createOffer (cc_media_constraints_t* constraints) = 0;
+        virtual void createOffer (cc_media_constraints_t* constraints, Timecard *) = 0;
 
-        virtual void createAnswer(cc_media_constraints_t* constraints) = 0;
+        virtual void createAnswer(cc_media_constraints_t* constraints, Timecard *) = 0;
 
-        virtual void setLocalDescription(cc_jsep_action_t action, const std::string & sdp) = 0;
+        virtual void setLocalDescription(cc_jsep_action_t action, const std::string & sdp, Timecard *) = 0;
 
-        virtual void setRemoteDescription(cc_jsep_action_t action, const std::string & sdp) = 0;
+        virtual void setRemoteDescription(cc_jsep_action_t action, const std::string & sdp, Timecard *) = 0;
 
         virtual void setPeerConnection(const std::string& handle) = 0;
 
@@ -288,7 +294,7 @@ namespace CSF
 
         virtual const std::string& getPeerConnection() const = 0;
 
-        virtual void addICECandidate(const std::string & candidate, const std::string & mid, unsigned short level) = 0;
+        virtual void addICECandidate(const std::string & candidate, const std::string & mid, unsigned short level, Timecard *) = 0;
 
     };
 }
diff --git a/media/webrtc/signaling/include/CC_CallInfo.h b/media/webrtc/signaling/include/CC_CallInfo.h
index 3a9137048538..abcc67b07443 100644
--- a/media/webrtc/signaling/include/CC_CallInfo.h
+++ b/media/webrtc/signaling/include/CC_CallInfo.h
@@ -12,10 +12,16 @@ extern "C"
 #include "fsmdef_states.h"
 }
 
+
 #include "CC_Common.h"
 #include "CC_CallTypes.h"
 #include "peer_connection_types.h"
 
+#if defined(__cplusplus) && __cplusplus >= 201103L
+typedef struct Timecard Timecard;
+#else
+#include "timecard.h"
+#endif
 
 namespace CSF
 {
@@ -350,5 +356,11 @@ namespace CSF
            the caller.
          */
         virtual MediaStreamTable* getMediaStreams() const = 0;
+
+        /**
+          Get the current operation's timecard (if any), and assume ownership
+          of its memory.
+         */
+        virtual Timecard *takeTimecard() = 0;
     };
 };
diff --git a/media/webrtc/signaling/signaling.gyp b/media/webrtc/signaling/signaling.gyp
index 0e8a78ed2a2d..ad53174806dd 100644
--- a/media/webrtc/signaling/signaling.gyp
+++ b/media/webrtc/signaling/signaling.gyp
@@ -41,6 +41,7 @@
         './src/callcontrol',
         './src/common',
         './src/common/browser_logging',
+        './src/common/time_profiling',
         './src/media',
         './src/media-conduit',
         './src/mediapipeline',
@@ -94,6 +95,9 @@
         # Browser Logging
         './src/common/browser_logging/CSFLog.cpp',
         './src/common/browser_logging/CSFLog.h',
+        # Browser Logging
+        './src/common/time_profiling/timecard.c',
+        './src/common/time_profiling/timecard.h',
         # Call Control
         './src/callcontrol/CC_CallTypes.cpp',
         './src/callcontrol/CallControlManager.cpp',
@@ -267,6 +271,7 @@
       #
       'include_dirs': [
         './src/common/browser_logging',
+        './src/common/time_profiling',
         './src/sipcc/include',
         './src/sipcc/core/includes',
         './src/sipcc/cpr/include',
diff --git a/media/webrtc/signaling/src/common/time_profiling/timecard.c b/media/webrtc/signaling/src/common/time_profiling/timecard.c
new file mode 100644
index 000000000000..001ca24b70a2
--- /dev/null
+++ b/media/webrtc/signaling/src/common/time_profiling/timecard.c
@@ -0,0 +1,124 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
+/* 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/. */
+
+#include <stdio.h>
+#include "timecard.h"
+#include "mozilla/mozalloc.h"
+
+Timecard *
+create_timecard()
+{
+  Timecard *tc = moz_xcalloc(1,sizeof(Timecard));
+  tc->entries_allocated = TIMECARD_INITIAL_TABLE_SIZE;
+  tc->entries = moz_xcalloc(tc->entries_allocated, sizeof(TimecardEntry));
+  tc->start_time = PR_Now();
+  return tc;
+}
+
+void
+destroy_timecard(Timecard *tc)
+{
+  moz_free(tc->entries);
+  moz_free(tc);
+}
+
+void
+stamp_timecard(Timecard *tc,
+               const char *event,
+               const char *file,
+               unsigned int line,
+               const char *function)
+{
+  TimecardEntry *entry = NULL;
+
+  /* Trim the path component from the filename */
+  const char *last_slash = file;
+  while (*file) {
+    if (*file == '/' || *file == '\\') {
+      last_slash = file;
+    }
+    file++;
+  }
+  file = last_slash;
+  if (*file == '/' || *file == '\\') {
+    file++;
+  }
+
+  /* Ensure there is enough space left in the entries list */
+  if (tc->curr_entry == tc->entries_allocated) {
+    tc->entries_allocated *= 2;
+    tc->entries = moz_xrealloc(tc->entries,
+                               tc->entries_allocated * sizeof(TimecardEntry));
+  }
+
+  /* Record the data into the timecard entry */
+  entry = &tc->entries[tc->curr_entry];
+  entry->timestamp = PR_Now();
+  entry->event = event;
+  entry->file = file;
+  entry->line = line;
+  entry->function = function;
+  tc->curr_entry++;
+}
+
+void
+print_timecard(Timecard *tc)
+{
+  size_t i;
+  TimecardEntry *entry;
+  size_t event_width = 5;
+  size_t file_width = 4;
+  size_t function_width = 8;
+  size_t line_width;
+  PRTime offset, delta;
+
+  for (i = 0; i < tc->curr_entry; i++) {
+    entry = &tc->entries[i];
+    if (strlen(entry->event) > event_width) {
+      event_width = strlen(entry->event);
+    }
+    if (strlen(entry->file) > file_width) {
+      file_width = strlen(entry->file);
+    }
+    if (strlen(entry->function) > function_width) {
+      function_width = strlen(entry->function);
+    }
+  }
+
+  printf("\nTimecard created %4lld.%6.6lld\n\n",
+          tc->start_time / PR_USEC_PER_SEC, tc->start_time % PR_USEC_PER_SEC);
+
+  line_width = 1 + 11 + 11 + event_width + file_width + 6 +
+                   function_width + (4 * 3);
+
+  printf(" %-11s | %-11s | %-*s | %-*s | %-*s\n",
+          "Timestamp", "Delta",
+          (int)event_width, "Event",
+          (int)file_width + 6, "File",
+          (int)function_width, "Function");
+
+  for (i = 0; i <= line_width; i++) {
+    printf("=");
+  }
+  printf("\n");
+
+  for (i = 0; i < tc->curr_entry; i++) {
+    entry = &tc->entries[i];
+    offset = entry->timestamp - tc->start_time;
+    if (i > 0) {
+      delta = entry->timestamp - tc->entries[i-1].timestamp;
+    } else {
+      delta = entry->timestamp - tc->start_time;
+    }
+    printf(" %4lld.%6.6lld | %4lld.%6.6lld | %-*s | %*s:%-5d | %-*s\n",
+           offset / PR_USEC_PER_SEC, offset % PR_USEC_PER_SEC,
+           delta / PR_USEC_PER_SEC, delta % PR_USEC_PER_SEC,
+           (int)event_width, entry->event,
+           (int)file_width, entry->file, entry->line,
+           (int)function_width, entry->function);
+  }
+  printf("\n");
+}
diff --git a/media/webrtc/signaling/src/common/time_profiling/timecard.h b/media/webrtc/signaling/src/common/time_profiling/timecard.h
new file mode 100644
index 000000000000..ca53b8dfebdc
--- /dev/null
+++ b/media/webrtc/signaling/src/common/time_profiling/timecard.h
@@ -0,0 +1,81 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
+/* 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/. */
+
+#ifndef timecard_h__
+#define timecard_h__
+
+#include <stdlib.h>
+#include "prtime.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define STAMP_TIMECARD(card,event)                                       \
+  do {                                                                   \
+    if (card) {                                                          \
+      stamp_timecard((card), (event), __FILE__, __LINE__, __FUNCTION__); \
+    }                                                                    \
+  } while (0)
+
+#define TIMECARD_INITIAL_TABLE_SIZE 16
+
+/*
+ * The "const char *" members of this structure point to static strings.
+ * We do not own them, and should not attempt to deallocate them.
+ */
+
+typedef struct {
+  PRTime timestamp;
+  const char *event;
+  const char *file;
+  unsigned int line;
+  const char *function;
+} TimecardEntry;
+
+typedef struct Timecard {
+  size_t curr_entry;
+  size_t entries_allocated;
+  TimecardEntry *entries;
+  PRTime start_time;
+} Timecard;
+
+/**
+ * Creates a new Timecard structure for tracking events.
+ */
+Timecard *
+create_timecard();
+
+/**
+ * Frees the memory associated with a timecard. After returning, the
+ * timecard pointed to by tc is no longer valid.
+ */
+void
+destroy_timecard(Timecard *tc);
+
+/**
+ * Records a new event in the indicated timecard. This should not be
+ * called directly; code should instead use the STAMP_TIMECARD macro,
+ * above.
+ */
+void
+stamp_timecard(Timecard *tc,
+               const char *event,
+               const char *file,
+               unsigned int line,
+               const char *function);
+
+/**
+ * Formats and outputs the contents of a timecard onto stdout.
+ */
+void
+print_timecard(Timecard *tc);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp b/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
index 59c4137d66e0..6855d38570b6 100644
--- a/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
+++ b/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
@@ -7,6 +7,7 @@
 #include "base/histogram.h"
 #include "vcm.h"
 #include "CSFLog.h"
+#include "timecard.h"
 #include "ccapi_call_info.h"
 #include "CC_SIPCCCallInfo.h"
 #include "ccapi_device_info.h"
@@ -71,6 +72,15 @@ static const char* logTag = "PeerConnectionImpl";
 static const int DTLS_FINGERPRINT_LENGTH = 64;
 static const int MEDIA_STREAM_MUTE = 0x80;
 
+PRLogModuleInfo *signalingLogInfo() {
+  static PRLogModuleInfo *logModuleInfo = nullptr;
+  if (!logModuleInfo) {
+    logModuleInfo = PR_NewLogModule("signaling");
+  }
+  return logModuleInfo;
+}
+
+
 namespace sipcc {
 
 void MediaConstraints::setBooleanConstraint(const std::string& constraint, bool enabled, bool mandatory) {
@@ -323,7 +333,9 @@ private:
 NS_IMPL_ISUPPORTS1(PeerConnectionImpl, IPeerConnection)
 
 PeerConnectionImpl::PeerConnectionImpl()
-: mRole(kRoleUnknown)
+: mTimeCard(PR_LOG_TEST(signalingLogInfo(),PR_LOG_ERROR) ?
+            create_timecard() : nullptr)
+  , mRole(kRoleUnknown)
   , mCall(NULL)
   , mReadyState(kNew)
   , mSignalingState(kSignalingStable)
@@ -341,10 +353,17 @@ PeerConnectionImpl::PeerConnectionImpl()
 #endif
   CSFLogInfo(logTag, "%s: PeerConnectionImpl constructor for %s",
              __FUNCTION__, mHandle.c_str());
+  STAMP_TIMECARD(mTimeCard, "Constructor Completed");
 }
 
 PeerConnectionImpl::~PeerConnectionImpl()
 {
+  if (mTimeCard) {
+    STAMP_TIMECARD(mTimeCard, "Destructor Invoked");
+    print_timecard(mTimeCard);
+    destroy_timecard(mTimeCard);
+    mTimeCard = nullptr;
+  }
   // This aborts if not on main thread (in Debug builds)
   PC_AUTO_ENTER_API_CALL_NO_CHECK();
   if (PeerConnectionCtx::isActive()) {
@@ -587,11 +606,13 @@ PeerConnectionImpl::Initialize(IPeerConnectionObserver* aObserver,
 
   mHandle = hex;
 
+  STAMP_TIMECARD(mTimeCard, "Initializing PC Ctx");
   res = PeerConnectionCtx::InitializeGlobal(mThread);
   NS_ENSURE_SUCCESS(res, res);
 
   PeerConnectionCtx *pcctx = PeerConnectionCtx::GetInstance();
   MOZ_ASSERT(pcctx);
+  STAMP_TIMECARD(mTimeCard, "Done Initializing PC Ctx");
 
   mCall = pcctx->createCall();
   if(!mCall.get()) {
@@ -628,8 +649,10 @@ PeerConnectionImpl::Initialize(IPeerConnectionObserver* aObserver,
   mCall->setPeerConnection(mHandle);
   PeerConnectionCtx::GetInstance()->mPeerConnections[mHandle] = this;
 
+  STAMP_TIMECARD(mTimeCard, "Generating DTLS Identity");
   // Create the DTLS Identity
   mIdentity = DtlsIdentity::Generate();
+  STAMP_TIMECARD(mTimeCard, "Done Generating DTLS Identity");
 
   if (!mIdentity) {
     CSFLogError(logTag, "%s: Generate returned NULL", __FUNCTION__);
@@ -659,14 +682,6 @@ PeerConnectionImpl::Initialize(IPeerConnectionObserver* aObserver,
     return res;
   }
 
-#ifndef MOZILLA_INTERNAL_API
-  // Busy-wait until we are ready, for C++ unit tests. Remove when tests are fixed.
-  CSFLogDebug(logTag, "%s: Sleeping until kStarted", __FUNCTION__);
-  while(PeerConnectionCtx::GetInstance()->sipcc_state() != kStarted) {
-    PR_Sleep(100);
-  }
-#endif
-
   return NS_OK;
 }
 
@@ -1003,12 +1018,16 @@ PeerConnectionImpl::CreateOffer(MediaConstraints& constraints)
 {
   PC_AUTO_ENTER_API_CALL(true);
 
+  Timecard *tc = mTimeCard;
+  mTimeCard = nullptr;
+  STAMP_TIMECARD(tc, "Create Offer");
+
   mRole = kRoleOfferer;  // TODO(ekr@rtfm.com): Interrogate SIPCC here?
 
   cc_media_constraints_t* cc_constraints = nullptr;
   constraints.buildArray(&cc_constraints);
 
-  mCall->createOffer(cc_constraints);
+  mCall->createOffer(cc_constraints, tc);
   return NS_OK;
 }
 
@@ -1031,12 +1050,16 @@ PeerConnectionImpl::CreateAnswer(MediaConstraints& constraints)
 {
   PC_AUTO_ENTER_API_CALL(true);
 
+  Timecard *tc = mTimeCard;
+  mTimeCard = nullptr;
+  STAMP_TIMECARD(tc, "Create Answer");
+
   mRole = kRoleAnswerer;  // TODO(ekr@rtfm.com): Interrogate SIPCC here?
 
   cc_media_constraints_t* cc_constraints = nullptr;
   constraints.buildArray(&cc_constraints);
 
-  mCall->createAnswer(cc_constraints);
+  mCall->createAnswer(cc_constraints, tc);
   return NS_OK;
 }
 
@@ -1050,8 +1073,13 @@ PeerConnectionImpl::SetLocalDescription(int32_t aAction, const char* aSDP)
     return NS_ERROR_FAILURE;
   }
 
+  Timecard *tc = mTimeCard;
+  mTimeCard = nullptr;
+  STAMP_TIMECARD(tc, "Set Local Description");
+
   mLocalRequestedSDP = aSDP;
-  mCall->setLocalDescription((cc_jsep_action_t)aAction, mLocalRequestedSDP);
+  mCall->setLocalDescription((cc_jsep_action_t)aAction,
+                             mLocalRequestedSDP, tc);
   return NS_OK;
 }
 
@@ -1065,8 +1093,13 @@ PeerConnectionImpl::SetRemoteDescription(int32_t action, const char* aSDP)
     return NS_ERROR_FAILURE;
   }
 
+  Timecard *tc = mTimeCard;
+  mTimeCard = nullptr;
+  STAMP_TIMECARD(tc, "Set Remote Description");
+
   mRemoteRequestedSDP = aSDP;
-  mCall->setRemoteDescription((cc_jsep_action_t)action, mRemoteRequestedSDP);
+  mCall->setRemoteDescription((cc_jsep_action_t)action,
+                              mRemoteRequestedSDP, tc);
   return NS_OK;
 }
 
@@ -1074,7 +1107,11 @@ NS_IMETHODIMP
 PeerConnectionImpl::AddIceCandidate(const char* aCandidate, const char* aMid, unsigned short aLevel) {
   PC_AUTO_ENTER_API_CALL(true);
 
-  mCall->addICECandidate(aCandidate, aMid, aLevel);
+  Timecard *tc = mTimeCard;
+  mTimeCard = nullptr;
+  STAMP_TIMECARD(tc, "Add Ice Candidate");
+
+  mCall->addICECandidate(aCandidate, aMid, aLevel, tc);
   return NS_OK;
 }
 
@@ -1367,6 +1404,12 @@ PeerConnectionImpl::onCallEvent(ccapi_call_event_e aCallEvent,
 
   cc_call_state_t event = aInfo->getCallState();
   std::string statestr = aInfo->callStateToString(event);
+  Timecard *timecard = aInfo->takeTimecard();
+
+  if (timecard) {
+    mTimeCard = timecard;
+    STAMP_TIMECARD(mTimeCard, "Operation Completed");
+  }
 
   if (CCAPI_CALL_EV_CREATED != aCallEvent && CCAPI_CALL_EV_STATE != aCallEvent) {
     CSFLogDebug(logTag, "%s: **** CALL HANDLE IS: %s, **** CALL STATE IS: %s",
@@ -1516,7 +1559,24 @@ PeerConnectionImpl::IceStateChange_m(IceState aState)
 
   mIceState = aState;
 
-#ifdef MOZILLA_INTERNAL_API
+  switch (mIceState) {
+    case kIceGathering:
+      STAMP_TIMECARD(mTimeCard, "Ice state: gathering");
+      break;
+    case kIceWaiting:
+      STAMP_TIMECARD(mTimeCard, "Ice state: waiting");
+      break;
+    case kIceChecking:
+      STAMP_TIMECARD(mTimeCard, "Ice state: checking");
+      break;
+    case kIceConnected:
+      STAMP_TIMECARD(mTimeCard, "Ice state: connected");
+      break;
+    case kIceFailed:
+      STAMP_TIMECARD(mTimeCard, "Ice state: failed");
+      break;
+  }
+
   nsCOMPtr<IPeerConnectionObserver> pco = do_QueryReferent(mPCObserver);
   if (!pco) {
     return NS_OK;
@@ -1527,7 +1587,6 @@ PeerConnectionImpl::IceStateChange_m(IceState aState)
                              // static_cast required to work around old C++ compiler on Android NDK r5c
                              static_cast<int>(IPeerConnectionObserver::kIceState)),
                 NS_DISPATCH_NORMAL);
-#endif
   return NS_OK;
 }
 
diff --git a/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.h b/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.h
index 14f27e8b9b63..36e75d66452d 100644
--- a/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.h
+++ b/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.h
@@ -40,6 +40,12 @@ namespace mozilla {
 }
 #endif
 
+#if defined(__cplusplus) && __cplusplus >= 201103L
+typedef struct Timecard Timecard;
+#else
+#include "timecard.h"
+#endif
+
 using namespace mozilla;
 
 namespace sipcc {
@@ -328,6 +334,11 @@ private:
   // ICE callbacks run on the right thread.
   nsresult IceStateChange_m(IceState aState);
 
+  // Timecard used to measure processing time. This should be the first class
+  // attribute so that we accurately measure the time required to instantiate
+  // any other attributes of this class.
+  Timecard *mTimeCard;
+
   // The role we are adopting
   Role mRole;
 
diff --git a/media/webrtc/signaling/src/sipcc/core/ccapp/CCProvider.h b/media/webrtc/signaling/src/sipcc/core/ccapp/CCProvider.h
index bd87aa77c97b..75ec4ae537e3 100755
--- a/media/webrtc/signaling/src/sipcc/core/ccapp/CCProvider.h
+++ b/media/webrtc/signaling/src/sipcc/core/ccapp/CCProvider.h
@@ -5,6 +5,12 @@
 #ifndef __CCPROVIDER_H__
 #define __CCPROVIDER_H__
 
+#if defined(__cplusplus) && __cplusplus >= 201103L
+typedef struct Timecard Timecard;
+#else
+#include "timecard.h"
+#endif
+
 #include "cpr_types.h"
 #include "cpr_ipc.h"
 #include "cpr_socket.h"
@@ -101,6 +107,7 @@ typedef struct cc_call_info_t_{
     unsigned int  media_stream_track_id;
     unsigned int  media_stream_id;
     cc_media_constraints_t* cc_constraints;
+    Timecard *    timecard;
 } session_data_t;
 
 typedef enum {
diff --git a/media/webrtc/signaling/src/sipcc/core/ccapp/cc_call_feature.c b/media/webrtc/signaling/src/sipcc/core/ccapp/cc_call_feature.c
index 0675497676d2..a89ee8c2a573 100644
--- a/media/webrtc/signaling/src/sipcc/core/ccapp/cc_call_feature.c
+++ b/media/webrtc/signaling/src/sipcc/core/ccapp/cc_call_feature.c
@@ -2,6 +2,7 @@
  * 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/. */
 
+#include "timecard.h"
 #include "cc_call_feature.h"
 #include "CCProvider.h"
 #include "sessionConstants.h"
@@ -106,7 +107,8 @@ cc_return_t cc_invokeFeatureSDPMode(cc_call_handle_t call_handle,
                                     uint16_t level,
                                     cc_media_constraints_t *constraints,
                                     string_t data,
-                                    string_t data1) {
+                                    string_t data1,
+                                    Timecard *tc) {
     session_feature_t callFeature;
     unsigned int session_id = 0;
     callFeature.session_id = (SESSIONTYPE_CALLCONTROL << CC_SID_TYPE_SHIFT) + call_handle;
@@ -117,6 +119,7 @@ cc_return_t cc_invokeFeatureSDPMode(cc_call_handle_t call_handle,
     callFeature.featData.ccData.track_id = track_id;
     callFeature.featData.ccData.level = level;
     callFeature.featData.ccData.constraints = constraints;
+    callFeature.featData.ccData.timecard = tc;
 
     CCAPP_DEBUG(DEB_F_PREFIX"cc_invokeFeatureSDPMode:sid=%d, line=%d, cid=%d, fid=%d, data=%s",
                         DEB_F_PREFIX_ARGS("cc_call_feature", "cc_invokeFeatureSDPMode"),
@@ -285,48 +288,56 @@ cc_return_t CC_CallFeature_dial(cc_call_handle_t call_handle, cc_sdp_direction_t
 }
 
 cc_return_t CC_CallFeature_CreateOffer(cc_call_handle_t call_handle,
-                                       cc_media_constraints_t *constraints) {
+                                       cc_media_constraints_t *constraints,
+                                       Timecard *tc) {
     CCAPP_DEBUG(DEB_L_C_F_PREFIX, DEB_L_C_F_PREFIX_ARGS(SIP_CC_PROV, GET_CALL_ID(call_handle),
                 GET_LINE_ID(call_handle), __FUNCTION__));
 
     return cc_invokeFeatureSDPMode(call_handle, CC_FEATURE_CREATEOFFER, JSEP_NO_ACTION,
-                                   0, 0, NO_STREAM, 0, constraints, NULL, NULL);
+                                   0, 0, NO_STREAM, 0, constraints, NULL, NULL, tc);
 }
 
 cc_return_t CC_CallFeature_CreateAnswer(cc_call_handle_t call_handle,
-                                        cc_media_constraints_t *constraints) {
+                                        cc_media_constraints_t *constraints,
+                                        Timecard *tc) {
     CCAPP_DEBUG(DEB_L_C_F_PREFIX, DEB_L_C_F_PREFIX_ARGS(SIP_CC_PROV, GET_CALL_ID(call_handle),
                 GET_LINE_ID(call_handle), __FUNCTION__));
 
     return cc_invokeFeatureSDPMode(call_handle, CC_FEATURE_CREATEANSWER, JSEP_NO_ACTION,
-                                   0, 0, NO_STREAM, 0, constraints, NULL, NULL);
+                                   0, 0, NO_STREAM, 0, constraints, NULL, NULL, tc);
 }
 
-cc_return_t CC_CallFeature_SetLocalDescription(cc_call_handle_t call_handle, cc_jsep_action_t action, string_t sdp) {
+cc_return_t CC_CallFeature_SetLocalDescription(cc_call_handle_t call_handle,
+                                               cc_jsep_action_t action,
+                                               string_t sdp,
+                                               Timecard *tc) {
     cc_media_constraints_t *constraints = NULL;
     CCAPP_DEBUG(DEB_L_C_F_PREFIX, DEB_L_C_F_PREFIX_ARGS(SIP_CC_PROV, GET_CALL_ID(call_handle),
             GET_LINE_ID(call_handle), __FUNCTION__));
 
     return cc_invokeFeatureSDPMode(call_handle, CC_FEATURE_SETLOCALDESC, action,
-                                   0, 0, NO_STREAM, 0, constraints, sdp, NULL);
+                                   0, 0, NO_STREAM, 0, constraints, sdp, NULL, tc);
 }
 
-cc_return_t CC_CallFeature_SetRemoteDescription(cc_call_handle_t call_handle, cc_jsep_action_t action, string_t sdp) {
+cc_return_t CC_CallFeature_SetRemoteDescription(cc_call_handle_t call_handle,
+                                                cc_jsep_action_t action,
+                                                string_t sdp,
+                                                Timecard *tc) {
     cc_media_constraints_t *constraints = NULL;
     CCAPP_DEBUG(DEB_L_C_F_PREFIX, DEB_L_C_F_PREFIX_ARGS(SIP_CC_PROV, GET_CALL_ID(call_handle),
             GET_LINE_ID(call_handle), __FUNCTION__));
 
     return cc_invokeFeatureSDPMode(call_handle, CC_FEATURE_SETREMOTEDESC, action,
-                                   0, 0, NO_STREAM, 0, constraints, sdp, NULL);
+                                   0, 0, NO_STREAM, 0, constraints, sdp, NULL, tc);
 }
 
-cc_return_t CC_CallFeature_SetPeerConnection(cc_call_handle_t call_handle, cc_peerconnection_t pc) {
+cc_return_t CC_CallFeature_SetPeerConnection(cc_call_handle_t call_handle,cc_peerconnection_t pc) {
     cc_media_constraints_t *constraints = NULL;
     CCAPP_DEBUG(DEB_L_C_F_PREFIX, DEB_L_C_F_PREFIX_ARGS(SIP_CC_PROV, GET_CALL_ID(call_handle),
                 GET_LINE_ID(call_handle), __FUNCTION__));
 
     return cc_invokeFeatureSDPMode(call_handle, CC_FEATURE_SETPEERCONNECTION, JSEP_NO_ACTION,
-                                   0, 0, NO_STREAM, 0, constraints, pc, NULL);
+                                   0, 0, NO_STREAM, 0, constraints, pc, NULL, NULL);
 }
 
 cc_return_t CC_CallFeature_AddStream(cc_call_handle_t call_handle, cc_media_stream_id_t stream_id,
@@ -336,7 +347,7 @@ cc_return_t CC_CallFeature_AddStream(cc_call_handle_t call_handle, cc_media_stre
             GET_LINE_ID(call_handle), __FUNCTION__));
 
     return cc_invokeFeatureSDPMode(call_handle, CC_FEATURE_ADDSTREAM, JSEP_NO_ACTION,
-                                   stream_id, track_id, media_type, 0, constraints, NULL, NULL);
+                                   stream_id, track_id, media_type, 0, constraints, NULL, NULL, NULL);
 }
 
 cc_return_t CC_CallFeature_RemoveStream(cc_call_handle_t call_handle, cc_media_stream_id_t stream_id,
@@ -347,16 +358,20 @@ cc_return_t CC_CallFeature_RemoveStream(cc_call_handle_t call_handle, cc_media_s
                 GET_LINE_ID(call_handle), __FUNCTION__));
 
     return cc_invokeFeatureSDPMode(call_handle, CC_FEATURE_REMOVESTREAM, JSEP_NO_ACTION,
-                                   stream_id, track_id, media_type, 0, constraints, NULL, NULL);
+                                   stream_id, track_id, media_type, 0, constraints, NULL, NULL, NULL);
 }
 
-cc_return_t CC_CallFeature_AddICECandidate(cc_call_handle_t call_handle, const char* candidate, const char *mid, cc_level_t level) {
+cc_return_t CC_CallFeature_AddICECandidate(cc_call_handle_t call_handle,
+                                           const char* candidate,
+                                           const char *mid,
+                                           cc_level_t level,
+                                           Timecard *tc) {
     cc_media_constraints_t *constraints = NULL;
     CCAPP_DEBUG(DEB_L_C_F_PREFIX, DEB_L_C_F_PREFIX_ARGS(SIP_CC_PROV, GET_CALL_ID(call_handle),
             GET_LINE_ID(call_handle), __FUNCTION__));
 
     return cc_invokeFeatureSDPMode(call_handle, CC_FEATURE_ADDICECANDIDATE, JSEP_NO_ACTION,
-                                   0, 0, NO_STREAM, (uint16_t)level, constraints, candidate, mid);
+                                   0, 0, NO_STREAM, (uint16_t)level, constraints, candidate, mid, tc);
 }
 
 /**
diff --git a/media/webrtc/signaling/src/sipcc/core/ccapp/ccapi_call.c b/media/webrtc/signaling/src/sipcc/core/ccapp/ccapi_call.c
index dbf04d75a13f..82f55b6d489e 100644
--- a/media/webrtc/signaling/src/sipcc/core/ccapp/ccapi_call.c
+++ b/media/webrtc/signaling/src/sipcc/core/ccapp/ccapi_call.c
@@ -2,6 +2,7 @@
  * 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/. */
 
+#include "timecard.h"
 #include "cpr_stdio.h"
 #include "ccapi_call.h"
 #include "sessionHash.h"
@@ -91,21 +92,29 @@ cc_return_t CCAPI_Call_originateCall(cc_call_handle_t handle, cc_sdp_direction_t
 }
 
 cc_return_t CCAPI_CreateOffer(cc_call_handle_t handle,
-                              cc_media_constraints_t *constraints) {
-	return CC_CallFeature_CreateOffer(handle, constraints);
+                              cc_media_constraints_t *constraints,
+                              Timecard *tc) {
+    return CC_CallFeature_CreateOffer(handle, constraints, tc);
 }
 
 cc_return_t CCAPI_CreateAnswer(cc_call_handle_t handle,
-                               cc_media_constraints_t *constraints) {
-	return CC_CallFeature_CreateAnswer(handle, constraints);
+                               cc_media_constraints_t *constraints,
+                               Timecard *tc) {
+    return CC_CallFeature_CreateAnswer(handle, constraints, tc);
 }
 
-cc_return_t CCAPI_SetLocalDescription(cc_call_handle_t handle, cc_jsep_action_t action, cc_string_t sdp) {
-	return CC_CallFeature_SetLocalDescription(handle, action, sdp);
+cc_return_t CCAPI_SetLocalDescription(cc_call_handle_t handle,
+                                      cc_jsep_action_t action,
+                                      cc_string_t sdp,
+                                      Timecard *tc) {
+    return CC_CallFeature_SetLocalDescription(handle, action, sdp, tc);
 }
 
-cc_return_t CCAPI_SetRemoteDescription(cc_call_handle_t handle, cc_jsep_action_t action, cc_string_t sdp) {
-    return CC_CallFeature_SetRemoteDescription(handle, action, sdp);
+cc_return_t CCAPI_SetRemoteDescription(cc_call_handle_t handle,
+                                       cc_jsep_action_t action,
+                                       cc_string_t sdp,
+                                       Timecard *tc) {
+    return CC_CallFeature_SetRemoteDescription(handle, action, sdp, tc);
 }
 
 cc_return_t CCAPI_SetPeerConnection(cc_call_handle_t handle, cc_peerconnection_t pc) {
@@ -120,8 +129,12 @@ cc_return_t CCAPI_RemoveStream(cc_call_handle_t handle, cc_media_stream_id_t str
   return CC_CallFeature_RemoveStream(handle, stream_id, track_id, media_type);
 }
 
-cc_return_t CCAPI_AddICECandidate(cc_call_handle_t handle, cc_string_t candidate, cc_string_t mid, cc_level_t level) {
-	return CC_CallFeature_AddICECandidate(handle, candidate, mid, level);
+cc_return_t CCAPI_AddICECandidate(cc_call_handle_t handle,
+                                  cc_string_t candidate,
+                                  cc_string_t mid,
+                                  cc_level_t level,
+                                  Timecard *tc) {
+    return CC_CallFeature_AddICECandidate(handle, candidate, mid, level, tc);
 }
 
 /**
diff --git a/media/webrtc/signaling/src/sipcc/core/ccapp/ccapi_call_info.c b/media/webrtc/signaling/src/sipcc/core/ccapp/ccapi_call_info.c
index 11b63510bc3e..b6d4a5289616 100644
--- a/media/webrtc/signaling/src/sipcc/core/ccapp/ccapi_call_info.c
+++ b/media/webrtc/signaling/src/sipcc/core/ccapp/ccapi_call_info.c
@@ -801,3 +801,23 @@ MediaStreamTable*  CCAPI_CallInfo_getMediaStreams(cc_callinfo_ref_t handle) {
 
   return table;
 }
+
+/**
+ * Assume ownership of timecard
+ * @param handle - call handle
+ * @return Timecard pointer
+ */
+Timecard*  CCAPI_CallInfo_takeTimecard(cc_callinfo_ref_t handle) {
+  session_data_t *data = (session_data_t *)handle;
+  Timecard *timecard = NULL;
+
+  CCAPP_DEBUG(DEB_F_PREFIX"Entering", DEB_F_PREFIX_ARGS(SIP_CC_PROV,
+              __FUNCTION__));
+
+  if (data) {
+    timecard = data->timecard;
+    data->timecard = NULL;
+  }
+
+  return timecard;
+}
diff --git a/media/webrtc/signaling/src/sipcc/core/ccapp/ccprovider.c b/media/webrtc/signaling/src/sipcc/core/ccapp/ccprovider.c
index 076fcfb02438..24970a7b3ede 100755
--- a/media/webrtc/signaling/src/sipcc/core/ccapp/ccprovider.c
+++ b/media/webrtc/signaling/src/sipcc/core/ccapp/ccprovider.c
@@ -4,6 +4,7 @@
 
 #include <limits.h>
 
+#include "timecard.h"
 #include "CCProvider.h"
 #include "ccSession.h"
 #include "ccsip_task.h"
@@ -631,8 +632,10 @@ processSessionEvent (line_t line_id, callid_t call_id, unsigned int event, sdp_d
     char* data1 =(char*)ccData.info1;
     long strtol_result;
     char *strtol_end;
+    Timecard *timecard = ccData.timecard;
     int sdpmode = 0;
 
+
     CCAPP_DEBUG(DEB_L_C_F_PREFIX"event=%d data=%s",
                 DEB_L_C_F_PREFIX_ARGS(SIP_CC_PROV, call_id, line_id, fname), event,
                 ((event == CC_FEATURE_KEYPRESS) ? "..." : data));
@@ -660,18 +663,22 @@ processSessionEvent (line_t line_id, callid_t call_id, unsigned int event, sdp_d
              dp_int_update_keypress(line_id, call_id, BKSP_KEY);
              break;
          case CC_FEATURE_CREATEOFFER:
+             STAMP_TIMECARD(timecard, "Processing create offer event");
              featdata.session.constraints = ccData.constraints;
-             cc_createoffer (CC_SRC_UI, CC_SRC_GSM, call_id, (line_t)instance, CC_FEATURE_CREATEOFFER, &featdata);
+             cc_createoffer (CC_SRC_UI, CC_SRC_GSM, call_id, (line_t)instance, CC_FEATURE_CREATEOFFER, &featdata, timecard);
              break;
          case CC_FEATURE_CREATEANSWER:
+             STAMP_TIMECARD(timecard, "Processing create answer event");
              featdata.session.constraints = ccData.constraints;
-             cc_createanswer (CC_SRC_UI, CC_SRC_GSM, call_id, (line_t)instance, CC_FEATURE_CREATEANSWER, data, &featdata);
+             cc_createanswer (CC_SRC_UI, CC_SRC_GSM, call_id, (line_t)instance, CC_FEATURE_CREATEANSWER, data, &featdata, timecard);
              break;
          case CC_FEATURE_SETLOCALDESC:
-             cc_setlocaldesc (CC_SRC_UI, CC_SRC_GSM, call_id, (line_t)instance, CC_FEATURE_SETLOCALDESC, ccData.action, data, &featdata);
+             STAMP_TIMECARD(timecard, "Processing set local event");
+             cc_setlocaldesc (CC_SRC_UI, CC_SRC_GSM, call_id, (line_t)instance, CC_FEATURE_SETLOCALDESC, ccData.action, data, &featdata, timecard);
              break;
          case CC_FEATURE_SETREMOTEDESC:
-             cc_setremotedesc (CC_SRC_UI, CC_SRC_GSM, call_id, (line_t)instance, CC_FEATURE_SETREMOTEDESC, ccData.action, data, &featdata);
+             STAMP_TIMECARD(timecard, "Processing set remote event");
+             cc_setremotedesc (CC_SRC_UI, CC_SRC_GSM, call_id, (line_t)instance, CC_FEATURE_SETREMOTEDESC, ccData.action, data, &featdata, timecard);
              break;
          case CC_FEATURE_SETPEERCONNECTION:
            PR_ASSERT(strlen(data) < PC_HANDLE_SIZE);
@@ -682,25 +689,26 @@ processSessionEvent (line_t line_id, callid_t call_id, unsigned int event, sdp_d
 
            cc_int_feature2(CC_MSG_SETPEERCONNECTION, CC_SRC_UI, CC_SRC_GSM,
              call_id, (line_t)instance,
-             CC_FEATURE_SETPEERCONNECTION, &featdata);
+             CC_FEATURE_SETPEERCONNECTION, &featdata, NULL);
            break;
          case CC_FEATURE_ADDSTREAM:
            featdata.track.stream_id = ccData.stream_id;
            featdata.track.track_id = ccData.track_id;
            featdata.track.media_type = ccData.media_type;
-           cc_int_feature2(CC_MSG_ADDSTREAM, CC_SRC_UI, CC_SRC_GSM, call_id, (line_t)instance, CC_FEATURE_ADDSTREAM, &featdata);
+           cc_int_feature2(CC_MSG_ADDSTREAM, CC_SRC_UI, CC_SRC_GSM, call_id, (line_t)instance, CC_FEATURE_ADDSTREAM, &featdata, timecard);
            break;
          case CC_FEATURE_REMOVESTREAM:
            featdata.track.stream_id = ccData.stream_id;
            featdata.track.track_id = ccData.track_id;
            featdata.track.media_type = ccData.media_type;
-           cc_int_feature2(CC_MSG_REMOVESTREAM, CC_SRC_UI, CC_SRC_GSM, call_id, (line_t)instance, CC_FEATURE_REMOVESTREAM, &featdata);
+           cc_int_feature2(CC_MSG_REMOVESTREAM, CC_SRC_UI, CC_SRC_GSM, call_id, (line_t)instance, CC_FEATURE_REMOVESTREAM, &featdata, timecard);
            break;
          case CC_FEATURE_ADDICECANDIDATE:
+           STAMP_TIMECARD(timecard, "Processing add candidate event");
            featdata.candidate.level = ccData.level;
            sstrncpy(featdata.candidate.candidate, data, sizeof(featdata.candidate.candidate)-1);
            sstrncpy(featdata.candidate.mid, data1, sizeof(featdata.candidate.mid)-1);
-           cc_int_feature2(CC_MSG_ADDCANDIDATE, CC_SRC_UI, CC_SRC_GSM, call_id, (line_t)instance, CC_FEATURE_ADDICECANDIDATE, &featdata);
+           cc_int_feature2(CC_MSG_ADDCANDIDATE, CC_SRC_UI, CC_SRC_GSM, call_id, (line_t)instance, CC_FEATURE_ADDICECANDIDATE, &featdata, timecard);
            break;
          case CC_FEATURE_DIALSTR:
              if (CheckAndGetAvailableLine(&line_id, &call_id) == TRUE) {
@@ -1053,6 +1061,11 @@ session_data_t * getDeepCopyOfSessionData(session_data_t *data)
            newData->plcd_number =  strlib_copy(data->plcd_number);
            newData->status =  strlib_copy(data->status);
            newData->sdp = strlib_copy(data->sdp);
+
+           /* The timecard can have only one owner */
+           newData->timecard = data->timecard;
+           data->timecard = NULL;
+
            calllogger_copy_call_log(&newData->call_log, &data->call_log);
        } else {
            newData->ref_count = 1;
@@ -1072,6 +1085,7 @@ session_data_t * getDeepCopyOfSessionData(session_data_t *data)
            newData->plcd_number =  strlib_empty();
            newData->status = strlib_empty();
            newData->sdp = strlib_empty();
+           newData->timecard = NULL;
            calllogger_init_call_log(&newData->call_log);
        }
 
@@ -1118,6 +1132,7 @@ void cleanSessionData(session_data_t *data)
         data->status = strlib_empty();
         strlib_free(data->sdp);
         data->sdp = strlib_empty();
+        data->timecard = NULL;
         calllogger_free_call_log(&data->call_log);
     }
 }
@@ -1456,6 +1471,7 @@ static void ccappUpdateSessionData (session_update_t *sessUpd)
 	data->vid_dir = SDP_DIRECTION_INACTIVE;
         data->callref = 0;
         data->sdp = strlib_empty();
+        data->timecard = NULL;
         calllogger_init_call_log(&data->call_log);
 
         switch (sessUpd->eventID) {
@@ -1467,6 +1483,8 @@ static void ccappUpdateSessionData (session_update_t *sessUpd)
             case UPDATE_REMOTE_DESC:
             case ICE_CANDIDATE_ADD:
                 data->sdp = sessUpd->update.ccSessionUpd.data.state_data.sdp;
+                data->timecard =
+                    sessUpd->update.ccSessionUpd.data.state_data.timecard;
                 /* Fall through to the next case... */
             case REMOTE_STREAM_ADD:
                 data->cause =
@@ -1817,6 +1835,7 @@ static void ccappUpdateSessionData (session_update_t *sessUpd)
         data->sdp = sessUpd->update.ccSessionUpd.data.state_data.sdp;
         /* Fall through to the next case... */
     case REMOTE_STREAM_ADD:
+        data->timecard = sessUpd->update.ccSessionUpd.data.state_data.timecard;
         data->cause = sessUpd->update.ccSessionUpd.data.state_data.cause;
         data->state = sessUpd->update.ccSessionUpd.data.state_data.state;
         data->fsm_state =
diff --git a/media/webrtc/signaling/src/sipcc/core/common/ui.c b/media/webrtc/signaling/src/sipcc/core/common/ui.c
index 6faa7ec7baab..8ba0cbdd194f 100755
--- a/media/webrtc/signaling/src/sipcc/core/common/ui.c
+++ b/media/webrtc/signaling/src/sipcc/core/common/ui.c
@@ -7,6 +7,7 @@
  */
 
 #include <stdarg.h>
+#include "timecard.h"
 #include "cpr.h"
 #include "cpr_in.h"
 #include "phone.h"
@@ -1555,6 +1556,7 @@ static void post_message_helper(group_call_event_t eventId,
                                 callid_t nCallId,
                                 uint16_t call_instance_id,
                                 string_t sdp,
+                                Timecard *timecard,
                                 pc_error error,
                                 const char *format,
                                 va_list args)
@@ -1568,6 +1570,8 @@ static void post_message_helper(group_call_event_t eventId,
         return;
     }
 
+    STAMP_TIMECARD(timecard, "Posting message to PC");
+
     msg.sessionID = createSessionId(nLine, nCallId);
 
     msg.eventID = eventId;
@@ -1577,6 +1581,7 @@ static void post_message_helper(group_call_event_t eventId,
     msg.update.ccSessionUpd.data.state_data.line_id = nLine;
     msg.update.ccSessionUpd.data.state_data.sdp = sdp;
     msg.update.ccSessionUpd.data.state_data.cause = error;
+    msg.update.ccSessionUpd.data.state_data.timecard = timecard;
 
     if (format) {
       flex_string_init(&fs);
@@ -1609,6 +1614,7 @@ void ui_create_offer(call_events event,
                      callid_t nCallID,
                      uint16_t call_instance_id,
                      string_t sdp,
+                     Timecard *timecard,
                      pc_error error,
                      const char *format, ...)
 {
@@ -1621,7 +1627,7 @@ void ui_create_offer(call_events event,
 
     va_start(ap, format);
     post_message_helper(CREATE_OFFER, event, new_state, nLine, nCallID,
-                        call_instance_id, sdp, error, format, ap);
+                        call_instance_id, sdp, timecard, error, format, ap);
     va_end(ap);
 
     return;
@@ -1639,6 +1645,7 @@ void ui_create_answer(call_events event,
                       callid_t nCallID,
                       uint16_t call_instance_id,
                       string_t sdp,
+                      Timecard *timecard,
                       pc_error error,
                       const char *format, ...)
 {
@@ -1648,7 +1655,7 @@ void ui_create_answer(call_events event,
 
     va_start(ap, format);
     post_message_helper(CREATE_ANSWER, event, new_state, nLine, nCallID,
-                        call_instance_id, sdp, error, format, ap);
+                        call_instance_id, sdp, timecard, error, format, ap);
     va_end(ap);
 
     return;
@@ -1666,6 +1673,7 @@ void ui_set_local_description(call_events event,
                               callid_t nCallID,
                               uint16_t call_instance_id,
                               string_t sdp,
+                              Timecard *timecard,
                               pc_error error,
                               const char *format, ...)
 {
@@ -1675,7 +1683,7 @@ void ui_set_local_description(call_events event,
 
     va_start(ap, format);
     post_message_helper(SET_LOCAL_DESC, event, new_state, nLine, nCallID,
-                        call_instance_id, sdp, error, format, ap);
+                        call_instance_id, sdp, timecard, error, format, ap);
     va_end(ap);
 
     return;
@@ -1693,6 +1701,7 @@ void ui_set_remote_description(call_events event,
                                callid_t nCallID,
                                uint16_t call_instance_id,
                                string_t sdp,
+                               Timecard *timecard,
                                pc_error error,
                                const char *format, ...)
 {
@@ -1702,7 +1711,7 @@ void ui_set_remote_description(call_events event,
 
     va_start(ap, format);
     post_message_helper(SET_REMOTE_DESC, event, new_state, nLine, nCallID,
-                        call_instance_id, sdp, error, format, ap);
+                        call_instance_id, sdp, timecard, error, format, ap);
     va_end(ap);
 
     return;
@@ -1720,6 +1729,7 @@ void ui_update_local_description(call_events event,
                                  callid_t nCallID,
                                  uint16_t call_instance_id,
                                  string_t sdp,
+                                 Timecard *timecard,
                                  pc_error error,
                                  const char *format, ...)
 {
@@ -1730,7 +1740,7 @@ void ui_update_local_description(call_events event,
 
     va_start(ap, format);
     post_message_helper(UPDATE_LOCAL_DESC, event, new_state, nLine, nCallID,
-                        call_instance_id, sdp, error, format, ap);
+                        call_instance_id, sdp, timecard, error, format, ap);
     va_end(ap);
 
     return;
@@ -1748,6 +1758,7 @@ void ui_ice_candidate_add(call_events event,
                           callid_t nCallID,
                           uint16_t call_instance_id,
                           string_t sdp,
+                          Timecard *timecard,
                           pc_error error,
                           const char *format, ...)
 {
@@ -1757,7 +1768,7 @@ void ui_ice_candidate_add(call_events event,
 
     va_start(ap, format);
     post_message_helper(ICE_CANDIDATE_ADD, event, new_state, nLine, nCallID,
-                        call_instance_id, sdp, error, format, ap);
+                        call_instance_id, sdp, timecard, error, format, ap);
     va_end(ap);
 }
 
@@ -1797,6 +1808,7 @@ void ui_on_remote_stream_added(call_events event,
     msg.update.ccSessionUpd.data.state_data.media_stream_track_id = media_track.track[0].media_stream_track_id;
     msg.update.ccSessionUpd.data.state_data.media_stream_id = (unsigned int)media_track.media_stream_id;
     msg.update.ccSessionUpd.data.state_data.cause = PC_NO_ERROR;
+    msg.update.ccSessionUpd.data.state_data.timecard = NULL;
 
     if ( ccappTaskPostMsg(CCAPP_SESSION_UPDATE, &msg, sizeof(session_update_t), CCAPP_CCPROVIER) != CPR_SUCCESS ) {
         CCAPP_ERROR(CCAPP_F_PREFIX"failed to send CALL_STATE(%d) msg", __FUNCTION__, event);
diff --git a/media/webrtc/signaling/src/sipcc/core/gsm/ccapi.c b/media/webrtc/signaling/src/sipcc/core/gsm/ccapi.c
index 2279cd6480e5..fc35e917113d 100755
--- a/media/webrtc/signaling/src/sipcc/core/gsm/ccapi.c
+++ b/media/webrtc/signaling/src/sipcc/core/gsm/ccapi.c
@@ -2,6 +2,7 @@
  * 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/. */
 
+#include "timecard.h"
 #include "cpr_types.h"
 #include "cpr_stdio.h"
 #include "cpr_string.h"
@@ -1110,7 +1111,7 @@ cc_int_release_complete (cc_srcs_t src_id, cc_srcs_t dst_id,
 void
 cc_int_feature2 (cc_msgs_t msg_id, cc_srcs_t src_id, cc_srcs_t dst_id,
                  callid_t call_id, line_t line, cc_features_t feature_id,
-                 cc_feature_data_t *data)
+                 cc_feature_data_t *data, Timecard *timecard)
 {
     cc_feature_t *pmsg;
     cc_msgbody_info_t *msg_body;
@@ -1129,6 +1130,7 @@ cc_int_feature2 (cc_msgs_t msg_id, cc_srcs_t src_id, cc_srcs_t dst_id,
     pmsg->line       = line;
     pmsg->feature_id = feature_id;
     pmsg->data_valid = (data == NULL) ? (FALSE) : (TRUE);
+    pmsg->timecard   = timecard;
 
     if (pmsg->data_valid == TRUE) {
         pmsg->data = *data;
@@ -1183,7 +1185,8 @@ static void send_message_helper(
     cc_features_t feature_id,
     cc_feature_data_t *data,
     string_t sdp,
-    cc_jsep_action_t action)
+    cc_jsep_action_t action,
+    Timecard *timecard)
 {
     cc_feature_t *pmsg;
     cc_msgbody_info_t *msg_body;
@@ -1201,6 +1204,7 @@ static void send_message_helper(
     pmsg->line       = line;
     pmsg->feature_id = feature_id;
     pmsg->data_valid = (data == NULL) ? (FALSE) : (TRUE);
+    pmsg->timecard   = timecard;
 
     if (msg_id == CC_MSG_SETLOCALDESC || msg_id == CC_MSG_SETREMOTEDESC) {
         pmsg->action = action;
@@ -1231,6 +1235,7 @@ static void send_message_helper(
     CC_DEBUG_ENTRY(__FUNCTION__, src_id, dst_id, call_id, line, cc_feature_name(feature_id));
     CC_DEBUG(DEB_L_C_F_PREFIX "feature= %s, data= %p",
         DEB_L_C_F_PREFIX_ARGS(CC_API, line, call_id, __FUNCTION__), cc_feature_name(feature_id), data);
+    STAMP_TIMECARD(timecard, "Sending message to queue");
     if (cc_send_msg((cprBuffer_t) pmsg, sizeof(*pmsg), dst_id) != CC_RC_SUCCESS) {
         // nobody checks the return code, so generate error message
         GSM_ERR_MSG("%s: unable to send msg for feat=%s", __FUNCTION__,
@@ -1242,10 +1247,11 @@ static void send_message_helper(
 
 void
 cc_createoffer (cc_srcs_t src_id, cc_srcs_t dst_id, callid_t call_id,
-                line_t line, cc_features_t feature_id, cc_feature_data_t *data)
+                line_t line, cc_features_t feature_id, cc_feature_data_t *data,
+                Timecard *tc)
 {
     send_message_helper(CC_MSG_CREATEOFFER, src_id, dst_id, call_id, line,
-        feature_id, data, NULL, 0);
+        feature_id, data, NULL, 0, tc);
 
     return;
 }
@@ -1253,29 +1259,32 @@ cc_createoffer (cc_srcs_t src_id, cc_srcs_t dst_id, callid_t call_id,
 
 void
 cc_createanswer (cc_srcs_t src_id, cc_srcs_t dst_id, callid_t call_id,
-                line_t line, cc_features_t feature_id, string_t sdp, cc_feature_data_t *data)
+                line_t line, cc_features_t feature_id, string_t sdp, cc_feature_data_t *data,
+                Timecard *tc)
 {
     send_message_helper(CC_MSG_CREATEANSWER, src_id, dst_id, call_id, line,
-        feature_id, data, sdp, 0);
+        feature_id, data, sdp, 0, tc);
 
     return;
 }
 
 
 void cc_setlocaldesc (cc_srcs_t src_id, cc_srcs_t dst_id, callid_t call_id, line_t line,
-                    cc_features_t feature_id, cc_jsep_action_t action, string_t sdp,  cc_feature_data_t *data)
+                    cc_features_t feature_id, cc_jsep_action_t action, string_t sdp,  cc_feature_data_t *data,
+                    Timecard *tc)
 {
     send_message_helper(CC_MSG_SETLOCALDESC, src_id, dst_id, call_id, line,
-        feature_id, data, sdp, action);
+        feature_id, data, sdp, action, tc);
 
     return;
 }
 
 void cc_setremotedesc (cc_srcs_t src_id, cc_srcs_t dst_id, callid_t call_id, line_t line,
-                    cc_features_t feature_id, cc_jsep_action_t action, string_t sdp, cc_feature_data_t *data)
+                    cc_features_t feature_id, cc_jsep_action_t action, string_t sdp, cc_feature_data_t *data,
+                    Timecard *tc)
 {
     send_message_helper(CC_MSG_SETREMOTEDESC, src_id, dst_id, call_id, line,
-        feature_id, data, sdp, action);
+        feature_id, data, sdp, action, tc);
 
     return;
 }
diff --git a/media/webrtc/signaling/src/sipcc/core/gsm/fsmdef.c b/media/webrtc/signaling/src/sipcc/core/gsm/fsmdef.c
index 2daef475d305..38975113a936 100755
--- a/media/webrtc/signaling/src/sipcc/core/gsm/fsmdef.c
+++ b/media/webrtc/signaling/src/sipcc/core/gsm/fsmdef.c
@@ -2418,6 +2418,7 @@ fsmdef_ev_default (sm_event_t *event)
       case CC_MSG_CREATEOFFER:
           ui_create_offer(evCreateOfferError, fcb->state, msg->line,
               msg->call_id, dcb->caller_id.call_instance_id, strlib_empty(),
+              msg->timecard,
               PC_INVALID_STATE, "Cannot create offer in state %s",
               fsmdef_state_name(fcb->state));
         break;
@@ -2425,6 +2426,7 @@ fsmdef_ev_default (sm_event_t *event)
       case CC_MSG_CREATEANSWER:
           ui_create_answer(evCreateAnswerError, fcb->state, msg->line,
               msg->call_id, dcb->caller_id.call_instance_id, strlib_empty(),
+              msg->timecard,
               PC_INVALID_STATE, "Cannot create answer in state %s",
               fsmdef_state_name(fcb->state));
         break;
@@ -2432,6 +2434,7 @@ fsmdef_ev_default (sm_event_t *event)
       case CC_MSG_SETLOCALDESC:
           ui_set_local_description(evSetLocalDescError, fcb->state, msg->line,
               msg->call_id, dcb->caller_id.call_instance_id, strlib_empty(),
+              msg->timecard,
               PC_INVALID_STATE, "Cannot set local description in state %s",
               fsmdef_state_name(fcb->state));
         break;
@@ -2439,7 +2442,7 @@ fsmdef_ev_default (sm_event_t *event)
       case CC_MSG_SETREMOTEDESC:
           ui_set_remote_description(evSetRemoteDescError, fcb->state,
               msg->line, msg->call_id, dcb->caller_id.call_instance_id,
-              strlib_empty(), PC_INVALID_STATE,
+              strlib_empty(), msg->timecard, PC_INVALID_STATE,
               "Cannot set remote description in state %s",
               fsmdef_state_name(fcb->state));
         break;
@@ -2447,6 +2450,7 @@ fsmdef_ev_default (sm_event_t *event)
       case CC_MSG_ADDCANDIDATE:
           ui_ice_candidate_add(evAddIceCandidateError, fcb->state, msg->line,
               msg->call_id, dcb->caller_id.call_instance_id, strlib_empty(),
+              msg->timecard,
               PC_INVALID_STATE, "Cannot add ICE candidate in state %s",
               fsmdef_state_name(fcb->state));
         break;
@@ -3153,14 +3157,15 @@ fsmdef_ev_createoffer (sm_event_t *event) {
         if (!local_sdp) {
             ui_create_offer(evCreateOfferError, fcb->state, line, call_id,
                 dcb->caller_id.call_instance_id, strlib_empty(),
+                msg->timecard,
                 PC_INTERNAL_ERROR, "Could not re-create local SDP for offer");
             FSM_DEBUG_SM("%s", get_debug_string(FSM_DBG_SDP_BUILD_ERR));
             return (fsmdef_release(fcb, cause, FALSE));
         }
 
         ui_create_offer(evCreateOfferSuccess, fcb->state, line, call_id,
-            dcb->caller_id.call_instance_id,
-            strlib_malloc(local_sdp,-1), PC_NO_ERROR, NULL);
+            dcb->caller_id.call_instance_id, strlib_malloc(local_sdp,-1),
+            msg->timecard, PC_NO_ERROR, NULL);
         free(local_sdp);
         return (SM_RC_END);
     }
@@ -3182,6 +3187,7 @@ fsmdef_ev_createoffer (sm_event_t *event) {
     if (!has_stream) {
       ui_create_offer(evCreateOfferError, fcb->state, line, call_id,
           dcb->caller_id.call_instance_id, strlib_empty(),
+          msg->timecard,
           PC_INVALID_STATE, "Cannot create SDP without any streams.");
       return SM_RC_END;
     }
@@ -3192,6 +3198,7 @@ fsmdef_ev_createoffer (sm_event_t *event) {
             DEB_F_PREFIX_ARGS(FSM, __FUNCTION__));
       ui_create_offer(evCreateOfferError, fcb->state, line, call_id,
           dcb->caller_id.call_instance_id, strlib_empty(),
+          msg->timecard,
           PC_INTERNAL_ERROR, "Failed to get ICE parameters for local SDP");
       return (fsmdef_release(fcb, cause, FALSE));
     }
@@ -3224,6 +3231,7 @@ fsmdef_ev_createoffer (sm_event_t *event) {
     if (cause != CC_CAUSE_OK) {
         ui_create_offer(evCreateOfferError, fcb->state, line, call_id,
             dcb->caller_id.call_instance_id, strlib_empty(),
+            msg->timecard,
             PC_INTERNAL_ERROR, "Could not create local SDP for offer;"
                 " cause = %s", cc_cause_name(cause));
         FSM_DEBUG_SM("%s", get_debug_string(FSM_DBG_SDP_BUILD_ERR));
@@ -3234,6 +3242,7 @@ fsmdef_ev_createoffer (sm_event_t *event) {
     if (cause != CC_CAUSE_OK) {
         ui_create_offer(evCreateOfferError, fcb->state, line, call_id,
             dcb->caller_id.call_instance_id, strlib_empty(),
+            msg->timecard,
             PC_INTERNAL_ERROR, "Could not encode local SDP for offer;"
                 " cause = %s", cc_cause_name(cause));
         FSM_DEBUG_SM("%s", get_debug_string(FSM_DBG_SDP_BUILD_ERR));
@@ -3245,7 +3254,8 @@ fsmdef_ev_createoffer (sm_event_t *event) {
     /* Pass offer SDP back to UI */
     ui_create_offer(evCreateOfferSuccess, fcb->state, line, call_id,
         dcb->caller_id.call_instance_id,
-        strlib_malloc(msg_body.parts[0].body, -1), PC_NO_ERROR, NULL);
+        strlib_malloc(msg_body.parts[0].body, -1),
+        msg->timecard, PC_NO_ERROR, NULL);
     cc_free_msg_body_parts(&msg_body);
 
     return (SM_RC_END);
@@ -3308,14 +3318,15 @@ fsmdef_ev_createanswer (sm_event_t *event) {
         if (!local_sdp) {
             ui_create_answer(evCreateAnswerError, fcb->state, line, call_id,
                 dcb->caller_id.call_instance_id, strlib_empty(),
+                msg->timecard,
                 PC_INTERNAL_ERROR, "Could not re-create local SDP for answer");
             FSM_DEBUG_SM("%s", get_debug_string(FSM_DBG_SDP_BUILD_ERR));
             return (fsmdef_release(fcb, cause, FALSE));
         }
 
         ui_create_answer(evCreateAnswerSuccess, fcb->state, line, call_id,
-            dcb->caller_id.call_instance_id,
-            strlib_malloc(local_sdp,-1), PC_NO_ERROR, NULL);
+            dcb->caller_id.call_instance_id, strlib_malloc(local_sdp,-1),
+            msg->timecard, PC_NO_ERROR, NULL);
         free(local_sdp);
         return (SM_RC_END);
     }
@@ -3334,6 +3345,7 @@ fsmdef_ev_createanswer (sm_event_t *event) {
             DEB_F_PREFIX_ARGS(FSM, __FUNCTION__));
       ui_create_answer(evCreateAnswerError, fcb->state, line, call_id,
           dcb->caller_id.call_instance_id, strlib_empty(),
+          msg->timecard,
           PC_INTERNAL_ERROR, "Could not get ICE parameters for answer");
       return (fsmdef_release(fcb, cause, FALSE));
     }
@@ -3376,6 +3388,7 @@ fsmdef_ev_createanswer (sm_event_t *event) {
     if (cause != CC_CAUSE_OK) {
         ui_create_answer(evCreateAnswerError, fcb->state, line, call_id,
             dcb->caller_id.call_instance_id, strlib_empty(),
+            msg->timecard,
             PC_INTERNAL_ERROR, "Could not create local SDP for answer;"
                 " cause = %s", cc_cause_name(cause));
         FSM_DEBUG_SM("%s", get_debug_string(FSM_DBG_SDP_BUILD_ERR));
@@ -3395,6 +3408,7 @@ fsmdef_ev_createanswer (sm_event_t *event) {
     if (cause != CC_CAUSE_OK) {
         ui_create_answer(evCreateAnswerError, fcb->state, line, call_id,
             dcb->caller_id.call_instance_id, strlib_empty(),
+            msg->timecard,
             PC_INTERNAL_ERROR, "Could not negotiate media lines; cause = %s",
                 cc_cause_name(cause));
         return (fsmdef_release(fcb, cause, FALSE));
@@ -3404,6 +3418,7 @@ fsmdef_ev_createanswer (sm_event_t *event) {
     if (cause != CC_CAUSE_OK) {
         ui_create_answer(evCreateAnswerError, fcb->state, line, call_id,
             dcb->caller_id.call_instance_id, strlib_empty(),
+            msg->timecard,
             PC_INTERNAL_ERROR, "Could not encode SDP for answer; cause = %s",
                 cc_cause_name(cause));
         FSM_DEBUG_SM("%s", get_debug_string(FSM_DBG_SDP_BUILD_ERR));
@@ -3415,7 +3430,8 @@ fsmdef_ev_createanswer (sm_event_t *event) {
     /* Pass SDP back to UI */
     ui_create_answer(evCreateAnswerSuccess, fcb->state, line, call_id,
         dcb->caller_id.call_instance_id,
-        strlib_malloc(msg_body.parts[0].body, -1), PC_NO_ERROR, NULL);
+        strlib_malloc(msg_body.parts[0].body, -1),
+        msg->timecard, PC_NO_ERROR, NULL);
     cc_free_msg_body_parts(&msg_body);
 
     return (SM_RC_END);
@@ -3452,6 +3468,7 @@ fsmdef_ev_setlocaldesc(sm_event_t *event) {
         fsm_change_state(fcb, __LINE__, FSMDEF_S_CLOSED);
         ui_set_local_description(evSetLocalDescError, fcb->state, line, call_id,
             0, strlib_empty(),
+            msg->timecard,
             PC_INTERNAL_ERROR, "Unrecoverable error: dcb is NULL.");
         return (SM_RC_CLEANUP);
     }
@@ -3461,6 +3478,7 @@ fsmdef_ev_setlocaldesc(sm_event_t *event) {
         fsm_change_state(fcb, __LINE__, FSMDEF_S_CLOSED);
         ui_set_local_description(evSetLocalDescError, fcb->state, line, call_id,
             dcb->caller_id.call_instance_id, strlib_empty(),
+            msg->timecard,
             PC_INTERNAL_ERROR, "'sdpmode' configuration is false. This should "
             "never ever happen. Run for your lives!");
         return (SM_RC_END);
@@ -3469,6 +3487,7 @@ fsmdef_ev_setlocaldesc(sm_event_t *event) {
     if (!dcb->sdp) {
         ui_set_local_description(evSetLocalDescError, fcb->state, line, call_id,
            dcb->caller_id.call_instance_id, strlib_empty(),
+           msg->timecard,
            PC_INTERNAL_ERROR, "Setting of local SDP before calling "
            "createOffer or createAnswer is not currently supported.");
         return (SM_RC_END);
@@ -3481,6 +3500,7 @@ fsmdef_ev_setlocaldesc(sm_event_t *event) {
             fcb->state != FSMDEF_S_HAVE_LOCAL_OFFER) {
             ui_set_local_description(evSetLocalDescError, fcb->state, line,
                 call_id, dcb->caller_id.call_instance_id, strlib_empty(),
+                msg->timecard,
                 PC_INVALID_STATE, "Cannot set local offer in state %s",
                 fsmdef_state_name(fcb->state));
             return (SM_RC_END);
@@ -3493,7 +3513,8 @@ fsmdef_ev_setlocaldesc(sm_event_t *event) {
         if (fcb->state != FSMDEF_S_HAVE_REMOTE_OFFER &&
             fcb->state != FSMDEF_S_HAVE_LOCAL_PRANSWER) {
             ui_set_local_description(evSetLocalDescError, fcb->state, line,
-            call_id, dcb->caller_id.call_instance_id, strlib_empty(),
+                call_id, dcb->caller_id.call_instance_id, strlib_empty(),
+                msg->timecard,
                 PC_INVALID_STATE, "Cannot set local answer in state %s",
                 fsmdef_state_name(fcb->state));
             return (SM_RC_END);
@@ -3511,12 +3532,15 @@ fsmdef_ev_setlocaldesc(sm_event_t *event) {
         cause = gsmsdp_install_peer_ice_attributes(fcb);
         if (cause != CC_CAUSE_OK) {
             ui_set_local_description(evSetLocalDescError, fcb->state, line,
-            call_id, dcb->caller_id.call_instance_id, strlib_empty(),
+                call_id, dcb->caller_id.call_instance_id, strlib_empty(),
+                msg->timecard,
                 PC_INTERNAL_ERROR, "Could not configure local ICE state"
                 " from SDP; cause = %s", cc_cause_name(cause));
             return (SM_RC_END);
         }
 
+        STAMP_TIMECARD(msg->timecard, "ICE Attributes Installed");
+
         /* taken from fsmdef_ev_connected_ack start rx and tx  */
         cc_call_state(dcb->call_id, dcb->line, CC_STATE_CONNECTED,
                   FSMDEF_CC_CALLER_ID);
@@ -3528,6 +3552,7 @@ fsmdef_ev_setlocaldesc(sm_event_t *event) {
                 CC_STATE_UNKNOWN, NULL);
             ui_set_local_description(evSetLocalDescError, fcb->state, line,
                 call_id, dcb->caller_id.call_instance_id, strlib_empty(),
+                msg->timecard,
                 PC_INTERNAL_ERROR, "Cannot start media channels; cause = %s",
                 cc_cause_name(cause));
             return (SM_RC_END);
@@ -3544,18 +3569,21 @@ fsmdef_ev_setlocaldesc(sm_event_t *event) {
             fcb->state != FSMDEF_S_HAVE_LOCAL_PRANSWER) {
             ui_set_local_description(evSetLocalDescError, fcb->state, line,
                 call_id, dcb->caller_id.call_instance_id, strlib_empty(),
+                msg->timecard,
                 PC_INVALID_STATE, "Cannot set local pranswer in state %s",
                 fsmdef_state_name(fcb->state));
             return (SM_RC_END);
         }
         ui_set_local_description(evSetLocalDescError, fcb->state, msg->line,
             msg->call_id, dcb->caller_id.call_instance_id, strlib_empty(),
+            msg->timecard,
             PC_INTERNAL_ERROR, "Provisional answers are not yet supported");
         return (SM_RC_END);
 
     default:
         ui_set_local_description(evSetLocalDescError, fcb->state, msg->line,
             msg->call_id, dcb->caller_id.call_instance_id, strlib_empty(),
+            msg->timecard,
             PC_INTERNAL_ERROR, "Unknown session description type: %d",action);
         return (SM_RC_END);
     }
@@ -3565,6 +3593,7 @@ fsmdef_ev_setlocaldesc(sm_event_t *event) {
     if (!local_sdp) {
         ui_set_local_description(evSetLocalDescError, fcb->state, msg->line,
             msg->call_id, dcb->caller_id.call_instance_id, strlib_empty(),
+            msg->timecard,
             PC_INTERNAL_ERROR, "Could not encode local SDP for local "
             "description");
         return (SM_RC_END);
@@ -3572,7 +3601,7 @@ fsmdef_ev_setlocaldesc(sm_event_t *event) {
 
     ui_set_local_description(evSetLocalDescSuccess, fcb->state, msg->line,
         msg->call_id, dcb->caller_id.call_instance_id,
-        strlib_malloc(local_sdp,-1), PC_NO_ERROR, NULL);
+        strlib_malloc(local_sdp,-1), msg->timecard, PC_NO_ERROR, NULL);
 
     free(local_sdp);
     return (SM_RC_END);
@@ -3613,6 +3642,7 @@ fsmdef_ev_setremotedesc(sm_event_t *event) {
         fsm_change_state(fcb, __LINE__, FSMDEF_S_CLOSED);
         ui_set_remote_description(evSetRemoteDescError, fcb->state, line,
             call_id, 0, strlib_empty(),
+            msg->timecard,
             PC_INTERNAL_ERROR, "Unrecoverable error: dcb is NULL.");
         return (SM_RC_CLEANUP);
     }
@@ -3622,6 +3652,7 @@ fsmdef_ev_setremotedesc(sm_event_t *event) {
         fsm_change_state(fcb, __LINE__, FSMDEF_S_CLOSED);
         ui_set_remote_description(evSetRemoteDescError, fcb->state, line,
             call_id, dcb->caller_id.call_instance_id, strlib_empty(),
+            msg->timecard,
             PC_INTERNAL_ERROR, "'sdpmode' configuration is false. This should "
             "never ever happen. Run for your lives!");
         return (SM_RC_END);
@@ -3635,6 +3666,7 @@ fsmdef_ev_setremotedesc(sm_event_t *event) {
                      DEB_F_PREFIX_ARGS(FSM, __FUNCTION__));
         ui_set_remote_description(evSetRemoteDescError, fcb->state, line,
             call_id, dcb->caller_id.call_instance_id, strlib_empty(),
+            msg->timecard,
             PC_INVALID_STATE, "Renegotiation of session description is not "
             "currently supported. See Bug 840728 for status.");
         return (SM_RC_END);
@@ -3665,7 +3697,8 @@ fsmdef_ev_setremotedesc(sm_event_t *event) {
         if (fcb->state != FSMDEF_S_STABLE &&
             fcb->state != FSMDEF_S_HAVE_REMOTE_OFFER) {
             ui_set_remote_description(evSetRemoteDescError, fcb->state, line,
-            call_id, dcb->caller_id.call_instance_id, strlib_empty(),
+                call_id, dcb->caller_id.call_instance_id, strlib_empty(),
+                msg->timecard,
                 PC_INVALID_STATE, "Cannot set remote offer in state %s",
                 fsmdef_state_name(fcb->state));
             return (SM_RC_END);
@@ -3673,7 +3706,8 @@ fsmdef_ev_setremotedesc(sm_event_t *event) {
         cause = gsmsdp_process_offer_sdp(fcb, &msg_body, TRUE);
         if (cause != CC_CAUSE_OK) {
             ui_set_remote_description(evSetRemoteDescError, fcb->state, line,
-            call_id, dcb->caller_id.call_instance_id, strlib_empty(),
+                call_id, dcb->caller_id.call_instance_id, strlib_empty(),
+                msg->timecard,
                 PC_INTERNAL_ERROR, "Could not process offer SDP; "
                 "cause = %s", cc_cause_name(cause));
             return (SM_RC_END);
@@ -3694,9 +3728,10 @@ fsmdef_ev_setremotedesc(sm_event_t *event) {
             has_data, FALSE);
         if (cause != CC_CAUSE_OK) {
             ui_set_remote_description(evSetRemoteDescError, fcb->state, line,
-              call_id, dcb->caller_id.call_instance_id, strlib_empty(),
-              PC_INTERNAL_ERROR, "Could not create local SDP; cause = %s",
-              cc_cause_name(cause));
+                  call_id, dcb->caller_id.call_instance_id, strlib_empty(),
+                  msg->timecard,
+                  PC_INTERNAL_ERROR, "Could not create local SDP; cause = %s",
+                  cc_cause_name(cause));
             FSM_DEBUG_SM("%s", get_debug_string(FSM_DBG_SDP_BUILD_ERR));
             // Force clean up call without sending release
             return (fsmdef_release(fcb, cause, FALSE));
@@ -3706,7 +3741,8 @@ fsmdef_ev_setremotedesc(sm_event_t *event) {
             TRUE, TRUE, TRUE, FALSE);
         if (cause != CC_CAUSE_OK) {
             ui_set_remote_description(evSetRemoteDescError, fcb->state, line,
-            call_id, dcb->caller_id.call_instance_id, strlib_empty(),
+              call_id, dcb->caller_id.call_instance_id, strlib_empty(),
+              msg->timecard,
               PC_INTERNAL_ERROR, "Could not negotiate media lines; cause = %s",
               cc_cause_name(cause));
             return (fsmdef_release(fcb, cause, FALSE));
@@ -3717,7 +3753,8 @@ fsmdef_ev_setremotedesc(sm_event_t *event) {
         cause = gsmsdp_check_ice_attributes_exist(fcb);
         if (cause != CC_CAUSE_OK) {
             ui_set_remote_description(evSetRemoteDescError, fcb->state, line,
-            call_id, dcb->caller_id.call_instance_id, strlib_empty(),
+              call_id, dcb->caller_id.call_instance_id, strlib_empty(),
+              msg->timecard,
               PC_INTERNAL_ERROR, "ICE attributes missing; cause = %s",
               cc_cause_name(cause));
             return (SM_RC_END);
@@ -3732,7 +3769,8 @@ fsmdef_ev_setremotedesc(sm_event_t *event) {
         if (fcb->state != FSMDEF_S_HAVE_LOCAL_OFFER &&
             fcb->state != FSMDEF_S_HAVE_REMOTE_PRANSWER) {
             ui_set_remote_description(evSetRemoteDescError, fcb->state, line,
-            call_id, dcb->caller_id.call_instance_id, strlib_empty(),
+                call_id, dcb->caller_id.call_instance_id, strlib_empty(),
+                msg->timecard,
                 PC_INVALID_STATE, "Cannot set remote answer in state %s",
                 fsmdef_state_name(fcb->state));
             return (SM_RC_END);
@@ -3741,6 +3779,7 @@ fsmdef_ev_setremotedesc(sm_event_t *event) {
         if (cause != CC_CAUSE_OK) {
             ui_set_remote_description(evSetRemoteDescError, fcb->state, line,
                 call_id, dcb->caller_id.call_instance_id, strlib_empty(),
+                msg->timecard,
                 PC_INTERNAL_ERROR, "Could not negotiate answer SDP; cause = %s",
                 cc_cause_name(cause));
             return (SM_RC_END);
@@ -3754,11 +3793,14 @@ fsmdef_ev_setremotedesc(sm_event_t *event) {
         if (cause != CC_CAUSE_OK) {
             ui_set_remote_description(evSetRemoteDescError, fcb->state, line,
                 call_id, dcb->caller_id.call_instance_id, strlib_empty(),
+                msg->timecard,
                 PC_INTERNAL_ERROR, "Could not configure local ICE state"
                 " from SDP; cause = %s", cc_cause_name(cause));
             return (SM_RC_END);
         }
 
+        STAMP_TIMECARD(msg->timecard, "ICE Attributes Installed");
+
         cc_call_state(dcb->call_id, dcb->line, CC_STATE_CONNECTED,
             FSMDEF_CC_CALLER_ID);
 
@@ -3775,18 +3817,21 @@ fsmdef_ev_setremotedesc(sm_event_t *event) {
             fcb->state != FSMDEF_S_HAVE_REMOTE_PRANSWER) {
             ui_set_remote_description(evSetRemoteDescError, fcb->state, line,
                 call_id, dcb->caller_id.call_instance_id, strlib_empty(),
+                msg->timecard,
                 PC_INVALID_STATE, "Cannot set remote pranswer in state %s",
                 fsmdef_state_name(fcb->state));
             return (SM_RC_END);
         }
-        ui_set_local_description(evSetLocalDescError, fcb->state, msg->line,
+        ui_set_remote_description(evSetRemoteDescError, fcb->state, msg->line,
             msg->call_id, dcb->caller_id.call_instance_id, strlib_empty(),
+            msg->timecard,
             PC_INTERNAL_ERROR, "Provisional answers are not yet supported");
         return (SM_RC_END);
 
     default:
-        ui_set_local_description(evSetLocalDescError, fcb->state, msg->line,
+        ui_set_remote_description(evSetRemoteDescError, fcb->state, msg->line,
             msg->call_id, dcb->caller_id.call_instance_id, strlib_empty(),
+            msg->timecard,
             PC_INTERNAL_ERROR, "Unknown session description type: %d",action);
         return (SM_RC_END);
     }
@@ -3801,7 +3846,8 @@ fsmdef_ev_setremotedesc(sm_event_t *event) {
 
     if (!remote_sdp) {
         ui_set_remote_description(evSetRemoteDescError, fcb->state, line,
-        call_id, dcb->caller_id.call_instance_id, strlib_empty(),
+            call_id, dcb->caller_id.call_instance_id, strlib_empty(),
+            msg->timecard,
             PC_INTERNAL_ERROR, "Could not serialize remote description;"
             " cause = %s",  cc_cause_name(cause));
         return (SM_RC_END);
@@ -3809,7 +3855,7 @@ fsmdef_ev_setremotedesc(sm_event_t *event) {
 
     ui_set_remote_description(evSetRemoteDescSuccess, fcb->state, line, call_id,
         dcb->caller_id.call_instance_id, strlib_malloc(remote_sdp,-1),
-        PC_NO_ERROR, NULL);
+        msg->timecard, PC_NO_ERROR, NULL);
 
     free(remote_sdp);
 
@@ -3992,7 +4038,8 @@ fsmdef_ev_addcandidate(sm_event_t *event) {
     if (!dcb) {
         FSM_DEBUG_SM(DEB_F_PREFIX"dcb is NULL.", DEB_F_PREFIX_ARGS(FSM, __FUNCTION__));
         ui_ice_candidate_add(evAddIceCandidateError, fcb->state, line, call_id,
-            0, strlib_empty(), PC_INTERNAL_ERROR, "DCB has not been created.");
+            0, strlib_empty(), msg->timecard, PC_INTERNAL_ERROR,
+            "DCB has not been created.");
         return SM_RC_CLEANUP;
     }
 
@@ -4000,6 +4047,7 @@ fsmdef_ev_addcandidate(sm_event_t *event) {
     if (sdpmode == FALSE) {
         ui_ice_candidate_add(evAddIceCandidateError, fcb->state, line, call_id,
             dcb->caller_id.call_instance_id, strlib_empty(),
+            msg->timecard,
             PC_INTERNAL_ERROR, "'sdpmode' configuration is false. This should "
             "never ever happen. Run for your lives!");
         return (SM_RC_END);
@@ -4012,6 +4060,7 @@ fsmdef_ev_addcandidate(sm_event_t *event) {
 
         ui_ice_candidate_add(evAddIceCandidateError, fcb->state, line, call_id,
             dcb->caller_id.call_instance_id, strlib_empty(),
+            msg->timecard,
             PC_INVALID_STATE, "Cannot add remote ICE candidates before "
                               "setting remote SDP.");
 
@@ -4059,6 +4108,7 @@ fsmdef_ev_addcandidate(sm_event_t *event) {
     if (!remote_sdp) {
         ui_ice_candidate_add(evAddIceCandidateError, fcb->state, line, call_id,
             dcb->caller_id.call_instance_id, strlib_empty(),
+            msg->timecard,
             PC_INTERNAL_ERROR, "Could not serialize new SDP after adding ICE "
             "candidate.");
         return (SM_RC_END);
@@ -4066,7 +4116,7 @@ fsmdef_ev_addcandidate(sm_event_t *event) {
 
     ui_ice_candidate_add(evAddIceCandidate, fcb->state, line, call_id,
         dcb->caller_id.call_instance_id, strlib_malloc(remote_sdp,-1),
-        PC_NO_ERROR, NULL);
+        msg->timecard, PC_NO_ERROR, NULL);
 
     free(remote_sdp);
     return (SM_RC_END);
diff --git a/media/webrtc/signaling/src/sipcc/core/includes/ccapi.h b/media/webrtc/signaling/src/sipcc/core/includes/ccapi.h
index bd0081144e65..34ae8d09ec6b 100755
--- a/media/webrtc/signaling/src/sipcc/core/includes/ccapi.h
+++ b/media/webrtc/signaling/src/sipcc/core/includes/ccapi.h
@@ -8,6 +8,12 @@
 #include "mozilla/Assertions.h"
 #include "mozilla/Util.h"
 
+#if defined(__cplusplus) && __cplusplus >= 201103L
+typedef struct Timecard Timecard;
+#else
+#include "timecard.h"
+#endif
+
 #include "cpr_types.h"
 #include "cpr_memory.h"
 #include "phone_types.h"
@@ -955,6 +961,7 @@ typedef struct cc_feature_t_ {
     boolean              data_valid;
     cc_jsep_action_t     action;
     char                 sdp[SDP_SIZE];
+    Timecard            *timecard;
 } cc_feature_t;
 
 typedef struct cc_feature_ack_t_ {
@@ -1174,19 +1181,23 @@ void cc_int_release_complete(cc_srcs_t src_id, cc_srcs_t dst_id,
 
 void cc_int_feature2(cc_msgs_t msg_id, cc_srcs_t src_id, cc_srcs_t dst_id,
                     callid_t call_id, line_t line, cc_features_t feature_id,
-                    cc_feature_data_t *data);
+                    cc_feature_data_t *data, Timecard *);
 
 void cc_createoffer(cc_srcs_t src_id, cc_srcs_t dst_id, callid_t call_id,
-                    line_t line, cc_features_t feature_id, cc_feature_data_t *data);
+                    line_t line, cc_features_t feature_id, cc_feature_data_t *data,
+                    Timecard *);
 
 void cc_createanswer (cc_srcs_t src_id, cc_srcs_t dst_id, callid_t call_id,
-                    line_t line, cc_features_t feature_id, string_t sdp, cc_feature_data_t *data);
+                    line_t line, cc_features_t feature_id, string_t sdp, cc_feature_data_t *data,
+                    Timecard *);
 
 void cc_setlocaldesc (cc_srcs_t src_id, cc_srcs_t dst_id, callid_t call_id, line_t line,
-                    cc_features_t feature_id, cc_jsep_action_t action, string_t sdp, cc_feature_data_t *data);
+                    cc_features_t feature_id, cc_jsep_action_t action, string_t sdp, cc_feature_data_t *data,
+                    Timecard *);
 
 void cc_setremotedesc (cc_srcs_t src_id, cc_srcs_t dst_id, callid_t call_id, line_t line,
-                    cc_features_t feature_id, cc_jsep_action_t action, string_t sdp, cc_feature_data_t *data);
+                    cc_features_t feature_id, cc_jsep_action_t action, string_t sdp, cc_feature_data_t *data,
+                    Timecard *);
 
 void cc_int_feature_ack(cc_srcs_t src_id, cc_srcs_t dst_id, callid_t call_id,
                         line_t line, cc_features_t feature_id,
@@ -1255,8 +1266,8 @@ void cc_int_fail_fallback(cc_srcs_t src_id, cc_srcs_t dst_id, int rsp_type,
 #define cc_release(a, b, c, d, e, f)     cc_int_release(a, CC_SRC_GSM, b, c, d, e, f)
 #define cc_release_complete(a, b, c, d, e) \
         cc_int_release_complete(a, CC_SRC_GSM, b, c, d, e)
-#define cc_feature(a, b, c, d, e)     cc_int_feature2(CC_MSG_FEATURE, a, CC_SRC_GSM, b, c, d, e)
-#define cc_int_feature(a, b, c, d, e, f)     cc_int_feature2(CC_MSG_FEATURE, a, b, c, d, e, f)
+#define cc_feature(a, b, c, d, e)     cc_int_feature2(CC_MSG_FEATURE, a, CC_SRC_GSM, b, c, d, e, NULL)
+#define cc_int_feature(a, b, c, d, e, f)     cc_int_feature2(CC_MSG_FEATURE, a, b, c, d, e, f, NULL)
 #define cc_feature_ack(a, b, c, d, e, f) \
         cc_int_feature_ack(a, CC_SRC_GSM, b, c, d, e, f)
 #define cc_offhook(a, b, c)           cc_int_offhook(a, CC_SRC_GSM, CC_NO_CALL_ID, CC_REASON_NONE, b, c, NULL, CC_MONITOR_NONE,CFWDALL_NONE)
diff --git a/media/webrtc/signaling/src/sipcc/core/includes/sessionTypes.h b/media/webrtc/signaling/src/sipcc/core/includes/sessionTypes.h
index 2849826adc80..e38b12ac0e72 100755
--- a/media/webrtc/signaling/src/sipcc/core/includes/sessionTypes.h
+++ b/media/webrtc/signaling/src/sipcc/core/includes/sessionTypes.h
@@ -5,6 +5,12 @@
 #ifndef _SESSIONTYPES_H_
 #define _SESSIONTYPES_H_
 
+#if defined(__cplusplus) && __cplusplus >= 201103L
+typedef struct Timecard Timecard;
+#else
+#include "timecard.h"
+#endif
+
 #include "string_lib.h"
 #include "sessionConstants.h"
 #include "ccsip_pmh.h"
@@ -48,6 +54,7 @@ typedef struct {
   cc_media_type_t           media_type;
   cc_level_t                level;
   cc_media_constraints_t *  constraints;
+  Timecard *                timecard;
 } ccSession_feature_t;
 
 typedef struct {
@@ -61,6 +68,7 @@ typedef struct {
   string_t     sdp;
   unsigned int media_stream_id;
   unsigned int media_stream_track_id;
+  Timecard *   timecard;
 } cc_call_state_data_t;
 /* CALL_SESSION_CREATED shall use the call_state as data*/
 
diff --git a/media/webrtc/signaling/src/sipcc/core/includes/uiapi.h b/media/webrtc/signaling/src/sipcc/core/includes/uiapi.h
index e0f86287bf89..800eaa41902b 100644
--- a/media/webrtc/signaling/src/sipcc/core/includes/uiapi.h
+++ b/media/webrtc/signaling/src/sipcc/core/includes/uiapi.h
@@ -186,6 +186,7 @@ void ui_create_offer(call_events event,
                      callid_t nCallID,
                      uint16_t call_instance_id,
                      string_t sdp,
+                     Timecard *timecard,
                      pc_error error,
                      const char *format, ...);
 
@@ -195,6 +196,7 @@ void ui_create_answer(call_events event,
                       callid_t nCallID,
                       uint16_t call_instance_id,
                       string_t sdp,
+                      Timecard *timecard,
                       pc_error error,
                       const char *format, ...);
 
@@ -204,6 +206,7 @@ void ui_set_local_description(call_events event,
                               callid_t nCallID,
                               uint16_t call_instance_id,
                               string_t sdp,
+                              Timecard *timecard,
                               pc_error error,
                               const char *format, ...);
 
@@ -213,6 +216,7 @@ void ui_set_remote_description(call_events event,
                                callid_t nCallID,
                                uint16_t call_instance_id,
                                string_t sdp,
+                               Timecard *timecard,
                                pc_error error,
                                const char *format, ...);
 
@@ -222,6 +226,7 @@ void ui_update_local_description(call_events event,
                                  callid_t nCallID,
                                  uint16_t call_instance_id,
                                  string_t sdp,
+                                 Timecard *timecard,
                                  pc_error error,
                                  const char *format, ...);
 
@@ -231,6 +236,7 @@ void ui_ice_candidate_add(call_events event,
                           callid_t nCallID,
                           uint16_t call_instance_id,
                           string_t sdp,
+                          Timecard *timecard,
                           pc_error error,
                           const char *format, ...);
 
diff --git a/media/webrtc/signaling/src/sipcc/include/cc_call_feature.h b/media/webrtc/signaling/src/sipcc/include/cc_call_feature.h
index 911217c938f7..fa4602d6daed 100644
--- a/media/webrtc/signaling/src/sipcc/include/cc_call_feature.h
+++ b/media/webrtc/signaling/src/sipcc/include/cc_call_feature.h
@@ -87,6 +87,12 @@
 #ifndef _CC_CALL_FEATURE_H_
 #define _CC_CALL_FEATURE_H_
 
+#if defined(__cplusplus) && __cplusplus >= 201103L
+typedef struct Timecard Timecard;
+#else
+#include "timecard.h"
+#endif
+
 #include "cc_constants.h"
 
 /***********************************Basic Call Feature Control Methods************************************
@@ -152,14 +158,22 @@ cc_return_t CC_CallFeature_backSpace(cc_call_handle_t call_handle);
 cc_return_t CC_CallFeature_dial(cc_call_handle_t call_handle, cc_sdp_direction_t video_pref, const cc_string_t numbers);
 
 cc_return_t CC_CallFeature_CreateOffer(cc_call_handle_t call_handle,
-                                       cc_media_constraints_t *constraints);
+                                       cc_media_constraints_t *constraints,
+                                       Timecard *tc);
 
 cc_return_t CC_CallFeature_CreateAnswer(cc_call_handle_t call_handle,
-                                        cc_media_constraints_t *constraints);
+                                        cc_media_constraints_t *constraints,
+                                        Timecard *tc);
 
-cc_return_t CC_CallFeature_SetLocalDescription(cc_call_handle_t call_handle, cc_jsep_action_t action, const char* sdp);
+cc_return_t CC_CallFeature_SetLocalDescription(cc_call_handle_t call_handle,
+                                               cc_jsep_action_t action,
+                                               const char* sdp,
+                                               Timecard *tc);
 
-cc_return_t CC_CallFeature_SetRemoteDescription(cc_call_handle_t call_handle, cc_jsep_action_t action, const char* sdp);
+cc_return_t CC_CallFeature_SetRemoteDescription(cc_call_handle_t call_handle,
+                                                cc_jsep_action_t action,
+                                                const char* sdp,
+                                                Timecard *tc);
 
 cc_return_t CC_CallFeature_SetPeerConnection(cc_call_handle_t call_handle, cc_peerconnection_t pc);
 
@@ -167,7 +181,11 @@ cc_return_t CC_CallFeature_AddStream(cc_call_handle_t call_handle, cc_media_stre
 
 cc_return_t CC_CallFeature_RemoveStream(cc_call_handle_t call_handle, cc_media_stream_id_t stream_id, cc_media_track_id_t id, cc_media_type_t media_type);
 
-cc_return_t CC_CallFeature_AddICECandidate(cc_call_handle_t call_handle, const char* candidate, const char *mid, cc_level_t level);
+cc_return_t CC_CallFeature_AddICECandidate(cc_call_handle_t call_handle,
+                                           const char* candidate,
+                                           const char *mid,
+                                           cc_level_t level,
+                                           Timecard *tc);
 
 /**
  * Initiate a speed dial.
diff --git a/media/webrtc/signaling/src/sipcc/include/ccapi_call.h b/media/webrtc/signaling/src/sipcc/include/ccapi_call.h
index d87e4264c8e6..081155a41d36 100644
--- a/media/webrtc/signaling/src/sipcc/include/ccapi_call.h
+++ b/media/webrtc/signaling/src/sipcc/include/ccapi_call.h
@@ -5,6 +5,12 @@
 #ifndef _CCAPI_CALL_H_
 #define _CCAPI_CALL_H_
 
+#if defined(__cplusplus) && __cplusplus >= 201103L
+typedef struct Timecard Timecard;
+#else
+#include "timecard.h"
+#endif
+
 #include "ccapi_types.h"
 
 /**
@@ -49,14 +55,22 @@ cc_return_t CCAPI_Call_originateCall(cc_call_handle_t handle, cc_sdp_direction_t
 
 
 cc_return_t CCAPI_CreateOffer(cc_call_handle_t handle,
-                              cc_media_constraints_t *constraints);
+                              cc_media_constraints_t *constraints,
+                              Timecard *tc);
 
 cc_return_t CCAPI_CreateAnswer(cc_call_handle_t handle,
-                               cc_media_constraints_t *constraints);
+                               cc_media_constraints_t *constraints,
+                               Timecard *tc);
 
-cc_return_t CCAPI_SetLocalDescription(cc_call_handle_t handle, cc_jsep_action_t action, cc_string_t sdp);
+cc_return_t CCAPI_SetLocalDescription(cc_call_handle_t handle,
+                                      cc_jsep_action_t action,
+                                      cc_string_t sdp,
+                                      Timecard *tc);
 
-cc_return_t CCAPI_SetRemoteDescription(cc_call_handle_t handle, cc_jsep_action_t action, cc_string_t sdp);
+cc_return_t CCAPI_SetRemoteDescription(cc_call_handle_t handle,
+                                       cc_jsep_action_t action,
+                                       cc_string_t sdp,
+                                       Timecard *tc);
 
 cc_return_t CCAPI_SetPeerConnection(cc_call_handle_t handle, cc_peerconnection_t pc);
 
@@ -64,7 +78,11 @@ cc_return_t CCAPI_AddStream(cc_call_handle_t handle, cc_media_stream_id_t stream
 
 cc_return_t CCAPI_RemoveStream(cc_call_handle_t handle, cc_media_stream_id_t stream_id, cc_media_track_id_t track_id, cc_media_type_t media_type);
 
-cc_return_t CCAPI_AddICECandidate(cc_call_handle_t handle, cc_string_t candidate, cc_string_t mid, cc_level_t level);
+cc_return_t CCAPI_AddICECandidate(cc_call_handle_t handle,
+                                  cc_string_t candidate,
+                                  cc_string_t mid,
+                                  cc_level_t level,
+                                  Timecard *tc);
 
 /**
  * Send digits on the call - can be invoked either to dial additional digits or send DTMF
diff --git a/media/webrtc/signaling/src/sipcc/include/ccapi_call_info.h b/media/webrtc/signaling/src/sipcc/include/ccapi_call_info.h
index 71c4d6884860..a6089681bc37 100644
--- a/media/webrtc/signaling/src/sipcc/include/ccapi_call_info.h
+++ b/media/webrtc/signaling/src/sipcc/include/ccapi_call_info.h
@@ -5,6 +5,12 @@
 #ifndef _CCAPI_CALL_INFO_H_
 #define _CCAPI_CALL_INFO_H_
 
+#if defined(__cplusplus) && __cplusplus >= 201103L
+typedef struct Timecard Timecard;
+#else
+#include "timecard.h"
+#endif
+
 #include "ccapi_types.h"
 #include "peer_connection_types.h"
 #include "fsmdef_states.h"
@@ -310,4 +316,11 @@ cc_int32_t  CCAPI_CallInfo_getStatusCode(cc_callinfo_ref_t handle);
  */
 MediaStreamTable* CCAPI_CallInfo_getMediaStreams(cc_callinfo_ref_t handle);
 
+/**
+ * Take posession of timecard
+ * @param [in] handle - call info handle
+ * @return timecard pointer
+ */
+Timecard* CCAPI_CallInfo_takeTimecard(cc_callinfo_ref_t handle);
+
 #endif /* _CCAPIAPI_CALL_INFO_H_ */
diff --git a/media/webrtc/signaling/src/softphonewrapper/CC_SIPCCCall.cpp b/media/webrtc/signaling/src/softphonewrapper/CC_SIPCCCall.cpp
index 5a7232a374ba..3050c50579a0 100644
--- a/media/webrtc/signaling/src/softphonewrapper/CC_SIPCCCall.cpp
+++ b/media/webrtc/signaling/src/softphonewrapper/CC_SIPCCCall.cpp
@@ -3,6 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "CSFLog.h"
+#include "timecard.h"
 
 #include "CC_Common.h"
 
@@ -531,23 +532,29 @@ void CC_SIPCCCall::originateP2PCall (cc_sdp_direction_t video_pref, const std::s
 /*
  * This method works asynchronously, is an onCallEvent with the resulting SDP
  */
-void CC_SIPCCCall::createOffer (cc_media_constraints_t *constraints) {
-    CCAPI_CreateOffer(callHandle, constraints);
+void CC_SIPCCCall::createOffer (cc_media_constraints_t *constraints,
+                                Timecard *tc) {
+    CCAPI_CreateOffer(callHandle, constraints, tc);
 }
 /*
  * This method works asynchronously, there is onCallEvent with the resulting SDP
  */
-void CC_SIPCCCall::createAnswer (cc_media_constraints_t *constraints) {
-    CCAPI_CreateAnswer(callHandle, constraints);
+void CC_SIPCCCall::createAnswer (cc_media_constraints_t *constraints,
+                                 Timecard *tc) {
+    CCAPI_CreateAnswer(callHandle, constraints, tc);
 
 }
 
-void CC_SIPCCCall::setLocalDescription(cc_jsep_action_t action, const std::string & sdp) {
-    CCAPI_SetLocalDescription(callHandle, action, sdp.c_str());
+void CC_SIPCCCall::setLocalDescription(cc_jsep_action_t action,
+                                       const std::string & sdp,
+                                       Timecard *tc) {
+    CCAPI_SetLocalDescription(callHandle, action, sdp.c_str(), tc);
 }
 
-void CC_SIPCCCall::setRemoteDescription(cc_jsep_action_t action, const std::string & sdp) {
-    CCAPI_SetRemoteDescription(callHandle, action, sdp.c_str());
+void CC_SIPCCCall::setRemoteDescription(cc_jsep_action_t action,
+                                       const std::string & sdp,
+                                       Timecard *tc) {
+    CCAPI_SetRemoteDescription(callHandle, action, sdp.c_str(), tc);
 }
 
 void CC_SIPCCCall::setPeerConnection(const std::string& handle)
@@ -570,6 +577,10 @@ void CC_SIPCCCall::removeStream(cc_media_stream_id_t stream_id, cc_media_track_i
   CCAPI_RemoveStream(callHandle, stream_id, track_id, media_type);
 }
 
-void CC_SIPCCCall::addICECandidate(const std::string & candidate, const std::string & mid, unsigned short level) {
-  CCAPI_AddICECandidate(callHandle, candidate.c_str(), mid.c_str(), (cc_level_t) level);
+void CC_SIPCCCall::addICECandidate(const std::string & candidate,
+                                   const std::string & mid,
+                                   unsigned short level,
+                                   Timecard *tc) {
+  CCAPI_AddICECandidate(callHandle, candidate.c_str(), mid.c_str(),
+                        (cc_level_t) level, tc);
 }
diff --git a/media/webrtc/signaling/src/softphonewrapper/CC_SIPCCCall.h b/media/webrtc/signaling/src/softphonewrapper/CC_SIPCCCall.h
index 7682665db8b4..326239c98183 100644
--- a/media/webrtc/signaling/src/softphonewrapper/CC_SIPCCCall.h
+++ b/media/webrtc/signaling/src/softphonewrapper/CC_SIPCCCall.h
@@ -9,6 +9,12 @@
 
 #include <map>
 
+#if defined(__cplusplus) && __cplusplus >= 201103L
+typedef struct Timecard Timecard;
+#else
+#include "timecard.h"
+#endif
+
 #include "common/Wrapper.h"
 #include "common/csf_common.h"
 #include "mozilla/Mutex.h"
@@ -111,16 +117,16 @@ namespace CSF
         virtual void removeStream(int streamId);
         virtual bool setVolume(int volume);
         virtual void originateP2PCall (cc_sdp_direction_t video_pref, const std::string & digits, const std::string & ip);
-        virtual void createOffer(cc_media_constraints_t *constraints);
-        virtual void createAnswer(cc_media_constraints_t *constraints);
-        virtual void setLocalDescription(cc_jsep_action_t action, const std::string & sdp);
-        virtual void setRemoteDescription(cc_jsep_action_t action, const std::string & sdp);
+        virtual void createOffer(cc_media_constraints_t *constraints, Timecard *);
+        virtual void createAnswer(cc_media_constraints_t *constraints, Timecard *);
+        virtual void setLocalDescription(cc_jsep_action_t action, const std::string & sdp, Timecard *);
+        virtual void setRemoteDescription(cc_jsep_action_t action, const std::string & sdp, Timecard *);
         virtual void setPeerConnection(const std::string& handle);
         virtual const std::string& getPeerConnection() const;
         virtual void addStream(cc_media_stream_id_t stream_id, cc_media_track_id_t track_id, cc_media_type_t media_type);
         virtual void removeStream(cc_media_stream_id_t stream_id, cc_media_track_id_t track_id, cc_media_type_t media_type);
         virtual CC_SIPCCCallMediaDataPtr getMediaData();
-        virtual void addICECandidate(const std::string & candidate, const std::string & mid, unsigned short level);
+        virtual void addICECandidate(const std::string & candidate, const std::string & mid, unsigned short level, Timecard *);
 
     private:
         virtual bool setAudioMute(bool mute);
diff --git a/media/webrtc/signaling/src/softphonewrapper/CC_SIPCCCallInfo.cpp b/media/webrtc/signaling/src/softphonewrapper/CC_SIPCCCallInfo.cpp
index da3831eca534..522fe236cd6b 100644
--- a/media/webrtc/signaling/src/softphonewrapper/CC_SIPCCCallInfo.cpp
+++ b/media/webrtc/signaling/src/softphonewrapper/CC_SIPCCCallInfo.cpp
@@ -449,6 +449,11 @@ MediaStreamTable* CC_SIPCCCallInfo::getMediaStreams() const
 	return CCAPI_CallInfo_getMediaStreams(callinfo_ref);
 }
 
+Timecard *CC_SIPCCCallInfo::takeTimecard()
+{
+    return CCAPI_CallInfo_takeTimecard(callinfo_ref);
+}
+
 bool CC_SIPCCCallInfo::isMediaStateAvailable()
 {
     // for softphone it will always be possible to query the mute state and video direction
diff --git a/media/webrtc/signaling/src/softphonewrapper/CC_SIPCCCallInfo.h b/media/webrtc/signaling/src/softphonewrapper/CC_SIPCCCallInfo.h
index 80269bc4522d..3e9c1f6a25cb 100644
--- a/media/webrtc/signaling/src/softphonewrapper/CC_SIPCCCallInfo.h
+++ b/media/webrtc/signaling/src/softphonewrapper/CC_SIPCCCallInfo.h
@@ -82,6 +82,7 @@ namespace CSF
         virtual std::string getSDP();
         virtual cc_int32_t getStatusCode();
         virtual MediaStreamTable* getMediaStreams() const;
+        virtual Timecard *takeTimecard();
 
         virtual void setMediaData(CC_SIPCCCallMediaDataPtr  pMediaData);
 
diff --git a/media/webrtc/signaling/test/Makefile.in b/media/webrtc/signaling/test/Makefile.in
index bdde05c3b9ad..f3eb6c44243a 100644
--- a/media/webrtc/signaling/test/Makefile.in
+++ b/media/webrtc/signaling/test/Makefile.in
@@ -140,6 +140,7 @@ LOCAL_INCLUDES += \
  -I$(topsrcdir)/media/webrtc/signaling/src/sipcc/cpr/include \
  -I$(topsrcdir)/media/webrtc/signaling/src/sipcc/core/includes \
  -I$(topsrcdir)/media/webrtc/signaling/src/common/browser_logging \
+ -I$(topsrcdir)/media/webrtc/signaling/src/common/time_profiling \
  -I$(topsrcdir)/media/webrtc/signaling/src/media \
  -I$(topsrcdir)/media/webrtc/signaling/src/media-conduit \
  -I$(topsrcdir)/media/webrtc/signaling/src/mediapipeline \
diff --git a/media/webrtc/signaling/test/sdp_unittests.cpp b/media/webrtc/signaling/test/sdp_unittests.cpp
index 80b79fdc7e57..9d3421cbc977 100644
--- a/media/webrtc/signaling/test/sdp_unittests.cpp
+++ b/media/webrtc/signaling/test/sdp_unittests.cpp
@@ -2,6 +2,8 @@
  * 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/. */
 
+#include "timecard.h"
+
 #include "CSFLog.h"
 
 #include <string>

From 9e730ecb1e6fc766a16a0a1c95c5111d41c22f4f Mon Sep 17 00:00:00 2001
From: Gregory Szorc <gps@mozilla.com>
Date: Wed, 4 Sep 2013 16:52:56 -0700
Subject: [PATCH 50/86] Bug 908977 - Generate XPIDL-derived headers directly
 into dist/include; r=glandium

---
 CLOBBER                                           |  2 +-
 config/makefiles/xpidl/Makefile.in                | 14 +++-----------
 python/mozbuild/mozbuild/backend/recursivemake.py | 12 +-----------
 3 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/CLOBBER b/CLOBBER
index d694d03373bb..ca2b8c66ad8c 100644
--- a/CLOBBER
+++ b/CLOBBER
@@ -18,4 +18,4 @@
 # Modifying this file will now automatically clobber the buildbot machines \o/
 #
 
-Bug 627487 - random test failures caused by bookmark JSON changes
+Bug 908977 - Generate XPIDL headers directly into dist/include
diff --git a/config/makefiles/xpidl/Makefile.in b/config/makefiles/xpidl/Makefile.in
index 29554cf7ac1a..cdbe06331b45 100644
--- a/config/makefiles/xpidl/Makefile.in
+++ b/config/makefiles/xpidl/Makefile.in
@@ -44,9 +44,6 @@ include $(topsrcdir)/config/rules.mk
 # For dependency files.
 idl_deps_dir := .deps
 
-# Where generated headers go.
-idl_headers_dir := headers
-
 # Where we put our final, linked .xpt files.
 idl_xpt_dir := xpt
 
@@ -58,23 +55,18 @@ process_py := $(topsrcdir)/python/mozbuild/mozbuild/action/xpidl-process.py
 # in the virtualenv.
 idlprocess := $(PYTHON_PATH) $(PLY_INCLUDE) -I$(IDL_PARSER_DIR) -I$(IDL_PARSER_CACHE_DIR) \
     $(process_py) --cache-dir $(IDL_PARSER_CACHE_DIR) $(dist_idl_dir) \
-        $(idl_headers_dir) $(idl_xpt_dir) $(idl_deps_dir)
+        $(dist_include_dir) $(idl_xpt_dir) $(idl_deps_dir)
 
-xpidl_headers := @xpidl_headers@
 xpidl_modules := @xpidl_modules@
 
 @xpidl_rules@
 
-dist_headers := $(addprefix $(dist_include_dir)/,$(xpidl_headers))
 linked_xpt_files := $(addprefix $(idl_xpt_dir)/,$(addsuffix .xpt,$(xpidl_modules)))
 depends_files := $(foreach root,$(xpidl_modules),$(idl_deps_dir)/$(root).pp)
 
-$(dist_headers): $(dist_include_dir)/%.h: $(idl_headers_dir)/%.h
-	$(INSTALL) $< $(dist_include_dir)
+xpidl:: $(linked_xpt_files)
 
-xpidl:: $(linked_xpt_files) $(dist_headers)
-
-$(linked_xpt_files): $(process_py) $(call mkdir_deps,$(idl_deps_dir) $(idl_headers_dir) $(idl_xpt_dir))
+$(linked_xpt_files): $(process_py) $(call mkdir_deps,$(idl_deps_dir) $(dist_include_dir) $(idl_xpt_dir))
 
 $(call include_deps,$(depends_files))
 
diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild/mozbuild/backend/recursivemake.py
index 765f329d004f..ecbaf63325a6 100644
--- a/python/mozbuild/mozbuild/backend/recursivemake.py
+++ b/python/mozbuild/mozbuild/backend/recursivemake.py
@@ -392,7 +392,7 @@ class RecursiveMakeBackend(CommonBackend):
         build_files = self._purge_manifests['xpidl']
 
         for p in ('Makefile', 'backend.mk', '.deps/.mkdir.done',
-            'headers/.mkdir.done', 'xpt/.mkdir.done'):
+            'xpt/.mkdir.done'):
             build_files.add(p)
 
         for idl in manager.idls.values():
@@ -400,13 +400,11 @@ class RecursiveMakeBackend(CommonBackend):
                 idl['basename'])
             self._install_manifests['dist_include'].add_optional_exists('%s.h'
                 % idl['root'])
-            build_files.add(mozpath.join('headers', '%s.h' % idl['root']))
 
         for module in manager.modules:
             build_files.add(mozpath.join('xpt', '%s.xpt' % module))
             build_files.add(mozpath.join('.deps', '%s.pp' % module))
 
-        headers = sorted('%s.h' % idl['root'] for idl in manager.idls.values())
         modules = manager.modules
         xpt_modules = sorted(modules.keys())
         rules = []
@@ -431,13 +429,6 @@ class RecursiveMakeBackend(CommonBackend):
                 '',
             ])
 
-            # Set up linkage so make knows headers come from $(idlprocess).
-            h = ['$(idl_headers_dir)/%s.h' % dep for dep in deps]
-            rules.extend([
-                '%s: $(idl_xpt_dir)/%s.xpt' % (' '.join(h), module),
-                '',
-            ])
-
         # Create dependency for output header so we force regeneration if the
         # header was deleted. This ideally should not be necessary. However,
         # some processes (such as PGO at the time this was implemented) wipe
@@ -448,7 +439,6 @@ class RecursiveMakeBackend(CommonBackend):
         result = self.environment.create_config_file(out_path, extra=dict(
             xpidl_rules='\n'.join(rules),
             xpidl_modules=' '.join(xpt_modules),
-            xpidl_headers=' '.join(headers),
         ))
         self._update_from_avoid_write(result)
         self.summary.managed_count += 1

From a6a650273392d411176a1bb36934b23724741608 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Thu, 5 Sep 2013 09:01:44 +0900
Subject: [PATCH 51/86] Bug 911924 - Remove MAKE_DIRS leftovers. r=ted

---
 config/makefiles/target_libs.mk        | 2 +-
 config/rules.mk                        | 6 +++---
 js/src/config/makefiles/target_libs.mk | 2 +-
 js/src/config/rules.mk                 | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/config/makefiles/target_libs.mk b/config/makefiles/target_libs.mk
index e5b797a2689f..3b9cca5aa1b2 100644
--- a/config/makefiles/target_libs.mk
+++ b/config/makefiles/target_libs.mk
@@ -18,7 +18,7 @@ GARBAGE += $(foreach lib,$(LIBRARY),$(EXPORT_LIBRARY)/$(lib))
 endif
 endif # EXPORT_LIBRARY
 
-libs:: $(SUBMAKEFILES) $(MAKE_DIRS) $(HOST_LIBRARY) $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(HOST_PROGRAM) $(HOST_SIMPLE_PROGRAMS) $(SIMPLE_PROGRAMS)
+libs:: $(SUBMAKEFILES) $(HOST_LIBRARY) $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(HOST_PROGRAM) $(HOST_SIMPLE_PROGRAMS) $(SIMPLE_PROGRAMS)
 ifndef NO_DIST_INSTALL
 ifdef SHARED_LIBRARY
 ifdef IS_COMPONENT
diff --git a/config/rules.mk b/config/rules.mk
index 45ca4ea68a55..2a4266c3a0ad 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -744,12 +744,12 @@ endef
 
 $(foreach subtier,export libs tools,$(eval $(call CREATE_SUBTIER_TRAVERSAL_RULE,$(subtier))))
 
-export:: $(SUBMAKEFILES) $(MAKE_DIRS)
+export:: $(SUBMAKEFILES)
 	$(LOOP_OVER_DIRS)
 	$(LOOP_OVER_TOOL_DIRS)
 
 
-tools:: $(SUBMAKEFILES) $(MAKE_DIRS)
+tools:: $(SUBMAKEFILES)
 	$(LOOP_OVER_DIRS)
 	$(foreach dir,$(TOOL_DIRS),$(call SUBMAKE,libs,$(dir)))
 
@@ -1754,7 +1754,7 @@ documentation:
 	$(DOXYGEN) $(DEPTH)/config/doxygen.cfg
 
 ifdef ENABLE_TESTS
-check:: $(SUBMAKEFILES) $(MAKE_DIRS)
+check:: $(SUBMAKEFILES)
 	$(LOOP_OVER_PARALLEL_DIRS)
 	$(LOOP_OVER_DIRS)
 	$(LOOP_OVER_TOOL_DIRS)
diff --git a/js/src/config/makefiles/target_libs.mk b/js/src/config/makefiles/target_libs.mk
index e5b797a2689f..3b9cca5aa1b2 100644
--- a/js/src/config/makefiles/target_libs.mk
+++ b/js/src/config/makefiles/target_libs.mk
@@ -18,7 +18,7 @@ GARBAGE += $(foreach lib,$(LIBRARY),$(EXPORT_LIBRARY)/$(lib))
 endif
 endif # EXPORT_LIBRARY
 
-libs:: $(SUBMAKEFILES) $(MAKE_DIRS) $(HOST_LIBRARY) $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(HOST_PROGRAM) $(HOST_SIMPLE_PROGRAMS) $(SIMPLE_PROGRAMS)
+libs:: $(SUBMAKEFILES) $(HOST_LIBRARY) $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(HOST_PROGRAM) $(HOST_SIMPLE_PROGRAMS) $(SIMPLE_PROGRAMS)
 ifndef NO_DIST_INSTALL
 ifdef SHARED_LIBRARY
 ifdef IS_COMPONENT
diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk
index 45ca4ea68a55..2a4266c3a0ad 100644
--- a/js/src/config/rules.mk
+++ b/js/src/config/rules.mk
@@ -744,12 +744,12 @@ endef
 
 $(foreach subtier,export libs tools,$(eval $(call CREATE_SUBTIER_TRAVERSAL_RULE,$(subtier))))
 
-export:: $(SUBMAKEFILES) $(MAKE_DIRS)
+export:: $(SUBMAKEFILES)
 	$(LOOP_OVER_DIRS)
 	$(LOOP_OVER_TOOL_DIRS)
 
 
-tools:: $(SUBMAKEFILES) $(MAKE_DIRS)
+tools:: $(SUBMAKEFILES)
 	$(LOOP_OVER_DIRS)
 	$(foreach dir,$(TOOL_DIRS),$(call SUBMAKE,libs,$(dir)))
 
@@ -1754,7 +1754,7 @@ documentation:
 	$(DOXYGEN) $(DEPTH)/config/doxygen.cfg
 
 ifdef ENABLE_TESTS
-check:: $(SUBMAKEFILES) $(MAKE_DIRS)
+check:: $(SUBMAKEFILES)
 	$(LOOP_OVER_PARALLEL_DIRS)
 	$(LOOP_OVER_DIRS)
 	$(LOOP_OVER_TOOL_DIRS)

From 04daefa195aac49963cad3e6e6de2fc58d4e1ea3 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Thu, 5 Sep 2013 09:01:44 +0900
Subject: [PATCH 52/86] Back out changeset 6fe5a446b775 (bug 903118)

---
 client.mk                            | 15 ++++++++++---
 config/makefiles/mozconfig.mk        | 33 ----------------------------
 config/rules.mk                      |  4 ----
 js/src/config/makefiles/mozconfig.mk | 33 ----------------------------
 js/src/config/rules.mk               |  4 ----
 5 files changed, 12 insertions(+), 77 deletions(-)
 delete mode 100644 config/makefiles/mozconfig.mk
 delete mode 100644 js/src/config/makefiles/mozconfig.mk

diff --git a/client.mk b/client.mk
index 5eb3f221f1b3..95a0e2513782 100644
--- a/client.mk
+++ b/client.mk
@@ -104,9 +104,18 @@ endif
 # Load mozconfig Options
 
 # See build pages, http://www.mozilla.org/build/ for how to set up mozconfig.
-# mozconfig.mk needs to be loaded multiple times by configure, so we don't check
-# for INCLUDED_MOZCONFIG_MK
-include $(TOPSRCDIR)/config/makefiles/mozconfig.mk
+
+MOZCONFIG_LOADER := build/autoconf/mozconfig2client-mk
+
+define CR
+
+
+endef
+
+# As $(shell) doesn't preserve newlines, use sed to replace them with an
+# unlikely sequence (||), which is then replaced back to newlines by make
+# before evaluation.
+$(eval $(subst ||,$(CR),$(shell _PYMAKE=$(.PYMAKE) $(TOPSRCDIR)/$(MOZCONFIG_LOADER) $(TOPSRCDIR) 2> $(TOPSRCDIR)/.mozconfig.out | sed 's/$$/||/')))
 
 ifdef AUTOCLOBBER
 export AUTOCLOBBER=1
diff --git a/config/makefiles/mozconfig.mk b/config/makefiles/mozconfig.mk
deleted file mode 100644
index 21408c46af48..000000000000
--- a/config/makefiles/mozconfig.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*- makefile -*-
-# vim:set ts=8 sw=8 sts=8 noet:
-#
-# 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/.
-#
-
-INCLUDED_MOZCONFIG_MK = 1
-
-# We are pulling in the mozconfig exports, so we only need to run once for the
-# whole make process tree (not for each sub-make). Export this so the sub-makes
-# don't read mozconfig multiple times.
-export INCLUDED_MOZCONFIG_MK
-
-MOZCONFIG_LOADER := build/autoconf/mozconfig2client-mk
-
-define CR
-
-
-endef
-
-# topsrcdir is used by rules.mk (set from the generated Makefile), while
-# TOPSRCDIR is used by client.mk
-ifneq (,$(topsrcdir))
-top := $(topsrcdir)
-else
-top := $(TOPSRCDIR)
-endif
-# As $(shell) doesn't preserve newlines, use sed to replace them with an
-# unlikely sequence (||), which is then replaced back to newlines by make
-# before evaluation.
-$(eval $(subst ||,$(CR),$(shell _PYMAKE=$(.PYMAKE) $(top)/$(MOZCONFIG_LOADER) $(top) 2> $(top)/.mozconfig.out | sed 's/$$/||/')))
diff --git a/config/rules.mk b/config/rules.mk
index 2a4266c3a0ad..5209d3117991 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -10,10 +10,6 @@ ifndef topsrcdir
 $(error topsrcdir was not set))
 endif
 
-ifndef INCLUDED_MOZCONFIG_MK
-include $(topsrcdir)/config/makefiles/mozconfig.mk
-endif
-
 # Integrate with mozbuild-generated make files. We first verify that no
 # variables provided by the automatically generated .mk files are
 # present. If they are, this is a violation of the separation of
diff --git a/js/src/config/makefiles/mozconfig.mk b/js/src/config/makefiles/mozconfig.mk
deleted file mode 100644
index 21408c46af48..000000000000
--- a/js/src/config/makefiles/mozconfig.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*- makefile -*-
-# vim:set ts=8 sw=8 sts=8 noet:
-#
-# 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/.
-#
-
-INCLUDED_MOZCONFIG_MK = 1
-
-# We are pulling in the mozconfig exports, so we only need to run once for the
-# whole make process tree (not for each sub-make). Export this so the sub-makes
-# don't read mozconfig multiple times.
-export INCLUDED_MOZCONFIG_MK
-
-MOZCONFIG_LOADER := build/autoconf/mozconfig2client-mk
-
-define CR
-
-
-endef
-
-# topsrcdir is used by rules.mk (set from the generated Makefile), while
-# TOPSRCDIR is used by client.mk
-ifneq (,$(topsrcdir))
-top := $(topsrcdir)
-else
-top := $(TOPSRCDIR)
-endif
-# As $(shell) doesn't preserve newlines, use sed to replace them with an
-# unlikely sequence (||), which is then replaced back to newlines by make
-# before evaluation.
-$(eval $(subst ||,$(CR),$(shell _PYMAKE=$(.PYMAKE) $(top)/$(MOZCONFIG_LOADER) $(top) 2> $(top)/.mozconfig.out | sed 's/$$/||/')))
diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk
index 2a4266c3a0ad..5209d3117991 100644
--- a/js/src/config/rules.mk
+++ b/js/src/config/rules.mk
@@ -10,10 +10,6 @@ ifndef topsrcdir
 $(error topsrcdir was not set))
 endif
 
-ifndef INCLUDED_MOZCONFIG_MK
-include $(topsrcdir)/config/makefiles/mozconfig.mk
-endif
-
 # Integrate with mozbuild-generated make files. We first verify that no
 # variables provided by the automatically generated .mk files are
 # present. If they are, this is a violation of the separation of

From 09b7788e66eddb3d04e99d4ca3cf3c3198df0cc5 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Thu, 5 Sep 2013 09:01:44 +0900
Subject: [PATCH 53/86] Bug 911634 - Create a .mozconfig.mk in the objdir when
 starting a build, and include it from config.mk. r=gps

---
 Makefile.in                        |  2 +-
 build/autoconf/mozconfig2client-mk | 16 +---------
 client.mk                          | 48 +++++++++++++++++++++++++-----
 config/config.mk                   |  2 ++
 js/src/config/config.mk            |  2 ++
 5 files changed, 47 insertions(+), 23 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 923f7c263a25..ef1cf067cf78 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -35,7 +35,7 @@ DIST_GARBAGE = config.cache config.log config.status* config-defs.h \
    config/autoconf.mk \
    mozilla-config.h \
    netwerk/necko-config.h xpcom/xpcom-config.h xpcom/xpcom-private.h \
-   $(topsrcdir)/.mozconfig.mk $(topsrcdir)/.mozconfig.out
+   .mozconfig.mk
 
 ifndef MOZ_PROFILE_USE
 # One of the first things we do in the build is purge "unknown" files
diff --git a/build/autoconf/mozconfig2client-mk b/build/autoconf/mozconfig2client-mk
index a3bf18ba42c8..aaf8de185932 100755
--- a/build/autoconf/mozconfig2client-mk
+++ b/build/autoconf/mozconfig2client-mk
@@ -43,15 +43,6 @@ mk_add_options() {
     # and substitute '@<word>@' with '$(<word>)'.
     _opt=`echo "$_opt" | sed -e 's/\([\"\\]\)/\\\\\1/g; s/@\([^@]*\)@/\$(\1)/g;'`
     echo $_opt;
-    opts="${opts:+$opts^}$_opt";
-  done
-}
-
-mk_echo_options() {
-  echo "Adding client.mk options from $FOUND_MOZCONFIG:" >&2
-  IFS=^
-  for _opt in $opts; do
-    echo "    $_opt" >&2
   done
 }
 
@@ -60,7 +51,6 @@ mk_echo_options() {
 
 scriptdir=`dirname $0`
 topsrcdir=$1
-opts=""
 
 # If the path changes, configure should be rerun
 echo "# PATH=$PATH"
@@ -81,10 +71,6 @@ if [ -n $isfoundset ]; then
   then
     print_header
     . "$FOUND_MOZCONFIG"
-  fi
-  echo "export FOUND_MOZCONFIG := $FOUND_MOZCONFIG"
-
-  if [ "$opts" ]; then
-    mk_echo_options
+    echo "FOUND_MOZCONFIG := $FOUND_MOZCONFIG"
   fi
 fi
diff --git a/client.mk b/client.mk
index 95a0e2513782..f9f7f10d1d2d 100644
--- a/client.mk
+++ b/client.mk
@@ -114,8 +114,20 @@ endef
 
 # As $(shell) doesn't preserve newlines, use sed to replace them with an
 # unlikely sequence (||), which is then replaced back to newlines by make
-# before evaluation.
-$(eval $(subst ||,$(CR),$(shell _PYMAKE=$(.PYMAKE) $(TOPSRCDIR)/$(MOZCONFIG_LOADER) $(TOPSRCDIR) 2> $(TOPSRCDIR)/.mozconfig.out | sed 's/$$/||/')))
+# before evaluation. $(shell) replacing newlines with spaces, || is always
+# followed by a space (since sed doesn't remove newlines), except on the
+# last line, so replace both '|| ' and '||'.
+MOZCONFIG_CONTENT := $(subst ||,$(CR),$(subst || ,$(CR),$(shell _PYMAKE=$(.PYMAKE) $(TOPSRCDIR)/$(MOZCONFIG_LOADER) $(TOPSRCDIR) | sed 's/$$/||/')))
+$(eval $(MOZCONFIG_CONTENT))
+
+# As '||' was used as a newline separator, it means it's not occurring in
+# lines themselves. It can thus safely be used to replaces normal spaces,
+# to then replace newlines with normal spaces. This allows to get a list
+# of mozconfig output lines.
+MOZCONFIG_OUT_LINES := $(subst $(CR), ,$(subst $(NULL) $(NULL),||,$(MOZCONFIG_CONTENT)))
+# Filter-out comments from those lines.
+START_COMMENT = \#
+MOZCONFIG_OUT_FILTERED := $(filter-out $(START_COMMENT)%,$(MOZCONFIG_OUT_LINES))
 
 ifdef AUTOCLOBBER
 export AUTOCLOBBER=1
@@ -175,13 +187,35 @@ build::
 include $(TOPSRCDIR)/config/makefiles/makeutils.mk
 include $(TOPSRCDIR)/config/makefiles/autotargets.mk
 
+# Create a makefile containing the mk_add_options values from mozconfig,
+# but only do so when OBJDIR is defined (see further above).
+ifdef MOZ_BUILD_PROJECTS
+ifdef MOZ_CURRENT_PROJECT
+WANT_MOZCONFIG_MK = 1
+else
+WANT_MOZCONFIG_MK =
+endif
+else
+WANT_MOZCONFIG_MK = 1
+endif
+
+ifdef WANT_MOZCONFIG_MK
+# For now, only output "export" lines from mozconfig2client-mk output.
+$(OBJDIR)/.mozconfig.mk: $(FOUND_MOZCONFIG) $(call mkdir_deps,$(OBJDIR))
+	( $(foreach line,$(filter export||%,$(MOZCONFIG_OUT_LINES)), echo "$(subst ||, ,$(line))";) ) > $@
+
+# Include that makefile so that it is created. This should not actually change
+# the environment since MOZCONFIG_CONTENT, which MOZCONFIG_OUT_LINES derives
+# from, has already been eval'ed.
+-include $(OBJDIR)/.mozconfig.mk
+endif
+
 # Print out any options loaded from mozconfig.
 all realbuild clean depend distclean export libs install realclean::
-	@if test -f .mozconfig.out; then \
-	  cat .mozconfig.out; \
-	  rm -f .mozconfig.out; \
-	else true; \
-	fi
+ifneq (,$(strip $(MOZCONFIG_OUT_FILTERED)))
+	$(info Adding client.mk options from $(FOUND_MOZCONFIG):)
+	$(foreach line,$(MOZCONFIG_OUT_FILTERED),$(info $(NULL) $(NULL) $(NULL) $(NULL) $(subst ||, ,$(line))))
+endif
 
 # Windows equivalents
 build_all: build
diff --git a/config/config.mk b/config/config.mk
index 19f9fec32a66..0eca489eef08 100644
--- a/config/config.mk
+++ b/config/config.mk
@@ -27,6 +27,8 @@ ifndef INCLUDED_AUTOCONF_MK
 include $(DEPTH)/config/autoconf.mk
 endif
 
+-include $(DEPTH)/.mozconfig.mk
+
 space = $(NULL) $(NULL)
 
 # Include defs.mk files that can be found in $(srcdir)/$(DEPTH),
diff --git a/js/src/config/config.mk b/js/src/config/config.mk
index 19f9fec32a66..0eca489eef08 100644
--- a/js/src/config/config.mk
+++ b/js/src/config/config.mk
@@ -27,6 +27,8 @@ ifndef INCLUDED_AUTOCONF_MK
 include $(DEPTH)/config/autoconf.mk
 endif
 
+-include $(DEPTH)/.mozconfig.mk
+
 space = $(NULL) $(NULL)
 
 # Include defs.mk files that can be found in $(srcdir)/$(DEPTH),

From cda48ada2e171e4736b3b767ba34a75a6c8ad4b7 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Thu, 5 Sep 2013 09:01:45 +0900
Subject: [PATCH 54/86] Bug 911936 - Kill make depend. r=gps

---
 client.mk              | 23 +++++++----------------
 config/rules.mk        | 13 +------------
 js/src/config/rules.mk | 13 +------------
 3 files changed, 9 insertions(+), 40 deletions(-)

diff --git a/client.mk b/client.mk
index f9f7f10d1d2d..223e057261a2 100644
--- a/client.mk
+++ b/client.mk
@@ -174,7 +174,7 @@ CONFIGURES := $(TOPSRCDIR)/configure
 CONFIGURES += $(TOPSRCDIR)/js/src/configure
 
 # Make targets that are going to be passed to the real build system
-OBJDIR_TARGETS = install export libs clean realclean distclean alldep maybe_clobber_profiledbuild upload sdk installer package fast-package package-compare stage-package source-package l10n-check
+OBJDIR_TARGETS = install export libs clean realclean distclean maybe_clobber_profiledbuild upload sdk installer package fast-package package-compare stage-package source-package l10n-check
 
 #######################################################################
 # Rules
@@ -211,7 +211,7 @@ $(OBJDIR)/.mozconfig.mk: $(FOUND_MOZCONFIG) $(call mkdir_deps,$(OBJDIR))
 endif
 
 # Print out any options loaded from mozconfig.
-all realbuild clean depend distclean export libs install realclean::
+all realbuild clean distclean export libs install realclean::
 ifneq (,$(strip $(MOZCONFIG_OUT_FILTERED)))
 	$(info Adding client.mk options from $(FOUND_MOZCONFIG):)
 	$(foreach line,$(MOZCONFIG_OUT_FILTERED),$(info $(NULL) $(NULL) $(NULL) $(NULL) $(subst ||, ,$(line))))
@@ -219,8 +219,6 @@ endif
 
 # Windows equivalents
 build_all: build
-build_all_dep: alldep
-build_all_depend: alldep
 clobber clobber_all: clean
 
 # helper target for mobile
@@ -263,7 +261,7 @@ endif
 #####################################################
 # Preflight, before building any project
 
-realbuild alldep preflight_all::
+realbuild preflight_all::
 ifeq (,$(MOZ_CURRENT_PROJECT)$(if $(MOZ_PREFLIGHT_ALL),,1))
 # Don't run preflight_all for individual projects in multi-project builds
 # (when MOZ_CURRENT_PROJECT is set.)
@@ -287,7 +285,7 @@ endif
 # loop through them.
 
 ifeq (,$(MOZ_CURRENT_PROJECT)$(if $(MOZ_BUILD_PROJECTS),,1))
-configure depend realbuild preflight postflight $(OBJDIR_TARGETS)::
+configure realbuild preflight postflight $(OBJDIR_TARGETS)::
 	set -e; \
 	for app in $(MOZ_BUILD_PROJECTS); do \
 	  $(MAKE) -f $(TOPSRCDIR)/client.mk $@ MOZ_CURRENT_PROJECT=$$app; \
@@ -382,16 +380,10 @@ $(OBJDIR)/config/autoconf.mk: $(TOPSRCDIR)/config/autoconf.mk.in
 endif
 
 
-####################################
-# Depend
-
-depend:: $(OBJDIR)/Makefile $(OBJDIR)/config.status
-	$(MOZ_MAKE) export && $(MOZ_MAKE) depend
-
 ####################################
 # Preflight
 
-realbuild alldep preflight::
+realbuild preflight::
 ifdef MOZ_PREFLIGHT
 	set -e; \
 	for mkfile in $(MOZ_PREFLIGHT); do \
@@ -415,7 +407,7 @@ $(OBJDIR_TARGETS):: $(OBJDIR)/Makefile $(OBJDIR)/config.status
 ####################################
 # Postflight
 
-realbuild alldep postflight::
+realbuild postflight::
 ifdef MOZ_POSTFLIGHT
 	set -e; \
 	for mkfile in $(MOZ_POSTFLIGHT); do \
@@ -428,7 +420,7 @@ endif # MOZ_CURRENT_PROJECT
 ####################################
 # Postflight, after building all projects
 
-realbuild alldep postflight_all::
+realbuild postflight_all::
 ifeq (,$(MOZ_CURRENT_PROJECT)$(if $(MOZ_POSTFLIGHT_ALL),,1))
 # Don't run postflight_all for individual projects in multi-project builds
 # (when MOZ_CURRENT_PROJECT is set.)
@@ -489,7 +481,6 @@ echo-variable-%:
 
 .PHONY: checkout \
     real_checkout \
-    depend \
     realbuild \
     build \
     profiledbuild \
diff --git a/config/rules.mk b/config/rules.mk
index 5209d3117991..dd048c1f59ac 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -686,14 +686,6 @@ default all::
 	$(MAKE) export
 	$(MAKE) libs
 	$(MAKE) tools
-
-# Do depend as well
-alldep::
-	$(MAKE) export
-	$(MAKE) depend
-	$(MAKE) libs
-	$(MAKE) tools
-
 endif # TIERS
 endif # SUPPRESS_DEFAULT_RULES
 
@@ -708,10 +700,7 @@ endif
 # Do everything from scratch
 everything::
 	$(MAKE) clean
-	$(MAKE) alldep
-
-# Add dummy depend target for tinderboxes
-depend::
+	$(MAKE) all
 
 # Target to only regenerate makefiles
 makefiles: $(SUBMAKEFILES)
diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk
index 5209d3117991..dd048c1f59ac 100644
--- a/js/src/config/rules.mk
+++ b/js/src/config/rules.mk
@@ -686,14 +686,6 @@ default all::
 	$(MAKE) export
 	$(MAKE) libs
 	$(MAKE) tools
-
-# Do depend as well
-alldep::
-	$(MAKE) export
-	$(MAKE) depend
-	$(MAKE) libs
-	$(MAKE) tools
-
 endif # TIERS
 endif # SUPPRESS_DEFAULT_RULES
 
@@ -708,10 +700,7 @@ endif
 # Do everything from scratch
 everything::
 	$(MAKE) clean
-	$(MAKE) alldep
-
-# Add dummy depend target for tinderboxes
-depend::
+	$(MAKE) all
 
 # Target to only regenerate makefiles
 makefiles: $(SUBMAKEFILES)

From b41136287589533de6aa0f699dd093c66ecc50e5 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Thu, 5 Sep 2013 09:01:45 +0900
Subject: [PATCH 55/86] Bug 912368 - Set relativesrcdir in
 config/tests/src-simple/Makefile and adjust so that it works. r=gps

---
 config/config.mk                    | 2 +-
 config/tests/src-simple/Makefile.in | 2 ++
 js/src/config/config.mk             | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/config/config.mk b/config/config.mk
index 0eca489eef08..d2e7e2a8921f 100644
--- a/config/config.mk
+++ b/config/config.mk
@@ -679,7 +679,7 @@ endif
 EXPAND_LOCALE_SRCDIR = $(if $(filter en-US,$(AB_CD)),$(topsrcdir)/$(1)/en-US,$(call core_realpath,$(L10NBASEDIR))/$(AB_CD)/$(subst /locales,,$(1)))
 
 ifdef relativesrcdir
-LOCALE_SRCDIR = $(call EXPAND_LOCALE_SRCDIR,$(relativesrcdir))
+LOCALE_SRCDIR ?= $(call EXPAND_LOCALE_SRCDIR,$(relativesrcdir))
 endif
 
 ifdef relativesrcdir
diff --git a/config/tests/src-simple/Makefile.in b/config/tests/src-simple/Makefile.in
index 1d34012c97ad..d425380236ea 100644
--- a/config/tests/src-simple/Makefile.in
+++ b/config/tests/src-simple/Makefile.in
@@ -7,6 +7,8 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
+relativesrcdir	= @relativesrcdir@
+
 LOCALE_SRCDIR = $(srcdir)/l10n
 
 include $(DEPTH)/config/autoconf.mk
diff --git a/js/src/config/config.mk b/js/src/config/config.mk
index 0eca489eef08..d2e7e2a8921f 100644
--- a/js/src/config/config.mk
+++ b/js/src/config/config.mk
@@ -679,7 +679,7 @@ endif
 EXPAND_LOCALE_SRCDIR = $(if $(filter en-US,$(AB_CD)),$(topsrcdir)/$(1)/en-US,$(call core_realpath,$(L10NBASEDIR))/$(AB_CD)/$(subst /locales,,$(1)))
 
 ifdef relativesrcdir
-LOCALE_SRCDIR = $(call EXPAND_LOCALE_SRCDIR,$(relativesrcdir))
+LOCALE_SRCDIR ?= $(call EXPAND_LOCALE_SRCDIR,$(relativesrcdir))
 endif
 
 ifdef relativesrcdir

From 81fd05ae2c1d9dedde06d1ee0e9ec08e7d8c421f Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Thu, 5 Sep 2013 09:01:45 +0900
Subject: [PATCH 56/86] Bug 912293 - Add a generic header and footer to
 generated Makefiles. r=gps

---
 config/autoconf.mk.in                         |  3 ++
 config/baseconfig.mk                          |  2 -
 config/rules.mk                               |  6 +++
 js/src/config/autoconf.mk.in                  |  3 ++
 js/src/config/baseconfig.mk                   |  2 -
 js/src/config/rules.mk                        |  6 +++
 js/src/configure.in                           |  2 +-
 .../mozbuild/backend/configenvironment.py     | 40 +++++++++++++++++--
 .../mozbuild/backend/recursivemake.py         | 34 +++-------------
 .../test/backend/data/stub0/Makefile.in       |  9 +----
 .../test/backend/test_recursivemake.py        | 14 ++++---
 11 files changed, 71 insertions(+), 50 deletions(-)

diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
index 41f7854eeef7..df6cc89badb7 100644
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -1,3 +1,6 @@
+ifndef INCLUDED_AUTOCONF_MK
+INCLUDED_AUTOCONF_MK = 1
 include $(DEPTH)/config/emptyvars.mk
 @ALLSUBSTS@
 include $(topsrcdir)/config/baseconfig.mk
+endif
diff --git a/config/baseconfig.mk b/config/baseconfig.mk
index c7c9e1364a0a..50f4cd4a7dd1 100644
--- a/config/baseconfig.mk
+++ b/config/baseconfig.mk
@@ -1,5 +1,3 @@
-INCLUDED_AUTOCONF_MK = 1
-
 includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
 idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
 installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
diff --git a/config/rules.mk b/config/rules.mk
index dd048c1f59ac..abc3e42c47d9 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -10,6 +10,12 @@ ifndef topsrcdir
 $(error topsrcdir was not set))
 endif
 
+# Define an include-at-most-once flag
+ifdef INCLUDED_RULES_MK
+$(error Do not include rules.mk twice!)
+endif
+INCLUDED_RULES_MK = 1
+
 # Integrate with mozbuild-generated make files. We first verify that no
 # variables provided by the automatically generated .mk files are
 # present. If they are, this is a violation of the separation of
diff --git a/js/src/config/autoconf.mk.in b/js/src/config/autoconf.mk.in
index 41f7854eeef7..df6cc89badb7 100644
--- a/js/src/config/autoconf.mk.in
+++ b/js/src/config/autoconf.mk.in
@@ -1,3 +1,6 @@
+ifndef INCLUDED_AUTOCONF_MK
+INCLUDED_AUTOCONF_MK = 1
 include $(DEPTH)/config/emptyvars.mk
 @ALLSUBSTS@
 include $(topsrcdir)/config/baseconfig.mk
+endif
diff --git a/js/src/config/baseconfig.mk b/js/src/config/baseconfig.mk
index eb26141b51c5..1ff076c07c39 100644
--- a/js/src/config/baseconfig.mk
+++ b/js/src/config/baseconfig.mk
@@ -1,5 +1,3 @@
-INCLUDED_AUTOCONF_MK = 1
-
 installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
 sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
 
diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk
index dd048c1f59ac..abc3e42c47d9 100644
--- a/js/src/config/rules.mk
+++ b/js/src/config/rules.mk
@@ -10,6 +10,12 @@ ifndef topsrcdir
 $(error topsrcdir was not set))
 endif
 
+# Define an include-at-most-once flag
+ifdef INCLUDED_RULES_MK
+$(error Do not include rules.mk twice!)
+endif
+INCLUDED_RULES_MK = 1
+
 # Integrate with mozbuild-generated make files. We first verify that no
 # variables provided by the automatically generated .mk files are
 # present. If they are, this is a violation of the separation of
diff --git a/js/src/configure.in b/js/src/configure.in
index bb80456d8261..3d833577f3f8 100644
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -4341,7 +4341,7 @@ AC_SUBST(ac_configure_args)
 dnl Spit out some output
 dnl ========================================================
 
-AC_OUTPUT([js-confdefs.h Makefile config/autoconf.mk config/emptyvars.mk])
+AC_OUTPUT([js-confdefs.h config/autoconf.mk config/emptyvars.mk])
 
 # Produce the js-config script at configure time; see the comments for
 # 'js*-config' in Makefile.in.
diff --git a/python/mozbuild/mozbuild/backend/configenvironment.py b/python/mozbuild/mozbuild/backend/configenvironment.py
index 0035b7169f79..76de9cfd7a00 100644
--- a/python/mozbuild/mozbuild/backend/configenvironment.py
+++ b/python/mozbuild/mozbuild/backend/configenvironment.py
@@ -205,7 +205,42 @@ class ConfigEnvironment(object):
             "relativesrcdir" for its source directory relative to the top
             "DEPTH" for the path to the top object directory
         '''
-        input = self.get_input(path)
+        if os.path.basename(path) == 'Makefile':
+            return self.create_makefile(path, extra=extra)
+        pp = self._get_preprocessor(path, extra)
+        pp.do_include(self.get_input(path))
+        return pp.out.close()
+
+    def create_makefile(self, path, stub=False, extra=None):
+        '''Creates the given makefile. Makefiles are treated the same as
+        config files, but some additional header and footer is added to the
+        output.
+
+        When the stub argument is True, no source file is used, and a stub
+        makefile with the default header and footer only is created.
+        '''
+        pp = self._get_preprocessor(path, extra)
+        pp.handleLine('# THIS FILE WAS AUTOMATICALLY GENERATED. DO NOT MODIFY BY HAND.\n');
+        pp.handleLine('DEPTH := @DEPTH@\n')
+        pp.handleLine('topsrcdir := @top_srcdir@\n')
+        pp.handleLine('srcdir := @srcdir@\n')
+        pp.handleLine('VPATH := @srcdir@\n')
+        pp.handleLine('relativesrcdir := @relativesrcdir@\n')
+        pp.handleLine('include $(DEPTH)/config/autoconf.mk\n')
+        if not stub:
+            pp.do_include(self.get_input(path))
+        # Empty line to avoid failures when last line in Makefile.in ends
+        # with a backslash.
+        pp.handleLine('\n')
+        pp.handleLine('ifndef INCLUDED_RULES_MK\n')
+        pp.handleLine('include $(topsrcdir)/config/rules.mk\n')
+        pp.handleLine('endif\n')
+        return pp.out.close()
+
+    def _get_preprocessor(self, path, extra):
+        '''Returns a preprocessor for use by create_config_file and
+        create_makefile.
+        '''
         pp = Preprocessor()
         pp.context.update(self.substs)
         pp.context.update(top_srcdir = self.get_top_srcdir(path))
@@ -218,8 +253,7 @@ class ConfigEnvironment(object):
         pp.setMarker(None)
 
         pp.out = FileAvoidWrite(path)
-        pp.do_include(input)
-        return pp.out.close()
+        return pp
 
     def create_config_header(self, path):
         '''Creates the given config header. A config header is generated by
diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild/mozbuild/backend/recursivemake.py
index ecbaf63325a6..ed45593f9d22 100644
--- a/python/mozbuild/mozbuild/backend/recursivemake.py
+++ b/python/mozbuild/mozbuild/backend/recursivemake.py
@@ -31,19 +31,6 @@ from ..frontend.data import (
 from ..util import FileAvoidWrite
 
 
-STUB_MAKEFILE = '''
-# THIS FILE WAS AUTOMATICALLY GENERATED. DO NOT MODIFY BY HAND.
-
-DEPTH          := {depth}
-topsrcdir      := {topsrc}
-srcdir         := {src}
-VPATH          := {src}
-relativesrcdir := {relsrc}
-
-include {topsrc}/config/rules.mk
-'''.lstrip()
-
-
 class BackendMakeFile(object):
     """Represents a generated backend.mk file.
 
@@ -237,14 +224,11 @@ class RecursiveMakeBackend(CommonBackend):
 
             # If Makefile.in exists, use it as a template. Otherwise, create a
             # stub.
-            if os.path.exists(makefile_in):
+            stub = not os.path.exists(makefile_in)
+            if not stub:
                 self.log(logging.DEBUG, 'substitute_makefile',
                     {'path': makefile}, 'Substituting makefile: {path}')
 
-                self._update_from_avoid_write(
-                    bf.environment.create_config_file(makefile))
-                self.summary.managed_count += 1
-
                 # Adding the Makefile.in here has the desired side-effect that
                 # if the Makefile.in disappears, this will force moz.build
                 # traversal. This means that when we remove empty Makefile.in
@@ -255,17 +239,9 @@ class RecursiveMakeBackend(CommonBackend):
                 self.log(logging.DEBUG, 'stub_makefile',
                     {'path': makefile}, 'Creating stub Makefile: {path}')
 
-                params = {
-                    'topsrc': bf.environment.get_top_srcdir(makefile),
-                    'src': bf.environment.get_file_srcdir(makefile),
-                    'depth': bf.environment.get_depth(makefile),
-                    'relsrc': bf.environment.get_relative_srcdir(makefile),
-                }
-
-                aw = FileAvoidWrite(makefile)
-                aw.write(STUB_MAKEFILE.format(**params))
-                self._update_from_avoid_write(aw.close())
-                self.summary.managed_count += 1
+            self._update_from_avoid_write(
+                bf.environment.create_makefile(makefile, stub=stub))
+            self.summary.managed_count += 1
 
             self._update_from_avoid_write(bf.close())
             self.summary.managed_count += 1
diff --git a/python/mozbuild/mozbuild/test/backend/data/stub0/Makefile.in b/python/mozbuild/mozbuild/test/backend/data/stub0/Makefile.in
index d756f9e9ee5a..02ff0a3f902e 100644
--- a/python/mozbuild/mozbuild/test/backend/data/stub0/Makefile.in
+++ b/python/mozbuild/mozbuild/test/backend/data/stub0/Makefile.in
@@ -1,11 +1,4 @@
 # Any copyright is dedicated to the Public Domain.
 # http://creativecommons.org/publicdomain/zero/1.0/
 
-DEPTH := @DEPTH@
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/rules.mk
+FOO := foo
diff --git a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py b/python/mozbuild/mozbuild/test/backend/test_recursivemake.py
index a2d64e8b31c3..06a509add03f 100644
--- a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py
+++ b/python/mozbuild/mozbuild/test/backend/test_recursivemake.py
@@ -47,16 +47,20 @@ class TestRecursiveMakeBackend(BackendTester):
 
         p = os.path.join(env.topobjdir, 'Makefile')
 
-        lines = [l.strip() for l in open(p, 'rt').readlines()[3:]]
+        lines = [l.strip() for l in open(p, 'rt').readlines()[1:] if not l.startswith('#')]
         self.assertEqual(lines, [
             'DEPTH := .',
             'topsrcdir := %s' % env.topsrcdir,
             'srcdir := %s' % env.topsrcdir,
-            'VPATH = %s' % env.topsrcdir,
-            '',
+            'VPATH := %s' % env.topsrcdir,
+            'relativesrcdir := .',
             'include $(DEPTH)/config/autoconf.mk',
             '',
-            'include $(topsrcdir)/config/rules.mk'
+            'FOO := foo',
+            '',
+            'ifndef INCLUDED_RULES_MK',
+            'include $(topsrcdir)/config/rules.mk',
+            'endif',
         ])
 
     def test_missing_makefile_in(self):
@@ -67,7 +71,7 @@ class TestRecursiveMakeBackend(BackendTester):
         self.assertTrue(os.path.exists(p))
 
         lines = [l.strip() for l in open(p, 'rt').readlines()]
-        self.assertEqual(len(lines), 9)
+        self.assertEqual(len(lines), 11)
 
         self.assertTrue(lines[0].startswith('# THIS FILE WAS AUTOMATICALLY'))
 

From f8bc7fa754bf4d82758bfa9e6eb5b074286f4905 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Thu, 5 Sep 2013 09:01:46 +0900
Subject: [PATCH 57/86] Bug 912293 - Remove now redundant boilerplate from
 Makefile.in. r=gps

---
 Makefile.in                                          |  7 -------
 accessible/public/ia2/Makefile.in                    |  8 --------
 accessible/public/msaa/Makefile.in                   | 10 ----------
 accessible/src/Makefile.in                           |  9 ---------
 accessible/src/atk/Makefile.in                       |  7 -------
 accessible/src/base/Makefile.in                      |  7 -------
 accessible/src/generic/Makefile.in                   |  7 -------
 accessible/src/html/Makefile.in                      |  7 -------
 accessible/src/jsat/Makefile.in                      | 10 ----------
 accessible/src/mac/Makefile.in                       |  7 -------
 accessible/src/other/Makefile.in                     |  7 -------
 accessible/src/windows/Makefile.in                   |  7 -------
 accessible/src/windows/ia2/Makefile.in               |  7 -------
 accessible/src/windows/msaa/Makefile.in              |  7 -------
 accessible/src/windows/sdn/Makefile.in               |  7 -------
 accessible/src/windows/uia/Makefile.in               |  7 -------
 accessible/src/xpcom/Makefile.in                     |  7 -------
 accessible/src/xul/Makefile.in                       |  7 -------
 accessible/tests/mochitest/Makefile.in               | 10 ----------
 accessible/tests/mochitest/actions/Makefile.in       | 10 ----------
 accessible/tests/mochitest/attributes/Makefile.in    | 10 ----------
 accessible/tests/mochitest/bounds/Makefile.in        | 10 ----------
 accessible/tests/mochitest/editabletext/Makefile.in  | 10 ----------
 accessible/tests/mochitest/elm/Makefile.in           | 10 ----------
 accessible/tests/mochitest/events/Makefile.in        | 10 ----------
 accessible/tests/mochitest/focus/Makefile.in         | 10 ----------
 accessible/tests/mochitest/hittest/Makefile.in       | 10 ----------
 accessible/tests/mochitest/hyperlink/Makefile.in     | 10 ----------
 accessible/tests/mochitest/hypertext/Makefile.in     | 10 ----------
 accessible/tests/mochitest/jsat/Makefile.in          | 10 ----------
 accessible/tests/mochitest/name/Makefile.in          | 10 ----------
 accessible/tests/mochitest/pivot/Makefile.in         | 10 ----------
 accessible/tests/mochitest/relations/Makefile.in     | 10 ----------
 accessible/tests/mochitest/role/Makefile.in          | 10 ----------
 accessible/tests/mochitest/scroll/Makefile.in        | 10 ----------
 accessible/tests/mochitest/selectable/Makefile.in    | 10 ----------
 accessible/tests/mochitest/states/Makefile.in        | 10 ----------
 accessible/tests/mochitest/table/Makefile.in         | 10 ----------
 accessible/tests/mochitest/text/Makefile.in          | 10 ----------
 accessible/tests/mochitest/textattrs/Makefile.in     | 10 ----------
 accessible/tests/mochitest/textcaret/Makefile.in     | 10 ----------
 accessible/tests/mochitest/textselection/Makefile.in | 10 ----------
 accessible/tests/mochitest/tree/Makefile.in          | 10 ----------
 accessible/tests/mochitest/treeupdate/Makefile.in    | 10 ----------
 accessible/tests/mochitest/value/Makefile.in         | 10 ----------
 addon-sdk/Makefile.in                                |  5 -----
 b2g/Makefile.in                                      |  7 -------
 b2g/app/Makefile.in                                  |  6 ------
 b2g/branding/official/locales/Makefile.in            | 10 ----------
 b2g/branding/unofficial/locales/Makefile.in          | 10 ----------
 b2g/chrome/Makefile.in                               |  9 ---------
 b2g/gaia/Makefile.in                                 |  8 --------
 b2g/installer/Makefile.in                            |  7 -------
 b2g/locales/Makefile.in                              |  8 --------
 browser/Makefile.in                                  |  5 -----
 browser/app/Makefile.in                              |  7 -------
 browser/app/profile/extensions/Makefile.in           |  6 ------
 .../Makefile.in                                      |  9 ---------
 browser/base/Makefile.in                             |  7 -------
 browser/base/content/test/Makefile.in                | 10 ----------
 browser/base/content/test/newtab/Makefile.in         | 10 ----------
 browser/base/content/test/social/Makefile.in         | 10 ----------
 .../base/content/test/social/opengraph/Makefile.in   | 10 ----------
 browser/branding/aurora/Makefile.in                  |  8 --------
 browser/branding/aurora/content/Makefile.in          |  9 ---------
 browser/branding/aurora/locales/Makefile.in          | 10 ----------
 browser/branding/nightly/Makefile.in                 |  8 --------
 browser/branding/nightly/content/Makefile.in         |  9 ---------
 browser/branding/nightly/locales/Makefile.in         | 10 ----------
 browser/branding/official/Makefile.in                |  8 --------
 browser/branding/official/content/Makefile.in        |  9 ---------
 browser/branding/official/locales/Makefile.in        | 10 ----------
 browser/branding/unofficial/Makefile.in              |  8 --------
 browser/branding/unofficial/content/Makefile.in      |  9 ---------
 browser/branding/unofficial/locales/Makefile.in      | 10 ----------
 browser/components/about/Makefile.in                 |  9 ---------
 browser/components/build/Makefile.in                 |  7 -------
 browser/components/certerror/test/Makefile.in        | 10 ----------
 browser/components/dirprovider/Makefile.in           |  9 ---------
 .../components/downloads/test/browser/Makefile.in    | 11 -----------
 browser/components/feeds/src/Makefile.in             |  9 ---------
 browser/components/feeds/test/Makefile.in            | 10 ----------
 browser/components/feeds/test/chrome/Makefile.in     | 11 -----------
 browser/components/migration/src/Makefile.in         | 10 ----------
 browser/components/places/tests/browser/Makefile.in  | 10 ----------
 browser/components/places/tests/chrome/Makefile.in   | 10 ----------
 browser/components/preferences/Makefile.in           |  7 -------
 .../components/preferences/in-content/Makefile.in    |  7 -------
 .../preferences/in-content/tests/Makefile.in         | 10 ----------
 browser/components/preferences/tests/Makefile.in     | 10 ----------
 .../privatebrowsing/test/browser/Makefile.in         | 10 ----------
 .../components/safebrowsing/content/test/Makefile.in | 10 ----------
 browser/components/search/test/Makefile.in           | 10 ----------
 browser/components/sessionstore/test/Makefile.in     | 10 ----------
 browser/components/shell/src/Makefile.in             |  7 -------
 browser/components/shell/test/Makefile.in            | 10 ----------
 browser/components/tabview/Makefile.in               |  7 -------
 browser/components/tabview/test/Makefile.in          | 10 ----------
 browser/components/test/Makefile.in                  | 10 ----------
 browser/devtools/Makefile.in                         |  5 -----
 browser/devtools/app-manager/Makefile.in             |  7 -------
 browser/devtools/app-manager/test/Makefile.in        | 10 ----------
 browser/devtools/commandline/Makefile.in             |  7 -------
 browser/devtools/commandline/test/Makefile.in        | 10 ----------
 browser/devtools/debugger/Makefile.in                |  7 -------
 browser/devtools/debugger/test/Makefile.in           | 10 ----------
 browser/devtools/fontinspector/test/Makefile.in      | 10 ----------
 browser/devtools/framework/Makefile.in               |  7 -------
 browser/devtools/framework/test/Makefile.in          | 10 ----------
 browser/devtools/inspector/Makefile.in               |  7 -------
 browser/devtools/inspector/test/Makefile.in          | 10 ----------
 browser/devtools/layoutview/test/Makefile.in         | 10 ----------
 browser/devtools/markupview/Makefile.in              |  9 ---------
 browser/devtools/markupview/test/Makefile.in         | 10 ----------
 browser/devtools/netmonitor/test/Makefile.in         | 10 ----------
 browser/devtools/profiler/Makefile.in                |  7 -------
 browser/devtools/profiler/test/Makefile.in           | 10 ----------
 browser/devtools/responsivedesign/Makefile.in        |  7 -------
 browser/devtools/responsivedesign/test/Makefile.in   | 10 ----------
 browser/devtools/scratchpad/Makefile.in              |  7 -------
 browser/devtools/scratchpad/test/Makefile.in         | 10 ----------
 browser/devtools/shared/Makefile.in                  |  7 -------
 browser/devtools/shared/test/Makefile.in             | 10 ----------
 browser/devtools/sourceeditor/test/Makefile.in       | 10 ----------
 browser/devtools/styleeditor/Makefile.in             |  7 -------
 browser/devtools/styleeditor/test/Makefile.in        | 10 ----------
 browser/devtools/styleinspector/Makefile.in          |  7 -------
 browser/devtools/styleinspector/test/Makefile.in     | 10 ----------
 browser/devtools/tilt/Makefile.in                    |  7 -------
 browser/devtools/tilt/test/Makefile.in               | 10 ----------
 browser/devtools/webconsole/Makefile.in              |  7 -------
 browser/devtools/webconsole/test/Makefile.in         | 10 ----------
 browser/extensions/Makefile.in                       |  7 -------
 browser/extensions/pdfjs/test/Makefile.in            | 10 ----------
 browser/fuel/test/Makefile.in                        | 10 ----------
 browser/installer/Makefile.in                        |  7 -------
 browser/installer/windows/Makefile.in                |  7 -------
 browser/locales/Makefile.in                          |  8 --------
 browser/metro/Makefile.in                            |  7 -------
 browser/metro/base/Makefile.in                       |  8 --------
 browser/metro/base/tests/Makefile.in                 | 10 ----------
 browser/metro/base/tests/mochiperf/Makefile.in       | 10 ----------
 browser/metro/base/tests/mochiperf/res/Makefile.in   | 10 ----------
 browser/metro/base/tests/mochitest/Makefile.in       | 10 ----------
 browser/metro/base/tests/mochitest/res/Makefile.in   | 10 ----------
 browser/metro/locales/Makefile.in                    |  6 ------
 browser/metro/locales/import/Makefile.in             |  6 ------
 browser/metro/profile/Makefile.in                    |  8 --------
 browser/metro/shell/Makefile.in                      |  9 ---------
 .../metro/shell/commandexecutehandler/Makefile.in    |  9 ---------
 browser/metro/shell/linktool/Makefile.in             |  9 ---------
 browser/metro/shell/testing/Makefile.in              |  9 ---------
 browser/modules/Makefile.in                          |  9 ---------
 browser/modules/test/Makefile.in                     | 10 ----------
 browser/modules/test/chrome/Makefile.in              | 10 ----------
 browser/themes/linux/Makefile.in                     |  9 ---------
 browser/themes/osx/Makefile.in                       |  9 ---------
 browser/themes/windows/Makefile.in                   |  9 ---------
 build/Makefile.in                                    |  6 ------
 build/mobile/robocop/Makefile.in                     |  7 -------
 build/mobile/sutagent/android/Makefile.in            |  7 -------
 build/mobile/sutagent/android/fencp/Makefile.in      |  7 -------
 build/mobile/sutagent/android/ffxcp/Makefile.in      |  7 -------
 build/mobile/sutagent/android/watcher/Makefile.in    |  7 -------
 build/package/Makefile.in                            |  7 -------
 build/stlport/Makefile.in                            |  7 -------
 build/unix/Makefile.in                               |  7 -------
 build/unix/elfhack/Makefile.in                       |  7 -------
 build/unix/elfhack/inject/Makefile.in                |  7 -------
 build/unix/stdc++compat/Makefile.in                  |  7 -------
 build/unix/test/Makefile.in                          |  6 ------
 build/win32/Makefile.in                              |  8 --------
 build/win32/crashinjectdll/Makefile.in               |  9 ---------
 build/win32/vmwarerecordinghelper/Makefile.in        |  9 ---------
 caps/src/Makefile.in                                 |  8 --------
 caps/tests/mochitest/Makefile.in                     | 10 ----------
 chrome/src/Makefile.in                               |  7 -------
 config/Makefile.in                                   |  7 -------
 config/makefiles/precompile/Makefile.in              |  6 ------
 config/makefiles/test/Makefile.in                    |  7 -------
 config/makefiles/xpidl/Makefile.in                   |  7 -------
 config/nspr/Makefile.in                              |  7 -------
 config/tests/makefiles/autodeps/Makefile.in          |  6 ------
 config/tests/src-simple/Makefile.in                  | 10 ----------
 content/base/src/Makefile.in                         |  7 -------
 content/base/test/Makefile.in                        | 11 -----------
 content/base/test/chrome/Makefile.in                 | 10 ----------
 content/base/test/websocket_hybi/Makefile.in         | 10 ----------
 content/canvas/compiledtest/Makefile.in              |  9 ---------
 content/canvas/src/Makefile.in                       |  7 -------
 content/canvas/test/Makefile.in                      |  8 --------
 content/canvas/test/chrome/Makefile.in               | 10 ----------
 content/canvas/test/crossorigin/Makefile.in          |  9 ---------
 content/canvas/test/webgl/Makefile.in                |  7 -------
 content/canvas/test/webgl/non-conf-tests/Makefile.in | 10 ----------
 content/events/src/Makefile.in                       |  9 ---------
 content/events/test/Makefile.in                      | 10 ----------
 content/html/content/src/Makefile.in                 |  7 -------
 content/html/content/test/Makefile.in                | 10 ----------
 content/html/content/test/bug649134/Makefile.in      | 10 ----------
 content/html/content/test/forms/Makefile.in          | 11 -----------
 content/html/document/src/Makefile.in                |  7 -------
 content/html/document/test/Makefile.in               | 10 ----------
 content/mathml/content/src/Makefile.in               |  7 -------
 content/media/Makefile.in                            |  7 -------
 content/media/dash/Makefile.in                       |  7 -------
 content/media/directshow/Makefile.in                 |  9 ---------
 content/media/gstreamer/Makefile.in                  |  7 -------
 content/media/mediasource/Makefile.in                |  8 --------
 content/media/mediasource/test/Makefile.in           | 10 ----------
 content/media/omx/Makefile.in                        |  7 -------
 content/media/omx/mediaresourcemanager/Makefile.in   |  7 -------
 content/media/plugins/Makefile.in                    |  7 -------
 content/media/raw/Makefile.in                        |  7 -------
 content/media/test/Makefile.in                       | 10 ----------
 content/media/webaudio/Makefile.in                   |  7 -------
 content/media/webaudio/blink/Makefile.in             |  7 -------
 content/media/webaudio/compiledtest/Makefile.in      | 10 ----------
 content/media/webaudio/test/Makefile.in              | 10 ----------
 content/media/webaudio/test/blink/Makefile.in        | 11 -----------
 content/media/webm/Makefile.in                       |  6 ------
 content/media/webrtc/Makefile.in                     |  7 -------
 content/media/webspeech/recognition/Makefile.in      |  6 ------
 content/media/webspeech/recognition/test/Makefile.in | 10 ----------
 content/media/webspeech/synth/Makefile.in            |  5 -----
 content/media/webspeech/synth/ipc/test/Makefile.in   | 10 ----------
 content/media/webspeech/synth/test/Makefile.in       | 10 ----------
 content/media/wmf/Makefile.in                        |  8 --------
 content/smil/Makefile.in                             |  9 ---------
 content/smil/test/Makefile.in                        | 10 ----------
 content/svg/content/src/Makefile.in                  |  7 -------
 content/svg/content/test/Makefile.in                 | 10 ----------
 content/svg/document/src/Makefile.in                 |  7 -------
 content/xbl/src/Makefile.in                          |  7 -------
 content/xbl/test/Makefile.in                         | 11 -----------
 content/xml/content/src/Makefile.in                  |  7 -------
 content/xml/document/src/Makefile.in                 |  7 -------
 content/xml/document/test/Makefile.in                | 10 ----------
 content/xslt/src/base/Makefile.in                    |  7 -------
 content/xslt/src/xml/Makefile.in                     |  7 -------
 content/xslt/src/xpath/Makefile.in                   |  7 -------
 content/xslt/src/xslt/Makefile.in                    |  7 -------
 content/xslt/tests/mochitest/Makefile.in             | 10 ----------
 content/xul/content/src/Makefile.in                  |  6 ------
 content/xul/content/test/Makefile.in                 | 10 ----------
 content/xul/document/src/Makefile.in                 |  7 -------
 content/xul/document/test/Makefile.in                | 10 ----------
 content/xul/templates/src/Makefile.in                |  7 -------
 content/xul/templates/tests/chrome/Makefile.in       | 10 ----------
 db/sqlite3/src/Makefile.in                           |  7 -------
 docshell/base/Makefile.in                            |  7 -------
 docshell/build/Makefile.in                           |  8 --------
 docshell/shistory/src/Makefile.in                    |  7 -------
 docshell/test/Makefile.in                            | 10 ----------
 docshell/test/browser/Makefile.in                    | 10 ----------
 docshell/test/chrome/Makefile.in                     | 10 ----------
 docshell/test/navigation/Makefile.in                 | 10 ----------
 dom/activities/src/Makefile.in                       |  9 ---------
 dom/alarm/Makefile.in                                |  8 --------
 dom/alarm/test/Makefile.in                           | 11 -----------
 dom/apps/tests/Makefile.in                           | 11 -----------
 dom/audiochannel/Makefile.in                         |  8 --------
 dom/base/Makefile.in                                 |  8 --------
 dom/base/test/Makefile.in                            | 11 -----------
 dom/battery/Makefile.in                              |  8 --------
 dom/battery/test/Makefile.in                         | 11 -----------
 dom/bindings/Makefile.in                             |  7 -------
 dom/bindings/test/Makefile.in                        |  8 --------
 dom/bluetooth/Makefile.in                            |  5 -----
 dom/browser-element/Makefile.in                      |  7 -------
 dom/browser-element/mochitest/Makefile.in            | 10 ----------
 dom/browser-element/mochitest/priority/Makefile.in   | 10 ----------
 dom/camera/Makefile.in                               |  8 --------
 dom/cellbroadcast/interfaces/Makefile.in             | 10 ----------
 dom/cellbroadcast/src/Makefile.in                    |  9 ---------
 dom/contacts/Makefile.in                             | 10 ----------
 dom/contacts/tests/Makefile.in                       | 11 -----------
 dom/devicestorage/Makefile.in                        |  7 -------
 dom/devicestorage/ipc/Makefile.in                    |  8 --------
 dom/devicestorage/test/Makefile.in                   | 10 ----------
 dom/encoding/Makefile.in                             |  6 ------
 dom/encoding/test/Makefile.in                        | 11 -----------
 dom/encoding/test/unit/Makefile.in                   | 11 -----------
 dom/file/Makefile.in                                 | 10 ----------
 dom/file/test/Makefile.in                            | 11 -----------
 dom/fmradio/ipc/Makefile.in                          |  7 -------
 dom/gamepad/Makefile.in                              |  7 -------
 dom/icc/interfaces/Makefile.in                       |  9 ---------
 dom/icc/src/Makefile.in                              |  5 -----
 dom/imptests/Makefile.in                             |  7 -------
 dom/imptests/editing/Makefile.in                     | 11 -----------
 dom/imptests/editing/conformancetest/Makefile.in     | 11 -----------
 dom/imptests/editing/css/Makefile.in                 | 11 -----------
 dom/imptests/editing/selecttest/Makefile.in          | 11 -----------
 .../failures/editing/conformancetest/Makefile.in     | 11 -----------
 dom/imptests/failures/editing/selecttest/Makefile.in | 11 -----------
 .../html/html/browsers/the-window-object/Makefile.in | 11 -----------
 .../named-access-on-the-window-object/Makefile.in    | 11 -----------
 .../failures/html/html/dom/documents/dta/Makefile.in | 11 -----------
 .../html/html/dom/documents/dta/doc.gEBN/Makefile.in | 11 -----------
 .../html/dom/elements/global-attributes/Makefile.in  | 11 -----------
 .../html/html/obsolete/implreq/oeaaa/Makefile.in     | 11 -----------
 .../semantics/forms/the-form-element/Makefile.in     | 11 -----------
 .../semantics/forms/the-option-element/Makefile.in   | 11 -----------
 .../semantics/forms/the-select-element/Makefile.in   | 11 -----------
 .../scripting-1/the-script-element/Makefile.in       | 11 -----------
 .../tabular-data/the-table-element/Makefile.in       | 11 -----------
 .../failures/html/html/webappapis/atob/Makefile.in   | 11 -----------
 dom/imptests/failures/html/js/builtins/Makefile.in   | 11 -----------
 .../old-tests/submission/Opera/microdata/Makefile.in | 11 -----------
 dom/imptests/failures/html/typedarrays/Makefile.in   | 11 -----------
 .../webapps/DOMCore/tests/approved/Makefile.in       | 11 -----------
 .../DOMCore/tests/submissions/Ms2ger/Makefile.in     | 11 -----------
 .../DOMCore/tests/submissions/Opera/Makefile.in      | 11 -----------
 .../tests/submissions/Infraware/Makefile.in          | 11 -----------
 .../WebStorage/tests/submissions/Ms2ger/Makefile.in  | 11 -----------
 .../tests/submissions/Ms2ger/Makefile.in             | 11 -----------
 dom/imptests/html/domxpath/Makefile.in               | 11 -----------
 .../browsers/browsing-the-web/read-media/Makefile.in | 11 -----------
 .../html/html/browsers/the-window-object/Makefile.in | 11 -----------
 .../named-access-on-the-window-object/Makefile.in    | 11 -----------
 dom/imptests/html/html/dom/documents/dta/Makefile.in | 11 -----------
 .../html/html/dom/documents/dta/doc.gEBN/Makefile.in | 11 -----------
 .../html/dom/elements/global-attributes/Makefile.in  | 11 -----------
 .../html/editing/the-hidden-attribute/Makefile.in    | 12 ------------
 .../html/html/obsolete/implreq/oeaaa/Makefile.in     | 11 -----------
 .../document-metadata/the-title-element/Makefile.in  | 11 -----------
 .../semantics/forms/the-form-element/Makefile.in     | 11 -----------
 .../semantics/forms/the-option-element/Makefile.in   | 11 -----------
 .../semantics/forms/the-select-element/Makefile.in   | 11 -----------
 .../scripting-1/the-script-element/Makefile.in       | 11 -----------
 .../tabular-data/the-table-element/Makefile.in       | 11 -----------
 .../the-time-element/Makefile.in                     | 11 -----------
 dom/imptests/html/html/webappapis/atob/Makefile.in   | 11 -----------
 .../html/webappapis/scripting/events/Makefile.in     | 11 -----------
 .../scripting/processing-model-2/Makefile.in         | 11 -----------
 dom/imptests/html/html/webappapis/timers/Makefile.in | 11 -----------
 dom/imptests/html/js/builtins/Makefile.in            | 11 -----------
 .../old-tests/submission/Opera/microdata/Makefile.in | 11 -----------
 dom/imptests/html/typedarrays/Makefile.in            | 11 -----------
 dom/imptests/html/webgl/Makefile.in                  | 11 -----------
 .../webapps/DOMCore/tests/approved/Makefile.in       | 11 -----------
 .../DOMCore/tests/submissions/Ms2ger/Makefile.in     | 11 -----------
 .../DOMCore/tests/submissions/Opera/Makefile.in      | 11 -----------
 .../tests/submissions/Infraware/Makefile.in          | 11 -----------
 .../tests/submissions/Infraware/iframe/Makefile.in   | 11 -----------
 .../WebStorage/tests/submissions/Ms2ger/Makefile.in  | 11 -----------
 .../tests/submissions/Ms2ger/Makefile.in             | 11 -----------
 dom/imptests/writeBuildFiles.py                      | 11 -----------
 dom/indexedDB/Makefile.in                            |  8 --------
 dom/indexedDB/ipc/Makefile.in                        |  7 -------
 dom/indexedDB/test/Makefile.in                       | 10 ----------
 dom/indexedDB/test/unit/Makefile.in                  | 11 -----------
 dom/interfaces/devicestorage/Makefile.in             | 11 -----------
 dom/ipc/Makefile.in                                  |  7 -------
 dom/ipc/tests/Makefile.in                            | 10 ----------
 dom/locales/Makefile.in                              | 10 ----------
 dom/media/Makefile.in                                |  8 --------
 dom/media/bridge/Makefile.in                         | 10 ----------
 dom/media/tests/mochitest/Makefile.in                | 10 ----------
 dom/messages/interfaces/Makefile.in                  | 10 ----------
 dom/mobilemessage/interfaces/Makefile.in             | 10 ----------
 dom/mobilemessage/src/Makefile.in                    |  5 -----
 dom/mobilemessage/tests/Makefile.in                  | 11 -----------
 dom/network/interfaces/Makefile.in                   | 10 ----------
 dom/network/src/Makefile.in                          |  5 -----
 dom/network/tests/Makefile.in                        | 11 -----------
 dom/permission/tests/Makefile.in                     | 11 -----------
 dom/phonenumberutils/tests/Makefile.in               | 11 -----------
 dom/plugins/base/Makefile.in                         |  7 -------
 dom/plugins/base/android/Makefile.in                 |  7 -------
 dom/plugins/ipc/Makefile.in                          |  7 -------
 dom/plugins/ipc/hangui/Makefile.in                   |  7 -------
 dom/plugins/ipc/interpose/Makefile.in                |  9 ---------
 dom/plugins/test/mochitest/Makefile.in               | 10 ----------
 dom/plugins/test/testplugin/Makefile.in              |  7 -------
 dom/plugins/test/testplugin/secondplugin/Makefile.in |  7 -------
 dom/power/Makefile.in                                |  7 -------
 dom/power/test/Makefile.in                           | 11 -----------
 dom/promise/Makefile.in                              |  9 ---------
 dom/promise/tests/Makefile.in                        | 11 -----------
 dom/quota/Makefile.in                                |  7 -------
 dom/settings/tests/Makefile.in                       | 11 -----------
 dom/src/events/Makefile.in                           |  7 -------
 dom/src/geolocation/Makefile.in                      |  7 -------
 dom/src/json/Makefile.in                             |  8 --------
 dom/src/json/test/Makefile.in                        | 11 -----------
 dom/src/jsurl/Makefile.in                            |  9 ---------
 dom/src/jsurl/test/Makefile.in                       | 10 ----------
 dom/src/notification/Makefile.in                     |  7 -------
 dom/src/offline/Makefile.in                          |  9 ---------
 dom/src/storage/Makefile.in                          |  6 ------
 dom/system/Makefile.in                               |  7 -------
 dom/system/android/Makefile.in                       |  8 --------
 dom/system/gonk/Makefile.in                          | 10 ----------
 dom/system/mac/Makefile.in                           |  7 -------
 dom/system/tests/Makefile.in                         |  8 --------
 dom/system/unix/Makefile.in                          |  7 -------
 dom/system/windows/Makefile.in                       |  9 ---------
 dom/telephony/Makefile.in                            | 10 ----------
 dom/tests/browser/Makefile.in                        | 10 ----------
 dom/tests/mochitest/ajax/jquery/Makefile.in          | 10 ----------
 dom/tests/mochitest/ajax/jquery/dist/Makefile.in     | 10 ----------
 dom/tests/mochitest/ajax/jquery/test/Makefile.in     | 10 ----------
 .../mochitest/ajax/jquery/test/data/Makefile.in      | 10 ----------
 .../ajax/jquery/test/data/offset/Makefile.in         | 10 ----------
 .../mochitest/ajax/jquery/test/unit/Makefile.in      | 10 ----------
 dom/tests/mochitest/ajax/lib/Makefile.in             | 10 ----------
 dom/tests/mochitest/ajax/mochikit/Makefile.in        | 10 ----------
 .../mochitest/ajax/mochikit/MochiKit/Makefile.in     | 10 ----------
 dom/tests/mochitest/ajax/mochikit/tests/Makefile.in  | 10 ----------
 .../ajax/mochikit/tests/SimpleTest/Makefile.in       | 10 ----------
 dom/tests/mochitest/ajax/offline/Makefile.in         | 10 ----------
 .../mochitest/ajax/offline/namespace1/Makefile.in    | 10 ----------
 .../ajax/offline/namespace1/sub/Makefile.in          | 10 ----------
 .../ajax/offline/namespace1/sub2/Makefile.in         | 10 ----------
 .../mochitest/ajax/offline/namespace2/Makefile.in    | 10 ----------
 dom/tests/mochitest/ajax/prototype/Makefile.in       | 10 ----------
 dom/tests/mochitest/ajax/prototype/dist/Makefile.in  | 10 ----------
 dom/tests/mochitest/ajax/prototype/test/Makefile.in  | 10 ----------
 .../ajax/prototype/test/functional/Makefile.in       | 10 ----------
 .../mochitest/ajax/prototype/test/lib/Makefile.in    | 10 ----------
 .../mochitest/ajax/prototype/test/unit/Makefile.in   | 10 ----------
 .../ajax/prototype/test/unit/fixtures/Makefile.in    | 10 ----------
 .../ajax/prototype/test/unit/tmp/Makefile.in         | 10 ----------
 dom/tests/mochitest/ajax/scriptaculous/Makefile.in   | 10 ----------
 .../mochitest/ajax/scriptaculous/lib/Makefile.in     | 10 ----------
 .../mochitest/ajax/scriptaculous/src/Makefile.in     | 10 ----------
 .../ajax/scriptaculous/test/unit/Makefile.in         | 10 ----------
 dom/tests/mochitest/bugs/Makefile.in                 | 10 ----------
 dom/tests/mochitest/chrome/Makefile.in               | 10 ----------
 dom/tests/mochitest/crypto/Makefile.in               | 10 ----------
 dom/tests/mochitest/dom-level0/Makefile.in           | 10 ----------
 dom/tests/mochitest/dom-level1-core/Makefile.in      | 10 ----------
 .../mochitest/dom-level1-core/files/Makefile.in      | 10 ----------
 dom/tests/mochitest/dom-level2-core/Makefile.in      | 10 ----------
 .../mochitest/dom-level2-core/files/Makefile.in      | 10 ----------
 dom/tests/mochitest/dom-level2-html/Makefile.in      | 10 ----------
 .../mochitest/dom-level2-html/files/Makefile.in      | 10 ----------
 .../files/applets/org/w3c/domts/Makefile.in          | 10 ----------
 dom/tests/mochitest/gamepad/Makefile.in              |  8 --------
 dom/tests/mochitest/general/Makefile.in              | 10 ----------
 dom/tests/mochitest/geolocation/Makefile.in          | 10 ----------
 dom/tests/mochitest/localstorage/Makefile.in         | 10 ----------
 dom/tests/mochitest/notification/Makefile.in         | 10 ----------
 dom/tests/mochitest/orientation/Makefile.in          | 10 ----------
 dom/tests/mochitest/pointerlock/Makefile.in          | 10 ----------
 dom/tests/mochitest/sessionstorage/Makefile.in       | 10 ----------
 dom/tests/mochitest/storageevent/Makefile.in         | 10 ----------
 dom/tests/mochitest/webapps/Makefile.in              | 10 ----------
 dom/tests/mochitest/webapps/apps/Makefile.in         | 10 ----------
 dom/tests/mochitest/webcomponents/Makefile.in        | 10 ----------
 dom/tests/mochitest/whatwg/Makefile.in               | 10 ----------
 dom/time/Makefile.in                                 |  7 -------
 dom/voicemail/Makefile.in                            | 10 ----------
 dom/wifi/Makefile.in                                 | 11 -----------
 dom/workers/Makefile.in                              |  9 ---------
 dom/workers/test/Makefile.in                         | 11 -----------
 dom/workers/test/extensions/bootstrap/Makefile.in    |  7 -------
 dom/workers/test/extensions/traditional/Makefile.in  |  7 -------
 dom/workers/test/subdir/Makefile.in                  | 10 ----------
 editor/composer/src/Makefile.in                      |  8 --------
 editor/composer/test/Makefile.in                     | 10 ----------
 editor/libeditor/base/Makefile.in                    |  9 ---------
 editor/libeditor/base/tests/Makefile.in              | 11 -----------
 editor/libeditor/html/Makefile.in                    |  6 ------
 editor/libeditor/html/tests/Makefile.in              |  8 --------
 editor/libeditor/text/Makefile.in                    |  6 ------
 editor/libeditor/text/tests/Makefile.in              | 11 -----------
 editor/txmgr/src/Makefile.in                         |  8 --------
 embedding/browser/build/Makefile.in                  |  7 -------
 embedding/browser/webBrowser/Makefile.in             |  8 --------
 embedding/components/build/Makefile.in               |  9 ---------
 embedding/components/printingui/src/mac/Makefile.in  |  9 ---------
 embedding/components/printingui/src/os2/Makefile.in  |  9 ---------
 .../components/printingui/src/unixshared/Makefile.in |  9 ---------
 embedding/components/printingui/src/win/Makefile.in  |  9 ---------
 .../components/webbrowserpersist/src/Makefile.in     |  8 --------
 embedding/components/windowwatcher/src/Makefile.in   |  9 ---------
 embedding/test/Makefile.in                           | 10 ----------
 embedding/tests/winEmbed/Makefile.in                 |  7 -------
 extensions/auth/Makefile.in                          |  9 ---------
 extensions/cookie/Makefile.in                        |  7 -------
 extensions/cookie/test/Makefile.in                   | 11 -----------
 extensions/gio/Makefile.in                           |  9 ---------
 extensions/gnomevfs/Makefile.in                      |  9 ---------
 extensions/permissions/Makefile.in                   |  8 --------
 extensions/pref/autoconfig/src/Makefile.in           | 10 ----------
 extensions/spellcheck/hunspell/src/Makefile.in       |  7 -------
 extensions/spellcheck/locales/Makefile.in            |  8 --------
 extensions/spellcheck/src/Makefile.in                |  7 -------
 extensions/spellcheck/tests/chrome/Makefile.in       | 10 ----------
 extensions/spellcheck/tests/chrome/base/Makefile.in  | 10 ----------
 extensions/spellcheck/tests/chrome/map/Makefile.in   | 10 ----------
 extensions/universalchardet/src/xpcom/Makefile.in    |  9 ---------
 extensions/universalchardet/tests/Makefile.in        | 11 -----------
 extensions/widgetutils/Makefile.in                   |  9 ---------
 extensions/widgetutils/src/Makefile.in               |  9 ---------
 gfx/2d/Makefile.in                                   |  5 -----
 gfx/angle/Makefile.in                                |  7 -------
 gfx/angle/src/libEGL/Makefile.in                     |  7 -------
 gfx/angle/src/libGLESv2/Makefile.in                  |  7 -------
 gfx/cairo/cairo/src/Makefile.in                      |  8 --------
 gfx/cairo/libpixman/src/Makefile.in                  |  7 -------
 gfx/gl/Makefile.in                                   |  7 -------
 gfx/graphite2/src/Makefile.in                        |  8 --------
 gfx/harfbuzz/src/Makefile.in                         |  7 -------
 gfx/ipc/Makefile.in                                  |  7 -------
 gfx/layers/Makefile.in                               |  5 -----
 gfx/ots/src/Makefile.in                              |  8 --------
 gfx/qcms/Makefile.in                                 |  7 -------
 gfx/skia/Makefile.in                                 |  7 -------
 gfx/src/Makefile.in                                  |  8 --------
 gfx/tests/Makefile.in                                | 11 -----------
 gfx/tests/gtest/Makefile.in                          |  8 --------
 gfx/thebes/Makefile.in                               |  7 -------
 gfx/ycbcr/Makefile.in                                |  7 -------
 hal/Makefile.in                                      |  7 -------
 hal/tests/Makefile.in                                | 11 -----------
 image/build/Makefile.in                              | 10 ----------
 image/decoders/Makefile.in                           | 10 ----------
 image/decoders/icon/Makefile.in                      |  9 ---------
 image/decoders/icon/android/Makefile.in              |  7 -------
 image/decoders/icon/gtk/Makefile.in                  | 10 ----------
 image/decoders/icon/qt/Makefile.in                   | 10 ----------
 image/encoders/bmp/Makefile.in                       | 11 -----------
 image/encoders/ico/Makefile.in                       | 11 -----------
 image/encoders/png/Makefile.in                       | 11 -----------
 image/src/Makefile.in                                | 10 ----------
 image/test/browser/Makefile.in                       | 10 ----------
 image/test/mochitest/Makefile.in                     | 10 ----------
 intl/build/Makefile.in                               |  9 ---------
 intl/chardet/src/Makefile.in                         |  8 --------
 intl/locale/src/Makefile.in                          |  7 -------
 intl/locale/src/mac/Makefile.in                      |  7 -------
 intl/locale/src/os2/Makefile.in                      |  7 -------
 intl/locale/src/unix/Makefile.in                     |  7 -------
 intl/locale/src/windows/Makefile.in                  |  7 -------
 intl/locales/Makefile.in                             |  8 --------
 intl/lwbrk/src/Makefile.in                           |  7 -------
 intl/lwbrk/tests/Makefile.in                         |  7 -------
 intl/uconv/src/Makefile.in                           |  7 -------
 intl/uconv/tests/Makefile.in                         | 10 ----------
 intl/uconv/tools/Makefile.in                         |  8 --------
 intl/uconv/ucvcn/Makefile.in                         |  9 ---------
 intl/uconv/ucvibm/Makefile.in                        |  9 ---------
 intl/uconv/ucvja/Makefile.in                         | 10 ----------
 intl/uconv/ucvko/Makefile.in                         | 10 ----------
 intl/uconv/ucvlatin/Makefile.in                      |  9 ---------
 intl/uconv/ucvtw/Makefile.in                         |  9 ---------
 intl/uconv/ucvtw2/Makefile.in                        | 10 ----------
 intl/uconv/util/Makefile.in                          |  9 ---------
 intl/unicharutil/tables/Makefile.in                  |  8 --------
 intl/unicharutil/tests/Makefile.in                   |  9 ---------
 intl/unicharutil/tools/Makefile.in                   |  8 --------
 intl/unicharutil/util/Makefile.in                    |  7 -------
 intl/unicharutil/util/internal/Makefile.in           |  7 -------
 ipc/app/Makefile.in                                  |  7 -------
 ipc/chromium/Makefile.in                             |  7 -------
 ipc/dbus/Makefile.in                                 |  7 -------
 ipc/glue/Makefile.in                                 |  7 -------
 ipc/ipdl/Makefile.in                                 |  7 -------
 ipc/ipdl/test/cxx/Makefile.in                        |  7 -------
 ipc/ipdl/test/cxx/app/Makefile.in                    |  7 -------
 ipc/ipdl/test/ipdl/Makefile.in                       |  6 ------
 ipc/netd/Makefile.in                                 |  7 -------
 ipc/nfc/Makefile.in                                  |  7 -------
 ipc/ril/Makefile.in                                  |  7 -------
 ipc/testshell/Makefile.in                            |  7 -------
 ipc/unixsocket/Makefile.in                           |  7 -------
 js/ductwork/debugger/Makefile.in                     | 10 ----------
 js/ipc/Makefile.in                                   |  7 -------
 js/jsd/Makefile.in                                   |  8 --------
 js/jsd/test/Makefile.in                              | 10 ----------
 js/src/Makefile.in                                   |  6 ------
 js/src/config/Makefile.in                            |  7 -------
 js/src/devtools/rootAnalysis/Makefile.in             |  5 -----
 js/src/editline/Makefile.in                          |  9 ---------
 js/src/gdb/Makefile.in                               |  7 -------
 js/src/jsapi-tests/Makefile.in                       |  7 -------
 js/src/shell/Makefile.in                             |  7 -------
 js/src/tests/Makefile.in                             |  8 --------
 js/xpconnect/loader/Makefile.in                      |  7 -------
 js/xpconnect/shell/Makefile.in                       |  7 -------
 js/xpconnect/src/Makefile.in                         |  7 -------
 js/xpconnect/tests/Makefile.in                       | 10 ----------
 js/xpconnect/tests/browser/Makefile.in               | 10 ----------
 js/xpconnect/tests/chrome/Makefile.in                | 10 ----------
 js/xpconnect/tests/components/js/Makefile.in         |  7 -------
 js/xpconnect/tests/components/native/Makefile.in     |  7 -------
 js/xpconnect/tests/idl/Makefile.in                   |  7 -------
 js/xpconnect/tests/mochitest/Makefile.in             | 11 -----------
 js/xpconnect/wrappers/Makefile.in                    |  9 ---------
 layout/base/Makefile.in                              |  7 -------
 layout/base/tests/Makefile.in                        | 10 ----------
 layout/base/tests/chrome/Makefile.in                 | 10 ----------
 layout/build/Makefile.in                             |  8 --------
 layout/forms/Makefile.in                             |  8 --------
 layout/forms/test/Makefile.in                        | 10 ----------
 layout/generic/Makefile.in                           |  8 --------
 layout/generic/test/Makefile.in                      | 10 ----------
 layout/inspector/src/Makefile.in                     |  9 ---------
 layout/inspector/tests/Makefile.in                   | 10 ----------
 layout/inspector/tests/chrome/Makefile.in            | 10 ----------
 layout/ipc/Makefile.in                               |  7 -------
 layout/mathml/Makefile.in                            |  8 --------
 layout/mathml/tests/Makefile.in                      | 10 ----------
 layout/media/Makefile.in                             |  7 -------
 layout/printing/Makefile.in                          |  8 --------
 layout/reftests/fonts/Makefile.in                    |  8 --------
 layout/reftests/fonts/mplus/Makefile.in              |  8 --------
 layout/style/Makefile.in                             |  8 --------
 layout/style/test/Makefile.in                        |  8 --------
 layout/style/test/chrome/Makefile.in                 | 10 ----------
 layout/svg/Makefile.in                               |  9 ---------
 layout/tables/Makefile.in                            |  7 -------
 layout/tables/test/Makefile.in                       | 10 ----------
 layout/tools/layout-debug/src/Makefile.in            |  7 -------
 layout/tools/reftest/Makefile.in                     |  7 -------
 layout/xul/base/src/Makefile.in                      |  8 --------
 layout/xul/base/test/Makefile.in                     | 10 ----------
 layout/xul/grid/Makefile.in                          |  9 ---------
 layout/xul/test/Makefile.in                          | 10 ----------
 layout/xul/tree/Makefile.in                          |  9 ---------
 media/kiss_fft/Makefile.in                           |  9 ---------
 media/libcubeb/src/Makefile.in                       |  7 -------
 media/libjpeg/Makefile.in                            |  7 -------
 media/libnestegg/src/Makefile.in                     |  9 ---------
 media/libogg/src/Makefile.in                         |  9 ---------
 media/libopus/Makefile.in                            |  9 ---------
 media/libpng/Makefile.in                             |  9 ---------
 media/libsoundtouch/src/Makefile.in                  |  8 --------
 media/libspeex_resampler/src/Makefile.in             |  7 -------
 media/libtheora/lib/Makefile.in                      |  6 ------
 media/libtremor/lib/Makefile.in                      |  9 ---------
 media/libvorbis/lib/Makefile.in                      |  9 ---------
 media/libvpx/Makefile.in                             |  7 -------
 media/mtransport/build/Makefile.in                   |  9 ---------
 media/mtransport/standalone/Makefile.in              |  8 --------
 media/mtransport/test/Makefile.in                    |  9 ---------
 media/mtransport/third_party/Makefile.in             |  9 ---------
 media/omx-plugin/Makefile.in                         |  7 -------
 media/omx-plugin/froyo/Makefile.in                   |  7 -------
 media/omx-plugin/gb/Makefile.in                      |  7 -------
 media/omx-plugin/gb235/Makefile.in                   |  7 -------
 media/omx-plugin/hc/Makefile.in                      |  7 -------
 .../omx-plugin/lib/froyo/libstagefright/Makefile.in  |  9 ---------
 media/omx-plugin/lib/gb/libstagefright/Makefile.in   |  9 ---------
 .../gb/libstagefright_color_conversion/Makefile.in   |  7 -------
 media/omx-plugin/lib/gb/libutils/Makefile.in         |  7 -------
 .../omx-plugin/lib/gb235/libstagefright/Makefile.in  |  9 ---------
 media/omx-plugin/lib/hc/libstagefright/Makefile.in   |  9 ---------
 media/omx-plugin/lib/ics/libstagefright/Makefile.in  |  9 ---------
 media/omx-plugin/lib/ics/libutils/Makefile.in        |  7 -------
 media/webrtc/Makefile.in                             |  8 --------
 media/webrtc/signaling/test/Makefile.in              |  7 -------
 memory/build/Makefile.in                             |  9 ---------
 memory/jemalloc/Makefile.in                          |  6 ------
 memory/mozalloc/Makefile.in                          |  9 ---------
 memory/mozjemalloc/Makefile.in                       |  9 ---------
 memory/replace/dmd/Makefile.in                       |  9 ---------
 memory/replace/dummy/Makefile.in                     |  9 ---------
 memory/replace/jemalloc/Makefile.in                  |  9 ---------
 mfbt/Makefile.in                                     |  9 ---------
 mfbt/tests/Makefile.in                               |  7 -------
 mobile/android/Makefile.in                           |  7 -------
 mobile/android/app/Makefile.in                       |  7 -------
 mobile/android/base/Makefile.in                      |  7 -------
 mobile/android/base/locales/Makefile.in              |  8 --------
 mobile/android/branding/aurora/locales/Makefile.in   | 10 ----------
 mobile/android/branding/beta/locales/Makefile.in     | 10 ----------
 mobile/android/branding/nightly/locales/Makefile.in  | 10 ----------
 mobile/android/branding/official/locales/Makefile.in | 10 ----------
 .../android/branding/unofficial/locales/Makefile.in  | 10 ----------
 mobile/android/chrome/Makefile.in                    |  9 ---------
 mobile/android/components/Makefile.in                |  9 ---------
 mobile/android/components/build/Makefile.in          |  9 ---------
 mobile/android/fonts/Makefile.in                     |  8 --------
 mobile/android/installer/Makefile.in                 |  7 -------
 mobile/android/locales/Makefile.in                   |  7 -------
 mobile/locales/Makefile.in                           |  8 --------
 modules/libbz2/src/Makefile.in                       |  8 --------
 modules/libjar/Makefile.in                           |  7 -------
 modules/libjar/test/chrome/Makefile.in               | 10 ----------
 modules/libjar/test/mochitest/Makefile.in            | 10 ----------
 modules/libjar/zipwriter/src/Makefile.in             |  8 --------
 modules/libmar/sign/Makefile.in                      |  7 -------
 modules/libmar/src/Makefile.in                       |  7 -------
 modules/libmar/tests/Makefile.in                     |  8 --------
 modules/libmar/tool/Makefile.in                      |  7 -------
 modules/libmar/verify/Makefile.in                    |  7 -------
 modules/libpref/src/Makefile.in                      |  7 -------
 modules/zlib/src/Makefile.in                         |  8 --------
 mozglue/android/Makefile.in                          |  7 -------
 mozglue/build/Makefile.in                            |  7 -------
 mozglue/linker/Makefile.in                           |  7 -------
 mozglue/tests/Makefile.in                            |  7 -------
 netwerk/Makefile.in                                  |  7 -------
 netwerk/base/public/Makefile.in                      |  7 -------
 netwerk/base/src/Makefile.in                         |  7 -------
 netwerk/build/Makefile.in                            |  8 --------
 netwerk/cache/Makefile.in                            | 10 ----------
 netwerk/cookie/Makefile.in                           |  9 ---------
 netwerk/dash/mpd/Makefile.in                         | 10 ----------
 netwerk/dns/Makefile.in                              |  7 -------
 netwerk/ipc/Makefile.in                              |  6 ------
 netwerk/locales/Makefile.in                          | 10 ----------
 netwerk/protocol/about/Makefile.in                   |  7 -------
 netwerk/protocol/data/Makefile.in                    |  8 --------
 netwerk/protocol/device/Makefile.in                  |  7 -------
 netwerk/protocol/file/Makefile.in                    |  9 ---------
 netwerk/protocol/ftp/Makefile.in                     |  7 -------
 netwerk/protocol/http/Makefile.in                    |  8 --------
 netwerk/protocol/res/Makefile.in                     |  8 --------
 netwerk/protocol/viewsource/Makefile.in              |  9 ---------
 netwerk/protocol/websocket/Makefile.in               |  8 --------
 netwerk/protocol/wyciwyg/Makefile.in                 |  8 --------
 netwerk/sctp/datachannel/Makefile.in                 |  8 --------
 netwerk/sctp/src/Makefile.in                         |  6 ------
 netwerk/srtp/src/Makefile.in                         |  6 ------
 netwerk/streamconv/converters/Makefile.in            | 10 ----------
 netwerk/streamconv/test/Makefile.in                  |  7 -------
 netwerk/system/android/Makefile.in                   |  7 -------
 netwerk/system/qt/Makefile.in                        |  6 ------
 netwerk/test/Makefile.in                             |  6 ------
 netwerk/test/browser/Makefile.in                     | 10 ----------
 netwerk/test/httpserver/Makefile.in                  | 10 ----------
 netwerk/test/mochitests/Makefile.in                  |  9 ---------
 netwerk/wifi/Makefile.in                             | 10 ----------
 other-licenses/android/Makefile.in                   |  9 ---------
 other-licenses/bsdiff/Makefile.in                    |  7 -------
 other-licenses/skia-npapi/Makefile.in                | 10 ----------
 other-licenses/snappy/Makefile.in                    |  8 --------
 parser/expat/lib/Makefile.in                         |  7 -------
 parser/html/Makefile.in                              |  7 -------
 parser/htmlparser/src/Makefile.in                    |  9 ---------
 parser/htmlparser/tests/mochitest/Makefile.in        | 10 ----------
 .../tests/mochitest/dir_bug534293/Makefile.in        | 10 ----------
 .../mochitest/html5lib_tree_construction/Makefile.in | 10 ----------
 .../html5lib_tree_construction/scripted/Makefile.in  | 10 ----------
 parser/xml/src/Makefile.in                           |  8 --------
 probes/Makefile.in                                   |  9 ---------
 profile/dirserviceprovider/src/Makefile.in           |  8 --------
 profile/dirserviceprovider/standalone/Makefile.in    |  6 ------
 python/Makefile.in                                   | 11 -----------
 .../test/backend/data/stub0/dir1/Makefile.in         |  5 -----
 .../test/backend/data/stub0/dir3/Makefile.in         |  5 -----
 rdf/build/Makefile.in                                |  8 --------
 rdf/datasource/src/Makefile.in                       |  8 --------
 rdf/tests/dsds/Makefile.in                           |  8 --------
 rdf/tests/rdfcat/Makefile.in                         |  7 -------
 rdf/tests/rdfpoll/Makefile.in                        | 10 ----------
 rdf/tests/triplescat/Makefile.in                     |  7 -------
 rdf/util/src/Makefile.in                             | 10 ----------
 rdf/util/src/internal/Makefile.in                    |  7 -------
 security/build/Makefile.in                           |  6 ------
 security/manager/boot/src/Makefile.in                |  7 -------
 security/manager/locales/Makefile.in                 | 10 ----------
 security/manager/pki/src/Makefile.in                 | 10 ----------
 security/manager/ssl/src/Makefile.in                 | 10 ----------
 .../manager/ssl/tests/mochitest/browser/Makefile.in  | 10 ----------
 .../manager/ssl/tests/mochitest/bugs/Makefile.in     | 10 ----------
 .../ssl/tests/mochitest/mixedcontent/Makefile.in     | 10 ----------
 .../mochitest/stricttransportsecurity/Makefile.in    | 10 ----------
 .../ssl/tests/unit/test_ocsp_stapling/Makefile.in    |  9 ---------
 security/sandbox/Makefile.in                         |  8 --------
 services/common/Makefile.in                          |  7 -------
 services/crypto/Makefile.in                          |  9 ---------
 services/crypto/component/Makefile.in                |  9 ---------
 services/datareporting/Makefile.in                   |  7 -------
 services/healthreport/Makefile.in                    |  8 --------
 services/metrics/Makefile.in                         |  9 ---------
 services/sync/Makefile.in                            |  9 ---------
 services/sync/locales/Makefile.in                    | 10 ----------
 startupcache/Makefile.in                             |  8 --------
 startupcache/test/Makefile.in                        |  9 ---------
 storage/build/Makefile.in                            | 10 ----------
 storage/src/Makefile.in                              |  9 ---------
 storage/test/Makefile.in                             | 10 ----------
 testing/gtest/Makefile.in                            |  6 ------
 testing/marionette/Makefile.in                       |  9 ---------
 testing/marionette/components/Makefile.in            |  9 ---------
 testing/mochitest/Makefile.in                        |  8 --------
 testing/mochitest/MochiKit/Makefile.in               |  7 -------
 testing/mochitest/chrome/Makefile.in                 |  7 -------
 testing/mochitest/dynamic/Makefile.in                |  7 -------
 testing/mochitest/roboextender/Makefile.in           |  8 --------
 testing/mochitest/ssltunnel/Makefile.in              |  9 ---------
 testing/mochitest/static/Makefile.in                 |  7 -------
 testing/mochitest/tests/Makefile.in                  |  8 --------
 .../tests/MochiKit-1.4.2/MochiKit/Makefile.in        |  7 -------
 .../mochitest/tests/MochiKit-1.4.2/tests/Makefile.in |  8 --------
 .../MochiKit-1.4.2/tests/SimpleTest/Makefile.in      |  7 -------
 testing/mochitest/tests/SimpleTest/Makefile.in       |  8 --------
 testing/mochitest/tests/browser/Makefile.in          | 10 ----------
 testing/modules/Makefile.in                          | 10 ----------
 testing/mozbase/Makefile.in                          |  7 -------
 testing/peptest/Makefile.in                          |  7 -------
 testing/profiles/Makefile.in                         |  6 ------
 testing/specialpowers/Makefile.in                    |  9 ---------
 testing/tools/screenshot/Makefile.in                 |  9 ---------
 testing/xpcshell/Makefile.in                         |  7 -------
 toolkit/Makefile.in                                  |  7 -------
 toolkit/components/aboutmemory/tests/Makefile.in     | 11 -----------
 toolkit/components/alerts/Makefile.in                |  7 -------
 toolkit/components/alerts/test/Makefile.in           | 10 ----------
 toolkit/components/autocomplete/Makefile.in          |  8 --------
 toolkit/components/build/Makefile.in                 |  9 ---------
 toolkit/components/commandlines/Makefile.in          |  8 --------
 toolkit/components/console/tests/Makefile.in         | 10 ----------
 toolkit/components/ctypes/Makefile.in                |  9 ---------
 toolkit/components/ctypes/tests/Makefile.in          |  8 --------
 toolkit/components/diskspacewatcher/Makefile.in      |  7 -------
 toolkit/components/downloads/Makefile.in             |  7 -------
 .../components/downloads/test/browser/Makefile.in    | 10 ----------
 toolkit/components/feeds/Makefile.in                 |  7 -------
 toolkit/components/feeds/test/Makefile.in            | 10 ----------
 toolkit/components/filepicker/Makefile.in            |  9 ---------
 toolkit/components/jsdownloads/src/Makefile.in       |  7 -------
 toolkit/components/jsdownloads/test/data/Makefile.in |  9 ---------
 toolkit/components/maintenanceservice/Makefile.in    |  7 -------
 toolkit/components/mediasniffer/Makefile.in          |  9 ---------
 toolkit/components/microformats/tests/Makefile.in    |  9 ---------
 toolkit/components/osfile/tests/mochi/Makefile.in    | 10 ----------
 toolkit/components/passwordmgr/test/Makefile.in      |  8 --------
 .../components/passwordmgr/test/auth2/Makefile.in    | 10 ----------
 .../components/passwordmgr/test/browser/Makefile.in  | 10 ----------
 toolkit/components/perf/Makefile.in                  |  9 ---------
 toolkit/components/places/Makefile.in                |  7 -------
 toolkit/components/places/tests/Makefile.in          |  8 --------
 toolkit/components/places/tests/browser/Makefile.in  | 10 ----------
 toolkit/components/places/tests/chrome/Makefile.in   | 10 ----------
 .../places/tests/mochitest/bug_411966/Makefile.in    | 10 ----------
 .../places/tests/mochitest/bug_461710/Makefile.in    | 10 ----------
 toolkit/components/prompts/test/Makefile.in          | 10 ----------
 toolkit/components/protobuf/Makefile.in              |  7 -------
 toolkit/components/reflect/Makefile.in               |  9 ---------
 toolkit/components/remote/Makefile.in                |  8 --------
 toolkit/components/satchel/Makefile.in               | 10 ----------
 toolkit/components/satchel/test/Makefile.in          | 11 -----------
 toolkit/components/satchel/test/browser/Makefile.in  | 11 -----------
 toolkit/components/search/Makefile.in                | 10 ----------
 toolkit/components/social/test/browser/Makefile.in   | 10 ----------
 toolkit/components/startup/tests/browser/Makefile.in | 10 ----------
 toolkit/components/telemetry/Makefile.in             |  6 ------
 toolkit/components/thumbnails/test/Makefile.in       | 10 ----------
 toolkit/components/url-classifier/Makefile.in        | 10 ----------
 toolkit/components/url-classifier/tests/Makefile.in  | 10 ----------
 .../url-classifier/tests/mochitest/Makefile.in       | 11 -----------
 toolkit/components/urlformatter/Makefile.in          |  8 --------
 toolkit/components/viewsource/test/Makefile.in       | 10 ----------
 .../components/viewsource/test/browser/Makefile.in   | 10 ----------
 toolkit/components/workerloader/Makefile.in          | 10 ----------
 toolkit/components/workerloader/tests/Makefile.in    | 10 ----------
 toolkit/content/Makefile.in                          |  8 --------
 toolkit/content/tests/browser/Makefile.in            | 10 ----------
 toolkit/content/tests/browser/common/Makefile.in     | 10 ----------
 toolkit/content/tests/browser/data/Makefile.in       | 10 ----------
 toolkit/content/tests/chrome/Makefile.in             | 10 ----------
 toolkit/content/tests/chrome/rtlchrome/Makefile.in   | 10 ----------
 toolkit/content/tests/chrome/rtltest/Makefile.in     | 10 ----------
 .../content/tests/chrome/rtltest/content/Makefile.in | 10 ----------
 toolkit/content/tests/widgets/Makefile.in            | 10 ----------
 toolkit/crashreporter/Makefile.in                    |  7 -------
 .../breakpad-windows-libxul/Makefile.in              |  9 ---------
 .../breakpad-windows-standalone/Makefile.in          |  9 ---------
 toolkit/crashreporter/client/Makefile.in             |  8 --------
 .../google-breakpad/src/client/Makefile.in           |  9 ---------
 .../src/client/linux/crash_generation/Makefile.in    |  7 -------
 .../src/client/linux/handler/Makefile.in             |  9 ---------
 .../src/client/linux/minidump_writer/Makefile.in     |  9 ---------
 .../src/client/mac/crash_generation/Makefile.in      |  9 ---------
 .../src/client/mac/handler/Makefile.in               |  9 ---------
 .../src/client/solaris/handler/Makefile.in           |  9 ---------
 .../google-breakpad/src/common/Makefile.in           |  7 -------
 .../google-breakpad/src/common/dwarf/Makefile.in     |  9 ---------
 .../google-breakpad/src/common/linux/Makefile.in     |  7 -------
 .../google-breakpad/src/common/mac/Makefile.in       |  8 --------
 .../google-breakpad/src/common/solaris/Makefile.in   | 10 ----------
 .../google-breakpad/src/processor/Makefile.in        |  9 ---------
 .../src/tools/linux/dump_syms/Makefile.in            |  9 ---------
 .../src/tools/mac/dump_syms/Makefile.in              |  9 ---------
 .../src/tools/solaris/dump_syms/Makefile.in          |  9 ---------
 toolkit/crashreporter/injector/Makefile.in           |  7 -------
 toolkit/crashreporter/test/Makefile.in               |  9 ---------
 toolkit/devtools/Makefile.in                         |  5 -----
 toolkit/devtools/client/Makefile.in                  |  7 -------
 toolkit/devtools/gcli/Makefile.in                    |  7 -------
 toolkit/devtools/server/Makefile.in                  |  7 -------
 toolkit/devtools/server/tests/mochitest/Makefile.in  | 10 ----------
 toolkit/devtools/sourcemap/Makefile.in               |  7 -------
 toolkit/devtools/webconsole/Makefile.in              |  7 -------
 toolkit/devtools/webconsole/test/Makefile.in         | 10 ----------
 toolkit/forgetaboutsite/test/browser/Makefile.in     |  9 ---------
 toolkit/identity/Makefile.in                         |  9 ---------
 toolkit/identity/tests/chrome/Makefile.in            | 10 ----------
 toolkit/library/Makefile.in                          |  9 ---------
 toolkit/library/winvccorlib/Makefile.in              | 10 ----------
 toolkit/locales/Makefile.in                          |  8 --------
 toolkit/modules/Makefile.in                          |  9 ---------
 toolkit/modules/tests/browser/Makefile.in            | 10 ----------
 toolkit/modules/tests/chrome/Makefile.in             | 11 -----------
 toolkit/mozapps/downloads/tests/Makefile.in          |  8 --------
 toolkit/mozapps/downloads/tests/chrome/Makefile.in   | 10 ----------
 toolkit/mozapps/extensions/Makefile.in               |  9 ---------
 toolkit/mozapps/extensions/test/Makefile.in          |  8 --------
 toolkit/mozapps/extensions/test/browser/Makefile.in  |  7 -------
 .../mozapps/extensions/test/mochitest/Makefile.in    | 10 ----------
 .../mozapps/extensions/test/xpinstall/Makefile.in    | 10 ----------
 toolkit/mozapps/plugins/tests/Makefile.in            |  8 --------
 toolkit/mozapps/update/common/Makefile.in            | 10 ----------
 toolkit/mozapps/update/test/Makefile.in              |  8 --------
 toolkit/mozapps/update/test/chrome/Makefile.in       |  8 --------
 toolkit/mozapps/update/test_svc/Makefile.in          |  8 --------
 toolkit/mozapps/update/updater/Makefile.in           |  7 -------
 toolkit/profile/Makefile.in                          |  7 -------
 toolkit/profile/test/Makefile.in                     | 11 -----------
 toolkit/system/androidproxy/Makefile.in              |  8 --------
 toolkit/system/dbus/Makefile.in                      |  7 -------
 toolkit/system/gnome/Makefile.in                     |  7 -------
 toolkit/system/osxproxy/Makefile.in                  |  8 --------
 toolkit/system/unixproxy/Makefile.in                 |  9 ---------
 toolkit/system/windowsproxy/Makefile.in              |  8 --------
 toolkit/themes/osx/mochitests/Makefile.in            | 10 ----------
 toolkit/xre/Makefile.in                              |  7 -------
 toolkit/xre/test/Makefile.in                         | 11 -----------
 toolkit/xre/test/win/Makefile.in                     |  7 -------
 tools/jprof/Makefile.in                              |  7 -------
 tools/jprof/stub/Makefile.in                         |  7 -------
 tools/profiler/Makefile.in                           |  9 ---------
 tools/trace-malloc/Makefile.in                       |  8 --------
 tools/trace-malloc/lib/Makefile.in                   | 10 ----------
 tools/update-packaging/Makefile.in                   |  7 -------
 uriloader/exthandler/Makefile.in                     |  6 ------
 uriloader/exthandler/tests/Makefile.in               |  8 --------
 uriloader/exthandler/tests/mochitest/Makefile.in     | 10 ----------
 uriloader/prefetch/Makefile.in                       |  7 -------
 view/src/Makefile.in                                 |  7 -------
 webapprt/Makefile.in                                 |  7 -------
 webapprt/gtk2/Makefile.in                            |  6 ------
 webapprt/locales/Makefile.in                         | 10 ----------
 webapprt/mac/Makefile.in                             |  7 -------
 webapprt/test/chrome/Makefile.in                     | 10 ----------
 webapprt/test/content/Makefile.in                    | 10 ----------
 webapprt/win/Makefile.in                             |  7 -------
 widget/android/Makefile.in                           |  7 -------
 widget/cocoa/Makefile.in                             |  7 -------
 widget/gonk/Makefile.in                              |  5 -----
 widget/gonk/libdisplay/Makefile.in                   |  5 -----
 widget/gonk/nativewindow/Makefile.in                 |  7 -------
 widget/gtk2/Makefile.in                              |  7 -------
 widget/gtkxtbin/Makefile.in                          |  8 --------
 widget/os2/Makefile.in                               |  9 ---------
 widget/qt/Makefile.in                                |  7 -------
 widget/qt/faststartupqt/Makefile.in                  | 10 ----------
 widget/shared/Makefile.in                            |  7 -------
 widget/shared/x11/Makefile.in                        |  7 -------
 widget/tests/Makefile.in                             |  9 ---------
 widget/windows/Makefile.in                           |  7 -------
 widget/windows/winrt/Makefile.in                     |  7 -------
 widget/xpwidgets/Makefile.in                         |  7 -------
 widget/xremoteclient/Makefile.in                     |  9 ---------
 xpcom/Makefile.in                                    |  7 -------
 xpcom/analysis/Makefile.in                           |  7 -------
 xpcom/base/Makefile.in                               |  7 -------
 xpcom/build/Makefile.in                              |  6 ------
 xpcom/components/Makefile.in                         |  7 -------
 xpcom/ds/Makefile.in                                 |  8 --------
 xpcom/glue/Makefile.in                               |  6 ------
 xpcom/glue/nomozalloc/Makefile.in                    |  6 ------
 xpcom/glue/standalone/Makefile.in                    |  7 -------
 xpcom/glue/standalone/staticruntime/Makefile.in      |  7 -------
 xpcom/glue/staticruntime/Makefile.in                 |  7 -------
 xpcom/glue/tests/gtest/Makefile.in                   |  9 ---------
 xpcom/idl-parser/Makefile.in                         |  7 -------
 xpcom/io/Makefile.in                                 |  8 --------
 xpcom/reflect/xptcall/src/Makefile.in                |  7 -------
 xpcom/reflect/xptcall/src/md/os2/Makefile.in         |  7 -------
 xpcom/reflect/xptcall/src/md/unix/Makefile.in        |  6 ------
 xpcom/reflect/xptcall/src/md/win32/Makefile.in       |  7 -------
 xpcom/reflect/xptcall/tests/Makefile.in              |  9 ---------
 xpcom/reflect/xptinfo/public/Makefile.in             |  9 ---------
 xpcom/reflect/xptinfo/src/Makefile.in                |  7 -------
 xpcom/reflect/xptinfo/tests/Makefile.in              |  9 ---------
 xpcom/sample/Makefile.in                             |  7 -------
 xpcom/sample/program/Makefile.in                     |  9 ---------
 xpcom/string/src/Makefile.in                         |  7 -------
 xpcom/tests/Makefile.in                              |  8 --------
 xpcom/tests/bug656331_component/Makefile.in          |  7 -------
 xpcom/tests/component/Makefile.in                    |  7 -------
 xpcom/tests/component_no_aslr/Makefile.in            |  7 -------
 xpcom/tests/external/Makefile.in                     |  7 -------
 xpcom/tests/static-checker/Makefile.in               |  7 -------
 xpcom/tests/windows/Makefile.in                      |  7 -------
 xpcom/threads/Makefile.in                            | 11 -----------
 xpcom/typelib/xpt/src/Makefile.in                    |  7 -------
 xpcom/typelib/xpt/tests/Makefile.in                  |  7 -------
 xpcom/typelib/xpt/tools/Makefile.in                  |  7 -------
 xpcom/windbgdlg/Makefile.in                          |  9 ---------
 xpfe/appshell/src/Makefile.in                        | 10 ----------
 xpfe/appshell/src/test/Makefile.in                   | 10 ----------
 xpfe/components/build/Makefile.in                    |  9 ---------
 xpfe/components/windowds/Makefile.in                 | 10 ----------
 xulrunner/app/Makefile.in                            |  7 -------
 xulrunner/app/profile/Makefile.in                    |  7 -------
 xulrunner/app/profile/chrome/Makefile.in             |  7 -------
 xulrunner/examples/simple/Makefile.in                |  7 -------
 .../examples/simple/components/public/Makefile.in    |  9 ---------
 xulrunner/examples/simple/components/src/Makefile.in |  9 ---------
 xulrunner/installer/Makefile.in                      |  7 -------
 xulrunner/installer/windows/Makefile.in              |  7 -------
 xulrunner/setup/Makefile.in                          |  9 ---------
 xulrunner/stub/Makefile.in                           |  7 -------
 xulrunner/tools/redit/Makefile.in                    |  9 ---------
 1014 files changed, 8752 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index ef1cf067cf78..a79189bc9213 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -3,11 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
 ifndef .PYMAKE
 ifeq (,$(MAKE_VERSION))
 $(error GNU Make is required)
@@ -19,8 +14,6 @@ endif
 
 export TOPLEVEL_BUILD := 1
 
-include $(DEPTH)/config/autoconf.mk
-
 default::
 
 ifdef COMPILE_ENVIRONMENT
diff --git a/accessible/public/ia2/Makefile.in b/accessible/public/ia2/Makefile.in
index 35fd596d6971..94c1dc180169 100644
--- a/accessible/public/ia2/Makefile.in
+++ b/accessible/public/ia2/Makefile.in
@@ -2,17 +2,10 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
 DEFFILE       = $(win_srcdir)/IA2Marshal.def
 
 IA2DIR        = $(topsrcdir)/other-licenses/ia2
 
-include $(DEPTH)/config/autoconf.mk
-
 DEFINES       += -DREGISTER_PROXY_DLL
 
 GARBAGE       += $(MIDL_GENERATED_FILES)
@@ -97,4 +90,3 @@ midl_done : $(addprefix $(IA2DIR)/,$(MIDL_INTERFACES) $(MIDL_ENUMS))
 # This marshall dll is also registered in the installer
 register::
 	regsvr32 -s $(DIST)/bin/$(SHARED_LIBRARY)
-
diff --git a/accessible/public/msaa/Makefile.in b/accessible/public/msaa/Makefile.in
index a72b5c89d800..e2ca272f32d6 100644
--- a/accessible/public/msaa/Makefile.in
+++ b/accessible/public/msaa/Makefile.in
@@ -2,15 +2,8 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
 DEFFILE = $(win_srcdir)/AccessibleMarshal.def
 
-include $(DEPTH)/config/autoconf.mk
-
 DEFINES += -DREGISTER_PROXY_DLL
 
 GARBAGE += $(MIDL_GENERATED_FILES) done_gen dlldata.c
@@ -73,6 +66,3 @@ INSTALL_TARGETS += midl_exports
 midl_exports_FILES := $(midl_exports)
 midl_exports_DEST = $(DIST)/include
 midl_exports_TARGET := export
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/accessible/src/Makefile.in b/accessible/src/Makefile.in
index aafeb3b09c8c..703581f91ddb 100644
--- a/accessible/src/Makefile.in
+++ b/accessible/src/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 A11Y_LOG = 0
 ifdef MOZ_DEBUG
   A11Y_LOG = 1
@@ -17,5 +10,3 @@ ifeq (,$(filter aurora beta release esr,$(MOZ_UPDATE_CHANNEL)))
   A11Y_LOG = 1
 endif
 export A11Y_LOG
-
-include $(topsrcdir)/config/rules.mk
diff --git a/accessible/src/atk/Makefile.in b/accessible/src/atk/Makefile.in
index ba1599610340..1d54a8bb13d2 100644
--- a/accessible/src/atk/Makefile.in
+++ b/accessible/src/atk/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = ..
 include $(topsrcdir)/config/rules.mk
 
diff --git a/accessible/src/base/Makefile.in b/accessible/src/base/Makefile.in
index d5ccede940d7..e5096734a02d 100644
--- a/accessible/src/base/Makefile.in
+++ b/accessible/src/base/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += \
diff --git a/accessible/src/generic/Makefile.in b/accessible/src/generic/Makefile.in
index e62fab2c6e0d..05826eeb54bf 100644
--- a/accessible/src/generic/Makefile.in
+++ b/accessible/src/generic/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES = \
diff --git a/accessible/src/html/Makefile.in b/accessible/src/html/Makefile.in
index 6b8c0b882286..6d9c97104179 100644
--- a/accessible/src/html/Makefile.in
+++ b/accessible/src/html/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES = \
diff --git a/accessible/src/jsat/Makefile.in b/accessible/src/jsat/Makefile.in
index 949f5cdc9e86..a26c4544f744 100644
--- a/accessible/src/jsat/Makefile.in
+++ b/accessible/src/jsat/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 INSTALL_TARGETS += ACCESSFU
 
 ACCESSFU_FILES := \
@@ -24,6 +17,3 @@ ACCESSFU_FILES := \
   $(NULL)
 
 ACCESSFU_DEST = $(FINAL_TARGET)/modules/accessibility
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/accessible/src/mac/Makefile.in b/accessible/src/mac/Makefile.in
index 2b98846b0236..ab692768638a 100644
--- a/accessible/src/mac/Makefile.in
+++ b/accessible/src/mac/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = ..
 include $(topsrcdir)/config/rules.mk
 
diff --git a/accessible/src/other/Makefile.in b/accessible/src/other/Makefile.in
index 5e146623d448..9a25fe59dd2f 100644
--- a/accessible/src/other/Makefile.in
+++ b/accessible/src/other/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = ..
 include $(topsrcdir)/config/rules.mk
 
diff --git a/accessible/src/windows/Makefile.in b/accessible/src/windows/Makefile.in
index a8ebd6c5e638..4f93f0f32fa5 100644
--- a/accessible/src/windows/Makefile.in
+++ b/accessible/src/windows/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 ifneq ($(A11Y_LOG),0)
diff --git a/accessible/src/windows/ia2/Makefile.in b/accessible/src/windows/ia2/Makefile.in
index 2eae05159b16..070a6f1ec4b4 100644
--- a/accessible/src/windows/ia2/Makefile.in
+++ b/accessible/src/windows/ia2/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 
 # The midl generated code include Windows headers which defines min and max
diff --git a/accessible/src/windows/msaa/Makefile.in b/accessible/src/windows/msaa/Makefile.in
index a805a8e256cd..a305425edd24 100644
--- a/accessible/src/windows/msaa/Makefile.in
+++ b/accessible/src/windows/msaa/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
diff --git a/accessible/src/windows/sdn/Makefile.in b/accessible/src/windows/sdn/Makefile.in
index 0c6595e9e823..0787e5c2e5c8 100644
--- a/accessible/src/windows/sdn/Makefile.in
+++ b/accessible/src/windows/sdn/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 
 # The midl generated code include Windows headers which defines min and max
diff --git a/accessible/src/windows/uia/Makefile.in b/accessible/src/windows/uia/Makefile.in
index bd00a15d8113..563639ea199a 100644
--- a/accessible/src/windows/uia/Makefile.in
+++ b/accessible/src/windows/uia/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = ..
 
 # The midl generated code include Windows headers which defines min and max
diff --git a/accessible/src/xpcom/Makefile.in b/accessible/src/xpcom/Makefile.in
index d8e5659645ca..3589d42b4355 100644
--- a/accessible/src/xpcom/Makefile.in
+++ b/accessible/src/xpcom/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXTRA_MDDEPEND_FILES = xpcAccEvents.pp
 
 INSTALL_TARGETS += xpcaccevents
diff --git a/accessible/src/xul/Makefile.in b/accessible/src/xul/Makefile.in
index a57c3f469823..9f8efdf647a8 100644
--- a/accessible/src/xul/Makefile.in
+++ b/accessible/src/xul/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES = \
diff --git a/accessible/tests/mochitest/Makefile.in b/accessible/tests/mochitest/Makefile.in
index 6704ac29e5d1..54ba129e39bf 100644
--- a/accessible/tests/mochitest/Makefile.in
+++ b/accessible/tests/mochitest/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_A11Y_FILES =\
 		dumbfile.xpi \
 		formimage.png \
@@ -47,5 +39,3 @@ MOCHITEST_A11Y_FILES =\
 		treeview.css \
 		treeview.js \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/accessible/tests/mochitest/actions/Makefile.in b/accessible/tests/mochitest/actions/Makefile.in
index ca85b70a02bc..5240ab5fa9ef 100644
--- a/accessible/tests/mochitest/actions/Makefile.in
+++ b/accessible/tests/mochitest/actions/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_A11Y_FILES =\
 		test_anchors.html \
 		test_aria.html \
@@ -25,5 +17,3 @@ MOCHITEST_A11Y_FILES =\
 		test_tree.xul \
 		test_treegrid.xul \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/accessible/tests/mochitest/attributes/Makefile.in b/accessible/tests/mochitest/attributes/Makefile.in
index 0c6f1401ac8b..f450676ce996 100644
--- a/accessible/tests/mochitest/attributes/Makefile.in
+++ b/accessible/tests/mochitest/attributes/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_A11Y_FILES =\
 		test_obj.html \
 		test_obj_css.html \
@@ -21,5 +13,3 @@ MOCHITEST_A11Y_FILES =\
 		test_tag.html \
 		test_xml-roles.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/accessible/tests/mochitest/bounds/Makefile.in b/accessible/tests/mochitest/bounds/Makefile.in
index 92435dac3264..db34768b1fc2 100644
--- a/accessible/tests/mochitest/bounds/Makefile.in
+++ b/accessible/tests/mochitest/bounds/Makefile.in
@@ -3,19 +3,9 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_A11Y_FILES =\
 		test_list.html \
 		test_select.html \
 		test_zoom_text.html \
 		test_zoom.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/accessible/tests/mochitest/editabletext/Makefile.in b/accessible/tests/mochitest/editabletext/Makefile.in
index e0a5a6a1ce52..55c335ce8feb 100644
--- a/accessible/tests/mochitest/editabletext/Makefile.in
+++ b/accessible/tests/mochitest/editabletext/Makefile.in
@@ -3,18 +3,8 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_A11Y_FILES =\
 		editabletext.js \
 		test_1.html \
 		test_2.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/accessible/tests/mochitest/elm/Makefile.in b/accessible/tests/mochitest/elm/Makefile.in
index c5719b63ef88..3b2723f14f38 100644
--- a/accessible/tests/mochitest/elm/Makefile.in
+++ b/accessible/tests/mochitest/elm/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_A11Y_FILES =\
 		test_figure.html \
 		test_HTMLSpec.html \
@@ -18,5 +10,3 @@ MOCHITEST_A11Y_FILES =\
 		test_nsApplicationAcc.html \
 		test_plugin.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/accessible/tests/mochitest/events/Makefile.in b/accessible/tests/mochitest/events/Makefile.in
index ae11d2e12170..ad5f048efaae 100644
--- a/accessible/tests/mochitest/events/Makefile.in
+++ b/accessible/tests/mochitest/events/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_A11Y_FILES =\
 		docload_wnd.html \
 		focus.html \
@@ -67,5 +59,3 @@ MOCHITEST_A11Y_FILES += \
 		test_focus_autocomplete.xul \
 		$(NULL)
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/accessible/tests/mochitest/focus/Makefile.in b/accessible/tests/mochitest/focus/Makefile.in
index 05d58b31e00f..1e40aa01458f 100644
--- a/accessible/tests/mochitest/focus/Makefile.in
+++ b/accessible/tests/mochitest/focus/Makefile.in
@@ -3,18 +3,8 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_A11Y_FILES =\
 		test_focusedChild.html \
 		test_takeFocus.html \
 		test_takeFocus.xul \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/accessible/tests/mochitest/hittest/Makefile.in b/accessible/tests/mochitest/hittest/Makefile.in
index 39311aca7bba..59c82b6cfed3 100644
--- a/accessible/tests/mochitest/hittest/Makefile.in
+++ b/accessible/tests/mochitest/hittest/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_A11Y_FILES = \
 		test_browser.html \
 		test_general.html \
@@ -20,5 +12,3 @@ MOCHITEST_A11Y_FILES = \
 		test_zoom.html \
 		zoom_tree.xul \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/accessible/tests/mochitest/hyperlink/Makefile.in b/accessible/tests/mochitest/hyperlink/Makefile.in
index ff3b673a17f5..17c3d19c400c 100644
--- a/accessible/tests/mochitest/hyperlink/Makefile.in
+++ b/accessible/tests/mochitest/hyperlink/Makefile.in
@@ -3,18 +3,8 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_A11Y_FILES =\
 		hyperlink.js \
 		test_general.html \
 		test_general.xul \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/accessible/tests/mochitest/hypertext/Makefile.in b/accessible/tests/mochitest/hypertext/Makefile.in
index dcc5f8541f35..82187e5af162 100644
--- a/accessible/tests/mochitest/hypertext/Makefile.in
+++ b/accessible/tests/mochitest/hypertext/Makefile.in
@@ -3,17 +3,7 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_A11Y_FILES = \
 		test_general.html \
 		test_update.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/accessible/tests/mochitest/jsat/Makefile.in b/accessible/tests/mochitest/jsat/Makefile.in
index 0fb627a9b62a..c3110f92b084 100644
--- a/accessible/tests/mochitest/jsat/Makefile.in
+++ b/accessible/tests/mochitest/jsat/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_A11Y_FILES =\
 jsatcommon.js \
 output.js \
@@ -22,5 +14,3 @@ test_live_regions.html \
 test_tables.html \
 test_utterance_order.html \
 $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/accessible/tests/mochitest/name/Makefile.in b/accessible/tests/mochitest/name/Makefile.in
index 28585e9098f2..55866bdd6774 100644
--- a/accessible/tests/mochitest/name/Makefile.in
+++ b/accessible/tests/mochitest/name/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_A11Y_FILES =\
 		general.css \
 		general.xbl \
@@ -29,5 +21,3 @@ MOCHITEST_A11Y_FILES =\
 ifneq ($(OS_ARCH), Darwin)
 MOCHITEST_A11Y_FILES += test_tree.xul
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/accessible/tests/mochitest/pivot/Makefile.in b/accessible/tests/mochitest/pivot/Makefile.in
index db4516d4b50f..304372fb2211 100644
--- a/accessible/tests/mochitest/pivot/Makefile.in
+++ b/accessible/tests/mochitest/pivot/Makefile.in
@@ -3,19 +3,9 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_A11Y_FILES = \
 		doc_virtualcursor.html \
 		doc_virtualcursor_text.html \
 		test_virtualcursor.html \
 		test_virtualcursor_text.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/accessible/tests/mochitest/relations/Makefile.in b/accessible/tests/mochitest/relations/Makefile.in
index 41b4d0f42169..10702007dd88 100644
--- a/accessible/tests/mochitest/relations/Makefile.in
+++ b/accessible/tests/mochitest/relations/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_A11Y_FILES =\
 		test_bindings.xhtml \
 		test_embeds.xul \
@@ -21,5 +13,3 @@ MOCHITEST_A11Y_FILES =\
 		test_ui_modalprompt.html \
 		test_update.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/accessible/tests/mochitest/role/Makefile.in b/accessible/tests/mochitest/role/Makefile.in
index 9085d321dd1f..dca7f5e61de7 100644
--- a/accessible/tests/mochitest/role/Makefile.in
+++ b/accessible/tests/mochitest/role/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_A11Y_FILES =\
 		test_aria.html \
 		test_aria.xul \
@@ -17,5 +9,3 @@ MOCHITEST_A11Y_FILES =\
 		test_general.xul \
 		test_svg.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/accessible/tests/mochitest/scroll/Makefile.in b/accessible/tests/mochitest/scroll/Makefile.in
index 2f0dfbfbb99c..0316fc005c30 100644
--- a/accessible/tests/mochitest/scroll/Makefile.in
+++ b/accessible/tests/mochitest/scroll/Makefile.in
@@ -3,17 +3,7 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_A11Y_FILES =\
 		test_zoom_text.html \
 		test_zoom.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/accessible/tests/mochitest/selectable/Makefile.in b/accessible/tests/mochitest/selectable/Makefile.in
index 1e94e9535859..f24b5721bcc0 100644
--- a/accessible/tests/mochitest/selectable/Makefile.in
+++ b/accessible/tests/mochitest/selectable/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_A11Y_FILES =\
 		test_aria.html \
 		test_listbox.xul \
@@ -19,5 +11,3 @@ MOCHITEST_A11Y_FILES =\
 		test_select.html \
 		test_tree.xul \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/accessible/tests/mochitest/states/Makefile.in b/accessible/tests/mochitest/states/Makefile.in
index 54034cf471f0..b4dbe4a6c08e 100644
--- a/accessible/tests/mochitest/states/Makefile.in
+++ b/accessible/tests/mochitest/states/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_A11Y_FILES =\
 		test_aria.html \
 		test_aria_imgmap.html \
@@ -44,5 +36,3 @@ MOCHITEST_A11Y_FILES =\
 ifneq ($(OS_ARCH), Darwin)
 MOCHITEST_A11Y_FILES += test_tree.xul
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/accessible/tests/mochitest/table/Makefile.in b/accessible/tests/mochitest/table/Makefile.in
index 19d30460bbb5..961a6222a4a2 100644
--- a/accessible/tests/mochitest/table/Makefile.in
+++ b/accessible/tests/mochitest/table/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_A11Y_FILES = \
 		test_headers_ariagrid.html \
 		test_headers_listbox.xul \
@@ -33,5 +25,3 @@ MOCHITEST_A11Y_FILES = \
 		test_table_1.html \
 		test_table_2.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/accessible/tests/mochitest/text/Makefile.in b/accessible/tests/mochitest/text/Makefile.in
index 3c075fff55a2..511f69ec978a 100644
--- a/accessible/tests/mochitest/text/Makefile.in
+++ b/accessible/tests/mochitest/text/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_A11Y_FILES = \
 		doc.html \
 		test_atcaretoffset.html \
@@ -25,5 +17,3 @@ MOCHITEST_A11Y_FILES = \
 		test_wordboundary.html \
 		test_words.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/accessible/tests/mochitest/textattrs/Makefile.in b/accessible/tests/mochitest/textattrs/Makefile.in
index e489aa99ca27..6943ad7d113a 100644
--- a/accessible/tests/mochitest/textattrs/Makefile.in
+++ b/accessible/tests/mochitest/textattrs/Makefile.in
@@ -3,17 +3,7 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_A11Y_FILES =\
 		test_general.html \
 		test_invalid.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/accessible/tests/mochitest/textcaret/Makefile.in b/accessible/tests/mochitest/textcaret/Makefile.in
index cda7967eac99..818bdeb1faa2 100644
--- a/accessible/tests/mochitest/textcaret/Makefile.in
+++ b/accessible/tests/mochitest/textcaret/Makefile.in
@@ -3,17 +3,7 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_A11Y_FILES = \
 		test_browserui.xul \
 		test_general.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/accessible/tests/mochitest/textselection/Makefile.in b/accessible/tests/mochitest/textselection/Makefile.in
index 364abca00b3b..0ab5fc667159 100644
--- a/accessible/tests/mochitest/textselection/Makefile.in
+++ b/accessible/tests/mochitest/textselection/Makefile.in
@@ -3,17 +3,7 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_A11Y_FILES = \
 		test_general.html \
 		test_userinput.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/accessible/tests/mochitest/tree/Makefile.in b/accessible/tests/mochitest/tree/Makefile.in
index 900615a966d2..978248dc71a0 100644
--- a/accessible/tests/mochitest/tree/Makefile.in
+++ b/accessible/tests/mochitest/tree/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_A11Y_FILES =\
 		dockids.html \
 		$(filter disabled-temporarily--bug-561508, test_applicationacc.xul) \
@@ -49,5 +41,3 @@ MOCHITEST_A11Y_FILES =\
 		test_txtctrl.xul \
 		wnd.xul \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/accessible/tests/mochitest/treeupdate/Makefile.in b/accessible/tests/mochitest/treeupdate/Makefile.in
index ca92d640d18c..daa605cf50fd 100644
--- a/accessible/tests/mochitest/treeupdate/Makefile.in
+++ b/accessible/tests/mochitest/treeupdate/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_A11Y_FILES =\
 		test_ariadialog.html \
 		test_canvas.html \
@@ -35,5 +27,3 @@ MOCHITEST_A11Y_FILES =\
 		test_visibility.html \
 		test_whitespace.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/accessible/tests/mochitest/value/Makefile.in b/accessible/tests/mochitest/value/Makefile.in
index e081e6270ed7..d527ab7a6485 100644
--- a/accessible/tests/mochitest/value/Makefile.in
+++ b/accessible/tests/mochitest/value/Makefile.in
@@ -3,19 +3,9 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_A11Y_FILES =\
 		test_general.html \
 		test_progress.html \
 		test_progress.xul \
 		test_range.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/addon-sdk/Makefile.in b/addon-sdk/Makefile.in
index 5c934aa91ec1..69b25924144b 100644
--- a/addon-sdk/Makefile.in
+++ b/addon-sdk/Makefile.in
@@ -2,11 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
 include $(topsrcdir)/config/config.mk
 
 export PYMAKE = $(.PYMAKE)
diff --git a/b2g/Makefile.in b/b2g/Makefile.in
index b24bd5b732ae..9b3e1e08ad99 100644
--- a/b2g/Makefile.in
+++ b/b2g/Makefile.in
@@ -2,12 +2,5 @@
 # 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/.
 
-DEPTH      = @DEPTH@
-topsrcdir  = @top_srcdir@
-srcdir     = @srcdir@
-VPATH      = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/testing/testsuite-targets.mk
diff --git a/b2g/app/Makefile.in b/b2g/app/Makefile.in
index 7fe9ef55e22d..fe1367ac813f 100644
--- a/b2g/app/Makefile.in
+++ b/b2g/app/Makefile.in
@@ -2,12 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
 USE_RCS_MK := 1
 include $(topsrcdir)/config/makefiles/rcs.mk
 
diff --git a/b2g/branding/official/locales/Makefile.in b/b2g/branding/official/locales/Makefile.in
index 2839d474fe52..82f614ecea29 100644
--- a/b2g/branding/official/locales/Makefile.in
+++ b/b2g/branding/official/locales/Makefile.in
@@ -2,14 +2,4 @@
 # 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/.
 
-DEPTH          = @DEPTH@
-topsrcdir      = @top_srcdir@
-srcdir         = @srcdir@
-VPATH          = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 DEFINES += -DAB_CD=$(AB_CD)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/b2g/branding/unofficial/locales/Makefile.in b/b2g/branding/unofficial/locales/Makefile.in
index 2839d474fe52..82f614ecea29 100644
--- a/b2g/branding/unofficial/locales/Makefile.in
+++ b/b2g/branding/unofficial/locales/Makefile.in
@@ -2,14 +2,4 @@
 # 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/.
 
-DEPTH          = @DEPTH@
-topsrcdir      = @top_srcdir@
-srcdir         = @srcdir@
-VPATH          = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 DEFINES += -DAB_CD=$(AB_CD)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/b2g/chrome/Makefile.in b/b2g/chrome/Makefile.in
index d816fe52e224..382dc360ce94 100644
--- a/b2g/chrome/Makefile.in
+++ b/b2g/chrome/Makefile.in
@@ -2,16 +2,7 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 DEFINES += -DAB_CD=$(MOZ_UI_LOCALE) \
            -DPACKAGE=browser \
            -DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
            $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/b2g/gaia/Makefile.in b/b2g/gaia/Makefile.in
index e4c11fbb7450..aaa960e0c2f8 100644
--- a/b2g/gaia/Makefile.in
+++ b/b2g/gaia/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 GAIA_PATH := gaia/profile
 
 ifeq ($(OS_ARCH),WINNT)
@@ -37,4 +30,3 @@ libs::
 	$(GAIA_MAKE) -j1 -C $(GAIADIR) clean
 	$(GAIA_MAKE) -j1 -C $(GAIADIR) profile
 	(cd $(GAIADIR)/profile && tar $(TAR_CREATE_FLAGS) - .) | (cd $(abspath $(DIST))/bin/$(GAIA_PATH) && tar -xf -)
-
diff --git a/b2g/installer/Makefile.in b/b2g/installer/Makefile.in
index ff49d58d6708..ef39fb37953c 100644
--- a/b2g/installer/Makefile.in
+++ b/b2g/installer/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 STANDALONE_MAKEFILE := 1
 
 include $(topsrcdir)/config/rules.mk
diff --git a/b2g/locales/Makefile.in b/b2g/locales/Makefile.in
index eab29a27bf00..8366e4340bd5 100644
--- a/b2g/locales/Makefile.in
+++ b/b2g/locales/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/config.mk
 
 SUBMAKEFILES += \
diff --git a/browser/Makefile.in b/browser/Makefile.in
index 29a5f99c2ef2..8b7dc07b28da 100644
--- a/browser/Makefile.in
+++ b/browser/Makefile.in
@@ -2,11 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
 include $(topsrcdir)/config/rules.mk
 
 ifdef MAKENSISU
diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
index c4a5de582de0..0567dc0e53f5 100644
--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 dist_dest   = $(DIST)/$(MOZ_MACBUNDLE_NAME)
 
 ifdef ENABLE_MARIONETTE
diff --git a/browser/app/profile/extensions/Makefile.in b/browser/app/profile/extensions/Makefile.in
index c95830045363..29242a2c61a9 100644
--- a/browser/app/profile/extensions/Makefile.in
+++ b/browser/app/profile/extensions/Makefile.in
@@ -3,14 +3,8 @@
 # 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/.
 
-DEPTH      = @DEPTH@
-topsrcdir  = @top_srcdir@
-srcdir     = @srcdir@
-VPATH      = @srcdir@
-
 DISTROEXT = $(call core_abspath,$(FINAL_TARGET))/distribution/extensions
 
-include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/config.mk
 
 ifneq (,$(filter beta,$(MOZ_UPDATE_CHANNEL)))
diff --git a/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in b/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in
index 7f0085560562..ff9319df951d 100644
--- a/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in
+++ b/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in
@@ -3,17 +3,8 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 FILES := \
 	install.rdf.in \
 	$(NULL)
 FILES_PATH = $(FINAL_TARGET)/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
 PP_TARGETS := FILES
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/base/Makefile.in b/browser/base/Makefile.in
index 285ef15f0f1e..7473a765cc7e 100644
--- a/browser/base/Makefile.in
+++ b/browser/base/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH   = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH   = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/config.mk
 
 abs_srcdir = $(call core_abspath,$(srcdir))
diff --git a/browser/base/content/test/Makefile.in b/browser/base/content/test/Makefile.in
index 594e111e9fbd..d517d124a57f 100644
--- a/browser/base/content/test/Makefile.in
+++ b/browser/base/content/test/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = \
         head_plain.js \
         bug364677-data.xml \
@@ -381,5 +373,3 @@ MOCHITEST_BROWSER_FILES += \
   browser_CTP_context_menu.js \
   $(NULL)
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/base/content/test/newtab/Makefile.in b/browser/base/content/test/newtab/Makefile.in
index 6ac460d14d3e..9bedf4579691 100644
--- a/browser/base/content/test/newtab/Makefile.in
+++ b/browser/base/content/test/newtab/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES = \
 	browser_newtab_block.js \
 	browser_newtab_disable.js \
@@ -34,5 +26,3 @@ MOCHITEST_BROWSER_FILES = \
 	browser_newtab_perwindow_private_browsing.js \
 	head.js \
 	$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/base/content/test/social/Makefile.in b/browser/base/content/test/social/Makefile.in
index 16a5211cbd3b..caeb2fd1a60d 100644
--- a/browser/base/content/test/social/Makefile.in
+++ b/browser/base/content/test/social/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES = \
                  head.js \
 		 blocklist.xml \
@@ -44,5 +36,3 @@ MOCHITEST_BROWSER_FILES = \
                  social_worker.js \
                  share.html \
                  $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/base/content/test/social/opengraph/Makefile.in b/browser/base/content/test/social/opengraph/Makefile.in
index d0d5a189083c..c963a72831d1 100644
--- a/browser/base/content/test/social/opengraph/Makefile.in
+++ b/browser/base/content/test/social/opengraph/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES := \
                  opengraph.html \
                  og_invalid_url.html \
@@ -17,5 +9,3 @@ MOCHITEST_BROWSER_FILES := \
                  shorturl_link.html \
                  shorturl_linkrel.html \
                  $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/branding/aurora/Makefile.in b/browser/branding/aurora/Makefile.in
index a593682abba0..34c2841c1e2b 100644
--- a/browser/branding/aurora/Makefile.in
+++ b/browser/branding/aurora/Makefile.in
@@ -2,12 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/config.mk
 
 PREF_JS_EXPORTS = $(srcdir)/pref/firefox-branding.js
@@ -70,5 +64,3 @@ VISUALMANIFEST_FLAGS := -Fsubstitution -DMOZ_APP_DISPLAYNAME=${MOZ_APP_DISPLAYNA
 VISUALMANIFEST_PATH := $(DIST)/bin
 PP_TARGETS += VISUALMANIFEST
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/branding/aurora/content/Makefile.in b/browser/branding/aurora/content/Makefile.in
index 2a0a285826c4..2d17f36dae63 100644
--- a/browser/branding/aurora/content/Makefile.in
+++ b/browser/branding/aurora/content/Makefile.in
@@ -5,18 +5,9 @@
 # Branding Makefile
 #  - jars chrome artwork
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # resources needed for the metro tile interface
 ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro)
 TILE_FILES := $(wildcard $(srcdir)/VisualElements*)
 TILE_DEST := $(DIST)/bin/tileresources
 INSTALL_TARGETS += TILE
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/branding/aurora/locales/Makefile.in b/browser/branding/aurora/locales/Makefile.in
index d199ba23528e..778f74dd0f15 100644
--- a/browser/branding/aurora/locales/Makefile.in
+++ b/browser/branding/aurora/locales/Makefile.in
@@ -2,14 +2,4 @@
 # 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/.
 
-DEPTH          = @DEPTH@
-topsrcdir      = @top_srcdir@
-srcdir         = @srcdir@
-VPATH          = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 DEFINES += -DAB_CD=$(AB_CD) -DMOZ_DISTRIBUTION_ID_UNQUOTED=$(MOZ_DISTRIBUTION_ID)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/branding/nightly/Makefile.in b/browser/branding/nightly/Makefile.in
index bf553dd76865..ad15f4dc5ab5 100644
--- a/browser/branding/nightly/Makefile.in
+++ b/browser/branding/nightly/Makefile.in
@@ -2,12 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/config.mk
 
 PREF_JS_EXPORTS = $(srcdir)/pref/firefox-branding.js
@@ -70,5 +64,3 @@ VISUALMANIFEST_FLAGS := -Fsubstitution -DMOZ_APP_DISPLAYNAME=${MOZ_APP_DISPLAYNA
 VISUALMANIFEST_PATH := $(DIST)/bin
 PP_TARGETS += VISUALMANIFEST
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/branding/nightly/content/Makefile.in b/browser/branding/nightly/content/Makefile.in
index 2a0a285826c4..2d17f36dae63 100644
--- a/browser/branding/nightly/content/Makefile.in
+++ b/browser/branding/nightly/content/Makefile.in
@@ -5,18 +5,9 @@
 # Branding Makefile
 #  - jars chrome artwork
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # resources needed for the metro tile interface
 ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro)
 TILE_FILES := $(wildcard $(srcdir)/VisualElements*)
 TILE_DEST := $(DIST)/bin/tileresources
 INSTALL_TARGETS += TILE
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/branding/nightly/locales/Makefile.in b/browser/branding/nightly/locales/Makefile.in
index d199ba23528e..778f74dd0f15 100644
--- a/browser/branding/nightly/locales/Makefile.in
+++ b/browser/branding/nightly/locales/Makefile.in
@@ -2,14 +2,4 @@
 # 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/.
 
-DEPTH          = @DEPTH@
-topsrcdir      = @top_srcdir@
-srcdir         = @srcdir@
-VPATH          = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 DEFINES += -DAB_CD=$(AB_CD) -DMOZ_DISTRIBUTION_ID_UNQUOTED=$(MOZ_DISTRIBUTION_ID)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/Makefile.in
index a593682abba0..34c2841c1e2b 100644
--- a/browser/branding/official/Makefile.in
+++ b/browser/branding/official/Makefile.in
@@ -2,12 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/config.mk
 
 PREF_JS_EXPORTS = $(srcdir)/pref/firefox-branding.js
@@ -70,5 +64,3 @@ VISUALMANIFEST_FLAGS := -Fsubstitution -DMOZ_APP_DISPLAYNAME=${MOZ_APP_DISPLAYNA
 VISUALMANIFEST_PATH := $(DIST)/bin
 PP_TARGETS += VISUALMANIFEST
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/branding/official/content/Makefile.in b/browser/branding/official/content/Makefile.in
index 2a0a285826c4..2d17f36dae63 100644
--- a/browser/branding/official/content/Makefile.in
+++ b/browser/branding/official/content/Makefile.in
@@ -5,18 +5,9 @@
 # Branding Makefile
 #  - jars chrome artwork
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # resources needed for the metro tile interface
 ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro)
 TILE_FILES := $(wildcard $(srcdir)/VisualElements*)
 TILE_DEST := $(DIST)/bin/tileresources
 INSTALL_TARGETS += TILE
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/branding/official/locales/Makefile.in b/browser/branding/official/locales/Makefile.in
index 2839d474fe52..82f614ecea29 100644
--- a/browser/branding/official/locales/Makefile.in
+++ b/browser/branding/official/locales/Makefile.in
@@ -2,14 +2,4 @@
 # 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/.
 
-DEPTH          = @DEPTH@
-topsrcdir      = @top_srcdir@
-srcdir         = @srcdir@
-VPATH          = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 DEFINES += -DAB_CD=$(AB_CD)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/branding/unofficial/Makefile.in b/browser/branding/unofficial/Makefile.in
index bf553dd76865..ad15f4dc5ab5 100644
--- a/browser/branding/unofficial/Makefile.in
+++ b/browser/branding/unofficial/Makefile.in
@@ -2,12 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/config.mk
 
 PREF_JS_EXPORTS = $(srcdir)/pref/firefox-branding.js
@@ -70,5 +64,3 @@ VISUALMANIFEST_FLAGS := -Fsubstitution -DMOZ_APP_DISPLAYNAME=${MOZ_APP_DISPLAYNA
 VISUALMANIFEST_PATH := $(DIST)/bin
 PP_TARGETS += VISUALMANIFEST
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/branding/unofficial/content/Makefile.in b/browser/branding/unofficial/content/Makefile.in
index 2a0a285826c4..2d17f36dae63 100644
--- a/browser/branding/unofficial/content/Makefile.in
+++ b/browser/branding/unofficial/content/Makefile.in
@@ -5,18 +5,9 @@
 # Branding Makefile
 #  - jars chrome artwork
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # resources needed for the metro tile interface
 ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro)
 TILE_FILES := $(wildcard $(srcdir)/VisualElements*)
 TILE_DEST := $(DIST)/bin/tileresources
 INSTALL_TARGETS += TILE
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/branding/unofficial/locales/Makefile.in b/browser/branding/unofficial/locales/Makefile.in
index d199ba23528e..778f74dd0f15 100644
--- a/browser/branding/unofficial/locales/Makefile.in
+++ b/browser/branding/unofficial/locales/Makefile.in
@@ -2,14 +2,4 @@
 # 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/.
 
-DEPTH          = @DEPTH@
-topsrcdir      = @top_srcdir@
-srcdir         = @srcdir@
-VPATH          = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 DEFINES += -DAB_CD=$(AB_CD) -DMOZ_DISTRIBUTION_ID_UNQUOTED=$(MOZ_DISTRIBUTION_ID)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/components/about/Makefile.in b/browser/components/about/Makefile.in
index 11e70d93e9dd..7da04ff51228 100644
--- a/browser/components/about/Makefile.in
+++ b/browser/components/about/Makefile.in
@@ -2,16 +2,7 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 FORCE_STATIC_LIB = 1
 USE_STATIC_LIBS = 1
 
 LOCAL_INCLUDES = -I$(srcdir)/../build
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/components/build/Makefile.in b/browser/components/build/Makefile.in
index 9adbf424e8d7..4a746eda8514 100644
--- a/browser/components/build/Makefile.in
+++ b/browser/components/build/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH=@DEPTH@
-topsrcdir=@top_srcdir@
-srcdir=@srcdir@
-VPATH=@srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 SHORT_LIBNAME = brwsrcmp
 IS_COMPONENT = 1
 MODULE_NAME = nsBrowserCompsModule
diff --git a/browser/components/certerror/test/Makefile.in b/browser/components/certerror/test/Makefile.in
index 6037dae127de..ee21ce777b28 100644
--- a/browser/components/certerror/test/Makefile.in
+++ b/browser/components/certerror/test/Makefile.in
@@ -3,17 +3,7 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES := \
   browser_bug431826.js \
   browser_bug633691.js \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/components/dirprovider/Makefile.in b/browser/components/dirprovider/Makefile.in
index 0a2d5d109e1e..b46e48dfcb4f 100644
--- a/browser/components/dirprovider/Makefile.in
+++ b/browser/components/dirprovider/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 FORCE_STATIC_LIB = 1
 USE_STATIC_LIBS = 1
 
@@ -18,5 +11,3 @@ EXTRA_DSO_LDOPTS = \
 	$(XPCOM_GLUE_LDOPTS) \
 	$(NSPR_LIBS) \
 	$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/components/downloads/test/browser/Makefile.in b/browser/components/downloads/test/browser/Makefile.in
index 1fc7a45220b6..39e028667175 100644
--- a/browser/components/downloads/test/browser/Makefile.in
+++ b/browser/components/downloads/test/browser/Makefile.in
@@ -1,19 +1,8 @@
 # Any copyright is dedicated to the Public Domain.
 # http://creativecommons.org/publicdomain/zero/1.0/
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES = \
   browser_basic_functionality.js \
   browser_first_download_panel.js \
   head.js \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/components/feeds/src/Makefile.in b/browser/components/feeds/src/Makefile.in
index ee7c4f70b377..1f555144a52d 100644
--- a/browser/components/feeds/src/Makefile.in
+++ b/browser/components/feeds/src/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 FORCE_STATIC_LIB = 1
 USE_STATIC_LIBS = 1
 
@@ -19,5 +12,3 @@ DEFINES += \
 
 
 LOCAL_INCLUDES = -I$(srcdir)/../../build
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/components/feeds/test/Makefile.in b/browser/components/feeds/test/Makefile.in
index bfc6e986992a..fd950aafe7d2 100644
--- a/browser/components/feeds/test/Makefile.in
+++ b/browser/components/feeds/test/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = \
 		bug408328-data.xml \
 		bug368464-data.xml \
@@ -23,5 +15,3 @@ MOCHITEST_FILES = \
 		valid-feed.xml \
 		valid-unsniffable-feed.xml \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/components/feeds/test/chrome/Makefile.in b/browser/components/feeds/test/chrome/Makefile.in
index 020e4b6525cb..c20deb1952a5 100644
--- a/browser/components/feeds/test/chrome/Makefile.in
+++ b/browser/components/feeds/test/chrome/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # sample_feed.atom was copied from toolkit/components/places/tests/chrome
 MOCHITEST_FILES	= \
 		sample_feed.atom \
@@ -22,6 +14,3 @@ MOCHITEST_CHROME_FILES	= \
 		test_bug408328.html \
 		test_maxSniffing.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/browser/components/migration/src/Makefile.in b/browser/components/migration/src/Makefile.in
index 924bb2d17fc6..831ccd1ec2be 100644
--- a/browser/components/migration/src/Makefile.in
+++ b/browser/components/migration/src/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 FORCE_STATIC_LIB = 1
 USE_STATIC_LIBS = 1
 
@@ -21,6 +14,3 @@ endif
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 DEFINES += -DHAS_SAFARI_MIGRATOR
 endif
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/browser/components/places/tests/browser/Makefile.in b/browser/components/places/tests/browser/Makefile.in
index 35fde42e386d..6c5bc454a137 100644
--- a/browser/components/places/tests/browser/Makefile.in
+++ b/browser/components/places/tests/browser/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH			= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH			= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES = \
 	head.js \
 	browser_0_library_left_pane_migration.js \
@@ -44,5 +36,3 @@ MOCHITEST_BROWSER_FILES = \
 	browser_library_downloads.js \
 	browser_library_left_pane_select_hierarchy.js \
 	$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/components/places/tests/chrome/Makefile.in b/browser/components/places/tests/chrome/Makefile.in
index 06fc35cef5d7..2581e5ce576f 100644
--- a/browser/components/places/tests/chrome/Makefile.in
+++ b/browser/components/places/tests/chrome/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH          = @DEPTH@
-topsrcdir      = @top_srcdir@
-srcdir         = @srcdir@
-VPATH          = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_CHROME_FILES = \
 	head.js \
 	test_treeview_date.xul \
@@ -22,5 +14,3 @@ MOCHITEST_CHROME_FILES = \
 	test_editBookmarkOverlay_tags_liveUpdate.xul \
 	test_bug631374_tags_selector_scroll.xul \
 	$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/components/preferences/Makefile.in b/browser/components/preferences/Makefile.in
index 32c72ab28765..8bc21d8d4863 100644
--- a/browser/components/preferences/Makefile.in
+++ b/browser/components/preferences/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += \
diff --git a/browser/components/preferences/in-content/Makefile.in b/browser/components/preferences/in-content/Makefile.in
index 2ce196b1d303..9a8d9616efbf 100644
--- a/browser/components/preferences/in-content/Makefile.in
+++ b/browser/components/preferences/in-content/Makefile.in
@@ -2,13 +2,6 @@
 #  - 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += \
diff --git a/browser/components/preferences/in-content/tests/Makefile.in b/browser/components/preferences/in-content/tests/Makefile.in
index 04622fc40ce4..a719accbd551 100644
--- a/browser/components/preferences/in-content/tests/Makefile.in
+++ b/browser/components/preferences/in-content/tests/Makefile.in
@@ -2,14 +2,6 @@
 #  - 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES := \
     head.js \
     browser_advanced_update.js \
@@ -36,5 +28,3 @@ MOCHITEST_BROWSER_FILES += \
   browser_healthreport.js \
   $(NULL)
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/components/preferences/tests/Makefile.in b/browser/components/preferences/tests/Makefile.in
index 56737aaf771d..e90b723882ed 100644
--- a/browser/components/preferences/tests/Makefile.in
+++ b/browser/components/preferences/tests/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES := \
     head.js \
     browser_advanced_update.js \
@@ -35,5 +27,3 @@ endif # ENABLE_TESTS
 ifdef MOZ_SERVICES_HEALTHREPORT
 MOCHITEST_BROWSER_FILES += browser_healthreport.js
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/components/privatebrowsing/test/browser/Makefile.in b/browser/components/privatebrowsing/test/browser/Makefile.in
index 03be7c9562d0..871ab7498fb3 100644
--- a/browser/components/privatebrowsing/test/browser/Makefile.in
+++ b/browser/components/privatebrowsing/test/browser/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES =  \
 		head.js \
                 browser_privatebrowsing_aboutHomeButtonAfterWindowClose.js \
@@ -56,5 +48,3 @@ MOCHITEST_BROWSER_FILES =  \
 		popup.html \
 		title.sjs \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/components/safebrowsing/content/test/Makefile.in b/browser/components/safebrowsing/content/test/Makefile.in
index 1ca03dbe0233..dc9f7374f0d7 100644
--- a/browser/components/safebrowsing/content/test/Makefile.in
+++ b/browser/components/safebrowsing/content/test/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES := \
   head.js \
   browser_bug400731.js \
@@ -23,5 +15,3 @@ MOCHITEST_BROWSER_FILES += \
   browser_bug415846.js \
   $(NULL)
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/components/search/test/Makefile.in b/browser/components/search/test/Makefile.in
index a9fa3f84c3b6..a9b1a3bbfe59 100644
--- a/browser/components/search/test/Makefile.in
+++ b/browser/components/search/test/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES = \
   head.js \
   browser_405664.js \
@@ -36,5 +28,3 @@ pp_mochitest_browser_files_PATH := $(DEPTH)/_tests/testing/mochitest/browser/$(r
 pp_mochitest_browser_files_FLAGS := -DMOZ_DISTRIBUTION_ID=$(MOZ_DISTRIBUTION_ID)
 PP_TARGETS += pp_mochitest_browser_files
 endif # ENABLE_TESTS
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/components/sessionstore/test/Makefile.in b/browser/components/sessionstore/test/Makefile.in
index df62aee0fc71..15ef9046cd3b 100644
--- a/browser/components/sessionstore/test/Makefile.in
+++ b/browser/components/sessionstore/test/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # browser_506482.js is disabled because of frequent failures (bug 538672)
 # browser_526613.js is disabled because of frequent failures (bug 534489)
 # browser_589246.js is disabled for leaking browser windows (bug 752467)
@@ -169,5 +161,3 @@ MOCHITEST_BROWSER_FILES += \
 	browser_625016.js \
 	$(NULL)
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/components/shell/src/Makefile.in b/browser/components/shell/src/Makefile.in
index 18491cef6e4b..f3fb6440191b 100644
--- a/browser/components/shell/src/Makefile.in
+++ b/browser/components/shell/src/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH   = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH   = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 FORCE_STATIC_LIB = 1
 USE_STATIC_LIBS = 1
 
diff --git a/browser/components/shell/test/Makefile.in b/browser/components/shell/test/Makefile.in
index b9624ac6e985..f148938ff485 100644
--- a/browser/components/shell/test/Makefile.in
+++ b/browser/components/shell/test/Makefile.in
@@ -2,17 +2,7 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES = \
     browser_420786.js \
     browser_633221.js \
 	$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/components/tabview/Makefile.in b/browser/components/tabview/Makefile.in
index cb36dd6a67c0..a8282c85d858 100644
--- a/browser/components/tabview/Makefile.in
+++ b/browser/components/tabview/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 libs::
diff --git a/browser/components/tabview/test/Makefile.in b/browser/components/tabview/test/Makefile.in
index 6f9576ea0799..1192dbc385e4 100644
--- a/browser/components/tabview/test/Makefile.in
+++ b/browser/components/tabview/test/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES := \
                  browser_tabview_alltabs.js \
                  browser_tabview_apptabs.js \
@@ -167,5 +159,3 @@ MOCHITEST_BROWSER_FILES := \
 # browser_tabview_bug654941.js disabled for intermittent failures (bug 754222)
 # browser_tabview_bug673729.js disabled for intermittent failures (bug 749980)
 # browser_tabview_bug696602.js disabled for intermittent failures (bug 736425)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/components/test/Makefile.in b/browser/components/test/Makefile.in
index b2e2e479dcc5..35097b910e73 100644
--- a/browser/components/test/Makefile.in
+++ b/browser/components/test/Makefile.in
@@ -2,16 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES = \
   browser_bug538331.js \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/devtools/Makefile.in b/browser/devtools/Makefile.in
index e57d3d86521e..2364f7a8733e 100644
--- a/browser/devtools/Makefile.in
+++ b/browser/devtools/Makefile.in
@@ -2,11 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
 include $(topsrcdir)/config/rules.mk
 
 libs::
diff --git a/browser/devtools/app-manager/Makefile.in b/browser/devtools/app-manager/Makefile.in
index de2b81dba523..ba273b843c60 100644
--- a/browser/devtools/app-manager/Makefile.in
+++ b/browser/devtools/app-manager/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 libs::
diff --git a/browser/devtools/app-manager/test/Makefile.in b/browser/devtools/app-manager/test/Makefile.in
index 5a28cecd6112..7d72e092bfe8 100644
--- a/browser/devtools/app-manager/test/Makefile.in
+++ b/browser/devtools/app-manager/test/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_CHROME_FILES = \
 		test_template.html \
 		test_connection_store.html \
@@ -17,5 +9,3 @@ MOCHITEST_CHROME_FILES = \
 		test_projects_store.html \
 		hosted_app.manifest \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/devtools/commandline/Makefile.in b/browser/devtools/commandline/Makefile.in
index 8890154f78a5..aad3588f0549 100644
--- a/browser/devtools/commandline/Makefile.in
+++ b/browser/devtools/commandline/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 libs::
diff --git a/browser/devtools/commandline/test/Makefile.in b/browser/devtools/commandline/test/Makefile.in
index fd4b1ab41ba7..ab2a455e8806 100644
--- a/browser/devtools/commandline/test/Makefile.in
+++ b/browser/devtools/commandline/test/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES = \
   browser_cmd_addon.js \
   $(browser_cmd_calllog.js disabled until bug 845831 is fixed) \
@@ -76,5 +68,3 @@ MOCHITEST_BROWSER_FILES = \
   helpers.js \
   mockCommands.js \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/devtools/debugger/Makefile.in b/browser/devtools/debugger/Makefile.in
index 42f17d7fecd8..f75d4ac50e03 100644
--- a/browser/devtools/debugger/Makefile.in
+++ b/browser/devtools/debugger/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 libs::
diff --git a/browser/devtools/debugger/test/Makefile.in b/browser/devtools/debugger/test/Makefile.in
index bf122e9b2230..f74e2ac3372d 100644
--- a/browser/devtools/debugger/test/Makefile.in
+++ b/browser/devtools/debugger/test/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH           = @DEPTH@
-topsrcdir       = @top_srcdir@
-srcdir          = @srcdir@
-VPATH           = @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_TESTS = \
 	browser_dbg_aaa_run_first_leaktest.js \
 	browser_dbg_blackboxing-01.js \
@@ -190,5 +182,3 @@ MOCHITEST_BROWSER_TESTS += \
 endif
 
 MOCHITEST_BROWSER_FILES_PARTS = MOCHITEST_BROWSER_TESTS MOCHITEST_BROWSER_PAGES
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/devtools/fontinspector/test/Makefile.in b/browser/devtools/fontinspector/test/Makefile.in
index 4e1e45775519..92e519f6aadf 100644
--- a/browser/devtools/fontinspector/test/Makefile.in
+++ b/browser/devtools/fontinspector/test/Makefile.in
@@ -2,18 +2,8 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES := \
 		browser_fontinspector.js \
 		browser_fontinspector.html \
 		browser_font.woff \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/devtools/framework/Makefile.in b/browser/devtools/framework/Makefile.in
index 5ea7a0c9665d..d9f6d8957c6d 100644
--- a/browser/devtools/framework/Makefile.in
+++ b/browser/devtools/framework/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 libs::
diff --git a/browser/devtools/framework/test/Makefile.in b/browser/devtools/framework/test/Makefile.in
index c9618e248803..2cd0cd43c24e 100644
--- a/browser/devtools/framework/test/Makefile.in
+++ b/browser/devtools/framework/test/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH			= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH			= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES = \
 		head.js \
 		browser_devtools_api.js \
@@ -32,5 +24,3 @@ MOCHITEST_BROWSER_FILES = \
 		browser_toolbox_raise.js \
 		browser_keybindings.js \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/devtools/inspector/Makefile.in b/browser/devtools/inspector/Makefile.in
index 12ae09fda795..f2337657845e 100644
--- a/browser/devtools/inspector/Makefile.in
+++ b/browser/devtools/inspector/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 libs::
diff --git a/browser/devtools/inspector/test/Makefile.in b/browser/devtools/inspector/test/Makefile.in
index 219e507f6da3..b737d16d619e 100644
--- a/browser/devtools/inspector/test/Makefile.in
+++ b/browser/devtools/inspector/test/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # Disabled for too many intermittent failures (bug 851349)
 #		browser_inspector_bug_831693_searchbox_panel_navigation.js \
 
@@ -48,5 +40,3 @@ MOCHITEST_BROWSER_FILES := \
 		browser_inspector_reload.js \
 		head.js \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/devtools/layoutview/test/Makefile.in b/browser/devtools/layoutview/test/Makefile.in
index 34a62289bf12..48a2973eea72 100644
--- a/browser/devtools/layoutview/test/Makefile.in
+++ b/browser/devtools/layoutview/test/Makefile.in
@@ -2,16 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES := \
 		browser_layoutview.js \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/devtools/markupview/Makefile.in b/browser/devtools/markupview/Makefile.in
index 83e6e11a1866..09327f5fb546 100644
--- a/browser/devtools/markupview/Makefile.in
+++ b/browser/devtools/markupview/Makefile.in
@@ -3,14 +3,5 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 libs::
 	$(NSINSTALL) $(srcdir)/*.js $(FINAL_TARGET)/modules/devtools/markupview
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/devtools/markupview/test/Makefile.in b/browser/devtools/markupview/test/Makefile.in
index 8ad1aa12ced3..b12b9283097c 100644
--- a/browser/devtools/markupview/test/Makefile.in
+++ b/browser/devtools/markupview/test/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES := \
 		browser_inspector_markup_navigation.html \
 		browser_inspector_markup_navigation.js \
@@ -22,5 +14,3 @@ MOCHITEST_BROWSER_FILES := \
     browser_bug896181_css_mixed_completion_new_attribute.js \
 		head.js \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/devtools/netmonitor/test/Makefile.in b/browser/devtools/netmonitor/test/Makefile.in
index 9c018b0ff7ee..a8d55ead8a41 100644
--- a/browser/devtools/netmonitor/test/Makefile.in
+++ b/browser/devtools/netmonitor/test/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH           = @DEPTH@
-topsrcdir       = @top_srcdir@
-srcdir          = @srcdir@
-VPATH           = @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_TESTS = \
 	browser_net_aaa_leaktest.js \
 	browser_net_autoscroll.js \
@@ -72,5 +64,3 @@ MOCHITEST_BROWSER_PAGES = \
 	$(NULL)
 
 MOCHITEST_BROWSER_FILES_PARTS = MOCHITEST_BROWSER_TESTS MOCHITEST_BROWSER_PAGES
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/devtools/profiler/Makefile.in b/browser/devtools/profiler/Makefile.in
index c439da0af99c..50512908d284 100644
--- a/browser/devtools/profiler/Makefile.in
+++ b/browser/devtools/profiler/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 libs::
diff --git a/browser/devtools/profiler/test/Makefile.in b/browser/devtools/profiler/test/Makefile.in
index 56381c216597..45e2a0f9d1f2 100644
--- a/browser/devtools/profiler/test/Makefile.in
+++ b/browser/devtools/profiler/test/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH          = @DEPTH@
-topsrcdir      = @top_srcdir@
-srcdir         = @srcdir@
-VPATH          = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_TESTS = \
 		browser_profiler_remote.js \
 		browser_profiler_bug_834878_source_buttons.js \
@@ -34,5 +26,3 @@ MOCHITEST_BROWSER_PAGES = \
 		$(NULL)
 
 MOCHITEST_BROWSER_FILES_PARTS = MOCHITEST_BROWSER_TESTS MOCHITEST_BROWSER_PAGES
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/devtools/responsivedesign/Makefile.in b/browser/devtools/responsivedesign/Makefile.in
index fe75dad69a8f..f75d4ac50e03 100644
--- a/browser/devtools/responsivedesign/Makefile.in
+++ b/browser/devtools/responsivedesign/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 libs::
diff --git a/browser/devtools/responsivedesign/test/Makefile.in b/browser/devtools/responsivedesign/test/Makefile.in
index add51e8759ae..42f0be6518b3 100644
--- a/browser/devtools/responsivedesign/test/Makefile.in
+++ b/browser/devtools/responsivedesign/test/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES := \
 		browser_responsiveui.js \
 		browser_responsiveuiaddcustompreset.js \
@@ -20,5 +12,3 @@ MOCHITEST_BROWSER_FILES := \
 		touch.html \
 		head.js \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/devtools/scratchpad/Makefile.in b/browser/devtools/scratchpad/Makefile.in
index 8890154f78a5..aad3588f0549 100644
--- a/browser/devtools/scratchpad/Makefile.in
+++ b/browser/devtools/scratchpad/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 libs::
diff --git a/browser/devtools/scratchpad/test/Makefile.in b/browser/devtools/scratchpad/test/Makefile.in
index e24f3d2363cd..23f2736e080f 100644
--- a/browser/devtools/scratchpad/test/Makefile.in
+++ b/browser/devtools/scratchpad/test/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH			= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH			= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES = \
 		browser_scratchpad_initialization.js \
 		browser_scratchpad_contexts.js \
@@ -43,5 +35,3 @@ MOCHITEST_BROWSER_FILES = \
 
 # Disable test due to bug 807234 becoming basically permanent
 #		browser_scratchpad_bug_653427_confirm_close.js \
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/devtools/shared/Makefile.in b/browser/devtools/shared/Makefile.in
index 94eba0663b98..af786db28764 100644
--- a/browser/devtools/shared/Makefile.in
+++ b/browser/devtools/shared/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 libs::
diff --git a/browser/devtools/shared/test/Makefile.in b/browser/devtools/shared/test/Makefile.in
index 3e9fbe2771dc..7246e11b94f8 100644
--- a/browser/devtools/shared/test/Makefile.in
+++ b/browser/devtools/shared/test/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES = \
 		browser_eventemitter_basic.js \
 		browser_observableobject.js \
@@ -39,5 +31,3 @@ MOCHITEST_BROWSER_FILES += \
 		browser_layoutHelpers.html \
 		browser_layoutHelpers_iframe.html \
 	$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/devtools/sourceeditor/test/Makefile.in b/browser/devtools/sourceeditor/test/Makefile.in
index 018370a80f19..8d8cde0ff2cc 100644
--- a/browser/devtools/sourceeditor/test/Makefile.in
+++ b/browser/devtools/sourceeditor/test/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES = \
 		browser_sourceeditor_initialization.js \
 		browser_bug684862_paste_html.js \
@@ -33,5 +25,3 @@ MOCHITEST_BROWSER_FILES = \
 		browser_bug744021_next_prev_bracket_jump.js \
 		browser_bug725392_mouse_coords_char_offset.js \
 		head.js \
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/devtools/styleeditor/Makefile.in b/browser/devtools/styleeditor/Makefile.in
index fe75dad69a8f..f75d4ac50e03 100644
--- a/browser/devtools/styleeditor/Makefile.in
+++ b/browser/devtools/styleeditor/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 libs::
diff --git a/browser/devtools/styleeditor/test/Makefile.in b/browser/devtools/styleeditor/test/Makefile.in
index 1918c406a217..00eee964a39c 100644
--- a/browser/devtools/styleeditor/test/Makefile.in
+++ b/browser/devtools/styleeditor/test/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES := \
                  browser_styleeditor_enabled.js \
                  browser_styleeditor_filesave.js \
@@ -51,5 +43,3 @@ MOCHITEST_BROWSER_FILES := \
                  test_private.html \
                  test_private.css \
                  $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/devtools/styleinspector/Makefile.in b/browser/devtools/styleinspector/Makefile.in
index 1599859b79ab..8a262855b737 100644
--- a/browser/devtools/styleinspector/Makefile.in
+++ b/browser/devtools/styleinspector/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 libs::
diff --git a/browser/devtools/styleinspector/test/Makefile.in b/browser/devtools/styleinspector/test/Makefile.in
index 2db33c1792cd..6848056ad560 100644
--- a/browser/devtools/styleinspector/test/Makefile.in
+++ b/browser/devtools/styleinspector/test/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES = \
   browser_bug683672.js \
   browser_styleinspector_bug_672746_default_styles.js \
@@ -61,5 +53,3 @@ MOCHITEST_BROWSER_FILES += \
   browser_styleinspector_bug_677930_urls_clickable/browser_styleinspector_bug_677930_urls_clickable.css \
   test-image.png \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/devtools/tilt/Makefile.in b/browser/devtools/tilt/Makefile.in
index e4584f3806ad..08d3262b6878 100644
--- a/browser/devtools/tilt/Makefile.in
+++ b/browser/devtools/tilt/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 libs::
diff --git a/browser/devtools/tilt/test/Makefile.in b/browser/devtools/tilt/test/Makefile.in
index cf3e6d35134b..273e0185bccc 100644
--- a/browser/devtools/tilt/test/Makefile.in
+++ b/browser/devtools/tilt/test/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH			= @DEPTH@
-topsrcdir		= @top_srcdir@
-srcdir			= @srcdir@
-VPATH			= @srcdir@
-relativesrcdir 	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES = \
 	head.js \
 	browser_tilt_01_lazy_getter.js \
@@ -59,5 +51,3 @@ MOCHITEST_BROWSER_FILES = \
 	browser_tilt_visualizer.js \
 	browser_tilt_zoom.js \
 	$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/devtools/webconsole/Makefile.in b/browser/devtools/webconsole/Makefile.in
index e839f960f6bd..35db6f7792ec 100644
--- a/browser/devtools/webconsole/Makefile.in
+++ b/browser/devtools/webconsole/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 libs::
diff --git a/browser/devtools/webconsole/test/Makefile.in b/browser/devtools/webconsole/test/Makefile.in
index 515cd73307d4..d20c9eced46e 100644
--- a/browser/devtools/webconsole/test/Makefile.in
+++ b/browser/devtools/webconsole/test/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH			= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH			= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES = \
 	browser_webconsole_notifications.js \
 	browser_webconsole_message_node_id.js \
@@ -258,5 +250,3 @@ MOCHITEST_BROWSER_FILES += \
 	test-iframe3.html \
 	test-mixedcontent-securityerrors.html \
 	$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/extensions/Makefile.in b/browser/extensions/Makefile.in
index 5dae4397a6d2..9d8b3416e024 100644
--- a/browser/extensions/Makefile.in
+++ b/browser/extensions/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH      = @DEPTH@
-topsrcdir  = @top_srcdir@
-srcdir     = @srcdir@
-VPATH      = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 ifdef MOZ_METRO
 GENERATED_DIRS = $(DIST)/bin/metro/chrome
 endif
diff --git a/browser/extensions/pdfjs/test/Makefile.in b/browser/extensions/pdfjs/test/Makefile.in
index 98ba859d22b3..e0b423540bbd 100644
--- a/browser/extensions/pdfjs/test/Makefile.in
+++ b/browser/extensions/pdfjs/test/Makefile.in
@@ -2,19 +2,9 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES = \
   browser_pdfjs_main.js \
   browser_pdfjs_savedialog.js \
   browser_pdfjs_views.js \
   file_pdfjs_test.pdf \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/fuel/test/Makefile.in b/browser/fuel/test/Makefile.in
index 79e82030d885..0ea7ed2237e5 100644
--- a/browser/fuel/test/Makefile.in
+++ b/browser/fuel/test/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH          = @DEPTH@
-topsrcdir      = @top_srcdir@
-srcdir         = @srcdir@
-VPATH          = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES := \
   browser_Application.js \
   browser_ApplicationPrefs.js \
@@ -21,5 +13,3 @@ MOCHITEST_BROWSER_FILES := \
   ContentB.html \
   ContentWithFrames.html \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/installer/Makefile.in b/browser/installer/Makefile.in
index 90ef165cf436..a9986c2aff99 100644
--- a/browser/installer/Makefile.in
+++ b/browser/installer/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 STANDALONE_MAKEFILE := 1
 
 include $(topsrcdir)/config/rules.mk
diff --git a/browser/installer/windows/Makefile.in b/browser/installer/windows/Makefile.in
index 51295945d15f..001f8d659d7b 100644
--- a/browser/installer/windows/Makefile.in
+++ b/browser/installer/windows/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk
 
 CONFIG_DIR = instgen
diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
index ea52beccc723..fb0fcebee0e4 100644
--- a/browser/locales/Makefile.in
+++ b/browser/locales/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/config.mk
 
 vpath %.xml @srcdir@/en-US/searchplugins
diff --git a/browser/metro/Makefile.in b/browser/metro/Makefile.in
index d58229c79c5a..948797992c42 100644
--- a/browser/metro/Makefile.in
+++ b/browser/metro/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 #########################################
diff --git a/browser/metro/base/Makefile.in b/browser/metro/base/Makefile.in
index c0a3a4404786..7a75e28d24d1 100644
--- a/browser/metro/base/Makefile.in
+++ b/browser/metro/base/Makefile.in
@@ -2,12 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/config.mk
 
 DIST_SUBDIR=metro
@@ -16,5 +10,3 @@ DEFINES += -DAB_CD=$(MOZ_UI_LOCALE) \
            -DPACKAGE=browser \
            -DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
            $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/metro/base/tests/Makefile.in b/browser/metro/base/tests/Makefile.in
index 1b138a98fb59..549712efaeec 100644
--- a/browser/metro/base/tests/Makefile.in
+++ b/browser/metro/base/tests/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # For now we're copying the actual Util code.
 # We should make this into a jsm module. See bug 848137
 XPCSHELL_RESOURCES = \
@@ -18,5 +10,3 @@ XPCSHELL_RESOURCES = \
 
 libs:: $(XPCSHELL_RESOURCES)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/xpcshell/$(relativesrcdir)/unit/
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/metro/base/tests/mochiperf/Makefile.in b/browser/metro/base/tests/mochiperf/Makefile.in
index fd2bc676a6d6..e3fc62956625 100644
--- a/browser/metro/base/tests/mochiperf/Makefile.in
+++ b/browser/metro/base/tests/mochiperf/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 ifndef MOZ_DEBUG
 MOCHITEST_METRO_FILES = \
   ../mochitest/head.js \
@@ -23,5 +15,3 @@ MOCHITEST_METRO_FILES = \
   browser_firstx.js \
   $(NULL)
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/metro/base/tests/mochiperf/res/Makefile.in b/browser/metro/base/tests/mochiperf/res/Makefile.in
index 99e414b71798..aea33ad03d22 100644
--- a/browser/metro/base/tests/mochiperf/res/Makefile.in
+++ b/browser/metro/base/tests/mochiperf/res/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 ifndef MOZ_DEBUG
 MOCHITEST_METRO_FILES = \
   ripples.html \
@@ -20,5 +12,3 @@ MOCHITEST_METRO_FILES = \
   fx.png \
   $(NULL)
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/metro/base/tests/mochitest/Makefile.in b/browser/metro/base/tests/mochitest/Makefile.in
index cda0f383aa84..2db959fb9d42 100644
--- a/browser/metro/base/tests/mochitest/Makefile.in
+++ b/browser/metro/base/tests/mochitest/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_METRO_FILES = \
   head.js \
   helpers/BookmarksHelper.js \
@@ -67,5 +59,3 @@ MOCHITEST_METRO_FILES += \
   browser_selection_caretfocus.html \
   $(NULL)
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/metro/base/tests/mochitest/res/Makefile.in b/browser/metro/base/tests/mochitest/res/Makefile.in
index 566a13522eb2..0c0f6f4f6a2b 100644
--- a/browser/metro/base/tests/mochitest/res/Makefile.in
+++ b/browser/metro/base/tests/mochitest/res/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_METRO_FILES = \
   image01.png \
   textblock01.html \
@@ -20,5 +12,3 @@ MOCHITEST_METRO_FILES = \
   blankpage2.html \
   blankpage3.html \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/metro/locales/Makefile.in b/browser/metro/locales/Makefile.in
index 43155d62a76b..c18eb3778f43 100644
--- a/browser/metro/locales/Makefile.in
+++ b/browser/metro/locales/Makefile.in
@@ -2,15 +2,9 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
 # metrofx specific resources - this defines LOCALE_SRCDIR
 relativesrcdir = browser/metro/locales
 
-include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/config.mk
 
 DEFINES += -DAB_CD=$(AB_CD)
diff --git a/browser/metro/locales/import/Makefile.in b/browser/metro/locales/import/Makefile.in
index 6c9bcab5534e..233a3754bdd9 100644
--- a/browser/metro/locales/import/Makefile.in
+++ b/browser/metro/locales/import/Makefile.in
@@ -2,15 +2,9 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
 # desktop specific resources - this defines LOCALE_SRCDIR
 relativesrcdir = browser/locales
 
-include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/config.mk
 
 #########################################
diff --git a/browser/metro/profile/Makefile.in b/browser/metro/profile/Makefile.in
index 258abe97531b..46da143fb4c7 100644
--- a/browser/metro/profile/Makefile.in
+++ b/browser/metro/profile/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/config.mk
 
 PREF_JS_EXPORTS = $(srcdir)/metro.js
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/metro/shell/Makefile.in b/browser/metro/shell/Makefile.in
index 0846eaa7a5e3..ce9f1e6fc965 100644
--- a/browser/metro/shell/Makefile.in
+++ b/browser/metro/shell/Makefile.in
@@ -2,17 +2,8 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 export::
 	$(NSINSTALL) $(srcdir)/resources.pri $(DIST)/bin
 
 install::
 	$(NSINSTALL) $(srcdir)/resources.pri $(DIST)/bin
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/metro/shell/commandexecutehandler/Makefile.in b/browser/metro/shell/commandexecutehandler/Makefile.in
index 09610317854f..814d9b3f481b 100644
--- a/browser/metro/shell/commandexecutehandler/Makefile.in
+++ b/browser/metro/shell/commandexecutehandler/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH      = @DEPTH@
-topsrcdir  = @top_srcdir@
-srcdir     = @srcdir@
-VPATH      = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 NO_PROFILE_GUIDED_OPTIMIZE = 1
 
 include $(topsrcdir)/config/config.mk
@@ -33,5 +26,3 @@ OS_LIBS = \
 	$(NULL)
 
 DEFINES += -DUNICODE -D_UNICODE -DNS_NO_XPCOM
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/metro/shell/linktool/Makefile.in b/browser/metro/shell/linktool/Makefile.in
index 9bfa298c6611..b2892028fbfc 100644
--- a/browser/metro/shell/linktool/Makefile.in
+++ b/browser/metro/shell/linktool/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH      = @DEPTH@
-topsrcdir  = @top_srcdir@
-srcdir     = @srcdir@
-VPATH      = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 NO_PROFILE_GUIDED_OPTIMIZE = 1
 
 include $(topsrcdir)/config/config.mk
@@ -25,5 +18,3 @@ OS_LIBS = \
 	$(NULL)
 
 DEFINES += -DUNICODE -D_UNICODE
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/metro/shell/testing/Makefile.in b/browser/metro/shell/testing/Makefile.in
index c3e5cfba423a..50efa245fa58 100644
--- a/browser/metro/shell/testing/Makefile.in
+++ b/browser/metro/shell/testing/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH      = @DEPTH@
-topsrcdir  = @top_srcdir@
-srcdir     = @srcdir@
-VPATH      = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # static win runtime linking
 USE_STATIC_LIBS = 1
 
@@ -33,5 +26,3 @@ OS_LIBS = \
 	$(NULL)
 
 DEFINES += -DUNICODE -D_UNICODE
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/modules/Makefile.in b/browser/modules/Makefile.in
index d83cd708e21f..02871c0e7287 100644
--- a/browser/modules/Makefile.in
+++ b/browser/modules/Makefile.in
@@ -2,17 +2,8 @@
 # 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/.
 
-DEPTH   = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH   = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/config.mk
 
 ifdef MOZILLA_OFFICIAL
 DEFINES += -DMOZILLA_OFFICIAL=1
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/modules/test/Makefile.in b/browser/modules/test/Makefile.in
index 00066aaee2da..852a5fffdc8b 100644
--- a/browser/modules/test/Makefile.in
+++ b/browser/modules/test/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES := \
   browser_NetworkPrioritizer.js \
   $(NULL)
@@ -22,5 +14,3 @@ endif
 
 # bug 793906 - temporarily disabling desktop UI while working on b2g
 # browser_SignInToWebsite.js
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/modules/test/chrome/Makefile.in b/browser/modules/test/chrome/Makefile.in
index b5f4e371acdf..664e10d5e5a6 100644
--- a/browser/modules/test/chrome/Makefile.in
+++ b/browser/modules/test/chrome/Makefile.in
@@ -2,17 +2,7 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_CHROME_FILES = \
 		test_sharedframe.xul \
 		sharedframe.xul \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/themes/linux/Makefile.in b/browser/themes/linux/Makefile.in
index 353289fb2266..173ca68435c6 100644
--- a/browser/themes/linux/Makefile.in
+++ b/browser/themes/linux/Makefile.in
@@ -2,15 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 ICON_FILES := icon.png
 ICON_DEST = $(FINAL_TARGET)/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
 INSTALL_TARGETS += ICON
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/themes/osx/Makefile.in b/browser/themes/osx/Makefile.in
index 353289fb2266..173ca68435c6 100644
--- a/browser/themes/osx/Makefile.in
+++ b/browser/themes/osx/Makefile.in
@@ -2,15 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 ICON_FILES := icon.png
 ICON_DEST = $(FINAL_TARGET)/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
 INSTALL_TARGETS += ICON
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/themes/windows/Makefile.in b/browser/themes/windows/Makefile.in
index 353289fb2266..173ca68435c6 100644
--- a/browser/themes/windows/Makefile.in
+++ b/browser/themes/windows/Makefile.in
@@ -2,15 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 ICON_FILES := icon.png
 ICON_DEST = $(FINAL_TARGET)/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
 INSTALL_TARGETS += ICON
-
-include $(topsrcdir)/config/rules.mk
diff --git a/build/Makefile.in b/build/Makefile.in
index 88948d0b4649..d47fef044870 100644
--- a/build/Makefile.in
+++ b/build/Makefile.in
@@ -3,12 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
 USE_RCS_MK := 1
 include $(topsrcdir)/config/makefiles/makeutils.mk
 
diff --git a/build/mobile/robocop/Makefile.in b/build/mobile/robocop/Makefile.in
index b09186a962ff..c642157c3f5a 100644
--- a/build/mobile/robocop/Makefile.in
+++ b/build/mobile/robocop/Makefile.in
@@ -2,17 +2,10 @@
 # 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/.
 
-DEPTH       = @DEPTH@
-topsrcdir   = @top_srcdir@
-srcdir      = @srcdir@
-VPATH       = @srcdir@
-
 mobile-tests := mobile/android/base/tests
 TESTPATH     := $(topsrcdir)/$(mobile-tests)
 dir-tests    := $(DEPTH)/$(mobile-tests)
 
-include $(DEPTH)/config/autoconf.mk
-
 ANDROID_APK_NAME := robocop-debug
 
 ROBOTIUM_PATH = $(srcdir)/robotium-solo-4.2.jar
diff --git a/build/mobile/sutagent/android/Makefile.in b/build/mobile/sutagent/android/Makefile.in
index 8fdc64b0e794..6a8a79d8b2cc 100644
--- a/build/mobile/sutagent/android/Makefile.in
+++ b/build/mobile/sutagent/android/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 ANDROID_APK_NAME := sutAgentAndroid
 
 JAVAFILES = \
diff --git a/build/mobile/sutagent/android/fencp/Makefile.in b/build/mobile/sutagent/android/fencp/Makefile.in
index 7b29ea0ba52d..07b9210cedb7 100644
--- a/build/mobile/sutagent/android/fencp/Makefile.in
+++ b/build/mobile/sutagent/android/fencp/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 ANDROID_APK_NAME := FenCP
 
 JAVAFILES = \
diff --git a/build/mobile/sutagent/android/ffxcp/Makefile.in b/build/mobile/sutagent/android/ffxcp/Makefile.in
index 2cabb7579713..4887658f8d06 100644
--- a/build/mobile/sutagent/android/ffxcp/Makefile.in
+++ b/build/mobile/sutagent/android/ffxcp/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 ANDROID_APK_NAME := FfxCP
 
 JAVAFILES = \
diff --git a/build/mobile/sutagent/android/watcher/Makefile.in b/build/mobile/sutagent/android/watcher/Makefile.in
index c711e75ce35f..9b9d5a763452 100644
--- a/build/mobile/sutagent/android/watcher/Makefile.in
+++ b/build/mobile/sutagent/android/watcher/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 ANDROID_APK_NAME := Watcher
 
 JAVAFILES = \
diff --git a/build/package/Makefile.in b/build/package/Makefile.in
index 163fab806826..c945b169a0e4 100644
--- a/build/package/Makefile.in
+++ b/build/package/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # This makefile doesn't do anything by default. Use one of the special targets
 # below to stage and build packages.
 
diff --git a/build/stlport/Makefile.in b/build/stlport/Makefile.in
index 35952867841c..d20ca93e4335 100644
--- a/build/stlport/Makefile.in
+++ b/build/stlport/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MODULES = stlport
 FORCE_STATIC_LIB = 1
 STL_FLAGS =
diff --git a/build/unix/Makefile.in b/build/unix/Makefile.in
index 5f2f4ff836c0..38cf1aedb979 100644
--- a/build/unix/Makefile.in
+++ b/build/unix/Makefile.in
@@ -4,13 +4,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 SDK_BINARY = run-mozilla.sh
 
 include $(topsrcdir)/config/rules.mk
diff --git a/build/unix/elfhack/Makefile.in b/build/unix/elfhack/Makefile.in
index 6c79089b0cbd..77728692bf9a 100644
--- a/build/unix/elfhack/Makefile.in
+++ b/build/unix/elfhack/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 INTERNAL_TOOLS = 1
 
 HOST_PROGRAM = elfhack
diff --git a/build/unix/elfhack/inject/Makefile.in b/build/unix/elfhack/inject/Makefile.in
index e44973fac427..ea096c7a97c1 100644
--- a/build/unix/elfhack/inject/Makefile.in
+++ b/build/unix/elfhack/inject/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 INTERNAL_TOOLS = 1
 NO_PROFILE_GUIDED_OPTIMIZE = 1
 
diff --git a/build/unix/stdc++compat/Makefile.in b/build/unix/stdc++compat/Makefile.in
index d3d03aca8d1d..b39c30fd2d03 100644
--- a/build/unix/stdc++compat/Makefile.in
+++ b/build/unix/stdc++compat/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 FORCE_STATIC_LIB= 1
 STL_FLAGS =
 NO_EXPAND_LIBS = 1
diff --git a/build/unix/test/Makefile.in b/build/unix/test/Makefile.in
index 237fab8fb3f4..87ba72435ef1 100644
--- a/build/unix/test/Makefile.in
+++ b/build/unix/test/Makefile.in
@@ -4,12 +4,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
 ##################################################
diff --git a/build/win32/Makefile.in b/build/win32/Makefile.in
index c85898e661d0..f9e7c8451422 100644
--- a/build/win32/Makefile.in
+++ b/build/win32/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 NO_PROFILE_GUIDED_OPTIMIZE = 1
 
 ifdef ENABLE_TESTS
@@ -80,4 +73,3 @@ endif # WIN32_REDIST_DIR
 check::
 	$(PYTHON) $(srcdir)/autobinscope.py $(DIST)/bin/$(MOZ_APP_NAME)$(BIN_SUFFIX) $(DIST)/crashreporter-symbols/
 	$(PYTHON) $(srcdir)/autobinscope.py $(DIST)/bin/plugin-container.exe $(DIST)/crashreporter-symbols/
-
diff --git a/build/win32/crashinjectdll/Makefile.in b/build/win32/crashinjectdll/Makefile.in
index 179c9049efee..117417a344cc 100644
--- a/build/win32/crashinjectdll/Makefile.in
+++ b/build/win32/crashinjectdll/Makefile.in
@@ -2,17 +2,8 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 DEFFILE = $(srcdir)/crashinjectdll.def
 FORCE_SHARED_LIB = 1
 USE_STATIC_LIBS = 1
 
 MOZ_GLUE_LDFLAGS =
-
-include $(topsrcdir)/config/rules.mk
diff --git a/build/win32/vmwarerecordinghelper/Makefile.in b/build/win32/vmwarerecordinghelper/Makefile.in
index 2a601343e254..7503ad49e413 100644
--- a/build/win32/vmwarerecordinghelper/Makefile.in
+++ b/build/win32/vmwarerecordinghelper/Makefile.in
@@ -2,18 +2,9 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 DEFFILE = $(srcdir)/$(LIBRARY_NAME).def
 
 FORCE_SHARED_LIB = 1
 USE_STATIC_LIBS = 1
 
 MOZ_GLUE_LDFLAGS =
-
-include $(topsrcdir)/config/rules.mk
diff --git a/caps/src/Makefile.in b/caps/src/Makefile.in
index ea2ddc5aed83..78593c1315d9 100644
--- a/caps/src/Makefile.in
+++ b/caps/src/Makefile.in
@@ -3,16 +3,8 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= -I$(srcdir)/../include \
 		   -I$(topsrcdir)/js/xpconnect/src \
 		   -I$(topsrcdir)/dom/base
-
diff --git a/caps/tests/mochitest/Makefile.in b/caps/tests/mochitest/Makefile.in
index 9e6bad703543..26252e68ff1f 100644
--- a/caps/tests/mochitest/Makefile.in
+++ b/caps/tests/mochitest/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = 	test_bug423375.html \
                 test_bug246699.html \
                 test_bug292789.html \
@@ -24,5 +16,3 @@ ifneq ($(OS_ARCH),WINNT)
 MOCHITEST_CHROME_FILES = test_principal_extendedorigin_appid_appstatus.html \
                          $(NULL)
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/chrome/src/Makefile.in b/chrome/src/Makefile.in
index 0a38fc116aa8..c09f56a2f044 100644
--- a/chrome/src/Makefile.in
+++ b/chrome/src/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/config/Makefile.in b/config/Makefile.in
index e2fafe28d124..b0668816aa89 100644
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -4,13 +4,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # For sanity's sake, we compile nsinstall without the wrapped system
 # headers, so that we can use it to set up the wrapped system headers.
 VISIBILITY_FLAGS =
diff --git a/config/makefiles/precompile/Makefile.in b/config/makefiles/precompile/Makefile.in
index b05da7dcfd99..7242bc3c6a91 100644
--- a/config/makefiles/precompile/Makefile.in
+++ b/config/makefiles/precompile/Makefile.in
@@ -5,12 +5,6 @@
 # This make file defines the precompile tier. This tier effectively fans out
 # to other make files and specialized targets.
 
-DEPTH := @DEPTH@
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 SUPPRESS_DEFAULT_RULES := 1
 
 include $(topsrcdir)/config/rules.mk
diff --git a/config/makefiles/test/Makefile.in b/config/makefiles/test/Makefile.in
index 8bb01d0ba2ff..6c66d820e900 100644
--- a/config/makefiles/test/Makefile.in
+++ b/config/makefiles/test/Makefile.in
@@ -4,13 +4,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 STANDALONE_MAKEFILE := 1
 USE_AUTOTARGETS_MK  = 1
 MAKEUTILS_UNIT_TEST = 1
diff --git a/config/makefiles/xpidl/Makefile.in b/config/makefiles/xpidl/Makefile.in
index cdbe06331b45..d2ecda139ceb 100644
--- a/config/makefiles/xpidl/Makefile.in
+++ b/config/makefiles/xpidl/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH := @DEPTH@
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 SUPPRESS_DEFAULT_RULES := 1
 STANDALONE_MAKEFILE := 1
 NO_MAKEFILE_RULE := 1
diff --git a/config/nspr/Makefile.in b/config/nspr/Makefile.in
index 1594d1fffa83..b94c5a4b68cf 100644
--- a/config/nspr/Makefile.in
+++ b/config/nspr/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 ifdef LIBXUL_SDK
diff --git a/config/tests/makefiles/autodeps/Makefile.in b/config/tests/makefiles/autodeps/Makefile.in
index 4367d9146460..b588c33be94a 100644
--- a/config/tests/makefiles/autodeps/Makefile.in
+++ b/config/tests/makefiles/autodeps/Makefile.in
@@ -12,12 +12,6 @@ PYTEST = $(PYTHON) -E
 # python -B not supported by older interpreters
 export PYTHONDONTWRITEBYTECODE=1
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
 autotgt_tests = .deps/autotargets.mk.ts
diff --git a/config/tests/src-simple/Makefile.in b/config/tests/src-simple/Makefile.in
index d425380236ea..e1cb3763afff 100644
--- a/config/tests/src-simple/Makefile.in
+++ b/config/tests/src-simple/Makefile.in
@@ -3,16 +3,8 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
 LOCALE_SRCDIR = $(srcdir)/l10n
 
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/config.mk
 
 STANDALONE_MAKEFILE := 1
@@ -42,5 +34,3 @@ check-%::
 	  echo "TEST-UNEXPECTED-FAIL | config/tests/ref-simple | different content in jar" ; \
 	  false; \
 	fi
-
-include $(topsrcdir)/config/rules.mk
diff --git a/content/base/src/Makefile.in b/content/base/src/Makefile.in
index 6822000914fa..1bbf1c703044 100644
--- a/content/base/src/Makefile.in
+++ b/content/base/src/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 ifdef MOZ_WEBRTC
 LOCAL_INCLUDES += \
 		-I$(topsrcdir)/netwerk/sctp/datachannel \
diff --git a/content/base/test/Makefile.in b/content/base/test/Makefile.in
index 60d211fdb44c..5cf2ea8ac575 100644
--- a/content/base/test/Makefile.in
+++ b/content/base/test/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES_A = \
 		responseIdentical.sjs \
 		test_bug5141.html \
@@ -708,6 +700,3 @@ MOCHITEST_BROWSER_FILES = \
 		browser_bug593387.js \
 		browser_bug902350.js \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/content/base/test/chrome/Makefile.in b/content/base/test/chrome/Makefile.in
index 0b6ccf57656d..412e4d357784 100644
--- a/content/base/test/chrome/Makefile.in
+++ b/content/base/test/chrome/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = \
     bug421622-referer.sjs \
     $(NULL)
@@ -70,5 +62,3 @@ MOCHITEST_CHROME_FILES += \
     cpows_child.js \
     $(NULL)
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/content/base/test/websocket_hybi/Makefile.in b/content/base/test/websocket_hybi/Makefile.in
index f7732dad7f5f..94d2d6fd4c36 100644
--- a/content/base/test/websocket_hybi/Makefile.in
+++ b/content/base/test/websocket_hybi/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 #### MODULE = content
 
 MOCHITEST_FILES = \
@@ -21,5 +13,3 @@ MOCHITEST_FILES = \
     test_receive-blob.html \
     file_binary-frames_wsh.py \
     $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/content/canvas/compiledtest/Makefile.in b/content/canvas/compiledtest/Makefile.in
index b1858fe42fbb..21a557ce43ea 100644
--- a/content/canvas/compiledtest/Makefile.in
+++ b/content/canvas/compiledtest/Makefile.in
@@ -2,15 +2,6 @@
 # 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/.
 
-DEPTH := @DEPTH@
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES := \
   -I$(srcdir)/../src \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/content/canvas/src/Makefile.in b/content/canvas/src/Makefile.in
index 98748a330519..8bc690245f7a 100644
--- a/content/canvas/src/Makefile.in
+++ b/content/canvas/src/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 ifdef MOZ_WEBGL
 LOCAL_INCLUDES += \
 	-I$(topsrcdir)/js/xpconnect/wrappers \
diff --git a/content/canvas/test/Makefile.in b/content/canvas/test/Makefile.in
index 2af137464d66..a986b3c39354 100644
--- a/content/canvas/test/Makefile.in
+++ b/content/canvas/test/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
 MOCHITEST_FILES = \
 	android.json \
 	test_canvas.html \
@@ -215,4 +208,3 @@ endif
 # test_2d.path.rect.zero.6.html
 
 # split up into groups to work around command-line length limits
-include $(topsrcdir)/config/rules.mk
diff --git a/content/canvas/test/chrome/Makefile.in b/content/canvas/test/chrome/Makefile.in
index 919dbb096a03..57ac61e050d4 100644
--- a/content/canvas/test/chrome/Makefile.in
+++ b/content/canvas/test/chrome/Makefile.in
@@ -3,17 +3,7 @@
 # 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/.
 
-DEPTH           = @DEPTH@
-topsrcdir       = @top_srcdir@
-srcdir          = @srcdir@
-VPATH           = @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_CHROME_FILES = \
 	test_webgl_debug_renderer_info.html \
 	nonchrome_webgl_debug_renderer_info.html \
 	$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/content/canvas/test/crossorigin/Makefile.in b/content/canvas/test/crossorigin/Makefile.in
index eea7f8c69406..b6ebbc9c83bc 100644
--- a/content/canvas/test/crossorigin/Makefile.in
+++ b/content/canvas/test/crossorigin/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
 MOCHITEST_FILES = \
 	image-allow-credentials.png \
 	image-allow-credentials.png^headers^ \
@@ -21,5 +14,3 @@ MOCHITEST_FILES = \
 	video.sjs \
 	test_video_crossorigin.html \
 	$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/content/canvas/test/webgl/Makefile.in b/content/canvas/test/webgl/Makefile.in
index dc56df908f1a..493041643bb4 100644
--- a/content/canvas/test/webgl/Makefile.in
+++ b/content/canvas/test/webgl/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
 MOCHITEST_FILES = \
   test_webgl_conformance_test_suite.html \
   00_test_list.txt \
diff --git a/content/canvas/test/webgl/non-conf-tests/Makefile.in b/content/canvas/test/webgl/non-conf-tests/Makefile.in
index 4f97d3bb43ee..3a4a044e3ba0 100644
--- a/content/canvas/test/webgl/non-conf-tests/Makefile.in
+++ b/content/canvas/test/webgl/non-conf-tests/Makefile.in
@@ -3,16 +3,6 @@
 # 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/.
 
-DEPTH          = @DEPTH@
-topsrcdir      = @top_srcdir@
-srcdir         = @srcdir@
-VPATH          = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = \
   test_webgl_conformance.html \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/content/events/src/Makefile.in b/content/events/src/Makefile.in
index 306dbedcb9ce..0c18ec676b6a 100644
--- a/content/events/src/Makefile.in
+++ b/content/events/src/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
@@ -35,5 +28,3 @@ endif
 ifdef MOZ_JSDEBUGGER
 DEFINES += -DMOZ_JSDEBUGGER
 endif
-
-
diff --git a/content/events/test/Makefile.in b/content/events/test/Makefile.in
index 9e23d5e3cdad..101678fee3c0 100644
--- a/content/events/test/Makefile.in
+++ b/content/events/test/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # Disabled due to timeouts.
 # 		test_bug563329.html
 MOCHITEST_FILES = \
@@ -130,5 +122,3 @@ MOCHITEST_CHROME_FILES = \
 		file_bug679494.html \
 		test_eventctors.xul \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/content/html/content/src/Makefile.in b/content/html/content/src/Makefile.in
index 1c989becd6c0..1f56035a0740 100644
--- a/content/html/content/src/Makefile.in
+++ b/content/html/content/src/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/content/html/content/test/Makefile.in b/content/html/content/test/Makefile.in
index b3fd1a328ec3..a568955fd01e 100644
--- a/content/html/content/test/Makefile.in
+++ b/content/html/content/test/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH          = @DEPTH@
-topsrcdir      = @top_srcdir@
-srcdir         = @srcdir@
-VPATH          = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = \
 		test_hidden.html \
 		test_bug589.html \
@@ -408,5 +400,3 @@ MOCHITEST_BROWSER_FILES = \
 		file_bug649778.html \
 		file_bug649778.html^headers^ \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/content/html/content/test/bug649134/Makefile.in b/content/html/content/test/bug649134/Makefile.in
index dd3064c72a7f..f159a1ec411b 100644
--- a/content/html/content/test/bug649134/Makefile.in
+++ b/content/html/content/test/bug649134/Makefile.in
@@ -3,14 +3,4 @@
 # 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/.
 
-DEPTH          = @DEPTH@
-topsrcdir      = @top_srcdir@
-srcdir         = @srcdir@
-VPATH          = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = file_bug649134-1.sjs file_bug649134-2.sjs index.html
-
-include $(topsrcdir)/config/rules.mk
diff --git a/content/html/content/test/forms/Makefile.in b/content/html/content/test/forms/Makefile.in
index 33ce3c226dc1..6119d2385e02 100644
--- a/content/html/content/test/forms/Makefile.in
+++ b/content/html/content/test/forms/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH          = @DEPTH@
-topsrcdir      = @top_srcdir@
-srcdir         = @srcdir@
-VPATH          = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = \
 		save_restore_radio_groups.sjs \
 		test_save_restore_radio_groups.html \
@@ -69,6 +61,3 @@ MOCHITEST_FILES = \
 		test_restore_form_elements.html \
 		test_select_selectedOptions.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/content/html/document/src/Makefile.in b/content/html/document/src/Makefile.in
index 4375a7ceac0e..c9b334ae06cb 100644
--- a/content/html/document/src/Makefile.in
+++ b/content/html/document/src/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += \
diff --git a/content/html/document/test/Makefile.in b/content/html/document/test/Makefile.in
index 1acffe5bf3ce..9b559ee5fe5d 100644
--- a/content/html/document/test/Makefile.in
+++ b/content/html/document/test/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = 	test_bug1682.html \
 		test_bug1823.html \
 		test_bug57600.html \
@@ -80,5 +72,3 @@ MOCHITEST_BROWSER_FILES = \
 		browser_bug592641.js \
 		bug592641_img.jpg \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/content/mathml/content/src/Makefile.in b/content/mathml/content/src/Makefile.in
index a7b35446231c..747ee43fd497 100644
--- a/content/mathml/content/src/Makefile.in
+++ b/content/mathml/content/src/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/content/media/Makefile.in b/content/media/Makefile.in
index 6e472d619fea..1a1f4816a588 100644
--- a/content/media/Makefile.in
+++ b/content/media/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/content/media/dash/Makefile.in b/content/media/dash/Makefile.in
index 40c9391db93b..d17d2cd9c9e4 100644
--- a/content/media/dash/Makefile.in
+++ b/content/media/dash/Makefile.in
@@ -8,13 +8,6 @@
 # Contributor(s):
 #     Steve Workman <sworkman@mozilla.com>
 
-DEPTH      := @DEPTH@
-topsrcdir  := @top_srcdir@
-srcdir     := @srcdir@
-VPATH      := @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES := \
diff --git a/content/media/directshow/Makefile.in b/content/media/directshow/Makefile.in
index ac6f8e15798e..3e3764e6007c 100644
--- a/content/media/directshow/Makefile.in
+++ b/content/media/directshow/Makefile.in
@@ -2,17 +2,8 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES += -I$(topsrcdir)/media/webrtc/trunk/webrtc/modules/video_capture/windows/
 
 ifeq ($(OS_ARCH),WINNT)
 OS_CXXFLAGS += -DNOMINMAX
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/content/media/gstreamer/Makefile.in b/content/media/gstreamer/Makefile.in
index 73436052c9cd..0de1a7f30c77 100644
--- a/content/media/gstreamer/Makefile.in
+++ b/content/media/gstreamer/Makefile.in
@@ -2,12 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 CFLAGS		+= $(GSTREAMER_CFLAGS)
@@ -18,4 +12,3 @@ INCLUDES	+= \
 		-I$(srcdir)/../../base/src \
 		-I$(srcdir)/../../html/content/src \
 		$(NULL)
-
diff --git a/content/media/mediasource/Makefile.in b/content/media/mediasource/Makefile.in
index e1a22d0a52e3..6fbe8159b2db 100644
--- a/content/media/mediasource/Makefile.in
+++ b/content/media/mediasource/Makefile.in
@@ -1,11 +1,3 @@
 # 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/.
-
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-include $(DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/rules.mk
diff --git a/content/media/mediasource/test/Makefile.in b/content/media/mediasource/test/Makefile.in
index cc414808a8f3..a3cdbdd95359 100644
--- a/content/media/mediasource/test/Makefile.in
+++ b/content/media/mediasource/test/Makefile.in
@@ -2,17 +2,7 @@
 # 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/.
 
-DEPTH          := @DEPTH@
-topsrcdir      := @top_srcdir@
-srcdir         := @srcdir@
-VPATH          := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = \
   test_MediaSource.html \
   seek.webm \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/content/media/omx/Makefile.in b/content/media/omx/Makefile.in
index 4f36f04040c3..71bdeafdcac0 100644
--- a/content/media/omx/Makefile.in
+++ b/content/media/omx/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/content/media/omx/mediaresourcemanager/Makefile.in b/content/media/omx/mediaresourcemanager/Makefile.in
index 726aaed1dbd6..6d87be4e4b7f 100644
--- a/content/media/omx/mediaresourcemanager/Makefile.in
+++ b/content/media/omx/mediaresourcemanager/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
diff --git a/content/media/plugins/Makefile.in b/content/media/plugins/Makefile.in
index 28f33d995a16..9e99f02e7a4c 100644
--- a/content/media/plugins/Makefile.in
+++ b/content/media/plugins/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= \
diff --git a/content/media/raw/Makefile.in b/content/media/raw/Makefile.in
index 480a76049b5d..3a768f87d4ca 100644
--- a/content/media/raw/Makefile.in
+++ b/content/media/raw/Makefile.in
@@ -3,13 +3,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= \
diff --git a/content/media/test/Makefile.in b/content/media/test/Makefile.in
index af006d80e266..69dabcf6f12d 100644
--- a/content/media/test/Makefile.in
+++ b/content/media/test/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # Media tests should be backend independent, i.e., not conditioned on
 # MOZ_OGG, MOZ_WAVE etc. (The only exception is the can_play_type tests,
 # which necessarily depend on the backend(s) configured.) As far as possible,
@@ -402,5 +394,3 @@ MOCHITEST_FILES += \
 		test_can_play_type_no_wave.html \
 		$(NULL)
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/content/media/webaudio/Makefile.in b/content/media/webaudio/Makefile.in
index a95152ffc10e..deb6de83a14b 100644
--- a/content/media/webaudio/Makefile.in
+++ b/content/media/webaudio/Makefile.in
@@ -2,12 +2,5 @@
 # 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/.
 
-DEPTH            := @DEPTH@
-topsrcdir        := @top_srcdir@
-srcdir           := @srcdir@
-VPATH            := @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
diff --git a/content/media/webaudio/blink/Makefile.in b/content/media/webaudio/blink/Makefile.in
index 1354f2bea29e..83afbee18fa5 100644
--- a/content/media/webaudio/blink/Makefile.in
+++ b/content/media/webaudio/blink/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH            := @DEPTH@
-topsrcdir        := @top_srcdir@
-srcdir           := @srcdir@
-VPATH            := @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES += -I$(topsrcdir)/content/media/webaudio
 
 include $(topsrcdir)/config/rules.mk
diff --git a/content/media/webaudio/compiledtest/Makefile.in b/content/media/webaudio/compiledtest/Makefile.in
index 4dd0d37710fd..216794ce45f2 100644
--- a/content/media/webaudio/compiledtest/Makefile.in
+++ b/content/media/webaudio/compiledtest/Makefile.in
@@ -2,14 +2,4 @@
 # 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/.
 
-DEPTH          := @DEPTH@
-topsrcdir      := @top_srcdir@
-srcdir         := @srcdir@
-VPATH          := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES := -I$(srcdir)/..
-
-include $(topsrcdir)/config/rules.mk
diff --git a/content/media/webaudio/test/Makefile.in b/content/media/webaudio/test/Makefile.in
index afeb3635d2c8..266d9349bbc9 100644
--- a/content/media/webaudio/test/Makefile.in
+++ b/content/media/webaudio/test/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH          := @DEPTH@
-topsrcdir      := @top_srcdir@
-srcdir         := @srcdir@
-VPATH          := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   audioBufferSourceNodeNeutered_worker.js \
   webaudio.js \
@@ -125,5 +117,3 @@ MOCHITEST_FILES += \
   test_pannerNodeChannelCount.html \
   $(NULL)
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/content/media/webaudio/test/blink/Makefile.in b/content/media/webaudio/test/blink/Makefile.in
index e03f5c3ca7cf..2bcd407874dc 100644
--- a/content/media/webaudio/test/blink/Makefile.in
+++ b/content/media/webaudio/test/blink/Makefile.in
@@ -2,19 +2,8 @@
 # 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/.
 
-DEPTH          := @DEPTH@
-topsrcdir      := @top_srcdir@
-srcdir         := @srcdir@
-VPATH          := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   audio-testing.js \
   convolution-testing.js \
   panner-model-testing.js \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/content/media/webm/Makefile.in b/content/media/webm/Makefile.in
index 47ea451c6b0f..019e248764e0 100644
--- a/content/media/webm/Makefile.in
+++ b/content/media/webm/Makefile.in
@@ -2,12 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES = \
diff --git a/content/media/webrtc/Makefile.in b/content/media/webrtc/Makefile.in
index 791a46e2bd4e..75780e0a1395 100644
--- a/content/media/webrtc/Makefile.in
+++ b/content/media/webrtc/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 ifeq ($(OS_ARCH),WINNT)
 OS_CXXFLAGS += -DNOMINMAX
 endif
diff --git a/content/media/webspeech/recognition/Makefile.in b/content/media/webspeech/recognition/Makefile.in
index 1c9ea07715ac..3f305e82a0a9 100644
--- a/content/media/webspeech/recognition/Makefile.in
+++ b/content/media/webspeech/recognition/Makefile.in
@@ -2,12 +2,6 @@
 # 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/.
 
-DEPTH            := @DEPTH@
-topsrcdir        := @top_srcdir@
-srcdir           := @srcdir@
-VPATH            := @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/dom/dom-config.mk
 
 VPATH += \
diff --git a/content/media/webspeech/recognition/test/Makefile.in b/content/media/webspeech/recognition/test/Makefile.in
index 7fe87335ddd3..fb203e17c313 100644
--- a/content/media/webspeech/recognition/test/Makefile.in
+++ b/content/media/webspeech/recognition/test/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH          := @DEPTH@
-topsrcdir      := @top_srcdir@
-srcdir         := @srcdir@
-VPATH          := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   head.js \
   test_success_without_recognition_service.html \
@@ -23,5 +15,3 @@ MOCHITEST_FILES := \
   hello.ogg \
   silence.ogg \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/content/media/webspeech/synth/Makefile.in b/content/media/webspeech/synth/Makefile.in
index b5c8b166988b..09e9152cb25c 100644
--- a/content/media/webspeech/synth/Makefile.in
+++ b/content/media/webspeech/synth/Makefile.in
@@ -2,11 +2,6 @@
 # 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/.
 
-DEPTH            := @DEPTH@
-topsrcdir        := @top_srcdir@
-srcdir           := @srcdir@
-VPATH            := @srcdir@
-include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/dom/dom-config.mk
 
 VPATH += \
diff --git a/content/media/webspeech/synth/ipc/test/Makefile.in b/content/media/webspeech/synth/ipc/test/Makefile.in
index 75e57214af50..c05e0acbb7c7 100644
--- a/content/media/webspeech/synth/ipc/test/Makefile.in
+++ b/content/media/webspeech/synth/ipc/test/Makefile.in
@@ -2,16 +2,6 @@
 # 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/.
 
-DEPTH          := @DEPTH@
-topsrcdir      := @top_srcdir@
-srcdir         := @srcdir@
-VPATH          := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_ipc.html \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/content/media/webspeech/synth/test/Makefile.in b/content/media/webspeech/synth/test/Makefile.in
index 61b11f61d57c..482e257c03eb 100644
--- a/content/media/webspeech/synth/test/Makefile.in
+++ b/content/media/webspeech/synth/test/Makefile.in
@@ -2,19 +2,9 @@
 # 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/.
 
-DEPTH          := @DEPTH@
-topsrcdir      := @top_srcdir@
-srcdir         := @srcdir@
-VPATH          := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   common.js \
   test_setup.html \
   test_speech_simple.html \
   test_speech_queue.html \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/content/media/wmf/Makefile.in b/content/media/wmf/Makefile.in
index 1185c8b7f817..642256452251 100644
--- a/content/media/wmf/Makefile.in
+++ b/content/media/wmf/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-include $(DEPTH)/config/autoconf.mk
-
 ifeq ($(OS_ARCH),WINNT)
 OS_CXXFLAGS += -DNOMINMAX
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/content/smil/Makefile.in b/content/smil/Makefile.in
index 6168d72cbfb4..e127ed315610 100644
--- a/content/smil/Makefile.in
+++ b/content/smil/Makefile.in
@@ -3,17 +3,8 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES += 	\
 		-I$(srcdir)/../base/src \
 		-I$(srcdir)/../../layout/style \
 		-I$(srcdir)/../events/src \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/content/smil/test/Makefile.in b/content/smil/test/Makefile.in
index 6278a0c8f08f..3c45c87a07af 100644
--- a/content/smil/test/Makefile.in
+++ b/content/smil/test/Makefile.in
@@ -1,14 +1,6 @@
 # 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/.
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = \
 	  db_smilAnimateMotion.js \
 	  db_smilCSSFromBy.js \
@@ -63,5 +55,3 @@ MOCHITEST_FILES = \
 
 # Tests disabled due to intermittent orange
 # test_smilCSSInherit.xhtml disabled until bug 501183 is fixed
-
-include $(topsrcdir)/config/rules.mk
diff --git a/content/svg/content/src/Makefile.in b/content/svg/content/src/Makefile.in
index c3d3f208a761..4e8488e1e65e 100644
--- a/content/svg/content/src/Makefile.in
+++ b/content/svg/content/src/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/content/svg/content/test/Makefile.in b/content/svg/content/test/Makefile.in
index 20f8d95172fd..40675731e524 100644
--- a/content/svg/content/test/Makefile.in
+++ b/content/svg/content/test/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # Disabled:
 #		bbox-helper.svg \
 #		test_length.xhtml \
@@ -104,5 +96,3 @@ MOCHITEST_FILES += \
 		test_text.html \
 		$(NULL)
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/content/svg/document/src/Makefile.in b/content/svg/document/src/Makefile.in
index ea1a3ada93a7..fe72b0d45a88 100644
--- a/content/svg/document/src/Makefile.in
+++ b/content/svg/document/src/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= \
diff --git a/content/xbl/src/Makefile.in b/content/xbl/src/Makefile.in
index 25228a20733b..a0f13f47b166 100644
--- a/content/xbl/src/Makefile.in
+++ b/content/xbl/src/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES	= \
diff --git a/content/xbl/test/Makefile.in b/content/xbl/test/Makefile.in
index bdd598ef1aa8..ceefdeac5536 100644
--- a/content/xbl/test/Makefile.in
+++ b/content/xbl/test/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES =	\
 		test_bug310107.html \
 		bug310107-resource.xhtml \
@@ -54,6 +46,3 @@ MOCHITEST_CHROME_FILES = \
 		test_bug723676.xul \
 		test_bug772966.xul \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/content/xml/content/src/Makefile.in b/content/xml/content/src/Makefile.in
index 120edb1a03dd..0b7085f0027d 100644
--- a/content/xml/content/src/Makefile.in
+++ b/content/xml/content/src/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= \
diff --git a/content/xml/document/src/Makefile.in b/content/xml/document/src/Makefile.in
index 641b20a13297..0bdbcd70a1ea 100644
--- a/content/xml/document/src/Makefile.in
+++ b/content/xml/document/src/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES	= \
diff --git a/content/xml/document/test/Makefile.in b/content/xml/document/test/Makefile.in
index 659cc9f26a07..ab5b8d236cf3 100644
--- a/content/xml/document/test/Makefile.in
+++ b/content/xml/document/test/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = 	test_bug232004.xhtml \
 		test_bug343870.xhtml \
 		test_bug355213.xhtml \
@@ -23,5 +15,3 @@ MOCHITEST_FILES = 	test_bug232004.xhtml \
 		file_bug293347xslt.xml \
 		test_bug691215.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/content/xslt/src/base/Makefile.in b/content/xslt/src/base/Makefile.in
index e6de70ac28ee..c967747abe01 100644
--- a/content/xslt/src/base/Makefile.in
+++ b/content/xslt/src/base/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH           = @DEPTH@
-topsrcdir       = @top_srcdir@
-srcdir          = @srcdir@
-VPATH           = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES += \
diff --git a/content/xslt/src/xml/Makefile.in b/content/xslt/src/xml/Makefile.in
index 1eaa5430e0af..225e6c8041df 100644
--- a/content/xslt/src/xml/Makefile.in
+++ b/content/xslt/src/xml/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH           = @DEPTH@
-topsrcdir       = @top_srcdir@
-srcdir          = @srcdir@
-VPATH           = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES += \
diff --git a/content/xslt/src/xpath/Makefile.in b/content/xslt/src/xpath/Makefile.in
index 0155c2562882..462cf326fc8a 100644
--- a/content/xslt/src/xpath/Makefile.in
+++ b/content/xslt/src/xpath/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH           = @DEPTH@
-topsrcdir       = @top_srcdir@
-srcdir          = @srcdir@
-VPATH           = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES += \
diff --git a/content/xslt/src/xslt/Makefile.in b/content/xslt/src/xslt/Makefile.in
index a61c3bd47f2d..2388cc5d542b 100644
--- a/content/xslt/src/xslt/Makefile.in
+++ b/content/xslt/src/xslt/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH           = @DEPTH@
-topsrcdir       = @top_srcdir@
-srcdir          = @srcdir@
-VPATH           = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # For nsDependentJSString
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/dom/base \
diff --git a/content/xslt/tests/mochitest/Makefile.in b/content/xslt/tests/mochitest/Makefile.in
index 448cdc08bf26..8c8985713edf 100644
--- a/content/xslt/tests/mochitest/Makefile.in
+++ b/content/xslt/tests/mochitest/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = 	test_bug319374.xhtml \
 		test_bug440974.html \
 		test_bug427060.html \
@@ -26,5 +18,3 @@ MOCHITEST_FILES = 	test_bug319374.xhtml \
 		test_bug667315.html \
 		test_exslt_regex.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/content/xul/content/src/Makefile.in b/content/xul/content/src/Makefile.in
index 7014a593e37a..385bcdf8e443 100644
--- a/content/xul/content/src/Makefile.in
+++ b/content/xul/content/src/Makefile.in
@@ -3,12 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES	= \
diff --git a/content/xul/content/test/Makefile.in b/content/xul/content/test/Makefile.in
index 9bad08f59cbb..284740a736bf 100644
--- a/content/xul/content/test/Makefile.in
+++ b/content/xul/content/test/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = 	\
 		test_bug486990.xul \
 		test_bug749367.xul \
@@ -24,5 +16,3 @@ MOCHITEST_CHROME_FILES = \
 		398289-resource.xul \
 		test_bug775972.xul \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/content/xul/document/src/Makefile.in b/content/xul/document/src/Makefile.in
index c07f9df66df6..f956dda749a5 100644
--- a/content/xul/document/src/Makefile.in
+++ b/content/xul/document/src/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES	= -I$(srcdir)/../../../base/src \
diff --git a/content/xul/document/test/Makefile.in b/content/xul/document/test/Makefile.in
index 4225d36dde2d..96baab5ceb3b 100644
--- a/content/xul/document/test/Makefile.in
+++ b/content/xul/document/test/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_CHROME_FILES	= \
 		test_bug311681.xul \
 		test_bug199692.xul \
@@ -31,5 +23,3 @@ MOCHITEST_CHROME_FILES	= \
 		test_bug757137.xul \
 		window_bug757137.xul \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/content/xul/templates/src/Makefile.in b/content/xul/templates/src/Makefile.in
index c2bd2f9eb94b..390009456a5f 100644
--- a/content/xul/templates/src/Makefile.in
+++ b/content/xul/templates/src/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES	= -I$(srcdir)/../../../base/src \
diff --git a/content/xul/templates/tests/chrome/Makefile.in b/content/xul/templates/tests/chrome/Makefile.in
index 4b6564e78654..7de93d10b5dc 100644
--- a/content/xul/templates/tests/chrome/Makefile.in
+++ b/content/xul/templates/tests/chrome/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # NOTE: it is important that the first test of the test_tmpl_* tests here use
 #       datasources="rdf:null" to ensure that the real animals.rdf datasource
 #       can be synchronously loaded before the tests run.
@@ -242,5 +234,3 @@ MOCHITEST_CHROME_FILES += \
 endif
 
 # test_bug397148.xul is disabled because it leaks. See bug 879531.
-
-include $(topsrcdir)/config/rules.mk
diff --git a/db/sqlite3/src/Makefile.in b/db/sqlite3/src/Makefile.in
index 88a2cfe36b8e..347386cb046e 100644
--- a/db/sqlite3/src/Makefile.in
+++ b/db/sqlite3/src/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 SHORT_LIBNAME    = mozsqlt3
 ifdef MOZ_FOLD_LIBS
 FORCE_STATIC_LIB = 1
diff --git a/docshell/base/Makefile.in b/docshell/base/Makefile.in
index 45d725053d86..2cee589292a1 100644
--- a/docshell/base/Makefile.in
+++ b/docshell/base/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 ifdef MOZ_TOOLKIT_SEARCH
 DEFINES += -DMOZ_TOOLKIT_SEARCH
 endif
diff --git a/docshell/build/Makefile.in b/docshell/build/Makefile.in
index c782b215d3ee..4b2b8c1c3b7b 100644
--- a/docshell/build/Makefile.in
+++ b/docshell/build/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 SHARED_LIBRARY_LIBS= \
 		../base/$(LIB_PREFIX)basedocshell_s.$(LIB_SUFFIX) \
diff --git a/docshell/shistory/src/Makefile.in b/docshell/shistory/src/Makefile.in
index d1c664f3fdce..4d38db3ec62a 100644
--- a/docshell/shistory/src/Makefile.in
+++ b/docshell/shistory/src/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += -I$(srcdir)/../../base
diff --git a/docshell/test/Makefile.in b/docshell/test/Makefile.in
index 82a30bdacb34..07b7788272ef 100644
--- a/docshell/test/Makefile.in
+++ b/docshell/test/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = \
 		test_bug123696.html \
 		bug123696-subframe.html \
@@ -90,5 +82,3 @@ MOCHITEST_FILES += \
 		file_bug511449.html \
 		$(NULL)
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/docshell/test/browser/Makefile.in b/docshell/test/browser/Makefile.in
index 7e8a6c33eb8b..7b4b5704e76d 100644
--- a/docshell/test/browser/Makefile.in
+++ b/docshell/test/browser/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES =	\
 		browser_bug92473.js \
 		test-form_sjis.html \
@@ -72,5 +64,3 @@ MOCHITEST_BROWSER_FILES =	\
 		browser_loadURI.js \
 		print_postdata.sjs \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/docshell/test/chrome/Makefile.in b/docshell/test/chrome/Makefile.in
index d70590afc4bc..c89231657a69 100644
--- a/docshell/test/chrome/Makefile.in
+++ b/docshell/test/chrome/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES =	\
                 bug89419.sjs \
                 blue.png \
@@ -111,5 +103,3 @@ MOCHITEST_CHROME_FILES += \
 else
 $(filter disabled-temporarily--bug-684176, test_bug454235.xul)
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/docshell/test/navigation/Makefile.in b/docshell/test/navigation/Makefile.in
index f8162b9b7e89..87b0311b9a60 100644
--- a/docshell/test/navigation/Makefile.in
+++ b/docshell/test/navigation/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = \
 		test_bug13871.html \
 		test_bug344861.html \
@@ -62,5 +54,3 @@ MOCHITEST_BROWSER_FILES = \
 		bug343515_pg3_2.html \
 		bug343515_pg3_1_1.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/activities/src/Makefile.in b/dom/activities/src/Makefile.in
index c66470e81eb7..7515f97e0f9c 100644
--- a/dom/activities/src/Makefile.in
+++ b/dom/activities/src/Makefile.in
@@ -2,13 +2,4 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/dom/dom-config.mk
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/alarm/Makefile.in b/dom/alarm/Makefile.in
index d12fb1ba7d15..f003358eae25 100644
--- a/dom/alarm/Makefile.in
+++ b/dom/alarm/Makefile.in
@@ -2,16 +2,8 @@
 # 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/.
 
-DEPTH       = @DEPTH@
-topsrcdir   = @top_srcdir@
-srcdir      = @srcdir@
-VPATH       = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/dom/dom-config.mk
 
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
-
diff --git a/dom/alarm/test/Makefile.in b/dom/alarm/test/Makefile.in
index 2c1e53070054..09d714856fcf 100644
--- a/dom/alarm/test/Makefile.in
+++ b/dom/alarm/test/Makefile.in
@@ -2,15 +2,6 @@
 # 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/.
 
-DEPTH            = @DEPTH@
-topsrcdir        = @top_srcdir@
-srcdir           = @srcdir@
-VPATH            = @srcdir@
-
-relativesrcdir   = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = \
   test_alarm_add_data.html \
   test_alarm_add_date.html \
@@ -19,5 +10,3 @@ MOCHITEST_FILES = \
   test_alarm_permitted_app.html \
   test_alarm_remove.html \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/apps/tests/Makefile.in b/dom/apps/tests/Makefile.in
index b4adc4a47eb7..1b7d924c8d5b 100644
--- a/dom/apps/tests/Makefile.in
+++ b/dom/apps/tests/Makefile.in
@@ -2,15 +2,6 @@
 # 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/.
 
-DEPTH            = @DEPTH@
-topsrcdir        = @top_srcdir@
-srcdir           = @srcdir@
-VPATH            = @srcdir@
-
-relativesrcdir   = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = \
   file_app.sjs \
   file_app.template.html \
@@ -27,5 +18,3 @@ MOCHITEST_FILES = \
 MOCHITEST_CHROME_FILES = \
   test_apps_service.xul \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/audiochannel/Makefile.in b/dom/audiochannel/Makefile.in
index dc8fbba11442..077c79054d5c 100644
--- a/dom/audiochannel/Makefile.in
+++ b/dom/audiochannel/Makefile.in
@@ -12,14 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-DEPTH            = @DEPTH@
-topsrcdir        = @top_srcdir@
-srcdir           = @srcdir@
-VPATH            = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
-
diff --git a/dom/base/Makefile.in b/dom/base/Makefile.in
index 0149114f57e0..7dd3b84d4788 100644
--- a/dom/base/Makefile.in
+++ b/dom/base/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/dom/dom-config.mk
 
 ifdef MOZ_JSDEBUGGER
@@ -36,4 +29,3 @@ ifdef MOZ_X11
 CXXFLAGS += $(TK_CFLAGS)
 LDFLAGS += $(TK_LIBS)
 endif
-
diff --git a/dom/base/test/Makefile.in b/dom/base/test/Makefile.in
index ce9586032638..8b1c20cc6796 100644
--- a/dom/base/test/Makefile.in
+++ b/dom/base/test/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = \
   test_constructor.html \
   test_constructor-assignment.html \
@@ -50,6 +42,3 @@ MOCHITEST_CHROME_FILES = \
    test_bug715041_removal.xul \
    test_domrequesthelper.xul \
    $(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/dom/battery/Makefile.in b/dom/battery/Makefile.in
index 4617b496c6be..8f74d461bd89 100644
--- a/dom/battery/Makefile.in
+++ b/dom/battery/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH            = @DEPTH@
-topsrcdir        = @top_srcdir@
-srcdir           = @srcdir@
-VPATH            = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/dom/dom-config.mk
 
 LOCAL_INCLUDES = \
@@ -17,4 +10,3 @@ LOCAL_INCLUDES = \
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
-
diff --git a/dom/battery/test/Makefile.in b/dom/battery/test/Makefile.in
index 9544efb8d74b..196c3a321167 100644
--- a/dom/battery/test/Makefile.in
+++ b/dom/battery/test/Makefile.in
@@ -2,17 +2,6 @@
 # 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/.
 
-DEPTH            = @DEPTH@
-topsrcdir        = @top_srcdir@
-srcdir           = @srcdir@
-VPATH            = @srcdir@
-
-relativesrcdir   = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = \
   test_battery_basics.html \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/bindings/Makefile.in b/dom/bindings/Makefile.in
index 78b397895021..28ff32889580 100644
--- a/dom/bindings/Makefile.in
+++ b/dom/bindings/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH            = @DEPTH@
-topsrcdir        = @top_srcdir@
-srcdir           = @srcdir@
-VPATH            = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY   = 1
 
 # Need this to find all our DOM source files.
diff --git a/dom/bindings/test/Makefile.in b/dom/bindings/test/Makefile.in
index 671563c84f23..a7049fab3e36 100644
--- a/dom/bindings/test/Makefile.in
+++ b/dom/bindings/test/Makefile.in
@@ -2,12 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-relativesrcdir = @relativesrcdir@
-
 # Do NOT export this library.  We don't actually want our test code
 # being added to libxul or anything.
 
@@ -16,8 +10,6 @@ ifdef .PYMAKE
 .NOTPARALLEL:
 endif
 
-include $(DEPTH)/config/autoconf.mk
-
 # Need this to find all our DOM source files.
 include $(topsrcdir)/dom/dom-config.mk
 
diff --git a/dom/bluetooth/Makefile.in b/dom/bluetooth/Makefile.in
index 9e0a3fe0387b..51c58e312a24 100644
--- a/dom/bluetooth/Makefile.in
+++ b/dom/bluetooth/Makefile.in
@@ -12,11 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-DEPTH            = @DEPTH@
-topsrcdir        = @top_srcdir@
-srcdir           = @srcdir@
-VPATH            = @srcdir@
-include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/dom/dom-config.mk
 
 VPATH += $(srcdir)/ipc
diff --git a/dom/browser-element/Makefile.in b/dom/browser-element/Makefile.in
index b1c673e3534e..f8c20282de61 100644
--- a/dom/browser-element/Makefile.in
+++ b/dom/browser-element/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH            = @DEPTH@
-topsrcdir        = @top_srcdir@
-srcdir           = @srcdir@
-VPATH            = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/dom/dom-config.mk
 
 
diff --git a/dom/browser-element/mochitest/Makefile.in b/dom/browser-element/mochitest/Makefile.in
index e93fc24b7810..7aadd852ca87 100644
--- a/dom/browser-element/mochitest/Makefile.in
+++ b/dom/browser-element/mochitest/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # Note: browserElementTestHelpers.js looks at the test's filename to determine
 # whether the test should be OOP.  "_oop_" signals OOP, "_inproc_" signals in
 # process.  Default is OOP.
@@ -248,5 +240,3 @@ MOCHITEST_FILES += \
 	$(NULL)
 
 endif #}
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/browser-element/mochitest/priority/Makefile.in b/dom/browser-element/mochitest/priority/Makefile.in
index 2a81792004e4..2dc0f1eb4556 100644
--- a/dom/browser-element/mochitest/priority/Makefile.in
+++ b/dom/browser-element/mochitest/priority/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # Note: ../browserElementTestHelpers.js makes all tests in this directory OOP,
 # because testing the process-priority manager without OOP frames doesn't make
 # much sense.
@@ -44,5 +36,3 @@ MOCHITEST_FILES = \
 	$(NULL)
 
 endif # MOZ_WIDGET_TOOLKIT == gtk2
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/camera/Makefile.in b/dom/camera/Makefile.in
index b2e44d421392..b9fbdbd6790f 100644
--- a/dom/camera/Makefile.in
+++ b/dom/camera/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH            = @DEPTH@
-topsrcdir        = @top_srcdir@
-srcdir           = @srcdir@
-VPATH            = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/dom/dom-config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
-
diff --git a/dom/cellbroadcast/interfaces/Makefile.in b/dom/cellbroadcast/interfaces/Makefile.in
index 143590c476a8..e2f1f0e33732 100644
--- a/dom/cellbroadcast/interfaces/Makefile.in
+++ b/dom/cellbroadcast/interfaces/Makefile.in
@@ -2,14 +2,4 @@
 # 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/.
 
-DEPTH            = @DEPTH@
-topsrcdir        = @top_srcdir@
-srcdir           = @srcdir@
-VPATH            = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/dom/dom-config.mk
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/dom/cellbroadcast/src/Makefile.in b/dom/cellbroadcast/src/Makefile.in
index db4cf4d78023..e2f1f0e33732 100644
--- a/dom/cellbroadcast/src/Makefile.in
+++ b/dom/cellbroadcast/src/Makefile.in
@@ -2,13 +2,4 @@
 # 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/.
 
-DEPTH            = @DEPTH@
-topsrcdir        = @top_srcdir@
-srcdir           = @srcdir@
-VPATH            = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/dom/dom-config.mk
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/contacts/Makefile.in b/dom/contacts/Makefile.in
index 26ae0e001f1e..b749a12b07ac 100644
--- a/dom/contacts/Makefile.in
+++ b/dom/contacts/Makefile.in
@@ -2,14 +2,4 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 VPATH += $(srcdir)/fallback
-
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/contacts/tests/Makefile.in b/dom/contacts/tests/Makefile.in
index 4a852707d676..49f05df0371d 100644
--- a/dom/contacts/tests/Makefile.in
+++ b/dom/contacts/tests/Makefile.in
@@ -2,15 +2,6 @@
 # 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/.
 
-DEPTH            = @DEPTH@
-topsrcdir        = @top_srcdir@
-srcdir           = @srcdir@
-VPATH            = @srcdir@
-
-relativesrcdir   = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = \
   test_contacts_basics.html \
   test_contacts_substringmatching.html \
@@ -24,5 +15,3 @@ MOCHITEST_FILES = \
 MOCHITEST_CHROME_FILES = \
   test_contacts_upgrade.html \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/devicestorage/Makefile.in b/dom/devicestorage/Makefile.in
index a3edba0dfdac..f99d6690dc06 100644
--- a/dom/devicestorage/Makefile.in
+++ b/dom/devicestorage/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH            = @DEPTH@
-topsrcdir        = @top_srcdir@
-srcdir           = @srcdir@
-VPATH            = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/dom/dom-config.mk
 
 LOCAL_INCLUDES = \
diff --git a/dom/devicestorage/ipc/Makefile.in b/dom/devicestorage/ipc/Makefile.in
index 456b4c181d97..15ec08c6940d 100644
--- a/dom/devicestorage/ipc/Makefile.in
+++ b/dom/devicestorage/ipc/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_ipc.html \
   ../test/devicestorage_common.js \
diff --git a/dom/devicestorage/test/Makefile.in b/dom/devicestorage/test/Makefile.in
index 4bbc9569125a..eaaace823327 100644
--- a/dom/devicestorage/test/Makefile.in
+++ b/dom/devicestorage/test/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 #  man, our mime database sucks hard.  followup bug # 788273
 #		test_add.html \
 
@@ -39,5 +31,3 @@ MOCHITEST_FILES	= \
 MOCHITEST_CHROME_FILES =\
 		test_app_permissions.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/encoding/Makefile.in b/dom/encoding/Makefile.in
index 7311ab1eac3c..8cb2fa41282d 100644
--- a/dom/encoding/Makefile.in
+++ b/dom/encoding/Makefile.in
@@ -2,12 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES = \
 	-I$(topsrcdir)/intl/locale/src \
 	$(NULL)
diff --git a/dom/encoding/test/Makefile.in b/dom/encoding/test/Makefile.in
index d1834d419df5..703c0cafea24 100644
--- a/dom/encoding/test/Makefile.in
+++ b/dom/encoding/test/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = \
   file_utf16_be_bom.css \
   file_utf16_be_bom.js \
@@ -33,6 +25,3 @@ MOCHITEST_CHROME_FILES = \
   file_stringencoding.jsm \
   test_stringencoding.xul \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/dom/encoding/test/unit/Makefile.in b/dom/encoding/test/unit/Makefile.in
index 19a4ed53e1ed..a78f8915261f 100644
--- a/dom/encoding/test/unit/Makefile.in
+++ b/dom/encoding/test/unit/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = \
   test_big5.js \
   test_euc-jp.js \
@@ -21,6 +13,3 @@ MOCHITEST_FILES = \
   test_shift_jis.js \
   test_singlebytes.js \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/dom/file/Makefile.in b/dom/file/Makefile.in
index 4ddef56abb7e..7515f97e0f9c 100644
--- a/dom/file/Makefile.in
+++ b/dom/file/Makefile.in
@@ -2,14 +2,4 @@
 # 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/.
 
-DEPTH            = @DEPTH@
-topsrcdir        = @top_srcdir@
-srcdir           = @srcdir@
-VPATH            = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/dom/dom-config.mk
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/dom/file/test/Makefile.in b/dom/file/test/Makefile.in
index 6680087680b8..f1c44f8e0005 100644
--- a/dom/file/test/Makefile.in
+++ b/dom/file/test/Makefile.in
@@ -2,15 +2,6 @@
 # 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/.
 
-DEPTH            = @DEPTH@
-topsrcdir        = @top_srcdir@
-srcdir           = @srcdir@
-VPATH            = @srcdir@
-relativesrcdir   = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-
 MOCHITEST_FILES = \
   dummy_worker.js \
   helpers.js \
@@ -34,5 +25,3 @@ MOCHITEST_FILES = \
   test_archivereader_nonUnicode.html \
   test_bug_793311.html \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/fmradio/ipc/Makefile.in b/dom/fmradio/ipc/Makefile.in
index d38a9c659eaf..4d9c311a21d2 100644
--- a/dom/fmradio/ipc/Makefile.in
+++ b/dom/fmradio/ipc/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH            = @DEPTH@
-topsrcdir        = @top_srcdir@
-srcdir           = @srcdir@
-VPATH            = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/dom/fmradio \
   $(NULL)
diff --git a/dom/gamepad/Makefile.in b/dom/gamepad/Makefile.in
index 8c7bfb43ee3b..9f4779b1fd1d 100644
--- a/dom/gamepad/Makefile.in
+++ b/dom/gamepad/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH       = @DEPTH@
-topsrcdir   = @top_srcdir@
-srcdir      = @srcdir@
-VPATH       = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/dom/base \
   $(NULL)
diff --git a/dom/icc/interfaces/Makefile.in b/dom/icc/interfaces/Makefile.in
index db4cf4d78023..e2f1f0e33732 100644
--- a/dom/icc/interfaces/Makefile.in
+++ b/dom/icc/interfaces/Makefile.in
@@ -2,13 +2,4 @@
 # 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/.
 
-DEPTH            = @DEPTH@
-topsrcdir        = @top_srcdir@
-srcdir           = @srcdir@
-VPATH            = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/dom/dom-config.mk
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/icc/src/Makefile.in b/dom/icc/src/Makefile.in
index 8979fb75e30f..6382981f40cd 100644
--- a/dom/icc/src/Makefile.in
+++ b/dom/icc/src/Makefile.in
@@ -2,13 +2,8 @@
 # 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/.
 
-DEPTH            = @DEPTH@
-topsrcdir        = @top_srcdir@
-srcdir           = @srcdir@
 VPATH            = $(srcdir)
 
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/dom/dom-config.mk
 
 LOCAL_INCLUDES = \
diff --git a/dom/imptests/Makefile.in b/dom/imptests/Makefile.in
index 332c8967f760..68f5e1f84e41 100644
--- a/dom/imptests/Makefile.in
+++ b/dom/imptests/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
 _SUPPORT_FILES = \
diff --git a/dom/imptests/editing/Makefile.in b/dom/imptests/editing/Makefile.in
index 3e2b767f1544..399d16387f0d 100644
--- a/dom/imptests/editing/Makefile.in
+++ b/dom/imptests/editing/Makefile.in
@@ -1,17 +1,6 @@
 # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   implementation.js \
   tests.js \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/editing/conformancetest/Makefile.in b/dom/imptests/editing/conformancetest/Makefile.in
index a2254f39b0f6..455d04846574 100644
--- a/dom/imptests/editing/conformancetest/Makefile.in
+++ b/dom/imptests/editing/conformancetest/Makefile.in
@@ -1,18 +1,7 @@
 # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_runtest.html \
   test_event.html \
   data.js \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/editing/css/Makefile.in b/dom/imptests/editing/css/Makefile.in
index cfea71350216..12ca918f6e0c 100644
--- a/dom/imptests/editing/css/Makefile.in
+++ b/dom/imptests/editing/css/Makefile.in
@@ -1,16 +1,5 @@
 # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   reset.css \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/editing/selecttest/Makefile.in b/dom/imptests/editing/selecttest/Makefile.in
index d9422e2f0b53..d4e6e5c5d382 100644
--- a/dom/imptests/editing/selecttest/Makefile.in
+++ b/dom/imptests/editing/selecttest/Makefile.in
@@ -1,14 +1,5 @@
 # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_addRange.html \
   test_collapse.html \
@@ -25,5 +16,3 @@ MOCHITEST_FILES := \
   common.js \
   test-iframe.html \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/failures/editing/conformancetest/Makefile.in b/dom/imptests/failures/editing/conformancetest/Makefile.in
index 37c8e1aebf4f..218c577cea47 100644
--- a/dom/imptests/failures/editing/conformancetest/Makefile.in
+++ b/dom/imptests/failures/editing/conformancetest/Makefile.in
@@ -1,17 +1,6 @@
 # THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_event.html.json \
   test_runtest.html.json \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/failures/editing/selecttest/Makefile.in b/dom/imptests/failures/editing/selecttest/Makefile.in
index 49b8cc388c6a..8f85b1a0fa2d 100644
--- a/dom/imptests/failures/editing/selecttest/Makefile.in
+++ b/dom/imptests/failures/editing/selecttest/Makefile.in
@@ -1,14 +1,5 @@
 # THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_Document-open.html.json \
   test_addRange.html.json \
@@ -20,5 +11,3 @@ MOCHITEST_FILES := \
   test_removeAllRanges.html.json \
   test_selectAllChildren.html.json \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/failures/html/html/browsers/the-window-object/Makefile.in b/dom/imptests/failures/html/html/browsers/the-window-object/Makefile.in
index 07a684ce2e3f..f9295f7b94a6 100644
--- a/dom/imptests/failures/html/html/browsers/the-window-object/Makefile.in
+++ b/dom/imptests/failures/html/html/browsers/the-window-object/Makefile.in
@@ -1,19 +1,8 @@
 # THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_window-indexed-properties-strict.html.json \
   test_window-named-properties.html.json \
   test_window-properties.html.json \
   test_window-prototype-chain.html.json \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/failures/html/html/browsers/the-window-object/named-access-on-the-window-object/Makefile.in b/dom/imptests/failures/html/html/browsers/the-window-object/named-access-on-the-window-object/Makefile.in
index 6c93e82a57ec..e39212aa6b5e 100644
--- a/dom/imptests/failures/html/html/browsers/the-window-object/named-access-on-the-window-object/Makefile.in
+++ b/dom/imptests/failures/html/html/browsers/the-window-object/named-access-on-the-window-object/Makefile.in
@@ -1,16 +1,5 @@
 # THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_window-null-names.html.json \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/failures/html/html/dom/documents/dta/Makefile.in b/dom/imptests/failures/html/html/dom/documents/dta/Makefile.in
index 4ebdbee44f8a..b949a10c5af4 100644
--- a/dom/imptests/failures/html/html/dom/documents/dta/Makefile.in
+++ b/dom/imptests/failures/html/html/dom/documents/dta/Makefile.in
@@ -1,14 +1,5 @@
 # THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_document.title-03.html.json \
   test_document.title-04.xhtml.json \
@@ -20,5 +11,3 @@ MOCHITEST_FILES := \
   test_nameditem-05.html.json \
   test_nameditem-06.html.json \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/failures/html/html/dom/documents/dta/doc.gEBN/Makefile.in b/dom/imptests/failures/html/html/dom/documents/dta/doc.gEBN/Makefile.in
index 15eaf7d9abd8..3c8a25612c00 100644
--- a/dom/imptests/failures/html/html/dom/documents/dta/doc.gEBN/Makefile.in
+++ b/dom/imptests/failures/html/html/dom/documents/dta/doc.gEBN/Makefile.in
@@ -1,16 +1,5 @@
 # THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_document.getElementsByName-newelements.html.json \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/failures/html/html/dom/elements/global-attributes/Makefile.in b/dom/imptests/failures/html/html/dom/elements/global-attributes/Makefile.in
index b8ea9e84c4f0..f34e6ea4b7fe 100644
--- a/dom/imptests/failures/html/html/dom/elements/global-attributes/Makefile.in
+++ b/dom/imptests/failures/html/html/dom/elements/global-attributes/Makefile.in
@@ -1,16 +1,5 @@
 # THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_document-dir.html.json \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/failures/html/html/obsolete/implreq/oeaaa/Makefile.in b/dom/imptests/failures/html/html/obsolete/implreq/oeaaa/Makefile.in
index ce00e971a539..21ff5b4e68c5 100644
--- a/dom/imptests/failures/html/html/obsolete/implreq/oeaaa/Makefile.in
+++ b/dom/imptests/failures/html/html/obsolete/implreq/oeaaa/Makefile.in
@@ -1,16 +1,5 @@
 # THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_script-IDL-event-htmlfor.html.json \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/failures/html/html/semantics/forms/the-form-element/Makefile.in b/dom/imptests/failures/html/html/semantics/forms/the-form-element/Makefile.in
index 750dfcde1c03..38434b4d32a5 100644
--- a/dom/imptests/failures/html/html/semantics/forms/the-form-element/Makefile.in
+++ b/dom/imptests/failures/html/html/semantics/forms/the-form-element/Makefile.in
@@ -1,17 +1,6 @@
 # THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_form-elements-interfaces-01.html.json \
   test_form-elements-nameditem-01.html.json \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/failures/html/html/semantics/forms/the-option-element/Makefile.in b/dom/imptests/failures/html/html/semantics/forms/the-option-element/Makefile.in
index d798ea45ac0b..bbc6c9737cda 100644
--- a/dom/imptests/failures/html/html/semantics/forms/the-option-element/Makefile.in
+++ b/dom/imptests/failures/html/html/semantics/forms/the-option-element/Makefile.in
@@ -1,16 +1,5 @@
 # THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_option-text-spaces.html.json \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/failures/html/html/semantics/forms/the-select-element/Makefile.in b/dom/imptests/failures/html/html/semantics/forms/the-select-element/Makefile.in
index bf8a42a386b9..db3bd060e917 100644
--- a/dom/imptests/failures/html/html/semantics/forms/the-select-element/Makefile.in
+++ b/dom/imptests/failures/html/html/semantics/forms/the-select-element/Makefile.in
@@ -1,16 +1,5 @@
 # THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_select-remove.html.json \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/failures/html/html/semantics/scripting-1/the-script-element/Makefile.in b/dom/imptests/failures/html/html/semantics/scripting-1/the-script-element/Makefile.in
index 8dbbab57679e..f7a8f2610b4a 100644
--- a/dom/imptests/failures/html/html/semantics/scripting-1/the-script-element/Makefile.in
+++ b/dom/imptests/failures/html/html/semantics/scripting-1/the-script-element/Makefile.in
@@ -1,19 +1,8 @@
 # THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_script-for-event.html.json \
   test_script-language-type.html.json \
   test_script-languages-01.html.json \
   test_script-languages-02.html.json \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/failures/html/html/semantics/tabular-data/the-table-element/Makefile.in b/dom/imptests/failures/html/html/semantics/tabular-data/the-table-element/Makefile.in
index 4ea8cb30c748..4d60e7f4d8c9 100644
--- a/dom/imptests/failures/html/html/semantics/tabular-data/the-table-element/Makefile.in
+++ b/dom/imptests/failures/html/html/semantics/tabular-data/the-table-element/Makefile.in
@@ -1,17 +1,6 @@
 # THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_table-insertRow.html.json \
   test_table-rows.html.json \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/failures/html/html/webappapis/atob/Makefile.in b/dom/imptests/failures/html/html/webappapis/atob/Makefile.in
index b04e23b97005..9e35f3de16b0 100644
--- a/dom/imptests/failures/html/html/webappapis/atob/Makefile.in
+++ b/dom/imptests/failures/html/html/webappapis/atob/Makefile.in
@@ -1,16 +1,5 @@
 # THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_base64.html.json \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/failures/html/js/builtins/Makefile.in b/dom/imptests/failures/html/js/builtins/Makefile.in
index 70d8f0a230ed..a46ba209a7b6 100644
--- a/dom/imptests/failures/html/js/builtins/Makefile.in
+++ b/dom/imptests/failures/html/js/builtins/Makefile.in
@@ -1,16 +1,5 @@
 # THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_WeakMap.prototype-properties.html.json \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/failures/html/old-tests/submission/Opera/microdata/Makefile.in b/dom/imptests/failures/html/old-tests/submission/Opera/microdata/Makefile.in
index 506f349322a3..01fb946cb3f2 100644
--- a/dom/imptests/failures/html/old-tests/submission/Opera/microdata/Makefile.in
+++ b/dom/imptests/failures/html/old-tests/submission/Opera/microdata/Makefile.in
@@ -1,16 +1,5 @@
 # THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_001.html.json \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/failures/html/typedarrays/Makefile.in b/dom/imptests/failures/html/typedarrays/Makefile.in
index 7dd6d40c5437..a2ce605117ad 100644
--- a/dom/imptests/failures/html/typedarrays/Makefile.in
+++ b/dom/imptests/failures/html/typedarrays/Makefile.in
@@ -1,16 +1,5 @@
 # THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_constructors.html.json \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/failures/webapps/DOMCore/tests/approved/Makefile.in b/dom/imptests/failures/webapps/DOMCore/tests/approved/Makefile.in
index 8e68e430d5be..839f88c7c106 100644
--- a/dom/imptests/failures/webapps/DOMCore/tests/approved/Makefile.in
+++ b/dom/imptests/failures/webapps/DOMCore/tests/approved/Makefile.in
@@ -1,14 +1,5 @@
 # THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_Node-properties.html.json \
   test_Range-cloneContents.html.json \
@@ -25,5 +16,3 @@ MOCHITEST_FILES := \
   test_exceptions.html.json \
   test_interfaces.html.json \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/Makefile.in b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/Makefile.in
index dc9cdada19e4..25780ee013ac 100644
--- a/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/Makefile.in
+++ b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/Makefile.in
@@ -1,14 +1,5 @@
 # THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_Document-createElementNS.html.json \
   test_Document-getElementsByTagName.html.json \
@@ -17,5 +8,3 @@ MOCHITEST_FILES := \
   test_case.html.json \
   test_historical.html.json \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/failures/webapps/DOMCore/tests/submissions/Opera/Makefile.in b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Opera/Makefile.in
index cf85032ba3ff..752d61f40225 100644
--- a/dom/imptests/failures/webapps/DOMCore/tests/submissions/Opera/Makefile.in
+++ b/dom/imptests/failures/webapps/DOMCore/tests/submissions/Opera/Makefile.in
@@ -1,17 +1,6 @@
 # THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_getElementsByClassName-10.xml.json \
   test_getElementsByClassName-11.xml.json \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/failures/webapps/WebStorage/tests/submissions/Infraware/Makefile.in b/dom/imptests/failures/webapps/WebStorage/tests/submissions/Infraware/Makefile.in
index d757036aae0b..0dde18a159bd 100644
--- a/dom/imptests/failures/webapps/WebStorage/tests/submissions/Infraware/Makefile.in
+++ b/dom/imptests/failures/webapps/WebStorage/tests/submissions/Infraware/Makefile.in
@@ -1,16 +1,5 @@
 # THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_storage_local_security.html.json \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/failures/webapps/WebStorage/tests/submissions/Ms2ger/Makefile.in b/dom/imptests/failures/webapps/WebStorage/tests/submissions/Ms2ger/Makefile.in
index afeb610aff71..11c41bc821c7 100644
--- a/dom/imptests/failures/webapps/WebStorage/tests/submissions/Ms2ger/Makefile.in
+++ b/dom/imptests/failures/webapps/WebStorage/tests/submissions/Ms2ger/Makefile.in
@@ -1,14 +1,5 @@
 # THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_missing_arguments.html.json \
   test_storage_local_builtins.html.json \
@@ -18,5 +9,3 @@ MOCHITEST_FILES := \
   test_storage_session_in_js.html.json \
   test_storage_session_removeitem_js.html.json \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/failures/webapps/XMLHttpRequest/tests/submissions/Ms2ger/Makefile.in b/dom/imptests/failures/webapps/XMLHttpRequest/tests/submissions/Ms2ger/Makefile.in
index 2246f983e4a9..285316b4b2e9 100644
--- a/dom/imptests/failures/webapps/XMLHttpRequest/tests/submissions/Ms2ger/Makefile.in
+++ b/dom/imptests/failures/webapps/XMLHttpRequest/tests/submissions/Ms2ger/Makefile.in
@@ -1,16 +1,5 @@
 # THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_interfaces.html.json \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/html/domxpath/Makefile.in b/dom/imptests/html/domxpath/Makefile.in
index 8a918a6b94d0..fbe38dbe9713 100644
--- a/dom/imptests/html/domxpath/Makefile.in
+++ b/dom/imptests/html/domxpath/Makefile.in
@@ -1,16 +1,5 @@
 # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_evaluator-constructor.html \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/html/html/browsers/browsing-the-web/read-media/Makefile.in b/dom/imptests/html/html/browsers/browsing-the-web/read-media/Makefile.in
index 7421246a3ded..bb68cae2e058 100644
--- a/dom/imptests/html/html/browsers/browsing-the-web/read-media/Makefile.in
+++ b/dom/imptests/html/html/browsers/browsing-the-web/read-media/Makefile.in
@@ -1,17 +1,6 @@
 # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_pageload-image.html \
   test_pageload-video.html \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/html/html/browsers/the-window-object/Makefile.in b/dom/imptests/html/html/browsers/the-window-object/Makefile.in
index 0d9a910c396e..615783814da1 100644
--- a/dom/imptests/html/html/browsers/the-window-object/Makefile.in
+++ b/dom/imptests/html/html/browsers/the-window-object/Makefile.in
@@ -1,14 +1,5 @@
 # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_window-indexed-properties.html \
   test_window-indexed-properties-strict.html \
@@ -16,5 +7,3 @@ MOCHITEST_FILES := \
   test_window-properties.html \
   test_window-prototype-chain.html \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/html/html/browsers/the-window-object/named-access-on-the-window-object/Makefile.in b/dom/imptests/html/html/browsers/the-window-object/named-access-on-the-window-object/Makefile.in
index 19233801ce34..9e3e76f0bd19 100644
--- a/dom/imptests/html/html/browsers/the-window-object/named-access-on-the-window-object/Makefile.in
+++ b/dom/imptests/html/html/browsers/the-window-object/named-access-on-the-window-object/Makefile.in
@@ -1,16 +1,5 @@
 # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_window-null-names.html \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/html/html/dom/documents/dta/Makefile.in b/dom/imptests/html/html/dom/documents/dta/Makefile.in
index c164495f3ad9..d529fa268823 100644
--- a/dom/imptests/html/html/dom/documents/dta/Makefile.in
+++ b/dom/imptests/html/html/dom/documents/dta/Makefile.in
@@ -1,14 +1,5 @@
 # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_document.body-getter.html \
   test_document.body-setter-01.html \
@@ -32,5 +23,3 @@ MOCHITEST_FILES := \
   test_nameditem-05.html \
   test_nameditem-06.html \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/html/html/dom/documents/dta/doc.gEBN/Makefile.in b/dom/imptests/html/html/dom/documents/dta/doc.gEBN/Makefile.in
index 3f5766aa72ba..4adde0061af3 100644
--- a/dom/imptests/html/html/dom/documents/dta/doc.gEBN/Makefile.in
+++ b/dom/imptests/html/html/dom/documents/dta/doc.gEBN/Makefile.in
@@ -1,14 +1,5 @@
 # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_document.getElementsByName-case.html \
   test_document.getElementsByName-case.xhtml \
@@ -24,5 +15,3 @@ MOCHITEST_FILES := \
   test_document.getElementsByName-param.xhtml \
   test_document.getElementsByName-same.html \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/html/html/dom/elements/global-attributes/Makefile.in b/dom/imptests/html/html/dom/elements/global-attributes/Makefile.in
index 5ff945e3b78a..a075e62547a3 100644
--- a/dom/imptests/html/html/dom/elements/global-attributes/Makefile.in
+++ b/dom/imptests/html/html/dom/elements/global-attributes/Makefile.in
@@ -1,14 +1,5 @@
 # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_classlist-nonstring.html \
   test_dataset-delete.html \
@@ -21,5 +12,3 @@ MOCHITEST_FILES := \
   test_id-attribute.html \
   test_id-name.html \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/html/html/editing/the-hidden-attribute/Makefile.in b/dom/imptests/html/html/editing/the-hidden-attribute/Makefile.in
index de4cf83ce220..9b1aadfa4bb6 100644
--- a/dom/imptests/html/html/editing/the-hidden-attribute/Makefile.in
+++ b/dom/imptests/html/html/editing/the-hidden-attribute/Makefile.in
@@ -1,14 +1,2 @@
 # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/html/html/obsolete/implreq/oeaaa/Makefile.in b/dom/imptests/html/html/obsolete/implreq/oeaaa/Makefile.in
index 0967ba877f65..8c4721e283e9 100644
--- a/dom/imptests/html/html/obsolete/implreq/oeaaa/Makefile.in
+++ b/dom/imptests/html/html/obsolete/implreq/oeaaa/Makefile.in
@@ -1,14 +1,5 @@
 # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_document-color-01.html \
   test_document-color-02.html \
@@ -17,5 +8,3 @@ MOCHITEST_FILES := \
   test_heading-obsolete-attributes-01.html \
   test_script-IDL-event-htmlfor.html \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/html/html/semantics/document-metadata/the-title-element/Makefile.in b/dom/imptests/html/html/semantics/document-metadata/the-title-element/Makefile.in
index c7328fc056c2..070e4689e83c 100644
--- a/dom/imptests/html/html/semantics/document-metadata/the-title-element/Makefile.in
+++ b/dom/imptests/html/html/semantics/document-metadata/the-title-element/Makefile.in
@@ -1,19 +1,8 @@
 # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_title.text-01.html \
   test_title.text-02.xhtml \
   test_title.text-03.html \
   test_title.text-04.xhtml \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/html/html/semantics/forms/the-form-element/Makefile.in b/dom/imptests/html/html/semantics/forms/the-form-element/Makefile.in
index 73224ec94c9b..fc6edac896a6 100644
--- a/dom/imptests/html/html/semantics/forms/the-form-element/Makefile.in
+++ b/dom/imptests/html/html/semantics/forms/the-form-element/Makefile.in
@@ -1,19 +1,8 @@
 # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_form-elements-interfaces-01.html \
   test_form-elements-matches.html \
   test_form-elements-nameditem-01.html \
   test_form-elements-nameditem-02.html \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/html/html/semantics/forms/the-option-element/Makefile.in b/dom/imptests/html/html/semantics/forms/the-option-element/Makefile.in
index 26457138202c..a64319b3c030 100644
--- a/dom/imptests/html/html/semantics/forms/the-option-element/Makefile.in
+++ b/dom/imptests/html/html/semantics/forms/the-option-element/Makefile.in
@@ -1,18 +1,7 @@
 # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_option-text-backslash.html \
   test_option-text-recurse.html \
   test_option-text-spaces.html \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/html/html/semantics/forms/the-select-element/Makefile.in b/dom/imptests/html/html/semantics/forms/the-select-element/Makefile.in
index f045cc37032e..f8839238e767 100644
--- a/dom/imptests/html/html/semantics/forms/the-select-element/Makefile.in
+++ b/dom/imptests/html/html/semantics/forms/the-select-element/Makefile.in
@@ -1,16 +1,5 @@
 # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_select-remove.html \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/html/html/semantics/scripting-1/the-script-element/Makefile.in b/dom/imptests/html/html/semantics/scripting-1/the-script-element/Makefile.in
index 01d809f10fba..3155a1e79e38 100644
--- a/dom/imptests/html/html/semantics/scripting-1/the-script-element/Makefile.in
+++ b/dom/imptests/html/html/semantics/scripting-1/the-script-element/Makefile.in
@@ -1,14 +1,5 @@
 # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_script-for-event.html \
   test_script-for-onload.html \
@@ -19,5 +10,3 @@ MOCHITEST_FILES := \
   test_script-noembed-noframes-iframe.xhtml \
   test_script-onload-string.html \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/html/html/semantics/tabular-data/the-table-element/Makefile.in b/dom/imptests/html/html/semantics/tabular-data/the-table-element/Makefile.in
index e0f7def25bb8..bcaec320a37e 100644
--- a/dom/imptests/html/html/semantics/tabular-data/the-table-element/Makefile.in
+++ b/dom/imptests/html/html/semantics/tabular-data/the-table-element/Makefile.in
@@ -1,14 +1,5 @@
 # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_createTBody.html \
   test_insertRow-method-01.html \
@@ -17,5 +8,3 @@ MOCHITEST_FILES := \
   test_table-rows.html \
   test_tBodies.html \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/html/html/semantics/text-level-semantics/the-time-element/Makefile.in b/dom/imptests/html/html/semantics/text-level-semantics/the-time-element/Makefile.in
index aea7b3316f56..3a255a43d6b4 100644
--- a/dom/imptests/html/html/semantics/text-level-semantics/the-time-element/Makefile.in
+++ b/dom/imptests/html/html/semantics/text-level-semantics/the-time-element/Makefile.in
@@ -1,16 +1,5 @@
 # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_001.html \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/html/html/webappapis/atob/Makefile.in b/dom/imptests/html/html/webappapis/atob/Makefile.in
index e1b0585185ad..32a2731e65a3 100644
--- a/dom/imptests/html/html/webappapis/atob/Makefile.in
+++ b/dom/imptests/html/html/webappapis/atob/Makefile.in
@@ -1,16 +1,5 @@
 # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_base64.html \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/html/html/webappapis/scripting/events/Makefile.in b/dom/imptests/html/html/webappapis/scripting/events/Makefile.in
index fcd52b675cbd..620bf636611a 100644
--- a/dom/imptests/html/html/webappapis/scripting/events/Makefile.in
+++ b/dom/imptests/html/html/webappapis/scripting/events/Makefile.in
@@ -1,18 +1,7 @@
 # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_body-onload.html \
   test_event-handler-javascript.html \
   test_event-handler-spec-example.html \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/html/html/webappapis/scripting/processing-model-2/Makefile.in b/dom/imptests/html/html/webappapis/scripting/processing-model-2/Makefile.in
index d798044e62c9..d0e57f196fad 100644
--- a/dom/imptests/html/html/webappapis/scripting/processing-model-2/Makefile.in
+++ b/dom/imptests/html/html/webappapis/scripting/processing-model-2/Makefile.in
@@ -1,18 +1,7 @@
 # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_window-onerror-parse-error.html \
   test_window-onerror-runtime-error.html \
   test_window-onerror-runtime-error-throw.html \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/html/html/webappapis/timers/Makefile.in b/dom/imptests/html/html/webappapis/timers/Makefile.in
index efacf063a229..09cccdeb1ed8 100644
--- a/dom/imptests/html/html/webappapis/timers/Makefile.in
+++ b/dom/imptests/html/html/webappapis/timers/Makefile.in
@@ -1,16 +1,5 @@
 # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_evil-spec-example.html \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/html/js/builtins/Makefile.in b/dom/imptests/html/js/builtins/Makefile.in
index ee07b70c7996..9ed7878500d5 100644
--- a/dom/imptests/html/js/builtins/Makefile.in
+++ b/dom/imptests/html/js/builtins/Makefile.in
@@ -1,14 +1,5 @@
 # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_Array.DefineOwnProperty.html \
   test_Array.prototype.join-order.html \
@@ -18,5 +9,3 @@ MOCHITEST_FILES := \
   test_WeakMap.prototype-properties.html \
   Math.maxmin.js \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/html/old-tests/submission/Opera/microdata/Makefile.in b/dom/imptests/html/old-tests/submission/Opera/microdata/Makefile.in
index aea7b3316f56..3a255a43d6b4 100644
--- a/dom/imptests/html/old-tests/submission/Opera/microdata/Makefile.in
+++ b/dom/imptests/html/old-tests/submission/Opera/microdata/Makefile.in
@@ -1,16 +1,5 @@
 # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_001.html \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/html/typedarrays/Makefile.in b/dom/imptests/html/typedarrays/Makefile.in
index 14e72879c866..a2b6cabd91a7 100644
--- a/dom/imptests/html/typedarrays/Makefile.in
+++ b/dom/imptests/html/typedarrays/Makefile.in
@@ -1,16 +1,5 @@
 # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_constructors.html \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/html/webgl/Makefile.in b/dom/imptests/html/webgl/Makefile.in
index 2f782c9dbaab..2965b391aae1 100644
--- a/dom/imptests/html/webgl/Makefile.in
+++ b/dom/imptests/html/webgl/Makefile.in
@@ -1,14 +1,5 @@
 # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_bufferSubData.html \
   test_compressedTexImage2D.html \
@@ -18,5 +9,3 @@ MOCHITEST_FILES := \
   test_uniformMatrixNfv.html \
   common.js \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/webapps/DOMCore/tests/approved/Makefile.in b/dom/imptests/webapps/DOMCore/tests/approved/Makefile.in
index 1194db65dedf..0fd810d1deab 100644
--- a/dom/imptests/webapps/DOMCore/tests/approved/Makefile.in
+++ b/dom/imptests/webapps/DOMCore/tests/approved/Makefile.in
@@ -1,14 +1,5 @@
 # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_exceptions.html \
   test_interfaces.html \
@@ -39,5 +30,3 @@ MOCHITEST_FILES += \
   test_Range-surroundContents.html \
   $(NULL)
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/Makefile.in b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/Makefile.in
index ad9a8f0de635..eb63c9d4b5ce 100644
--- a/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/Makefile.in
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/Makefile.in
@@ -1,14 +1,5 @@
 # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_attributes.html \
   test_case.html \
@@ -78,5 +69,3 @@ MOCHITEST_FILES := \
   Document-createProcessingInstruction.js \
   productions.js \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/webapps/DOMCore/tests/submissions/Opera/Makefile.in b/dom/imptests/webapps/DOMCore/tests/submissions/Opera/Makefile.in
index 2cbcd93e709d..6b9df178acf6 100644
--- a/dom/imptests/webapps/DOMCore/tests/submissions/Opera/Makefile.in
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Opera/Makefile.in
@@ -1,14 +1,5 @@
 # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_getElementsByClassName-01.htm \
   test_getElementsByClassName-02.htm \
@@ -29,5 +20,3 @@ MOCHITEST_FILES := \
   test_getElementsByClassName-17.htm \
   test_getElementsByClassName-18.htm \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/webapps/WebStorage/tests/submissions/Infraware/Makefile.in b/dom/imptests/webapps/WebStorage/tests/submissions/Infraware/Makefile.in
index a2b6617b3e90..dc38ea46e204 100644
--- a/dom/imptests/webapps/WebStorage/tests/submissions/Infraware/Makefile.in
+++ b/dom/imptests/webapps/WebStorage/tests/submissions/Infraware/Makefile.in
@@ -1,14 +1,5 @@
 # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_event_constructor.html \
   test_event_local_key.html \
@@ -37,5 +28,3 @@ MOCHITEST_FILES := \
   test_storage_session_removeitem.html \
   test_storage_session_setitem.html \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/webapps/WebStorage/tests/submissions/Infraware/iframe/Makefile.in b/dom/imptests/webapps/WebStorage/tests/submissions/Infraware/iframe/Makefile.in
index 517f33fc6ea5..146fa70bfb91 100644
--- a/dom/imptests/webapps/WebStorage/tests/submissions/Infraware/iframe/Makefile.in
+++ b/dom/imptests/webapps/WebStorage/tests/submissions/Infraware/iframe/Makefile.in
@@ -1,14 +1,5 @@
 # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   local_change_item_iframe.html \
   local_security_iframe.html \
@@ -18,5 +9,3 @@ MOCHITEST_FILES := \
   session_set_item_clear_iframe.html \
   session_set_item_iframe.html \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/webapps/WebStorage/tests/submissions/Ms2ger/Makefile.in b/dom/imptests/webapps/WebStorage/tests/submissions/Ms2ger/Makefile.in
index c12aec445bc5..195836bea730 100644
--- a/dom/imptests/webapps/WebStorage/tests/submissions/Ms2ger/Makefile.in
+++ b/dom/imptests/webapps/WebStorage/tests/submissions/Ms2ger/Makefile.in
@@ -1,14 +1,5 @@
 # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_event_constructor_js.html \
   test_missing_arguments.html \
@@ -30,5 +21,3 @@ MOCHITEST_FILES := \
   test_storage_session_setitem_js.html \
   storage_builtins.js \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/webapps/XMLHttpRequest/tests/submissions/Ms2ger/Makefile.in b/dom/imptests/webapps/XMLHttpRequest/tests/submissions/Ms2ger/Makefile.in
index e2a781d7d482..81981b2525ff 100644
--- a/dom/imptests/webapps/XMLHttpRequest/tests/submissions/Ms2ger/Makefile.in
+++ b/dom/imptests/webapps/XMLHttpRequest/tests/submissions/Ms2ger/Makefile.in
@@ -1,18 +1,7 @@
 # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_FormData-append.html \
   test_interfaces.html \
   test_setrequestheader-invalid-arguments.htm \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/imptests/writeBuildFiles.py b/dom/imptests/writeBuildFiles.py
index 30c6e74c7e6d..bc0207e2bdd2 100644
--- a/dom/imptests/writeBuildFiles.py
+++ b/dom/imptests/writeBuildFiles.py
@@ -8,18 +8,7 @@ import string
 
 makefile_template = """# THIS FILE IS AUTOGENERATED BY ${caller} - DO NOT EDIT
 
-DEPTH := @DEPTH@
-
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $$(DEPTH)/config/autoconf.mk
-
 ${files}
-
-include $$(topsrcdir)/config/rules.mk
 """
 
 mozbuild_template = """# THIS FILE IS AUTOGENERATED BY ${caller} - DO NOT EDIT
diff --git a/dom/indexedDB/Makefile.in b/dom/indexedDB/Makefile.in
index 764c625f23ef..d50c9c898781 100644
--- a/dom/indexedDB/Makefile.in
+++ b/dom/indexedDB/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES = \
   -I$(topsrcdir)/caps/include \
   -I$(topsrcdir)/content/base/src \
@@ -23,4 +16,3 @@ LOCAL_INCLUDES = \
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
-
diff --git a/dom/indexedDB/ipc/Makefile.in b/dom/indexedDB/ipc/Makefile.in
index a89145fa759c..17f0d7781bd2 100644
--- a/dom/indexedDB/ipc/Makefile.in
+++ b/dom/indexedDB/ipc/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-relativesrcdir = @relativesrcdir@
-VPATH = @srcdir@
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/dom/indexedDB \
   -I$(topsrcdir)/content/events/src \
diff --git a/dom/indexedDB/test/Makefile.in b/dom/indexedDB/test/Makefile.in
index a1bbfb271231..4c637e06c2bb 100644
--- a/dom/indexedDB/test/Makefile.in
+++ b/dom/indexedDB/test/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = \
   bfcache_iframe1.html \
   bfcache_iframe2.html \
@@ -145,5 +137,3 @@ MOCHITEST_BROWSER_FILES = \
   $(NULL)
 
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/indexedDB/test/unit/Makefile.in b/dom/indexedDB/test/unit/Makefile.in
index 25d3b150d5d1..2e2fba5f6488 100644
--- a/dom/indexedDB/test/unit/Makefile.in
+++ b/dom/indexedDB/test/unit/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = \
   test_add_put.js \
   test_add_twice_failure.js \
@@ -74,6 +66,3 @@ MOCHITEST_FILES = \
   test_unique_index_update.js \
   test_writer_starvation.js \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/dom/interfaces/devicestorage/Makefile.in b/dom/interfaces/devicestorage/Makefile.in
index 728a356cb517..7515f97e0f9c 100644
--- a/dom/interfaces/devicestorage/Makefile.in
+++ b/dom/interfaces/devicestorage/Makefile.in
@@ -2,15 +2,4 @@
 # 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/.
 
-DEPTH            = @DEPTH@
-topsrcdir        = @top_srcdir@
-srcdir           = @srcdir@
-VPATH            = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/dom/dom-config.mk
-
-include $(topsrcdir)/config/rules.mk
-
-
diff --git a/dom/ipc/Makefile.in b/dom/ipc/Makefile.in
index 112105253a5c..51877abbd1c2 100644
--- a/dom/ipc/Makefile.in
+++ b/dom/ipc/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
diff --git a/dom/ipc/tests/Makefile.in b/dom/ipc/tests/Makefile.in
index 5f274a06645d..d74e188dcd33 100644
--- a/dom/ipc/tests/Makefile.in
+++ b/dom/ipc/tests/Makefile.in
@@ -2,18 +2,8 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_CHROME_FILES = \
   test_process_error.xul \
   process_error.xul \
   process_error_contentscript.js \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/locales/Makefile.in b/dom/locales/Makefile.in
index 2839d474fe52..82f614ecea29 100644
--- a/dom/locales/Makefile.in
+++ b/dom/locales/Makefile.in
@@ -2,14 +2,4 @@
 # 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/.
 
-DEPTH          = @DEPTH@
-topsrcdir      = @top_srcdir@
-srcdir         = @srcdir@
-VPATH          = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 DEFINES += -DAB_CD=$(AB_CD)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/media/Makefile.in b/dom/media/Makefile.in
index 8427a62a247d..26902866443f 100644
--- a/dom/media/Makefile.in
+++ b/dom/media/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH            = @DEPTH@
-topsrcdir        = @top_srcdir@
-srcdir           = @srcdir@
-VPATH            = @srcdir@
-relativesrcdir   = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/dom/dom-config.mk
 
 
diff --git a/dom/media/bridge/Makefile.in b/dom/media/bridge/Makefile.in
index 7642fcba44bd..e88c344b06cc 100644
--- a/dom/media/bridge/Makefile.in
+++ b/dom/media/bridge/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH   = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-
 EXPORT_LIBRARY = 1
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/media/mtransport \
@@ -21,5 +13,3 @@ LOCAL_INCLUDES += \
   -I$(topsrcdir)/media/webrtc/signaling/src/common/time_profiling \
   -I$(topsrcdir)/ipc/chromium/src \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/media/tests/mochitest/Makefile.in b/dom/media/tests/mochitest/Makefile.in
index a4f4b72cc078..4b9b65115737 100644
--- a/dom/media/tests/mochitest/Makefile.in
+++ b/dom/media/tests/mochitest/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = \
   test_dataChannel_basicAudio.html \
   test_dataChannel_basicAudioVideo.html \
@@ -64,5 +56,3 @@ ifdef MOZ_WEBRTC_LEAKING_TESTS
 MOCHITEST_FILES += \
   $(NULL)
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/messages/interfaces/Makefile.in b/dom/messages/interfaces/Makefile.in
index 4ddef56abb7e..7515f97e0f9c 100644
--- a/dom/messages/interfaces/Makefile.in
+++ b/dom/messages/interfaces/Makefile.in
@@ -2,14 +2,4 @@
 # 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/.
 
-DEPTH            = @DEPTH@
-topsrcdir        = @top_srcdir@
-srcdir           = @srcdir@
-VPATH            = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/dom/dom-config.mk
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/dom/mobilemessage/interfaces/Makefile.in b/dom/mobilemessage/interfaces/Makefile.in
index 143590c476a8..e2f1f0e33732 100644
--- a/dom/mobilemessage/interfaces/Makefile.in
+++ b/dom/mobilemessage/interfaces/Makefile.in
@@ -2,14 +2,4 @@
 # 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/.
 
-DEPTH            = @DEPTH@
-topsrcdir        = @top_srcdir@
-srcdir           = @srcdir@
-VPATH            = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/dom/dom-config.mk
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/dom/mobilemessage/src/Makefile.in b/dom/mobilemessage/src/Makefile.in
index 4dfe608bd89c..f64158868302 100644
--- a/dom/mobilemessage/src/Makefile.in
+++ b/dom/mobilemessage/src/Makefile.in
@@ -2,16 +2,11 @@
 # 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/.
 
-DEPTH            = @DEPTH@
-topsrcdir        = @top_srcdir@
-srcdir           = @srcdir@
 VPATH            = \
   $(srcdir) \
   $(srcdir)/ipc \
   $(NULL)
 
-include $(DEPTH)/config/autoconf.mk
-
 ifeq (android,$(MOZ_WIDGET_TOOLKIT))
 VPATH += $(srcdir)/android
 else ifdef MOZ_B2G_RIL
diff --git a/dom/mobilemessage/tests/Makefile.in b/dom/mobilemessage/tests/Makefile.in
index d148951a16c6..2c18a6229730 100644
--- a/dom/mobilemessage/tests/Makefile.in
+++ b/dom/mobilemessage/tests/Makefile.in
@@ -2,15 +2,6 @@
 # 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/.
 
-DEPTH            = @DEPTH@
-topsrcdir        = @top_srcdir@
-srcdir           = @srcdir@
-VPATH            = @srcdir@
-
-relativesrcdir   = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = \
   test_sms_basics.html \
   test_smsfilter.html \
@@ -21,5 +12,3 @@ MOCHITEST_CHROME_FILES = \
   test_smsdatabaseservice.xul \
   $(NULL)
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/network/interfaces/Makefile.in b/dom/network/interfaces/Makefile.in
index 143590c476a8..e2f1f0e33732 100644
--- a/dom/network/interfaces/Makefile.in
+++ b/dom/network/interfaces/Makefile.in
@@ -2,14 +2,4 @@
 # 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/.
 
-DEPTH            = @DEPTH@
-topsrcdir        = @top_srcdir@
-srcdir           = @srcdir@
-VPATH            = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/dom/dom-config.mk
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/dom/network/src/Makefile.in b/dom/network/src/Makefile.in
index a6fae9dcfa53..82ffe59a27f7 100644
--- a/dom/network/src/Makefile.in
+++ b/dom/network/src/Makefile.in
@@ -2,13 +2,8 @@
 # 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/.
 
-DEPTH            = @DEPTH@
-topsrcdir        = @top_srcdir@
-srcdir           = @srcdir@
 VPATH            = $(srcdir)
 
-include $(DEPTH)/config/autoconf.mk
-
 ifdef MOZ_B2G_RIL
 endif
 
diff --git a/dom/network/tests/Makefile.in b/dom/network/tests/Makefile.in
index cc7c0341bef3..52fcdb65ce1a 100644
--- a/dom/network/tests/Makefile.in
+++ b/dom/network/tests/Makefile.in
@@ -2,15 +2,6 @@
 # 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/.
 
-DEPTH            = @DEPTH@
-topsrcdir        = @top_srcdir@
-srcdir           = @srcdir@
-VPATH            = @srcdir@
-
-relativesrcdir   = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = \
   test_network_basics.html \
   test_tcpsocket_default_permissions.html \
@@ -26,5 +17,3 @@ MOCHITEST_FILES = \
   test_networkstats_enabled_perm.html \
   $(NULL)
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/permission/tests/Makefile.in b/dom/permission/tests/Makefile.in
index abe7a9d3411a..f62b1ae1b520 100644
--- a/dom/permission/tests/Makefile.in
+++ b/dom/permission/tests/Makefile.in
@@ -2,15 +2,6 @@
 # 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/.
 
-DEPTH            = @DEPTH@
-topsrcdir        = @top_srcdir@
-srcdir           = @srcdir@
-VPATH            = @srcdir@
-
-relativesrcdir   = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = \
   test_permission_basics.html \
   test_alarms.html \
@@ -71,5 +62,3 @@ MOCHITEST_FILES += \
   test_time.html \
   $(NULL)
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/phonenumberutils/tests/Makefile.in b/dom/phonenumberutils/tests/Makefile.in
index 4f12284fca3b..8e1c3e4f4481 100644
--- a/dom/phonenumberutils/tests/Makefile.in
+++ b/dom/phonenumberutils/tests/Makefile.in
@@ -2,15 +2,6 @@
 # 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/.
 
-DEPTH            = @DEPTH@
-topsrcdir        = @top_srcdir@
-srcdir           = @srcdir@
-VPATH            = @srcdir@
-
-relativesrcdir   = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = \
   test_phonenumberutils_basics.html \
   $(NULL)
@@ -20,5 +11,3 @@ MOCHITEST_CHROME_FILES = \
   test_phonenumberutils.xul \
   test_phonenumberservice.xul \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/plugins/base/Makefile.in b/dom/plugins/base/Makefile.in
index 0cb5d745b51d..6bd4bb26ec37 100644
--- a/dom/plugins/base/Makefile.in
+++ b/dom/plugins/base/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 ifeq ($(MOZ_WIDGET_TOOLKIT),android)
 LOCAL_INCLUDES += -I$(topsrcdir)/dom/plugins/base/android
diff --git a/dom/plugins/base/android/Makefile.in b/dom/plugins/base/android/Makefile.in
index a486fa80a79e..2370cfd39632 100644
--- a/dom/plugins/base/android/Makefile.in
+++ b/dom/plugins/base/android/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/widget/android \
diff --git a/dom/plugins/ipc/Makefile.in b/dom/plugins/ipc/Makefile.in
index f85a0aa406f0..9208622ee11f 100644
--- a/dom/plugins/ipc/Makefile.in
+++ b/dom/plugins/ipc/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 
 ifeq (WINNT,$(OS_ARCH))
diff --git a/dom/plugins/ipc/hangui/Makefile.in b/dom/plugins/ipc/hangui/Makefile.in
index f0b485c3b5ac..a43cad194287 100644
--- a/dom/plugins/ipc/hangui/Makefile.in
+++ b/dom/plugins/ipc/hangui/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH           = @DEPTH@
-topsrcdir       = @top_srcdir@
-srcdir          = @srcdir@
-VPATH           = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 OS_LIBS = $(call EXPAND_LIBNAME,comctl32)
 
 RCINCLUDE = HangUIDlg.rc
diff --git a/dom/plugins/ipc/interpose/Makefile.in b/dom/plugins/ipc/interpose/Makefile.in
index 1b7d47aadad3..6c34ec1d42fc 100644
--- a/dom/plugins/ipc/interpose/Makefile.in
+++ b/dom/plugins/ipc/interpose/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 FORCE_SHARED_LIB = 1
 DIST_INSTALL     = 1
 
@@ -16,5 +9,3 @@ DIST_INSTALL     = 1
 EXTRA_DSO_LDOPTS += \
   -framework Carbon \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/plugins/test/mochitest/Makefile.in b/dom/plugins/test/mochitest/Makefile.in
index 939b99fbce5d..72203abddb9f 100644
--- a/dom/plugins/test/mochitest/Makefile.in
+++ b/dom/plugins/test/mochitest/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = \
   utils.js \
   test_defaultValue.html \
@@ -168,5 +160,3 @@ MOCHITEST_FILES += \
 		test_crash_nested_loop.html \
 		$(NULL)
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/plugins/test/testplugin/Makefile.in b/dom/plugins/test/testplugin/Makefile.in
index 19a08ec39865..aea5d1d99318 100644
--- a/dom/plugins/test/testplugin/Makefile.in
+++ b/dom/plugins/test/testplugin/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MODULE_NAME  = TestPlugin
 
 RELATIVE_PATH=.
diff --git a/dom/plugins/test/testplugin/secondplugin/Makefile.in b/dom/plugins/test/testplugin/secondplugin/Makefile.in
index 2116a57c80ea..3d9e28c64eab 100644
--- a/dom/plugins/test/testplugin/secondplugin/Makefile.in
+++ b/dom/plugins/test/testplugin/secondplugin/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MODULE_NAME  = SecondTestPlugin
 
 RELATIVE_PATH=..
diff --git a/dom/power/Makefile.in b/dom/power/Makefile.in
index 50514d426872..77e0fd397397 100644
--- a/dom/power/Makefile.in
+++ b/dom/power/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH            = @DEPTH@
-topsrcdir        = @top_srcdir@
-srcdir           = @srcdir@
-VPATH            = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/dom/dom-config.mk
 
 include $(topsrcdir)/config/rules.mk
diff --git a/dom/power/test/Makefile.in b/dom/power/test/Makefile.in
index fdde538c1d95..ef93721ba242 100644
--- a/dom/power/test/Makefile.in
+++ b/dom/power/test/Makefile.in
@@ -2,15 +2,6 @@
 # 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/.
 
-DEPTH            = @DEPTH@
-topsrcdir        = @top_srcdir@
-srcdir           = @srcdir@
-VPATH            = @srcdir@
-
-relativesrcdir   = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = \
   test_power_basics.html \
   test_power_set_cpusleepallowed.html \
@@ -21,5 +12,3 @@ MOCHITEST_FILES = \
 MOCHITEST_BROWSER_FILES = \
   browser_wakelocks.js \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/promise/Makefile.in b/dom/promise/Makefile.in
index f5c87a324835..95fcf427e248 100644
--- a/dom/promise/Makefile.in
+++ b/dom/promise/Makefile.in
@@ -2,16 +2,7 @@
 # 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/.
 
-DEPTH            = @DEPTH@
-topsrcdir        = @top_srcdir@
-srcdir           = @srcdir@
-VPATH            = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/dom/workers \
   -I$(topsrcdir)/dom/base \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/promise/tests/Makefile.in b/dom/promise/tests/Makefile.in
index 7df9c9f0d068..78eae66b7f38 100644
--- a/dom/promise/tests/Makefile.in
+++ b/dom/promise/tests/Makefile.in
@@ -2,19 +2,8 @@
 # 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/.
 
-DEPTH            = @DEPTH@
-topsrcdir        = @top_srcdir@
-srcdir           = @srcdir@
-VPATH            = @srcdir@
-
-relativesrcdir   = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = \
   test_promise.html \
   test_resolve.html \
   test_bug883683.html \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/quota/Makefile.in b/dom/quota/Makefile.in
index 09269702360e..13aef919415d 100644
--- a/dom/quota/Makefile.in
+++ b/dom/quota/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH            = @DEPTH@
-topsrcdir        = @top_srcdir@
-srcdir           = @srcdir@
-VPATH            = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/dom/dom-config.mk
 
 LOCAL_INCLUDES = \
diff --git a/dom/settings/tests/Makefile.in b/dom/settings/tests/Makefile.in
index e5e25daf320a..4070989f7293 100644
--- a/dom/settings/tests/Makefile.in
+++ b/dom/settings/tests/Makefile.in
@@ -2,15 +2,6 @@
 # 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/.
 
-DEPTH            = @DEPTH@
-topsrcdir        = @top_srcdir@
-srcdir           = @srcdir@
-VPATH            = @srcdir@
-
-relativesrcdir   = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = \
   test_settings_basics.html \
   test_settings_events.html \
@@ -24,5 +15,3 @@ MOCHITEST_CHROME_FILES = \
   test_settings_service.xul \
   test_settings_service.js \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/src/events/Makefile.in b/dom/src/events/Makefile.in
index 75914fa5ae74..0dbd610f6f01 100644
--- a/dom/src/events/Makefile.in
+++ b/dom/src/events/Makefile.in
@@ -3,14 +3,7 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= -I$(topsrcdir)/dom/base
 INCLUDES	+= -I$(topsrcdir)/content/base/src
-
diff --git a/dom/src/geolocation/Makefile.in b/dom/src/geolocation/Makefile.in
index 3e06a8ca4d8b..494a68b7c676 100644
--- a/dom/src/geolocation/Makefile.in
+++ b/dom/src/geolocation/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES = \
 		-I$(topsrcdir)/dom/base \
 		-I$(topsrcdir)/dom/ipc \
diff --git a/dom/src/json/Makefile.in b/dom/src/json/Makefile.in
index c69686fbe74e..c47d819ff4e0 100644
--- a/dom/src/json/Makefile.in
+++ b/dom/src/json/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH          = @DEPTH@
-topsrcdir      = @top_srcdir@
-srcdir         = @srcdir@
-VPATH          = @srcdir@
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES = \
 		-I$(srcdir)/../base \
 		-I$(topsrcdir)/content/events/src
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/src/json/test/Makefile.in b/dom/src/json/test/Makefile.in
index ca9a38a0e4f5..3a6011f4c0b9 100644
--- a/dom/src/json/test/Makefile.in
+++ b/dom/src/json/test/Makefile.in
@@ -3,17 +3,6 @@
 # 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/.
 
-DEPTH          = @DEPTH@
-topsrcdir      = @top_srcdir@
-srcdir         = @srcdir@
-VPATH          = @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = \
     test_json.html \
     $(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/dom/src/jsurl/Makefile.in b/dom/src/jsurl/Makefile.in
index 3451a229a38d..54b64c69fff6 100644
--- a/dom/src/jsurl/Makefile.in
+++ b/dom/src/jsurl/Makefile.in
@@ -3,17 +3,8 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES += \
 		-I$(srcdir) \
 		-I$(topsrcdir)/dom/base \
 		-I$(topsrcdir)/netwerk/base/src \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/dom/src/jsurl/test/Makefile.in b/dom/src/jsurl/test/Makefile.in
index 6104ffa4fa7b..37c93ad0d2dd 100644
--- a/dom/src/jsurl/test/Makefile.in
+++ b/dom/src/jsurl/test/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = 	pass.html \
 		fail.html \
 		test_bug351633-1.html \
@@ -24,5 +16,3 @@ MOCHITEST_FILES = 	pass.html \
 		test_bug351633-4.html \
 		test_bug384981.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/src/notification/Makefile.in b/dom/src/notification/Makefile.in
index 24601103d748..997f5d69367f 100644
--- a/dom/src/notification/Makefile.in
+++ b/dom/src/notification/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH       = @DEPTH@
-topsrcdir   = @top_srcdir@
-srcdir      = @srcdir@
-VPATH       = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES = \
   -I$(topsrcdir)/dom/base \
   -I$(topsrcdir)/dom/ipc \
diff --git a/dom/src/offline/Makefile.in b/dom/src/offline/Makefile.in
index 75a44f151e42..e1d5ab6c86bf 100644
--- a/dom/src/offline/Makefile.in
+++ b/dom/src/offline/Makefile.in
@@ -3,16 +3,7 @@
 # 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/.
 
-DEPTH          = @DEPTH@
-topsrcdir      = @top_srcdir@
-srcdir         = @srcdir@
-VPATH          = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES = \
 		-I$(topsrcdir)/dom/base \
 		-I$(topsrcdir)/content/base/src \
 		-I$(topsrcdir)/content/events/src
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/src/storage/Makefile.in b/dom/src/storage/Makefile.in
index 2a957c9d0a4f..a80fc8bc629a 100644
--- a/dom/src/storage/Makefile.in
+++ b/dom/src/storage/Makefile.in
@@ -3,12 +3,6 @@
 # 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/.
 
-DEPTH          = @DEPTH@
-topsrcdir      = @top_srcdir@
-srcdir         = @srcdir@
-VPATH          = @srcdir@
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES = \
                 -I$(topsrcdir)/dom/base \
 		-I$(topsrcdir)/content/events/src
diff --git a/dom/system/Makefile.in b/dom/system/Makefile.in
index eac93c7f4279..8bfba6af17b3 100644
--- a/dom/system/Makefile.in
+++ b/dom/system/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH       = @DEPTH@
-topsrcdir   = @top_srcdir@
-srcdir      = @srcdir@
-VPATH       = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 DEFINES += -DDLL_PREFIX=\"$(DLL_PREFIX)\" -DDLL_SUFFIX=\"$(DLL_SUFFIX)\"
 
 # We fire the nsDOMDeviceAcceleration
diff --git a/dom/system/android/Makefile.in b/dom/system/android/Makefile.in
index 036363b3e4d4..be31405fcbc8 100644
--- a/dom/system/android/Makefile.in
+++ b/dom/system/android/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH       = @DEPTH@
-topsrcdir   = @top_srcdir@
-srcdir      = @srcdir@
-VPATH       = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 LOCAL_INCLUDES  += -I$(topsrcdir)/dom/src/geolocation \
                      -I$(topsrcdir)/content/events/src
@@ -16,4 +9,3 @@ LOCAL_INCLUDES  += -I$(topsrcdir)/dom/src/geolocation \
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
-
diff --git a/dom/system/gonk/Makefile.in b/dom/system/gonk/Makefile.in
index d648d2d74071..56710dccf091 100644
--- a/dom/system/gonk/Makefile.in
+++ b/dom/system/gonk/Makefile.in
@@ -12,15 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-DEPTH            = @DEPTH@
-topsrcdir        = @top_srcdir@
-srcdir           = @srcdir@
-VPATH            = @srcdir@
-
-relativesrcdir   = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/dom/dom-config.mk
 
 LOCAL_INCLUDES = \
@@ -42,4 +33,3 @@ WORKER_DEST = $(FINAL_TARGET)/modules/workers
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
-
diff --git a/dom/system/mac/Makefile.in b/dom/system/mac/Makefile.in
index 65edb1f26e42..f6f11022b98f 100644
--- a/dom/system/mac/Makefile.in
+++ b/dom/system/mac/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH       = @DEPTH@
-topsrcdir   = @top_srcdir@
-srcdir      = @srcdir@
-VPATH       = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 LOCAL_INCLUDES  += -I$(topsrcdir)/dom/src/geolocation \
                    $(NULL)
diff --git a/dom/system/tests/Makefile.in b/dom/system/tests/Makefile.in
index d05d4b19593b..39f1da4a7134 100644
--- a/dom/system/tests/Makefile.in
+++ b/dom/system/tests/Makefile.in
@@ -1,12 +1,4 @@
-DEPTH           = @DEPTH@
-topsrcdir       = @top_srcdir@
-srcdir          = @srcdir@
-VPATH           = @srcdir@
-relativesrcdir  = @relativesrcdir@
-
 MOCHITEST_CHROME_FILES = \
 	test_constants.xul \
 	worker_constants.js \
         $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/system/unix/Makefile.in b/dom/system/unix/Makefile.in
index 33c2005fb281..2df3b7bb29ce 100644
--- a/dom/system/unix/Makefile.in
+++ b/dom/system/unix/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH       = @DEPTH@
-topsrcdir   = @top_srcdir@
-srcdir      = @srcdir@
-VPATH       = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 ifdef MOZ_ENABLE_QTMOBILITY
 LOCAL_INCLUDES  += $(MOZ_QT_CFLAGS) \
diff --git a/dom/system/windows/Makefile.in b/dom/system/windows/Makefile.in
index d2b151cd35ca..6b7770624eeb 100644
--- a/dom/system/windows/Makefile.in
+++ b/dom/system/windows/Makefile.in
@@ -2,16 +2,7 @@
 # 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/.
 
-DEPTH       = @DEPTH@
-topsrcdir   = @top_srcdir@
-srcdir      = @srcdir@
-VPATH       = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 
 # We fire the nsDOMDeviceAcceleration
 LOCAL_INCLUDES += -I$(topsrcdir)/content/events/src
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/telephony/Makefile.in b/dom/telephony/Makefile.in
index 143590c476a8..e2f1f0e33732 100644
--- a/dom/telephony/Makefile.in
+++ b/dom/telephony/Makefile.in
@@ -2,14 +2,4 @@
 # 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/.
 
-DEPTH            = @DEPTH@
-topsrcdir        = @top_srcdir@
-srcdir           = @srcdir@
-VPATH            = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/dom/dom-config.mk
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/dom/tests/browser/Makefile.in b/dom/tests/browser/Makefile.in
index b20e699d35c9..5857ff42dda9 100644
--- a/dom/tests/browser/Makefile.in
+++ b/dom/tests/browser/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH := @DEPTH@
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES := \
   browser_focus_steal_from_chrome.js \
   browser_focus_steal_from_chrome_during_mousedown.js \
@@ -41,5 +33,3 @@ endif
 
 # TODO: Re-enable permissions tests on Mac, bug 795334
 # TODO: disabled test browser_webapps_perms_reinstall.js, re-enable when bug 794920 is fixed
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/tests/mochitest/ajax/jquery/Makefile.in b/dom/tests/mochitest/ajax/jquery/Makefile.in
index d788ca1a8c72..9983a56d596a 100644
--- a/dom/tests/mochitest/ajax/jquery/Makefile.in
+++ b/dom/tests/mochitest/ajax/jquery/Makefile.in
@@ -3,17 +3,7 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES	= \
 	manifest.json \
 	test_jQuery.html \
 	$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/tests/mochitest/ajax/jquery/dist/Makefile.in b/dom/tests/mochitest/ajax/jquery/dist/Makefile.in
index 6021d7ec6ac6..8acb52057994 100644
--- a/dom/tests/mochitest/ajax/jquery/dist/Makefile.in
+++ b/dom/tests/mochitest/ajax/jquery/dist/Makefile.in
@@ -3,16 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES	= \
 	jquery.js \
 	$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/tests/mochitest/ajax/jquery/test/Makefile.in b/dom/tests/mochitest/ajax/jquery/test/Makefile.in
index 272dc8b6b480..2f2c320550bf 100644
--- a/dom/tests/mochitest/ajax/jquery/test/Makefile.in
+++ b/dom/tests/mochitest/ajax/jquery/test/Makefile.in
@@ -3,19 +3,9 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES	= \
 	index.html \
 	offset.html \
 	test.js \
 	fix.html \
 	$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/tests/mochitest/ajax/jquery/test/data/Makefile.in b/dom/tests/mochitest/ajax/jquery/test/data/Makefile.in
index ba9f555867c9..e0832d8bbf6a 100644
--- a/dom/tests/mochitest/ajax/jquery/test/data/Makefile.in
+++ b/dom/tests/mochitest/ajax/jquery/test/data/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES	= \
 	cow.jpg \
 	dashboard.xml \
@@ -26,5 +18,3 @@ MOCHITEST_FILES	= \
 	testsuite.css \
 	with_fries.xml \
 	$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/tests/mochitest/ajax/jquery/test/data/offset/Makefile.in b/dom/tests/mochitest/ajax/jquery/test/data/offset/Makefile.in
index c5388c36c084..33ee8e2d31c5 100644
--- a/dom/tests/mochitest/ajax/jquery/test/data/offset/Makefile.in
+++ b/dom/tests/mochitest/ajax/jquery/test/data/offset/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES	= \
 	absolute.html \
 	fixed.html \
@@ -19,5 +11,3 @@ MOCHITEST_FILES	= \
 	static.html \
 	table.html \
 	$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/tests/mochitest/ajax/jquery/test/unit/Makefile.in b/dom/tests/mochitest/ajax/jquery/test/unit/Makefile.in
index 917cd7fa65ea..aa2740fde748 100644
--- a/dom/tests/mochitest/ajax/jquery/test/unit/Makefile.in
+++ b/dom/tests/mochitest/ajax/jquery/test/unit/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES	= \
 	ajax.js \
 	core.js \
@@ -20,5 +12,3 @@ MOCHITEST_FILES	= \
 	offset.js \
 	selector.js \
 	$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/tests/mochitest/ajax/lib/Makefile.in b/dom/tests/mochitest/ajax/lib/Makefile.in
index 3e0f75abc8c9..dd368608a5e0 100644
--- a/dom/tests/mochitest/ajax/lib/Makefile.in
+++ b/dom/tests/mochitest/ajax/lib/Makefile.in
@@ -3,17 +3,7 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES	= \
 		AJAX_setup.js \
 		test.css \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/tests/mochitest/ajax/mochikit/Makefile.in b/dom/tests/mochitest/ajax/mochikit/Makefile.in
index fdc6362aad24..64753ebf5457 100644
--- a/dom/tests/mochitest/ajax/mochikit/Makefile.in
+++ b/dom/tests/mochitest/ajax/mochikit/Makefile.in
@@ -3,17 +3,7 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES	= \
 	test_Mochikit.html \
 	manifest.json \
 	$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/tests/mochitest/ajax/mochikit/MochiKit/Makefile.in b/dom/tests/mochitest/ajax/mochikit/MochiKit/Makefile.in
index 58a3468efb55..d2dfae618d3b 100644
--- a/dom/tests/mochitest/ajax/mochikit/MochiKit/Makefile.in
+++ b/dom/tests/mochitest/ajax/mochikit/MochiKit/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES	= \
 		Async.js \
 		Base.js \
@@ -34,5 +26,3 @@ MOCHITEST_FILES	= \
 		Visual.js \
 		__package__.js \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/tests/mochitest/ajax/mochikit/tests/Makefile.in b/dom/tests/mochitest/ajax/mochikit/tests/Makefile.in
index 149285c37e5d..66b2ffb4ae45 100644
--- a/dom/tests/mochitest/ajax/mochikit/tests/Makefile.in
+++ b/dom/tests/mochitest/ajax/mochikit/tests/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES	= \
 		FakeJSAN.js \
 		cli.js \
@@ -41,5 +33,3 @@ MOCHITEST_FILES	= \
 		MochiKit-Visual.html \
 		test_Signal.js \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/tests/mochitest/ajax/mochikit/tests/SimpleTest/Makefile.in b/dom/tests/mochitest/ajax/mochikit/tests/SimpleTest/Makefile.in
index 63d3291cf1da..f28bd2ebf3c0 100644
--- a/dom/tests/mochitest/ajax/mochikit/tests/SimpleTest/Makefile.in
+++ b/dom/tests/mochitest/ajax/mochikit/tests/SimpleTest/Makefile.in
@@ -3,18 +3,8 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES	= \
 		SimpleTest.js \
 		TestRunner.js \
 		test.css \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/tests/mochitest/ajax/offline/Makefile.in b/dom/tests/mochitest/ajax/offline/Makefile.in
index 946116c01f0f..223390db9427 100644
--- a/dom/tests/mochitest/ajax/offline/Makefile.in
+++ b/dom/tests/mochitest/ajax/offline/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES	= \
 	offlineTests.js \
 	test_badManifestMagic.html \
@@ -100,5 +92,3 @@ MOCHITEST_FILES	= \
 	$(NULL)
 
 # test_offlineMode.html disabled due to bug 656943
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/tests/mochitest/ajax/offline/namespace1/Makefile.in b/dom/tests/mochitest/ajax/offline/namespace1/Makefile.in
index 52d93593e839..a6de3f4cba26 100644
--- a/dom/tests/mochitest/ajax/offline/namespace1/Makefile.in
+++ b/dom/tests/mochitest/ajax/offline/namespace1/Makefile.in
@@ -3,18 +3,8 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES	= \
         opp.html \
         script.js \
         redirectToDifferentOrigin.sjs \
         $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/tests/mochitest/ajax/offline/namespace1/sub/Makefile.in b/dom/tests/mochitest/ajax/offline/namespace1/sub/Makefile.in
index bdc3f7037491..8a6ad68cc23d 100644
--- a/dom/tests/mochitest/ajax/offline/namespace1/sub/Makefile.in
+++ b/dom/tests/mochitest/ajax/offline/namespace1/sub/Makefile.in
@@ -3,17 +3,7 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES	= \
         opp.html \
         script1.js \
         $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/tests/mochitest/ajax/offline/namespace1/sub2/Makefile.in b/dom/tests/mochitest/ajax/offline/namespace1/sub2/Makefile.in
index bfc2312c60b4..8675ad4a92a7 100644
--- a/dom/tests/mochitest/ajax/offline/namespace1/sub2/Makefile.in
+++ b/dom/tests/mochitest/ajax/offline/namespace1/sub2/Makefile.in
@@ -3,16 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES	= \
         script2.js \
         $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/tests/mochitest/ajax/offline/namespace2/Makefile.in b/dom/tests/mochitest/ajax/offline/namespace2/Makefile.in
index 8ef9365dd4cf..4a07a75542bd 100644
--- a/dom/tests/mochitest/ajax/offline/namespace2/Makefile.in
+++ b/dom/tests/mochitest/ajax/offline/namespace2/Makefile.in
@@ -3,16 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES	= \
         script3.js \
         $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/tests/mochitest/ajax/prototype/Makefile.in b/dom/tests/mochitest/ajax/prototype/Makefile.in
index 0db62f4d6cea..5e40609dd8cf 100644
--- a/dom/tests/mochitest/ajax/prototype/Makefile.in
+++ b/dom/tests/mochitest/ajax/prototype/Makefile.in
@@ -3,17 +3,7 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES	= \
         test_Prototype.html \
         manifest.json \
         $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/tests/mochitest/ajax/prototype/dist/Makefile.in b/dom/tests/mochitest/ajax/prototype/dist/Makefile.in
index 29e6fbbc63cb..3134dd47f9b8 100644
--- a/dom/tests/mochitest/ajax/prototype/dist/Makefile.in
+++ b/dom/tests/mochitest/ajax/prototype/dist/Makefile.in
@@ -3,16 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES	= \
 	prototype.js \
         $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/tests/mochitest/ajax/prototype/test/Makefile.in b/dom/tests/mochitest/ajax/prototype/test/Makefile.in
index 10596d5ace1f..2489a9a80a28 100644
--- a/dom/tests/mochitest/ajax/prototype/test/Makefile.in
+++ b/dom/tests/mochitest/ajax/prototype/test/Makefile.in
@@ -3,18 +3,8 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES	= \
 		test.css \
 		browser.html \
 		console.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/tests/mochitest/ajax/prototype/test/functional/Makefile.in b/dom/tests/mochitest/ajax/prototype/test/functional/Makefile.in
index 4b58640b7137..50f5dfe5a378 100644
--- a/dom/tests/mochitest/ajax/prototype/test/functional/Makefile.in
+++ b/dom/tests/mochitest/ajax/prototype/test/functional/Makefile.in
@@ -3,16 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES	= \
 	event.html \
 	$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/tests/mochitest/ajax/prototype/test/lib/Makefile.in b/dom/tests/mochitest/ajax/prototype/test/lib/Makefile.in
index 6dd897f72d82..7af48fdc8073 100644
--- a/dom/tests/mochitest/ajax/prototype/test/lib/Makefile.in
+++ b/dom/tests/mochitest/ajax/prototype/test/lib/Makefile.in
@@ -3,16 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES	= \
 		unittest.js \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/tests/mochitest/ajax/prototype/test/unit/Makefile.in b/dom/tests/mochitest/ajax/prototype/test/unit/Makefile.in
index ac447d80a502..d7be5d124017 100644
--- a/dom/tests/mochitest/ajax/prototype/test/unit/Makefile.in
+++ b/dom/tests/mochitest/ajax/prototype/test/unit/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES	= \
 	ajax_test.js \
 	array_test.js \
@@ -28,5 +20,3 @@ MOCHITEST_FILES	= \
 	string_test.js \
 	unittest_test.js \
 	$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/tests/mochitest/ajax/prototype/test/unit/fixtures/Makefile.in b/dom/tests/mochitest/ajax/prototype/test/unit/fixtures/Makefile.in
index 01f85a3e5848..c0c9e0f1bdff 100644
--- a/dom/tests/mochitest/ajax/prototype/test/unit/fixtures/Makefile.in
+++ b/dom/tests/mochitest/ajax/prototype/test/unit/fixtures/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES= \
 	ajax.html \
 	ajax.js \
@@ -38,5 +30,3 @@ MOCHITEST_FILES= \
 	string.js \
 	unittest.html \
 	$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/tests/mochitest/ajax/prototype/test/unit/tmp/Makefile.in b/dom/tests/mochitest/ajax/prototype/test/unit/tmp/Makefile.in
index c72f0f19a383..67125a47c234 100644
--- a/dom/tests/mochitest/ajax/prototype/test/unit/tmp/Makefile.in
+++ b/dom/tests/mochitest/ajax/prototype/test/unit/tmp/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES= \
 	ajax_test.html \
 	array_test.html \
@@ -28,5 +20,3 @@ MOCHITEST_FILES= \
 	string_test.html \
 	unit_test.html \
 	$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/tests/mochitest/ajax/scriptaculous/Makefile.in b/dom/tests/mochitest/ajax/scriptaculous/Makefile.in
index 274e8f8d24dd..c1c6656d8656 100644
--- a/dom/tests/mochitest/ajax/scriptaculous/Makefile.in
+++ b/dom/tests/mochitest/ajax/scriptaculous/Makefile.in
@@ -3,17 +3,7 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES	= \
 	manifest.json \
 	test_Scriptaculous.html \
 	$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/tests/mochitest/ajax/scriptaculous/lib/Makefile.in b/dom/tests/mochitest/ajax/scriptaculous/lib/Makefile.in
index 0ec4c44aca28..2011060d156e 100644
--- a/dom/tests/mochitest/ajax/scriptaculous/lib/Makefile.in
+++ b/dom/tests/mochitest/ajax/scriptaculous/lib/Makefile.in
@@ -3,16 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES	= \
 	prototype.js \
 	$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/tests/mochitest/ajax/scriptaculous/src/Makefile.in b/dom/tests/mochitest/ajax/scriptaculous/src/Makefile.in
index fa4e7259c3f4..01afaec7e286 100644
--- a/dom/tests/mochitest/ajax/scriptaculous/src/Makefile.in
+++ b/dom/tests/mochitest/ajax/scriptaculous/src/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES	= \
 	builder.js \
 	controls.js \
@@ -21,5 +13,3 @@ MOCHITEST_FILES	= \
 	sound.js \
 	unittest.js \
 	$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/tests/mochitest/ajax/scriptaculous/test/unit/Makefile.in b/dom/tests/mochitest/ajax/scriptaculous/test/unit/Makefile.in
index e380eb359b12..ef1a6eed59d5 100644
--- a/dom/tests/mochitest/ajax/scriptaculous/test/unit/Makefile.in
+++ b/dom/tests/mochitest/ajax/scriptaculous/test/unit/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES	= \
 	_ajax_inplaceeditor_result.html \
 	_ajax_inplaceeditor_text.html \
@@ -32,5 +24,3 @@ MOCHITEST_FILES	= \
 	string_test.html \
 	unit_test.html \
 	$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/tests/mochitest/bugs/Makefile.in b/dom/tests/mochitest/bugs/Makefile.in
index 7676344fc0e3..9d13cabe0f67 100644
--- a/dom/tests/mochitest/bugs/Makefile.in
+++ b/dom/tests/mochitest/bugs/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES	= \
 		test_bug42976.html \
 		test_bug49312.html \
@@ -148,5 +140,3 @@ MOCHITEST_FILES	= \
 		test_bug876098.html \
 		test_toJSON.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/tests/mochitest/chrome/Makefile.in b/dom/tests/mochitest/chrome/Makefile.in
index 0f95ef48381d..3e6fb8e5966c 100644
--- a/dom/tests/mochitest/chrome/Makefile.in
+++ b/dom/tests/mochitest/chrome/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_CHROME_FILES = \
 		MozEnteredDomFullscreen_chrome.xul \
 		fullscreen.xul \
@@ -88,5 +80,3 @@ MOCHITEST_CHROME_FILES += \
 else
 $(filter disabled-on-os-x-for-intermittent-failures--bug-798848, test_MozEnteredDomFullscreen_event.xul)
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/tests/mochitest/crypto/Makefile.in b/dom/tests/mochitest/crypto/Makefile.in
index 3ff37077fa6a..f1d29a129d40 100644
--- a/dom/tests/mochitest/crypto/Makefile.in
+++ b/dom/tests/mochitest/crypto/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   test_getRandomValues.html \
   $(NULL)
@@ -23,5 +15,3 @@ MOCHITEST_FILES += \
   test_no_legacy.html \
   $(NULL)
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/tests/mochitest/dom-level0/Makefile.in b/dom/tests/mochitest/dom-level0/Makefile.in
index f63a7e28e3d2..0b8b2e54b569 100644
--- a/dom/tests/mochitest/dom-level0/Makefile.in
+++ b/dom/tests/mochitest/dom-level0/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES	= \
 		test_crossdomainprops.html \
 		file_crossdomainprops_inner.html \
@@ -28,5 +20,3 @@ MOCHITEST_FILES	= \
 		test_location_sandboxed.html \
 		framed_location.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/tests/mochitest/dom-level1-core/Makefile.in b/dom/tests/mochitest/dom-level1-core/Makefile.in
index 59b161a7f6b5..98ea225b240b 100644
--- a/dom/tests/mochitest/dom-level1-core/Makefile.in
+++ b/dom/tests/mochitest/dom-level1-core/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES_A	= \
 		DOMTestCase.js \
 		activity-home.css \
@@ -567,5 +559,3 @@ MOCHITEST_FILES_G	= \
 # name is too long for Windows little brain.
 
 MOCHITEST_FILES_PARTS := $(foreach part,A B C D E F G,MOCHITEST_FILES_$(part))
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/tests/mochitest/dom-level1-core/files/Makefile.in b/dom/tests/mochitest/dom-level1-core/files/Makefile.in
index 79fb83147a54..e1dbea344071 100644
--- a/dom/tests/mochitest/dom-level1-core/files/Makefile.in
+++ b/dom/tests/mochitest/dom-level1-core/files/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES	= \
 		hc_nodtdstaff.html \
 		hc_nodtdstaff.xhtml \
@@ -32,5 +24,3 @@ MOCHITEST_FILES	= \
 		xhtml-symbol.ent \
 		xhtml1-strict.dtd \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/tests/mochitest/dom-level2-core/Makefile.in b/dom/tests/mochitest/dom-level2-core/Makefile.in
index e4fb99ac7c38..8381420a2bcb 100644
--- a/dom/tests/mochitest/dom-level2-core/Makefile.in
+++ b/dom/tests/mochitest/dom-level2-core/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES_A	= \
 		DOMTestCase.js \
 		exclusions.js \
@@ -275,5 +267,3 @@ MOCHITEST_FILES_F	= \
 		$(NULL)
 
 MOCHITEST_FILES_PARTS := $(foreach part,A B C D E F,MOCHITEST_FILES_$(part))
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/tests/mochitest/dom-level2-core/files/Makefile.in b/dom/tests/mochitest/dom-level2-core/files/Makefile.in
index 040846515509..5608244955a3 100644
--- a/dom/tests/mochitest/dom-level2-core/files/Makefile.in
+++ b/dom/tests/mochitest/dom-level2-core/files/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES	= \
 		hc_staff.html \
 		hc_staff.svg \
@@ -37,5 +29,3 @@ MOCHITEST_FILES	= \
 		xhtml1-strict.dtd \
 		xhtml1-transitional.dtd \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/tests/mochitest/dom-level2-html/Makefile.in b/dom/tests/mochitest/dom-level2-html/Makefile.in
index 09d51a240991..fecb72770389 100644
--- a/dom/tests/mochitest/dom-level2-html/Makefile.in
+++ b/dom/tests/mochitest/dom-level2-html/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES_A	= \
 		DOMTestCase.js \
 		test_anchor01.html \
@@ -696,5 +688,3 @@ MOCHITEST_FILES_F	= \
 		$(NULL)
 
 MOCHITEST_FILES_PARTS := $(foreach part,A B C D E,MOCHITEST_FILES_$(part))
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/tests/mochitest/dom-level2-html/files/Makefile.in b/dom/tests/mochitest/dom-level2-html/files/Makefile.in
index d2dc024d59cb..cc904ccfed22 100644
--- a/dom/tests/mochitest/dom-level2-html/files/Makefile.in
+++ b/dom/tests/mochitest/dom-level2-html/files/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES	= \
 		anchor.html \
 		anchor.xhtml \
@@ -218,5 +210,3 @@ MOCHITEST_FILES	= \
 		xhtml1-strict.dtd \
 		xhtml1-transitional.dtd \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/tests/mochitest/dom-level2-html/files/applets/org/w3c/domts/Makefile.in b/dom/tests/mochitest/dom-level2-html/files/applets/org/w3c/domts/Makefile.in
index 7de0bc4b8dbe..f8c35b15a81f 100644
--- a/dom/tests/mochitest/dom-level2-html/files/applets/org/w3c/domts/Makefile.in
+++ b/dom/tests/mochitest/dom-level2-html/files/applets/org/w3c/domts/Makefile.in
@@ -2,16 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   DOMTSApplet.class \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/tests/mochitest/gamepad/Makefile.in b/dom/tests/mochitest/gamepad/Makefile.in
index 3d63b0e083cd..90ff525e3f8a 100644
--- a/dom/tests/mochitest/gamepad/Makefile.in
+++ b/dom/tests/mochitest/gamepad/Makefile.in
@@ -2,14 +2,8 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
 relativesrcdir	= dom/tests/mochitest/gamepad
 
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = \
   test_gamepad.html \
   test_gamepad_connect_events.html \
@@ -20,5 +14,3 @@ MOCHITEST_FILES = \
   test_navigator_gamepads.html \
   mock_gamepad.js \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/tests/mochitest/general/Makefile.in b/dom/tests/mochitest/general/Makefile.in
index 99767603c247..a3ac0c8913f3 100644
--- a/dom/tests/mochitest/general/Makefile.in
+++ b/dom/tests/mochitest/general/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = \
 		test__content.html \
 		file_MozEnteredDomFullscreen.html \
@@ -67,5 +59,3 @@ MOCHITEST_CHROME_FILES = \
 		test_offsets.js \
                 test_offsets.css \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/tests/mochitest/geolocation/Makefile.in b/dom/tests/mochitest/geolocation/Makefile.in
index eec49e8dd702..3fa7bc435f2b 100644
--- a/dom/tests/mochitest/geolocation/Makefile.in
+++ b/dom/tests/mochitest/geolocation/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES	= \
 		test_allowCurrent.html \
 		test_allowWatch.html \
@@ -36,5 +28,3 @@ MOCHITEST_FILES	= \
 		network_geolocation.sjs \
 		windowTest.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/tests/mochitest/localstorage/Makefile.in b/dom/tests/mochitest/localstorage/Makefile.in
index e2f32625fc76..691b494bec42 100644
--- a/dom/tests/mochitest/localstorage/Makefile.in
+++ b/dom/tests/mochitest/localstorage/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES	= \
     frameAppIsolation.html \
     frameChromeSlave.html \
@@ -64,5 +56,3 @@ MOCHITEST_CHROME_FILES = \
     frame_clear_browser_data.html \
     page_blank.html \
     $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/tests/mochitest/notification/Makefile.in b/dom/tests/mochitest/notification/Makefile.in
index 1992c32c3775..95e35e3a85b5 100644
--- a/dom/tests/mochitest/notification/Makefile.in
+++ b/dom/tests/mochitest/notification/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_CHROME_FILES = \
 		test_system_principal.xul \
 		$(NULL)
@@ -23,5 +15,3 @@ MOCHITEST_FILES	= \
 		create_notification.html \
 		notification_common.js \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/tests/mochitest/orientation/Makefile.in b/dom/tests/mochitest/orientation/Makefile.in
index 75c7d02393b8..415cf52a34d4 100644
--- a/dom/tests/mochitest/orientation/Makefile.in
+++ b/dom/tests/mochitest/orientation/Makefile.in
@@ -2,17 +2,7 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES	= \
 		bug507902-frame.html \
 		test_bug507902.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/tests/mochitest/pointerlock/Makefile.in b/dom/tests/mochitest/pointerlock/Makefile.in
index fa6252c753e3..186a1e1122ec 100644
--- a/dom/tests/mochitest/pointerlock/Makefile.in
+++ b/dom/tests/mochitest/pointerlock/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH	= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir	= @srcdir@
-VPATH	= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES	= \
 		pointerlock_utils.js \
 		file_approval.html \
@@ -40,5 +32,3 @@ MOCHITEST_FILES += \
 else
 $(filter disabled-on-linux-for-intermittent-failures--bug-788164, test_pointerlock-api.html)
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/tests/mochitest/sessionstorage/Makefile.in b/dom/tests/mochitest/sessionstorage/Makefile.in
index b21aeb69c345..73b0080ba6fb 100644
--- a/dom/tests/mochitest/sessionstorage/Makefile.in
+++ b/dom/tests/mochitest/sessionstorage/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES	= \
     frameReplace.html \
     frameEqual.html \
@@ -30,5 +22,3 @@ MOCHITEST_FILES	= \
 MOCHITEST_CHROME_FILES = \
     test_sessionStorageFromChrome.xhtml \
     $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/tests/mochitest/storageevent/Makefile.in b/dom/tests/mochitest/storageevent/Makefile.in
index 2f2508f68823..a95342b7f0ad 100644
--- a/dom/tests/mochitest/storageevent/Makefile.in
+++ b/dom/tests/mochitest/storageevent/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES	= \
     frameLocalStorageMaster.html \
     frameLocalStorageSlaveEqual.html \
@@ -26,5 +18,3 @@ MOCHITEST_FILES	= \
     interOriginFrame.js \
     interOriginTest2.js \
     $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/tests/mochitest/webapps/Makefile.in b/dom/tests/mochitest/webapps/Makefile.in
index 046a2fb53d88..b995bf27cf73 100644
--- a/dom/tests/mochitest/webapps/Makefile.in
+++ b/dom/tests/mochitest/webapps/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH	 = @DEPTH@
-topsrcdir	 = @top_srcdir@
-srcdir	= @srcdir@
-VPATH	 = @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_CHROME_FILES = \
     install_and_redirect_helper.xul \
     cross_origin.html \
@@ -33,5 +25,3 @@ MOCHITEST_FILES = \
     file_bug_779982.js \
     file_bug_779982.html \
     $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/tests/mochitest/webapps/apps/Makefile.in b/dom/tests/mochitest/webapps/apps/Makefile.in
index b88db945c6e2..717f28281e30 100644
--- a/dom/tests/mochitest/webapps/apps/Makefile.in
+++ b/dom/tests/mochitest/webapps/apps/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH	 = @DEPTH@
-topsrcdir	 = @top_srcdir@
-srcdir	= @srcdir@
-VPATH	 = @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_CHROME_FILES	= \
     basic.webapp \
     basic.webapp^headers^ \
@@ -43,5 +35,3 @@ MOCHITEST_CHROME_FILES	= \
     launch_paths.webapp \
     launch_paths.webapp^headers^ \
     $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/tests/mochitest/webcomponents/Makefile.in b/dom/tests/mochitest/webcomponents/Makefile.in
index edbccbe396f5..31d9651e603d 100644
--- a/dom/tests/mochitest/webcomponents/Makefile.in
+++ b/dom/tests/mochitest/webcomponents/Makefile.in
@@ -2,19 +2,9 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES	= \
 		test_bug900724.html \
 		test_document_register.html \
 		test_document_register_lifecycle.html \
 		test_template.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/tests/mochitest/whatwg/Makefile.in b/dom/tests/mochitest/whatwg/Makefile.in
index 2c4a6653d355..a89e812a7e41 100644
--- a/dom/tests/mochitest/whatwg/Makefile.in
+++ b/dom/tests/mochitest/whatwg/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES	= \
 		browserFu.js \
 		test_MessageEvent.html \
@@ -57,5 +49,3 @@ MOCHITEST_FILES	= \
 MOCHITEST_CHROME_FILES	= \
 		test_postMessage_chrome.html \
 		$(NULL)		
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/time/Makefile.in b/dom/time/Makefile.in
index 50514d426872..77e0fd397397 100644
--- a/dom/time/Makefile.in
+++ b/dom/time/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH            = @DEPTH@
-topsrcdir        = @top_srcdir@
-srcdir           = @srcdir@
-VPATH            = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/dom/dom-config.mk
 
 include $(topsrcdir)/config/rules.mk
diff --git a/dom/voicemail/Makefile.in b/dom/voicemail/Makefile.in
index 143590c476a8..e2f1f0e33732 100644
--- a/dom/voicemail/Makefile.in
+++ b/dom/voicemail/Makefile.in
@@ -2,14 +2,4 @@
 # 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/.
 
-DEPTH            = @DEPTH@
-topsrcdir        = @top_srcdir@
-srcdir           = @srcdir@
-VPATH            = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/dom/dom-config.mk
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/dom/wifi/Makefile.in b/dom/wifi/Makefile.in
index 1e569fdf9c16..6900248f94b1 100644
--- a/dom/wifi/Makefile.in
+++ b/dom/wifi/Makefile.in
@@ -2,17 +2,6 @@
 # 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/.
 
-DEPTH            = @DEPTH@
-topsrcdir        = @top_srcdir@
-srcdir           = @srcdir@
-VPATH            = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY   = 1
 
 include $(topsrcdir)/dom/dom-config.mk
-
-include $(topsrcdir)/config/rules.mk
-
-
diff --git a/dom/workers/Makefile.in b/dom/workers/Makefile.in
index 511613ed3e61..36593c7eca77 100644
--- a/dom/workers/Makefile.in
+++ b/dom/workers/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH            = @DEPTH@
-topsrcdir        = @top_srcdir@
-srcdir           = @srcdir@
-VPATH            = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES = \
   -I$(topsrcdir)/content/base/src \
   -I$(topsrcdir)/content/events/src \
@@ -16,5 +9,3 @@ LOCAL_INCLUDES = \
   -I$(topsrcdir)/dom/system \
   -I$(topsrcdir)/xpcom/build \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/workers/test/Makefile.in b/dom/workers/test/Makefile.in
index 505073489208..f6913ac62e0d 100644
--- a/dom/workers/test/Makefile.in
+++ b/dom/workers/test/Makefile.in
@@ -2,15 +2,6 @@
 # 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/.
 
-DEPTH            = @DEPTH@
-topsrcdir        = @top_srcdir@
-srcdir           = @srcdir@
-VPATH            = @srcdir@
-
-relativesrcdir   = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = \
   test_404.html \
   test_atob.html \
@@ -154,5 +145,3 @@ MOCHITEST_CHROME_FILES = \
   test_bug883784.jsm \
   jsm_url_worker.js \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/workers/test/extensions/bootstrap/Makefile.in b/dom/workers/test/extensions/bootstrap/Makefile.in
index 96b08d1be7dc..eab7a52c57b3 100644
--- a/dom/workers/test/extensions/bootstrap/Makefile.in
+++ b/dom/workers/test/extensions/bootstrap/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH            = @DEPTH@
-topsrcdir        = @top_srcdir@
-srcdir           = @srcdir@
-VPATH            = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 XPI_NAME = workerbootstrap
 
 DIST_FILES = \
diff --git a/dom/workers/test/extensions/traditional/Makefile.in b/dom/workers/test/extensions/traditional/Makefile.in
index 07f0fb213f0a..d3db4c7e1ccd 100644
--- a/dom/workers/test/extensions/traditional/Makefile.in
+++ b/dom/workers/test/extensions/traditional/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH            = @DEPTH@
-topsrcdir        = @top_srcdir@
-srcdir           = @srcdir@
-VPATH            = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 XPI_NAME = worker
 DIST_FILES = \
   install.rdf \
diff --git a/dom/workers/test/subdir/Makefile.in b/dom/workers/test/subdir/Makefile.in
index 621db8dc83de..5553563e2266 100644
--- a/dom/workers/test/subdir/Makefile.in
+++ b/dom/workers/test/subdir/Makefile.in
@@ -2,18 +2,8 @@
 # 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/.
 
-DEPTH            = @DEPTH@
-topsrcdir        = @top_srcdir@
-srcdir           = @srcdir@
-VPATH            = @srcdir@
-relativesrcdir   = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES := \
   relativeLoad_sub_worker.js \
   relativeLoad_sub_worker2.js \
   relativeLoad_sub_import.js \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/editor/composer/src/Makefile.in b/editor/composer/src/Makefile.in
index 592154674c59..8d9f821f0629 100644
--- a/editor/composer/src/Makefile.in
+++ b/editor/composer/src/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 include $(topsrcdir)/config/rules.mk
 
@@ -41,4 +34,3 @@ libs::
 
 install::
 	$(SYSINSTALL) $(IFLAGS1) $(_FILES) $(DESTDIR)$(mozappdir)/res
-
diff --git a/editor/composer/test/Makefile.in b/editor/composer/test/Makefile.in
index 52f5df77623c..2e9d17a4dd7e 100644
--- a/editor/composer/test/Makefile.in
+++ b/editor/composer/test/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = \
 		test_bug348497.html \
 		test_bug384147.html \
@@ -26,5 +18,3 @@ MOCHITEST_CHROME_FILES = \
 		test_bug678842.html \
 		test_async_UpdateCurrentDictionary.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/editor/libeditor/base/Makefile.in b/editor/libeditor/base/Makefile.in
index c140237a7b42..304d81aad2b4 100644
--- a/editor/libeditor/base/Makefile.in
+++ b/editor/libeditor/base/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES += \
 		-I$(topsrcdir)/editor/libeditor/text \
 		-I$(topsrcdir)/editor/txmgr/src \
@@ -18,5 +11,3 @@ LOCAL_INCLUDES += \
 		-I$(topsrcdir)/layout/style \
 		-I$(topsrcdir)/extensions/spellcheck/src \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/editor/libeditor/base/tests/Makefile.in b/editor/libeditor/base/tests/Makefile.in
index 10383b1dc260..9de17b442a91 100644
--- a/editor/libeditor/base/tests/Makefile.in
+++ b/editor/libeditor/base/tests/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = \
 		test_bug408231.html \
 		test_bug502673.html \
@@ -31,6 +23,3 @@ MOCHITEST_CHROME_FILES = \
 		test_dragdrop.html \
 		test_bug599983.xul \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/editor/libeditor/html/Makefile.in b/editor/libeditor/html/Makefile.in
index cfa7e057d407..158234971ce5 100644
--- a/editor/libeditor/html/Makefile.in
+++ b/editor/libeditor/html/Makefile.in
@@ -3,12 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES        += -I$(topsrcdir)/editor/libeditor/base \
diff --git a/editor/libeditor/html/tests/Makefile.in b/editor/libeditor/html/tests/Makefile.in
index 1ea47976605a..b9adc11dcafa 100644
--- a/editor/libeditor/html/tests/Makefile.in
+++ b/editor/libeditor/html/tests/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = \
 		green.png \
 		test_bug200416.html \
diff --git a/editor/libeditor/text/Makefile.in b/editor/libeditor/text/Makefile.in
index 6de6eac10bf0..bbc7083df0fe 100644
--- a/editor/libeditor/text/Makefile.in
+++ b/editor/libeditor/text/Makefile.in
@@ -3,12 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= \
diff --git a/editor/libeditor/text/tests/Makefile.in b/editor/libeditor/text/tests/Makefile.in
index 4417a8d1f88d..5a62866734b3 100644
--- a/editor/libeditor/text/tests/Makefile.in
+++ b/editor/libeditor/text/tests/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = \
 		test_bug318065.html \
 		test_bug471722.html \
@@ -51,6 +43,3 @@ MOCHITEST_CHROME_FILES = \
 		test_bug636465.xul \
 		test_bug830600.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/editor/txmgr/src/Makefile.in b/editor/txmgr/src/Makefile.in
index 230e328fd409..a328285626a1 100644
--- a/editor/txmgr/src/Makefile.in
+++ b/editor/txmgr/src/Makefile.in
@@ -3,12 +3,4 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
-include $(topsrcdir)/config/rules.mk
-
diff --git a/embedding/browser/build/Makefile.in b/embedding/browser/build/Makefile.in
index 553c1109a444..9adb707ba7e3 100644
--- a/embedding/browser/build/Makefile.in
+++ b/embedding/browser/build/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY	= 1
 SHARED_LIBRARY_LIBS= \
 		../webBrowser/$(LIB_PREFIX)nsWebBrowser_s.$(LIB_SUFFIX) \
diff --git a/embedding/browser/webBrowser/Makefile.in b/embedding/browser/webBrowser/Makefile.in
index 6eb70043309c..a909f0b1257b 100644
--- a/embedding/browser/webBrowser/Makefile.in
+++ b/embedding/browser/webBrowser/Makefile.in
@@ -3,16 +3,8 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES	= \
 		-I$(srcdir)/../../../content/base/src \
 		-I$(srcdir)/../../../content/svg/content/src \
 		$(NULL)
 		
-include $(topsrcdir)/config/rules.mk
diff --git a/embedding/components/build/Makefile.in b/embedding/components/build/Makefile.in
index d2e007471862..51927762849e 100644
--- a/embedding/components/build/Makefile.in
+++ b/embedding/components/build/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 SHARED_LIBRARY_LIBS = \
 	../windowwatcher/src/$(LIB_PREFIX)windowwatcher_s.$(LIB_SUFFIX) \
@@ -49,5 +42,3 @@ endif
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 LOCAL_INCLUDES += -I$(srcdir)/../printingui/src/mac
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/embedding/components/printingui/src/mac/Makefile.in b/embedding/components/printingui/src/mac/Makefile.in
index 94df80c131fb..84be2a747fe5 100644
--- a/embedding/components/printingui/src/mac/Makefile.in
+++ b/embedding/components/printingui/src/mac/Makefile.in
@@ -3,13 +3,4 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY	= ..
-include $(topsrcdir)/config/rules.mk
-
diff --git a/embedding/components/printingui/src/os2/Makefile.in b/embedding/components/printingui/src/os2/Makefile.in
index 94df80c131fb..84be2a747fe5 100644
--- a/embedding/components/printingui/src/os2/Makefile.in
+++ b/embedding/components/printingui/src/os2/Makefile.in
@@ -3,13 +3,4 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY	= ..
-include $(topsrcdir)/config/rules.mk
-
diff --git a/embedding/components/printingui/src/unixshared/Makefile.in b/embedding/components/printingui/src/unixshared/Makefile.in
index 94df80c131fb..84be2a747fe5 100644
--- a/embedding/components/printingui/src/unixshared/Makefile.in
+++ b/embedding/components/printingui/src/unixshared/Makefile.in
@@ -3,13 +3,4 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY	= ..
-include $(topsrcdir)/config/rules.mk
-
diff --git a/embedding/components/printingui/src/win/Makefile.in b/embedding/components/printingui/src/win/Makefile.in
index 94df80c131fb..84be2a747fe5 100644
--- a/embedding/components/printingui/src/win/Makefile.in
+++ b/embedding/components/printingui/src/win/Makefile.in
@@ -3,13 +3,4 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY	= ..
-include $(topsrcdir)/config/rules.mk
-
diff --git a/embedding/components/webbrowserpersist/src/Makefile.in b/embedding/components/webbrowserpersist/src/Makefile.in
index 3beef4b0faea..726d57a667e0 100644
--- a/embedding/components/webbrowserpersist/src/Makefile.in
+++ b/embedding/components/webbrowserpersist/src/Makefile.in
@@ -3,17 +3,9 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES	= \
 	-I$(topsrcdir)/content/html/content/src \
 	-I$(topsrcdir)/content/base/src \
 	$(NULL)
-
diff --git a/embedding/components/windowwatcher/src/Makefile.in b/embedding/components/windowwatcher/src/Makefile.in
index c199269872e1..dfe3232e3717 100644
--- a/embedding/components/windowwatcher/src/Makefile.in
+++ b/embedding/components/windowwatcher/src/Makefile.in
@@ -3,16 +3,7 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # For nsJSUtils
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/dom/base \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/embedding/test/Makefile.in b/embedding/test/Makefile.in
index 7842e2f33436..74b3841b66e4 100644
--- a/embedding/test/Makefile.in
+++ b/embedding/test/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = \
 	test_bug293834.html \
 	bug293834_form.html \
@@ -22,5 +14,3 @@ MOCHITEST_FILES = \
 	test_private_window_from_content.html \
 	test_window_open_units.html \
 	$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/embedding/tests/winEmbed/Makefile.in b/embedding/tests/winEmbed/Makefile.in
index e3caa35df4f7..d705d1f215db 100644
--- a/embedding/tests/winEmbed/Makefile.in
+++ b/embedding/tests/winEmbed/Makefile.in
@@ -27,13 +27,6 @@
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 XPI_NAME	= winembed
 
 RESFILE		= winEmbed.res
diff --git a/extensions/auth/Makefile.in b/extensions/auth/Makefile.in
index d6e846e05ef7..6c17e4e0fb18 100644
--- a/extensions/auth/Makefile.in
+++ b/extensions/auth/Makefile.in
@@ -3,16 +3,7 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY	= 1
 ifeq ($(OS_ARCH),WINNT)
 LOCAL_INCLUDES	+= -DUSE_SSPI
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/extensions/cookie/Makefile.in b/extensions/cookie/Makefile.in
index 711dc3a45219..ba6b76d8227d 100644
--- a/extensions/cookie/Makefile.in
+++ b/extensions/cookie/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
diff --git a/extensions/cookie/test/Makefile.in b/extensions/cookie/test/Makefile.in
index 2183452c6123..172973049f60 100644
--- a/extensions/cookie/test/Makefile.in
+++ b/extensions/cookie/test/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = \
   test_samedomain.html \
   file_testcommon.js \
@@ -60,6 +52,3 @@ MOCHITEST_CHROME_FILES = \
 MOCHITEST_BROWSER_FILES = \
   browser_test_favicon.js \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/extensions/gio/Makefile.in b/extensions/gio/Makefile.in
index f5a630c97d1f..89d651d4ed0c 100644
--- a/extensions/gio/Makefile.in
+++ b/extensions/gio/Makefile.in
@@ -3,14 +3,5 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY	= 1
 LOCAL_INCLUDES	= $(MOZ_GIO_CFLAGS)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/extensions/gnomevfs/Makefile.in b/extensions/gnomevfs/Makefile.in
index 7d64e9727f07..03ceda58873c 100644
--- a/extensions/gnomevfs/Makefile.in
+++ b/extensions/gnomevfs/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 SHORT_LIBNAME	= nkgnomevfs
 IS_COMPONENT	= 1
 
@@ -26,5 +19,3 @@ EXTRA_DSO_LDOPTS = \
 # application.  this is necessary since we don't want to force users
 # to install gnome-vfs2 in order to use the rest of mozilla ;-)
 FORCE_SHARED_LIB= 1
-
-include $(topsrcdir)/config/rules.mk
diff --git a/extensions/permissions/Makefile.in b/extensions/permissions/Makefile.in
index 3d29be25d141..f76e93c4ff53 100644
--- a/extensions/permissions/Makefile.in
+++ b/extensions/permissions/Makefile.in
@@ -2,12 +2,4 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY	= 1
-include $(topsrcdir)/config/rules.mk
diff --git a/extensions/pref/autoconfig/src/Makefile.in b/extensions/pref/autoconfig/src/Makefile.in
index ad702409c257..cb691ba431bb 100644
--- a/extensions/pref/autoconfig/src/Makefile.in
+++ b/extensions/pref/autoconfig/src/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH            = @DEPTH@
-topsrcdir        = @top_srcdir@
-srcdir           = @srcdir@
-VPATH            = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY   = 1
 AUTOCFG_JS_EXPORTS = \
 		$(srcdir)/prefcalls.js \
@@ -31,6 +24,3 @@ endif
 endif
 endif
 endif
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/extensions/spellcheck/hunspell/src/Makefile.in b/extensions/spellcheck/hunspell/src/Makefile.in
index 026922dd24d8..dae7fc079e3f 100644
--- a/extensions/spellcheck/hunspell/src/Makefile.in
+++ b/extensions/spellcheck/hunspell/src/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH           = @DEPTH@
-topsrcdir       = @top_srcdir@
-srcdir          = @srcdir@
-VPATH           = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 ifndef MOZ_NATIVE_HUNSPELL
 # This variable is referenced in configure.in.  Make sure to change that file
 # too if you need to change this variable.
diff --git a/extensions/spellcheck/locales/Makefile.in b/extensions/spellcheck/locales/Makefile.in
index cf6c11abf0c0..e31cf9b921e8 100644
--- a/extensions/spellcheck/locales/Makefile.in
+++ b/extensions/spellcheck/locales/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH          = @DEPTH@
-topsrcdir      = @top_srcdir@
-srcdir         = @srcdir@
-VPATH          = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 DEFINES += -DAB_CD=$(AB_CD)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/extensions/spellcheck/src/Makefile.in b/extensions/spellcheck/src/Makefile.in
index 83096b06e6b0..5d2370e06115 100644
--- a/extensions/spellcheck/src/Makefile.in
+++ b/extensions/spellcheck/src/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY  = 1
 SHARED_LIBRARY_LIBS += ../hunspell/src/$(LIB_PREFIX)hunspell_s.$(LIB_SUFFIX)
 
diff --git a/extensions/spellcheck/tests/chrome/Makefile.in b/extensions/spellcheck/tests/chrome/Makefile.in
index bbff6f6f0023..c2d73bea1341 100644
--- a/extensions/spellcheck/tests/chrome/Makefile.in
+++ b/extensions/spellcheck/tests/chrome/Makefile.in
@@ -3,15 +3,5 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_CHROME_FILES = 	test_add_remove_dictionaries.xul \
 				$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/extensions/spellcheck/tests/chrome/base/Makefile.in b/extensions/spellcheck/tests/chrome/base/Makefile.in
index 0965eaab3e52..f5c9c8c2776d 100644
--- a/extensions/spellcheck/tests/chrome/base/Makefile.in
+++ b/extensions/spellcheck/tests/chrome/base/Makefile.in
@@ -3,16 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_CHROME_FILES = 	base_utf.dic \
 				base_utf.aff \
 				$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/extensions/spellcheck/tests/chrome/map/Makefile.in b/extensions/spellcheck/tests/chrome/map/Makefile.in
index ca847d251cab..45e6d1b51698 100644
--- a/extensions/spellcheck/tests/chrome/map/Makefile.in
+++ b/extensions/spellcheck/tests/chrome/map/Makefile.in
@@ -3,16 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_CHROME_FILES = 	maputf.dic \
 				maputf.aff \
 				$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/extensions/universalchardet/src/xpcom/Makefile.in b/extensions/universalchardet/src/xpcom/Makefile.in
index 50cdbe77134b..99439ba0758c 100644
--- a/extensions/universalchardet/src/xpcom/Makefile.in
+++ b/extensions/universalchardet/src/xpcom/Makefile.in
@@ -3,18 +3,9 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY	= 1
 LOCAL_INCLUDES = -I$(srcdir)/../base
 
 SHARED_LIBRARY_LIBS = \
 		../base/$(LIB_PREFIX)universalchardet_s.$(LIB_SUFFIX) \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/extensions/universalchardet/tests/Makefile.in b/extensions/universalchardet/tests/Makefile.in
index 1f370bc62711..f1230640905e 100644
--- a/extensions/universalchardet/tests/Makefile.in
+++ b/extensions/universalchardet/tests/Makefile.in
@@ -3,15 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-relativesrcdir = @relativesrcdir@
-
 MOCHITEST_CHROME_FILES =	\
 		CharsetDetectionTests.js \
 		bug9357_text.html \
@@ -70,5 +61,3 @@ MOCHITEST_CHROME_FILES =	\
 		test_bug811363-2-8.html \
 		test_bug811363-2-9.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/extensions/widgetutils/Makefile.in b/extensions/widgetutils/Makefile.in
index f5dd24e99fd1..fcd3970d99c7 100644
--- a/extensions/widgetutils/Makefile.in
+++ b/extensions/widgetutils/Makefile.in
@@ -3,13 +3,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-DEPTH=@DEPTH@
-topsrcdir=@top_srcdir@
-srcdir=@srcdir@
-VPATH=@srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 XPI_NAME = widgetutils
 
 INSTALL_EXTENSION_ID = widgetutils@extensions.mozilla.org
@@ -26,5 +19,3 @@ XULAPP_DEFINES = \
 ifdef TARGET_XPCOM_ABI
 XULAPP_DEFINES += -DEM_ABI=$(OS_TARGET)_$(TARGET_XPCOM_ABI)
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/extensions/widgetutils/src/Makefile.in b/extensions/widgetutils/src/Makefile.in
index 75752ead81e9..09540c703510 100644
--- a/extensions/widgetutils/src/Makefile.in
+++ b/extensions/widgetutils/src/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 XPI_NAME	= widgetutils
 SHORT_LIBNAME = widgetutils
 FORCE_SHARED_LIB = 1
@@ -24,5 +17,3 @@ EXTRA_DSO_LDOPTS = \
 ifdef TARGET_XPCOM_ABI
 FINAL_TARGET=$(DIST)/xpi-stage/$(XPI_NAME)/platform/$(OS_TARGET)_$(TARGET_XPCOM_ABI)
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/gfx/2d/Makefile.in b/gfx/2d/Makefile.in
index 51a7000c80b5..ade29fb33189 100644
--- a/gfx/2d/Makefile.in
+++ b/gfx/2d/Makefile.in
@@ -3,13 +3,8 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
 VPATH		=  $(srcdir) $(srcdir)/unittest
 
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY	= 1
 
 DEFINES += -DMOZ_GFX -DUSE_CAIRO -DGFX2D_INTERNAL
diff --git a/gfx/angle/Makefile.in b/gfx/angle/Makefile.in
index a92b143c09e0..02097a9ee897 100644
--- a/gfx/angle/Makefile.in
+++ b/gfx/angle/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 ifeq (WINNT,$(OS_TARGET))
 VISIBILITY_FLAGS =
 endif
diff --git a/gfx/angle/src/libEGL/Makefile.in b/gfx/angle/src/libEGL/Makefile.in
index 00d9dcb40560..3570212c9a55 100644
--- a/gfx/angle/src/libEGL/Makefile.in
+++ b/gfx/angle/src/libEGL/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # On Windows, we don't automatically get "lib" prepended, but we need it.
 FORCE_SHARED_LIB = 1
 
diff --git a/gfx/angle/src/libGLESv2/Makefile.in b/gfx/angle/src/libGLESv2/Makefile.in
index 249a3cea4799..d7bba7508d97 100644
--- a/gfx/angle/src/libGLESv2/Makefile.in
+++ b/gfx/angle/src/libGLESv2/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # On Windows, we don't automatically get "lib" prepended, but we need it.
 FORCE_SHARED_LIB = 1
 
diff --git a/gfx/cairo/cairo/src/Makefile.in b/gfx/cairo/cairo/src/Makefile.in
index 993d7d2d6c7f..b6559ac3ba85 100644
--- a/gfx/cairo/cairo/src/Makefile.in
+++ b/gfx/cairo/cairo/src/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH           = @DEPTH@
-topsrcdir       = @top_srcdir@
-srcdir          = @srcdir@
-VPATH           = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 ifdef GNU_CC
 ifeq ($(OS_TARGET),Android)
 MODULE_OPTIMIZE_FLAGS = -O2
@@ -130,4 +123,3 @@ endif
 ifdef MOZ_TREE_FREETYPE
 DEFINES += -DHAVE_FT_LIBRARY_SETLCDFILTER -DFT_LCD_FILTER_H="$(topsrcdir)/modules/freetype2/include/freetype/ftlcdfil.h"
 endif
-
diff --git a/gfx/cairo/libpixman/src/Makefile.in b/gfx/cairo/libpixman/src/Makefile.in
index 2b3ad7f7f428..59d6cb0b2fc5 100644
--- a/gfx/cairo/libpixman/src/Makefile.in
+++ b/gfx/cairo/libpixman/src/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 ifeq ($(OS_TARGET),Android)
 MODULE_OPTIMIZE_FLAGS = -O2
 endif
diff --git a/gfx/gl/Makefile.in b/gfx/gl/Makefile.in
index 4e756f242141..c2ecd980dc3f 100644
--- a/gfx/gl/Makefile.in
+++ b/gfx/gl/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY   = 1
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 ifdef MOZ_WEBGL
diff --git a/gfx/graphite2/src/Makefile.in b/gfx/graphite2/src/Makefile.in
index c9ffeb519c0f..a35b5795f65f 100644
--- a/gfx/graphite2/src/Makefile.in
+++ b/gfx/graphite2/src/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # parameters for the Graphite2 files.mk fragment
 _NS =
 _BASE = $(srcdir)/..
@@ -45,4 +38,3 @@ DEFINES += -DGRAPHITE2_NFILEFACE -DGRAPHITE2_NTRACING -DGRAPHITE2_NSEGCACHE
 # provide a custom header that overrides malloc() and friends,
 # to ensure safe OOM handling
 DEFINES += -DGRAPHITE2_CUSTOM_HEADER="\"MozGrMalloc.h\""
-
diff --git a/gfx/harfbuzz/src/Makefile.in b/gfx/harfbuzz/src/Makefile.in
index 7ae75a3efd3d..175ab227ecf8 100644
--- a/gfx/harfbuzz/src/Makefile.in
+++ b/gfx/harfbuzz/src/Makefile.in
@@ -25,13 +25,6 @@
 #
 
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 ifeq ($(OS_ARCH),WINNT)
 FORCE_STATIC_LIB = 1
 endif
diff --git a/gfx/ipc/Makefile.in b/gfx/ipc/Makefile.in
index ae6071cd0f73..080924560802 100644
--- a/gfx/ipc/Makefile.in
+++ b/gfx/ipc/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH       = @DEPTH@
-topsrcdir   = @top_srcdir@
-srcdir      = @srcdir@
-VPATH       = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY     = 1
 
 include $(topsrcdir)/config/rules.mk
diff --git a/gfx/layers/Makefile.in b/gfx/layers/Makefile.in
index 110e22ae6f99..6cb91ac2cc7d 100644
--- a/gfx/layers/Makefile.in
+++ b/gfx/layers/Makefile.in
@@ -3,9 +3,6 @@
 # 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/.
 
-DEPTH       = @DEPTH@
-topsrcdir   = @top_srcdir@
-srcdir      = @srcdir@
 VPATH       = \
   $(srcdir) \
   $(srcdir)/basic \
@@ -18,8 +15,6 @@ VPATH       = \
   $(srcdir)/ipc \
   $(NULL)
 
-include $(DEPTH)/config/autoconf.mk
-
 ifdef MOZ_DEBUG
 DEFINES += -DD3D_DEBUG_INFO
 endif
diff --git a/gfx/ots/src/Makefile.in b/gfx/ots/src/Makefile.in
index 39a44bce6807..eb64e21db8f2 100644
--- a/gfx/ots/src/Makefile.in
+++ b/gfx/ots/src/Makefile.in
@@ -25,13 +25,6 @@
 #
 
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 ifeq (WINNT,$(OS_TARGET))
 VISIBILITY_FLAGS =
 FORCE_STATIC_LIB = 1
@@ -50,4 +43,3 @@ DEFINES += -DMOZ_OTS_REPORT_ERRORS
 ifeq (WINNT,$(OS_TARGET))
 DEFINES += -DOTS_DLL -DOTS_DLL_EXPORTS
 endif
-
diff --git a/gfx/qcms/Makefile.in b/gfx/qcms/Makefile.in
index 61a8f7857621..109ba3530e29 100644
--- a/gfx/qcms/Makefile.in
+++ b/gfx/qcms/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 ifeq (86,$(findstring 86,$(OS_TEST)))
 CSRCS += transform-sse2.c
 ifdef _MSC_VER
diff --git a/gfx/skia/Makefile.in b/gfx/skia/Makefile.in
index d617e2488104..84014b919c73 100644
--- a/gfx/skia/Makefile.in
+++ b/gfx/skia/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY  = 1
 
 DEFINES += -DSK_A32_SHIFT=24 -DSK_R32_SHIFT=16 -DSK_G32_SHIFT=8 -DSK_B32_SHIFT=0
diff --git a/gfx/src/Makefile.in b/gfx/src/Makefile.in
index 47b98f128ee7..a5ef9f40b0e2 100644
--- a/gfx/src/Makefile.in
+++ b/gfx/src/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH       = @DEPTH@
-topsrcdir   = @top_srcdir@
-srcdir      = @srcdir@
-VPATH       = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 include $(topsrcdir)/config/rules.mk
 
@@ -26,4 +19,3 @@ endif
 ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
 CXXFLAGS += $(MOZ_QT_CFLAGS)
 endif
-
diff --git a/gfx/tests/Makefile.in b/gfx/tests/Makefile.in
index e6e23ad46783..a1c1936508ff 100644
--- a/gfx/tests/Makefile.in
+++ b/gfx/tests/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOZILLA_INTERNAL_API = 1
 
 MOCHITEST_FILES = $(addprefix mochitest/, \
@@ -18,6 +10,3 @@ MOCHITEST_FILES = $(addprefix mochitest/, \
 	test_bug513439.html \
 	test_acceleration.html \
 )
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/gfx/tests/gtest/Makefile.in b/gfx/tests/gtest/Makefile.in
index 34bf9654a9b2..a6b395bd8d61 100644
--- a/gfx/tests/gtest/Makefile.in
+++ b/gfx/tests/gtest/Makefile.in
@@ -3,14 +3,7 @@
 # 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/.
 
-DEPTH          = @DEPTH@
-topsrcdir      = @top_srcdir@
-srcdir         = @srcdir@
 VPATH          = @srcdir@ $(srcdir)/$(DEPTH)/gfx/2d/unittest
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS) $(TK_CFLAGS) 
 
 # Create a GTest library
@@ -24,4 +17,3 @@ LOCAL_INCLUDES = \
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
-
diff --git a/gfx/thebes/Makefile.in b/gfx/thebes/Makefile.in
index e68c767141c3..d74556f48ede 100644
--- a/gfx/thebes/Makefile.in
+++ b/gfx/thebes/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY	= 1
 
 LOCAL_INCLUDES += \
diff --git a/gfx/ycbcr/Makefile.in b/gfx/ycbcr/Makefile.in
index dde0947edd09..f46fc241f733 100644
--- a/gfx/ycbcr/Makefile.in
+++ b/gfx/ycbcr/Makefile.in
@@ -1,10 +1,3 @@
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 
 include $(topsrcdir)/config/rules.mk
diff --git a/hal/Makefile.in b/hal/Makefile.in
index b9fb880a43a6..c01fc96070ee 100644
--- a/hal/Makefile.in
+++ b/hal/Makefile.in
@@ -3,9 +3,6 @@
 # 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/.
 
-DEPTH       = @DEPTH@
-topsrcdir   = @top_srcdir@
-srcdir      = @srcdir@
 VPATH       = \
   $(srcdir) \
   $(srcdir)/android \
@@ -17,10 +14,6 @@ VPATH       = \
   $(srcdir)/cocoa \
   $(NULL)
 
-relativesrcdir   = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 MOCHITEST_BROWSER_FILES += \
 	tests/browser_alarms.js \
diff --git a/hal/tests/Makefile.in b/hal/tests/Makefile.in
index 9243c8a21f91..b61119f23dd1 100644
--- a/hal/tests/Makefile.in
+++ b/hal/tests/Makefile.in
@@ -2,17 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES = \
   browser_alarms.js \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/image/build/Makefile.in b/image/build/Makefile.in
index 7f4cb4668982..20eb0a62612c 100644
--- a/image/build/Makefile.in
+++ b/image/build/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 LOCAL_INCLUDES	= \
 		-I. \
@@ -28,6 +21,3 @@ SHARED_LIBRARY_LIBS = \
 		../encoders/jpeg/$(LIB_PREFIX)imgjpege_s.$(LIB_SUFFIX) \
 		../encoders/bmp/$(LIB_PREFIX)imgbmpe_s.$(LIB_SUFFIX) \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/image/decoders/Makefile.in b/image/decoders/Makefile.in
index 559787ae8f4c..6166e3bcf477 100644
--- a/image/decoders/Makefile.in
+++ b/image/decoders/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # Decoders need RasterImage.h
 LOCAL_INCLUDES += -I$(topsrcdir)/image/src/
 
@@ -17,6 +10,3 @@ LOCAL_INCLUDES += -I$(topsrcdir)/image/src/
 DEFINES		+= -DMOZ_PNG_WRITE \
 	-DMOZ_PNG_READ \
 	$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/image/decoders/icon/Makefile.in b/image/decoders/icon/Makefile.in
index 819ac56dd687..70fb6e4fb7ec 100644
--- a/image/decoders/icon/Makefile.in
+++ b/image/decoders/icon/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 ifdef MOZ_WIDGET_GTK
 PLATFORM = gtk
@@ -38,5 +31,3 @@ endif
 SHARED_LIBRARY_LIBS = $(PLATFORM)/$(LIB_PREFIX)imgicon$(PLATFORM)_s.$(LIB_SUFFIX)
 
 LOCAL_INCLUDES	= -I$(srcdir)/$(PLATFORM)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/image/decoders/icon/android/Makefile.in b/image/decoders/icon/android/Makefile.in
index 75370a8aeeb3..deb6de83a14b 100644
--- a/image/decoders/icon/android/Makefile.in
+++ b/image/decoders/icon/android/Makefile.in
@@ -2,12 +2,5 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
diff --git a/image/decoders/icon/gtk/Makefile.in b/image/decoders/icon/gtk/Makefile.in
index fa149a883cc2..322deeed827e 100644
--- a/image/decoders/icon/gtk/Makefile.in
+++ b/image/decoders/icon/gtk/Makefile.in
@@ -3,18 +3,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 ifdef MOZ_ENABLE_GNOMEUI
 LOCAL_INCLUDES += $(MOZ_GNOMEUI_CFLAGS)
 else
 LOCAL_INCLUDES += $(TK_CFLAGS)
 endif
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/image/decoders/icon/qt/Makefile.in b/image/decoders/icon/qt/Makefile.in
index f6f6be105e51..80ab8e2a0e08 100644
--- a/image/decoders/icon/qt/Makefile.in
+++ b/image/decoders/icon/qt/Makefile.in
@@ -2,14 +2,4 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES += $(MOZ_QT_CFLAGS)
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/image/encoders/bmp/Makefile.in b/image/encoders/bmp/Makefile.in
index 52ec2fb1cb10..bfdc5f722b8e 100644
--- a/image/encoders/bmp/Makefile.in
+++ b/image/encoders/bmp/Makefile.in
@@ -2,15 +2,4 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES += -I$(topsrcdir)/image/src/
-
-include $(topsrcdir)/config/rules.mk
-
-
diff --git a/image/encoders/ico/Makefile.in b/image/encoders/ico/Makefile.in
index 613a91c2a8c0..5d17eab6513f 100644
--- a/image/encoders/ico/Makefile.in
+++ b/image/encoders/ico/Makefile.in
@@ -2,18 +2,7 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # Decoders need RasterImage.h
 LOCAL_INCLUDES += -I$(topsrcdir)/image/src/
 LOCAL_INCLUDES += -I$(topsrcdir)/image/encoders/bmp/
 LOCAL_INCLUDES += -I$(topsrcdir)/image/encoders/png/
-
-include $(topsrcdir)/config/rules.mk
-
-
diff --git a/image/encoders/png/Makefile.in b/image/encoders/png/Makefile.in
index 2bb1a80ada2c..d6affc6a8629 100644
--- a/image/encoders/png/Makefile.in
+++ b/image/encoders/png/Makefile.in
@@ -2,19 +2,8 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 DEFINES		+= -DMOZ_PNG_WRITE \
 	-DMOZ_PNG_READ \
 	$(NULL)
 
 LOCAL_INCLUDES += -I$(topsrcdir)/image/src/
-
-include $(topsrcdir)/config/rules.mk
-
-
diff --git a/image/src/Makefile.in b/image/src/Makefile.in
index b74bb645caff..fdbef391ae41 100644
--- a/image/src/Makefile.in
+++ b/image/src/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-
 # We need to instantiate the decoders
 LOCAL_INCLUDES += -I$(topsrcdir)/image/decoders
 
@@ -31,5 +23,3 @@ include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 # Because imgFrame.cpp includes "cairo.h"
 CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS)
-
-
diff --git a/image/test/browser/Makefile.in b/image/test/browser/Makefile.in
index c021eed9a214..24b1f27bc55c 100644
--- a/image/test/browser/Makefile.in
+++ b/image/test/browser/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES = head.js \
   browser_image.js \
   image.html \
@@ -19,5 +11,3 @@ MOCHITEST_BROWSER_FILES = head.js \
   browser_bug666317.js \
   big.png \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/image/test/mochitest/Makefile.in b/image/test/mochitest/Makefile.in
index 3935249e5100..30c46a52454a 100644
--- a/image/test/mochitest/Makefile.in
+++ b/image/test/mochitest/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES =   imgutils.js \
                 animationPolling.js \
                 lime100x100.svg \
@@ -118,5 +110,3 @@ MOCHITEST_CHROME_FILES = imgutils.js \
                 animated2.gif \
                 test_staticClone.html \
                 $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/intl/build/Makefile.in b/intl/build/Makefile.in
index e3bd610b8793..dd211dae7af3 100644
--- a/intl/build/Makefile.in
+++ b/intl/build/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 
 # see also intl/locale/src/Makefile.in
@@ -39,5 +32,3 @@ SHARED_LIBRARY_LIBS = \
 			../locale/src/$(LOCALE_DIR)/$(LIB_PREFIX)platlocale_s.$(LIB_SUFFIX) \
 			../hyphenation/src/$(HYPHENATION_DIR)/$(LIB_PREFIX)hyphenation_s.$(LIB_SUFFIX) \
 			$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/intl/chardet/src/Makefile.in b/intl/chardet/src/Makefile.in
index 7cd163587f08..a328285626a1 100644
--- a/intl/chardet/src/Makefile.in
+++ b/intl/chardet/src/Makefile.in
@@ -3,12 +3,4 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
-include $(topsrcdir)/config/rules.mk
diff --git a/intl/locale/src/Makefile.in b/intl/locale/src/Makefile.in
index 6432650f77d0..18a8c686093f 100644
--- a/intl/locale/src/Makefile.in
+++ b/intl/locale/src/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 ifeq ($(MOZ_WIDGET_TOOLKIT), qt)
 OS_INCLUDES	+= $(MOZ_QT_CFLAGS)
 endif
diff --git a/intl/locale/src/mac/Makefile.in b/intl/locale/src/mac/Makefile.in
index 170eb4439f77..048239d29939 100644
--- a/intl/locale/src/mac/Makefile.in
+++ b/intl/locale/src/mac/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= -I$(srcdir)/..
diff --git a/intl/locale/src/os2/Makefile.in b/intl/locale/src/os2/Makefile.in
index 4c7b1925769d..18e043473fb5 100644
--- a/intl/locale/src/os2/Makefile.in
+++ b/intl/locale/src/os2/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 include $(topsrcdir)/config/rules.mk
 
diff --git a/intl/locale/src/unix/Makefile.in b/intl/locale/src/unix/Makefile.in
index cd8fc6a9f664..22d86ca39423 100644
--- a/intl/locale/src/unix/Makefile.in
+++ b/intl/locale/src/unix/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= -I$(srcdir)/..
diff --git a/intl/locale/src/windows/Makefile.in b/intl/locale/src/windows/Makefile.in
index 596b7dfd724e..d432c3df3bcc 100644
--- a/intl/locale/src/windows/Makefile.in
+++ b/intl/locale/src/windows/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= -I$(srcdir)/..
diff --git a/intl/locales/Makefile.in b/intl/locales/Makefile.in
index 4490abd17ee6..850178990fb5 100644
--- a/intl/locales/Makefile.in
+++ b/intl/locales/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH          = @DEPTH@
-topsrcdir      = @top_srcdir@
-srcdir         = @srcdir@
-VPATH          = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 DEFINES += -DAB_CD=$(AB_CD)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/intl/lwbrk/src/Makefile.in b/intl/lwbrk/src/Makefile.in
index 9d01272aa376..da28c981e5e0 100644
--- a/intl/lwbrk/src/Makefile.in
+++ b/intl/lwbrk/src/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 ifdef MOZ_WIDGET_GTK
diff --git a/intl/lwbrk/tests/Makefile.in b/intl/lwbrk/tests/Makefile.in
index ebac01404634..a859ba938a52 100644
--- a/intl/lwbrk/tests/Makefile.in
+++ b/intl/lwbrk/tests/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES	= -I$(srcdir)/../public
diff --git a/intl/uconv/src/Makefile.in b/intl/uconv/src/Makefile.in
index d57c8df4e2a0..9622fe8028ee 100644
--- a/intl/uconv/src/Makefile.in
+++ b/intl/uconv/src/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY  = 1
 LOCAL_INCLUDES	= -I$(srcdir)/../util \
 		  -I$(srcdir)/../ucvlatin \
diff --git a/intl/uconv/tests/Makefile.in b/intl/uconv/tests/Makefile.in
index 7e216b794096..097b2c95bef7 100644
--- a/intl/uconv/tests/Makefile.in
+++ b/intl/uconv/tests/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES =	\
 		test_bug335816.html \
 		test_bug843434.html \
@@ -21,5 +13,3 @@ MOCHITEST_FILES =	\
 		test_unicode_noncharacters_utf8.html \
 		test_utf8_overconsumption.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/intl/uconv/tools/Makefile.in b/intl/uconv/tools/Makefile.in
index d6d26bb03ee8..7643298750af 100644
--- a/intl/uconv/tools/Makefile.in
+++ b/intl/uconv/tools/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 # needed for mac linux
@@ -18,4 +11,3 @@ ifneq ($(OS_RELEASE),1.2)
 OS_LIBS		+= /usr/lib/libdl.so
 endif
 endif
-
diff --git a/intl/uconv/ucvcn/Makefile.in b/intl/uconv/ucvcn/Makefile.in
index 9ccce15a2d87..ed7d3d8d1a38 100644
--- a/intl/uconv/ucvcn/Makefile.in
+++ b/intl/uconv/ucvcn/Makefile.in
@@ -3,13 +3,4 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES = -I$(srcdir)/../util
-
-include $(topsrcdir)/config/rules.mk
diff --git a/intl/uconv/ucvibm/Makefile.in b/intl/uconv/ucvibm/Makefile.in
index 9ccce15a2d87..ed7d3d8d1a38 100644
--- a/intl/uconv/ucvibm/Makefile.in
+++ b/intl/uconv/ucvibm/Makefile.in
@@ -3,13 +3,4 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES = -I$(srcdir)/../util
-
-include $(topsrcdir)/config/rules.mk
diff --git a/intl/uconv/ucvja/Makefile.in b/intl/uconv/ucvja/Makefile.in
index f42ee4ba1892..0ae97e279079 100644
--- a/intl/uconv/ucvja/Makefile.in
+++ b/intl/uconv/ucvja/Makefile.in
@@ -3,14 +3,4 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES	= -I$(srcdir)/../util
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/intl/uconv/ucvko/Makefile.in b/intl/uconv/ucvko/Makefile.in
index 77417d245458..ed7d3d8d1a38 100644
--- a/intl/uconv/ucvko/Makefile.in
+++ b/intl/uconv/ucvko/Makefile.in
@@ -3,14 +3,4 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES = -I$(srcdir)/../util
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/intl/uconv/ucvlatin/Makefile.in b/intl/uconv/ucvlatin/Makefile.in
index ae3abe6bb548..d5cea2de78d3 100644
--- a/intl/uconv/ucvlatin/Makefile.in
+++ b/intl/uconv/ucvlatin/Makefile.in
@@ -3,13 +3,4 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES = -I$(srcdir)/../util -I$(srcdir)/../src
-
-include $(topsrcdir)/config/rules.mk
diff --git a/intl/uconv/ucvtw/Makefile.in b/intl/uconv/ucvtw/Makefile.in
index 9ccce15a2d87..ed7d3d8d1a38 100644
--- a/intl/uconv/ucvtw/Makefile.in
+++ b/intl/uconv/ucvtw/Makefile.in
@@ -3,13 +3,4 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES = -I$(srcdir)/../util
-
-include $(topsrcdir)/config/rules.mk
diff --git a/intl/uconv/ucvtw2/Makefile.in b/intl/uconv/ucvtw2/Makefile.in
index f42ee4ba1892..0ae97e279079 100644
--- a/intl/uconv/ucvtw2/Makefile.in
+++ b/intl/uconv/ucvtw2/Makefile.in
@@ -3,14 +3,4 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES	= -I$(srcdir)/../util
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/intl/uconv/util/Makefile.in b/intl/uconv/util/Makefile.in
index a67f1930d843..a328285626a1 100644
--- a/intl/uconv/util/Makefile.in
+++ b/intl/uconv/util/Makefile.in
@@ -3,13 +3,4 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
-include $(topsrcdir)/config/rules.mk
-
diff --git a/intl/unicharutil/tables/Makefile.in b/intl/unicharutil/tables/Makefile.in
index caff6062e6e5..f4e2c26c732d 100644
--- a/intl/unicharutil/tables/Makefile.in
+++ b/intl/unicharutil/tables/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 _PROP_TABLES = \
@@ -31,4 +24,3 @@ libs:: $(_PROP_TABLES)
 
 install:: $(_PROP_TABLES)
 	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/res/entityTables
-
diff --git a/intl/unicharutil/tests/Makefile.in b/intl/unicharutil/tests/Makefile.in
index 042d0c42f2ed..40299b69d968 100644
--- a/intl/unicharutil/tests/Makefile.in
+++ b/intl/unicharutil/tests/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 USE_STATIC_LIBS = 1
 
 LIBS		= \
@@ -23,4 +15,3 @@ LIBS		= \
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= -I$(srcdir)/../public
-
diff --git a/intl/unicharutil/tools/Makefile.in b/intl/unicharutil/tools/Makefile.in
index 18d899e6f64e..2b8ac433b008 100644
--- a/intl/unicharutil/tools/Makefile.in
+++ b/intl/unicharutil/tools/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # XXX need configure test
 EX_LIBS		= $(shell $(GLIB_CONFIG) --libs)
 
@@ -17,4 +10,3 @@ include $(topsrcdir)/config/rules.mk
 
 # XXX replace with proper configure test for glib
 CFLAGS		+= $(shell $(GLIB_CONFIG) --cflags)
-
diff --git a/intl/unicharutil/util/Makefile.in b/intl/unicharutil/util/Makefile.in
index b8d4c2a02568..ba4967aa4143 100644
--- a/intl/unicharutil/util/Makefile.in
+++ b/intl/unicharutil/util/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # This makefile builds the unicharutil_external_s library which should be used
 # by frozen (dependent) linkage components. Internal-linkage code should use
 # unicharutil_s which is built in the internal/ subdirectory.
diff --git a/intl/unicharutil/util/internal/Makefile.in b/intl/unicharutil/util/internal/Makefile.in
index 7e0811da40de..2db7551de712 100644
--- a/intl/unicharutil/util/internal/Makefile.in
+++ b/intl/unicharutil/util/internal/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # This makefile builds the version of unicharutils_s static library which uses
 # internal linkage. Components that use frozen (external) linkage should use
 # unicharutil_external_s.
diff --git a/ipc/app/Makefile.in b/ipc/app/Makefile.in
index 288caf7bc566..4a55b347e400 100644
--- a/ipc/app/Makefile.in
+++ b/ipc/app/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 ifneq ($(dir $(PROGRAM)),./)
   GENERATED_DIRS = $(dir $(PROGRAM))
 endif
diff --git a/ipc/chromium/Makefile.in b/ipc/chromium/Makefile.in
index 7a87383ebec9..f6c272c86f61 100644
--- a/ipc/chromium/Makefile.in
+++ b/ipc/chromium/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 OS_CXXFLAGS := $(filter-out -fshort-wchar,$(OS_CXXFLAGS))
 
 EXPORT_LIBRARY = 1
diff --git a/ipc/dbus/Makefile.in b/ipc/dbus/Makefile.in
index cee0b50dcb45..e6feecf596c6 100644
--- a/ipc/dbus/Makefile.in
+++ b/ipc/dbus/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 
 ifdef MOZ_ENABLE_DBUS
diff --git a/ipc/glue/Makefile.in b/ipc/glue/Makefile.in
index 714ab33e009e..96c7e1241e3e 100644
--- a/ipc/glue/Makefile.in
+++ b/ipc/glue/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/crashreporter
 
 EXPORT_LIBRARY = 1
diff --git a/ipc/ipdl/Makefile.in b/ipc/ipdl/Makefile.in
index 5608fd6ff29b..f26071ab1728 100644
--- a/ipc/ipdl/Makefile.in
+++ b/ipc/ipdl/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 GARBAGE_DIRS += _ipdlheaders
 GARBAGE += ipdl_lextab.py ipdl_yacctab.py $(wildcard *.pyc $(srcdir)/ipdl/*.pyc $(srcdir)/ipdl/cxx/*.pyc)
 
diff --git a/ipc/ipdl/test/cxx/Makefile.in b/ipc/ipdl/test/cxx/Makefile.in
index 50a4fdd53896..a81d69f6c459 100644
--- a/ipc/ipdl/test/cxx/Makefile.in
+++ b/ipc/ipdl/test/cxx/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 
 IPDLTESTS = \
diff --git a/ipc/ipdl/test/cxx/app/Makefile.in b/ipc/ipdl/test/cxx/app/Makefile.in
index fe219f594fe5..ee55c3de1925 100644
--- a/ipc/ipdl/test/cxx/app/Makefile.in
+++ b/ipc/ipdl/test/cxx/app/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 NSDISTMODE = copy
 
 LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
diff --git a/ipc/ipdl/test/ipdl/Makefile.in b/ipc/ipdl/test/ipdl/Makefile.in
index e42a7651f09a..71981c616e35 100644
--- a/ipc/ipdl/test/ipdl/Makefile.in
+++ b/ipc/ipdl/test/ipdl/Makefile.in
@@ -2,12 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
 OKTESTS := $(wildcard $(srcdir)/ok/*.ipdl) $(wildcard $(srcdir)/ok/*.ipdlh)
diff --git a/ipc/netd/Makefile.in b/ipc/netd/Makefile.in
index 1202c04971bc..da4cc22ed66b 100644
--- a/ipc/netd/Makefile.in
+++ b/ipc/netd/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 
 include $(topsrcdir)/config/rules.mk
diff --git a/ipc/nfc/Makefile.in b/ipc/nfc/Makefile.in
index 1202c04971bc..da4cc22ed66b 100644
--- a/ipc/nfc/Makefile.in
+++ b/ipc/nfc/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 
 include $(topsrcdir)/config/rules.mk
diff --git a/ipc/ril/Makefile.in b/ipc/ril/Makefile.in
index 1202c04971bc..da4cc22ed66b 100644
--- a/ipc/ril/Makefile.in
+++ b/ipc/ril/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 
 include $(topsrcdir)/config/rules.mk
diff --git a/ipc/testshell/Makefile.in b/ipc/testshell/Makefile.in
index 97e53df366ad..748f88067e19 100644
--- a/ipc/testshell/Makefile.in
+++ b/ipc/testshell/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-relativesrcdir = @relativesrcdir@
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 
 # For xpcshell error messages and nsDependentJSString
diff --git a/ipc/unixsocket/Makefile.in b/ipc/unixsocket/Makefile.in
index 93fd4c0e90cd..8e1c861dd398 100644
--- a/ipc/unixsocket/Makefile.in
+++ b/ipc/unixsocket/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
diff --git a/js/ductwork/debugger/Makefile.in b/js/ductwork/debugger/Makefile.in
index 4d78f806adfd..71b3b58a2608 100644
--- a/js/ductwork/debugger/Makefile.in
+++ b/js/ductwork/debugger/Makefile.in
@@ -2,19 +2,9 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 
 EXTRA_DSO_LDOPTS += \
   $(MOZ_COMPONENT_LIBS) \
   $(MOZ_JS_LIBS) \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/js/ipc/Makefile.in b/js/ipc/Makefile.in
index 53fcd8f07db3..38403206d1e9 100644
--- a/js/ipc/Makefile.in
+++ b/js/ipc/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/dom/base \
diff --git a/js/jsd/Makefile.in b/js/jsd/Makefile.in
index adc6cfeab29b..3aa071a64a20 100644
--- a/js/jsd/Makefile.in
+++ b/js/jsd/Makefile.in
@@ -6,14 +6,6 @@
 
 
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
-srcdir		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 
 # REQUIRES	= java js
diff --git a/js/jsd/test/Makefile.in b/js/jsd/test/Makefile.in
index bf3273d724f9..1538a6be92ba 100644
--- a/js/jsd/test/Makefile.in
+++ b/js/jsd/test/Makefile.in
@@ -3,17 +3,7 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = 	test_bug507448.html bug507448.js \
 		test_bug617870-callhooks.html test-bug617870-callhooks.js jsd-test.js \
 		test_bug638178-execlines.html test-bug638178-execlines.js \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/js/src/Makefile.in b/js/src/Makefile.in
index 8e6996e1e484..ea4a385e9761 100644
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -4,15 +4,9 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-
 TOPLEVEL_BUILD := 1
 
 run_for_side_effects := $(shell echo "MAKE: $(MAKE)")
-include $(DEPTH)/config/autoconf.mk
-
 STATIC_LIBRARY_NAME = js_static
 LIBS		= $(NSPR_LIBS)
 
diff --git a/js/src/config/Makefile.in b/js/src/config/Makefile.in
index e1fe1f8898ee..cc5fc4fc3864 100644
--- a/js/src/config/Makefile.in
+++ b/js/src/config/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # For sanity's sake, we compile nsinstall without the wrapped system
 # headers, so that we can use it to set up the wrapped system headers.
 VISIBILITY_FLAGS =
diff --git a/js/src/devtools/rootAnalysis/Makefile.in b/js/src/devtools/rootAnalysis/Makefile.in
index d1aa349a3d19..4fdac6fa712c 100644
--- a/js/src/devtools/rootAnalysis/Makefile.in
+++ b/js/src/devtools/rootAnalysis/Makefile.in
@@ -12,11 +12,6 @@
 # analysis scripts, written in JS, will run over those database files to
 # produce the final analysis output.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/config.mk
 
 VPATH += $(srcdir)
diff --git a/js/src/editline/Makefile.in b/js/src/editline/Makefile.in
index 5c3ae6c8d77e..ab4d66c17fa5 100644
--- a/js/src/editline/Makefile.in
+++ b/js/src/editline/Makefile.in
@@ -4,16 +4,7 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH           = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 FORCE_STATIC_LIB = 1
 
 DEFINES += -DANSI_ARROWS -DHAVE_TCGETATTR -DHIDE -DUSE_DIRENT -DSYS_UNIX \
 	-DHAVE_STDLIB -DUNIQUE_HISTORY
-
-include $(topsrcdir)/config/rules.mk
diff --git a/js/src/gdb/Makefile.in b/js/src/gdb/Makefile.in
index a582dfe5005f..29b6823d954d 100644
--- a/js/src/gdb/Makefile.in
+++ b/js/src/gdb/Makefile.in
@@ -4,13 +4,8 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
 VPATH		= @srcdir@ @srcdir@/tests
 
-include $(DEPTH)/config/autoconf.mk
-
 # Building against js_static requires that we declare mfbt sybols "exported"
 # on its behalf.
 DEFINES += -DEXPORT_JS_API -DIMPL_MFBT
@@ -34,5 +29,3 @@ GDB_AUTOLOAD_FLAGS := -Dtopsrcdir=$(abspath $(topsrcdir))
 INSTALL_TARGETS += GDB_INSTALL_AUTOLOAD
 GDB_INSTALL_AUTOLOAD_FILES := $(CURDIR)/gdb-tests-gdb.py
 GDB_INSTALL_AUTOLOAD_DEST := $(DIST)/bin
-
-include $(topsrcdir)/config/rules.mk
diff --git a/js/src/jsapi-tests/Makefile.in b/js/src/jsapi-tests/Makefile.in
index 10d705486835..e5d7c6eb935b 100644
--- a/js/src/jsapi-tests/Makefile.in
+++ b/js/src/jsapi-tests/Makefile.in
@@ -4,13 +4,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 DEFINES         += -DEXPORT_JS_API
 # Building against js_static requires that we declare mfbt sybols "exported"
 # on its behalf.
diff --git a/js/src/shell/Makefile.in b/js/src/shell/Makefile.in
index 05f591ba183e..260aa21bbd2c 100644
--- a/js/src/shell/Makefile.in
+++ b/js/src/shell/Makefile.in
@@ -4,13 +4,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 ifdef _MSC_VER
 # unnecessary PGO for js shell.  But gcc cannot turn off pgo because it is
 # necessary to link PGO lib on gcc when a object/static lib are compiled
diff --git a/js/src/tests/Makefile.in b/js/src/tests/Makefile.in
index 149c02a15cba..5ba7d5d7324e 100644
--- a/js/src/tests/Makefile.in
+++ b/js/src/tests/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 # test files to be packaged.
@@ -46,4 +39,3 @@ stage-package:
 	$(NSINSTALL) -D $(PKG_STAGE)/jsreftest/tests
 	(cd $(srcdir) && tar $(TAR_CREATE_FLAGS) - $(TEST_FILES)) | (cd $(PKG_STAGE)/jsreftest/tests && tar -xf -)
 	$(PYTHON) $(srcdir)/jstests.py --make-manifests $(PKG_STAGE)/jsreftest/tests/
-
diff --git a/js/xpconnect/loader/Makefile.in b/js/xpconnect/loader/Makefile.in
index e7f537971503..c8109e48823f 100644
--- a/js/xpconnect/loader/Makefile.in
+++ b/js/xpconnect/loader/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH 		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES += \
   -I$(srcdir)/../src \
   -I$(srcdir)/../wrappers \
diff --git a/js/xpconnect/shell/Makefile.in b/js/xpconnect/shell/Makefile.in
index 2742cbb400af..a258573f367f 100644
--- a/js/xpconnect/shell/Makefile.in
+++ b/js/xpconnect/shell/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 FAIL_ON_WARNINGS := 1
 SDK_BINARY	= $(PROGRAM)
 
diff --git a/js/xpconnect/src/Makefile.in b/js/xpconnect/src/Makefile.in
index 2911973d5fd4..7a1d05555dde 100644
--- a/js/xpconnect/src/Makefile.in
+++ b/js/xpconnect/src/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES = \
 		-I$(srcdir)/../wrappers \
 		-I$(srcdir)/../loader \
diff --git a/js/xpconnect/tests/Makefile.in b/js/xpconnect/tests/Makefile.in
index b077dd697957..ef09cffa57bb 100644
--- a/js/xpconnect/tests/Makefile.in
+++ b/js/xpconnect/tests/Makefile.in
@@ -3,19 +3,9 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 LIBS = \
   $(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
   $(LIBS_DIR) \
   $(MOZ_JS_LIBS) \
   $(MOZ_COMPONENT_LIBS) \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/js/xpconnect/tests/browser/Makefile.in b/js/xpconnect/tests/browser/Makefile.in
index 1f8518ac1250..cb05b2045308 100644
--- a/js/xpconnect/tests/browser/Makefile.in
+++ b/js/xpconnect/tests/browser/Makefile.in
@@ -2,16 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES := \
 		browser_dead_object.js \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/js/xpconnect/tests/chrome/Makefile.in b/js/xpconnect/tests/chrome/Makefile.in
index f826e39f5664..a1210fff3c59 100644
--- a/js/xpconnect/tests/chrome/Makefile.in
+++ b/js/xpconnect/tests/chrome/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_CHROME_FILES = \
 		test_bug361111.xul \
 		test_bug448587.xul \
@@ -93,5 +85,3 @@ endif
 
 # Disabled due to apparent conservative stack scanner false positives on Linux64 debug.
 #		test_watchpoints.xul \
-
-include $(topsrcdir)/config/rules.mk
diff --git a/js/xpconnect/tests/components/js/Makefile.in b/js/xpconnect/tests/components/js/Makefile.in
index bd3d0f82758f..6c1c789665bd 100644
--- a/js/xpconnect/tests/components/js/Makefile.in
+++ b/js/xpconnect/tests/components/js/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 IS_COMPONENT = 1
 MODULE_NAME = xpconnect_test
 
diff --git a/js/xpconnect/tests/components/native/Makefile.in b/js/xpconnect/tests/components/native/Makefile.in
index c69fcd8a8f8a..9a0cca644d28 100644
--- a/js/xpconnect/tests/components/native/Makefile.in
+++ b/js/xpconnect/tests/components/native/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 IS_COMPONENT = 1
 MODULE_NAME = xpconnect_test
 FORCE_SHARED_LIB = 1
diff --git a/js/xpconnect/tests/idl/Makefile.in b/js/xpconnect/tests/idl/Makefile.in
index 379d862d400a..166bf4665e17 100644
--- a/js/xpconnect/tests/idl/Makefile.in
+++ b/js/xpconnect/tests/idl/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 componentdir = js/xpconnect/tests/components
diff --git a/js/xpconnect/tests/mochitest/Makefile.in b/js/xpconnect/tests/mochitest/Makefile.in
index aca7ae38620e..1d58390ff8f7 100644
--- a/js/xpconnect/tests/mochitest/Makefile.in
+++ b/js/xpconnect/tests/mochitest/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES =	chrome_wrappers_helper.html \
 		file_documentdomain.html \
 		file_doublewrappedcompartments.html \
@@ -100,6 +92,3 @@ MOCHITEST_FILES =	chrome_wrappers_helper.html \
 		test_asmjs.html \
 		file_asmjs.js \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/js/xpconnect/wrappers/Makefile.in b/js/xpconnect/wrappers/Makefile.in
index c1d1c7d086cd..93c13e5d07fe 100644
--- a/js/xpconnect/wrappers/Makefile.in
+++ b/js/xpconnect/wrappers/Makefile.in
@@ -2,15 +2,6 @@
 # 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/.
 
-DEPTH 		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES = \
                 -I$(srcdir)/../src \
                 -I$(srcdir)/../../../dom/base \
-
-include $(topsrcdir)/config/rules.mk
diff --git a/layout/base/Makefile.in b/layout/base/Makefile.in
index 3f105c5393fe..158a72bdfaf0 100644
--- a/layout/base/Makefile.in
+++ b/layout/base/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/layout/base/tests/Makefile.in b/layout/base/tests/Makefile.in
index 06ff1081ded4..7d12354a404f 100644
--- a/layout/base/tests/Makefile.in
+++ b/layout/base/tests/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES =	\
 		border_radius_hit_testing_iframe.html \
 		test_preserve3d_sorting_hit_testing.html \
@@ -366,5 +358,3 @@ endif
 MOCHITEST_BROWSER_FILES = \
 	browser_bug617076.js \
 	$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/layout/base/tests/chrome/Makefile.in b/layout/base/tests/chrome/Makefile.in
index e3954192f916..f20a9541cf47 100644
--- a/layout/base/tests/chrome/Makefile.in
+++ b/layout/base/tests/chrome/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_CHROME_FILES = \
 	test_bug370436.html \
 	test_bug396367-1.html \
@@ -63,5 +55,3 @@ MOCHITEST_CHROME_FILES += \
 	$(NULL)
 endif
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/layout/build/Makefile.in b/layout/build/Makefile.in
index 0db2d8428cf1..6cfafbacf958 100644
--- a/layout/build/Makefile.in
+++ b/layout/build/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # Solaris sh blows
 ifeq ($(OS_ARCH),SunOS)
 SHELL := ksh
@@ -339,4 +332,3 @@ LOCAL_INCLUDES	+= -I$(topsrcdir)/content/media/webspeech/synth
 endif #}
 
 LOCAL_INCLUDES	+= -I$(topsrcdir)/dom/camera
-
diff --git a/layout/forms/Makefile.in b/layout/forms/Makefile.in
index 6ec071a7d543..1158c5242ae8 100644
--- a/layout/forms/Makefile.in
+++ b/layout/forms/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES	= \
@@ -22,4 +15,3 @@ LOCAL_INCLUDES	= \
 		-I$(srcdir)/../../editor/libeditor/text \
 		-I$(srcdir)/../../editor/txmgr/src \
 		$(NULL)
-
diff --git a/layout/forms/test/Makefile.in b/layout/forms/test/Makefile.in
index 5bcb187be94e..57d90c70959f 100644
--- a/layout/forms/test/Makefile.in
+++ b/layout/forms/test/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES =	test_bug231389.html \
 		test_bug287446.html \
 		     bug287446_subframe.html \
@@ -56,5 +48,3 @@ MOCHITEST_CHROME_FILES = \
 		test_bug665540.html \
 		     bug665540_window.xul \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/layout/generic/Makefile.in b/layout/generic/Makefile.in
index e73c623db33f..2e91333fb8a4 100644
--- a/layout/generic/Makefile.in
+++ b/layout/generic/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 RESOURCES_HTML = \
 		$(srcdir)/folder.png \
 		$(NULL)
@@ -46,4 +39,3 @@ libs::
 
 install::
 	$(SYSINSTALL) $(IFLAGS1) $(RESOURCES_HTML) $(DESTDIR)$(mozappdir)/res/html
-
diff --git a/layout/generic/test/Makefile.in b/layout/generic/test/Makefile.in
index 45c331b682d4..51ccf3b42c87 100644
--- a/layout/generic/test/Makefile.in
+++ b/layout/generic/test/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # in the list below, we make sure that the tests that require focus
 # run before test_plugin_clipping, which can steal focus for its window.
 MOCHITEST_FILES = \
@@ -131,5 +123,3 @@ MOCHITEST_CHROME_FILES = \
   file_bug514732_window.xul \
   test_selection_preventDefault.html \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/layout/inspector/src/Makefile.in b/layout/inspector/src/Makefile.in
index 49c8934ec123..9b12a12515bd 100644
--- a/layout/inspector/src/Makefile.in
+++ b/layout/inspector/src/Makefile.in
@@ -3,17 +3,8 @@
 # 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/.
 
-DEPTH=@DEPTH@
-topsrcdir=@top_srcdir@
-srcdir=@srcdir@
-VPATH=@srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES	+= \
 		-I$(srcdir)/../../style \
 		-I$(topsrcdir)/content/base/src \
 		-I$(topsrcdir)/content/xbl/src \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/layout/inspector/tests/Makefile.in b/layout/inspector/tests/Makefile.in
index 27fa9d123880..4b021ade0495 100644
--- a/layout/inspector/tests/Makefile.in
+++ b/layout/inspector/tests/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES =\
 		test_bug462787.html \
 		test_bug462789.html \
@@ -26,5 +18,3 @@ MOCHITEST_FILES =\
 		test_bug877690.html \
 		test_get_all_style_sheets.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/layout/inspector/tests/chrome/Makefile.in b/layout/inspector/tests/chrome/Makefile.in
index 62231aa87325..aa09c529769e 100644
--- a/layout/inspector/tests/chrome/Makefile.in
+++ b/layout/inspector/tests/chrome/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_CHROME_FILES =\
 		test_bug467669.xul \
 		test_bug467669.css \
@@ -22,5 +14,3 @@ MOCHITEST_CHROME_FILES =\
 		test_bug727834.xul \
 		test_bug727834.css \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/layout/ipc/Makefile.in b/layout/ipc/Makefile.in
index 494e6254fe59..654fa19b0af9 100644
--- a/layout/ipc/Makefile.in
+++ b/layout/ipc/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
diff --git a/layout/mathml/Makefile.in b/layout/mathml/Makefile.in
index db15a65438f1..380af3c038f5 100644
--- a/layout/mathml/Makefile.in
+++ b/layout/mathml/Makefile.in
@@ -4,13 +4,6 @@
 # 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/.
 
-DEPTH=@DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES = \
 	-I$(srcdir)/../style \
 	-I$(srcdir)/../base \
@@ -53,4 +46,3 @@ $(DIST)/bin/res/fonts/$(math_properties) $(DESTDIR)$(mozappdir)/res/fonts/$(math
 
 libs:: $(DIST)/bin/res/fonts/$(math_properties)
 install:: $(DESTDIR)$(mozappdir)/res/fonts/$(math_properties)
-
diff --git a/layout/mathml/tests/Makefile.in b/layout/mathml/tests/Makefile.in
index 90f84cce699c..aca0a4567aed 100644
--- a/layout/mathml/tests/Makefile.in
+++ b/layout/mathml/tests/Makefile.in
@@ -3,19 +3,9 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES =\
 	test_bug706406.html \
 	test_bug553917.html \
 	test_bug827713-2.html \
 	test_bug827713.html \
 	$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/layout/media/Makefile.in b/layout/media/Makefile.in
index 53b744862ba4..21962b9f0065 100644
--- a/layout/media/Makefile.in
+++ b/layout/media/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY	= $(DIST)/lib
 ifeq (WINNT,$(OS_TARGET))
 FORCE_SHARED_LIB = 1
diff --git a/layout/printing/Makefile.in b/layout/printing/Makefile.in
index d425fd8974cc..a71bfcf97751 100644
--- a/layout/printing/Makefile.in
+++ b/layout/printing/Makefile.in
@@ -2,17 +2,9 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += \
 		-I$(srcdir)/../base \
 		-I$(srcdir)/../../content/base/src \
 		$(NULL)
-
diff --git a/layout/reftests/fonts/Makefile.in b/layout/reftests/fonts/Makefile.in
index 65d9c1a188fc..30a2f72bd5dc 100644
--- a/layout/reftests/fonts/Makefile.in
+++ b/layout/reftests/fonts/Makefile.in
@@ -3,16 +3,8 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
 relativesrcdir  = fonts
 
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = \
   Ahem.ttf \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/layout/reftests/fonts/mplus/Makefile.in b/layout/reftests/fonts/mplus/Makefile.in
index e5b28c9b39d4..5b0759daed50 100644
--- a/layout/reftests/fonts/mplus/Makefile.in
+++ b/layout/reftests/fonts/mplus/Makefile.in
@@ -3,16 +3,8 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
 relativesrcdir  = fonts/mplus
 
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = \
   mplus-1p-regular.ttf \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/layout/style/Makefile.in b/layout/style/Makefile.in
index 776f3bea45fd..1f83b885b6ae 100644
--- a/layout/style/Makefile.in
+++ b/layout/style/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 ifdef GNU_CC
 OS_CFLAGS := $(OS_CFLAGS) -Wshadow
 OS_CXXFLAGS := $(OS_CXXFLAGS) -Wshadow
@@ -54,4 +47,3 @@ libs:: $(_FILES)
 
 install:: $(_FILES)
 	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/res
-
diff --git a/layout/style/test/Makefile.in b/layout/style/test/Makefile.in
index 94908439f254..2e898bcaeb06 100644
--- a/layout/style/test/Makefile.in
+++ b/layout/style/test/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 HOST_CPPSRCS	= \
 		ListCSSProperties.cpp \
 		$(NULL)
diff --git a/layout/style/test/chrome/Makefile.in b/layout/style/test/chrome/Makefile.in
index 30a81d8bea40..c9d1c032717d 100644
--- a/layout/style/test/chrome/Makefile.in
+++ b/layout/style/test/chrome/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_CHROME_FILES = \
     test_bug535806.xul \
     bug535806-css.css \
@@ -25,5 +17,3 @@ MOCHITEST_FILES = \
     moz_document_helper.html \
     additional_sheets_helper.html \
     $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/layout/svg/Makefile.in b/layout/svg/Makefile.in
index 74bb3d11a02b..028bc3397462 100644
--- a/layout/svg/Makefile.in
+++ b/layout/svg/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES	= \
@@ -27,5 +20,3 @@ libs::
 
 install::
 	$(SYSINSTALL) $(IFLAGS1) $(srcdir)/svg.css $(DESTDIR)$(mozappdir)/res
-
-
diff --git a/layout/tables/Makefile.in b/layout/tables/Makefile.in
index e41c30be4383..696156bfb5c2 100644
--- a/layout/tables/Makefile.in
+++ b/layout/tables/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 DEFINES         += -DDEBUG_TABLE_STRATEGY_off
diff --git a/layout/tables/test/Makefile.in b/layout/tables/test/Makefile.in
index f1c75c942ed3..1178cdde8cbc 100644
--- a/layout/tables/test/Makefile.in
+++ b/layout/tables/test/Makefile.in
@@ -3,17 +3,7 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = \
 		test_bug337124.html \
 		test_bug541668_table_event_delivery.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/layout/tools/layout-debug/src/Makefile.in b/layout/tools/layout-debug/src/Makefile.in
index 88811c529c03..08662c92cf5a 100644
--- a/layout/tools/layout-debug/src/Makefile.in
+++ b/layout/tools/layout-debug/src/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY	= 1
 include $(topsrcdir)/config/rules.mk
 
diff --git a/layout/tools/reftest/Makefile.in b/layout/tools/reftest/Makefile.in
index f716fda47986..5424b94e0ee3 100644
--- a/layout/tools/reftest/Makefile.in
+++ b/layout/tools/reftest/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 ifdef XPI_NAME
 NO_JS_MANIFEST = 1
 DIST_FILES = install.rdf
diff --git a/layout/xul/base/src/Makefile.in b/layout/xul/base/src/Makefile.in
index 2a6261dc47d5..7cab3c0272ec 100644
--- a/layout/xul/base/src/Makefile.in
+++ b/layout/xul/base/src/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES	= \
@@ -19,4 +12,3 @@ LOCAL_INCLUDES	= \
 		-I$(srcdir)/../../../generic \
 		-I$(srcdir)/../../../style \
 		$(NULL)
-
diff --git a/layout/xul/base/test/Makefile.in b/layout/xul/base/test/Makefile.in
index c9fe036a8b5a..58dd783e33e3 100644
--- a/layout/xul/base/test/Makefile.in
+++ b/layout/xul/base/test/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = 	test_bug511075.html \
 		test_splitter.xul \
 		test_resizer_incontent.xul \
@@ -26,5 +18,3 @@ MOCHITEST_CHROME_FILES =	test_bug381167.xhtml \
 		window_resizer_element.xul \
 		test_windowminmaxsize.xul \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/layout/xul/grid/Makefile.in b/layout/xul/grid/Makefile.in
index f1797eee63d3..156b892c2017 100644
--- a/layout/xul/grid/Makefile.in
+++ b/layout/xul/grid/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES	= \
 		-I$(srcdir) \
 		-I$(srcdir)/../base/src \
@@ -17,5 +10,3 @@ LOCAL_INCLUDES	= \
 		-I$(srcdir)/../../style \
 		-I$(srcdir)/../../forms \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/layout/xul/test/Makefile.in b/layout/xul/test/Makefile.in
index df82e07ee4f9..632fa8a72d1c 100644
--- a/layout/xul/test/Makefile.in
+++ b/layout/xul/test/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES =\
 		test_bug386386.html \
 		test_bug394800.xhtml \
@@ -30,5 +22,3 @@ MOCHITEST_BROWSER_FILES = \
 		browser_bug703210.js \
 		browser_bug706743.js \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/layout/xul/tree/Makefile.in b/layout/xul/tree/Makefile.in
index 21dc290365e6..4480f66a4751 100644
--- a/layout/xul/tree/Makefile.in
+++ b/layout/xul/tree/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES	= \
 		-I$(srcdir) \
 		-I$(topsrcdir)/content/events/src \
@@ -20,5 +13,3 @@ LOCAL_INCLUDES	= \
 		-I$(srcdir)/../../style \
 		-I$(srcdir)/../../forms \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/media/kiss_fft/Makefile.in b/media/kiss_fft/Makefile.in
index c0af2b97bc60..d1bf32913469 100644
--- a/media/kiss_fft/Makefile.in
+++ b/media/kiss_fft/Makefile.in
@@ -2,15 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 ifeq (WINNT,$(OS_TARGET))
 VISIBILITY_FLAGS =
 endif
-include $(topsrcdir)/config/rules.mk
-
diff --git a/media/libcubeb/src/Makefile.in b/media/libcubeb/src/Makefile.in
index 6e9ec8e828b8..0b427fe5e8dd 100644
--- a/media/libcubeb/src/Makefile.in
+++ b/media/libcubeb/src/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH           = @DEPTH@
-topsrcdir       = @top_srcdir@
-srcdir          = @srcdir@
-VPATH           = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 FORCE_STATIC_LIB= 1
 ifeq ($(OS_TARGET),WINNT)
 VISIBILITY_FLAGS =
diff --git a/media/libjpeg/Makefile.in b/media/libjpeg/Makefile.in
index 9351e2d140d9..77779c64c5ff 100644
--- a/media/libjpeg/Makefile.in
+++ b/media/libjpeg/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 ifeq ($(OS_ARCH),WINNT)
 VISIBILITY_FLAGS	=
 endif
diff --git a/media/libnestegg/src/Makefile.in b/media/libnestegg/src/Makefile.in
index a01dfc33a274..0a73e700fe1b 100644
--- a/media/libnestegg/src/Makefile.in
+++ b/media/libnestegg/src/Makefile.in
@@ -2,16 +2,7 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 FORCE_STATIC_LIB= 1
 ifeq (WINNT,$(OS_TARGET))
 VISIBILITY_FLAGS =
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/media/libogg/src/Makefile.in b/media/libogg/src/Makefile.in
index a01dfc33a274..0a73e700fe1b 100644
--- a/media/libogg/src/Makefile.in
+++ b/media/libogg/src/Makefile.in
@@ -2,16 +2,7 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 FORCE_STATIC_LIB= 1
 ifeq (WINNT,$(OS_TARGET))
 VISIBILITY_FLAGS =
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/media/libopus/Makefile.in b/media/libopus/Makefile.in
index fd15d63ecd20..e23955f70797 100644
--- a/media/libopus/Makefile.in
+++ b/media/libopus/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 FORCE_STATIC_LIB= 1
 
 DEFINES += \
@@ -71,5 +64,3 @@ LOCAL_INCLUDES += -I$(srcdir)/silk/float
 VPATH += $(srcdir)/silk/float
 CSRCS += $(notdir $(SILK_SOURCES_FLOAT))
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/media/libpng/Makefile.in b/media/libpng/Makefile.in
index 36e022bc378f..958b62d73a52 100644
--- a/media/libpng/Makefile.in
+++ b/media/libpng/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 FORCE_STATIC_LIB= 1
 ifeq ($(OS_ARCH),WINNT)
 VISIBILITY_FLAGS=
@@ -21,5 +14,3 @@ DEFINES += \
   $(NULL)
 
 FORCE_STATIC_LIB = 1
-
-include $(topsrcdir)/config/rules.mk
diff --git a/media/libsoundtouch/src/Makefile.in b/media/libsoundtouch/src/Makefile.in
index f1939894abdc..8967702b09dd 100644
--- a/media/libsoundtouch/src/Makefile.in
+++ b/media/libsoundtouch/src/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 SHORT_LIBNAME = soundt
 VISIBILITY_FLAGS =
 EXTRA_DSO_LDOPTS += $(MOZALLOC_LIB)
@@ -28,4 +21,3 @@ mmx_optimized.$(OBJ_SUFFIX): OS_CXXFLAGS += -xarch=sse2 -xO4
 sse_optimized.$(OBJ_SUFFIX): OS_CXXFLAGS += -xarch=sse2 -xO4
 endif
 endif
-
diff --git a/media/libspeex_resampler/src/Makefile.in b/media/libspeex_resampler/src/Makefile.in
index cb0b02570e3f..430be9a9641a 100644
--- a/media/libspeex_resampler/src/Makefile.in
+++ b/media/libspeex_resampler/src/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 FORCE_STATIC_LIB = 1
 
 # We don't compile the full speex codec, only the resampler.
diff --git a/media/libtheora/lib/Makefile.in b/media/libtheora/lib/Makefile.in
index 57fbd8d4be98..43f5841f47c2 100644
--- a/media/libtheora/lib/Makefile.in
+++ b/media/libtheora/lib/Makefile.in
@@ -2,12 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 FORCE_STATIC_LIB = 1
 ifeq (WINNT,$(OS_TARGET))
 VISIBILITY_FLAGS =
diff --git a/media/libtremor/lib/Makefile.in b/media/libtremor/lib/Makefile.in
index 5eb7a4188018..44950ec28fc6 100644
--- a/media/libtremor/lib/Makefile.in
+++ b/media/libtremor/lib/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH  = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir  = @srcdir@
-VPATH  = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 FORCE_STATIC_LIB= 1
 LOCAL_INCLUDES += -I$(topsrcdir)/media/libtremor/include/tremor
 
@@ -19,5 +12,3 @@ endif
 ifeq (arm_1_, $(TARGET_CPU)_$(GNU_CC)_$(MOZ_THUMB2))
 DEFINES += -D_ARM_ASSEM_
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/media/libvorbis/lib/Makefile.in b/media/libvorbis/lib/Makefile.in
index 030d2c1625fb..81a708daf662 100644
--- a/media/libvorbis/lib/Makefile.in
+++ b/media/libvorbis/lib/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 FORCE_STATIC_LIB= 1
 ifeq (WINNT,$(OS_TARGET))
 VISIBILITY_FLAGS =
@@ -17,5 +10,3 @@ endif
 ifeq ($(OS_ARCH),AIX)
 DEFINES += -Dalloca=__alloca
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/media/libvpx/Makefile.in b/media/libvpx/Makefile.in
index 923568845c12..c6f0edb6f2cc 100644
--- a/media/libvpx/Makefile.in
+++ b/media/libvpx/Makefile.in
@@ -3,13 +3,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 DEFINES += -DHAVE_CONFIG_H=vpx_config.h
 
 FORCE_STATIC_LIB= 1
diff --git a/media/mtransport/build/Makefile.in b/media/mtransport/build/Makefile.in
index 7a0d94b977d3..72e14e190408 100644
--- a/media/mtransport/build/Makefile.in
+++ b/media/mtransport/build/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXTRA_DEPS += $(srcdir)/../objs.mk
 
 ifeq (WINNT,$(OS_TARGET))
@@ -31,5 +24,3 @@ DEFINES += \
 else ifeq (Linux,$(OS_TARGET))
 DEFINES += -DLINUX
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/media/mtransport/standalone/Makefile.in b/media/mtransport/standalone/Makefile.in
index 55b8e1e7874e..e479344827cf 100644
--- a/media/mtransport/standalone/Makefile.in
+++ b/media/mtransport/standalone/Makefile.in
@@ -2,12 +2,6 @@
 # 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/.
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
 include $(srcdir)/../objs.mk
 
 EXTRA_DEPS += $(srcdir)/../objs.mk
@@ -32,5 +26,3 @@ DEFINES += -DLINUX
 endif
 
 include $(srcdir)/../objs.mk
-
-include $(topsrcdir)/config/rules.mk
diff --git a/media/mtransport/test/Makefile.in b/media/mtransport/test/Makefile.in
index 47c35e3e1885..0322d419aa09 100644
--- a/media/mtransport/test/Makefile.in
+++ b/media/mtransport/test/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 DEFINES += \
   -DHAVE_STRDUP -DNR_SOCKET_IS_VOID_PTR -DSCTP_DEBUG -DINET
 
@@ -105,5 +98,3 @@ DEFINES += \
   -DGTEST_USE_OWN_TR1_TUPLE=1 \
   $(NULL)
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/media/mtransport/third_party/Makefile.in b/media/mtransport/third_party/Makefile.in
index 478f151e04ee..c80d579cece5 100644
--- a/media/mtransport/third_party/Makefile.in
+++ b/media/mtransport/third_party/Makefile.in
@@ -3,13 +3,4 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 NO_SUBMAKEFILES_RULE = 1
-
-include $(topsrcdir)/config/rules.mk
diff --git a/media/omx-plugin/Makefile.in b/media/omx-plugin/Makefile.in
index c86197ec60c5..f2d747c7afd6 100644
--- a/media/omx-plugin/Makefile.in
+++ b/media/omx-plugin/Makefile.in
@@ -12,13 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-DEPTH   = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH   = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MODULE_NAME = omxplugin
 FORCE_SHARED_LIB = 1
 
diff --git a/media/omx-plugin/froyo/Makefile.in b/media/omx-plugin/froyo/Makefile.in
index d866553acec7..0fe233527982 100644
--- a/media/omx-plugin/froyo/Makefile.in
+++ b/media/omx-plugin/froyo/Makefile.in
@@ -12,13 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-DEPTH   = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH   = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MODULE_NAME = omxpluginfroyo
 FORCE_SHARED_LIB = 1
 
diff --git a/media/omx-plugin/gb/Makefile.in b/media/omx-plugin/gb/Makefile.in
index c45f9fa54042..3d43c011efe8 100644
--- a/media/omx-plugin/gb/Makefile.in
+++ b/media/omx-plugin/gb/Makefile.in
@@ -12,13 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-DEPTH   = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH   = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MODULE_NAME = omxplugingb
 FORCE_SHARED_LIB = 1
 
diff --git a/media/omx-plugin/gb235/Makefile.in b/media/omx-plugin/gb235/Makefile.in
index 3ef93235fcf3..f5867de3ba6e 100644
--- a/media/omx-plugin/gb235/Makefile.in
+++ b/media/omx-plugin/gb235/Makefile.in
@@ -12,13 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-DEPTH   = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH   = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MODULE_NAME = omxplugingb235
 FORCE_SHARED_LIB = 1
 
diff --git a/media/omx-plugin/hc/Makefile.in b/media/omx-plugin/hc/Makefile.in
index 06b667100f59..6e7cc9618da2 100644
--- a/media/omx-plugin/hc/Makefile.in
+++ b/media/omx-plugin/hc/Makefile.in
@@ -12,13 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-DEPTH   = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH   = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MODULE_NAME = omxpluginhc
 FORCE_SHARED_LIB = 1
 
diff --git a/media/omx-plugin/lib/froyo/libstagefright/Makefile.in b/media/omx-plugin/lib/froyo/libstagefright/Makefile.in
index a82a9b2a2191..80c277633e90 100644
--- a/media/omx-plugin/lib/froyo/libstagefright/Makefile.in
+++ b/media/omx-plugin/lib/froyo/libstagefright/Makefile.in
@@ -11,13 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-DEPTH   = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH   = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MODULE_NAME = libandroidstagefrightfroyo
 FORCE_SHARED_LIB = 1
 
@@ -46,5 +39,3 @@ EXTRA_DSO_LDOPTS += \
 		-L$(DEPTH)/media/omx-plugin/lib/gb/libutils \
 		-lutils \
 		$(NULL)
-
-
diff --git a/media/omx-plugin/lib/gb/libstagefright/Makefile.in b/media/omx-plugin/lib/gb/libstagefright/Makefile.in
index 9b38a810800a..901f974a64a6 100644
--- a/media/omx-plugin/lib/gb/libstagefright/Makefile.in
+++ b/media/omx-plugin/lib/gb/libstagefright/Makefile.in
@@ -11,13 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-DEPTH   = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH   = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MODULE_NAME = libandroidstagefrightgb
 FORCE_SHARED_LIB = 1
 
@@ -46,5 +39,3 @@ EXTRA_DSO_LDOPTS += \
 		-L$(DEPTH)/media/omx-plugin/lib/gb/libutils \
 		-lutils \
 		$(NULL)
-
-
diff --git a/media/omx-plugin/lib/gb/libstagefright_color_conversion/Makefile.in b/media/omx-plugin/lib/gb/libstagefright_color_conversion/Makefile.in
index 3b95793e2d6f..d5c8ebd1c16e 100644
--- a/media/omx-plugin/lib/gb/libstagefright_color_conversion/Makefile.in
+++ b/media/omx-plugin/lib/gb/libstagefright_color_conversion/Makefile.in
@@ -11,13 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-DEPTH   = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH   = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MODULE_NAME = libstagefright_color_conversion
 FORCE_SHARED_LIB = 1
 
diff --git a/media/omx-plugin/lib/gb/libutils/Makefile.in b/media/omx-plugin/lib/gb/libutils/Makefile.in
index 45b3c4bb91af..0d0c1e61cd63 100644
--- a/media/omx-plugin/lib/gb/libutils/Makefile.in
+++ b/media/omx-plugin/lib/gb/libutils/Makefile.in
@@ -11,13 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-DEPTH   = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH   = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MODULE_NAME = libandroidutilsgb
 FORCE_SHARED_LIB = 1
 
diff --git a/media/omx-plugin/lib/gb235/libstagefright/Makefile.in b/media/omx-plugin/lib/gb235/libstagefright/Makefile.in
index 063813c7711c..b5f0e9220809 100644
--- a/media/omx-plugin/lib/gb235/libstagefright/Makefile.in
+++ b/media/omx-plugin/lib/gb235/libstagefright/Makefile.in
@@ -11,13 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-DEPTH   = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH   = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MODULE_NAME = libandroidstagefrightgb234
 FORCE_SHARED_LIB = 1
 
@@ -46,5 +39,3 @@ EXTRA_DSO_LDOPTS += \
 		-L$(DEPTH)/media/omx-plugin/lib/gb/libutils \
 		-lutils \
 		$(NULL)
-
-
diff --git a/media/omx-plugin/lib/hc/libstagefright/Makefile.in b/media/omx-plugin/lib/hc/libstagefright/Makefile.in
index 898d76dda30f..dd0782a0a8cc 100644
--- a/media/omx-plugin/lib/hc/libstagefright/Makefile.in
+++ b/media/omx-plugin/lib/hc/libstagefright/Makefile.in
@@ -11,13 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-DEPTH   = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH   = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MODULE_NAME = libandroidstagefrighthc
 FORCE_SHARED_LIB = 1
 
@@ -46,5 +39,3 @@ EXTRA_DSO_LDOPTS += \
 		-L$(DEPTH)/media/omx-plugin/lib/gb/libutils \
 		-lutils \
 		$(NULL)
-
-
diff --git a/media/omx-plugin/lib/ics/libstagefright/Makefile.in b/media/omx-plugin/lib/ics/libstagefright/Makefile.in
index e9cf04780dff..52778b4f7355 100644
--- a/media/omx-plugin/lib/ics/libstagefright/Makefile.in
+++ b/media/omx-plugin/lib/ics/libstagefright/Makefile.in
@@ -11,13 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-DEPTH   = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH   = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MODULE_NAME = libandroidstagefright
 FORCE_SHARED_LIB = 1
 
@@ -46,5 +39,3 @@ EXTRA_DSO_LDOPTS += \
 		-L$(DEPTH)/media/omx-plugin/lib/ics/libutils \
 		-lutils \
 		$(NULL)
-
-
diff --git a/media/omx-plugin/lib/ics/libutils/Makefile.in b/media/omx-plugin/lib/ics/libutils/Makefile.in
index f7bfdbbdfba7..86ec95bde5d0 100644
--- a/media/omx-plugin/lib/ics/libutils/Makefile.in
+++ b/media/omx-plugin/lib/ics/libutils/Makefile.in
@@ -11,13 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-DEPTH   = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH   = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MODULE_NAME = libandroidutils
 FORCE_SHARED_LIB = 1
 
diff --git a/media/webrtc/Makefile.in b/media/webrtc/Makefile.in
index 7e9c02a5cd86..72442409e443 100644
--- a/media/webrtc/Makefile.in
+++ b/media/webrtc/Makefile.in
@@ -2,13 +2,5 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir          = @srcdir@
-VPATH           = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # These Makefiles don't have corresponding Makefile.ins
 NO_SUBMAKEFILES_RULE = 1
-include $(topsrcdir)/config/rules.mk
diff --git a/media/webrtc/signaling/test/Makefile.in b/media/webrtc/signaling/test/Makefile.in
index f3eb6c44243a..b7bd0f1f72f3 100644
--- a/media/webrtc/signaling/test/Makefile.in
+++ b/media/webrtc/signaling/test/Makefile.in
@@ -2,13 +2,6 @@
 # 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/. */
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 LIBS = \
   $(XPCOM_LIBS) \
   $(NSPR_LIBS) \
diff --git a/memory/build/Makefile.in b/memory/build/Makefile.in
index fd4dbb869d0a..44665d167d53 100644
--- a/memory/build/Makefile.in
+++ b/memory/build/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 FORCE_STATIC_LIB = 1
 STLFLAGS =
 ifdef MOZ_GLUE_PROGRAM_LDFLAGS
@@ -39,5 +32,3 @@ ifeq (Darwin,$(OS_TARGET))
 LOCAL_INCLUDES += -I$(topsrcdir)/memory/jemalloc/src/include
 endif
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/memory/jemalloc/Makefile.in b/memory/jemalloc/Makefile.in
index 27cfffdd72bf..c303c5b95ef3 100644
--- a/memory/jemalloc/Makefile.in
+++ b/memory/jemalloc/Makefile.in
@@ -2,14 +2,8 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-
 VPATH		= $(srcdir) $(srcdir)/src/src
 
-include $(DEPTH)/config/autoconf.mk
-
 FORCE_STATIC_LIB = 1
 
 ifdef MOZ_GLUE_PROGRAM_LDFLAGS
diff --git a/memory/mozalloc/Makefile.in b/memory/mozalloc/Makefile.in
index 9a00956eafff..c9be51d01967 100644
--- a/memory/mozalloc/Makefile.in
+++ b/memory/mozalloc/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 VISIBILITY_FLAGS=
 STL_FLAGS	=
 ifdef _MSC_VER
@@ -36,5 +29,3 @@ SDK_LIBRARY = $(SHARED_LIBRARY)
 endif
 
 LOCAL_INCLUDES += -I$(DEPTH)/xpcom
-
-include $(topsrcdir)/config/rules.mk
diff --git a/memory/mozjemalloc/Makefile.in b/memory/mozjemalloc/Makefile.in
index da3a04ea284e..2da90445f1f8 100644
--- a/memory/mozjemalloc/Makefile.in
+++ b/memory/mozjemalloc/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 ifndef MOZ_JEMALLOC3
 FORCE_STATIC_LIB= 1
 
@@ -42,5 +35,3 @@ DEFINES += -DMOZ_REPLACE_MALLOC
 endif
 
 DEFINES += -DMOZ_JEMALLOC_IMPL
-
-include $(topsrcdir)/config/rules.mk
diff --git a/memory/replace/dmd/Makefile.in b/memory/replace/dmd/Makefile.in
index 718331343756..597c5121fde5 100644
--- a/memory/replace/dmd/Makefile.in
+++ b/memory/replace/dmd/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 FORCE_SHARED_LIB= 1
 
 DEFINES 	+= -DMOZ_NO_MOZALLOC
@@ -27,5 +20,3 @@ STL_FLAGS 	=
 ifeq ($(OS_ARCH),WINNT)
 OS_LIBS         += $(call EXPAND_LIBNAME,dbghelp)
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/memory/replace/dummy/Makefile.in b/memory/replace/dummy/Makefile.in
index 217cbefe1f24..c509e01b41e0 100644
--- a/memory/replace/dummy/Makefile.in
+++ b/memory/replace/dummy/Makefile.in
@@ -2,13 +2,4 @@
 # 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/.
 
-DEPTH           = @DEPTH@
-topsrcdir       = @top_srcdir@
-srcdir          = @srcdir@
-VPATH           = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 FORCE_SHARED_LIB = 1
-
-include $(topsrcdir)/config/rules.mk
diff --git a/memory/replace/jemalloc/Makefile.in b/memory/replace/jemalloc/Makefile.in
index 122468dc64c0..6dc55c8378d3 100644
--- a/memory/replace/jemalloc/Makefile.in
+++ b/memory/replace/jemalloc/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH           = @DEPTH@
-topsrcdir       = @top_srcdir@
-srcdir          = @srcdir@
-VPATH           = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 FORCE_SHARED_LIB = 1
 
 SHARED_LIBRARY_LIBS = $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/jemalloc)
@@ -22,5 +15,3 @@ VPATH += $(topsrcdir)/memory/build
 
 MOZ_GLUE_LDFLAGS = # Don't link against mozglue
 WRAP_LDFLAGS = # Never wrap malloc function calls with -Wl,--wrap
-
-include $(topsrcdir)/config/rules.mk
diff --git a/mfbt/Makefile.in b/mfbt/Makefile.in
index c74f8d2ed1e0..5d656acceb72 100644
--- a/mfbt/Makefile.in
+++ b/mfbt/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 FORCE_STATIC_LIB = 1
 STL_FLAGS =
 
@@ -24,5 +17,3 @@ MFBT_ROOT = $(srcdir)
 include $(MFBT_ROOT)/sources.mk
 
 DEFINES += -DIMPL_MFBT
-
-include $(topsrcdir)/config/rules.mk
diff --git a/mfbt/tests/Makefile.in b/mfbt/tests/Makefile.in
index fab82648a717..e7a4567e7cfb 100644
--- a/mfbt/tests/Makefile.in
+++ b/mfbt/tests/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 STL_FLAGS =
 
 # in order to prevent rules.mk from trying to link to libraries that are
diff --git a/mobile/android/Makefile.in b/mobile/android/Makefile.in
index 1c89b2ed9d29..e86aaf15ab87 100644
--- a/mobile/android/Makefile.in
+++ b/mobile/android/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH      = @DEPTH@
-topsrcdir  = @top_srcdir@
-srcdir     = @srcdir@
-VPATH      = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/testing/testsuite-targets.mk
 
diff --git a/mobile/android/app/Makefile.in b/mobile/android/app/Makefile.in
index fea286accedd..92ea3350707f 100644
--- a/mobile/android/app/Makefile.in
+++ b/mobile/android/app/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 dist_dest = $(DIST)/$(APP_NAME).app
 
 PREF_JS_EXPORTS = $(srcdir)/mobile.js
diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in
index b60b7620201e..9320b24bcca7 100644
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 DIST_FILES = package-name.txt
 
 include $(topsrcdir)/mobile/android/base/android-services-files.mk
diff --git a/mobile/android/base/locales/Makefile.in b/mobile/android/base/locales/Makefile.in
index b39d334895a0..d792f5cf9ca9 100644
--- a/mobile/android/base/locales/Makefile.in
+++ b/mobile/android/base/locales/Makefile.in
@@ -2,12 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-relativesrcdir = @relativesrcdir@
-
 include $(topsrcdir)/config/config.mk
 
 # special case some locale codes, he and id
@@ -76,5 +70,3 @@ $(dir-strings-xml)/strings.xml: $(strings-xml-preqs)
 	  -DMOZ_APP_DISPLAYNAME="@MOZ_APP_DISPLAYNAME@" \
       $< \
 	  > $@
-
-include $(topsrcdir)/config/rules.mk
diff --git a/mobile/android/branding/aurora/locales/Makefile.in b/mobile/android/branding/aurora/locales/Makefile.in
index 2839d474fe52..82f614ecea29 100644
--- a/mobile/android/branding/aurora/locales/Makefile.in
+++ b/mobile/android/branding/aurora/locales/Makefile.in
@@ -2,14 +2,4 @@
 # 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/.
 
-DEPTH          = @DEPTH@
-topsrcdir      = @top_srcdir@
-srcdir         = @srcdir@
-VPATH          = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 DEFINES += -DAB_CD=$(AB_CD)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/mobile/android/branding/beta/locales/Makefile.in b/mobile/android/branding/beta/locales/Makefile.in
index 2839d474fe52..82f614ecea29 100644
--- a/mobile/android/branding/beta/locales/Makefile.in
+++ b/mobile/android/branding/beta/locales/Makefile.in
@@ -2,14 +2,4 @@
 # 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/.
 
-DEPTH          = @DEPTH@
-topsrcdir      = @top_srcdir@
-srcdir         = @srcdir@
-VPATH          = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 DEFINES += -DAB_CD=$(AB_CD)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/mobile/android/branding/nightly/locales/Makefile.in b/mobile/android/branding/nightly/locales/Makefile.in
index 2839d474fe52..82f614ecea29 100644
--- a/mobile/android/branding/nightly/locales/Makefile.in
+++ b/mobile/android/branding/nightly/locales/Makefile.in
@@ -2,14 +2,4 @@
 # 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/.
 
-DEPTH          = @DEPTH@
-topsrcdir      = @top_srcdir@
-srcdir         = @srcdir@
-VPATH          = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 DEFINES += -DAB_CD=$(AB_CD)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/mobile/android/branding/official/locales/Makefile.in b/mobile/android/branding/official/locales/Makefile.in
index 2839d474fe52..82f614ecea29 100644
--- a/mobile/android/branding/official/locales/Makefile.in
+++ b/mobile/android/branding/official/locales/Makefile.in
@@ -2,14 +2,4 @@
 # 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/.
 
-DEPTH          = @DEPTH@
-topsrcdir      = @top_srcdir@
-srcdir         = @srcdir@
-VPATH          = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 DEFINES += -DAB_CD=$(AB_CD)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/mobile/android/branding/unofficial/locales/Makefile.in b/mobile/android/branding/unofficial/locales/Makefile.in
index 2839d474fe52..82f614ecea29 100644
--- a/mobile/android/branding/unofficial/locales/Makefile.in
+++ b/mobile/android/branding/unofficial/locales/Makefile.in
@@ -2,14 +2,4 @@
 # 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/.
 
-DEPTH          = @DEPTH@
-topsrcdir      = @top_srcdir@
-srcdir         = @srcdir@
-VPATH          = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 DEFINES += -DAB_CD=$(AB_CD)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/mobile/android/chrome/Makefile.in b/mobile/android/chrome/Makefile.in
index 9c5d9451bce3..6bfb40097c75 100644
--- a/mobile/android/chrome/Makefile.in
+++ b/mobile/android/chrome/Makefile.in
@@ -2,17 +2,8 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 DEFINES += -DAB_CD=$(MOZ_UI_LOCALE) \
            -DPACKAGE=browser \
            -DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
            -DANDROID_PACKAGE_NAME=$(ANDROID_PACKAGE_NAME) \
            $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/mobile/android/components/Makefile.in b/mobile/android/components/Makefile.in
index affdc59832db..5f4a13ec49c8 100644
--- a/mobile/android/components/Makefile.in
+++ b/mobile/android/components/Makefile.in
@@ -2,15 +2,6 @@
 # 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/.
 
-DEPTH      = @DEPTH@
-topsrcdir  = @top_srcdir@
-srcdir     = @srcdir@
-VPATH      = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 DEFINES += \
   -DANDROID_PACKAGE_NAME=$(ANDROID_PACKAGE_NAME) \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/mobile/android/components/build/Makefile.in b/mobile/android/components/build/Makefile.in
index e2c6ba886e87..7eced15d51c0 100644
--- a/mobile/android/components/build/Makefile.in
+++ b/mobile/android/components/build/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY  = 1
 
 ifdef MOZ_ANDROID_HISTORY
@@ -17,5 +10,3 @@ LOCAL_INCLUDES += \
 	-I$(topsrcdir)/content/base/src \
 	$(NULL)
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/mobile/android/fonts/Makefile.in b/mobile/android/fonts/Makefile.in
index 9e5fa705453f..39692487322f 100644
--- a/mobile/android/fonts/Makefile.in
+++ b/mobile/android/fonts/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH      = @DEPTH@
-topsrcdir  = @top_srcdir@
-srcdir     = @srcdir@
-VPATH      = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 packaged_fonts =  \
 	CharisSILCompact-R.ttf \
 	CharisSILCompact-B.ttf \
@@ -29,4 +22,3 @@ include $(topsrcdir)/testing/testsuite-targets.mk
 
 libs:: $(packaged_fonts)
 	$(INSTALL) $^ $(DIST)/bin/res/fonts/
-
diff --git a/mobile/android/installer/Makefile.in b/mobile/android/installer/Makefile.in
index 53d02bd9acc7..a2f3cb8a9d5f 100644
--- a/mobile/android/installer/Makefile.in
+++ b/mobile/android/installer/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 STANDALONE_MAKEFILE := 1
 
 # overwrite mobile-l10n.js with a matchOS=true one for multi-locale builds
diff --git a/mobile/android/locales/Makefile.in b/mobile/android/locales/Makefile.in
index 85385d74e5e4..d38cfe357c52 100644
--- a/mobile/android/locales/Makefile.in
+++ b/mobile/android/locales/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/config.mk
 
 SUBMAKEFILES += \
diff --git a/mobile/locales/Makefile.in b/mobile/locales/Makefile.in
index 6a6053c73301..18505c6ffd94 100644
--- a/mobile/locales/Makefile.in
+++ b/mobile/locales/Makefile.in
@@ -12,13 +12,6 @@
 #     based on current locale.
 #####################################################################################
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/config.mk
 
 USE_AUTOTARGETS_MK=1
@@ -215,4 +208,3 @@ $(bookmarks): $(bookmarks-ts)
 
 
 export:: searchplugins bookmarks
-
diff --git a/modules/libbz2/src/Makefile.in b/modules/libbz2/src/Makefile.in
index e8df0a2c33a3..353b8f8199b0 100644
--- a/modules/libbz2/src/Makefile.in
+++ b/modules/libbz2/src/Makefile.in
@@ -4,13 +4,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 FORCE_STATIC_LIB= 1
 ifeq ($(OS_ARCH),WINNT)
 USE_STATIC_LIBS = 1
@@ -27,4 +20,3 @@ include $(topsrcdir)/config/rules.mk
 # The intermediate (.ii/.s) files for host and target can have the same name...
 # disable parallel builds
 .NOTPARALLEL:
-
diff --git a/modules/libjar/Makefile.in b/modules/libjar/Makefile.in
index 711dc3a45219..ba6b76d8227d 100644
--- a/modules/libjar/Makefile.in
+++ b/modules/libjar/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
diff --git a/modules/libjar/test/chrome/Makefile.in b/modules/libjar/test/chrome/Makefile.in
index b8ab6369c163..f27e52624a55 100644
--- a/modules/libjar/test/chrome/Makefile.in
+++ b/modules/libjar/test/chrome/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_CHROME_FILES = \
 		test_bug386153.html    \
 		signed.zip             \
@@ -19,5 +11,3 @@ MOCHITEST_CHROME_FILES = \
 		signed-tampered.zip    \
 		signed-added.zip       \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/modules/libjar/test/mochitest/Makefile.in b/modules/libjar/test/mochitest/Makefile.in
index b967bf55039f..3be35c780870 100644
--- a/modules/libjar/test/mochitest/Makefile.in
+++ b/modules/libjar/test/mochitest/Makefile.in
@@ -3,19 +3,9 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = \
 		test_bug403331.html    \
 		bug403331.zip          \
 		bug403331.zip^headers^ \
 		openredirect.sjs       \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/modules/libjar/zipwriter/src/Makefile.in b/modules/libjar/zipwriter/src/Makefile.in
index 6a11f41acd17..a172e01cf04f 100644
--- a/modules/libjar/zipwriter/src/Makefile.in
+++ b/modules/libjar/zipwriter/src/Makefile.in
@@ -2,12 +2,4 @@
 # 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/.
 
-DEPTH                 = @DEPTH@
-topsrcdir             = @top_srcdir@
-srcdir                = @srcdir@
-VPATH                 = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY        = 1
-include $(topsrcdir)/config/rules.mk
diff --git a/modules/libmar/sign/Makefile.in b/modules/libmar/sign/Makefile.in
index c36adb7010db..40a5958c3b3e 100644
--- a/modules/libmar/sign/Makefile.in
+++ b/modules/libmar/sign/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 FORCE_STATIC_LIB = 1
 ifeq ($(OS_ARCH),WINNT)
 USE_STATIC_LIBS = 1
diff --git a/modules/libmar/src/Makefile.in b/modules/libmar/src/Makefile.in
index 5b1f66beb89d..fa4276ab4de1 100644
--- a/modules/libmar/src/Makefile.in
+++ b/modules/libmar/src/Makefile.in
@@ -4,13 +4,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 FORCE_STATIC_LIB = 1
 ifeq ($(OS_ARCH),WINNT)
 USE_STATIC_LIBS = 1
diff --git a/modules/libmar/tests/Makefile.in b/modules/libmar/tests/Makefile.in
index 4f3de04a32fd..4eb252cf7b61 100644
--- a/modules/libmar/tests/Makefile.in
+++ b/modules/libmar/tests/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 TESTROOT = $(call core_abspath,$(DEPTH))/_tests/xpcshell/$(relativesrcdir)
 
 DEFINES += -DBIN_SUFFIX=$(BIN_SUFFIX)
diff --git a/modules/libmar/tool/Makefile.in b/modules/libmar/tool/Makefile.in
index 797a8983b58f..2a548812a97c 100644
--- a/modules/libmar/tool/Makefile.in
+++ b/modules/libmar/tool/Makefile.in
@@ -4,13 +4,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 ifeq ($(OS_ARCH),WINNT)
 USE_STATIC_LIBS = 1
 endif
diff --git a/modules/libmar/verify/Makefile.in b/modules/libmar/verify/Makefile.in
index 60eb6a93dd80..a57d7f1b55fb 100644
--- a/modules/libmar/verify/Makefile.in
+++ b/modules/libmar/verify/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 FORCE_STATIC_LIB = 1
 ifeq ($(OS_ARCH),WINNT)
 USE_STATIC_LIBS = 1
diff --git a/modules/libpref/src/Makefile.in b/modules/libpref/src/Makefile.in
index f5a52b922fe7..7aedc604d37e 100644
--- a/modules/libpref/src/Makefile.in
+++ b/modules/libpref/src/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 DEFINES += -DOS_ARCH=$(OS_ARCH) \
            -DMOZ_WIDGET_TOOLKIT=$(MOZ_WIDGET_TOOLKIT) \
diff --git a/modules/zlib/src/Makefile.in b/modules/zlib/src/Makefile.in
index f836d2c380a1..aea729a99c7c 100644
--- a/modules/zlib/src/Makefile.in
+++ b/modules/zlib/src/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
 include $(srcdir)/objs.mk
 
 CSRCS		= $(MODULES_ZLIB_SRC_LCSRCS)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/mozglue/android/Makefile.in b/mozglue/android/Makefile.in
index d3ac49fcb9e7..36c31370d56b 100644
--- a/mozglue/android/Makefile.in
+++ b/mozglue/android/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 FORCE_STATIC_LIB = 1
 STL_FLAGS=
 DEFINES += \
diff --git a/mozglue/build/Makefile.in b/mozglue/build/Makefile.in
index 4587181f671a..f0f1ee3b21c5 100644
--- a/mozglue/build/Makefile.in
+++ b/mozglue/build/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 DIST_INSTALL = 1
 
 # Build mozglue as a shared lib on Windows, OSX and Android.
diff --git a/mozglue/linker/Makefile.in b/mozglue/linker/Makefile.in
index e50fd33f3178..7016ef70b425 100644
--- a/mozglue/linker/Makefile.in
+++ b/mozglue/linker/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 FORCE_STATIC_LIB= 1
 STL_FLAGS =
 
diff --git a/mozglue/tests/Makefile.in b/mozglue/tests/Makefile.in
index 9eeee4fa2de5..981315e2ec77 100644
--- a/mozglue/tests/Makefile.in
+++ b/mozglue/tests/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 ifdef MOZ_LINKER
 STL_FLAGS =
 
diff --git a/netwerk/Makefile.in b/netwerk/Makefile.in
index 900f0ea07a12..ab3a7e9c507b 100644
--- a/netwerk/Makefile.in
+++ b/netwerk/Makefile.in
@@ -2,14 +2,7 @@
 # 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/.
 
-DEPTH := @DEPTH@
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-
 INSTALL_TARGETS += neckoconfig
 neckoconfig_FILES := necko-config.h
 neckoconfig_DEST = $(DIST)/include
 neckoconfig_TARGET := export
-
-include $(topsrcdir)/config/rules.mk
diff --git a/netwerk/base/public/Makefile.in b/netwerk/base/public/Makefile.in
index 11a39f90e87f..67b5881f5c7f 100644
--- a/netwerk/base/public/Makefile.in
+++ b/netwerk/base/public/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-include $(DEPTH)/config/autoconf.mk
-
-
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DIMPL_LIBXUL
diff --git a/netwerk/base/src/Makefile.in b/netwerk/base/src/Makefile.in
index 848e7d338458..ebfc06537f31 100644
--- a/netwerk/base/src/Makefile.in
+++ b/netwerk/base/src/Makefile.in
@@ -4,13 +4,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES	+= -I$(topsrcdir)/dom/base
 
 ifdef MOZ_ENABLE_QTNETWORK
diff --git a/netwerk/build/Makefile.in b/netwerk/build/Makefile.in
index 11b2010a06fb..11bcf362833e 100644
--- a/netwerk/build/Makefile.in
+++ b/netwerk/build/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 SHARED_LIBRARY_LIBS = \
   ../base/src/$(LIB_PREFIX)neckobase_s.$(LIB_SUFFIX) \
@@ -110,4 +103,3 @@ endif
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
-
diff --git a/netwerk/cache/Makefile.in b/netwerk/cache/Makefile.in
index 0dd1d76ba806..d8f6272eaad7 100644
--- a/netwerk/cache/Makefile.in
+++ b/netwerk/cache/Makefile.in
@@ -3,16 +3,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES = \
   -I$(srcdir)/../base/src \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/netwerk/cookie/Makefile.in b/netwerk/cookie/Makefile.in
index 9229b065a315..5003dd940a38 100644
--- a/netwerk/cookie/Makefile.in
+++ b/netwerk/cookie/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 ifdef NECKO_COOKIES
 
 LOCAL_INCLUDES	= \
@@ -22,4 +14,3 @@ endif
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
-
diff --git a/netwerk/dash/mpd/Makefile.in b/netwerk/dash/mpd/Makefile.in
index e50488494c1e..993b41e582cf 100644
--- a/netwerk/dash/mpd/Makefile.in
+++ b/netwerk/dash/mpd/Makefile.in
@@ -8,18 +8,8 @@
 # Contributor(s):
 #     Steve Workman <sworkman@mozilla.com>
 
-DEPTH     := @DEPTH@
-topsrcdir := @top_srcdir@
-srcdir    := @srcdir@
-VPATH     := @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES := \
   -I$(topsrcdir)/content/base/src \
   -I$(topsrcdir)/content/html/content/public \
   -I$(topsrcdir)/content/html/content/src \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/netwerk/dns/Makefile.in b/netwerk/dns/Makefile.in
index ba242011bae1..296accc95235 100644
--- a/netwerk/dns/Makefile.in
+++ b/netwerk/dns/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # need to include etld_data.inc
 LOCAL_INCLUDES = \
   -I$(srcdir)/../base/src \
diff --git a/netwerk/ipc/Makefile.in b/netwerk/ipc/Makefile.in
index 6b42f3aa9453..8b1a255e83f5 100644
--- a/netwerk/ipc/Makefile.in
+++ b/netwerk/ipc/Makefile.in
@@ -2,12 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 LOCAL_INCLUDES +=                  \
   -I$(srcdir)/../protocol/http \
diff --git a/netwerk/locales/Makefile.in b/netwerk/locales/Makefile.in
index 3e9aa00c44fa..82f614ecea29 100644
--- a/netwerk/locales/Makefile.in
+++ b/netwerk/locales/Makefile.in
@@ -2,14 +2,4 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 DEFINES += -DAB_CD=$(AB_CD)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/netwerk/protocol/about/Makefile.in b/netwerk/protocol/about/Makefile.in
index a96a2dca7406..60585d841ebe 100644
--- a/netwerk/protocol/about/Makefile.in
+++ b/netwerk/protocol/about/Makefile.in
@@ -3,16 +3,9 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES = \
   -I$(srcdir)/../../base/src \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
-
diff --git a/netwerk/protocol/data/Makefile.in b/netwerk/protocol/data/Makefile.in
index fc155171b296..92f40ea0ef6c 100644
--- a/netwerk/protocol/data/Makefile.in
+++ b/netwerk/protocol/data/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES = \
   -I$(srcdir)/../../base/src \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/netwerk/protocol/device/Makefile.in b/netwerk/protocol/device/Makefile.in
index 698b6714c090..aeb87f02900e 100644
--- a/netwerk/protocol/device/Makefile.in
+++ b/netwerk/protocol/device/Makefile.in
@@ -2,15 +2,8 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES = -I$(srcdir)/../../base/src/ \
                  $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
-
diff --git a/netwerk/protocol/file/Makefile.in b/netwerk/protocol/file/Makefile.in
index 30ab47b11c5f..0bcc7e12f8d8 100644
--- a/netwerk/protocol/file/Makefile.in
+++ b/netwerk/protocol/file/Makefile.in
@@ -3,16 +3,7 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES = \
   -I$(srcdir)/../../base/src \
   -I$(topsrcdir)/xpcom/ds \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/netwerk/protocol/ftp/Makefile.in b/netwerk/protocol/ftp/Makefile.in
index 2a53b1c2256b..d1ccabda512a 100644
--- a/netwerk/protocol/ftp/Makefile.in
+++ b/netwerk/protocol/ftp/Makefile.in
@@ -3,12 +3,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES = \
   -I$(srcdir)/../../base/src \
   -I$(topsrcdir)/xpcom/ds \
@@ -24,4 +18,3 @@ DEFINES += -DFORCE_PR_LOG
 endif
 endif
 endif # WINNT
-
diff --git a/netwerk/protocol/http/Makefile.in b/netwerk/protocol/http/Makefile.in
index f1b1a9e51149..545fe295a29d 100644
--- a/netwerk/protocol/http/Makefile.in
+++ b/netwerk/protocol/http/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES = \
   -I$(srcdir)/../../base/src \
   -I$(topsrcdir)/xpcom/ds \
@@ -19,4 +12,3 @@ LOCAL_INCLUDES = \
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
-
diff --git a/netwerk/protocol/res/Makefile.in b/netwerk/protocol/res/Makefile.in
index a3cbb9faba3b..3b6614703086 100644
--- a/netwerk/protocol/res/Makefile.in
+++ b/netwerk/protocol/res/Makefile.in
@@ -3,17 +3,9 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES = \
   -I$(topsrcdir)/netwerk/base/src \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
-
diff --git a/netwerk/protocol/viewsource/Makefile.in b/netwerk/protocol/viewsource/Makefile.in
index 8705772dda6e..92f40ea0ef6c 100644
--- a/netwerk/protocol/viewsource/Makefile.in
+++ b/netwerk/protocol/viewsource/Makefile.in
@@ -3,15 +3,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES = \
   -I$(srcdir)/../../base/src \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/netwerk/protocol/websocket/Makefile.in b/netwerk/protocol/websocket/Makefile.in
index 92f9dab75769..ee9a044e97a2 100644
--- a/netwerk/protocol/websocket/Makefile.in
+++ b/netwerk/protocol/websocket/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES = \
   -I$(srcdir)/../../base/src \
   -I$(topsrcdir)/content/base/src \
@@ -18,4 +11,3 @@ LOCAL_INCLUDES = \
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
-
diff --git a/netwerk/protocol/wyciwyg/Makefile.in b/netwerk/protocol/wyciwyg/Makefile.in
index 0ef6835f507c..fe8826831448 100644
--- a/netwerk/protocol/wyciwyg/Makefile.in
+++ b/netwerk/protocol/wyciwyg/Makefile.in
@@ -2,17 +2,9 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES = \
   -I$(srcdir)/../../base/src \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
-
diff --git a/netwerk/sctp/datachannel/Makefile.in b/netwerk/sctp/datachannel/Makefile.in
index 07abd70d0a87..c2e9b3348ee8 100644
--- a/netwerk/sctp/datachannel/Makefile.in
+++ b/netwerk/sctp/datachannel/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 NO_PROFILE_GUIDED_OPTIMIZE = 1 # Don't PGO
 LOCAL_INCLUDES = \
   -I$(topsrcdir)/xpcom/ds \
@@ -37,4 +30,3 @@ endif
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
-
diff --git a/netwerk/sctp/src/Makefile.in b/netwerk/sctp/src/Makefile.in
index 304af4310b46..9697bf363b71 100644
--- a/netwerk/sctp/src/Makefile.in
+++ b/netwerk/sctp/src/Makefile.in
@@ -3,17 +3,12 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
 VPATH     = \
   @srcdir@ \
   @srcdir@/netinet \
   @srcdir@/netinet6 \
   $(NULL)
 
-include $(DEPTH)/config/autoconf.mk
-
 NO_PROFILE_GUIDED_OPTIMIZE = 1 # Don't PGO
 
 LOCAL_INCLUDES = \
@@ -99,4 +94,3 @@ include $(topsrcdir)/ipc/chromium/chromium-config.mk
 ifdef GNU_CC
 CFLAGS += -std=gnu99
 endif
-
diff --git a/netwerk/srtp/src/Makefile.in b/netwerk/srtp/src/Makefile.in
index 13b6889eb583..690edcb9e343 100644
--- a/netwerk/srtp/src/Makefile.in
+++ b/netwerk/srtp/src/Makefile.in
@@ -3,9 +3,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
 VPATH = \
   @srcdir@ \
   @srcdir@/srtp \
@@ -18,8 +15,6 @@ VPATH = \
   @srcdir@/crypto/rng \
   $(NULL)
 
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES = \
   -I$(srcdir)/include \
   -I$(srcdir)/crypto/include \
@@ -74,4 +69,3 @@ include $(topsrcdir)/ipc/chromium/chromium-config.mk
 ifdef GNU_CC
 CFLAGS += -std=gnu99
 endif
-
diff --git a/netwerk/streamconv/converters/Makefile.in b/netwerk/streamconv/converters/Makefile.in
index 791cb8105768..d7f2a0a8adbe 100644
--- a/netwerk/streamconv/converters/Makefile.in
+++ b/netwerk/streamconv/converters/Makefile.in
@@ -3,16 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES =                        \
         -I$(topsrcdir)/netwerk/base/src \
         $(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/netwerk/streamconv/test/Makefile.in b/netwerk/streamconv/test/Makefile.in
index 360a151c6060..8a395e5af006 100644
--- a/netwerk/streamconv/test/Makefile.in
+++ b/netwerk/streamconv/test/Makefile.in
@@ -3,12 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-include $(DEPTH)/config/autoconf.mk
-
 LIBS		= \
 		$(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
 		$(XPCOM_LIBS) \
@@ -30,4 +24,3 @@ ifdef NGPREFS
 DEFINES		+= -DNGPREFS
 endif
 endif # WINNT
-
diff --git a/netwerk/system/android/Makefile.in b/netwerk/system/android/Makefile.in
index a3ea1c27f704..d655dcd961e4 100644
--- a/netwerk/system/android/Makefile.in
+++ b/netwerk/system/android/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += -I$(srcdir)/../../base/src
- 
diff --git a/netwerk/system/qt/Makefile.in b/netwerk/system/qt/Makefile.in
index 114cebb23869..a1d0afdee2c6 100644
--- a/netwerk/system/qt/Makefile.in
+++ b/netwerk/system/qt/Makefile.in
@@ -3,12 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir	 = @srcdir@
-VPATH		= @srcdir@
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 OS_INCLUDES += $(MOZ_QT_CFLAGS)
diff --git a/netwerk/test/Makefile.in b/netwerk/test/Makefile.in
index 8da4a57f6c1a..542298f6f2c0 100644
--- a/netwerk/test/Makefile.in
+++ b/netwerk/test/Makefile.in
@@ -4,14 +4,8 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir = @relativesrcdir@
 FAIL_ON_WARNINGS := 1
 
-include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/config.mk
 
 LIBS		= $(XPCOM_LIBS) \
diff --git a/netwerk/test/browser/Makefile.in b/netwerk/test/browser/Makefile.in
index 03b63904c868..c2a32052b2ca 100644
--- a/netwerk/test/browser/Makefile.in
+++ b/netwerk/test/browser/Makefile.in
@@ -2,16 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES = \
 	                  browser_NetUtil.js \
 	                  $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/netwerk/test/httpserver/Makefile.in b/netwerk/test/httpserver/Makefile.in
index 3e22f2348eb6..21fed0e9dee3 100644
--- a/netwerk/test/httpserver/Makefile.in
+++ b/netwerk/test/httpserver/Makefile.in
@@ -4,14 +4,6 @@
 # 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/.
 
-DEPTH          = @DEPTH@
-topsrcdir      = @top_srcdir@
-srcdir         = @srcdir@
-VPATH          = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 NO_INTERFACES_MANIFEST = 1
 
 ifdef XPI_NAME
@@ -24,5 +16,3 @@ EXTRA_COMPONENTS += \
 endif
 
 TESTING_JS_MODULES = httpd.js
-
-include $(topsrcdir)/config/rules.mk
diff --git a/netwerk/test/mochitests/Makefile.in b/netwerk/test/mochitests/Makefile.in
index 0e2a36a76209..681212e0dda8 100644
--- a/netwerk/test/mochitests/Makefile.in
+++ b/netwerk/test/mochitests/Makefile.in
@@ -4,18 +4,9 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = \
   partial_content.sjs \
   test_partially_cached_content.html \
   user_agent.sjs \
   test_user_agent_overrides.html \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/netwerk/wifi/Makefile.in b/netwerk/wifi/Makefile.in
index b875c6d06956..3b05a9d1c1df 100644
--- a/netwerk/wifi/Makefile.in
+++ b/netwerk/wifi/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 ifeq ($(OS_ARCH),SunOS)
 OS_INCLUDES += $(GLIB_CFLAGS)
 endif
@@ -16,6 +9,3 @@ endif
 ifdef NECKO_WIFI_DBUS
 OS_INCLUDES += $(MOZ_DBUS_GLIB_CFLAGS)
 endif
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/other-licenses/android/Makefile.in b/other-licenses/android/Makefile.in
index f6da3203e255..ba1f67dbaf3f 100644
--- a/other-licenses/android/Makefile.in
+++ b/other-licenses/android/Makefile.in
@@ -2,13 +2,4 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 FORCE_STATIC_LIB = 1
-
-include $(topsrcdir)/config/rules.mk
diff --git a/other-licenses/bsdiff/Makefile.in b/other-licenses/bsdiff/Makefile.in
index 89611336c141..8bb65714ba36 100644
--- a/other-licenses/bsdiff/Makefile.in
+++ b/other-licenses/bsdiff/Makefile.in
@@ -22,13 +22,6 @@
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # This program is output to dist/host/bin because it is only needed by the
 # build system and is not intended to be included in Mozilla distributions.
 HOST_PROGRAM = mbsdiff$(BIN_SUFFIX)
diff --git a/other-licenses/skia-npapi/Makefile.in b/other-licenses/skia-npapi/Makefile.in
index 185336e2bb46..192a4930c343 100644
--- a/other-licenses/skia-npapi/Makefile.in
+++ b/other-licenses/skia-npapi/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY   = 1
 
 DEFINES += \
@@ -22,6 +15,3 @@ LOCAL_INCLUDES += \
   -I$(topsrcdir)/gfx/skia/include/config \
   -I$(topsrcdir)/gfx/gl \
   $(NULL)
-
-
-include $(topsrcdir)/config/rules.mk
diff --git a/other-licenses/snappy/Makefile.in b/other-licenses/snappy/Makefile.in
index d3e3fe90b989..d77e96d68bee 100644
--- a/other-licenses/snappy/Makefile.in
+++ b/other-licenses/snappy/Makefile.in
@@ -2,17 +2,9 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-
 VPATH = \
   @srcdir@ \
   $(topsrcdir)/other-licenses/snappy/src
   $(NULL)
 
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
-
-include $(topsrcdir)/config/rules.mk
diff --git a/parser/expat/lib/Makefile.in b/parser/expat/lib/Makefile.in
index cad77fbbc5a4..8dc75814023b 100644
--- a/parser/expat/lib/Makefile.in
+++ b/parser/expat/lib/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # We want only the static lib, not the shared lib
 FORCE_STATIC_LIB = 1
 
diff --git a/parser/html/Makefile.in b/parser/html/Makefile.in
index 97a3eaf678a8..37e8b4518da0 100644
--- a/parser/html/Makefile.in
+++ b/parser/html/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= \
diff --git a/parser/htmlparser/src/Makefile.in b/parser/htmlparser/src/Makefile.in
index e1a11a885a72..4c6703813cec 100644
--- a/parser/htmlparser/src/Makefile.in
+++ b/parser/htmlparser/src/Makefile.in
@@ -2,16 +2,7 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 SHARED_LIBRARY_LIBS = \
 		$(DEPTH)/parser/xml/src/$(LIB_PREFIX)saxp.$(LIB_SUFFIX) \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/parser/htmlparser/tests/mochitest/Makefile.in b/parser/htmlparser/tests/mochitest/Makefile.in
index 91654785bde9..6a1406f345bd 100644
--- a/parser/htmlparser/tests/mochitest/Makefile.in
+++ b/parser/htmlparser/tests/mochitest/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES =	parser_datreader.js \
 		parser_web_testrunner.js \
 		html5_tree_construction_exceptions.js \
@@ -92,5 +84,3 @@ MOCHITEST_FILES =	parser_datreader.js \
 
 # Disable test due to frequent orange on Mac
 #		test_bug534293.html \
-
-include $(topsrcdir)/config/rules.mk
diff --git a/parser/htmlparser/tests/mochitest/dir_bug534293/Makefile.in b/parser/htmlparser/tests/mochitest/dir_bug534293/Makefile.in
index 1cc24f94d37d..678338f40d75 100644
--- a/parser/htmlparser/tests/mochitest/dir_bug534293/Makefile.in
+++ b/parser/htmlparser/tests/mochitest/dir_bug534293/Makefile.in
@@ -3,15 +3,5 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES =	file_bug534293.sjs \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/parser/htmlparser/tests/mochitest/html5lib_tree_construction/Makefile.in b/parser/htmlparser/tests/mochitest/html5lib_tree_construction/Makefile.in
index 83119c7a382d..5bcacc656f5c 100644
--- a/parser/htmlparser/tests/mochitest/html5lib_tree_construction/Makefile.in
+++ b/parser/htmlparser/tests/mochitest/html5lib_tree_construction/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES =	adoption01.dat \
 		adoption02.dat \
 		comments01.dat \
@@ -56,5 +48,3 @@ MOCHITEST_FILES =	adoption01.dat \
 		webkit02.dat \
 		main-element.dat \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/parser/htmlparser/tests/mochitest/html5lib_tree_construction/scripted/Makefile.in b/parser/htmlparser/tests/mochitest/html5lib_tree_construction/scripted/Makefile.in
index dea1f9d57913..3d2f5ace3638 100644
--- a/parser/htmlparser/tests/mochitest/html5lib_tree_construction/scripted/Makefile.in
+++ b/parser/htmlparser/tests/mochitest/html5lib_tree_construction/scripted/Makefile.in
@@ -3,17 +3,7 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES =	adoption01.dat \
 		webkit01.dat \
 		ark.dat \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/parser/xml/src/Makefile.in b/parser/xml/src/Makefile.in
index e94516bfe7fa..befbfd9820fb 100644
--- a/parser/xml/src/Makefile.in
+++ b/parser/xml/src/Makefile.in
@@ -2,12 +2,4 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOZILLA_INTERNAL_API = 1
-include $(topsrcdir)/config/rules.mk
diff --git a/probes/Makefile.in b/probes/Makefile.in
index 8a1e44b72830..6d18f3425459 100644
--- a/probes/Makefile.in
+++ b/probes/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 ifdef HAVE_DTRACE
 export:: $(DIST)/include/mozilla-trace.h
 
@@ -19,5 +12,3 @@ $(DIST)/include/mozilla-trace.h: mozilla-trace.d Makefile
 	    mozilla-trace.h.tmp > $(DIST)/include/mozilla-trace.h
 	rm mozilla-trace.h.tmp
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/profile/dirserviceprovider/src/Makefile.in b/profile/dirserviceprovider/src/Makefile.in
index ae8a2ea936b5..134152550b4b 100644
--- a/profile/dirserviceprovider/src/Makefile.in
+++ b/profile/dirserviceprovider/src/Makefile.in
@@ -2,17 +2,9 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
 include $(srcdir)/objs.mk
 
 MOZILLA_INTERNAL_API = 1
 
 # we don't want the shared lib
 FORCE_STATIC_LIB = 1
-
-include $(topsrcdir)/config/rules.mk
diff --git a/profile/dirserviceprovider/standalone/Makefile.in b/profile/dirserviceprovider/standalone/Makefile.in
index d9a6ede9d280..e7724b92f963 100644
--- a/profile/dirserviceprovider/standalone/Makefile.in
+++ b/profile/dirserviceprovider/standalone/Makefile.in
@@ -2,12 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
 include $(srcdir)/../src/objs.mk
 
 FORCE_STATIC_LIB = 1
diff --git a/python/Makefile.in b/python/Makefile.in
index bce07dc5bed2..05d48b48716a 100644
--- a/python/Makefile.in
+++ b/python/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH := @DEPTH@
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 test_dirs := \
   mozbuild/mozbuild/test \
   mozbuild/mozbuild/test/backend \
@@ -20,7 +13,3 @@ test_dirs := \
   $(NULL)
 
 PYTHON_UNIT_TESTS := $(foreach dir,$(test_dirs),$(wildcard $(srcdir)/$(dir)/*.py))
-
-include $(topsrcdir)/config/rules.mk
-
-
diff --git a/python/mozbuild/mozbuild/test/backend/data/stub0/dir1/Makefile.in b/python/mozbuild/mozbuild/test/backend/data/stub0/dir1/Makefile.in
index a038825a9429..17c147d97aa1 100644
--- a/python/mozbuild/mozbuild/test/backend/data/stub0/dir1/Makefile.in
+++ b/python/mozbuild/mozbuild/test/backend/data/stub0/dir1/Makefile.in
@@ -1,11 +1,6 @@
 # Any copyright is dedicated to the Public Domain.
 # http://creativecommons.org/publicdomain/zero/1.0/
 
-DEPTH := @DEPTH@
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH = @srcdir@
-
 include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/rules.mk
diff --git a/python/mozbuild/mozbuild/test/backend/data/stub0/dir3/Makefile.in b/python/mozbuild/mozbuild/test/backend/data/stub0/dir3/Makefile.in
index a038825a9429..17c147d97aa1 100644
--- a/python/mozbuild/mozbuild/test/backend/data/stub0/dir3/Makefile.in
+++ b/python/mozbuild/mozbuild/test/backend/data/stub0/dir3/Makefile.in
@@ -1,11 +1,6 @@
 # Any copyright is dedicated to the Public Domain.
 # http://creativecommons.org/publicdomain/zero/1.0/
 
-DEPTH := @DEPTH@
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH = @srcdir@
-
 include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/rules.mk
diff --git a/rdf/build/Makefile.in b/rdf/build/Makefile.in
index ed3993579cd9..9efccb32e52d 100644
--- a/rdf/build/Makefile.in
+++ b/rdf/build/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY  = 1
 SHARED_LIBRARY_LIBS = \
 		../base/src/$(LIB_PREFIX)rdfbase_s.$(LIB_SUFFIX) \
@@ -23,4 +16,3 @@ LOCAL_INCLUDES	= \
 		-I$(srcdir)/../content/src \
 		-I$(srcdir)/../datasource/src \
 		$(NULL)
-
diff --git a/rdf/datasource/src/Makefile.in b/rdf/datasource/src/Makefile.in
index 1e473e7cc477..18018946910d 100644
--- a/rdf/datasource/src/Makefile.in
+++ b/rdf/datasource/src/Makefile.in
@@ -3,16 +3,8 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 # XXX This is a dependency on rdfutil.h: it'll go away once that becomes
 # a first-class XPCOM interface.
 INCLUDES	+= -I$(srcdir)/../../base/src
-
diff --git a/rdf/tests/dsds/Makefile.in b/rdf/tests/dsds/Makefile.in
index c3bdbdd8fc3f..9c0d3d064040 100644
--- a/rdf/tests/dsds/Makefile.in
+++ b/rdf/tests/dsds/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOZILLA_INTERNAL_API = 1
 
 
@@ -38,4 +31,3 @@ libs::
 
 install:: $(RESOURCE_SAMPLES)
 	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/res/samples/rdf
-
diff --git a/rdf/tests/rdfcat/Makefile.in b/rdf/tests/rdfcat/Makefile.in
index bd37bf3f5049..6d305cdc8811 100644
--- a/rdf/tests/rdfcat/Makefile.in
+++ b/rdf/tests/rdfcat/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 LIBS		= \
 		$(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
 		$(LIBS_DIR) \
diff --git a/rdf/tests/rdfpoll/Makefile.in b/rdf/tests/rdfpoll/Makefile.in
index 4095c9f9eaf2..ad93a989acb7 100644
--- a/rdf/tests/rdfpoll/Makefile.in
+++ b/rdf/tests/rdfpoll/Makefile.in
@@ -3,19 +3,9 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 LIBS		= \
 		$(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
 		$(LIBS_DIR) \
 		$(XPCOM_LIBS) \
 		$(NSPR_LIBS) \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/rdf/tests/triplescat/Makefile.in b/rdf/tests/triplescat/Makefile.in
index bd37bf3f5049..6d305cdc8811 100644
--- a/rdf/tests/triplescat/Makefile.in
+++ b/rdf/tests/triplescat/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 LIBS		= \
 		$(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
 		$(LIBS_DIR) \
diff --git a/rdf/util/src/Makefile.in b/rdf/util/src/Makefile.in
index 6ae2f6117b6f..7abda44bbaa2 100644
--- a/rdf/util/src/Makefile.in
+++ b/rdf/util/src/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # This makefile builds the rdfutil_external_s library which should be 
 # used by frozen (dependent) linkage components. The internal-linkage code should use
 # rdfutil_s which is built in the internal/ subdirectory. 
@@ -22,6 +15,3 @@ DIST_INSTALL = 1
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/rdf/util/src/internal/Makefile.in b/rdf/util/src/internal/Makefile.in
index a2aef58f1b20..f8cee05b3dba 100644
--- a/rdf/util/src/internal/Makefile.in
+++ b/rdf/util/src/internal/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # This makefile builds the version of unicharutils_s static library which uses
 # internal linkage. Components that use frozen (external) linkage should use
 # rdfutil_external_s.
diff --git a/security/build/Makefile.in b/security/build/Makefile.in
index 98af252dd98f..4874f7146836 100644
--- a/security/build/Makefile.in
+++ b/security/build/Makefile.in
@@ -3,12 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
 CC_WRAPPER =
 CXX_WRAPPER =
 
diff --git a/security/manager/boot/src/Makefile.in b/security/manager/boot/src/Makefile.in
index 98ad1033e0fc..64f1d7d53967 100644
--- a/security/manager/boot/src/Makefile.in
+++ b/security/manager/boot/src/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY	= 1
 
 include $(topsrcdir)/config/rules.mk
diff --git a/security/manager/locales/Makefile.in b/security/manager/locales/Makefile.in
index 3e9aa00c44fa..82f614ecea29 100644
--- a/security/manager/locales/Makefile.in
+++ b/security/manager/locales/Makefile.in
@@ -2,14 +2,4 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 DEFINES += -DAB_CD=$(AB_CD)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/security/manager/pki/src/Makefile.in b/security/manager/pki/src/Makefile.in
index 91591b89cdfb..260028568a5a 100644
--- a/security/manager/pki/src/Makefile.in
+++ b/security/manager/pki/src/Makefile.in
@@ -4,17 +4,7 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY	= 1
 INCLUDES	+= \
 		-I$(DIST)/public/nss \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in
index 29e94ee41a47..ad4d28f260ec 100644
--- a/security/manager/ssl/src/Makefile.in
+++ b/security/manager/ssl/src/Makefile.in
@@ -4,19 +4,9 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY	= 1
 DEFINES += \
   -DNSS_ENABLE_ECC \
   -DDLL_PREFIX=\"$(DLL_PREFIX)\" \
   -DDLL_SUFFIX=\"$(DLL_SUFFIX)\" \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/security/manager/ssl/tests/mochitest/browser/Makefile.in b/security/manager/ssl/tests/mochitest/browser/Makefile.in
index 91d1b50815a6..b97ab96fc077 100644
--- a/security/manager/ssl/tests/mochitest/browser/Makefile.in
+++ b/security/manager/ssl/tests/mochitest/browser/Makefile.in
@@ -3,17 +3,7 @@
 # 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/.
 
-DEPTH          = @DEPTH@
-topsrcdir      = @top_srcdir@
-srcdir         = @srcdir@
-VPATH          = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES = \
   head.js \
   browser_bug627234_perwindowpb.js \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/security/manager/ssl/tests/mochitest/bugs/Makefile.in b/security/manager/ssl/tests/mochitest/bugs/Makefile.in
index 515130d8f55a..b9c0966d1ca0 100644
--- a/security/manager/ssl/tests/mochitest/bugs/Makefile.in
+++ b/security/manager/ssl/tests/mochitest/bugs/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = \
         test_bug480509.html \
         test_bug483440.html \
@@ -33,5 +25,3 @@ MOCHITEST_CHROME_FILES = \
         test_bug480619.html \
         test_bug644006.html \
         $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/Makefile.in b/security/manager/ssl/tests/mochitest/mixedcontent/Makefile.in
index 582ff18ba911..653bf8150abd 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/Makefile.in
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = \
         alloworigin.sjs \
         backward.html \
@@ -70,5 +62,3 @@ MOCHITEST_FILES = \
 
 #        test_dynUnsecureRedirect.html \ intermitently fails, quit often, bug 487402
 #        test_unsecureIframeMetaRedirect.html \ also intermittently fails, less often, bug 487632
-
-include $(topsrcdir)/config/rules.mk
diff --git a/security/manager/ssl/tests/mochitest/stricttransportsecurity/Makefile.in b/security/manager/ssl/tests/mochitest/stricttransportsecurity/Makefile.in
index 1dde9f22d25f..30b94027e34b 100644
--- a/security/manager/ssl/tests/mochitest/stricttransportsecurity/Makefile.in
+++ b/security/manager/ssl/tests/mochitest/stricttransportsecurity/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = \
   plain_bootstrap.html \
   plain_bootstrap.html^headers^ \
@@ -25,5 +17,3 @@ MOCHITEST_CHROME_FILES += \
   test_sts_privatebrowsing_perwindowpb.html \
   page_blank.html \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/security/manager/ssl/tests/unit/test_ocsp_stapling/Makefile.in b/security/manager/ssl/tests/unit/test_ocsp_stapling/Makefile.in
index 3ff49c4e97f6..9c8647bcd3f2 100644
--- a/security/manager/ssl/tests/unit/test_ocsp_stapling/Makefile.in
+++ b/security/manager/ssl/tests/unit/test_ocsp_stapling/Makefile.in
@@ -4,15 +4,8 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-relativesrcdir = @relativesrcdir@
 FAIL_ON_WARNINGS := 1
 
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/config.mk
 
 LIBS = \
@@ -22,5 +15,3 @@ LIBS = \
   $(NULL)
 
 DEFINES += $(TK_CFLAGS)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/security/sandbox/Makefile.in b/security/sandbox/Makefile.in
index 3edac69c69f0..a52b81952809 100644
--- a/security/sandbox/Makefile.in
+++ b/security/sandbox/Makefile.in
@@ -2,16 +2,8 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 FAIL_ON_WARNINGS = 1
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
-
diff --git a/services/common/Makefile.in b/services/common/Makefile.in
index ac7305b058c8..aa3e4a5d71a9 100644
--- a/services/common/Makefile.in
+++ b/services/common/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 modules := \
   log4moz.js \
   storageservice.js \
diff --git a/services/crypto/Makefile.in b/services/crypto/Makefile.in
index 15ea27525818..a97069dca66d 100644
--- a/services/crypto/Makefile.in
+++ b/services/crypto/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 modules := \
   utils.js \
   WeaveCrypto.js \
@@ -17,5 +10,3 @@ modules := \
 CRYPTO_MODULE_FILES := $(addprefix modules/,$(modules))
 CRYPTO_MODULE_DEST = $(FINAL_TARGET)/modules/services-crypto
 INSTALL_TARGETS += CRYPTO_MODULE
-
-include $(topsrcdir)/config/rules.mk
diff --git a/services/crypto/component/Makefile.in b/services/crypto/component/Makefile.in
index 9ba68107e605..36ed8aed8ad8 100644
--- a/services/crypto/component/Makefile.in
+++ b/services/crypto/component/Makefile.in
@@ -2,14 +2,5 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY := 1
 MOZILLA_INTERNAL_API := 1
-
-include $(topsrcdir)/config/rules.mk
diff --git a/services/datareporting/Makefile.in b/services/datareporting/Makefile.in
index 8cf6bba12d84..6e8e2b1fefac 100644
--- a/services/datareporting/Makefile.in
+++ b/services/datareporting/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MODULES := policy.jsm sessions.jsm
 MODULES_PATH = $(FINAL_TARGET)/modules/services/datareporting
 PP_TARGETS += MODULES
diff --git a/services/healthreport/Makefile.in b/services/healthreport/Makefile.in
index 0df91f059fa1..eb6e2d14a6df 100644
--- a/services/healthreport/Makefile.in
+++ b/services/healthreport/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 modules := \
   healthreporter.jsm \
   profile.jsm \
@@ -50,4 +43,3 @@ include $(topsrcdir)/config/rules.mk
 
 # Add extra prerequisites until bug 837792 is addressed.
 $(FINAL_TARGET)/modules/HealthReport.jsm: $(healthreport_depends)
-
diff --git a/services/metrics/Makefile.in b/services/metrics/Makefile.in
index 0d33f646dd8f..9cf3f105b3eb 100644
--- a/services/metrics/Makefile.in
+++ b/services/metrics/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 testing_modules := \
   mocks.jsm \
   $(NULL)
@@ -28,5 +21,3 @@ include $(topsrcdir)/config/rules.mk
 
 # Add extra prerequisites until bug 837792 is addressed.
 $(FINAL_TARGET)/modules/Metrics.jsm: Metrics.jsm providermanager.jsm dataprovider.jsm storage.jsm
-
-
diff --git a/services/sync/Makefile.in b/services/sync/Makefile.in
index 2a7dd01ab955..ce827ea9dad6 100644
--- a/services/sync/Makefile.in
+++ b/services/sync/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH     := @DEPTH@
-topsrcdir := @top_srcdir@
-srcdir    := @srcdir@
-VPATH     := @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # Definitions used by constants.js.
 weave_version := 1.28.0
 weave_id      := {340c2bbc-ce74-4362-90b5-7c26312808ef}
@@ -82,5 +75,3 @@ INSTALL_TARGETS += SYNC_STAGES
 
 TESTING_JS_MODULES := $(addprefix modules-testing/,$(sync_testing_modules))
 TESTING_JS_MODULE_DIR := services/sync
-
-include $(topsrcdir)/config/rules.mk
diff --git a/services/sync/locales/Makefile.in b/services/sync/locales/Makefile.in
index 1975558f3ed2..82f614ecea29 100644
--- a/services/sync/locales/Makefile.in
+++ b/services/sync/locales/Makefile.in
@@ -2,14 +2,4 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 DEFINES += -DAB_CD=$(AB_CD)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/startupcache/Makefile.in b/startupcache/Makefile.in
index b0ca4419928c..e8ff94a2cf76 100644
--- a/startupcache/Makefile.in
+++ b/startupcache/Makefile.in
@@ -3,12 +3,4 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
-include $(topsrcdir)/config/rules.mk
diff --git a/startupcache/test/Makefile.in b/startupcache/test/Makefile.in
index 5b4bf3e9ff87..9bd1b6378351 100644
--- a/startupcache/test/Makefile.in
+++ b/startupcache/test/Makefile.in
@@ -3,13 +3,4 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 LIBS += $(MOZ_COMPONENT_LIBS)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/storage/build/Makefile.in b/storage/build/Makefile.in
index fb8e601bc233..de999a9151b7 100644
--- a/storage/build/Makefile.in
+++ b/storage/build/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH=@DEPTH@
-topsrcdir=@top_srcdir@
-srcdir=@srcdir@
-VPATH=@srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 LOCAL_INCLUDES = \
 	$(SQLITE_CFLAGS) \
@@ -18,6 +11,3 @@ LOCAL_INCLUDES = \
 SHARED_LIBRARY_LIBS = \
 	../src/$(LIB_PREFIX)storage_s.$(LIB_SUFFIX) \
 	$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/storage/src/Makefile.in b/storage/src/Makefile.in
index 75763f61e67a..941864015325 100644
--- a/storage/src/Makefile.in
+++ b/storage/src/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH   = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH   = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # Don't use the jemalloc allocator on Android, because we can't guarantee
 # that Gecko will configure sqlite before it is first used (bug 730495).
 #
@@ -32,5 +25,3 @@ LOCAL_INCLUDES = \
 # This is the default value.  If we ever change it when compiling sqlite, we
 # will need to change it here as well.
 DEFINES += -DSQLITE_MAX_LIKE_PATTERN_LENGTH=50000
-
-include $(topsrcdir)/config/rules.mk
diff --git a/storage/test/Makefile.in b/storage/test/Makefile.in
index fc444cdf5b22..07914f614de0 100644
--- a/storage/test/Makefile.in
+++ b/storage/test/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES = \
   -I$(srcdir)/../src \
   $(NULL)
@@ -20,5 +12,3 @@ LIBS = \
 	$(MOZ_COMPONENT_LIBS) \
 	$(SQLITE_LIBS) \
 	$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/testing/gtest/Makefile.in b/testing/gtest/Makefile.in
index 50af72f9c189..318f66f979f5 100644
--- a/testing/gtest/Makefile.in
+++ b/testing/gtest/Makefile.in
@@ -5,9 +5,6 @@
 # Avoid recursive make to avoid having to add files to the gtest/ subdirectory
 # (which is third-party code), and to make the build faster.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
 VPATH = \
   $(srcdir) \
   $(srcdir)/gtest/src \
@@ -15,8 +12,6 @@ VPATH = \
   $(srcdir)/gmock/src \
   $(NULL)
 
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 LOCAL_INCLUDES += \
   -I$(srcdir)/gtest \
@@ -41,4 +36,3 @@ endif
 	$(PYTHON) $(topsrcdir)/testing/gtest/rungtests.py --xre-path=$(DIST)/bin --symbols-path=$(DIST)/crashreporter-symbols $(DIST)/bin/$(MOZ_APP_NAME)$(BIN_SUFFIX)
 endif
 endif
-
diff --git a/testing/marionette/Makefile.in b/testing/marionette/Makefile.in
index 65cbf611285c..0e1861faeed8 100644
--- a/testing/marionette/Makefile.in
+++ b/testing/marionette/Makefile.in
@@ -2,15 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 ifdef ENABLE_TESTS
     DEFINES += -DENABLE_TESTS
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/testing/marionette/components/Makefile.in b/testing/marionette/components/Makefile.in
index 010c22fb0d8a..542a6efb68f1 100644
--- a/testing/marionette/components/Makefile.in
+++ b/testing/marionette/components/Makefile.in
@@ -2,15 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 ifdef ENABLE_MARIONETTE
 DEFINES += -DENABLE_MARIONETTE=1
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/testing/mochitest/Makefile.in b/testing/mochitest/Makefile.in
index cb595b46d237..59e20277c549 100644
--- a/testing/mochitest/Makefile.in
+++ b/testing/mochitest/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 NO_JS_MANIFEST = 1
 MOZ_CHROME_FILE_FORMAT = jar
 DIST_FILES = install.rdf
diff --git a/testing/mochitest/MochiKit/Makefile.in b/testing/mochitest/MochiKit/Makefile.in
index 2b9bb0e0ae8c..7b76a2a93a6b 100644
--- a/testing/mochitest/MochiKit/Makefile.in
+++ b/testing/mochitest/MochiKit/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
 _JS_FILES =	Async.js \
diff --git a/testing/mochitest/chrome/Makefile.in b/testing/mochitest/chrome/Makefile.in
index 96a0c160e6b3..64162c0fdd37 100644
--- a/testing/mochitest/chrome/Makefile.in
+++ b/testing/mochitest/chrome/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
 _STATIC_FILES = test_sample.xul \
diff --git a/testing/mochitest/dynamic/Makefile.in b/testing/mochitest/dynamic/Makefile.in
index a1925e352487..4a42bb890ebc 100644
--- a/testing/mochitest/dynamic/Makefile.in
+++ b/testing/mochitest/dynamic/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
 _STATIC_FILES = \
diff --git a/testing/mochitest/roboextender/Makefile.in b/testing/mochitest/roboextender/Makefile.in
index 48fb5b4e1794..0cd167f272a4 100644
--- a/testing/mochitest/roboextender/Makefile.in
+++ b/testing/mochitest/roboextender/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH           = @DEPTH@
-topsrcdir       = @top_srcdir@
-srcdir          = @srcdir@
-VPATH           = @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 _TEST_FILES = \
   bootstrap.js \
   install.rdf \
diff --git a/testing/mochitest/ssltunnel/Makefile.in b/testing/mochitest/ssltunnel/Makefile.in
index c965e42e694f..9936c4eb5ace 100644
--- a/testing/mochitest/ssltunnel/Makefile.in
+++ b/testing/mochitest/ssltunnel/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # This isn't XPCOM code, but it wants to use STL, so disable the STL
 # wrappers
 STL_FLAGS =
@@ -19,5 +12,3 @@ LIBS = \
   $(NSS_LIBS) \
   $(MOZALLOC_LIB) \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/testing/mochitest/static/Makefile.in b/testing/mochitest/static/Makefile.in
index 7c36843bfed5..464e09abcb42 100644
--- a/testing/mochitest/static/Makefile.in
+++ b/testing/mochitest/static/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
 _STATIC_FILES = test.template.txt \
diff --git a/testing/mochitest/tests/Makefile.in b/testing/mochitest/tests/Makefile.in
index 29f3570af136..327b30274322 100644
--- a/testing/mochitest/tests/Makefile.in
+++ b/testing/mochitest/tests/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 _TEST_FILES = \
diff --git a/testing/mochitest/tests/MochiKit-1.4.2/MochiKit/Makefile.in b/testing/mochitest/tests/MochiKit-1.4.2/MochiKit/Makefile.in
index ad52619f4ba8..bdd6d085b4ef 100644
--- a/testing/mochitest/tests/MochiKit-1.4.2/MochiKit/Makefile.in
+++ b/testing/mochitest/tests/MochiKit-1.4.2/MochiKit/Makefile.in
@@ -4,13 +4,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
 _MOCHIKIT_FILES = \
diff --git a/testing/mochitest/tests/MochiKit-1.4.2/tests/Makefile.in b/testing/mochitest/tests/MochiKit-1.4.2/tests/Makefile.in
index 9ce5e2cb712c..1da95a70a431 100644
--- a/testing/mochitest/tests/MochiKit-1.4.2/tests/Makefile.in
+++ b/testing/mochitest/tests/MochiKit-1.4.2/tests/Makefile.in
@@ -4,14 +4,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 _TEST_FILES = \
diff --git a/testing/mochitest/tests/MochiKit-1.4.2/tests/SimpleTest/Makefile.in b/testing/mochitest/tests/MochiKit-1.4.2/tests/SimpleTest/Makefile.in
index e3de691f61c8..184885cb23fe 100644
--- a/testing/mochitest/tests/MochiKit-1.4.2/tests/SimpleTest/Makefile.in
+++ b/testing/mochitest/tests/MochiKit-1.4.2/tests/SimpleTest/Makefile.in
@@ -8,13 +8,6 @@
 # We want to run the tests in our own (modified) harness.
 #
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
 _STUBS_FILES = \
diff --git a/testing/mochitest/tests/SimpleTest/Makefile.in b/testing/mochitest/tests/SimpleTest/Makefile.in
index 3d1d974db36c..129b0545e90c 100644
--- a/testing/mochitest/tests/SimpleTest/Makefile.in
+++ b/testing/mochitest/tests/SimpleTest/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 _SIMPLETEST_FILES =	LogController.js \
 			SimpleTest.js \
@@ -28,4 +21,3 @@ _SIMPLETEST_FILES =	LogController.js \
 
 libs:: $(_SIMPLETEST_FILES)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/$(relativesrcdir)
-
diff --git a/testing/mochitest/tests/browser/Makefile.in b/testing/mochitest/tests/browser/Makefile.in
index f17a1a79076d..e72b3e47b47d 100644
--- a/testing/mochitest/tests/browser/Makefile.in
+++ b/testing/mochitest/tests/browser/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES = \
   head.js \
   browser_head.js \
@@ -36,5 +28,3 @@ MOCHITEST_BROWSER_FILES = \
 #
 # Disabled because it would take too long, useful to check functionality though.
 #  browser_requestLongerTimeout.js \
-
-include $(topsrcdir)/config/rules.mk
diff --git a/testing/modules/Makefile.in b/testing/modules/Makefile.in
index a83e570eb254..2fdde35eec69 100644
--- a/testing/modules/Makefile.in
+++ b/testing/modules/Makefile.in
@@ -2,16 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 TESTING_JS_MODULES := \
   AppInfo.jsm \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/testing/mozbase/Makefile.in b/testing/mozbase/Makefile.in
index 1212eeb33a27..4da71e1310b6 100644
--- a/testing/mozbase/Makefile.in
+++ b/testing/mozbase/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 PYTHON_UNIT_TESTS := \
   test.py \
   $(NULL)
diff --git a/testing/peptest/Makefile.in b/testing/peptest/Makefile.in
index 1de2e21606ad..bfa66b649bd1 100644
--- a/testing/peptest/Makefile.in
+++ b/testing/peptest/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 PEPTEST_HARNESS = \
diff --git a/testing/profiles/Makefile.in b/testing/profiles/Makefile.in
index c45e0502f0cc..1693f3bf3055 100644
--- a/testing/profiles/Makefile.in
+++ b/testing/profiles/Makefile.in
@@ -2,12 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
 MOCHITEST_PROFILE_FILES = \
diff --git a/testing/specialpowers/Makefile.in b/testing/specialpowers/Makefile.in
index caf8c8bef487..9ead39736c7f 100644
--- a/testing/specialpowers/Makefile.in
+++ b/testing/specialpowers/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH           = @DEPTH@
-topsrcdir       = @top_srcdir@
-srcdir          = @srcdir@
-VPATH           = @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 NO_JS_MANIFEST = 1
 MOZ_CHROME_FILE_FORMAT = flat
 DIST_FILES = \
@@ -41,4 +33,3 @@ libs:: $(libs-preqs)
 	cp -RL $(DEPTH)/testing/specialpowers/specialpowers $(DEPTH)/_tests/testing/mochitest/extensions
 	$(NSINSTALL) -D $(DEPTH)/_tests/reftest/specialpowers
 	cp -RL $(DEPTH)/testing/specialpowers/specialpowers $(DEPTH)/_tests/reftest
-
diff --git a/testing/tools/screenshot/Makefile.in b/testing/tools/screenshot/Makefile.in
index eb276a919ce7..8384ca15e3d4 100644
--- a/testing/tools/screenshot/Makefile.in
+++ b/testing/tools/screenshot/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 ifdef MOZ_WIDGET_GTK
 ifdef MOZ_X11
 
@@ -29,5 +22,3 @@ WIN32_EXE_LDFLAGS = -municode
 endif
 
 endif # windows
-
-include $(topsrcdir)/config/rules.mk
diff --git a/testing/xpcshell/Makefile.in b/testing/xpcshell/Makefile.in
index ead4483db2b4..4670bb629e82 100644
--- a/testing/xpcshell/Makefile.in
+++ b/testing/xpcshell/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # Run selftests
 PYTHON_UNIT_TESTS := \
   selftest.py
diff --git a/toolkit/Makefile.in b/toolkit/Makefile.in
index 1f1c870bd056..92df822fcfe1 100644
--- a/toolkit/Makefile.in
+++ b/toolkit/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 export::
diff --git a/toolkit/components/aboutmemory/tests/Makefile.in b/toolkit/components/aboutmemory/tests/Makefile.in
index f241ef31f2f8..4c08c5a7fc7c 100644
--- a/toolkit/components/aboutmemory/tests/Makefile.in
+++ b/toolkit/components/aboutmemory/tests/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_CHROME_FILES	= \
 		memory-reports-good.json \
 		memory-reports-bad.json \
@@ -29,6 +21,3 @@ MOCHITEST_CHROME_FILES += \
   test_memoryReporters.xul \
   $(NULL)
 endif
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/toolkit/components/alerts/Makefile.in b/toolkit/components/alerts/Makefile.in
index a898e8b26650..eec8bdc94d91 100644
--- a/toolkit/components/alerts/Makefile.in
+++ b/toolkit/components/alerts/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/components/build/
 
 include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/alerts/test/Makefile.in b/toolkit/components/alerts/test/Makefile.in
index d6bb8e04c5e5..68cc3214ac95 100644
--- a/toolkit/components/alerts/test/Makefile.in
+++ b/toolkit/components/alerts/test/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH   = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH   = @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # Mochitest tests
 # Synchronous tests like test_alerts.html must come before
 # asynchronous tests like test_alerts_noobserve.html!
@@ -19,5 +11,3 @@ MOCHITEST_FILES = \
 		test_alerts.html \
 		test_alerts_noobserve.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/autocomplete/Makefile.in b/toolkit/components/autocomplete/Makefile.in
index 554ea27e53e6..15aff14ed534 100644
--- a/toolkit/components/autocomplete/Makefile.in
+++ b/toolkit/components/autocomplete/Makefile.in
@@ -2,12 +2,4 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/build/Makefile.in b/toolkit/components/build/Makefile.in
index abf6dfd78546..6d7d1e75f23f 100644
--- a/toolkit/components/build/Makefile.in
+++ b/toolkit/components/build/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH=@DEPTH@
-topsrcdir=@top_srcdir@
-srcdir=@srcdir@
-VPATH=@srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 LOCAL_INCLUDES = \
   -I$(srcdir)/../alerts \
@@ -54,5 +47,3 @@ endif
 ifdef MOZ_FEEDS
 SHARED_LIBRARY_LIBS += ../feeds/$(LIB_PREFIX)feed_s.$(LIB_SUFFIX)
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/commandlines/Makefile.in b/toolkit/components/commandlines/Makefile.in
index 86f1a688612b..15aff14ed534 100644
--- a/toolkit/components/commandlines/Makefile.in
+++ b/toolkit/components/commandlines/Makefile.in
@@ -2,12 +2,4 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/console/tests/Makefile.in b/toolkit/components/console/tests/Makefile.in
index 12613c70a52d..ac04ecd252c1 100644
--- a/toolkit/components/console/tests/Makefile.in
+++ b/toolkit/components/console/tests/Makefile.in
@@ -3,16 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_CHROME_FILES	= \
 		test_hugeURIs.xul \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/ctypes/Makefile.in b/toolkit/components/ctypes/Makefile.in
index 4da5d6d31ccb..4d35ffaf34a9 100644
--- a/toolkit/components/ctypes/Makefile.in
+++ b/toolkit/components/ctypes/Makefile.in
@@ -2,17 +2,8 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 
 LOCAL_INCLUDES := \
   -I$(topsrcdir)/js/xpconnect/loader \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/ctypes/tests/Makefile.in b/toolkit/components/ctypes/tests/Makefile.in
index 8d2a5bd6add3..c8a1666c7cf7 100644
--- a/toolkit/components/ctypes/tests/Makefile.in
+++ b/toolkit/components/ctypes/tests/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 SHORT_LIBNAME = jscttest
 FORCE_SHARED_LIB = 1
 
diff --git a/toolkit/components/diskspacewatcher/Makefile.in b/toolkit/components/diskspacewatcher/Makefile.in
index 2eed6114270c..8e1c861dd398 100644
--- a/toolkit/components/diskspacewatcher/Makefile.in
+++ b/toolkit/components/diskspacewatcher/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
diff --git a/toolkit/components/downloads/Makefile.in b/toolkit/components/downloads/Makefile.in
index bd53a3dcc09f..8fdc90994a14 100644
--- a/toolkit/components/downloads/Makefile.in
+++ b/toolkit/components/downloads/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS += $(TK_CFLAGS) -DGOOGLE_PROTOBUF_NO_RTTI
diff --git a/toolkit/components/downloads/test/browser/Makefile.in b/toolkit/components/downloads/test/browser/Makefile.in
index 720ee9cc745e..98f2c5e77261 100644
--- a/toolkit/components/downloads/test/browser/Makefile.in
+++ b/toolkit/components/downloads/test/browser/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH          = @DEPTH@
-topsrcdir      = @top_srcdir@
-srcdir         = @srcdir@
-VPATH          = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES = \
   browser_nsIDownloadManagerUI.js \
   browser_download_history.js \
@@ -20,5 +12,3 @@ MOCHITEST_FILES = \
   download.html \
   download.test \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/feeds/Makefile.in b/toolkit/components/feeds/Makefile.in
index 5e901809cddd..026ec2e3b4b7 100644
--- a/toolkit/components/feeds/Makefile.in
+++ b/toolkit/components/feeds/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOZILLA_INTERNAL_API = 1
 include $(topsrcdir)/config/rules.mk
 
diff --git a/toolkit/components/feeds/test/Makefile.in b/toolkit/components/feeds/test/Makefile.in
index 702fc71980bf..d21cd8214a90 100644
--- a/toolkit/components/feeds/test/Makefile.in
+++ b/toolkit/components/feeds/test/Makefile.in
@@ -3,16 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_CHROME_FILES = \
 		test_bug675492.xul    \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/filepicker/Makefile.in b/toolkit/components/filepicker/Makefile.in
index 3ab977f8b595..5aa5764bee3f 100644
--- a/toolkit/components/filepicker/Makefile.in
+++ b/toolkit/components/filepicker/Makefile.in
@@ -4,17 +4,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 ifdef MOZ_XUL
 ifeq (,$(filter android qt os2 cocoa windows,$(MOZ_WIDGET_TOOLKIT)))
 EXPORT_LIBRARY = 1
 endif
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/jsdownloads/src/Makefile.in b/toolkit/components/jsdownloads/src/Makefile.in
index 09f092d08e00..c97efbc03e9e 100644
--- a/toolkit/components/jsdownloads/src/Makefile.in
+++ b/toolkit/components/jsdownloads/src/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS += $(TK_CFLAGS)
diff --git a/toolkit/components/jsdownloads/test/data/Makefile.in b/toolkit/components/jsdownloads/test/data/Makefile.in
index 223aa6f5bcad..6e009860ab0b 100644
--- a/toolkit/components/jsdownloads/test/data/Makefile.in
+++ b/toolkit/components/jsdownloads/test/data/Makefile.in
@@ -1,15 +1,6 @@
 # Any copyright is dedicated to the Public Domain.
 # http://creativecommons.org/publicdomain/zero/1.0/
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 FILES = \
 	empty.txt \
 	source.txt \
diff --git a/toolkit/components/maintenanceservice/Makefile.in b/toolkit/components/maintenanceservice/Makefile.in
index 45085c3ef7f6..10a39a3508b4 100644
--- a/toolkit/components/maintenanceservice/Makefile.in
+++ b/toolkit/components/maintenanceservice/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # For debugging purposes only
 #DEFINES += -DDISABLE_UPDATER_AUTHENTICODE_CHECK
 
diff --git a/toolkit/components/mediasniffer/Makefile.in b/toolkit/components/mediasniffer/Makefile.in
index 4301cae66bf2..15aff14ed534 100644
--- a/toolkit/components/mediasniffer/Makefile.in
+++ b/toolkit/components/mediasniffer/Makefile.in
@@ -2,13 +2,4 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/microformats/tests/Makefile.in b/toolkit/components/microformats/tests/Makefile.in
index 3e2c0ca67fb4..71ac09c52791 100644
--- a/toolkit/components/microformats/tests/Makefile.in
+++ b/toolkit/components/microformats/tests/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = \
 		test_Microformats.html \
 		test_Microformats_hCard.html \
@@ -22,5 +15,3 @@ MOCHITEST_FILES = \
 		test_framerecursion.html \
 		geo.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/osfile/tests/mochi/Makefile.in b/toolkit/components/osfile/tests/mochi/Makefile.in
index 25cf80b29329..51537ae51f55 100644
--- a/toolkit/components/osfile/tests/mochi/Makefile.in
+++ b/toolkit/components/osfile/tests/mochi/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH           = @DEPTH@
-topsrcdir       = @top_srcdir@
-srcdir          = @srcdir@
-VPATH           = @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_CHROME_FILES := \
   test_osfile_back.xul \
   worker_handler.js \
@@ -23,5 +15,3 @@ MOCHITEST_CHROME_FILES := \
   test_osfile_async.xul \
   main_test_osfile_async.js \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/passwordmgr/test/Makefile.in b/toolkit/components/passwordmgr/test/Makefile.in
index 0852f8bf88ad..b2ea222f1ad2 100644
--- a/toolkit/components/passwordmgr/test/Makefile.in
+++ b/toolkit/components/passwordmgr/test/Makefile.in
@@ -3,12 +3,6 @@
 # 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/.
 
-DEPTH          = @DEPTH@
-topsrcdir      = @top_srcdir@
-srcdir         = @srcdir@
-VPATH          = @srcdir@
-relativesrcdir = @relativesrcdir@
-
 include $(topsrcdir)/config/config.mk
 
 # Mochitest tests
@@ -91,5 +85,3 @@ MOCHITEST_CHROME_FILES += \
 # This test doesn't pass because we can't ensure a cross-platform
 # event that occurs between DOMContentLoaded and Pageload
 # test_bug_221634.html
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/passwordmgr/test/auth2/Makefile.in b/toolkit/components/passwordmgr/test/auth2/Makefile.in
index d7588520b84b..bd9fd24a5297 100644
--- a/toolkit/components/passwordmgr/test/auth2/Makefile.in
+++ b/toolkit/components/passwordmgr/test/auth2/Makefile.in
@@ -2,16 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = \
     authenticate.sjs \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/passwordmgr/test/browser/Makefile.in b/toolkit/components/passwordmgr/test/browser/Makefile.in
index 304ffbebd6fb..8205c924a924 100644
--- a/toolkit/components/passwordmgr/test/browser/Makefile.in
+++ b/toolkit/components/passwordmgr/test/browser/Makefile.in
@@ -3,19 +3,9 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES = \
   browser_passwordmgrdlg.js \
   browser_passwordmgr_sort.js \
   browser_passwordmgrcopypwd.js \
   browser_passwordmgr_observers.js \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/perf/Makefile.in b/toolkit/components/perf/Makefile.in
index 038daa920234..02ae543b4d46 100644
--- a/toolkit/components/perf/Makefile.in
+++ b/toolkit/components/perf/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 LOCAL_INCLUDES := \
   -I$(topsrcdir)/js/xpconnect/loader \
@@ -19,5 +12,3 @@ MOCHITEST_CHROME_FILES = \
     test_pm.xul \
     $(NULL)
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/places/Makefile.in b/toolkit/components/places/Makefile.in
index 7006d6f4a8c4..9819e67912cd 100644
--- a/toolkit/components/places/Makefile.in
+++ b/toolkit/components/places/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 ifdef MOZ_PLACES
 EXPORT_LIBRARY = 1
 
diff --git a/toolkit/components/places/tests/Makefile.in b/toolkit/components/places/tests/Makefile.in
index 1cc089626de8..9c1395d05334 100644
--- a/toolkit/components/places/tests/Makefile.in
+++ b/toolkit/components/places/tests/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # Files in the main "tests" folder.
 XPCSHELL_TESTS_COMMON = \
   head_common.js \
diff --git a/toolkit/components/places/tests/browser/Makefile.in b/toolkit/components/places/tests/browser/Makefile.in
index 2a8a98b6570e..0990f7d19e71 100644
--- a/toolkit/components/places/tests/browser/Makefile.in
+++ b/toolkit/components/places/tests/browser/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES = \
 	head.js \
 	browser_bug248970.js \
@@ -55,5 +47,3 @@ MOCHITEST_FILES = \
 	favicon-normal32.png \
 	favicon.html \
 	$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/places/tests/chrome/Makefile.in b/toolkit/components/places/tests/chrome/Makefile.in
index 7b54f1723f2b..5153bdc1b6e6 100644
--- a/toolkit/components/places/tests/chrome/Makefile.in
+++ b/toolkit/components/places/tests/chrome/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES	= \
 		sample_feed.atom \
 		bad_links.atom \
@@ -32,5 +24,3 @@ MOCHITEST_CHROME_FILES	= \
 		history_post.sjs \
 		test_reloadLivemarks.xul \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/places/tests/mochitest/bug_411966/Makefile.in b/toolkit/components/places/tests/mochitest/bug_411966/Makefile.in
index 69bdc35452f3..1b43efcac001 100644
--- a/toolkit/components/places/tests/mochitest/bug_411966/Makefile.in
+++ b/toolkit/components/places/tests/mochitest/bug_411966/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES	= \
 		redirect.js \
 		TypedPage.htm \
@@ -20,5 +12,3 @@ MOCHITEST_FILES	= \
 		TempRedirectPage.htm^headers^ \
 		PermRedirectPage.htm \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/places/tests/mochitest/bug_461710/Makefile.in b/toolkit/components/places/tests/mochitest/bug_461710/Makefile.in
index aac587d78a81..ceb3734bb484 100644
--- a/toolkit/components/places/tests/mochitest/bug_461710/Makefile.in
+++ b/toolkit/components/places/tests/mochitest/bug_461710/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES	= \
 		visited_page.html \
 		link_page.html \
@@ -18,5 +10,3 @@ MOCHITEST_FILES	= \
 		link_page-3.html \
 		iframe.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/prompts/test/Makefile.in b/toolkit/components/prompts/test/Makefile.in
index ba0244466c4f..ca40c5e5e0e5 100644
--- a/toolkit/components/prompts/test/Makefile.in
+++ b/toolkit/components/prompts/test/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH          = @DEPTH@
-topsrcdir      = @top_srcdir@
-srcdir         = @srcdir@
-VPATH          = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # Mochitest tests
 MOCHITEST_FILES = \
     test_modal_select.html \
@@ -23,5 +15,3 @@ MOCHITEST_FILES = \
     bug619644_inner.html \
     bug625187_iframe.html \
     $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/protobuf/Makefile.in b/toolkit/components/protobuf/Makefile.in
index 7a51a803e8d2..82af0c9c02a8 100644
--- a/toolkit/components/protobuf/Makefile.in
+++ b/toolkit/components/protobuf/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 VPATH = \
   @srcdir@ \
   @srcdir@/google/protobuf \
diff --git a/toolkit/components/reflect/Makefile.in b/toolkit/components/reflect/Makefile.in
index 20a0aa89f9c8..216d04cfd8fd 100644
--- a/toolkit/components/reflect/Makefile.in
+++ b/toolkit/components/reflect/Makefile.in
@@ -2,18 +2,9 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 
 EXTRA_DSO_LDOPTS += \
     $(MOZ_COMPONENT_LIBS) \
     $(MOZ_JS_LIBS) \
     $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/remote/Makefile.in b/toolkit/components/remote/Makefile.in
index 8382e419743a..6265b246d1ea 100644
--- a/toolkit/components/remote/Makefile.in
+++ b/toolkit/components/remote/Makefile.in
@@ -3,16 +3,8 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 
 include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS += $(TK_CFLAGS)
-
diff --git a/toolkit/components/satchel/Makefile.in b/toolkit/components/satchel/Makefile.in
index fff31c9f1d68..5a02721032ce 100644
--- a/toolkit/components/satchel/Makefile.in
+++ b/toolkit/components/satchel/Makefile.in
@@ -2,18 +2,8 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 
 LOCAL_INCLUDES = \
   -I$(srcdir)/../build \
   $(NULL)
-
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/satchel/test/Makefile.in b/toolkit/components/satchel/test/Makefile.in
index ed5e614a67fb..9d72b1ee2744 100644
--- a/toolkit/components/satchel/test/Makefile.in
+++ b/toolkit/components/satchel/test/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH   = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH   = @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = \
 		test_bug_511615.html \
 		test_bug_787624.html \
@@ -22,6 +14,3 @@ MOCHITEST_FILES = \
 		subtst_form_submission_1.html \
 		subtst_privbrowsing.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/toolkit/components/satchel/test/browser/Makefile.in b/toolkit/components/satchel/test/browser/Makefile.in
index 6c9329a44b77..e78af561ab50 100644
--- a/toolkit/components/satchel/test/browser/Makefile.in
+++ b/toolkit/components/satchel/test/browser/Makefile.in
@@ -2,19 +2,8 @@
 # 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/.
 
-DEPTH          = @DEPTH@
-topsrcdir      = @top_srcdir@
-srcdir         = @srcdir@
-VPATH          = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES = \
   head.js \
   ../subtst_privbrowsing.html \
   browser_privbrowsing_perwindowpb.js \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/toolkit/components/search/Makefile.in b/toolkit/components/search/Makefile.in
index cb5b5feeaba7..7355d13216c2 100644
--- a/toolkit/components/search/Makefile.in
+++ b/toolkit/components/search/Makefile.in
@@ -2,14 +2,4 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-
 DEFINES += -DMOZ_DISTRIBUTION_ID=$(MOZ_DISTRIBUTION_ID)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/social/test/browser/Makefile.in b/toolkit/components/social/test/browser/Makefile.in
index 20eed5001043..8d77d0f43510 100644
--- a/toolkit/components/social/test/browser/Makefile.in
+++ b/toolkit/components/social/test/browser/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 ifdef MOZ_SOCIAL
 # social is turned off for android
 
@@ -31,5 +23,3 @@ MOCHITEST_BROWSER_FILES = \
   $(NULL)
 
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/startup/tests/browser/Makefile.in b/toolkit/components/startup/tests/browser/Makefile.in
index d493dd085b29..6f9385228b9c 100644
--- a/toolkit/components/startup/tests/browser/Makefile.in
+++ b/toolkit/components/startup/tests/browser/Makefile.in
@@ -2,19 +2,9 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES = \
 	browser_bug511456.js \
 	browser_bug537449.js \
 	browser_crash_detection.js \
 	beforeunload.html \
 	$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/telemetry/Makefile.in b/toolkit/components/telemetry/Makefile.in
index c91cbad56092..ed1429e16238 100644
--- a/toolkit/components/telemetry/Makefile.in
+++ b/toolkit/components/telemetry/Makefile.in
@@ -3,12 +3,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
 USE_RCS_MK := 1
 include $(topsrcdir)/config/makefiles/rcs.mk
 
diff --git a/toolkit/components/thumbnails/test/Makefile.in b/toolkit/components/thumbnails/test/Makefile.in
index 335c1dbe7f0d..1d17831e85fc 100644
--- a/toolkit/components/thumbnails/test/Makefile.in
+++ b/toolkit/components/thumbnails/test/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES := \
 	browser_thumbnails_background.js \
 	browser_thumbnails_capture.js \
@@ -30,5 +22,3 @@ MOCHITEST_BROWSER_FILES := \
 	thumbnails_background.sjs \
 	thumbnails_update.sjs \
 	$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/url-classifier/Makefile.in b/toolkit/components/url-classifier/Makefile.in
index 844f17d5b616..934d6dc2b8e9 100644
--- a/toolkit/components/url-classifier/Makefile.in
+++ b/toolkit/components/url-classifier/Makefile.in
@@ -3,17 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES = \
   -I$(srcdir)/../build \
   $(SQLITE_CFLAGS) \
   $(NULL)
-
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/url-classifier/tests/Makefile.in b/toolkit/components/url-classifier/tests/Makefile.in
index 24236f071416..905791dc0538 100644
--- a/toolkit/components/url-classifier/tests/Makefile.in
+++ b/toolkit/components/url-classifier/tests/Makefile.in
@@ -4,14 +4,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOZILLA_INTERNAL_API = 1
 
 # XXX Get this to work in libxul builds.
@@ -19,5 +11,3 @@ MOZILLA_INTERNAL_API = 1
 #CPP_UNIT_TESTS = \
 #	TestUrlClassifierUtils.cpp \
 #	$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/url-classifier/tests/mochitest/Makefile.in b/toolkit/components/url-classifier/tests/mochitest/Makefile.in
index 49c1f1a2fe1c..15b189baa8a6 100644
--- a/toolkit/components/url-classifier/tests/mochitest/Makefile.in
+++ b/toolkit/components/url-classifier/tests/mochitest/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = \
 		test_classifier.html \
 		test_classifier_worker.html \
@@ -26,6 +18,3 @@ MOCHITEST_FILES = \
 MOCHITEST_CHROME_FILES = \
   test_lookup_system_principal.html \
   $(NULL)
-
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/urlformatter/Makefile.in b/toolkit/components/urlformatter/Makefile.in
index a6bb8bad8b4d..4bbb6e4368cc 100644
--- a/toolkit/components/urlformatter/Makefile.in
+++ b/toolkit/components/urlformatter/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-
 export:: google_api_key
 
 EXTRA_PP_COMPONENTS_FLAGS = -I google_api_key
diff --git a/toolkit/components/viewsource/test/Makefile.in b/toolkit/components/viewsource/test/Makefile.in
index 4892ebb4b755..ca082b7fe571 100644
--- a/toolkit/components/viewsource/test/Makefile.in
+++ b/toolkit/components/viewsource/test/Makefile.in
@@ -4,16 +4,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_CHROME_FILES   = \
                 test_428653.xul \
                 $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/viewsource/test/browser/Makefile.in b/toolkit/components/viewsource/test/browser/Makefile.in
index 2df7cf9d81b5..04efe6f28c6c 100644
--- a/toolkit/components/viewsource/test/browser/Makefile.in
+++ b/toolkit/components/viewsource/test/browser/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES   = \
                 browser_bug699356.js \
                 browser_bug713810.js \
@@ -19,5 +11,3 @@ MOCHITEST_BROWSER_FILES   = \
                 browser_viewsourceprefs_nonhtml.js \
                 head.js \
                 $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/workerloader/Makefile.in b/toolkit/components/workerloader/Makefile.in
index 41b9e8487e60..1bbcea7946ac 100644
--- a/toolkit/components/workerloader/Makefile.in
+++ b/toolkit/components/workerloader/Makefile.in
@@ -2,19 +2,9 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 WORKER_FILES := require.js \
 	$(NULL)
 
 INSTALL_TARGETS += WORKER
 
 WORKER_DEST = $(FINAL_TARGET)/modules/workers
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/toolkit/components/workerloader/tests/Makefile.in b/toolkit/components/workerloader/tests/Makefile.in
index b270a13c750c..42b727cd5d45 100644
--- a/toolkit/components/workerloader/tests/Makefile.in
+++ b/toolkit/components/workerloader/tests/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH           = @DEPTH@
-topsrcdir       = @top_srcdir@
-srcdir          = @srcdir@
-VPATH           = @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_CHROME_FILES := \
   test_loading.xul \
   worker_test_loading.js \
@@ -24,5 +16,3 @@ MOCHITEST_CHROME_FILES := \
   moduleG-throws-later.js \
   moduleH-module-dot-exports.js \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/content/Makefile.in b/toolkit/content/Makefile.in
index d108440f1330..8675ba2c2e67 100644
--- a/toolkit/content/Makefile.in
+++ b/toolkit/content/Makefile.in
@@ -4,14 +4,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
 CHROME_DEPS = buildconfig.html
 
-include $(DEPTH)/config/autoconf.mk
 USE_RCS_MK := 1
 include $(topsrcdir)/config/makefiles/makeutils.mk
 
@@ -47,5 +41,3 @@ endif
 
 BUILD_HOSTNAME = $(shell hostname -s || hostname)
 DEFINES += -DBUILD_HOSTNAME="$(BUILD_HOSTNAME)"
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/content/tests/browser/Makefile.in b/toolkit/content/tests/browser/Makefile.in
index 7245a5427962..457ae82c3866 100644
--- a/toolkit/content/tests/browser/Makefile.in
+++ b/toolkit/content/tests/browser/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH          = @DEPTH@
-topsrcdir      = @top_srcdir@
-srcdir         = @srcdir@
-VPATH          = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES = \
   browser_keyevents_during_autoscrolling.js \
   browser_bug295977_autoscroll_overflow.js \
@@ -20,5 +12,3 @@ MOCHITEST_BROWSER_FILES = \
   browser_default_image_filename.js \
   browser_input_file_tooltips.js \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/content/tests/browser/common/Makefile.in b/toolkit/content/tests/browser/common/Makefile.in
index 3e6bac2c7cf1..eead015eb16c 100644
--- a/toolkit/content/tests/browser/common/Makefile.in
+++ b/toolkit/content/tests/browser/common/Makefile.in
@@ -3,16 +3,6 @@
 # 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/.
 
-DEPTH          = @DEPTH@
-topsrcdir      = @top_srcdir@
-srcdir         = @srcdir@
-VPATH          = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES = \
   mockTransfer.js \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/content/tests/browser/data/Makefile.in b/toolkit/content/tests/browser/data/Makefile.in
index 17e9e9f590b3..347b2a9c8f48 100644
--- a/toolkit/content/tests/browser/data/Makefile.in
+++ b/toolkit/content/tests/browser/data/Makefile.in
@@ -3,17 +3,7 @@
 # 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/.
 
-DEPTH          = @DEPTH@
-topsrcdir      = @top_srcdir@
-srcdir         = @srcdir@
-VPATH          = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES = \
   post_form_inner.sjs \
   post_form_outer.sjs \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/content/tests/chrome/Makefile.in b/toolkit/content/tests/chrome/Makefile.in
index e9eb4e1fe6a5..93ab10dd1ae1 100644
--- a/toolkit/content/tests/chrome/Makefile.in
+++ b/toolkit/content/tests/chrome/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_CHROME_FILES = \
   ../widgets/popup_shared.js \
   ../widgets/tree_shared.js \
@@ -177,5 +169,3 @@ MOCHITEST_CHROME_FILES += $(filter disabled-temporarily, test_cursorsnap.xul) \
 		window_cursorsnap_dialog.xul \
 		window_cursorsnap_wizard.xul
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/content/tests/chrome/rtlchrome/Makefile.in b/toolkit/content/tests/chrome/rtlchrome/Makefile.in
index 67656bde5dfc..4f7822621627 100644
--- a/toolkit/content/tests/chrome/rtlchrome/Makefile.in
+++ b/toolkit/content/tests/chrome/rtlchrome/Makefile.in
@@ -2,18 +2,8 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_CHROME_FILES := \
   rtl.css \
   rtl.dtd \
   rtl.manifest \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/content/tests/chrome/rtltest/Makefile.in b/toolkit/content/tests/chrome/rtltest/Makefile.in
index 3c72d00b1716..1144f581b05a 100644
--- a/toolkit/content/tests/chrome/rtltest/Makefile.in
+++ b/toolkit/content/tests/chrome/rtltest/Makefile.in
@@ -2,16 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_CHROME_FILES := \
   righttoleft.manifest \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/content/tests/chrome/rtltest/content/Makefile.in b/toolkit/content/tests/chrome/rtltest/content/Makefile.in
index 47bece880c4c..cf3fff2f6a0b 100644
--- a/toolkit/content/tests/chrome/rtltest/content/Makefile.in
+++ b/toolkit/content/tests/chrome/rtltest/content/Makefile.in
@@ -2,16 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_CHROME_FILES := \
   dirtest.xul \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/content/tests/widgets/Makefile.in b/toolkit/content/tests/widgets/Makefile.in
index 44f9fd773e77..d9e8fb434a73 100644
--- a/toolkit/content/tests/widgets/Makefile.in
+++ b/toolkit/content/tests/widgets/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES =	\
 		test_contextmenu_nested.xul \
 		tree_shared.js \
@@ -59,5 +51,3 @@ MOCHITEST_FILES += \
 		test_popupanchor.xul \
 		$(NULL)
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/crashreporter/Makefile.in b/toolkit/crashreporter/Makefile.in
index ddd1b40550d6..c56af5e478e1 100644
--- a/toolkit/crashreporter/Makefile.in
+++ b/toolkit/crashreporter/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 ifeq ($(OS_ARCH),Linux)
 # MOZ_APP_NAME is needed on Android, where we
 # need to launch by package name.
diff --git a/toolkit/crashreporter/breakpad-windows-libxul/Makefile.in b/toolkit/crashreporter/breakpad-windows-libxul/Makefile.in
index 1bd1672e544a..ad732f1fba1b 100644
--- a/toolkit/crashreporter/breakpad-windows-libxul/Makefile.in
+++ b/toolkit/crashreporter/breakpad-windows-libxul/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 FORCE_STATIC_LIB = 1
 
 STL_FLAGS =
@@ -28,5 +21,3 @@ VPATH += \
   $(NULL)
 
 DEFINES += -DUNICODE -DUNICODE_ -DBREAKPAD_NO_TERMINATE_THREAD -DNOMINMAX
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/crashreporter/breakpad-windows-standalone/Makefile.in b/toolkit/crashreporter/breakpad-windows-standalone/Makefile.in
index 5192abc59b8c..21b66aad643a 100644
--- a/toolkit/crashreporter/breakpad-windows-standalone/Makefile.in
+++ b/toolkit/crashreporter/breakpad-windows-standalone/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 FORCE_STATIC_LIB = 1
 USE_STATIC_LIBS = 1
 MOZ_GLUE_LDFLAGS =
@@ -28,5 +21,3 @@ VPATH += \
   $(NULL)
 
 DEFINES += -DUNICODE -DUNICODE_ -DBREAKPAD_NO_TERMINATE_THREAD -DNOMINMAX
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/crashreporter/client/Makefile.in b/toolkit/crashreporter/client/Makefile.in
index de89dde2bd79..01e7388e919f 100644
--- a/toolkit/crashreporter/client/Makefile.in
+++ b/toolkit/crashreporter/client/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # Don't use the STL wrappers in the crashreporter clients; they don't
 # link with -lmozalloc, and it really doesn't matter here anyway.
 STL_FLAGS =
diff --git a/toolkit/crashreporter/google-breakpad/src/client/Makefile.in b/toolkit/crashreporter/google-breakpad/src/client/Makefile.in
index adde49f88b95..24270f18c958 100644
--- a/toolkit/crashreporter/google-breakpad/src/client/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/client/Makefile.in
@@ -2,18 +2,9 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 XPI_NAME 	= crashreporter
 
 LOCAL_INCLUDES 	= -I$(srcdir)/..
 
 # need static lib
 FORCE_STATIC_LIB = 1
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/Makefile.in b/toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/Makefile.in
index 343e7cf52af1..a4af3425c693 100644
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES = \
   -I$(topsrcdir)/toolkit/crashreporter/google-breakpad/src \
   $(NULL)
diff --git a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/Makefile.in b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/Makefile.in
index 0b1d2bf94997..7b251bc74472 100644
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 ifdef MOZ_THUMB2 #{
 # The syscall number is passed through r7 in the linux ARM ABI, but r7
 # is also the THUMB frame pointer.  (Unfortunate, but ah well.)  gcc
@@ -39,5 +32,3 @@ ifeq ($(OS_TARGET),Android)
 DEFINES += -D_STLP_CONST_CONSTRUCTOR_BUG -D_STLP_NO_MEMBER_TEMPLATES
 LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/crashreporter/google-breakpad/src/common/android/include/
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/Makefile.in b/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/Makefile.in
index 6b7feee07b63..085a48f4a607 100644
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 XPI_NAME 	= crashreporter
 
 LOCAL_INCLUDES = \
@@ -25,5 +18,3 @@ endif
 ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
 DEFINES += -DELFSIZE=32
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/Makefile.in b/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/Makefile.in
index df06cbf72ca7..36fc57161160 100644
--- a/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/Makefile.in
@@ -2,18 +2,9 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 XPI_NAME 	= crashreporter
 
 LOCAL_INCLUDES 	= -I$(srcdir)/../../..
 
 # need static lib
 FORCE_STATIC_LIB = 1
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/handler/Makefile.in b/toolkit/crashreporter/google-breakpad/src/client/mac/handler/Makefile.in
index df06cbf72ca7..36fc57161160 100644
--- a/toolkit/crashreporter/google-breakpad/src/client/mac/handler/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/client/mac/handler/Makefile.in
@@ -2,18 +2,9 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 XPI_NAME 	= crashreporter
 
 LOCAL_INCLUDES 	= -I$(srcdir)/../../..
 
 # need static lib
 FORCE_STATIC_LIB = 1
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/crashreporter/google-breakpad/src/client/solaris/handler/Makefile.in b/toolkit/crashreporter/google-breakpad/src/client/solaris/handler/Makefile.in
index df06cbf72ca7..36fc57161160 100644
--- a/toolkit/crashreporter/google-breakpad/src/client/solaris/handler/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/client/solaris/handler/Makefile.in
@@ -2,18 +2,9 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 XPI_NAME 	= crashreporter
 
 LOCAL_INCLUDES 	= -I$(srcdir)/../../..
 
 # need static lib
 FORCE_STATIC_LIB = 1
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/crashreporter/google-breakpad/src/common/Makefile.in b/toolkit/crashreporter/google-breakpad/src/common/Makefile.in
index d92731f14ff7..729947341732 100644
--- a/toolkit/crashreporter/google-breakpad/src/common/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/common/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 ifneq (WINNT,$(OS_TARGET))
 ifdef MOZ_CRASHREPORTER
 endif
diff --git a/toolkit/crashreporter/google-breakpad/src/common/dwarf/Makefile.in b/toolkit/crashreporter/google-breakpad/src/common/dwarf/Makefile.in
index 1c5b9d73dad7..29029e05375e 100644
--- a/toolkit/crashreporter/google-breakpad/src/common/dwarf/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/common/dwarf/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 ifdef MOZ_CRASHREPORTER
 
 LOCAL_INCLUDES 	= -I$(srcdir)/../..
@@ -27,5 +20,3 @@ HOST_CXXFLAGS := -funsigned-char $(filter-out -fno-rtti,$(HOST_CXXFLAGS))
 
 # need static lib
 FORCE_STATIC_LIB = 1
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in b/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in
index 99357ac6039a..908f3d7bec9f 100644
--- a/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 ifdef MOZ_CRASHREPORTER
 endif
 
diff --git a/toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in b/toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in
index d17854c24a51..e4f6fbc4f43c 100644
--- a/toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-
 LOCAL_INCLUDES 	= -I$(srcdir)/../..
 
 # This is a little weird, but we're building a host and a target lib here.
diff --git a/toolkit/crashreporter/google-breakpad/src/common/solaris/Makefile.in b/toolkit/crashreporter/google-breakpad/src/common/solaris/Makefile.in
index 04d3f8e85a38..589f0b95848e 100644
--- a/toolkit/crashreporter/google-breakpad/src/common/solaris/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/common/solaris/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-
 LOCAL_INCLUDES 	= -I$(srcdir)/../..
 
 # not compiling http_upload.cc currently
@@ -22,5 +14,3 @@ HOST_CPPSRCS = \
 
 # need static lib
 FORCE_STATIC_LIB = 1
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/crashreporter/google-breakpad/src/processor/Makefile.in b/toolkit/crashreporter/google-breakpad/src/processor/Makefile.in
index b5daa36670ff..bef12cad85cc 100644
--- a/toolkit/crashreporter/google-breakpad/src/processor/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/processor/Makefile.in
@@ -2,16 +2,7 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES 	= -I$(srcdir)/../.. -I$(srcdir)/..
 
 # need static lib
 FORCE_STATIC_LIB = 1
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in b/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in
index 07036fee6709..ff3a0873a4cc 100644
--- a/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 HOST_PROGRAM = dump_syms
 
 LOCAL_INCLUDES 	= \
@@ -25,5 +18,3 @@ HOST_LIBS += \
   $(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/$(LIB_PREFIX)host_breakpad_common_s.$(LIB_SUFFIX) \
   $(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/dwarf/$(LIB_PREFIX)host_breakpad_dwarf_s.$(LIB_SUFFIX) \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/crashreporter/google-breakpad/src/tools/mac/dump_syms/Makefile.in b/toolkit/crashreporter/google-breakpad/src/tools/mac/dump_syms/Makefile.in
index 33d31c38f9a8..d62363170e74 100644
--- a/toolkit/crashreporter/google-breakpad/src/tools/mac/dump_syms/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/tools/mac/dump_syms/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 HOST_PROGRAM = dump_syms
 
 LOCAL_INCLUDES 	= \
@@ -29,5 +22,3 @@ HOST_LIBS += \
 HOST_LDFLAGS += \
   -framework Foundation \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/crashreporter/google-breakpad/src/tools/solaris/dump_syms/Makefile.in b/toolkit/crashreporter/google-breakpad/src/tools/solaris/dump_syms/Makefile.in
index 7d7a9cac4afe..bd0147096dba 100644
--- a/toolkit/crashreporter/google-breakpad/src/tools/solaris/dump_syms/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/tools/solaris/dump_syms/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 HOST_PROGRAM = dump_syms
 
 LOCAL_INCLUDES 	= \
@@ -26,5 +19,3 @@ HOST_LIBS += \
   $(NULL)
 
 HOST_LDFLAGS += -lelf -ldemangle
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/crashreporter/injector/Makefile.in b/toolkit/crashreporter/injector/Makefile.in
index 2fd65673afca..f5a66b85d321 100644
--- a/toolkit/crashreporter/injector/Makefile.in
+++ b/toolkit/crashreporter/injector/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 FORCE_SHARED_LIB = 1
 USE_STATIC_LIBS = 1
 STL_FLAGS =
diff --git a/toolkit/crashreporter/test/Makefile.in b/toolkit/crashreporter/test/Makefile.in
index f65357c33f19..cebe4615f87e 100644
--- a/toolkit/crashreporter/test/Makefile.in
+++ b/toolkit/crashreporter/test/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 FORCE_SHARED_LIB = 1
 
 VPATH += \
@@ -42,4 +34,3 @@ libs::  $(MOCHITEST_BROWSER_FILES)
 libs:: $(SHARED_LIBRARY) $(EXTRA_JS_MODULES)
 	$(INSTALL) $^ $(DEPTH)/_tests/xpcshell/$(relativesrcdir)/unit/
 	$(INSTALL) $^ $(DEPTH)/_tests/xpcshell/$(relativesrcdir)/unit_ipc/
-
diff --git a/toolkit/devtools/Makefile.in b/toolkit/devtools/Makefile.in
index bba704930848..7501dba58483 100644
--- a/toolkit/devtools/Makefile.in
+++ b/toolkit/devtools/Makefile.in
@@ -2,11 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
 include $(topsrcdir)/config/rules.mk
 
 libs::
diff --git a/toolkit/devtools/client/Makefile.in b/toolkit/devtools/client/Makefile.in
index eaae4c6f08b9..23506e61c6d3 100644
--- a/toolkit/devtools/client/Makefile.in
+++ b/toolkit/devtools/client/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 libs::
diff --git a/toolkit/devtools/gcli/Makefile.in b/toolkit/devtools/gcli/Makefile.in
index fe75dad69a8f..f75d4ac50e03 100644
--- a/toolkit/devtools/gcli/Makefile.in
+++ b/toolkit/devtools/gcli/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 libs::
diff --git a/toolkit/devtools/server/Makefile.in b/toolkit/devtools/server/Makefile.in
index 9402dbeb04eb..7f61c3e0aee8 100644
--- a/toolkit/devtools/server/Makefile.in
+++ b/toolkit/devtools/server/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 
 EXTRA_DSO_LDOPTS += \
diff --git a/toolkit/devtools/server/tests/mochitest/Makefile.in b/toolkit/devtools/server/tests/mochitest/Makefile.in
index 86a0f782f02f..3b6d826755e5 100644
--- a/toolkit/devtools/server/tests/mochitest/Makefile.in
+++ b/toolkit/devtools/server/tests/mochitest/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_CHROME_FILES	= \
 	inspector-helpers.js \
 	inspector-traversal-data.html \
@@ -39,5 +31,3 @@ MOCHITEST_CHROME_FILES	= \
 	test_connection-manager.html \
 	test_device.html \
 	$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/devtools/sourcemap/Makefile.in b/toolkit/devtools/sourcemap/Makefile.in
index 8890154f78a5..aad3588f0549 100644
--- a/toolkit/devtools/sourcemap/Makefile.in
+++ b/toolkit/devtools/sourcemap/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 libs::
diff --git a/toolkit/devtools/webconsole/Makefile.in b/toolkit/devtools/webconsole/Makefile.in
index fe3837d47564..45ffcf18666d 100644
--- a/toolkit/devtools/webconsole/Makefile.in
+++ b/toolkit/devtools/webconsole/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 libs::
diff --git a/toolkit/devtools/webconsole/test/Makefile.in b/toolkit/devtools/webconsole/test/Makefile.in
index 64b5348446da..7d4d02651ca5 100644
--- a/toolkit/devtools/webconsole/test/Makefile.in
+++ b/toolkit/devtools/webconsole/test/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH          = @DEPTH@
-topsrcdir      = @top_srcdir@
-srcdir         = @srcdir@
-VPATH          = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_CHROME_FILES = \
     test_basics.html \
     test_cached_messages.html \
@@ -30,5 +22,3 @@ MOCHITEST_CHROME_FILES = \
     data.json^headers^ \
     common.js \
     $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/forgetaboutsite/test/browser/Makefile.in b/toolkit/forgetaboutsite/test/browser/Makefile.in
index 8abe5e26f58b..1c531a5c72fd 100644
--- a/toolkit/forgetaboutsite/test/browser/Makefile.in
+++ b/toolkit/forgetaboutsite/test/browser/Makefile.in
@@ -2,16 +2,7 @@
 # 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/.
 
-DEPTH   := @DEPTH@
-topsrcdir := @top_srcdir@
-srcdir    := @srcdir@
-VPATH   := @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES := \
   browser_clearplugindata.js \
   browser_clearplugindata.html \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/identity/Makefile.in b/toolkit/identity/Makefile.in
index fa79dcc3230f..275538dce73e 100644
--- a/toolkit/identity/Makefile.in
+++ b/toolkit/identity/Makefile.in
@@ -2,13 +2,4 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/identity/tests/chrome/Makefile.in b/toolkit/identity/tests/chrome/Makefile.in
index 0d8c172e5f0d..693db85ff79a 100644
--- a/toolkit/identity/tests/chrome/Makefile.in
+++ b/toolkit/identity/tests/chrome/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH          = @DEPTH@
-topsrcdir      = @top_srcdir@
-srcdir         = @srcdir@
-VPATH          = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_CHROME_FILES = \
 		sandbox_content.html \
 		sandbox_content_alert.html \
@@ -21,5 +13,3 @@ MOCHITEST_CHROME_FILES = \
 		sandbox_content.sjs \
 		test_sandbox.xul \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
index 5c4063f0f6d2..c6885253d681 100644
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/rdf/util/src/objs.mk
 include $(topsrcdir)/intl/unicharutil/util/objs.mk
 
@@ -714,5 +707,3 @@ endif
 
 $(FINAL_TARGET)/dependentlibs.list: dependentlibs.py $(SHARED_LIBRARY) $(wildcard $(if $(wildcard $(FINAL_TARGET)/dependentlibs.list),$(addprefix $(FINAL_TARGET)/,$(shell cat $(FINAL_TARGET)/dependentlibs.list))))
 	$(PYTHON) $< $(SHARED_LIBRARY) -L $(FINAL_TARGET) $(if $(TOOLCHAIN_PREFIX),$(addprefix -p ,$(TOOLCHAIN_PREFIX))) > $@
-
-
diff --git a/toolkit/library/winvccorlib/Makefile.in b/toolkit/library/winvccorlib/Makefile.in
index 0c0044022237..8f6203ffbf76 100644
--- a/toolkit/library/winvccorlib/Makefile.in
+++ b/toolkit/library/winvccorlib/Makefile.in
@@ -2,20 +2,10 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
 # When we're linking GTest we recurse into this directory but don't need
 # to generate this library
 ifndef LINK_GTEST
 
-include $(DEPTH)/config/autoconf.mk
-
 FORCE_SHARED_LIB=1
 
 endif
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/toolkit/locales/Makefile.in b/toolkit/locales/Makefile.in
index 4548cc42ba0b..e3e28e44bf32 100644
--- a/toolkit/locales/Makefile.in
+++ b/toolkit/locales/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 DEFINES += -DAB_CD=$(AB_CD)
 
 XULPPFLAGS += -I$(LOCALE_SRCDIR)/defines.inc
diff --git a/toolkit/modules/Makefile.in b/toolkit/modules/Makefile.in
index 273612e65547..f9d643c8e1b4 100644
--- a/toolkit/modules/Makefile.in
+++ b/toolkit/modules/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 ifdef MOZ_TOOLKIT_SEARCH
 DEFINES += -DMOZ_TOOLKIT_SEARCH
 endif
@@ -17,5 +10,3 @@ DEFINES += \
   -DMOZ_APP_NAME=$(MOZ_APP_NAME) \
   -DMOZ_BUILD_APP=$(MOZ_BUILD_APP) \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/modules/tests/browser/Makefile.in b/toolkit/modules/tests/browser/Makefile.in
index 22610f45e828..f30e8d08b85f 100644
--- a/toolkit/modules/tests/browser/Makefile.in
+++ b/toolkit/modules/tests/browser/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH          = @DEPTH@
-topsrcdir      = @top_srcdir@
-srcdir         = @srcdir@
-VPATH          = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_FILES = \
   browser_DeferredTask.js \
   browser_Deprecated.js \
@@ -19,5 +11,3 @@ MOCHITEST_BROWSER_FILES = \
   browser_Troubleshoot.js \
   
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/modules/tests/chrome/Makefile.in b/toolkit/modules/tests/chrome/Makefile.in
index 9c3ed48eb652..0e4c38bca7ba 100644
--- a/toolkit/modules/tests/chrome/Makefile.in
+++ b/toolkit/modules/tests/chrome/Makefile.in
@@ -2,17 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_CHROME_FILES = \
   test_bug544442_checkCert.xul \
   $(NULL)
-
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/mozapps/downloads/tests/Makefile.in b/toolkit/mozapps/downloads/tests/Makefile.in
index ba4bdd289137..2a5fe66d574e 100644
--- a/toolkit/mozapps/downloads/tests/Makefile.in
+++ b/toolkit/mozapps/downloads/tests/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH          = @DEPTH@
-topsrcdir      = @top_srcdir@
-srcdir         = @srcdir@
-VPATH          = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 libs:: 
diff --git a/toolkit/mozapps/downloads/tests/chrome/Makefile.in b/toolkit/mozapps/downloads/tests/chrome/Makefile.in
index 9555a89efbf3..573dc97be5f2 100644
--- a/toolkit/mozapps/downloads/tests/chrome/Makefile.in
+++ b/toolkit/mozapps/downloads/tests/chrome/Makefile.in
@@ -3,14 +3,6 @@
 # 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/.
 
-DEPTH          = @DEPTH@
-topsrcdir      = @top_srcdir@
-srcdir         = @srcdir@
-VPATH          = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # temporarily disabled test (bug 483200)
 #  test_retention_is_0_closes.xul \
 
@@ -58,5 +50,3 @@ MOCHITEST_CHROME_FILES += \
   $(filter disabled-for-very-frequent-orange--bug-630567, test_taskbarprogress_service.xul) \
   $(NULL)
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/mozapps/extensions/Makefile.in b/toolkit/mozapps/extensions/Makefile.in
index 5eeb7947b6e1..33851f05f3f6 100644
--- a/toolkit/mozapps/extensions/Makefile.in
+++ b/toolkit/mozapps/extensions/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 ifeq (,$(filter aurora beta release esr,$(MOZ_UPDATE_CHANNEL)))
 DEFINES += -DMOZ_COMPATIBILITY_NIGHTLY=1
 endif
@@ -31,5 +24,3 @@ EXTRA_DSO_LDOPTS = \
   $(MOZ_UNICHARUTIL_LIBS) \
   $(MOZ_COMPONENT_LIBS) \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/mozapps/extensions/test/Makefile.in b/toolkit/mozapps/extensions/test/Makefile.in
index 43f32ec30d44..3ef6ffbc45b6 100644
--- a/toolkit/mozapps/extensions/test/Makefile.in
+++ b/toolkit/mozapps/extensions/test/Makefile.in
@@ -2,18 +2,10 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
 ADDONSRC = $(srcdir)/addons
-relativesrcdir = @relativesrcdir@
-
 TESTROOT = $(CURDIR)/$(DEPTH)/_tests/xpcshell/$(relativesrcdir)
 TESTXPI = $(TESTROOT)/xpcshell/addons
 
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 libs::
diff --git a/toolkit/mozapps/extensions/test/browser/Makefile.in b/toolkit/mozapps/extensions/test/browser/Makefile.in
index af6e1ea663a1..881366f130d9 100644
--- a/toolkit/mozapps/extensions/test/browser/Makefile.in
+++ b/toolkit/mozapps/extensions/test/browser/Makefile.in
@@ -2,16 +2,9 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-relativesrcdir  = @relativesrcdir@
 ADDONSRC = $(srcdir)/addons
 TESTXPI = $(CURDIR)/$(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)/addons
 
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_BROWSER_MAIN = \
   head.js \
   browser_about.js \
diff --git a/toolkit/mozapps/extensions/test/mochitest/Makefile.in b/toolkit/mozapps/extensions/test/mochitest/Makefile.in
index fc8266cbad4f..c18651775c55 100644
--- a/toolkit/mozapps/extensions/test/mochitest/Makefile.in
+++ b/toolkit/mozapps/extensions/test/mochitest/Makefile.in
@@ -3,15 +3,5 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES =	test_bug609794.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/mozapps/extensions/test/xpinstall/Makefile.in b/toolkit/mozapps/extensions/test/xpinstall/Makefile.in
index 20742d1fa1ae..32affc875df8 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/Makefile.in
+++ b/toolkit/mozapps/extensions/test/xpinstall/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # browser_bug672485.js is disabled due to a leak. See bug 682410.
 
 MOCHITEST_BROWSER_FILES = head.js \
@@ -94,5 +86,3 @@ MOCHITEST_BROWSER_FILES = head.js \
                  bug645699.html \
                  redirect.sjs \
                  $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/mozapps/plugins/tests/Makefile.in b/toolkit/mozapps/plugins/tests/Makefile.in
index 6d1e34c6415f..67692078550d 100644
--- a/toolkit/mozapps/plugins/tests/Makefile.in
+++ b/toolkit/mozapps/plugins/tests/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-relativesrcdir  = @relativesrcdir@
 TESTROOT = $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
 USE_STATIC_LIBS = 1
 
diff --git a/toolkit/mozapps/update/common/Makefile.in b/toolkit/mozapps/update/common/Makefile.in
index 723847251077..c29c9b596dd7 100644
--- a/toolkit/mozapps/update/common/Makefile.in
+++ b/toolkit/mozapps/update/common/Makefile.in
@@ -2,16 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 ifeq ($(OS_ARCH),WINNT)
 USE_STATIC_LIBS = 1
 endif
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/toolkit/mozapps/update/test/Makefile.in b/toolkit/mozapps/update/test/Makefile.in
index 45d486139352..970123e40fc0 100644
--- a/toolkit/mozapps/update/test/Makefile.in
+++ b/toolkit/mozapps/update/test/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 TESTROOT = $(call core_abspath,$(DEPTH))/_tests/xpcshell/$(relativesrcdir)
 
 DEFINES += \
diff --git a/toolkit/mozapps/update/test/chrome/Makefile.in b/toolkit/mozapps/update/test/chrome/Makefile.in
index 6a6bd170e091..5c156d6b9ec5 100644
--- a/toolkit/mozapps/update/test/chrome/Makefile.in
+++ b/toolkit/mozapps/update/test/chrome/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_CHROME_FILES = \
   ../unit/data/simple.mar \
   ../unit/data/simple_no_pib.mar \
diff --git a/toolkit/mozapps/update/test_svc/Makefile.in b/toolkit/mozapps/update/test_svc/Makefile.in
index 80b32f15d0e3..f59ef7f24820 100644
--- a/toolkit/mozapps/update/test_svc/Makefile.in
+++ b/toolkit/mozapps/update/test_svc/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 TESTROOT = $(call core_abspath,$(DEPTH))/_tests/xpcshell/$(relativesrcdir)
 
 DEFINES += \
diff --git a/toolkit/mozapps/update/updater/Makefile.in b/toolkit/mozapps/update/updater/Makefile.in
index f5831b2425c6..66ad73c91c24 100644
--- a/toolkit/mozapps/update/updater/Makefile.in
+++ b/toolkit/mozapps/update/updater/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # Don't link the updater against libmozglue. See bug 687139
 MOZ_GLUE_LDFLAGS =
 MOZ_GLUE_PROGRAM_LDFLAGS =
diff --git a/toolkit/profile/Makefile.in b/toolkit/profile/Makefile.in
index 5cc9d5164722..17ff60d08d39 100644
--- a/toolkit/profile/Makefile.in
+++ b/toolkit/profile/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES = \
   -I$(srcdir)/../xre \
   -I$(topsrcdir)/profile/dirserviceprovider/src \
diff --git a/toolkit/profile/test/Makefile.in b/toolkit/profile/test/Makefile.in
index cfaa2896570c..9f77d3ae8004 100644
--- a/toolkit/profile/test/Makefile.in
+++ b/toolkit/profile/test/Makefile.in
@@ -3,17 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_CHROME_FILES   = \
                 test_create_profile.xul \
                 $(NULL)
-
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/system/androidproxy/Makefile.in b/toolkit/system/androidproxy/Makefile.in
index ee5f5f18fb70..b18c26d61eee 100644
--- a/toolkit/system/androidproxy/Makefile.in
+++ b/toolkit/system/androidproxy/Makefile.in
@@ -2,12 +2,4 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY  = 1
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/system/dbus/Makefile.in b/toolkit/system/dbus/Makefile.in
index 96b07bdbdd2e..f6914e0c0fce 100644
--- a/toolkit/system/dbus/Makefile.in
+++ b/toolkit/system/dbus/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 IS_COMPONENT = 1
 FORCE_SHARED_LIB = 1
 
diff --git a/toolkit/system/gnome/Makefile.in b/toolkit/system/gnome/Makefile.in
index 70ab32ecfafc..272a9fcd7f90 100644
--- a/toolkit/system/gnome/Makefile.in
+++ b/toolkit/system/gnome/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir	  = @srcdir@
-VPATH	  = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 FORCE_SHARED_LIB = 1
 IS_COMPONENT	= 1
 EXTRA_DSO_LDOPTS += \
diff --git a/toolkit/system/osxproxy/Makefile.in b/toolkit/system/osxproxy/Makefile.in
index ee5f5f18fb70..b18c26d61eee 100644
--- a/toolkit/system/osxproxy/Makefile.in
+++ b/toolkit/system/osxproxy/Makefile.in
@@ -2,12 +2,4 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY  = 1
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/system/unixproxy/Makefile.in b/toolkit/system/unixproxy/Makefile.in
index 9a4052750b47..def5e71005da 100644
--- a/toolkit/system/unixproxy/Makefile.in
+++ b/toolkit/system/unixproxy/Makefile.in
@@ -2,16 +2,7 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY  = 1
 ifdef MOZ_ENABLE_LIBPROXY
 CXXFLAGS += $(MOZ_LIBPROXY_CFLAGS)
 endif # MOZ_ENABLE_LIBPROXY
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/system/windowsproxy/Makefile.in b/toolkit/system/windowsproxy/Makefile.in
index ee5f5f18fb70..b18c26d61eee 100644
--- a/toolkit/system/windowsproxy/Makefile.in
+++ b/toolkit/system/windowsproxy/Makefile.in
@@ -2,12 +2,4 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY  = 1
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/themes/osx/mochitests/Makefile.in b/toolkit/themes/osx/mochitests/Makefile.in
index 63823e781b80..6de76a8a49a3 100644
--- a/toolkit/themes/osx/mochitests/Makefile.in
+++ b/toolkit/themes/osx/mochitests/Makefile.in
@@ -3,15 +3,5 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_CHROME_FILES = 	test_bug510426.xul \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in
index 5779d430b362..ed032b8bdde8 100644
--- a/toolkit/xre/Makefile.in
+++ b/toolkit/xre/Makefile.in
@@ -5,13 +5,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 USE_RCS_MK=1
 include $(topsrcdir)/config/makefiles/makeutils.mk
 
diff --git a/toolkit/xre/test/Makefile.in b/toolkit/xre/test/Makefile.in
index 2dc0e9ccb7ab..6d3be40b8a35 100644
--- a/toolkit/xre/test/Makefile.in
+++ b/toolkit/xre/test/Makefile.in
@@ -2,17 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = \
   test_fpuhandler.html \
   $(NULL)
-
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/xre/test/win/Makefile.in b/toolkit/xre/test/win/Makefile.in
index 6339f1ddfd7a..22a409962cf5 100644
--- a/toolkit/xre/test/win/Makefile.in
+++ b/toolkit/xre/test/win/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 OS_LIBS += $(call EXPAND_LIBNAME,comctl32 ws2_32 shell32)
 
 LOCAL_INCLUDES += \
diff --git a/tools/jprof/Makefile.in b/tools/jprof/Makefile.in
index ea6cb8e2e68c..f94a0355f459 100644
--- a/tools/jprof/Makefile.in
+++ b/tools/jprof/Makefile.in
@@ -4,13 +4,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 OS_LIBS = \
 	-ldl \
 	-lbfd \
diff --git a/tools/jprof/stub/Makefile.in b/tools/jprof/stub/Makefile.in
index 8d4826f7ef3e..f90aac903e9f 100644
--- a/tools/jprof/stub/Makefile.in
+++ b/tools/jprof/stub/Makefile.in
@@ -4,13 +4,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY	= 1
 FORCE_SHARED_LIB = 1
 
diff --git a/tools/profiler/Makefile.in b/tools/profiler/Makefile.in
index 1724fcc89efe..bd36e7cd09fb 100644
--- a/tools/profiler/Makefile.in
+++ b/tools/profiler/Makefile.in
@@ -4,14 +4,7 @@
 # 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/.
 
-DEPTH       = @DEPTH@
-topsrcdir   = @top_srcdir@
-srcdir      = @srcdir@
 VPATH       = $(srcdir)
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 ifdef MOZ_ENABLE_PROFILER_SPS
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/mozglue/linker \
@@ -34,5 +27,3 @@ CMMSRCS += \
 endif
 
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/tools/trace-malloc/Makefile.in b/tools/trace-malloc/Makefile.in
index b0afa4732609..646b31c3d861 100644
--- a/tools/trace-malloc/Makefile.in
+++ b/tools/trace-malloc/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXTRACSRCS = tmreader.c
 EXTRACPPSRCS = adreader.cpp
 
@@ -75,4 +68,3 @@ libs:: rules.txt
 
 libs:: spacetrace.css
 	$(INSTALL) $< $(DIST)/bin/res
-
diff --git a/tools/trace-malloc/lib/Makefile.in b/tools/trace-malloc/lib/Makefile.in
index e53aa0b639ff..954139a3e174 100644
--- a/tools/trace-malloc/lib/Makefile.in
+++ b/tools/trace-malloc/lib/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY	= 1
 DEFFILE		= $(win_srcdir)/tm.def
 
@@ -24,6 +17,3 @@ DEFINES		+= -DMOZ_NO_MOZALLOC
 ifdef WRAP_SYSTEM_INCLUDES
 DEFINES		+= -DWRAP_SYSTEM_INCLUDES
 endif
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/tools/update-packaging/Makefile.in b/tools/update-packaging/Makefile.in
index b23bb5e9b121..f58a60ca0cf7 100644
--- a/tools/update-packaging/Makefile.in
+++ b/tools/update-packaging/Makefile.in
@@ -4,13 +4,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 STANDALONE_MAKEFILE := 1
 
 # input location for the build, usually $(DIST)
diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in
index 7cc2de29ea57..0b6a2b834982 100644
--- a/uriloader/exthandler/Makefile.in
+++ b/uriloader/exthandler/Makefile.in
@@ -3,12 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
 OSDIR		= os2
 else
diff --git a/uriloader/exthandler/tests/Makefile.in b/uriloader/exthandler/tests/Makefile.in
index d635e31d6214..ae93666a7659 100644
--- a/uriloader/exthandler/tests/Makefile.in
+++ b/uriloader/exthandler/tests/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH           = @DEPTH@
-topsrcdir       = @top_srcdir@
-srcdir          = @srcdir@
-VPATH           = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 FAIL_ON_WARNINGS = 1
 
 include $(topsrcdir)/config/config.mk
diff --git a/uriloader/exthandler/tests/mochitest/Makefile.in b/uriloader/exthandler/tests/mochitest/Makefile.in
index 9bea6f6297b6..a1c152574b4e 100644
--- a/uriloader/exthandler/tests/mochitest/Makefile.in
+++ b/uriloader/exthandler/tests/mochitest/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES =	\
 		test_handlerApps.xhtml \
 		test_unsafeBidiChars.xhtml \
@@ -18,5 +10,3 @@ MOCHITEST_FILES =	\
 		unsafeBidiFileName.sjs \
 		test_badMimeType.html \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/uriloader/prefetch/Makefile.in b/uriloader/prefetch/Makefile.in
index 289490db49ce..0fcef969ed57 100644
--- a/uriloader/prefetch/Makefile.in
+++ b/uriloader/prefetch/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES = \
 		-I$(topsrcdir)/content/base/src \
 		-I$(topsrcdir)/content/events/src \
diff --git a/view/src/Makefile.in b/view/src/Makefile.in
index 1498bab29b73..285d563bea10 100644
--- a/view/src/Makefile.in
+++ b/view/src/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES  = \
diff --git a/webapprt/Makefile.in b/webapprt/Makefile.in
index 93cf40de1040..07fec1621d39 100644
--- a/webapprt/Makefile.in
+++ b/webapprt/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # Include config.mk explicitly so we can override FINAL_TARGET.
 include $(topsrcdir)/config/config.mk
 
diff --git a/webapprt/gtk2/Makefile.in b/webapprt/gtk2/Makefile.in
index b74ed3e54a66..c684406a1ee4 100644
--- a/webapprt/gtk2/Makefile.in
+++ b/webapprt/gtk2/Makefile.in
@@ -2,12 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-include $(DEPTH)/config/autoconf.mk
-
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/toolkit/xre \
   -I$(topsrcdir)/xpcom/base \
diff --git a/webapprt/locales/Makefile.in b/webapprt/locales/Makefile.in
index 1975558f3ed2..82f614ecea29 100644
--- a/webapprt/locales/Makefile.in
+++ b/webapprt/locales/Makefile.in
@@ -2,14 +2,4 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 DEFINES += -DAB_CD=$(AB_CD)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/webapprt/mac/Makefile.in b/webapprt/mac/Makefile.in
index 9f67ef7664f9..12dac3750b75 100644
--- a/webapprt/mac/Makefile.in
+++ b/webapprt/mac/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # This switches $(INSTALL) to copy mode, like $(SYSINSTALL), so things that
 # shouldn't get 755 perms need $(IFLAGS1) for either way of calling nsinstall.
 NSDISTMODE = copy
diff --git a/webapprt/test/chrome/Makefile.in b/webapprt/test/chrome/Makefile.in
index f12d205effed..a8d84d9b48db 100644
--- a/webapprt/test/chrome/Makefile.in
+++ b/webapprt/test/chrome/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH          = @DEPTH@
-topsrcdir      = @top_srcdir@
-srcdir         = @srcdir@
-VPATH          = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_WEBAPPRT_CHROME_FILES = \
   head.js \
   browser_sample.js \
@@ -37,5 +29,3 @@ MOCHITEST_WEBAPPRT_CHROME_FILES = \
     geolocation-prompt-perm.html \
     geolocation-prompt-noperm.html \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/webapprt/test/content/Makefile.in b/webapprt/test/content/Makefile.in
index 2ea38598bfda..8dea9fddd3ff 100644
--- a/webapprt/test/content/Makefile.in
+++ b/webapprt/test/content/Makefile.in
@@ -2,19 +2,9 @@
 # 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/.
 
-DEPTH          = @DEPTH@
-topsrcdir      = @top_srcdir@
-srcdir         = @srcdir@
-VPATH          = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_FILES = \
   test.webapp \
   test.webapp^headers^ \
   webapprt_sample.html \
   webapprt_indexeddb.html \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/webapprt/win/Makefile.in b/webapprt/win/Makefile.in
index c218d5ff1af9..d86b5f110b4e 100644
--- a/webapprt/win/Makefile.in
+++ b/webapprt/win/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # Statically link against the CRT
 USE_STATIC_LIBS = 1
 # Don't create a dependency on mozglue, which is impossible (difficult?)
diff --git a/widget/android/Makefile.in b/widget/android/Makefile.in
index 985f4e9f3756..273504f8a1bf 100644
--- a/widget/android/Makefile.in
+++ b/widget/android/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH           = @DEPTH@
-topsrcdir       = @top_srcdir@
-srcdir          = @srcdir@
-VPATH           = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY  = 1
 SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a
 
diff --git a/widget/cocoa/Makefile.in b/widget/cocoa/Makefile.in
index 1a09dc51c937..70b71a1bb2cc 100644
--- a/widget/cocoa/Makefile.in
+++ b/widget/cocoa/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY	= 1
 CMMSRCS = \
   nsBidiKeyboard.mm \
diff --git a/widget/gonk/Makefile.in b/widget/gonk/Makefile.in
index a838823ee2b0..eac18d69fcaa 100644
--- a/widget/gonk/Makefile.in
+++ b/widget/gonk/Makefile.in
@@ -12,16 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-DEPTH           = @DEPTH@
-topsrcdir       = @top_srcdir@
-srcdir          = @srcdir@
 VPATH           = \
   $(srcdir) \
   $(srcdir)/libui \
   $(NULL)
 
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY  = 1
 SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a
 
diff --git a/widget/gonk/libdisplay/Makefile.in b/widget/gonk/libdisplay/Makefile.in
index 10bba6484ac0..570f9340ac2f 100644
--- a/widget/gonk/libdisplay/Makefile.in
+++ b/widget/gonk/libdisplay/Makefile.in
@@ -12,15 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-DEPTH           = @DEPTH@
-topsrcdir       = @top_srcdir@
-srcdir          = @srcdir@
 VPATH           = \
   $(srcdir) \
   $(NULL)
 
-include $(DEPTH)/config/autoconf.mk
-
 FORCE_STATIC_LIB= 1
 STL_FLAGS=
 
diff --git a/widget/gonk/nativewindow/Makefile.in b/widget/gonk/nativewindow/Makefile.in
index 0f9cd248cac0..c30944d90ee2 100644
--- a/widget/gonk/nativewindow/Makefile.in
+++ b/widget/gonk/nativewindow/Makefile.in
@@ -11,13 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-DEPTH           = @DEPTH@
-topsrcdir       = @top_srcdir@
-srcdir          = @srcdir@
-VPATH           = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 STL_FLAGS=
 
 include $(topsrcdir)/config/rules.mk
diff --git a/widget/gtk2/Makefile.in b/widget/gtk2/Makefile.in
index 04b711a94451..1187627ca813 100644
--- a/widget/gtk2/Makefile.in
+++ b/widget/gtk2/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY	= 1
 NATIVE_THEME_SUPPORT = 1
 
diff --git a/widget/gtkxtbin/Makefile.in b/widget/gtkxtbin/Makefile.in
index c84d0971d73c..d9143cd128c0 100644
--- a/widget/gtkxtbin/Makefile.in
+++ b/widget/gtkxtbin/Makefile.in
@@ -4,13 +4,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 ifdef MOZ_ENABLE_GTK2
 CSRCS		= \
@@ -29,4 +22,3 @@ DEFINES		+= -D_IMPL_GTKXTBIN_API
 INCLUDES	+= \
 		-I$(srcdir) \
 		$(NULL)
-
diff --git a/widget/os2/Makefile.in b/widget/os2/Makefile.in
index d641a02cea64..0b4704b3b183 100644
--- a/widget/os2/Makefile.in
+++ b/widget/os2/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY	= 1
 RESFILE		= widget.res
 SHARED_LIBRARY_LIBS = \
@@ -40,5 +33,3 @@ export-preqs = \
 
 export:: $(export-preqs)
 	test -f ./res/aliasb.ptr || cp $(srcdir)/res/*.* ./res
-
-
diff --git a/widget/qt/Makefile.in b/widget/qt/Makefile.in
index d3500c132807..4160cbd3b8fe 100644
--- a/widget/qt/Makefile.in
+++ b/widget/qt/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a
 
diff --git a/widget/qt/faststartupqt/Makefile.in b/widget/qt/faststartupqt/Makefile.in
index 14b721cf48ee..d643c6db486f 100644
--- a/widget/qt/faststartupqt/Makefile.in
+++ b/widget/qt/faststartupqt/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 DIST_INSTALL = 1
 FORCE_STATIC_LIB = 1
 STL_FLAGS=
@@ -40,6 +33,3 @@ LOCAL_INCLUDES += \
 	$(NULL)
 
 DEFINES += -DLIBRARY_FILENAME="$(SHARED_LIBRARY)" -DMOZ_NO_MOZALLOC -DXPCOM_GLUE
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/widget/shared/Makefile.in b/widget/shared/Makefile.in
index 29ef2d582c91..6468a43b2c71 100644
--- a/widget/shared/Makefile.in
+++ b/widget/shared/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/widget/shared/x11/Makefile.in b/widget/shared/x11/Makefile.in
index f0ed88151ebe..5fc38aec4a63 100644
--- a/widget/shared/x11/Makefile.in
+++ b/widget/shared/x11/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH      = @DEPTH@
-topsrcdir  = @top_srcdir@
-srcdir     = @srcdir@
-VPATH      = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS   += $(TK_CFLAGS)
diff --git a/widget/tests/Makefile.in b/widget/tests/Makefile.in
index 815643f032de..73d877dbdae7 100644
--- a/widget/tests/Makefile.in
+++ b/widget/tests/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-include $(DEPTH)/config/autoconf.mk
-
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 
 ifdef NS_ENABLE_TSF
@@ -102,5 +95,3 @@ MOCHITEST_FILES += 	plugin_scroll_invalidation.html \
 		test_plugin_scroll_invalidation.html \
 		$(NULL)
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/widget/windows/Makefile.in b/widget/windows/Makefile.in
index 49a76fbb6f09..b1429538f6b8 100644
--- a/widget/windows/Makefile.in
+++ b/widget/windows/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY	= 1
 RESFILE		= widget.res
 DEFINES		+= -DMOZ_UNICODE 
diff --git a/widget/windows/winrt/Makefile.in b/widget/windows/winrt/Makefile.in
index ba8a581b0090..69398b74c985 100644
--- a/widget/windows/winrt/Makefile.in
+++ b/widget/windows/winrt/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY	= 1
 DEFINES		+= -DMOZ_UNICODE
 
diff --git a/widget/xpwidgets/Makefile.in b/widget/xpwidgets/Makefile.in
index 095d14262593..f4c2db81f4d2 100644
--- a/widget/xpwidgets/Makefile.in
+++ b/widget/xpwidgets/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 SHARED_LIBRARY_LIBS = ../shared/$(LIB_PREFIX)widget_shared.$(LIB_SUFFIX)
 ifdef MOZ_X11
 SHARED_LIBRARY_LIBS += ../shared/x11/$(LIB_PREFIX)widget_shared_x11.$(LIB_SUFFIX)
diff --git a/widget/xremoteclient/Makefile.in b/widget/xremoteclient/Makefile.in
index 1187f760f365..88dc128e5ca6 100644
--- a/widget/xremoteclient/Makefile.in
+++ b/widget/xremoteclient/Makefile.in
@@ -7,13 +7,6 @@
 # the application binaries. The fact that it's under mozilla/widget is a fluke
 # of tree history.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 FORCE_STATIC_LIB = 1
 
 DEFINES += -DXPCOM_GLUE
@@ -37,5 +30,3 @@ PROGOBJS = $(PROGCPPSRCS:.cpp=.$(OBJ_SUFFIX))
 LIBS            = \
 		$(NSPR_LIBS) \
 		$(XLDFLAGS) $(XLIBS)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/xpcom/Makefile.in b/xpcom/Makefile.in
index e7f6c35a1926..b8515521fab1 100644
--- a/xpcom/Makefile.in
+++ b/xpcom/Makefile.in
@@ -2,14 +2,7 @@
 # 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/.
 
-DEPTH := @DEPTH@
-topsrcdir := @top_srcdir@
-srcdir := @srcdir@
-VPATH := @srcdir@
-
 INSTALL_TARGETS += xpcom
 xpcom_FILES := xpcom-config.h
 xpcom_DEST = $(DIST)/include
 xpcom_TARGET := export
-
-include $(topsrcdir)/config/rules.mk
diff --git a/xpcom/analysis/Makefile.in b/xpcom/analysis/Makefile.in
index 96d99f9afb99..9ab1af624cb8 100644
--- a/xpcom/analysis/Makefile.in
+++ b/xpcom/analysis/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOZILLA_INTERNAL_API = 1
 
 include $(topsrcdir)/config/rules.mk
diff --git a/xpcom/base/Makefile.in b/xpcom/base/Makefile.in
index 5e34139d2918..fa3c709be76f 100644
--- a/xpcom/base/Makefile.in
+++ b/xpcom/base/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOZILLA_INTERNAL_API =1
 ifeq ($(OS_ARCH),WINNT)
 
diff --git a/xpcom/build/Makefile.in b/xpcom/build/Makefile.in
index 651f24042075..f50e0902be40 100644
--- a/xpcom/build/Makefile.in
+++ b/xpcom/build/Makefile.in
@@ -4,12 +4,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
 include $(srcdir)/../glue/objs.mk
 
 EXTRA_DEPS += $(srcdir)/../glue/objs.mk
diff --git a/xpcom/components/Makefile.in b/xpcom/components/Makefile.in
index e23d24777374..9b48ca2adc52 100644
--- a/xpcom/components/Makefile.in
+++ b/xpcom/components/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOZILLA_INTERNAL_API = 1
 
 LOCAL_INCLUDES	= \
diff --git a/xpcom/ds/Makefile.in b/xpcom/ds/Makefile.in
index 7408bb7dc791..992f4970bc1b 100644
--- a/xpcom/ds/Makefile.in
+++ b/xpcom/ds/Makefile.in
@@ -3,16 +3,8 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOZILLA_INTERNAL_API = 1
 
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += -I$(srcdir)/../io
-
diff --git a/xpcom/glue/Makefile.in b/xpcom/glue/Makefile.in
index 550adeb70678..015980a630ad 100644
--- a/xpcom/glue/Makefile.in
+++ b/xpcom/glue/Makefile.in
@@ -3,12 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
 include $(srcdir)/objs.mk
 
 EXTRA_DEPS += $(srcdir)/objs.mk
diff --git a/xpcom/glue/nomozalloc/Makefile.in b/xpcom/glue/nomozalloc/Makefile.in
index e2caa73a566b..e149c28c1ba0 100644
--- a/xpcom/glue/nomozalloc/Makefile.in
+++ b/xpcom/glue/nomozalloc/Makefile.in
@@ -3,12 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
 include $(srcdir)/../objs.mk
 
 EXTRA_DEPS += $(srcdir)/../objs.mk
diff --git a/xpcom/glue/standalone/Makefile.in b/xpcom/glue/standalone/Makefile.in
index d3cacfd13092..514f028b7f72 100644
--- a/xpcom/glue/standalone/Makefile.in
+++ b/xpcom/glue/standalone/Makefile.in
@@ -3,12 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
 include $(srcdir)/../objs.mk
 
 EXTRA_DEPS += $(srcdir)/../objs.mk
@@ -49,4 +43,3 @@ DEFINES		+= -DXPCOM_GLUE
 ifdef TARGET_XPCOM_ABI
 DEFINES += -DTARGET_XPCOM_ABI=\"$(TARGET_XPCOM_ABI)\"
 endif
-
diff --git a/xpcom/glue/standalone/staticruntime/Makefile.in b/xpcom/glue/standalone/staticruntime/Makefile.in
index 3c1df788b9ff..75ed9667be52 100644
--- a/xpcom/glue/standalone/staticruntime/Makefile.in
+++ b/xpcom/glue/standalone/staticruntime/Makefile.in
@@ -2,12 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
 include $(srcdir)/../../objs.mk
 
 EXTRA_DEPS += $(srcdir)/../../objs.mk
@@ -52,4 +46,3 @@ DEFINES		+= -DXPCOM_GLUE
 ifdef TARGET_XPCOM_ABI
 DEFINES += -DTARGET_XPCOM_ABI=\"$(TARGET_XPCOM_ABI)\"
 endif
-
diff --git a/xpcom/glue/staticruntime/Makefile.in b/xpcom/glue/staticruntime/Makefile.in
index 911f7ab92b96..80bab0cb3d30 100644
--- a/xpcom/glue/staticruntime/Makefile.in
+++ b/xpcom/glue/staticruntime/Makefile.in
@@ -3,12 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
 include $(srcdir)/../objs.mk
 
 EXTRA_DEPS += $(srcdir)/../objs.mk
@@ -48,4 +42,3 @@ export:: $(XPCOM_GLUE_SRC_CPPSRCS) $(XPCOM_GLUENS_SRC_CPPSRCS) $(topsrcdir)/xpco
 ifdef TARGET_XPCOM_ABI
 DEFINES += -DTARGET_XPCOM_ABI=\"$(TARGET_XPCOM_ABI)\"
 endif
-
diff --git a/xpcom/glue/tests/gtest/Makefile.in b/xpcom/glue/tests/gtest/Makefile.in
index ea55dfe0b133..3379ad33696a 100644
--- a/xpcom/glue/tests/gtest/Makefile.in
+++ b/xpcom/glue/tests/gtest/Makefile.in
@@ -3,14 +3,5 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 LOCAL_INCLUDES = -I$(srcdir)/../..
-
-include $(topsrcdir)/config/rules.mk
diff --git a/xpcom/idl-parser/Makefile.in b/xpcom/idl-parser/Makefile.in
index 7c48ead0f8b7..a7802139b5ed 100644
--- a/xpcom/idl-parser/Makefile.in
+++ b/xpcom/idl-parser/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 PARSER_SRCS = \
   header.py \
   typelib.py \
diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in
index 0f3faf73d15e..d3630ef15bb6 100644
--- a/xpcom/io/Makefile.in
+++ b/xpcom/io/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOZILLA_INTERNAL_API = 1
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
@@ -20,4 +13,3 @@ endif
 endif
 
 LOCAL_INCLUDES	+= -I..
-
diff --git a/xpcom/reflect/xptcall/src/Makefile.in b/xpcom/reflect/xptcall/src/Makefile.in
index bdef57704cf7..c2a1da78b5fc 100644
--- a/xpcom/reflect/xptcall/src/Makefile.in
+++ b/xpcom/reflect/xptcall/src/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOZILLA_INTERNAL_API = 1
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
diff --git a/xpcom/reflect/xptcall/src/md/os2/Makefile.in b/xpcom/reflect/xptcall/src/md/os2/Makefile.in
index 7552f11e5a73..7ed8c1dfb9b8 100644
--- a/xpcom/reflect/xptcall/src/md/os2/Makefile.in
+++ b/xpcom/reflect/xptcall/src/md/os2/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir		= @top_srcdir@
-srcdir			= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY	= ../..
 MOZILLA_INTERNAL_API = 1
 
diff --git a/xpcom/reflect/xptcall/src/md/unix/Makefile.in b/xpcom/reflect/xptcall/src/md/unix/Makefile.in
index 430748165a3c..8f25236e110c 100644
--- a/xpcom/reflect/xptcall/src/md/unix/Makefile.in
+++ b/xpcom/reflect/xptcall/src/md/unix/Makefile.in
@@ -3,14 +3,8 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
 NO_PROFILE_GUIDED_OPTIMIZE = 1
 
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY	= ../..
 MOZILLA_INTERNAL_API = 1
 
diff --git a/xpcom/reflect/xptcall/src/md/win32/Makefile.in b/xpcom/reflect/xptcall/src/md/win32/Makefile.in
index b4049f1b81e1..a355fe36eeff 100644
--- a/xpcom/reflect/xptcall/src/md/win32/Makefile.in
+++ b/xpcom/reflect/xptcall/src/md/win32/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY	= ../..
 MOZILLA_INTERNAL_API = 1
 
diff --git a/xpcom/reflect/xptcall/tests/Makefile.in b/xpcom/reflect/xptcall/tests/Makefile.in
index 959acbabf2db..1860e72f6f65 100644
--- a/xpcom/reflect/xptcall/tests/Makefile.in
+++ b/xpcom/reflect/xptcall/tests/Makefile.in
@@ -3,16 +3,7 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 LIBS		= \
 		$(XPCOM_GLUE_LDOPTS) \
 		$(NSPR_LIBS) \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/xpcom/reflect/xptinfo/public/Makefile.in b/xpcom/reflect/xptinfo/public/Makefile.in
index 9b02060ae961..c14c389e2be2 100644
--- a/xpcom/reflect/xptinfo/public/Makefile.in
+++ b/xpcom/reflect/xptinfo/public/Makefile.in
@@ -3,15 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-
 include $(topsrcdir)/config/rules.mk
 
 CFLAGS		+= -DEXPORT_XPCI_API
-
diff --git a/xpcom/reflect/xptinfo/src/Makefile.in b/xpcom/reflect/xptinfo/src/Makefile.in
index 11aaffa7c0d9..e8221baf2213 100644
--- a/xpcom/reflect/xptinfo/src/Makefile.in
+++ b/xpcom/reflect/xptinfo/src/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOZILLA_INTERNAL_API = 1
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
diff --git a/xpcom/reflect/xptinfo/tests/Makefile.in b/xpcom/reflect/xptinfo/tests/Makefile.in
index 959acbabf2db..1860e72f6f65 100644
--- a/xpcom/reflect/xptinfo/tests/Makefile.in
+++ b/xpcom/reflect/xptinfo/tests/Makefile.in
@@ -3,16 +3,7 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 LIBS		= \
 		$(XPCOM_GLUE_LDOPTS) \
 		$(NSPR_LIBS) \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/xpcom/sample/Makefile.in b/xpcom/sample/Makefile.in
index 7a64ee1639c8..efa358e1d3ad 100644
--- a/xpcom/sample/Makefile.in
+++ b/xpcom/sample/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # On OS/2, SHORT_LIBNAME is used to generate a library with an 8.3 filename,
 # e.g. dist/bin/components/xpcomsmp.dll
 SHORT_LIBNAME	= xpcomsmp
diff --git a/xpcom/sample/program/Makefile.in b/xpcom/sample/program/Makefile.in
index 395a73547f55..cf243e6f0d2a 100644
--- a/xpcom/sample/program/Makefile.in
+++ b/xpcom/sample/program/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # LIBS specifies linker flags when building an executable program from
 # this Makefile. We link against the "standalone glue" which does not require
 # that the application be linked against the XPCOM dynamic library or the NSPR
@@ -28,5 +21,3 @@ endif
 # Whatever code is going to be linked with the *standalone* glue must be
 # built with the XPCOM_GLUE define set.
 DEFINES += -DXPCOM_GLUE
-
-include $(topsrcdir)/config/rules.mk
diff --git a/xpcom/string/src/Makefile.in b/xpcom/string/src/Makefile.in
index 74695176e0ea..565397948ba2 100644
--- a/xpcom/string/src/Makefile.in
+++ b/xpcom/string/src/Makefile.in
@@ -4,13 +4,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOZILLA_INTERNAL_API = 1
 
 # we don't want the shared lib, but we want to force the creation of a
diff --git a/xpcom/tests/Makefile.in b/xpcom/tests/Makefile.in
index d1e23c724b5c..788020967647 100644
--- a/xpcom/tests/Makefile.in
+++ b/xpcom/tests/Makefile.in
@@ -2,14 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 FAIL_ON_WARNINGS = 1
 
 VPATH += $(topsrcdir)/build
diff --git a/xpcom/tests/bug656331_component/Makefile.in b/xpcom/tests/bug656331_component/Makefile.in
index f475a794498c..b43d665c0915 100644
--- a/xpcom/tests/bug656331_component/Makefile.in
+++ b/xpcom/tests/bug656331_component/Makefile.in
@@ -5,13 +5,6 @@
 
 # Blatantly copied from xpcom/tests/component.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 IS_COMPONENT	= 1
 FORCE_SHARED_LIB = 1
 
diff --git a/xpcom/tests/component/Makefile.in b/xpcom/tests/component/Makefile.in
index e2f9b65b199c..3a3a468f039a 100644
--- a/xpcom/tests/component/Makefile.in
+++ b/xpcom/tests/component/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 IS_COMPONENT	= 1
 FORCE_SHARED_LIB = 1
 
diff --git a/xpcom/tests/component_no_aslr/Makefile.in b/xpcom/tests/component_no_aslr/Makefile.in
index 62f10a40b476..b946ce208bee 100644
--- a/xpcom/tests/component_no_aslr/Makefile.in
+++ b/xpcom/tests/component_no_aslr/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 IS_COMPONENT	= 1
 FORCE_SHARED_LIB = 1
 
diff --git a/xpcom/tests/external/Makefile.in b/xpcom/tests/external/Makefile.in
index 9932618a6a55..5002019438cb 100644
--- a/xpcom/tests/external/Makefile.in
+++ b/xpcom/tests/external/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 LIBS += \
diff --git a/xpcom/tests/static-checker/Makefile.in b/xpcom/tests/static-checker/Makefile.in
index cfacd6e7013b..35d2422bb2a9 100644
--- a/xpcom/tests/static-checker/Makefile.in
+++ b/xpcom/tests/static-checker/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 OUTPARAMS_WARNING_TESTCASES = \
   e1.cpp \
   e4.cpp \
diff --git a/xpcom/tests/windows/Makefile.in b/xpcom/tests/windows/Makefile.in
index ebac9f2c4679..e03fbaedaadf 100644
--- a/xpcom/tests/windows/Makefile.in
+++ b/xpcom/tests/windows/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 OS_LIBS	+= $(call EXPAND_LIBNAME,rpcrt4 uuid)
diff --git a/xpcom/threads/Makefile.in b/xpcom/threads/Makefile.in
index e41bcf67fbb7..cfb6a17d9f9c 100644
--- a/xpcom/threads/Makefile.in
+++ b/xpcom/threads/Makefile.in
@@ -3,17 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOZILLA_INTERNAL_API = 1
 LOCAL_INCLUDES	= -I$(srcdir)/../components
 LOCAL_INCLUDES = -I$(srcdir)/../build
-
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/xpcom/typelib/xpt/src/Makefile.in b/xpcom/typelib/xpt/src/Makefile.in
index 9a6bf832281e..bcf39d7dea96 100644
--- a/xpcom/typelib/xpt/src/Makefile.in
+++ b/xpcom/typelib/xpt/src/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 DIST_INSTALL	= 1
 USE_STATIC_LIBS = 1
 
diff --git a/xpcom/typelib/xpt/tests/Makefile.in b/xpcom/typelib/xpt/tests/Makefile.in
index 9874693d44da..4623aa5c8aac 100644
--- a/xpcom/typelib/xpt/tests/Makefile.in
+++ b/xpcom/typelib/xpt/tests/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 LIBS		= \
 		$(DIST)/lib/$(LIB_PREFIX)xpt.$(LIB_SUFFIX) \
 		$(NULL)
diff --git a/xpcom/typelib/xpt/tools/Makefile.in b/xpcom/typelib/xpt/tools/Makefile.in
index 2427d7839599..2a99f7df4363 100644
--- a/xpcom/typelib/xpt/tools/Makefile.in
+++ b/xpcom/typelib/xpt/tools/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 INTERNAL_TOOLS	= 1
 
 SDK_BINARY = \
diff --git a/xpcom/windbgdlg/Makefile.in b/xpcom/windbgdlg/Makefile.in
index 4066a8610a20..254509ee779d 100644
--- a/xpcom/windbgdlg/Makefile.in
+++ b/xpcom/windbgdlg/Makefile.in
@@ -3,13 +3,4 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOZ_WINCONSOLE = 0
-include $(topsrcdir)/config/rules.mk
-
diff --git a/xpfe/appshell/src/Makefile.in b/xpfe/appshell/src/Makefile.in
index 19fa4d68cabc..5ca9cde30202 100644
--- a/xpfe/appshell/src/Makefile.in
+++ b/xpfe/appshell/src/Makefile.in
@@ -3,15 +3,5 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY  = 1
 LOCAL_INCLUDES += -I$(topsrcdir)/dom/base
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/xpfe/appshell/src/test/Makefile.in b/xpfe/appshell/src/test/Makefile.in
index d05d2d87a265..a994a4564b65 100644
--- a/xpfe/appshell/src/test/Makefile.in
+++ b/xpfe/appshell/src/test/Makefile.in
@@ -2,16 +2,6 @@
 # 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/.
 
-DEPTH          := @DEPTH@
-topsrcdir      := @top_srcdir@
-srcdir         := @srcdir@
-VPATH          := @srcdir@
-relativesrcdir := @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 MOCHITEST_CHROME_FILES := \
   test_hiddenPrivateWindow.xul \
   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/xpfe/components/build/Makefile.in b/xpfe/components/build/Makefile.in
index c11be5e52d45..6750adb3c255 100644
--- a/xpfe/components/build/Makefile.in
+++ b/xpfe/components/build/Makefile.in
@@ -3,15 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY = 1
 SHARED_LIBRARY_LIBS += ../directory/$(LIB_PREFIX)directory_s.$(LIB_SUFFIX)
 LOCAL_INCLUDES += -I$(srcdir)/../directory
-
-include $(topsrcdir)/config/rules.mk
diff --git a/xpfe/components/windowds/Makefile.in b/xpfe/components/windowds/Makefile.in
index 6cb0ce06bfe5..398c4043a54e 100644
--- a/xpfe/components/windowds/Makefile.in
+++ b/xpfe/components/windowds/Makefile.in
@@ -3,14 +3,4 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 EXPORT_LIBRARY   = 1
-
-
-include $(topsrcdir)/config/rules.mk
diff --git a/xulrunner/app/Makefile.in b/xulrunner/app/Makefile.in
index 44acc2d50fd2..f32c74c84305 100644
--- a/xulrunner/app/Makefile.in
+++ b/xulrunner/app/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 PREF_JS_EXPORTS = $(srcdir)/xulrunner.js
 GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/,xulrunner.js)
 
diff --git a/xulrunner/app/profile/Makefile.in b/xulrunner/app/profile/Makefile.in
index df4a64c1e395..adc738d3495f 100644
--- a/xulrunner/app/profile/Makefile.in
+++ b/xulrunner/app/profile/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk
 
 FILES := \
diff --git a/xulrunner/app/profile/chrome/Makefile.in b/xulrunner/app/profile/chrome/Makefile.in
index 2b98c93898e0..bda2018d793f 100644
--- a/xulrunner/app/profile/chrome/Makefile.in
+++ b/xulrunner/app/profile/chrome/Makefile.in
@@ -3,12 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
 FILES := \
@@ -25,4 +19,3 @@ libs::
 install::
 	$(SYSINSTALL) $(IFLAGS1) $(FILES) $(DESTDIR)$(mozappdir)/defaults/profile/chrome
 	$(NSINSTALL)  -t $(IFLAGS1) $(FILES) $(DESTDIR)$(mozappdir)/defaults/profile/US/chrome
-
diff --git a/xulrunner/examples/simple/Makefile.in b/xulrunner/examples/simple/Makefile.in
index 3e6086323fb4..bc19e8b7a341 100644
--- a/xulrunner/examples/simple/Makefile.in
+++ b/xulrunner/examples/simple/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 XPI_NAME	= simple
 
 PREF_JS_EXPORTS	= $(srcdir)/simple-prefs.js
diff --git a/xulrunner/examples/simple/components/public/Makefile.in b/xulrunner/examples/simple/components/public/Makefile.in
index 6562abbce053..92cb56b028ef 100644
--- a/xulrunner/examples/simple/components/public/Makefile.in
+++ b/xulrunner/examples/simple/components/public/Makefile.in
@@ -3,13 +3,4 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 XPI_NAME	= simple
-
-include $(topsrcdir)/config/rules.mk
diff --git a/xulrunner/examples/simple/components/src/Makefile.in b/xulrunner/examples/simple/components/src/Makefile.in
index 6fcebb0efa16..12fa0b722bb7 100644
--- a/xulrunner/examples/simple/components/src/Makefile.in
+++ b/xulrunner/examples/simple/components/src/Makefile.in
@@ -3,13 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 XPI_NAME	= simple
 SHORT_LIBNAME = simpltst
 IS_COMPONENT	= 1
@@ -18,5 +11,3 @@ EXTRA_DSO_LDOPTS = \
 	$(XPCOM_GLUE_LDOPTS) \
 	$(NSPR_LIBS) \
 	$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/xulrunner/installer/Makefile.in b/xulrunner/installer/Makefile.in
index 81b3ef11172e..645846516c85 100644
--- a/xulrunner/installer/Makefile.in
+++ b/xulrunner/installer/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 STANDALONE_MAKEFILE := 1
 
 NO_PKG_FILES = \
diff --git a/xulrunner/installer/windows/Makefile.in b/xulrunner/installer/windows/Makefile.in
index cc538559c4a4..4ababec2efa8 100644
--- a/xulrunner/installer/windows/Makefile.in
+++ b/xulrunner/installer/windows/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 CONFIG_DIR=$(call core_abspath,$(srcdir))
 OBJ_DIR=$(call core_abspath,$(DEPTH))
 SRC_DIR=$(call core_abspath,$(topsrcdir))
diff --git a/xulrunner/setup/Makefile.in b/xulrunner/setup/Makefile.in
index 3466fec6806f..e36fc237f803 100644
--- a/xulrunner/setup/Makefile.in
+++ b/xulrunner/setup/Makefile.in
@@ -2,13 +2,4 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 DEFINES = -DBIN_SUFFIX=$(BIN_SUFFIX)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/xulrunner/stub/Makefile.in b/xulrunner/stub/Makefile.in
index 512d81f001fd..356c27c06c1e 100644
--- a/xulrunner/stub/Makefile.in
+++ b/xulrunner/stub/Makefile.in
@@ -2,13 +2,6 @@
 # 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/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # Statically link against the RTL on windows
 USE_STATIC_LIBS = 1
 # Don't create a dependency on mozglue
diff --git a/xulrunner/tools/redit/Makefile.in b/xulrunner/tools/redit/Makefile.in
index e48292732481..f831e13b38a0 100644
--- a/xulrunner/tools/redit/Makefile.in
+++ b/xulrunner/tools/redit/Makefile.in
@@ -2,13 +2,6 @@
 # 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/. */
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 ifeq ($(OS_ARCH),WINNT)
 
 SDK_BINARY =  \
@@ -30,5 +23,3 @@ WIN32_EXE_LDFLAGS = -municode
 endif
 
 endif
-
-include $(topsrcdir)/config/rules.mk

From 65f42bebc99575c33fd7239dfb31b685176c4b1c Mon Sep 17 00:00:00 2001
From: Jonas Finnemann Jensen <jopsen@gmail.com>
Date: Wed, 4 Sep 2013 15:32:00 -0700
Subject: [PATCH 58/86] Bug 910658 - Add "qnew = -U" to defaults section in
 mach mercurial-setup; r=gps

DONTBUILD (NPOTB)
---
 tools/mercurial/hgsetup/config.py | 28 ++++++++++++++++++++++++++++
 tools/mercurial/hgsetup/wizard.py | 14 ++++++++++++++
 2 files changed, 42 insertions(+)

diff --git a/tools/mercurial/hgsetup/config.py b/tools/mercurial/hgsetup/config.py
index b5b20ef50d2e..650d5a6cb2ac 100644
--- a/tools/mercurial/hgsetup/config.py
+++ b/tools/mercurial/hgsetup/config.py
@@ -5,6 +5,7 @@
 from __future__ import unicode_literals
 
 from configobj import ConfigObj
+import re
 
 
 BUGZILLA_FINGERPRINT = '45:77:35:fd:6f:2c:1c:c2:90:4b:f7:b4:4d:60:c6:97:c5:5c:47:27'
@@ -115,3 +116,30 @@ class MercurialConfig(object):
                 del self._c['mqext']['mqcommit']
             except KeyError:
                 pass
+
+
+    def have_qnew_currentuser_default(self):
+        if 'defaults' not in self._c:
+            return False
+        d = self._c['defaults']
+        if 'qnew' not in d:
+            return False
+        argv = d['qnew'].split(' ')
+        for arg in argv:
+            if arg == '--currentuser' or re.match("-[^-]*U.*", arg):
+                return True
+        return False
+
+    def ensure_qnew_currentuser_default(self):
+        if self.have_qnew_currentuser_default():
+            return
+        if 'defaults' not in self._c:
+            self._c['defaults'] = {}
+
+        d = self._c['defaults']
+        if 'qnew' not in d:
+          d['qnew'] = '-U'
+        else:
+          d['qnew'] = '-U ' + d['qnew']
+
+
diff --git a/tools/mercurial/hgsetup/wizard.py b/tools/mercurial/hgsetup/wizard.py
index 979ebfb191af..6317e5834b46 100644
--- a/tools/mercurial/hgsetup/wizard.py
+++ b/tools/mercurial/hgsetup/wizard.py
@@ -71,6 +71,12 @@ import patches from Bugzilla using a friendly bz:// URL handler. e.g.
 |hg qimport bz://123456|.
 '''.strip()
 
+QNEWCURRENTUSER_INFO = '''
+The mercurial queues command |hg qnew|, which creates new patches in your patch
+queue does not set patch author information by default. Author information
+should be included when uploading for review.
+'''.strip()
+
 FINISHED = '''
 Your Mercurial should now be properly configured and recommended extensions
 should be up to date!
@@ -204,6 +210,14 @@ class MercurialSetupWizard(object):
                     'default',
                     'Ensuring qimportbz extension is up to date...')
 
+            if not c.have_qnew_currentuser_default():
+                print(QNEWCURRENTUSER_INFO)
+                if self._prompt_yn('Would you like qnew to set patch author by '
+                                   'default'):
+                    c.ensure_qnew_currentuser_default()
+                    print('Configured qnew to set patch author by default.')
+                    print('')
+
         c.add_mozilla_host_fingerprints()
 
         b = StringIO()

From d96a2ab84e07c1acd3f9d5fe1906c44c6ed928b5 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Thu, 5 Sep 2013 09:18:49 +0900
Subject: [PATCH 59/86] Fixup for bug 911634. r=gps

---
 client.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client.mk b/client.mk
index 223e057261a2..cf009ba0dbf6 100644
--- a/client.mk
+++ b/client.mk
@@ -201,8 +201,9 @@ endif
 
 ifdef WANT_MOZCONFIG_MK
 # For now, only output "export" lines from mozconfig2client-mk output.
+MOZCONFIG_MK_LINES := $(filter export||%,$(MOZCONFIG_OUT_LINES))
 $(OBJDIR)/.mozconfig.mk: $(FOUND_MOZCONFIG) $(call mkdir_deps,$(OBJDIR))
-	( $(foreach line,$(filter export||%,$(MOZCONFIG_OUT_LINES)), echo "$(subst ||, ,$(line))";) ) > $@
+	$(if $(MOZCONFIG_MK_LINES),( $(foreach line,$(MOZCONFIG_MK_LINES), echo "$(subst ||, ,$(line))";) )) > $@
 
 # Include that makefile so that it is created. This should not actually change
 # the environment since MOZCONFIG_CONTENT, which MOZCONFIG_OUT_LINES derives

From 38d7cba888de8e910776ea968ac1b2b55d939031 Mon Sep 17 00:00:00 2001
From: "Nicholas D. Matsakis" <nmatsakis@mozilla.com>
Date: Fri, 30 Aug 2013 07:14:30 -0400
Subject: [PATCH 60/86] Bug 910777 - Add JSCLASS_IMPLEMENTS_BARRIERS to the
 Binary Data classes with custom trace r=sfink

---
 js/src/builtin/BinaryData.cpp         | 15 ++++++++-------
 js/src/builtin/TypeRepresentation.cpp |  1 +
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/js/src/builtin/BinaryData.cpp b/js/src/builtin/BinaryData.cpp
index fc28d1ab03cb..3ce727373086 100644
--- a/js/src/builtin/BinaryData.cpp
+++ b/js/src/builtin/BinaryData.cpp
@@ -935,7 +935,7 @@ ArrayType::create(JSContext *cx, HandleObject arrayTypeGlobal,
     RootedObject obj(cx, NewBuiltinClassInstance(cx, &ArrayType::class_));
     if (!obj)
         return NULL;
-    obj->setFixedSlot(SLOT_TYPE_REPR, ObjectValue(*typeReprObj));
+    obj->initFixedSlot(SLOT_TYPE_REPR, ObjectValue(*typeReprObj));
 
     RootedValue elementTypeVal(cx, ObjectValue(*elementType));
     if (!JSObject::defineProperty(cx, obj, cx->names().elementType,
@@ -943,7 +943,7 @@ ArrayType::create(JSContext *cx, HandleObject arrayTypeGlobal,
                                   JSPROP_READONLY | JSPROP_PERMANENT))
         return NULL;
 
-    obj->setFixedSlot(SLOT_ARRAY_ELEM_TYPE, elementTypeVal);
+    obj->initFixedSlot(SLOT_ARRAY_ELEM_TYPE, elementTypeVal);
 
     RootedValue lengthVal(cx, Int32Value(length));
     if (!JSObject::defineProperty(cx, obj, cx->names().length,
@@ -1142,7 +1142,7 @@ StructType::layout(JSContext *cx, HandleObject structType, HandleObject fields)
         return false;
     StructTypeRepresentation *typeRepr =
         TypeRepresentation::fromOwnerObject(typeReprObj)->asStruct();
-    structType->setFixedSlot(SLOT_TYPE_REPR, ObjectValue(*typeReprObj));
+    structType->initFixedSlot(SLOT_TYPE_REPR, ObjectValue(*typeReprObj));
 
     // Construct for internal use an array with the type object for each field.
     RootedObject fieldTypeVec(
@@ -1151,7 +1151,7 @@ StructType::layout(JSContext *cx, HandleObject structType, HandleObject fields)
     if (!fieldTypeVec)
         return false;
 
-    structType->setFixedSlot(SLOT_STRUCT_FIELD_TYPES,
+    structType->initFixedSlot(SLOT_STRUCT_FIELD_TYPES,
                              ObjectValue(*fieldTypeVec));
 
     // Construct the fieldNames vector
@@ -1581,7 +1581,7 @@ DefineNumericClass(JSContext *cx,
     if (!typeReprObj)
         return false;
 
-    numFun->setFixedSlot(SLOT_TYPE_REPR, ObjectValue(*typeReprObj));
+    numFun->initFixedSlot(SLOT_TYPE_REPR, ObjectValue(*typeReprObj));
 
     if (!InitializeCommonTypeDescriptorProperties(cx, numFun, typeReprObj))
         return false;
@@ -1629,6 +1629,7 @@ Class BinaryBlock::class_ = {
     Class::NON_NATIVE |
     JSCLASS_HAS_RESERVED_SLOTS(BLOCK_RESERVED_SLOTS) |
     JSCLASS_HAS_PRIVATE |
+    JSCLASS_IMPLEMENTS_BARRIERS |
     JSCLASS_HAS_CACHED_PROTO(JSProto_ArrayType),
     JS_PropertyStub,
     JS_DeletePropertyStub,
@@ -1738,8 +1739,8 @@ BinaryBlock::createNull(JSContext *cx, HandleObject type, HandleValue owner)
 
     RootedObject obj(cx,
         NewObjectWithClassProto(cx, &class_, &protoVal.toObject(), NULL));
-    obj->setFixedSlot(SLOT_DATATYPE, ObjectValue(*type));
-    obj->setFixedSlot(SLOT_BLOCKREFOWNER, owner);
+    obj->initFixedSlot(SLOT_DATATYPE, ObjectValue(*type));
+    obj->initFixedSlot(SLOT_BLOCKREFOWNER, owner);
 
     // Tag the type object for this instance with the type
     // representation, if that has not been done already.
diff --git a/js/src/builtin/TypeRepresentation.cpp b/js/src/builtin/TypeRepresentation.cpp
index d9e170398d65..bbac9b1982df 100644
--- a/js/src/builtin/TypeRepresentation.cpp
+++ b/js/src/builtin/TypeRepresentation.cpp
@@ -27,6 +27,7 @@ using namespace mozilla;
 
 Class TypeRepresentation::class_ = {
     "TypeRepresentation",
+    JSCLASS_IMPLEMENTS_BARRIERS |
     JSCLASS_HAS_PRIVATE,
     JS_PropertyStub,         /* addProperty */
     JS_DeletePropertyStub,   /* delProperty */

From 5eeca09525c99019dc46332607024771ced89e2c Mon Sep 17 00:00:00 2001
From: Yaron Tausky <yaron.tausky@gmail.com>
Date: Wed, 4 Sep 2013 20:58:21 -0400
Subject: [PATCH 61/86] Bug 793212 - Refactor IonBuilder::TestCommonPropFunc.
 r=efaust

---
 js/src/jit/IonBuilder.cpp | 215 ++++++++++++++++++++++++--------------
 1 file changed, 134 insertions(+), 81 deletions(-)

diff --git a/js/src/jit/IonBuilder.cpp b/js/src/jit/IonBuilder.cpp
index 2876914f9ebe..9d70100cea5e 100644
--- a/js/src/jit/IonBuilder.cpp
+++ b/js/src/jit/IonBuilder.cpp
@@ -7636,24 +7636,81 @@ IonBuilder::jsop_not()
     return true;
 }
 
+inline bool
+TestClassHasAccessorHook(Class *clasp, bool isGetter)
+{
+    if (isGetter && clasp->ops.getGeneric)
+        return true;
+    if (!isGetter && clasp->ops.setGeneric)
+        return true;
+    return false;
+}
 
 inline bool
-IonBuilder::TestCommonPropFunc(JSContext *cx, types::StackTypeSet *types, HandleId id,
-                               JSFunction **funcp, bool isGetter, bool *isDOM,
-                               MDefinition **guardOut)
+TestTypeHasOwnProperty(JSContext *cx, types::TypeObject *typeObj, HandleId id, bool &cont)
 {
-    JSObject *found = NULL;
-    JSObject *foundProto = NULL;
+    cont = true;
+    types::HeapTypeSet *propSet = typeObj->getProperty(cx, types::IdToTypeId(id), false);
+    if (!propSet)
+        return false;
+    if (propSet->ownProperty(false))
+        cont = false;
+    return true;
+}
 
-    *funcp = NULL;
-    *isDOM = false;
+inline bool
+TestCommonAccessorProtoChain(JSContext *cx, HandleId id, bool isGetter, JSObject *foundProto,
+                             JSObject *obj, bool &cont)
+{
+    cont = false;
+    RootedObject curObj(cx, obj);
+    JSObject *stopAt = foundProto->getProto();
+    while (curObj != stopAt) {
+        // Don't optimize if we have a hook that would have to be called.
+        if (TestClassHasAccessorHook(curObj->getClass(), isGetter))
+            return true;
 
-    // No sense looking if we don't know what's going on.
-    if (!types || types->unknownObject())
-        return true;
+        // Check here to make sure that everyone has Type Objects with known
+        // properties between them and the proto we found the accessor on. We
+        // need those to add freezes safely. NOTE: We do not do this above, as
+        // we may be able to freeze all the types up to where we found the
+        // property, even if there are unknown types higher in the prototype
+        // chain.
+        if (curObj != foundProto) {
+            types::TypeObject *typeObj = curObj->getType(cx);
+            if (!typeObj)
+                return false;
 
-    // Iterate down all the types to see if they all have the same getter or
-    // setter.
+            if (typeObj->unknownProperties())
+                return true;
+
+            // Check here to make sure that nobody on the prototype chain is
+            // marked as having the property as an "own property". This can
+            // happen in cases of |delete| having been used, or cases with
+            // watched objects. If TI ever decides to be more accurate about
+            // |delete| handling, this should go back to curObj->watched().
+
+            // Even though we are not directly accessing the properties on the whole
+            // prototype chain, we need to fault in the sets anyway, as we need
+            // to freeze on them.
+            bool lcont;
+            if (!TestTypeHasOwnProperty(cx, typeObj, id, lcont))
+                return false;
+            if (!lcont)
+                return true;
+        }
+
+        curObj = curObj->getProto();
+    }
+    cont = true;
+    return true;
+}
+
+inline bool
+SearchCommonPropFunc(JSContext *cx, types::StackTypeSet *types, HandleId id, bool isGetter,
+                     JSObject *&found, JSObject *&foundProto, bool &cont)
+{
+    cont = false;
     for (unsigned i = 0; i < types->getObjectCount(); i++) {
         RootedObject curObj(cx, types->getSingleObject(i));
 
@@ -7669,17 +7726,15 @@ IonBuilder::TestCommonPropFunc(JSContext *cx, types::StackTypeSet *types, Handle
 
             // If the class of the object has a hook, we can't
             // inline, as we would need to call the hook.
-            if (isGetter && typeObj->clasp->ops.getGeneric)
-                return true;
-            if (!isGetter && typeObj->clasp->ops.setGeneric)
+            if (TestClassHasAccessorHook(typeObj->clasp, isGetter))
                 return true;
 
             // If the type has an own property, we can't be sure we don't shadow
             // the chain.
-            types::HeapTypeSet *propSet = typeObj->getProperty(cx, types::IdToTypeId(id), false);
-            if (!propSet)
+            bool lcont;
+            if (!TestTypeHasOwnProperty(cx, typeObj, id, lcont))
                 return false;
-            if (propSet->ownProperty(false))
+            if (!lcont)
                 return true;
 
             // Otherwise try using the prototype.
@@ -7735,71 +7790,19 @@ IonBuilder::TestCommonPropFunc(JSContext *cx, types::StackTypeSet *types, Handle
         else if (foundProto != proto)
             return true;
 
-        JSObject *stopAt = foundProto->getProto();
-        while (curObj != stopAt) {
-            // Don't optimize if we have a hook that would have to be called.
-            if (isGetter && curObj->getClass()->ops.getGeneric)
-                return true;
-            if (!isGetter && curObj->getClass()->ops.setGeneric)
-                return true;
-
-            // Check here to make sure that everyone has Type Objects with known
-            // properties between them and the proto we found the accessor on. We
-            // need those to add freezes safely. NOTE: We do not do this above, as
-            // we may be able to freeze all the types up to where we found the
-            // property, even if there are unknown types higher in the prototype
-            // chain.
-            if (curObj != foundProto) {
-                types::TypeObject *typeObj = curObj->getType(cx);
-                if (!typeObj)
-                    return false;
-
-                if (typeObj->unknownProperties())
-                    return true;
-
-                // Check here to make sure that nobody on the prototype chain is
-                // marked as having the property as an "own property". This can
-                // happen in cases of |delete| having been used, or cases with
-                // watched objects. If TI ever decides to be more accurate about
-                // |delete| handling, this should go back to curObj->watched().
-
-                // Even though we are not directly accessing the properties on the whole
-                // prototype chain, we need to fault in the sets anyway, as we need
-                // to freeze on them.
-                types::HeapTypeSet *propSet =
-                    typeObj->getProperty(cx, types::IdToTypeId(id), false);
-                if (!propSet)
-                    return false;
-                if (propSet->ownProperty(false))
-                    return true;
-            }
-
-            curObj = curObj->getProto();
-        }
+        bool lcont;
+        if (!TestCommonAccessorProtoChain(cx, id, isGetter, foundProto, curObj, lcont))
+            return false;
+        if (!lcont)
+            return true;
     }
+    cont = true;
+    return true;
+}
 
-    // No need to add a freeze if we didn't find anything
-    if (!found)
-        return true;
-
-    JS_ASSERT(foundProto);
-
-    // Add a shape guard on the prototype we found the property on. The rest of
-    // the prototype chain is guarded by TI freezes. Note that a shape guard is
-    // good enough here, even in the proxy case, because we have ensured there
-    // are no lookup hooks for this property.
-    MInstruction *wrapper = MConstant::New(ObjectValue(*foundProto));
-    current->add(wrapper);
-    wrapper = addShapeGuard(wrapper, foundProto->lastProperty(), Bailout_ShapeGuard);
-
-    // Pass the guard back so it can be an operand.
-    if (isGetter) {
-        JS_ASSERT(wrapper->isGuardShape());
-        *guardOut = wrapper;
-    }
-
-    // Now we have to freeze all the property typesets to ensure there isn't a
-    // lower shadowing getter or setter installed in the future.
+inline bool
+FreezePropTypeSets(JSContext *cx, types::StackTypeSet *types, JSObject *foundProto, HandleId id)
+{
     types::TypeObject *curType;
     for (unsigned i = 0; i < types->getObjectCount(); i++) {
         curType = types->getTypeObject(i);
@@ -7839,6 +7842,56 @@ IonBuilder::TestCommonPropFunc(JSContext *cx, types::StackTypeSet *types, Handle
             }
         }
     }
+    return true;
+}
+
+inline bool
+IonBuilder::TestCommonPropFunc(JSContext *cx, types::StackTypeSet *types, HandleId id,
+                               JSFunction **funcp, bool isGetter, bool *isDOM,
+                               MDefinition **guardOut)
+{
+    JSObject *found = NULL;
+    JSObject *foundProto = NULL;
+
+    *funcp = NULL;
+    *isDOM = false;
+
+    // No sense looking if we don't know what's going on.
+    if (!types || types->unknownObject())
+        return true;
+
+    // Iterate down all the types to see if they all have the same getter or
+    // setter.
+    bool cont;
+    if (!SearchCommonPropFunc(cx, types, id, isGetter, found, foundProto, cont))
+        return false;
+    if (!cont)
+        return true;
+
+    // No need to add a freeze if we didn't find anything
+    if (!found)
+        return true;
+
+    JS_ASSERT(foundProto);
+
+    // Add a shape guard on the prototype we found the property on. The rest of
+    // the prototype chain is guarded by TI freezes. Note that a shape guard is
+    // good enough here, even in the proxy case, because we have ensured there
+    // are no lookup hooks for this property.
+    MInstruction *wrapper = MConstant::New(ObjectValue(*foundProto));
+    current->add(wrapper);
+    wrapper = addShapeGuard(wrapper, foundProto->lastProperty(), Bailout_ShapeGuard);
+
+    // Pass the guard back so it can be an operand.
+    if (guardOut) {
+        JS_ASSERT(wrapper->isGuardShape());
+        *guardOut = wrapper;
+    }
+
+    // Now we have to freeze all the property typesets to ensure there isn't a
+    // lower shadowing getter or setter installed in the future.
+    if (!FreezePropTypeSets(cx, types, foundProto, id))
+        return false;
 
     *funcp = &found->as<JSFunction>();
     *isDOM = types->isDOMClass();

From 878ab4a3c47ef03514228e4758f37b344243cef6 Mon Sep 17 00:00:00 2001
From: Yaron Tausky <yaron.tausky@gmail.com>
Date: Wed, 4 Sep 2013 20:58:22 -0400
Subject: [PATCH 62/86] Bug 911553 - Trap Proxy calls from ToPrimitive.
 r=bholley

---
 js/src/jit-test/tests/proxy/bug911553.js | 10 ++++++++++
 js/src/jsproxy.cpp                       | 24 +-----------------------
 js/src/jsproxy.h                         |  2 --
 js/src/jswrapper.cpp                     | 16 ++++++++++++++++
 js/src/jswrapper.h                       |  3 +++
 5 files changed, 30 insertions(+), 25 deletions(-)
 create mode 100644 js/src/jit-test/tests/proxy/bug911553.js

diff --git a/js/src/jit-test/tests/proxy/bug911553.js b/js/src/jit-test/tests/proxy/bug911553.js
new file mode 100644
index 000000000000..5ccfbe21db00
--- /dev/null
+++ b/js/src/jit-test/tests/proxy/bug911553.js
@@ -0,0 +1,10 @@
+assertEq(
+    ""+new Proxy(
+        {toString:() => "inner toString"},
+        {get:(t, pk) => (pk === "toString" ? () => "proxy toString" : t[pk])}),
+    "proxy toString")
+assertEq(
+    ""+new Proxy(
+        {valueOf:() => "inner valueOf"},
+        {get:(t, pk) => (pk === "valueOf" ? () => "proxy valueOf" : t[pk])}),
+    "proxy valueOf")
diff --git a/js/src/jsproxy.cpp b/js/src/jsproxy.cpp
index f0a9df0d2d51..19f276ec85d0 100644
--- a/js/src/jsproxy.cpp
+++ b/js/src/jsproxy.cpp
@@ -516,16 +516,6 @@ DirectProxyHandler::regexp_toShared(JSContext *cx, HandleObject proxy,
     return RegExpToShared(cx, target, g);
 }
 
-bool
-DirectProxyHandler::defaultValue(JSContext *cx, HandleObject proxy, JSType hint,
-                                 MutableHandleValue vp)
-{
-    vp.set(ObjectValue(*proxy->as<ProxyObject>().target()));
-    if (hint == JSTYPE_VOID)
-        return ToPrimitive(cx, vp);
-    return ToPrimitive(cx, hint, vp);
-}
-
 JSObject *
 DirectProxyHandler::weakmapKeyDelegate(JSObject *proxy)
 {
@@ -787,8 +777,6 @@ class ScriptedIndirectProxyHandler : public BaseProxyHandler
     virtual bool nativeCall(JSContext *cx, IsAcceptableThis test, NativeImpl impl,
                             CallArgs args) MOZ_OVERRIDE;
     virtual JSString *fun_toString(JSContext *cx, HandleObject proxy, unsigned indent) MOZ_OVERRIDE;
-    virtual bool defaultValue(JSContext *cx, HandleObject obj, JSType hint,
-                              MutableHandleValue vp) MOZ_OVERRIDE;
 
     static ScriptedIndirectProxyHandler singleton;
 };
@@ -1047,17 +1035,6 @@ ScriptedIndirectProxyHandler::fun_toString(JSContext *cx, HandleObject proxy, un
     return fun_toStringHelper(cx, obj, indent);
 }
 
-bool
-ScriptedIndirectProxyHandler::defaultValue(JSContext *cx, HandleObject proxy, JSType hint,
-                                           MutableHandleValue vp)
-{
-    /*
-     * This function is only here to prevent bug 757063. It will be removed when
-     * the direct proxy refactor is complete.
-     */
-    return BaseProxyHandler::defaultValue(cx, proxy, hint, vp);
-}
-
 ScriptedIndirectProxyHandler ScriptedIndirectProxyHandler::singleton;
 
 static JSObject *
@@ -1097,6 +1074,7 @@ class ScriptedDirectProxyHandler : public DirectProxyHandler {
     virtual bool iterate(JSContext *cx, HandleObject proxy, unsigned flags,
                          MutableHandleValue vp) MOZ_OVERRIDE;
 
+    /* Spidermonkey extensions. */
     virtual bool call(JSContext *cx, HandleObject proxy, const CallArgs &args) MOZ_OVERRIDE;
     virtual bool construct(JSContext *cx, HandleObject proxy, const CallArgs &args) MOZ_OVERRIDE;
 
diff --git a/js/src/jsproxy.h b/js/src/jsproxy.h
index a50fd4df8e70..9fe9139355b7 100644
--- a/js/src/jsproxy.h
+++ b/js/src/jsproxy.h
@@ -226,8 +226,6 @@ class JS_PUBLIC_API(DirectProxyHandler) : public BaseProxyHandler
                                    unsigned indent) MOZ_OVERRIDE;
     virtual bool regexp_toShared(JSContext *cx, HandleObject proxy,
                                  RegExpGuard *g) MOZ_OVERRIDE;
-    virtual bool defaultValue(JSContext *cx, HandleObject obj, JSType hint,
-                              MutableHandleValue vp) MOZ_OVERRIDE;
     virtual JSObject *weakmapKeyDelegate(JSObject *proxy);
 };
 
diff --git a/js/src/jswrapper.cpp b/js/src/jswrapper.cpp
index 6a4f45d283f6..17fee7573ae0 100644
--- a/js/src/jswrapper.cpp
+++ b/js/src/jswrapper.cpp
@@ -23,6 +23,22 @@ using namespace js::gc;
 
 int js::sWrapperFamily;
 
+/*
+ * Wrapper forwards this call directly to the wrapped object for efficiency
+ * and transparency. In particular, the hint is needed to properly stringify
+ * Date objects in certain cases - see bug 646129. Note also the
+ * SecurityWrapper overrides this trap to avoid information leaks. See bug
+ * 720619.
+ */
+bool
+Wrapper::defaultValue(JSContext *cx, HandleObject proxy, JSType hint, MutableHandleValue vp)
+{
+    vp.set(ObjectValue(*proxy->as<ProxyObject>().target()));
+    if (hint == JSTYPE_VOID)
+        return ToPrimitive(cx, vp);
+    return ToPrimitive(cx, hint, vp);
+}
+
 JSObject *
 Wrapper::New(JSContext *cx, JSObject *obj, JSObject *proto, JSObject *parent, Wrapper *handler)
 {
diff --git a/js/src/jswrapper.h b/js/src/jswrapper.h
index dc20fc0c4703..84df39582ec7 100644
--- a/js/src/jswrapper.h
+++ b/js/src/jswrapper.h
@@ -37,6 +37,9 @@ class JS_FRIEND_API(Wrapper) : public DirectProxyHandler
         LAST_USED_FLAG = CROSS_COMPARTMENT
     };
 
+    virtual bool defaultValue(JSContext *cx, HandleObject obj, JSType hint,
+                              MutableHandleValue vp) MOZ_OVERRIDE;
+
     /*
      * Wrappers can explicitly specify that they are unsafe to unwrap from a
      * security perspective (as is the case for SecurityWrappers). If a wrapper

From d4fe19b1a735c3ad873fa13214c8985a6ee3d10f Mon Sep 17 00:00:00 2001
From: Brian Birtles <birtles@gmail.com>
Date: Thu, 5 Sep 2013 09:59:54 +0900
Subject: [PATCH 63/86] Bug 912305 - Fix documentation of RadialGradientPattern
 constructor; r=bas, DONTBUILD (comment-only)

---
 gfx/2d/2D.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gfx/2d/2D.h b/gfx/2d/2D.h
index d54038114698..93b75bee73bc 100644
--- a/gfx/2d/2D.h
+++ b/gfx/2d/2D.h
@@ -246,8 +246,10 @@ class RadialGradientPattern : public Pattern
 {
 public:
   /*
-   * aBegin Start of the linear gradient
-   * aEnd End of the linear gradient
+   * aCenter1 Center of the inner (focal) circle.
+   * aCenter2 Center of the outer circle.
+   * aRadius1 Radius of the inner (focal) circle.
+   * aRadius2 Radius of the outer circle.
    * aStops GradientStops object for this gradient, this should match the
    *        backend type of the draw target this pattern will be used with.
    * aMatrix A matrix that transforms the pattern into user space

From d1a188e23cb961bfdcf7cccbc7a92d8c12cb4119 Mon Sep 17 00:00:00 2001
From: Benjamin Bouvier <bbouvier@mozilla.com>
Date: Wed, 4 Sep 2013 18:44:24 -0700
Subject: [PATCH 64/86] Bug 912294: Fix pre increment operator in
 InlineListIterator and InlineListReverseIterator; r=dvander

---
 js/src/jit/InlineList.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/js/src/jit/InlineList.h b/js/src/jit/InlineList.h
index 2f849644143c..affefa547cb8 100644
--- a/js/src/jit/InlineList.h
+++ b/js/src/jit/InlineList.h
@@ -321,8 +321,8 @@ class InlineListIterator
 
   public:
     InlineListIterator<T> & operator ++() {
-        iter = iter->next;
-        return *iter;
+        iter = static_cast<Node *>(iter->next);
+        return *this;
     }
     InlineListIterator<T> operator ++(int) {
         InlineListIterator<T> old(*this);
@@ -366,7 +366,7 @@ class InlineListReverseIterator
   public:
     InlineListReverseIterator<T> & operator ++() {
         iter = iter->prev;
-        return *iter;
+        return *this;
     }
     InlineListReverseIterator<T> operator ++(int) {
         InlineListReverseIterator<T> old(*this);

From 5cee158ea0b77d4bcbda890870befe6e0a2968ea Mon Sep 17 00:00:00 2001
From: Patrick Wang <kk1fff@patrickz.net>
Date: Thu, 5 Sep 2013 00:28:46 +0800
Subject: [PATCH 65/86] Bug 910990 - prevent from build failure with older
 version of ethtool in linux. r=abr,ekr,khuey

---
 configure.in                                        | 10 ++++++++++
 media/mtransport/third_party/nICEr/nicer.gyp        |  6 ++++++
 media/mtransport/third_party/nICEr/src/stun/addrs.c |  4 ++++
 3 files changed, 20 insertions(+)

diff --git a/configure.in b/configure.in
index 65d450172b09..0054bf9d702b 100644
--- a/configure.in
+++ b/configure.in
@@ -5228,6 +5228,10 @@ if test -n "$MOZ_WEBRTC"; then
     esac
 fi
 
+AC_TRY_COMPILE([#include <linux/ethtool.h>],
+               [ struct ethtool_cmd cmd; cmd.speed_hi = 0; ],
+               MOZ_WEBRTC_HAVE_ETHTOOL_SPEED_HI=1)
+
 # target_arch is from {ia32|x64|arm|ppc}
 case "$CPU_ARCH" in
 x86_64)
@@ -8978,6 +8982,12 @@ dnl so that regeneration via dependencies works correctly
       WEBRTC_CONFIG="${WEBRTC_CONFIG} -D have_clock_monotonic=0"
    fi
 
+   if test -n "$MOZ_WEBRTC_HAVE_ETHTOOL_SPEED_HI"; then
+      WEBRTC_CONFIG="${WEBRTC_CONFIG} -D have_ethtool_cmd_speed_hi=1"
+   else
+      WEBRTC_CONFIG="${WEBRTC_CONFIG} -D have_ethtool_cmd_speed_hi=0"
+   fi
+
    GYP_WEBRTC_OPTIONS="--format=mozmake ${WEBRTC_CONFIG} -D target_arch=${WEBRTC_TARGET_ARCH} ${EXTRA_GYP_DEFINES} --depth=${srcdir}/media/webrtc/trunk --toplevel-dir=${srcdir} -G OBJDIR=${_objdir}"
 
    $PYTHON ${srcdir}/media/webrtc/trunk/build/gyp_chromium \
diff --git a/media/mtransport/third_party/nICEr/nicer.gyp b/media/mtransport/third_party/nICEr/nicer.gyp
index 316331ef39ba..118f27f464cb 100644
--- a/media/mtransport/third_party/nICEr/nicer.gyp
+++ b/media/mtransport/third_party/nICEr/nicer.gyp
@@ -8,6 +8,7 @@
 {
   'variables' : {
     'build_with_gonk%': 0,
+    'have_ethtool_cmd_speed_hi%': 1
   },
   'targets' : [
       {
@@ -235,6 +236,11 @@
                'defines': [
                   "USE_PLATFORM_NR_STUN_GET_ADDRS",
                ]
+             }],
+             ['have_ethtool_cmd_speed_hi==0', {
+               'defines': [
+                  "DONT_HAVE_ETHTOOL_SPEED_HI",
+               ]
              }]
           ],
       }]
diff --git a/media/mtransport/third_party/nICEr/src/stun/addrs.c b/media/mtransport/third_party/nICEr/src/stun/addrs.c
index f26322edaea9..cc29b2c6c944 100644
--- a/media/mtransport/third_party/nICEr/src/stun/addrs.c
+++ b/media/mtransport/third_party/nICEr/src/stun/addrs.c
@@ -653,7 +653,11 @@ stun_get_siocgifconf_addrs(nr_local_addr addrs[], int maxaddrs, int *count)
              /* For wireless network, we won't get ethtool, it's a wired
                 connection */
              addrs[n].interface.type = NR_INTERFACE_TYPE_WIRED;
+#ifdef DONT_HAVE_ETHTOOL_SPEED_HI
+             addrs[n].interface.estimated_speed = ecmd.speed;
+#else
              addrs[n].interface.estimated_speed = ((ecmd.speed_hi << 16) | ecmd.speed) * 1000;
+#endif
           }
 
           strncpy(wrq.ifr_name, ifr->ifr_name, sizeof(wrq.ifr_name));

From 4649a86b099a2cd418cd822fd88494d4336e5a3a Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Wed, 4 Sep 2013 19:05:51 -0700
Subject: [PATCH 66/86] Bug 912322 - Update semantics of IsChromeOrXBL to
 return true for remote XUL. r=bz

This brings us into alignment with nsContentUtils::IsCallerXBL(). We also take
the opportunity to clean up some comments and invariants that changed with the
removal of the XBL bit.
---
 js/xpconnect/src/XPCWrappedNativeScope.cpp |  9 +++++++++
 js/xpconnect/src/nsXPConnect.cpp           | 12 +++++++++---
 js/xpconnect/src/xpcprivate.h              | 17 +++++++----------
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/js/xpconnect/src/XPCWrappedNativeScope.cpp b/js/xpconnect/src/XPCWrappedNativeScope.cpp
index 1cf3055a6b63..c2b71876c8fb 100644
--- a/js/xpconnect/src/XPCWrappedNativeScope.cpp
+++ b/js/xpconnect/src/XPCWrappedNativeScope.cpp
@@ -266,6 +266,15 @@ XPCWrappedNativeScope::EnsureXBLScope(JSContext *cx)
     return mXBLScope;
 }
 
+bool
+XPCWrappedNativeScope::AllowXBLScope()
+{
+    // We only disallow XBL scopes in remote XUL situations.
+    MOZ_ASSERT_IF(!mAllowXBLScope,
+                  nsContentUtils::AllowXULXBLForPrincipal(GetPrincipal()));
+    return mAllowXBLScope;
+}
+
 namespace xpc {
 JSObject *GetXBLScope(JSContext *cx, JSObject *contentScopeArg)
 {
diff --git a/js/xpconnect/src/nsXPConnect.cpp b/js/xpconnect/src/nsXPConnect.cpp
index 61ea9fb7fda2..3c4dde7eb329 100644
--- a/js/xpconnect/src/nsXPConnect.cpp
+++ b/js/xpconnect/src/nsXPConnect.cpp
@@ -1710,9 +1710,15 @@ bool
 IsChromeOrXBL(JSContext* cx, JSObject* /* unused */)
 {
     MOZ_ASSERT(NS_IsMainThread());
-    JSCompartment* compartment = js::GetContextCompartment(cx);
-    return AccessCheck::isChrome(compartment) ||
-           IsXBLScope(compartment);
+    JSCompartment* c = js::GetContextCompartment(cx);
+
+    // For remote XUL, we run XBL in the XUL scope. Given that we care about
+    // compat and not security for remote XUL, we just always claim to be XBL.
+    //
+    // Note that, for performance, we don't check AllowXULXBLForPrincipal here,
+    // and instead rely on the fact that AllowXBLScope() only returns false in
+    // remote XUL situations.
+    return AccessCheck::isChrome(c) || IsXBLScope(c) || !AllowXBLScope(c);
 }
 
 } // namespace dom
diff --git a/js/xpconnect/src/xpcprivate.h b/js/xpconnect/src/xpcprivate.h
index 7aa790c63d52..88e03c5454be 100644
--- a/js/xpconnect/src/xpcprivate.h
+++ b/js/xpconnect/src/xpcprivate.h
@@ -1413,7 +1413,7 @@ public:
     nsAutoPtr<JSObject2JSObjectMap> mWaiverWrapperMap;
 
     bool IsXBLScope() { return mIsXBLScope; }
-    bool AllowXBLScope() { return mAllowXBLScope; }
+    bool AllowXBLScope();
 
 protected:
     virtual ~XPCWrappedNativeScope();
@@ -1449,20 +1449,17 @@ private:
 
     bool mIsXBLScope;
 
-    // There are certain cases where we explicitly disallow XBL scopes: they
-    // can be prefed off, or we might be running in a remote XUL domain where
-    // we want to run all XBL in content to maintain compat. We separately
+    // For remote XUL domains, we run all XBL in the content scope for compat
+    // reasons (though we sometimes pref this off for automation). We separately
     // track the result of this decision (mAllowXBLScope), from the decision
     // of whether to actually _use_ an XBL scope (mUseXBLScope), which depends
     // on the type of global and whether the compartment is system principal
     // or not.
     //
-    // This distinction is useful primarily because it tells us whether we
-    // can infer the XBL-ness of a caller by checking that the caller is
-    // running in an XBL scope, or whether we need to check the XBL bit on the
-    // script. The XBL bit is nasty, so we want to consult it only if we
-    // absolutely have to, which should generally happen only in unsupported
-    // pref configurations.
+    // This distinction is useful primarily because, if true, we know that we
+    // have no way of distinguishing XBL script from content script for the
+    // given scope. In these (unsupported) situations, we just always claim to
+    // be XBL.
     bool mAllowXBLScope;
     bool mUseXBLScope;
 };

From 22a073b7ea3bd0753610361e19b99f61369130b0 Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Wed, 4 Sep 2013 19:05:51 -0700
Subject: [PATCH 67/86] Bug 912322 - Fix tests. r=bz

The crashtest changes are untested (aside from the fact that they don't crash).
---
 content/base/crashtests/308120-1.xul           |  2 +-
 content/base/crashtests/330925-1.xhtml         |  2 +-
 content/base/crashtests/401993-1.html          |  2 +-
 content/base/test/test_base.xhtml              |  2 +-
 content/base/test/test_bug330925.xhtml         |  9 +++++----
 content/base/test/test_bug372086.html          |  4 ++--
 content/base/test/test_bug444030.xhtml         |  2 +-
 content/html/content/crashtests/465466-1.xhtml |  2 +-
 content/xbl/crashtests/472260-1.xhtml          |  2 +-
 content/xbl/test/file_bug379959_cross.html     |  4 ++--
 content/xbl/test/file_bug379959_data.html      |  2 +-
 content/xbl/test/file_bug591198_inner.html     |  2 +-
 content/xbl/test/test_bug378866.xhtml          |  2 +-
 content/xbl/test/test_bug468210.xhtml          |  2 +-
 .../xslt/tests/mochitest/test_bug319374.xhtml  |  9 ++++++---
 content/xul/content/crashtests/326864-1.xul    | 10 +++++++---
 content/xul/content/crashtests/384740-1.xul    |  2 +-
 dom/base/crashtests/404869-1.xul               |  2 +-
 dom/indexedDB/test/head.js                     |  2 +-
 js/xpconnect/crashtests/471366-1.html          |  2 +-
 layout/base/crashtests/379105-1.xhtml          |  2 +-
 layout/inspector/tests/test_bug522601.xhtml    |  2 +-
 layout/reftests/bugs/495385-2f.xhtml           | 18 ++++++++++++++----
 layout/reftests/bugs/reftest.list              |  2 +-
 .../test_selectors_on_anonymous_content.html   |  2 +-
 layout/xul/base/src/crashtests/328135-1.xul    |  2 +-
 layout/xul/base/src/crashtests/329477-1.xhtml  |  4 ++--
 .../content/tests/widgets/test_popupanchor.xul |  2 +-
 28 files changed, 59 insertions(+), 41 deletions(-)

diff --git a/content/base/crashtests/308120-1.xul b/content/base/crashtests/308120-1.xul
index dc8a21c3e906..55963d758e44 100644
--- a/content/base/crashtests/308120-1.xul
+++ b/content/base/crashtests/308120-1.xul
@@ -1,3 +1,3 @@
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" onload="var button=document.getElementsByTagName('button')[0]; try { button.appendChild(document.getAnonymousNodes(button)[0]); } catch(e) { }">
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" onload="var button=document.getElementsByTagName('button')[0]; try { button.appendChild(SpecialPowers.unwrap(SpecialPowers.wrap(document).getAnonymousNodes(button))[0]); } catch(e) { }">
   <button/>
 </window>
diff --git a/content/base/crashtests/330925-1.xhtml b/content/base/crashtests/330925-1.xhtml
index 02e1dac4a5bb..7dac8374c250 100644
--- a/content/base/crashtests/330925-1.xhtml
+++ b/content/base/crashtests/330925-1.xhtml
@@ -10,7 +10,7 @@ function init()
   var emb = document.getElementById("emb");
 
   try {  
-    foopy.appendChild(document.getAnonymousNodes(emb)[0]);
+    foopy.appendChild(SpecialPowers.unwrap(SpecialPowers.wrap(document).getAnonymousNodes(emb))[0]);
     emb.parentNode.removeChild(emb);
     foopy.parentNode.removeChild(foopy);
   } catch (e) {
diff --git a/content/base/crashtests/401993-1.html b/content/base/crashtests/401993-1.html
index ba071e2b334e..b8679dfd04ff 100644
--- a/content/base/crashtests/401993-1.html
+++ b/content/base/crashtests/401993-1.html
@@ -11,7 +11,7 @@ function s()
   
   function boom()
   {
-    var nodes = document.getAnonymousNodes(x);
+    var nodes = SpecialPowers.unwrap(SpecialPowers.wrap(document).getAnonymousNodes(x));
     if (!nodes) {
       setTimeout(boom, 10);
       return;
diff --git a/content/base/test/test_base.xhtml b/content/base/test/test_base.xhtml
index 41e5bbccf2c7..b77551adaa8f 100644
--- a/content/base/test/test_base.xhtml
+++ b/content/base/test/test_base.xhtml
@@ -40,7 +40,7 @@ addLoadEvent(function() {
      "http://mochi.test:8888/tests/content/base/test/file_base_xbl.xml",
      "http://mochi.test:8888/tests/content/base/test/file_base_xbl.xml#shesellsseashellsbytheseashore",
      ];
-  node = document.getAnonymousNodes(document.getElementById("bound"))[0];
+  node = SpecialPowers.unwrap(SpecialPowers.wrap(document).getAnonymousNodes(document.getElementById("bound")))[0];
   while(node) {
     is(node.baseURI, svgExpected.shift(), "node base");
     node = node.firstChild;
diff --git a/content/base/test/test_bug330925.xhtml b/content/base/test/test_bug330925.xhtml
index 3784bd18b01d..a26ab94be9b3 100644
--- a/content/base/test/test_bug330925.xhtml
+++ b/content/base/test/test_bug330925.xhtml
@@ -46,20 +46,21 @@ addLoadEvent(init);
 function init()
 {
   var t = document.getElementById("t");
+  var d = SpecialPowers.wrap(document);
 
-  is(document.getBindingParent(document.getAnonymousNodes(t)[0]), 
+  is(SpecialPowers.unwrap(d.getBindingParent(d.getAnonymousNodes(t)[0])),
      t,
      "Wrong binding parent for anonymous node");
      
-  is(document.getBindingParent(document.getAnonymousNodes(t)[1].childNodes[0]), 
+  is(SpecialPowers.unwrap(d.getBindingParent(d.getAnonymousNodes(t)[1].childNodes[0])),
      t,
      "Wrong binding parent for child of anonymous node");
      
-  is(document.getBindingParent(t), 
+  is(d.getBindingParent(t), 
      null,
      "Non-anonymous node should not have a binding parent");
      
-  is(document.getBindingParent(document.documentElement), 
+  is(d.getBindingParent(document.documentElement), 
      null,
      "Document element should not have a binding parent");
      
diff --git a/content/base/test/test_bug372086.html b/content/base/test/test_bug372086.html
index d439215ef2b4..43d8c6e0c8c6 100644
--- a/content/base/test/test_bug372086.html
+++ b/content/base/test/test_bug372086.html
@@ -42,7 +42,7 @@ function runTest() {
   is(range.endOffset, 3, "Unexpected end offset");
   is(range.toString(), "bc", "Unexpected range serialization");
 
-  var anon = document.getAnonymousNodes($("d"))[0];
+  var anon = SpecialPowers.unwrap(SpecialPowers.wrap(document).getAnonymousNodes($("d")))[0];
   // Should collapse the range, because can't determine order
   range.setEnd(anon, 2);
   is(range.startContainer, anon, "Unexpected collapsed start container");
@@ -59,7 +59,7 @@ function runTest() {
   is(range.endOffset, 2, "Unexpected end offset after");
   is(range.toString(), "de", "Unexpected range serialization after");
 
-  anon = document.getAnonymousNodes($("d"))[2];
+  anon = SpecialPowers.unwrap(SpecialPowers.wrap(document).getAnonymousNodes($("d")))[2];
   // Collapses because one endpoint is anonymous from point of view of
   // the other.  
   range.setStart(anon, 1);
diff --git a/content/base/test/test_bug444030.xhtml b/content/base/test/test_bug444030.xhtml
index 92f6ba0e57e9..6ba2c6ec1395 100644
--- a/content/base/test/test_bug444030.xhtml
+++ b/content/base/test/test_bug444030.xhtml
@@ -26,7 +26,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=444030
 /** Test for Bug 444030 **/
 
 function doTest() {
-  var anonTextNode = document.getAnonymousNodes(document.getElementById("boundElement"))[0];
+  var anonTextNode = SpecialPowers.unwrap(SpecialPowers.wrap(document).getAnonymousNodes(document.getElementById("boundElement")))[0];
   var hadException = false;
   try {
     var wholeText = anonTextNode.wholeText;
diff --git a/content/html/content/crashtests/465466-1.xhtml b/content/html/content/crashtests/465466-1.xhtml
index d1b85dadec45..4e1258702684 100644
--- a/content/html/content/crashtests/465466-1.xhtml
+++ b/content/html/content/crashtests/465466-1.xhtml
@@ -11,7 +11,7 @@
 function boom()
 {
   var f = document.getElementById("f");
-  var anon = document.getAnonymousNodes(f)[0];
+  var anon = SpecialPowers.unwrap(SpecialPowers.wrap(document).getAnonymousNodes(f))[0];
   document.body.removeChild(f);
   anon.appendChild(document.createElement("label"));
 }
diff --git a/content/xbl/crashtests/472260-1.xhtml b/content/xbl/crashtests/472260-1.xhtml
index 4b8d97f38a39..49d5407d4636 100644
--- a/content/xbl/crashtests/472260-1.xhtml
+++ b/content/xbl/crashtests/472260-1.xhtml
@@ -12,7 +12,7 @@
 function boom()
 {
   var bo = document.getElementById("bo");
-  var anon = document.getAnonymousNodes(bo)[0];
+  var anon = SpecialPowers.wrap(document).getAnonymousNodes(bo)[0];
 
   bo.style.MozBinding = "url(#bar)";
 
diff --git a/content/xbl/test/file_bug379959_cross.html b/content/xbl/test/file_bug379959_cross.html
index 29a456d38ad7..8f356d210182 100644
--- a/content/xbl/test/file_bug379959_cross.html
+++ b/content/xbl/test/file_bug379959_cross.html
@@ -16,9 +16,9 @@
 <div id="div2"></div>
 <script>
 onload = function() {
-  nodes = document.getAnonymousNodes(document.getElementById('div1'));
+  nodes = SpecialPowers.wrap(document).getAnonymousNodes(document.getElementById('div1'));
   parent.postMessage(nodes ? nodes.length : 0, "http://mochi.test:8888");
-  nodes = document.getAnonymousNodes(document.getElementById('div2'));
+  nodes = SpecialPowers.wrap(document).getAnonymousNodes(document.getElementById('div2'));
   parent.postMessage(nodes ? nodes.length : 0, "http://mochi.test:8888");
 }
 </script>
diff --git a/content/xbl/test/file_bug379959_data.html b/content/xbl/test/file_bug379959_data.html
index a84b63ca33a9..dd101760193c 100644
--- a/content/xbl/test/file_bug379959_data.html
+++ b/content/xbl/test/file_bug379959_data.html
@@ -11,7 +11,7 @@
 <div id="d"></div>
 <script>
 onload = function() {
-  nodes = document.getAnonymousNodes(document.getElementById('d'));
+  nodes = SpecialPowers.wrap(document).getAnonymousNodes(document.getElementById('d'));
   parent.postMessage(nodes ? nodes.length : 0, "http://mochi.test:8888");
 }
 </script>
diff --git a/content/xbl/test/file_bug591198_inner.html b/content/xbl/test/file_bug591198_inner.html
index 12fc9f58348f..89b547a39fa6 100644
--- a/content/xbl/test/file_bug591198_inner.html
+++ b/content/xbl/test/file_bug591198_inner.html
@@ -22,7 +22,7 @@ function sendResults() {
   
   try {
     res.anonChildCount =
-      document.getAnonymousNodes(document.getElementById('b')).length;
+      SpecialPowers.wrap(document).getAnonymousNodes(document.getElementById('b')).length;
   }
   catch (ex) {}
 
diff --git a/content/xbl/test/test_bug378866.xhtml b/content/xbl/test/test_bug378866.xhtml
index d4de492ca05a..8dcbf11bb9a5 100644
--- a/content/xbl/test/test_bug378866.xhtml
+++ b/content/xbl/test/test_bug378866.xhtml
@@ -33,7 +33,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=378866
 /** Test for Bug 378866 **/
 
 function runTest() {
-  var anon = document.getAnonymousNodes(document.getElementById('grandparent'));
+  var anon = SpecialPowers.unwrap(SpecialPowers.wrap(document).getAnonymousNodes(document.getElementById('grandparent')));
   var child = document.getElementById('child');
   var insertionPoint = anon[0].childNodes[0];
   insertionPoint.parentNode.removeChild(insertionPoint);
diff --git a/content/xbl/test/test_bug468210.xhtml b/content/xbl/test/test_bug468210.xhtml
index f930880dd0be..04434fdf35f9 100644
--- a/content/xbl/test/test_bug468210.xhtml
+++ b/content/xbl/test/test_bug468210.xhtml
@@ -32,7 +32,7 @@ addLoadEvent(function() {
   var div = $("d");
   var n = document.anchors.length;
   is(n, 1, "Unexpected number of anchors");
-  var anon = document.getAnonymousNodes(div)[0];
+  var anon = SpecialPowers.unwrap(SpecialPowers.wrap(document).getAnonymousNodes(div))[0];
   is(anon instanceof HTMLSpanElement, true, "Unexpected node");
   is(anon.parentNode, div, "Unexpected parent");
   document.body.appendChild(div);
diff --git a/content/xslt/tests/mochitest/test_bug319374.xhtml b/content/xslt/tests/mochitest/test_bug319374.xhtml
index c891fb3630a0..a3496b7d7b56 100644
--- a/content/xslt/tests/mochitest/test_bug319374.xhtml
+++ b/content/xslt/tests/mochitest/test_bug319374.xhtml
@@ -31,6 +31,9 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=319374
     //         cause non-anonymous XPath result to throw exceptions..
     var counter = 0;
     var error = null;
+    function getAnonymousNodes(e) {
+      return SpecialPowers.unwrap(SpecialPowers.wrap(document).getAnonymousNodes(e));
+    }
     try {
       var xp = new XPathEvaluator();
       var result = xp.evaluate("*",
@@ -42,7 +45,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=319374
       var res = null;
       while (res = result.iterateNext()) {
         ++counter; 
-        var anon = document.getAnonymousNodes(res);
+        var anon = getAnonymousNodes(res);
         anon[0].removeChild(anon[0].firstChild); // Removing a child node
         anon[0].removeAttribute("attr1"); // Removing an attribute
         anon[1].firstChild.data = "anon text changed" // Modifying text data
@@ -56,10 +59,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=319374
     // Test 2: If the context node is in anonymous content, changing some
     //         other anonymous tree shouldn't cause XPath result to throw.
     var anonAttr1 =
-      document.getAnonymousNodes(document.getElementById('content').
+      getAnonymousNodes(document.getElementById('content').
         firstChild)[0].getAttributeNode('attr');
     var anonAttr2 =
-      document.getAnonymousNodes(document.getElementById('content').
+      getAnonymousNodes(document.getElementById('content').
         lastChild)[0].getAttributeNode('attr');
     var resultAttr = null;
     try {
diff --git a/content/xul/content/crashtests/326864-1.xul b/content/xul/content/crashtests/326864-1.xul
index 154b1344bcbe..5515ca25921c 100644
--- a/content/xul/content/crashtests/326864-1.xul
+++ b/content/xul/content/crashtests/326864-1.xul
@@ -6,13 +6,17 @@
 
 <script>
 
+function getAnonymousNodes(e) {
+  return SpecialPowers.unwrap(SpecialPowers.wrap(document).getAnonymousNodes(e));
+}
+
 function init()
 {
   var tt = document.getElementById("textbox");
-  var hb = document.getAnonymousNodes(tt)[0]; // hbox
-  var men = document.getAnonymousNodes(hb)[1]; // menupopup
+  var hb = getAnonymousNodes(tt)[0]; // hbox
+  var men = getAnonymousNodes(hb)[1]; // menupopup
   var menitem = men.childNodes[0]; // menuitem
-  var hb2 = document.getAnonymousNodes(menitem)[1]; // hbox
+  var hb2 = getAnonymousNodes(menitem)[1]; // hbox
   var label2 = hb2.childNodes[0]; // label
 
   men.menu = null;
diff --git a/content/xul/content/crashtests/384740-1.xul b/content/xul/content/crashtests/384740-1.xul
index 3f47b47ac05d..374f47c3db28 100644
--- a/content/xul/content/crashtests/384740-1.xul
+++ b/content/xul/content/crashtests/384740-1.xul
@@ -12,7 +12,7 @@ function boom()
 
   var scrollbar = document.createElementNS(XUL_NS, 'scrollbar');
   document.documentElement.appendChild(scrollbar);
-  var sbb = document.getAnonymousNodes(scrollbar)[0];
+  var sbb = SpecialPowers.unwrap(SpecialPowers.wrap(document).getAnonymousNodes(scrollbar))[0];
   var action = document.createElementNS(XUL_NS, 'action');
   action.setAttribute('datasources', "");
   sbb.appendChild(action);
diff --git a/dom/base/crashtests/404869-1.xul b/dom/base/crashtests/404869-1.xul
index e530f7ec656f..f5c7facff0a7 100644
--- a/dom/base/crashtests/404869-1.xul
+++ b/dom/base/crashtests/404869-1.xul
@@ -10,7 +10,7 @@
 function boom()
 {
   var menupopup = document.getElementById("menupopup");
-  var x = document.getAnonymousNodes(menupopup)[0];
+  var x = SpecialPowers.wrap(document).getAnonymousNodes(menupopup)[0];
   menupopup.style.MozBinding = "url('#empty')";
   for (var ppp in x) {
   }
diff --git a/dom/indexedDB/test/head.js b/dom/indexedDB/test/head.js
index 514b5096c469..f47bead8789d 100644
--- a/dom/indexedDB/test/head.js
+++ b/dom/indexedDB/test/head.js
@@ -60,7 +60,7 @@ function triggerSecondaryCommand(popup, index)
 
   // Cancel the arrow panel slide-in transition (bug 767133) such that
   // it won't interfere with us interacting with the dropdown.
-  document.getAnonymousNodes(popup)[0].style.transition = "none";
+  SpecialPowers.wrap(document).getAnonymousNodes(popup)[0].style.transition = "none";
 
   notification.button.focus();
 
diff --git a/js/xpconnect/crashtests/471366-1.html b/js/xpconnect/crashtests/471366-1.html
index 75d0f2542a9c..b450d5e12a46 100644
--- a/js/xpconnect/crashtests/471366-1.html
+++ b/js/xpconnect/crashtests/471366-1.html
@@ -3,7 +3,7 @@
 <head>
 <script type="text/javascript">
 
-document.getAnonymousNodes({__proto__: XPCNativeWrapper.prototype});
+SpecialPowers.wrap(document).getAnonymousNodes({__proto__: XPCNativeWrapper.prototype});
 
 </script>
 </head>
diff --git a/layout/base/crashtests/379105-1.xhtml b/layout/base/crashtests/379105-1.xhtml
index 662ebbd5cab0..e20cced1696a 100644
--- a/layout/base/crashtests/379105-1.xhtml
+++ b/layout/base/crashtests/379105-1.xhtml
@@ -25,7 +25,7 @@ function boom1()
 
 function boom2()
 {
-  var nodes = document.getAnonymousNodes(xbltarget);
+  var nodes = SpecialPowers.unwrap(SpecialPowers.wrap(document).getAnonymousNodes(xbltarget));
   if (!nodes) {
     setTimeout(boom2, 10);
     return;
diff --git a/layout/inspector/tests/test_bug522601.xhtml b/layout/inspector/tests/test_bug522601.xhtml
index 8a94fe6176ce..344dc61cbf45 100644
--- a/layout/inspector/tests/test_bug522601.xhtml
+++ b/layout/inspector/tests/test_bug522601.xhtml
@@ -106,7 +106,7 @@ addLoadEvent(function() {
   testFunc(walkerNonAnon, "previousNode", null,
            "step back past root");
 
-  var anonDiv = document.getAnonymousNodes($("display"))[0];
+  var anonDiv = SpecialPowers.unwrap(SpecialPowers.wrap(document).getAnonymousNodes($("display")))[0];
 
   var walkerAnon =
     SpecialPowers.Cc["@mozilla.org/inspector/deep-tree-walker;1"]
diff --git a/layout/reftests/bugs/495385-2f.xhtml b/layout/reftests/bugs/495385-2f.xhtml
index 9b01963d2381..3c358728c944 100644
--- a/layout/reftests/bugs/495385-2f.xhtml
+++ b/layout/reftests/bugs/495385-2f.xhtml
@@ -13,6 +13,19 @@
   </binding>
   <binding id="empty2">
     <content><children/><div xmlns="http://www.w3.org/1999/xhtml">Kitty</div></content>
+    <implementation>
+      <constructor>
+        // We used to do this in an onload handler, but getAnonymousNodes is no
+        // longer accessible to content, and we can't use SpecialPowers in
+        // reftests. So we enable XBL scopes and take advantage of the fact that XBL
+        // scopes can access these functions. We apply this binding
+        // programatically to make absolutely sure this constructor runs after all the
+        // other bindings have been set up.
+        document.body.offsetHeight;
+        document.getAnonymousNodes(document.getElementById("d3"))[0].style.display = 'inline';
+        document.getAnonymousNodes(document.getElementById("d4"))[2].style.display = 'inline';
+      </constructor>
+    </implementation>
   </binding>
 </bindings>
 <style>
@@ -21,13 +34,10 @@ body > div { border:1px solid black; margin:1em;
 #d1 { -moz-binding:url(#before); }
 #d2 { -moz-binding:url(#after); }
 #d3 { -moz-binding:url(#empty1); }
-#d4 { -moz-binding:url(#empty2); }
 </style>
 <script>
 function loaded() {
-  document.body.offsetHeight;
-  document.getAnonymousNodes(document.getElementById("d3"))[0].style.display = 'inline';
-  document.getAnonymousNodes(document.getElementById("d4"))[2].style.display = 'inline';
+  document.getElementById('d4').style.MozBinding = "url(#empty2)";
 }
 </script>
 </head>
diff --git a/layout/reftests/bugs/reftest.list b/layout/reftests/bugs/reftest.list
index 8b28ccd272ef..20e161a852dc 100644
--- a/layout/reftests/bugs/reftest.list
+++ b/layout/reftests/bugs/reftest.list
@@ -1370,7 +1370,7 @@ fails-if(Android) == 488685-1.html 488685-1-ref.html
 == 495385-2c.html 495385-2-ref.html
 == 495385-2d.html 495385-2-ref.html
 == 495385-2e.html 495385-2-ref.html
-== 495385-2f.xhtml 495385-2-ref.html
+pref(dom.use_xbl_scopes_for_remote_xul,true) == 495385-2f.xhtml 495385-2-ref.html
 == 495385-2g.html 495385-2-ref.html
 == 495385-2h.html 495385-2-ref.html
 == 495385-2i.html 495385-2-ref.html
diff --git a/layout/style/test/test_selectors_on_anonymous_content.html b/layout/style/test/test_selectors_on_anonymous_content.html
index 89da83fe8869..7a65f532894c 100644
--- a/layout/style/test/test_selectors_on_anonymous_content.html
+++ b/layout/style/test/test_selectors_on_anonymous_content.html
@@ -42,7 +42,7 @@ function run() {
         style_text.data = selector + "{ z-index: " + zi + " }";
 
         var doc_div = document.getElementById("display");
-        var anon_div = document.getAnonymousNodes(doc_div)[0];
+        var anon_div = SpecialPowers.unwrap(SpecialPowers.wrap(document).getAnonymousNodes(doc_div))[0];
         var should_match = [];
         var should_not_match = [];
         (matches_docdiv ? should_match : should_not_match).push(doc_div);
diff --git a/layout/xul/base/src/crashtests/328135-1.xul b/layout/xul/base/src/crashtests/328135-1.xul
index 1a532e1869a3..77a4679099db 100644
--- a/layout/xul/base/src/crashtests/328135-1.xul
+++ b/layout/xul/base/src/crashtests/328135-1.xul
@@ -9,7 +9,7 @@
 
 function init() { 
   var pop = document.getElementsByTagName("popup")[0];
-  document.getAnonymousNodes(pop)[0];
+  SpecialPowers.wrap(document).getAnonymousNodes(pop)[0];
   eval.eee = document.documentElement;
 };
 
diff --git a/layout/xul/base/src/crashtests/329477-1.xhtml b/layout/xul/base/src/crashtests/329477-1.xhtml
index 87c8bd63666f..fcbd3da872cc 100644
--- a/layout/xul/base/src/crashtests/329477-1.xhtml
+++ b/layout/xul/base/src/crashtests/329477-1.xhtml
@@ -9,8 +9,8 @@
 function init() 
 { 
   var textbox = document.getElementsByTagName("textbox")[0];
-  var hbox = document.getAnonymousNodes(textbox)[0];
-  var menupopup = document.getAnonymousNodes(hbox)[1];
+  var hbox = SpecialPowers.wrap(document).getAnonymousNodes(textbox)[0];
+  var menupopup = SpecialPowers.wrap(document).getAnonymousNodes(hbox)[1];
 
   menupopup.click();
 }
diff --git a/toolkit/content/tests/widgets/test_popupanchor.xul b/toolkit/content/tests/widgets/test_popupanchor.xul
index 404c177067f1..b255c06ba8b2 100644
--- a/toolkit/content/tests/widgets/test_popupanchor.xul
+++ b/toolkit/content/tests/widgets/test_popupanchor.xul
@@ -383,7 +383,7 @@ SimpleTest.waitForExplicitFinish();
 addEventListener("load", function() {
   // anchor is set by the test runner above
   panel = document.getElementById("testPanel");
-  arrow = document.getAnonymousElementByAttribute(panel, "anonid", "arrow");
+  arrow = SpecialPowers.wrap(document).getAnonymousElementByAttribute(panel, "anonid", "arrow");
   // Cancel the arrow panel slide-in transition (bug 767133) so the size and
   // position are "stable" enough to test without jumping through hoops...
   arrow.style.transition = "none";

From 618a975abe0859c993582619820a176ce924ab3b Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Wed, 4 Sep 2013 19:05:52 -0700
Subject: [PATCH 68/86] Bug 912322 - Stop making XBL methods available to the
 web. r=bz

---
 dom/webidl/Document.webidl                    |  5 ++-
 js/xpconnect/tests/mochitest/Makefile.in      |  1 +
 .../tests/mochitest/test_bug912322.html       | 35 +++++++++++++++++++
 3 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 js/xpconnect/tests/mochitest/test_bug912322.html

diff --git a/dom/webidl/Document.webidl b/dom/webidl/Document.webidl
index 81d84c799c74..518fbb823926 100644
--- a/dom/webidl/Document.webidl
+++ b/dom/webidl/Document.webidl
@@ -277,11 +277,14 @@ partial interface Document {
 partial interface Document {
   // nsIDOMDocumentXBL.  Wish we could make these [ChromeOnly], but
   // that would likely break bindings running with the page principal.
+  [Func="IsChromeOrXBL"]
   NodeList? getAnonymousNodes(Element elt);
+  [Func="IsChromeOrXBL"]
   Element? getAnonymousElementByAttribute(Element elt, DOMString attrName,
                                           DOMString attrValue);
+  [Func="IsChromeOrXBL"]
   Element? getBindingParent(Node node);
-  [Throws]
+  [Throws, Func="IsChromeOrXBL"]
   void loadBindingDocument(DOMString documentURL);
 
   // nsIDOMDocumentTouch
diff --git a/js/xpconnect/tests/mochitest/Makefile.in b/js/xpconnect/tests/mochitest/Makefile.in
index 1d58390ff8f7..df908fcf40f1 100644
--- a/js/xpconnect/tests/mochitest/Makefile.in
+++ b/js/xpconnect/tests/mochitest/Makefile.in
@@ -87,6 +87,7 @@ MOCHITEST_FILES =	chrome_wrappers_helper.html \
 		test_bug865260.html \
 		test_bug870423.html \
 		test_bug871887.html \
+		test_bug912322.html \
 		file_crosscompartment_weakmap.html \
 		test_crosscompartment_weakmap.html \
 		test_asmjs.html \
diff --git a/js/xpconnect/tests/mochitest/test_bug912322.html b/js/xpconnect/tests/mochitest/test_bug912322.html
new file mode 100644
index 000000000000..22fcc9f96c50
--- /dev/null
+++ b/js/xpconnect/tests/mochitest/test_bug912322.html
@@ -0,0 +1,35 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=912322
+-->
+<head>
+  <meta charset="utf-8">
+  <title>Test for Bug 912322</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+  <script type="application/javascript">
+
+  /** Test that XBL functions aren't exposed to the web. **/
+  funs = ['getAnonymousNodes', 'getAnonymousElementByAttribute',
+          'getBindingParent', 'loadBindingDocument'];
+  for (var f of funs) {
+    ok(!(f in document), f + " should not be available to content");
+    ok(f in SpecialPowers.wrap(document), f + " should be available to chrome via Xray");
+  }
+
+
+
+
+  </script>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=912322">Mozilla Bug 912322</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+
+</div>
+<pre id="test">
+</pre>
+</body>
+</html>

From 32806e97e55bc28753e76b8a689773a72ea1bb88 Mon Sep 17 00:00:00 2001
From: Dan Gohman <sunfish@google.com>
Date: Wed, 4 Sep 2013 20:06:07 -0700
Subject: [PATCH 69/86] Bug 910782 - SpiderMonkey: Delete obsolete comments.
 r=jorendorff

---
 js/src/jsopcode.tbl | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/js/src/jsopcode.tbl b/js/src/jsopcode.tbl
index b8229b3b9eac..9e72369ba3fc 100644
--- a/js/src/jsopcode.tbl
+++ b/js/src/jsopcode.tbl
@@ -223,7 +223,6 @@ OPDEF(JSOP_LEAVEFORLETIN, 105,"leaveforletin",NULL,   1,  0,  0,  JOF_BYTE)
 /* The argument is the offset to the next statement and is used by IonMonkey. */
 OPDEF(JSOP_LABEL,     106,"label",     NULL,          5,  0,  0,  JOF_JUMP)
 
-/* Performs the dynamic validation step of type-checked asm.js. */
 OPDEF(JSOP_UNUSED107, 107,"unused107",  NULL,         1,  0,  0,  JOF_BYTE)
 
 /* Like JSOP_FUNAPPLY but for f.call instead of f.apply. */
@@ -275,11 +274,6 @@ OPDEF(JSOP_EVAL,      123,"eval",       NULL,         3, -1,  1, JOF_UINT16|JOF_
  */
 OPDEF(JSOP_ENUMELEM,  124,"enumelem",   NULL,         1,  3,  0,  JOF_BYTE |JOF_SET|JOF_TMPSLOT)
 
-/*
- * Getter and setter prefix bytecodes.  These modify the next bytecode, either
- * an assignment or a property initializer code, which then defines a property
- * getter or setter.
- */
 OPDEF(JSOP_UNUSED125,  125, "unused125", NULL,      1,  0,  0,  JOF_BYTE)
 OPDEF(JSOP_UNUSED126,  126, "unused126", NULL,      1,  0,  0,  JOF_BYTE)
 

From 663d485da74d412c6098bf1d9cdca5a934fc7127 Mon Sep 17 00:00:00 2001
From: Dan Gohman <sunfish@google.com>
Date: Wed, 4 Sep 2013 20:06:07 -0700
Subject: [PATCH 70/86] Bug 910782 - SpiderMonkey: Simply uses of BRANCH.
 r=luke

---
 js/src/vm/Interpreter.cpp | 31 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/js/src/vm/Interpreter.cpp b/js/src/vm/Interpreter.cpp
index 89908b55639b..67b338b43a3a 100644
--- a/js/src/vm/Interpreter.cpp
+++ b/js/src/vm/Interpreter.cpp
@@ -1303,9 +1303,10 @@ Interpret(JSContext *cx, RunState &state)
 
 #define BRANCH(n)                                                             \
     JS_BEGIN_MACRO                                                            \
-        regs.pc += (n);                                                       \
+        int32_t nlen = (n);                                                   \
+        regs.pc += nlen;                                                      \
         op = (JSOp) *regs.pc;                                                 \
-        if ((n) <= 0)                                                         \
+        if (nlen <= 0)                                                        \
             goto check_backedge;                                              \
         DO_OP();                                                              \
     JS_END_MACRO
@@ -1705,19 +1706,15 @@ BEGIN_CASE(JSOP_DEFAULT)
     /* FALL THROUGH */
 BEGIN_CASE(JSOP_GOTO)
 {
-    len = GET_JUMP_OFFSET(regs.pc);
-    BRANCH(len);
+    BRANCH(GET_JUMP_OFFSET(regs.pc));
 }
-END_CASE(JSOP_GOTO)
 
 BEGIN_CASE(JSOP_IFEQ)
 {
     bool cond = ToBooleanOp(regs);
     regs.sp--;
-    if (cond == false) {
-        len = GET_JUMP_OFFSET(regs.pc);
-        BRANCH(len);
-    }
+    if (!cond)
+        BRANCH(GET_JUMP_OFFSET(regs.pc));
 }
 END_CASE(JSOP_IFEQ)
 
@@ -1725,17 +1722,15 @@ BEGIN_CASE(JSOP_IFNE)
 {
     bool cond = ToBooleanOp(regs);
     regs.sp--;
-    if (cond != false) {
-        len = GET_JUMP_OFFSET(regs.pc);
-        BRANCH(len);
-    }
+    if (cond)
+        BRANCH(GET_JUMP_OFFSET(regs.pc));
 }
 END_CASE(JSOP_IFNE)
 
 BEGIN_CASE(JSOP_OR)
 {
     bool cond = ToBooleanOp(regs);
-    if (cond == true) {
+    if (cond) {
         len = GET_JUMP_OFFSET(regs.pc);
         goto advanceAndDoOp;
     }
@@ -1745,7 +1740,7 @@ END_CASE(JSOP_OR)
 BEGIN_CASE(JSOP_AND)
 {
     bool cond = ToBooleanOp(regs);
-    if (cond == false) {
+    if (!cond) {
         len = GET_JUMP_OFFSET(regs.pc);
         goto advanceAndDoOp;
     }
@@ -1766,8 +1761,7 @@ END_CASE(JSOP_AND)
             regs.sp -= (spdec);                                               \
             if ((cond) == (diff_ != 0)) {                                     \
                 ++regs.pc;                                                    \
-                len = GET_JUMP_OFFSET(regs.pc);                               \
-                BRANCH(len);                                                  \
+                BRANCH(GET_JUMP_OFFSET(regs.pc));                             \
             }                                                                 \
             len = 1 + JSOP_IFEQ_LENGTH;                                       \
             goto advanceAndDoOp;                                              \
@@ -2012,8 +2006,7 @@ BEGIN_CASE(JSOP_CASE)
     STRICT_EQUALITY_OP(==, cond);
     if (cond) {
         regs.sp--;
-        len = GET_JUMP_OFFSET(regs.pc);
-        BRANCH(len);
+        BRANCH(GET_JUMP_OFFSET(regs.pc));
     }
 }
 END_CASE(JSOP_CASE)

From 738e86b47649482b88a7ee433764a3348595da75 Mon Sep 17 00:00:00 2001
From: Dan Gohman <sunfish@google.com>
Date: Wed, 4 Sep 2013 20:06:07 -0700
Subject: [PATCH 71/86] Bug 910782 - SpiderMonkey: Inline check_backedge, which
 is only used in one place. r=luke

---
 js/src/vm/Interpreter.cpp | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/js/src/vm/Interpreter.cpp b/js/src/vm/Interpreter.cpp
index 67b338b43a3a..84fc30c0fd67 100644
--- a/js/src/vm/Interpreter.cpp
+++ b/js/src/vm/Interpreter.cpp
@@ -1307,7 +1307,7 @@ Interpret(JSContext *cx, RunState &state)
         regs.pc += nlen;                                                      \
         op = (JSOp) *regs.pc;                                                 \
         if (nlen <= 0)                                                        \
-            goto check_backedge;                                              \
+            CHECK_BRANCH();                                                   \
         DO_OP();                                                              \
     JS_END_MACRO
 
@@ -1554,12 +1554,6 @@ END_CASE(JSOP_LOOPHEAD)
 BEGIN_CASE(JSOP_LABEL)
 END_CASE(JSOP_LABEL)
 
-check_backedge:
-{
-    CHECK_BRANCH();
-    DO_OP();
-}
-
 BEGIN_CASE(JSOP_LOOPENTRY)
 
 #ifdef JS_ION

From 11463021401a89beff1ceba68bffee7ce68bd8f3 Mon Sep 17 00:00:00 2001
From: Dan Gohman <sunfish@google.com>
Date: Wed, 4 Sep 2013 20:06:07 -0700
Subject: [PATCH 72/86] Bug 910782 - SpiderMonkey: Remove the for(;;)
 surrounding the interpreter loop, as it isn't needed, and adjust indentation
 for consistency. r=luke

---
 js/src/vm/Interpreter.cpp | 171 +++++++++++++++++++-------------------
 1 file changed, 86 insertions(+), 85 deletions(-)

diff --git a/js/src/vm/Interpreter.cpp b/js/src/vm/Interpreter.cpp
index 84fc30c0fd67..859d1fcac0eb 100644
--- a/js/src/vm/Interpreter.cpp
+++ b/js/src/vm/Interpreter.cpp
@@ -1416,88 +1416,88 @@ Interpret(JSContext *cx, RunState &state)
     if (rt->profilingScripts || cx->runtime()->debugHooks.interruptHook)
         switchMask = -1; /* Enable interrupts. */
 
-    for (;;) {
-      advanceAndDoOp:
-        js::gc::MaybeVerifyBarriers(cx);
-        regs.pc += len;
-        op = (JSOp) *regs.pc;
+  advanceAndDoOp:
+    js::gc::MaybeVerifyBarriers(cx);
+    regs.pc += len;
+    op = (JSOp) *regs.pc;
 
-      do_op:
-        CHECK_PCCOUNT_INTERRUPTS();
-        switchOp = int(op) | switchMask;
-      do_switch:
-        switch (switchOp) {
+  do_op:
+    CHECK_PCCOUNT_INTERRUPTS();
+    switchOp = int(op) | switchMask;
+  do_switch:
+    switch (switchOp) {
 
-  case -1:
+case -1:
+{
     JS_ASSERT(switchMask == -1);
-    {
-        bool moreInterrupts = false;
 
-        if (cx->runtime()->profilingScripts) {
-            if (!script->hasScriptCounts)
-                script->initScriptCounts(cx);
-            moreInterrupts = true;
-        }
+    bool moreInterrupts = false;
 
-        if (script->hasScriptCounts) {
-            PCCounts counts = script->getPCCounts(regs.pc);
-            counts.get(PCCounts::BASE_INTERP)++;
-            moreInterrupts = true;
-        }
-
-        JSInterruptHook hook = cx->runtime()->debugHooks.interruptHook;
-        if (hook || script->stepModeEnabled()) {
-            RootedValue rval(cx);
-            JSTrapStatus status = JSTRAP_CONTINUE;
-            if (hook)
-                status = hook(cx, script, regs.pc, rval.address(), cx->runtime()->debugHooks.interruptHookData);
-            if (status == JSTRAP_CONTINUE && script->stepModeEnabled())
-                status = Debugger::onSingleStep(cx, &rval);
-            switch (status) {
-              case JSTRAP_ERROR:
-                goto error;
-              case JSTRAP_CONTINUE:
-                break;
-              case JSTRAP_RETURN:
-                regs.fp()->setReturnValue(rval);
-                interpReturnOK = true;
-                goto forced_return;
-              case JSTRAP_THROW:
-                cx->setPendingException(rval);
-                goto error;
-              default:;
-            }
-            moreInterrupts = true;
-        }
-
-        if (script->hasAnyBreakpointsOrStepMode())
-            moreInterrupts = true;
-
-        if (script->hasBreakpointsAt(regs.pc)) {
-            RootedValue rval(cx);
-            JSTrapStatus status = Debugger::onTrap(cx, &rval);
-            switch (status) {
-              case JSTRAP_ERROR:
-                goto error;
-              case JSTRAP_RETURN:
-                regs.fp()->setReturnValue(rval);
-                interpReturnOK = true;
-                goto forced_return;
-              case JSTRAP_THROW:
-                cx->setPendingException(rval);
-                goto error;
-              default:
-                break;
-            }
-            JS_ASSERT(status == JSTRAP_CONTINUE);
-            JS_ASSERT(rval.isInt32() && rval.toInt32() == op);
-        }
-
-        switchMask = moreInterrupts ? -1 : 0;
-        switchOp = int(op);
-        goto do_switch;
+    if (cx->runtime()->profilingScripts) {
+        if (!script->hasScriptCounts)
+            script->initScriptCounts(cx);
+        moreInterrupts = true;
     }
 
+    if (script->hasScriptCounts) {
+        PCCounts counts = script->getPCCounts(regs.pc);
+        counts.get(PCCounts::BASE_INTERP)++;
+        moreInterrupts = true;
+    }
+
+    JSInterruptHook hook = cx->runtime()->debugHooks.interruptHook;
+    if (hook || script->stepModeEnabled()) {
+        RootedValue rval(cx);
+        JSTrapStatus status = JSTRAP_CONTINUE;
+        if (hook)
+            status = hook(cx, script, regs.pc, rval.address(), cx->runtime()->debugHooks.interruptHookData);
+        if (status == JSTRAP_CONTINUE && script->stepModeEnabled())
+            status = Debugger::onSingleStep(cx, &rval);
+        switch (status) {
+          case JSTRAP_ERROR:
+            goto error;
+          case JSTRAP_CONTINUE:
+            break;
+          case JSTRAP_RETURN:
+            regs.fp()->setReturnValue(rval);
+            interpReturnOK = true;
+            goto forced_return;
+          case JSTRAP_THROW:
+            cx->setPendingException(rval);
+            goto error;
+          default:;
+        }
+        moreInterrupts = true;
+    }
+
+    if (script->hasAnyBreakpointsOrStepMode())
+        moreInterrupts = true;
+
+    if (script->hasBreakpointsAt(regs.pc)) {
+        RootedValue rval(cx);
+        JSTrapStatus status = Debugger::onTrap(cx, &rval);
+        switch (status) {
+          case JSTRAP_ERROR:
+            goto error;
+          case JSTRAP_RETURN:
+            regs.fp()->setReturnValue(rval);
+            interpReturnOK = true;
+            goto forced_return;
+          case JSTRAP_THROW:
+            cx->setPendingException(rval);
+            goto error;
+          default:
+            break;
+        }
+        JS_ASSERT(status == JSTRAP_CONTINUE);
+        JS_ASSERT(rval.isInt32() && rval.toInt32() == op);
+    }
+
+    switchMask = moreInterrupts ? -1 : 0;
+    switchOp = int(op);
+    goto do_switch;
+}
+
 /* Various 1-byte no-ops. */
 BEGIN_CASE(JSOP_NOP)
 BEGIN_CASE(JSOP_UNUSED125)
@@ -3254,17 +3254,18 @@ BEGIN_CASE(JSOP_ARRAYPUSH)
 }
 END_CASE(JSOP_ARRAYPUSH)
 
-          default:
-          {
-            char numBuf[12];
-            JS_snprintf(numBuf, sizeof numBuf, "%d", op);
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                                 JSMSG_BAD_BYTECODE, numBuf);
-            goto error;
-          }
+default:
+{
+    char numBuf[12];
+    JS_snprintf(numBuf, sizeof numBuf, "%d", op);
+    JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
+                         JSMSG_BAD_BYTECODE, numBuf);
+    goto error;
+}
 
-        } /* switch (op) */
-    } /* for (;;) */
+    } /* switch (op) */
+
+    MOZ_ASSUME_UNREACHABLE("Interpreter loop exited via fallthrough");
 
   error:
     JS_ASSERT(uint32_t(regs.pc - script->code) < script->length);

From 72a87a573ef87edc9e0875ef634480e31b7dcf15 Mon Sep 17 00:00:00 2001
From: Dan Gohman <sunfish@google.com>
Date: Wed, 4 Sep 2013 20:06:07 -0700
Subject: [PATCH 73/86] Bug 910782 - SpiderMonkey: Use jsbytecode instead of
 int for the switch mask variables, and name the magic opcode used to enable
 interrupts. r=luke

---
 js/src/vm/Interpreter.cpp | 30 ++++++++++++++++++------------
 js/src/vm/Stack-inl.h     |  2 +-
 js/src/vm/Stack.h         | 11 ++++++++---
 3 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/js/src/vm/Interpreter.cpp b/js/src/vm/Interpreter.cpp
index 859d1fcac0eb..51923da35572 100644
--- a/js/src/vm/Interpreter.cpp
+++ b/js/src/vm/Interpreter.cpp
@@ -1261,7 +1261,8 @@ Interpret(JSContext *cx, RunState &state)
 
     JS_ASSERT(!cx->compartment()->activeAnalysis);
 
-#define CHECK_PCCOUNT_INTERRUPTS() JS_ASSERT_IF(script->hasScriptCounts, switchMask == -1)
+#define CHECK_PCCOUNT_INTERRUPTS() \
+    JS_ASSERT_IF(script->hasScriptCounts, switchMask == EnableInterruptsPseudoOpcode)
 
     /*
      * When Debugger puts a script in single-step mode, all js::Interpret
@@ -1272,10 +1273,15 @@ Interpret(JSContext *cx, RunState &state)
      * JavaScript to run: each place an object might be coerced to a primitive
      * or a number, for example. So instead, we expose a simple mechanism to
      * let Debugger tweak the affected js::Interpret frames when an onStep
-     * handler is added: setting switchMask to -1 will enable interrupts.
+     * handler is added: setting switchMask to EnableInterruptsPseudoOpcode
+     * will enable interrupts.
      */
-    register int switchMask = 0;
-    int switchOp;
+    static_assert(EnableInterruptsPseudoOpcode >= JSOP_LIMIT,
+                  "EnableInterruptsPseudoOpcode must be greater than any opcode");
+    static_assert(EnableInterruptsPseudoOpcode == jsbytecode(-1),
+                  "EnableInterruptsPseudoOpcode must be the maximum jsbytecode value");
+    jsbytecode switchMask = 0;
+    jsbytecode switchOp;
 
 #define DO_OP()            goto do_op
 
@@ -1315,7 +1321,7 @@ Interpret(JSContext *cx, RunState &state)
     JS_BEGIN_MACRO                                                            \
         script = (s);                                                         \
         if (script->hasAnyBreakpointsOrStepMode() || script->hasScriptCounts) \
-            switchMask = -1; /* Enable interrupts. */                         \
+            switchMask = EnableInterruptsPseudoOpcode; /* Enable interrupts. */ \
     JS_END_MACRO
 
     FrameRegs regs;
@@ -1414,7 +1420,7 @@ Interpret(JSContext *cx, RunState &state)
     len = 0;
 
     if (rt->profilingScripts || cx->runtime()->debugHooks.interruptHook)
-        switchMask = -1; /* Enable interrupts. */
+        switchMask = EnableInterruptsPseudoOpcode; /* Enable interrupts. */
 
   advanceAndDoOp:
     js::gc::MaybeVerifyBarriers(cx);
@@ -1423,14 +1429,12 @@ Interpret(JSContext *cx, RunState &state)
 
   do_op:
     CHECK_PCCOUNT_INTERRUPTS();
-    switchOp = int(op) | switchMask;
+    switchOp = jsbytecode(op) | switchMask;
   do_switch:
     switch (switchOp) {
 
-case -1:
+BEGIN_CASE(EnableInterruptsPseudoOpcode)
 {
-    JS_ASSERT(switchMask == -1);
-
     bool moreInterrupts = false;
 
     if (cx->runtime()->profilingScripts) {
@@ -1493,8 +1497,10 @@ case -1:
         JS_ASSERT(rval.isInt32() && rval.toInt32() == op);
     }
 
-    switchMask = moreInterrupts ? -1 : 0;
-    switchOp = int(op);
+    JS_ASSERT(switchMask == EnableInterruptsPseudoOpcode);
+    switchMask = moreInterrupts ? EnableInterruptsPseudoOpcode : 0;
+
+    switchOp = jsbytecode(op);
     goto do_switch;
 }
 
diff --git a/js/src/vm/Stack-inl.h b/js/src/vm/Stack-inl.h
index ddfb6afa59b3..f45ea205ec7d 100644
--- a/js/src/vm/Stack-inl.h
+++ b/js/src/vm/Stack-inl.h
@@ -840,7 +840,7 @@ Activation::~Activation()
 }
 
 InterpreterActivation::InterpreterActivation(JSContext *cx, StackFrame *entry, FrameRegs &regs,
-                                             int *const switchMask)
+                                             jsbytecode *const switchMask)
   : Activation(cx, Interpreter),
     entry_(entry),
     regs_(regs),
diff --git a/js/src/vm/Stack.h b/js/src/vm/Stack.h
index 59ea0b47824b..4377ddceeaf7 100644
--- a/js/src/vm/Stack.h
+++ b/js/src/vm/Stack.h
@@ -1216,6 +1216,11 @@ class Activation
     void operator=(const Activation &other) MOZ_DELETE;
 };
 
+// The value to assign to InterpreterActivation's *switchMask_ to enable
+// interrupts. This value is greater than the greatest opcode, and is chosen
+// such that the bitwise or of this value with any opcode is this value.
+static const jsbytecode EnableInterruptsPseudoOpcode = -1;
+
 class InterpreterFrameIterator;
 
 class InterpreterActivation : public Activation
@@ -1224,7 +1229,7 @@ class InterpreterActivation : public Activation
 
     StackFrame *const entry_; // Entry frame for this activation.
     FrameRegs &regs_;
-    int *const switchMask_; // For debugger interrupts, see js::Interpret.
+    jsbytecode *const switchMask_; // For debugger interrupts, see js::Interpret.
 
 #ifdef DEBUG
     size_t oldFrameCount_;
@@ -1232,7 +1237,7 @@ class InterpreterActivation : public Activation
 
   public:
     inline InterpreterActivation(JSContext *cx, StackFrame *entry, FrameRegs &regs,
-                                 int *const switchMask);
+                                 jsbytecode *const switchMask);
     inline ~InterpreterActivation();
 
     inline bool pushInlineFrame(const CallArgs &args, HandleScript script,
@@ -1252,7 +1257,7 @@ class InterpreterActivation : public Activation
             enableInterruptsUnconditionally();
     }
     void enableInterruptsUnconditionally() {
-        *switchMask_ = -1;
+        *switchMask_ = EnableInterruptsPseudoOpcode;
     }
 };
 

From b78633b185c0fe6c4367abe1ee121deb385087ee Mon Sep 17 00:00:00 2001
From: Dan Gohman <sunfish@google.com>
Date: Wed, 4 Sep 2013 20:06:07 -0700
Subject: [PATCH 74/86] Bug 910782 - SpiderMonkey: Add an explicit scope aroud
 the InvokeState object's lifetime. r=luke

---
 js/src/vm/Interpreter.cpp | 50 ++++++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/js/src/vm/Interpreter.cpp b/js/src/vm/Interpreter.cpp
index 51923da35572..03225f0d2ea1 100644
--- a/js/src/vm/Interpreter.cpp
+++ b/js/src/vm/Interpreter.cpp
@@ -2472,33 +2472,35 @@ BEGIN_CASE(JSOP_FUNCALL)
     TypeMonitorCall(cx, args, construct);
 
 #ifdef JS_ION
-    InvokeState state(cx, args, initial);
-    if (newType)
-        state.setUseNewType();
+    {
+        InvokeState state(cx, args, initial);
+        if (newType)
+            state.setUseNewType();
 
-    if (!newType && jit::IsIonEnabled(cx)) {
-        jit::MethodStatus status = jit::CanEnter(cx, state);
-        if (status == jit::Method_Error)
-            goto error;
-        if (status == jit::Method_Compiled) {
-            jit::IonExecStatus exec = jit::Cannon(cx, state);
-            CHECK_BRANCH();
-            regs.sp = args.spAfterCall();
-            interpReturnOK = !IsErrorStatus(exec);
-            goto jit_return;
+        if (!newType && jit::IsIonEnabled(cx)) {
+            jit::MethodStatus status = jit::CanEnter(cx, state);
+            if (status == jit::Method_Error)
+                goto error;
+            if (status == jit::Method_Compiled) {
+                jit::IonExecStatus exec = jit::Cannon(cx, state);
+                CHECK_BRANCH();
+                regs.sp = args.spAfterCall();
+                interpReturnOK = !IsErrorStatus(exec);
+                goto jit_return;
+            }
         }
-    }
 
-    if (jit::IsBaselineEnabled(cx)) {
-        jit::MethodStatus status = jit::CanEnterBaselineMethod(cx, state);
-        if (status == jit::Method_Error)
-            goto error;
-        if (status == jit::Method_Compiled) {
-            jit::IonExecStatus exec = jit::EnterBaselineMethod(cx, state);
-            CHECK_BRANCH();
-            regs.sp = args.spAfterCall();
-            interpReturnOK = !IsErrorStatus(exec);
-            goto jit_return;
+        if (jit::IsBaselineEnabled(cx)) {
+            jit::MethodStatus status = jit::CanEnterBaselineMethod(cx, state);
+            if (status == jit::Method_Error)
+                goto error;
+            if (status == jit::Method_Compiled) {
+                jit::IonExecStatus exec = jit::EnterBaselineMethod(cx, state);
+                CHECK_BRANCH();
+                regs.sp = args.spAfterCall();
+                interpReturnOK = !IsErrorStatus(exec);
+                goto jit_return;
+            }
         }
     }
 #endif

From 1f32372424fa1ed674d988d843a603feb0fd648e Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <nnethercote@mozilla.com>
Date: Tue, 27 Aug 2013 16:24:51 -0700
Subject: [PATCH 75/86] Bug 910517 - Remove nsIMemoryReporter, and rename
 nsIMemoryMultiReporter as nsIMemoryReporter.  r=mmcr8.

--HG--
rename : content/canvas/src/WebGLMemoryMultiReporterWrapper.h => content/canvas/src/WebGLMemoryReporterWrapper.h
extra : rebase_source : 9142be547b2eeef37a8073a710ce23070f98cf65
---
 addon-sdk/source/lib/sdk/test/harness.js      |  12 +-
 content/base/src/nsContentUtils.cpp           |   4 +-
 content/base/src/nsDOMFile.cpp                |   8 +-
 .../canvas/src/CanvasRenderingContext2D.cpp   |   4 +-
 content/canvas/src/WebGLContext.cpp           |  10 +-
 content/canvas/src/WebGLContext.h             |   2 +-
 content/canvas/src/WebGLContextReporter.cpp   |  84 +++---
 ...Wrapper.h => WebGLMemoryReporterWrapper.h} |  20 +-
 content/media/MediaDecoder.cpp                |  12 +-
 dom/base/nsScriptNameSpaceManager.cpp         |   4 +-
 dom/base/nsWindowMemoryReporter.cpp           |  47 +--
 dom/base/nsWindowMemoryReporter.h             |  27 +-
 dom/ipc/ContentChild.cpp                      |  39 +--
 dom/ipc/ContentParent.cpp                     | 101 ++++---
 dom/ipc/ContentParent.h                       |  17 +-
 dom/workers/WorkerPrivate.cpp                 |  10 +-
 dom/workers/WorkerPrivate.h                   |   1 -
 .../spellcheck/hunspell/src/mozHunspell.cpp   |   4 +-
 gfx/gl/GLContext.h                            |   6 +-
 gfx/layers/ipc/ShadowLayerUtilsGralloc.cpp    |   4 +-
 gfx/thebes/gfxASurface.cpp                    |   8 +-
 gfx/thebes/gfxAndroidPlatform.cpp             |   6 +-
 gfx/thebes/gfxFont.cpp                        |   6 +-
 gfx/thebes/gfxFont.h                          |   4 +-
 gfx/thebes/gfxPlatformFontList.cpp            |   6 +-
 gfx/thebes/gfxPlatformFontList.h              |   4 +-
 gfx/thebes/gfxWindowsPlatform.cpp             |  38 +--
 gfx/thebes/gfxWindowsPlatform.h               |   4 +-
 image/src/imgLoader.cpp                       |  12 +-
 image/test/mochitest/test_bug601470.html      |  18 +-
 ipc/glue/SharedMemory.cpp                     |   8 +-
 js/xpconnect/src/XPCJSMemoryReporter.h        |   8 +-
 js/xpconnect/src/XPCJSRuntime.cpp             |  68 ++---
 js/xpconnect/src/xpcpublic.h                  |   4 +-
 layout/base/nsStyleSheetService.cpp           |   4 +-
 layout/style/nsLayoutStylesheetCache.cpp      |   4 +-
 modules/libpref/src/Preferences.cpp           |   4 +-
 netwerk/cache/nsDiskCacheDevice.cpp           |   4 +-
 netwerk/cache/nsMemoryCacheDevice.cpp         |   4 +-
 netwerk/dns/nsEffectiveTLDService.cpp         |   4 +-
 startupcache/StartupCache.cpp                 |   8 +-
 storage/src/mozStorageService.cpp             |  29 +-
 storage/src/mozStorageService.h               |   5 +-
 .../aboutmemory/content/aboutMemory.js        | 144 ++++-----
 .../tests/test_aboutcompartments.xul          |  87 ++----
 .../aboutmemory/tests/test_aboutmemory.xul    | 243 +++++++--------
 .../aboutmemory/tests/test_aboutmemory2.xul   |  82 ++---
 .../aboutmemory/tests/test_aboutmemory3.xul   |  44 +--
 .../tests/test_memoryReporters.xul            |   5 -
 .../tests/test_sqliteMultiReporter.xul        |   6 +-
 toolkit/components/places/History.cpp         |   4 +-
 toolkit/components/telemetry/Telemetry.cpp    |   4 +-
 toolkit/components/telemetry/TelemetryPing.js |  30 +-
 .../nsUrlClassifierPrefixSet.cpp              |   4 +-
 xpcom/base/AvailableMemoryTracker.cpp         | 103 ++-----
 xpcom/base/MapsMemoryReporter.cpp             |  30 +-
 xpcom/base/nsCycleCollector.cpp               |  14 +-
 xpcom/base/nsIMemoryReporter.idl              | 269 +++++++----------
 xpcom/base/nsMemoryInfoDumper.cpp             |  89 ++----
 xpcom/base/nsMemoryReporterManager.cpp        | 281 ++++--------------
 xpcom/base/nsMemoryReporterManager.h          |   3 -
 xpcom/build/nsXPComInit.cpp                   |   4 +-
 xpcom/components/nsCategoryManager.cpp        |   4 +-
 xpcom/components/nsComponentManager.cpp       |   4 +-
 xpcom/ds/nsObserverService.cpp                |  12 +-
 xpcom/ds/nsObserverService.h                  |   4 +-
 .../xptinfo/src/xptiInterfaceInfoManager.cpp  |   4 +-
 67 files changed, 855 insertions(+), 1295 deletions(-)
 rename content/canvas/src/{WebGLMemoryMultiReporterWrapper.h => WebGLMemoryReporterWrapper.h} (90%)

diff --git a/addon-sdk/source/lib/sdk/test/harness.js b/addon-sdk/source/lib/sdk/test/harness.js
index 7139aea70107..5bb12a59f890 100644
--- a/addon-sdk/source/lib/sdk/test/harness.js
+++ b/addon-sdk/source/lib/sdk/test/harness.js
@@ -148,6 +148,9 @@ function reportMemoryUsage() {
   var mgr = Cc["@mozilla.org/memory-reporter-manager;1"]
             .getService(Ci.nsIMemoryReporterManager);
 
+  // XXX: this code is *so* bogus -- nsIMemoryReporter changed its |memoryUsed|
+  // field to |amount| *years* ago, and even bigger changes have happened
+  // since -- that it must just never be run.
   var reporters = mgr.enumerateReporters();
   if (reporters.hasMoreElements())
     print("\n");
@@ -376,14 +379,7 @@ function getPotentialLeaks() {
 
   let enm = mgr.enumerateReporters();
   while (enm.hasMoreElements()) {
-    let reporter = enm.getNext().QueryInterface(Ci.nsIMemoryReporter);
-    logReporter(reporter.process, reporter.path, reporter.kind, reporter.units,
-                reporter.amount, reporter.description);
-  }
-
-  let enm = mgr.enumerateMultiReporters();
-  while (enm.hasMoreElements()) {
-    let mr = enm.getNext().QueryInterface(Ci.nsIMemoryMultiReporter);
+    let mr = enm.getNext().QueryInterface(Ci.nsIMemoryReporter);
     mr.collectReports(logReporter, null);
   }
 
diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp
index 6befb2a62a0d..d20a93aaa2b5 100644
--- a/content/base/src/nsContentUtils.cpp
+++ b/content/base/src/nsContentUtils.cpp
@@ -255,11 +255,11 @@ static NS_DEFINE_CID(kCParserCID, NS_PARSER_CID);
 
 static PLDHashTable sEventListenerManagersHash;
 
-class DOMEventListenerManagersHashReporter MOZ_FINAL : public MemoryReporterBase
+class DOMEventListenerManagersHashReporter MOZ_FINAL : public MemoryUniReporter
 {
 public:
   DOMEventListenerManagersHashReporter()
-    : MemoryReporterBase(
+    : MemoryUniReporter(
         "explicit/dom/event-listener-managers-hash",
         KIND_HEAP,
         UNITS_BYTES,
diff --git a/content/base/src/nsDOMFile.cpp b/content/base/src/nsDOMFile.cpp
index b8a5507db5f4..c65a635ce26e 100644
--- a/content/base/src/nsDOMFile.cpp
+++ b/content/base/src/nsDOMFile.cpp
@@ -641,7 +641,7 @@ nsDOMMemoryFile::DataOwner::sMemoryReporterRegistered;
 NS_MEMORY_REPORTER_MALLOC_SIZEOF_FUN(DOMMemoryFileDataOwnerMallocSizeOf)
 
 class nsDOMMemoryFileDataOwnerMemoryReporter MOZ_FINAL
-  : public nsIMemoryMultiReporter
+  : public nsIMemoryReporter
 {
   NS_DECL_THREADSAFE_ISUPPORTS
 
@@ -651,7 +651,7 @@ class nsDOMMemoryFileDataOwnerMemoryReporter MOZ_FINAL
     return NS_OK;
   }
 
-  NS_IMETHOD CollectReports(nsIMemoryMultiReporterCallback *aCallback,
+  NS_IMETHOD CollectReports(nsIMemoryReporterCallback *aCallback,
                             nsISupports *aClosure)
   {
     typedef nsDOMMemoryFile::DataOwner DataOwner;
@@ -725,7 +725,7 @@ class nsDOMMemoryFileDataOwnerMemoryReporter MOZ_FINAL
 };
 
 NS_IMPL_ISUPPORTS1(nsDOMMemoryFileDataOwnerMemoryReporter,
-                   nsIMemoryMultiReporter)
+                   nsIMemoryReporter)
 
 /* static */ void
 nsDOMMemoryFile::DataOwner::EnsureMemoryReporterRegistered()
@@ -737,7 +737,7 @@ nsDOMMemoryFile::DataOwner::EnsureMemoryReporterRegistered()
 
   nsRefPtr<nsDOMMemoryFileDataOwnerMemoryReporter> reporter = new
     nsDOMMemoryFileDataOwnerMemoryReporter();
-  NS_RegisterMemoryMultiReporter(reporter);
+  NS_RegisterMemoryReporter(reporter);
 
   sMemoryReporterRegistered = true;
 }
diff --git a/content/canvas/src/CanvasRenderingContext2D.cpp b/content/canvas/src/CanvasRenderingContext2D.cpp
index 89f040d93190..c3e56b39fd6e 100644
--- a/content/canvas/src/CanvasRenderingContext2D.cpp
+++ b/content/canvas/src/CanvasRenderingContext2D.cpp
@@ -143,11 +143,11 @@ static int64_t gCanvasAzureMemoryUsed = 0;
 // This is KIND_OTHER because it's not always clear where in memory the pixels
 // of a canvas are stored.  Furthermore, this memory will be tracked by the
 // underlying surface implementations.  See bug 655638 for details.
-class Canvas2dPixelsReporter MOZ_FINAL : public MemoryReporterBase
+class Canvas2dPixelsReporter MOZ_FINAL : public MemoryUniReporter
 {
   public:
     Canvas2dPixelsReporter()
-      : MemoryReporterBase("canvas-2d-pixels", KIND_OTHER, UNITS_BYTES,
+      : MemoryUniReporter("canvas-2d-pixels", KIND_OTHER, UNITS_BYTES,
 "Memory used by 2D canvases. Each canvas requires (width * height * 4) bytes.")
     {}
 private:
diff --git a/content/canvas/src/WebGLContext.cpp b/content/canvas/src/WebGLContext.cpp
index d27463547bab..1886d442c126 100644
--- a/content/canvas/src/WebGLContext.cpp
+++ b/content/canvas/src/WebGLContext.cpp
@@ -10,7 +10,7 @@
 #include "WebGLContextUtils.h"
 #include "WebGLBuffer.h"
 #include "WebGLVertexAttribData.h"
-#include "WebGLMemoryMultiReporterWrapper.h"
+#include "WebGLMemoryReporterWrapper.h"
 #include "WebGLFramebuffer.h"
 #include "WebGLVertexArray.h"
 #include "WebGLQuery.h"
@@ -179,7 +179,7 @@ WebGLContext::WebGLContext()
     mPixelStorePackAlignment = 4;
     mPixelStoreUnpackAlignment = 4;
 
-    WebGLMemoryMultiReporterWrapper::AddWebGLContext(this);
+    WebGLMemoryReporterWrapper::AddWebGLContext(this);
 
     mAllowRestore = true;
     mContextLossTimerRunning = false;
@@ -213,7 +213,7 @@ WebGLContext::WebGLContext()
 WebGLContext::~WebGLContext()
 {
     DestroyResourcesAndContext();
-    WebGLMemoryMultiReporterWrapper::RemoveWebGLContext(this);
+    WebGLMemoryReporterWrapper::RemoveWebGLContext(this);
     TerminateContextLossTimer();
     mContextRestorer = nullptr;
 }
@@ -653,8 +653,8 @@ void WebGLContext::LoseOldestWebGLContextIfLimitExceeded()
     // when choosing which one to lose first.
     UpdateLastUseIndex();
 
-    WebGLMemoryMultiReporterWrapper::ContextsArrayType &contexts
-      = WebGLMemoryMultiReporterWrapper::Contexts();
+    WebGLMemoryReporterWrapper::ContextsArrayType &contexts
+      = WebGLMemoryReporterWrapper::Contexts();
 
     // quick exit path, should cover a majority of cases
     if (contexts.Length() <= kMaxWebGLContextsPerPrincipal) {
diff --git a/content/canvas/src/WebGLContext.h b/content/canvas/src/WebGLContext.h
index 4a03e67955ec..586f6caf736f 100644
--- a/content/canvas/src/WebGLContext.h
+++ b/content/canvas/src/WebGLContext.h
@@ -118,7 +118,7 @@ class WebGLContext :
 {
     friend class WebGLContextUserData;
     friend class WebGLMemoryPressureObserver;
-    friend class WebGLMemoryMultiReporterWrapper;
+    friend class WebGLMemoryReporterWrapper;
     friend class WebGLExtensionLoseContext;
     friend class WebGLExtensionCompressedTextureS3TC;
     friend class WebGLExtensionCompressedTextureATC;
diff --git a/content/canvas/src/WebGLContextReporter.cpp b/content/canvas/src/WebGLContextReporter.cpp
index a7bcebb6ec42..8b42f8b475bc 100644
--- a/content/canvas/src/WebGLContextReporter.cpp
+++ b/content/canvas/src/WebGLContextReporter.cpp
@@ -4,32 +4,32 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "WebGLContext.h"
-#include "WebGLMemoryMultiReporterWrapper.h"
+#include "WebGLMemoryReporterWrapper.h"
 #include "nsIMemoryReporter.h"
 
 using namespace mozilla;
 
 NS_IMPL_ISUPPORTS1(WebGLMemoryPressureObserver, nsIObserver)
 
-class WebGLMemoryMultiReporter MOZ_FINAL : public nsIMemoryMultiReporter 
+class WebGLMemoryReporter MOZ_FINAL : public nsIMemoryReporter
 {
   public:
     NS_DECL_ISUPPORTS
-    NS_DECL_NSIMEMORYMULTIREPORTER
+    NS_DECL_NSIMEMORYREPORTER
 };
 
-NS_IMPL_ISUPPORTS1(WebGLMemoryMultiReporter, nsIMemoryMultiReporter)
+NS_IMPL_ISUPPORTS1(WebGLMemoryReporter, nsIMemoryReporter)
 
 NS_IMETHODIMP
-WebGLMemoryMultiReporter::GetName(nsACString &aName)
+WebGLMemoryReporter::GetName(nsACString &aName)
 {
   aName.AssignLiteral("webgl");
   return NS_OK;
 }
 
 NS_IMETHODIMP
-WebGLMemoryMultiReporter::CollectReports(nsIMemoryMultiReporterCallback* aCb, 
-                                         nsISupports* aClosure)
+WebGLMemoryReporter::CollectReports(nsIMemoryReporterCallback* aCb,
+                                    nsISupports* aClosure)
 {
 #define REPORT(_path, _kind, _units, _amount, _desc)                          \
     do {                                                                      \
@@ -42,21 +42,21 @@ WebGLMemoryMultiReporter::CollectReports(nsIMemoryMultiReporterCallback* aCb,
 
     REPORT("webgl-texture-memory",
            nsIMemoryReporter::KIND_OTHER, nsIMemoryReporter::UNITS_BYTES,
-           WebGLMemoryMultiReporterWrapper::GetTextureMemoryUsed(),
+           WebGLMemoryReporterWrapper::GetTextureMemoryUsed(),
            "Memory used by WebGL textures.The OpenGL"
            " implementation is free to store these textures in either video"
            " memory or main memory. This measurement is only a lower bound,"
-           " actual memory usage may be higher for example if the storage" 
+           " actual memory usage may be higher for example if the storage"
            " is strided.");
-   
+
     REPORT("webgl-texture-count",
            nsIMemoryReporter::KIND_OTHER, nsIMemoryReporter::UNITS_COUNT,
-           WebGLMemoryMultiReporterWrapper::GetTextureCount(), 
+           WebGLMemoryReporterWrapper::GetTextureCount(),
            "Number of WebGL textures.");
 
     REPORT("webgl-buffer-memory",
            nsIMemoryReporter::KIND_OTHER, nsIMemoryReporter::UNITS_BYTES,
-           WebGLMemoryMultiReporterWrapper::GetBufferMemoryUsed(), 
+           WebGLMemoryReporterWrapper::GetBufferMemoryUsed(),
            "Memory used by WebGL buffers. The OpenGL"
            " implementation is free to store these buffers in either video"
            " memory or main memory. This measurement is only a lower bound,"
@@ -65,7 +65,7 @@ WebGLMemoryMultiReporter::CollectReports(nsIMemoryMultiReporterCallback* aCb,
 
     REPORT("explicit/webgl/buffer-cache-memory",
            nsIMemoryReporter::KIND_HEAP, nsIMemoryReporter::UNITS_BYTES,
-           WebGLMemoryMultiReporterWrapper::GetBufferCacheMemoryUsed(),
+           WebGLMemoryReporterWrapper::GetBufferCacheMemoryUsed(),
            "Memory used by WebGL buffer caches. The WebGL"
            " implementation caches the contents of element array buffers"
            " only.This adds up with the webgl-buffer-memory value, but"
@@ -74,69 +74,69 @@ WebGLMemoryMultiReporter::CollectReports(nsIMemoryMultiReporterCallback* aCb,
 
     REPORT("webgl-buffer-count",
            nsIMemoryReporter::KIND_OTHER, nsIMemoryReporter::UNITS_COUNT,
-           WebGLMemoryMultiReporterWrapper::GetBufferCount(),
-           "Number of WebGL buffers."); 
-   
+           WebGLMemoryReporterWrapper::GetBufferCount(),
+           "Number of WebGL buffers.");
+
     REPORT("webgl-renderbuffer-memory",
            nsIMemoryReporter::KIND_OTHER, nsIMemoryReporter::UNITS_BYTES,
-           WebGLMemoryMultiReporterWrapper::GetRenderbufferMemoryUsed(), 
+           WebGLMemoryReporterWrapper::GetRenderbufferMemoryUsed(),
            "Memory used by WebGL renderbuffers. The OpenGL"
            " implementation is free to store these renderbuffers in either"
            " video memory or main memory. This measurement is only a lower"
            " bound, actual memory usage may be higher for example if the"
            " storage is strided.");
-   
+
     REPORT("webgl-renderbuffer-count",
            nsIMemoryReporter::KIND_OTHER, nsIMemoryReporter::UNITS_COUNT,
-           WebGLMemoryMultiReporterWrapper::GetRenderbufferCount(),
+           WebGLMemoryReporterWrapper::GetRenderbufferCount(),
            "Number of WebGL renderbuffers.");
-  
+
     REPORT("explicit/webgl/shader",
            nsIMemoryReporter::KIND_HEAP, nsIMemoryReporter::UNITS_BYTES,
-           WebGLMemoryMultiReporterWrapper::GetShaderSize(), 
+           WebGLMemoryReporterWrapper::GetShaderSize(),
            "Combined size of WebGL shader ASCII sources and translation"
-           " logs cached on the heap."); 
+           " logs cached on the heap.");
 
     REPORT("webgl-shader-count",
            nsIMemoryReporter::KIND_OTHER, nsIMemoryReporter::UNITS_COUNT,
-           WebGLMemoryMultiReporterWrapper::GetShaderCount(), 
-           "Number of WebGL shaders."); 
+           WebGLMemoryReporterWrapper::GetShaderCount(),
+           "Number of WebGL shaders.");
 
     REPORT("webgl-context-count",
            nsIMemoryReporter::KIND_OTHER, nsIMemoryReporter::UNITS_COUNT,
-           WebGLMemoryMultiReporterWrapper::GetContextCount(), 
-           "Number of WebGL contexts."); 
+           WebGLMemoryReporterWrapper::GetContextCount(),
+           "Number of WebGL contexts.");
 
 #undef REPORT
 
     return NS_OK;
 }
 
-WebGLMemoryMultiReporterWrapper* WebGLMemoryMultiReporterWrapper::sUniqueInstance = nullptr;
+WebGLMemoryReporterWrapper* WebGLMemoryReporterWrapper::sUniqueInstance = nullptr;
 
-WebGLMemoryMultiReporterWrapper* WebGLMemoryMultiReporterWrapper::UniqueInstance()
+WebGLMemoryReporterWrapper* WebGLMemoryReporterWrapper::UniqueInstance()
 {
     if (!sUniqueInstance) {
-        sUniqueInstance = new WebGLMemoryMultiReporterWrapper;
+        sUniqueInstance = new WebGLMemoryReporterWrapper;
     }
-    return sUniqueInstance;     
+    return sUniqueInstance;
 }
 
-WebGLMemoryMultiReporterWrapper::WebGLMemoryMultiReporterWrapper()
-{ 
-    mReporter = new WebGLMemoryMultiReporter;   
-    NS_RegisterMemoryMultiReporter(mReporter);
-}
-
-WebGLMemoryMultiReporterWrapper::~WebGLMemoryMultiReporterWrapper()
+WebGLMemoryReporterWrapper::WebGLMemoryReporterWrapper()
 {
-    NS_UnregisterMemoryMultiReporter(mReporter);
+    mReporter = new WebGLMemoryReporter;
+    NS_RegisterMemoryReporter(mReporter);
+}
+
+WebGLMemoryReporterWrapper::~WebGLMemoryReporterWrapper()
+{
+    NS_UnregisterMemoryReporter(mReporter);
 }
 
 NS_MEMORY_REPORTER_MALLOC_SIZEOF_FUN(WebGLBufferMallocSizeOf)
 
-int64_t 
-WebGLMemoryMultiReporterWrapper::GetBufferCacheMemoryUsed() {
+int64_t
+WebGLMemoryReporterWrapper::GetBufferCacheMemoryUsed() {
     const ContextsArrayType & contexts = Contexts();
     int64_t result = 0;
     for(size_t i = 0; i < contexts.Length(); ++i) {
@@ -153,8 +153,8 @@ WebGLMemoryMultiReporterWrapper::GetBufferCacheMemoryUsed() {
 
 NS_MEMORY_REPORTER_MALLOC_SIZEOF_FUN(WebGLShaderMallocSizeOf)
 
-int64_t 
-WebGLMemoryMultiReporterWrapper::GetShaderSize() {
+int64_t
+WebGLMemoryReporterWrapper::GetShaderSize() {
     const ContextsArrayType & contexts = Contexts();
     int64_t result = 0;
     for(size_t i = 0; i < contexts.Length(); ++i) {
diff --git a/content/canvas/src/WebGLMemoryMultiReporterWrapper.h b/content/canvas/src/WebGLMemoryReporterWrapper.h
similarity index 90%
rename from content/canvas/src/WebGLMemoryMultiReporterWrapper.h
rename to content/canvas/src/WebGLMemoryReporterWrapper.h
index 9527ff17eeee..098d661748a1 100644
--- a/content/canvas/src/WebGLMemoryMultiReporterWrapper.h
+++ b/content/canvas/src/WebGLMemoryReporterWrapper.h
@@ -3,8 +3,8 @@
  * 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/. */
 
-#ifndef WEBGLMEMORYMULTIREPORTWRAPER_H_
-#define WEBGLMEMORYMULTIREPORTWRAPER_H_
+#ifndef WEBGLMEMORYREPORTWRAPER_H_
+#define WEBGLMEMORYREPORTWRAPER_H_
 
 #include "WebGLContext.h"
 #include "WebGLBuffer.h"
@@ -17,21 +17,21 @@
 
 namespace mozilla {
 
-class WebGLMemoryMultiReporterWrapper
+class WebGLMemoryReporterWrapper
 {
-    WebGLMemoryMultiReporterWrapper();
-    ~WebGLMemoryMultiReporterWrapper();
-    static WebGLMemoryMultiReporterWrapper* sUniqueInstance;
+    WebGLMemoryReporterWrapper();
+    ~WebGLMemoryReporterWrapper();
+    static WebGLMemoryReporterWrapper* sUniqueInstance;
 
-    // here we store plain pointers, not RefPtrs: we don't want the 
-    // WebGLMemoryMultiReporterWrapper unique instance to keep alive all		
+    // here we store plain pointers, not RefPtrs: we don't want the
+    // WebGLMemoryReporterWrapper unique instance to keep alive all
     // WebGLContexts ever created.
     typedef nsTArray<const WebGLContext*> ContextsArrayType;
     ContextsArrayType mContexts;
 
-    nsCOMPtr<nsIMemoryMultiReporter> mReporter;
+    nsCOMPtr<nsIMemoryReporter> mReporter;
 
-    static WebGLMemoryMultiReporterWrapper* UniqueInstance();
+    static WebGLMemoryReporterWrapper* UniqueInstance();
 
     static ContextsArrayType & Contexts() { return UniqueInstance()->mContexts; }
 
diff --git a/content/media/MediaDecoder.cpp b/content/media/MediaDecoder.cpp
index c1ff95aa9176..4a1ff88d20b4 100644
--- a/content/media/MediaDecoder.cpp
+++ b/content/media/MediaDecoder.cpp
@@ -74,7 +74,7 @@ class MediaMemoryTracker
 
   DecodersArray mDecoders;
 
-  nsCOMPtr<nsIMemoryMultiReporter> mReporter;
+  nsCOMPtr<nsIMemoryReporter> mReporter;
 
 public:
   static void AddMediaDecoder(MediaDecoder* aDecoder)
@@ -1725,7 +1725,7 @@ MediaDecoder::IsWMFEnabled()
 }
 #endif
 
-class MediaReporter MOZ_FINAL : public nsIMemoryMultiReporter
+class MediaReporter MOZ_FINAL : public nsIMemoryReporter
 {
 public:
   NS_DECL_ISUPPORTS
@@ -1736,7 +1736,7 @@ public:
     return NS_OK;
   }
 
-  NS_IMETHOD CollectReports(nsIMemoryMultiReporterCallback* aCb,
+  NS_IMETHOD CollectReports(nsIMemoryReporterCallback* aCb,
                             nsISupports* aClosure)
   {
     int64_t video, audio;
@@ -1762,7 +1762,7 @@ public:
   }
 };
 
-NS_IMPL_ISUPPORTS1(MediaReporter, nsIMemoryMultiReporter)
+NS_IMPL_ISUPPORTS1(MediaReporter, nsIMemoryReporter)
 
 MediaDecoderOwner*
 MediaDecoder::GetOwner()
@@ -1774,12 +1774,12 @@ MediaDecoder::GetOwner()
 MediaMemoryTracker::MediaMemoryTracker()
   : mReporter(new MediaReporter())
 {
-  NS_RegisterMemoryMultiReporter(mReporter);
+  NS_RegisterMemoryReporter(mReporter);
 }
 
 MediaMemoryTracker::~MediaMemoryTracker()
 {
-  NS_UnregisterMemoryMultiReporter(mReporter);
+  NS_UnregisterMemoryReporter(mReporter);
 }
 
 } // namespace mozilla
diff --git a/dom/base/nsScriptNameSpaceManager.cpp b/dom/base/nsScriptNameSpaceManager.cpp
index 4d6b0cf7ffb7..32d48d6258bb 100644
--- a/dom/base/nsScriptNameSpaceManager.cpp
+++ b/dom/base/nsScriptNameSpaceManager.cpp
@@ -116,11 +116,11 @@ GlobalNameHashInitEntry(PLDHashTable *table, PLDHashEntryHdr *entry,
   return true;
 }
 
-class ScriptNameSpaceManagerReporter MOZ_FINAL : public MemoryReporterBase
+class ScriptNameSpaceManagerReporter MOZ_FINAL : public MemoryUniReporter
 {
 public:
   ScriptNameSpaceManagerReporter(nsScriptNameSpaceManager* aManager)
-    : MemoryReporterBase(
+    : MemoryUniReporter(
         "explicit/script-namespace-manager",
         KIND_HEAP,
         nsIMemoryReporter::UNITS_BYTES,
diff --git a/dom/base/nsWindowMemoryReporter.cpp b/dom/base/nsWindowMemoryReporter.cpp
index 1e02e0c13f4f..23c8acf77c27 100644
--- a/dom/base/nsWindowMemoryReporter.cpp
+++ b/dom/base/nsWindowMemoryReporter.cpp
@@ -25,7 +25,7 @@ nsWindowMemoryReporter::nsWindowMemoryReporter()
   mDetachedWindows.Init();
 }
 
-NS_IMPL_ISUPPORTS3(nsWindowMemoryReporter, nsIMemoryMultiReporter, nsIObserver,
+NS_IMPL_ISUPPORTS3(nsWindowMemoryReporter, nsIMemoryReporter, nsIObserver,
                    nsSupportsWeakReference)
 
 /* static */
@@ -34,7 +34,7 @@ nsWindowMemoryReporter::Init()
 {
   // The memory reporter manager will own this object.
   nsRefPtr<nsWindowMemoryReporter> windowReporter = new nsWindowMemoryReporter();
-  NS_RegisterMemoryMultiReporter(windowReporter);
+  NS_RegisterMemoryReporter(windowReporter);
 
   nsCOMPtr<nsIObserverService> os = services::GetObserverService();
   if (os) {
@@ -46,13 +46,13 @@ nsWindowMemoryReporter::Init()
                     /* weakRef = */ true);
   }
 
-  nsRefPtr<GhostURLsReporter> ghostMultiReporter =
+  nsRefPtr<GhostURLsReporter> ghostURLsReporter =
     new GhostURLsReporter(windowReporter);
-  NS_RegisterMemoryMultiReporter(ghostMultiReporter);
+  NS_RegisterMemoryReporter(ghostURLsReporter);
 
-  nsRefPtr<NumGhostsReporter> ghostReporter =
+  nsRefPtr<NumGhostsReporter> numGhostsReporter =
     new NumGhostsReporter(windowReporter);
-  NS_RegisterMemoryReporter(ghostReporter);
+  NS_RegisterMemoryReporter(numGhostsReporter);
 }
 
 static already_AddRefed<nsIURI>
@@ -122,7 +122,7 @@ CollectWindowReports(nsGlobalWindow *aWindow,
                      nsTHashtable<nsUint64HashKey> *aGhostWindowIDs,
                      WindowPaths *aWindowPaths,
                      WindowPaths *aTopWindowPaths,
-                     nsIMemoryMultiReporterCallback *aCb,
+                     nsIMemoryReporterCallback *aCb,
                      nsISupports *aClosure)
 {
   nsAutoCString windowPath("explicit/");
@@ -320,7 +320,7 @@ nsWindowMemoryReporter::GetName(nsACString &aName)
 }
 
 NS_IMETHODIMP
-nsWindowMemoryReporter::CollectReports(nsIMemoryMultiReporterCallback* aCb,
+nsWindowMemoryReporter::CollectReports(nsIMemoryReporterCallback* aCb,
                                        nsISupports* aClosure)
 {
   nsGlobalWindow::WindowByIdTable* windowsById =
@@ -356,9 +356,9 @@ nsWindowMemoryReporter::CollectReports(nsIMemoryMultiReporterCallback* aCb,
   }
 
   // Report JS memory usage.  We do this from here because the JS memory
-  // multi-reporter needs to be passed |windowPaths|.
-  nsresult rv = xpc::JSMemoryMultiReporter::CollectReports(&windowPaths, &topWindowPaths,
-                                                           aCb, aClosure);
+  // reporter needs to be passed |windowPaths|.
+  nsresult rv = xpc::JSReporter::CollectReports(&windowPaths, &topWindowPaths,
+                                                aCb, aClosure);
   NS_ENSURE_SUCCESS(rv, rv);
 
 #define REPORT(_path, _amount, _desc)                                         \
@@ -668,7 +668,7 @@ nsWindowMemoryReporter::CheckForGhostWindows(
 }
 
 NS_IMPL_ISUPPORTS1(nsWindowMemoryReporter::GhostURLsReporter,
-                   nsIMemoryMultiReporter)
+                   nsIMemoryReporter)
 
 nsWindowMemoryReporter::
 GhostURLsReporter::GhostURLsReporter(
@@ -687,7 +687,7 @@ GhostURLsReporter::GetName(nsACString& aName)
 
 struct ReportGhostWindowsEnumeratorData
 {
-  nsIMemoryMultiReporterCallback* callback;
+  nsIMemoryReporterCallback* callback;
   nsISupports* closure;
   nsresult rv;
 };
@@ -734,7 +734,7 @@ ReportGhostWindowsEnumerator(nsUint64HashKey* aIDHashKey, void* aClosure)
 NS_IMETHODIMP
 nsWindowMemoryReporter::
 GhostURLsReporter::CollectReports(
-  nsIMemoryMultiReporterCallback* aCb,
+  nsIMemoryReporterCallback* aCb,
   nsISupports* aClosure)
 {
   // Get the IDs of all the ghost windows in existance.
@@ -752,25 +752,6 @@ GhostURLsReporter::CollectReports(
   return reportGhostWindowsEnumData.rv;
 }
 
-NS_IMETHODIMP
-nsWindowMemoryReporter::
-NumGhostsReporter::GetDescription(nsACString& aDesc)
-{
-  nsPrintfCString str(
-"The number of ghost windows present (the number of nodes underneath \
-explicit/window-objects/top(none)/ghost, modulo race conditions).  A ghost \
-window is not shown in any tab, does not share a domain with any non-detached \
-windows, and has met these criteria for at least %ds \
-(memory.ghost_window_timeout_seconds) or has survived a round of about:memory's \
-minimize memory usage button.\n\n\
-Ghost windows can happen legitimately, but they are often indicative of leaks \
-in the browser or add-ons.",
-  mWindowReporter->GetGhostTimeout());
-
-  aDesc.Assign(str);
-  return NS_OK;
-}
-
 int64_t
 nsWindowMemoryReporter::NumGhostsReporter::Amount()
 {
diff --git a/dom/base/nsWindowMemoryReporter.h b/dom/base/nsWindowMemoryReporter.h
index 7390445005c1..f08967302fe9 100644
--- a/dom/base/nsWindowMemoryReporter.h
+++ b/dom/base/nsWindowMemoryReporter.h
@@ -108,13 +108,13 @@ public:
  *   the tab.
  *
  */
-class nsWindowMemoryReporter MOZ_FINAL : public nsIMemoryMultiReporter,
+class nsWindowMemoryReporter MOZ_FINAL : public nsIMemoryReporter,
                                          public nsIObserver,
                                          public nsSupportsWeakReference
 {
 public:
   NS_DECL_ISUPPORTS
-  NS_DECL_NSIMEMORYMULTIREPORTER
+  NS_DECL_NSIMEMORYREPORTER
   NS_DECL_NSIOBSERVER
 
   static void Init();
@@ -126,33 +126,38 @@ private:
    * this list, running this report is faster than running
    * nsWindowMemoryReporter.
    */
-  class GhostURLsReporter MOZ_FINAL : public nsIMemoryMultiReporter
+  class GhostURLsReporter MOZ_FINAL : public nsIMemoryReporter
   {
   public:
     GhostURLsReporter(nsWindowMemoryReporter* aWindowReporter);
 
     NS_DECL_ISUPPORTS
-    NS_DECL_NSIMEMORYMULTIREPORTER
+    NS_DECL_NSIMEMORYREPORTER
 
   private:
     nsRefPtr<nsWindowMemoryReporter> mWindowReporter;
   };
 
   /**
-   * nsGhostWindowReporter generates the "ghost-windows" single-report, which
-   * counts the number of ghost windows present.
+   * nsGhostWindowReporter generates the "ghost-windows" report, which counts
+   * the number of ghost windows present.
    */
-  class NumGhostsReporter MOZ_FINAL : public mozilla::MemoryReporterBase
+  class NumGhostsReporter MOZ_FINAL : public mozilla::MemoryUniReporter
   {
   public:
     NumGhostsReporter(nsWindowMemoryReporter* aWindowReporter)
-        // Description is "???" because we define GetDescription below.
-      : MemoryReporterBase("ghost-windows", KIND_OTHER, UNITS_COUNT, "???")
+      : MemoryUniReporter("ghost-windows", KIND_OTHER, UNITS_COUNT,
+"The number of ghost windows present (the number of nodes underneath "
+"explicit/window-objects/top(none)/ghost, modulo race conditions).  A ghost "
+"window is not shown in any tab, does not share a domain with any non-detached "
+"windows, and has met these criteria for at least "
+"memory.ghost_window_timeout_seconds, or has survived a round of "
+"about:memory's minimize memory usage button.\n\n"
+"Ghost windows can happen legitimately, but they are often indicative of "
+"leaks in the browser or add-ons.")
       , mWindowReporter(aWindowReporter)
     {}
 
-    NS_IMETHOD GetDescription(nsACString& aDesc);
-
   private:
     int64_t Amount() MOZ_OVERRIDE;
 
diff --git a/dom/ipc/ContentChild.cpp b/dom/ipc/ContentChild.cpp
index f1afd28ea2da..3c565e8bda57 100644
--- a/dom/ipc/ContentChild.cpp
+++ b/dom/ipc/ContentChild.cpp
@@ -398,7 +398,7 @@ ContentChild::AllocPMemoryReportRequestChild()
 }
 
 // This is just a wrapper for InfallibleTArray<MemoryReport> that implements
-// nsISupports, so it can be passed to nsIMemoryMultiReporter::CollectReports.
+// nsISupports, so it can be passed to nsIMemoryReporter::CollectReports.
 class MemoryReportsWrapper MOZ_FINAL : public nsISupports {
 public:
     NS_DECL_ISUPPORTS
@@ -407,7 +407,7 @@ public:
 };
 NS_IMPL_ISUPPORTS0(MemoryReportsWrapper)
 
-class MemoryReportCallback MOZ_FINAL : public nsIMemoryMultiReporterCallback
+class MemoryReportCallback MOZ_FINAL : public nsIMemoryReporterCallback
 {
 public:
     NS_DECL_ISUPPORTS
@@ -435,53 +435,28 @@ private:
 };
 NS_IMPL_ISUPPORTS1(
   MemoryReportCallback
-, nsIMemoryMultiReporterCallback
+, nsIMemoryReporterCallback
 )
 
 bool
 ContentChild::RecvPMemoryReportRequestConstructor(PMemoryReportRequestChild* child)
 {
-    
     nsCOMPtr<nsIMemoryReporterManager> mgr = do_GetService("@mozilla.org/memory-reporter-manager;1");
 
     InfallibleTArray<MemoryReport> reports;
 
     nsPrintfCString process("Content (%d)", getpid());
 
-    // First do the vanilla memory reporters.
+    // Run each reporter.  The callback will turn each measurement into a
+    // MemoryReport.
     nsCOMPtr<nsISimpleEnumerator> e;
     mgr->EnumerateReporters(getter_AddRefs(e));
-    bool more;
-    while (NS_SUCCEEDED(e->HasMoreElements(&more)) && more) {
-      nsCOMPtr<nsIMemoryReporter> r;
-      e->GetNext(getter_AddRefs(r));
-
-      nsCString path;
-      int32_t kind;
-      int32_t units;
-      int64_t amount;
-      nsCString desc;
-
-      if (NS_SUCCEEDED(r->GetPath(path)) &&
-          NS_SUCCEEDED(r->GetKind(&kind)) &&
-          NS_SUCCEEDED(r->GetUnits(&units)) &&
-          NS_SUCCEEDED(r->GetAmount(&amount)) &&
-          NS_SUCCEEDED(r->GetDescription(desc)))
-      {
-        MemoryReport memreport(process, path, kind, units, amount, desc);
-        reports.AppendElement(memreport);
-      }
-    }
-
-    // Then do the memory multi-reporters, by calling CollectReports on each
-    // one, whereupon the callback will turn each measurement into a
-    // MemoryReport.
-    mgr->EnumerateMultiReporters(getter_AddRefs(e));
     nsRefPtr<MemoryReportsWrapper> wrappedReports =
         new MemoryReportsWrapper(&reports);
     nsRefPtr<MemoryReportCallback> cb = new MemoryReportCallback(process);
+    bool more;
     while (NS_SUCCEEDED(e->HasMoreElements(&more)) && more) {
-      nsCOMPtr<nsIMemoryMultiReporter> r;
+      nsCOMPtr<nsIMemoryReporter> r;
       e->GetNext(getter_AddRefs(r));
       r->CollectReports(cb, wrappedReports);
     }
diff --git a/dom/ipc/ContentParent.cpp b/dom/ipc/ContentParent.cpp
index 320e465a6271..468776789819 100644
--- a/dom/ipc/ContentParent.cpp
+++ b/dom/ipc/ContentParent.cpp
@@ -159,34 +159,54 @@ namespace dom {
 
 #define NS_IPC_IOSERVICE_SET_OFFLINE_TOPIC "ipc:network:set-offline"
 
-// This represents a single measurement taken by a memory reporter in a child
-// process and passed to this one.  Its process is non-empty, and its amount is
-// fixed.
-class ChildMemoryReporter MOZ_FINAL : public MemoryReporterBase
+// This represents all the memory reports provided by a child process.
+class ChildReporter MOZ_FINAL : public nsIMemoryReporter
 {
 public:
-    ChildMemoryReporter(const char* aProcess, const char* aPath, int32_t aKind,
-                        int32_t aUnits, int64_t aAmount,
-                        const char* aDescription)
-      : MemoryReporterBase(aPath, aKind, aUnits, aDescription)
-      , mProcess(aProcess)
-      , mAmount(aAmount)
+    ChildReporter(const InfallibleTArray<MemoryReport>& childReports)
     {
+        for (uint32_t i = 0; i < childReports.Length(); i++) {
+            MemoryReport r(childReports[i].process(),
+                           childReports[i].path(),
+                           childReports[i].kind(),
+                           childReports[i].units(),
+                           childReports[i].amount(),
+                           childReports[i].desc());
+
+            // Child reports have a non-empty process.
+            MOZ_ASSERT(!r.process().IsEmpty());
+
+            mChildReports.AppendElement(r);
+        }
     }
 
-    NS_IMETHOD GetProcess(nsACString& aProcess)
+    NS_DECL_ISUPPORTS
+
+    NS_IMETHOD GetName(nsACString& name)
     {
-      aProcess.Assign(mProcess);
-      return NS_OK;
+        name.AssignLiteral("content-child");
+        return NS_OK;
     }
 
-private:
-    int64_t Amount() { return mAmount; }
+    NS_IMETHOD CollectReports(nsIMemoryReporterCallback* aCb,
+                              nsISupports* aClosure)
+    {
+        for (uint32_t i = 0; i < mChildReports.Length(); i++) {
+            nsresult rv;
+            MemoryReport r = mChildReports[i];
+            rv = aCb->Callback(r.process(), r.path(), r.kind(), r.units(),
+                               r.amount(), r.desc(), aClosure);
+            NS_ENSURE_SUCCESS(rv, rv);
+        }
+        return NS_OK;
+    }
 
-    nsCString mProcess;
-    int64_t   mAmount;
+  private:
+    InfallibleTArray<MemoryReport> mChildReports;
 };
 
+NS_IMPL_ISUPPORTS1(ChildReporter, nsIMemoryReporter)
+
 class MemoryReportRequestParent : public PMemoryReportRequestParent
 {
 public:
@@ -207,9 +227,9 @@ MemoryReportRequestParent::MemoryReportRequestParent()
 }
 
 bool
-MemoryReportRequestParent::Recv__delete__(const InfallibleTArray<MemoryReport>& report)
+MemoryReportRequestParent::Recv__delete__(const InfallibleTArray<MemoryReport>& childReports)
 {
-    Owner()->SetChildMemoryReporters(report);
+    Owner()->SetChildMemoryReports(childReports);
     return true;
 }
 
@@ -221,15 +241,15 @@ MemoryReportRequestParent::~MemoryReportRequestParent()
 /**
  * A memory reporter for ContentParent objects themselves.
  */
-class ContentParentMemoryReporter MOZ_FINAL : public nsIMemoryMultiReporter
+class ContentParentMemoryReporter MOZ_FINAL : public nsIMemoryReporter
 {
 public:
     NS_DECL_ISUPPORTS
-    NS_DECL_NSIMEMORYMULTIREPORTER
+    NS_DECL_NSIMEMORYREPORTER
     NS_MEMORY_REPORTER_MALLOC_SIZEOF_FUN(MallocSizeOf)
 };
 
-NS_IMPL_ISUPPORTS1(ContentParentMemoryReporter, nsIMemoryMultiReporter)
+NS_IMPL_ISUPPORTS1(ContentParentMemoryReporter, nsIMemoryReporter)
 
 NS_IMETHODIMP
 ContentParentMemoryReporter::GetName(nsACString& aName)
@@ -239,7 +259,7 @@ ContentParentMemoryReporter::GetName(nsACString& aName)
 }
 
 NS_IMETHODIMP
-ContentParentMemoryReporter::CollectReports(nsIMemoryMultiReporterCallback* cb,
+ContentParentMemoryReporter::CollectReports(nsIMemoryReporterCallback* cb,
                                             nsISupports* aClosure)
 {
     nsAutoTArray<ContentParent*, 16> cps;
@@ -356,7 +376,7 @@ ContentParent::StartUp()
     }
 
     nsRefPtr<ContentParentMemoryReporter> mr = new ContentParentMemoryReporter();
-    NS_RegisterMemoryMultiReporter(mr);
+    NS_RegisterMemoryReporter(mr);
 
     sCanLaunchSubprocesses = true;
 
@@ -876,7 +896,7 @@ ContentParent::ShutDownProcess(bool aCloseWithError)
     // shut down the cycle collector.  But by then it's too late to release any
     // CC'ed objects, so we need to null them out here, while we still can.  See
     // bug 899761.
-    mMemoryReporters.Clear();
+    mChildReporter = nullptr;
     if (mMessageManager) {
       mMessageManager->Disconnect();
       mMessageManager = nullptr;
@@ -1027,8 +1047,8 @@ ContentParent::ActorDestroy(ActorDestroyReason why)
       ppm->Disconnect();
     }
 
-    // clear the child memory reporters
-    ClearChildMemoryReporters();
+    // unregister the child memory reporter
+    UnregisterChildMemoryReporter();
 
     // remove the global remote preferences observers
     Preferences::RemoveObserver(this, "");
@@ -2141,28 +2161,16 @@ ContentParent::DeallocPMemoryReportRequestParent(PMemoryReportRequestParent* act
 }
 
 void
-ContentParent::SetChildMemoryReporters(const InfallibleTArray<MemoryReport>& report)
+ContentParent::SetChildMemoryReports(const InfallibleTArray<MemoryReport>& childReports)
 {
     nsCOMPtr<nsIMemoryReporterManager> mgr =
         do_GetService("@mozilla.org/memory-reporter-manager;1");
-    for (int32_t i = 0; i < mMemoryReporters.Count(); i++)
-        mgr->UnregisterReporter(mMemoryReporters[i]);
 
-    for (uint32_t i = 0; i < report.Length(); i++) {
-        nsCString process  = report[i].process();
-        nsCString path     = report[i].path();
-        int32_t   kind     = report[i].kind();
-        int32_t   units    = report[i].units();
-        int64_t   amount   = report[i].amount();
-        nsCString desc     = report[i].desc();
+    if (mChildReporter)
+        mgr->UnregisterReporter(mChildReporter);
 
-        nsRefPtr<ChildMemoryReporter> r =
-            new ChildMemoryReporter(process.get(), path.get(), kind, units,
-                                    amount, desc.get());
-
-        mMemoryReporters.AppendObject(r);
-        mgr->RegisterReporter(r);
-    }
+    mChildReporter = new ChildReporter(childReports);
+    mgr->RegisterReporter(mChildReporter);
 
     nsCOMPtr<nsIObserverService> obs =
         do_GetService("@mozilla.org/observer-service;1");
@@ -2171,12 +2179,11 @@ ContentParent::SetChildMemoryReporters(const InfallibleTArray<MemoryReport>& rep
 }
 
 void
-ContentParent::ClearChildMemoryReporters()
+ContentParent::UnregisterChildMemoryReporter()
 {
     nsCOMPtr<nsIMemoryReporterManager> mgr =
         do_GetService("@mozilla.org/memory-reporter-manager;1");
-    for (int32_t i = 0; i < mMemoryReporters.Count(); i++)
-        mgr->UnregisterReporter(mMemoryReporters[i]);
+    mgr->UnregisterReporter(mChildReporter);
 }
 
 PTestShellParent*
diff --git a/dom/ipc/ContentParent.h b/dom/ipc/ContentParent.h
index 5bfa77b18d1a..716f181dcd37 100644
--- a/dom/ipc/ContentParent.h
+++ b/dom/ipc/ContentParent.h
@@ -143,8 +143,9 @@ public:
     bool IsAlive();
     bool IsForApp();
 
-    void SetChildMemoryReporters(const InfallibleTArray<MemoryReport>& report);
-    void ClearChildMemoryReporters();
+    void SetChildMemoryReports(const InfallibleTArray<MemoryReport>&
+                               childReports);
+    void UnregisterChildMemoryReporter();
 
     GeckoChildProcessHost* Process() {
         return mSubprocess;
@@ -446,11 +447,13 @@ private:
     uint64_t mChildID;
     int32_t mGeolocationWatchID;
 
-    // This is a cache of all of the memory reporters
-    // registered in the child process.  To update this, one
-    // can broadcast the topic "child-memory-reporter-request" using
-    // the nsIObserverService.
-    nsCOMArray<nsIMemoryReporter> mMemoryReporters;
+    // This is a reporter holding the reports from the child's last
+    // "child-memory-reporter-update" notification.  To update this, one can
+    // broadcast the topic "child-memory-reporter-request" using the
+    // nsIObserverService.
+    //
+    // Note that this assumes there is at most one child process at a time!
+    nsCOMPtr<nsIMemoryReporter> mChildReporter;
 
     nsString mAppManifestURL;
 
diff --git a/dom/workers/WorkerPrivate.cpp b/dom/workers/WorkerPrivate.cpp
index 506698d1693e..06373224696a 100644
--- a/dom/workers/WorkerPrivate.cpp
+++ b/dom/workers/WorkerPrivate.cpp
@@ -1766,7 +1766,7 @@ struct WorkerPrivate::TimeoutInfo
   bool mCanceled;
 };
 
-class WorkerPrivate::MemoryReporter MOZ_FINAL : public nsIMemoryMultiReporter
+class WorkerPrivate::MemoryReporter MOZ_FINAL : public nsIMemoryReporter
 {
   friend class WorkerPrivate;
 
@@ -1807,7 +1807,7 @@ public:
   }
 
   NS_IMETHOD
-  CollectReports(nsIMemoryMultiReporterCallback* aCallback,
+  CollectReports(nsIMemoryReporterCallback* aCallback,
                  nsISupports* aClosure)
   {
     AssertIsOnMainThread();
@@ -1883,7 +1883,7 @@ private:
   }
 };
 
-NS_IMPL_ISUPPORTS1(WorkerPrivate::MemoryReporter, nsIMemoryMultiReporter)
+NS_IMPL_ISUPPORTS1(WorkerPrivate::MemoryReporter, nsIMemoryReporter)
 
 template <class Derived>
 WorkerPrivateParent<Derived>::WorkerPrivateParent(
@@ -3093,7 +3093,7 @@ WorkerPrivate::EnableMemoryReporter()
   // successfully registered the reporter.
   mMemoryReporter = new MemoryReporter(this);
 
-  if (NS_FAILED(NS_RegisterMemoryMultiReporter(mMemoryReporter))) {
+  if (NS_FAILED(NS_RegisterMemoryReporter(mMemoryReporter))) {
     NS_WARNING("Failed to register memory reporter!");
     // No need to lock here since a failed registration means our memory
     // reporter can't start running. Just clean up.
@@ -3148,7 +3148,7 @@ WorkerPrivate::DisableMemoryReporter()
   }
 
   // Finally unregister the memory reporter.
-  if (NS_FAILED(NS_UnregisterMemoryMultiReporter(memoryReporter))) {
+  if (NS_FAILED(NS_UnregisterMemoryReporter(memoryReporter))) {
     NS_WARNING("Failed to unregister memory reporter!");
   }
 }
diff --git a/dom/workers/WorkerPrivate.h b/dom/workers/WorkerPrivate.h
index 20794e29be1b..4d316a7fbb37 100644
--- a/dom/workers/WorkerPrivate.h
+++ b/dom/workers/WorkerPrivate.h
@@ -34,7 +34,6 @@
 class JSAutoStructuredCloneBuffer;
 class nsIChannel;
 class nsIDocument;
-class nsIMemoryMultiReporter;
 class nsIPrincipal;
 class nsIScriptContext;
 class nsIURI;
diff --git a/extensions/spellcheck/hunspell/src/mozHunspell.cpp b/extensions/spellcheck/hunspell/src/mozHunspell.cpp
index 73f39b70268a..d49aea441d64 100644
--- a/extensions/spellcheck/hunspell/src/mozHunspell.cpp
+++ b/extensions/spellcheck/hunspell/src/mozHunspell.cpp
@@ -97,11 +97,11 @@ NS_IMPL_CYCLE_COLLECTION_3(mozHunspell,
                            mEncoder,
                            mDecoder)
 
-class SpellCheckReporter MOZ_FINAL : public mozilla::MemoryReporterBase
+class SpellCheckReporter MOZ_FINAL : public mozilla::MemoryUniReporter
 {
 public:
   SpellCheckReporter()
-    : MemoryReporterBase("explicit/spell-check", KIND_HEAP, UNITS_BYTES,
+    : MemoryUniReporter("explicit/spell-check", KIND_HEAP, UNITS_BYTES,
 "Memory used by the Hunspell spell checking engine's internal data structures.")
   {
 #ifdef DEBUG
diff --git a/gfx/gl/GLContext.h b/gfx/gl/GLContext.h
index 1173e7d2e695..82efb9481085 100644
--- a/gfx/gl/GLContext.h
+++ b/gfx/gl/GLContext.h
@@ -3394,12 +3394,12 @@ public:
 #endif
 };
 
-class GfxTexturesReporter MOZ_FINAL : public MemoryReporterBase
+class GfxTexturesReporter MOZ_FINAL : public MemoryUniReporter
 {
 public:
     GfxTexturesReporter()
-      : MemoryReporterBase("gfx-textures", KIND_OTHER, UNITS_BYTES,
-                           "Memory used for storing GL textures.")
+      : MemoryUniReporter("gfx-textures", KIND_OTHER, UNITS_BYTES,
+                          "Memory used for storing GL textures.")
     {
 #ifdef DEBUG
         // There must be only one instance of this class, due to |sAmount|
diff --git a/gfx/layers/ipc/ShadowLayerUtilsGralloc.cpp b/gfx/layers/ipc/ShadowLayerUtilsGralloc.cpp
index b8e10eb9e2b4..1b59de593694 100644
--- a/gfx/layers/ipc/ShadowLayerUtilsGralloc.cpp
+++ b/gfx/layers/ipc/ShadowLayerUtilsGralloc.cpp
@@ -184,13 +184,13 @@ ContentTypeFromPixelFormat(android::PixelFormat aFormat)
   return gfxASurface::ContentFromFormat(ImageFormatForPixelFormat(aFormat));
 }
 
-class GrallocReporter MOZ_FINAL : public MemoryReporterBase
+class GrallocReporter MOZ_FINAL : public MemoryUniReporter
 {
   friend class GrallocBufferActor;
 
 public:
   GrallocReporter()
-    : MemoryReporterBase("gralloc", KIND_OTHER, UNITS_BYTES,
+    : MemoryUniReporter("gralloc", KIND_OTHER, UNITS_BYTES,
 "Special RAM that can be shared between processes and directly accessed by "
 "both the CPU and GPU.  Gralloc memory is usually a relatively precious "
 "resource, with much less available than generic RAM.  When it's exhausted, "
diff --git a/gfx/thebes/gfxASurface.cpp b/gfx/thebes/gfxASurface.cpp
index 539bf86249f5..27aafff304f1 100644
--- a/gfx/thebes/gfxASurface.cpp
+++ b/gfx/thebes/gfxASurface.cpp
@@ -598,7 +598,7 @@ PR_STATIC_ASSERT(uint32_t(CAIRO_SURFACE_TYPE_SKIA) ==
 static int64_t gSurfaceMemoryUsed[gfxASurface::SurfaceTypeMax] = { 0 };
 
 class SurfaceMemoryReporter MOZ_FINAL :
-    public nsIMemoryMultiReporter
+    public nsIMemoryReporter
 {
 public:
     SurfaceMemoryReporter()
@@ -612,7 +612,7 @@ public:
         return NS_OK;
     }
 
-    NS_IMETHOD CollectReports(nsIMemoryMultiReporterCallback *aCb,
+    NS_IMETHOD CollectReports(nsIMemoryReporterCallback *aCb,
                               nsISupports *aClosure)
     {
         size_t len = NS_ARRAY_LENGTH(sSurfaceMemoryReporterAttrs);
@@ -639,7 +639,7 @@ public:
     }
 };
 
-NS_IMPL_ISUPPORTS1(SurfaceMemoryReporter, nsIMemoryMultiReporter)
+NS_IMPL_ISUPPORTS1(SurfaceMemoryReporter, nsIMemoryReporter)
 
 void
 gfxASurface::RecordMemoryUsedForSurfaceType(gfxASurface::gfxSurfaceType aType,
@@ -652,7 +652,7 @@ gfxASurface::RecordMemoryUsedForSurfaceType(gfxASurface::gfxSurfaceType aType,
 
     static bool registered = false;
     if (!registered) {
-        NS_RegisterMemoryMultiReporter(new SurfaceMemoryReporter());
+        NS_RegisterMemoryReporter(new SurfaceMemoryReporter());
         registered = true;
     }
 
diff --git a/gfx/thebes/gfxAndroidPlatform.cpp b/gfx/thebes/gfxAndroidPlatform.cpp
index c9781a4a4bf6..81acf67eeae1 100644
--- a/gfx/thebes/gfxAndroidPlatform.cpp
+++ b/gfx/thebes/gfxAndroidPlatform.cpp
@@ -30,12 +30,12 @@ using namespace mozilla::gfx;
 
 static FT_Library gPlatformFTLibrary = nullptr;
 
-class FreetypeReporter MOZ_FINAL : public MemoryReporterBase
+class FreetypeReporter MOZ_FINAL : public MemoryUniReporter
 {
 public:
     FreetypeReporter()
-      : MemoryReporterBase("explicit/freetype", KIND_HEAP, UNITS_BYTES,
-                           "Memory used by Freetype.")
+      : MemoryUniReporter("explicit/freetype", KIND_HEAP, UNITS_BYTES,
+                          "Memory used by Freetype.")
     {
 #ifdef DEBUG
         // There must be only one instance of this class, due to |sAmount|
diff --git a/gfx/thebes/gfxFont.cpp b/gfx/thebes/gfxFont.cpp
index 77dcae2b74e9..1b7050f2f25d 100644
--- a/gfx/thebes/gfxFont.cpp
+++ b/gfx/thebes/gfxFont.cpp
@@ -1252,7 +1252,7 @@ gfxFontFamily::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf,
  * shaped-word caches to free up memory.
  */
 
-NS_IMPL_ISUPPORTS1(gfxFontCache::MemoryReporter, nsIMemoryMultiReporter)
+NS_IMPL_ISUPPORTS1(gfxFontCache::MemoryReporter, nsIMemoryReporter)
 
 NS_MEMORY_REPORTER_MALLOC_SIZEOF_FUN(FontCacheMallocSizeOf)
 
@@ -1265,7 +1265,7 @@ gfxFontCache::MemoryReporter::GetName(nsACString &aName)
 
 NS_IMETHODIMP
 gfxFontCache::MemoryReporter::CollectReports
-    (nsIMemoryMultiReporterCallback* aCb,
+    (nsIMemoryReporterCallback* aCb,
      nsISupports* aClosure)
 {
     FontCacheSizes sizes;
@@ -1324,7 +1324,7 @@ gfxFontCache::Init()
     if (!gGlobalCache) {
         return NS_ERROR_OUT_OF_MEMORY;
     }
-    NS_RegisterMemoryMultiReporter(new MemoryReporter);
+    NS_RegisterMemoryReporter(new MemoryReporter);
     return NS_OK;
 }
 
diff --git a/gfx/thebes/gfxFont.h b/gfx/thebes/gfxFont.h
index 2f5e8bb5c193..3133c05d1e7b 100644
--- a/gfx/thebes/gfxFont.h
+++ b/gfx/thebes/gfxFont.h
@@ -977,11 +977,11 @@ public:
 
 protected:
     class MemoryReporter MOZ_FINAL
-        : public nsIMemoryMultiReporter
+        : public nsIMemoryReporter
     {
     public:
         NS_DECL_ISUPPORTS
-        NS_DECL_NSIMEMORYMULTIREPORTER
+        NS_DECL_NSIMEMORYREPORTER
     };
 
     void DestroyFont(gfxFont *aFont);
diff --git a/gfx/thebes/gfxPlatformFontList.cpp b/gfx/thebes/gfxPlatformFontList.cpp
index 60584906c0c2..4ab0a331fd7f 100644
--- a/gfx/thebes/gfxPlatformFontList.cpp
+++ b/gfx/thebes/gfxPlatformFontList.cpp
@@ -70,7 +70,7 @@ gfxFontListPrefObserver::Observe(nsISupports     *aSubject,
     return NS_OK;
 }
 
-NS_IMPL_ISUPPORTS1(gfxPlatformFontList::MemoryReporter, nsIMemoryMultiReporter)
+NS_IMPL_ISUPPORTS1(gfxPlatformFontList::MemoryReporter, nsIMemoryReporter)
 
 NS_MEMORY_REPORTER_MALLOC_SIZEOF_FUN(FontListMallocSizeOf)
 
@@ -83,7 +83,7 @@ gfxPlatformFontList::MemoryReporter::GetName(nsACString &aName)
 
 NS_IMETHODIMP
 gfxPlatformFontList::MemoryReporter::CollectReports
-    (nsIMemoryMultiReporterCallback* aCb,
+    (nsIMemoryReporterCallback* aCb,
      nsISupports* aClosure)
 {
     FontListSizes sizes;
@@ -148,7 +148,7 @@ gfxPlatformFontList::gfxPlatformFontList(bool aNeedFullnamePostscriptNames)
 
     mSharedCmaps.Init(16);
 
-    NS_RegisterMemoryMultiReporter(new MemoryReporter);
+    NS_RegisterMemoryReporter(new MemoryReporter);
 }
 
 gfxPlatformFontList::~gfxPlatformFontList()
diff --git a/gfx/thebes/gfxPlatformFontList.h b/gfx/thebes/gfxPlatformFontList.h
index 53c1c9474594..b8f1aaebec3f 100644
--- a/gfx/thebes/gfxPlatformFontList.h
+++ b/gfx/thebes/gfxPlatformFontList.h
@@ -179,11 +179,11 @@ public:
 
 protected:
     class MemoryReporter MOZ_FINAL
-        : public nsIMemoryMultiReporter
+        : public nsIMemoryReporter
     {
     public:
         NS_DECL_ISUPPORTS
-        NS_DECL_NSIMEMORYMULTIREPORTER
+        NS_DECL_NSIMEMORYREPORTER
     };
 
     gfxPlatformFontList(bool aNeedFullnamePostscriptNames = true);
diff --git a/gfx/thebes/gfxWindowsPlatform.cpp b/gfx/thebes/gfxWindowsPlatform.cpp
index f543a5743337..72bdaa02525d 100644
--- a/gfx/thebes/gfxWindowsPlatform.cpp
+++ b/gfx/thebes/gfxWindowsPlatform.cpp
@@ -73,11 +73,11 @@ static const int kSupportedFeatureLevels[] =
   { D3D10_FEATURE_LEVEL_10_1, D3D10_FEATURE_LEVEL_10_0,
     D3D10_FEATURE_LEVEL_9_3 };
 
-class GfxD2DSurfaceCacheReporter MOZ_FINAL : public MemoryReporterBase
+class GfxD2DSurfaceCacheReporter MOZ_FINAL : public MemoryUniReporter
 {
 public:
     GfxD2DSurfaceCacheReporter()
-      : MemoryReporterBase("gfx-d2d-surface-cache", KIND_OTHER, UNITS_BYTES,
+      : MemoryUniReporter("gfx-d2d-surface-cache", KIND_OTHER, UNITS_BYTES,
 "Memory used by the Direct2D internal surface cache.")
     {}
 private:
@@ -110,11 +110,11 @@ bool OncePreferenceDirect2DForceEnabled()
 
 } // anonymous namespace
 
-class GfxD2DSurfaceVramReporter MOZ_FINAL : public MemoryReporterBase
+class GfxD2DSurfaceVramReporter MOZ_FINAL : public MemoryUniReporter
 {
 public:
     GfxD2DSurfaceVramReporter()
-      : MemoryReporterBase("gfx-d2d-surface-vram", KIND_OTHER, UNITS_BYTES,
+      : MemoryUniReporter("gfx-d2d-surface-vram", KIND_OTHER, UNITS_BYTES,
                            "Video memory used by D2D surfaces.")
     {}
 private:
@@ -127,11 +127,11 @@ private:
 
 #endif
 
-class GfxD2DVramDrawTargetReporter MOZ_FINAL : public MemoryReporterBase
+class GfxD2DVramDrawTargetReporter MOZ_FINAL : public MemoryUniReporter
 {
 public:
     GfxD2DVramDrawTargetReporter()
-      : MemoryReporterBase("gfx-d2d-vram-draw-target", KIND_OTHER, UNITS_BYTES,
+      : MemoryUniReporter("gfx-d2d-vram-draw-target", KIND_OTHER, UNITS_BYTES,
                            "Video memory used by D2D DrawTargets.")
     {}
 private:
@@ -141,11 +141,11 @@ private:
     }
 };
 
-class GfxD2DVramSourceSurfaceReporter MOZ_FINAL : public MemoryReporterBase
+class GfxD2DVramSourceSurfaceReporter MOZ_FINAL : public MemoryUniReporter
 {
 public:
     GfxD2DVramSourceSurfaceReporter()
-      : MemoryReporterBase("gfx-d2d-vram-source-surface",
+      : MemoryUniReporter("gfx-d2d-vram-source-surface",
                            KIND_OTHER, UNITS_BYTES,
                            "Video memory used by D2D SourceSurfaces.")
     {}
@@ -206,7 +206,7 @@ typedef HRESULT (WINAPI*D3D11CreateDeviceFunc)(
   ID3D11DeviceContext *ppImmediateContext
 );
 
-class GPUAdapterMultiReporter : public nsIMemoryMultiReporter {
+class GPUAdapterReporter : public nsIMemoryReporter {
 
     // Callers must Release the DXGIAdapter after use or risk mem-leak
     static bool GetDXGIAdapter(IDXGIAdapter **DXGIAdapter)
@@ -228,7 +228,7 @@ class GPUAdapterMultiReporter : public nsIMemoryMultiReporter {
 public:
     NS_DECL_ISUPPORTS
 
-    // nsIMemoryMultiReporter abstract method implementation
+    // nsIMemoryReporter abstract method implementation
     NS_IMETHOD
     GetName(nsACString &aName)
     {
@@ -236,9 +236,9 @@ public:
         return NS_OK;
     }
     
-    // nsIMemoryMultiReporter abstract method implementation
+    // nsIMemoryReporter abstract method implementation
     NS_IMETHOD
-    CollectReports(nsIMemoryMultiReporterCallback* aCb,
+    CollectReports(nsIMemoryReporterCallback* aCb,
                    nsISupports* aClosure)
     {
         int32_t winVers, buildNum;
@@ -347,7 +347,7 @@ public:
         return NS_OK;
     }
 };
-NS_IMPL_ISUPPORTS1(GPUAdapterMultiReporter, nsIMemoryMultiReporter)
+NS_IMPL_ISUPPORTS1(GPUAdapterReporter, nsIMemoryReporter)
 
 static __inline void
 BuildKeyNameFromFontName(nsAString &aName)
@@ -385,16 +385,16 @@ gfxWindowsPlatform::gfxWindowsPlatform()
 
     UpdateRenderMode();
 
-    mGPUAdapterMultiReporter = new GPUAdapterMultiReporter();
-    NS_RegisterMemoryMultiReporter(mGPUAdapterMultiReporter);
+    mGPUAdapterReporter = new GPUAdapterReporter();
+    NS_RegisterMemoryReporter(mGPUAdapterReporter);
 }
 
 gfxWindowsPlatform::~gfxWindowsPlatform()
 {
-    NS_UnregisterMemoryMultiReporter(mGPUAdapterMultiReporter);
-    
-     mDeviceManager = nullptr;
-     
+    NS_UnregisterMemoryReporter(mGPUAdapterReporter);
+
+    mDeviceManager = nullptr;
+
     ::ReleaseDC(nullptr, mScreenDC);
     // not calling FT_Done_FreeType because cairo may still hold references to
     // these FT_Faces.  See bug 458169.
diff --git a/gfx/thebes/gfxWindowsPlatform.h b/gfx/thebes/gfxWindowsPlatform.h
index c00332244b4d..8d1d5aac423c 100644
--- a/gfx/thebes/gfxWindowsPlatform.h
+++ b/gfx/thebes/gfxWindowsPlatform.h
@@ -52,7 +52,7 @@ class IDirect3DDevice9;
 class ID3D11Device;
 class IDXGIAdapter1;
 
-class nsIMemoryMultiReporter;
+class nsIMemoryReporter;
 
 // Utility to get a Windows HDC from a thebes context,
 // used by both GDI and Uniscribe font shapers
@@ -315,7 +315,7 @@ private:
     // TODO: unify this with mPrefFonts (NB: holds families, not fonts) in gfxPlatformFontList
     nsDataHashtable<nsCStringHashKey, nsTArray<nsRefPtr<gfxFontEntry> > > mPrefFonts;
 
-    nsIMemoryMultiReporter* mGPUAdapterMultiReporter;
+    nsIMemoryReporter* mGPUAdapterReporter;
 };
 
 #endif /* GFX_WINDOWS_PLATFORM_H */
diff --git a/image/src/imgLoader.cpp b/image/src/imgLoader.cpp
index 024108605ff0..463583899b3d 100644
--- a/image/src/imgLoader.cpp
+++ b/image/src/imgLoader.cpp
@@ -61,7 +61,7 @@ using namespace mozilla::image;
 NS_MEMORY_REPORTER_MALLOC_SIZEOF_FUN(ImagesMallocSizeOf)
 
 class imgMemoryReporter MOZ_FINAL :
-  public nsIMemoryMultiReporter
+  public nsIMemoryReporter
 {
 public:
   imgMemoryReporter()
@@ -76,7 +76,7 @@ public:
     return NS_OK;
   }
 
-  NS_IMETHOD CollectReports(nsIMemoryMultiReporterCallback *callback,
+  NS_IMETHOD CollectReports(nsIMemoryReporterCallback *callback,
                             nsISupports *closure)
   {
     AllSizes chrome;
@@ -233,15 +233,15 @@ private:
   }
 };
 
-NS_IMPL_ISUPPORTS1(imgMemoryReporter, nsIMemoryMultiReporter)
+NS_IMPL_ISUPPORTS1(imgMemoryReporter, nsIMemoryReporter)
 
 // This is used by telemetry.
 class ImagesContentUsedUncompressedReporter MOZ_FINAL
-  : public MemoryReporterBase
+  : public MemoryUniReporter
 {
 public:
   ImagesContentUsedUncompressedReporter()
-    : MemoryReporterBase("images-content-used-uncompressed",
+    : MemoryUniReporter("images-content-used-uncompressed",
                          KIND_OTHER, UNITS_BYTES,
 "This is the sum of the 'explicit/images/content/used/uncompressed-heap' "
 "and 'explicit/images/content/used/uncompressed-nonheap' numbers.  However, "
@@ -850,7 +850,7 @@ void imgLoader::GlobalInit()
     sCacheMaxSize = 5 * 1024 * 1024;
 
   sMemReporter = new imgMemoryReporter();
-  NS_RegisterMemoryMultiReporter(sMemReporter);
+  NS_RegisterMemoryReporter(sMemReporter);
   NS_RegisterMemoryReporter(new ImagesContentUsedUncompressedReporter());
 }
 
diff --git a/image/test/mochitest/test_bug601470.html b/image/test/mochitest/test_bug601470.html
index 7942285f5d72..bc37ea2c2048 100644
--- a/image/test/mochitest/test_bug601470.html
+++ b/image/test/mochitest/test_bug601470.html
@@ -25,14 +25,18 @@ window.onload = function() {
   var mgr = SpecialPowers.Cc["@mozilla.org/memory-reporter-manager;1"]
     .getService(SpecialPowers.Ci.nsIMemoryReporterManager);
 
-  var e = mgr.enumerateReporters();
-  var memoryCounter = 0;
-  while (e.hasMoreElements()) {
-    var mr =
-      e.getNext().QueryInterface(SpecialPowers.Ci.nsIMemoryReporter);
-    memoryCounter += mr.amount;
+  var amount = 0;
+  var handleReport = function(aProcess, aPath, aKind, aUnits, aAmount, aDesc) {
+    amount += aAmount;
   }
-  ok(memoryCounter > 0, "we should be using a nonzero amount of memory");
+
+  var e = mgr.enumerateReporters();
+  while (e.hasMoreElements()) {
+    var mr = e.getNext().QueryInterface(SpecialPowers.Ci.nsIMemoryReporter);
+    mr.collectReports(handleReport, null);
+  }
+
+  ok(amount > 0, "we should be using a nonzero amount of memory");
   ok(true, "yay, didn't crash!");
 
   SimpleTest.finish();
diff --git a/ipc/glue/SharedMemory.cpp b/ipc/glue/SharedMemory.cpp
index 24959ff48583..6fe916e42f7d 100644
--- a/ipc/glue/SharedMemory.cpp
+++ b/ipc/glue/SharedMemory.cpp
@@ -17,11 +17,11 @@ namespace ipc {
 static Atomic<size_t> gShmemAllocated;
 static Atomic<size_t> gShmemMapped;
 
-class ShmemAllocatedReporter MOZ_FINAL : public MemoryReporterBase
+class ShmemAllocatedReporter MOZ_FINAL : public MemoryUniReporter
 {
 public:
   ShmemAllocatedReporter()
-    : MemoryReporterBase("shmem-allocated", KIND_OTHER, UNITS_BYTES,
+    : MemoryUniReporter("shmem-allocated", KIND_OTHER, UNITS_BYTES,
 "Memory shared with other processes that is accessible (but not necessarily "
 "mapped).")
   {}
@@ -29,11 +29,11 @@ private:
   int64_t Amount() MOZ_OVERRIDE { return gShmemAllocated; }
 };
 
-class ShmemMappedReporter MOZ_FINAL : public MemoryReporterBase
+class ShmemMappedReporter MOZ_FINAL : public MemoryUniReporter
 {
 public:
   ShmemMappedReporter()
-    : MemoryReporterBase("shmem-mapped", KIND_OTHER, UNITS_BYTES,
+    : MemoryUniReporter("shmem-mapped", KIND_OTHER, UNITS_BYTES,
 "Memory shared with other processes that is mapped into the address space.")
   {}
 private:
diff --git a/js/xpconnect/src/XPCJSMemoryReporter.h b/js/xpconnect/src/XPCJSMemoryReporter.h
index ac95b7813035..447f0f3896bf 100644
--- a/js/xpconnect/src/XPCJSMemoryReporter.h
+++ b/js/xpconnect/src/XPCJSMemoryReporter.h
@@ -9,22 +9,22 @@
 #define XPCJSMemoryReporter_h
 
 class nsISupports;
-class nsIMemoryMultiReporterCallback;
+class nsIMemoryReporterCallback;
 
 namespace xpc {
 
 // The key is the window ID.
 typedef nsDataHashtable<nsUint64HashKey, nsCString> WindowPaths;
 
-// This is very nearly an instance of nsIMemoryMultiReporter, but it's not,
+// This is very nearly an instance of nsIMemoryReporter, but it's not,
 // because it's invoked by nsWindowMemoryReporter in order to get |windowPaths|
 // in CollectReports.
-class JSMemoryMultiReporter
+class JSReporter
 {
 public:
     static nsresult CollectReports(WindowPaths *windowPaths,
                                    WindowPaths *topWindowPaths,
-                                   nsIMemoryMultiReporterCallback *cb,
+                                   nsIMemoryReporterCallback *cb,
                                    nsISupports *closure);
 };
 
diff --git a/js/xpconnect/src/XPCJSRuntime.cpp b/js/xpconnect/src/XPCJSRuntime.cpp
index 02c3a6cd93bc..50ce3f4c95aa 100644
--- a/js/xpconnect/src/XPCJSRuntime.cpp
+++ b/js/xpconnect/src/XPCJSRuntime.cpp
@@ -1560,13 +1560,13 @@ GetCompartmentName(JSCompartment *c, nsCString &name, bool replaceSlashes)
     }
 }
 
-// Telemetry relies on this being a single reporter (rather than part of the
-// "js" multi-reporter).
-class JSGCHeapReporter MOZ_FINAL : public MemoryReporterBase
+// Telemetry relies on this being a uni-reporter (rather than part of the "js"
+// reporter).
+class JSGCHeapReporter MOZ_FINAL : public MemoryUniReporter
 {
 public:
     JSGCHeapReporter()
-      : MemoryReporterBase("js-gc-heap", KIND_OTHER, UNITS_BYTES,
+      : MemoryUniReporter("js-gc-heap", KIND_OTHER, UNITS_BYTES,
 "Memory used by the garbage-collected JavaScript heap.")
     {}
 private:
@@ -1578,19 +1578,17 @@ private:
     }
 };
 
-// Nb: js-compartments/system + js-compartments/user could be
-// different to the number of compartments reported by
-// JSMemoryMultiReporter if a garbage collection occurred
-// between them being consulted.  We could move these reporters into
-// XPConnectJSCompartmentCount to avoid that problem, but then we couldn't
-// easily report them via telemetry, so we live with the small risk of
-// inconsistencies.
+// Nb: js-compartments/system + js-compartments/user could be different to the
+// number of compartments reported by JSReporter if a garbage collection
+// occurred between them being consulted.  We could move these reporters into
+// JSReporter to avoid that problem, but then we couldn't easily report them
+// via telemetry, so we live with the small risk of inconsistencies.
 
-class JSCompartmentsSystemReporter MOZ_FINAL : public MemoryReporterBase
+class JSCompartmentsSystemReporter MOZ_FINAL : public MemoryUniReporter
 {
 public:
     JSCompartmentsSystemReporter()
-      : MemoryReporterBase("js-compartments/system", KIND_OTHER, UNITS_COUNT,
+      : MemoryUniReporter("js-compartments/system", KIND_OTHER, UNITS_COUNT,
 "The number of JavaScript compartments for system code.  The sum of this and "
 "'js-compartments/user' might not match the number of compartments listed "
 "in the 'explicit' tree if a garbage collection occurs at an inopportune "
@@ -1604,11 +1602,11 @@ private:
     }
 };
 
-class JSCompartmentsUserReporter MOZ_FINAL : public MemoryReporterBase
+class JSCompartmentsUserReporter MOZ_FINAL : public MemoryUniReporter
 {
 public:
     JSCompartmentsUserReporter()
-      : MemoryReporterBase("js-compartments/user", KIND_OTHER, UNITS_COUNT,
+      : MemoryUniReporter("js-compartments/user", KIND_OTHER, UNITS_COUNT,
 "The number of JavaScript compartments for user code.  The sum of this and "
 "'js-compartments/system' might not match the number of compartments listed "
 "under 'js' if a garbage collection occurs at an inopportune time, but such "
@@ -1623,11 +1621,11 @@ private:
 };
 
 // This is also a single reporter so it can be used by telemetry.
-class JSMainRuntimeTemporaryPeakReporter MOZ_FINAL : public MemoryReporterBase
+class JSMainRuntimeTemporaryPeakReporter MOZ_FINAL : public MemoryUniReporter
 {
 public:
     JSMainRuntimeTemporaryPeakReporter()
-      : MemoryReporterBase("js-main-runtime-temporary-peak",
+      : MemoryUniReporter("js-main-runtime-temporary-peak",
                            KIND_OTHER, UNITS_BYTES,
 "The peak size of the transient storage in the main JSRuntime (the current "
 "size of which is reported as 'explicit/js-non-window/runtime/temporary').")
@@ -1758,7 +1756,7 @@ namespace xpc {
 static nsresult
 ReportZoneStats(const JS::ZoneStats &zStats,
                 const xpc::ZoneStatsExtras &extras,
-                nsIMemoryMultiReporterCallback *cb,
+                nsIMemoryReporterCallback *cb,
                 nsISupports *closure, size_t *gcTotalOut = NULL)
 {
     const nsAutoCString& pathPrefix = extras.pathPrefix;
@@ -1942,7 +1940,7 @@ static nsresult
 ReportCompartmentStats(const JS::CompartmentStats &cStats,
                        const xpc::CompartmentStatsExtras &extras,
                        amIAddonManager *addonManager,
-                       nsIMemoryMultiReporterCallback *cb,
+                       nsIMemoryReporterCallback *cb,
                        nsISupports *closure, size_t *gcTotalOut = NULL)
 {
     static const nsDependentCString addonPrefix("explicit/add-ons/");
@@ -2084,8 +2082,8 @@ ReportCompartmentStats(const JS::CompartmentStats &cStats,
                    "Memory allocated on the malloc heap for data belonging to ctypes objects.");
 
     // Note that we use cDOMPathPrefix here.  This is because we measure orphan
-    // DOM nodes in the JS multi-reporter, but we want to report them in a
-    // "dom" sub-tree rather than a "js" sub-tree.
+    // DOM nodes in the JS reporter, but we want to report them in a "dom"
+    // sub-tree rather than a "js" sub-tree.
     ZCREPORT_BYTES(cDOMPathPrefix + NS_LITERAL_CSTRING("orphan-nodes"),
                    cStats.objectsExtra.private_,
                    "Memory used by orphan DOM nodes that are only reachable "
@@ -2207,7 +2205,7 @@ static nsresult
 ReportJSRuntimeExplicitTreeStats(const JS::RuntimeStats &rtStats,
                                  const nsACString &rtPath,
                                  amIAddonManager* addonManager,
-                                 nsIMemoryMultiReporterCallback *cb,
+                                 nsIMemoryReporterCallback *cb,
                                  nsISupports *closure, size_t *rtTotalOut)
 {
     nsresult rv;
@@ -2349,7 +2347,7 @@ ReportJSRuntimeExplicitTreeStats(const JS::RuntimeStats &rtStats,
 nsresult
 ReportJSRuntimeExplicitTreeStats(const JS::RuntimeStats &rtStats,
                                  const nsACString &rtPath,
-                                 nsIMemoryMultiReporterCallback *cb,
+                                 nsIMemoryReporterCallback *cb,
                                  nsISupports *closure, size_t *rtTotalOut)
 {
     nsCOMPtr<amIAddonManager> am =
@@ -2361,7 +2359,7 @@ ReportJSRuntimeExplicitTreeStats(const JS::RuntimeStats &rtStats,
 
 } // namespace xpc
 
-class JSCompartmentsMultiReporter MOZ_FINAL : public nsIMemoryMultiReporter
+class JSCompartmentsReporter MOZ_FINAL : public nsIMemoryReporter
 {
   public:
     NS_DECL_THREADSAFE_ISUPPORTS
@@ -2385,7 +2383,7 @@ class JSCompartmentsMultiReporter MOZ_FINAL : public nsIMemoryMultiReporter
         paths->append(path);
     }
 
-    NS_IMETHOD CollectReports(nsIMemoryMultiReporterCallback *cb,
+    NS_IMETHOD CollectReports(nsIMemoryReporterCallback *cb,
                               nsISupports *closure)
     {
         // First we collect the compartment paths.  Then we report them.  Doing
@@ -2407,9 +2405,7 @@ class JSCompartmentsMultiReporter MOZ_FINAL : public nsIMemoryMultiReporter
     }
 };
 
-NS_IMPL_ISUPPORTS1(JSCompartmentsMultiReporter
-                              , nsIMemoryMultiReporter
-                              )
+NS_IMPL_ISUPPORTS1(JSCompartmentsReporter, nsIMemoryReporter)
 
 NS_MEMORY_REPORTER_MALLOC_SIZEOF_FUN(OrphanMallocSizeOf)
 
@@ -2567,9 +2563,9 @@ class XPCJSRuntimeStats : public JS::RuntimeStats
         // "<something>compartment(<cname>)/".
         //
         // extras->domPathPrefix is used for DOM orphan nodes, which are
-        // counted by the JS multi-reporter but reported as part of the
-        // DOM measurements. At this point it has the form "<something>/dom/"
-        // if this compartment belongs to an nsGlobalWindow, and
+        // counted by the JS reporter but reported as part of the DOM
+        // measurements. At this point it has the form "<something>/dom/" if
+        // this compartment belongs to an nsGlobalWindow, and
         // "explicit/dom/<something>?!/" otherwise (in which case it shouldn't
         // be used, because non-nsGlobalWindow compartments shouldn't have
         // orphan DOM nodes).
@@ -2579,10 +2575,10 @@ class XPCJSRuntimeStats : public JS::RuntimeStats
 };
 
 nsresult
-JSMemoryMultiReporter::CollectReports(WindowPaths *windowPaths,
-                                      WindowPaths *topWindowPaths,
-                                      nsIMemoryMultiReporterCallback *cb,
-                                      nsISupports *closure)
+JSReporter::CollectReports(WindowPaths *windowPaths,
+                           WindowPaths *topWindowPaths,
+                           nsIMemoryReporterCallback *cb,
+                           nsISupports *closure)
 {
     XPCJSRuntime *xpcrt = nsXPConnect::GetRuntimeInstance();
 
@@ -3053,7 +3049,7 @@ XPCJSRuntime::XPCJSRuntime(nsXPConnect* aXPConnect)
     NS_RegisterMemoryReporter(new JSCompartmentsSystemReporter());
     NS_RegisterMemoryReporter(new JSCompartmentsUserReporter());
     NS_RegisterMemoryReporter(new JSMainRuntimeTemporaryPeakReporter());
-    NS_RegisterMemoryMultiReporter(new JSCompartmentsMultiReporter);
+    NS_RegisterMemoryReporter(new JSCompartmentsReporter);
 
     // Install a JavaScript 'debugger' keyword handler in debug builds only
 #ifdef DEBUG
diff --git a/js/xpconnect/src/xpcpublic.h b/js/xpconnect/src/xpcpublic.h
index 430791f2caef..5de64f5b906f 100644
--- a/js/xpconnect/src/xpcpublic.h
+++ b/js/xpconnect/src/xpcpublic.h
@@ -180,7 +180,7 @@ xpc_UnmarkSkippableJSHolders();
 NS_EXPORT_(void)
 xpc_ActivateDebugMode();
 
-class nsIMemoryMultiReporterCallback;
+class nsIMemoryReporterCallback;
 
 // readable string conversions, static methods and members only
 class XPCStringConvert
@@ -376,7 +376,7 @@ private:
 nsresult
 ReportJSRuntimeExplicitTreeStats(const JS::RuntimeStats &rtStats,
                                  const nsACString &rtPath,
-                                 nsIMemoryMultiReporterCallback *cb,
+                                 nsIMemoryReporterCallback *cb,
                                  nsISupports *closure, size_t *rtTotal = NULL);
 
 /**
diff --git a/layout/base/nsStyleSheetService.cpp b/layout/base/nsStyleSheetService.cpp
index 644399f6dc03..419e30b80d9b 100644
--- a/layout/base/nsStyleSheetService.cpp
+++ b/layout/base/nsStyleSheetService.cpp
@@ -26,11 +26,11 @@
 using namespace mozilla;
 
 class LayoutStyleSheetServiceReporter MOZ_FINAL
-  : public mozilla::MemoryReporterBase
+  : public mozilla::MemoryUniReporter
 {
 public:
   LayoutStyleSheetServiceReporter()
-    : MemoryReporterBase("explicit/layout/style-sheet-service",
+    : MemoryUniReporter("explicit/layout/style-sheet-service",
                          KIND_HEAP, UNITS_BYTES,
 "Memory used for style sheets held by the style sheet service.")
   {}
diff --git a/layout/style/nsLayoutStylesheetCache.cpp b/layout/style/nsLayoutStylesheetCache.cpp
index 72072679b6b0..c20510e18ec2 100644
--- a/layout/style/nsLayoutStylesheetCache.cpp
+++ b/layout/style/nsLayoutStylesheetCache.cpp
@@ -18,11 +18,11 @@
 #include "nsCSSStyleSheet.h"
 
 class LayoutStyleSheetCacheReporter MOZ_FINAL
-  : public mozilla::MemoryReporterBase
+  : public mozilla::MemoryUniReporter
 {
 public:
   LayoutStyleSheetCacheReporter()
-    : MemoryReporterBase("explicit/layout/style-sheet-cache",
+    : MemoryUniReporter("explicit/layout/style-sheet-cache",
                          KIND_HEAP, UNITS_BYTES,
                          "Memory used for some built-in style sheets.")
   {}
diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferences.cpp
index 10eba7a2675d..59c06be2f034 100644
--- a/modules/libpref/src/Preferences.cpp
+++ b/modules/libpref/src/Preferences.cpp
@@ -203,11 +203,11 @@ Preferences::SizeOfIncludingThisAndOtherStuff(mozilla::MallocSizeOf aMallocSizeO
   return n;
 }
 
-class PreferencesReporter MOZ_FINAL : public MemoryReporterBase
+class PreferencesReporter MOZ_FINAL : public MemoryUniReporter
 {
 public:
   PreferencesReporter()
-    : MemoryReporterBase("explicit/preferences", KIND_HEAP, UNITS_BYTES,
+    : MemoryUniReporter("explicit/preferences", KIND_HEAP, UNITS_BYTES,
                          "Memory used by the preferences system.")
   {}
 private:
diff --git a/netwerk/cache/nsDiskCacheDevice.cpp b/netwerk/cache/nsDiskCacheDevice.cpp
index a6dcd50164e7..97c1ad8964c1 100644
--- a/netwerk/cache/nsDiskCacheDevice.cpp
+++ b/netwerk/cache/nsDiskCacheDevice.cpp
@@ -370,11 +370,11 @@ nsDiskCache::Truncate(PRFileDesc *  fd, uint32_t  newEOF)
  *  nsDiskCacheDevice
  *****************************************************************************/
 
-class NetworkDiskCacheReporter MOZ_FINAL : public MemoryReporterBase
+class NetworkDiskCacheReporter MOZ_FINAL : public MemoryUniReporter
 {
 public:
     NetworkDiskCacheReporter(nsDiskCacheDevice* aDevice)
-      : MemoryReporterBase(
+      : MemoryUniReporter(
             "explicit/network/disk-cache",
             KIND_HEAP,
             UNITS_BYTES,
diff --git a/netwerk/cache/nsMemoryCacheDevice.cpp b/netwerk/cache/nsMemoryCacheDevice.cpp
index 02b7b8dc199b..e0e9c9656027 100644
--- a/netwerk/cache/nsMemoryCacheDevice.cpp
+++ b/netwerk/cache/nsMemoryCacheDevice.cpp
@@ -29,11 +29,11 @@
 const char *gMemoryDeviceID      = "memory";
 
 class NetworkMemoryCacheReporter MOZ_FINAL :
-    public mozilla::MemoryReporterBase
+    public mozilla::MemoryUniReporter
 {
 public:
     NetworkMemoryCacheReporter(nsMemoryCacheDevice* aDevice)
-      : MemoryReporterBase(
+      : MemoryUniReporter(
             "explicit/network/memory-cache",
             KIND_HEAP,
             UNITS_BYTES,
diff --git a/netwerk/dns/nsEffectiveTLDService.cpp b/netwerk/dns/nsEffectiveTLDService.cpp
index 71dd332ba730..3389f63af018 100644
--- a/netwerk/dns/nsEffectiveTLDService.cpp
+++ b/netwerk/dns/nsEffectiveTLDService.cpp
@@ -61,11 +61,11 @@ nsDomainEntry::FuncForStaticAsserts(void)
 
 static nsEffectiveTLDService *gService = nullptr;
 
-class EffectiveTLDServiceReporter MOZ_FINAL : public MemoryReporterBase
+class EffectiveTLDServiceReporter MOZ_FINAL : public MemoryUniReporter
 {
 public:
   EffectiveTLDServiceReporter()
-    : MemoryReporterBase("explicit/xpcom/effective-TLD-service",
+    : MemoryUniReporter("explicit/xpcom/effective-TLD-service",
                          KIND_HEAP, UNITS_BYTES,
                          "Memory used by the effective TLD service.")
   {}
diff --git a/startupcache/StartupCache.cpp b/startupcache/StartupCache.cpp
index 14021ccb4eea..2889dd326207 100644
--- a/startupcache/StartupCache.cpp
+++ b/startupcache/StartupCache.cpp
@@ -53,11 +53,11 @@
 namespace mozilla {
 namespace scache {
 
-class StartupCacheMappingReporter MOZ_FINAL : public MemoryReporterBase
+class StartupCacheMappingReporter MOZ_FINAL : public MemoryUniReporter
 {
 public:
   StartupCacheMappingReporter()
-    : MemoryReporterBase("explicit/startup-cache/mapping",
+    : MemoryUniReporter("explicit/startup-cache/mapping",
                          KIND_NONHEAP, UNITS_BYTES,
 "Memory used to hold the mapping of the startup cache from file.  This memory "
 "is likely to be swapped out shortly after start-up.")
@@ -71,11 +71,11 @@ private:
   }
 };
 
-class StartupCacheDataReporter MOZ_FINAL : public MemoryReporterBase
+class StartupCacheDataReporter MOZ_FINAL : public MemoryUniReporter
 {
 public:
   StartupCacheDataReporter()
-    : MemoryReporterBase("explicit/startup-cache/data", KIND_HEAP, UNITS_BYTES,
+    : MemoryUniReporter("explicit/startup-cache/data", KIND_HEAP, UNITS_BYTES,
 "Memory used by the startup cache for things other than the file mapping.")
   {}
 private:
diff --git a/storage/src/mozStorageService.cpp b/storage/src/mozStorageService.cpp
index 9b0b31948319..4e6118f033e6 100644
--- a/storage/src/mozStorageService.cpp
+++ b/storage/src/mozStorageService.cpp
@@ -57,18 +57,18 @@ namespace storage {
 // the multi-reporter provides reports that add up to the total.  But it's
 // useful to have the total in the "Other Measurements" list in about:memory,
 // and more importantly, we also gather the total via telemetry.
-class StorageSQLiteReporter MOZ_FINAL : public MemoryReporterBase
+class StorageSQLiteUniReporter MOZ_FINAL : public MemoryUniReporter
 {
 public:
-  StorageSQLiteReporter()
-    : MemoryReporterBase("storage-sqlite", KIND_OTHER, UNITS_BYTES,
+  StorageSQLiteUniReporter()
+    : MemoryUniReporter("storage-sqlite", KIND_OTHER, UNITS_BYTES,
                          "Memory used by SQLite.")
   {}
 private:
   int64_t Amount() MOZ_OVERRIDE { return ::sqlite3_memory_used(); }
 };
 
-class StorageSQLiteMultiReporter MOZ_FINAL : public nsIMemoryMultiReporter
+class StorageSQLiteMultiReporter MOZ_FINAL : public nsIMemoryReporter
 {
 private:
   Service *mService;    // a weakref because Service contains a strongref to this
@@ -97,7 +97,7 @@ public:
 
   NS_IMETHOD GetName(nsACString &aName)
   {
-      aName.AssignLiteral("storage-sqlite");
+      aName.AssignLiteral("storage-sqlite-multi");
       return NS_OK;
   }
 
@@ -107,7 +107,7 @@ public:
   // main thread!  But at the time of writing this function is only called when
   // about:memory is loaded (not, for example, when telemetry pings occur) and
   // any delays in that case aren't so bad.
-  NS_IMETHOD CollectReports(nsIMemoryMultiReporterCallback *aCb,
+  NS_IMETHOD CollectReports(nsIMemoryReporterCallback *aCb,
                             nsISupports *aClosure)
   {
     nsresult rv;
@@ -164,8 +164,7 @@ public:
 
 private:
   /**
-   * Passes a single SQLite memory statistic to a memory multi-reporter
-   * callback.
+   * Passes a single SQLite memory statistic to a memory reporter callback.
    *
    * @param aCallback
    *        The callback.
@@ -185,7 +184,7 @@ private:
    * @param aTotal
    *        The accumulator for the measurement.
    */
-  nsresult reportConn(nsIMemoryMultiReporterCallback *aCb,
+  nsresult reportConn(nsIMemoryReporterCallback *aCb,
                       nsISupports *aClosure,
                       sqlite3 *aConn,
                       const nsACString &aPathHead,
@@ -216,7 +215,7 @@ private:
 
 NS_IMPL_ISUPPORTS1(
   StorageSQLiteMultiReporter,
-  nsIMemoryMultiReporter
+  nsIMemoryReporter
 )
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -308,8 +307,8 @@ Service::Service()
 
 Service::~Service()
 {
-  (void)::NS_UnregisterMemoryReporter(mStorageSQLiteReporter);
-  (void)::NS_UnregisterMemoryMultiReporter(mStorageSQLiteMultiReporter);
+  (void)::NS_UnregisterMemoryReporter(mStorageSQLiteUniReporter);
+  (void)::NS_UnregisterMemoryReporter(mStorageSQLiteMultiReporter);
 
   int rc = sqlite3_vfs_unregister(mSqliteVFS);
   if (rc != SQLITE_OK)
@@ -541,10 +540,10 @@ Service::initialize()
 
   // Create and register our SQLite memory reporters.  Registration can only
   // happen on the main thread (otherwise you'll get cryptic crashes).
-  mStorageSQLiteReporter = new StorageSQLiteReporter();
+  mStorageSQLiteUniReporter = new StorageSQLiteUniReporter();
   mStorageSQLiteMultiReporter = new StorageSQLiteMultiReporter(this);
-  (void)::NS_RegisterMemoryReporter(mStorageSQLiteReporter);
-  (void)::NS_RegisterMemoryMultiReporter(mStorageSQLiteMultiReporter);
+  (void)::NS_RegisterMemoryReporter(mStorageSQLiteUniReporter);
+  (void)::NS_RegisterMemoryReporter(mStorageSQLiteMultiReporter);
 
   return NS_OK;
 }
diff --git a/storage/src/mozStorageService.h b/storage/src/mozStorageService.h
index 18a70a220795..f0625af5067d 100644
--- a/storage/src/mozStorageService.h
+++ b/storage/src/mozStorageService.h
@@ -17,7 +17,6 @@
 #include "mozIStorageService.h"
 
 class nsIMemoryReporter;
-class nsIMemoryMultiReporter;
 class nsIXPConnect;
 struct sqlite3_vfs;
 
@@ -173,8 +172,8 @@ private:
 
   nsCOMPtr<nsIFile> mProfileStorageFile;
 
-  nsCOMPtr<nsIMemoryReporter> mStorageSQLiteReporter;
-  nsCOMPtr<nsIMemoryMultiReporter> mStorageSQLiteMultiReporter;
+  nsCOMPtr<nsIMemoryReporter> mStorageSQLiteUniReporter;
+  nsCOMPtr<nsIMemoryReporter> mStorageSQLiteMultiReporter;
 
   static Service *gService;
 
diff --git a/toolkit/components/aboutmemory/content/aboutMemory.js b/toolkit/components/aboutmemory/content/aboutMemory.js
index cb9170734d2c..6e5320911ec3 100644
--- a/toolkit/components/aboutmemory/content/aboutMemory.js
+++ b/toolkit/components/aboutmemory/content/aboutMemory.js
@@ -166,49 +166,32 @@ function onUnload()
 //---------------------------------------------------------------------------
 
 /**
- * Iterates over each reporter and multi-reporter.
+ * Iterates over each reporter.
  *
- * @param aIgnoreSingle
- *        Function that indicates if we should skip a single reporter, based
- *        on its path.
- * @param aIgnoreMulti
- *        Function that indicates if we should skip a multi-reporter, based on
- *        its name.
+ * @param aIgnoreReporter
+ *        Function that indicates if we should skip an entire reporter, based
+ *        on its name.
+ * @param aIgnoreReport
+ *        Function that indicates if we should skip a single report from a
+ *        reporter, based on its path.
  * @param aHandleReport
- *        The function that's called for each report.
+ *        The function that's called for each non-skipped report.
  */
-function processMemoryReporters(aIgnoreSingle, aIgnoreMulti, aHandleReport)
+function processMemoryReporters(aIgnoreReporter, aIgnoreReport, aHandleReport)
 {
-  // Process each memory reporter with aHandleReport.
-  //
-  // - Note that copying rOrig.amount (which calls a C++ function under the
-  //   IDL covers) to r._amount for every reporter now means that the
-  //   results as consistent as possible -- measurements are made all at
-  //   once before most of the memory required to generate this page is
-  //   allocated.
-  //
-  // - After this point we never use the original memory report again.
-
-  let e = gMgr.enumerateReporters();
-  while (e.hasMoreElements()) {
-    let rOrig = e.getNext().QueryInterface(Ci.nsIMemoryReporter);
-    let unsafePath = rOrig.path;
-    if (!aIgnoreSingle(unsafePath)) {
-      aHandleReport(rOrig.process, unsafePath, rOrig.kind, rOrig.units,
-                    rOrig.amount, rOrig.description);
+  let handleReport = function(aProcess, aUnsafePath, aKind, aUnits,
+                              aAmount, aDescription) {
+    if (!aIgnoreReport(aUnsafePath)) {
+      aHandleReport(aProcess, aUnsafePath, aKind, aUnits, aAmount,
+                    aDescription, /* presence = */ undefined);
     }
   }
 
-  let e = gMgr.enumerateMultiReporters();
+  let e = gMgr.enumerateReporters();
   while (e.hasMoreElements()) {
-    let mr = e.getNext().QueryInterface(Ci.nsIMemoryMultiReporter);
-    if (!aIgnoreMulti(mr.name)) {
+    let mr = e.getNext().QueryInterface(Ci.nsIMemoryReporter);
+    if (!aIgnoreReporter(mr.name)) {
       // |collectReports| never passes in a |presence| argument.
-      let handleReport = function(aProcess, aUnsafePath, aKind, aUnits,
-                                  aAmount, aDescription) {
-        aHandleReport(aProcess, aUnsafePath, aKind, aUnits, aAmount,
-                      aDescription, /* presence = */ undefined);
-      }
       mr.collectReports(handleReport, null);
     }
   }
@@ -219,19 +202,19 @@ function processMemoryReporters(aIgnoreSingle, aIgnoreMulti, aHandleReport)
  *
  * @param aReports
  *        Array of reports, read from a file or the clipboard.
- * @param aIgnoreSingle
- *        Function that indicates if we should skip a single reporter, based
+ * @param aIgnoreReport
+ *        Function that indicates if we should skip a single report, based
  *        on its path.
  * @param aHandleReport
  *        The function that's called for each report.
  */
-function processMemoryReportsFromFile(aReports, aIgnoreSingle, aHandleReport)
+function processMemoryReportsFromFile(aReports, aIgnoreReport, aHandleReport)
 {
   // Process each memory reporter with aHandleReport.
 
   for (let i = 0; i < aReports.length; i++) {
     let r = aReports[i];
-    if (!aIgnoreSingle(r.path)) {
+    if (!aIgnoreReport(r.path)) {
       aHandleReport(r.process, r.path, r.kind, r.units, r.amount,
                     r.description, r._presence);
     }
@@ -591,10 +574,7 @@ function updateAboutMemoryFromReporters()
 
   try {
     // Process the reports from the memory reporters.
-    let process = function(aIgnoreSingle, aIgnoreMulti, aHandleReport) {
-      processMemoryReporters(aIgnoreSingle, aIgnoreMulti, aHandleReport);
-    }
-    appendAboutMemoryMain(process, gMgr.hasMozMallocUsableSize,
+    appendAboutMemoryMain(processMemoryReporters, gMgr.hasMozMallocUsableSize,
                           /* forceShowSmaps = */ false);
 
   } catch (ex) {
@@ -621,8 +601,8 @@ function updateAboutMemoryFromJSONObject(aObj)
                 "missing 'hasMozMallocUsableSize' property");
     assertInput(aObj.reports && aObj.reports instanceof Array,
                 "missing or non-array 'reports' property");
-    let process = function(aIgnoreSingle, aIgnoreMulti, aHandleReport) {
-      processMemoryReportsFromFile(aObj.reports, aIgnoreSingle, aHandleReport);
+    let process = function(aIgnoreReporter, aIgnoreReport, aHandleReport) {
+      processMemoryReportsFromFile(aObj.reports, aIgnoreReport, aHandleReport);
     }
     appendAboutMemoryMain(process, aObj.hasMozMallocUsableSize,
                           /* forceShowSmaps = */ true);
@@ -973,7 +953,7 @@ function PColl()
  * Processes reports (whether from reporters or from a file) and append the
  * main part of the page.
  *
- * @param aProcess
+ * @param aProcessReports
  *        Function that extracts the memory reports from the reporters or from
  *        file.
  * @param aHasMozMallocUsableSize
@@ -982,10 +962,10 @@ function PColl()
  *        True if we should show the smaps memory reporters even if we're not
  *        in verbose mode.
  */
-function appendAboutMemoryMain(aProcess, aHasMozMallocUsableSize,
+function appendAboutMemoryMain(aProcessReports, aHasMozMallocUsableSize,
                                aForceShowSmaps)
 {
-  let pcollsByProcess = getPCollsByProcess(aProcess, aForceShowSmaps);
+  let pcollsByProcess = getPCollsByProcess(aProcessReports, aForceShowSmaps);
 
   // Sort the processes.
   let processes = Object.keys(pcollsByProcess);
@@ -1043,7 +1023,7 @@ function appendAboutMemoryMain(aProcess, aHasMozMallocUsableSize,
  * This function reads all the memory reports, and puts that data in structures
  * that will be used to generate the page.
  *
- * @param aProcessMemoryReports
+ * @param aProcessReports
  *        Function that extracts the memory reports from the reporters or from
  *        file.
  * @param aForceShowSmaps
@@ -1051,7 +1031,7 @@ function appendAboutMemoryMain(aProcess, aHasMozMallocUsableSize,
  *        in verbose mode.
  * @return The table of PColls by process.
  */
-function getPCollsByProcess(aProcessMemoryReports, aForceShowSmaps)
+function getPCollsByProcess(aProcessReports, aForceShowSmaps)
 {
   let pcollsByProcess = {};
 
@@ -1060,23 +1040,28 @@ function getPCollsByProcess(aProcessMemoryReports, aForceShowSmaps)
   // be in parentheses, so a ')' might appear after the '.'.)
   const gSentenceRegExp = /^[A-Z].*\.\)?$/m;
 
-  // Ignore the "smaps" multi-reporter in non-verbose mode unless we're reading
-  // from a file or the clipboard, and ignore the "compartments" and
-  // "ghost-windows" multi-reporters all the time.  (Note that reports from
-  // these multi-reporters can reach here as single reports if they were in the
-  // child process.)
+  // Ignore the "smaps" reporter in non-verbose mode unless we're reading from
+  // a file or the clipboard, and ignore the "compartments" and "ghost-windows"
+  // reporters all the time.  (Note that reports from these reporters can reach
+  // here via a "content-child" reporter if they were in a child process.)
   //
-  // Also ignore the resident-fast reporter; we use the vanilla resident
+  // Also ignore the "resident-fast" reporter; we use the vanilla "resident"
   // reporter because it's more important that we get accurate results than
   // that we avoid the (small) possibility of a long pause when loading
-  // about:memory.
-  //
-  // We don't show both resident and resident-fast because running the resident
-  // reporter can purge pages on MacOS, which affects the results of the
-  // resident-fast reporter.  We don't want about:memory's results to be
-  // affected by the order of memory reporter execution.
+  // about:memory.  Furthermore, the "resident" reporter can purge pages on
+  // MacOS, which affects the results of the "resident-fast" reporter, and we
+  // don't want the measurements shown in about:memory to be affected by the
+  // (arbitrary) order of memory reporter execution.
 
-  function ignoreSingle(aUnsafePath)
+  function ignoreReporter(aName)
+  {
+    return (aName === "smaps" && !gVerbose.checked && !aForceShowSmaps) ||
+           aName === "compartments" ||
+           aName === "ghost-windows" ||
+           aName === "resident-fast";
+  }
+
+  function ignoreReport(aUnsafePath)
   {
     return (isSmapsPath(aUnsafePath) && !gVerbose.checked && !aForceShowSmaps) ||
            aUnsafePath.startsWith("compartments/") ||
@@ -1084,13 +1069,6 @@ function getPCollsByProcess(aProcessMemoryReports, aForceShowSmaps)
            aUnsafePath == "resident-fast";
   }
 
-  function ignoreMulti(aMRName)
-  {
-    return (aMRName === "smaps" && !gVerbose.checked && !aForceShowSmaps) ||
-            aMRName === "compartments" ||
-            aMRName === "ghost-windows";
-  }
-
   function handleReport(aProcess, aUnsafePath, aKind, aUnits, aAmount,
                         aDescription, aPresence)
   {
@@ -1171,7 +1149,7 @@ function getPCollsByProcess(aProcessMemoryReports, aForceShowSmaps)
     }
   }
 
-  aProcessMemoryReports(ignoreSingle, ignoreMulti, handleReport);
+  aProcessReports(ignoreReporter, ignoreReport, handleReport);
 
   return pcollsByProcess;
 }
@@ -2107,18 +2085,18 @@ Compartment.prototype = {
 
 function getCompartmentsByProcess()
 {
-  // Ignore anything that didn't come from the "compartments" multi-reporter.
-  // (Note that some such reports can reach here as single reports if they were
-  // in the child process.)
+  // Ignore anything that didn't come from the "compartments" reporter.  (Note
+  // reports from this reporter can reach here via a "content-child" reporter
+  // if they were in a child process.)
 
-  function ignoreSingle(aUnsafePath)
+  function ignoreReporter(aName)
   {
-    return !aUnsafePath.startsWith("compartments/");
+    return !(aName == "compartments" || aName == "content-child");
   }
 
-  function ignoreMulti(aMRName)
+  function ignoreReport(aUnsafePath)
   {
-    return aMRName !== "compartments";
+    return !aUnsafePath.startsWith("compartments/");
   }
 
   let compartmentsByProcess = {};
@@ -2169,7 +2147,7 @@ function getCompartmentsByProcess()
     }
   }
 
-  processMemoryReporters(ignoreSingle, ignoreMulti, handleReport);
+  processMemoryReporters(ignoreReporter, ignoreReport, handleReport);
 
   return compartmentsByProcess;
 }
@@ -2191,14 +2169,14 @@ GhostWindow.prototype = {
 
 function getGhostWindowsByProcess()
 {
-  function ignoreSingle(aUnsafePath)
+  function ignoreReporter(aName)
   {
-    return !aUnsafePath.startsWith('ghost-windows/')
+    return !(aName == "ghost-windows" || aName == "content-child");
   }
 
-  function ignoreMulti(aName)
+  function ignoreReport(aUnsafePath)
   {
-    return aName !== "ghost-windows";
+    return !aUnsafePath.startsWith('ghost-windows/')
   }
 
   let ghostWindowsByProcess = {};
@@ -2230,7 +2208,7 @@ function getGhostWindowsByProcess()
     }
   }
 
-  processMemoryReporters(ignoreSingle, ignoreMulti, handleReport);
+  processMemoryReporters(ignoreReporter, ignoreReport, handleReport);
 
   return ghostWindowsByProcess;
 }
diff --git a/toolkit/components/aboutmemory/tests/test_aboutcompartments.xul b/toolkit/components/aboutmemory/tests/test_aboutcompartments.xul
index aaab20563058..160a673bd664 100644
--- a/toolkit/components/aboutmemory/tests/test_aboutcompartments.xul
+++ b/toolkit/components/aboutmemory/tests/test_aboutcompartments.xul
@@ -24,8 +24,7 @@
   let mgr = Cc["@mozilla.org/memory-reporter-manager;1"].
             getService(Ci.nsIMemoryReporterManager);
 
-  // Remove all the real reporters and multi-reporters;  save them to
-  // restore at the end.
+  // Remove all the real reporters;  save them to restore at the end.
   mgr.blockRegistration();
   var e = mgr.enumerateReporters();
   var realReporters = [];
@@ -34,13 +33,6 @@
     mgr.unregisterReporter(r);
     realReporters.push(r);
   }
-  e = mgr.enumerateMultiReporters();
-  var realMultiReporters = [];
-  while (e.hasMoreElements()) {
-    var r = e.getNext().QueryInterface(Ci.nsIMemoryMultiReporter);
-    mgr.unregisterMultiReporter(r);
-    realMultiReporters.push(r);
-  }
 
   // Setup various fake-but-deterministic reporters.
   const KB = 1024;
@@ -52,41 +44,39 @@
   const BYTES = Ci.nsIMemoryReporter.UNITS_BYTES;
   const COUNT = Ci.nsIMemoryReporter.UNITS_COUNT;
 
-  function f(aProcess, aPath, aKind, aUnits, aAmount) {
-    return {
-      process:     aProcess,
-      path:        aPath,
-      kind:        aKind,
-      units:       aUnits,
-      description: "",
-      amount:      aAmount 
-    };
-  }
-
   var fakeReporters = [
-    // These should be ignored.
-    f("", "explicit/a",         HEAP,    BYTES, 222 * MB),
-    f("", "explicit/b/a",       HEAP,    BYTES,  85 * MB),
-    f("", "explicit/b/b",       NONHEAP, BYTES,  85 * MB),
-    f("", "other1",             OTHER,   BYTES, 111 * MB),
-    f("", "other2",             OTHER,   COUNT, 888),
-
-    f("2nd", "explicit/c",      HEAP,    BYTES, 333 * MB),
-    f("2nd", "compartments/user/child-user-compartment",     OTHER, COUNT, 1),
-    f("2nd", "compartments/system/child-system-compartment", OTHER, COUNT, 1)
-  ];
-
-  var fakeMultiReporters = [
-    // These shouldn't show up.
-    { name: "fake",
+    { name: "fake1",
+      collectReports: function(aCbObj, aClosure) {
+        function f(aP1, aP2, aK, aU, aA) {
+          aCbObj.callback(aP1, aP2, aK, aU, aA, "Desc.", aClosure);
+        }
+        // These should be ignored.
+        f("", "explicit/a",         HEAP,    BYTES, 222 * MB);
+        f("", "explicit/b/a",       HEAP,    BYTES,  85 * MB);
+        f("", "explicit/b/b",       NONHEAP, BYTES,  85 * MB);
+        f("", "other1",             OTHER,   BYTES, 111 * MB);
+        f("", "other2",             OTHER,   COUNT, 888);
+      }
+    },
+    { name: "fake2",
       collectReports: function(aCbObj, aClosure) {
         function f(aP, aK, aU, aA) {
           aCbObj.callback("", aP, aK, aU, aA, "Desc.", aClosure);
         }
+        // These shouldn't show up.
         f("explicit/a/d",     HEAP,    BYTES,  13 * MB);
         f("explicit/b/c",     NONHEAP, BYTES,  10 * MB);
-       },
-       explicitNonHeap: 10*MB
+       }
+    },
+    { name: "content-child",
+      collectReports: function(aCbObj, aClosure) {
+        function f(aP1, aP2, aK, aU, aA, aD) {
+          aCbObj.callback(aP1, aP2, aK, aU, aA, aD, aClosure);
+        }
+        f("2nd", "explicit/c",      HEAP,    BYTES, 333 * MB, "Desc.");
+        f("2nd", "compartments/user/child-user-compartment",     OTHER, COUNT, 1, "");
+        f("2nd", "compartments/system/child-system-compartment", OTHER, COUNT, 1, "");
+      }
     },
     { name: "compartments",
       collectReports: function(aCbObj, aClosure) {
@@ -104,8 +94,7 @@
         f("compartments/system/[System Principal]");
         f("compartments/system/[System Principal]");
         f("compartments/system/atoms");
-      },
-      explicitNonHeap: 0
+      }
     },
     { name: "ghost-windows",
       collectReports: function(aCbObj, aClosure) {
@@ -114,8 +103,7 @@
         }
         f("ghost-windows/https:\\\\very-long-url.com\\very-long\\oh-so-long\\really-quite-long.html?a=2&b=3&c=4&d=5&e=abcdefghijklmnopqrstuvwxyz&f=123456789123456789123456789");
         f("ghost-windows/http:\\\\foobar.com\\foo?bar#baz");
-      },
-      explicitNonHeap: 0
+      }
     },
     // These shouldn't show up.
     { name: "smaps",
@@ -126,17 +114,13 @@
         }
         f("smaps/vsize/a",     24);
         f("smaps/swap/a",       1);
-      },
-      explicitNonHeap: 0
+      }
     }
   ];
 
   for (var i = 0; i < fakeReporters.length; i++) {
     mgr.registerReporterEvenIfBlocked(fakeReporters[i]);
   }
-  for (var i = 0; i < fakeMultiReporters.length; i++) {
-    mgr.registerMultiReporterEvenIfBlocked(fakeMultiReporters[i]);
-  }
   ]]>
   </script>
 
@@ -180,21 +164,14 @@ Ghost Windows\n\
 
   function finish()
   {
-    // Unregister fake reporters and multi-reporters, re-register the real
-    // reporters and multi-reporters, just in case subsequent tests rely on
-    // them.
+    // Unregister fake reporters and re-register the real reporters, just in
+    // case subsequent tests rely on them.
     for (var i = 0; i < fakeReporters.length; i++) {
       mgr.unregisterReporter(fakeReporters[i]);
     }
-    for (var i = 0; i < fakeMultiReporters.length; i++) {
-      mgr.unregisterMultiReporter(fakeMultiReporters[i]);
-    }
     for (var i = 0; i < realReporters.length; i++) {
       mgr.registerReporterEvenIfBlocked(realReporters[i]);
     }
-    for (var i = 0; i < realMultiReporters.length; i++) {
-      mgr.registerMultiReporterEvenIfBlocked(realMultiReporters[i]);
-    }
     mgr.unblockRegistration();
 
     SimpleTest.finish();
diff --git a/toolkit/components/aboutmemory/tests/test_aboutmemory.xul b/toolkit/components/aboutmemory/tests/test_aboutmemory.xul
index 84fe972f206f..cf1b9421b7c4 100644
--- a/toolkit/components/aboutmemory/tests/test_aboutmemory.xul
+++ b/toolkit/components/aboutmemory/tests/test_aboutmemory.xul
@@ -27,8 +27,7 @@
   let mgr = Cc["@mozilla.org/memory-reporter-manager;1"].
             getService(Ci.nsIMemoryReporterManager);
 
-  // Remove all the real reporters and multi-reporters;  save them to
-  // restore at the end.
+  // Remove all the real reporters;  save them to restore at the end.
   mgr.blockRegistration();
   let e = mgr.enumerateReporters();
   let realReporters = [];
@@ -37,13 +36,6 @@
     mgr.unregisterReporter(r);
     realReporters.push(r);
   }
-  e = mgr.enumerateMultiReporters();
-  let realMultiReporters = [];
-  while (e.hasMoreElements()) {
-    let r = e.getNext().QueryInterface(Ci.nsIMemoryMultiReporter);
-    mgr.unregisterMultiReporter(r);
-    realMultiReporters.push(r);
-  }
 
   // Setup various fake-but-deterministic reporters.
   const KB = 1024;
@@ -57,71 +49,60 @@
   const COUNT_CUMULATIVE = Ci.nsIMemoryReporter.UNITS_COUNT_CUMULATIVE;
   const PERCENTAGE = Ci.nsIMemoryReporter.UNITS_PERCENTAGE;
 
-  function f2(aProcess, aPath, aKind, aUnits, aAmount) {
-    return {
-      process:     aProcess,
-      path:        aPath,
-      kind:        aKind,
-      units:       aUnits,
-      description: "Desc.",
-      amount:      aAmount 
-    };
-  }
-
-  function f(aProcess, aPath, aKind, aAmount) {
-    return f2(aProcess, aPath, aKind, BYTES, aAmount);
-  }
-
   let fakeReporters = [
-    f("", "heap-allocated",     OTHER,   500 * MB),
-    f("", "heap-unallocated",   OTHER,   100 * MB),
-    f("", "explicit/a",         HEAP,    222 * MB),
-    f("", "explicit/b/a",       HEAP,     85 * MB),
-    f("", "explicit/b/b",       HEAP,     75 * MB),
-    f("", "explicit/b/c/a",     HEAP,     70 * MB),
-    f("", "explicit/b/c/b",     HEAP,      2 * MB), // omitted
-    f("", "explicit/g/a",       HEAP,      6 * MB),
-    f("", "explicit/g/b",       HEAP,      5 * MB),
-    f("", "explicit/g/other",   HEAP,      4 * MB),
-    // A degenerate tree with the same name as a non-degenerate tree should
-    // work ok.
-    f("", "explicit",           OTHER,   888 * MB),
-    f("", "other1/a/b",         OTHER,   111 * MB),
-    f("", "other1/c/d",         OTHER,    22 * MB),
-    f("", "other1/c/e",         OTHER,    33 * MB),
-    f2("", "other4",            OTHER,   COUNT_CUMULATIVE, 777),
-    f2("", "other4",            OTHER,   COUNT_CUMULATIVE, 111),
-    f2("", "other3/a/b/c/d/e",  OTHER,   PERCENTAGE, 2000),
-    f2("", "other3/a/b/c/d/f",  OTHER,   PERCENTAGE, 10),
-    f2("", "other3/a/b/c/d/g",  OTHER,   PERCENTAGE, 5),
-    f2("", "other3/a/b/c/d/g",  OTHER,   PERCENTAGE, 5),
-    // Check that a rounded-up-to-100.00% value is shown as "100.0%" (i.e. one
-    // decimal point).
-    f2("", "other6/big",        OTHER,   COUNT, 99999),
-    f2("", "other6/small",      OTHER,   COUNT, 1),
-    // Check that a 0 / 0 is handled correctly.
-    f("", "other7/zero",        OTHER,   0),
-    // These compartments ones shouldn't be displayed.
-    f2("", "compartments/user/foo",   OTHER, COUNT, 1),
-    f2("", "compartments/system/foo", OTHER, COUNT, 1)
-  ];
-  let fakeMultiReporters = [
+    { name: "fake0",
+      collectReports: function(aCbObj, aClosure) {
+        function f(aP, aK, aU, aA) {
+          aCbObj.callback("", aP, aK, aU, aA, "Desc.", aClosure);
+        }
+        f("heap-allocated",     OTHER,   BYTES, 500 * MB);
+        f("heap-unallocated",   OTHER,   BYTES, 100 * MB);
+        f("explicit/a",         HEAP,    BYTES, 222 * MB);
+        f("explicit/b/a",       HEAP,    BYTES,  85 * MB);
+        f("explicit/b/b",       HEAP,    BYTES,  75 * MB);
+        f("explicit/b/c/a",     HEAP,    BYTES,  70 * MB);
+        f("explicit/b/c/b",     HEAP,    BYTES,   2 * MB); // omitted
+        f("explicit/g/a",       HEAP,    BYTES,   6 * MB);
+        f("explicit/g/b",       HEAP,    BYTES,   5 * MB);
+        f("explicit/g/other",   HEAP,    BYTES,   4 * MB);
+        // A degenerate tree with the same name as a non-degenerate tree should
+        // work ok.
+        f("explicit",           OTHER,   BYTES, 888 * MB);
+        f("other1/a/b",         OTHER,   BYTES, 111 * MB);
+        f("other1/c/d",         OTHER,   BYTES,  22 * MB);
+        f("other1/c/e",         OTHER,   BYTES,  33 * MB);
+        f("other4",             OTHER,   COUNT_CUMULATIVE, 777);
+        f("other4",             OTHER,   COUNT_CUMULATIVE, 111);
+        f("other3/a/b/c/d/e",   OTHER,   PERCENTAGE, 2000);
+        f("other3/a/b/c/d/f",   OTHER,   PERCENTAGE, 10);
+        f("other3/a/b/c/d/g",   OTHER,   PERCENTAGE, 5);
+        f("other3/a/b/c/d/g",   OTHER,   PERCENTAGE, 5);
+        // Check that a rounded-up-to-100.00% value is shown as "100.0%" (i.e. one
+        // decimal point).
+        f("other6/big",         OTHER,   COUNT, 99999);
+        f("other6/small",       OTHER,   COUNT, 1);
+        // Check that a 0 / 0 is handled correctly.
+        f("other7/zero",        OTHER,   BYTES, 0);
+        // These compartments ones shouldn't be displayed.
+        f("compartments/user/foo",   OTHER, COUNT, 1);
+        f("compartments/system/foo", OTHER, COUNT, 1);
+      }
+    },
     { name: "fake1",
       collectReports: function(aCbObj, aClosure) {
         function f(aP, aK, aU, aA) {
           aCbObj.callback("", aP, aK, aU, aA, "Desc.", aClosure);
         }
-        f("explicit/c/d",     NONHEAP, BYTES,  13 * MB),
-        f("explicit/c/d",     NONHEAP, BYTES,  10 * MB), // dup
-        f("explicit/c/other", NONHEAP, BYTES,  77 * MB),
+        f("explicit/c/d",     NONHEAP, BYTES,  13 * MB);
+        f("explicit/c/d",     NONHEAP, BYTES,  10 * MB); // dup
+        f("explicit/c/other", NONHEAP, BYTES,  77 * MB);
         f("explicit/cc",      NONHEAP, BYTES,  13 * MB);
         f("explicit/cc",      NONHEAP, BYTES,  10 * MB); // dup
         f("explicit/d",       NONHEAP, BYTES, 499 * KB); // omitted
         f("explicit/e",       NONHEAP, BYTES, 100 * KB); // omitted
         f("explicit/f/g/h/i", HEAP,    BYTES,  10 * MB);
         f("explicit/f/g/h/j", HEAP,    BYTES,  10 * MB);
-      },
-      explicitNonHeap: (100 + 13 + 10)*MB + (499 + 100)*KB
+      }
     },
     { name: "fake2",
       collectReports: function(aCbObj, aClosure) {
@@ -132,8 +113,7 @@
         f("other2",           OTHER,   BYTES, 222 * MB);
         f("perc2",            OTHER,   PERCENTAGE, 10000);
         f("perc1",            OTHER,   PERCENTAGE, 4567);
-      },
-      explicitNonHeap: 0
+      }
     },
     { name: "smaps",
       collectReports: function(aCbObj, aClosure) {
@@ -148,8 +128,7 @@
         f("swap/b/c",     10);
         f("rss/a",        42);
         f("pss/a",        43);
-      },
-      explicitNonHeap: 0
+      }
     },
     { name: "compartments",
       collectReports: function(aCbObj, aClosure) {
@@ -158,16 +137,12 @@
         }
         f("compartments/user/bar");
         f("compartments/system/bar");
-      },
-      explicitNonHeap: 0
+      }
     }
   ];
   for (let i = 0; i < fakeReporters.length; i++) {
     mgr.registerReporterEvenIfBlocked(fakeReporters[i]);
   }
-  for (let i = 0; i < fakeMultiReporters.length; i++) {
-    mgr.registerMultiReporterEvenIfBlocked(fakeMultiReporters[i]);
-  }
 
   // mgr.explicit sums "heap-allocated" and all the appropriate NONHEAP ones:
   // - "explicit/c", "explicit/cc" x 2, "explicit/d", "explicit/e"
@@ -189,59 +164,74 @@
   // the largest).  Processes without a |resident| memory reporter are saved
   // for the end.
   let fakeReporters2 = [
-    f("2nd", "heap-allocated",  OTHER,  1000 * MB),
-    f("2nd", "heap-unallocated",OTHER,   100 * MB),
-    f("2nd", "explicit/a/b/c",  HEAP,    497 * MB),
-    f("2nd", "explicit/a/b/c",  HEAP,      1 * MB), // dup: merge
-    f("2nd", "explicit/a/b/c",  HEAP,      1 * MB), // dup: merge
-    f("2nd", "explicit/flip\\the\\backslashes",
-                                HEAP,    200 * MB),
-    f("2nd", "explicit/compartment(compartment-url)",
-                                HEAP,    200 * MB),
-    f("2nd", "other0",          OTHER,   666 * MB),
-    f("2nd", "other1",          OTHER,   111 * MB),
-    // Even though the "smaps" reporter is a multi-reporter, if its in a
-    // child process it'll be passed to the main process as single reports.
-    // The fact that we skip the "smaps" multi-reporter in the main
-    // process won't cause these to be skipped;  the fall-back skipping will
-    // be hit instead.
-    f("2nd", "size/e",          NONHEAP, 24*4*KB),
-    f("2nd", "size/f",          NONHEAP, 24*4*KB),
+    { name: "resident-fast",
+      collectReports: function(aCbObj, aClosure) {
+        // Shouldn't reach here;  aboutMemory.js should skip the reporter.
+        // (Nb: this must come after |mgr.explicit| is accessed, otherwise it
+        // *will* be run by nsMemoryReporterManager::GetExplicit()).
+        ok(false, "'resident-fast' reporter was run");
+      }
+    },
+    { name: "fake3",
+      collectReports: function(aCbObj, aClosure) {
+        function f(aP1, aP2, aK, aU, aA) {
+          aCbObj.callback(aP1, aP2, aK, aU, aA, "Desc.", aClosure);
+        }
+        f("2nd", "heap-allocated",  OTHER,   BYTES,1000* MB);
+        f("2nd", "heap-unallocated",OTHER,   BYTES,100 * MB);
+        f("2nd", "explicit/a/b/c",  HEAP,    BYTES,497 * MB);
+        f("2nd", "explicit/a/b/c",  HEAP,    BYTES,  1 * MB); // dup: merge
+        f("2nd", "explicit/a/b/c",  HEAP,    BYTES,  1 * MB); // dup: merge
+        f("2nd", "explicit/flip\\the\\backslashes",
+                                    HEAP,    BYTES,200 * MB);
+        f("2nd", "explicit/compartment(compartment-url)",
+                                    HEAP,    BYTES,200 * MB);
+        f("2nd", "other0",          OTHER,   BYTES,666 * MB);
+        f("2nd", "other1",          OTHER,   BYTES,111 * MB);
+        // If the "smaps" reporter is in a child process it'll be passed to
+        // the main process under a different name.  The fact that we skip
+        // the "smaps" reporter in the main process won't cause these
+        // to be skipped;  the report-level skipping will be hit instead.
+        f("2nd", "size/e",          NONHEAP, BYTES,24*4*KB);
+        f("2nd", "size/f",          NONHEAP, BYTES,24*4*KB);
+        f("2nd", "resident-fast",   NONHEAP, BYTES,24*4*KB); // ignored!
 
-    // Check that we can handle "heap-allocated" not being present.
-    f("3rd", "explicit/a/b",    HEAP,    333 * MB),
-    f("3rd", "explicit/a/c",    HEAP,    444 * MB),
-    f("3rd", "other1",          OTHER,     1 * MB),
-    f("3rd", "resident",        OTHER,   100 * MB),
+        // Check that we can handle "heap-allocated" not being present.
+        f("3rd", "explicit/a/b",    HEAP,    BYTES,333 * MB);
+        f("3rd", "explicit/a/c",    HEAP,    BYTES,444 * MB);
+        f("3rd", "other1",          OTHER,   BYTES,  1 * MB);
+        f("3rd", "resident",        OTHER,   BYTES,100 * MB);
 
-    // Invalid values (negative, too-big) should be identified.
-    f("4th", "heap-allocated",   OTHER,   100 * MB),
-    f("4th", "resident",         OTHER,   200 * MB),
-    f("4th", "explicit/js/compartment(http:\\\\too-big.com\\)/stuff",
-                                 HEAP,    150 * MB),
-    f("4th", "explicit/ok",      HEAP,      5 * MB),
-    f("4th", "explicit/neg1",    NONHEAP,  -2 * MB),
-    // -111 becomes "-0.00MB" in non-verbose mode, and getting the negative
-    // sign in there correctly is non-trivial.
-    f("4th",  "other1",          OTHER,   -111),
-    f("4th",  "other2",          OTHER,   -222 * MB),
-    f2("4th", "other3",          OTHER,   COUNT, -333),
-    f2("4th", "other4",          OTHER,   COUNT_CUMULATIVE, -444),
-    f2("4th", "other5",          OTHER,   PERCENTAGE, -555),
-    f2("4th", "other6",          OTHER,   PERCENTAGE, 66666),
+        // Invalid values (negative, too-big) should be identified.
+        f("4th", "heap-allocated",   OTHER,   BYTES,100 * MB);
+        f("4th", "resident",         OTHER,   BYTES,200 * MB);
+        f("4th", "explicit/js/compartment(http:\\\\too-big.com\\)/stuff",
+                                     HEAP,    BYTES,150 * MB);
+        f("4th", "explicit/ok",      HEAP,    BYTES,  5 * MB);
+        f("4th", "explicit/neg1",    NONHEAP, BYTES, -2 * MB);
+        // -111 becomes "-0.00MB" in non-verbose mode, and getting the negative
+        // sign in there correctly is non-trivial.
+        f("4th",  "other1",          OTHER,   BYTES,-111);
+        f("4th",  "other2",          OTHER,   BYTES,-222 * MB);
+        f("4th",  "other3",          OTHER,   COUNT, -333);
+        f("4th",  "other4",          OTHER,   COUNT_CUMULATIVE, -444);
+        f("4th",  "other5",          OTHER,   PERCENTAGE, -555);
+        f("4th",  "other6",          OTHER,   PERCENTAGE, 66666);
 
-    // If a negative value is within a collapsed sub-tree in non-verbose mode,
-    // we should get the warning at the top and the relevant sub-trees should
-    // be expanded, even in non-verbose mode.
-    f("5th", "heap-allocated",   OTHER,   100 * MB),
-    f("5th", "explicit/big",     HEAP,     99 * MB),
-    f("5th", "explicit/a/pos",   HEAP,     40 * KB),
-    f("5th", "explicit/a/neg1",  NONHEAP, -20 * KB),
-    f("5th", "explicit/a/neg2",  NONHEAP, -10 * KB),
-    f("5th", "explicit/b/c/d/e", NONHEAP,  20 * KB),
-    f("5th", "explicit/b/c/d/f", NONHEAP, -60 * KB),
-    f("5th", "explicit/b/c/g/h", NONHEAP,  10 * KB),
-    f("5th", "explicit/b/c/i/j", NONHEAP,   5 * KB)
+        // If a negative value is within a collapsed sub-tree in non-verbose mode,
+        // we should get the warning at the top and the relevant sub-trees should
+        // be expanded, even in non-verbose mode.
+        f("5th", "heap-allocated",   OTHER,   BYTES,100 * MB);
+        f("5th", "explicit/big",     HEAP,    BYTES, 99 * MB);
+        f("5th", "explicit/a/pos",   HEAP,    BYTES, 40 * KB);
+        f("5th", "explicit/a/neg1",  NONHEAP, BYTES,-20 * KB);
+        f("5th", "explicit/a/neg2",  NONHEAP, BYTES,-10 * KB);
+        f("5th", "explicit/b/c/d/e", NONHEAP, BYTES, 20 * KB);
+        f("5th", "explicit/b/c/d/f", NONHEAP, BYTES,-60 * KB);
+        f("5th", "explicit/b/c/g/h", NONHEAP, BYTES, 10 * KB);
+        f("5th", "explicit/b/c/i/j", NONHEAP, BYTES,  5 * KB);
+      }
+    }
   ];
   for (let i = 0; i < fakeReporters2.length; i++) {
     mgr.registerReporterEvenIfBlocked(fakeReporters2[i]);
@@ -586,21 +576,14 @@ Other Measurements\n\
 
   function finish()
   {
-    // Unregister fake reporters and multi-reporters, re-register the real
-    // reporters and multi-reporters, just in case subsequent tests rely on
-    // them.
+    // Unregister fake reporters and re-register the real reporters, just in
+    // case subsequent tests rely on them.
     for (let i = 0; i < fakeReporters.length; i++) {
       mgr.unregisterReporter(fakeReporters[i]);
     }
-    for (let i = 0; i < fakeMultiReporters.length; i++) {
-      mgr.unregisterMultiReporter(fakeMultiReporters[i]);
-    }
     for (let i = 0; i < realReporters.length; i++) {
       mgr.registerReporterEvenIfBlocked(realReporters[i]);
     }
-    for (let i = 0; i < realMultiReporters.length; i++) {
-      mgr.registerMultiReporterEvenIfBlocked(realMultiReporters[i]);
-    }
     mgr.unblockRegistration();
 
     SimpleTest.finish();
diff --git a/toolkit/components/aboutmemory/tests/test_aboutmemory2.xul b/toolkit/components/aboutmemory/tests/test_aboutmemory2.xul
index 830e1e3c02e1..d899bd4ad58c 100644
--- a/toolkit/components/aboutmemory/tests/test_aboutmemory2.xul
+++ b/toolkit/components/aboutmemory/tests/test_aboutmemory2.xul
@@ -22,8 +22,7 @@
   let mgr = Cc["@mozilla.org/memory-reporter-manager;1"].
             getService(Ci.nsIMemoryReporterManager);
 
-  // Remove all the real reporters and multi-reporters;  save them to
-  // restore at the end.
+  // Remove all the real reporters;  save them to restore at the end.
   mgr.blockRegistration();
   let e = mgr.enumerateReporters();
   let realReporters = [];
@@ -32,13 +31,6 @@
     mgr.unregisterReporter(r);
     realReporters.push(r);
   }
-  e = mgr.enumerateMultiReporters();
-  let realMultiReporters = [];
-  while (e.hasMoreElements()) {
-    let r = e.getNext().QueryInterface(Ci.nsIMemoryMultiReporter);
-    mgr.unregisterMultiReporter(r);
-    realMultiReporters.push(r);
-  }
 
   // Setup various fake-but-deterministic reporters.
   const KB = 1024;
@@ -47,35 +39,31 @@
   const OTHER = Ci.nsIMemoryReporter.KIND_OTHER;
   const BYTES = Ci.nsIMemoryReporter.UNITS_BYTES;
 
-  function f(aPath, aKind, aAmount) {
-    return {
-      process:     "",
-      path:        aPath,
-      kind:        aKind,
-      units:       BYTES,
-      description: "Desc.",
-      amount:      aAmount
-    };
-  }
-
-  let hiReport  = f("explicit/h/i",  HEAP,  10 * MB);
-  let hi2Report = f("explicit/h/i2", HEAP,   9 * MB);
-  let jkReport  = f("explicit/j/k",  HEAP, 0.5 * MB);
-  let jk2Report = f("explicit/j/k2", HEAP, 0.3 * MB);
+  let hiPath  = "explicit/h/i";
+  let hi2Path = "explicit/h/i2";
+  let jkPath  = "explicit/j/k";
+  let jk2Path = "explicit/j/k2";
 
   let fakeReporters = [
-    f("heap-allocated",     OTHER,   250 * MB),
-    f("explicit/a/b",       HEAP,     50 * MB),
-    f("explicit/a/c/d",     HEAP,     25 * MB),
-    f("explicit/a/c/e",     HEAP,     15 * MB),
-    f("explicit/a/f",       HEAP,     30 * MB),
-    f("explicit/g",         HEAP,    100 * MB),
-    hiReport,
-    hi2Report,
-    jkReport,
-    jk2Report,
-    f("explicit/a/l/m",     HEAP,    0.1 * MB),
-    f("explicit/a/l/n",     HEAP,    0.1 * MB),
+    { name: "fake1",
+      collectReports: function(aCbObj, aClosure) {
+        function f(aP, aK, aA) {
+          aCbObj.callback("", aP, aK, BYTES, aA, "Desc.", aClosure);
+        }
+        f("heap-allocated",     OTHER,   250 * MB);
+        f("explicit/a/b",       HEAP,     50 * MB);
+        f("explicit/a/c/d",     HEAP,     25 * MB);
+        f("explicit/a/c/e",     HEAP,     15 * MB);
+        f("explicit/a/f",       HEAP,     30 * MB);
+        f("explicit/g",         HEAP,    100 * MB);
+        f(hiPath,               HEAP,     10 * MB);
+        f(hi2Path,              HEAP,      9 * MB);
+        f(jkPath,               HEAP,    0.5 * MB);
+        f(jk2Path,              HEAP,    0.3 * MB);
+        f("explicit/a/l/m",     HEAP,    0.1 * MB);
+        f("explicit/a/l/n",     HEAP,    0.1 * MB);
+      }
+    }
   ];
 
   for (let i = 0; i < fakeReporters.length; i++) {
@@ -91,18 +79,14 @@
   <![CDATA[
   function finish()
   {
-    // Unregister fake reporters and multi-reporters, re-register the real
-    // reporters and multi-reporters, just in case subsequent tests rely on
-    // them.
+    // Unregister fake reporters and re-register the real reporters, just in
+    // case subsequent tests rely on them.
     for (let i = 0; i < fakeReporters.length; i++) {
       mgr.unregisterReporter(fakeReporters[i]);
     }
     for (let i = 0; i < realReporters.length; i++) {
       mgr.registerReporterEvenIfBlocked(realReporters[i]);
     }
-    for (let i = 0; i < realMultiReporters.length; i++) {
-      mgr.registerMultiReporterEvenIfBlocked(realMultiReporters[i]);
-    }
     mgr.unblockRegistration();
 
     SimpleTest.finish();
@@ -119,13 +103,13 @@
       // click on a child of the span identified via |id|.
       if (node.nodeName === "button") {
         if (aSwap) {
-          // We swap the paths of hiReport/hi2Report and jkReport/jk2Report
-          // just before updating, to test what happens when significant nodes
-          // become insignificant and vice versa.
-          hiReport.path  = "explicit/j/k";
-          hi2Report.path = "explicit/j/k2";
-          jkReport.path  = "explicit/h/i";
-          jk2Report.path = "explicit/h/i2";
+          // We swap hipath/hi2Path and jkPath/jk2Path just before updating, to
+          // test what happens when significant nodes become insignificant and
+          // vice versa.
+          hiPath  = "explicit/j/k";
+          hi2Path = "explicit/j/k2";
+          jkPath  = "explicit/h/i";
+          jk2Path = "explicit/h/i2";
         }
         node.click();
       } else {
diff --git a/toolkit/components/aboutmemory/tests/test_aboutmemory3.xul b/toolkit/components/aboutmemory/tests/test_aboutmemory3.xul
index 26c29a7017f8..38c55f7d858b 100644
--- a/toolkit/components/aboutmemory/tests/test_aboutmemory3.xul
+++ b/toolkit/components/aboutmemory/tests/test_aboutmemory3.xul
@@ -22,8 +22,7 @@
   let mgr = Cc["@mozilla.org/memory-reporter-manager;1"].
             getService(Ci.nsIMemoryReporterManager);
 
-  // Remove all the real reporters and multi-reporters;  save them to
-  // restore at the end.
+  // Remove all the real reporters;  save them to restore at the end.
   mgr.blockRegistration();
   let e = mgr.enumerateReporters();
   let realReporters = [];
@@ -32,13 +31,6 @@
     mgr.unregisterReporter(r);
     realReporters.push(r);
   }
-  e = mgr.enumerateMultiReporters();
-  let realMultiReporters = [];
-  while (e.hasMoreElements()) {
-    let r = e.getNext().QueryInterface(Ci.nsIMemoryMultiReporter);
-    mgr.unregisterMultiReporter(r);
-    realMultiReporters.push(r);
-  }
 
   // Setup a minimal number of fake reporters.
   const KB = 1024;
@@ -47,22 +39,18 @@
   const OTHER = Ci.nsIMemoryReporter.KIND_OTHER;
   const BYTES = Ci.nsIMemoryReporter.UNITS_BYTES;
 
-  function f(aPath, aKind, aAmount, aDesc) {
-    return {
-      process:     "",
-      path:        aPath,
-      kind:        aKind,
-      units:       BYTES,
-      amount:      aAmount,
-      description: aDesc
-    };
-  }
-
   let fakeReporters = [
-    f("heap-allocated",     OTHER,   250 * MB, "Heap allocated."),
-    f("explicit/a/b",       HEAP,     50 * MB, "A b."),
-    f("other/a",            OTHER,   0.2 * MB, "Other a."),
-    f("other/b",            OTHER,   0.1 * MB, "Other b."),
+    { name: "fake1",
+      collectReports: function(aCbObj, aClosure) {
+        function f(aP, aK, aA, aD) {
+          aCbObj.callback("", aP, aK, BYTES, aA, aD, aClosure);
+        }
+        f("heap-allocated",     OTHER,   250 * MB, "Heap allocated.");
+        f("explicit/a/b",       HEAP,     50 * MB, "A b.");
+        f("other/a",            OTHER,   0.2 * MB, "Other a.");
+        f("other/b",            OTHER,   0.1 * MB, "Other b.");
+      }
+    }
   ];
 
   for (let i = 0; i < fakeReporters.length; i++) {
@@ -78,18 +66,14 @@
   <![CDATA[
   function finish()
   {
-    // Unregister fake reporters and multi-reporters, re-register the real
-    // reporters and multi-reporters, just in case subsequent tests rely on
-    // them.
+    // Unregister fake reporters and re-register the real reporters, just in
+    // case subsequent tests rely on them.
     for (let i = 0; i < fakeReporters.length; i++) {
       mgr.unregisterReporter(fakeReporters[i]);
     }
     for (let i = 0; i < realReporters.length; i++) {
       mgr.registerReporterEvenIfBlocked(realReporters[i]);
     }
-    for (let i = 0; i < realMultiReporters.length; i++) {
-      mgr.registerMultiReporterEvenIfBlocked(realMultiReporters[i]);
-    }
     mgr.unblockRegistration();
 
     SimpleTest.finish();
diff --git a/toolkit/components/aboutmemory/tests/test_memoryReporters.xul b/toolkit/components/aboutmemory/tests/test_memoryReporters.xul
index efaf8ded068b..10f11b060d09 100644
--- a/toolkit/components/aboutmemory/tests/test_memoryReporters.xul
+++ b/toolkit/components/aboutmemory/tests/test_memoryReporters.xul
@@ -138,11 +138,6 @@
   let e = mgr.enumerateReporters();
   while (e.hasMoreElements()) {
     let r = e.getNext().QueryInterface(Ci.nsIMemoryReporter);
-    handleReport(r.process, r.path, r.kind, r.units, r.amount, r.description);
-  }
-  e = mgr.enumerateMultiReporters();
-  while (e.hasMoreElements()) {
-    let r = e.getNext().QueryInterface(Ci.nsIMemoryMultiReporter);
     r.collectReports(handleReport, null);
 
     // Access |name| to make sure it doesn't crash or assert.
diff --git a/toolkit/components/aboutmemory/tests/test_sqliteMultiReporter.xul b/toolkit/components/aboutmemory/tests/test_sqliteMultiReporter.xul
index 0ecc3dd041e2..02608edb1222 100644
--- a/toolkit/components/aboutmemory/tests/test_sqliteMultiReporter.xul
+++ b/toolkit/components/aboutmemory/tests/test_sqliteMultiReporter.xul
@@ -36,13 +36,13 @@
   let db = storage.openDatabase(file);
   db.close();
 
-  // Invoke all the multi-reporters.  The SQLite multi-reporter is among
+  // Invoke all the reporters.  The SQLite multi-reporter is among
   // them.  It shouldn't crash.
   let mgr = Cc["@mozilla.org/memory-reporter-manager;1"].
             getService(Ci.nsIMemoryReporterManager);
-  e = mgr.enumerateMultiReporters();
+  e = mgr.enumerateReporters();
   while (e.hasMoreElements()) {
-    let r = e.getNext().QueryInterface(Ci.nsIMemoryMultiReporter);
+    let r = e.getNext().QueryInterface(Ci.nsIMemoryReporter);
     r.collectReports(function(){}, null);
   }
 
diff --git a/toolkit/components/places/History.cpp b/toolkit/components/places/History.cpp
index 5186a461f831..df00f4e689c6 100644
--- a/toolkit/components/places/History.cpp
+++ b/toolkit/components/places/History.cpp
@@ -1909,11 +1909,11 @@ StoreAndNotifyEmbedVisit(VisitData& aPlace,
   (void)NS_DispatchToMainThread(event);
 }
 
-class HistoryLinksHashtableReporter MOZ_FINAL : public MemoryReporterBase
+class HistoryLinksHashtableReporter MOZ_FINAL : public MemoryUniReporter
 {
 public:
   HistoryLinksHashtableReporter()
-    : MemoryReporterBase("explicit/history-links-hashtable",
+    : MemoryUniReporter("explicit/history-links-hashtable",
                          KIND_HEAP, UNITS_BYTES,
 "Memory used by the hashtable that records changes to the visited state of "
 "links.")
diff --git a/toolkit/components/telemetry/Telemetry.cpp b/toolkit/components/telemetry/Telemetry.cpp
index a166beb2410c..322a10e8717d 100644
--- a/toolkit/components/telemetry/Telemetry.cpp
+++ b/toolkit/components/telemetry/Telemetry.cpp
@@ -370,11 +370,11 @@ TelemetryImpl::SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf)
   return n;
 }
 
-class TelemetryReporter MOZ_FINAL : public MemoryReporterBase
+class TelemetryReporter MOZ_FINAL : public MemoryUniReporter
 {
 public:
   TelemetryReporter()
-    : MemoryReporterBase("explicit/telemetry", KIND_HEAP, UNITS_BYTES,
+    : MemoryUniReporter("explicit/telemetry", KIND_HEAP, UNITS_BYTES,
                          "Memory used by the telemetry system.")
   {}
 private:
diff --git a/toolkit/components/telemetry/TelemetryPing.js b/toolkit/components/telemetry/TelemetryPing.js
index 59d80026224d..ebe65429f507 100644
--- a/toolkit/components/telemetry/TelemetryPing.js
+++ b/toolkit/components/telemetry/TelemetryPing.js
@@ -8,6 +8,7 @@ const Ci = Components.interfaces;
 const Cr = Components.results;
 const Cu = Components.utils;
 
+Cu.import("resource://gre/modules/debug.js");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 #ifndef MOZ_WIDGET_GONK
@@ -458,15 +459,32 @@ TelemetryPing.prototype = {
     let e = mgr.enumerateReporters();
     while (e.hasMoreElements()) {
       let mr = e.getNext().QueryInterface(Ci.nsIMemoryReporter);
-      let id = MEM_HISTOGRAMS[mr.path];
+      let id = MEM_HISTOGRAMS[mr.name];
       if (!id) {
         continue;
       }
 
-      // Reading mr.amount might throw an exception.  If so, just ignore that
+      // collectReports might throw an exception.  If so, just ignore that
       // memory reporter; we're not getting useful data out of it.
       try {
-        this.handleMemoryReport(id, mr.path, mr.units, mr.amount);
+        // Bind handleMemoryReport() so it can be called inside the closure
+        // used as the callback.
+        let boundHandleMemoryReport = this.handleMemoryReport.bind(this);
+
+        // Reporters used for telemetry should be uni-reporters!  we assert if
+        // they make more than one report.
+        let hasReported = false;
+
+        function h(process, path, kind, units, amount, desc) {
+          if (!hasReported) {
+            boundHandleMemoryReport(id, path, units, amount);
+            hasReported = true;
+          } else {
+            NS_ASSERT(false,
+                      "reporter " + mr.name + " has made more than one report");
+          }
+        }
+        mr.collectReports(h, null);
       }
       catch (e) {
       }
@@ -474,11 +492,7 @@ TelemetryPing.prototype = {
     histogram.add(new Date() - startTime);
   },
 
-  handleMemoryReport: function handleMemoryReport(id, path, units, amount) {
-    if (amount == -1) {
-      return;
-    }
-
+  handleMemoryReport: function(id, path, units, amount) {
     let val;
     if (units == Ci.nsIMemoryReporter.UNITS_BYTES) {
       val = Math.floor(amount / 1024);
diff --git a/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.cpp b/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.cpp
index 7c0724686ac1..5db8b1e95e5e 100644
--- a/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.cpp
+++ b/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.cpp
@@ -36,12 +36,12 @@ static const PRLogModuleInfo *gUrlClassifierPrefixSetLog = nullptr;
 #define LOG_ENABLED() (false)
 #endif
 
-class PrefixSetReporter MOZ_FINAL : public MemoryReporterBase
+class PrefixSetReporter MOZ_FINAL : public MemoryUniReporter
 {
 public:
   PrefixSetReporter(nsUrlClassifierPrefixSet* aPrefixSet,
                     const nsACString& aName)
-    : MemoryReporterBase(
+    : MemoryUniReporter(
         nsPrintfCString(
           "explicit/storage/prefix-set/%s",
           (!aName.IsEmpty() ? PromiseFlatCString(aName).get() : "?!")
diff --git a/xpcom/base/AvailableMemoryTracker.cpp b/xpcom/base/AvailableMemoryTracker.cpp
index 874a8e497a1f..4a896aef4f1a 100644
--- a/xpcom/base/AvailableMemoryTracker.cpp
+++ b/xpcom/base/AvailableMemoryTracker.cpp
@@ -325,37 +325,19 @@ CreateDIBSectionHook(HDC aDC,
   return result;
 }
 
-class LowMemoryEventsVirtualReporter MOZ_FINAL : public MemoryReporterBase
+class LowMemoryEventsVirtualReporter MOZ_FINAL : public MemoryUniReporter
 {
 public:
-  // The description is "???" because we implement GetDescription().
   LowMemoryEventsVirtualReporter()
-    : MemoryReporterBase("low-memory-events/virtual",
-                         KIND_OTHER, UNITS_COUNT_CUMULATIVE, "???")
+    : MemoryUniReporter("low-memory-events/virtual",
+                         KIND_OTHER, UNITS_COUNT_CUMULATIVE,
+"Number of low-virtual-memory events fired since startup. We fire such an "
+"event if we notice there is less than memory.low_virtual_mem_threshold_mb of "
+"virtual address space available (if zero, this behavior is disabled).  The "
+"process will probably crash if it runs out of virtual address space, so "
+"this event is dire.")
   {}
 
-  NS_IMETHOD GetDescription(nsACString &aDescription)
-  {
-    aDescription.AssignLiteral(
-      "Number of low-virtual-memory events fired since startup. ");
-
-    if (sLowVirtualMemoryThreshold == 0) {
-      aDescription.AppendLiteral(
-        "Tracking low-virtual-memory events is disabled, but you can enable it "
-        "by giving the memory.low_virtual_mem_threshold_mb pref a non-zero "
-        "value.");
-    }
-    else {
-      aDescription.Append(nsPrintfCString(
-        "We fire such an event if we notice there is less than %d MB of virtual "
-        "address space available (controlled by the "
-        "'memory.low_virtual_mem_threshold_mb' pref).  We'll likely crash if "
-        "we run out of virtual address space, so this event is somewhat dire.",
-        sLowVirtualMemoryThreshold));
-    }
-    return NS_OK;
-  }
-
 private:
   int64_t Amount() MOZ_OVERRIDE
   {
@@ -367,73 +349,36 @@ private:
   }
 };
 
-class LowCommitSpaceEventsReporter MOZ_FINAL : public MemoryReporterBase
+class LowCommitSpaceEventsReporter MOZ_FINAL : public MemoryUniReporter
 {
 public:
-  // The description is "???" because we implement GetDescription().
   LowCommitSpaceEventsReporter()
-    : MemoryReporterBase("low-commit-space-events",
-                         KIND_OTHER, UNITS_COUNT_CUMULATIVE, "???")
+    : MemoryUniReporter("low-commit-space-events",
+                         KIND_OTHER, UNITS_COUNT_CUMULATIVE,
+"Number of low-commit-space events fired since startup. We fire such an "
+"event if we notice there is less than memory.low_commit_space_threshold_mb of "
+"commit space available (if zero, this behavior is disabled).  Windows will "
+"likely kill the process if it runs out of commit space, so this event is "
+"dire.")
   {}
 
-  NS_IMETHOD GetDescription(nsACString &aDescription)
-  {
-    aDescription.AssignLiteral(
-      "Number of low-commit-space events fired since startup. ");
-
-    if (sLowCommitSpaceThreshold == 0) {
-      aDescription.Append(
-        "Tracking low-commit-space events is disabled, but you can enable it "
-        "by giving the memory.low_commit_space_threshold_mb pref a non-zero "
-        "value.");
-    }
-    else {
-      aDescription.Append(nsPrintfCString(
-        "We fire such an event if we notice there is less than %d MB of "
-        "available commit space (controlled by the "
-        "'memory.low_commit_space_threshold_mb' pref).  Windows will likely "
-        "kill us if we run out of commit space, so this event is somewhat dire.",
-        sLowCommitSpaceThreshold));
-    }
-    return NS_OK;
-  }
-
 private:
   int64_t Amount() MOZ_OVERRIDE { return sNumLowCommitSpaceEvents; }
 };
 
-class LowMemoryEventsPhysicalReporter MOZ_FINAL : public MemoryReporterBase
+class LowMemoryEventsPhysicalReporter MOZ_FINAL : public MemoryUniReporter
 {
 public:
-  // The description is "???" because we implement GetDescription().
   LowMemoryEventsPhysicalReporter()
-    : MemoryReporterBase("low-memory-events/physical",
-                         KIND_OTHER, UNITS_COUNT_CUMULATIVE, "???")
+    : MemoryUniReporter("low-memory-events/physical",
+                         KIND_OTHER, UNITS_COUNT_CUMULATIVE,
+"Number of low-physical-memory events fired since startup. We fire such an "
+"event if we notice there is less than memory.low_physical_memory_threshold_mb "
+"of physical memory available (if zero, this behavior is disabled).  The "
+"machine will start to page if it runs out of physical memory.  This may "
+"cause it to run slowly, but it shouldn't cause it to crash.")
   {}
 
-  NS_IMETHOD GetDescription(nsACString &aDescription)
-  {
-    aDescription.AssignLiteral(
-      "Number of low-physical-memory events fired since startup. ");
-
-    if (sLowPhysicalMemoryThreshold == 0) {
-      aDescription.Append(
-        "Tracking low-physical-memory events is disabled, but you can enable it "
-        "by giving the memory.low_physical_memory_threshold_mb pref a non-zero "
-        "value.");
-    }
-    else {
-      aDescription.Append(nsPrintfCString(
-        "We fire such an event if we notice there is less than %d MB of "
-        "available physical memory (controlled by the "
-        "'memory.low_physical_memory_threshold_mb' pref).  The machine will start "
-        "to page if it runs out of physical memory; this may cause it to run "
-        "slowly, but it shouldn't cause us to crash.",
-        sLowPhysicalMemoryThreshold));
-    }
-    return NS_OK;
-  }
-
 private:
   int64_t Amount() MOZ_OVERRIDE { return sNumLowPhysicalMemEvents; }
 };
diff --git a/xpcom/base/MapsMemoryReporter.cpp b/xpcom/base/MapsMemoryReporter.cpp
index 09fd1354a423..e638601ea784 100644
--- a/xpcom/base/MapsMemoryReporter.cpp
+++ b/xpcom/base/MapsMemoryReporter.cpp
@@ -111,7 +111,7 @@ struct CategoriesSeen {
 
 } // anonymous namespace
 
-class MapsReporter MOZ_FINAL : public nsIMemoryMultiReporter
+class MapsReporter MOZ_FINAL : public nsIMemoryReporter
 {
 public:
   MapsReporter();
@@ -125,7 +125,7 @@ public:
   }
 
   NS_IMETHOD
-  CollectReports(nsIMemoryMultiReporterCallback *aCb,
+  CollectReports(nsIMemoryReporterCallback *aCb,
                  nsISupports *aClosure);
 
 private:
@@ -135,7 +135,7 @@ private:
 
   nsresult
   ParseMapping(FILE *aFile,
-               nsIMemoryMultiReporterCallback *aCb,
+               nsIMemoryReporterCallback *aCb,
                nsISupports *aClosure,
                CategoriesSeen *aCategoriesSeen);
 
@@ -149,7 +149,7 @@ private:
   ParseMapBody(FILE *aFile,
                const nsACString &aName,
                const nsACString &aDescription,
-               nsIMemoryMultiReporterCallback *aCb,
+               nsIMemoryReporterCallback *aCb,
                nsISupports *aClosure,
                CategoriesSeen *aCategoriesSeen);
 
@@ -158,7 +158,7 @@ private:
   nsTHashtable<nsCStringHashKey> mMozillaLibraries;
 };
 
-NS_IMPL_ISUPPORTS1(MapsReporter, nsIMemoryMultiReporter)
+NS_IMPL_ISUPPORTS1(MapsReporter, nsIMemoryReporter)
 
 MapsReporter::MapsReporter()
   : mSearchedForLibxul(false)
@@ -173,7 +173,7 @@ MapsReporter::MapsReporter()
 }
 
 NS_IMETHODIMP
-MapsReporter::CollectReports(nsIMemoryMultiReporterCallback *aCb,
+MapsReporter::CollectReports(nsIMemoryReporterCallback *aCb,
                              nsISupports *aClosure)
 {
   CategoriesSeen categoriesSeen;
@@ -258,7 +258,7 @@ MapsReporter::FindLibxul()
 nsresult
 MapsReporter::ParseMapping(
   FILE *aFile,
-  nsIMemoryMultiReporterCallback *aCb,
+  nsIMemoryReporterCallback *aCb,
   nsISupports *aClosure,
   CategoriesSeen *aCategoriesSeen)
 {
@@ -461,7 +461,7 @@ MapsReporter::ParseMapBody(
   FILE *aFile,
   const nsACString &aName,
   const nsACString &aDescription,
-  nsIMemoryMultiReporterCallback *aCb,
+  nsIMemoryReporterCallback *aCb,
   nsISupports *aClosure,
   CategoriesSeen *aCategoriesSeen)
 {
@@ -520,11 +520,11 @@ MapsReporter::ParseMapBody(
   return NS_OK;
 }
 
-class ResidentUniqueReporter MOZ_FINAL : public MemoryReporterBase
+class ResidentUniqueReporter MOZ_FINAL : public MemoryUniReporter
 {
 public:
   ResidentUniqueReporter()
-    : MemoryReporterBase("resident-unique", KIND_OTHER, UNITS_BYTES,
+    : MemoryUniReporter("resident-unique", KIND_OTHER, UNITS_BYTES,
 "Memory mapped by the process that is present in physical memory and not "
 "shared with any other processes.  This is also known as the process's unique "
 "set size (USS).  This is the amount of RAM we'd expect to be freed if we "
@@ -540,9 +540,9 @@ private:
     // little to do with whether the pages are actually shared.  smaps on the
     // other hand appears to give us the correct information.
     //
-    // We could calculate this data during the smaps multi-reporter, but the
-    // overhead of the smaps reporter is considerable (we don't even run the
-    // smaps reporter in normal about:memory operation).  Hopefully this
+    // We could calculate this data within the smaps reporter, but the overhead
+    // of the smaps reporter is considerable (we don't even run the smaps
+    // reporter in normal about:memory operation).  Hopefully this
     // implementation is fast enough not to matter.
 
     *aAmount = 0;
@@ -568,8 +568,8 @@ private:
 
 void Init()
 {
-  nsCOMPtr<nsIMemoryMultiReporter> reporter = new MapsReporter();
-  NS_RegisterMemoryMultiReporter(reporter);
+  nsCOMPtr<nsIMemoryReporter> reporter = new MapsReporter();
+  NS_RegisterMemoryReporter(reporter);
 
   NS_RegisterMemoryReporter(new ResidentUniqueReporter());
 }
diff --git a/xpcom/base/nsCycleCollector.cpp b/xpcom/base/nsCycleCollector.cpp
index c1cf5784fddd..e4cbfbbbb394 100644
--- a/xpcom/base/nsCycleCollector.cpp
+++ b/xpcom/base/nsCycleCollector.cpp
@@ -917,7 +917,7 @@ private:
     CC_BeforeUnlinkCallback mBeforeUnlinkCB;
     CC_ForgetSkippableCallback mForgetSkippableCB;
 
-    nsCOMPtr<nsIMemoryMultiReporter> mReporter;
+    nsCOMPtr<nsIMemoryReporter> mReporter;
 
     nsPurpleBuffer mPurpleBuf;
 
@@ -2398,10 +2398,10 @@ nsCycleCollector::CollectWhite(nsICycleCollectorListener *aListener)
 // Memory reporter
 ////////////////////////
 
-class CycleCollectorMultiReporter MOZ_FINAL : public nsIMemoryMultiReporter
+class CycleCollectorReporter MOZ_FINAL : public nsIMemoryReporter
 {
   public:
-    CycleCollectorMultiReporter(nsCycleCollector* aCollector)
+    CycleCollectorReporter(nsCycleCollector* aCollector)
       : mCollector(aCollector)
     {}
 
@@ -2413,7 +2413,7 @@ class CycleCollectorMultiReporter MOZ_FINAL : public nsIMemoryMultiReporter
         return NS_OK;
     }
 
-    NS_IMETHOD CollectReports(nsIMemoryMultiReporterCallback* aCb,
+    NS_IMETHOD CollectReports(nsIMemoryReporterCallback* aCb,
                               nsISupports* aClosure)
     {
         size_t objectSize, graphNodesSize, graphEdgesSize, whiteNodesSize,
@@ -2465,7 +2465,7 @@ class CycleCollectorMultiReporter MOZ_FINAL : public nsIMemoryMultiReporter
     nsCycleCollector* mCollector;
 };
 
-NS_IMPL_ISUPPORTS1(CycleCollectorMultiReporter, nsIMemoryMultiReporter)
+NS_IMPL_ISUPPORTS1(CycleCollectorReporter, nsIMemoryReporter)
 
 
 ////////////////////////////////////////////////////////////////////////
@@ -2492,7 +2492,7 @@ nsCycleCollector::nsCycleCollector() :
 
 nsCycleCollector::~nsCycleCollector()
 {
-    NS_UnregisterMemoryMultiReporter(mReporter);
+    NS_UnregisterMemoryReporter(mReporter);
 }
 
 void
@@ -2508,7 +2508,7 @@ nsCycleCollector::RegisterJSRuntime(CycleCollectedJSRuntime *aJSRuntime)
     // instead.
     static bool registered = false;
     if (!registered) {
-        NS_RegisterMemoryMultiReporter(new CycleCollectorMultiReporter(this));
+        NS_RegisterMemoryReporter(new CycleCollectorReporter(this));
         registered = true;
     }
 }
diff --git a/xpcom/base/nsIMemoryReporter.idl b/xpcom/base/nsIMemoryReporter.idl
index 615232b782a0..206adf12356e 100644
--- a/xpcom/base/nsIMemoryReporter.idl
+++ b/xpcom/base/nsIMemoryReporter.idl
@@ -17,55 +17,22 @@ interface nsICancelableRunnable;
  * reporter.
  */
 
-/*
- * An nsIMemoryReporter reports a single memory measurement as an object.
- * Use this when it makes sense to gather this measurement without gathering
- * related measurements at the same time.
- *
- * Note that the |amount| field may be implemented as a function, and so
- * accessing it can trigger significant computation;  the other fields can
- * be accessed without triggering this computation.  (Compare and contrast
- * this with nsIMemoryMultiReporter.)  
- *
- * aboutMemory.js is the most important consumer of memory reports.  It
- * places the following constraints on reports.
- *
- * - There must be an "explicit" tree.  It represents non-overlapping
- *   regions of memory that have been explicitly allocated with an
- *   OS-level allocation (e.g. mmap/VirtualAlloc/vm_allocate) or a
- *   heap-level allocation (e.g. malloc/calloc/operator new).  Reporters
- *   in this tree must have kind HEAP or NONHEAP, units BYTES, and a
- *   description that is a sentence (i.e. starts with a capital letter and
- *   ends with a period, or similar).
- *
- * - The "size", "rss", "pss" and "swap" trees are optional.  They
- *   represent regions of virtual memory that the process has mapped.
- *   Reporters in this category must have kind NONHEAP, units BYTES, and a
- *   non-empty description.
- *
- * - The "compartments" and "ghost-windows" trees are optional.  They are
- *   used by about:compartments.  Reporters in these trees must have kind
- *   OTHER, units COUNT, an amount of 1, and a description that's an empty
- *   string.
- *
- * - All other reports are unconstrained except that they must have a
- *   description that is a sentence.
- */
-[scriptable, uuid(b2c39f65-1799-4b92-a806-ab3cf6af3cfa)]
-interface nsIMemoryReporter : nsISupports
+[scriptable, function, uuid(3a61be3b-b93b-461a-a4f8-388214f558b1)]
+interface nsIMemoryReporterCallback : nsISupports
 {
   /*
-   * The name of the process containing this reporter.  Each reporter initially
-   * has "" in this field, indicating that it applies to the current process.
-   * (This is true even for reporters in a child process.)  When a reporter
-   * from a child process is copied into the main process, the copy has its
-   * 'process' field set appropriately.
-   */
-  readonly attribute ACString process;
-
-  /*
-   * The path that this memory usage should be reported under.  Paths are
-   * '/'-delimited, eg. "a/b/c".  
+   * The arguments to the callback are as follows.
+   *
+   *
+   * |process|  The name of the process containing this reporter.  Each
+   * reporter initially has "" in this field, indicating that it applies to the
+   * current process.  (This is true even for reporters in a child process.)
+   * When a reporter from a child process is copied into the main process, the
+   * copy has its 'process' field set appropriately.
+   *
+   *
+   * |path|  The path that this memory usage should be reported under.  Paths
+   * are '/'-delimited, eg. "a/b/c".
    *
    * Each reporter can be viewed as representing a leaf node in a tree.
    * Internal nodes of the tree don't have reporters.  So, for example, the
@@ -98,11 +65,9 @@ interface nsIMemoryReporter : nsISupports
    *
    * The paths of all reporters form a set of trees.  Trees can be
    * "degenerate", i.e. contain a single entry with no '/'.
-   */
-  readonly attribute AUTF8String path;
-
-  /*
-   * There are three kinds of memory reporters.
+   *
+   *
+   * |kind|  There are three kinds of memory reporters.
    *
    *  - HEAP: reporters measuring memory allocated by the heap allocator,
    *    e.g. by calling malloc, calloc, realloc, memalign, operator new, or
@@ -120,19 +85,9 @@ interface nsIMemoryReporter : nsISupports
    *
    * The kind only matters for reporters in the "explicit" tree;
    * aboutMemory.js uses it to calculate "heap-unclassified".
-   */
-  const int32_t KIND_NONHEAP = 0;
-  const int32_t KIND_HEAP    = 1;
-  const int32_t KIND_OTHER   = 2;
-
-  /*
-   * The reporter kind.  See KIND_* above.
-   */
-  readonly attribute int32_t kind;
-
-  /*
-   * The amount reported by a memory reporter must have one of the following
-   * units, but you may of course add new units as necessary:
+   *
+   *
+   * |units|  The units on the reporter's amount.  One of the following.
    *
    *  - BYTES: The amount contains a number of bytes.
    *
@@ -156,67 +111,84 @@ interface nsIMemoryReporter : nsISupports
    *    be 1234.
    *
    *    Values greater than 100% are allowed.
+   *
+   *
+   * |amount|  The numeric value reported by this memory reporter.  Accesses
+   * can fail if something goes wrong when getting the amount.
+   *
+   *
+   * |description|  A human-readable description of this memory usage report.
    */
-  const int32_t UNITS_BYTES = 0;
-  const int32_t UNITS_COUNT = 1;
-  const int32_t UNITS_COUNT_CUMULATIVE = 2;
-  const int32_t UNITS_PERCENTAGE = 3;
-
-  /*
-   * The units on the reporter's amount.  See UNITS_* above.
-   */
-  readonly attribute int32_t units;
-
-  /*
-   * The numeric value reported by this memory reporter.  Accesses can fail if
-   * something goes wrong when getting the amount.
-   */
-  readonly attribute int64_t amount;
-
-  /*
-   * A human-readable description of this memory usage report.
-   */
-  readonly attribute AUTF8String description;
-};
-
-[scriptable, function, uuid(5b15f3fa-ba15-443c-8337-7770f5f0ce5d)]
-interface nsIMemoryMultiReporterCallback : nsISupports
-{
   void callback(in ACString process, in AUTF8String path, in int32_t kind,
                 in int32_t units, in int64_t amount,
                 in AUTF8String description, in nsISupports closure);
 };
 
 /*
- * An nsIMemoryMultiReporter reports multiple memory measurements via a
- * callback function which is called once for each measurement.  Use this
- * when you want to gather multiple measurements in a single operation (eg.
- * a single traversal of a large data structure).
+ * An nsIMemoryReporter reports one or more memory measurements via a
+ * callback function which is called once for each measurement.
  *
- * The arguments to the callback deliberately match the fields in
- * nsIMemoryReporter, but note that seeing any of these arguments requires
- * calling collectReports which will trigger all relevant computation.
- * (Compare and contrast this with nsIMemoryReporter, which allows all
- * fields except |amount| to be accessed without triggering computation.)
+ * An nsIMemoryReporter that reports a single measurement is sometimes called a
+ * "uni-reporter".  One that reports multiple measurements is sometimes called
+ * a "multi-reporter".
+ *
+ * aboutMemory.js is the most important consumer of memory reports.  It
+ * places the following constraints on reports.
+ *
+ * - There must be an "explicit" tree.  It represents non-overlapping
+ *   regions of memory that have been explicitly allocated with an
+ *   OS-level allocation (e.g. mmap/VirtualAlloc/vm_allocate) or a
+ *   heap-level allocation (e.g. malloc/calloc/operator new).  Reporters
+ *   in this tree must have kind HEAP or NONHEAP, units BYTES, and a
+ *   description that is a sentence (i.e. starts with a capital letter and
+ *   ends with a period, or similar).
+ *
+ * - The "size", "rss", "pss" and "swap" trees are optional.  They
+ *   represent regions of virtual memory that the process has mapped.
+ *   Reporters in this category must have kind NONHEAP, units BYTES, and a
+ *   non-empty description.
+ *
+ * - The "compartments" and "ghost-windows" trees are optional.  They are
+ *   used by about:compartments.  Reporters in these trees must have kind
+ *   OTHER, units COUNT, an amount of 1, and a description that's an empty
+ *   string.
+ *
+ * - All other reports are unconstrained except that they must have a
+ *   description that is a sentence.
  */
-[scriptable, uuid(24d61ead-237b-4969-a6bd-73fd8fed1d99)]
-interface nsIMemoryMultiReporter : nsISupports
+[scriptable, uuid(53248304-124b-43cd-99dc-6e5797b91618)]
+interface nsIMemoryReporter : nsISupports
 {
   /*
-   * The name of the multi-reporter.  Useful when only one multi-reporter
-   * needs to be run.  Must be unique;  if multi-reporters share names it's
-   * likely the wrong one will be called in certain circumstances.
+   * The name of the reporter.  Useful when only one reporter needs to be run.
+   * Must be unique;  if reporters share names it's likely the wrong one will
+   * be called in certain circumstances.
    */
   readonly attribute ACString name;
 
   /*
-   * Run the multi-reporter.
+   * Run the reporter.
    */
-  void collectReports(in nsIMemoryMultiReporterCallback callback,
+  void collectReports(in nsIMemoryReporterCallback callback,
                       in nsISupports closure);
+
+  /*
+   * Kinds.  See the |kind| comment in nsIMemoryReporterCallback.
+   */
+  const int32_t KIND_NONHEAP = 0;
+  const int32_t KIND_HEAP    = 1;
+  const int32_t KIND_OTHER   = 2;
+
+  /*
+   * Units.  See the |units| comment in nsIMemoryReporterCallback.
+   */
+  const int32_t UNITS_BYTES = 0;
+  const int32_t UNITS_COUNT = 1;
+  const int32_t UNITS_COUNT_CUMULATIVE = 2;
+  const int32_t UNITS_PERCENTAGE = 3;
 };
 
-[scriptable, builtinclass, uuid(70b0e608-8dbf-4dc7-b88f-f1c745c1b48c)]
+[scriptable, builtinclass, uuid(4db7040a-16f9-4249-879b-fe72729c7ef5)]
 interface nsIMemoryReporterManager : nsISupports
 {
   /*
@@ -224,12 +196,6 @@ interface nsIMemoryReporterManager : nsISupports
    */
   nsISimpleEnumerator enumerateReporters ();
 
-  /*
-   * Return an enumerator of nsIMemoryMultiReporters that are currently
-   * registered.
-   */
-  nsISimpleEnumerator enumerateMultiReporters ();
-
   /*
    * Register the given nsIMemoryReporter.  After a reporter is registered,
    * it will be available via enumerateReporters().  The Manager service
@@ -237,31 +203,17 @@ interface nsIMemoryReporterManager : nsISupports
    */
   void registerReporter (in nsIMemoryReporter reporter);
 
-  /*
-   * Register the given nsIMemoryMultiReporter.  After a multi-reporter is
-   * registered, it will be available via enumerateMultiReporters().  The
-   * Manager service will hold a strong reference to the given
-   * multi-reporter.
-   */
-  void registerMultiReporter (in nsIMemoryMultiReporter reporter);
-
   /*
    * Unregister the given memory reporter.
    */
   void unregisterReporter (in nsIMemoryReporter reporter);
 
-  /*
-   * Unregister the given memory multi-reporter.
-   */
-  void unregisterMultiReporter (in nsIMemoryMultiReporter reporter);
-
   /**
    * These functions should only be used for testing purposes.
    */
   void blockRegistration();
   void unblockRegistration();
   void registerReporterEvenIfBlocked(in nsIMemoryReporter aReporter);
-  void registerMultiReporterEvenIfBlocked(in nsIMemoryMultiReporter aReporter);
 
   /*
    * Initialize.
@@ -280,8 +232,8 @@ interface nsIMemoryReporterManager : nsISupports
    * (eg. via mmap, VirtualAlloc) and at the heap level (eg. via malloc,
    * calloc, operator new).  (Nb: it covers all heap allocations, but will
    * miss any OS-level ones not covered by memory reporters.)  This reporter
-   * is special-cased because it's interesting, and is moderately difficult
-   * to compute in JS.  Accesses can fail.
+   * is special-cased because it's interesting, and is difficult to compute
+   * from JavaScript code.  Accesses can fail.
    */
   readonly attribute int64_t explicit;
 
@@ -307,10 +259,7 @@ interface nsIMemoryReporterManager : nsISupports
 // instead of nsCOMPtr<nsIMemoryReporter>.
 
 XPCOM_API(nsresult) NS_RegisterMemoryReporter(nsIMemoryReporter* aReporter);
-XPCOM_API(nsresult) NS_RegisterMemoryMultiReporter(nsIMemoryMultiReporter* aReporter);
-
 XPCOM_API(nsresult) NS_UnregisterMemoryReporter(nsIMemoryReporter* aReporter);
-XPCOM_API(nsresult) NS_UnregisterMemoryMultiReporter(nsIMemoryMultiReporter* aReporter);
 
 #if defined(MOZ_DMD)
 namespace mozilla {
@@ -375,10 +324,11 @@ void RunReporters();
 namespace mozilla {
 
 // The following base class reduces the amount of boilerplate code required for
-// memory reporters.  You just need to provide the following.
-// - The constant values: path, kind, units, and description.  They are passed
-//   to the MemoryReporterBase constructor.
-// - A (private) Amount() or (public) GetAmount() method.  It can use the 
+// memory uni-reporters.  You just need to provide the following.
+// - The constant values: nameAndPath (which serves as both the reporters name,
+//   and the path in its single report), kind, units, and description.  They
+//   are passed to the MemoryUniReporter constructor.
+// - A (private) Amount() or (public) GetAmount() method.  It can use the
 //   MallocSizeOf method if necessary.  (There is also
 //   MallocSizeOfOn{Alloc,Free}, which can be useful.)  Use Amount() if the
 //   reporter is infallible, and GetAmount() otherwise.  (If you fail to
@@ -390,58 +340,45 @@ namespace mozilla {
 // - "explicit/dom/xyzzy"     --> DOMXyzzyReporter
 // - "js-compartments/system" --> JSCompartmentsSystemReporter
 //
-class MemoryReporterBase : public nsIMemoryReporter
+class MemoryUniReporter : public nsIMemoryReporter
 {
 public:
-  MemoryReporterBase(const char* aPath, int32_t aKind, int32_t aUnits,
-                     const char* aDescription)
-    : mPath(aPath)
+  MemoryUniReporter(const char* aNameAndPath, int32_t aKind, int32_t aUnits,
+                    const char* aDescription)
+    : mNameAndPath(aNameAndPath)
     , mKind(aKind)
     , mUnits(aUnits)
     , mDescription(aDescription)
   {}
 
-  virtual ~MemoryReporterBase() {}
+  virtual ~MemoryUniReporter() {}
 
   NS_DECL_THREADSAFE_ISUPPORTS
 
-  NS_IMETHOD GetProcess(nsACString& aProcess)
+  NS_IMETHOD GetName(nsACString& aName)
   {
-    aProcess.Truncate();
+    aName.Assign(mNameAndPath);
     return NS_OK;
   }
 
-  NS_IMETHOD GetPath(nsACString& aPath)
+  NS_IMETHOD CollectReports(nsIMemoryReporterCallback* aCallback,
+                            nsISupports* aClosure)
   {
-    aPath.Assign(mPath);
-    return NS_OK;
-  }
-
-  NS_IMETHOD GetKind(int32_t* aKind)
-  {
-    *aKind = mKind;
-    return NS_OK;
-  }
-
-  NS_IMETHOD GetUnits(int32_t* aUnits)
-  {
-    *aUnits = mUnits;
-    return NS_OK;
+    int64_t amount;
+    nsresult rv = GetAmount(&amount);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    return aCallback->Callback(EmptyCString(), mNameAndPath, mKind, mUnits,
+                               amount, mDescription, aClosure);
   }
 
+protected:
   NS_IMETHOD GetAmount(int64_t* aAmount)
   {
     *aAmount = Amount();
     return NS_OK;
   }
 
-  NS_IMETHOD GetDescription(nsACString& aDescription)
-  {
-    aDescription.Assign(mDescription);
-    return NS_OK;
-  }
-
-protected:
   virtual int64_t Amount()
   {
     // We only reach here if neither GetAmount() nor Amount() was overridden.
@@ -453,7 +390,7 @@ protected:
   NS_MEMORY_REPORTER_MALLOC_SIZEOF_ON_ALLOC_FUN(MallocSizeOfOnAlloc)
   NS_MEMORY_REPORTER_MALLOC_SIZEOF_ON_FREE_FUN(MallocSizeOfOnFree)
 
-  const nsCString mPath;
+  const nsCString mNameAndPath;
   const int32_t   mKind;
   const int32_t   mUnits;
   const nsCString mDescription;
diff --git a/xpcom/base/nsMemoryInfoDumper.cpp b/xpcom/base/nsMemoryInfoDumper.cpp
index d6716918ecbd..b8ea0f6d1233 100644
--- a/xpcom/base/nsMemoryInfoDumper.cpp
+++ b/xpcom/base/nsMemoryInfoDumper.cpp
@@ -672,32 +672,35 @@ DumpReport(nsIGZFileWriter *aWriter, bool aIsFirst,
   return NS_OK;
 }
 
-class DumpMultiReporterCallback MOZ_FINAL : public nsIMemoryMultiReporterCallback
+class DumpReporterCallback MOZ_FINAL : public nsIMemoryReporterCallback
 {
-  public:
-    NS_DECL_ISUPPORTS
+public:
+  NS_DECL_ISUPPORTS
 
-      NS_IMETHOD Callback(const nsACString &aProcess, const nsACString &aPath,
-          int32_t aKind, int32_t aUnits, int64_t aAmount,
-          const nsACString &aDescription,
-          nsISupports *aData)
-      {
-        nsCOMPtr<nsIGZFileWriter> writer = do_QueryInterface(aData);
-        NS_ENSURE_TRUE(writer, NS_ERROR_FAILURE);
+  DumpReporterCallback(bool* aIsFirstPtr) : mIsFirstPtr(aIsFirstPtr) {}
 
-        // The |isFirst = false| assumes that at least one single reporter is
-        // present and so will have been processed in
-        // DumpProcessMemoryReportsToGZFileWriter() below.
-        return DumpReport(writer, /* isFirst = */ false, aProcess, aPath,
-            aKind, aUnits, aAmount, aDescription);
-        return NS_OK;
-      }
+  NS_IMETHOD Callback(const nsACString &aProcess, const nsACString &aPath,
+      int32_t aKind, int32_t aUnits, int64_t aAmount,
+      const nsACString &aDescription,
+      nsISupports *aData)
+  {
+    nsCOMPtr<nsIGZFileWriter> writer = do_QueryInterface(aData);
+    NS_ENSURE_TRUE(writer, NS_ERROR_FAILURE);
+
+    // The |isFirst = false| assumes that at least one single reporter is
+    // present and so will have been processed in
+    // DumpProcessMemoryReportsToGZFileWriter() below.
+    bool isFirst = *mIsFirstPtr;
+    *mIsFirstPtr = false;
+    return DumpReport(writer, isFirst, aProcess, aPath, aKind, aUnits, aAmount,
+                      aDescription);
+  }
+
+private:
+  bool* mIsFirstPtr;
 };
 
-NS_IMPL_ISUPPORTS1(
-    DumpMultiReporterCallback
-    , nsIMemoryMultiReporterCallback
-    )
+NS_IMPL_ISUPPORTS1(DumpReporterCallback, nsIMemoryReporterCallback)
 
 } // namespace mozilla
 
@@ -795,8 +798,6 @@ DMDWrite(void* aState, const char* aFmt, va_list ap)
 static nsresult
 DumpProcessMemoryReportsToGZFileWriter(nsIGZFileWriter *aWriter)
 {
-  nsresult rv;
-
   // Increment this number if the format changes.
   //
   // This is the first write to the file, and it causes |aWriter| to allocate
@@ -814,53 +815,15 @@ DumpProcessMemoryReportsToGZFileWriter(nsIGZFileWriter *aWriter)
   DUMP(aWriter, ",\n");
   DUMP(aWriter, "  \"reports\": ");
 
-  // Process single reporters.
+  // Process reporters.
   bool isFirst = true;
   bool more;
   nsCOMPtr<nsISimpleEnumerator> e;
   mgr->EnumerateReporters(getter_AddRefs(e));
+  nsRefPtr<DumpReporterCallback> cb = new DumpReporterCallback(&isFirst);
   while (NS_SUCCEEDED(e->HasMoreElements(&more)) && more) {
     nsCOMPtr<nsIMemoryReporter> r;
     e->GetNext(getter_AddRefs(r));
-
-    nsCString process;
-    rv = r->GetProcess(process);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    nsCString path;
-    rv = r->GetPath(path);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    int32_t kind;
-    rv = r->GetKind(&kind);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    int32_t units;
-    rv = r->GetUnits(&units);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    int64_t amount;
-    rv = r->GetAmount(&amount);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    nsCString description;
-    rv = r->GetDescription(description);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    rv = DumpReport(aWriter, isFirst, process, path, kind, units, amount,
-                    description);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    isFirst = false;
-  }
-
-  // Process multi-reporters.
-  nsCOMPtr<nsISimpleEnumerator> e2;
-  mgr->EnumerateMultiReporters(getter_AddRefs(e2));
-  nsRefPtr<DumpMultiReporterCallback> cb = new DumpMultiReporterCallback();
-  while (NS_SUCCEEDED(e2->HasMoreElements(&more)) && more) {
-    nsCOMPtr<nsIMemoryMultiReporter> r;
-    e2->GetNext(getter_AddRefs(r));
     r->CollectReports(cb, aWriter);
   }
 
diff --git a/xpcom/base/nsMemoryReporterManager.cpp b/xpcom/base/nsMemoryReporterManager.cpp
index b1b0d407db59..85a6cac78fda 100644
--- a/xpcom/base/nsMemoryReporterManager.cpp
+++ b/xpcom/base/nsMemoryReporterManager.cpp
@@ -327,11 +327,11 @@ static nsresult GetResidentFast(int64_t* aN)
 }
 
 #define HAVE_PRIVATE_REPORTER
-class PrivateReporter MOZ_FINAL : public MemoryReporterBase
+class PrivateReporter MOZ_FINAL : public MemoryUniReporter
 {
 public:
     PrivateReporter()
-      : MemoryReporterBase("private", KIND_OTHER, UNITS_BYTES,
+      : MemoryUniReporter("private", KIND_OTHER, UNITS_BYTES,
 "Memory that cannot be shared with other processes, including memory that is "
 "committed and marked MEM_PRIVATE, data that is not mapped, and executable "
 "pages that have been written to.")
@@ -356,11 +356,11 @@ public:
 #endif  // XP_<PLATFORM>
 
 #ifdef HAVE_VSIZE_AND_RESIDENT_REPORTERS
-class VsizeReporter MOZ_FINAL : public MemoryReporterBase
+class VsizeReporter MOZ_FINAL : public MemoryUniReporter
 {
 public:
     VsizeReporter()
-      : MemoryReporterBase("vsize", KIND_OTHER, UNITS_BYTES,
+      : MemoryUniReporter("vsize", KIND_OTHER, UNITS_BYTES,
 "Memory mapped by the process, including code and data segments, the heap, "
 "thread stacks, memory explicitly mapped by the process via mmap and similar "
 "operations, and memory shared with other processes. This is the vsize figure "
@@ -373,11 +373,11 @@ public:
     NS_IMETHOD GetAmount(int64_t* aAmount) { return GetVsize(aAmount); }
 };
 
-class ResidentReporter MOZ_FINAL : public MemoryReporterBase
+class ResidentReporter MOZ_FINAL : public MemoryUniReporter
 {
 public:
     ResidentReporter()
-      : MemoryReporterBase("resident", KIND_OTHER, UNITS_BYTES,
+      : MemoryUniReporter("resident", KIND_OTHER, UNITS_BYTES,
 "Memory mapped by the process that is present in physical memory, also known "
 "as the resident set size (RSS).  This is the best single figure to use when "
 "considering the memory resources used by the process, but it depends both on "
@@ -389,11 +389,11 @@ public:
     NS_IMETHOD GetAmount(int64_t* aAmount) { return GetResident(aAmount); }
 };
 
-class ResidentFastReporter MOZ_FINAL : public MemoryReporterBase
+class ResidentFastReporter MOZ_FINAL : public MemoryUniReporter
 {
 public:
     ResidentFastReporter()
-      : MemoryReporterBase("resident-fast", KIND_OTHER, UNITS_BYTES,
+      : MemoryUniReporter("resident-fast", KIND_OTHER, UNITS_BYTES,
 "This is the same measurement as 'resident', but it tries to be as fast as "
 "possible at the expense of accuracy.  On most platforms this is identical to "
 "the 'resident' measurement, but on Mac it may over-count.  You should use "
@@ -412,11 +412,11 @@ public:
 
 #define HAVE_PAGE_FAULT_REPORTERS 1
 
-class PageFaultsSoftReporter MOZ_FINAL : public MemoryReporterBase
+class PageFaultsSoftReporter MOZ_FINAL : public MemoryUniReporter
 {
 public:
     PageFaultsSoftReporter()
-      : MemoryReporterBase("page-faults-soft", KIND_OTHER,
+      : MemoryUniReporter("page-faults-soft", KIND_OTHER,
                            UNITS_COUNT_CUMULATIVE,
 "The number of soft page faults (also known as 'minor page faults') that "
 "have occurred since the process started.  A soft page fault occurs when the "
@@ -441,11 +441,11 @@ public:
     }
 };
 
-class PageFaultsHardReporter MOZ_FINAL : public MemoryReporterBase
+class PageFaultsHardReporter MOZ_FINAL : public MemoryUniReporter
 {
 public:
     PageFaultsHardReporter()
-      : MemoryReporterBase("page-faults-hard", KIND_OTHER,
+      : MemoryUniReporter("page-faults-hard", KIND_OTHER,
                            UNITS_COUNT_CUMULATIVE,
 "The number of hard page faults (also known as 'major page faults') that have "
 "occurred since the process started.  A hard page fault occurs when a process "
@@ -479,11 +479,11 @@ public:
 
 #ifdef HAVE_JEMALLOC_STATS
 
-class HeapAllocatedReporter MOZ_FINAL : public MemoryReporterBase
+class HeapAllocatedReporter MOZ_FINAL : public MemoryUniReporter
 {
 public:
     HeapAllocatedReporter()
-      : MemoryReporterBase("heap-allocated", KIND_OTHER, UNITS_BYTES,
+      : MemoryUniReporter("heap-allocated", KIND_OTHER, UNITS_BYTES,
 "Memory mapped by the heap allocator that is currently allocated to the "
 "application.  This may exceed the amount of memory requested by the "
 "application because the allocator regularly rounds up request sizes. (The "
@@ -498,14 +498,14 @@ private:
     }
 };
 
-class HeapOverheadWasteReporter MOZ_FINAL : public MemoryReporterBase
+class HeapOverheadWasteReporter MOZ_FINAL : public MemoryUniReporter
 {
 public:
     // We mark this and the other heap-overhead reporters as KIND_NONHEAP
     // because KIND_HEAP memory means "counted in heap-allocated", which this
     // is not.
     HeapOverheadWasteReporter()
-      : MemoryReporterBase("explicit/heap-overhead/waste",
+      : MemoryUniReporter("explicit/heap-overhead/waste",
                            KIND_NONHEAP, UNITS_BYTES,
 "Committed bytes which do not correspond to an active allocation and which the "
 "allocator is not intentionally keeping alive (i.e., not 'heap-bookkeeping' or "
@@ -522,11 +522,11 @@ private:
     }
 };
 
-class HeapOverheadBookkeepingReporter MOZ_FINAL : public MemoryReporterBase
+class HeapOverheadBookkeepingReporter MOZ_FINAL : public MemoryUniReporter
 {
 public:
     HeapOverheadBookkeepingReporter()
-      : MemoryReporterBase("explicit/heap-overhead/bookkeeping",
+      : MemoryUniReporter("explicit/heap-overhead/bookkeeping",
                            KIND_NONHEAP, UNITS_BYTES,
 "Committed bytes which the heap allocator uses for internal data structures.")
     {}
@@ -539,11 +539,11 @@ private:
     }
 };
 
-class HeapOverheadPageCacheReporter MOZ_FINAL : public MemoryReporterBase
+class HeapOverheadPageCacheReporter MOZ_FINAL : public MemoryUniReporter
 {
 public:
     HeapOverheadPageCacheReporter()
-      : MemoryReporterBase("explicit/heap-overhead/page-cache",
+      : MemoryUniReporter("explicit/heap-overhead/page-cache",
                            KIND_NONHEAP, UNITS_BYTES,
 "Memory which the allocator could return to the operating system, but hasn't. "
 "The allocator keeps this memory around as an optimization, so it doesn't "
@@ -559,11 +559,11 @@ private:
     }
 };
 
-class HeapCommittedReporter MOZ_FINAL : public MemoryReporterBase
+class HeapCommittedReporter MOZ_FINAL : public MemoryUniReporter
 {
 public:
     HeapCommittedReporter()
-      : MemoryReporterBase("heap-committed", KIND_OTHER, UNITS_BYTES,
+      : MemoryUniReporter("heap-committed", KIND_OTHER, UNITS_BYTES,
 "Memory mapped by the heap allocator that is committed, i.e. in physical "
 "memory or paged to disk.  This value corresponds to 'heap-allocated' + "
 "'heap-waste' + 'heap-bookkeeping' + 'heap-page-cache', but because "
@@ -580,11 +580,11 @@ private:
     }
 };
 
-class HeapOverheadRatioReporter MOZ_FINAL : public MemoryReporterBase
+class HeapOverheadRatioReporter MOZ_FINAL : public MemoryUniReporter
 {
 public:
     HeapOverheadRatioReporter()
-      : MemoryReporterBase("heap-overhead-ratio", KIND_OTHER,
+      : MemoryUniReporter("heap-overhead-ratio", KIND_OTHER,
                            UNITS_PERCENTAGE,
 "Ratio of committed, unused bytes to allocated bytes; i.e., "
 "'heap-overhead' / 'heap-allocated'.  This measures the overhead of "
@@ -607,11 +607,11 @@ private:
 // However, the obvious time to register it is when the table is initialized,
 // and that happens before XPCOM components are initialized, which means the
 // NS_RegisterMemoryReporter call fails.  So instead we do it here.
-class AtomTablesReporter MOZ_FINAL : public MemoryReporterBase
+class AtomTablesReporter MOZ_FINAL : public MemoryUniReporter
 {
 public:
     AtomTablesReporter()
-      : MemoryReporterBase("explicit/atom-tables", KIND_HEAP, UNITS_BYTES,
+      : MemoryUniReporter("explicit/atom-tables", KIND_HEAP, UNITS_BYTES,
 "Memory used by the dynamic and static atoms tables.")
     {}
 private:
@@ -623,10 +623,10 @@ private:
 namespace mozilla {
 namespace dmd {
 
-class DMDMultiReporter MOZ_FINAL : public nsIMemoryMultiReporter
+class DMDReporter MOZ_FINAL : public nsIMemoryReporter
 {
 public:
-  DMDMultiReporter()
+  DMDReporter()
   {}
 
   NS_DECL_ISUPPORTS
@@ -637,7 +637,7 @@ public:
     return NS_OK;
   }
 
-  NS_IMETHOD CollectReports(nsIMemoryMultiReporterCallback* aCallback,
+  NS_IMETHOD CollectReports(nsIMemoryReporterCallback* aCallback,
                             nsISupports* aClosure)
   {
     dmd::Sizes sizes;
@@ -677,7 +677,7 @@ public:
   }
 };
 
-NS_IMPL_ISUPPORTS1(DMDMultiReporter, nsIMemoryMultiReporter)
+NS_IMPL_ISUPPORTS1(DMDReporter, nsIMemoryReporter)
 
 } // namespace dmd
 } // namespace mozilla
@@ -725,7 +725,7 @@ nsMemoryReporterManager::Init()
     RegisterReporter(new AtomTablesReporter);
 
 #ifdef MOZ_DMD
-    RegisterMultiReporter(new mozilla::dmd::DMDMultiReporter);
+    RegisterReporter(new mozilla::dmd::DMDReporter);
 #endif
 
 #if defined(XP_LINUX)
@@ -803,7 +803,6 @@ nsMemoryReporterManager::nsMemoryReporterManager()
     mIsRegistrationBlocked(false)
 {
     mReporters.Init();
-    mMultiReporters.Init();
 }
 
 nsMemoryReporterManager::~nsMemoryReporterManager()
@@ -827,23 +826,6 @@ nsMemoryReporterManager::EnumerateReporters(nsISimpleEnumerator** aResult)
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsMemoryReporterManager::EnumerateMultiReporters(nsISimpleEnumerator** aResult)
-{
-    // Memory multi-reporters are not necessarily threadsafe, so
-    // EnumerateMultiReporters() must be called from the main thread.
-    if (!NS_IsMainThread()) {
-        MOZ_CRASH();
-    }
-
-    mozilla::MutexAutoLock autoLock(mMutex);
-
-    nsRefPtr<HashtableEnumerator> enumerator =
-        new HashtableEnumerator(mMultiReporters);
-    enumerator.forget(aResult);
-    return NS_OK;
-}
-
 static void
 DebugAssertRefcountIsNonZero(nsISupports* aObj)
 {
@@ -899,41 +881,6 @@ nsMemoryReporterManager::RegisterReporterEvenIfBlocked(
     return RegisterReporterHelper(aReporter, /* force = */ true);
 }
 
-nsresult
-nsMemoryReporterManager::RegisterMultiReporterHelper(
-    nsIMemoryMultiReporter* aReporter, bool aForce)
-{
-    // This method is thread-safe.
-    mozilla::MutexAutoLock autoLock(mMutex);
-
-    if ((mIsRegistrationBlocked && !aForce) ||
-         mMultiReporters.Contains(aReporter)) {
-        return NS_ERROR_FAILURE;
-    }
-
-    {
-        nsCOMPtr<nsIMemoryMultiReporter> kungFuDeathGrip = aReporter;
-        mMultiReporters.PutEntry(aReporter);
-    }
-
-    DebugAssertRefcountIsNonZero(aReporter);
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMemoryReporterManager::RegisterMultiReporter(nsIMemoryMultiReporter* aReporter)
-{
-    return RegisterMultiReporterHelper(aReporter, /* force = */ false);
-}
-
-NS_IMETHODIMP
-nsMemoryReporterManager::RegisterMultiReporterEvenIfBlocked(
-    nsIMemoryMultiReporter* aReporter)
-{
-    return RegisterMultiReporterHelper(aReporter, /* force = */ true);
-}
-
 NS_IMETHODIMP
 nsMemoryReporterManager::UnregisterReporter(nsIMemoryReporter* aReporter)
 {
@@ -948,20 +895,6 @@ nsMemoryReporterManager::UnregisterReporter(nsIMemoryReporter* aReporter)
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsMemoryReporterManager::UnregisterMultiReporter(nsIMemoryMultiReporter* aReporter)
-{
-    // This method is thread-safe.
-    mozilla::MutexAutoLock autoLock(mMutex);
-
-    if (!mMultiReporters.Contains(aReporter)) {
-        return NS_ERROR_FAILURE;
-    }
-
-    mMultiReporters.RemoveEntry(aReporter);
-    return NS_OK;
-}
-
 NS_IMETHODIMP
 nsMemoryReporterManager::BlockRegistration()
 {
@@ -998,7 +931,7 @@ nsMemoryReporterManager::GetResident(int64_t* aResident)
 }
 
 // This is just a wrapper for int64_t that implements nsISupports, so it can be
-// passed to nsIMemoryMultiReporter::CollectReports.
+// passed to nsIMemoryReporter::CollectReports.
 class Int64Wrapper MOZ_FINAL : public nsISupports {
 public:
     NS_DECL_ISUPPORTS
@@ -1007,7 +940,7 @@ public:
 };
 NS_IMPL_ISUPPORTS0(Int64Wrapper)
 
-class ExplicitNonHeapCountingCallback MOZ_FINAL : public nsIMemoryMultiReporterCallback
+class ExplicitCallback MOZ_FINAL : public nsIMemoryReporterCallback
 {
 public:
     NS_DECL_ISUPPORTS
@@ -1015,23 +948,20 @@ public:
     NS_IMETHOD Callback(const nsACString& aProcess, const nsACString& aPath,
                         int32_t aKind, int32_t aUnits, int64_t aAmount,
                         const nsACString& aDescription,
-                        nsISupports* aWrappedExplicitNonHeap)
+                        nsISupports* aWrappedExplicit)
     {
-        if (aKind == nsIMemoryReporter::KIND_NONHEAP &&
-            PromiseFlatCString(aPath).Find("explicit") == 0 &&
-            aAmount != int64_t(-1))
+        if (aPath.Equals("heap-allocated") ||
+            (aKind == nsIMemoryReporter::KIND_NONHEAP &&
+             PromiseFlatCString(aPath).Find("explicit") == 0))
         {
-            Int64Wrapper* wrappedPRInt64 =
-                static_cast<Int64Wrapper*>(aWrappedExplicitNonHeap);
-            wrappedPRInt64->mValue += aAmount;
+            Int64Wrapper* wrappedInt64 =
+                static_cast<Int64Wrapper*>(aWrappedExplicit);
+            wrappedInt64->mValue += aAmount;
         }
         return NS_OK;
     }
 };
-NS_IMPL_ISUPPORTS1(
-  ExplicitNonHeapCountingCallback
-, nsIMemoryMultiReporterCallback
-)
+NS_IMPL_ISUPPORTS1(ExplicitCallback, nsIMemoryReporterCallback)
 
 NS_IMETHODIMP
 nsMemoryReporterManager::GetExplicit(int64_t* aExplicit)
@@ -1044,63 +974,25 @@ nsMemoryReporterManager::GetExplicit(int64_t* aExplicit)
     nsresult rv;
     bool more;
 
-    // Get "heap-allocated" and all the KIND_NONHEAP measurements from normal
-    // (i.e. non-multi) "explicit" reporters.
-    int64_t heapAllocated = int64_t(-1);
-    int64_t explicitNonHeapNormalSize = 0;
+    // For each reporter we call CollectReports and filter out the
+    // non-explicit, non-NONHEAP measurements (except for "heap-allocated").
+    // That's lots of wasted work, and we used to have a GetExplicitNonHeap()
+    // method which did this more efficiently, but it ended up being more
+    // trouble than it was worth.
+
+    nsRefPtr<ExplicitCallback> cb = new ExplicitCallback();
+    nsRefPtr<Int64Wrapper> wrappedExplicitSize = new Int64Wrapper();
+
     nsCOMPtr<nsISimpleEnumerator> e;
     EnumerateReporters(getter_AddRefs(e));
     while (NS_SUCCEEDED(e->HasMoreElements(&more)) && more) {
         nsCOMPtr<nsIMemoryReporter> r;
         e->GetNext(getter_AddRefs(r));
-
-        int32_t kind;
-        rv = r->GetKind(&kind);
-        NS_ENSURE_SUCCESS(rv, rv);
-
-        nsCString path;
-        rv = r->GetPath(path);
-        NS_ENSURE_SUCCESS(rv, rv);
-
-        // We're only interested in NONHEAP explicit reporters and
-        // the 'heap-allocated' reporter.
-        if (kind == nsIMemoryReporter::KIND_NONHEAP &&
-            path.Find("explicit") == 0)
-        {
-            // Just skip any NONHEAP reporters that fail, because
-            // "heap-allocated" is the most important one.
-            int64_t amount;
-            rv = r->GetAmount(&amount);
-            if (NS_SUCCEEDED(rv)) {
-                explicitNonHeapNormalSize += amount;
-            }
-        } else if (path.Equals("heap-allocated")) {
-            // If we don't have "heap-allocated", give up, because the result
-            // would be horribly inaccurate.
-            rv = r->GetAmount(&heapAllocated);
-            NS_ENSURE_SUCCESS(rv, rv);
-        }
+        r->CollectReports(cb, wrappedExplicitSize);
     }
 
-    // For each multi-reporter we call CollectReports and filter out the
-    // non-explicit, non-NONHEAP measurements.  That's lots of wasted work,
-    // and we used to have a GetExplicitNonHeap() method which did this more
-    // efficiently, but it ended up being more trouble than it was worth.
+    *aExplicit = wrappedExplicitSize->mValue;
 
-    nsRefPtr<ExplicitNonHeapCountingCallback> cb =
-      new ExplicitNonHeapCountingCallback();
-    nsRefPtr<Int64Wrapper> wrappedExplicitNonHeapMultiSize =
-      new Int64Wrapper();
-    nsCOMPtr<nsISimpleEnumerator> e2;
-    EnumerateMultiReporters(getter_AddRefs(e2));
-    while (NS_SUCCEEDED(e2->HasMoreElements(&more)) && more) {
-      nsCOMPtr<nsIMemoryMultiReporter> r;
-      e2->GetNext(getter_AddRefs(r));
-      r->CollectReports(cb, wrappedExplicitNonHeapMultiSize);
-    }
-    int64_t explicitNonHeapMultiSize = wrappedExplicitNonHeapMultiSize->mValue;
-
-    *aExplicit = heapAllocated + explicitNonHeapNormalSize + explicitNonHeapMultiSize;
     return NS_OK;
 #endif // HAVE_JEMALLOC_STATS
 }
@@ -1205,7 +1097,7 @@ nsMemoryReporterManager::MinimizeMemoryUsage(nsIRunnable* aCallback,
 // Most memory reporters don't need thread safety, but some do.  Make them all
 // thread-safe just to be safe.  Memory reporters are created and destroyed
 // infrequently enough that the performance cost should be negligible.
-NS_IMPL_ISUPPORTS1(MemoryReporterBase, nsIMemoryReporter)
+NS_IMPL_ISUPPORTS1(MemoryUniReporter, nsIMemoryReporter)
 
 nsresult
 NS_RegisterMemoryReporter(nsIMemoryReporter* aReporter)
@@ -1217,16 +1109,6 @@ NS_RegisterMemoryReporter(nsIMemoryReporter* aReporter)
     return mgr->RegisterReporter(aReporter);
 }
 
-nsresult
-NS_RegisterMemoryMultiReporter(nsIMemoryMultiReporter* aReporter)
-{
-    nsCOMPtr<nsIMemoryReporterManager> mgr = do_GetService("@mozilla.org/memory-reporter-manager;1");
-    if (!mgr) {
-        return NS_ERROR_FAILURE;
-    }
-    return mgr->RegisterMultiReporter(aReporter);
-}
-
 nsresult
 NS_UnregisterMemoryReporter(nsIMemoryReporter* aReporter)
 {
@@ -1237,22 +1119,12 @@ NS_UnregisterMemoryReporter(nsIMemoryReporter* aReporter)
     return mgr->UnregisterReporter(aReporter);
 }
 
-nsresult
-NS_UnregisterMemoryMultiReporter(nsIMemoryMultiReporter* aReporter)
-{
-    nsCOMPtr<nsIMemoryReporterManager> mgr = do_GetService("@mozilla.org/memory-reporter-manager;1");
-    if (!mgr) {
-        return NS_ERROR_FAILURE;
-    }
-    return mgr->UnregisterMultiReporter(aReporter);
-}
-
 #if defined(MOZ_DMD)
 
 namespace mozilla {
 namespace dmd {
 
-class NullMultiReporterCallback : public nsIMemoryMultiReporterCallback
+class NullReporterCallback : public nsIMemoryReporterCallback
 {
 public:
     NS_DECL_ISUPPORTS
@@ -1267,8 +1139,8 @@ public:
     }
 };
 NS_IMPL_ISUPPORTS1(
-  NullMultiReporterCallback
-, nsIMemoryMultiReporterCallback
+  NullReporterCallback
+, nsIMemoryReporterCallback
 )
 
 void
@@ -1277,48 +1149,15 @@ RunReporters()
     nsCOMPtr<nsIMemoryReporterManager> mgr =
         do_GetService("@mozilla.org/memory-reporter-manager;1");
 
-    // Do vanilla reporters.
+    nsRefPtr<NullReporterCallback> cb = new NullReporterCallback();
+
+    bool more;
     nsCOMPtr<nsISimpleEnumerator> e;
     mgr->EnumerateReporters(getter_AddRefs(e));
-    bool more;
     while (NS_SUCCEEDED(e->HasMoreElements(&more)) && more) {
         nsCOMPtr<nsIMemoryReporter> r;
         e->GetNext(getter_AddRefs(r));
-
-        int32_t kind;
-        nsresult rv = r->GetKind(&kind);
-        if (NS_FAILED(rv)) {
-            continue;
-        }
-        nsCString path;
-        rv = r->GetPath(path);
-        if (NS_FAILED(rv)) {
-            continue;
-        }
-
-        // We're only interested in HEAP explicit reporters.  (In particular,
-        // some heap blocks are deliberately measured once inside an "explicit"
-        // reporter and once outside, which isn't a problem.  This condition
-        // prevents them being reported as double-counted.  See bug 811018
-        // comment 2.)
-        if (kind == nsIMemoryReporter::KIND_HEAP &&
-            path.Find("explicit") == 0)
-        {
-            // Just getting the amount is enough for the reporter to report to
-            // DMD.
-            int64_t amount;
-            (void)r->GetAmount(&amount);
-        }
-    }
-
-    // Do multi-reporters.
-    nsCOMPtr<nsISimpleEnumerator> e2;
-    mgr->EnumerateMultiReporters(getter_AddRefs(e2));
-    nsRefPtr<NullMultiReporterCallback> cb = new NullMultiReporterCallback();
-    while (NS_SUCCEEDED(e2->HasMoreElements(&more)) && more) {
-      nsCOMPtr<nsIMemoryMultiReporter> r;
-      e2->GetNext(getter_AddRefs(r));
-      r->CollectReports(cb, nullptr);
+        r->CollectReports(cb, nullptr);
     }
 }
 
diff --git a/xpcom/base/nsMemoryReporterManager.h b/xpcom/base/nsMemoryReporterManager.h
index 3b22ce011b65..baa1e30343aa 100644
--- a/xpcom/base/nsMemoryReporterManager.h
+++ b/xpcom/base/nsMemoryReporterManager.h
@@ -24,11 +24,8 @@ public:
 
 private:
   nsresult RegisterReporterHelper(nsIMemoryReporter *reporter, bool aForce);
-  nsresult RegisterMultiReporterHelper(nsIMemoryMultiReporter *reporter,
-                                       bool aForce);
 
   nsTHashtable<nsISupportsHashKey> mReporters;
-  nsTHashtable<nsISupportsHashKey> mMultiReporters;
   Mutex mMutex;
   bool mIsRegistrationBlocked;
 };
diff --git a/xpcom/build/nsXPComInit.cpp b/xpcom/build/nsXPComInit.cpp
index d4dc96da432f..a56b668807f7 100644
--- a/xpcom/build/nsXPComInit.cpp
+++ b/xpcom/build/nsXPComInit.cpp
@@ -334,11 +334,11 @@ NS_InitXPCOM(nsIServiceManager* *result,
     return NS_InitXPCOM2(result, binDirectory, nullptr);
 }
 
-class ICUReporter MOZ_FINAL : public MemoryReporterBase
+class ICUReporter MOZ_FINAL : public MemoryUniReporter
 {
 public:
     ICUReporter()
-      : MemoryReporterBase("explicit/icu", KIND_HEAP, UNITS_BYTES,
+      : MemoryUniReporter("explicit/icu", KIND_HEAP, UNITS_BYTES,
 "Memory used by ICU, a Unicode and globalization support library.")
     {
 #ifdef DEBUG
diff --git a/xpcom/components/nsCategoryManager.cpp b/xpcom/components/nsCategoryManager.cpp
index 7765add9feab..7ca0a1906544 100644
--- a/xpcom/components/nsCategoryManager.cpp
+++ b/xpcom/components/nsCategoryManager.cpp
@@ -402,11 +402,11 @@ CategoryEnumerator::enumfunc_createenumerator(const char* aStr, CategoryNode* aN
 
 NS_IMPL_QUERY_INTERFACE1(nsCategoryManager, nsICategoryManager)
 
-class XPCOMCategoryManagerReporter MOZ_FINAL : public MemoryReporterBase
+class XPCOMCategoryManagerReporter MOZ_FINAL : public MemoryUniReporter
 {
 public:
     XPCOMCategoryManagerReporter()
-      : MemoryReporterBase("explicit/xpcom/category-manager",
+      : MemoryUniReporter("explicit/xpcom/category-manager",
                            KIND_HEAP, UNITS_BYTES,
                            "Memory used for the XPCOM category manager.")
     {}
diff --git a/xpcom/components/nsComponentManager.cpp b/xpcom/components/nsComponentManager.cpp
index e9cf03a9c70c..aa4487f7249e 100644
--- a/xpcom/components/nsComponentManager.cpp
+++ b/xpcom/components/nsComponentManager.cpp
@@ -280,11 +280,11 @@ CloneAndAppend(nsIFile* aBase, const nsACString& append)
 // nsComponentManagerImpl
 ////////////////////////////////////////////////////////////////////////////////
 
-class XPCOMComponentManagerReporter MOZ_FINAL : public MemoryReporterBase
+class XPCOMComponentManagerReporter MOZ_FINAL : public MemoryUniReporter
 {
 public:
     XPCOMComponentManagerReporter()
-      : MemoryReporterBase("explicit/xpcom/component-manager",
+      : MemoryUniReporter("explicit/xpcom/component-manager",
                            KIND_HEAP, UNITS_BYTES,
                            "Memory used for the XPCOM component manager.")
     {}
diff --git a/xpcom/ds/nsObserverService.cpp b/xpcom/ds/nsObserverService.cpp
index 4b8448eb6d85..0c3ca7ee65be 100644
--- a/xpcom/ds/nsObserverService.cpp
+++ b/xpcom/ds/nsObserverService.cpp
@@ -48,18 +48,18 @@ GetObserverServiceLog()
 
 namespace mozilla {
 
-class ObserverServiceReporter MOZ_FINAL : public nsIMemoryMultiReporter
+class ObserverServiceReporter MOZ_FINAL : public nsIMemoryReporter
 {
 public:
     NS_DECL_ISUPPORTS
-    NS_DECL_NSIMEMORYMULTIREPORTER
+    NS_DECL_NSIMEMORYREPORTER
 protected:
     static const size_t kSuspectReferentCount = 1000;
     static PLDHashOperator CountReferents(nsObserverList* aObserverList,
                                           void* aClosure);
 };
 
-NS_IMPL_ISUPPORTS1(ObserverServiceReporter, nsIMemoryMultiReporter)
+NS_IMPL_ISUPPORTS1(ObserverServiceReporter, nsIMemoryReporter)
 
 NS_IMETHODIMP
 ObserverServiceReporter::GetName(nsACString& aName)
@@ -128,7 +128,7 @@ ObserverServiceReporter::CountReferents(nsObserverList* aObserverList,
 }
 
 NS_IMETHODIMP
-ObserverServiceReporter::CollectReports(nsIMemoryMultiReporterCallback* cb,
+ObserverServiceReporter::CollectReports(nsIMemoryReporterCallback* cb,
                                         nsISupports* aClosure)
 {
     nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
@@ -220,14 +220,14 @@ void
 nsObserverService::RegisterReporter()
 {
     mReporter = new ObserverServiceReporter();
-    NS_RegisterMemoryMultiReporter(mReporter);
+    NS_RegisterMemoryReporter(mReporter);
 }
 
 void
 nsObserverService::Shutdown()
 {
     if (mReporter) {
-        NS_UnregisterMemoryMultiReporter(mReporter);
+        NS_UnregisterMemoryReporter(mReporter);
     }
 
     mShuttingDown = true;
diff --git a/xpcom/ds/nsObserverService.h b/xpcom/ds/nsObserverService.h
index 0c559a8a1ec3..1b3ff959194a 100644
--- a/xpcom/ds/nsObserverService.h
+++ b/xpcom/ds/nsObserverService.h
@@ -15,7 +15,7 @@
 #define NS_OBSERVERSERVICE_CID \
     { 0xd07f5195, 0xe3d1, 0x11d2, { 0x8a, 0xcd, 0x0, 0x10, 0x5a, 0x1b, 0x88, 0x60 } }
 
-class nsIMemoryMultiReporter;
+class nsIMemoryReporter;
 
 namespace mozilla {
 class ObserverServiceReporter;
@@ -47,7 +47,7 @@ private:
 
   bool mShuttingDown;
   nsTHashtable<nsObserverList> mObserverTopicTable;
-  nsCOMPtr<nsIMemoryMultiReporter> mReporter;
+  nsCOMPtr<nsIMemoryReporter> mReporter;
 };
 
 NS_DEFINE_STATIC_IID_ACCESSOR(nsObserverService, NS_OBSERVERSERVICE_CID)
diff --git a/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp b/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp
index c34c36b907ca..0a0546e9dfe2 100644
--- a/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp
+++ b/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp
@@ -40,11 +40,11 @@ XPTInterfaceInfoManager::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf)
     return n;
 }
 
-class XPTIWorkingSetReporter MOZ_FINAL : public MemoryReporterBase
+class XPTIWorkingSetReporter MOZ_FINAL : public MemoryUniReporter
 {
 public:
     XPTIWorkingSetReporter()
-      : MemoryReporterBase("explicit/xpti-working-set", KIND_HEAP, UNITS_BYTES,
+      : MemoryUniReporter("explicit/xpti-working-set", KIND_HEAP, UNITS_BYTES,
                            "Memory used by the XPCOM typelib system.")
     {}
 private:

From 2529248891c10b91a72903732260015e0ce6e572 Mon Sep 17 00:00:00 2001
From: Dan Gohman <sunfish@google.com>
Date: Wed, 4 Sep 2013 21:16:07 -0700
Subject: [PATCH 76/86] Bug 885169 - Spidermonkey: Fix ARM trampoline code to
 inform its RegisterSet of its use of a context register. r=nbp

---
 js/src/jit/arm/Trampoline-arm.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/js/src/jit/arm/Trampoline-arm.cpp b/js/src/jit/arm/Trampoline-arm.cpp
index b5ca00421ea0..374f13b44efe 100644
--- a/js/src/jit/arm/Trampoline-arm.cpp
+++ b/js/src/jit/arm/Trampoline-arm.cpp
@@ -651,6 +651,7 @@ IonRuntime::generateVMWrapper(JSContext *cx, const VMFunction &f)
 
     // The context is the first argument; r0 is the first argument register.
     Register cxreg = r0;
+    regs.take(cxreg);
 
     // Stack is:
     //    ... frame ...

From 9f96e589c94cdf6d275a2bfebc0202017acd0369 Mon Sep 17 00:00:00 2001
From: Dan Gohman <sunfish@google.com>
Date: Wed, 4 Sep 2013 21:16:07 -0700
Subject: [PATCH 77/86] Bug 885169 - Spidermonkey: Alleviate register
 allocation constraints in ICGetElem_Arguments::Compiler::generateStubCode.
 r=nbp

---
 js/src/jit/BaselineIC.cpp           |  3 ++-
 js/src/jit/arm/MacroAssembler-arm.h | 30 +++++++++++++++++++++++------
 js/src/jit/x86/MacroAssembler-x86.h | 26 +++++++++++++++++++------
 3 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/js/src/jit/BaselineIC.cpp b/js/src/jit/BaselineIC.cpp
index ca883d1c2bba..bdfb5e857952 100644
--- a/js/src/jit/BaselineIC.cpp
+++ b/js/src/jit/BaselineIC.cpp
@@ -3970,7 +3970,7 @@ ICGetElem_Arguments::Compiler::generateStubCode(MacroAssembler &masm)
     regs = availableGeneralRegs(0);
     regs.takeUnchecked(objReg);
     regs.takeUnchecked(idxReg);
-    regs.takeUnchecked(scratchReg);
+    regs.take(scratchReg);
     Register argData = regs.takeAny();
     Register tempReg = regs.takeAny();
 
@@ -3992,6 +3992,7 @@ ICGetElem_Arguments::Compiler::generateStubCode(MacroAssembler &masm)
     masm.addPtr(Imm32(ArgumentsData::offsetOfArgs()), argData);
     regs.add(scratchReg);
     regs.add(tempReg);
+    regs.add(argData);
     ValueOperand tempVal = regs.takeAnyValue();
     masm.loadValue(BaseIndex(argData, idxReg, ScaleFromElemWidth(sizeof(Value))), tempVal);
 
diff --git a/js/src/jit/arm/MacroAssembler-arm.h b/js/src/jit/arm/MacroAssembler-arm.h
index 5c8e52159d48..5cd54627f98b 100644
--- a/js/src/jit/arm/MacroAssembler-arm.h
+++ b/js/src/jit/arm/MacroAssembler-arm.h
@@ -954,12 +954,30 @@ class MacroAssemblerARMCompat : public MacroAssemblerARM
     void moveValue(const Value &val, const ValueOperand &dest);
 
     void moveValue(const ValueOperand &src, const ValueOperand &dest) {
-        JS_ASSERT(src.typeReg() != dest.payloadReg());
-        JS_ASSERT(src.payloadReg() != dest.typeReg());
-        if (src.typeReg() != dest.typeReg())
-            ma_mov(src.typeReg(), dest.typeReg());
-        if (src.payloadReg() != dest.payloadReg())
-            ma_mov(src.payloadReg(), dest.payloadReg());
+        Register s0 = src.typeReg(), d0 = dest.typeReg(),
+                 s1 = src.payloadReg(), d1 = dest.payloadReg();
+
+        // Either one or both of the source registers could be the same as a
+        // destination register.
+        if (s1 == d0) {
+            if (s0 == d1) {
+                // If both are, this is just a swap of two registers.
+                JS_ASSERT(d1 != ScratchRegister);
+                JS_ASSERT(d0 != ScratchRegister);
+                ma_mov(d1, ScratchRegister);
+                ma_mov(d0, d1);
+                ma_mov(ScratchRegister, d0);
+                return;
+            }
+            // If only one is, copy that source first.
+            mozilla::Swap(s0, s1);
+            mozilla::Swap(d0, d1);
+        }
+
+        if (s0 != d0)
+            ma_mov(s0, d0);
+        if (s1 != d1)
+            ma_mov(s1, d1);
     }
 
     void storeValue(ValueOperand val, Operand dst);
diff --git a/js/src/jit/x86/MacroAssembler-x86.h b/js/src/jit/x86/MacroAssembler-x86.h
index 5b3d579562fa..dcb8673f5fb9 100644
--- a/js/src/jit/x86/MacroAssembler-x86.h
+++ b/js/src/jit/x86/MacroAssembler-x86.h
@@ -113,12 +113,26 @@ class MacroAssemblerX86 : public MacroAssemblerX86Shared
         moveValue(val, dest.typeReg(), dest.payloadReg());
     }
     void moveValue(const ValueOperand &src, const ValueOperand &dest) {
-        JS_ASSERT(src.typeReg() != dest.payloadReg());
-        JS_ASSERT(src.payloadReg() != dest.typeReg());
-        if (src.typeReg() != dest.typeReg())
-            movl(src.typeReg(), dest.typeReg());
-        if (src.payloadReg() != dest.payloadReg())
-            movl(src.payloadReg(), dest.payloadReg());
+        Register s0 = src.typeReg(), d0 = dest.typeReg(),
+                 s1 = src.payloadReg(), d1 = dest.payloadReg();
+
+        // Either one or both of the source registers could be the same as a
+        // destination register.
+        if (s1 == d0) {
+            if (s0 == d1) {
+                // If both are, this is just a swap of two registers.
+                xchgl(d0, d1);
+                return;
+            }
+            // If only one is, copy that source first.
+            mozilla::Swap(s0, s1);
+            mozilla::Swap(d0, d1);
+        }
+
+        if (s0 != d0)
+            movl(s0, d0);
+        if (s1 != d1)
+            movl(s1, d1);
     }
 
     /////////////////////////////////////////////////////////////////

From 1e180cb5c9cca2d48a86d04c21a5cf297faacfaa Mon Sep 17 00:00:00 2001
From: Dan Gohman <sunfish@google.com>
Date: Wed, 4 Sep 2013 21:16:07 -0700
Subject: [PATCH 78/86] Bug 885169 - Reverse the default register allocation
 order so that low registers like eax on x86/x64 are preferred over high
 registers. r=h4writer

---
 js/src/jit/RegisterSets.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/js/src/jit/RegisterSets.h b/js/src/jit/RegisterSets.h
index b19d422c3fcc..251fac45f805 100644
--- a/js/src/jit/RegisterSets.h
+++ b/js/src/jit/RegisterSets.h
@@ -400,8 +400,12 @@ class TypedRegisterSet
 #endif
     }
     T getAny() const {
-        JS_ASSERT(!empty());
-        return T::FromCode(mozilla::FloorLog2(bits_));
+        // The choice of first or last here is mostly arbitrary, as they are
+        // about the same speed on popular architectures. We choose first, as
+        // it has the advantage of using the "lower" registers more often. These
+        // registers are sometimes more efficient (e.g. optimized encodings for
+        // EAX on x86).
+        return getFirst();
     }
     T getFirst() const {
         JS_ASSERT(!empty());

From 95e80fd9544e49837eb4da3d682ebe4d9b870238 Mon Sep 17 00:00:00 2001
From: Shane Tully <stully@mozilla.com>
Date: Fri, 23 Aug 2013 16:36:01 -0700
Subject: [PATCH 79/86] Bug 880118 - Integrate the GeckoView library into the
 build system r=cpeterson

---
 mobile/android/geckoview_library/.classpath   | 13 ++++++
 mobile/android/geckoview_library/.project     | 33 ++++++++++++++
 .../geckoview_library/AndroidManifest.xml     | 17 +++++++
 mobile/android/geckoview_library/Makefile.in  | 45 +++++++++++++++++++
 mobile/android/geckoview_library/moz.build    |  5 +++
 .../geckoview_library/project.properties      | 15 +++++++
 mobile/android/moz.build                      |  1 +
 toolkit/mozapps/installer/packager.mk         |  7 ++-
 8 files changed, 135 insertions(+), 1 deletion(-)
 create mode 100644 mobile/android/geckoview_library/.classpath
 create mode 100644 mobile/android/geckoview_library/.project
 create mode 100644 mobile/android/geckoview_library/AndroidManifest.xml
 create mode 100644 mobile/android/geckoview_library/Makefile.in
 create mode 100644 mobile/android/geckoview_library/moz.build
 create mode 100644 mobile/android/geckoview_library/project.properties

diff --git a/mobile/android/geckoview_library/.classpath b/mobile/android/geckoview_library/.classpath
new file mode 100644
index 000000000000..46d9cf7cbb2f
--- /dev/null
+++ b/mobile/android/geckoview_library/.classpath
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES">
+		<attributes>
+			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="geckoview_library/libs/armeabi-v7a"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry kind="output" path="bin/classes"/>
+</classpath>
diff --git a/mobile/android/geckoview_library/.project b/mobile/android/geckoview_library/.project
new file mode 100644
index 000000000000..6ed69354e958
--- /dev/null
+++ b/mobile/android/geckoview_library/.project
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>GeckoView</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/mobile/android/geckoview_library/AndroidManifest.xml b/mobile/android/geckoview_library/AndroidManifest.xml
new file mode 100644
index 000000000000..12aed5b1bc5a
--- /dev/null
+++ b/mobile/android/geckoview_library/AndroidManifest.xml
@@ -0,0 +1,17 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.mozilla.geckoview"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
+
+    <uses-sdk
+        android:minSdkVersion="8"
+        android:targetSdkVersion="17" />
+
+</manifest>
diff --git a/mobile/android/geckoview_library/Makefile.in b/mobile/android/geckoview_library/Makefile.in
new file mode 100644
index 000000000000..129832a1f478
--- /dev/null
+++ b/mobile/android/geckoview_library/Makefile.in
@@ -0,0 +1,45 @@
+# 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/.
+
+DEPTH      = @DEPTH@
+topsrcdir  = @top_srcdir@
+srcdir     = @srcdir@
+VPATH      = @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+INSTALL_TARGETS += GECKOVIEW_LIBRARY
+GECKOVIEW_LIBRARY_DEST = $(CURDIR)
+GECKOVIEW_LIBRARY_FILES := \
+  .classpath \
+  .project \
+  AndroidManifest.xml \
+  project.properties \
+  $(NULL)
+
+include $(topsrcdir)/config/rules.mk
+
+package:
+	# Make directory for the zips
+	$(MKDIR) -p $(DIST)/geckoview_library
+
+	# Zip the assets
+	cd $(DIST)/fennec; \
+	$(ZIP) -r ../geckoview_library/geckoview_assets.zip assets
+
+	# Make empty directories to fit an Android project structure
+	$(MKDIR) -p bin gen libs/$(ABI_DIR) src
+
+	# Copy the JARs
+	cp ../base/jars/* libs/
+
+	# Copy the SOs
+	cp $(DIST)/bin/libmozglue.so $(DIST)/bin/lib/libplugin-container.so libs/$(ABI_DIR)/
+
+	# Copy the resources
+	cp -R ../base/res .
+
+	# Zip the directory
+	cd ..; \
+	$(ZIP) -r ../../dist/geckoview_library/geckoview_library.zip geckoview_library --exclude geckoview_library/backend.mk geckoview_library/Makefile
diff --git a/mobile/android/geckoview_library/moz.build b/mobile/android/geckoview_library/moz.build
new file mode 100644
index 000000000000..c271ec3908ce
--- /dev/null
+++ b/mobile/android/geckoview_library/moz.build
@@ -0,0 +1,5 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# 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/.
diff --git a/mobile/android/geckoview_library/project.properties b/mobile/android/geckoview_library/project.properties
new file mode 100644
index 000000000000..484dab07534a
--- /dev/null
+++ b/mobile/android/geckoview_library/project.properties
@@ -0,0 +1,15 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system edit
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+
+# Project target.
+target=android-17
+android.library=true
diff --git a/mobile/android/moz.build b/mobile/android/moz.build
index 9d4352980971..d2c29326d7a6 100644
--- a/mobile/android/moz.build
+++ b/mobile/android/moz.build
@@ -16,6 +16,7 @@ DIRS += [
     'themes/core',
     'app',
     'fonts',
+    'geckoview_library',
 ]
 
 if not CONFIG['LIBXUL_SDK']:
diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk
index 2acb734bf901..b344809899bc 100644
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -344,6 +344,10 @@ else
 INNER_ROBOCOP_PACKAGE=echo 'Testing is disabled - No Robocop for you'
 endif
 
+# Create geckoview_library/geckoview_{assets,library}.zip for third-party GeckoView consumers.
+INNER_MAKE_GECKOVIEW_LIBRARY= \
+  $(MAKE) -C ../mobile/android/geckoview_library package ABI_DIR=$(ABI_DIR)
+
 ifdef MOZ_OMX_PLUGIN
 DIST_FILES += libomxplugin.so libomxplugingb.so libomxplugingb235.so libomxpluginhc.so libomxpluginfroyo.so
 endif
@@ -394,7 +398,8 @@ INNER_MAKE_PACKAGE	= \
   cp $(_ABS_DIST)/gecko.apk $(_ABS_DIST)/gecko-unsigned-unaligned.apk && \
   $(RELEASE_JARSIGNER) $(_ABS_DIST)/gecko.apk && \
   $(ZIPALIGN) -f -v 4 $(_ABS_DIST)/gecko.apk $(PACKAGE) && \
-  $(INNER_ROBOCOP_PACKAGE)
+  $(INNER_ROBOCOP_PACKAGE) && \
+  $(INNER_MAKE_GECKOVIEW_LIBRARY)
 
 # Language repacks root the resources contained in assets/omni.ja
 # under assets/, but the repacks expect them to be rooted at /.

From a3499c335b597f212705116bc661e548772bc054 Mon Sep 17 00:00:00 2001
From: Mark Finkle <mfinkle@mozilla.com>
Date: Thu, 5 Sep 2013 00:26:26 -0400
Subject: [PATCH 80/86] Bug 880118 - Add support for disabling geckoview
 packaging r=glandium

---
 configure.in                          | 1 +
 toolkit/mozapps/installer/packager.mk | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/configure.in b/configure.in
index 0054bf9d702b..a7412ab73ab2 100644
--- a/configure.in
+++ b/configure.in
@@ -8447,6 +8447,7 @@ AC_SUBST(MOZ_METRO)
 AC_SUBST(MOZ_ANDROID_HISTORY)
 AC_SUBST(MOZ_WEBSMS_BACKEND)
 AC_SUBST(MOZ_ANDROID_BEAM)
+AC_SUBST(MOZ_DISABLE_GECKOVIEW)
 AC_SUBST(ENABLE_STRIP)
 AC_SUBST(PKG_SKIP_STRIP)
 AC_SUBST(STRIP_FLAGS)
diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk
index b344809899bc..0fe7c54919bb 100644
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -345,8 +345,12 @@ INNER_ROBOCOP_PACKAGE=echo 'Testing is disabled - No Robocop for you'
 endif
 
 # Create geckoview_library/geckoview_{assets,library}.zip for third-party GeckoView consumers.
+ifndef MOZ_DISABLE_GECKOVIEW
 INNER_MAKE_GECKOVIEW_LIBRARY= \
   $(MAKE) -C ../mobile/android/geckoview_library package ABI_DIR=$(ABI_DIR)
+else
+INNER_MAKE_GECKOVIEW_LIBRARY=echo 'GeckoView library packaging is disabled'
+endif
 
 ifdef MOZ_OMX_PLUGIN
 DIST_FILES += libomxplugin.so libomxplugingb.so libomxplugingb235.so libomxpluginhc.so libomxpluginfroyo.so

From 6d8ac130b9cb09fb3f2396b235157edc104b9796 Mon Sep 17 00:00:00 2001
From: Mark Finkle <mfinkle@mozilla.com>
Date: Thu, 5 Sep 2013 00:26:30 -0400
Subject: [PATCH 81/86] Bug 880118 - Disable geckoview packaging in l10n builds
 r=glandium

---
 mobile/android/config/mozconfigs/android-armv6/l10n-nightly | 1 +
 mobile/android/config/mozconfigs/android-armv6/l10n-release | 1 +
 mobile/android/config/mozconfigs/android-x86/l10n-nightly   | 1 +
 mobile/android/config/mozconfigs/android-x86/l10n-release   | 1 +
 mobile/android/config/mozconfigs/android/l10n-nightly       | 1 +
 mobile/android/config/mozconfigs/android/l10n-release       | 1 +
 6 files changed, 6 insertions(+)

diff --git a/mobile/android/config/mozconfigs/android-armv6/l10n-nightly b/mobile/android/config/mozconfigs/android-armv6/l10n-nightly
index 04fbfac0c332..3bbac064ff35 100644
--- a/mobile/android/config/mozconfigs/android-armv6/l10n-nightly
+++ b/mobile/android/config/mozconfigs/android-armv6/l10n-nightly
@@ -34,6 +34,7 @@ ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 export MOZ_PKG_SPECIAL=armv6
+export MOZ_DISABLE_GECKOVIEW=1
 
 ac_add_options --with-branding=mobile/android/branding/nightly
 
diff --git a/mobile/android/config/mozconfigs/android-armv6/l10n-release b/mobile/android/config/mozconfigs/android-armv6/l10n-release
index a369cde177ff..2b493db2664d 100644
--- a/mobile/android/config/mozconfigs/android-armv6/l10n-release
+++ b/mobile/android/config/mozconfigs/android-armv6/l10n-release
@@ -31,6 +31,7 @@ ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 export MOZ_PKG_SPECIAL=armv6
+export MOZ_DISABLE_GECKOVIEW=1
 
 ac_add_options --enable-official-branding
 ac_add_options --with-branding=mobile/android/branding/beta
diff --git a/mobile/android/config/mozconfigs/android-x86/l10n-nightly b/mobile/android/config/mozconfigs/android-x86/l10n-nightly
index a03e4099e958..80e4328bc00e 100644
--- a/mobile/android/config/mozconfigs/android-x86/l10n-nightly
+++ b/mobile/android/config/mozconfigs/android-x86/l10n-nightly
@@ -32,6 +32,7 @@ ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
+export MOZ_DISABLE_GECKOVIEW=1
 
 ac_add_options --with-branding=mobile/android/branding/nightly
 
diff --git a/mobile/android/config/mozconfigs/android-x86/l10n-release b/mobile/android/config/mozconfigs/android-x86/l10n-release
index 4064f8503775..3f717c3a6984 100644
--- a/mobile/android/config/mozconfigs/android-x86/l10n-release
+++ b/mobile/android/config/mozconfigs/android-x86/l10n-release
@@ -29,6 +29,7 @@ ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
+export MOZ_DISABLE_GECKOVIEW=1
 
 ac_add_options --enable-official-branding
 ac_add_options --with-branding=mobile/android/branding/beta
diff --git a/mobile/android/config/mozconfigs/android/l10n-nightly b/mobile/android/config/mozconfigs/android/l10n-nightly
index ad3f99d0b3a1..021712335fa8 100644
--- a/mobile/android/config/mozconfigs/android/l10n-nightly
+++ b/mobile/android/config/mozconfigs/android/l10n-nightly
@@ -32,6 +32,7 @@ ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
+export MOZ_DISABLE_GECKOVIEW=1
 
 ac_add_options --with-branding=mobile/android/branding/nightly
 
diff --git a/mobile/android/config/mozconfigs/android/l10n-release b/mobile/android/config/mozconfigs/android/l10n-release
index 0143c6b1478d..671c52604a26 100644
--- a/mobile/android/config/mozconfigs/android/l10n-release
+++ b/mobile/android/config/mozconfigs/android/l10n-release
@@ -29,6 +29,7 @@ ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
+export MOZ_DISABLE_GECKOVIEW=1
 
 ac_add_options --enable-official-branding
 ac_add_options --with-branding=mobile/android/branding/beta

From 8b7d6d5ca2f831e4093e348f6adf0b5cee595594 Mon Sep 17 00:00:00 2001
From: Mark Finkle <mfinkle@mozilla.com>
Date: Thu, 5 Sep 2013 00:29:29 -0400
Subject: [PATCH 82/86] Bug 880118 - Dynamically pull resource IDs to avoid
 R.java reordering r=kats

---
 mobile/android/base/gfx/LayerView.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/mobile/android/base/gfx/LayerView.java b/mobile/android/base/gfx/LayerView.java
index 842395a2bcf9..c3aa8a4bb32a 100644
--- a/mobile/android/base/gfx/LayerView.java
+++ b/mobile/android/base/gfx/LayerView.java
@@ -443,18 +443,20 @@ public class LayerView extends FrameLayout {
         return mGLController;
     }
 
-    private Bitmap getDrawable(int resId) {
+    private Bitmap getDrawable(String name) {
         BitmapFactory.Options options = new BitmapFactory.Options();
         options.inScaled = false;
-        return BitmapUtils.decodeResource(getContext(), resId, options);
+        Context context = getContext();
+        int resId = context.getResources().getIdentifier(name, "drawable", context.getPackageName());
+        return BitmapUtils.decodeResource(context, resId, options);
     }
 
     Bitmap getShadowPattern() {
-        return getDrawable(R.drawable.shadow);
+        return getDrawable("shadow");
     }
 
     Bitmap getScrollbarImage() {
-        return getDrawable(R.drawable.scrollbar);
+        return getDrawable("scrollbar");
     }
 
     /* When using a SurfaceView (mSurfaceView != null), resizing happens in two

From af28e043e97aa5cc8dab9522ebc9be27cae7e02c Mon Sep 17 00:00:00 2001
From: Mark Finkle <mfinkle@mozilla.com>
Date: Thu, 5 Sep 2013 00:33:11 -0400
Subject: [PATCH 83/86] Bug 911018 - Call HardwareUtils.init in GeckoView
 r=bnicholson

---
 mobile/android/base/GeckoView.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mobile/android/base/GeckoView.java b/mobile/android/base/GeckoView.java
index 5bd8c57d6af1..fa6eb551e484 100644
--- a/mobile/android/base/GeckoView.java
+++ b/mobile/android/base/GeckoView.java
@@ -9,6 +9,7 @@ import org.mozilla.gecko.db.BrowserDB;
 import org.mozilla.gecko.gfx.LayerView;
 import org.mozilla.gecko.mozglue.GeckoLoader;
 import org.mozilla.gecko.util.Clipboard;
+import org.mozilla.gecko.util.HardwareUtils;
 import org.mozilla.gecko.util.GeckoEventListener;
 import org.mozilla.gecko.util.ThreadUtils;
 
@@ -53,6 +54,8 @@ public class GeckoView extends LayerView
             }
 
             Clipboard.init(context);
+            HardwareUtils.init(context);
+
             GeckoLoader.loadMozGlue();
             BrowserDB.setEnableContentProviders(false);
         }

From 51f479662d78fc9ecc4bac3d2052b6fa4dd3dcca Mon Sep 17 00:00:00 2001
From: Phil Ringnalda <philringnalda@gmail.com>
Date: Wed, 4 Sep 2013 21:49:16 -0700
Subject: [PATCH 84/86] Back out e46601eb7279:533dc9ea3301 (bug 912322) for
 Android reftest bustage

---
 content/base/crashtests/308120-1.xul          |  2 +-
 content/base/crashtests/330925-1.xhtml        |  2 +-
 content/base/crashtests/401993-1.html         |  2 +-
 content/base/test/test_base.xhtml             |  2 +-
 content/base/test/test_bug330925.xhtml        |  9 +++--
 content/base/test/test_bug372086.html         |  4 +--
 content/base/test/test_bug444030.xhtml        |  2 +-
 .../html/content/crashtests/465466-1.xhtml    |  2 +-
 content/xbl/crashtests/472260-1.xhtml         |  2 +-
 content/xbl/test/file_bug379959_cross.html    |  4 +--
 content/xbl/test/file_bug379959_data.html     |  2 +-
 content/xbl/test/file_bug591198_inner.html    |  2 +-
 content/xbl/test/test_bug378866.xhtml         |  2 +-
 content/xbl/test/test_bug468210.xhtml         |  2 +-
 .../xslt/tests/mochitest/test_bug319374.xhtml |  9 ++---
 content/xul/content/crashtests/326864-1.xul   | 10 ++----
 content/xul/content/crashtests/384740-1.xul   |  2 +-
 dom/base/crashtests/404869-1.xul              |  2 +-
 dom/indexedDB/test/head.js                    |  2 +-
 dom/webidl/Document.webidl                    |  5 +--
 js/xpconnect/crashtests/471366-1.html         |  2 +-
 js/xpconnect/src/XPCWrappedNativeScope.cpp    |  9 -----
 js/xpconnect/src/nsXPConnect.cpp              | 12 ++-----
 js/xpconnect/src/xpcprivate.h                 | 17 +++++----
 js/xpconnect/tests/mochitest/Makefile.in      |  1 -
 .../tests/mochitest/test_bug912322.html       | 35 -------------------
 layout/base/crashtests/379105-1.xhtml         |  2 +-
 layout/inspector/tests/test_bug522601.xhtml   |  2 +-
 layout/reftests/bugs/495385-2f.xhtml          | 18 +++-------
 layout/reftests/bugs/reftest.list             |  2 +-
 .../test_selectors_on_anonymous_content.html  |  2 +-
 layout/xul/base/src/crashtests/328135-1.xul   |  2 +-
 layout/xul/base/src/crashtests/329477-1.xhtml |  4 +--
 .../tests/widgets/test_popupanchor.xul        |  2 +-
 34 files changed, 55 insertions(+), 124 deletions(-)
 delete mode 100644 js/xpconnect/tests/mochitest/test_bug912322.html

diff --git a/content/base/crashtests/308120-1.xul b/content/base/crashtests/308120-1.xul
index 55963d758e44..dc8a21c3e906 100644
--- a/content/base/crashtests/308120-1.xul
+++ b/content/base/crashtests/308120-1.xul
@@ -1,3 +1,3 @@
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" onload="var button=document.getElementsByTagName('button')[0]; try { button.appendChild(SpecialPowers.unwrap(SpecialPowers.wrap(document).getAnonymousNodes(button))[0]); } catch(e) { }">
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" onload="var button=document.getElementsByTagName('button')[0]; try { button.appendChild(document.getAnonymousNodes(button)[0]); } catch(e) { }">
   <button/>
 </window>
diff --git a/content/base/crashtests/330925-1.xhtml b/content/base/crashtests/330925-1.xhtml
index 7dac8374c250..02e1dac4a5bb 100644
--- a/content/base/crashtests/330925-1.xhtml
+++ b/content/base/crashtests/330925-1.xhtml
@@ -10,7 +10,7 @@ function init()
   var emb = document.getElementById("emb");
 
   try {  
-    foopy.appendChild(SpecialPowers.unwrap(SpecialPowers.wrap(document).getAnonymousNodes(emb))[0]);
+    foopy.appendChild(document.getAnonymousNodes(emb)[0]);
     emb.parentNode.removeChild(emb);
     foopy.parentNode.removeChild(foopy);
   } catch (e) {
diff --git a/content/base/crashtests/401993-1.html b/content/base/crashtests/401993-1.html
index b8679dfd04ff..ba071e2b334e 100644
--- a/content/base/crashtests/401993-1.html
+++ b/content/base/crashtests/401993-1.html
@@ -11,7 +11,7 @@ function s()
   
   function boom()
   {
-    var nodes = SpecialPowers.unwrap(SpecialPowers.wrap(document).getAnonymousNodes(x));
+    var nodes = document.getAnonymousNodes(x);
     if (!nodes) {
       setTimeout(boom, 10);
       return;
diff --git a/content/base/test/test_base.xhtml b/content/base/test/test_base.xhtml
index b77551adaa8f..41e5bbccf2c7 100644
--- a/content/base/test/test_base.xhtml
+++ b/content/base/test/test_base.xhtml
@@ -40,7 +40,7 @@ addLoadEvent(function() {
      "http://mochi.test:8888/tests/content/base/test/file_base_xbl.xml",
      "http://mochi.test:8888/tests/content/base/test/file_base_xbl.xml#shesellsseashellsbytheseashore",
      ];
-  node = SpecialPowers.unwrap(SpecialPowers.wrap(document).getAnonymousNodes(document.getElementById("bound")))[0];
+  node = document.getAnonymousNodes(document.getElementById("bound"))[0];
   while(node) {
     is(node.baseURI, svgExpected.shift(), "node base");
     node = node.firstChild;
diff --git a/content/base/test/test_bug330925.xhtml b/content/base/test/test_bug330925.xhtml
index a26ab94be9b3..3784bd18b01d 100644
--- a/content/base/test/test_bug330925.xhtml
+++ b/content/base/test/test_bug330925.xhtml
@@ -46,21 +46,20 @@ addLoadEvent(init);
 function init()
 {
   var t = document.getElementById("t");
-  var d = SpecialPowers.wrap(document);
 
-  is(SpecialPowers.unwrap(d.getBindingParent(d.getAnonymousNodes(t)[0])),
+  is(document.getBindingParent(document.getAnonymousNodes(t)[0]), 
      t,
      "Wrong binding parent for anonymous node");
      
-  is(SpecialPowers.unwrap(d.getBindingParent(d.getAnonymousNodes(t)[1].childNodes[0])),
+  is(document.getBindingParent(document.getAnonymousNodes(t)[1].childNodes[0]), 
      t,
      "Wrong binding parent for child of anonymous node");
      
-  is(d.getBindingParent(t), 
+  is(document.getBindingParent(t), 
      null,
      "Non-anonymous node should not have a binding parent");
      
-  is(d.getBindingParent(document.documentElement), 
+  is(document.getBindingParent(document.documentElement), 
      null,
      "Document element should not have a binding parent");
      
diff --git a/content/base/test/test_bug372086.html b/content/base/test/test_bug372086.html
index 43d8c6e0c8c6..d439215ef2b4 100644
--- a/content/base/test/test_bug372086.html
+++ b/content/base/test/test_bug372086.html
@@ -42,7 +42,7 @@ function runTest() {
   is(range.endOffset, 3, "Unexpected end offset");
   is(range.toString(), "bc", "Unexpected range serialization");
 
-  var anon = SpecialPowers.unwrap(SpecialPowers.wrap(document).getAnonymousNodes($("d")))[0];
+  var anon = document.getAnonymousNodes($("d"))[0];
   // Should collapse the range, because can't determine order
   range.setEnd(anon, 2);
   is(range.startContainer, anon, "Unexpected collapsed start container");
@@ -59,7 +59,7 @@ function runTest() {
   is(range.endOffset, 2, "Unexpected end offset after");
   is(range.toString(), "de", "Unexpected range serialization after");
 
-  anon = SpecialPowers.unwrap(SpecialPowers.wrap(document).getAnonymousNodes($("d")))[2];
+  anon = document.getAnonymousNodes($("d"))[2];
   // Collapses because one endpoint is anonymous from point of view of
   // the other.  
   range.setStart(anon, 1);
diff --git a/content/base/test/test_bug444030.xhtml b/content/base/test/test_bug444030.xhtml
index 6ba2c6ec1395..92f6ba0e57e9 100644
--- a/content/base/test/test_bug444030.xhtml
+++ b/content/base/test/test_bug444030.xhtml
@@ -26,7 +26,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=444030
 /** Test for Bug 444030 **/
 
 function doTest() {
-  var anonTextNode = SpecialPowers.unwrap(SpecialPowers.wrap(document).getAnonymousNodes(document.getElementById("boundElement")))[0];
+  var anonTextNode = document.getAnonymousNodes(document.getElementById("boundElement"))[0];
   var hadException = false;
   try {
     var wholeText = anonTextNode.wholeText;
diff --git a/content/html/content/crashtests/465466-1.xhtml b/content/html/content/crashtests/465466-1.xhtml
index 4e1258702684..d1b85dadec45 100644
--- a/content/html/content/crashtests/465466-1.xhtml
+++ b/content/html/content/crashtests/465466-1.xhtml
@@ -11,7 +11,7 @@
 function boom()
 {
   var f = document.getElementById("f");
-  var anon = SpecialPowers.unwrap(SpecialPowers.wrap(document).getAnonymousNodes(f))[0];
+  var anon = document.getAnonymousNodes(f)[0];
   document.body.removeChild(f);
   anon.appendChild(document.createElement("label"));
 }
diff --git a/content/xbl/crashtests/472260-1.xhtml b/content/xbl/crashtests/472260-1.xhtml
index 49d5407d4636..4b8d97f38a39 100644
--- a/content/xbl/crashtests/472260-1.xhtml
+++ b/content/xbl/crashtests/472260-1.xhtml
@@ -12,7 +12,7 @@
 function boom()
 {
   var bo = document.getElementById("bo");
-  var anon = SpecialPowers.wrap(document).getAnonymousNodes(bo)[0];
+  var anon = document.getAnonymousNodes(bo)[0];
 
   bo.style.MozBinding = "url(#bar)";
 
diff --git a/content/xbl/test/file_bug379959_cross.html b/content/xbl/test/file_bug379959_cross.html
index 8f356d210182..29a456d38ad7 100644
--- a/content/xbl/test/file_bug379959_cross.html
+++ b/content/xbl/test/file_bug379959_cross.html
@@ -16,9 +16,9 @@
 <div id="div2"></div>
 <script>
 onload = function() {
-  nodes = SpecialPowers.wrap(document).getAnonymousNodes(document.getElementById('div1'));
+  nodes = document.getAnonymousNodes(document.getElementById('div1'));
   parent.postMessage(nodes ? nodes.length : 0, "http://mochi.test:8888");
-  nodes = SpecialPowers.wrap(document).getAnonymousNodes(document.getElementById('div2'));
+  nodes = document.getAnonymousNodes(document.getElementById('div2'));
   parent.postMessage(nodes ? nodes.length : 0, "http://mochi.test:8888");
 }
 </script>
diff --git a/content/xbl/test/file_bug379959_data.html b/content/xbl/test/file_bug379959_data.html
index dd101760193c..a84b63ca33a9 100644
--- a/content/xbl/test/file_bug379959_data.html
+++ b/content/xbl/test/file_bug379959_data.html
@@ -11,7 +11,7 @@
 <div id="d"></div>
 <script>
 onload = function() {
-  nodes = SpecialPowers.wrap(document).getAnonymousNodes(document.getElementById('d'));
+  nodes = document.getAnonymousNodes(document.getElementById('d'));
   parent.postMessage(nodes ? nodes.length : 0, "http://mochi.test:8888");
 }
 </script>
diff --git a/content/xbl/test/file_bug591198_inner.html b/content/xbl/test/file_bug591198_inner.html
index 89b547a39fa6..12fc9f58348f 100644
--- a/content/xbl/test/file_bug591198_inner.html
+++ b/content/xbl/test/file_bug591198_inner.html
@@ -22,7 +22,7 @@ function sendResults() {
   
   try {
     res.anonChildCount =
-      SpecialPowers.wrap(document).getAnonymousNodes(document.getElementById('b')).length;
+      document.getAnonymousNodes(document.getElementById('b')).length;
   }
   catch (ex) {}
 
diff --git a/content/xbl/test/test_bug378866.xhtml b/content/xbl/test/test_bug378866.xhtml
index 8dcbf11bb9a5..d4de492ca05a 100644
--- a/content/xbl/test/test_bug378866.xhtml
+++ b/content/xbl/test/test_bug378866.xhtml
@@ -33,7 +33,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=378866
 /** Test for Bug 378866 **/
 
 function runTest() {
-  var anon = SpecialPowers.unwrap(SpecialPowers.wrap(document).getAnonymousNodes(document.getElementById('grandparent')));
+  var anon = document.getAnonymousNodes(document.getElementById('grandparent'));
   var child = document.getElementById('child');
   var insertionPoint = anon[0].childNodes[0];
   insertionPoint.parentNode.removeChild(insertionPoint);
diff --git a/content/xbl/test/test_bug468210.xhtml b/content/xbl/test/test_bug468210.xhtml
index 04434fdf35f9..f930880dd0be 100644
--- a/content/xbl/test/test_bug468210.xhtml
+++ b/content/xbl/test/test_bug468210.xhtml
@@ -32,7 +32,7 @@ addLoadEvent(function() {
   var div = $("d");
   var n = document.anchors.length;
   is(n, 1, "Unexpected number of anchors");
-  var anon = SpecialPowers.unwrap(SpecialPowers.wrap(document).getAnonymousNodes(div))[0];
+  var anon = document.getAnonymousNodes(div)[0];
   is(anon instanceof HTMLSpanElement, true, "Unexpected node");
   is(anon.parentNode, div, "Unexpected parent");
   document.body.appendChild(div);
diff --git a/content/xslt/tests/mochitest/test_bug319374.xhtml b/content/xslt/tests/mochitest/test_bug319374.xhtml
index a3496b7d7b56..c891fb3630a0 100644
--- a/content/xslt/tests/mochitest/test_bug319374.xhtml
+++ b/content/xslt/tests/mochitest/test_bug319374.xhtml
@@ -31,9 +31,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=319374
     //         cause non-anonymous XPath result to throw exceptions..
     var counter = 0;
     var error = null;
-    function getAnonymousNodes(e) {
-      return SpecialPowers.unwrap(SpecialPowers.wrap(document).getAnonymousNodes(e));
-    }
     try {
       var xp = new XPathEvaluator();
       var result = xp.evaluate("*",
@@ -45,7 +42,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=319374
       var res = null;
       while (res = result.iterateNext()) {
         ++counter; 
-        var anon = getAnonymousNodes(res);
+        var anon = document.getAnonymousNodes(res);
         anon[0].removeChild(anon[0].firstChild); // Removing a child node
         anon[0].removeAttribute("attr1"); // Removing an attribute
         anon[1].firstChild.data = "anon text changed" // Modifying text data
@@ -59,10 +56,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=319374
     // Test 2: If the context node is in anonymous content, changing some
     //         other anonymous tree shouldn't cause XPath result to throw.
     var anonAttr1 =
-      getAnonymousNodes(document.getElementById('content').
+      document.getAnonymousNodes(document.getElementById('content').
         firstChild)[0].getAttributeNode('attr');
     var anonAttr2 =
-      getAnonymousNodes(document.getElementById('content').
+      document.getAnonymousNodes(document.getElementById('content').
         lastChild)[0].getAttributeNode('attr');
     var resultAttr = null;
     try {
diff --git a/content/xul/content/crashtests/326864-1.xul b/content/xul/content/crashtests/326864-1.xul
index 5515ca25921c..154b1344bcbe 100644
--- a/content/xul/content/crashtests/326864-1.xul
+++ b/content/xul/content/crashtests/326864-1.xul
@@ -6,17 +6,13 @@
 
 <script>
 
-function getAnonymousNodes(e) {
-  return SpecialPowers.unwrap(SpecialPowers.wrap(document).getAnonymousNodes(e));
-}
-
 function init()
 {
   var tt = document.getElementById("textbox");
-  var hb = getAnonymousNodes(tt)[0]; // hbox
-  var men = getAnonymousNodes(hb)[1]; // menupopup
+  var hb = document.getAnonymousNodes(tt)[0]; // hbox
+  var men = document.getAnonymousNodes(hb)[1]; // menupopup
   var menitem = men.childNodes[0]; // menuitem
-  var hb2 = getAnonymousNodes(menitem)[1]; // hbox
+  var hb2 = document.getAnonymousNodes(menitem)[1]; // hbox
   var label2 = hb2.childNodes[0]; // label
 
   men.menu = null;
diff --git a/content/xul/content/crashtests/384740-1.xul b/content/xul/content/crashtests/384740-1.xul
index 374f47c3db28..3f47b47ac05d 100644
--- a/content/xul/content/crashtests/384740-1.xul
+++ b/content/xul/content/crashtests/384740-1.xul
@@ -12,7 +12,7 @@ function boom()
 
   var scrollbar = document.createElementNS(XUL_NS, 'scrollbar');
   document.documentElement.appendChild(scrollbar);
-  var sbb = SpecialPowers.unwrap(SpecialPowers.wrap(document).getAnonymousNodes(scrollbar))[0];
+  var sbb = document.getAnonymousNodes(scrollbar)[0];
   var action = document.createElementNS(XUL_NS, 'action');
   action.setAttribute('datasources', "");
   sbb.appendChild(action);
diff --git a/dom/base/crashtests/404869-1.xul b/dom/base/crashtests/404869-1.xul
index f5c7facff0a7..e530f7ec656f 100644
--- a/dom/base/crashtests/404869-1.xul
+++ b/dom/base/crashtests/404869-1.xul
@@ -10,7 +10,7 @@
 function boom()
 {
   var menupopup = document.getElementById("menupopup");
-  var x = SpecialPowers.wrap(document).getAnonymousNodes(menupopup)[0];
+  var x = document.getAnonymousNodes(menupopup)[0];
   menupopup.style.MozBinding = "url('#empty')";
   for (var ppp in x) {
   }
diff --git a/dom/indexedDB/test/head.js b/dom/indexedDB/test/head.js
index f47bead8789d..514b5096c469 100644
--- a/dom/indexedDB/test/head.js
+++ b/dom/indexedDB/test/head.js
@@ -60,7 +60,7 @@ function triggerSecondaryCommand(popup, index)
 
   // Cancel the arrow panel slide-in transition (bug 767133) such that
   // it won't interfere with us interacting with the dropdown.
-  SpecialPowers.wrap(document).getAnonymousNodes(popup)[0].style.transition = "none";
+  document.getAnonymousNodes(popup)[0].style.transition = "none";
 
   notification.button.focus();
 
diff --git a/dom/webidl/Document.webidl b/dom/webidl/Document.webidl
index 518fbb823926..81d84c799c74 100644
--- a/dom/webidl/Document.webidl
+++ b/dom/webidl/Document.webidl
@@ -277,14 +277,11 @@ partial interface Document {
 partial interface Document {
   // nsIDOMDocumentXBL.  Wish we could make these [ChromeOnly], but
   // that would likely break bindings running with the page principal.
-  [Func="IsChromeOrXBL"]
   NodeList? getAnonymousNodes(Element elt);
-  [Func="IsChromeOrXBL"]
   Element? getAnonymousElementByAttribute(Element elt, DOMString attrName,
                                           DOMString attrValue);
-  [Func="IsChromeOrXBL"]
   Element? getBindingParent(Node node);
-  [Throws, Func="IsChromeOrXBL"]
+  [Throws]
   void loadBindingDocument(DOMString documentURL);
 
   // nsIDOMDocumentTouch
diff --git a/js/xpconnect/crashtests/471366-1.html b/js/xpconnect/crashtests/471366-1.html
index b450d5e12a46..75d0f2542a9c 100644
--- a/js/xpconnect/crashtests/471366-1.html
+++ b/js/xpconnect/crashtests/471366-1.html
@@ -3,7 +3,7 @@
 <head>
 <script type="text/javascript">
 
-SpecialPowers.wrap(document).getAnonymousNodes({__proto__: XPCNativeWrapper.prototype});
+document.getAnonymousNodes({__proto__: XPCNativeWrapper.prototype});
 
 </script>
 </head>
diff --git a/js/xpconnect/src/XPCWrappedNativeScope.cpp b/js/xpconnect/src/XPCWrappedNativeScope.cpp
index c2b71876c8fb..1cf3055a6b63 100644
--- a/js/xpconnect/src/XPCWrappedNativeScope.cpp
+++ b/js/xpconnect/src/XPCWrappedNativeScope.cpp
@@ -266,15 +266,6 @@ XPCWrappedNativeScope::EnsureXBLScope(JSContext *cx)
     return mXBLScope;
 }
 
-bool
-XPCWrappedNativeScope::AllowXBLScope()
-{
-    // We only disallow XBL scopes in remote XUL situations.
-    MOZ_ASSERT_IF(!mAllowXBLScope,
-                  nsContentUtils::AllowXULXBLForPrincipal(GetPrincipal()));
-    return mAllowXBLScope;
-}
-
 namespace xpc {
 JSObject *GetXBLScope(JSContext *cx, JSObject *contentScopeArg)
 {
diff --git a/js/xpconnect/src/nsXPConnect.cpp b/js/xpconnect/src/nsXPConnect.cpp
index 3c4dde7eb329..61ea9fb7fda2 100644
--- a/js/xpconnect/src/nsXPConnect.cpp
+++ b/js/xpconnect/src/nsXPConnect.cpp
@@ -1710,15 +1710,9 @@ bool
 IsChromeOrXBL(JSContext* cx, JSObject* /* unused */)
 {
     MOZ_ASSERT(NS_IsMainThread());
-    JSCompartment* c = js::GetContextCompartment(cx);
-
-    // For remote XUL, we run XBL in the XUL scope. Given that we care about
-    // compat and not security for remote XUL, we just always claim to be XBL.
-    //
-    // Note that, for performance, we don't check AllowXULXBLForPrincipal here,
-    // and instead rely on the fact that AllowXBLScope() only returns false in
-    // remote XUL situations.
-    return AccessCheck::isChrome(c) || IsXBLScope(c) || !AllowXBLScope(c);
+    JSCompartment* compartment = js::GetContextCompartment(cx);
+    return AccessCheck::isChrome(compartment) ||
+           IsXBLScope(compartment);
 }
 
 } // namespace dom
diff --git a/js/xpconnect/src/xpcprivate.h b/js/xpconnect/src/xpcprivate.h
index 88e03c5454be..7aa790c63d52 100644
--- a/js/xpconnect/src/xpcprivate.h
+++ b/js/xpconnect/src/xpcprivate.h
@@ -1413,7 +1413,7 @@ public:
     nsAutoPtr<JSObject2JSObjectMap> mWaiverWrapperMap;
 
     bool IsXBLScope() { return mIsXBLScope; }
-    bool AllowXBLScope();
+    bool AllowXBLScope() { return mAllowXBLScope; }
 
 protected:
     virtual ~XPCWrappedNativeScope();
@@ -1449,17 +1449,20 @@ private:
 
     bool mIsXBLScope;
 
-    // For remote XUL domains, we run all XBL in the content scope for compat
-    // reasons (though we sometimes pref this off for automation). We separately
+    // There are certain cases where we explicitly disallow XBL scopes: they
+    // can be prefed off, or we might be running in a remote XUL domain where
+    // we want to run all XBL in content to maintain compat. We separately
     // track the result of this decision (mAllowXBLScope), from the decision
     // of whether to actually _use_ an XBL scope (mUseXBLScope), which depends
     // on the type of global and whether the compartment is system principal
     // or not.
     //
-    // This distinction is useful primarily because, if true, we know that we
-    // have no way of distinguishing XBL script from content script for the
-    // given scope. In these (unsupported) situations, we just always claim to
-    // be XBL.
+    // This distinction is useful primarily because it tells us whether we
+    // can infer the XBL-ness of a caller by checking that the caller is
+    // running in an XBL scope, or whether we need to check the XBL bit on the
+    // script. The XBL bit is nasty, so we want to consult it only if we
+    // absolutely have to, which should generally happen only in unsupported
+    // pref configurations.
     bool mAllowXBLScope;
     bool mUseXBLScope;
 };
diff --git a/js/xpconnect/tests/mochitest/Makefile.in b/js/xpconnect/tests/mochitest/Makefile.in
index df908fcf40f1..1d58390ff8f7 100644
--- a/js/xpconnect/tests/mochitest/Makefile.in
+++ b/js/xpconnect/tests/mochitest/Makefile.in
@@ -87,7 +87,6 @@ MOCHITEST_FILES =	chrome_wrappers_helper.html \
 		test_bug865260.html \
 		test_bug870423.html \
 		test_bug871887.html \
-		test_bug912322.html \
 		file_crosscompartment_weakmap.html \
 		test_crosscompartment_weakmap.html \
 		test_asmjs.html \
diff --git a/js/xpconnect/tests/mochitest/test_bug912322.html b/js/xpconnect/tests/mochitest/test_bug912322.html
deleted file mode 100644
index 22fcc9f96c50..000000000000
--- a/js/xpconnect/tests/mochitest/test_bug912322.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=912322
--->
-<head>
-  <meta charset="utf-8">
-  <title>Test for Bug 912322</title>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-  <script type="application/javascript">
-
-  /** Test that XBL functions aren't exposed to the web. **/
-  funs = ['getAnonymousNodes', 'getAnonymousElementByAttribute',
-          'getBindingParent', 'loadBindingDocument'];
-  for (var f of funs) {
-    ok(!(f in document), f + " should not be available to content");
-    ok(f in SpecialPowers.wrap(document), f + " should be available to chrome via Xray");
-  }
-
-
-
-
-  </script>
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=912322">Mozilla Bug 912322</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-
-</div>
-<pre id="test">
-</pre>
-</body>
-</html>
diff --git a/layout/base/crashtests/379105-1.xhtml b/layout/base/crashtests/379105-1.xhtml
index e20cced1696a..662ebbd5cab0 100644
--- a/layout/base/crashtests/379105-1.xhtml
+++ b/layout/base/crashtests/379105-1.xhtml
@@ -25,7 +25,7 @@ function boom1()
 
 function boom2()
 {
-  var nodes = SpecialPowers.unwrap(SpecialPowers.wrap(document).getAnonymousNodes(xbltarget));
+  var nodes = document.getAnonymousNodes(xbltarget);
   if (!nodes) {
     setTimeout(boom2, 10);
     return;
diff --git a/layout/inspector/tests/test_bug522601.xhtml b/layout/inspector/tests/test_bug522601.xhtml
index 344dc61cbf45..8a94fe6176ce 100644
--- a/layout/inspector/tests/test_bug522601.xhtml
+++ b/layout/inspector/tests/test_bug522601.xhtml
@@ -106,7 +106,7 @@ addLoadEvent(function() {
   testFunc(walkerNonAnon, "previousNode", null,
            "step back past root");
 
-  var anonDiv = SpecialPowers.unwrap(SpecialPowers.wrap(document).getAnonymousNodes($("display")))[0];
+  var anonDiv = document.getAnonymousNodes($("display"))[0];
 
   var walkerAnon =
     SpecialPowers.Cc["@mozilla.org/inspector/deep-tree-walker;1"]
diff --git a/layout/reftests/bugs/495385-2f.xhtml b/layout/reftests/bugs/495385-2f.xhtml
index 3c358728c944..9b01963d2381 100644
--- a/layout/reftests/bugs/495385-2f.xhtml
+++ b/layout/reftests/bugs/495385-2f.xhtml
@@ -13,19 +13,6 @@
   </binding>
   <binding id="empty2">
     <content><children/><div xmlns="http://www.w3.org/1999/xhtml">Kitty</div></content>
-    <implementation>
-      <constructor>
-        // We used to do this in an onload handler, but getAnonymousNodes is no
-        // longer accessible to content, and we can't use SpecialPowers in
-        // reftests. So we enable XBL scopes and take advantage of the fact that XBL
-        // scopes can access these functions. We apply this binding
-        // programatically to make absolutely sure this constructor runs after all the
-        // other bindings have been set up.
-        document.body.offsetHeight;
-        document.getAnonymousNodes(document.getElementById("d3"))[0].style.display = 'inline';
-        document.getAnonymousNodes(document.getElementById("d4"))[2].style.display = 'inline';
-      </constructor>
-    </implementation>
   </binding>
 </bindings>
 <style>
@@ -34,10 +21,13 @@ body > div { border:1px solid black; margin:1em;
 #d1 { -moz-binding:url(#before); }
 #d2 { -moz-binding:url(#after); }
 #d3 { -moz-binding:url(#empty1); }
+#d4 { -moz-binding:url(#empty2); }
 </style>
 <script>
 function loaded() {
-  document.getElementById('d4').style.MozBinding = "url(#empty2)";
+  document.body.offsetHeight;
+  document.getAnonymousNodes(document.getElementById("d3"))[0].style.display = 'inline';
+  document.getAnonymousNodes(document.getElementById("d4"))[2].style.display = 'inline';
 }
 </script>
 </head>
diff --git a/layout/reftests/bugs/reftest.list b/layout/reftests/bugs/reftest.list
index 20e161a852dc..8b28ccd272ef 100644
--- a/layout/reftests/bugs/reftest.list
+++ b/layout/reftests/bugs/reftest.list
@@ -1370,7 +1370,7 @@ fails-if(Android) == 488685-1.html 488685-1-ref.html
 == 495385-2c.html 495385-2-ref.html
 == 495385-2d.html 495385-2-ref.html
 == 495385-2e.html 495385-2-ref.html
-pref(dom.use_xbl_scopes_for_remote_xul,true) == 495385-2f.xhtml 495385-2-ref.html
+== 495385-2f.xhtml 495385-2-ref.html
 == 495385-2g.html 495385-2-ref.html
 == 495385-2h.html 495385-2-ref.html
 == 495385-2i.html 495385-2-ref.html
diff --git a/layout/style/test/test_selectors_on_anonymous_content.html b/layout/style/test/test_selectors_on_anonymous_content.html
index 7a65f532894c..89da83fe8869 100644
--- a/layout/style/test/test_selectors_on_anonymous_content.html
+++ b/layout/style/test/test_selectors_on_anonymous_content.html
@@ -42,7 +42,7 @@ function run() {
         style_text.data = selector + "{ z-index: " + zi + " }";
 
         var doc_div = document.getElementById("display");
-        var anon_div = SpecialPowers.unwrap(SpecialPowers.wrap(document).getAnonymousNodes(doc_div))[0];
+        var anon_div = document.getAnonymousNodes(doc_div)[0];
         var should_match = [];
         var should_not_match = [];
         (matches_docdiv ? should_match : should_not_match).push(doc_div);
diff --git a/layout/xul/base/src/crashtests/328135-1.xul b/layout/xul/base/src/crashtests/328135-1.xul
index 77a4679099db..1a532e1869a3 100644
--- a/layout/xul/base/src/crashtests/328135-1.xul
+++ b/layout/xul/base/src/crashtests/328135-1.xul
@@ -9,7 +9,7 @@
 
 function init() { 
   var pop = document.getElementsByTagName("popup")[0];
-  SpecialPowers.wrap(document).getAnonymousNodes(pop)[0];
+  document.getAnonymousNodes(pop)[0];
   eval.eee = document.documentElement;
 };
 
diff --git a/layout/xul/base/src/crashtests/329477-1.xhtml b/layout/xul/base/src/crashtests/329477-1.xhtml
index fcbd3da872cc..87c8bd63666f 100644
--- a/layout/xul/base/src/crashtests/329477-1.xhtml
+++ b/layout/xul/base/src/crashtests/329477-1.xhtml
@@ -9,8 +9,8 @@
 function init() 
 { 
   var textbox = document.getElementsByTagName("textbox")[0];
-  var hbox = SpecialPowers.wrap(document).getAnonymousNodes(textbox)[0];
-  var menupopup = SpecialPowers.wrap(document).getAnonymousNodes(hbox)[1];
+  var hbox = document.getAnonymousNodes(textbox)[0];
+  var menupopup = document.getAnonymousNodes(hbox)[1];
 
   menupopup.click();
 }
diff --git a/toolkit/content/tests/widgets/test_popupanchor.xul b/toolkit/content/tests/widgets/test_popupanchor.xul
index b255c06ba8b2..404c177067f1 100644
--- a/toolkit/content/tests/widgets/test_popupanchor.xul
+++ b/toolkit/content/tests/widgets/test_popupanchor.xul
@@ -383,7 +383,7 @@ SimpleTest.waitForExplicitFinish();
 addEventListener("load", function() {
   // anchor is set by the test runner above
   panel = document.getElementById("testPanel");
-  arrow = SpecialPowers.wrap(document).getAnonymousElementByAttribute(panel, "anonid", "arrow");
+  arrow = document.getAnonymousElementByAttribute(panel, "anonid", "arrow");
   // Cancel the arrow panel slide-in transition (bug 767133) so the size and
   // position are "stable" enough to test without jumping through hoops...
   arrow.style.transition = "none";

From e6e55b7023be9e1cb01cf969754bd9fef9e4feb0 Mon Sep 17 00:00:00 2001
From: George Wright <gwright@mozilla.com>
Date: Fri, 30 Aug 2013 14:35:30 -0400
Subject: [PATCH 85/86] Bug 903722 - Only demote to a software canvas if we're
 a GL-backed Skia canvas r=bjacob

---
 content/canvas/src/CanvasRenderingContext2D.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/canvas/src/CanvasRenderingContext2D.cpp b/content/canvas/src/CanvasRenderingContext2D.cpp
index c3e56b39fd6e..a2b33c49f552 100644
--- a/content/canvas/src/CanvasRenderingContext2D.cpp
+++ b/content/canvas/src/CanvasRenderingContext2D.cpp
@@ -746,7 +746,7 @@ CanvasRenderingContext2D::RedrawUser(const gfxRect& r)
 void CanvasRenderingContext2D::Demote()
 {
 #ifdef  USE_SKIA_GPU
-  if (!IsTargetValid() || mForceSoftware)
+  if (!IsTargetValid() || mForceSoftware || !mTarget->GetGLContext())
     return;
 
   RemoveDemotableContext(this);

From 26ceee4fb590cc07516e069aaad105566eaa6b75 Mon Sep 17 00:00:00 2001
From: Phil Ringnalda <philringnalda@gmail.com>
Date: Wed, 4 Sep 2013 22:42:06 -0700
Subject: [PATCH 86/86] Back out 4537337759b7 (bug 910517) because nobody
 expects the talos inquisition

--HG--
rename : content/canvas/src/WebGLMemoryReporterWrapper.h => content/canvas/src/WebGLMemoryMultiReporterWrapper.h
---
 addon-sdk/source/lib/sdk/test/harness.js      |  12 +-
 content/base/src/nsContentUtils.cpp           |   4 +-
 content/base/src/nsDOMFile.cpp                |   8 +-
 .../canvas/src/CanvasRenderingContext2D.cpp   |   4 +-
 content/canvas/src/WebGLContext.cpp           |  10 +-
 content/canvas/src/WebGLContext.h             |   2 +-
 content/canvas/src/WebGLContextReporter.cpp   |  80 ++---
 ...er.h => WebGLMemoryMultiReporterWrapper.h} |  20 +-
 content/media/MediaDecoder.cpp                |  12 +-
 dom/base/nsScriptNameSpaceManager.cpp         |   4 +-
 dom/base/nsWindowMemoryReporter.cpp           |  47 ++-
 dom/base/nsWindowMemoryReporter.h             |  27 +-
 dom/ipc/ContentChild.cpp                      |  41 ++-
 dom/ipc/ContentParent.cpp                     | 101 +++----
 dom/ipc/ContentParent.h                       |  17 +-
 dom/workers/WorkerPrivate.cpp                 |  10 +-
 dom/workers/WorkerPrivate.h                   |   1 +
 .../spellcheck/hunspell/src/mozHunspell.cpp   |   4 +-
 gfx/gl/GLContext.h                            |   6 +-
 gfx/layers/ipc/ShadowLayerUtilsGralloc.cpp    |   4 +-
 gfx/thebes/gfxASurface.cpp                    |   8 +-
 gfx/thebes/gfxAndroidPlatform.cpp             |   6 +-
 gfx/thebes/gfxFont.cpp                        |   6 +-
 gfx/thebes/gfxFont.h                          |   4 +-
 gfx/thebes/gfxPlatformFontList.cpp            |   6 +-
 gfx/thebes/gfxPlatformFontList.h              |   4 +-
 gfx/thebes/gfxWindowsPlatform.cpp             |  38 +--
 gfx/thebes/gfxWindowsPlatform.h               |   4 +-
 image/src/imgLoader.cpp                       |  12 +-
 image/test/mochitest/test_bug601470.html      |  14 +-
 ipc/glue/SharedMemory.cpp                     |   8 +-
 js/xpconnect/src/XPCJSMemoryReporter.h        |   8 +-
 js/xpconnect/src/XPCJSRuntime.cpp             |  68 +++--
 js/xpconnect/src/xpcpublic.h                  |   4 +-
 layout/base/nsStyleSheetService.cpp           |   4 +-
 layout/style/nsLayoutStylesheetCache.cpp      |   4 +-
 modules/libpref/src/Preferences.cpp           |   4 +-
 netwerk/cache/nsDiskCacheDevice.cpp           |   4 +-
 netwerk/cache/nsMemoryCacheDevice.cpp         |   4 +-
 netwerk/dns/nsEffectiveTLDService.cpp         |   4 +-
 startupcache/StartupCache.cpp                 |   8 +-
 storage/src/mozStorageService.cpp             |  29 +-
 storage/src/mozStorageService.h               |   5 +-
 .../aboutmemory/content/aboutMemory.js        | 154 ++++++----
 .../tests/test_aboutcompartments.xul          |  87 ++++--
 .../aboutmemory/tests/test_aboutmemory.xul    | 243 ++++++++-------
 .../aboutmemory/tests/test_aboutmemory2.xul   |  82 +++--
 .../aboutmemory/tests/test_aboutmemory3.xul   |  44 ++-
 .../tests/test_memoryReporters.xul            |   5 +
 .../tests/test_sqliteMultiReporter.xul        |   6 +-
 toolkit/components/places/History.cpp         |   4 +-
 toolkit/components/telemetry/Telemetry.cpp    |   4 +-
 toolkit/components/telemetry/TelemetryPing.js |  30 +-
 .../nsUrlClassifierPrefixSet.cpp              |   4 +-
 xpcom/base/AvailableMemoryTracker.cpp         | 103 +++++--
 xpcom/base/MapsMemoryReporter.cpp             |  30 +-
 xpcom/base/nsCycleCollector.cpp               |  14 +-
 xpcom/base/nsIMemoryReporter.idl              | 269 ++++++++++-------
 xpcom/base/nsMemoryInfoDumper.cpp             |  89 ++++--
 xpcom/base/nsMemoryReporterManager.cpp        | 281 ++++++++++++++----
 xpcom/base/nsMemoryReporterManager.h          |   3 +
 xpcom/build/nsXPComInit.cpp                   |   4 +-
 xpcom/components/nsCategoryManager.cpp        |   4 +-
 xpcom/components/nsComponentManager.cpp       |   4 +-
 xpcom/ds/nsObserverService.cpp                |  12 +-
 xpcom/ds/nsObserverService.h                  |   4 +-
 .../xptinfo/src/xptiInterfaceInfoManager.cpp  |   4 +-
 67 files changed, 1297 insertions(+), 857 deletions(-)
 rename content/canvas/src/{WebGLMemoryReporterWrapper.h => WebGLMemoryMultiReporterWrapper.h} (90%)

diff --git a/addon-sdk/source/lib/sdk/test/harness.js b/addon-sdk/source/lib/sdk/test/harness.js
index 5bb12a59f890..7139aea70107 100644
--- a/addon-sdk/source/lib/sdk/test/harness.js
+++ b/addon-sdk/source/lib/sdk/test/harness.js
@@ -148,9 +148,6 @@ function reportMemoryUsage() {
   var mgr = Cc["@mozilla.org/memory-reporter-manager;1"]
             .getService(Ci.nsIMemoryReporterManager);
 
-  // XXX: this code is *so* bogus -- nsIMemoryReporter changed its |memoryUsed|
-  // field to |amount| *years* ago, and even bigger changes have happened
-  // since -- that it must just never be run.
   var reporters = mgr.enumerateReporters();
   if (reporters.hasMoreElements())
     print("\n");
@@ -379,7 +376,14 @@ function getPotentialLeaks() {
 
   let enm = mgr.enumerateReporters();
   while (enm.hasMoreElements()) {
-    let mr = enm.getNext().QueryInterface(Ci.nsIMemoryReporter);
+    let reporter = enm.getNext().QueryInterface(Ci.nsIMemoryReporter);
+    logReporter(reporter.process, reporter.path, reporter.kind, reporter.units,
+                reporter.amount, reporter.description);
+  }
+
+  let enm = mgr.enumerateMultiReporters();
+  while (enm.hasMoreElements()) {
+    let mr = enm.getNext().QueryInterface(Ci.nsIMemoryMultiReporter);
     mr.collectReports(logReporter, null);
   }
 
diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp
index d20a93aaa2b5..6befb2a62a0d 100644
--- a/content/base/src/nsContentUtils.cpp
+++ b/content/base/src/nsContentUtils.cpp
@@ -255,11 +255,11 @@ static NS_DEFINE_CID(kCParserCID, NS_PARSER_CID);
 
 static PLDHashTable sEventListenerManagersHash;
 
-class DOMEventListenerManagersHashReporter MOZ_FINAL : public MemoryUniReporter
+class DOMEventListenerManagersHashReporter MOZ_FINAL : public MemoryReporterBase
 {
 public:
   DOMEventListenerManagersHashReporter()
-    : MemoryUniReporter(
+    : MemoryReporterBase(
         "explicit/dom/event-listener-managers-hash",
         KIND_HEAP,
         UNITS_BYTES,
diff --git a/content/base/src/nsDOMFile.cpp b/content/base/src/nsDOMFile.cpp
index c65a635ce26e..b8a5507db5f4 100644
--- a/content/base/src/nsDOMFile.cpp
+++ b/content/base/src/nsDOMFile.cpp
@@ -641,7 +641,7 @@ nsDOMMemoryFile::DataOwner::sMemoryReporterRegistered;
 NS_MEMORY_REPORTER_MALLOC_SIZEOF_FUN(DOMMemoryFileDataOwnerMallocSizeOf)
 
 class nsDOMMemoryFileDataOwnerMemoryReporter MOZ_FINAL
-  : public nsIMemoryReporter
+  : public nsIMemoryMultiReporter
 {
   NS_DECL_THREADSAFE_ISUPPORTS
 
@@ -651,7 +651,7 @@ class nsDOMMemoryFileDataOwnerMemoryReporter MOZ_FINAL
     return NS_OK;
   }
 
-  NS_IMETHOD CollectReports(nsIMemoryReporterCallback *aCallback,
+  NS_IMETHOD CollectReports(nsIMemoryMultiReporterCallback *aCallback,
                             nsISupports *aClosure)
   {
     typedef nsDOMMemoryFile::DataOwner DataOwner;
@@ -725,7 +725,7 @@ class nsDOMMemoryFileDataOwnerMemoryReporter MOZ_FINAL
 };
 
 NS_IMPL_ISUPPORTS1(nsDOMMemoryFileDataOwnerMemoryReporter,
-                   nsIMemoryReporter)
+                   nsIMemoryMultiReporter)
 
 /* static */ void
 nsDOMMemoryFile::DataOwner::EnsureMemoryReporterRegistered()
@@ -737,7 +737,7 @@ nsDOMMemoryFile::DataOwner::EnsureMemoryReporterRegistered()
 
   nsRefPtr<nsDOMMemoryFileDataOwnerMemoryReporter> reporter = new
     nsDOMMemoryFileDataOwnerMemoryReporter();
-  NS_RegisterMemoryReporter(reporter);
+  NS_RegisterMemoryMultiReporter(reporter);
 
   sMemoryReporterRegistered = true;
 }
diff --git a/content/canvas/src/CanvasRenderingContext2D.cpp b/content/canvas/src/CanvasRenderingContext2D.cpp
index a2b33c49f552..8fb8ef5c0f9d 100644
--- a/content/canvas/src/CanvasRenderingContext2D.cpp
+++ b/content/canvas/src/CanvasRenderingContext2D.cpp
@@ -143,11 +143,11 @@ static int64_t gCanvasAzureMemoryUsed = 0;
 // This is KIND_OTHER because it's not always clear where in memory the pixels
 // of a canvas are stored.  Furthermore, this memory will be tracked by the
 // underlying surface implementations.  See bug 655638 for details.
-class Canvas2dPixelsReporter MOZ_FINAL : public MemoryUniReporter
+class Canvas2dPixelsReporter MOZ_FINAL : public MemoryReporterBase
 {
   public:
     Canvas2dPixelsReporter()
-      : MemoryUniReporter("canvas-2d-pixels", KIND_OTHER, UNITS_BYTES,
+      : MemoryReporterBase("canvas-2d-pixels", KIND_OTHER, UNITS_BYTES,
 "Memory used by 2D canvases. Each canvas requires (width * height * 4) bytes.")
     {}
 private:
diff --git a/content/canvas/src/WebGLContext.cpp b/content/canvas/src/WebGLContext.cpp
index 1886d442c126..d27463547bab 100644
--- a/content/canvas/src/WebGLContext.cpp
+++ b/content/canvas/src/WebGLContext.cpp
@@ -10,7 +10,7 @@
 #include "WebGLContextUtils.h"
 #include "WebGLBuffer.h"
 #include "WebGLVertexAttribData.h"
-#include "WebGLMemoryReporterWrapper.h"
+#include "WebGLMemoryMultiReporterWrapper.h"
 #include "WebGLFramebuffer.h"
 #include "WebGLVertexArray.h"
 #include "WebGLQuery.h"
@@ -179,7 +179,7 @@ WebGLContext::WebGLContext()
     mPixelStorePackAlignment = 4;
     mPixelStoreUnpackAlignment = 4;
 
-    WebGLMemoryReporterWrapper::AddWebGLContext(this);
+    WebGLMemoryMultiReporterWrapper::AddWebGLContext(this);
 
     mAllowRestore = true;
     mContextLossTimerRunning = false;
@@ -213,7 +213,7 @@ WebGLContext::WebGLContext()
 WebGLContext::~WebGLContext()
 {
     DestroyResourcesAndContext();
-    WebGLMemoryReporterWrapper::RemoveWebGLContext(this);
+    WebGLMemoryMultiReporterWrapper::RemoveWebGLContext(this);
     TerminateContextLossTimer();
     mContextRestorer = nullptr;
 }
@@ -653,8 +653,8 @@ void WebGLContext::LoseOldestWebGLContextIfLimitExceeded()
     // when choosing which one to lose first.
     UpdateLastUseIndex();
 
-    WebGLMemoryReporterWrapper::ContextsArrayType &contexts
-      = WebGLMemoryReporterWrapper::Contexts();
+    WebGLMemoryMultiReporterWrapper::ContextsArrayType &contexts
+      = WebGLMemoryMultiReporterWrapper::Contexts();
 
     // quick exit path, should cover a majority of cases
     if (contexts.Length() <= kMaxWebGLContextsPerPrincipal) {
diff --git a/content/canvas/src/WebGLContext.h b/content/canvas/src/WebGLContext.h
index 586f6caf736f..4a03e67955ec 100644
--- a/content/canvas/src/WebGLContext.h
+++ b/content/canvas/src/WebGLContext.h
@@ -118,7 +118,7 @@ class WebGLContext :
 {
     friend class WebGLContextUserData;
     friend class WebGLMemoryPressureObserver;
-    friend class WebGLMemoryReporterWrapper;
+    friend class WebGLMemoryMultiReporterWrapper;
     friend class WebGLExtensionLoseContext;
     friend class WebGLExtensionCompressedTextureS3TC;
     friend class WebGLExtensionCompressedTextureATC;
diff --git a/content/canvas/src/WebGLContextReporter.cpp b/content/canvas/src/WebGLContextReporter.cpp
index 8b42f8b475bc..a7bcebb6ec42 100644
--- a/content/canvas/src/WebGLContextReporter.cpp
+++ b/content/canvas/src/WebGLContextReporter.cpp
@@ -4,32 +4,32 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "WebGLContext.h"
-#include "WebGLMemoryReporterWrapper.h"
+#include "WebGLMemoryMultiReporterWrapper.h"
 #include "nsIMemoryReporter.h"
 
 using namespace mozilla;
 
 NS_IMPL_ISUPPORTS1(WebGLMemoryPressureObserver, nsIObserver)
 
-class WebGLMemoryReporter MOZ_FINAL : public nsIMemoryReporter
+class WebGLMemoryMultiReporter MOZ_FINAL : public nsIMemoryMultiReporter 
 {
   public:
     NS_DECL_ISUPPORTS
-    NS_DECL_NSIMEMORYREPORTER
+    NS_DECL_NSIMEMORYMULTIREPORTER
 };
 
-NS_IMPL_ISUPPORTS1(WebGLMemoryReporter, nsIMemoryReporter)
+NS_IMPL_ISUPPORTS1(WebGLMemoryMultiReporter, nsIMemoryMultiReporter)
 
 NS_IMETHODIMP
-WebGLMemoryReporter::GetName(nsACString &aName)
+WebGLMemoryMultiReporter::GetName(nsACString &aName)
 {
   aName.AssignLiteral("webgl");
   return NS_OK;
 }
 
 NS_IMETHODIMP
-WebGLMemoryReporter::CollectReports(nsIMemoryReporterCallback* aCb,
-                                    nsISupports* aClosure)
+WebGLMemoryMultiReporter::CollectReports(nsIMemoryMultiReporterCallback* aCb, 
+                                         nsISupports* aClosure)
 {
 #define REPORT(_path, _kind, _units, _amount, _desc)                          \
     do {                                                                      \
@@ -42,21 +42,21 @@ WebGLMemoryReporter::CollectReports(nsIMemoryReporterCallback* aCb,
 
     REPORT("webgl-texture-memory",
            nsIMemoryReporter::KIND_OTHER, nsIMemoryReporter::UNITS_BYTES,
-           WebGLMemoryReporterWrapper::GetTextureMemoryUsed(),
+           WebGLMemoryMultiReporterWrapper::GetTextureMemoryUsed(),
            "Memory used by WebGL textures.The OpenGL"
            " implementation is free to store these textures in either video"
            " memory or main memory. This measurement is only a lower bound,"
-           " actual memory usage may be higher for example if the storage"
+           " actual memory usage may be higher for example if the storage" 
            " is strided.");
-
+   
     REPORT("webgl-texture-count",
            nsIMemoryReporter::KIND_OTHER, nsIMemoryReporter::UNITS_COUNT,
-           WebGLMemoryReporterWrapper::GetTextureCount(),
+           WebGLMemoryMultiReporterWrapper::GetTextureCount(), 
            "Number of WebGL textures.");
 
     REPORT("webgl-buffer-memory",
            nsIMemoryReporter::KIND_OTHER, nsIMemoryReporter::UNITS_BYTES,
-           WebGLMemoryReporterWrapper::GetBufferMemoryUsed(),
+           WebGLMemoryMultiReporterWrapper::GetBufferMemoryUsed(), 
            "Memory used by WebGL buffers. The OpenGL"
            " implementation is free to store these buffers in either video"
            " memory or main memory. This measurement is only a lower bound,"
@@ -65,7 +65,7 @@ WebGLMemoryReporter::CollectReports(nsIMemoryReporterCallback* aCb,
 
     REPORT("explicit/webgl/buffer-cache-memory",
            nsIMemoryReporter::KIND_HEAP, nsIMemoryReporter::UNITS_BYTES,
-           WebGLMemoryReporterWrapper::GetBufferCacheMemoryUsed(),
+           WebGLMemoryMultiReporterWrapper::GetBufferCacheMemoryUsed(),
            "Memory used by WebGL buffer caches. The WebGL"
            " implementation caches the contents of element array buffers"
            " only.This adds up with the webgl-buffer-memory value, but"
@@ -74,69 +74,69 @@ WebGLMemoryReporter::CollectReports(nsIMemoryReporterCallback* aCb,
 
     REPORT("webgl-buffer-count",
            nsIMemoryReporter::KIND_OTHER, nsIMemoryReporter::UNITS_COUNT,
-           WebGLMemoryReporterWrapper::GetBufferCount(),
-           "Number of WebGL buffers.");
-
+           WebGLMemoryMultiReporterWrapper::GetBufferCount(),
+           "Number of WebGL buffers."); 
+   
     REPORT("webgl-renderbuffer-memory",
            nsIMemoryReporter::KIND_OTHER, nsIMemoryReporter::UNITS_BYTES,
-           WebGLMemoryReporterWrapper::GetRenderbufferMemoryUsed(),
+           WebGLMemoryMultiReporterWrapper::GetRenderbufferMemoryUsed(), 
            "Memory used by WebGL renderbuffers. The OpenGL"
            " implementation is free to store these renderbuffers in either"
            " video memory or main memory. This measurement is only a lower"
            " bound, actual memory usage may be higher for example if the"
            " storage is strided.");
-
+   
     REPORT("webgl-renderbuffer-count",
            nsIMemoryReporter::KIND_OTHER, nsIMemoryReporter::UNITS_COUNT,
-           WebGLMemoryReporterWrapper::GetRenderbufferCount(),
+           WebGLMemoryMultiReporterWrapper::GetRenderbufferCount(),
            "Number of WebGL renderbuffers.");
-
+  
     REPORT("explicit/webgl/shader",
            nsIMemoryReporter::KIND_HEAP, nsIMemoryReporter::UNITS_BYTES,
-           WebGLMemoryReporterWrapper::GetShaderSize(),
+           WebGLMemoryMultiReporterWrapper::GetShaderSize(), 
            "Combined size of WebGL shader ASCII sources and translation"
-           " logs cached on the heap.");
+           " logs cached on the heap."); 
 
     REPORT("webgl-shader-count",
            nsIMemoryReporter::KIND_OTHER, nsIMemoryReporter::UNITS_COUNT,
-           WebGLMemoryReporterWrapper::GetShaderCount(),
-           "Number of WebGL shaders.");
+           WebGLMemoryMultiReporterWrapper::GetShaderCount(), 
+           "Number of WebGL shaders."); 
 
     REPORT("webgl-context-count",
            nsIMemoryReporter::KIND_OTHER, nsIMemoryReporter::UNITS_COUNT,
-           WebGLMemoryReporterWrapper::GetContextCount(),
-           "Number of WebGL contexts.");
+           WebGLMemoryMultiReporterWrapper::GetContextCount(), 
+           "Number of WebGL contexts."); 
 
 #undef REPORT
 
     return NS_OK;
 }
 
-WebGLMemoryReporterWrapper* WebGLMemoryReporterWrapper::sUniqueInstance = nullptr;
+WebGLMemoryMultiReporterWrapper* WebGLMemoryMultiReporterWrapper::sUniqueInstance = nullptr;
 
-WebGLMemoryReporterWrapper* WebGLMemoryReporterWrapper::UniqueInstance()
+WebGLMemoryMultiReporterWrapper* WebGLMemoryMultiReporterWrapper::UniqueInstance()
 {
     if (!sUniqueInstance) {
-        sUniqueInstance = new WebGLMemoryReporterWrapper;
+        sUniqueInstance = new WebGLMemoryMultiReporterWrapper;
     }
-    return sUniqueInstance;
+    return sUniqueInstance;     
 }
 
-WebGLMemoryReporterWrapper::WebGLMemoryReporterWrapper()
-{
-    mReporter = new WebGLMemoryReporter;
-    NS_RegisterMemoryReporter(mReporter);
+WebGLMemoryMultiReporterWrapper::WebGLMemoryMultiReporterWrapper()
+{ 
+    mReporter = new WebGLMemoryMultiReporter;   
+    NS_RegisterMemoryMultiReporter(mReporter);
 }
 
-WebGLMemoryReporterWrapper::~WebGLMemoryReporterWrapper()
+WebGLMemoryMultiReporterWrapper::~WebGLMemoryMultiReporterWrapper()
 {
-    NS_UnregisterMemoryReporter(mReporter);
+    NS_UnregisterMemoryMultiReporter(mReporter);
 }
 
 NS_MEMORY_REPORTER_MALLOC_SIZEOF_FUN(WebGLBufferMallocSizeOf)
 
-int64_t
-WebGLMemoryReporterWrapper::GetBufferCacheMemoryUsed() {
+int64_t 
+WebGLMemoryMultiReporterWrapper::GetBufferCacheMemoryUsed() {
     const ContextsArrayType & contexts = Contexts();
     int64_t result = 0;
     for(size_t i = 0; i < contexts.Length(); ++i) {
@@ -153,8 +153,8 @@ WebGLMemoryReporterWrapper::GetBufferCacheMemoryUsed() {
 
 NS_MEMORY_REPORTER_MALLOC_SIZEOF_FUN(WebGLShaderMallocSizeOf)
 
-int64_t
-WebGLMemoryReporterWrapper::GetShaderSize() {
+int64_t 
+WebGLMemoryMultiReporterWrapper::GetShaderSize() {
     const ContextsArrayType & contexts = Contexts();
     int64_t result = 0;
     for(size_t i = 0; i < contexts.Length(); ++i) {
diff --git a/content/canvas/src/WebGLMemoryReporterWrapper.h b/content/canvas/src/WebGLMemoryMultiReporterWrapper.h
similarity index 90%
rename from content/canvas/src/WebGLMemoryReporterWrapper.h
rename to content/canvas/src/WebGLMemoryMultiReporterWrapper.h
index 098d661748a1..9527ff17eeee 100644
--- a/content/canvas/src/WebGLMemoryReporterWrapper.h
+++ b/content/canvas/src/WebGLMemoryMultiReporterWrapper.h
@@ -3,8 +3,8 @@
  * 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/. */
 
-#ifndef WEBGLMEMORYREPORTWRAPER_H_
-#define WEBGLMEMORYREPORTWRAPER_H_
+#ifndef WEBGLMEMORYMULTIREPORTWRAPER_H_
+#define WEBGLMEMORYMULTIREPORTWRAPER_H_
 
 #include "WebGLContext.h"
 #include "WebGLBuffer.h"
@@ -17,21 +17,21 @@
 
 namespace mozilla {
 
-class WebGLMemoryReporterWrapper
+class WebGLMemoryMultiReporterWrapper
 {
-    WebGLMemoryReporterWrapper();
-    ~WebGLMemoryReporterWrapper();
-    static WebGLMemoryReporterWrapper* sUniqueInstance;
+    WebGLMemoryMultiReporterWrapper();
+    ~WebGLMemoryMultiReporterWrapper();
+    static WebGLMemoryMultiReporterWrapper* sUniqueInstance;
 
-    // here we store plain pointers, not RefPtrs: we don't want the
-    // WebGLMemoryReporterWrapper unique instance to keep alive all
+    // here we store plain pointers, not RefPtrs: we don't want the 
+    // WebGLMemoryMultiReporterWrapper unique instance to keep alive all		
     // WebGLContexts ever created.
     typedef nsTArray<const WebGLContext*> ContextsArrayType;
     ContextsArrayType mContexts;
 
-    nsCOMPtr<nsIMemoryReporter> mReporter;
+    nsCOMPtr<nsIMemoryMultiReporter> mReporter;
 
-    static WebGLMemoryReporterWrapper* UniqueInstance();
+    static WebGLMemoryMultiReporterWrapper* UniqueInstance();
 
     static ContextsArrayType & Contexts() { return UniqueInstance()->mContexts; }
 
diff --git a/content/media/MediaDecoder.cpp b/content/media/MediaDecoder.cpp
index 4a1ff88d20b4..c1ff95aa9176 100644
--- a/content/media/MediaDecoder.cpp
+++ b/content/media/MediaDecoder.cpp
@@ -74,7 +74,7 @@ class MediaMemoryTracker
 
   DecodersArray mDecoders;
 
-  nsCOMPtr<nsIMemoryReporter> mReporter;
+  nsCOMPtr<nsIMemoryMultiReporter> mReporter;
 
 public:
   static void AddMediaDecoder(MediaDecoder* aDecoder)
@@ -1725,7 +1725,7 @@ MediaDecoder::IsWMFEnabled()
 }
 #endif
 
-class MediaReporter MOZ_FINAL : public nsIMemoryReporter
+class MediaReporter MOZ_FINAL : public nsIMemoryMultiReporter
 {
 public:
   NS_DECL_ISUPPORTS
@@ -1736,7 +1736,7 @@ public:
     return NS_OK;
   }
 
-  NS_IMETHOD CollectReports(nsIMemoryReporterCallback* aCb,
+  NS_IMETHOD CollectReports(nsIMemoryMultiReporterCallback* aCb,
                             nsISupports* aClosure)
   {
     int64_t video, audio;
@@ -1762,7 +1762,7 @@ public:
   }
 };
 
-NS_IMPL_ISUPPORTS1(MediaReporter, nsIMemoryReporter)
+NS_IMPL_ISUPPORTS1(MediaReporter, nsIMemoryMultiReporter)
 
 MediaDecoderOwner*
 MediaDecoder::GetOwner()
@@ -1774,12 +1774,12 @@ MediaDecoder::GetOwner()
 MediaMemoryTracker::MediaMemoryTracker()
   : mReporter(new MediaReporter())
 {
-  NS_RegisterMemoryReporter(mReporter);
+  NS_RegisterMemoryMultiReporter(mReporter);
 }
 
 MediaMemoryTracker::~MediaMemoryTracker()
 {
-  NS_UnregisterMemoryReporter(mReporter);
+  NS_UnregisterMemoryMultiReporter(mReporter);
 }
 
 } // namespace mozilla
diff --git a/dom/base/nsScriptNameSpaceManager.cpp b/dom/base/nsScriptNameSpaceManager.cpp
index 32d48d6258bb..4d6b0cf7ffb7 100644
--- a/dom/base/nsScriptNameSpaceManager.cpp
+++ b/dom/base/nsScriptNameSpaceManager.cpp
@@ -116,11 +116,11 @@ GlobalNameHashInitEntry(PLDHashTable *table, PLDHashEntryHdr *entry,
   return true;
 }
 
-class ScriptNameSpaceManagerReporter MOZ_FINAL : public MemoryUniReporter
+class ScriptNameSpaceManagerReporter MOZ_FINAL : public MemoryReporterBase
 {
 public:
   ScriptNameSpaceManagerReporter(nsScriptNameSpaceManager* aManager)
-    : MemoryUniReporter(
+    : MemoryReporterBase(
         "explicit/script-namespace-manager",
         KIND_HEAP,
         nsIMemoryReporter::UNITS_BYTES,
diff --git a/dom/base/nsWindowMemoryReporter.cpp b/dom/base/nsWindowMemoryReporter.cpp
index 23c8acf77c27..1e02e0c13f4f 100644
--- a/dom/base/nsWindowMemoryReporter.cpp
+++ b/dom/base/nsWindowMemoryReporter.cpp
@@ -25,7 +25,7 @@ nsWindowMemoryReporter::nsWindowMemoryReporter()
   mDetachedWindows.Init();
 }
 
-NS_IMPL_ISUPPORTS3(nsWindowMemoryReporter, nsIMemoryReporter, nsIObserver,
+NS_IMPL_ISUPPORTS3(nsWindowMemoryReporter, nsIMemoryMultiReporter, nsIObserver,
                    nsSupportsWeakReference)
 
 /* static */
@@ -34,7 +34,7 @@ nsWindowMemoryReporter::Init()
 {
   // The memory reporter manager will own this object.
   nsRefPtr<nsWindowMemoryReporter> windowReporter = new nsWindowMemoryReporter();
-  NS_RegisterMemoryReporter(windowReporter);
+  NS_RegisterMemoryMultiReporter(windowReporter);
 
   nsCOMPtr<nsIObserverService> os = services::GetObserverService();
   if (os) {
@@ -46,13 +46,13 @@ nsWindowMemoryReporter::Init()
                     /* weakRef = */ true);
   }
 
-  nsRefPtr<GhostURLsReporter> ghostURLsReporter =
+  nsRefPtr<GhostURLsReporter> ghostMultiReporter =
     new GhostURLsReporter(windowReporter);
-  NS_RegisterMemoryReporter(ghostURLsReporter);
+  NS_RegisterMemoryMultiReporter(ghostMultiReporter);
 
-  nsRefPtr<NumGhostsReporter> numGhostsReporter =
+  nsRefPtr<NumGhostsReporter> ghostReporter =
     new NumGhostsReporter(windowReporter);
-  NS_RegisterMemoryReporter(numGhostsReporter);
+  NS_RegisterMemoryReporter(ghostReporter);
 }
 
 static already_AddRefed<nsIURI>
@@ -122,7 +122,7 @@ CollectWindowReports(nsGlobalWindow *aWindow,
                      nsTHashtable<nsUint64HashKey> *aGhostWindowIDs,
                      WindowPaths *aWindowPaths,
                      WindowPaths *aTopWindowPaths,
-                     nsIMemoryReporterCallback *aCb,
+                     nsIMemoryMultiReporterCallback *aCb,
                      nsISupports *aClosure)
 {
   nsAutoCString windowPath("explicit/");
@@ -320,7 +320,7 @@ nsWindowMemoryReporter::GetName(nsACString &aName)
 }
 
 NS_IMETHODIMP
-nsWindowMemoryReporter::CollectReports(nsIMemoryReporterCallback* aCb,
+nsWindowMemoryReporter::CollectReports(nsIMemoryMultiReporterCallback* aCb,
                                        nsISupports* aClosure)
 {
   nsGlobalWindow::WindowByIdTable* windowsById =
@@ -356,9 +356,9 @@ nsWindowMemoryReporter::CollectReports(nsIMemoryReporterCallback* aCb,
   }
 
   // Report JS memory usage.  We do this from here because the JS memory
-  // reporter needs to be passed |windowPaths|.
-  nsresult rv = xpc::JSReporter::CollectReports(&windowPaths, &topWindowPaths,
-                                                aCb, aClosure);
+  // multi-reporter needs to be passed |windowPaths|.
+  nsresult rv = xpc::JSMemoryMultiReporter::CollectReports(&windowPaths, &topWindowPaths,
+                                                           aCb, aClosure);
   NS_ENSURE_SUCCESS(rv, rv);
 
 #define REPORT(_path, _amount, _desc)                                         \
@@ -668,7 +668,7 @@ nsWindowMemoryReporter::CheckForGhostWindows(
 }
 
 NS_IMPL_ISUPPORTS1(nsWindowMemoryReporter::GhostURLsReporter,
-                   nsIMemoryReporter)
+                   nsIMemoryMultiReporter)
 
 nsWindowMemoryReporter::
 GhostURLsReporter::GhostURLsReporter(
@@ -687,7 +687,7 @@ GhostURLsReporter::GetName(nsACString& aName)
 
 struct ReportGhostWindowsEnumeratorData
 {
-  nsIMemoryReporterCallback* callback;
+  nsIMemoryMultiReporterCallback* callback;
   nsISupports* closure;
   nsresult rv;
 };
@@ -734,7 +734,7 @@ ReportGhostWindowsEnumerator(nsUint64HashKey* aIDHashKey, void* aClosure)
 NS_IMETHODIMP
 nsWindowMemoryReporter::
 GhostURLsReporter::CollectReports(
-  nsIMemoryReporterCallback* aCb,
+  nsIMemoryMultiReporterCallback* aCb,
   nsISupports* aClosure)
 {
   // Get the IDs of all the ghost windows in existance.
@@ -752,6 +752,25 @@ GhostURLsReporter::CollectReports(
   return reportGhostWindowsEnumData.rv;
 }
 
+NS_IMETHODIMP
+nsWindowMemoryReporter::
+NumGhostsReporter::GetDescription(nsACString& aDesc)
+{
+  nsPrintfCString str(
+"The number of ghost windows present (the number of nodes underneath \
+explicit/window-objects/top(none)/ghost, modulo race conditions).  A ghost \
+window is not shown in any tab, does not share a domain with any non-detached \
+windows, and has met these criteria for at least %ds \
+(memory.ghost_window_timeout_seconds) or has survived a round of about:memory's \
+minimize memory usage button.\n\n\
+Ghost windows can happen legitimately, but they are often indicative of leaks \
+in the browser or add-ons.",
+  mWindowReporter->GetGhostTimeout());
+
+  aDesc.Assign(str);
+  return NS_OK;
+}
+
 int64_t
 nsWindowMemoryReporter::NumGhostsReporter::Amount()
 {
diff --git a/dom/base/nsWindowMemoryReporter.h b/dom/base/nsWindowMemoryReporter.h
index f08967302fe9..7390445005c1 100644
--- a/dom/base/nsWindowMemoryReporter.h
+++ b/dom/base/nsWindowMemoryReporter.h
@@ -108,13 +108,13 @@ public:
  *   the tab.
  *
  */
-class nsWindowMemoryReporter MOZ_FINAL : public nsIMemoryReporter,
+class nsWindowMemoryReporter MOZ_FINAL : public nsIMemoryMultiReporter,
                                          public nsIObserver,
                                          public nsSupportsWeakReference
 {
 public:
   NS_DECL_ISUPPORTS
-  NS_DECL_NSIMEMORYREPORTER
+  NS_DECL_NSIMEMORYMULTIREPORTER
   NS_DECL_NSIOBSERVER
 
   static void Init();
@@ -126,38 +126,33 @@ private:
    * this list, running this report is faster than running
    * nsWindowMemoryReporter.
    */
-  class GhostURLsReporter MOZ_FINAL : public nsIMemoryReporter
+  class GhostURLsReporter MOZ_FINAL : public nsIMemoryMultiReporter
   {
   public:
     GhostURLsReporter(nsWindowMemoryReporter* aWindowReporter);
 
     NS_DECL_ISUPPORTS
-    NS_DECL_NSIMEMORYREPORTER
+    NS_DECL_NSIMEMORYMULTIREPORTER
 
   private:
     nsRefPtr<nsWindowMemoryReporter> mWindowReporter;
   };
 
   /**
-   * nsGhostWindowReporter generates the "ghost-windows" report, which counts
-   * the number of ghost windows present.
+   * nsGhostWindowReporter generates the "ghost-windows" single-report, which
+   * counts the number of ghost windows present.
    */
-  class NumGhostsReporter MOZ_FINAL : public mozilla::MemoryUniReporter
+  class NumGhostsReporter MOZ_FINAL : public mozilla::MemoryReporterBase
   {
   public:
     NumGhostsReporter(nsWindowMemoryReporter* aWindowReporter)
-      : MemoryUniReporter("ghost-windows", KIND_OTHER, UNITS_COUNT,
-"The number of ghost windows present (the number of nodes underneath "
-"explicit/window-objects/top(none)/ghost, modulo race conditions).  A ghost "
-"window is not shown in any tab, does not share a domain with any non-detached "
-"windows, and has met these criteria for at least "
-"memory.ghost_window_timeout_seconds, or has survived a round of "
-"about:memory's minimize memory usage button.\n\n"
-"Ghost windows can happen legitimately, but they are often indicative of "
-"leaks in the browser or add-ons.")
+        // Description is "???" because we define GetDescription below.
+      : MemoryReporterBase("ghost-windows", KIND_OTHER, UNITS_COUNT, "???")
       , mWindowReporter(aWindowReporter)
     {}
 
+    NS_IMETHOD GetDescription(nsACString& aDesc);
+
   private:
     int64_t Amount() MOZ_OVERRIDE;
 
diff --git a/dom/ipc/ContentChild.cpp b/dom/ipc/ContentChild.cpp
index 3c565e8bda57..f1afd28ea2da 100644
--- a/dom/ipc/ContentChild.cpp
+++ b/dom/ipc/ContentChild.cpp
@@ -398,7 +398,7 @@ ContentChild::AllocPMemoryReportRequestChild()
 }
 
 // This is just a wrapper for InfallibleTArray<MemoryReport> that implements
-// nsISupports, so it can be passed to nsIMemoryReporter::CollectReports.
+// nsISupports, so it can be passed to nsIMemoryMultiReporter::CollectReports.
 class MemoryReportsWrapper MOZ_FINAL : public nsISupports {
 public:
     NS_DECL_ISUPPORTS
@@ -407,7 +407,7 @@ public:
 };
 NS_IMPL_ISUPPORTS0(MemoryReportsWrapper)
 
-class MemoryReportCallback MOZ_FINAL : public nsIMemoryReporterCallback
+class MemoryReportCallback MOZ_FINAL : public nsIMemoryMultiReporterCallback
 {
 public:
     NS_DECL_ISUPPORTS
@@ -435,29 +435,54 @@ private:
 };
 NS_IMPL_ISUPPORTS1(
   MemoryReportCallback
-, nsIMemoryReporterCallback
+, nsIMemoryMultiReporterCallback
 )
 
 bool
 ContentChild::RecvPMemoryReportRequestConstructor(PMemoryReportRequestChild* child)
 {
+    
     nsCOMPtr<nsIMemoryReporterManager> mgr = do_GetService("@mozilla.org/memory-reporter-manager;1");
 
     InfallibleTArray<MemoryReport> reports;
 
     nsPrintfCString process("Content (%d)", getpid());
 
-    // Run each reporter.  The callback will turn each measurement into a
-    // MemoryReport.
+    // First do the vanilla memory reporters.
     nsCOMPtr<nsISimpleEnumerator> e;
     mgr->EnumerateReporters(getter_AddRefs(e));
-    nsRefPtr<MemoryReportsWrapper> wrappedReports =
-        new MemoryReportsWrapper(&reports);
-    nsRefPtr<MemoryReportCallback> cb = new MemoryReportCallback(process);
     bool more;
     while (NS_SUCCEEDED(e->HasMoreElements(&more)) && more) {
       nsCOMPtr<nsIMemoryReporter> r;
       e->GetNext(getter_AddRefs(r));
+
+      nsCString path;
+      int32_t kind;
+      int32_t units;
+      int64_t amount;
+      nsCString desc;
+
+      if (NS_SUCCEEDED(r->GetPath(path)) &&
+          NS_SUCCEEDED(r->GetKind(&kind)) &&
+          NS_SUCCEEDED(r->GetUnits(&units)) &&
+          NS_SUCCEEDED(r->GetAmount(&amount)) &&
+          NS_SUCCEEDED(r->GetDescription(desc)))
+      {
+        MemoryReport memreport(process, path, kind, units, amount, desc);
+        reports.AppendElement(memreport);
+      }
+    }
+
+    // Then do the memory multi-reporters, by calling CollectReports on each
+    // one, whereupon the callback will turn each measurement into a
+    // MemoryReport.
+    mgr->EnumerateMultiReporters(getter_AddRefs(e));
+    nsRefPtr<MemoryReportsWrapper> wrappedReports =
+        new MemoryReportsWrapper(&reports);
+    nsRefPtr<MemoryReportCallback> cb = new MemoryReportCallback(process);
+    while (NS_SUCCEEDED(e->HasMoreElements(&more)) && more) {
+      nsCOMPtr<nsIMemoryMultiReporter> r;
+      e->GetNext(getter_AddRefs(r));
       r->CollectReports(cb, wrappedReports);
     }
 
diff --git a/dom/ipc/ContentParent.cpp b/dom/ipc/ContentParent.cpp
index 468776789819..320e465a6271 100644
--- a/dom/ipc/ContentParent.cpp
+++ b/dom/ipc/ContentParent.cpp
@@ -159,54 +159,34 @@ namespace dom {
 
 #define NS_IPC_IOSERVICE_SET_OFFLINE_TOPIC "ipc:network:set-offline"
 
-// This represents all the memory reports provided by a child process.
-class ChildReporter MOZ_FINAL : public nsIMemoryReporter
+// This represents a single measurement taken by a memory reporter in a child
+// process and passed to this one.  Its process is non-empty, and its amount is
+// fixed.
+class ChildMemoryReporter MOZ_FINAL : public MemoryReporterBase
 {
 public:
-    ChildReporter(const InfallibleTArray<MemoryReport>& childReports)
+    ChildMemoryReporter(const char* aProcess, const char* aPath, int32_t aKind,
+                        int32_t aUnits, int64_t aAmount,
+                        const char* aDescription)
+      : MemoryReporterBase(aPath, aKind, aUnits, aDescription)
+      , mProcess(aProcess)
+      , mAmount(aAmount)
     {
-        for (uint32_t i = 0; i < childReports.Length(); i++) {
-            MemoryReport r(childReports[i].process(),
-                           childReports[i].path(),
-                           childReports[i].kind(),
-                           childReports[i].units(),
-                           childReports[i].amount(),
-                           childReports[i].desc());
-
-            // Child reports have a non-empty process.
-            MOZ_ASSERT(!r.process().IsEmpty());
-
-            mChildReports.AppendElement(r);
-        }
     }
 
-    NS_DECL_ISUPPORTS
-
-    NS_IMETHOD GetName(nsACString& name)
+    NS_IMETHOD GetProcess(nsACString& aProcess)
     {
-        name.AssignLiteral("content-child");
-        return NS_OK;
+      aProcess.Assign(mProcess);
+      return NS_OK;
     }
 
-    NS_IMETHOD CollectReports(nsIMemoryReporterCallback* aCb,
-                              nsISupports* aClosure)
-    {
-        for (uint32_t i = 0; i < mChildReports.Length(); i++) {
-            nsresult rv;
-            MemoryReport r = mChildReports[i];
-            rv = aCb->Callback(r.process(), r.path(), r.kind(), r.units(),
-                               r.amount(), r.desc(), aClosure);
-            NS_ENSURE_SUCCESS(rv, rv);
-        }
-        return NS_OK;
-    }
+private:
+    int64_t Amount() { return mAmount; }
 
-  private:
-    InfallibleTArray<MemoryReport> mChildReports;
+    nsCString mProcess;
+    int64_t   mAmount;
 };
 
-NS_IMPL_ISUPPORTS1(ChildReporter, nsIMemoryReporter)
-
 class MemoryReportRequestParent : public PMemoryReportRequestParent
 {
 public:
@@ -227,9 +207,9 @@ MemoryReportRequestParent::MemoryReportRequestParent()
 }
 
 bool
-MemoryReportRequestParent::Recv__delete__(const InfallibleTArray<MemoryReport>& childReports)
+MemoryReportRequestParent::Recv__delete__(const InfallibleTArray<MemoryReport>& report)
 {
-    Owner()->SetChildMemoryReports(childReports);
+    Owner()->SetChildMemoryReporters(report);
     return true;
 }
 
@@ -241,15 +221,15 @@ MemoryReportRequestParent::~MemoryReportRequestParent()
 /**
  * A memory reporter for ContentParent objects themselves.
  */
-class ContentParentMemoryReporter MOZ_FINAL : public nsIMemoryReporter
+class ContentParentMemoryReporter MOZ_FINAL : public nsIMemoryMultiReporter
 {
 public:
     NS_DECL_ISUPPORTS
-    NS_DECL_NSIMEMORYREPORTER
+    NS_DECL_NSIMEMORYMULTIREPORTER
     NS_MEMORY_REPORTER_MALLOC_SIZEOF_FUN(MallocSizeOf)
 };
 
-NS_IMPL_ISUPPORTS1(ContentParentMemoryReporter, nsIMemoryReporter)
+NS_IMPL_ISUPPORTS1(ContentParentMemoryReporter, nsIMemoryMultiReporter)
 
 NS_IMETHODIMP
 ContentParentMemoryReporter::GetName(nsACString& aName)
@@ -259,7 +239,7 @@ ContentParentMemoryReporter::GetName(nsACString& aName)
 }
 
 NS_IMETHODIMP
-ContentParentMemoryReporter::CollectReports(nsIMemoryReporterCallback* cb,
+ContentParentMemoryReporter::CollectReports(nsIMemoryMultiReporterCallback* cb,
                                             nsISupports* aClosure)
 {
     nsAutoTArray<ContentParent*, 16> cps;
@@ -376,7 +356,7 @@ ContentParent::StartUp()
     }
 
     nsRefPtr<ContentParentMemoryReporter> mr = new ContentParentMemoryReporter();
-    NS_RegisterMemoryReporter(mr);
+    NS_RegisterMemoryMultiReporter(mr);
 
     sCanLaunchSubprocesses = true;
 
@@ -896,7 +876,7 @@ ContentParent::ShutDownProcess(bool aCloseWithError)
     // shut down the cycle collector.  But by then it's too late to release any
     // CC'ed objects, so we need to null them out here, while we still can.  See
     // bug 899761.
-    mChildReporter = nullptr;
+    mMemoryReporters.Clear();
     if (mMessageManager) {
       mMessageManager->Disconnect();
       mMessageManager = nullptr;
@@ -1047,8 +1027,8 @@ ContentParent::ActorDestroy(ActorDestroyReason why)
       ppm->Disconnect();
     }
 
-    // unregister the child memory reporter
-    UnregisterChildMemoryReporter();
+    // clear the child memory reporters
+    ClearChildMemoryReporters();
 
     // remove the global remote preferences observers
     Preferences::RemoveObserver(this, "");
@@ -2161,16 +2141,28 @@ ContentParent::DeallocPMemoryReportRequestParent(PMemoryReportRequestParent* act
 }
 
 void
-ContentParent::SetChildMemoryReports(const InfallibleTArray<MemoryReport>& childReports)
+ContentParent::SetChildMemoryReporters(const InfallibleTArray<MemoryReport>& report)
 {
     nsCOMPtr<nsIMemoryReporterManager> mgr =
         do_GetService("@mozilla.org/memory-reporter-manager;1");
+    for (int32_t i = 0; i < mMemoryReporters.Count(); i++)
+        mgr->UnregisterReporter(mMemoryReporters[i]);
 
-    if (mChildReporter)
-        mgr->UnregisterReporter(mChildReporter);
+    for (uint32_t i = 0; i < report.Length(); i++) {
+        nsCString process  = report[i].process();
+        nsCString path     = report[i].path();
+        int32_t   kind     = report[i].kind();
+        int32_t   units    = report[i].units();
+        int64_t   amount   = report[i].amount();
+        nsCString desc     = report[i].desc();
 
-    mChildReporter = new ChildReporter(childReports);
-    mgr->RegisterReporter(mChildReporter);
+        nsRefPtr<ChildMemoryReporter> r =
+            new ChildMemoryReporter(process.get(), path.get(), kind, units,
+                                    amount, desc.get());
+
+        mMemoryReporters.AppendObject(r);
+        mgr->RegisterReporter(r);
+    }
 
     nsCOMPtr<nsIObserverService> obs =
         do_GetService("@mozilla.org/observer-service;1");
@@ -2179,11 +2171,12 @@ ContentParent::SetChildMemoryReports(const InfallibleTArray<MemoryReport>& child
 }
 
 void
-ContentParent::UnregisterChildMemoryReporter()
+ContentParent::ClearChildMemoryReporters()
 {
     nsCOMPtr<nsIMemoryReporterManager> mgr =
         do_GetService("@mozilla.org/memory-reporter-manager;1");
-    mgr->UnregisterReporter(mChildReporter);
+    for (int32_t i = 0; i < mMemoryReporters.Count(); i++)
+        mgr->UnregisterReporter(mMemoryReporters[i]);
 }
 
 PTestShellParent*
diff --git a/dom/ipc/ContentParent.h b/dom/ipc/ContentParent.h
index 716f181dcd37..5bfa77b18d1a 100644
--- a/dom/ipc/ContentParent.h
+++ b/dom/ipc/ContentParent.h
@@ -143,9 +143,8 @@ public:
     bool IsAlive();
     bool IsForApp();
 
-    void SetChildMemoryReports(const InfallibleTArray<MemoryReport>&
-                               childReports);
-    void UnregisterChildMemoryReporter();
+    void SetChildMemoryReporters(const InfallibleTArray<MemoryReport>& report);
+    void ClearChildMemoryReporters();
 
     GeckoChildProcessHost* Process() {
         return mSubprocess;
@@ -447,13 +446,11 @@ private:
     uint64_t mChildID;
     int32_t mGeolocationWatchID;
 
-    // This is a reporter holding the reports from the child's last
-    // "child-memory-reporter-update" notification.  To update this, one can
-    // broadcast the topic "child-memory-reporter-request" using the
-    // nsIObserverService.
-    //
-    // Note that this assumes there is at most one child process at a time!
-    nsCOMPtr<nsIMemoryReporter> mChildReporter;
+    // This is a cache of all of the memory reporters
+    // registered in the child process.  To update this, one
+    // can broadcast the topic "child-memory-reporter-request" using
+    // the nsIObserverService.
+    nsCOMArray<nsIMemoryReporter> mMemoryReporters;
 
     nsString mAppManifestURL;
 
diff --git a/dom/workers/WorkerPrivate.cpp b/dom/workers/WorkerPrivate.cpp
index 06373224696a..506698d1693e 100644
--- a/dom/workers/WorkerPrivate.cpp
+++ b/dom/workers/WorkerPrivate.cpp
@@ -1766,7 +1766,7 @@ struct WorkerPrivate::TimeoutInfo
   bool mCanceled;
 };
 
-class WorkerPrivate::MemoryReporter MOZ_FINAL : public nsIMemoryReporter
+class WorkerPrivate::MemoryReporter MOZ_FINAL : public nsIMemoryMultiReporter
 {
   friend class WorkerPrivate;
 
@@ -1807,7 +1807,7 @@ public:
   }
 
   NS_IMETHOD
-  CollectReports(nsIMemoryReporterCallback* aCallback,
+  CollectReports(nsIMemoryMultiReporterCallback* aCallback,
                  nsISupports* aClosure)
   {
     AssertIsOnMainThread();
@@ -1883,7 +1883,7 @@ private:
   }
 };
 
-NS_IMPL_ISUPPORTS1(WorkerPrivate::MemoryReporter, nsIMemoryReporter)
+NS_IMPL_ISUPPORTS1(WorkerPrivate::MemoryReporter, nsIMemoryMultiReporter)
 
 template <class Derived>
 WorkerPrivateParent<Derived>::WorkerPrivateParent(
@@ -3093,7 +3093,7 @@ WorkerPrivate::EnableMemoryReporter()
   // successfully registered the reporter.
   mMemoryReporter = new MemoryReporter(this);
 
-  if (NS_FAILED(NS_RegisterMemoryReporter(mMemoryReporter))) {
+  if (NS_FAILED(NS_RegisterMemoryMultiReporter(mMemoryReporter))) {
     NS_WARNING("Failed to register memory reporter!");
     // No need to lock here since a failed registration means our memory
     // reporter can't start running. Just clean up.
@@ -3148,7 +3148,7 @@ WorkerPrivate::DisableMemoryReporter()
   }
 
   // Finally unregister the memory reporter.
-  if (NS_FAILED(NS_UnregisterMemoryReporter(memoryReporter))) {
+  if (NS_FAILED(NS_UnregisterMemoryMultiReporter(memoryReporter))) {
     NS_WARNING("Failed to unregister memory reporter!");
   }
 }
diff --git a/dom/workers/WorkerPrivate.h b/dom/workers/WorkerPrivate.h
index 4d316a7fbb37..20794e29be1b 100644
--- a/dom/workers/WorkerPrivate.h
+++ b/dom/workers/WorkerPrivate.h
@@ -34,6 +34,7 @@
 class JSAutoStructuredCloneBuffer;
 class nsIChannel;
 class nsIDocument;
+class nsIMemoryMultiReporter;
 class nsIPrincipal;
 class nsIScriptContext;
 class nsIURI;
diff --git a/extensions/spellcheck/hunspell/src/mozHunspell.cpp b/extensions/spellcheck/hunspell/src/mozHunspell.cpp
index d49aea441d64..73f39b70268a 100644
--- a/extensions/spellcheck/hunspell/src/mozHunspell.cpp
+++ b/extensions/spellcheck/hunspell/src/mozHunspell.cpp
@@ -97,11 +97,11 @@ NS_IMPL_CYCLE_COLLECTION_3(mozHunspell,
                            mEncoder,
                            mDecoder)
 
-class SpellCheckReporter MOZ_FINAL : public mozilla::MemoryUniReporter
+class SpellCheckReporter MOZ_FINAL : public mozilla::MemoryReporterBase
 {
 public:
   SpellCheckReporter()
-    : MemoryUniReporter("explicit/spell-check", KIND_HEAP, UNITS_BYTES,
+    : MemoryReporterBase("explicit/spell-check", KIND_HEAP, UNITS_BYTES,
 "Memory used by the Hunspell spell checking engine's internal data structures.")
   {
 #ifdef DEBUG
diff --git a/gfx/gl/GLContext.h b/gfx/gl/GLContext.h
index 82efb9481085..1173e7d2e695 100644
--- a/gfx/gl/GLContext.h
+++ b/gfx/gl/GLContext.h
@@ -3394,12 +3394,12 @@ public:
 #endif
 };
 
-class GfxTexturesReporter MOZ_FINAL : public MemoryUniReporter
+class GfxTexturesReporter MOZ_FINAL : public MemoryReporterBase
 {
 public:
     GfxTexturesReporter()
-      : MemoryUniReporter("gfx-textures", KIND_OTHER, UNITS_BYTES,
-                          "Memory used for storing GL textures.")
+      : MemoryReporterBase("gfx-textures", KIND_OTHER, UNITS_BYTES,
+                           "Memory used for storing GL textures.")
     {
 #ifdef DEBUG
         // There must be only one instance of this class, due to |sAmount|
diff --git a/gfx/layers/ipc/ShadowLayerUtilsGralloc.cpp b/gfx/layers/ipc/ShadowLayerUtilsGralloc.cpp
index 1b59de593694..b8e10eb9e2b4 100644
--- a/gfx/layers/ipc/ShadowLayerUtilsGralloc.cpp
+++ b/gfx/layers/ipc/ShadowLayerUtilsGralloc.cpp
@@ -184,13 +184,13 @@ ContentTypeFromPixelFormat(android::PixelFormat aFormat)
   return gfxASurface::ContentFromFormat(ImageFormatForPixelFormat(aFormat));
 }
 
-class GrallocReporter MOZ_FINAL : public MemoryUniReporter
+class GrallocReporter MOZ_FINAL : public MemoryReporterBase
 {
   friend class GrallocBufferActor;
 
 public:
   GrallocReporter()
-    : MemoryUniReporter("gralloc", KIND_OTHER, UNITS_BYTES,
+    : MemoryReporterBase("gralloc", KIND_OTHER, UNITS_BYTES,
 "Special RAM that can be shared between processes and directly accessed by "
 "both the CPU and GPU.  Gralloc memory is usually a relatively precious "
 "resource, with much less available than generic RAM.  When it's exhausted, "
diff --git a/gfx/thebes/gfxASurface.cpp b/gfx/thebes/gfxASurface.cpp
index 27aafff304f1..539bf86249f5 100644
--- a/gfx/thebes/gfxASurface.cpp
+++ b/gfx/thebes/gfxASurface.cpp
@@ -598,7 +598,7 @@ PR_STATIC_ASSERT(uint32_t(CAIRO_SURFACE_TYPE_SKIA) ==
 static int64_t gSurfaceMemoryUsed[gfxASurface::SurfaceTypeMax] = { 0 };
 
 class SurfaceMemoryReporter MOZ_FINAL :
-    public nsIMemoryReporter
+    public nsIMemoryMultiReporter
 {
 public:
     SurfaceMemoryReporter()
@@ -612,7 +612,7 @@ public:
         return NS_OK;
     }
 
-    NS_IMETHOD CollectReports(nsIMemoryReporterCallback *aCb,
+    NS_IMETHOD CollectReports(nsIMemoryMultiReporterCallback *aCb,
                               nsISupports *aClosure)
     {
         size_t len = NS_ARRAY_LENGTH(sSurfaceMemoryReporterAttrs);
@@ -639,7 +639,7 @@ public:
     }
 };
 
-NS_IMPL_ISUPPORTS1(SurfaceMemoryReporter, nsIMemoryReporter)
+NS_IMPL_ISUPPORTS1(SurfaceMemoryReporter, nsIMemoryMultiReporter)
 
 void
 gfxASurface::RecordMemoryUsedForSurfaceType(gfxASurface::gfxSurfaceType aType,
@@ -652,7 +652,7 @@ gfxASurface::RecordMemoryUsedForSurfaceType(gfxASurface::gfxSurfaceType aType,
 
     static bool registered = false;
     if (!registered) {
-        NS_RegisterMemoryReporter(new SurfaceMemoryReporter());
+        NS_RegisterMemoryMultiReporter(new SurfaceMemoryReporter());
         registered = true;
     }
 
diff --git a/gfx/thebes/gfxAndroidPlatform.cpp b/gfx/thebes/gfxAndroidPlatform.cpp
index 81acf67eeae1..c9781a4a4bf6 100644
--- a/gfx/thebes/gfxAndroidPlatform.cpp
+++ b/gfx/thebes/gfxAndroidPlatform.cpp
@@ -30,12 +30,12 @@ using namespace mozilla::gfx;
 
 static FT_Library gPlatformFTLibrary = nullptr;
 
-class FreetypeReporter MOZ_FINAL : public MemoryUniReporter
+class FreetypeReporter MOZ_FINAL : public MemoryReporterBase
 {
 public:
     FreetypeReporter()
-      : MemoryUniReporter("explicit/freetype", KIND_HEAP, UNITS_BYTES,
-                          "Memory used by Freetype.")
+      : MemoryReporterBase("explicit/freetype", KIND_HEAP, UNITS_BYTES,
+                           "Memory used by Freetype.")
     {
 #ifdef DEBUG
         // There must be only one instance of this class, due to |sAmount|
diff --git a/gfx/thebes/gfxFont.cpp b/gfx/thebes/gfxFont.cpp
index 1b7050f2f25d..77dcae2b74e9 100644
--- a/gfx/thebes/gfxFont.cpp
+++ b/gfx/thebes/gfxFont.cpp
@@ -1252,7 +1252,7 @@ gfxFontFamily::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf,
  * shaped-word caches to free up memory.
  */
 
-NS_IMPL_ISUPPORTS1(gfxFontCache::MemoryReporter, nsIMemoryReporter)
+NS_IMPL_ISUPPORTS1(gfxFontCache::MemoryReporter, nsIMemoryMultiReporter)
 
 NS_MEMORY_REPORTER_MALLOC_SIZEOF_FUN(FontCacheMallocSizeOf)
 
@@ -1265,7 +1265,7 @@ gfxFontCache::MemoryReporter::GetName(nsACString &aName)
 
 NS_IMETHODIMP
 gfxFontCache::MemoryReporter::CollectReports
-    (nsIMemoryReporterCallback* aCb,
+    (nsIMemoryMultiReporterCallback* aCb,
      nsISupports* aClosure)
 {
     FontCacheSizes sizes;
@@ -1324,7 +1324,7 @@ gfxFontCache::Init()
     if (!gGlobalCache) {
         return NS_ERROR_OUT_OF_MEMORY;
     }
-    NS_RegisterMemoryReporter(new MemoryReporter);
+    NS_RegisterMemoryMultiReporter(new MemoryReporter);
     return NS_OK;
 }
 
diff --git a/gfx/thebes/gfxFont.h b/gfx/thebes/gfxFont.h
index 3133c05d1e7b..2f5e8bb5c193 100644
--- a/gfx/thebes/gfxFont.h
+++ b/gfx/thebes/gfxFont.h
@@ -977,11 +977,11 @@ public:
 
 protected:
     class MemoryReporter MOZ_FINAL
-        : public nsIMemoryReporter
+        : public nsIMemoryMultiReporter
     {
     public:
         NS_DECL_ISUPPORTS
-        NS_DECL_NSIMEMORYREPORTER
+        NS_DECL_NSIMEMORYMULTIREPORTER
     };
 
     void DestroyFont(gfxFont *aFont);
diff --git a/gfx/thebes/gfxPlatformFontList.cpp b/gfx/thebes/gfxPlatformFontList.cpp
index 4ab0a331fd7f..60584906c0c2 100644
--- a/gfx/thebes/gfxPlatformFontList.cpp
+++ b/gfx/thebes/gfxPlatformFontList.cpp
@@ -70,7 +70,7 @@ gfxFontListPrefObserver::Observe(nsISupports     *aSubject,
     return NS_OK;
 }
 
-NS_IMPL_ISUPPORTS1(gfxPlatformFontList::MemoryReporter, nsIMemoryReporter)
+NS_IMPL_ISUPPORTS1(gfxPlatformFontList::MemoryReporter, nsIMemoryMultiReporter)
 
 NS_MEMORY_REPORTER_MALLOC_SIZEOF_FUN(FontListMallocSizeOf)
 
@@ -83,7 +83,7 @@ gfxPlatformFontList::MemoryReporter::GetName(nsACString &aName)
 
 NS_IMETHODIMP
 gfxPlatformFontList::MemoryReporter::CollectReports
-    (nsIMemoryReporterCallback* aCb,
+    (nsIMemoryMultiReporterCallback* aCb,
      nsISupports* aClosure)
 {
     FontListSizes sizes;
@@ -148,7 +148,7 @@ gfxPlatformFontList::gfxPlatformFontList(bool aNeedFullnamePostscriptNames)
 
     mSharedCmaps.Init(16);
 
-    NS_RegisterMemoryReporter(new MemoryReporter);
+    NS_RegisterMemoryMultiReporter(new MemoryReporter);
 }
 
 gfxPlatformFontList::~gfxPlatformFontList()
diff --git a/gfx/thebes/gfxPlatformFontList.h b/gfx/thebes/gfxPlatformFontList.h
index b8f1aaebec3f..53c1c9474594 100644
--- a/gfx/thebes/gfxPlatformFontList.h
+++ b/gfx/thebes/gfxPlatformFontList.h
@@ -179,11 +179,11 @@ public:
 
 protected:
     class MemoryReporter MOZ_FINAL
-        : public nsIMemoryReporter
+        : public nsIMemoryMultiReporter
     {
     public:
         NS_DECL_ISUPPORTS
-        NS_DECL_NSIMEMORYREPORTER
+        NS_DECL_NSIMEMORYMULTIREPORTER
     };
 
     gfxPlatformFontList(bool aNeedFullnamePostscriptNames = true);
diff --git a/gfx/thebes/gfxWindowsPlatform.cpp b/gfx/thebes/gfxWindowsPlatform.cpp
index 72bdaa02525d..f543a5743337 100644
--- a/gfx/thebes/gfxWindowsPlatform.cpp
+++ b/gfx/thebes/gfxWindowsPlatform.cpp
@@ -73,11 +73,11 @@ static const int kSupportedFeatureLevels[] =
   { D3D10_FEATURE_LEVEL_10_1, D3D10_FEATURE_LEVEL_10_0,
     D3D10_FEATURE_LEVEL_9_3 };
 
-class GfxD2DSurfaceCacheReporter MOZ_FINAL : public MemoryUniReporter
+class GfxD2DSurfaceCacheReporter MOZ_FINAL : public MemoryReporterBase
 {
 public:
     GfxD2DSurfaceCacheReporter()
-      : MemoryUniReporter("gfx-d2d-surface-cache", KIND_OTHER, UNITS_BYTES,
+      : MemoryReporterBase("gfx-d2d-surface-cache", KIND_OTHER, UNITS_BYTES,
 "Memory used by the Direct2D internal surface cache.")
     {}
 private:
@@ -110,11 +110,11 @@ bool OncePreferenceDirect2DForceEnabled()
 
 } // anonymous namespace
 
-class GfxD2DSurfaceVramReporter MOZ_FINAL : public MemoryUniReporter
+class GfxD2DSurfaceVramReporter MOZ_FINAL : public MemoryReporterBase
 {
 public:
     GfxD2DSurfaceVramReporter()
-      : MemoryUniReporter("gfx-d2d-surface-vram", KIND_OTHER, UNITS_BYTES,
+      : MemoryReporterBase("gfx-d2d-surface-vram", KIND_OTHER, UNITS_BYTES,
                            "Video memory used by D2D surfaces.")
     {}
 private:
@@ -127,11 +127,11 @@ private:
 
 #endif
 
-class GfxD2DVramDrawTargetReporter MOZ_FINAL : public MemoryUniReporter
+class GfxD2DVramDrawTargetReporter MOZ_FINAL : public MemoryReporterBase
 {
 public:
     GfxD2DVramDrawTargetReporter()
-      : MemoryUniReporter("gfx-d2d-vram-draw-target", KIND_OTHER, UNITS_BYTES,
+      : MemoryReporterBase("gfx-d2d-vram-draw-target", KIND_OTHER, UNITS_BYTES,
                            "Video memory used by D2D DrawTargets.")
     {}
 private:
@@ -141,11 +141,11 @@ private:
     }
 };
 
-class GfxD2DVramSourceSurfaceReporter MOZ_FINAL : public MemoryUniReporter
+class GfxD2DVramSourceSurfaceReporter MOZ_FINAL : public MemoryReporterBase
 {
 public:
     GfxD2DVramSourceSurfaceReporter()
-      : MemoryUniReporter("gfx-d2d-vram-source-surface",
+      : MemoryReporterBase("gfx-d2d-vram-source-surface",
                            KIND_OTHER, UNITS_BYTES,
                            "Video memory used by D2D SourceSurfaces.")
     {}
@@ -206,7 +206,7 @@ typedef HRESULT (WINAPI*D3D11CreateDeviceFunc)(
   ID3D11DeviceContext *ppImmediateContext
 );
 
-class GPUAdapterReporter : public nsIMemoryReporter {
+class GPUAdapterMultiReporter : public nsIMemoryMultiReporter {
 
     // Callers must Release the DXGIAdapter after use or risk mem-leak
     static bool GetDXGIAdapter(IDXGIAdapter **DXGIAdapter)
@@ -228,7 +228,7 @@ class GPUAdapterReporter : public nsIMemoryReporter {
 public:
     NS_DECL_ISUPPORTS
 
-    // nsIMemoryReporter abstract method implementation
+    // nsIMemoryMultiReporter abstract method implementation
     NS_IMETHOD
     GetName(nsACString &aName)
     {
@@ -236,9 +236,9 @@ public:
         return NS_OK;
     }
     
-    // nsIMemoryReporter abstract method implementation
+    // nsIMemoryMultiReporter abstract method implementation
     NS_IMETHOD
-    CollectReports(nsIMemoryReporterCallback* aCb,
+    CollectReports(nsIMemoryMultiReporterCallback* aCb,
                    nsISupports* aClosure)
     {
         int32_t winVers, buildNum;
@@ -347,7 +347,7 @@ public:
         return NS_OK;
     }
 };
-NS_IMPL_ISUPPORTS1(GPUAdapterReporter, nsIMemoryReporter)
+NS_IMPL_ISUPPORTS1(GPUAdapterMultiReporter, nsIMemoryMultiReporter)
 
 static __inline void
 BuildKeyNameFromFontName(nsAString &aName)
@@ -385,16 +385,16 @@ gfxWindowsPlatform::gfxWindowsPlatform()
 
     UpdateRenderMode();
 
-    mGPUAdapterReporter = new GPUAdapterReporter();
-    NS_RegisterMemoryReporter(mGPUAdapterReporter);
+    mGPUAdapterMultiReporter = new GPUAdapterMultiReporter();
+    NS_RegisterMemoryMultiReporter(mGPUAdapterMultiReporter);
 }
 
 gfxWindowsPlatform::~gfxWindowsPlatform()
 {
-    NS_UnregisterMemoryReporter(mGPUAdapterReporter);
-
-    mDeviceManager = nullptr;
-
+    NS_UnregisterMemoryMultiReporter(mGPUAdapterMultiReporter);
+    
+     mDeviceManager = nullptr;
+     
     ::ReleaseDC(nullptr, mScreenDC);
     // not calling FT_Done_FreeType because cairo may still hold references to
     // these FT_Faces.  See bug 458169.
diff --git a/gfx/thebes/gfxWindowsPlatform.h b/gfx/thebes/gfxWindowsPlatform.h
index 8d1d5aac423c..c00332244b4d 100644
--- a/gfx/thebes/gfxWindowsPlatform.h
+++ b/gfx/thebes/gfxWindowsPlatform.h
@@ -52,7 +52,7 @@ class IDirect3DDevice9;
 class ID3D11Device;
 class IDXGIAdapter1;
 
-class nsIMemoryReporter;
+class nsIMemoryMultiReporter;
 
 // Utility to get a Windows HDC from a thebes context,
 // used by both GDI and Uniscribe font shapers
@@ -315,7 +315,7 @@ private:
     // TODO: unify this with mPrefFonts (NB: holds families, not fonts) in gfxPlatformFontList
     nsDataHashtable<nsCStringHashKey, nsTArray<nsRefPtr<gfxFontEntry> > > mPrefFonts;
 
-    nsIMemoryReporter* mGPUAdapterReporter;
+    nsIMemoryMultiReporter* mGPUAdapterMultiReporter;
 };
 
 #endif /* GFX_WINDOWS_PLATFORM_H */
diff --git a/image/src/imgLoader.cpp b/image/src/imgLoader.cpp
index 463583899b3d..024108605ff0 100644
--- a/image/src/imgLoader.cpp
+++ b/image/src/imgLoader.cpp
@@ -61,7 +61,7 @@ using namespace mozilla::image;
 NS_MEMORY_REPORTER_MALLOC_SIZEOF_FUN(ImagesMallocSizeOf)
 
 class imgMemoryReporter MOZ_FINAL :
-  public nsIMemoryReporter
+  public nsIMemoryMultiReporter
 {
 public:
   imgMemoryReporter()
@@ -76,7 +76,7 @@ public:
     return NS_OK;
   }
 
-  NS_IMETHOD CollectReports(nsIMemoryReporterCallback *callback,
+  NS_IMETHOD CollectReports(nsIMemoryMultiReporterCallback *callback,
                             nsISupports *closure)
   {
     AllSizes chrome;
@@ -233,15 +233,15 @@ private:
   }
 };
 
-NS_IMPL_ISUPPORTS1(imgMemoryReporter, nsIMemoryReporter)
+NS_IMPL_ISUPPORTS1(imgMemoryReporter, nsIMemoryMultiReporter)
 
 // This is used by telemetry.
 class ImagesContentUsedUncompressedReporter MOZ_FINAL
-  : public MemoryUniReporter
+  : public MemoryReporterBase
 {
 public:
   ImagesContentUsedUncompressedReporter()
-    : MemoryUniReporter("images-content-used-uncompressed",
+    : MemoryReporterBase("images-content-used-uncompressed",
                          KIND_OTHER, UNITS_BYTES,
 "This is the sum of the 'explicit/images/content/used/uncompressed-heap' "
 "and 'explicit/images/content/used/uncompressed-nonheap' numbers.  However, "
@@ -850,7 +850,7 @@ void imgLoader::GlobalInit()
     sCacheMaxSize = 5 * 1024 * 1024;
 
   sMemReporter = new imgMemoryReporter();
-  NS_RegisterMemoryReporter(sMemReporter);
+  NS_RegisterMemoryMultiReporter(sMemReporter);
   NS_RegisterMemoryReporter(new ImagesContentUsedUncompressedReporter());
 }
 
diff --git a/image/test/mochitest/test_bug601470.html b/image/test/mochitest/test_bug601470.html
index bc37ea2c2048..7942285f5d72 100644
--- a/image/test/mochitest/test_bug601470.html
+++ b/image/test/mochitest/test_bug601470.html
@@ -25,18 +25,14 @@ window.onload = function() {
   var mgr = SpecialPowers.Cc["@mozilla.org/memory-reporter-manager;1"]
     .getService(SpecialPowers.Ci.nsIMemoryReporterManager);
 
-  var amount = 0;
-  var handleReport = function(aProcess, aPath, aKind, aUnits, aAmount, aDesc) {
-    amount += aAmount;
-  }
-
   var e = mgr.enumerateReporters();
+  var memoryCounter = 0;
   while (e.hasMoreElements()) {
-    var mr = e.getNext().QueryInterface(SpecialPowers.Ci.nsIMemoryReporter);
-    mr.collectReports(handleReport, null);
+    var mr =
+      e.getNext().QueryInterface(SpecialPowers.Ci.nsIMemoryReporter);
+    memoryCounter += mr.amount;
   }
-
-  ok(amount > 0, "we should be using a nonzero amount of memory");
+  ok(memoryCounter > 0, "we should be using a nonzero amount of memory");
   ok(true, "yay, didn't crash!");
 
   SimpleTest.finish();
diff --git a/ipc/glue/SharedMemory.cpp b/ipc/glue/SharedMemory.cpp
index 6fe916e42f7d..24959ff48583 100644
--- a/ipc/glue/SharedMemory.cpp
+++ b/ipc/glue/SharedMemory.cpp
@@ -17,11 +17,11 @@ namespace ipc {
 static Atomic<size_t> gShmemAllocated;
 static Atomic<size_t> gShmemMapped;
 
-class ShmemAllocatedReporter MOZ_FINAL : public MemoryUniReporter
+class ShmemAllocatedReporter MOZ_FINAL : public MemoryReporterBase
 {
 public:
   ShmemAllocatedReporter()
-    : MemoryUniReporter("shmem-allocated", KIND_OTHER, UNITS_BYTES,
+    : MemoryReporterBase("shmem-allocated", KIND_OTHER, UNITS_BYTES,
 "Memory shared with other processes that is accessible (but not necessarily "
 "mapped).")
   {}
@@ -29,11 +29,11 @@ private:
   int64_t Amount() MOZ_OVERRIDE { return gShmemAllocated; }
 };
 
-class ShmemMappedReporter MOZ_FINAL : public MemoryUniReporter
+class ShmemMappedReporter MOZ_FINAL : public MemoryReporterBase
 {
 public:
   ShmemMappedReporter()
-    : MemoryUniReporter("shmem-mapped", KIND_OTHER, UNITS_BYTES,
+    : MemoryReporterBase("shmem-mapped", KIND_OTHER, UNITS_BYTES,
 "Memory shared with other processes that is mapped into the address space.")
   {}
 private:
diff --git a/js/xpconnect/src/XPCJSMemoryReporter.h b/js/xpconnect/src/XPCJSMemoryReporter.h
index 447f0f3896bf..ac95b7813035 100644
--- a/js/xpconnect/src/XPCJSMemoryReporter.h
+++ b/js/xpconnect/src/XPCJSMemoryReporter.h
@@ -9,22 +9,22 @@
 #define XPCJSMemoryReporter_h
 
 class nsISupports;
-class nsIMemoryReporterCallback;
+class nsIMemoryMultiReporterCallback;
 
 namespace xpc {
 
 // The key is the window ID.
 typedef nsDataHashtable<nsUint64HashKey, nsCString> WindowPaths;
 
-// This is very nearly an instance of nsIMemoryReporter, but it's not,
+// This is very nearly an instance of nsIMemoryMultiReporter, but it's not,
 // because it's invoked by nsWindowMemoryReporter in order to get |windowPaths|
 // in CollectReports.
-class JSReporter
+class JSMemoryMultiReporter
 {
 public:
     static nsresult CollectReports(WindowPaths *windowPaths,
                                    WindowPaths *topWindowPaths,
-                                   nsIMemoryReporterCallback *cb,
+                                   nsIMemoryMultiReporterCallback *cb,
                                    nsISupports *closure);
 };
 
diff --git a/js/xpconnect/src/XPCJSRuntime.cpp b/js/xpconnect/src/XPCJSRuntime.cpp
index 50ce3f4c95aa..02c3a6cd93bc 100644
--- a/js/xpconnect/src/XPCJSRuntime.cpp
+++ b/js/xpconnect/src/XPCJSRuntime.cpp
@@ -1560,13 +1560,13 @@ GetCompartmentName(JSCompartment *c, nsCString &name, bool replaceSlashes)
     }
 }
 
-// Telemetry relies on this being a uni-reporter (rather than part of the "js"
-// reporter).
-class JSGCHeapReporter MOZ_FINAL : public MemoryUniReporter
+// Telemetry relies on this being a single reporter (rather than part of the
+// "js" multi-reporter).
+class JSGCHeapReporter MOZ_FINAL : public MemoryReporterBase
 {
 public:
     JSGCHeapReporter()
-      : MemoryUniReporter("js-gc-heap", KIND_OTHER, UNITS_BYTES,
+      : MemoryReporterBase("js-gc-heap", KIND_OTHER, UNITS_BYTES,
 "Memory used by the garbage-collected JavaScript heap.")
     {}
 private:
@@ -1578,17 +1578,19 @@ private:
     }
 };
 
-// Nb: js-compartments/system + js-compartments/user could be different to the
-// number of compartments reported by JSReporter if a garbage collection
-// occurred between them being consulted.  We could move these reporters into
-// JSReporter to avoid that problem, but then we couldn't easily report them
-// via telemetry, so we live with the small risk of inconsistencies.
+// Nb: js-compartments/system + js-compartments/user could be
+// different to the number of compartments reported by
+// JSMemoryMultiReporter if a garbage collection occurred
+// between them being consulted.  We could move these reporters into
+// XPConnectJSCompartmentCount to avoid that problem, but then we couldn't
+// easily report them via telemetry, so we live with the small risk of
+// inconsistencies.
 
-class JSCompartmentsSystemReporter MOZ_FINAL : public MemoryUniReporter
+class JSCompartmentsSystemReporter MOZ_FINAL : public MemoryReporterBase
 {
 public:
     JSCompartmentsSystemReporter()
-      : MemoryUniReporter("js-compartments/system", KIND_OTHER, UNITS_COUNT,
+      : MemoryReporterBase("js-compartments/system", KIND_OTHER, UNITS_COUNT,
 "The number of JavaScript compartments for system code.  The sum of this and "
 "'js-compartments/user' might not match the number of compartments listed "
 "in the 'explicit' tree if a garbage collection occurs at an inopportune "
@@ -1602,11 +1604,11 @@ private:
     }
 };
 
-class JSCompartmentsUserReporter MOZ_FINAL : public MemoryUniReporter
+class JSCompartmentsUserReporter MOZ_FINAL : public MemoryReporterBase
 {
 public:
     JSCompartmentsUserReporter()
-      : MemoryUniReporter("js-compartments/user", KIND_OTHER, UNITS_COUNT,
+      : MemoryReporterBase("js-compartments/user", KIND_OTHER, UNITS_COUNT,
 "The number of JavaScript compartments for user code.  The sum of this and "
 "'js-compartments/system' might not match the number of compartments listed "
 "under 'js' if a garbage collection occurs at an inopportune time, but such "
@@ -1621,11 +1623,11 @@ private:
 };
 
 // This is also a single reporter so it can be used by telemetry.
-class JSMainRuntimeTemporaryPeakReporter MOZ_FINAL : public MemoryUniReporter
+class JSMainRuntimeTemporaryPeakReporter MOZ_FINAL : public MemoryReporterBase
 {
 public:
     JSMainRuntimeTemporaryPeakReporter()
-      : MemoryUniReporter("js-main-runtime-temporary-peak",
+      : MemoryReporterBase("js-main-runtime-temporary-peak",
                            KIND_OTHER, UNITS_BYTES,
 "The peak size of the transient storage in the main JSRuntime (the current "
 "size of which is reported as 'explicit/js-non-window/runtime/temporary').")
@@ -1756,7 +1758,7 @@ namespace xpc {
 static nsresult
 ReportZoneStats(const JS::ZoneStats &zStats,
                 const xpc::ZoneStatsExtras &extras,
-                nsIMemoryReporterCallback *cb,
+                nsIMemoryMultiReporterCallback *cb,
                 nsISupports *closure, size_t *gcTotalOut = NULL)
 {
     const nsAutoCString& pathPrefix = extras.pathPrefix;
@@ -1940,7 +1942,7 @@ static nsresult
 ReportCompartmentStats(const JS::CompartmentStats &cStats,
                        const xpc::CompartmentStatsExtras &extras,
                        amIAddonManager *addonManager,
-                       nsIMemoryReporterCallback *cb,
+                       nsIMemoryMultiReporterCallback *cb,
                        nsISupports *closure, size_t *gcTotalOut = NULL)
 {
     static const nsDependentCString addonPrefix("explicit/add-ons/");
@@ -2082,8 +2084,8 @@ ReportCompartmentStats(const JS::CompartmentStats &cStats,
                    "Memory allocated on the malloc heap for data belonging to ctypes objects.");
 
     // Note that we use cDOMPathPrefix here.  This is because we measure orphan
-    // DOM nodes in the JS reporter, but we want to report them in a "dom"
-    // sub-tree rather than a "js" sub-tree.
+    // DOM nodes in the JS multi-reporter, but we want to report them in a
+    // "dom" sub-tree rather than a "js" sub-tree.
     ZCREPORT_BYTES(cDOMPathPrefix + NS_LITERAL_CSTRING("orphan-nodes"),
                    cStats.objectsExtra.private_,
                    "Memory used by orphan DOM nodes that are only reachable "
@@ -2205,7 +2207,7 @@ static nsresult
 ReportJSRuntimeExplicitTreeStats(const JS::RuntimeStats &rtStats,
                                  const nsACString &rtPath,
                                  amIAddonManager* addonManager,
-                                 nsIMemoryReporterCallback *cb,
+                                 nsIMemoryMultiReporterCallback *cb,
                                  nsISupports *closure, size_t *rtTotalOut)
 {
     nsresult rv;
@@ -2347,7 +2349,7 @@ ReportJSRuntimeExplicitTreeStats(const JS::RuntimeStats &rtStats,
 nsresult
 ReportJSRuntimeExplicitTreeStats(const JS::RuntimeStats &rtStats,
                                  const nsACString &rtPath,
-                                 nsIMemoryReporterCallback *cb,
+                                 nsIMemoryMultiReporterCallback *cb,
                                  nsISupports *closure, size_t *rtTotalOut)
 {
     nsCOMPtr<amIAddonManager> am =
@@ -2359,7 +2361,7 @@ ReportJSRuntimeExplicitTreeStats(const JS::RuntimeStats &rtStats,
 
 } // namespace xpc
 
-class JSCompartmentsReporter MOZ_FINAL : public nsIMemoryReporter
+class JSCompartmentsMultiReporter MOZ_FINAL : public nsIMemoryMultiReporter
 {
   public:
     NS_DECL_THREADSAFE_ISUPPORTS
@@ -2383,7 +2385,7 @@ class JSCompartmentsReporter MOZ_FINAL : public nsIMemoryReporter
         paths->append(path);
     }
 
-    NS_IMETHOD CollectReports(nsIMemoryReporterCallback *cb,
+    NS_IMETHOD CollectReports(nsIMemoryMultiReporterCallback *cb,
                               nsISupports *closure)
     {
         // First we collect the compartment paths.  Then we report them.  Doing
@@ -2405,7 +2407,9 @@ class JSCompartmentsReporter MOZ_FINAL : public nsIMemoryReporter
     }
 };
 
-NS_IMPL_ISUPPORTS1(JSCompartmentsReporter, nsIMemoryReporter)
+NS_IMPL_ISUPPORTS1(JSCompartmentsMultiReporter
+                              , nsIMemoryMultiReporter
+                              )
 
 NS_MEMORY_REPORTER_MALLOC_SIZEOF_FUN(OrphanMallocSizeOf)
 
@@ -2563,9 +2567,9 @@ class XPCJSRuntimeStats : public JS::RuntimeStats
         // "<something>compartment(<cname>)/".
         //
         // extras->domPathPrefix is used for DOM orphan nodes, which are
-        // counted by the JS reporter but reported as part of the DOM
-        // measurements. At this point it has the form "<something>/dom/" if
-        // this compartment belongs to an nsGlobalWindow, and
+        // counted by the JS multi-reporter but reported as part of the
+        // DOM measurements. At this point it has the form "<something>/dom/"
+        // if this compartment belongs to an nsGlobalWindow, and
         // "explicit/dom/<something>?!/" otherwise (in which case it shouldn't
         // be used, because non-nsGlobalWindow compartments shouldn't have
         // orphan DOM nodes).
@@ -2575,10 +2579,10 @@ class XPCJSRuntimeStats : public JS::RuntimeStats
 };
 
 nsresult
-JSReporter::CollectReports(WindowPaths *windowPaths,
-                           WindowPaths *topWindowPaths,
-                           nsIMemoryReporterCallback *cb,
-                           nsISupports *closure)
+JSMemoryMultiReporter::CollectReports(WindowPaths *windowPaths,
+                                      WindowPaths *topWindowPaths,
+                                      nsIMemoryMultiReporterCallback *cb,
+                                      nsISupports *closure)
 {
     XPCJSRuntime *xpcrt = nsXPConnect::GetRuntimeInstance();
 
@@ -3049,7 +3053,7 @@ XPCJSRuntime::XPCJSRuntime(nsXPConnect* aXPConnect)
     NS_RegisterMemoryReporter(new JSCompartmentsSystemReporter());
     NS_RegisterMemoryReporter(new JSCompartmentsUserReporter());
     NS_RegisterMemoryReporter(new JSMainRuntimeTemporaryPeakReporter());
-    NS_RegisterMemoryReporter(new JSCompartmentsReporter);
+    NS_RegisterMemoryMultiReporter(new JSCompartmentsMultiReporter);
 
     // Install a JavaScript 'debugger' keyword handler in debug builds only
 #ifdef DEBUG
diff --git a/js/xpconnect/src/xpcpublic.h b/js/xpconnect/src/xpcpublic.h
index 5de64f5b906f..430791f2caef 100644
--- a/js/xpconnect/src/xpcpublic.h
+++ b/js/xpconnect/src/xpcpublic.h
@@ -180,7 +180,7 @@ xpc_UnmarkSkippableJSHolders();
 NS_EXPORT_(void)
 xpc_ActivateDebugMode();
 
-class nsIMemoryReporterCallback;
+class nsIMemoryMultiReporterCallback;
 
 // readable string conversions, static methods and members only
 class XPCStringConvert
@@ -376,7 +376,7 @@ private:
 nsresult
 ReportJSRuntimeExplicitTreeStats(const JS::RuntimeStats &rtStats,
                                  const nsACString &rtPath,
-                                 nsIMemoryReporterCallback *cb,
+                                 nsIMemoryMultiReporterCallback *cb,
                                  nsISupports *closure, size_t *rtTotal = NULL);
 
 /**
diff --git a/layout/base/nsStyleSheetService.cpp b/layout/base/nsStyleSheetService.cpp
index 419e30b80d9b..644399f6dc03 100644
--- a/layout/base/nsStyleSheetService.cpp
+++ b/layout/base/nsStyleSheetService.cpp
@@ -26,11 +26,11 @@
 using namespace mozilla;
 
 class LayoutStyleSheetServiceReporter MOZ_FINAL
-  : public mozilla::MemoryUniReporter
+  : public mozilla::MemoryReporterBase
 {
 public:
   LayoutStyleSheetServiceReporter()
-    : MemoryUniReporter("explicit/layout/style-sheet-service",
+    : MemoryReporterBase("explicit/layout/style-sheet-service",
                          KIND_HEAP, UNITS_BYTES,
 "Memory used for style sheets held by the style sheet service.")
   {}
diff --git a/layout/style/nsLayoutStylesheetCache.cpp b/layout/style/nsLayoutStylesheetCache.cpp
index c20510e18ec2..72072679b6b0 100644
--- a/layout/style/nsLayoutStylesheetCache.cpp
+++ b/layout/style/nsLayoutStylesheetCache.cpp
@@ -18,11 +18,11 @@
 #include "nsCSSStyleSheet.h"
 
 class LayoutStyleSheetCacheReporter MOZ_FINAL
-  : public mozilla::MemoryUniReporter
+  : public mozilla::MemoryReporterBase
 {
 public:
   LayoutStyleSheetCacheReporter()
-    : MemoryUniReporter("explicit/layout/style-sheet-cache",
+    : MemoryReporterBase("explicit/layout/style-sheet-cache",
                          KIND_HEAP, UNITS_BYTES,
                          "Memory used for some built-in style sheets.")
   {}
diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferences.cpp
index 59c06be2f034..10eba7a2675d 100644
--- a/modules/libpref/src/Preferences.cpp
+++ b/modules/libpref/src/Preferences.cpp
@@ -203,11 +203,11 @@ Preferences::SizeOfIncludingThisAndOtherStuff(mozilla::MallocSizeOf aMallocSizeO
   return n;
 }
 
-class PreferencesReporter MOZ_FINAL : public MemoryUniReporter
+class PreferencesReporter MOZ_FINAL : public MemoryReporterBase
 {
 public:
   PreferencesReporter()
-    : MemoryUniReporter("explicit/preferences", KIND_HEAP, UNITS_BYTES,
+    : MemoryReporterBase("explicit/preferences", KIND_HEAP, UNITS_BYTES,
                          "Memory used by the preferences system.")
   {}
 private:
diff --git a/netwerk/cache/nsDiskCacheDevice.cpp b/netwerk/cache/nsDiskCacheDevice.cpp
index 97c1ad8964c1..a6dcd50164e7 100644
--- a/netwerk/cache/nsDiskCacheDevice.cpp
+++ b/netwerk/cache/nsDiskCacheDevice.cpp
@@ -370,11 +370,11 @@ nsDiskCache::Truncate(PRFileDesc *  fd, uint32_t  newEOF)
  *  nsDiskCacheDevice
  *****************************************************************************/
 
-class NetworkDiskCacheReporter MOZ_FINAL : public MemoryUniReporter
+class NetworkDiskCacheReporter MOZ_FINAL : public MemoryReporterBase
 {
 public:
     NetworkDiskCacheReporter(nsDiskCacheDevice* aDevice)
-      : MemoryUniReporter(
+      : MemoryReporterBase(
             "explicit/network/disk-cache",
             KIND_HEAP,
             UNITS_BYTES,
diff --git a/netwerk/cache/nsMemoryCacheDevice.cpp b/netwerk/cache/nsMemoryCacheDevice.cpp
index e0e9c9656027..02b7b8dc199b 100644
--- a/netwerk/cache/nsMemoryCacheDevice.cpp
+++ b/netwerk/cache/nsMemoryCacheDevice.cpp
@@ -29,11 +29,11 @@
 const char *gMemoryDeviceID      = "memory";
 
 class NetworkMemoryCacheReporter MOZ_FINAL :
-    public mozilla::MemoryUniReporter
+    public mozilla::MemoryReporterBase
 {
 public:
     NetworkMemoryCacheReporter(nsMemoryCacheDevice* aDevice)
-      : MemoryUniReporter(
+      : MemoryReporterBase(
             "explicit/network/memory-cache",
             KIND_HEAP,
             UNITS_BYTES,
diff --git a/netwerk/dns/nsEffectiveTLDService.cpp b/netwerk/dns/nsEffectiveTLDService.cpp
index 3389f63af018..71dd332ba730 100644
--- a/netwerk/dns/nsEffectiveTLDService.cpp
+++ b/netwerk/dns/nsEffectiveTLDService.cpp
@@ -61,11 +61,11 @@ nsDomainEntry::FuncForStaticAsserts(void)
 
 static nsEffectiveTLDService *gService = nullptr;
 
-class EffectiveTLDServiceReporter MOZ_FINAL : public MemoryUniReporter
+class EffectiveTLDServiceReporter MOZ_FINAL : public MemoryReporterBase
 {
 public:
   EffectiveTLDServiceReporter()
-    : MemoryUniReporter("explicit/xpcom/effective-TLD-service",
+    : MemoryReporterBase("explicit/xpcom/effective-TLD-service",
                          KIND_HEAP, UNITS_BYTES,
                          "Memory used by the effective TLD service.")
   {}
diff --git a/startupcache/StartupCache.cpp b/startupcache/StartupCache.cpp
index 2889dd326207..14021ccb4eea 100644
--- a/startupcache/StartupCache.cpp
+++ b/startupcache/StartupCache.cpp
@@ -53,11 +53,11 @@
 namespace mozilla {
 namespace scache {
 
-class StartupCacheMappingReporter MOZ_FINAL : public MemoryUniReporter
+class StartupCacheMappingReporter MOZ_FINAL : public MemoryReporterBase
 {
 public:
   StartupCacheMappingReporter()
-    : MemoryUniReporter("explicit/startup-cache/mapping",
+    : MemoryReporterBase("explicit/startup-cache/mapping",
                          KIND_NONHEAP, UNITS_BYTES,
 "Memory used to hold the mapping of the startup cache from file.  This memory "
 "is likely to be swapped out shortly after start-up.")
@@ -71,11 +71,11 @@ private:
   }
 };
 
-class StartupCacheDataReporter MOZ_FINAL : public MemoryUniReporter
+class StartupCacheDataReporter MOZ_FINAL : public MemoryReporterBase
 {
 public:
   StartupCacheDataReporter()
-    : MemoryUniReporter("explicit/startup-cache/data", KIND_HEAP, UNITS_BYTES,
+    : MemoryReporterBase("explicit/startup-cache/data", KIND_HEAP, UNITS_BYTES,
 "Memory used by the startup cache for things other than the file mapping.")
   {}
 private:
diff --git a/storage/src/mozStorageService.cpp b/storage/src/mozStorageService.cpp
index 4e6118f033e6..9b0b31948319 100644
--- a/storage/src/mozStorageService.cpp
+++ b/storage/src/mozStorageService.cpp
@@ -57,18 +57,18 @@ namespace storage {
 // the multi-reporter provides reports that add up to the total.  But it's
 // useful to have the total in the "Other Measurements" list in about:memory,
 // and more importantly, we also gather the total via telemetry.
-class StorageSQLiteUniReporter MOZ_FINAL : public MemoryUniReporter
+class StorageSQLiteReporter MOZ_FINAL : public MemoryReporterBase
 {
 public:
-  StorageSQLiteUniReporter()
-    : MemoryUniReporter("storage-sqlite", KIND_OTHER, UNITS_BYTES,
+  StorageSQLiteReporter()
+    : MemoryReporterBase("storage-sqlite", KIND_OTHER, UNITS_BYTES,
                          "Memory used by SQLite.")
   {}
 private:
   int64_t Amount() MOZ_OVERRIDE { return ::sqlite3_memory_used(); }
 };
 
-class StorageSQLiteMultiReporter MOZ_FINAL : public nsIMemoryReporter
+class StorageSQLiteMultiReporter MOZ_FINAL : public nsIMemoryMultiReporter
 {
 private:
   Service *mService;    // a weakref because Service contains a strongref to this
@@ -97,7 +97,7 @@ public:
 
   NS_IMETHOD GetName(nsACString &aName)
   {
-      aName.AssignLiteral("storage-sqlite-multi");
+      aName.AssignLiteral("storage-sqlite");
       return NS_OK;
   }
 
@@ -107,7 +107,7 @@ public:
   // main thread!  But at the time of writing this function is only called when
   // about:memory is loaded (not, for example, when telemetry pings occur) and
   // any delays in that case aren't so bad.
-  NS_IMETHOD CollectReports(nsIMemoryReporterCallback *aCb,
+  NS_IMETHOD CollectReports(nsIMemoryMultiReporterCallback *aCb,
                             nsISupports *aClosure)
   {
     nsresult rv;
@@ -164,7 +164,8 @@ public:
 
 private:
   /**
-   * Passes a single SQLite memory statistic to a memory reporter callback.
+   * Passes a single SQLite memory statistic to a memory multi-reporter
+   * callback.
    *
    * @param aCallback
    *        The callback.
@@ -184,7 +185,7 @@ private:
    * @param aTotal
    *        The accumulator for the measurement.
    */
-  nsresult reportConn(nsIMemoryReporterCallback *aCb,
+  nsresult reportConn(nsIMemoryMultiReporterCallback *aCb,
                       nsISupports *aClosure,
                       sqlite3 *aConn,
                       const nsACString &aPathHead,
@@ -215,7 +216,7 @@ private:
 
 NS_IMPL_ISUPPORTS1(
   StorageSQLiteMultiReporter,
-  nsIMemoryReporter
+  nsIMemoryMultiReporter
 )
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -307,8 +308,8 @@ Service::Service()
 
 Service::~Service()
 {
-  (void)::NS_UnregisterMemoryReporter(mStorageSQLiteUniReporter);
-  (void)::NS_UnregisterMemoryReporter(mStorageSQLiteMultiReporter);
+  (void)::NS_UnregisterMemoryReporter(mStorageSQLiteReporter);
+  (void)::NS_UnregisterMemoryMultiReporter(mStorageSQLiteMultiReporter);
 
   int rc = sqlite3_vfs_unregister(mSqliteVFS);
   if (rc != SQLITE_OK)
@@ -540,10 +541,10 @@ Service::initialize()
 
   // Create and register our SQLite memory reporters.  Registration can only
   // happen on the main thread (otherwise you'll get cryptic crashes).
-  mStorageSQLiteUniReporter = new StorageSQLiteUniReporter();
+  mStorageSQLiteReporter = new StorageSQLiteReporter();
   mStorageSQLiteMultiReporter = new StorageSQLiteMultiReporter(this);
-  (void)::NS_RegisterMemoryReporter(mStorageSQLiteUniReporter);
-  (void)::NS_RegisterMemoryReporter(mStorageSQLiteMultiReporter);
+  (void)::NS_RegisterMemoryReporter(mStorageSQLiteReporter);
+  (void)::NS_RegisterMemoryMultiReporter(mStorageSQLiteMultiReporter);
 
   return NS_OK;
 }
diff --git a/storage/src/mozStorageService.h b/storage/src/mozStorageService.h
index f0625af5067d..18a70a220795 100644
--- a/storage/src/mozStorageService.h
+++ b/storage/src/mozStorageService.h
@@ -17,6 +17,7 @@
 #include "mozIStorageService.h"
 
 class nsIMemoryReporter;
+class nsIMemoryMultiReporter;
 class nsIXPConnect;
 struct sqlite3_vfs;
 
@@ -172,8 +173,8 @@ private:
 
   nsCOMPtr<nsIFile> mProfileStorageFile;
 
-  nsCOMPtr<nsIMemoryReporter> mStorageSQLiteUniReporter;
-  nsCOMPtr<nsIMemoryReporter> mStorageSQLiteMultiReporter;
+  nsCOMPtr<nsIMemoryReporter> mStorageSQLiteReporter;
+  nsCOMPtr<nsIMemoryMultiReporter> mStorageSQLiteMultiReporter;
 
   static Service *gService;
 
diff --git a/toolkit/components/aboutmemory/content/aboutMemory.js b/toolkit/components/aboutmemory/content/aboutMemory.js
index 6e5320911ec3..cb9170734d2c 100644
--- a/toolkit/components/aboutmemory/content/aboutMemory.js
+++ b/toolkit/components/aboutmemory/content/aboutMemory.js
@@ -166,32 +166,49 @@ function onUnload()
 //---------------------------------------------------------------------------
 
 /**
- * Iterates over each reporter.
+ * Iterates over each reporter and multi-reporter.
  *
- * @param aIgnoreReporter
- *        Function that indicates if we should skip an entire reporter, based
- *        on its name.
- * @param aIgnoreReport
- *        Function that indicates if we should skip a single report from a
- *        reporter, based on its path.
+ * @param aIgnoreSingle
+ *        Function that indicates if we should skip a single reporter, based
+ *        on its path.
+ * @param aIgnoreMulti
+ *        Function that indicates if we should skip a multi-reporter, based on
+ *        its name.
  * @param aHandleReport
- *        The function that's called for each non-skipped report.
+ *        The function that's called for each report.
  */
-function processMemoryReporters(aIgnoreReporter, aIgnoreReport, aHandleReport)
+function processMemoryReporters(aIgnoreSingle, aIgnoreMulti, aHandleReport)
 {
-  let handleReport = function(aProcess, aUnsafePath, aKind, aUnits,
-                              aAmount, aDescription) {
-    if (!aIgnoreReport(aUnsafePath)) {
-      aHandleReport(aProcess, aUnsafePath, aKind, aUnits, aAmount,
-                    aDescription, /* presence = */ undefined);
-    }
-  }
+  // Process each memory reporter with aHandleReport.
+  //
+  // - Note that copying rOrig.amount (which calls a C++ function under the
+  //   IDL covers) to r._amount for every reporter now means that the
+  //   results as consistent as possible -- measurements are made all at
+  //   once before most of the memory required to generate this page is
+  //   allocated.
+  //
+  // - After this point we never use the original memory report again.
 
   let e = gMgr.enumerateReporters();
   while (e.hasMoreElements()) {
-    let mr = e.getNext().QueryInterface(Ci.nsIMemoryReporter);
-    if (!aIgnoreReporter(mr.name)) {
+    let rOrig = e.getNext().QueryInterface(Ci.nsIMemoryReporter);
+    let unsafePath = rOrig.path;
+    if (!aIgnoreSingle(unsafePath)) {
+      aHandleReport(rOrig.process, unsafePath, rOrig.kind, rOrig.units,
+                    rOrig.amount, rOrig.description);
+    }
+  }
+
+  let e = gMgr.enumerateMultiReporters();
+  while (e.hasMoreElements()) {
+    let mr = e.getNext().QueryInterface(Ci.nsIMemoryMultiReporter);
+    if (!aIgnoreMulti(mr.name)) {
       // |collectReports| never passes in a |presence| argument.
+      let handleReport = function(aProcess, aUnsafePath, aKind, aUnits,
+                                  aAmount, aDescription) {
+        aHandleReport(aProcess, aUnsafePath, aKind, aUnits, aAmount,
+                      aDescription, /* presence = */ undefined);
+      }
       mr.collectReports(handleReport, null);
     }
   }
@@ -202,19 +219,19 @@ function processMemoryReporters(aIgnoreReporter, aIgnoreReport, aHandleReport)
  *
  * @param aReports
  *        Array of reports, read from a file or the clipboard.
- * @param aIgnoreReport
- *        Function that indicates if we should skip a single report, based
+ * @param aIgnoreSingle
+ *        Function that indicates if we should skip a single reporter, based
  *        on its path.
  * @param aHandleReport
  *        The function that's called for each report.
  */
-function processMemoryReportsFromFile(aReports, aIgnoreReport, aHandleReport)
+function processMemoryReportsFromFile(aReports, aIgnoreSingle, aHandleReport)
 {
   // Process each memory reporter with aHandleReport.
 
   for (let i = 0; i < aReports.length; i++) {
     let r = aReports[i];
-    if (!aIgnoreReport(r.path)) {
+    if (!aIgnoreSingle(r.path)) {
       aHandleReport(r.process, r.path, r.kind, r.units, r.amount,
                     r.description, r._presence);
     }
@@ -574,7 +591,10 @@ function updateAboutMemoryFromReporters()
 
   try {
     // Process the reports from the memory reporters.
-    appendAboutMemoryMain(processMemoryReporters, gMgr.hasMozMallocUsableSize,
+    let process = function(aIgnoreSingle, aIgnoreMulti, aHandleReport) {
+      processMemoryReporters(aIgnoreSingle, aIgnoreMulti, aHandleReport);
+    }
+    appendAboutMemoryMain(process, gMgr.hasMozMallocUsableSize,
                           /* forceShowSmaps = */ false);
 
   } catch (ex) {
@@ -601,8 +621,8 @@ function updateAboutMemoryFromJSONObject(aObj)
                 "missing 'hasMozMallocUsableSize' property");
     assertInput(aObj.reports && aObj.reports instanceof Array,
                 "missing or non-array 'reports' property");
-    let process = function(aIgnoreReporter, aIgnoreReport, aHandleReport) {
-      processMemoryReportsFromFile(aObj.reports, aIgnoreReport, aHandleReport);
+    let process = function(aIgnoreSingle, aIgnoreMulti, aHandleReport) {
+      processMemoryReportsFromFile(aObj.reports, aIgnoreSingle, aHandleReport);
     }
     appendAboutMemoryMain(process, aObj.hasMozMallocUsableSize,
                           /* forceShowSmaps = */ true);
@@ -953,7 +973,7 @@ function PColl()
  * Processes reports (whether from reporters or from a file) and append the
  * main part of the page.
  *
- * @param aProcessReports
+ * @param aProcess
  *        Function that extracts the memory reports from the reporters or from
  *        file.
  * @param aHasMozMallocUsableSize
@@ -962,10 +982,10 @@ function PColl()
  *        True if we should show the smaps memory reporters even if we're not
  *        in verbose mode.
  */
-function appendAboutMemoryMain(aProcessReports, aHasMozMallocUsableSize,
+function appendAboutMemoryMain(aProcess, aHasMozMallocUsableSize,
                                aForceShowSmaps)
 {
-  let pcollsByProcess = getPCollsByProcess(aProcessReports, aForceShowSmaps);
+  let pcollsByProcess = getPCollsByProcess(aProcess, aForceShowSmaps);
 
   // Sort the processes.
   let processes = Object.keys(pcollsByProcess);
@@ -1023,7 +1043,7 @@ function appendAboutMemoryMain(aProcessReports, aHasMozMallocUsableSize,
  * This function reads all the memory reports, and puts that data in structures
  * that will be used to generate the page.
  *
- * @param aProcessReports
+ * @param aProcessMemoryReports
  *        Function that extracts the memory reports from the reporters or from
  *        file.
  * @param aForceShowSmaps
@@ -1031,7 +1051,7 @@ function appendAboutMemoryMain(aProcessReports, aHasMozMallocUsableSize,
  *        in verbose mode.
  * @return The table of PColls by process.
  */
-function getPCollsByProcess(aProcessReports, aForceShowSmaps)
+function getPCollsByProcess(aProcessMemoryReports, aForceShowSmaps)
 {
   let pcollsByProcess = {};
 
@@ -1040,28 +1060,23 @@ function getPCollsByProcess(aProcessReports, aForceShowSmaps)
   // be in parentheses, so a ')' might appear after the '.'.)
   const gSentenceRegExp = /^[A-Z].*\.\)?$/m;
 
-  // Ignore the "smaps" reporter in non-verbose mode unless we're reading from
-  // a file or the clipboard, and ignore the "compartments" and "ghost-windows"
-  // reporters all the time.  (Note that reports from these reporters can reach
-  // here via a "content-child" reporter if they were in a child process.)
+  // Ignore the "smaps" multi-reporter in non-verbose mode unless we're reading
+  // from a file or the clipboard, and ignore the "compartments" and
+  // "ghost-windows" multi-reporters all the time.  (Note that reports from
+  // these multi-reporters can reach here as single reports if they were in the
+  // child process.)
   //
-  // Also ignore the "resident-fast" reporter; we use the vanilla "resident"
+  // Also ignore the resident-fast reporter; we use the vanilla resident
   // reporter because it's more important that we get accurate results than
   // that we avoid the (small) possibility of a long pause when loading
-  // about:memory.  Furthermore, the "resident" reporter can purge pages on
-  // MacOS, which affects the results of the "resident-fast" reporter, and we
-  // don't want the measurements shown in about:memory to be affected by the
-  // (arbitrary) order of memory reporter execution.
+  // about:memory.
+  //
+  // We don't show both resident and resident-fast because running the resident
+  // reporter can purge pages on MacOS, which affects the results of the
+  // resident-fast reporter.  We don't want about:memory's results to be
+  // affected by the order of memory reporter execution.
 
-  function ignoreReporter(aName)
-  {
-    return (aName === "smaps" && !gVerbose.checked && !aForceShowSmaps) ||
-           aName === "compartments" ||
-           aName === "ghost-windows" ||
-           aName === "resident-fast";
-  }
-
-  function ignoreReport(aUnsafePath)
+  function ignoreSingle(aUnsafePath)
   {
     return (isSmapsPath(aUnsafePath) && !gVerbose.checked && !aForceShowSmaps) ||
            aUnsafePath.startsWith("compartments/") ||
@@ -1069,6 +1084,13 @@ function getPCollsByProcess(aProcessReports, aForceShowSmaps)
            aUnsafePath == "resident-fast";
   }
 
+  function ignoreMulti(aMRName)
+  {
+    return (aMRName === "smaps" && !gVerbose.checked && !aForceShowSmaps) ||
+            aMRName === "compartments" ||
+            aMRName === "ghost-windows";
+  }
+
   function handleReport(aProcess, aUnsafePath, aKind, aUnits, aAmount,
                         aDescription, aPresence)
   {
@@ -1149,7 +1171,7 @@ function getPCollsByProcess(aProcessReports, aForceShowSmaps)
     }
   }
 
-  aProcessReports(ignoreReporter, ignoreReport, handleReport);
+  aProcessMemoryReports(ignoreSingle, ignoreMulti, handleReport);
 
   return pcollsByProcess;
 }
@@ -2085,20 +2107,20 @@ Compartment.prototype = {
 
 function getCompartmentsByProcess()
 {
-  // Ignore anything that didn't come from the "compartments" reporter.  (Note
-  // reports from this reporter can reach here via a "content-child" reporter
-  // if they were in a child process.)
+  // Ignore anything that didn't come from the "compartments" multi-reporter.
+  // (Note that some such reports can reach here as single reports if they were
+  // in the child process.)
 
-  function ignoreReporter(aName)
-  {
-    return !(aName == "compartments" || aName == "content-child");
-  }
-
-  function ignoreReport(aUnsafePath)
+  function ignoreSingle(aUnsafePath)
   {
     return !aUnsafePath.startsWith("compartments/");
   }
 
+  function ignoreMulti(aMRName)
+  {
+    return aMRName !== "compartments";
+  }
+
   let compartmentsByProcess = {};
 
   function handleReport(aProcess, aUnsafePath, aKind, aUnits, aAmount,
@@ -2147,7 +2169,7 @@ function getCompartmentsByProcess()
     }
   }
 
-  processMemoryReporters(ignoreReporter, ignoreReport, handleReport);
+  processMemoryReporters(ignoreSingle, ignoreMulti, handleReport);
 
   return compartmentsByProcess;
 }
@@ -2169,16 +2191,16 @@ GhostWindow.prototype = {
 
 function getGhostWindowsByProcess()
 {
-  function ignoreReporter(aName)
-  {
-    return !(aName == "ghost-windows" || aName == "content-child");
-  }
-
-  function ignoreReport(aUnsafePath)
+  function ignoreSingle(aUnsafePath)
   {
     return !aUnsafePath.startsWith('ghost-windows/')
   }
 
+  function ignoreMulti(aName)
+  {
+    return aName !== "ghost-windows";
+  }
+
   let ghostWindowsByProcess = {};
 
   function handleReport(aProcess, aUnsafePath, aKind, aUnits, aAmount,
@@ -2208,7 +2230,7 @@ function getGhostWindowsByProcess()
     }
   }
 
-  processMemoryReporters(ignoreReporter, ignoreReport, handleReport);
+  processMemoryReporters(ignoreSingle, ignoreMulti, handleReport);
 
   return ghostWindowsByProcess;
 }
diff --git a/toolkit/components/aboutmemory/tests/test_aboutcompartments.xul b/toolkit/components/aboutmemory/tests/test_aboutcompartments.xul
index 160a673bd664..aaab20563058 100644
--- a/toolkit/components/aboutmemory/tests/test_aboutcompartments.xul
+++ b/toolkit/components/aboutmemory/tests/test_aboutcompartments.xul
@@ -24,7 +24,8 @@
   let mgr = Cc["@mozilla.org/memory-reporter-manager;1"].
             getService(Ci.nsIMemoryReporterManager);
 
-  // Remove all the real reporters;  save them to restore at the end.
+  // Remove all the real reporters and multi-reporters;  save them to
+  // restore at the end.
   mgr.blockRegistration();
   var e = mgr.enumerateReporters();
   var realReporters = [];
@@ -33,6 +34,13 @@
     mgr.unregisterReporter(r);
     realReporters.push(r);
   }
+  e = mgr.enumerateMultiReporters();
+  var realMultiReporters = [];
+  while (e.hasMoreElements()) {
+    var r = e.getNext().QueryInterface(Ci.nsIMemoryMultiReporter);
+    mgr.unregisterMultiReporter(r);
+    realMultiReporters.push(r);
+  }
 
   // Setup various fake-but-deterministic reporters.
   const KB = 1024;
@@ -44,39 +52,41 @@
   const BYTES = Ci.nsIMemoryReporter.UNITS_BYTES;
   const COUNT = Ci.nsIMemoryReporter.UNITS_COUNT;
 
+  function f(aProcess, aPath, aKind, aUnits, aAmount) {
+    return {
+      process:     aProcess,
+      path:        aPath,
+      kind:        aKind,
+      units:       aUnits,
+      description: "",
+      amount:      aAmount 
+    };
+  }
+
   var fakeReporters = [
-    { name: "fake1",
-      collectReports: function(aCbObj, aClosure) {
-        function f(aP1, aP2, aK, aU, aA) {
-          aCbObj.callback(aP1, aP2, aK, aU, aA, "Desc.", aClosure);
-        }
-        // These should be ignored.
-        f("", "explicit/a",         HEAP,    BYTES, 222 * MB);
-        f("", "explicit/b/a",       HEAP,    BYTES,  85 * MB);
-        f("", "explicit/b/b",       NONHEAP, BYTES,  85 * MB);
-        f("", "other1",             OTHER,   BYTES, 111 * MB);
-        f("", "other2",             OTHER,   COUNT, 888);
-      }
-    },
-    { name: "fake2",
+    // These should be ignored.
+    f("", "explicit/a",         HEAP,    BYTES, 222 * MB),
+    f("", "explicit/b/a",       HEAP,    BYTES,  85 * MB),
+    f("", "explicit/b/b",       NONHEAP, BYTES,  85 * MB),
+    f("", "other1",             OTHER,   BYTES, 111 * MB),
+    f("", "other2",             OTHER,   COUNT, 888),
+
+    f("2nd", "explicit/c",      HEAP,    BYTES, 333 * MB),
+    f("2nd", "compartments/user/child-user-compartment",     OTHER, COUNT, 1),
+    f("2nd", "compartments/system/child-system-compartment", OTHER, COUNT, 1)
+  ];
+
+  var fakeMultiReporters = [
+    // These shouldn't show up.
+    { name: "fake",
       collectReports: function(aCbObj, aClosure) {
         function f(aP, aK, aU, aA) {
           aCbObj.callback("", aP, aK, aU, aA, "Desc.", aClosure);
         }
-        // These shouldn't show up.
         f("explicit/a/d",     HEAP,    BYTES,  13 * MB);
         f("explicit/b/c",     NONHEAP, BYTES,  10 * MB);
-       }
-    },
-    { name: "content-child",
-      collectReports: function(aCbObj, aClosure) {
-        function f(aP1, aP2, aK, aU, aA, aD) {
-          aCbObj.callback(aP1, aP2, aK, aU, aA, aD, aClosure);
-        }
-        f("2nd", "explicit/c",      HEAP,    BYTES, 333 * MB, "Desc.");
-        f("2nd", "compartments/user/child-user-compartment",     OTHER, COUNT, 1, "");
-        f("2nd", "compartments/system/child-system-compartment", OTHER, COUNT, 1, "");
-      }
+       },
+       explicitNonHeap: 10*MB
     },
     { name: "compartments",
       collectReports: function(aCbObj, aClosure) {
@@ -94,7 +104,8 @@
         f("compartments/system/[System Principal]");
         f("compartments/system/[System Principal]");
         f("compartments/system/atoms");
-      }
+      },
+      explicitNonHeap: 0
     },
     { name: "ghost-windows",
       collectReports: function(aCbObj, aClosure) {
@@ -103,7 +114,8 @@
         }
         f("ghost-windows/https:\\\\very-long-url.com\\very-long\\oh-so-long\\really-quite-long.html?a=2&b=3&c=4&d=5&e=abcdefghijklmnopqrstuvwxyz&f=123456789123456789123456789");
         f("ghost-windows/http:\\\\foobar.com\\foo?bar#baz");
-      }
+      },
+      explicitNonHeap: 0
     },
     // These shouldn't show up.
     { name: "smaps",
@@ -114,13 +126,17 @@
         }
         f("smaps/vsize/a",     24);
         f("smaps/swap/a",       1);
-      }
+      },
+      explicitNonHeap: 0
     }
   ];
 
   for (var i = 0; i < fakeReporters.length; i++) {
     mgr.registerReporterEvenIfBlocked(fakeReporters[i]);
   }
+  for (var i = 0; i < fakeMultiReporters.length; i++) {
+    mgr.registerMultiReporterEvenIfBlocked(fakeMultiReporters[i]);
+  }
   ]]>
   </script>
 
@@ -164,14 +180,21 @@ Ghost Windows\n\
 
   function finish()
   {
-    // Unregister fake reporters and re-register the real reporters, just in
-    // case subsequent tests rely on them.
+    // Unregister fake reporters and multi-reporters, re-register the real
+    // reporters and multi-reporters, just in case subsequent tests rely on
+    // them.
     for (var i = 0; i < fakeReporters.length; i++) {
       mgr.unregisterReporter(fakeReporters[i]);
     }
+    for (var i = 0; i < fakeMultiReporters.length; i++) {
+      mgr.unregisterMultiReporter(fakeMultiReporters[i]);
+    }
     for (var i = 0; i < realReporters.length; i++) {
       mgr.registerReporterEvenIfBlocked(realReporters[i]);
     }
+    for (var i = 0; i < realMultiReporters.length; i++) {
+      mgr.registerMultiReporterEvenIfBlocked(realMultiReporters[i]);
+    }
     mgr.unblockRegistration();
 
     SimpleTest.finish();
diff --git a/toolkit/components/aboutmemory/tests/test_aboutmemory.xul b/toolkit/components/aboutmemory/tests/test_aboutmemory.xul
index cf1b9421b7c4..84fe972f206f 100644
--- a/toolkit/components/aboutmemory/tests/test_aboutmemory.xul
+++ b/toolkit/components/aboutmemory/tests/test_aboutmemory.xul
@@ -27,7 +27,8 @@
   let mgr = Cc["@mozilla.org/memory-reporter-manager;1"].
             getService(Ci.nsIMemoryReporterManager);
 
-  // Remove all the real reporters;  save them to restore at the end.
+  // Remove all the real reporters and multi-reporters;  save them to
+  // restore at the end.
   mgr.blockRegistration();
   let e = mgr.enumerateReporters();
   let realReporters = [];
@@ -36,6 +37,13 @@
     mgr.unregisterReporter(r);
     realReporters.push(r);
   }
+  e = mgr.enumerateMultiReporters();
+  let realMultiReporters = [];
+  while (e.hasMoreElements()) {
+    let r = e.getNext().QueryInterface(Ci.nsIMemoryMultiReporter);
+    mgr.unregisterMultiReporter(r);
+    realMultiReporters.push(r);
+  }
 
   // Setup various fake-but-deterministic reporters.
   const KB = 1024;
@@ -49,60 +57,71 @@
   const COUNT_CUMULATIVE = Ci.nsIMemoryReporter.UNITS_COUNT_CUMULATIVE;
   const PERCENTAGE = Ci.nsIMemoryReporter.UNITS_PERCENTAGE;
 
+  function f2(aProcess, aPath, aKind, aUnits, aAmount) {
+    return {
+      process:     aProcess,
+      path:        aPath,
+      kind:        aKind,
+      units:       aUnits,
+      description: "Desc.",
+      amount:      aAmount 
+    };
+  }
+
+  function f(aProcess, aPath, aKind, aAmount) {
+    return f2(aProcess, aPath, aKind, BYTES, aAmount);
+  }
+
   let fakeReporters = [
-    { name: "fake0",
-      collectReports: function(aCbObj, aClosure) {
-        function f(aP, aK, aU, aA) {
-          aCbObj.callback("", aP, aK, aU, aA, "Desc.", aClosure);
-        }
-        f("heap-allocated",     OTHER,   BYTES, 500 * MB);
-        f("heap-unallocated",   OTHER,   BYTES, 100 * MB);
-        f("explicit/a",         HEAP,    BYTES, 222 * MB);
-        f("explicit/b/a",       HEAP,    BYTES,  85 * MB);
-        f("explicit/b/b",       HEAP,    BYTES,  75 * MB);
-        f("explicit/b/c/a",     HEAP,    BYTES,  70 * MB);
-        f("explicit/b/c/b",     HEAP,    BYTES,   2 * MB); // omitted
-        f("explicit/g/a",       HEAP,    BYTES,   6 * MB);
-        f("explicit/g/b",       HEAP,    BYTES,   5 * MB);
-        f("explicit/g/other",   HEAP,    BYTES,   4 * MB);
-        // A degenerate tree with the same name as a non-degenerate tree should
-        // work ok.
-        f("explicit",           OTHER,   BYTES, 888 * MB);
-        f("other1/a/b",         OTHER,   BYTES, 111 * MB);
-        f("other1/c/d",         OTHER,   BYTES,  22 * MB);
-        f("other1/c/e",         OTHER,   BYTES,  33 * MB);
-        f("other4",             OTHER,   COUNT_CUMULATIVE, 777);
-        f("other4",             OTHER,   COUNT_CUMULATIVE, 111);
-        f("other3/a/b/c/d/e",   OTHER,   PERCENTAGE, 2000);
-        f("other3/a/b/c/d/f",   OTHER,   PERCENTAGE, 10);
-        f("other3/a/b/c/d/g",   OTHER,   PERCENTAGE, 5);
-        f("other3/a/b/c/d/g",   OTHER,   PERCENTAGE, 5);
-        // Check that a rounded-up-to-100.00% value is shown as "100.0%" (i.e. one
-        // decimal point).
-        f("other6/big",         OTHER,   COUNT, 99999);
-        f("other6/small",       OTHER,   COUNT, 1);
-        // Check that a 0 / 0 is handled correctly.
-        f("other7/zero",        OTHER,   BYTES, 0);
-        // These compartments ones shouldn't be displayed.
-        f("compartments/user/foo",   OTHER, COUNT, 1);
-        f("compartments/system/foo", OTHER, COUNT, 1);
-      }
-    },
+    f("", "heap-allocated",     OTHER,   500 * MB),
+    f("", "heap-unallocated",   OTHER,   100 * MB),
+    f("", "explicit/a",         HEAP,    222 * MB),
+    f("", "explicit/b/a",       HEAP,     85 * MB),
+    f("", "explicit/b/b",       HEAP,     75 * MB),
+    f("", "explicit/b/c/a",     HEAP,     70 * MB),
+    f("", "explicit/b/c/b",     HEAP,      2 * MB), // omitted
+    f("", "explicit/g/a",       HEAP,      6 * MB),
+    f("", "explicit/g/b",       HEAP,      5 * MB),
+    f("", "explicit/g/other",   HEAP,      4 * MB),
+    // A degenerate tree with the same name as a non-degenerate tree should
+    // work ok.
+    f("", "explicit",           OTHER,   888 * MB),
+    f("", "other1/a/b",         OTHER,   111 * MB),
+    f("", "other1/c/d",         OTHER,    22 * MB),
+    f("", "other1/c/e",         OTHER,    33 * MB),
+    f2("", "other4",            OTHER,   COUNT_CUMULATIVE, 777),
+    f2("", "other4",            OTHER,   COUNT_CUMULATIVE, 111),
+    f2("", "other3/a/b/c/d/e",  OTHER,   PERCENTAGE, 2000),
+    f2("", "other3/a/b/c/d/f",  OTHER,   PERCENTAGE, 10),
+    f2("", "other3/a/b/c/d/g",  OTHER,   PERCENTAGE, 5),
+    f2("", "other3/a/b/c/d/g",  OTHER,   PERCENTAGE, 5),
+    // Check that a rounded-up-to-100.00% value is shown as "100.0%" (i.e. one
+    // decimal point).
+    f2("", "other6/big",        OTHER,   COUNT, 99999),
+    f2("", "other6/small",      OTHER,   COUNT, 1),
+    // Check that a 0 / 0 is handled correctly.
+    f("", "other7/zero",        OTHER,   0),
+    // These compartments ones shouldn't be displayed.
+    f2("", "compartments/user/foo",   OTHER, COUNT, 1),
+    f2("", "compartments/system/foo", OTHER, COUNT, 1)
+  ];
+  let fakeMultiReporters = [
     { name: "fake1",
       collectReports: function(aCbObj, aClosure) {
         function f(aP, aK, aU, aA) {
           aCbObj.callback("", aP, aK, aU, aA, "Desc.", aClosure);
         }
-        f("explicit/c/d",     NONHEAP, BYTES,  13 * MB);
-        f("explicit/c/d",     NONHEAP, BYTES,  10 * MB); // dup
-        f("explicit/c/other", NONHEAP, BYTES,  77 * MB);
+        f("explicit/c/d",     NONHEAP, BYTES,  13 * MB),
+        f("explicit/c/d",     NONHEAP, BYTES,  10 * MB), // dup
+        f("explicit/c/other", NONHEAP, BYTES,  77 * MB),
         f("explicit/cc",      NONHEAP, BYTES,  13 * MB);
         f("explicit/cc",      NONHEAP, BYTES,  10 * MB); // dup
         f("explicit/d",       NONHEAP, BYTES, 499 * KB); // omitted
         f("explicit/e",       NONHEAP, BYTES, 100 * KB); // omitted
         f("explicit/f/g/h/i", HEAP,    BYTES,  10 * MB);
         f("explicit/f/g/h/j", HEAP,    BYTES,  10 * MB);
-      }
+      },
+      explicitNonHeap: (100 + 13 + 10)*MB + (499 + 100)*KB
     },
     { name: "fake2",
       collectReports: function(aCbObj, aClosure) {
@@ -113,7 +132,8 @@
         f("other2",           OTHER,   BYTES, 222 * MB);
         f("perc2",            OTHER,   PERCENTAGE, 10000);
         f("perc1",            OTHER,   PERCENTAGE, 4567);
-      }
+      },
+      explicitNonHeap: 0
     },
     { name: "smaps",
       collectReports: function(aCbObj, aClosure) {
@@ -128,7 +148,8 @@
         f("swap/b/c",     10);
         f("rss/a",        42);
         f("pss/a",        43);
-      }
+      },
+      explicitNonHeap: 0
     },
     { name: "compartments",
       collectReports: function(aCbObj, aClosure) {
@@ -137,12 +158,16 @@
         }
         f("compartments/user/bar");
         f("compartments/system/bar");
-      }
+      },
+      explicitNonHeap: 0
     }
   ];
   for (let i = 0; i < fakeReporters.length; i++) {
     mgr.registerReporterEvenIfBlocked(fakeReporters[i]);
   }
+  for (let i = 0; i < fakeMultiReporters.length; i++) {
+    mgr.registerMultiReporterEvenIfBlocked(fakeMultiReporters[i]);
+  }
 
   // mgr.explicit sums "heap-allocated" and all the appropriate NONHEAP ones:
   // - "explicit/c", "explicit/cc" x 2, "explicit/d", "explicit/e"
@@ -164,74 +189,59 @@
   // the largest).  Processes without a |resident| memory reporter are saved
   // for the end.
   let fakeReporters2 = [
-    { name: "resident-fast",
-      collectReports: function(aCbObj, aClosure) {
-        // Shouldn't reach here;  aboutMemory.js should skip the reporter.
-        // (Nb: this must come after |mgr.explicit| is accessed, otherwise it
-        // *will* be run by nsMemoryReporterManager::GetExplicit()).
-        ok(false, "'resident-fast' reporter was run");
-      }
-    },
-    { name: "fake3",
-      collectReports: function(aCbObj, aClosure) {
-        function f(aP1, aP2, aK, aU, aA) {
-          aCbObj.callback(aP1, aP2, aK, aU, aA, "Desc.", aClosure);
-        }
-        f("2nd", "heap-allocated",  OTHER,   BYTES,1000* MB);
-        f("2nd", "heap-unallocated",OTHER,   BYTES,100 * MB);
-        f("2nd", "explicit/a/b/c",  HEAP,    BYTES,497 * MB);
-        f("2nd", "explicit/a/b/c",  HEAP,    BYTES,  1 * MB); // dup: merge
-        f("2nd", "explicit/a/b/c",  HEAP,    BYTES,  1 * MB); // dup: merge
-        f("2nd", "explicit/flip\\the\\backslashes",
-                                    HEAP,    BYTES,200 * MB);
-        f("2nd", "explicit/compartment(compartment-url)",
-                                    HEAP,    BYTES,200 * MB);
-        f("2nd", "other0",          OTHER,   BYTES,666 * MB);
-        f("2nd", "other1",          OTHER,   BYTES,111 * MB);
-        // If the "smaps" reporter is in a child process it'll be passed to
-        // the main process under a different name.  The fact that we skip
-        // the "smaps" reporter in the main process won't cause these
-        // to be skipped;  the report-level skipping will be hit instead.
-        f("2nd", "size/e",          NONHEAP, BYTES,24*4*KB);
-        f("2nd", "size/f",          NONHEAP, BYTES,24*4*KB);
-        f("2nd", "resident-fast",   NONHEAP, BYTES,24*4*KB); // ignored!
+    f("2nd", "heap-allocated",  OTHER,  1000 * MB),
+    f("2nd", "heap-unallocated",OTHER,   100 * MB),
+    f("2nd", "explicit/a/b/c",  HEAP,    497 * MB),
+    f("2nd", "explicit/a/b/c",  HEAP,      1 * MB), // dup: merge
+    f("2nd", "explicit/a/b/c",  HEAP,      1 * MB), // dup: merge
+    f("2nd", "explicit/flip\\the\\backslashes",
+                                HEAP,    200 * MB),
+    f("2nd", "explicit/compartment(compartment-url)",
+                                HEAP,    200 * MB),
+    f("2nd", "other0",          OTHER,   666 * MB),
+    f("2nd", "other1",          OTHER,   111 * MB),
+    // Even though the "smaps" reporter is a multi-reporter, if its in a
+    // child process it'll be passed to the main process as single reports.
+    // The fact that we skip the "smaps" multi-reporter in the main
+    // process won't cause these to be skipped;  the fall-back skipping will
+    // be hit instead.
+    f("2nd", "size/e",          NONHEAP, 24*4*KB),
+    f("2nd", "size/f",          NONHEAP, 24*4*KB),
 
-        // Check that we can handle "heap-allocated" not being present.
-        f("3rd", "explicit/a/b",    HEAP,    BYTES,333 * MB);
-        f("3rd", "explicit/a/c",    HEAP,    BYTES,444 * MB);
-        f("3rd", "other1",          OTHER,   BYTES,  1 * MB);
-        f("3rd", "resident",        OTHER,   BYTES,100 * MB);
+    // Check that we can handle "heap-allocated" not being present.
+    f("3rd", "explicit/a/b",    HEAP,    333 * MB),
+    f("3rd", "explicit/a/c",    HEAP,    444 * MB),
+    f("3rd", "other1",          OTHER,     1 * MB),
+    f("3rd", "resident",        OTHER,   100 * MB),
 
-        // Invalid values (negative, too-big) should be identified.
-        f("4th", "heap-allocated",   OTHER,   BYTES,100 * MB);
-        f("4th", "resident",         OTHER,   BYTES,200 * MB);
-        f("4th", "explicit/js/compartment(http:\\\\too-big.com\\)/stuff",
-                                     HEAP,    BYTES,150 * MB);
-        f("4th", "explicit/ok",      HEAP,    BYTES,  5 * MB);
-        f("4th", "explicit/neg1",    NONHEAP, BYTES, -2 * MB);
-        // -111 becomes "-0.00MB" in non-verbose mode, and getting the negative
-        // sign in there correctly is non-trivial.
-        f("4th",  "other1",          OTHER,   BYTES,-111);
-        f("4th",  "other2",          OTHER,   BYTES,-222 * MB);
-        f("4th",  "other3",          OTHER,   COUNT, -333);
-        f("4th",  "other4",          OTHER,   COUNT_CUMULATIVE, -444);
-        f("4th",  "other5",          OTHER,   PERCENTAGE, -555);
-        f("4th",  "other6",          OTHER,   PERCENTAGE, 66666);
+    // Invalid values (negative, too-big) should be identified.
+    f("4th", "heap-allocated",   OTHER,   100 * MB),
+    f("4th", "resident",         OTHER,   200 * MB),
+    f("4th", "explicit/js/compartment(http:\\\\too-big.com\\)/stuff",
+                                 HEAP,    150 * MB),
+    f("4th", "explicit/ok",      HEAP,      5 * MB),
+    f("4th", "explicit/neg1",    NONHEAP,  -2 * MB),
+    // -111 becomes "-0.00MB" in non-verbose mode, and getting the negative
+    // sign in there correctly is non-trivial.
+    f("4th",  "other1",          OTHER,   -111),
+    f("4th",  "other2",          OTHER,   -222 * MB),
+    f2("4th", "other3",          OTHER,   COUNT, -333),
+    f2("4th", "other4",          OTHER,   COUNT_CUMULATIVE, -444),
+    f2("4th", "other5",          OTHER,   PERCENTAGE, -555),
+    f2("4th", "other6",          OTHER,   PERCENTAGE, 66666),
 
-        // If a negative value is within a collapsed sub-tree in non-verbose mode,
-        // we should get the warning at the top and the relevant sub-trees should
-        // be expanded, even in non-verbose mode.
-        f("5th", "heap-allocated",   OTHER,   BYTES,100 * MB);
-        f("5th", "explicit/big",     HEAP,    BYTES, 99 * MB);
-        f("5th", "explicit/a/pos",   HEAP,    BYTES, 40 * KB);
-        f("5th", "explicit/a/neg1",  NONHEAP, BYTES,-20 * KB);
-        f("5th", "explicit/a/neg2",  NONHEAP, BYTES,-10 * KB);
-        f("5th", "explicit/b/c/d/e", NONHEAP, BYTES, 20 * KB);
-        f("5th", "explicit/b/c/d/f", NONHEAP, BYTES,-60 * KB);
-        f("5th", "explicit/b/c/g/h", NONHEAP, BYTES, 10 * KB);
-        f("5th", "explicit/b/c/i/j", NONHEAP, BYTES,  5 * KB);
-      }
-    }
+    // If a negative value is within a collapsed sub-tree in non-verbose mode,
+    // we should get the warning at the top and the relevant sub-trees should
+    // be expanded, even in non-verbose mode.
+    f("5th", "heap-allocated",   OTHER,   100 * MB),
+    f("5th", "explicit/big",     HEAP,     99 * MB),
+    f("5th", "explicit/a/pos",   HEAP,     40 * KB),
+    f("5th", "explicit/a/neg1",  NONHEAP, -20 * KB),
+    f("5th", "explicit/a/neg2",  NONHEAP, -10 * KB),
+    f("5th", "explicit/b/c/d/e", NONHEAP,  20 * KB),
+    f("5th", "explicit/b/c/d/f", NONHEAP, -60 * KB),
+    f("5th", "explicit/b/c/g/h", NONHEAP,  10 * KB),
+    f("5th", "explicit/b/c/i/j", NONHEAP,   5 * KB)
   ];
   for (let i = 0; i < fakeReporters2.length; i++) {
     mgr.registerReporterEvenIfBlocked(fakeReporters2[i]);
@@ -576,14 +586,21 @@ Other Measurements\n\
 
   function finish()
   {
-    // Unregister fake reporters and re-register the real reporters, just in
-    // case subsequent tests rely on them.
+    // Unregister fake reporters and multi-reporters, re-register the real
+    // reporters and multi-reporters, just in case subsequent tests rely on
+    // them.
     for (let i = 0; i < fakeReporters.length; i++) {
       mgr.unregisterReporter(fakeReporters[i]);
     }
+    for (let i = 0; i < fakeMultiReporters.length; i++) {
+      mgr.unregisterMultiReporter(fakeMultiReporters[i]);
+    }
     for (let i = 0; i < realReporters.length; i++) {
       mgr.registerReporterEvenIfBlocked(realReporters[i]);
     }
+    for (let i = 0; i < realMultiReporters.length; i++) {
+      mgr.registerMultiReporterEvenIfBlocked(realMultiReporters[i]);
+    }
     mgr.unblockRegistration();
 
     SimpleTest.finish();
diff --git a/toolkit/components/aboutmemory/tests/test_aboutmemory2.xul b/toolkit/components/aboutmemory/tests/test_aboutmemory2.xul
index d899bd4ad58c..830e1e3c02e1 100644
--- a/toolkit/components/aboutmemory/tests/test_aboutmemory2.xul
+++ b/toolkit/components/aboutmemory/tests/test_aboutmemory2.xul
@@ -22,7 +22,8 @@
   let mgr = Cc["@mozilla.org/memory-reporter-manager;1"].
             getService(Ci.nsIMemoryReporterManager);
 
-  // Remove all the real reporters;  save them to restore at the end.
+  // Remove all the real reporters and multi-reporters;  save them to
+  // restore at the end.
   mgr.blockRegistration();
   let e = mgr.enumerateReporters();
   let realReporters = [];
@@ -31,6 +32,13 @@
     mgr.unregisterReporter(r);
     realReporters.push(r);
   }
+  e = mgr.enumerateMultiReporters();
+  let realMultiReporters = [];
+  while (e.hasMoreElements()) {
+    let r = e.getNext().QueryInterface(Ci.nsIMemoryMultiReporter);
+    mgr.unregisterMultiReporter(r);
+    realMultiReporters.push(r);
+  }
 
   // Setup various fake-but-deterministic reporters.
   const KB = 1024;
@@ -39,31 +47,35 @@
   const OTHER = Ci.nsIMemoryReporter.KIND_OTHER;
   const BYTES = Ci.nsIMemoryReporter.UNITS_BYTES;
 
-  let hiPath  = "explicit/h/i";
-  let hi2Path = "explicit/h/i2";
-  let jkPath  = "explicit/j/k";
-  let jk2Path = "explicit/j/k2";
+  function f(aPath, aKind, aAmount) {
+    return {
+      process:     "",
+      path:        aPath,
+      kind:        aKind,
+      units:       BYTES,
+      description: "Desc.",
+      amount:      aAmount
+    };
+  }
+
+  let hiReport  = f("explicit/h/i",  HEAP,  10 * MB);
+  let hi2Report = f("explicit/h/i2", HEAP,   9 * MB);
+  let jkReport  = f("explicit/j/k",  HEAP, 0.5 * MB);
+  let jk2Report = f("explicit/j/k2", HEAP, 0.3 * MB);
 
   let fakeReporters = [
-    { name: "fake1",
-      collectReports: function(aCbObj, aClosure) {
-        function f(aP, aK, aA) {
-          aCbObj.callback("", aP, aK, BYTES, aA, "Desc.", aClosure);
-        }
-        f("heap-allocated",     OTHER,   250 * MB);
-        f("explicit/a/b",       HEAP,     50 * MB);
-        f("explicit/a/c/d",     HEAP,     25 * MB);
-        f("explicit/a/c/e",     HEAP,     15 * MB);
-        f("explicit/a/f",       HEAP,     30 * MB);
-        f("explicit/g",         HEAP,    100 * MB);
-        f(hiPath,               HEAP,     10 * MB);
-        f(hi2Path,              HEAP,      9 * MB);
-        f(jkPath,               HEAP,    0.5 * MB);
-        f(jk2Path,              HEAP,    0.3 * MB);
-        f("explicit/a/l/m",     HEAP,    0.1 * MB);
-        f("explicit/a/l/n",     HEAP,    0.1 * MB);
-      }
-    }
+    f("heap-allocated",     OTHER,   250 * MB),
+    f("explicit/a/b",       HEAP,     50 * MB),
+    f("explicit/a/c/d",     HEAP,     25 * MB),
+    f("explicit/a/c/e",     HEAP,     15 * MB),
+    f("explicit/a/f",       HEAP,     30 * MB),
+    f("explicit/g",         HEAP,    100 * MB),
+    hiReport,
+    hi2Report,
+    jkReport,
+    jk2Report,
+    f("explicit/a/l/m",     HEAP,    0.1 * MB),
+    f("explicit/a/l/n",     HEAP,    0.1 * MB),
   ];
 
   for (let i = 0; i < fakeReporters.length; i++) {
@@ -79,14 +91,18 @@
   <![CDATA[
   function finish()
   {
-    // Unregister fake reporters and re-register the real reporters, just in
-    // case subsequent tests rely on them.
+    // Unregister fake reporters and multi-reporters, re-register the real
+    // reporters and multi-reporters, just in case subsequent tests rely on
+    // them.
     for (let i = 0; i < fakeReporters.length; i++) {
       mgr.unregisterReporter(fakeReporters[i]);
     }
     for (let i = 0; i < realReporters.length; i++) {
       mgr.registerReporterEvenIfBlocked(realReporters[i]);
     }
+    for (let i = 0; i < realMultiReporters.length; i++) {
+      mgr.registerMultiReporterEvenIfBlocked(realMultiReporters[i]);
+    }
     mgr.unblockRegistration();
 
     SimpleTest.finish();
@@ -103,13 +119,13 @@
       // click on a child of the span identified via |id|.
       if (node.nodeName === "button") {
         if (aSwap) {
-          // We swap hipath/hi2Path and jkPath/jk2Path just before updating, to
-          // test what happens when significant nodes become insignificant and
-          // vice versa.
-          hiPath  = "explicit/j/k";
-          hi2Path = "explicit/j/k2";
-          jkPath  = "explicit/h/i";
-          jk2Path = "explicit/h/i2";
+          // We swap the paths of hiReport/hi2Report and jkReport/jk2Report
+          // just before updating, to test what happens when significant nodes
+          // become insignificant and vice versa.
+          hiReport.path  = "explicit/j/k";
+          hi2Report.path = "explicit/j/k2";
+          jkReport.path  = "explicit/h/i";
+          jk2Report.path = "explicit/h/i2";
         }
         node.click();
       } else {
diff --git a/toolkit/components/aboutmemory/tests/test_aboutmemory3.xul b/toolkit/components/aboutmemory/tests/test_aboutmemory3.xul
index 38c55f7d858b..26c29a7017f8 100644
--- a/toolkit/components/aboutmemory/tests/test_aboutmemory3.xul
+++ b/toolkit/components/aboutmemory/tests/test_aboutmemory3.xul
@@ -22,7 +22,8 @@
   let mgr = Cc["@mozilla.org/memory-reporter-manager;1"].
             getService(Ci.nsIMemoryReporterManager);
 
-  // Remove all the real reporters;  save them to restore at the end.
+  // Remove all the real reporters and multi-reporters;  save them to
+  // restore at the end.
   mgr.blockRegistration();
   let e = mgr.enumerateReporters();
   let realReporters = [];
@@ -31,6 +32,13 @@
     mgr.unregisterReporter(r);
     realReporters.push(r);
   }
+  e = mgr.enumerateMultiReporters();
+  let realMultiReporters = [];
+  while (e.hasMoreElements()) {
+    let r = e.getNext().QueryInterface(Ci.nsIMemoryMultiReporter);
+    mgr.unregisterMultiReporter(r);
+    realMultiReporters.push(r);
+  }
 
   // Setup a minimal number of fake reporters.
   const KB = 1024;
@@ -39,18 +47,22 @@
   const OTHER = Ci.nsIMemoryReporter.KIND_OTHER;
   const BYTES = Ci.nsIMemoryReporter.UNITS_BYTES;
 
+  function f(aPath, aKind, aAmount, aDesc) {
+    return {
+      process:     "",
+      path:        aPath,
+      kind:        aKind,
+      units:       BYTES,
+      amount:      aAmount,
+      description: aDesc
+    };
+  }
+
   let fakeReporters = [
-    { name: "fake1",
-      collectReports: function(aCbObj, aClosure) {
-        function f(aP, aK, aA, aD) {
-          aCbObj.callback("", aP, aK, BYTES, aA, aD, aClosure);
-        }
-        f("heap-allocated",     OTHER,   250 * MB, "Heap allocated.");
-        f("explicit/a/b",       HEAP,     50 * MB, "A b.");
-        f("other/a",            OTHER,   0.2 * MB, "Other a.");
-        f("other/b",            OTHER,   0.1 * MB, "Other b.");
-      }
-    }
+    f("heap-allocated",     OTHER,   250 * MB, "Heap allocated."),
+    f("explicit/a/b",       HEAP,     50 * MB, "A b."),
+    f("other/a",            OTHER,   0.2 * MB, "Other a."),
+    f("other/b",            OTHER,   0.1 * MB, "Other b."),
   ];
 
   for (let i = 0; i < fakeReporters.length; i++) {
@@ -66,14 +78,18 @@
   <![CDATA[
   function finish()
   {
-    // Unregister fake reporters and re-register the real reporters, just in
-    // case subsequent tests rely on them.
+    // Unregister fake reporters and multi-reporters, re-register the real
+    // reporters and multi-reporters, just in case subsequent tests rely on
+    // them.
     for (let i = 0; i < fakeReporters.length; i++) {
       mgr.unregisterReporter(fakeReporters[i]);
     }
     for (let i = 0; i < realReporters.length; i++) {
       mgr.registerReporterEvenIfBlocked(realReporters[i]);
     }
+    for (let i = 0; i < realMultiReporters.length; i++) {
+      mgr.registerMultiReporterEvenIfBlocked(realMultiReporters[i]);
+    }
     mgr.unblockRegistration();
 
     SimpleTest.finish();
diff --git a/toolkit/components/aboutmemory/tests/test_memoryReporters.xul b/toolkit/components/aboutmemory/tests/test_memoryReporters.xul
index 10f11b060d09..efaf8ded068b 100644
--- a/toolkit/components/aboutmemory/tests/test_memoryReporters.xul
+++ b/toolkit/components/aboutmemory/tests/test_memoryReporters.xul
@@ -138,6 +138,11 @@
   let e = mgr.enumerateReporters();
   while (e.hasMoreElements()) {
     let r = e.getNext().QueryInterface(Ci.nsIMemoryReporter);
+    handleReport(r.process, r.path, r.kind, r.units, r.amount, r.description);
+  }
+  e = mgr.enumerateMultiReporters();
+  while (e.hasMoreElements()) {
+    let r = e.getNext().QueryInterface(Ci.nsIMemoryMultiReporter);
     r.collectReports(handleReport, null);
 
     // Access |name| to make sure it doesn't crash or assert.
diff --git a/toolkit/components/aboutmemory/tests/test_sqliteMultiReporter.xul b/toolkit/components/aboutmemory/tests/test_sqliteMultiReporter.xul
index 02608edb1222..0ecc3dd041e2 100644
--- a/toolkit/components/aboutmemory/tests/test_sqliteMultiReporter.xul
+++ b/toolkit/components/aboutmemory/tests/test_sqliteMultiReporter.xul
@@ -36,13 +36,13 @@
   let db = storage.openDatabase(file);
   db.close();
 
-  // Invoke all the reporters.  The SQLite multi-reporter is among
+  // Invoke all the multi-reporters.  The SQLite multi-reporter is among
   // them.  It shouldn't crash.
   let mgr = Cc["@mozilla.org/memory-reporter-manager;1"].
             getService(Ci.nsIMemoryReporterManager);
-  e = mgr.enumerateReporters();
+  e = mgr.enumerateMultiReporters();
   while (e.hasMoreElements()) {
-    let r = e.getNext().QueryInterface(Ci.nsIMemoryReporter);
+    let r = e.getNext().QueryInterface(Ci.nsIMemoryMultiReporter);
     r.collectReports(function(){}, null);
   }
 
diff --git a/toolkit/components/places/History.cpp b/toolkit/components/places/History.cpp
index df00f4e689c6..5186a461f831 100644
--- a/toolkit/components/places/History.cpp
+++ b/toolkit/components/places/History.cpp
@@ -1909,11 +1909,11 @@ StoreAndNotifyEmbedVisit(VisitData& aPlace,
   (void)NS_DispatchToMainThread(event);
 }
 
-class HistoryLinksHashtableReporter MOZ_FINAL : public MemoryUniReporter
+class HistoryLinksHashtableReporter MOZ_FINAL : public MemoryReporterBase
 {
 public:
   HistoryLinksHashtableReporter()
-    : MemoryUniReporter("explicit/history-links-hashtable",
+    : MemoryReporterBase("explicit/history-links-hashtable",
                          KIND_HEAP, UNITS_BYTES,
 "Memory used by the hashtable that records changes to the visited state of "
 "links.")
diff --git a/toolkit/components/telemetry/Telemetry.cpp b/toolkit/components/telemetry/Telemetry.cpp
index 322a10e8717d..a166beb2410c 100644
--- a/toolkit/components/telemetry/Telemetry.cpp
+++ b/toolkit/components/telemetry/Telemetry.cpp
@@ -370,11 +370,11 @@ TelemetryImpl::SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf)
   return n;
 }
 
-class TelemetryReporter MOZ_FINAL : public MemoryUniReporter
+class TelemetryReporter MOZ_FINAL : public MemoryReporterBase
 {
 public:
   TelemetryReporter()
-    : MemoryUniReporter("explicit/telemetry", KIND_HEAP, UNITS_BYTES,
+    : MemoryReporterBase("explicit/telemetry", KIND_HEAP, UNITS_BYTES,
                          "Memory used by the telemetry system.")
   {}
 private:
diff --git a/toolkit/components/telemetry/TelemetryPing.js b/toolkit/components/telemetry/TelemetryPing.js
index ebe65429f507..59d80026224d 100644
--- a/toolkit/components/telemetry/TelemetryPing.js
+++ b/toolkit/components/telemetry/TelemetryPing.js
@@ -8,7 +8,6 @@ const Ci = Components.interfaces;
 const Cr = Components.results;
 const Cu = Components.utils;
 
-Cu.import("resource://gre/modules/debug.js");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 #ifndef MOZ_WIDGET_GONK
@@ -459,32 +458,15 @@ TelemetryPing.prototype = {
     let e = mgr.enumerateReporters();
     while (e.hasMoreElements()) {
       let mr = e.getNext().QueryInterface(Ci.nsIMemoryReporter);
-      let id = MEM_HISTOGRAMS[mr.name];
+      let id = MEM_HISTOGRAMS[mr.path];
       if (!id) {
         continue;
       }
 
-      // collectReports might throw an exception.  If so, just ignore that
+      // Reading mr.amount might throw an exception.  If so, just ignore that
       // memory reporter; we're not getting useful data out of it.
       try {
-        // Bind handleMemoryReport() so it can be called inside the closure
-        // used as the callback.
-        let boundHandleMemoryReport = this.handleMemoryReport.bind(this);
-
-        // Reporters used for telemetry should be uni-reporters!  we assert if
-        // they make more than one report.
-        let hasReported = false;
-
-        function h(process, path, kind, units, amount, desc) {
-          if (!hasReported) {
-            boundHandleMemoryReport(id, path, units, amount);
-            hasReported = true;
-          } else {
-            NS_ASSERT(false,
-                      "reporter " + mr.name + " has made more than one report");
-          }
-        }
-        mr.collectReports(h, null);
+        this.handleMemoryReport(id, mr.path, mr.units, mr.amount);
       }
       catch (e) {
       }
@@ -492,7 +474,11 @@ TelemetryPing.prototype = {
     histogram.add(new Date() - startTime);
   },
 
-  handleMemoryReport: function(id, path, units, amount) {
+  handleMemoryReport: function handleMemoryReport(id, path, units, amount) {
+    if (amount == -1) {
+      return;
+    }
+
     let val;
     if (units == Ci.nsIMemoryReporter.UNITS_BYTES) {
       val = Math.floor(amount / 1024);
diff --git a/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.cpp b/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.cpp
index 5db8b1e95e5e..7c0724686ac1 100644
--- a/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.cpp
+++ b/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.cpp
@@ -36,12 +36,12 @@ static const PRLogModuleInfo *gUrlClassifierPrefixSetLog = nullptr;
 #define LOG_ENABLED() (false)
 #endif
 
-class PrefixSetReporter MOZ_FINAL : public MemoryUniReporter
+class PrefixSetReporter MOZ_FINAL : public MemoryReporterBase
 {
 public:
   PrefixSetReporter(nsUrlClassifierPrefixSet* aPrefixSet,
                     const nsACString& aName)
-    : MemoryUniReporter(
+    : MemoryReporterBase(
         nsPrintfCString(
           "explicit/storage/prefix-set/%s",
           (!aName.IsEmpty() ? PromiseFlatCString(aName).get() : "?!")
diff --git a/xpcom/base/AvailableMemoryTracker.cpp b/xpcom/base/AvailableMemoryTracker.cpp
index 4a896aef4f1a..874a8e497a1f 100644
--- a/xpcom/base/AvailableMemoryTracker.cpp
+++ b/xpcom/base/AvailableMemoryTracker.cpp
@@ -325,19 +325,37 @@ CreateDIBSectionHook(HDC aDC,
   return result;
 }
 
-class LowMemoryEventsVirtualReporter MOZ_FINAL : public MemoryUniReporter
+class LowMemoryEventsVirtualReporter MOZ_FINAL : public MemoryReporterBase
 {
 public:
+  // The description is "???" because we implement GetDescription().
   LowMemoryEventsVirtualReporter()
-    : MemoryUniReporter("low-memory-events/virtual",
-                         KIND_OTHER, UNITS_COUNT_CUMULATIVE,
-"Number of low-virtual-memory events fired since startup. We fire such an "
-"event if we notice there is less than memory.low_virtual_mem_threshold_mb of "
-"virtual address space available (if zero, this behavior is disabled).  The "
-"process will probably crash if it runs out of virtual address space, so "
-"this event is dire.")
+    : MemoryReporterBase("low-memory-events/virtual",
+                         KIND_OTHER, UNITS_COUNT_CUMULATIVE, "???")
   {}
 
+  NS_IMETHOD GetDescription(nsACString &aDescription)
+  {
+    aDescription.AssignLiteral(
+      "Number of low-virtual-memory events fired since startup. ");
+
+    if (sLowVirtualMemoryThreshold == 0) {
+      aDescription.AppendLiteral(
+        "Tracking low-virtual-memory events is disabled, but you can enable it "
+        "by giving the memory.low_virtual_mem_threshold_mb pref a non-zero "
+        "value.");
+    }
+    else {
+      aDescription.Append(nsPrintfCString(
+        "We fire such an event if we notice there is less than %d MB of virtual "
+        "address space available (controlled by the "
+        "'memory.low_virtual_mem_threshold_mb' pref).  We'll likely crash if "
+        "we run out of virtual address space, so this event is somewhat dire.",
+        sLowVirtualMemoryThreshold));
+    }
+    return NS_OK;
+  }
+
 private:
   int64_t Amount() MOZ_OVERRIDE
   {
@@ -349,36 +367,73 @@ private:
   }
 };
 
-class LowCommitSpaceEventsReporter MOZ_FINAL : public MemoryUniReporter
+class LowCommitSpaceEventsReporter MOZ_FINAL : public MemoryReporterBase
 {
 public:
+  // The description is "???" because we implement GetDescription().
   LowCommitSpaceEventsReporter()
-    : MemoryUniReporter("low-commit-space-events",
-                         KIND_OTHER, UNITS_COUNT_CUMULATIVE,
-"Number of low-commit-space events fired since startup. We fire such an "
-"event if we notice there is less than memory.low_commit_space_threshold_mb of "
-"commit space available (if zero, this behavior is disabled).  Windows will "
-"likely kill the process if it runs out of commit space, so this event is "
-"dire.")
+    : MemoryReporterBase("low-commit-space-events",
+                         KIND_OTHER, UNITS_COUNT_CUMULATIVE, "???")
   {}
 
+  NS_IMETHOD GetDescription(nsACString &aDescription)
+  {
+    aDescription.AssignLiteral(
+      "Number of low-commit-space events fired since startup. ");
+
+    if (sLowCommitSpaceThreshold == 0) {
+      aDescription.Append(
+        "Tracking low-commit-space events is disabled, but you can enable it "
+        "by giving the memory.low_commit_space_threshold_mb pref a non-zero "
+        "value.");
+    }
+    else {
+      aDescription.Append(nsPrintfCString(
+        "We fire such an event if we notice there is less than %d MB of "
+        "available commit space (controlled by the "
+        "'memory.low_commit_space_threshold_mb' pref).  Windows will likely "
+        "kill us if we run out of commit space, so this event is somewhat dire.",
+        sLowCommitSpaceThreshold));
+    }
+    return NS_OK;
+  }
+
 private:
   int64_t Amount() MOZ_OVERRIDE { return sNumLowCommitSpaceEvents; }
 };
 
-class LowMemoryEventsPhysicalReporter MOZ_FINAL : public MemoryUniReporter
+class LowMemoryEventsPhysicalReporter MOZ_FINAL : public MemoryReporterBase
 {
 public:
+  // The description is "???" because we implement GetDescription().
   LowMemoryEventsPhysicalReporter()
-    : MemoryUniReporter("low-memory-events/physical",
-                         KIND_OTHER, UNITS_COUNT_CUMULATIVE,
-"Number of low-physical-memory events fired since startup. We fire such an "
-"event if we notice there is less than memory.low_physical_memory_threshold_mb "
-"of physical memory available (if zero, this behavior is disabled).  The "
-"machine will start to page if it runs out of physical memory.  This may "
-"cause it to run slowly, but it shouldn't cause it to crash.")
+    : MemoryReporterBase("low-memory-events/physical",
+                         KIND_OTHER, UNITS_COUNT_CUMULATIVE, "???")
   {}
 
+  NS_IMETHOD GetDescription(nsACString &aDescription)
+  {
+    aDescription.AssignLiteral(
+      "Number of low-physical-memory events fired since startup. ");
+
+    if (sLowPhysicalMemoryThreshold == 0) {
+      aDescription.Append(
+        "Tracking low-physical-memory events is disabled, but you can enable it "
+        "by giving the memory.low_physical_memory_threshold_mb pref a non-zero "
+        "value.");
+    }
+    else {
+      aDescription.Append(nsPrintfCString(
+        "We fire such an event if we notice there is less than %d MB of "
+        "available physical memory (controlled by the "
+        "'memory.low_physical_memory_threshold_mb' pref).  The machine will start "
+        "to page if it runs out of physical memory; this may cause it to run "
+        "slowly, but it shouldn't cause us to crash.",
+        sLowPhysicalMemoryThreshold));
+    }
+    return NS_OK;
+  }
+
 private:
   int64_t Amount() MOZ_OVERRIDE { return sNumLowPhysicalMemEvents; }
 };
diff --git a/xpcom/base/MapsMemoryReporter.cpp b/xpcom/base/MapsMemoryReporter.cpp
index e638601ea784..09fd1354a423 100644
--- a/xpcom/base/MapsMemoryReporter.cpp
+++ b/xpcom/base/MapsMemoryReporter.cpp
@@ -111,7 +111,7 @@ struct CategoriesSeen {
 
 } // anonymous namespace
 
-class MapsReporter MOZ_FINAL : public nsIMemoryReporter
+class MapsReporter MOZ_FINAL : public nsIMemoryMultiReporter
 {
 public:
   MapsReporter();
@@ -125,7 +125,7 @@ public:
   }
 
   NS_IMETHOD
-  CollectReports(nsIMemoryReporterCallback *aCb,
+  CollectReports(nsIMemoryMultiReporterCallback *aCb,
                  nsISupports *aClosure);
 
 private:
@@ -135,7 +135,7 @@ private:
 
   nsresult
   ParseMapping(FILE *aFile,
-               nsIMemoryReporterCallback *aCb,
+               nsIMemoryMultiReporterCallback *aCb,
                nsISupports *aClosure,
                CategoriesSeen *aCategoriesSeen);
 
@@ -149,7 +149,7 @@ private:
   ParseMapBody(FILE *aFile,
                const nsACString &aName,
                const nsACString &aDescription,
-               nsIMemoryReporterCallback *aCb,
+               nsIMemoryMultiReporterCallback *aCb,
                nsISupports *aClosure,
                CategoriesSeen *aCategoriesSeen);
 
@@ -158,7 +158,7 @@ private:
   nsTHashtable<nsCStringHashKey> mMozillaLibraries;
 };
 
-NS_IMPL_ISUPPORTS1(MapsReporter, nsIMemoryReporter)
+NS_IMPL_ISUPPORTS1(MapsReporter, nsIMemoryMultiReporter)
 
 MapsReporter::MapsReporter()
   : mSearchedForLibxul(false)
@@ -173,7 +173,7 @@ MapsReporter::MapsReporter()
 }
 
 NS_IMETHODIMP
-MapsReporter::CollectReports(nsIMemoryReporterCallback *aCb,
+MapsReporter::CollectReports(nsIMemoryMultiReporterCallback *aCb,
                              nsISupports *aClosure)
 {
   CategoriesSeen categoriesSeen;
@@ -258,7 +258,7 @@ MapsReporter::FindLibxul()
 nsresult
 MapsReporter::ParseMapping(
   FILE *aFile,
-  nsIMemoryReporterCallback *aCb,
+  nsIMemoryMultiReporterCallback *aCb,
   nsISupports *aClosure,
   CategoriesSeen *aCategoriesSeen)
 {
@@ -461,7 +461,7 @@ MapsReporter::ParseMapBody(
   FILE *aFile,
   const nsACString &aName,
   const nsACString &aDescription,
-  nsIMemoryReporterCallback *aCb,
+  nsIMemoryMultiReporterCallback *aCb,
   nsISupports *aClosure,
   CategoriesSeen *aCategoriesSeen)
 {
@@ -520,11 +520,11 @@ MapsReporter::ParseMapBody(
   return NS_OK;
 }
 
-class ResidentUniqueReporter MOZ_FINAL : public MemoryUniReporter
+class ResidentUniqueReporter MOZ_FINAL : public MemoryReporterBase
 {
 public:
   ResidentUniqueReporter()
-    : MemoryUniReporter("resident-unique", KIND_OTHER, UNITS_BYTES,
+    : MemoryReporterBase("resident-unique", KIND_OTHER, UNITS_BYTES,
 "Memory mapped by the process that is present in physical memory and not "
 "shared with any other processes.  This is also known as the process's unique "
 "set size (USS).  This is the amount of RAM we'd expect to be freed if we "
@@ -540,9 +540,9 @@ private:
     // little to do with whether the pages are actually shared.  smaps on the
     // other hand appears to give us the correct information.
     //
-    // We could calculate this data within the smaps reporter, but the overhead
-    // of the smaps reporter is considerable (we don't even run the smaps
-    // reporter in normal about:memory operation).  Hopefully this
+    // We could calculate this data during the smaps multi-reporter, but the
+    // overhead of the smaps reporter is considerable (we don't even run the
+    // smaps reporter in normal about:memory operation).  Hopefully this
     // implementation is fast enough not to matter.
 
     *aAmount = 0;
@@ -568,8 +568,8 @@ private:
 
 void Init()
 {
-  nsCOMPtr<nsIMemoryReporter> reporter = new MapsReporter();
-  NS_RegisterMemoryReporter(reporter);
+  nsCOMPtr<nsIMemoryMultiReporter> reporter = new MapsReporter();
+  NS_RegisterMemoryMultiReporter(reporter);
 
   NS_RegisterMemoryReporter(new ResidentUniqueReporter());
 }
diff --git a/xpcom/base/nsCycleCollector.cpp b/xpcom/base/nsCycleCollector.cpp
index e4cbfbbbb394..c1cf5784fddd 100644
--- a/xpcom/base/nsCycleCollector.cpp
+++ b/xpcom/base/nsCycleCollector.cpp
@@ -917,7 +917,7 @@ private:
     CC_BeforeUnlinkCallback mBeforeUnlinkCB;
     CC_ForgetSkippableCallback mForgetSkippableCB;
 
-    nsCOMPtr<nsIMemoryReporter> mReporter;
+    nsCOMPtr<nsIMemoryMultiReporter> mReporter;
 
     nsPurpleBuffer mPurpleBuf;
 
@@ -2398,10 +2398,10 @@ nsCycleCollector::CollectWhite(nsICycleCollectorListener *aListener)
 // Memory reporter
 ////////////////////////
 
-class CycleCollectorReporter MOZ_FINAL : public nsIMemoryReporter
+class CycleCollectorMultiReporter MOZ_FINAL : public nsIMemoryMultiReporter
 {
   public:
-    CycleCollectorReporter(nsCycleCollector* aCollector)
+    CycleCollectorMultiReporter(nsCycleCollector* aCollector)
       : mCollector(aCollector)
     {}
 
@@ -2413,7 +2413,7 @@ class CycleCollectorReporter MOZ_FINAL : public nsIMemoryReporter
         return NS_OK;
     }
 
-    NS_IMETHOD CollectReports(nsIMemoryReporterCallback* aCb,
+    NS_IMETHOD CollectReports(nsIMemoryMultiReporterCallback* aCb,
                               nsISupports* aClosure)
     {
         size_t objectSize, graphNodesSize, graphEdgesSize, whiteNodesSize,
@@ -2465,7 +2465,7 @@ class CycleCollectorReporter MOZ_FINAL : public nsIMemoryReporter
     nsCycleCollector* mCollector;
 };
 
-NS_IMPL_ISUPPORTS1(CycleCollectorReporter, nsIMemoryReporter)
+NS_IMPL_ISUPPORTS1(CycleCollectorMultiReporter, nsIMemoryMultiReporter)
 
 
 ////////////////////////////////////////////////////////////////////////
@@ -2492,7 +2492,7 @@ nsCycleCollector::nsCycleCollector() :
 
 nsCycleCollector::~nsCycleCollector()
 {
-    NS_UnregisterMemoryReporter(mReporter);
+    NS_UnregisterMemoryMultiReporter(mReporter);
 }
 
 void
@@ -2508,7 +2508,7 @@ nsCycleCollector::RegisterJSRuntime(CycleCollectedJSRuntime *aJSRuntime)
     // instead.
     static bool registered = false;
     if (!registered) {
-        NS_RegisterMemoryReporter(new CycleCollectorReporter(this));
+        NS_RegisterMemoryMultiReporter(new CycleCollectorMultiReporter(this));
         registered = true;
     }
 }
diff --git a/xpcom/base/nsIMemoryReporter.idl b/xpcom/base/nsIMemoryReporter.idl
index 206adf12356e..615232b782a0 100644
--- a/xpcom/base/nsIMemoryReporter.idl
+++ b/xpcom/base/nsIMemoryReporter.idl
@@ -17,22 +17,55 @@ interface nsICancelableRunnable;
  * reporter.
  */
 
-[scriptable, function, uuid(3a61be3b-b93b-461a-a4f8-388214f558b1)]
-interface nsIMemoryReporterCallback : nsISupports
+/*
+ * An nsIMemoryReporter reports a single memory measurement as an object.
+ * Use this when it makes sense to gather this measurement without gathering
+ * related measurements at the same time.
+ *
+ * Note that the |amount| field may be implemented as a function, and so
+ * accessing it can trigger significant computation;  the other fields can
+ * be accessed without triggering this computation.  (Compare and contrast
+ * this with nsIMemoryMultiReporter.)  
+ *
+ * aboutMemory.js is the most important consumer of memory reports.  It
+ * places the following constraints on reports.
+ *
+ * - There must be an "explicit" tree.  It represents non-overlapping
+ *   regions of memory that have been explicitly allocated with an
+ *   OS-level allocation (e.g. mmap/VirtualAlloc/vm_allocate) or a
+ *   heap-level allocation (e.g. malloc/calloc/operator new).  Reporters
+ *   in this tree must have kind HEAP or NONHEAP, units BYTES, and a
+ *   description that is a sentence (i.e. starts with a capital letter and
+ *   ends with a period, or similar).
+ *
+ * - The "size", "rss", "pss" and "swap" trees are optional.  They
+ *   represent regions of virtual memory that the process has mapped.
+ *   Reporters in this category must have kind NONHEAP, units BYTES, and a
+ *   non-empty description.
+ *
+ * - The "compartments" and "ghost-windows" trees are optional.  They are
+ *   used by about:compartments.  Reporters in these trees must have kind
+ *   OTHER, units COUNT, an amount of 1, and a description that's an empty
+ *   string.
+ *
+ * - All other reports are unconstrained except that they must have a
+ *   description that is a sentence.
+ */
+[scriptable, uuid(b2c39f65-1799-4b92-a806-ab3cf6af3cfa)]
+interface nsIMemoryReporter : nsISupports
 {
   /*
-   * The arguments to the callback are as follows.
-   *
-   *
-   * |process|  The name of the process containing this reporter.  Each
-   * reporter initially has "" in this field, indicating that it applies to the
-   * current process.  (This is true even for reporters in a child process.)
-   * When a reporter from a child process is copied into the main process, the
-   * copy has its 'process' field set appropriately.
-   *
-   *
-   * |path|  The path that this memory usage should be reported under.  Paths
-   * are '/'-delimited, eg. "a/b/c".
+   * The name of the process containing this reporter.  Each reporter initially
+   * has "" in this field, indicating that it applies to the current process.
+   * (This is true even for reporters in a child process.)  When a reporter
+   * from a child process is copied into the main process, the copy has its
+   * 'process' field set appropriately.
+   */
+  readonly attribute ACString process;
+
+  /*
+   * The path that this memory usage should be reported under.  Paths are
+   * '/'-delimited, eg. "a/b/c".  
    *
    * Each reporter can be viewed as representing a leaf node in a tree.
    * Internal nodes of the tree don't have reporters.  So, for example, the
@@ -65,9 +98,11 @@ interface nsIMemoryReporterCallback : nsISupports
    *
    * The paths of all reporters form a set of trees.  Trees can be
    * "degenerate", i.e. contain a single entry with no '/'.
-   *
-   *
-   * |kind|  There are three kinds of memory reporters.
+   */
+  readonly attribute AUTF8String path;
+
+  /*
+   * There are three kinds of memory reporters.
    *
    *  - HEAP: reporters measuring memory allocated by the heap allocator,
    *    e.g. by calling malloc, calloc, realloc, memalign, operator new, or
@@ -85,9 +120,19 @@ interface nsIMemoryReporterCallback : nsISupports
    *
    * The kind only matters for reporters in the "explicit" tree;
    * aboutMemory.js uses it to calculate "heap-unclassified".
-   *
-   *
-   * |units|  The units on the reporter's amount.  One of the following.
+   */
+  const int32_t KIND_NONHEAP = 0;
+  const int32_t KIND_HEAP    = 1;
+  const int32_t KIND_OTHER   = 2;
+
+  /*
+   * The reporter kind.  See KIND_* above.
+   */
+  readonly attribute int32_t kind;
+
+  /*
+   * The amount reported by a memory reporter must have one of the following
+   * units, but you may of course add new units as necessary:
    *
    *  - BYTES: The amount contains a number of bytes.
    *
@@ -111,84 +156,67 @@ interface nsIMemoryReporterCallback : nsISupports
    *    be 1234.
    *
    *    Values greater than 100% are allowed.
-   *
-   *
-   * |amount|  The numeric value reported by this memory reporter.  Accesses
-   * can fail if something goes wrong when getting the amount.
-   *
-   *
-   * |description|  A human-readable description of this memory usage report.
    */
+  const int32_t UNITS_BYTES = 0;
+  const int32_t UNITS_COUNT = 1;
+  const int32_t UNITS_COUNT_CUMULATIVE = 2;
+  const int32_t UNITS_PERCENTAGE = 3;
+
+  /*
+   * The units on the reporter's amount.  See UNITS_* above.
+   */
+  readonly attribute int32_t units;
+
+  /*
+   * The numeric value reported by this memory reporter.  Accesses can fail if
+   * something goes wrong when getting the amount.
+   */
+  readonly attribute int64_t amount;
+
+  /*
+   * A human-readable description of this memory usage report.
+   */
+  readonly attribute AUTF8String description;
+};
+
+[scriptable, function, uuid(5b15f3fa-ba15-443c-8337-7770f5f0ce5d)]
+interface nsIMemoryMultiReporterCallback : nsISupports
+{
   void callback(in ACString process, in AUTF8String path, in int32_t kind,
                 in int32_t units, in int64_t amount,
                 in AUTF8String description, in nsISupports closure);
 };
 
 /*
- * An nsIMemoryReporter reports one or more memory measurements via a
- * callback function which is called once for each measurement.
+ * An nsIMemoryMultiReporter reports multiple memory measurements via a
+ * callback function which is called once for each measurement.  Use this
+ * when you want to gather multiple measurements in a single operation (eg.
+ * a single traversal of a large data structure).
  *
- * An nsIMemoryReporter that reports a single measurement is sometimes called a
- * "uni-reporter".  One that reports multiple measurements is sometimes called
- * a "multi-reporter".
- *
- * aboutMemory.js is the most important consumer of memory reports.  It
- * places the following constraints on reports.
- *
- * - There must be an "explicit" tree.  It represents non-overlapping
- *   regions of memory that have been explicitly allocated with an
- *   OS-level allocation (e.g. mmap/VirtualAlloc/vm_allocate) or a
- *   heap-level allocation (e.g. malloc/calloc/operator new).  Reporters
- *   in this tree must have kind HEAP or NONHEAP, units BYTES, and a
- *   description that is a sentence (i.e. starts with a capital letter and
- *   ends with a period, or similar).
- *
- * - The "size", "rss", "pss" and "swap" trees are optional.  They
- *   represent regions of virtual memory that the process has mapped.
- *   Reporters in this category must have kind NONHEAP, units BYTES, and a
- *   non-empty description.
- *
- * - The "compartments" and "ghost-windows" trees are optional.  They are
- *   used by about:compartments.  Reporters in these trees must have kind
- *   OTHER, units COUNT, an amount of 1, and a description that's an empty
- *   string.
- *
- * - All other reports are unconstrained except that they must have a
- *   description that is a sentence.
+ * The arguments to the callback deliberately match the fields in
+ * nsIMemoryReporter, but note that seeing any of these arguments requires
+ * calling collectReports which will trigger all relevant computation.
+ * (Compare and contrast this with nsIMemoryReporter, which allows all
+ * fields except |amount| to be accessed without triggering computation.)
  */
-[scriptable, uuid(53248304-124b-43cd-99dc-6e5797b91618)]
-interface nsIMemoryReporter : nsISupports
+[scriptable, uuid(24d61ead-237b-4969-a6bd-73fd8fed1d99)]
+interface nsIMemoryMultiReporter : nsISupports
 {
   /*
-   * The name of the reporter.  Useful when only one reporter needs to be run.
-   * Must be unique;  if reporters share names it's likely the wrong one will
-   * be called in certain circumstances.
+   * The name of the multi-reporter.  Useful when only one multi-reporter
+   * needs to be run.  Must be unique;  if multi-reporters share names it's
+   * likely the wrong one will be called in certain circumstances.
    */
   readonly attribute ACString name;
 
   /*
-   * Run the reporter.
+   * Run the multi-reporter.
    */
-  void collectReports(in nsIMemoryReporterCallback callback,
+  void collectReports(in nsIMemoryMultiReporterCallback callback,
                       in nsISupports closure);
-
-  /*
-   * Kinds.  See the |kind| comment in nsIMemoryReporterCallback.
-   */
-  const int32_t KIND_NONHEAP = 0;
-  const int32_t KIND_HEAP    = 1;
-  const int32_t KIND_OTHER   = 2;
-
-  /*
-   * Units.  See the |units| comment in nsIMemoryReporterCallback.
-   */
-  const int32_t UNITS_BYTES = 0;
-  const int32_t UNITS_COUNT = 1;
-  const int32_t UNITS_COUNT_CUMULATIVE = 2;
-  const int32_t UNITS_PERCENTAGE = 3;
 };
 
-[scriptable, builtinclass, uuid(4db7040a-16f9-4249-879b-fe72729c7ef5)]
+[scriptable, builtinclass, uuid(70b0e608-8dbf-4dc7-b88f-f1c745c1b48c)]
 interface nsIMemoryReporterManager : nsISupports
 {
   /*
@@ -196,6 +224,12 @@ interface nsIMemoryReporterManager : nsISupports
    */
   nsISimpleEnumerator enumerateReporters ();
 
+  /*
+   * Return an enumerator of nsIMemoryMultiReporters that are currently
+   * registered.
+   */
+  nsISimpleEnumerator enumerateMultiReporters ();
+
   /*
    * Register the given nsIMemoryReporter.  After a reporter is registered,
    * it will be available via enumerateReporters().  The Manager service
@@ -203,17 +237,31 @@ interface nsIMemoryReporterManager : nsISupports
    */
   void registerReporter (in nsIMemoryReporter reporter);
 
+  /*
+   * Register the given nsIMemoryMultiReporter.  After a multi-reporter is
+   * registered, it will be available via enumerateMultiReporters().  The
+   * Manager service will hold a strong reference to the given
+   * multi-reporter.
+   */
+  void registerMultiReporter (in nsIMemoryMultiReporter reporter);
+
   /*
    * Unregister the given memory reporter.
    */
   void unregisterReporter (in nsIMemoryReporter reporter);
 
+  /*
+   * Unregister the given memory multi-reporter.
+   */
+  void unregisterMultiReporter (in nsIMemoryMultiReporter reporter);
+
   /**
    * These functions should only be used for testing purposes.
    */
   void blockRegistration();
   void unblockRegistration();
   void registerReporterEvenIfBlocked(in nsIMemoryReporter aReporter);
+  void registerMultiReporterEvenIfBlocked(in nsIMemoryMultiReporter aReporter);
 
   /*
    * Initialize.
@@ -232,8 +280,8 @@ interface nsIMemoryReporterManager : nsISupports
    * (eg. via mmap, VirtualAlloc) and at the heap level (eg. via malloc,
    * calloc, operator new).  (Nb: it covers all heap allocations, but will
    * miss any OS-level ones not covered by memory reporters.)  This reporter
-   * is special-cased because it's interesting, and is difficult to compute
-   * from JavaScript code.  Accesses can fail.
+   * is special-cased because it's interesting, and is moderately difficult
+   * to compute in JS.  Accesses can fail.
    */
   readonly attribute int64_t explicit;
 
@@ -259,7 +307,10 @@ interface nsIMemoryReporterManager : nsISupports
 // instead of nsCOMPtr<nsIMemoryReporter>.
 
 XPCOM_API(nsresult) NS_RegisterMemoryReporter(nsIMemoryReporter* aReporter);
+XPCOM_API(nsresult) NS_RegisterMemoryMultiReporter(nsIMemoryMultiReporter* aReporter);
+
 XPCOM_API(nsresult) NS_UnregisterMemoryReporter(nsIMemoryReporter* aReporter);
+XPCOM_API(nsresult) NS_UnregisterMemoryMultiReporter(nsIMemoryMultiReporter* aReporter);
 
 #if defined(MOZ_DMD)
 namespace mozilla {
@@ -324,11 +375,10 @@ void RunReporters();
 namespace mozilla {
 
 // The following base class reduces the amount of boilerplate code required for
-// memory uni-reporters.  You just need to provide the following.
-// - The constant values: nameAndPath (which serves as both the reporters name,
-//   and the path in its single report), kind, units, and description.  They
-//   are passed to the MemoryUniReporter constructor.
-// - A (private) Amount() or (public) GetAmount() method.  It can use the
+// memory reporters.  You just need to provide the following.
+// - The constant values: path, kind, units, and description.  They are passed
+//   to the MemoryReporterBase constructor.
+// - A (private) Amount() or (public) GetAmount() method.  It can use the 
 //   MallocSizeOf method if necessary.  (There is also
 //   MallocSizeOfOn{Alloc,Free}, which can be useful.)  Use Amount() if the
 //   reporter is infallible, and GetAmount() otherwise.  (If you fail to
@@ -340,45 +390,58 @@ namespace mozilla {
 // - "explicit/dom/xyzzy"     --> DOMXyzzyReporter
 // - "js-compartments/system" --> JSCompartmentsSystemReporter
 //
-class MemoryUniReporter : public nsIMemoryReporter
+class MemoryReporterBase : public nsIMemoryReporter
 {
 public:
-  MemoryUniReporter(const char* aNameAndPath, int32_t aKind, int32_t aUnits,
-                    const char* aDescription)
-    : mNameAndPath(aNameAndPath)
+  MemoryReporterBase(const char* aPath, int32_t aKind, int32_t aUnits,
+                     const char* aDescription)
+    : mPath(aPath)
     , mKind(aKind)
     , mUnits(aUnits)
     , mDescription(aDescription)
   {}
 
-  virtual ~MemoryUniReporter() {}
+  virtual ~MemoryReporterBase() {}
 
   NS_DECL_THREADSAFE_ISUPPORTS
 
-  NS_IMETHOD GetName(nsACString& aName)
+  NS_IMETHOD GetProcess(nsACString& aProcess)
   {
-    aName.Assign(mNameAndPath);
+    aProcess.Truncate();
     return NS_OK;
   }
 
-  NS_IMETHOD CollectReports(nsIMemoryReporterCallback* aCallback,
-                            nsISupports* aClosure)
+  NS_IMETHOD GetPath(nsACString& aPath)
   {
-    int64_t amount;
-    nsresult rv = GetAmount(&amount);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    return aCallback->Callback(EmptyCString(), mNameAndPath, mKind, mUnits,
-                               amount, mDescription, aClosure);
+    aPath.Assign(mPath);
+    return NS_OK;
+  }
+
+  NS_IMETHOD GetKind(int32_t* aKind)
+  {
+    *aKind = mKind;
+    return NS_OK;
+  }
+
+  NS_IMETHOD GetUnits(int32_t* aUnits)
+  {
+    *aUnits = mUnits;
+    return NS_OK;
   }
 
-protected:
   NS_IMETHOD GetAmount(int64_t* aAmount)
   {
     *aAmount = Amount();
     return NS_OK;
   }
 
+  NS_IMETHOD GetDescription(nsACString& aDescription)
+  {
+    aDescription.Assign(mDescription);
+    return NS_OK;
+  }
+
+protected:
   virtual int64_t Amount()
   {
     // We only reach here if neither GetAmount() nor Amount() was overridden.
@@ -390,7 +453,7 @@ protected:
   NS_MEMORY_REPORTER_MALLOC_SIZEOF_ON_ALLOC_FUN(MallocSizeOfOnAlloc)
   NS_MEMORY_REPORTER_MALLOC_SIZEOF_ON_FREE_FUN(MallocSizeOfOnFree)
 
-  const nsCString mNameAndPath;
+  const nsCString mPath;
   const int32_t   mKind;
   const int32_t   mUnits;
   const nsCString mDescription;
diff --git a/xpcom/base/nsMemoryInfoDumper.cpp b/xpcom/base/nsMemoryInfoDumper.cpp
index b8ea0f6d1233..d6716918ecbd 100644
--- a/xpcom/base/nsMemoryInfoDumper.cpp
+++ b/xpcom/base/nsMemoryInfoDumper.cpp
@@ -672,35 +672,32 @@ DumpReport(nsIGZFileWriter *aWriter, bool aIsFirst,
   return NS_OK;
 }
 
-class DumpReporterCallback MOZ_FINAL : public nsIMemoryReporterCallback
+class DumpMultiReporterCallback MOZ_FINAL : public nsIMemoryMultiReporterCallback
 {
-public:
-  NS_DECL_ISUPPORTS
+  public:
+    NS_DECL_ISUPPORTS
 
-  DumpReporterCallback(bool* aIsFirstPtr) : mIsFirstPtr(aIsFirstPtr) {}
+      NS_IMETHOD Callback(const nsACString &aProcess, const nsACString &aPath,
+          int32_t aKind, int32_t aUnits, int64_t aAmount,
+          const nsACString &aDescription,
+          nsISupports *aData)
+      {
+        nsCOMPtr<nsIGZFileWriter> writer = do_QueryInterface(aData);
+        NS_ENSURE_TRUE(writer, NS_ERROR_FAILURE);
 
-  NS_IMETHOD Callback(const nsACString &aProcess, const nsACString &aPath,
-      int32_t aKind, int32_t aUnits, int64_t aAmount,
-      const nsACString &aDescription,
-      nsISupports *aData)
-  {
-    nsCOMPtr<nsIGZFileWriter> writer = do_QueryInterface(aData);
-    NS_ENSURE_TRUE(writer, NS_ERROR_FAILURE);
-
-    // The |isFirst = false| assumes that at least one single reporter is
-    // present and so will have been processed in
-    // DumpProcessMemoryReportsToGZFileWriter() below.
-    bool isFirst = *mIsFirstPtr;
-    *mIsFirstPtr = false;
-    return DumpReport(writer, isFirst, aProcess, aPath, aKind, aUnits, aAmount,
-                      aDescription);
-  }
-
-private:
-  bool* mIsFirstPtr;
+        // The |isFirst = false| assumes that at least one single reporter is
+        // present and so will have been processed in
+        // DumpProcessMemoryReportsToGZFileWriter() below.
+        return DumpReport(writer, /* isFirst = */ false, aProcess, aPath,
+            aKind, aUnits, aAmount, aDescription);
+        return NS_OK;
+      }
 };
 
-NS_IMPL_ISUPPORTS1(DumpReporterCallback, nsIMemoryReporterCallback)
+NS_IMPL_ISUPPORTS1(
+    DumpMultiReporterCallback
+    , nsIMemoryMultiReporterCallback
+    )
 
 } // namespace mozilla
 
@@ -798,6 +795,8 @@ DMDWrite(void* aState, const char* aFmt, va_list ap)
 static nsresult
 DumpProcessMemoryReportsToGZFileWriter(nsIGZFileWriter *aWriter)
 {
+  nsresult rv;
+
   // Increment this number if the format changes.
   //
   // This is the first write to the file, and it causes |aWriter| to allocate
@@ -815,15 +814,53 @@ DumpProcessMemoryReportsToGZFileWriter(nsIGZFileWriter *aWriter)
   DUMP(aWriter, ",\n");
   DUMP(aWriter, "  \"reports\": ");
 
-  // Process reporters.
+  // Process single reporters.
   bool isFirst = true;
   bool more;
   nsCOMPtr<nsISimpleEnumerator> e;
   mgr->EnumerateReporters(getter_AddRefs(e));
-  nsRefPtr<DumpReporterCallback> cb = new DumpReporterCallback(&isFirst);
   while (NS_SUCCEEDED(e->HasMoreElements(&more)) && more) {
     nsCOMPtr<nsIMemoryReporter> r;
     e->GetNext(getter_AddRefs(r));
+
+    nsCString process;
+    rv = r->GetProcess(process);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    nsCString path;
+    rv = r->GetPath(path);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    int32_t kind;
+    rv = r->GetKind(&kind);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    int32_t units;
+    rv = r->GetUnits(&units);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    int64_t amount;
+    rv = r->GetAmount(&amount);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    nsCString description;
+    rv = r->GetDescription(description);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    rv = DumpReport(aWriter, isFirst, process, path, kind, units, amount,
+                    description);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    isFirst = false;
+  }
+
+  // Process multi-reporters.
+  nsCOMPtr<nsISimpleEnumerator> e2;
+  mgr->EnumerateMultiReporters(getter_AddRefs(e2));
+  nsRefPtr<DumpMultiReporterCallback> cb = new DumpMultiReporterCallback();
+  while (NS_SUCCEEDED(e2->HasMoreElements(&more)) && more) {
+    nsCOMPtr<nsIMemoryMultiReporter> r;
+    e2->GetNext(getter_AddRefs(r));
     r->CollectReports(cb, aWriter);
   }
 
diff --git a/xpcom/base/nsMemoryReporterManager.cpp b/xpcom/base/nsMemoryReporterManager.cpp
index 85a6cac78fda..b1b0d407db59 100644
--- a/xpcom/base/nsMemoryReporterManager.cpp
+++ b/xpcom/base/nsMemoryReporterManager.cpp
@@ -327,11 +327,11 @@ static nsresult GetResidentFast(int64_t* aN)
 }
 
 #define HAVE_PRIVATE_REPORTER
-class PrivateReporter MOZ_FINAL : public MemoryUniReporter
+class PrivateReporter MOZ_FINAL : public MemoryReporterBase
 {
 public:
     PrivateReporter()
-      : MemoryUniReporter("private", KIND_OTHER, UNITS_BYTES,
+      : MemoryReporterBase("private", KIND_OTHER, UNITS_BYTES,
 "Memory that cannot be shared with other processes, including memory that is "
 "committed and marked MEM_PRIVATE, data that is not mapped, and executable "
 "pages that have been written to.")
@@ -356,11 +356,11 @@ public:
 #endif  // XP_<PLATFORM>
 
 #ifdef HAVE_VSIZE_AND_RESIDENT_REPORTERS
-class VsizeReporter MOZ_FINAL : public MemoryUniReporter
+class VsizeReporter MOZ_FINAL : public MemoryReporterBase
 {
 public:
     VsizeReporter()
-      : MemoryUniReporter("vsize", KIND_OTHER, UNITS_BYTES,
+      : MemoryReporterBase("vsize", KIND_OTHER, UNITS_BYTES,
 "Memory mapped by the process, including code and data segments, the heap, "
 "thread stacks, memory explicitly mapped by the process via mmap and similar "
 "operations, and memory shared with other processes. This is the vsize figure "
@@ -373,11 +373,11 @@ public:
     NS_IMETHOD GetAmount(int64_t* aAmount) { return GetVsize(aAmount); }
 };
 
-class ResidentReporter MOZ_FINAL : public MemoryUniReporter
+class ResidentReporter MOZ_FINAL : public MemoryReporterBase
 {
 public:
     ResidentReporter()
-      : MemoryUniReporter("resident", KIND_OTHER, UNITS_BYTES,
+      : MemoryReporterBase("resident", KIND_OTHER, UNITS_BYTES,
 "Memory mapped by the process that is present in physical memory, also known "
 "as the resident set size (RSS).  This is the best single figure to use when "
 "considering the memory resources used by the process, but it depends both on "
@@ -389,11 +389,11 @@ public:
     NS_IMETHOD GetAmount(int64_t* aAmount) { return GetResident(aAmount); }
 };
 
-class ResidentFastReporter MOZ_FINAL : public MemoryUniReporter
+class ResidentFastReporter MOZ_FINAL : public MemoryReporterBase
 {
 public:
     ResidentFastReporter()
-      : MemoryUniReporter("resident-fast", KIND_OTHER, UNITS_BYTES,
+      : MemoryReporterBase("resident-fast", KIND_OTHER, UNITS_BYTES,
 "This is the same measurement as 'resident', but it tries to be as fast as "
 "possible at the expense of accuracy.  On most platforms this is identical to "
 "the 'resident' measurement, but on Mac it may over-count.  You should use "
@@ -412,11 +412,11 @@ public:
 
 #define HAVE_PAGE_FAULT_REPORTERS 1
 
-class PageFaultsSoftReporter MOZ_FINAL : public MemoryUniReporter
+class PageFaultsSoftReporter MOZ_FINAL : public MemoryReporterBase
 {
 public:
     PageFaultsSoftReporter()
-      : MemoryUniReporter("page-faults-soft", KIND_OTHER,
+      : MemoryReporterBase("page-faults-soft", KIND_OTHER,
                            UNITS_COUNT_CUMULATIVE,
 "The number of soft page faults (also known as 'minor page faults') that "
 "have occurred since the process started.  A soft page fault occurs when the "
@@ -441,11 +441,11 @@ public:
     }
 };
 
-class PageFaultsHardReporter MOZ_FINAL : public MemoryUniReporter
+class PageFaultsHardReporter MOZ_FINAL : public MemoryReporterBase
 {
 public:
     PageFaultsHardReporter()
-      : MemoryUniReporter("page-faults-hard", KIND_OTHER,
+      : MemoryReporterBase("page-faults-hard", KIND_OTHER,
                            UNITS_COUNT_CUMULATIVE,
 "The number of hard page faults (also known as 'major page faults') that have "
 "occurred since the process started.  A hard page fault occurs when a process "
@@ -479,11 +479,11 @@ public:
 
 #ifdef HAVE_JEMALLOC_STATS
 
-class HeapAllocatedReporter MOZ_FINAL : public MemoryUniReporter
+class HeapAllocatedReporter MOZ_FINAL : public MemoryReporterBase
 {
 public:
     HeapAllocatedReporter()
-      : MemoryUniReporter("heap-allocated", KIND_OTHER, UNITS_BYTES,
+      : MemoryReporterBase("heap-allocated", KIND_OTHER, UNITS_BYTES,
 "Memory mapped by the heap allocator that is currently allocated to the "
 "application.  This may exceed the amount of memory requested by the "
 "application because the allocator regularly rounds up request sizes. (The "
@@ -498,14 +498,14 @@ private:
     }
 };
 
-class HeapOverheadWasteReporter MOZ_FINAL : public MemoryUniReporter
+class HeapOverheadWasteReporter MOZ_FINAL : public MemoryReporterBase
 {
 public:
     // We mark this and the other heap-overhead reporters as KIND_NONHEAP
     // because KIND_HEAP memory means "counted in heap-allocated", which this
     // is not.
     HeapOverheadWasteReporter()
-      : MemoryUniReporter("explicit/heap-overhead/waste",
+      : MemoryReporterBase("explicit/heap-overhead/waste",
                            KIND_NONHEAP, UNITS_BYTES,
 "Committed bytes which do not correspond to an active allocation and which the "
 "allocator is not intentionally keeping alive (i.e., not 'heap-bookkeeping' or "
@@ -522,11 +522,11 @@ private:
     }
 };
 
-class HeapOverheadBookkeepingReporter MOZ_FINAL : public MemoryUniReporter
+class HeapOverheadBookkeepingReporter MOZ_FINAL : public MemoryReporterBase
 {
 public:
     HeapOverheadBookkeepingReporter()
-      : MemoryUniReporter("explicit/heap-overhead/bookkeeping",
+      : MemoryReporterBase("explicit/heap-overhead/bookkeeping",
                            KIND_NONHEAP, UNITS_BYTES,
 "Committed bytes which the heap allocator uses for internal data structures.")
     {}
@@ -539,11 +539,11 @@ private:
     }
 };
 
-class HeapOverheadPageCacheReporter MOZ_FINAL : public MemoryUniReporter
+class HeapOverheadPageCacheReporter MOZ_FINAL : public MemoryReporterBase
 {
 public:
     HeapOverheadPageCacheReporter()
-      : MemoryUniReporter("explicit/heap-overhead/page-cache",
+      : MemoryReporterBase("explicit/heap-overhead/page-cache",
                            KIND_NONHEAP, UNITS_BYTES,
 "Memory which the allocator could return to the operating system, but hasn't. "
 "The allocator keeps this memory around as an optimization, so it doesn't "
@@ -559,11 +559,11 @@ private:
     }
 };
 
-class HeapCommittedReporter MOZ_FINAL : public MemoryUniReporter
+class HeapCommittedReporter MOZ_FINAL : public MemoryReporterBase
 {
 public:
     HeapCommittedReporter()
-      : MemoryUniReporter("heap-committed", KIND_OTHER, UNITS_BYTES,
+      : MemoryReporterBase("heap-committed", KIND_OTHER, UNITS_BYTES,
 "Memory mapped by the heap allocator that is committed, i.e. in physical "
 "memory or paged to disk.  This value corresponds to 'heap-allocated' + "
 "'heap-waste' + 'heap-bookkeeping' + 'heap-page-cache', but because "
@@ -580,11 +580,11 @@ private:
     }
 };
 
-class HeapOverheadRatioReporter MOZ_FINAL : public MemoryUniReporter
+class HeapOverheadRatioReporter MOZ_FINAL : public MemoryReporterBase
 {
 public:
     HeapOverheadRatioReporter()
-      : MemoryUniReporter("heap-overhead-ratio", KIND_OTHER,
+      : MemoryReporterBase("heap-overhead-ratio", KIND_OTHER,
                            UNITS_PERCENTAGE,
 "Ratio of committed, unused bytes to allocated bytes; i.e., "
 "'heap-overhead' / 'heap-allocated'.  This measures the overhead of "
@@ -607,11 +607,11 @@ private:
 // However, the obvious time to register it is when the table is initialized,
 // and that happens before XPCOM components are initialized, which means the
 // NS_RegisterMemoryReporter call fails.  So instead we do it here.
-class AtomTablesReporter MOZ_FINAL : public MemoryUniReporter
+class AtomTablesReporter MOZ_FINAL : public MemoryReporterBase
 {
 public:
     AtomTablesReporter()
-      : MemoryUniReporter("explicit/atom-tables", KIND_HEAP, UNITS_BYTES,
+      : MemoryReporterBase("explicit/atom-tables", KIND_HEAP, UNITS_BYTES,
 "Memory used by the dynamic and static atoms tables.")
     {}
 private:
@@ -623,10 +623,10 @@ private:
 namespace mozilla {
 namespace dmd {
 
-class DMDReporter MOZ_FINAL : public nsIMemoryReporter
+class DMDMultiReporter MOZ_FINAL : public nsIMemoryMultiReporter
 {
 public:
-  DMDReporter()
+  DMDMultiReporter()
   {}
 
   NS_DECL_ISUPPORTS
@@ -637,7 +637,7 @@ public:
     return NS_OK;
   }
 
-  NS_IMETHOD CollectReports(nsIMemoryReporterCallback* aCallback,
+  NS_IMETHOD CollectReports(nsIMemoryMultiReporterCallback* aCallback,
                             nsISupports* aClosure)
   {
     dmd::Sizes sizes;
@@ -677,7 +677,7 @@ public:
   }
 };
 
-NS_IMPL_ISUPPORTS1(DMDReporter, nsIMemoryReporter)
+NS_IMPL_ISUPPORTS1(DMDMultiReporter, nsIMemoryMultiReporter)
 
 } // namespace dmd
 } // namespace mozilla
@@ -725,7 +725,7 @@ nsMemoryReporterManager::Init()
     RegisterReporter(new AtomTablesReporter);
 
 #ifdef MOZ_DMD
-    RegisterReporter(new mozilla::dmd::DMDReporter);
+    RegisterMultiReporter(new mozilla::dmd::DMDMultiReporter);
 #endif
 
 #if defined(XP_LINUX)
@@ -803,6 +803,7 @@ nsMemoryReporterManager::nsMemoryReporterManager()
     mIsRegistrationBlocked(false)
 {
     mReporters.Init();
+    mMultiReporters.Init();
 }
 
 nsMemoryReporterManager::~nsMemoryReporterManager()
@@ -826,6 +827,23 @@ nsMemoryReporterManager::EnumerateReporters(nsISimpleEnumerator** aResult)
     return NS_OK;
 }
 
+NS_IMETHODIMP
+nsMemoryReporterManager::EnumerateMultiReporters(nsISimpleEnumerator** aResult)
+{
+    // Memory multi-reporters are not necessarily threadsafe, so
+    // EnumerateMultiReporters() must be called from the main thread.
+    if (!NS_IsMainThread()) {
+        MOZ_CRASH();
+    }
+
+    mozilla::MutexAutoLock autoLock(mMutex);
+
+    nsRefPtr<HashtableEnumerator> enumerator =
+        new HashtableEnumerator(mMultiReporters);
+    enumerator.forget(aResult);
+    return NS_OK;
+}
+
 static void
 DebugAssertRefcountIsNonZero(nsISupports* aObj)
 {
@@ -881,6 +899,41 @@ nsMemoryReporterManager::RegisterReporterEvenIfBlocked(
     return RegisterReporterHelper(aReporter, /* force = */ true);
 }
 
+nsresult
+nsMemoryReporterManager::RegisterMultiReporterHelper(
+    nsIMemoryMultiReporter* aReporter, bool aForce)
+{
+    // This method is thread-safe.
+    mozilla::MutexAutoLock autoLock(mMutex);
+
+    if ((mIsRegistrationBlocked && !aForce) ||
+         mMultiReporters.Contains(aReporter)) {
+        return NS_ERROR_FAILURE;
+    }
+
+    {
+        nsCOMPtr<nsIMemoryMultiReporter> kungFuDeathGrip = aReporter;
+        mMultiReporters.PutEntry(aReporter);
+    }
+
+    DebugAssertRefcountIsNonZero(aReporter);
+
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMemoryReporterManager::RegisterMultiReporter(nsIMemoryMultiReporter* aReporter)
+{
+    return RegisterMultiReporterHelper(aReporter, /* force = */ false);
+}
+
+NS_IMETHODIMP
+nsMemoryReporterManager::RegisterMultiReporterEvenIfBlocked(
+    nsIMemoryMultiReporter* aReporter)
+{
+    return RegisterMultiReporterHelper(aReporter, /* force = */ true);
+}
+
 NS_IMETHODIMP
 nsMemoryReporterManager::UnregisterReporter(nsIMemoryReporter* aReporter)
 {
@@ -895,6 +948,20 @@ nsMemoryReporterManager::UnregisterReporter(nsIMemoryReporter* aReporter)
     return NS_OK;
 }
 
+NS_IMETHODIMP
+nsMemoryReporterManager::UnregisterMultiReporter(nsIMemoryMultiReporter* aReporter)
+{
+    // This method is thread-safe.
+    mozilla::MutexAutoLock autoLock(mMutex);
+
+    if (!mMultiReporters.Contains(aReporter)) {
+        return NS_ERROR_FAILURE;
+    }
+
+    mMultiReporters.RemoveEntry(aReporter);
+    return NS_OK;
+}
+
 NS_IMETHODIMP
 nsMemoryReporterManager::BlockRegistration()
 {
@@ -931,7 +998,7 @@ nsMemoryReporterManager::GetResident(int64_t* aResident)
 }
 
 // This is just a wrapper for int64_t that implements nsISupports, so it can be
-// passed to nsIMemoryReporter::CollectReports.
+// passed to nsIMemoryMultiReporter::CollectReports.
 class Int64Wrapper MOZ_FINAL : public nsISupports {
 public:
     NS_DECL_ISUPPORTS
@@ -940,7 +1007,7 @@ public:
 };
 NS_IMPL_ISUPPORTS0(Int64Wrapper)
 
-class ExplicitCallback MOZ_FINAL : public nsIMemoryReporterCallback
+class ExplicitNonHeapCountingCallback MOZ_FINAL : public nsIMemoryMultiReporterCallback
 {
 public:
     NS_DECL_ISUPPORTS
@@ -948,20 +1015,23 @@ public:
     NS_IMETHOD Callback(const nsACString& aProcess, const nsACString& aPath,
                         int32_t aKind, int32_t aUnits, int64_t aAmount,
                         const nsACString& aDescription,
-                        nsISupports* aWrappedExplicit)
+                        nsISupports* aWrappedExplicitNonHeap)
     {
-        if (aPath.Equals("heap-allocated") ||
-            (aKind == nsIMemoryReporter::KIND_NONHEAP &&
-             PromiseFlatCString(aPath).Find("explicit") == 0))
+        if (aKind == nsIMemoryReporter::KIND_NONHEAP &&
+            PromiseFlatCString(aPath).Find("explicit") == 0 &&
+            aAmount != int64_t(-1))
         {
-            Int64Wrapper* wrappedInt64 =
-                static_cast<Int64Wrapper*>(aWrappedExplicit);
-            wrappedInt64->mValue += aAmount;
+            Int64Wrapper* wrappedPRInt64 =
+                static_cast<Int64Wrapper*>(aWrappedExplicitNonHeap);
+            wrappedPRInt64->mValue += aAmount;
         }
         return NS_OK;
     }
 };
-NS_IMPL_ISUPPORTS1(ExplicitCallback, nsIMemoryReporterCallback)
+NS_IMPL_ISUPPORTS1(
+  ExplicitNonHeapCountingCallback
+, nsIMemoryMultiReporterCallback
+)
 
 NS_IMETHODIMP
 nsMemoryReporterManager::GetExplicit(int64_t* aExplicit)
@@ -974,25 +1044,63 @@ nsMemoryReporterManager::GetExplicit(int64_t* aExplicit)
     nsresult rv;
     bool more;
 
-    // For each reporter we call CollectReports and filter out the
-    // non-explicit, non-NONHEAP measurements (except for "heap-allocated").
-    // That's lots of wasted work, and we used to have a GetExplicitNonHeap()
-    // method which did this more efficiently, but it ended up being more
-    // trouble than it was worth.
-
-    nsRefPtr<ExplicitCallback> cb = new ExplicitCallback();
-    nsRefPtr<Int64Wrapper> wrappedExplicitSize = new Int64Wrapper();
-
+    // Get "heap-allocated" and all the KIND_NONHEAP measurements from normal
+    // (i.e. non-multi) "explicit" reporters.
+    int64_t heapAllocated = int64_t(-1);
+    int64_t explicitNonHeapNormalSize = 0;
     nsCOMPtr<nsISimpleEnumerator> e;
     EnumerateReporters(getter_AddRefs(e));
     while (NS_SUCCEEDED(e->HasMoreElements(&more)) && more) {
         nsCOMPtr<nsIMemoryReporter> r;
         e->GetNext(getter_AddRefs(r));
-        r->CollectReports(cb, wrappedExplicitSize);
+
+        int32_t kind;
+        rv = r->GetKind(&kind);
+        NS_ENSURE_SUCCESS(rv, rv);
+
+        nsCString path;
+        rv = r->GetPath(path);
+        NS_ENSURE_SUCCESS(rv, rv);
+
+        // We're only interested in NONHEAP explicit reporters and
+        // the 'heap-allocated' reporter.
+        if (kind == nsIMemoryReporter::KIND_NONHEAP &&
+            path.Find("explicit") == 0)
+        {
+            // Just skip any NONHEAP reporters that fail, because
+            // "heap-allocated" is the most important one.
+            int64_t amount;
+            rv = r->GetAmount(&amount);
+            if (NS_SUCCEEDED(rv)) {
+                explicitNonHeapNormalSize += amount;
+            }
+        } else if (path.Equals("heap-allocated")) {
+            // If we don't have "heap-allocated", give up, because the result
+            // would be horribly inaccurate.
+            rv = r->GetAmount(&heapAllocated);
+            NS_ENSURE_SUCCESS(rv, rv);
+        }
     }
 
-    *aExplicit = wrappedExplicitSize->mValue;
+    // For each multi-reporter we call CollectReports and filter out the
+    // non-explicit, non-NONHEAP measurements.  That's lots of wasted work,
+    // and we used to have a GetExplicitNonHeap() method which did this more
+    // efficiently, but it ended up being more trouble than it was worth.
 
+    nsRefPtr<ExplicitNonHeapCountingCallback> cb =
+      new ExplicitNonHeapCountingCallback();
+    nsRefPtr<Int64Wrapper> wrappedExplicitNonHeapMultiSize =
+      new Int64Wrapper();
+    nsCOMPtr<nsISimpleEnumerator> e2;
+    EnumerateMultiReporters(getter_AddRefs(e2));
+    while (NS_SUCCEEDED(e2->HasMoreElements(&more)) && more) {
+      nsCOMPtr<nsIMemoryMultiReporter> r;
+      e2->GetNext(getter_AddRefs(r));
+      r->CollectReports(cb, wrappedExplicitNonHeapMultiSize);
+    }
+    int64_t explicitNonHeapMultiSize = wrappedExplicitNonHeapMultiSize->mValue;
+
+    *aExplicit = heapAllocated + explicitNonHeapNormalSize + explicitNonHeapMultiSize;
     return NS_OK;
 #endif // HAVE_JEMALLOC_STATS
 }
@@ -1097,7 +1205,7 @@ nsMemoryReporterManager::MinimizeMemoryUsage(nsIRunnable* aCallback,
 // Most memory reporters don't need thread safety, but some do.  Make them all
 // thread-safe just to be safe.  Memory reporters are created and destroyed
 // infrequently enough that the performance cost should be negligible.
-NS_IMPL_ISUPPORTS1(MemoryUniReporter, nsIMemoryReporter)
+NS_IMPL_ISUPPORTS1(MemoryReporterBase, nsIMemoryReporter)
 
 nsresult
 NS_RegisterMemoryReporter(nsIMemoryReporter* aReporter)
@@ -1109,6 +1217,16 @@ NS_RegisterMemoryReporter(nsIMemoryReporter* aReporter)
     return mgr->RegisterReporter(aReporter);
 }
 
+nsresult
+NS_RegisterMemoryMultiReporter(nsIMemoryMultiReporter* aReporter)
+{
+    nsCOMPtr<nsIMemoryReporterManager> mgr = do_GetService("@mozilla.org/memory-reporter-manager;1");
+    if (!mgr) {
+        return NS_ERROR_FAILURE;
+    }
+    return mgr->RegisterMultiReporter(aReporter);
+}
+
 nsresult
 NS_UnregisterMemoryReporter(nsIMemoryReporter* aReporter)
 {
@@ -1119,12 +1237,22 @@ NS_UnregisterMemoryReporter(nsIMemoryReporter* aReporter)
     return mgr->UnregisterReporter(aReporter);
 }
 
+nsresult
+NS_UnregisterMemoryMultiReporter(nsIMemoryMultiReporter* aReporter)
+{
+    nsCOMPtr<nsIMemoryReporterManager> mgr = do_GetService("@mozilla.org/memory-reporter-manager;1");
+    if (!mgr) {
+        return NS_ERROR_FAILURE;
+    }
+    return mgr->UnregisterMultiReporter(aReporter);
+}
+
 #if defined(MOZ_DMD)
 
 namespace mozilla {
 namespace dmd {
 
-class NullReporterCallback : public nsIMemoryReporterCallback
+class NullMultiReporterCallback : public nsIMemoryMultiReporterCallback
 {
 public:
     NS_DECL_ISUPPORTS
@@ -1139,8 +1267,8 @@ public:
     }
 };
 NS_IMPL_ISUPPORTS1(
-  NullReporterCallback
-, nsIMemoryReporterCallback
+  NullMultiReporterCallback
+, nsIMemoryMultiReporterCallback
 )
 
 void
@@ -1149,15 +1277,48 @@ RunReporters()
     nsCOMPtr<nsIMemoryReporterManager> mgr =
         do_GetService("@mozilla.org/memory-reporter-manager;1");
 
-    nsRefPtr<NullReporterCallback> cb = new NullReporterCallback();
-
-    bool more;
+    // Do vanilla reporters.
     nsCOMPtr<nsISimpleEnumerator> e;
     mgr->EnumerateReporters(getter_AddRefs(e));
+    bool more;
     while (NS_SUCCEEDED(e->HasMoreElements(&more)) && more) {
         nsCOMPtr<nsIMemoryReporter> r;
         e->GetNext(getter_AddRefs(r));
-        r->CollectReports(cb, nullptr);
+
+        int32_t kind;
+        nsresult rv = r->GetKind(&kind);
+        if (NS_FAILED(rv)) {
+            continue;
+        }
+        nsCString path;
+        rv = r->GetPath(path);
+        if (NS_FAILED(rv)) {
+            continue;
+        }
+
+        // We're only interested in HEAP explicit reporters.  (In particular,
+        // some heap blocks are deliberately measured once inside an "explicit"
+        // reporter and once outside, which isn't a problem.  This condition
+        // prevents them being reported as double-counted.  See bug 811018
+        // comment 2.)
+        if (kind == nsIMemoryReporter::KIND_HEAP &&
+            path.Find("explicit") == 0)
+        {
+            // Just getting the amount is enough for the reporter to report to
+            // DMD.
+            int64_t amount;
+            (void)r->GetAmount(&amount);
+        }
+    }
+
+    // Do multi-reporters.
+    nsCOMPtr<nsISimpleEnumerator> e2;
+    mgr->EnumerateMultiReporters(getter_AddRefs(e2));
+    nsRefPtr<NullMultiReporterCallback> cb = new NullMultiReporterCallback();
+    while (NS_SUCCEEDED(e2->HasMoreElements(&more)) && more) {
+      nsCOMPtr<nsIMemoryMultiReporter> r;
+      e2->GetNext(getter_AddRefs(r));
+      r->CollectReports(cb, nullptr);
     }
 }
 
diff --git a/xpcom/base/nsMemoryReporterManager.h b/xpcom/base/nsMemoryReporterManager.h
index baa1e30343aa..3b22ce011b65 100644
--- a/xpcom/base/nsMemoryReporterManager.h
+++ b/xpcom/base/nsMemoryReporterManager.h
@@ -24,8 +24,11 @@ public:
 
 private:
   nsresult RegisterReporterHelper(nsIMemoryReporter *reporter, bool aForce);
+  nsresult RegisterMultiReporterHelper(nsIMemoryMultiReporter *reporter,
+                                       bool aForce);
 
   nsTHashtable<nsISupportsHashKey> mReporters;
+  nsTHashtable<nsISupportsHashKey> mMultiReporters;
   Mutex mMutex;
   bool mIsRegistrationBlocked;
 };
diff --git a/xpcom/build/nsXPComInit.cpp b/xpcom/build/nsXPComInit.cpp
index a56b668807f7..d4dc96da432f 100644
--- a/xpcom/build/nsXPComInit.cpp
+++ b/xpcom/build/nsXPComInit.cpp
@@ -334,11 +334,11 @@ NS_InitXPCOM(nsIServiceManager* *result,
     return NS_InitXPCOM2(result, binDirectory, nullptr);
 }
 
-class ICUReporter MOZ_FINAL : public MemoryUniReporter
+class ICUReporter MOZ_FINAL : public MemoryReporterBase
 {
 public:
     ICUReporter()
-      : MemoryUniReporter("explicit/icu", KIND_HEAP, UNITS_BYTES,
+      : MemoryReporterBase("explicit/icu", KIND_HEAP, UNITS_BYTES,
 "Memory used by ICU, a Unicode and globalization support library.")
     {
 #ifdef DEBUG
diff --git a/xpcom/components/nsCategoryManager.cpp b/xpcom/components/nsCategoryManager.cpp
index 7ca0a1906544..7765add9feab 100644
--- a/xpcom/components/nsCategoryManager.cpp
+++ b/xpcom/components/nsCategoryManager.cpp
@@ -402,11 +402,11 @@ CategoryEnumerator::enumfunc_createenumerator(const char* aStr, CategoryNode* aN
 
 NS_IMPL_QUERY_INTERFACE1(nsCategoryManager, nsICategoryManager)
 
-class XPCOMCategoryManagerReporter MOZ_FINAL : public MemoryUniReporter
+class XPCOMCategoryManagerReporter MOZ_FINAL : public MemoryReporterBase
 {
 public:
     XPCOMCategoryManagerReporter()
-      : MemoryUniReporter("explicit/xpcom/category-manager",
+      : MemoryReporterBase("explicit/xpcom/category-manager",
                            KIND_HEAP, UNITS_BYTES,
                            "Memory used for the XPCOM category manager.")
     {}
diff --git a/xpcom/components/nsComponentManager.cpp b/xpcom/components/nsComponentManager.cpp
index aa4487f7249e..e9cf03a9c70c 100644
--- a/xpcom/components/nsComponentManager.cpp
+++ b/xpcom/components/nsComponentManager.cpp
@@ -280,11 +280,11 @@ CloneAndAppend(nsIFile* aBase, const nsACString& append)
 // nsComponentManagerImpl
 ////////////////////////////////////////////////////////////////////////////////
 
-class XPCOMComponentManagerReporter MOZ_FINAL : public MemoryUniReporter
+class XPCOMComponentManagerReporter MOZ_FINAL : public MemoryReporterBase
 {
 public:
     XPCOMComponentManagerReporter()
-      : MemoryUniReporter("explicit/xpcom/component-manager",
+      : MemoryReporterBase("explicit/xpcom/component-manager",
                            KIND_HEAP, UNITS_BYTES,
                            "Memory used for the XPCOM component manager.")
     {}
diff --git a/xpcom/ds/nsObserverService.cpp b/xpcom/ds/nsObserverService.cpp
index 0c3ca7ee65be..4b8448eb6d85 100644
--- a/xpcom/ds/nsObserverService.cpp
+++ b/xpcom/ds/nsObserverService.cpp
@@ -48,18 +48,18 @@ GetObserverServiceLog()
 
 namespace mozilla {
 
-class ObserverServiceReporter MOZ_FINAL : public nsIMemoryReporter
+class ObserverServiceReporter MOZ_FINAL : public nsIMemoryMultiReporter
 {
 public:
     NS_DECL_ISUPPORTS
-    NS_DECL_NSIMEMORYREPORTER
+    NS_DECL_NSIMEMORYMULTIREPORTER
 protected:
     static const size_t kSuspectReferentCount = 1000;
     static PLDHashOperator CountReferents(nsObserverList* aObserverList,
                                           void* aClosure);
 };
 
-NS_IMPL_ISUPPORTS1(ObserverServiceReporter, nsIMemoryReporter)
+NS_IMPL_ISUPPORTS1(ObserverServiceReporter, nsIMemoryMultiReporter)
 
 NS_IMETHODIMP
 ObserverServiceReporter::GetName(nsACString& aName)
@@ -128,7 +128,7 @@ ObserverServiceReporter::CountReferents(nsObserverList* aObserverList,
 }
 
 NS_IMETHODIMP
-ObserverServiceReporter::CollectReports(nsIMemoryReporterCallback* cb,
+ObserverServiceReporter::CollectReports(nsIMemoryMultiReporterCallback* cb,
                                         nsISupports* aClosure)
 {
     nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
@@ -220,14 +220,14 @@ void
 nsObserverService::RegisterReporter()
 {
     mReporter = new ObserverServiceReporter();
-    NS_RegisterMemoryReporter(mReporter);
+    NS_RegisterMemoryMultiReporter(mReporter);
 }
 
 void
 nsObserverService::Shutdown()
 {
     if (mReporter) {
-        NS_UnregisterMemoryReporter(mReporter);
+        NS_UnregisterMemoryMultiReporter(mReporter);
     }
 
     mShuttingDown = true;
diff --git a/xpcom/ds/nsObserverService.h b/xpcom/ds/nsObserverService.h
index 1b3ff959194a..0c559a8a1ec3 100644
--- a/xpcom/ds/nsObserverService.h
+++ b/xpcom/ds/nsObserverService.h
@@ -15,7 +15,7 @@
 #define NS_OBSERVERSERVICE_CID \
     { 0xd07f5195, 0xe3d1, 0x11d2, { 0x8a, 0xcd, 0x0, 0x10, 0x5a, 0x1b, 0x88, 0x60 } }
 
-class nsIMemoryReporter;
+class nsIMemoryMultiReporter;
 
 namespace mozilla {
 class ObserverServiceReporter;
@@ -47,7 +47,7 @@ private:
 
   bool mShuttingDown;
   nsTHashtable<nsObserverList> mObserverTopicTable;
-  nsCOMPtr<nsIMemoryReporter> mReporter;
+  nsCOMPtr<nsIMemoryMultiReporter> mReporter;
 };
 
 NS_DEFINE_STATIC_IID_ACCESSOR(nsObserverService, NS_OBSERVERSERVICE_CID)
diff --git a/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp b/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp
index 0a0546e9dfe2..c34c36b907ca 100644
--- a/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp
+++ b/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp
@@ -40,11 +40,11 @@ XPTInterfaceInfoManager::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf)
     return n;
 }
 
-class XPTIWorkingSetReporter MOZ_FINAL : public MemoryUniReporter
+class XPTIWorkingSetReporter MOZ_FINAL : public MemoryReporterBase
 {
 public:
     XPTIWorkingSetReporter()
-      : MemoryUniReporter("explicit/xpti-working-set", KIND_HEAP, UNITS_BYTES,
+      : MemoryReporterBase("explicit/xpti-working-set", KIND_HEAP, UNITS_BYTES,
                            "Memory used by the XPCOM typelib system.")
     {}
 private: