--- a/browser/components/Makefile.in
+++ b/browser/components/Makefile.in
@@ -8,11 +8,9 @@ srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 DISABLED_EXTRA_COMPONENTS = \
   BrowserComponents.manifest \
   $(NULL)
 
-EXTRA_JS_MODULES = distribution.js
-
 include $(topsrcdir)/config/rules.mk

--- a/browser/components/downloads/src/Makefile.in
+++ b/browser/components/downloads/src/Makefile.in
@@ -10,14 +10,9 @@ VPATH     = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 DISABLED_EXTRA_COMPONENTS = \
   BrowserDownloads.manifest \
   DownloadsUI.js \
   DownloadsStartup.js \
   $(NULL)
 
-EXTRA_JS_MODULES = \
-  DownloadsCommon.jsm \
-  DownloadsLogger.jsm \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk

--- a/browser/components/downloads/src/moz.build
+++ b/browser/components/downloads/src/moz.build
@@ -4,8 +4,14 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 EXTRA_COMPONENTS += [
     'BrowserDownloads.manifest',
     'DownloadsStartup.js',
     'DownloadsUI.js',
 ]
+
+EXTRA_JS_MODULES += [
+    'DownloadsCommon.jsm',
+    'DownloadsLogger.jsm',
+]
+

--- a/browser/components/moz.build
+++ b/browser/components/moz.build
@@ -38,8 +38,13 @@ MODULE = 'browsercomps'
 
 EXTRA_COMPONENTS += [
     'BrowserComponents.manifest',
 ]
 EXTRA_PP_COMPONENTS += [
     'nsBrowserContentHandler.js',
     'nsBrowserGlue.js',
 ]
+
+EXTRA_JS_MODULES += [
+    'distribution.js',
+]
+

--- a/browser/components/places/src/Makefile.in
+++ b/browser/components/places/src/Makefile.in
@@ -10,14 +10,10 @@ VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 DISABLED_EXTRA_COMPONENTS = \
   BrowserPlaces.manifest \
   PlacesProtocolHandler.js \
   $(NULL)
 
-EXTRA_JS_MODULES = \
-  PlacesUIUtils.jsm \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
 

--- a/browser/components/places/src/moz.build
+++ b/browser/components/places/src/moz.build
@@ -7,8 +7,13 @@
 XPIDL_FLAGS += [
     '-I$(topsrcdir)/browser/components',
 ]
 
 EXTRA_COMPONENTS += [
     'BrowserPlaces.manifest',
     'PlacesProtocolHandler.js',
 ]
+
+EXTRA_JS_MODULES += [
+    'PlacesUIUtils.jsm',
+]
+

--- a/browser/components/sessionstore/src/Makefile.in
+++ b/browser/components/sessionstore/src/Makefile.in
@@ -11,23 +11,13 @@ include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/config.mk
 
 DISABLED_EXTRA_COMPONENTS = \
   nsSessionStore.manifest \
   nsSessionStore.js \
   nsSessionStartup.js \
   $(NULL)
 
-JS_MODULES_PATH := modules/sessionstore
-
-EXTRA_JS_MODULES := \
-  DocumentUtils.jsm \
-  SessionStorage.jsm \
-  SessionMigration.jsm \
-  XPathGenerator.jsm \
-  _SessionFile.jsm \
-  $(NULL)
-
 EXTRA_PP_JS_MODULES := \
 	SessionStore.jsm \
 	$(NULL)
 
 include $(topsrcdir)/config/rules.mk

--- a/browser/components/sessionstore/src/moz.build
+++ b/browser/components/sessionstore/src/moz.build
@@ -4,8 +4,18 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 EXTRA_COMPONENTS += [
     'nsSessionStartup.js',
     'nsSessionStore.js',
     'nsSessionStore.manifest',
 ]
+
+JS_MODULES_PATH = 'modules/sessionstore'
+
+EXTRA_JS_MODULES = [
+    'DocumentUtils.jsm',
+    'SessionMigration.jsm',
+    'SessionStorage.jsm',
+    'XPathGenerator.jsm',
+    '_SessionFile.jsm',
+]

