--- a/CLOBBER
+++ b/CLOBBER
@@ -17,9 +17,9 @@
 #
 # Modifying this file will now automatically clobber the buildbot machines \o/
 #
 
 # Are you updating CLOBBER because you think it's needed for your WebIDL
 # changes to stick? As of bug 928195, this shouldn't be necessary! Please
 # don't change CLOBBER for WebIDL changes any more.
 
-Skia update needs a CLOBBER on all platforms.
+dom/ flattening might need a CLOBBER.

rename from dom/src/jar.mn
rename to dom/jar.mn

--- a/dom/moz.build
+++ b/dom/moz.build
@@ -1,14 +1,16 @@
 # -*- 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/.
 
+JAR_MANIFESTS += ['jar.mn']
+
 interfaces = [
     'base',
     'canvas',
     'core',
     'html',
     'events',
     'devicestorage',
     'settings',
@@ -66,17 +68,16 @@ DIRS += [
     'notification',
     'offline',
     'power',
     'push',
     'quota',
     'settings',
     'storage',
     'mobilemessage',
-    'src',
     'time',
     'locales',
     'network',
     'permission',
     'plugins/base',
     'plugins/ipc',
     'indexedDB',
     'system',

rename from dom/src/res/hiddenWindow.html
rename to dom/res/hiddenWindow.html

deleted file mode 100644
--- a/dom/src/moz.build
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- 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/.
-
-JAR_MANIFESTS += ['jar.mn']