--- a/browser/devtools/sourceeditor/Makefile.in
+++ b/browser/devtools/sourceeditor/Makefile.in
@@ -5,15 +5,9 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXTRA_JS_MODULES = \
-	source-editor.jsm \
-	source-editor-orion.jsm \
-	source-editor-ui.jsm \
-	$(NULL)
-
 include $(topsrcdir)/config/rules.mk

--- a/browser/devtools/sourceeditor/moz.build
+++ b/browser/devtools/sourceeditor/moz.build
@@ -1,7 +1,14 @@
 # -*- 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/.
 
 TEST_DIRS += ['test']
+
+EXTRA_JS_MODULES += [
+    'source-editor-orion.jsm',
+    'source-editor-ui.jsm',
+    'source-editor.jsm',
+]
+

--- a/browser/devtools/webconsole/Makefile.in
+++ b/browser/devtools/webconsole/Makefile.in
@@ -4,18 +4,12 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXTRA_JS_MODULES = \
-		HUDService.jsm \
-		NetworkPanel.jsm \
-		WebConsolePanel.jsm \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
 libs::
 	$(NSINSTALL) $(srcdir)/*.js $(FINAL_TARGET)/modules/devtools/framework

--- a/browser/devtools/webconsole/moz.build
+++ b/browser/devtools/webconsole/moz.build
@@ -1,8 +1,14 @@
 # -*- 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/.
 
 TEST_DIRS += ['test']
 
+EXTRA_JS_MODULES += [
+    'HUDService.jsm',
+    'NetworkPanel.jsm',
+    'WebConsolePanel.jsm',
+]
+

--- a/browser/metro/modules/Makefile.in
+++ b/browser/metro/modules/Makefile.in
@@ -4,13 +4,9 @@
 
 DEPTH      = @DEPTH@
 topsrcdir  = @top_srcdir@
 srcdir     = @srcdir@
 VPATH      = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/config.mk
-EXTRA_JS_MODULES = \
-  colorUtils.jsm \
-  CrossSlide.jsm \
-  $(NULL)
 include $(topsrcdir)/config/rules.mk

--- a/browser/metro/modules/moz.build
+++ b/browser/metro/modules/moz.build
@@ -1,6 +1,11 @@
 # -*- 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/.
 
+EXTRA_JS_MODULES += [
+    'CrossSlide.jsm',
+    'colorUtils.jsm',
+]
+

--- a/browser/modules/Makefile.in
+++ b/browser/modules/Makefile.in
@@ -6,39 +6,18 @@ DEPTH   = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/config.mk
 
-EXTRA_JS_MODULES = \
-	BrowserNewTabPreloader.jsm \
-	openLocationLastURL.jsm \
-	NetworkPrioritizer.jsm \
-	offlineAppCache.jsm \
-	SignInToWebsite.jsm \
-	SitePermissions.jsm \
-	webappsUI.jsm \
-	webrtcUI.jsm \
-	Social.jsm \
-	SharedFrame.jsm \
-	$(NULL)
-
 EXTRA_PP_JS_MODULES = \
 	AboutHomeUtils.jsm \
 	RecentWindow.jsm \
 	$(NULL)
 
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
-EXTRA_JS_MODULES += \
-	WindowsJumpLists.jsm \
-	WindowsPreviewPerTab.jsm \
-	$(NULL)
-endif
-
 ifdef MOZILLA_OFFICIAL
 DEFINES += -DMOZILLA_OFFICIAL=1
 endif
 
 include $(topsrcdir)/config/rules.mk

--- a/browser/modules/moz.build
+++ b/browser/modules/moz.build
@@ -1,8 +1,26 @@
 # -*- 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/.
 
 TEST_DIRS += ['test']
 
+EXTRA_JS_MODULES += [
+    'BrowserNewTabPreloader.jsm',
+    'NetworkPrioritizer.jsm',
+    'SharedFrame.jsm',
+    'SignInToWebsite.jsm',
+    'SitePermissions.jsm',
+    'Social.jsm',
+    'offlineAppCache.jsm',
+    'openLocationLastURL.jsm',
+    'webappsUI.jsm',
+    'webrtcUI.jsm',
+]
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
+    EXTRA_JS_MODULES += [
+        'WindowsJumpLists.jsm',
+        'WindowsPreviewPerTab.jsm',
+    ]