Bug 921492 - Make StrictOrderingOnAppendList use actual alphabetical sorting. r=mshal,r=gps
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 24 Oct 2013 08:05:43 +0900
changeset 151862 b84acd40490ee5dc4922dc0326ec39b27041273d
parent 151861 56c3abf3f03093fbb638d3bb6ce15de743f7e12f
child 151863 6f52040ede0ddad2c50b70341c648988a0f51848
push id35341
push usermh@glandium.org
push dateWed, 23 Oct 2013 23:07:07 +0000
treeherdermozilla-inbound@36d807c66c6d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal, gps
bugs921492
milestone27.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 921492 - Make StrictOrderingOnAppendList use actual alphabetical sorting. r=mshal,r=gps
accessible/src/atk/moz.build
accessible/src/base/moz.build
accessible/src/generic/moz.build
accessible/src/mac/moz.build
accessible/src/windows/msaa/moz.build
browser/components/sessionstore/src/moz.build
browser/metro/components/moz.build
browser/metro/modules/moz.build
browser/modules/moz.build
content/base/public/moz.build
content/base/src/moz.build
content/events/src/moz.build
content/html/content/src/moz.build
content/html/document/src/moz.build
content/media/moz.build
content/media/plugins/moz.build
content/media/webspeech/recognition/moz.build
content/media/webspeech/synth/moz.build
content/media/webspeech/synth/pico/moz.build
content/smil/moz.build
content/svg/content/src/moz.build
content/xbl/src/moz.build
content/xml/content/src/moz.build
content/xml/document/src/moz.build
content/xslt/src/xpath/moz.build
content/xslt/src/xslt/moz.build
content/xul/document/src/moz.build
docshell/base/moz.build
docshell/shistory/public/moz.build
docshell/shistory/src/moz.build
dom/base/moz.build
dom/bindings/moz.build
dom/bluetooth/moz.build
dom/icc/interfaces/moz.build
dom/interfaces/base/moz.build
dom/interfaces/core/moz.build
dom/interfaces/css/moz.build
dom/interfaces/events/moz.build
dom/interfaces/html/moz.build
dom/interfaces/xpath/moz.build
dom/interfaces/xul/moz.build
dom/ipc/moz.build
dom/mobilemessage/src/moz.build
dom/phonenumberutils/moz.build
dom/plugins/base/android/moz.build
dom/plugins/base/moz.build
dom/plugins/ipc/moz.build
dom/src/geolocation/moz.build
dom/system/gonk/moz.build
dom/system/moz.build
dom/system/unix/moz.build
dom/telephony/moz.build
dom/webidl/moz.build
dom/workers/moz.build
editor/composer/src/moz.build
editor/libeditor/base/moz.build
editor/libeditor/html/moz.build
embedding/components/printingui/src/os2/moz.build
embedding/components/printingui/src/unixshared/moz.build
embedding/components/printingui/src/win/moz.build
extensions/universalchardet/src/base/moz.build
gfx/2d/moz.build
gfx/angle/moz.build
gfx/angle/src/libEGL/moz.build
gfx/angle/src/libGLESv2/moz.build
gfx/cairo/cairo/src/moz.build
gfx/gl/moz.build
gfx/graphite2/src/moz.build
gfx/layers/moz.build
gfx/skia/moz.build
gfx/tests/gtest/moz.build
gfx/thebes/moz.build
hal/moz.build
image/src/moz.build
ipc/glue/moz.build
ipc/ipdl/test/cxx/moz.build
js/src/gdb/moz.build
js/src/jsapi-tests/moz.build
js/src/moz.build
js/xpconnect/idl/moz.build
js/xpconnect/public/moz.build
js/xpconnect/src/moz.build
layout/base/moz.build
layout/generic/moz.build
layout/inspector/public/moz.build
layout/inspector/src/moz.build
layout/mathml/moz.build
layout/style/moz.build
layout/svg/moz.build
layout/tables/moz.build
layout/xul/base/src/moz.build
media/libsoundtouch/src/moz.build
media/mtransport/objs.mozbuild
media/mtransport/test/moz.build
mfbt/tests/moz.build
modules/libjar/zipwriter/src/moz.build
modules/libpref/src/moz.build
mozglue/android/moz.build
mozglue/build/moz.build
netwerk/base/public/moz.build
netwerk/base/src/moz.build
netwerk/cache2/moz.build
netwerk/cookie/moz.build
netwerk/dash/mpd/moz.build
netwerk/protocol/http/moz.build
netwerk/protocol/rtsp/moz.build
netwerk/protocol/wyciwyg/moz.build
netwerk/socket/moz.build
netwerk/streamconv/converters/moz.build
netwerk/test/moz.build
parser/html/moz.build
profile/dirserviceprovider/src/objs.mozbuild
python/mozbuild/mozbuild/frontend/sandbox.py
python/mozbuild/mozbuild/util.py
rdf/base/idl/moz.build
security/manager/boot/public/moz.build
security/manager/ssl/public/moz.build
security/manager/ssl/src/moz.build
storage/src/moz.build
storage/test/moz.build
toolkit/components/captivedetect/moz.build
toolkit/components/downloads/moz.build
toolkit/components/jsdownloads/src/moz.build
toolkit/components/places/moz.build
toolkit/components/startup/moz.build
toolkit/components/url-classifier/moz.build
toolkit/devtools/apps/moz.build
toolkit/identity/moz.build
toolkit/modules/moz.build
toolkit/mozapps/extensions/moz.build
toolkit/xre/moz.build
tools/profiler/moz.build
uriloader/exthandler/moz.build
uriloader/prefetch/moz.build
webapprt/moz.build
widget/android/moz.build
widget/cocoa/moz.build
widget/gonk/moz.build
widget/gtk/moz.build
widget/moz.build
widget/os2/moz.build
widget/qt/moz.build
widget/shared/moz.build
widget/windows/moz.build
widget/windows/winrt/moz.build
widget/xpwidgets/moz.build
xpcom/base/moz.build
xpcom/build/moz.build
xpcom/ds/moz.build
xpcom/glue/moz.build
xpcom/glue/objs.mozbuild
xpcom/io/moz.build
xpcom/string/public/moz.build
xpcom/system/moz.build
xpcom/tests/moz.build
xpcom/threads/moz.build
--- a/accessible/src/atk/moz.build
+++ b/accessible/src/atk/moz.build
@@ -11,31 +11,31 @@ EXPORTS.mozilla.a11y += [
     'HyperTextAccessibleWrap.h',
 ]
 
 CPP_SOURCES += [
     'AccessibleWrap.cpp',
     'ApplicationAccessibleWrap.cpp',
     'AtkSocketAccessible.cpp',
     'DocAccessibleWrap.cpp',
-    'Platform.cpp',
-    'RootAccessibleWrap.cpp',
-    'UtilInterface.cpp',
     'nsMaiHyperlink.cpp',
     'nsMaiInterfaceAction.cpp',
     'nsMaiInterfaceComponent.cpp',
     'nsMaiInterfaceDocument.cpp',
     'nsMaiInterfaceEditableText.cpp',
     'nsMaiInterfaceHyperlinkImpl.cpp',
     'nsMaiInterfaceHypertext.cpp',
     'nsMaiInterfaceImage.cpp',
     'nsMaiInterfaceSelection.cpp',
     'nsMaiInterfaceTable.cpp',
     'nsMaiInterfaceText.cpp',
     'nsMaiInterfaceValue.cpp',
+    'Platform.cpp',
+    'RootAccessibleWrap.cpp',
+    'UtilInterface.cpp',
 ]
 
 LIBRARY_NAME = 'accessibility_toolkit_s'
 
 LIBXUL_LIBRARY = True
 
 LOCAL_INCLUDES += [
     '../base',
--- a/accessible/src/base/moz.build
+++ b/accessible/src/base/moz.build
@@ -5,18 +5,18 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 include('../shared.mozbuild')
 
 MODULE = 'accessibility'
 
 EXPORTS += [
     'AccEvent.h',
+    'nsAccessibilityService.h',
     'nsAccessNode.h',
-    'nsAccessibilityService.h',
 ]
 
 EXPORTS.mozilla.a11y += [
     'AccTypes.h',
     'DocManager.h',
     'FocusManager.h',
     'Platform.h',
     'RelationType.h',
@@ -26,40 +26,40 @@ EXPORTS.mozilla.a11y += [
 ]
 
 if CONFIG['MOZ_DEBUG']:
     EXPORTS.mozilla.a11y += [
         'Logging.h',
     ]
 
 CPP_SOURCES += [
-    'ARIAMap.cpp',
-    'ARIAStateMap.cpp',
     'AccCollector.cpp',
     'AccEvent.cpp',
     'AccGroupInfo.cpp',
     'AccIterator.cpp',
+    'ARIAMap.cpp',
+    'ARIAStateMap.cpp',
     'Asserts.cpp',
     'DocManager.cpp',
     'EventQueue.cpp',
     'Filters.cpp',
     'FocusManager.cpp',
     'NotificationController.cpp',
+    'nsAccessibilityService.cpp',
+    'nsAccessiblePivot.cpp',
+    'nsAccessNode.cpp',
+    'nsAccUtils.cpp',
+    'nsCoreUtils.cpp',
+    'nsEventShell.cpp',
+    'nsTextEquivUtils.cpp',
     'SelectionManager.cpp',
     'StyleInfo.cpp',
     'TextAttrs.cpp',
     'TextUpdater.cpp',
     'TreeWalker.cpp',
-    'nsAccUtils.cpp',
-    'nsAccessNode.cpp',
-    'nsAccessibilityService.cpp',
-    'nsAccessiblePivot.cpp',
-    'nsCoreUtils.cpp',
-    'nsEventShell.cpp',
-    'nsTextEquivUtils.cpp',
 ]
 
 if a11y_log:
     CPP_SOURCES += [
         'Logging.cpp',
     ]
 
 LIBRARY_NAME = 'accessibility_base_s'
--- a/accessible/src/generic/moz.build
+++ b/accessible/src/generic/moz.build
@@ -8,19 +8,19 @@ MODULE = 'accessibility'
 
 EXPORTS.mozilla.a11y += [
     'Accessible.h',
     'DocAccessible.h',
     'HyperTextAccessible.h',
 ]
 
 CPP_SOURCES += [
-    'ARIAGridAccessible.cpp',
     'Accessible.cpp',
     'ApplicationAccessible.cpp',
+    'ARIAGridAccessible.cpp',
     'BaseAccessibles.cpp',
     'DocAccessible.cpp',
     'FormControlAccessible.cpp',
     'HyperTextAccessible.cpp',
     'ImageAccessible.cpp',
     'OuterDocAccessible.cpp',
     'RootAccessible.cpp',
     'TableCellAccessible.cpp',
--- a/accessible/src/mac/moz.build
+++ b/accessible/src/mac/moz.build
@@ -16,23 +16,23 @@ EXPORTS.mozilla.a11y += [
 ]
 
 LIBRARY_NAME = 'accessibility_toolkit_s'
 
 CMMSRCS += [
     'AccessibleWrap.mm',
     'DocAccessibleWrap.mm',
     'MacUtils.mm',
-    'Platform.mm',
-    'RootAccessibleWrap.mm',
     'mozAccessible.mm',
     'mozActionElements.mm',
     'mozDocAccessible.mm',
     'mozHTMLAccessible.mm',
     'mozTextAccessible.mm',
+    'Platform.mm',
+    'RootAccessibleWrap.mm',
 ]
 
 LIBXUL_LIBRARY = True
 
 LOCAL_INCLUDES += [
     '../base',
     '../generic',
     '../html',
--- a/accessible/src/windows/msaa/moz.build
+++ b/accessible/src/windows/msaa/moz.build
@@ -12,32 +12,32 @@ EXPORTS += [
 
 EXPORTS.mozilla.a11y += [
     'AccessibleWrap.h',
     'Compatibility.h',
     'HyperTextAccessibleWrap.h',
 ]
 
 CPP_SOURCES += [
-    'ARIAGridAccessibleWrap.cpp',
     'AccessibleWrap.cpp',
     'ApplicationAccessibleWrap.cpp',
+    'ARIAGridAccessibleWrap.cpp',
     'Compatibility.cpp',
     'DocAccessibleWrap.cpp',
     'EnumVariant.cpp',
     'HTMLTableAccessibleWrap.cpp',
     'HTMLWin32ObjectAccessible.cpp',
     'HyperTextAccessibleWrap.cpp',
+    'ImageAccessibleWrap.cpp',
     'IUnknownImpl.cpp',
-    'ImageAccessibleWrap.cpp',
+    'nsWinUtils.cpp',
     'Platform.cpp',
     'RootAccessibleWrap.cpp',
     'ServiceProvider.cpp',
     'TextLeafAccessibleWrap.cpp',
-    'nsWinUtils.cpp',
 ]
 
 if CONFIG['MOZ_XUL']:
     CPP_SOURCES += [
         'XULListboxAccessibleWrap.cpp',
         'XULMenuAccessibleWrap.cpp',
         'XULTreeGridAccessibleWrap.cpp',
     ]
--- a/browser/components/sessionstore/src/moz.build
+++ b/browser/components/sessionstore/src/moz.build
@@ -8,30 +8,30 @@ EXTRA_COMPONENTS += [
     'nsSessionStartup.js',
     'nsSessionStore.js',
     'nsSessionStore.manifest',
 ]
 
 JS_MODULES_PATH = 'modules/sessionstore'
 
 EXTRA_JS_MODULES = [
+    '_SessionFile.jsm',
     'DocShellCapabilities.jsm',
     'DocumentUtils.jsm',
     'Messenger.jsm',
     'PageStyle.jsm',
     'PrivacyLevel.jsm',
     'RecentlyClosedTabsAndWindowsMenuUtils.jsm',
     'SessionCookies.jsm',
     'SessionHistory.jsm',
     'SessionMigration.jsm',
     'SessionStorage.jsm',
     'SessionWorker.js',
     'TabStateCache.jsm',
     'TextAndScrollData.jsm',
     'XPathGenerator.jsm',
-    '_SessionFile.jsm',
 ]
 
 EXTRA_PP_JS_MODULES += [
     'SessionSaver.jsm',
     'SessionStore.jsm',
 ]
 
--- a/browser/metro/components/moz.build
+++ b/browser/metro/components/moz.build
@@ -24,14 +24,14 @@ if CONFIG['MOZ_SAFE_BROWSING']:
     EXTRA_COMPONENTS += [
         'SafeBrowsing.js',
     ]
 
 EXTRA_PP_COMPONENTS += [
     'AboutRedirector.js',
     'BrowserCLH.js',
     'BrowserStartup.js',
+    'components.manifest',
     'DirectoryProvider.js',
     'HelperAppDialog.js',
     'SessionStore.js',
     'Sidebar.js',
-    'components.manifest',
 ]
--- a/browser/metro/modules/moz.build
+++ b/browser/metro/modules/moz.build
@@ -1,13 +1,13 @@
 # -*- 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 += [
+    'colorUtils.jsm',
     'ContentUtil.jsm',
     'CrossSlide.jsm',
     'View.jsm',
-    'colorUtils.jsm',
 ]
 
--- a/browser/modules/moz.build
+++ b/browser/modules/moz.build
@@ -5,24 +5,24 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 TEST_DIRS += ['test']
 
 EXTRA_JS_MODULES += [
     'BrowserNewTabPreloader.jsm',
     'ContentClick.jsm',
     'NetworkPrioritizer.jsm',
+    'offlineAppCache.jsm',
+    'openLocationLastURL.jsm',
     'SharedFrame.jsm',
     'SignInToWebsite.jsm',
     'SitePermissions.jsm',
     'Social.jsm',
     'TabCrashReporter.jsm',
     'UITour.jsm',
-    'offlineAppCache.jsm',
-    'openLocationLastURL.jsm',
     'webappsUI.jsm',
     'webrtcUI.jsm',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     EXTRA_JS_MODULES += [
         'WindowsJumpLists.jsm',
         'WindowsPreviewPerTab.jsm',
--- a/content/base/public/moz.build
+++ b/content/base/public/moz.build
@@ -2,24 +2,24 @@
 # 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/.
 
 XPIDL_SOURCES += [
     'nsIContentPolicy.idl',
     'nsIContentSecurityPolicy.idl',
+    'nsIDocumentEncoder.idl',
     'nsIDOMDataChannel.idl',
     'nsIDOMFile.idl',
     'nsIDOMFileList.idl',
     'nsIDOMFileReader.idl',
     'nsIDOMFormData.idl',
     'nsIDOMParser.idl',
     'nsIDOMSerializer.idl',
-    'nsIDocumentEncoder.idl',
     'nsIDroppedLinkHandler.idl',
     'nsIFrameLoader.idl',
     'nsIImageLoadingContent.idl',
     'nsIMessageManager.idl',
     'nsIObjectLoadingContent.idl',
     'nsIScriptLoaderObserver.idl',
     'nsISelection.idl',
     'nsISelectionController.idl',
@@ -38,19 +38,19 @@ EXPORTS += [
     'mozFlushType.h',
     'nsCaseTreatment.h',
     'nsContentCID.h',
     'nsContentCreatorFunctions.h',
     'nsContentPolicyUtils.h',
     'nsContentTypeParser.h',
     'nsContentUtils.h',
     'nsCopySupport.h',
-    'nsDOMFile.h',
     'nsDeprecatedOperationList.h',
     'nsDocElementCreatedNotificationRunner.h',
+    'nsDOMFile.h',
     'nsHostObjectProtocolHandler.h',
     'nsIAttribute.h',
     'nsIContent.h',
     'nsIContentInlines.h',
     'nsIContentIterator.h',
     'nsIContentSerializer.h',
     'nsIDocument.h',
     'nsIDocumentInlines.h',
--- a/content/base/src/moz.build
+++ b/content/base/src/moz.build
@@ -49,87 +49,83 @@ if CONFIG['MOZ_WEBRTC']:
 if CONFIG['INTEL_ARCHITECTURE']:
     CPP_SOURCES += [
         'nsTextFragmentSSE2.cpp',
     ]
 
 EXPORTS.mozilla.dom += [
     'Attr.h',
     'Comment.h',
+    'DocumentFragment.h',
+    'DocumentType.h',
     'DOMImplementation.h',
     'DOMParser.h',
     'DOMRect.h',
-    'DocumentFragment.h',
-    'DocumentType.h',
     'EventSource.h',
     'Link.h',
     'NodeIterator.h',
     'Text.h',
     'TreeWalker.h',
 ]
 
 CPP_SOURCES += [
     'Attr.cpp',
     'ChildIterator.cpp',
     'Comment.cpp',
+    'DirectionalityUtils.cpp',
+    'DocumentFragment.cpp',
+    'DocumentType.cpp',
     'DOMImplementation.cpp',
     'DOMParser.cpp',
     'DOMRect.cpp',
-    'DirectionalityUtils.cpp',
-    'DocumentFragment.cpp',
-    'DocumentType.cpp',
     'Element.cpp',
     'EventSource.cpp',
     'FileIOObject.cpp',
     'FragmentOrElement.cpp',
     'Link.cpp',
     'NodeIterator.cpp',
-    'Text.cpp',
-    'ThirdPartyUtil.cpp',
-    'TreeWalker.cpp',
-    'WebSocket.cpp',
     'nsAtomListUtils.cpp',
     'nsAttrAndChildArray.cpp',
     'nsAttrValue.cpp',
     'nsAttrValueOrString.cpp',
     'nsCCUncollectableMarker.cpp',
-    'nsCSPService.cpp',
     'nsChannelPolicy.cpp',
     'nsContentAreaDragDrop.cpp',
     'nsContentIterator.cpp',
     'nsContentList.cpp',
     'nsContentPolicy.cpp',
     'nsContentSink.cpp',
     'nsContentUtils.cpp',
     'nsCopySupport.cpp',
     'nsCrossSiteListenerProxy.cpp',
+    'nsCSPService.cpp',
+    'nsDataDocumentContentPolicy.cpp',
+    'nsDocument.cpp',
+    'nsDocumentEncoder.cpp',
     'nsDOMAttributeMap.cpp',
     'nsDOMBlobBuilder.cpp',
     'nsDOMCaretPosition.cpp',
     'nsDOMFile.cpp',
     'nsDOMFileReader.cpp',
     'nsDOMLists.cpp',
     'nsDOMMutationObserver.cpp',
     'nsDOMSerializer.cpp',
     'nsDOMSettableTokenList.cpp',
     'nsDOMTokenList.cpp',
-    'nsDataDocumentContentPolicy.cpp',
-    'nsDocument.cpp',
-    'nsDocumentEncoder.cpp',
     'nsFormData.cpp',
     'nsFrameLoader.cpp',
     'nsFrameMessageManager.cpp',
     'nsGenConImageContent.cpp',
     'nsGenericDOMDataNode.cpp',
     'nsGkAtoms.cpp',
-    'nsHTMLContentSerializer.cpp',
     'nsHostObjectProtocolHandler.cpp',
     'nsHostObjectURI.cpp',
+    'nsHTMLContentSerializer.cpp',
+    'nsImageLoadingContent.cpp',
     'nsINode.cpp',
-    'nsImageLoadingContent.cpp',
     'nsInProcessTabChildGlobal.cpp',
     'nsLineBreaker.cpp',
     'nsMappedAttributeElement.cpp',
     'nsMappedAttributes.cpp',
     'nsMixedContentBlocker.cpp',
     'nsNameSpaceManager.cpp',
     'nsNoDataProtocolContentPolicy.cpp',
     'nsNodeInfo.cpp',
@@ -139,28 +135,32 @@ CPP_SOURCES += [
     'nsPlainTextSerializer.cpp',
     'nsPropertyTable.cpp',
     'nsRange.cpp',
     'nsReferencedElement.cpp',
     'nsScriptElement.cpp',
     'nsScriptLoader.cpp',
     'nsStubDocumentObserver.cpp',
     'nsStubMutationObserver.cpp',
+    'nsStyledElement.cpp',
     'nsStyleLinkElement.cpp',
-    'nsStyledElement.cpp',
     'nsSyncLoadService.cpp',
     'nsTextFragment.cpp',
     'nsTextNode.cpp',
     'nsTraversal.cpp',
     'nsTreeSanitizer.cpp',
     'nsViewportInfo.cpp',
     'nsXHTMLContentSerializer.cpp',
     'nsXMLContentSerializer.cpp',
     'nsXMLHttpRequest.cpp',
     'nsXMLNameSpaceMap.cpp',
+    'Text.cpp',
+    'ThirdPartyUtil.cpp',
+    'TreeWalker.cpp',
+    'WebSocket.cpp',
 ]
 
 EXTRA_COMPONENTS += [
     'contentAreaDropListener.js',
     'contentAreaDropListener.manifest',
     'contentSecurityPolicy.manifest',
     'messageWakeupService.js',
     'messageWakeupService.manifest',
--- a/content/events/src/moz.build
+++ b/content/events/src/moz.build
@@ -20,18 +20,16 @@ EXPORTS.mozilla.dom += [
 ]
 
 if CONFIG['MOZ_WEBSPEECH']:
     EXPORTS.mozilla.dom += ['SpeechRecognitionError.h']
 
 CPP_SOURCES += [
     'DOMWheelEvent.cpp',
     'EventTarget.cpp',
-    'TextComposition.cpp',
-    'Touch.cpp',
     'nsAsyncDOMEvent.cpp',
     'nsContentEventHandler.cpp',
     'nsDOMAnimationEvent.cpp',
     'nsDOMBeforeUnloadEvent.cpp',
     'nsDOMClipboardEvent.cpp',
     'nsDOMCommandEvent.cpp',
     'nsDOMCompositionEvent.cpp',
     'nsDOMDataContainerEvent.cpp',
@@ -57,16 +55,18 @@ CPP_SOURCES += [
     'nsDOMXULCommandEvent.cpp',
     'nsEventDispatcher.cpp',
     'nsEventListenerManager.cpp',
     'nsEventListenerService.cpp',
     'nsEventStateManager.cpp',
     'nsIMEStateManager.cpp',
     'nsPaintRequest.cpp',
     'nsPrivateTextRange.cpp',
+    'TextComposition.cpp',
+    'Touch.cpp',
 ]
 
 if CONFIG['MOZ_WEBSPEECH']:
     CPP_SOURCES += ['SpeechRecognitionError.cpp']
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
--- a/content/html/content/src/moz.build
+++ b/content/html/content/src/moz.build
@@ -10,36 +10,36 @@ EXPORTS += [
     'HTMLPropertiesCollection.h',
     'nsGenericHTMLElement.h',
     'nsHTMLDNSPrefetch.h',
 ]
 
 EXPORTS.mozilla.dom += [
     'HTMLAnchorElement.h',
     'HTMLAreaElement.h',
+    'HTMLBodyElement.h',
     'HTMLBRElement.h',
-    'HTMLBodyElement.h',
     'HTMLButtonElement.h',
     'HTMLDataElement.h',
     'HTMLDataListElement.h',
     'HTMLDivElement.h',
     'HTMLFieldSetElement.h',
     'HTMLFontElement.h',
     'HTMLFormControlsCollection.h',
     'HTMLFormElement.h',
     'HTMLFrameElement.h',
     'HTMLFrameSetElement.h',
+    'HTMLHeadingElement.h',
     'HTMLHRElement.h',
-    'HTMLHeadingElement.h',
     'HTMLIFrameElement.h',
     'HTMLImageElement.h',
     'HTMLInputElement.h',
-    'HTMLLIElement.h',
     'HTMLLabelElement.h',
     'HTMLLegendElement.h',
+    'HTMLLIElement.h',
     'HTMLLinkElement.h',
     'HTMLMapElement.h',
     'HTMLMenuElement.h',
     'HTMLMenuItemElement.h',
     'HTMLMetaElement.h',
     'HTMLMeterElement.h',
     'HTMLModElement.h',
     'HTMLObjectElement.h',
@@ -76,38 +76,38 @@ EXPORTS.mozilla.dom += [
     'UndoManager.h',
     'ValidityState.h',
 ]
 
 CPP_SOURCES += [
     'HTMLAnchorElement.cpp',
     'HTMLAreaElement.cpp',
     'HTMLAudioElement.cpp',
+    'HTMLBodyElement.cpp',
     'HTMLBRElement.cpp',
-    'HTMLBodyElement.cpp',
     'HTMLButtonElement.cpp',
     'HTMLCanvasElement.cpp',
     'HTMLDataElement.cpp',
     'HTMLDataListElement.cpp',
     'HTMLDivElement.cpp',
     'HTMLElement.cpp',
     'HTMLFieldSetElement.cpp',
     'HTMLFontElement.cpp',
     'HTMLFormControlsCollection.cpp',
     'HTMLFormElement.cpp',
     'HTMLFrameElement.cpp',
     'HTMLFrameSetElement.cpp',
+    'HTMLHeadingElement.cpp',
     'HTMLHRElement.cpp',
-    'HTMLHeadingElement.cpp',
     'HTMLIFrameElement.cpp',
     'HTMLImageElement.cpp',
     'HTMLInputElement.cpp',
-    'HTMLLIElement.cpp',
     'HTMLLabelElement.cpp',
     'HTMLLegendElement.cpp',
+    'HTMLLIElement.cpp',
     'HTMLLinkElement.cpp',
     'HTMLMapElement.cpp',
     'HTMLMediaElement.cpp',
     'HTMLMenuElement.cpp',
     'HTMLMenuItemElement.cpp',
     'HTMLMetaElement.cpp',
     'HTMLMeterElement.cpp',
     'HTMLModElement.cpp',
@@ -137,28 +137,28 @@ CPP_SOURCES += [
     'HTMLTemplateElement.cpp',
     'HTMLTextAreaElement.cpp',
     'HTMLTimeElement.cpp',
     'HTMLTitleElement.cpp',
     'HTMLTrackElement.cpp',
     'HTMLUnknownElement.cpp',
     'HTMLVideoElement.cpp',
     'MediaError.cpp',
-    'TextTrackManager.cpp',
-    'TimeRanges.cpp',
-    'UndoManager.cpp',
-    'ValidityState.cpp',
     'nsDOMStringMap.cpp',
     'nsFormSubmission.cpp',
     'nsGenericHTMLElement.cpp',
     'nsGenericHTMLFrameElement.cpp',
     'nsHTMLDNSPrefetch.cpp',
     'nsIConstraintValidation.cpp',
     'nsRadioVisitor.cpp',
     'nsTextEditorState.cpp',
+    'TextTrackManager.cpp',
+    'TimeRanges.cpp',
+    'UndoManager.cpp',
+    'ValidityState.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
--- a/content/html/document/src/moz.build
+++ b/content/html/document/src/moz.build
@@ -14,20 +14,20 @@ EXPORTS.mozilla.dom += [
     'HTMLAllCollection.h',
     'ImageDocument.h',
 ]
 
 CPP_SOURCES += [
     'HTMLAllCollection.cpp',
     'ImageDocument.cpp',
     'MediaDocument.cpp',
+    'nsHTMLContentSink.cpp',
+    'nsHTMLDocument.cpp',
     'PluginDocument.cpp',
     'VideoDocument.cpp',
-    'nsHTMLContentSink.cpp',
-    'nsHTMLDocument.cpp',
 ]
 
 LIBRARY_NAME = 'gkconhtmldoc_s'
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
--- a/content/media/moz.build
+++ b/content/media/moz.build
@@ -61,32 +61,32 @@ EXPORTS += [
     'AudioNodeEngine.h',
     'AudioNodeExternalInputStream.h',
     'AudioNodeStream.h',
     'AudioSampleFormat.h',
     'AudioSegment.h',
     'AudioStream.h',
     'BufferDecoder.h',
     'BufferMediaResource.h',
+    'DecoderTraits.h',
     'DOMMediaStream.h',
-    'DecoderTraits.h',
     'EncodedBufferCache.h',
     'FileBlockCache.h',
     'Latency.h',
-    'MP3FrameParser.h',
     'MediaCache.h',
     'MediaDecoder.h',
     'MediaDecoderOwner.h',
     'MediaDecoderReader.h',
     'MediaDecoderStateMachine.h',
     'MediaMetadataManager.h',
     'MediaRecorder.h',
     'MediaResource.h',
     'MediaSegment.h',
     'MediaStreamGraph.h',
+    'MP3FrameParser.h',
     'RtspMediaResource.h',
     'SharedBuffer.h',
     'StreamBuffer.h',
     'TimeVarying.h',
     'TrackUnionStream.h',
     'VideoFrameContainer.h',
     'VideoSegment.h',
     'VideoUtils.h',
@@ -111,30 +111,30 @@ CPP_SOURCES += [
     'AudioChannelFormat.cpp',
     'AudioNodeEngine.cpp',
     'AudioNodeExternalInputStream.cpp',
     'AudioNodeStream.cpp',
     'AudioSegment.cpp',
     'AudioStream.cpp',
     'AudioStreamTrack.cpp',
     'BufferDecoder.cpp',
+    'DecoderTraits.cpp',
     'DOMMediaStream.cpp',
-    'DecoderTraits.cpp',
     'EncodedBufferCache.cpp',
     'FileBlockCache.cpp',
     'Latency.cpp',
-    'MP3FrameParser.cpp',
     'MediaCache.cpp',
     'MediaDecoder.cpp',
     'MediaDecoderReader.cpp',
     'MediaDecoderStateMachine.cpp',
     'MediaRecorder.cpp',
     'MediaResource.cpp',
     'MediaStreamGraph.cpp',
     'MediaStreamTrack.cpp',
+    'MP3FrameParser.cpp',
     'RtspMediaResource.cpp',
     'StreamBuffer.cpp',
     'TextTrack.cpp',
     'TextTrackCue.cpp',
     'TextTrackCueList.cpp',
     'TextTrackList.cpp',
     'TextTrackRegion.cpp',
     'TextTrackRegionList.cpp',
--- a/content/media/plugins/moz.build
+++ b/content/media/plugins/moz.build
@@ -2,21 +2,21 @@
 # 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/.
 
 MODULE = 'content'
 
 EXPORTS += [
-    'MPAPI.h',
     'MediaPluginDecoder.h',
     'MediaPluginHost.h',
     'MediaPluginReader.h',
     'MediaResourceServer.h',
+    'MPAPI.h',
 ]
 
 CPP_SOURCES += [
     'MediaPluginDecoder.cpp',
     'MediaPluginHost.cpp',
     'MediaPluginReader.cpp',
     'MediaResourceServer.cpp',
 ]
--- a/content/media/webspeech/recognition/moz.build
+++ b/content/media/webspeech/recognition/moz.build
@@ -22,25 +22,25 @@ EXPORTS.mozilla.dom += [
     'SpeechRecognitionResult.h',
     'SpeechRecognitionResultList.h',
     'SpeechStreamListener.h',
     'test/FakeSpeechRecognitionService.h',
 ]
 
 CPP_SOURCES += [
     'EnableWebSpeechRecognitionCheck.cpp',
+    'endpointer.cc',
+    'energy_endpointer.cc',
+    'energy_endpointer_params.cc',
     'SpeechGrammar.cpp',
     'SpeechGrammarList.cpp',
     'SpeechRecognition.cpp',
     'SpeechRecognitionAlternative.cpp',
     'SpeechRecognitionResult.cpp',
     'SpeechRecognitionResultList.cpp',
     'SpeechStreamListener.cpp',
-    'endpointer.cc',
-    'energy_endpointer.cc',
-    'energy_endpointer_params.cc',
     'test/FakeSpeechRecognitionService.cpp',
 ]
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'gkconwebspeechrecognition_s'
 
--- a/content/media/webspeech/synth/moz.build
+++ b/content/media/webspeech/synth/moz.build
@@ -13,34 +13,34 @@ if CONFIG['MOZ_WEBSPEECH']:
     XPIDL_SOURCES += [
         'nsIDOMSpeechSynthesisEvent.idl',
         'nsISpeechService.idl',
         'nsISynthVoiceRegistry.idl'
     ]
 
     EXPORTS.mozilla.dom += [
         'EnableSpeechSynthesisCheck.h',
-        'SpeechSynthesis.h',
-        'SpeechSynthesisUtterance.h',
-        'SpeechSynthesisVoice.h',
         'ipc/SpeechSynthesisChild.h',
         'ipc/SpeechSynthesisParent.h',
         'nsSpeechTask.h',
         'nsSynthVoiceRegistry.h',
+        'SpeechSynthesis.h',
+        'SpeechSynthesisUtterance.h',
+        'SpeechSynthesisVoice.h',
     ]
 
     CPP_SOURCES += [
         'EnableSpeechSynthesisCheck.cpp',
-        'SpeechSynthesis.cpp',
-        'SpeechSynthesisUtterance.cpp',
-        'SpeechSynthesisVoice.cpp',
         'ipc/SpeechSynthesisChild.cpp',
         'ipc/SpeechSynthesisParent.cpp',
         'nsSpeechTask.cpp',
         'nsSynthVoiceRegistry.cpp',
+        'SpeechSynthesis.cpp',
+        'SpeechSynthesisUtterance.cpp',
+        'SpeechSynthesisVoice.cpp',
     ]
 
     if CONFIG['MOZ_SYNTH_PICO']:
         PARALLEL_DIRS = ['pico']
 
 IPDL_SOURCES += [
     'ipc/PSpeechSynthesis.ipdl',
     'ipc/PSpeechSynthesisRequest.ipdl',
--- a/content/media/webspeech/synth/pico/moz.build
+++ b/content/media/webspeech/synth/pico/moz.build
@@ -2,16 +2,16 @@
 # 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/.
 
 MODULE = 'synthpico'
 
 CPP_SOURCES += [
-    'PicoModule.cpp',
-    'nsPicoService.cpp'
+    'nsPicoService.cpp',
+    'PicoModule.cpp'
 ]
 
 LIBRARY_NAME = 'synthpico'
 LIBXUL_LIBRARY = True
 EXPORT_LIBRARY = True
 FAIL_ON_WARNINGS = True
--- a/content/smil/moz.build
+++ b/content/smil/moz.build
@@ -9,61 +9,61 @@ TEST_TOOL_DIRS += ['test']
 MODULE = 'content'
 
 EXPORTS += [
     'nsDOMTimeEvent.h',
     'nsISMILAttr.h',
     'nsISMILType.h',
     'nsSMILAnimationController.h',
     'nsSMILAnimationFunction.h',
+    'nsSMILCompositorTable.h',
     'nsSMILCSSProperty.h',
-    'nsSMILCompositorTable.h',
     'nsSMILInstanceTime.h',
     'nsSMILInterval.h',
     'nsSMILKeySpline.h',
     'nsSMILMappedAttribute.h',
     'nsSMILMilestone.h',
     'nsSMILNullType.h',
     'nsSMILRepeatCount.h',
     'nsSMILSetAnimationFunction.h',
     'nsSMILTargetIdentifier.h',
     'nsSMILTimeContainer.h',
+    'nsSMILTimedElement.h',
     'nsSMILTimeValue.h',
     'nsSMILTimeValueSpec.h',
     'nsSMILTimeValueSpecParams.h',
-    'nsSMILTimedElement.h',
     'nsSMILTypes.h',
     'nsSMILValue.h',
 ]
 
 CPP_SOURCES += [
-    'SMILBoolType.cpp',
-    'SMILEnumType.cpp',
-    'SMILIntegerType.cpp',
-    'SMILStringType.cpp',
     'nsDOMTimeEvent.cpp',
     'nsSMILAnimationController.cpp',
     'nsSMILAnimationFunction.cpp',
+    'nsSMILCompositor.cpp',
     'nsSMILCSSProperty.cpp',
     'nsSMILCSSValueType.cpp',
-    'nsSMILCompositor.cpp',
     'nsSMILFloatType.cpp',
     'nsSMILInstanceTime.cpp',
     'nsSMILInterval.cpp',
     'nsSMILKeySpline.cpp',
     'nsSMILMappedAttribute.cpp',
     'nsSMILNullType.cpp',
     'nsSMILParserUtils.cpp',
     'nsSMILRepeatCount.cpp',
     'nsSMILSetAnimationFunction.cpp',
     'nsSMILTimeContainer.cpp',
+    'nsSMILTimedElement.cpp',
     'nsSMILTimeValue.cpp',
     'nsSMILTimeValueSpec.cpp',
-    'nsSMILTimedElement.cpp',
     'nsSMILValue.cpp',
+    'SMILBoolType.cpp',
+    'SMILEnumType.cpp',
+    'SMILIntegerType.cpp',
+    'SMILStringType.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'gkconsmil_s'
 
--- a/content/svg/content/src/moz.build
+++ b/content/svg/content/src/moz.build
@@ -2,40 +2,41 @@
 # 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/.
 
 MODULE = 'content'
 
 EXPORTS += [
-    'SVGAttrValueWrapper.h',
-    'SVGPreserveAspectRatio.h',
-    'SVGStringList.h',
     'nsSVGClass.h',
     'nsSVGElement.h',
     'nsSVGFeatures.h',
+    'SVGAttrValueWrapper.h',
+    'SVGPreserveAspectRatio.h',
+    'SVGStringList.h',
 ]
 
 EXPORTS.mozilla.dom += [
+    'nsSVGAnimatedTransformList.h',
     'SVGAElement.h',
     'SVGAltGlyphElement.h',
     'SVGAngle.h',
-    'SVGAnimateElement.h',
-    'SVGAnimateMotionElement.h',
-    'SVGAnimateTransformElement.h',
     'SVGAnimatedAngle.h',
     'SVGAnimatedBoolean.h',
     'SVGAnimatedEnumeration.h',
     'SVGAnimatedInteger.h',
     'SVGAnimatedLength.h',
     'SVGAnimatedNumber.h',
     'SVGAnimatedRect.h',
     'SVGAnimatedString.h',
     'SVGAnimatedTransformList.h',
+    'SVGAnimateElement.h',
+    'SVGAnimateMotionElement.h',
+    'SVGAnimateTransformElement.h',
     'SVGAnimationElement.h',
     'SVGCircleElement.h',
     'SVGClipPathElement.h',
     'SVGComponentTransferFunctionElement.h',
     'SVGDefsElement.h',
     'SVGDescElement.h',
     'SVGEllipseElement.h',
     'SVGFEBlendElement.h',
@@ -58,85 +59,105 @@ EXPORTS.mozilla.dom += [
     'SVGFESpotLightElement.h',
     'SVGFETileElement.h',
     'SVGFETurbulenceElement.h',
     'SVGFilterElement.h',
     'SVGForeignObjectElement.h',
     'SVGGElement.h',
     'SVGGradientElement.h',
     'SVGGraphicsElement.h',
+    'SVGImageElement.h',
     'SVGIRect.h',
-    'SVGImageElement.h',
     'SVGLineElement.h',
-    'SVGMPathElement.h',
     'SVGMarkerElement.h',
     'SVGMaskElement.h',
     'SVGMatrix.h',
     'SVGMetadataElement.h',
+    'SVGMPathElement.h',
     'SVGPathElement.h',
     'SVGPatternElement.h',
     'SVGPolygonElement.h',
     'SVGPolylineElement.h',
     'SVGRect.h',
     'SVGRectElement.h',
-    'SVGSVGElement.h',
     'SVGScriptElement.h',
     'SVGSetElement.h',
     'SVGStopElement.h',
     'SVGStyleElement.h',
+    'SVGSVGElement.h',
     'SVGSwitchElement.h',
     'SVGSymbolElement.h',
-    'SVGTSpanElement.h',
     'SVGTests.h',
     'SVGTextContentElement.h',
     'SVGTextElement.h',
     'SVGTextPathElement.h',
     'SVGTextPositioningElement.h',
     'SVGTitleElement.h',
     'SVGTransform.h',
     'SVGTransformableElement.h',
+    'SVGTSpanElement.h',
     'SVGUseElement.h',
     'SVGViewElement.h',
     'SVGZoomEvent.h',
-    'nsSVGAnimatedTransformList.h',
 ]
 
 CPP_SOURCES += [
     'DOMSVGAnimatedLengthList.cpp',
     'DOMSVGAnimatedNumberList.cpp',
     'DOMSVGLength.cpp',
     'DOMSVGLengthList.cpp',
     'DOMSVGNumber.cpp',
     'DOMSVGNumberList.cpp',
     'DOMSVGPathSeg.cpp',
     'DOMSVGPathSegList.cpp',
     'DOMSVGPoint.cpp',
     'DOMSVGPointList.cpp',
     'DOMSVGStringList.cpp',
     'DOMSVGTransformList.cpp',
+    'nsISVGPoint.cpp',
+    'nsSVGAngle.cpp',
+    'nsSVGAnimatedTransformList.cpp',
+    'nsSVGBoolean.cpp',
+    'nsSVGClass.cpp',
+    'nsSVGDataParser.cpp',
+    'nsSVGElement.cpp',
+    'nsSVGEnum.cpp',
+    'nsSVGFeatures.cpp',
+    'nsSVGFilters.cpp',
+    'nsSVGInteger.cpp',
+    'nsSVGIntegerPair.cpp',
+    'nsSVGLength2.cpp',
+    'nsSVGNumber2.cpp',
+    'nsSVGNumberPair.cpp',
+    'nsSVGPathDataParser.cpp',
+    'nsSVGPathGeometryElement.cpp',
+    'nsSVGPolyElement.cpp',
+    'nsSVGString.cpp',
+    'nsSVGTransform.cpp',
+    'nsSVGViewBox.cpp',
     'SVGAElement.cpp',
     'SVGAltGlyphElement.cpp',
     'SVGAngle.cpp',
-    'SVGAnimateElement.cpp',
-    'SVGAnimateMotionElement.cpp',
-    'SVGAnimateTransformElement.cpp',
     'SVGAnimatedAngle.cpp',
     'SVGAnimatedBoolean.cpp',
     'SVGAnimatedEnumeration.cpp',
     'SVGAnimatedInteger.cpp',
     'SVGAnimatedLength.cpp',
     'SVGAnimatedLengthList.cpp',
     'SVGAnimatedNumber.cpp',
     'SVGAnimatedNumberList.cpp',
     'SVGAnimatedPathSegList.cpp',
     'SVGAnimatedPointList.cpp',
     'SVGAnimatedPreserveAspectRatio.cpp',
     'SVGAnimatedRect.cpp',
     'SVGAnimatedString.cpp',
     'SVGAnimatedTransformList.cpp',
+    'SVGAnimateElement.cpp',
+    'SVGAnimateMotionElement.cpp',
+    'SVGAnimateTransformElement.cpp',
     'SVGAnimationElement.cpp',
     'SVGAttrValueWrapper.cpp',
     'SVGCircleElement.cpp',
     'SVGClipPathElement.cpp',
     'SVGContentUtils.cpp',
     'SVGDefsElement.cpp',
     'SVGDescElement.cpp',
     'SVGElementFactory.cpp',
@@ -168,86 +189,65 @@ CPP_SOURCES += [
     'SVGGradientElement.cpp',
     'SVGGraphicsElement.cpp',
     'SVGImageElement.cpp',
     'SVGIntegerPairSMILType.cpp',
     'SVGLength.cpp',
     'SVGLengthList.cpp',
     'SVGLengthListSMILType.cpp',
     'SVGLineElement.cpp',
-    'SVGMPathElement.cpp',
     'SVGMarkerElement.cpp',
     'SVGMaskElement.cpp',
     'SVGMatrix.cpp',
     'SVGMetadataElement.cpp',
     'SVGMotionSMILAnimationFunction.cpp',
     'SVGMotionSMILAttr.cpp',
     'SVGMotionSMILPathUtils.cpp',
     'SVGMotionSMILType.cpp',
+    'SVGMPathElement.cpp',
     'SVGNumberList.cpp',
     'SVGNumberListSMILType.cpp',
     'SVGNumberPairSMILType.cpp',
     'SVGOrientSMILType.cpp',
     'SVGPathData.cpp',
     'SVGPathElement.cpp',
     'SVGPathSegListSMILType.cpp',
     'SVGPathSegUtils.cpp',
     'SVGPatternElement.cpp',
     'SVGPointList.cpp',
     'SVGPointListSMILType.cpp',
     'SVGPolygonElement.cpp',
     'SVGPolylineElement.cpp',
     'SVGPreserveAspectRatio.cpp',
     'SVGRect.cpp',
     'SVGRectElement.cpp',
-    'SVGSVGElement.cpp',
     'SVGScriptElement.cpp',
     'SVGSetElement.cpp',
     'SVGStopElement.cpp',
     'SVGStringList.cpp',
     'SVGStyleElement.cpp',
+    'SVGSVGElement.cpp',
     'SVGSwitchElement.cpp',
     'SVGSymbolElement.cpp',
-    'SVGTSpanElement.cpp',
     'SVGTests.cpp',
     'SVGTextContentElement.cpp',
     'SVGTextElement.cpp',
     'SVGTextPathElement.cpp',
     'SVGTextPositioningElement.cpp',
     'SVGTitleElement.cpp',
     'SVGTransform.cpp',
+    'SVGTransformableElement.cpp',
     'SVGTransformList.cpp',
     'SVGTransformListParser.cpp',
     'SVGTransformListSMILType.cpp',
-    'SVGTransformableElement.cpp',
+    'SVGTSpanElement.cpp',
     'SVGUseElement.cpp',
     'SVGViewBoxSMILType.cpp',
     'SVGViewElement.cpp',
     'SVGZoomEvent.cpp',
-    'nsISVGPoint.cpp',
-    'nsSVGAngle.cpp',
-    'nsSVGAnimatedTransformList.cpp',
-    'nsSVGBoolean.cpp',
-    'nsSVGClass.cpp',
-    'nsSVGDataParser.cpp',
-    'nsSVGElement.cpp',
-    'nsSVGEnum.cpp',
-    'nsSVGFeatures.cpp',
-    'nsSVGFilters.cpp',
-    'nsSVGInteger.cpp',
-    'nsSVGIntegerPair.cpp',
-    'nsSVGLength2.cpp',
-    'nsSVGNumber2.cpp',
-    'nsSVGNumberPair.cpp',
-    'nsSVGPathDataParser.cpp',
-    'nsSVGPathGeometryElement.cpp',
-    'nsSVGPolyElement.cpp',
-    'nsSVGString.cpp',
-    'nsSVGTransform.cpp',
-    'nsSVGViewBox.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'gkcontentsvg_s'
 
--- a/content/xbl/src/moz.build
+++ b/content/xbl/src/moz.build
@@ -12,33 +12,33 @@ EXPORTS += [
     'nsXBLService.h',
 ]
 
 EXPORTS.mozilla.dom += [
     'XBLChildrenElement.h',
 ]
 
 CPP_SOURCES += [
-    'XBLChildrenElement.cpp',
     'nsBindingManager.cpp',
     'nsXBLBinding.cpp',
     'nsXBLContentSink.cpp',
     'nsXBLDocumentInfo.cpp',
     'nsXBLEventHandler.cpp',
     'nsXBLProtoImpl.cpp',
     'nsXBLProtoImplField.cpp',
     'nsXBLProtoImplMethod.cpp',
     'nsXBLProtoImplProperty.cpp',
     'nsXBLPrototypeBinding.cpp',
     'nsXBLPrototypeHandler.cpp',
     'nsXBLPrototypeResources.cpp',
     'nsXBLResourceLoader.cpp',
     'nsXBLSerialize.cpp',
     'nsXBLService.cpp',
     'nsXBLWindowKeyHandler.cpp',
+    'XBLChildrenElement.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
--- a/content/xml/content/src/moz.build
+++ b/content/xml/content/src/moz.build
@@ -3,26 +3,26 @@
 # 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/.
 
 MODULE = 'content'
 
 EXPORTS.mozilla.dom += [
     'CDATASection.h',
+    'nsXMLElement.h',
     'ProcessingInstruction.h',
     'XMLStylesheetProcessingInstruction.h',
-    'nsXMLElement.h',
 ]
 
 CPP_SOURCES += [
     'CDATASection.cpp',
+    'nsXMLElement.cpp',
     'ProcessingInstruction.cpp',
     'XMLStylesheetProcessingInstruction.cpp',
-    'nsXMLElement.cpp',
 ]
 
 LIBRARY_NAME = 'gkconxmlcon_s'
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
--- a/content/xml/document/src/moz.build
+++ b/content/xml/document/src/moz.build
@@ -6,20 +6,20 @@
 
 MODULE = 'content'
 
 EXPORTS.mozilla.dom += [
     'XMLDocument.h',
 ]
 
 CPP_SOURCES += [
-    'XMLDocument.cpp',
     'nsXMLContentSink.cpp',
     'nsXMLFragmentContentSink.cpp',
     'nsXMLPrettyPrinter.cpp',
+    'XMLDocument.cpp',
 ]
 
 LIBRARY_NAME = 'gkconxmldoc_s'
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
--- a/content/xslt/src/xpath/moz.build
+++ b/content/xslt/src/xpath/moz.build
@@ -6,54 +6,54 @@
 
 MODULE = 'transformiix'
 
 EXPORTS.mozilla.dom += [
     'XPathEvaluator.h',
 ]
 
 CPP_SOURCES += [
-    'XPathEvaluator.cpp',
     'nsXPathExpression.cpp',
     'nsXPathNSResolver.cpp',
     'nsXPathResult.cpp',
     'txBooleanExpr.cpp',
     'txBooleanResult.cpp',
     'txCoreFunctionCall.cpp',
     'txErrorExpr.cpp',
     'txExpr.cpp',
     'txExprLexer.cpp',
     'txExprParser.cpp',
     'txFilterExpr.cpp',
     'txForwardContext.cpp',
     'txFunctionCall.cpp',
     'txLiteralExpr.cpp',
     'txLocationStep.cpp',
     'txMozillaXPathTreeWalker.cpp',
+    'txNamedAttributeStep.cpp',
     'txNameTest.cpp',
-    'txNamedAttributeStep.cpp',
     'txNodeSet.cpp',
     'txNodeSetAdaptor.cpp',
     'txNodeSetContext.cpp',
     'txNodeTypeTest.cpp',
     'txNumberExpr.cpp',
     'txNumberResult.cpp',
     'txPathExpr.cpp',
+    'txPredicatedNodeTest.cpp',
     'txPredicateList.cpp',
-    'txPredicatedNodeTest.cpp',
     'txRelationalExpr.cpp',
     'txResultRecycler.cpp',
     'txRootExpr.cpp',
     'txStringResult.cpp',
     'txUnaryExpr.cpp',
     'txUnionExpr.cpp',
     'txUnionNodeTest.cpp',
     'txVariableRefExpr.cpp',
+    'txXPathOptimizer.cpp',
     'txXPCOMExtensionFunction.cpp',
-    'txXPathOptimizer.cpp',
+    'XPathEvaluator.cpp',
 ]
 
 LIBRARY_NAME = 'txxpath_s'
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
--- a/content/xslt/src/xslt/moz.build
+++ b/content/xslt/src/xslt/moz.build
@@ -5,18 +5,18 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'transformiix'
 
 CPP_SOURCES += [
     'txBufferingHandler.cpp',
     'txCurrentFunctionCall.cpp',
     'txDocumentFunctionCall.cpp',
+    'txExecutionState.cpp',
     'txEXSLTFunctions.cpp',
-    'txExecutionState.cpp',
     'txFormatNumberFunctionCall.cpp',
     'txGenerateIdFunctionCall.cpp',
     'txInstructions.cpp',
     'txKeyFunctionCall.cpp',
     'txMozillaStylesheetCompiler.cpp',
     'txMozillaTextOutput.cpp',
     'txMozillaXMLOutput.cpp',
     'txMozillaXSLTProcessor.cpp',
--- a/content/xul/document/src/moz.build
+++ b/content/xul/document/src/moz.build
@@ -7,21 +7,21 @@
 MODULE = 'xuldoc'
 
 CPP_SOURCES += [
     'nsXULControllers.cpp',
 ]
 
 if CONFIG['MOZ_XUL']:
     CPP_SOURCES += [
-        'XULDocument.cpp',
         'nsXULCommandDispatcher.cpp',
         'nsXULContentSink.cpp',
         'nsXULPrototypeCache.cpp',
         'nsXULPrototypeDocument.cpp',
+        'XULDocument.cpp',
     ]
 
 LIBRARY_NAME = 'gkconxuldoc_s'
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
--- a/docshell/base/moz.build
+++ b/docshell/base/moz.build
@@ -31,40 +31,40 @@ XPIDL_SOURCES += [
     'nsIWebNavigation.idl',
     'nsIWebNavigationInfo.idl',
     'nsIWebPageDescriptor.idl',
 ]
 
 MODULE = 'docshell'
 
 EXPORTS += [
-    'SerializedLoadContext.h',
     'nsDocShellLoadTypes.h',
     'nsILinkHandler.h',
     'nsIWebShellServices.h',
+    'SerializedLoadContext.h',
 ]
 
 EXPORTS.mozilla += [
     'IHistory.h',
     'LoadContext.h',
 ]
 
 CPP_SOURCES += [
     'LoadContext.cpp',
-    'SerializedLoadContext.cpp',
     'nsAboutRedirector.cpp',
-    'nsDSURIContentListener.cpp',
     'nsDefaultURIFixup.cpp',
     'nsDocShell.cpp',
     'nsDocShellEditorData.cpp',
     'nsDocShellEnumerator.cpp',
     'nsDocShellLoadInfo.cpp',
     'nsDocShellTransferableHooks.cpp',
     'nsDownloadHistory.cpp',
+    'nsDSURIContentListener.cpp',
     'nsWebNavigationInfo.cpp',
+    'SerializedLoadContext.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
--- a/docshell/shistory/public/moz.build
+++ b/docshell/shistory/public/moz.build
@@ -3,16 +3,16 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'nsIBFCacheEntry.idl',
     'nsISHContainer.idl',
     'nsISHEntry.idl',
-    'nsISHTransaction.idl',
     'nsISHistory.idl',
     'nsISHistoryInternal.idl',
     'nsISHistoryListener.idl',
+    'nsISHTransaction.idl',
 ]
 
 MODULE = 'shistory'
 
--- a/docshell/shistory/src/moz.build
+++ b/docshell/shistory/src/moz.build
@@ -8,18 +8,18 @@ MODULE = 'shistory'
 
 EXPORTS += [
     'nsSHEntryShared.h',
 ]
 
 CPP_SOURCES += [
     'nsSHEntry.cpp',
     'nsSHEntryShared.cpp',
+    'nsSHistory.cpp',
     'nsSHTransaction.cpp',
-    'nsSHistory.cpp',
 ]
 
 LIBRARY_NAME = 'shistory_s'
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@@ -35,19 +35,19 @@ EXPORTS += [
     'nsIScriptExternalNameSet.h',
     'nsIScriptGlobalObject.h',
     'nsIScriptGlobalObjectOwner.h',
     'nsIScriptNameSpaceManager.h',
     'nsIScriptObjectPrincipal.h',
     'nsIScriptTimeoutHandler.h',
     'nsJSEnvironment.h',
     'nsJSUtils.h',
+    'nsPerformance.h',
     'nsPIDOMWindow.h',
     'nsPIWindowRoot.h',
-    'nsPerformance.h',
     'nsStructuredCloneContainer.h',
     'nsWindowMemoryReporter.h',
     'nsWrapperCache.h',
     'nsWrapperCacheInlines.h',
 ]
 
 EXPORTS.mozilla.dom += [
     'BarProps.h',
@@ -70,18 +70,16 @@ CPP_SOURCES += [
     'DOMCursor.cpp',
     'DOMError.cpp',
     'DOMException.cpp',
     'DOMRequest.cpp',
     'MessageChannel.cpp',
     'MessagePort.cpp',
     'MessagePortList.cpp',
     'Navigator.cpp',
-    'URL.cpp',
-    'WindowNamedPropertiesHandler.cpp',
     'nsContentPermissionHelper.cpp',
     'nsDOMClassInfo.cpp',
     'nsDOMNavigationTiming.cpp',
     'nsDOMScriptObjectFactory.cpp',
     'nsDOMWindowList.cpp',
     'nsDOMWindowUtils.cpp',
     'nsFocusManager.cpp',
     'nsGlobalWindow.cpp',
@@ -96,16 +94,18 @@ CPP_SOURCES += [
     'nsPluginArray.cpp',
     'nsQueryContentEventResult.cpp',
     'nsScreen.cpp',
     'nsScriptNameSpaceManager.cpp',
     'nsStructuredCloneContainer.cpp',
     'nsWindowMemoryReporter.cpp',
     'nsWindowRoot.cpp',
     'nsWrapperCache.cpp',
+    'URL.cpp',
+    'WindowNamedPropertiesHandler.cpp',
 ]
 
 EXTRA_COMPONENTS += [
     'ConsoleAPI.js',
     'ConsoleAPI.manifest',
     'SiteSpecificUserAgent.js',
     'SiteSpecificUserAgent.manifest',
 ]
--- a/dom/bindings/moz.build
+++ b/dom/bindings/moz.build
@@ -12,20 +12,20 @@ EXPORTS.mozilla += [
 
 EXPORTS.mozilla.dom += [
     'AtomList.h',
     'BindingDeclarations.h',
     'BindingUtils.h',
     'CallbackFunction.h',
     'CallbackInterface.h',
     'CallbackObject.h',
+    'Date.h',
     'DOMJSClass.h',
     'DOMJSProxyHandler.h',
     'DOMString.h',
-    'Date.h',
     'Errors.msg',
     'Exceptions.h',
     'JSSlots.h',
     'NonRefcountedDOMObject.h',
     'Nullable.h',
     'OwningNonNull.h',
     'PrimitiveConversions.h',
     'RootedDictionary.h',
--- a/dom/bluetooth/moz.build
+++ b/dom/bluetooth/moz.build
@@ -36,20 +36,20 @@ if CONFIG['MOZ_B2G_BT']:
         'BluetoothProfileController.cpp',
         'BluetoothPropertyContainer.cpp',
         'BluetoothReplyRunnable.cpp',
         'BluetoothService.cpp',
         'BluetoothSocket.cpp',
         'BluetoothUnixSocketConnector.cpp',
         'BluetoothUtils.cpp',
         'BluetoothUuid.cpp',
-        'ObexBase.cpp',
         'ipc/BluetoothChild.cpp',
         'ipc/BluetoothParent.cpp',
-        'ipc/BluetoothServiceChildProcess.cpp'
+        'ipc/BluetoothServiceChildProcess.cpp',
+        'ObexBase.cpp'
     ]
 
     if CONFIG['MOZ_B2G_RIL']:
         CPP_SOURCES += [
             'BluetoothRilListener.cpp',
         ]
 
     if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
--- a/dom/icc/interfaces/moz.build
+++ b/dom/icc/interfaces/moz.build
@@ -1,14 +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/.
 
 XPIDL_SOURCES += [
-    'SimToolKit.idl',
     'nsIDOMIccInfo.idl',
     'nsIDOMIccManager.idl',
     'nsIIccProvider.idl',
+    'SimToolKit.idl',
 ]
 
 XPIDL_MODULE = 'dom_icc'
--- a/dom/interfaces/base/moz.build
+++ b/dom/interfaces/base/moz.build
@@ -7,21 +7,21 @@
 XPIDL_SOURCES += [
     'domstubs.idl',
     'nsIBrowserDOMWindow.idl',
     'nsICompositionStringSynthesizer.idl',
     'nsIContentPermissionPrompt.idl',
     'nsIContentPrefService.idl',
     'nsIContentPrefService2.idl',
     'nsIContentURIGrouper.idl',
-    'nsIDOMCRMFObject.idl',
     'nsIDOMChromeWindow.idl',
     'nsIDOMClientRect.idl',
     'nsIDOMClientRectList.idl',
     'nsIDOMConstructor.idl',
+    'nsIDOMCRMFObject.idl',
     'nsIDOMGlobalObjectConstructor.idl',
     'nsIDOMGlobalPropertyInitializer.idl',
     'nsIDOMHistory.idl',
     'nsIDOMJSWindow.idl',
     'nsIDOMLocation.idl',
     'nsIDOMMediaQueryList.idl',
     'nsIDOMModalContentWindow.idl',
     'nsIDOMNavigator.idl',
--- a/dom/interfaces/core/moz.build
+++ b/dom/interfaces/core/moz.build
@@ -4,27 +4,27 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'nsIDOMAttr.idl',
     'nsIDOMCDATASection.idl',
     'nsIDOMCharacterData.idl',
     'nsIDOMComment.idl',
-    'nsIDOMDOMException.idl',
-    'nsIDOMDOMImplementation.idl',
-    'nsIDOMDOMStringList.idl',
     'nsIDOMDocument.idl',
     'nsIDOMDocumentFragment.idl',
     'nsIDOMDocumentType.idl',
+    'nsIDOMDOMException.idl',
+    'nsIDOMDOMImplementation.idl',
+    'nsIDOMDOMStringList.idl',
     'nsIDOMElement.idl',
     'nsIDOMMozNamedAttrMap.idl',
-    'nsIDOMNSEditableElement.idl',
     'nsIDOMNode.idl',
     'nsIDOMNodeList.idl',
+    'nsIDOMNSEditableElement.idl',
     'nsIDOMProcessingInstruction.idl',
     'nsIDOMText.idl',
     'nsIDOMUserDataHandler.idl',
     'nsIDOMXMLDocument.idl',
     'nsIInlineEventHandlers.idl',
 ]
 
 XPIDL_MODULE = 'dom_core'
--- a/dom/interfaces/css/moz.build
+++ b/dom/interfaces/css/moz.build
@@ -1,15 +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/.
 
 XPIDL_SOURCES += [
+    'nsIDOMCounter.idl',
     'nsIDOMCSSCharsetRule.idl',
     'nsIDOMCSSConditionRule.idl',
     'nsIDOMCSSFontFaceRule.idl',
     'nsIDOMCSSFontFeatureValuesRule.idl',
     'nsIDOMCSSGroupingRule.idl',
     'nsIDOMCSSImportRule.idl',
     'nsIDOMCSSMediaRule.idl',
     'nsIDOMCSSMozDocumentRule.idl',
@@ -19,17 +20,16 @@ XPIDL_SOURCES += [
     'nsIDOMCSSRuleList.idl',
     'nsIDOMCSSStyleDeclaration.idl',
     'nsIDOMCSSStyleRule.idl',
     'nsIDOMCSSStyleSheet.idl',
     'nsIDOMCSSSupportsRule.idl',
     'nsIDOMCSSUnknownRule.idl',
     'nsIDOMCSSValue.idl',
     'nsIDOMCSSValueList.idl',
-    'nsIDOMCounter.idl',
     'nsIDOMElementCSSInlineStyle.idl',
     'nsIDOMMozCSSKeyframeRule.idl',
     'nsIDOMMozCSSKeyframesRule.idl',
     'nsIDOMRect.idl',
 ]
 
 XPIDL_MODULE = 'dom_css'
 
--- a/dom/interfaces/events/moz.build
+++ b/dom/interfaces/events/moz.build
@@ -7,36 +7,36 @@
 XPIDL_SOURCES += [
     'nsIDOMAnimationEvent.idl',
     'nsIDOMBeforeUnloadEvent.idl',
     'nsIDOMClipboardEvent.idl',
     'nsIDOMCloseEvent.idl',
     'nsIDOMCommandEvent.idl',
     'nsIDOMCompositionEvent.idl',
     'nsIDOMCustomEvent.idl',
-    'nsIDOMDOMTransactionEvent.idl',
     'nsIDOMDataContainerEvent.idl',
     'nsIDOMDataTransfer.idl',
     'nsIDOMDeviceMotionEvent.idl',
     'nsIDOMDeviceOrientationEvent.idl',
+    'nsIDOMDOMTransactionEvent.idl',
     'nsIDOMDragEvent.idl',
     'nsIDOMElementReplaceEvent.idl',
     'nsIDOMEvent.idl',
     'nsIDOMEventListener.idl',
     'nsIDOMEventTarget.idl',
     'nsIDOMFocusEvent.idl',
     'nsIDOMHashChangeEvent.idl',
     'nsIDOMKeyEvent.idl',
     'nsIDOMMessageEvent.idl',
     'nsIDOMMouseEvent.idl',
     'nsIDOMMouseScrollEvent.idl',
     'nsIDOMMutationEvent.idl',
-    'nsIDOMNSEvent.idl',
     'nsIDOMNotifyAudioAvailableEvent.idl',
     'nsIDOMNotifyPaintEvent.idl',
+    'nsIDOMNSEvent.idl',
     'nsIDOMPageTransitionEvent.idl',
     'nsIDOMPaintRequest.idl',
     'nsIDOMPopStateEvent.idl',
     'nsIDOMPopupBlockedEvent.idl',
     'nsIDOMProgressEvent.idl',
     'nsIDOMRecordErrorEvent.idl',
     'nsIDOMScrollAreaEvent.idl',
     'nsIDOMSimpleGestureEvent.idl',
--- a/dom/interfaces/html/moz.build
+++ b/dom/interfaces/html/moz.build
@@ -4,49 +4,49 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'nsIDOMHTMLAnchorElement.idl',
     'nsIDOMHTMLAppletElement.idl',
     'nsIDOMHTMLAreaElement.idl',
     'nsIDOMHTMLAudioElement.idl',
-    'nsIDOMHTMLBRElement.idl',
     'nsIDOMHTMLBaseElement.idl',
     'nsIDOMHTMLBodyElement.idl',
+    'nsIDOMHTMLBRElement.idl',
     'nsIDOMHTMLButtonElement.idl',
     'nsIDOMHTMLByteRanges.idl',
     'nsIDOMHTMLCanvasElement.idl',
     'nsIDOMHTMLCollection.idl',
     'nsIDOMHTMLDirectoryElement.idl',
     'nsIDOMHTMLDivElement.idl',
     'nsIDOMHTMLDocument.idl',
     'nsIDOMHTMLElement.idl',
     'nsIDOMHTMLEmbedElement.idl',
     'nsIDOMHTMLFieldSetElement.idl',
     'nsIDOMHTMLFormElement.idl',
     'nsIDOMHTMLFrameElement.idl',
     'nsIDOMHTMLFrameSetElement.idl',
-    'nsIDOMHTMLHRElement.idl',
     'nsIDOMHTMLHeadElement.idl',
     'nsIDOMHTMLHeadingElement.idl',
+    'nsIDOMHTMLHRElement.idl',
     'nsIDOMHTMLHtmlElement.idl',
     'nsIDOMHTMLIFrameElement.idl',
     'nsIDOMHTMLImageElement.idl',
     'nsIDOMHTMLInputElement.idl',
+    'nsIDOMHTMLLabelElement.idl',
     'nsIDOMHTMLLIElement.idl',
-    'nsIDOMHTMLLabelElement.idl',
     'nsIDOMHTMLLinkElement.idl',
     'nsIDOMHTMLMapElement.idl',
     'nsIDOMHTMLMediaElement.idl',
     'nsIDOMHTMLMenuElement.idl',
     'nsIDOMHTMLMenuItemElement.idl',
     'nsIDOMHTMLMetaElement.idl',
+    'nsIDOMHTMLObjectElement.idl',
     'nsIDOMHTMLOListElement.idl',
-    'nsIDOMHTMLObjectElement.idl',
     'nsIDOMHTMLOptGroupElement.idl',
     'nsIDOMHTMLOptionElement.idl',
     'nsIDOMHTMLOptionsCollection.idl',
     'nsIDOMHTMLParagraphElement.idl',
     'nsIDOMHTMLPreElement.idl',
     'nsIDOMHTMLQuoteElement.idl',
     'nsIDOMHTMLScriptElement.idl',
     'nsIDOMHTMLSelectElement.idl',
--- a/dom/interfaces/xpath/moz.build
+++ b/dom/interfaces/xpath/moz.build
@@ -3,17 +3,17 @@
 # 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/.
 
 XPIDL_SOURCES += [
     'nsIDOMNSXPathExpression.idl',
     'nsIDOMXPathEvaluator.idl',
     'nsIDOMXPathExpression.idl',
+    'nsIDOMXPathNamespace.idl',
     'nsIDOMXPathNSResolver.idl',
-    'nsIDOMXPathNamespace.idl',
     'nsIDOMXPathResult.idl',
 ]
 
 XPIDL_MODULE = 'dom_xpath'
 
 MODULE = 'dom'
 
--- a/dom/interfaces/xul/moz.build
+++ b/dom/interfaces/xul/moz.build
@@ -10,18 +10,18 @@ XPIDL_SOURCES += [
     'nsIDOMXULCommandDispatcher.idl',
     'nsIDOMXULCommandEvent.idl',
     'nsIDOMXULContainerElement.idl',
     'nsIDOMXULControlElement.idl',
     'nsIDOMXULDescriptionElement.idl',
     'nsIDOMXULDocument.idl',
     'nsIDOMXULElement.idl',
     'nsIDOMXULImageElement.idl',
+    'nsIDOMXULLabeledControlEl.idl',
     'nsIDOMXULLabelElement.idl',
-    'nsIDOMXULLabeledControlEl.idl',
     'nsIDOMXULMenuListElement.idl',
     'nsIDOMXULMultSelectCntrlEl.idl',
     'nsIDOMXULPopupElement.idl',
     'nsIDOMXULRelatedElement.idl',
     'nsIDOMXULSelectCntrlEl.idl',
     'nsIDOMXULSelectCntrlItemEl.idl',
     'nsIDOMXULTextboxElement.idl',
     'nsIDOMXULTreeElement.idl',
--- a/dom/ipc/moz.build
+++ b/dom/ipc/moz.build
@@ -5,18 +5,18 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'cocoa':
     TEST_DIRS += ['tests']
 
 MODULE = 'dom'
 
 EXPORTS += [
+    'nsICachedFileDescriptorListener.h',
     'PCOMContentPermissionRequestChild.h',
-    'nsICachedFileDescriptorListener.h',
 ]
 
 EXPORTS.mozilla.dom.ipc += [
     'Blob.h',
     'nsIRemoteBlob.h',
 ]
 
 EXPORTS.mozilla.dom += [
--- a/dom/mobilemessage/src/moz.build
+++ b/dom/mobilemessage/src/moz.build
@@ -1,35 +1,35 @@
 # -*- 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/.
 
 EXPORTS.mozilla.dom.mobilemessage += [
     'Constants.h',            # Required by almost all cpp files
+    'ipc/SmsChild.h',
+    'ipc/SmsParent.h',
     'MobileMessageService.h', # Required by nsLayoutModule.cpp
     'SmsServicesFactory.h',   # Required by nsLayoutModule.cpp
     'Types.h',                # Required by IPDL SmsTypes.h
-    'ipc/SmsChild.h',
-    'ipc/SmsParent.h',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
     CPP_SOURCES += [
         'android/MmsService.cpp',
         'android/MobileMessageDatabaseService.cpp',
         'android/SmsService.cpp',
     ]
 elif CONFIG['MOZ_B2G_RIL']:
     EXTRA_JS_MODULES = [
+        'gonk/mms_consts.js',
         'gonk/MmsPduHelper.jsm',
+        'gonk/wap_consts.js',
         'gonk/WspPduHelper.jsm',
-        'gonk/mms_consts.js',
-        'gonk/wap_consts.js',
     ]
     EXTRA_COMPONENTS += [
         'gonk/MmsService.js',
         'gonk/MmsService.manifest',
         'gonk/MobileMessageDatabaseService.js',
         'gonk/MobileMessageDatabaseService.manifest',
     ]
     CPP_SOURCES += [
@@ -47,29 +47,29 @@ EXPORTS.mozilla.dom += [
     'MobileMessageManager.h',
     'SmsFilter.h',
     'SmsMessage.h',
     'SmsSegmentInfo.h',
 ]
 
 CPP_SOURCES += [
     'Constants.cpp',
+    'ipc/SmsChild.cpp',
+    'ipc/SmsIPCService.cpp',
+    'ipc/SmsParent.cpp',
     'MmsMessage.cpp',
     'MobileMessageCallback.cpp',
     'MobileMessageCursorCallback.cpp',
     'MobileMessageManager.cpp',
     'MobileMessageService.cpp',
     'MobileMessageThread.cpp',
     'SmsFilter.cpp',
     'SmsMessage.cpp',
     'SmsSegmentInfo.cpp',
     'SmsServicesFactory.cpp',
-    'ipc/SmsChild.cpp',
-    'ipc/SmsIPCService.cpp',
-    'ipc/SmsParent.cpp',
 ]
 
 IPDL_SOURCES += [
     'ipc/PMobileMessageCursor.ipdl',
     'ipc/PSms.ipdl',
     'ipc/PSmsRequest.ipdl',
     'ipc/SmsTypes.ipdlh',
 ]
--- a/dom/phonenumberutils/moz.build
+++ b/dom/phonenumberutils/moz.build
@@ -7,17 +7,17 @@
 TEST_DIRS += ['tests']
 
 EXTRA_COMPONENTS += [
     'PhoneNumberService.js',
     'PhoneNumberService.manifest',
 ]
 
 EXTRA_JS_MODULES += [
+    'mcc_iso3166_table.jsm',
     'PhoneNumber.jsm',
     'PhoneNumberMetaData.jsm',
     'PhoneNumberNormalizer.jsm',
-    'mcc_iso3166_table.jsm',
 ]
 
 EXTRA_PP_JS_MODULES += [
     'PhoneNumberUtils.jsm',
 ]
--- a/dom/plugins/base/android/moz.build
+++ b/dom/plugins/base/android/moz.build
@@ -2,18 +2,18 @@
 # 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/.
 
 MODULE = 'plugin'
 
 EXPORTS += [
+    'android_npapi.h',
     'ANPKeyCodes.h',
-    'android_npapi.h',
 ]
 
 CPP_SOURCES += [
     'ANPAudio.cpp',
     'ANPBitmap.cpp',
     'ANPEvent.cpp',
     'ANPLog.cpp',
     'ANPMatrix.cpp',
--- a/dom/plugins/base/moz.build
+++ b/dom/plugins/base/moz.build
@@ -28,37 +28,37 @@ EXPORTS += [
     'nsJSNPRuntime.h',
     'nsNPAPIPluginInstance.h',
     'nsPluginDirServiceProvider.h',
     'nsPluginHost.h',
     'nsPluginInstanceOwner.h',
     'nsPluginLogging.h',
     'nsPluginNativeWindow.h',
     'nsPluginPlayPreviewInfo.h',
-    'nsPluginTags.h',
     'nsPluginsCID.h',
     'nsPluginsDir.h',
+    'nsPluginTags.h',
 ]
 
 EXPORTS.mozilla += [
     'PluginPRLibrary.h',
 ]
 
 CPP_SOURCES += [
-    'PluginPRLibrary.cpp',
     'nsJSNPRuntime.cpp',
     'nsNPAPIPlugin.cpp',
     'nsNPAPIPluginInstance.cpp',
     'nsNPAPIPluginStreamListener.cpp',
     'nsPluginHost.cpp',
     'nsPluginInstanceOwner.cpp',
     'nsPluginModule.cpp',
     'nsPluginPlayPreviewInfo.cpp',
     'nsPluginStreamListenerPeer.cpp',
     'nsPluginTags.cpp',
+    'PluginPRLibrary.cpp',
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     CPP_SOURCES += [
         'nsPluginDirServiceProvider.cpp',
         'nsPluginNativeWindowWin.cpp',
         'nsPluginsDirWin.cpp',
     ]
--- a/dom/plugins/ipc/moz.build
+++ b/dom/plugins/ipc/moz.build
@@ -57,18 +57,18 @@ if CONFIG['OS_ARCH'] == 'WINNT':
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     EXPORTS.mozilla.plugins += [
         'PluginInterposeOSX.h',
     ]
 
 if CONFIG['MOZ_ENABLE_QT']:
     CPP_SOURCES += [
+        'moc_NestedLoopTimer.cpp',
         'NestedLoopTimer.cpp',
-        'moc_NestedLoopTimer.cpp',
     ]
 
 CPP_SOURCES += [
     'BrowserStreamChild.cpp',
     'BrowserStreamParent.cpp',
     'ChildAsyncCall.cpp',
     'ChildTimer.cpp',
     'PluginBackgroundDestroyer.cpp',
--- a/dom/src/geolocation/moz.build
+++ b/dom/src/geolocation/moz.build
@@ -7,18 +7,18 @@
 MODULE = 'dom'
 
 EXPORTS += [
     'nsGeoPosition.h',
     'nsGeoPositionIPCSerialiser.h',
 ]
 
 CPP_SOURCES += [
+    'nsGeolocation.cpp',
     'nsGeoPosition.cpp',
-    'nsGeolocation.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'jsdomgeolocation_s'
 
--- a/dom/system/gonk/moz.build
+++ b/dom/system/gonk/moz.build
@@ -38,44 +38,44 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk
         'nsVolumeService.h',
     ]
     CPP_SOURCES += [
         'AudioChannelManager.cpp',
         'AudioManager.cpp',
         'AutoMounter.cpp',
         'AutoMounterSetting.cpp',
         'GonkGPSGeolocationProvider.cpp',
+        'nsVolume.cpp',
+        'nsVolumeMountLock.cpp',
+        'nsVolumeService.cpp',
+        'nsVolumeStat.cpp',
         'OpenFileFinder.cpp',
         'TimeZoneSettingObserver.cpp',
         'Volume.cpp',
         'VolumeCommand.cpp',
         'VolumeManager.cpp',
         'VolumeServiceIOThread.cpp',
         'VolumeServiceTest.cpp',
-        'nsVolume.cpp',
-        'nsVolumeMountLock.cpp',
-        'nsVolumeService.cpp',
-        'nsVolumeStat.cpp',
     ]
 
 if CONFIG['ENABLE_TESTS']:
     XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell.ini']
 
 CPP_SOURCES += [
     'SystemWorkerManager.cpp',
 ]
 
 EXTRA_COMPONENTS += [
     'NetworkInterfaceListService.js',
     'NetworkInterfaceListService.manifest',
     'NetworkManager.js',
     'NetworkManager.manifest',
-    'RILContentHelper.js',
     'RadioInterfaceLayer.js',
     'RadioInterfaceLayer.manifest',
+    'RILContentHelper.js',
 ]
 
 EXTRA_JS_MODULES += [
     'net_worker.js',
     'ril_consts.js',
     'ril_worker.js',
     'systemlibs.js',
 ]
--- a/dom/system/moz.build
+++ b/dom/system/moz.build
@@ -32,18 +32,18 @@ EXPORTS += [
     'nsDeviceSensors.h',
 ]
 
 EXPORTS.mozilla += [
     'OSFileConstants.h',
 ]
 
 CPP_SOURCES += [
+    'nsDeviceSensors.cpp',
     'OSFileConstants.cpp',
-    'nsDeviceSensors.cpp',
 ]
 
 # On Systems that have build in geolocation providers,
 # we really do not need these.
 if CONFIG['OS_TARGET'] != 'Android' or CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     EXTRA_COMPONENTS += [
         'NetworkGeolocationProvider.js',
         'NetworkGeolocationProvider.manifest',
--- a/dom/system/unix/moz.build
+++ b/dom/system/unix/moz.build
@@ -3,18 +3,18 @@
 # 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/.
 
 MODULE = 'dom'
 
 if CONFIG['MOZ_ENABLE_QTMOBILITY']:
     CPP_SOURCES += [
+        'moc_QTMLocationProvider.cpp',
         'QTMLocationProvider.cpp',
-        'moc_QTMLocationProvider.cpp',
     ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'domsystemunix_s'
 
--- a/dom/telephony/moz.build
+++ b/dom/telephony/moz.build
@@ -16,32 +16,32 @@ EXPORTS.mozilla.dom += [
     'CallEvent.h',
     'CallsList.h',
     'Telephony.h',
     'TelephonyCall.h',
     'TelephonyCallGroup.h',
 ]
 
 EXPORTS.mozilla.dom.telephony += [
+    'ipc/TelephonyChild.h',
+    'ipc/TelephonyParent.h',
     'TelephonyCommon.h',
     'TelephonyFactory.h',
-    'ipc/TelephonyChild.h',
-    'ipc/TelephonyParent.h',
 ]
 
 CPP_SOURCES += [
     'CallEvent.cpp',
     'CallsList.cpp',
+    'ipc/TelephonyChild.cpp',
+    'ipc/TelephonyIPCProvider.cpp',
+    'ipc/TelephonyParent.cpp',
     'Telephony.cpp',
     'TelephonyCall.cpp',
     'TelephonyCallGroup.cpp',
     'TelephonyFactory.cpp',
-    'ipc/TelephonyChild.cpp',
-    'ipc/TelephonyIPCProvider.cpp',
-    'ipc/TelephonyParent.cpp',
 ]
 
 IPDL_SOURCES += [
     'ipc/PTelephony.ipdl',
     'ipc/PTelephonyRequest.ipdl',
     'ipc/TelephonyTypes.ipdlh'
 ]
 
--- a/dom/webidl/moz.build
+++ b/dom/webidl/moz.build
@@ -33,62 +33,62 @@ WEBIDL_FILES = [
     'AudioProcessingEvent.webidl',
     'AudioStreamTrack.webidl',
     'BarProp.webidl',
     'BatteryManager.webidl',
     'BeforeUnloadEvent.webidl',
     'BiquadFilterNode.webidl',
     'Blob.webidl',
     'BrowserElementDictionaries.webidl',
-    'CDATASection.webidl',
-    'CSS.webidl',
-    'CSSPrimitiveValue.webidl',
-    'CSSStyleDeclaration.webidl',
-    'CSSStyleSheet.webidl',
-    'CSSValue.webidl',
-    'CSSValueList.webidl',
     'CallEvent.webidl',
     'CallsList.webidl',
     'CameraControl.webidl',
     'CameraManager.webidl',
     'CanvasRenderingContext2D.webidl',
     'CaretPosition.webidl',
+    'CDATASection.webidl',
     'ChannelMergerNode.webidl',
     'ChannelSplitterNode.webidl',
     'CharacterData.webidl',
     'ChildNode.webidl',
     'ClipboardEvent.webidl',
     'CommandEvent.webidl',
     'Comment.webidl',
     'CompositionEvent.webidl',
     'Contacts.webidl',
     'ConvolverNode.webidl',
     'Coordinates.webidl',
+    'CSS.webidl',
+    'CSSPrimitiveValue.webidl',
+    'CSSStyleDeclaration.webidl',
+    'CSSStyleSheet.webidl',
+    'CSSValue.webidl',
+    'CSSValueList.webidl',
+    'DataContainerEvent.webidl',
+    'DataStore.webidl',
+    'DelayNode.webidl',
+    'DesktopNotification.webidl',
+    'DeviceMotionEvent.webidl',
+    'DeviceStorage.webidl',
+    'Document.webidl',
+    'DocumentFragment.webidl',
+    'DocumentType.webidl',
     'DOMCursor.webidl',
     'DOMError.webidl',
     'DOMException.webidl',
     'DOMImplementation.webidl',
     'DOMMMIError.webidl',
     'DOMParser.webidl',
     'DOMRect.webidl',
     'DOMRectList.webidl',
     'DOMRequest.webidl',
     'DOMSettableTokenList.webidl',
     'DOMStringMap.webidl',
     'DOMTokenList.webidl',
     'DOMTransaction.webidl',
-    'DataContainerEvent.webidl',
-    'DataStore.webidl',
-    'DelayNode.webidl',
-    'DesktopNotification.webidl',
-    'DeviceMotionEvent.webidl',
-    'DeviceStorage.webidl',
-    'Document.webidl',
-    'DocumentFragment.webidl',
-    'DocumentType.webidl',
     'DragEvent.webidl',
     'DummyBinding.webidl',
     'DynamicsCompressorNode.webidl',
     'Element.webidl',
     'Event.webidl',
     'EventHandler.webidl',
     'EventListener.webidl',
     'EventSource.webidl',
@@ -101,60 +101,61 @@ WEBIDL_FILES = [
     'FileReaderSync.webidl',
     'FileRequest.webidl',
     'FocusEvent.webidl',
     'FormData.webidl',
     'Function.webidl',
     'GainNode.webidl',
     'Geolocation.webidl',
     'GetUserMediaRequest.webidl',
+    'History.webidl',
     'HTMLAnchorElement.webidl',
     'HTMLAppletElement.webidl',
     'HTMLAreaElement.webidl',
     'HTMLAudioElement.webidl',
-    'HTMLBRElement.webidl',
     'HTMLBaseElement.webidl',
     'HTMLBodyElement.webidl',
+    'HTMLBRElement.webidl',
     'HTMLButtonElement.webidl',
     'HTMLCanvasElement.webidl',
     'HTMLCollection.webidl',
-    'HTMLDListElement.webidl',
     'HTMLDataElement.webidl',
     'HTMLDataListElement.webidl',
     'HTMLDirectoryElement.webidl',
     'HTMLDivElement.webidl',
+    'HTMLDListElement.webidl',
     'HTMLDocument.webidl',
     'HTMLElement.webidl',
     'HTMLEmbedElement.webidl',
     'HTMLFieldSetElement.webidl',
     'HTMLFontElement.webidl',
     'HTMLFormControlsCollection.webidl',
     'HTMLFormElement.webidl',
     'HTMLFrameElement.webidl',
     'HTMLFrameSetElement.webidl',
-    'HTMLHRElement.webidl',
     'HTMLHeadElement.webidl',
     'HTMLHeadingElement.webidl',
+    'HTMLHRElement.webidl',
     'HTMLHtmlElement.webidl',
     'HTMLIFrameElement.webidl',
     'HTMLImageElement.webidl',
     'HTMLInputElement.webidl',
-    'HTMLLIElement.webidl',
     'HTMLLabelElement.webidl',
     'HTMLLegendElement.webidl',
+    'HTMLLIElement.webidl',
     'HTMLLinkElement.webidl',
     'HTMLMapElement.webidl',
     'HTMLMediaElement.webidl',
     'HTMLMenuElement.webidl',
     'HTMLMenuItemElement.webidl',
     'HTMLMetaElement.webidl',
     'HTMLMeterElement.webidl',
     'HTMLModElement.webidl',
+    'HTMLObjectElement.webidl',
     'HTMLOListElement.webidl',
-    'HTMLObjectElement.webidl',
     'HTMLOptGroupElement.webidl',
     'HTMLOptionElement.webidl',
     'HTMLOptionsCollection.webidl',
     'HTMLOutputElement.webidl',
     'HTMLParagraphElement.webidl',
     'HTMLParamElement.webidl',
     'HTMLPreElement.webidl',
     'HTMLProgressElement.webidl',
@@ -173,17 +174,16 @@ WEBIDL_FILES = [
     'HTMLTableSectionElement.webidl',
     'HTMLTemplateElement.webidl',
     'HTMLTextAreaElement.webidl',
     'HTMLTimeElement.webidl',
     'HTMLTitleElement.webidl',
     'HTMLTrackElement.webidl',
     'HTMLUListElement.webidl',
     'HTMLVideoElement.webidl',
-    'History.webidl',
     'IDBCursor.webidl',
     'IDBDatabase.webidl',
     'IDBFactory.webidl',
     'IDBFileHandle.webidl',
     'IDBIndex.webidl',
     'IDBKeyRange.webidl',
     'IDBObjectStore.webidl',
     'IDBOpenDBRequest.webidl',
@@ -192,18 +192,18 @@ WEBIDL_FILES = [
     'IDBVersionChangeEvent.webidl',
     'ImageData.webidl',
     'ImageDocument.webidl',
     'InputMethod.webidl',
     'InspectorUtils.webidl',
     'InterAppConnection.webidl',
     'InterAppConnectionRequest.webidl',
     'InterAppMessagePort.webidl',
+    'KeyboardEvent.webidl',
     'KeyEvent.webidl',
-    'KeyboardEvent.webidl',
     'LegacyQueryInterface.webidl',
     'LinkStyle.webidl',
     'LocalMediaStream.webidl',
     'Location.webidl',
     'MediaElementAudioSourceNode.webidl',
     'MediaError.webidl',
     'MediaRecorder.webidl',
     'MediaSource.webidl',
@@ -250,44 +250,54 @@ WEBIDL_FILES = [
     'PhoneNumberService.webidl',
     'Plugin.webidl',
     'PluginArray.webidl',
     'Position.webidl',
     'PositionError.webidl',
     'ProcessingInstruction.webidl',
     'Promise.webidl',
     'PushManager.webidl',
+    'Range.webidl',
+    'Rect.webidl',
     'RGBColor.webidl',
     'RTCConfiguration.webidl',
     'RTCIceCandidate.webidl',
     'RTCPeerConnection.webidl',
     'RTCSessionDescription.webidl',
     'RTCStatsReport.webidl',
-    'Range.webidl',
-    'Rect.webidl',
+    'Screen.webidl',
+    'ScriptProcessorNode.webidl',
+    'ScrollAreaEvent.webidl',
+    'SettingsManager.webidl',
+    'SharedWorker.webidl',
+    'SimpleGestureEvent.webidl',
+    'SourceBuffer.webidl',
+    'SourceBufferList.webidl',
+    'StorageType.webidl',
+    'StyleSheet.webidl',
     'SVGAElement.webidl',
     'SVGAltGlyphElement.webidl',
     'SVGAngle.webidl',
-    'SVGAnimateElement.webidl',
-    'SVGAnimateMotionElement.webidl',
-    'SVGAnimateTransformElement.webidl',
     'SVGAnimatedAngle.webidl',
     'SVGAnimatedBoolean.webidl',
     'SVGAnimatedEnumeration.webidl',
     'SVGAnimatedInteger.webidl',
     'SVGAnimatedLength.webidl',
     'SVGAnimatedLengthList.webidl',
     'SVGAnimatedNumber.webidl',
     'SVGAnimatedNumberList.webidl',
     'SVGAnimatedPathData.webidl',
     'SVGAnimatedPoints.webidl',
     'SVGAnimatedPreserveAspectRatio.webidl',
     'SVGAnimatedRect.webidl',
     'SVGAnimatedString.webidl',
     'SVGAnimatedTransformList.webidl',
+    'SVGAnimateElement.webidl',
+    'SVGAnimateMotionElement.webidl',
+    'SVGAnimateTransformElement.webidl',
     'SVGAnimationElement.webidl',
     'SVGCircleElement.webidl',
     'SVGClipPathElement.webidl',
     'SVGComponentTransferFunctionElement.webidl',
     'SVGDefsElement.webidl',
     'SVGDescElement.webidl',
     'SVGDocument.webidl',
     'SVGElement.webidl',
@@ -320,69 +330,59 @@ WEBIDL_FILES = [
     'SVGFilterPrimitiveStandardAttributes.webidl',
     'SVGFitToViewBox.webidl',
     'SVGForeignObjectElement.webidl',
     'SVGGElement.webidl',
     'SVGGradientElement.webidl',
     'SVGGraphicsElement.webidl',
     'SVGImageElement.webidl',
     'SVGLengthList.webidl',
+    'SVGLinearGradientElement.webidl',
     'SVGLineElement.webidl',
-    'SVGLinearGradientElement.webidl',
-    'SVGMPathElement.webidl',
     'SVGMarkerElement.webidl',
     'SVGMaskElement.webidl',
     'SVGMatrix.webidl',
     'SVGMetadataElement.webidl',
+    'SVGMPathElement.webidl',
     'SVGNumberList.webidl',
     'SVGPathElement.webidl',
     'SVGPathSeg.webidl',
     'SVGPathSegList.webidl',
     'SVGPatternElement.webidl',
     'SVGPoint.webidl',
     'SVGPointList.webidl',
     'SVGPolygonElement.webidl',
     'SVGPolylineElement.webidl',
     'SVGPreserveAspectRatio.webidl',
     'SVGRadialGradientElement.webidl',
     'SVGRect.webidl',
     'SVGRectElement.webidl',
-    'SVGSVGElement.webidl',
     'SVGScriptElement.webidl',
     'SVGSetElement.webidl',
     'SVGStopElement.webidl',
     'SVGStringList.webidl',
     'SVGStyleElement.webidl',
+    'SVGSVGElement.webidl',
     'SVGSwitchElement.webidl',
     'SVGSymbolElement.webidl',
-    'SVGTSpanElement.webidl',
     'SVGTests.webidl',
     'SVGTextContentElement.webidl',
     'SVGTextElement.webidl',
     'SVGTextPathElement.webidl',
     'SVGTextPositioningElement.webidl',
     'SVGTitleElement.webidl',
     'SVGTransform.webidl',
     'SVGTransformList.webidl',
+    'SVGTSpanElement.webidl',
+    'SVGUnitTypes.webidl',
     'SVGURIReference.webidl',
-    'SVGUnitTypes.webidl',
     'SVGUseElement.webidl',
     'SVGViewElement.webidl',
     'SVGZoomAndPan.webidl',
     'SVGZoomEvent.webidl',
-    'Screen.webidl',
-    'ScriptProcessorNode.webidl',
-    'ScrollAreaEvent.webidl',
-    'SettingsManager.webidl',
-    'SharedWorker.webidl',
-    'SimpleGestureEvent.webidl',
-    'SourceBuffer.webidl',
-    'SourceBufferList.webidl',
-    'StorageType.webidl',
-    'StyleSheet.webidl',
     'Telephony.webidl',
     'TelephonyCall.webidl',
     'TelephonyCallGroup.webidl',
     'Text.webidl',
     'TextDecoder.webidl',
     'TextEncoder.webidl',
     'TextTrack.webidl',
     'TextTrackCueList.webidl',
@@ -391,26 +391,26 @@ WEBIDL_FILES = [
     'TimeRanges.webidl',
     'Touch.webidl',
     'TouchEvent.webidl',
     'TouchList.webidl',
     'TransitionEvent.webidl',
     'TreeColumns.webidl',
     'TreeWalker.webidl',
     'UIEvent.webidl',
+    'UndoManager.webidl',
     'URL.webidl',
     'URLUtils.webidl',
     'URLUtilsReadOnly.webidl',
-    'UndoManager.webidl',
+    'ValidityState.webidl',
+    'VideoPlaybackQuality.webidl',
+    'VideoStreamTrack.webidl',
     'VTTCue.webidl',
     'VTTRegion.webidl',
     'VTTRegionList.webidl',
-    'ValidityState.webidl',
-    'VideoPlaybackQuality.webidl',
-    'VideoStreamTrack.webidl',
     'WaveShaperNode.webidl',
     'WebComponents.webidl',
     'WebSocket.webidl',
     'WheelEvent.webidl',
     'WifiOptions.webidl',
     'Window.webidl',
     'WorkerLocation.webidl',
     'WorkerMessagePort.webidl',
@@ -471,19 +471,19 @@ if CONFIG['MOZ_B2G_RIL']:
     WEBIDL_FILES += [
         'MozStkCommandEvent.webidl',
         'MozVoicemail.webidl',
     ]
 
 WEBIDL_FILES += [
     'CloseEvent.webidl',
     'CustomEvent.webidl',
-    'DOMTransactionEvent.webidl',
     'DeviceOrientationEvent.webidl',
     'DeviceStorageChangeEvent.webidl',
+    'DOMTransactionEvent.webidl',
     'ElementReplaceEvent.webidl',
     'HashChangeEvent.webidl',
     'MozApplicationEvent.webidl',
     'MozMmsEvent.webidl',
     'MozSettingsEvent.webidl',
     'MozSmsEvent.webidl',
     'PageTransitionEvent.webidl',
     'PopStateEvent.webidl',
--- a/dom/workers/moz.build
+++ b/dom/workers/moz.build
@@ -30,18 +30,18 @@ EXPORTS.mozilla.dom.workers.bindings += 
     'XMLHttpRequestEventTarget.h',
     'XMLHttpRequestUpload.h',
 ]
 
 CPP_SOURCES += [
     'ChromeWorkerScope.cpp',
     'DOMBindingBase.cpp',
     'EventListenerManager.cpp',
+    'Events.cpp',
     'EventTarget.cpp',
-    'Events.cpp',
     'File.cpp',
     'FileReaderSync.cpp',
     'Location.cpp',
     'MessagePort.cpp',
     'Navigator.cpp',
     'Principal.cpp',
     'RuntimeService.cpp',
     'ScriptLoader.cpp',
--- a/editor/composer/src/moz.build
+++ b/editor/composer/src/moz.build
@@ -2,22 +2,22 @@
 # 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/.
 
 MODULE = 'editor'
 
 CPP_SOURCES += [
-    'nsComposeTxtSrvFilter.cpp',
     'nsComposerCommands.cpp',
     'nsComposerCommandsUpdater.cpp',
     'nsComposerController.cpp',
     'nsComposerDocumentCommands.cpp',
     'nsComposerRegistration.cpp',
+    'nsComposeTxtSrvFilter.cpp',
     'nsEditingSession.cpp',
     'nsEditorSpellCheck.cpp',
 ]
 
 LIBRARY_NAME = 'composer'
 
 FAIL_ON_WARNINGS = True
 
--- a/editor/libeditor/base/moz.build
+++ b/editor/libeditor/base/moz.build
@@ -16,26 +16,26 @@ CPP_SOURCES += [
     'DeleteRangeTxn.cpp',
     'DeleteTextTxn.cpp',
     'EditAggregateTxn.cpp',
     'EditTxn.cpp',
     'IMETextTxn.cpp',
     'InsertElementTxn.cpp',
     'InsertTextTxn.cpp',
     'JoinElementTxn.cpp',
-    'PlaceholderTxn.cpp',
-    'SetDocTitleTxn.cpp',
-    'SplitElementTxn.cpp',
     'nsEditor.cpp',
     'nsEditorCommands.cpp',
     'nsEditorController.cpp',
     'nsEditorEventListener.cpp',
     'nsEditorUtils.cpp',
     'nsSelectionState.cpp',
     'nsStyleSheetTxns.cpp',
+    'PlaceholderTxn.cpp',
+    'SetDocTitleTxn.cpp',
+    'SplitElementTxn.cpp',
 ]
 
 LIBRARY_NAME = 'editorbase_s'
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
--- a/editor/libeditor/html/moz.build
+++ b/editor/libeditor/html/moz.build
@@ -4,33 +4,33 @@
 # License, v. 2.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 += ['tests']
 
 MODULE = 'editor'
 
 CPP_SOURCES += [
-    'TextEditorTest.cpp',
-    'TypeInState.cpp',
     'nsEditProperty.cpp',
     'nsHTMLAbsPosition.cpp',
     'nsHTMLAnonymousUtils.cpp',
     'nsHTMLCSSUtils.cpp',
     'nsHTMLDataTransfer.cpp',
-    'nsHTMLEditRules.cpp',
-    'nsHTMLEditUtils.cpp',
     'nsHTMLEditor.cpp',
     'nsHTMLEditorEventListener.cpp',
     'nsHTMLEditorStyle.cpp',
+    'nsHTMLEditRules.cpp',
+    'nsHTMLEditUtils.cpp',
     'nsHTMLInlineTableEditor.cpp',
     'nsHTMLObjectResizer.cpp',
     'nsHTMLURIRefObject.cpp',
     'nsTableEditor.cpp',
     'nsWSRunObject.cpp',
+    'TextEditorTest.cpp',
+    'TypeInState.cpp',
 ]
 
 LIBRARY_NAME = 'htmleditor_s'
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
--- a/embedding/components/printingui/src/os2/moz.build
+++ b/embedding/components/printingui/src/os2/moz.build
@@ -2,17 +2,17 @@
 # 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/.
 
 MODULE = 'embedcomponents'
 
 CPP_SOURCES += [
+    'nsPrintingPromptService.cpp',
     'nsPrintProgress.cpp',
     'nsPrintProgressParams.cpp',
-    'nsPrintingPromptService.cpp',
 ]
 
 LIBRARY_NAME = 'printingui_s'
 
 LIBXUL_LIBRARY = True
 
--- a/embedding/components/printingui/src/unixshared/moz.build
+++ b/embedding/components/printingui/src/unixshared/moz.build
@@ -2,19 +2,19 @@
 # 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/.
 
 MODULE = 'embedcomponents'
 
 CPP_SOURCES += [
+    'nsPrintingPromptService.cpp',
     'nsPrintProgress.cpp',
     'nsPrintProgressParams.cpp',
-    'nsPrintingPromptService.cpp',
 ]
 
 LIBRARY_NAME = 'printingui_s'
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
--- a/embedding/components/printingui/src/win/moz.build
+++ b/embedding/components/printingui/src/win/moz.build
@@ -3,19 +3,19 @@
 # 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/.
 
 MODULE = 'embedcomponents'
 
 CPP_SOURCES += [
     'nsPrintDialogUtil.cpp',
+    'nsPrintingPromptService.cpp',
     'nsPrintProgress.cpp',
     'nsPrintProgressParams.cpp',
-    'nsPrintingPromptService.cpp',
 ]
 
 LIBRARY_NAME = 'printingui_s'
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
--- a/extensions/universalchardet/src/base/moz.build
+++ b/extensions/universalchardet/src/base/moz.build
@@ -12,29 +12,29 @@ CPP_SOURCES += [
     'LangBulgarianModel.cpp',
     'LangCyrillicModel.cpp',
     'LangGreekModel.cpp',
     'LangHebrewModel.cpp',
     'LangHungarianModel.cpp',
     'LangThaiModel.cpp',
     'nsBig5Prober.cpp',
     'nsCharSetProber.cpp',
+    'nsEscCharsetProber.cpp',
+    'nsEscSM.cpp',
     'nsEUCJPProber.cpp',
     'nsEUCKRProber.cpp',
     'nsEUCTWProber.cpp',
-    'nsEscCharsetProber.cpp',
-    'nsEscSM.cpp',
     'nsGB2312Prober.cpp',
     'nsHebrewProber.cpp',
     'nsLatin1Prober.cpp',
     'nsMBCSGroupProber.cpp',
     'nsMBCSSM.cpp',
+    'nsSBCharSetProber.cpp',
     'nsSBCSGroupProber.cpp',
-    'nsSBCharSetProber.cpp',
     'nsSJISProber.cpp',
+    'nsUniversalDetector.cpp',
     'nsUTF8Prober.cpp',
-    'nsUniversalDetector.cpp',
 ]
 
 LIBRARY_NAME = 'universalchardet_s'
 
 LIBXUL_LIBRARY = True
 
--- a/gfx/2d/moz.build
+++ b/gfx/2d/moz.build
@@ -58,21 +58,21 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'wi
         ]
     if CONFIG['MOZ_ENABLE_SKIA']:
         CPP_SOURCES += [
             'ScaledFontWin.cpp',
         ]
 
 if CONFIG['MOZ_ENABLE_SKIA']:
     CPP_SOURCES += [
+        'convolver.cpp',
         'DrawTargetSkia.cpp',
+        'image_operations.cpp',
         'PathSkia.cpp',
         'SourceSurfaceSkia.cpp',
-        'convolver.cpp',
-        'image_operations.cpp',
     ]
 
 # Are we targeting x86 or x64?  If so, build SSE2 files.
 if CONFIG['INTEL_ARCHITECTURE']:
     # VC2005 doesn't support _mm_castsi128_ps, so SSE2 is turned off
     if CONFIG['_MSC_VER'] != '1400':
         CPP_SOURCES += [
             'BlurSSE2.cpp',
--- a/gfx/angle/moz.build
+++ b/gfx/angle/moz.build
@@ -36,42 +36,42 @@ CPP_SOURCES += ['src/compiler/preprocess
 
 
 # Target: 'translator_common'
 #   Requires: 'preprocessor'
 # src/compiler:
 CPP_SOURCES += ['src/compiler/' + src for src in [
     'BuiltInFunctionEmulator.cpp',
     'Compiler.cpp',
+    'compiler_debug.cpp',
     'CompilerUniform.cpp',
     'DetectCallDepth.cpp',
     'Diagnostics.cpp',
     'DirectiveHandler.cpp',
     'ForLoopUnroll.cpp',
+    'glslang_lex.cpp',
+    'glslang_tab.cpp',
     'InfoSink.cpp',
     'Initialize.cpp',
     'InitializeDll.cpp',
     'InitializeParseContext.cpp',
+    'Intermediate.cpp',
+    'intermOut.cpp',
     'IntermTraverse.cpp',
-    'Intermediate.cpp',
     'MapLongVariableNames.cpp',
+    'parseConst.cpp',
     'ParseHelper.cpp',
     'PoolAlloc.cpp',
     'QualifierAlive.cpp',
     'RemoveTree.cpp',
     'SymbolTable.cpp',
+    'util.cpp',
     'ValidateLimitations.cpp',
     'VariableInfo.cpp',
     'VariablePacker.cpp',
-    'compiler_debug.cpp',
-    'glslang_lex.cpp',
-    'glslang_tab.cpp',
-    'intermOut.cpp',
-    'parseConst.cpp',
-    'util.cpp',
 ]]
 
 # src/compiler/depgraph:
 CPP_SOURCES += ['src/compiler/depgraph/' + src for src in [
     'DependencyGraph.cpp',
     'DependencyGraphBuilder.cpp',
     'DependencyGraphOutput.cpp',
     'DependencyGraphTraverse.cpp',
--- a/gfx/angle/src/libEGL/moz.build
+++ b/gfx/angle/src/libEGL/moz.build
@@ -5,22 +5,22 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'libegl'
 
 # Target: 'libEGL'
 #   Requires: 'libGLESv2'
 # src/common:
 CPP_SOURCES += ['../common/' + src for src in [
+    'debug.cpp',
     'RefCountObject.cpp',
-    'debug.cpp',
 ]]
 
 # src/libEGL
 CPP_SOURCES += [
     'Config.cpp',
     'Display.cpp',
-    'Surface.cpp',
     'libEGL.cpp',
     'main.cpp',
+    'Surface.cpp',
 ]
 
 LIBRARY_NAME = 'libEGL'
--- a/gfx/angle/src/libGLESv2/moz.build
+++ b/gfx/angle/src/libGLESv2/moz.build
@@ -24,42 +24,42 @@ CPP_SOURCES += ['../compiler/preprocesso
 
 
 # Target: 'translator_common'
 #   Requires: 'preprocessor'
 # src/compiler:
 CPP_SOURCES += ['../compiler/' + src for src in [
     'BuiltInFunctionEmulator.cpp',
     'Compiler.cpp',
+    'compiler_debug.cpp',
     'CompilerUniform.cpp',
     'DetectCallDepth.cpp',
     'Diagnostics.cpp',
     'DirectiveHandler.cpp',
     'ForLoopUnroll.cpp',
+    'glslang_lex.cpp',
+    'glslang_tab.cpp',
     'InfoSink.cpp',
     'Initialize.cpp',
     'InitializeDll.cpp',
     'InitializeParseContext.cpp',
+    'Intermediate.cpp',
+    'intermOut.cpp',
     'IntermTraverse.cpp',
-    'Intermediate.cpp',
     'MapLongVariableNames.cpp',
+    'parseConst.cpp',
     'ParseHelper.cpp',
     'PoolAlloc.cpp',
     'QualifierAlive.cpp',
     'RemoveTree.cpp',
     'SymbolTable.cpp',
+    'util.cpp',
     'ValidateLimitations.cpp',
     'VariableInfo.cpp',
     'VariablePacker.cpp',
-    'compiler_debug.cpp',
-    'glslang_lex.cpp',
-    'glslang_tab.cpp',
-    'intermOut.cpp',
-    'parseConst.cpp',
-    'util.cpp',
 ]]
 
 # src/compiler/depgraph:
 CPP_SOURCES += ['../compiler/depgraph/' + src for src in [
     'DependencyGraph.cpp',
     'DependencyGraphBuilder.cpp',
     'DependencyGraphOutput.cpp',
     'DependencyGraphTraverse.cpp',
@@ -104,39 +104,39 @@ CPP_SOURCES += ['../compiler/' + src for
     'UnfoldShortCircuit.cpp',
 ]]
 
 
 # Target: 'libGLESv2'
 #   Requires: 'translator_hlsl'
 # src/common:
 CPP_SOURCES += ['../common/' + src for src in [
+    'debug.cpp',
     'RefCountObject.cpp',
-    'debug.cpp',
 ]]
 
 # src/libGLESv2:
 CPP_SOURCES += [
     'Buffer.cpp',
     'Context.cpp',
     'Fence.cpp',
     'Float16ToFloat32.cpp',
     'Framebuffer.cpp',
     'HandleAllocator.cpp',
+    'libGLESv2.cpp',
+    'main.cpp',
+    'precompiled.cpp',
     'Program.cpp',
     'ProgramBinary.cpp',
     'Query.cpp',
     'Renderbuffer.cpp',
     'ResourceManager.cpp',
     'Shader.cpp',
     'Texture.cpp',
     'Uniform.cpp',
-    'libGLESv2.cpp',
-    'main.cpp',
-    'precompiled.cpp',
     'utilities.cpp',
 ]
 
 # src/libGLESv2/renderer:
 CPP_SOURCES += ['renderer/' + src for src in [
     'Blit.cpp',
     'BufferStorage.cpp',
     'BufferStorage11.cpp',
@@ -150,31 +150,31 @@ CPP_SOURCES += ['renderer/' + src for sr
     'IndexBuffer.cpp',
     'IndexBuffer11.cpp',
     'IndexBuffer9.cpp',
     'IndexDataManager.cpp',
     'IndexRangeCache.cpp',
     'InputLayoutCache.cpp',
     'Query11.cpp',
     'Query9.cpp',
+    'Renderer.cpp',
+    'Renderer11.cpp',
+    'renderer11_utils.cpp',
+    'Renderer9.cpp',
+    'renderer9_utils.cpp',
     'RenderStateCache.cpp',
     'RenderTarget11.cpp',
     'RenderTarget9.cpp',
-    'Renderer.cpp',
-    'Renderer11.cpp',
-    'Renderer9.cpp',
     'ShaderExecutable11.cpp',
     'ShaderExecutable9.cpp',
     'SwapChain11.cpp',
     'SwapChain9.cpp',
     'TextureStorage.cpp',
     'TextureStorage11.cpp',
     'TextureStorage9.cpp',
     'VertexBuffer.cpp',
     'VertexBuffer11.cpp',
     'VertexBuffer9.cpp',
     'VertexDataManager.cpp',
     'VertexDeclarationCache.cpp',
-    'renderer11_utils.cpp',
-    'renderer9_utils.cpp',
 ]]
 
 LIBRARY_NAME = 'libGLESv2'
--- a/gfx/cairo/cairo/src/moz.build
+++ b/gfx/cairo/cairo/src/moz.build
@@ -27,18 +27,18 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'wind
             'cairo-dwrite-font.cpp',
         ]
     if CONFIG['MOZ_ENABLE_D2D_SURFACE']:
         CPP_SOURCES += [
             'cairo-d2d-surface.cpp',
         ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'os2':
     EXPORTS.cairo += [
+        'cairo-os2-private.h',
         'cairo-os2.h',
-        'cairo-os2-private.h',
         'cairo-pdf.h',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     EXPORTS.cairo += [
         'cairo-quartz-image.h',
         'cairo-quartz.h',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'beos':
--- a/gfx/gl/moz.build
+++ b/gfx/gl/moz.build
@@ -24,29 +24,29 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'an
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     gl_provider = 'EGL'
 
 if CONFIG['MOZ_GL_PROVIDER']:
     gl_provider = CONFIG['MOZ_GL_PROVIDER']
 
 EXPORTS += [
     'ForceDiscreteGPUHelperCGL.h',
+    'GfxTexturesReporter.h',
     'GLConsts.h',
     'GLContext.h',
     'GLContextProvider.h',
     'GLContextProviderImpl.h',
     'GLContextSymbols.h',
     'GLContextTypes.h',
     'GLDefs.h',
     'GLLibraryEGL.h',
     'GLLibraryLoader.h',
     'GLScreenBuffer.h',
     'GLTextureImage.h',
     'GLTypes.h',
-    'GfxTexturesReporter.h',
     'SharedSurface.h',
     'SharedSurfaceEGL.h',
     'SharedSurfaceGL.h',
     'SurfaceFactory.h',
     'SurfaceStream.h',
     'SurfaceTypes.h',
     'TextureGarbageBin.h',
     'VBOArena.h',
@@ -86,25 +86,25 @@ if gl_provider == 'CGL':
         'SharedSurfaceIO.cpp',
     ]
 else:
     CPP_SOURCES += [
         'GLContextProvider%s.cpp' % gl_provider,
     ]
 
 CPP_SOURCES += [
+    'GfxTexturesReporter.cpp',
     'GLContext.cpp',
     'GLContextFeatures.cpp',
     'GLContextTypes.cpp',
     'GLContextUtils.cpp',
     'GLLibraryEGL.cpp',
     'GLLibraryLoader.cpp',
     'GLScreenBuffer.cpp',
     'GLTextureImage.cpp',
-    'GfxTexturesReporter.cpp',
     'SharedSurface.cpp',
     'SharedSurfaceEGL.cpp',
     'SharedSurfaceGL.cpp',
     'SurfaceFactory.cpp',
     'SurfaceStream.cpp',
     'TextureGarbageBin.cpp',
     'TextureImageEGL.cpp',
     'VBOArena.cpp',
--- a/gfx/graphite2/src/moz.build
+++ b/gfx/graphite2/src/moz.build
@@ -36,34 +36,34 @@ CPP_SOURCES += [
     'CmapCache.cpp',
     'Code.cpp',
     'Face.cpp',
     'FeatureMap.cpp',
     'FileFace.cpp',
     'Font.cpp',
     'GlyphCache.cpp',
     'GlyphFace.cpp',
+    'gr_char_info.cpp',
+    'gr_face.cpp',
+    'gr_features.cpp',
+    'gr_font.cpp',
+    'gr_logging.cpp',
+    'gr_segment.cpp',
+    'gr_slot.cpp',
+    'json.cpp',
     'Justifier.cpp',
     'NameTable.cpp',
     'Pass.cpp',
     'SegCache.cpp',
     'SegCacheEntry.cpp',
     'SegCacheStore.cpp',
     'Segment.cpp',
     'Silf.cpp',
     'Slot.cpp',
     'Sparse.cpp',
     'TtfUtil.cpp',
     'UtfCodec.cpp',
-    'gr_char_info.cpp',
-    'gr_face.cpp',
-    'gr_features.cpp',
-    'gr_font.cpp',
-    'gr_logging.cpp',
-    'gr_segment.cpp',
-    'gr_slot.cpp',
-    'json.cpp',
 ]
 
 LIBRARY_NAME = 'mozgraphite2'
 
 MSVC_ENABLE_PGO = True
 
--- a/gfx/layers/moz.build
+++ b/gfx/layers/moz.build
@@ -2,50 +2,50 @@
 # 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/.
 
 MODULE = 'thebes'
 
 EXPORTS += [
-    'CopyableCanvasLayer.h',
-    'D3D9SurfaceImage.h',
-    'FrameMetrics.h',
-    'GrallocImages.h',
-    'ImageContainer.h',
-    'ImageLayers.h',
-    'ImageTypes.h',
-    'LayerSorter.h',
-    'LayerTreeInvalidation.h',
-    'Layers.h',
-    'LayersLogging.h',
-    'ReadbackLayer.h',
-    'SharedTextureImage.h',
     'basic/BasicCanvasLayer.h',
     'basic/BasicImplData.h',
     'basic/BasicLayers.h',
     'basic/BasicLayersImpl.h',
     'basic/BasicThebesLayer.h',
     'client/ClientCanvasLayer.h',
     'client/ClientContainerLayer.h',
     'client/ClientLayerManager.h',
     'client/ClientThebesLayer.h',
     'client/ClientTiledThebesLayer.h',
     'composite/CompositableHost.h',
     'composite/ImageHost.h',
+    'CopyableCanvasLayer.h',
+    'D3D9SurfaceImage.h',
+    'FrameMetrics.h',
+    'GrallocImages.h',
+    'ImageContainer.h',
+    'ImageLayers.h',
+    'ImageTypes.h',
     'ipc/CompositorChild.h',
     'ipc/CompositorParent.h',
     'ipc/ShadowLayersManager.h',
+    'Layers.h',
+    'LayersLogging.h',
+    'LayerSorter.h',
+    'LayerTreeInvalidation.h',
     'opengl/Composer2D.h',
     'opengl/ImageLayerOGL.h',
     'opengl/LayerManagerOGL.h',
     'opengl/LayerManagerOGLProgram.h',
     'opengl/LayerManagerOGLShaders.h',
     'opengl/TexturePoolOGL.h',
+    'ReadbackLayer.h',
+    'SharedTextureImage.h',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     CPP_SOURCES += [
         'D3D9SurfaceImage.cpp',
     ]
     if CONFIG['MOZ_ENABLE_D3D9_LAYER']:
         EXPORTS += [
@@ -91,24 +91,16 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'wind
             'ipc/ShadowLayerUtilsD3D10.cpp',
         ]
 
 EXPORTS.gfxipc += [
     'ipc/ShadowLayerUtils.h',
 ]
 
 EXPORTS.mozilla.layers += [
-    'Compositor.h',
-    'CompositorTypes.h',
-    'D3D9SurfaceImage.h',
-    'Effects.h',
-    'ImageDataSerializer.h',
-    'LayersTypes.h',
-    'RenderTrace.h',
-    'YCbCrImageDataSerializer.h',
     'basic/BasicCompositor.h',
     'client/CanvasClient.h',
     'client/CompositableClient.h',
     'client/ContentClient.h',
     'client/ImageClient.h',
     'client/TextureClient.h',
     'client/TiledContentClient.h',
     'composite/APZCTreeManager.h',
@@ -117,41 +109,49 @@ EXPORTS.mozilla.layers += [
     'composite/ColorLayerComposite.h',
     'composite/ContainerLayerComposite.h',
     'composite/ContentHost.h',
     'composite/ImageHost.h',
     'composite/ImageLayerComposite.h',
     'composite/LayerManagerComposite.h',
     'composite/TextureHost.h',
     'composite/ThebesLayerComposite.h',
+    'Compositor.h',
+    'CompositorTypes.h',
+    'D3D9SurfaceImage.h',
+    'Effects.h',
+    'ImageDataSerializer.h',
     'ipc/AsyncPanZoomController.h',
     'ipc/Axis.h',
     'ipc/CompositableForwarder.h',
     'ipc/CompositableTransactionParent.h',
     'ipc/CompositorChild.h',
     'ipc/CompositorCocoaWidgetHelper.h',
     'ipc/CompositorParent.h',
     'ipc/GeckoContentController.h',
     'ipc/GestureEventListener.h',
-    'ipc/ISurfaceAllocator.h',
     'ipc/ImageBridgeChild.h',
     'ipc/ImageBridgeParent.h',
+    'ipc/ISurfaceAllocator.h',
     'ipc/LayerTransactionChild.h',
     'ipc/LayerTransactionParent.h',
     'ipc/ShadowLayers.h',
     'ipc/ShadowLayersManager.h',
     'ipc/SharedPlanarYCbCrImage.h',
     'ipc/SharedRGBImage.h',
     'ipc/TaskThrottler.h',
+    'LayersTypes.h',
     'opengl/CompositingRenderTargetOGL.h',
     'opengl/CompositorOGL.h',
     'opengl/GrallocTextureClient.h',
     'opengl/GrallocTextureHost.h',
     'opengl/TextureClientOGL.h',
     'opengl/TextureHostOGL.h',
+    'RenderTrace.h',
+    'YCbCrImageDataSerializer.h',
 ]
 
 if CONFIG['MOZ_X11']:
     EXPORTS.mozilla.layers += [
         'ipc/ShadowLayerUtilsX11.h',
     ]
     CPP_SOURCES += [
         'ipc/ShadowLayerUtilsX11.cpp'
@@ -176,40 +176,26 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk
     CPP_SOURCES += [
         'GrallocImages.cpp',
         'ipc/ShadowLayerUtilsGralloc.cpp',
         'opengl/GrallocTextureClient.cpp',
         'opengl/GrallocTextureHost.cpp',
     ]
 
 CPP_SOURCES += [
-    'BufferUnrotate.cpp',
-    'Compositor.cpp',
-    'CopyableCanvasLayer.cpp',
-    'Effects.cpp',
-    'ImageContainer.cpp',
-    'ImageDataSerializer.cpp',
-    'ImageLayers.cpp',
-    'LayerSorter.cpp',
-    'LayerTreeInvalidation.cpp',
-    'Layers.cpp',
-    'LayersLogging.cpp',
-    'ReadbackProcessor.cpp',
-    'RenderTrace.cpp',
-    'ThebesLayerBuffer.cpp',
-    'YCbCrImageDataSerializer.cpp',
     'basic/BasicCanvasLayer.cpp',
     'basic/BasicColorLayer.cpp',
     'basic/BasicCompositor.cpp',
     'basic/BasicContainerLayer.cpp',
     'basic/BasicImageLayer.cpp',
     'basic/BasicImages.cpp',
     'basic/BasicLayerManager.cpp',
     'basic/BasicLayersImpl.cpp',
     'basic/BasicThebesLayer.cpp',
+    'BufferUnrotate.cpp',
     'client/CanvasClient.cpp',
     'client/ClientCanvasLayer.cpp',
     'client/ClientColorLayer.cpp',
     'client/ClientContainerLayer.cpp',
     'client/ClientImageLayer.cpp',
     'client/ClientLayerManager.cpp',
     'client/ClientThebesLayer.cpp',
     'client/ClientTiledThebesLayer.cpp',
@@ -226,46 +212,60 @@ CPP_SOURCES += [
     'composite/ContainerLayerComposite.cpp',
     'composite/ContentHost.cpp',
     'composite/ImageHost.cpp',
     'composite/ImageLayerComposite.cpp',
     'composite/LayerManagerComposite.cpp',
     'composite/TextureHost.cpp',
     'composite/ThebesLayerComposite.cpp',
     'composite/TiledContentHost.cpp',
+    'Compositor.cpp',
+    'CopyableCanvasLayer.cpp',
+    'Effects.cpp',
+    'ImageContainer.cpp',
+    'ImageDataSerializer.cpp',
+    'ImageLayers.cpp',
     'ipc/AsyncPanZoomController.cpp',
     'ipc/Axis.cpp',
     'ipc/CompositableTransactionParent.cpp',
     'ipc/CompositorChild.cpp',
     'ipc/CompositorCocoaWidgetHelper.cpp',
     'ipc/CompositorParent.cpp',
     'ipc/GestureEventListener.cpp',
-    'ipc/ISurfaceAllocator.cpp',
     'ipc/ImageBridgeChild.cpp',
     'ipc/ImageBridgeParent.cpp',
+    'ipc/ISurfaceAllocator.cpp',
     'ipc/LayerTransactionChild.cpp',
     'ipc/LayerTransactionParent.cpp',
     'ipc/ShadowLayerChild.cpp',
     'ipc/ShadowLayerParent.cpp',
     'ipc/ShadowLayers.cpp',
     'ipc/SharedPlanarYCbCrImage.cpp',
     'ipc/SharedRGBImage.cpp',
     'ipc/TaskThrottler.cpp',
+    'Layers.cpp',
+    'LayersLogging.cpp',
+    'LayerSorter.cpp',
+    'LayerTreeInvalidation.cpp',
     'opengl/CanvasLayerOGL.cpp',
     'opengl/ColorLayerOGL.cpp',
     'opengl/CompositingRenderTargetOGL.cpp',
     'opengl/CompositorOGL.cpp',
     'opengl/ContainerLayerOGL.cpp',
     'opengl/ImageLayerOGL.cpp',
     'opengl/LayerManagerOGL.cpp',
     'opengl/LayerManagerOGLProgram.cpp',
     'opengl/TextureClientOGL.cpp',
     'opengl/TextureHostOGL.cpp',
     'opengl/TexturePoolOGL.cpp',
     'opengl/ThebesLayerOGL.cpp',
+    'ReadbackProcessor.cpp',
+    'RenderTrace.cpp',
+    'ThebesLayerBuffer.cpp',
+    'YCbCrImageDataSerializer.cpp',
 ]
 
 IPDL_SOURCES = [
     'ipc/LayersMessages.ipdlh',
     'ipc/LayersSurfaces.ipdlh',
     'ipc/PCompositable.ipdl',
     'ipc/PCompositor.ipdl',
     'ipc/PGrallocBuffer.ipdl',
--- a/gfx/skia/moz.build
+++ b/gfx/skia/moz.build
@@ -68,43 +68,51 @@ EXPORTS.skia += [
     'include/core/SkScalarCompare.h',
     'include/core/SkShader.h',
     'include/core/SkSize.h',
     'include/core/SkStream.h',
     'include/core/SkString.h',
     'include/core/SkStrokeRec.h',
     'include/core/SkTArray.h',
     'include/core/SkTDArray.h',
+    'include/core/SkTDict.h',
     'include/core/SkTDStack.h',
-    'include/core/SkTDict.h',
-    'include/core/SkTInternalLList.h',
-    'include/core/SkTLazy.h',
-    'include/core/SkTRegistry.h',
-    'include/core/SkTScopedPtr.h',
-    'include/core/SkTSearch.h',
     'include/core/SkTemplates.h',
     'include/core/SkThread.h',
     'include/core/SkThread_platform.h',
     'include/core/SkTime.h',
+    'include/core/SkTInternalLList.h',
+    'include/core/SkTLazy.h',
     'include/core/SkTrace.h',
+    'include/core/SkTRegistry.h',
+    'include/core/SkTScopedPtr.h',
+    'include/core/SkTSearch.h',
     'include/core/SkTypeface.h',
     'include/core/SkTypes.h',
+    'include/core/SkUnitMapper.h',
     'include/core/SkUnPreMultiply.h',
-    'include/core/SkUnitMapper.h',
     'include/core/SkUtils.h',
     'include/core/SkWeakRefCnt.h',
     'include/core/SkWriter32.h',
     'include/core/SkXfermode.h',
     'include/effects/SkBlurDrawLooper.h',
     'include/effects/SkBlurMaskFilter.h',
     'include/effects/SkDashPathEffect.h',
     'include/effects/SkGradientShader.h',
     'include/effects/SkLayerDrawLooper.h',
     'include/effects/SkLayerRasterizer.h',
     'include/effects/SkMorphologyImageFilter.h',
+    'include/gpu/gl/GrGLConfig.h',
+    'include/gpu/gl/GrGLFunctions.h',
+    'include/gpu/gl/GrGLInterface.h',
+    'include/gpu/gl/SkANGLEGLContext.h',
+    'include/gpu/gl/SkDebugGLContext.h',
+    'include/gpu/gl/SkMesaGLContext.h',
+    'include/gpu/gl/SkNativeGLContext.h',
+    'include/gpu/gl/SkNullGLContext.h',
     'include/gpu/GrAARectRenderer.h',
     'include/gpu/GrBackendEffectFactory.h',
     'include/gpu/GrClipData.h',
     'include/gpu/GrColor.h',
     'include/gpu/GrConfig.h',
     'include/gpu/GrContext.h',
     'include/gpu/GrContextFactory.h',
     'include/gpu/GrEffect.h',
@@ -127,42 +135,34 @@ EXPORTS.skia += [
     'include/gpu/GrTextureAccess.h',
     'include/gpu/GrTypes.h',
     'include/gpu/GrTypesPriv.h',
     'include/gpu/GrUserConfig.h',
     'include/gpu/SkGpuDevice.h',
     'include/gpu/SkGr.h',
     'include/gpu/SkGrPixelRef.h',
     'include/gpu/SkGrTexturePixelRef.h',
-    'include/gpu/gl/GrGLConfig.h',
-    'include/gpu/gl/GrGLFunctions.h',
-    'include/gpu/gl/GrGLInterface.h',
-    'include/gpu/gl/SkANGLEGLContext.h',
-    'include/gpu/gl/SkDebugGLContext.h',
-    'include/gpu/gl/SkMesaGLContext.h',
-    'include/gpu/gl/SkNativeGLContext.h',
-    'include/gpu/gl/SkNullGLContext.h',
     'include/lazy/SkBitmapFactory.h',
     'include/utils/SkDeferredCanvas.h',
     'include/utils/SkRandom.h',
     'include/views/SkTextBox.h',
     'src/core/SkTypefaceCache.h',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     EXPORTS.skia += [
         'include/ports/SkTypeface_mac.h',
     ]
     CPP_SOURCES += [
         'src/ports/SkFontHost_mac.cpp',
         'src/ports/SkThread_pthread.cpp',
         'src/ports/SkTime_Unix.cpp',
+        'src/utils/mac/SkStream_mac.cpp',
         'src/utils/SkThreadUtils_pthread.cpp',
         'src/utils/SkThreadUtils_pthread_mach.cpp',
-        'src/utils/mac/SkStream_mac.cpp',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     EXPORTS.skia += [
         'include/config/sk_stdint.h',
         'include/ports/SkTypeface_win.h',
     ]
     CPP_SOURCES += [
         'src/ports/SkFontHost_sandbox_none.cpp',
@@ -171,35 +171,35 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'wi
         'src/ports/SkTime_win.cpp',
         'src/utils/SkThreadUtils_win.cpp',
     ]
 elif CONFIG['MOZ_WIDGET_GTK']:
     EXPORTS.skia += [
         'include/ports/SkTypeface_cairo.h',
     ]
     CPP_SOURCES += [
+        'src/ports/SkFontHost_cairo.cpp',
         'src/ports/SkFontHost_FreeType_common.cpp',
-        'src/ports/SkFontHost_cairo.cpp',
         'src/ports/SkThread_pthread.cpp',
         'src/ports/SkTime_Unix.cpp',
         'src/utils/SkOSFile.cpp',
         'src/utils/SkThreadUtils_pthread.cpp',
     ]
     if CONFIG['OS_TARGET'] in ('Linux', 'FreeBSD', 'NetBSD'):
         CPP_SOURCES += [
             'src/utils/SkThreadUtils_pthread_linux.cpp',
         ]
     else:
         CPP_SOURCES += [
             'src/utils/SkThreadUtils_pthread_other.cpp',
         ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
     CPP_SOURCES += [
+        'src/ports/SkFontHost_cairo.cpp',
         'src/ports/SkFontHost_FreeType_common.cpp',
-        'src/ports/SkFontHost_cairo.cpp',
         'src/utils/SkOSFile.cpp',
     ]
     if CONFIG['OS_TARGET'] == 'Linux':
         EXPORTS.skia += [
             'include/ports/SkTypeface_cairo.h',
         ]
         CPP_SOURCES += [
             'src/ports/SkThread_pthread.cpp',
@@ -211,59 +211,93 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt
 # toolkits.
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk'):
     EXPORTS.skia += [
         'include/ports/SkTypeface_cairo.h',
     ]
     CPP_SOURCES += [
         'src/images/SkImageRef_ashmem.cpp',
         'src/ports/SkDebug_android.cpp',
+        'src/ports/SkFontHost_cairo.cpp',
         'src/ports/SkFontHost_FreeType.cpp',
         'src/ports/SkFontHost_FreeType_common.cpp',
-        'src/ports/SkFontHost_cairo.cpp',
         'src/ports/SkFontHost_linux.cpp',
         'src/ports/SkThread_pthread.cpp',
         'src/ports/SkTime_Unix.cpp',
+        'src/utils/android/ashmem.cpp',
         'src/utils/SkOSFile.cpp',
         'src/utils/SkThreadUtils_pthread.cpp',
         'src/utils/SkThreadUtils_pthread_other.cpp',
-        'src/utils/android/ashmem.cpp',
     ]
 else:
     CPP_SOURCES += [
         'src/ports/SkDebug_stdio.cpp',
     ]
 
 if CONFIG['INTEL_ARCHITECTURE']:
     CPP_SOURCES += [
+        'src/opts/opts_check_SSE2.cpp',
         'src/opts/SkBitmapProcState_opts_SSE2.cpp',
         'src/opts/SkBlitRect_opts_SSE2.cpp',
         'src/opts/SkBlitRow_opts_SSE2.cpp',
         'src/opts/SkUtils_opts_SSE2.cpp',
-        'src/opts/opts_check_SSE2.cpp',
     ]
     if CONFIG['HAVE_TOOLCHAIN_SUPPORT_MSSSE3']:
         CPP_SOURCES += [
             'src/opts/SkBitmapProcState_opts_SSSE3.cpp',
         ]
 elif CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC']:
         CPP_SOURCES += [
+            'src/opts/opts_check_arm.cpp',
             'src/opts/SkBitmapProcState_opts_arm.cpp',
             'src/opts/SkBlitRow_opts_arm.cpp',
-            'src/opts/opts_check_arm.cpp',
         ]
 else:
     CPP_SOURCES += [
         'src/opts/SkBitmapProcState_opts_none.cpp',
         'src/opts/SkBlitRow_opts_none.cpp',
         'src/opts/SkUtils_opts_none.cpp',
     ]
 
 if CONFIG['MOZ_ENABLE_SKIA_GPU']:
     CPP_SOURCES += [
+        'src/gpu/effects/GrConfigConversionEffect.cpp',
+        'src/gpu/effects/GrConvolutionEffect.cpp',
+        'src/gpu/effects/GrSimpleTextureEffect.cpp',
+        'src/gpu/effects/GrSingleTextureEffect.cpp',
+        'src/gpu/effects/GrTextureDomainEffect.cpp',
+        'src/gpu/effects/GrTextureStripAtlas.cpp',
+        'src/gpu/gl/GrGLBufferImpl.cpp',
+        'src/gpu/gl/GrGLCaps.cpp',
+        'src/gpu/gl/GrGLContext.cpp',
+        'src/gpu/gl/GrGLCreateNativeInterface_none.cpp',
+        'src/gpu/gl/GrGLCreateNullInterface.cpp',
+        'src/gpu/gl/GrGLDefaultInterface_native.cpp',
+        'src/gpu/gl/GrGLEffect.cpp',
+        'src/gpu/gl/GrGLEffectMatrix.cpp',
+        'src/gpu/gl/GrGLExtensions.cpp',
+        'src/gpu/gl/GrGLIndexBuffer.cpp',
+        'src/gpu/gl/GrGLInterface.cpp',
+        'src/gpu/gl/GrGLNoOpInterface.cpp',
+        'src/gpu/gl/GrGLPath.cpp',
+        'src/gpu/gl/GrGLProgram.cpp',
+        'src/gpu/gl/GrGLProgramDesc.cpp',
+        'src/gpu/gl/GrGLRenderTarget.cpp',
+        'src/gpu/gl/GrGLShaderBuilder.cpp',
+        'src/gpu/gl/GrGLSL.cpp',
+        'src/gpu/gl/GrGLStencilBuffer.cpp',
+        'src/gpu/gl/GrGLTexture.cpp',
+        'src/gpu/gl/GrGLUniformManager.cpp',
+        'src/gpu/gl/GrGLUtil.cpp',
+        'src/gpu/gl/GrGLVertexArray.cpp',
+        'src/gpu/gl/GrGLVertexBuffer.cpp',
+        'src/gpu/gl/GrGpuGL.cpp',
+        'src/gpu/gl/GrGpuGL_program.cpp',
+        'src/gpu/gl/SkGLContextHelper.cpp',
+        'src/gpu/gl/SkNullGLContext.cpp',
         'src/gpu/GrAAConvexPathRenderer.cpp',
         'src/gpu/GrAAHairLinePathRenderer.cpp',
         'src/gpu/GrAARectRenderer.cpp',
         'src/gpu/GrAddPathRenderers_default.cpp',
         'src/gpu/GrAllocPool.cpp',
         'src/gpu/GrAtlas.cpp',
         'src/gpu/GrBufferAllocPool.cpp',
         'src/gpu/GrCacheID.cpp',
@@ -286,83 +320,49 @@ if CONFIG['MOZ_ENABLE_SKIA_GPU']:
         'src/gpu/GrPathRenderer.cpp',
         'src/gpu/GrPathRendererChain.cpp',
         'src/gpu/GrPathUtils.cpp',
         'src/gpu/GrRectanizer.cpp',
         'src/gpu/GrReducedClip.cpp',
         'src/gpu/GrRenderTarget.cpp',
         'src/gpu/GrResource.cpp',
         'src/gpu/GrResourceCache.cpp',
-        'src/gpu/GrSWMaskHelper.cpp',
         'src/gpu/GrSoftwarePathRenderer.cpp',
         'src/gpu/GrStencil.cpp',
         'src/gpu/GrStencilAndCoverPathRenderer.cpp',
         'src/gpu/GrStencilBuffer.cpp',
         'src/gpu/GrSurface.cpp',
+        'src/gpu/GrSWMaskHelper.cpp',
         'src/gpu/GrTextContext.cpp',
         'src/gpu/GrTextStrike.cpp',
         'src/gpu/GrTexture.cpp',
         'src/gpu/GrTextureAccess.cpp',
         'src/gpu/SkGpuDevice.cpp',
         'src/gpu/SkGr.cpp',
         'src/gpu/SkGrFontScaler.cpp',
         'src/gpu/SkGrPixelRef.cpp',
         'src/gpu/SkGrTexturePixelRef.cpp',
-        'src/gpu/effects/GrConfigConversionEffect.cpp',
-        'src/gpu/effects/GrConvolutionEffect.cpp',
-        'src/gpu/effects/GrSimpleTextureEffect.cpp',
-        'src/gpu/effects/GrSingleTextureEffect.cpp',
-        'src/gpu/effects/GrTextureDomainEffect.cpp',
-        'src/gpu/effects/GrTextureStripAtlas.cpp',
-        'src/gpu/gl/GrGLBufferImpl.cpp',
-        'src/gpu/gl/GrGLCaps.cpp',
-        'src/gpu/gl/GrGLContext.cpp',
-        'src/gpu/gl/GrGLCreateNativeInterface_none.cpp',
-        'src/gpu/gl/GrGLCreateNullInterface.cpp',
-        'src/gpu/gl/GrGLDefaultInterface_native.cpp',
-        'src/gpu/gl/GrGLEffect.cpp',
-        'src/gpu/gl/GrGLEffectMatrix.cpp',
-        'src/gpu/gl/GrGLExtensions.cpp',
-        'src/gpu/gl/GrGLIndexBuffer.cpp',
-        'src/gpu/gl/GrGLInterface.cpp',
-        'src/gpu/gl/GrGLNoOpInterface.cpp',
-        'src/gpu/gl/GrGLPath.cpp',
-        'src/gpu/gl/GrGLProgram.cpp',
-        'src/gpu/gl/GrGLProgramDesc.cpp',
-        'src/gpu/gl/GrGLRenderTarget.cpp',
-        'src/gpu/gl/GrGLSL.cpp',
-        'src/gpu/gl/GrGLShaderBuilder.cpp',
-        'src/gpu/gl/GrGLStencilBuffer.cpp',
-        'src/gpu/gl/GrGLTexture.cpp',
-        'src/gpu/gl/GrGLUniformManager.cpp',
-        'src/gpu/gl/GrGLUtil.cpp',
-        'src/gpu/gl/GrGLVertexArray.cpp',
-        'src/gpu/gl/GrGLVertexBuffer.cpp',
-        'src/gpu/gl/GrGpuGL.cpp',
-        'src/gpu/gl/GrGpuGL_program.cpp',
-        'src/gpu/gl/SkGLContextHelper.cpp',
-        'src/gpu/gl/SkNullGLContext.cpp',
     ]
 
 CPP_SOURCES += [
         'src/core/Sk64.cpp',
         'src/core/SkAAClip.cpp',
         'src/core/SkAdvancedTypefaceMetrics.cpp',
         'src/core/SkAlphaRuns.cpp',
         'src/core/SkAnnotation.cpp',
         'src/core/SkBBoxHierarchy.cpp',
         'src/core/SkBBoxHierarchyRecord.cpp',
         'src/core/SkBBoxRecord.cpp',
         'src/core/SkBitmap.cpp',
+        'src/core/SkBitmap_scroll.cpp',
         'src/core/SkBitmapHeap.cpp',
         'src/core/SkBitmapProcShader.cpp',
         'src/core/SkBitmapProcState.cpp',
         'src/core/SkBitmapProcState_matrixProcs.cpp',
         'src/core/SkBitmapSampler.cpp',
-        'src/core/SkBitmap_scroll.cpp',
         'src/core/SkBlitMask_D32.cpp',
         'src/core/SkBlitRow_D16.cpp',
         'src/core/SkBlitRow_D32.cpp',
         'src/core/SkBlitRow_D4444.cpp',
         'src/core/SkBlitter.cpp',
         'src/core/SkBlitter_4444.cpp',
         'src/core/SkBlitter_A1.cpp',
         'src/core/SkBlitter_A8.cpp',
@@ -425,51 +425,60 @@ CPP_SOURCES += [
         'src/core/SkPicturePlayback.cpp',
         'src/core/SkPictureRecord.cpp',
         'src/core/SkPictureStateTree.cpp',
         'src/core/SkPixelRef.cpp',
         'src/core/SkPoint.cpp',
         'src/core/SkProcSpriteBlitter.cpp',
         'src/core/SkPtrRecorder.cpp',
         'src/core/SkQuadClipper.cpp',
-        'src/core/SkRRect.cpp',
-        'src/core/SkRTree.cpp',
         'src/core/SkRasterClip.cpp',
         'src/core/SkRasterizer.cpp',
         'src/core/SkRect.cpp',
         'src/core/SkRefCnt.cpp',
         'src/core/SkRefDict.cpp',
         'src/core/SkRegion.cpp',
         'src/core/SkRegion_path.cpp',
         'src/core/SkRegion_rects.cpp',
+        'src/core/SkRRect.cpp',
+        'src/core/SkRTree.cpp',
         'src/core/SkScalar.cpp',
         'src/core/SkScalerContext.cpp',
         'src/core/SkScan.cpp',
+        'src/core/SkScan_Antihair.cpp',
         'src/core/SkScan_AntiPath.cpp',
-        'src/core/SkScan_Antihair.cpp',
         'src/core/SkScan_Hairline.cpp',
         'src/core/SkScan_Path.cpp',
         'src/core/SkShader.cpp',
         'src/core/SkSpriteBlitter_ARGB32.cpp',
         'src/core/SkSpriteBlitter_RGB16.cpp',
         'src/core/SkStream.cpp',
         'src/core/SkString.cpp',
         'src/core/SkStroke.cpp',
         'src/core/SkStrokeRec.cpp',
         'src/core/SkStrokerPriv.cpp',
+        'src/core/SkTileGrid.cpp',
+        'src/core/SkTileGridPicture.cpp',
         'src/core/SkTLS.cpp',
         'src/core/SkTSearch.cpp',
-        'src/core/SkTileGrid.cpp',
-        'src/core/SkTileGridPicture.cpp',
         'src/core/SkTypeface.cpp',
         'src/core/SkTypefaceCache.cpp',
         'src/core/SkUnPreMultiply.cpp',
         'src/core/SkUtils.cpp',
         'src/core/SkWriter32.cpp',
         'src/core/SkXfermode.cpp',
+        'src/effects/gradients/SkBitmapCache.cpp',
+        'src/effects/gradients/SkClampRange.cpp',
+        'src/effects/gradients/SkGradientShader.cpp',
+        'src/effects/gradients/SkGradientTileProc.cpp',
+        'src/effects/gradients/SkLinearGradient.cpp',
+        'src/effects/gradients/SkRadialGradient.cpp',
+        'src/effects/gradients/SkSweepGradient.cpp',
+        'src/effects/gradients/SkTwoPointConicalGradient.cpp',
+        'src/effects/gradients/SkTwoPointRadialGradient.cpp',
         'src/effects/Sk1DPathEffect.cpp',
         'src/effects/Sk2DPathEffect.cpp',
         'src/effects/SkAvoidXfermode.cpp',
         'src/effects/SkBicubicImageFilter.cpp',
         'src/effects/SkBitmapSource.cpp',
         'src/effects/SkBlendImageFilter.cpp',
         'src/effects/SkBlurDrawLooper.cpp',
         'src/effects/SkBlurImageFilter.cpp',
@@ -494,51 +503,42 @@ CPP_SOURCES += [
         'src/effects/SkMergeImageFilter.cpp',
         'src/effects/SkMorphologyImageFilter.cpp',
         'src/effects/SkOffsetImageFilter.cpp',
         'src/effects/SkPixelXorXfermode.cpp',
         'src/effects/SkStippleMaskFilter.cpp',
         'src/effects/SkTableColorFilter.cpp',
         'src/effects/SkTableMaskFilter.cpp',
         'src/effects/SkTestImageFilters.cpp',
-        'src/effects/gradients/SkBitmapCache.cpp',
-        'src/effects/gradients/SkClampRange.cpp',
-        'src/effects/gradients/SkGradientShader.cpp',
-        'src/effects/gradients/SkGradientTileProc.cpp',
-        'src/effects/gradients/SkLinearGradient.cpp',
-        'src/effects/gradients/SkRadialGradient.cpp',
-        'src/effects/gradients/SkSweepGradient.cpp',
-        'src/effects/gradients/SkTwoPointConicalGradient.cpp',
-        'src/effects/gradients/SkTwoPointRadialGradient.cpp',
         'src/image/SkDataPixelRef.cpp',
         'src/image/SkImage.cpp',
-        'src/image/SkImagePriv.cpp',
         'src/image/SkImage_Codec.cpp',
         'src/image/SkImage_Picture.cpp',
         'src/image/SkImage_Raster.cpp',
+        'src/image/SkImagePriv.cpp',
         'src/image/SkSurface.cpp',
         'src/image/SkSurface_Picture.cpp',
         'src/image/SkSurface_Raster.cpp',
         'src/images/SkImageDecoder.cpp',
         'src/images/SkImageDecoder_Factory.cpp',
         'src/images/SkImageRef.cpp',
+        'src/images/SkImageRef_GlobalPool.cpp',
         'src/images/SkImageRefPool.cpp',
-        'src/images/SkImageRef_GlobalPool.cpp',
         'src/images/SkImages.cpp',
         'src/lazy/SkBitmapFactory.cpp',
         'src/lazy/SkLazyPixelRef.cpp',
         'src/pipe/SkGPipeRead.cpp',
         'src/pipe/SkGPipeWrite.cpp',
         'src/ports/SkGlobalInitialization_default.cpp',
         'src/ports/SkMemory_malloc.cpp',
         'src/ports/SkOSFile_stdio.cpp',
         'src/sfnt/SkOTUtils.cpp',
         'src/utils/SkBase64.cpp',
+        'src/utils/SkBitmapTransformer.cpp',
         'src/utils/SkBitSet.cpp',
-        'src/utils/SkBitmapTransformer.cpp',
         'src/utils/SkCondVar.cpp',
         'src/utils/SkCountdown.cpp',
         'src/utils/SkDeferredCanvas.cpp',
         'src/utils/SkPictureUtils.cpp',
         'src/utils/SkRTConf.cpp',
         'src/utils/SkThreadPool.cpp',
 ]
 
--- a/gfx/tests/gtest/moz.build
+++ b/gfx/tests/gtest/moz.build
@@ -4,29 +4,29 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'gfxtest'
 
 LIBRARY_NAME = 'gfxtest'
 
 GTEST_CPP_SOURCES += [
+    'gfxSurfaceRefCountTest.cpp',
+    'gfxWordCacheTest.cpp',
     'TestAsyncPanZoomController.cpp',
     'TestBufferRotation.cpp',
     'TestColorNames.cpp',
     'TestLayers.cpp',
     'TestRegion.cpp',
-    'TestTextures.cpp',
-    'TestTiledLayerBuffer.cpp',
     # Hangs on linux in ApplyGdkScreenFontOptions
     #'gfxFontSelectionTest.cpp',
-    'gfxSurfaceRefCountTest.cpp',
+    'TestTextures.cpp',
     # Test works but it doesn't assert anything
     #'gfxTextRunPerfTest.cpp',
-    'gfxWordCacheTest.cpp',
+    'TestTiledLayerBuffer.cpp',
 ]
 
 # Because of gkmedia on windows we wont find these
 # symbols in xul.dll.
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'windows':
     GTEST_CPP_SOURCES += [
         'TestBase.cpp',
         'TestMoz2D.cpp',
--- a/gfx/thebes/moz.build
+++ b/gfx/thebes/moz.build
@@ -3,22 +3,20 @@
 # 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/.
 
 MODULE = 'thebes'
 
 EXPORTS += [
     'DrawMode.h',
-    'GraphicsFilter.h',
-    'RoundedRect.h',
     'gfx2DGlue.h',
     'gfx3DMatrix.h',
+    'gfxAlphaRecovery.h',
     'gfxASurface.h',
-    'gfxAlphaRecovery.h',
     'gfxBaseSharedMemorySurface.h',
     'gfxBlur.h',
     'gfxCachedTempSurface.h',
     'gfxColor.h',
     'gfxContext.h',
     'gfxDrawable.h',
     'gfxFailure.h',
     'gfxFont.h',
@@ -36,25 +34,27 @@ EXPORTS += [
     'gfxPoint3D.h',
     'gfxPointH3D.h',
     'gfxQuad.h',
     'gfxQuaternion.h',
     'gfxRect.h',
     'gfxReusableImageSurfaceWrapper.h',
     'gfxReusableSharedImageSurfaceWrapper.h',
     'gfxReusableSurfaceWrapper.h',
-    'gfxSVGGlyphs.h',
     'gfxSharedImageSurface.h',
     'gfxSharedQuartzSurface.h',
     'gfxSkipChars.h',
+    'gfxSVGGlyphs.h',
     'gfxTeeSurface.h',
     'gfxTypes.h',
     'gfxUserFontSet.h',
     'gfxUtils.h',
+    'GraphicsFilter.h',
     'nsSurfaceTexture.h',
+    'RoundedRect.h',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
     EXPORTS += [
         'gfxAndroidPlatform.h',
         'gfxFT2FontBase.h',
         'gfxFT2Fonts.h',
         'gfxPDFSurface.h',
@@ -100,28 +100,28 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co
         'gfxQuartzSurface.cpp',
         'nsUnicodeRange.cpp',
     ]
 elif CONFIG['MOZ_WIDGET_GTK']:
     EXPORTS += [
         'gfxFT2FontBase.h',
         'gfxGdkNativeRenderer.h',
         'gfxPDFSurface.h',
+        'gfxPlatformGtk.h',
         'gfxPSSurface.h',
-        'gfxPlatformGtk.h',
     ]
 
     CPP_SOURCES += [
+        'gfxFontconfigUtils.cpp',
         'gfxFT2FontBase.cpp',
         'gfxFT2Utils.cpp',
-        'gfxFontconfigUtils.cpp',
         'gfxGdkNativeRenderer.cpp',
         'gfxPDFSurface.cpp',
+        'gfxPlatformGtk.cpp',
         'gfxPSSurface.cpp',
-        'gfxPlatformGtk.cpp',
         'nsUnicodeRange.cpp',
     ]
 
     if CONFIG['MOZ_X11']:
         EXPORTS += [
             'gfxXlibNativeRenderer.h',
             'gfxXlibSurface.h',
         ]
@@ -159,19 +159,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt
     EXPORTS += [
         'gfxFT2FontBase.h',
         'gfxPDFSurface.h',
         'gfxQPainterSurface.h',
         'gfxQtNativeRenderer.h',
         'gfxQtPlatform.h',
     ]
     CPP_SOURCES += [
+        'gfxFontconfigUtils.cpp',
         'gfxFT2FontBase.cpp',
         'gfxFT2Utils.cpp',
-        'gfxFontconfigUtils.cpp',
         'gfxPDFSurface.cpp',
         'gfxQPainterSurface.cpp',
         'gfxQtPlatform.cpp',
         'nsUnicodeRange.cpp',
     ]
 
     if CONFIG['MOZ_X11']:
         EXPORTS += [
@@ -228,18 +228,18 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'wi
 # Are we targeting x86 or x64?  If so, build gfxAlphaRecoverySSE2.cpp.
 if CONFIG['INTEL_ARCHITECTURE']:
     CPP_SOURCES += [
         'gfxAlphaRecoverySSE2.cpp',
     ]
 
 CPP_SOURCES += [
     'gfx3DMatrix.cpp',
+    'gfxAlphaRecovery.cpp',
     'gfxASurface.cpp',
-    'gfxAlphaRecovery.cpp',
     'gfxBaseSharedMemorySurface.cpp',
     'gfxBlur.cpp',
     'gfxCachedTempSurface.cpp',
     'gfxContext.cpp',
     'gfxDrawable.cpp',
     'gfxFont.cpp',
     'gfxFontFeatures.cpp',
     'gfxFontMissingGlyphs.cpp',
@@ -251,19 +251,19 @@ CPP_SOURCES += [
     'gfxMatrix.cpp',
     'gfxPath.cpp',
     'gfxPattern.cpp',
     'gfxPlatform.cpp',
     'gfxPlatformFontList.cpp',
     'gfxRect.cpp',
     'gfxReusableImageSurfaceWrapper.cpp',
     'gfxReusableSharedImageSurfaceWrapper.cpp',
-    'gfxSVGGlyphs.cpp',
     'gfxScriptItemizer.cpp',
     'gfxSkipChars.cpp',
+    'gfxSVGGlyphs.cpp',
     'gfxTeeSurface.cpp',
     'gfxUserFontSet.cpp',
     'gfxUtils.cpp',
     'nsSurfaceTexture.cpp',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     CMMSRCS += [
--- a/hal/moz.build
+++ b/hal/moz.build
@@ -18,18 +18,18 @@ EXPORTS.mozilla += [
     'HalTypes.h',
     'HalWakeLock.h',
 ]
 
 TEST_DIRS += ['tests']
 CPP_SOURCES += [
     'Hal.cpp',
     'HalWakeLock.cpp',
+    'sandbox/SandboxHal.cpp',
     'WindowIdentifier.cpp',
-    'sandbox/SandboxHal.cpp',
 ]
 
 if CONFIG['MOZ_GAMEPAD_BACKEND'] == 'stub':
     CPP_SOURCES += [
         'fallback/FallbackGamepad.cpp'
     ]
 elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'cocoa':
     CPP_SOURCES += [
@@ -126,18 +126,18 @@ else:
         'fallback/FallbackSensor.cpp',
         'fallback/FallbackVibration.cpp',
     ]
 
 # Fallbacks for backends implemented on Gonk only.
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
     CPP_SOURCES += [
         'fallback/FallbackDiskSpaceWatcher.cpp',
+        'fallback/FallbackFactoryReset.cpp',
         'fallback/FallbackFMRadio.cpp',
-        'fallback/FallbackFactoryReset.cpp',
         'fallback/FallbackLights.cpp',
         'fallback/FallbackProcessPriority.cpp',
         'fallback/FallbackScreenPower.cpp',
         'fallback/FallbackSwitch.cpp',
         'fallback/FallbackTime.cpp',
         'fallback/FallbackWakeLocks.cpp',
     ]
 
--- a/image/src/moz.build
+++ b/image/src/moz.build
@@ -3,47 +3,47 @@
 # 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/.
 
 MODULE = 'imglib2'
 
 EXPORTS += [
     'ImageOps.h',
-    'Orientation.h',
     'imgLoader.h',
     'imgRequest.h',
     'imgRequestProxy.h',
+    'Orientation.h',
 ]
 
 CPP_SOURCES += [
     'ClippedImage.cpp',
     'Decoder.cpp',
     'DiscardTracker.cpp',
     'FrameAnimator.cpp',
     'FrameBlender.cpp',
     'FrameSequence.cpp',
     'FrozenImage.cpp',
     'Image.cpp',
     'ImageFactory.cpp',
     'ImageMetadata.cpp',
     'ImageOps.cpp',
     'ImageWrapper.cpp',
-    'OrientedImage.cpp',
-    'RasterImage.cpp',
-    'SVGDocumentWrapper.cpp',
-    'ScriptedNotificationObserver.cpp',
-    'SurfaceCache.cpp',
-    'VectorImage.cpp',
     'imgFrame.cpp',
     'imgLoader.cpp',
     'imgRequest.cpp',
     'imgRequestProxy.cpp',
     'imgStatusTracker.cpp',
     'imgTools.cpp',
+    'OrientedImage.cpp',
+    'RasterImage.cpp',
+    'ScriptedNotificationObserver.cpp',
+    'SurfaceCache.cpp',
+    'SVGDocumentWrapper.cpp',
+    'VectorImage.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'imglib2_s'
 
--- a/ipc/glue/moz.build
+++ b/ipc/glue/moz.build
@@ -12,18 +12,18 @@ EXPORTS += [
 ]
 
 EXPORTS.mozilla.ipc += [
     'BrowserProcessSubThread.h',
     'CrossProcessMutex.h',
     'FileDescriptor.h',
     'FileDescriptorUtils.h',
     'GeckoChildProcessHost.h',
+    'InputStreamUtils.h',
     'IOThreadChild.h',
-    'InputStreamUtils.h',
     'MessageChannel.h',
     'MessageLink.h',
     'ProcessChild.h',
     'ProtocolUtils.h',
     'ScopedXREEmbed.h',
     'SharedMemory.h',
     'SharedMemoryBasic.h',
     'SharedMemorySysV.h',
--- a/ipc/ipdl/test/cxx/moz.build
+++ b/ipc/ipdl/test/cxx/moz.build
@@ -6,26 +6,26 @@
 
 TOOL_DIRS += ['app']
 
 MODULE = 'ipdlunittest'
 LIBRARY_NAME = 'ipdlunittest_s'
 
 EXPORTS.mozilla._ipdltest += [
     'IPDLUnitTestProcessChild.h',
+    'IPDLUnitTests.h',
     'IPDLUnitTestTypes.h',
     'IPDLUnitTestUtils.h',
-    'IPDLUnitTests.h',
 ]
 
 CPP_SOURCES += [
     '$(IPDLTESTSRCS)',
     'IPDLUnitTestProcessChild.cpp',
+    'IPDLUnitTests.cpp',
     'IPDLUnitTestSubprocess.cpp',
-    'IPDLUnitTests.cpp',
 ]
 
 IPDL_SOURCES += [
     'PTestActorPunning.ipdl',
     'PTestActorPunningPunned.ipdl',
     'PTestActorPunningSub.ipdl',
     'PTestBadActor.ipdl',
     'PTestBadActorSub.ipdl',
@@ -57,21 +57,21 @@ IPDL_SOURCES += [
     'PTestManyChildAllocsSub.ipdl',
     'PTestMultiMgrs.ipdl',
     'PTestMultiMgrsBottom.ipdl',
     'PTestMultiMgrsLeft.ipdl',
     'PTestMultiMgrsRight.ipdl',
     'PTestNestedLoops.ipdl',
     'PTestOpens.ipdl',
     'PTestOpensOpened.ipdl',
-    'PTestRPC.ipdl',
     'PTestRaceDeferral.ipdl',
     'PTestRacyInterruptReplies.ipdl',
     'PTestRacyReentry.ipdl',
     'PTestRacyUndefer.ipdl',
+    'PTestRPC.ipdl',
     'PTestSanity.ipdl',
     'PTestSelfManage.ipdl',
     'PTestSelfManageRoot.ipdl',
     'PTestShmem.ipdl',
     'PTestShutdown.ipdl',
     'PTestShutdownSub.ipdl',
     'PTestShutdownSubsub.ipdl',
     'PTestStackHooks.ipdl',
--- a/js/src/gdb/moz.build
+++ b/js/src/gdb/moz.build
@@ -3,16 +3,16 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 PROGRAM = 'gdb-tests'
 
 CPP_SOURCES += [
     'gdb-tests.cpp',
+    'tests/test-jsid.cpp',
     'tests/test-JSObject.cpp',
     'tests/test-JSString.cpp',
-    'tests/test-Root.cpp',
-    'tests/test-jsid.cpp',
     'tests/test-jsval.cpp',
     'tests/test-prettyprinters.cpp',
+    'tests/test-Root.cpp',
     'tests/typedef-printers.cpp',
 ]
--- a/js/src/jsapi-tests/moz.build
+++ b/js/src/jsapi-tests/moz.build
@@ -32,39 +32,39 @@ CPP_SOURCES += [
     'testFuncCallback.cpp',
     'testFunctionProperties.cpp',
     'testGCExactRooting.cpp',
     'testGCFinalizeCallback.cpp',
     'testGCOutOfMemory.cpp',
     'testHashTable.cpp',
     'testHashTableInit.cpp',
     'testIndexToString.cpp',
+    'testIntern.cpp',
     'testIntString.cpp',
     'testIntTypesABI.cpp',
-    'testIntern.cpp',
     'testJSEvaluateScript.cpp',
     'testLookup.cpp',
     'testLooselyEqual.cpp',
     'testNewObject.cpp',
     'testNullRoot.cpp',
+    'testObjectEmulatingUndefined.cpp',
     'testOOM.cpp',
-    'testObjectEmulatingUndefined.cpp',
     'testOps.cpp',
     'testOriginPrincipals.cpp',
     'testParseJSON.cpp',
     'testProfileStrings.cpp',
     'testPropCache.cpp',
     'testRegExp.cpp',
     'testResolveRecursion.cpp',
+    'tests.cpp',
     'testSameValue.cpp',
     'testScriptInfo.cpp',
     'testScriptObject.cpp',
     'testSetProperty.cpp',
     'testSourcePolicy.cpp',
     'testStringBuffer.cpp',
     'testStructuredClone.cpp',
     'testToIntWidth.cpp',
     'testTrap.cpp',
     'testTypedArrays.cpp',
     'testUTF8.cpp',
     'testXDR.cpp',
-    'tests.cpp',
 ]
--- a/js/src/moz.build
+++ b/js/src/moz.build
@@ -83,18 +83,18 @@ CPP_SOURCES += [
     'builtin/Intl.cpp',
     'builtin/MapObject.cpp',
     'builtin/Module.cpp',
     'builtin/Object.cpp',
     'builtin/ParallelArray.cpp',
     'builtin/Profilers.cpp',
     'builtin/RegExp.cpp',
     'builtin/TestingFunctions.cpp',
+    'builtin/TypedObject.cpp',
     'builtin/TypeRepresentation.cpp',
-    'builtin/TypedObject.cpp',
     'devtools/sharkctl.cpp',
     'ds/LifoAlloc.cpp',
     'frontend/BytecodeCompiler.cpp',
     'frontend/BytecodeEmitter.cpp',
     'frontend/FoldConstants.cpp',
     'frontend/NameFunctions.cpp',
     'frontend/ParseMaps.cpp',
     'frontend/ParseNode.cpp',
@@ -162,20 +162,20 @@ CPP_SOURCES += [
     'vm/ObjectImpl.cpp',
     'vm/OldDebugAPI.cpp',
     'vm/Probes.cpp',
     'vm/PropertyKey.cpp',
     'vm/ProxyObject.cpp',
     'vm/RegExpObject.cpp',
     'vm/RegExpStatics.cpp',
     'vm/Runtime.cpp',
-    'vm/SPSProfiler.cpp',
     'vm/ScopeObject.cpp',
     'vm/SelfHosting.cpp',
     'vm/Shape.cpp',
+    'vm/SPSProfiler.cpp',
     'vm/Stack.cpp',
     'vm/String.cpp',
     'vm/StringBuffer.cpp',
     'vm/StructuredClone.cpp',
     'vm/ThreadPool.cpp',
     'vm/TypedArrayObject.cpp',
     'vm/Unicode.cpp',
     'vm/Value.cpp',
@@ -223,40 +223,40 @@ if CONFIG['ENABLE_ION']:
         'jit/IonAnalysis.cpp',
         'jit/IonBuilder.cpp',
         'jit/IonCaches.cpp',
         'jit/IonFrames.cpp',
         'jit/IonMacroAssembler.cpp',
         'jit/IonSpewer.cpp',
         'jit/JSONSpewer.cpp',
         'jit/LICM.cpp',
+        'jit/LinearScan.cpp',
         'jit/LIR.cpp',
-        'jit/LinearScan.cpp',
         'jit/LiveRangeAllocator.cpp',
         'jit/Lowering.cpp',
         'jit/MCallOptimize.cpp',
         'jit/MIR.cpp',
         'jit/MIRGraph.cpp',
         'jit/MoveResolver.cpp',
         'jit/ParallelFunctions.cpp',
         'jit/ParallelSafetyAnalysis.cpp',
         'jit/PerfSpewer.cpp',
         'jit/RangeAnalysis.cpp',
         'jit/RegisterAllocator.cpp',
         'jit/Safepoints.cpp',
+        'jit/shared/BaselineCompiler-shared.cpp',
+        'jit/shared/CodeGenerator-shared.cpp',
+        'jit/shared/Lowering-shared.cpp',
         'jit/Snapshots.cpp',
         'jit/StupidAllocator.cpp',
         'jit/TypePolicy.cpp',
         'jit/TypeRepresentationSet.cpp',
         'jit/UnreachableCodeElimination.cpp',
+        'jit/ValueNumbering.cpp',
         'jit/VMFunctions.cpp',
-        'jit/ValueNumbering.cpp',
-        'jit/shared/BaselineCompiler-shared.cpp',
-        'jit/shared/CodeGenerator-shared.cpp',
-        'jit/shared/Lowering-shared.cpp',
     ]
     if CONFIG['TARGET_CPU'].find('86') != -1:
         CPP_SOURCES += [
             'jit/shared/Assembler-x86-shared.cpp',
             'jit/shared/BaselineCompiler-x86-shared.cpp',
             'jit/shared/BaselineIC-x86-shared.cpp',
             'jit/shared/CodeGenerator-x86-shared.cpp',
             'jit/shared/IonFrames-x86-shared.cpp',
--- a/js/xpconnect/idl/moz.build
+++ b/js/xpconnect/idl/moz.build
@@ -4,21 +4,21 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'mozIJSSubScriptLoader.idl',
     'nsIJSEngineTelemetryStats.idl',
     'nsIJSRuntimeService.idl',
     'nsIScriptError.idl',
+    'nsIXPConnect.idl',
     'nsIXPCScriptable.idl',
     'nsIXPCSecurityManager.idl',
-    'nsIXPConnect.idl',
+    'xpccomponents.idl',
+    'xpcexception.idl',
     'xpcIJSGetFactory.idl',
     'xpcIJSModuleLoader.idl',
     'xpcIJSWeakReference.idl',
-    'xpccomponents.idl',
-    'xpcexception.idl',
     'xpcjsid.idl',
 ]
 
 MODULE = 'xpconnect'
 
--- a/js/xpconnect/public/moz.build
+++ b/js/xpconnect/public/moz.build
@@ -2,15 +2,15 @@
 # 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/.
 
 MODULE = 'xpconnect'
 
 EXPORTS += [
-    'SandboxPrivate.h',
+    'nsAutoJSValHolder.h',
     'nsAXPCNativeCallContext.h',
-    'nsAutoJSValHolder.h',
     'nsTArrayHelpers.h',
+    'SandboxPrivate.h',
     'xpc_map_end.h',
 ]
 
--- a/js/xpconnect/src/moz.build
+++ b/js/xpconnect/src/moz.build
@@ -3,24 +3,27 @@
 # 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/.
 
 MODULE = 'xpconnect'
 
 EXPORTS += [
     'BackstagePass.h',
-    'XPCJSMemoryReporter.h',
     'nsCxPusher.h',
     'qsObjectHelper.h',
+    'XPCJSMemoryReporter.h',
     'xpcObjectHelper.h',
     'xpcpublic.h',
 ]
 
 CPP_SOURCES += [
+    'nsCxPusher.cpp',
+    'nsScriptError.cpp',
+    'nsXPConnect.cpp',
     'Sandbox.cpp',
     'XPCCallContext.cpp',
     'XPCComponents.cpp',
     'XPCContext.cpp',
     'XPCConvert.cpp',
     'XPCDebug.cpp',
     'XPCException.cpp',
     'XPCJSContextStack.cpp',
@@ -40,19 +43,16 @@ CPP_SOURCES += [
     'XPCWrappedJS.cpp',
     'XPCWrappedJSClass.cpp',
     'XPCWrappedNative.cpp',
     'XPCWrappedNativeInfo.cpp',
     'XPCWrappedNativeJSOps.cpp',
     'XPCWrappedNativeProto.cpp',
     'XPCWrappedNativeScope.cpp',
     'XPCWrapper.cpp',
-    'nsCxPusher.cpp',
-    'nsScriptError.cpp',
-    'nsXPConnect.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
--- a/layout/base/moz.build
+++ b/layout/base/moz.build
@@ -25,26 +25,23 @@ XPIDL_MODULE = 'layout_base'
 
 MODULE = 'layout'
 
 EXPORTS += [
     'DisplayItemClip.h',
     'DisplayListClipState.h',
     'FrameLayerBuilder.h',
     'FramePropertyTable.h',
-    'ScrollbarStyles.h',
-    'StackArena.h',
-    'Units.h',
     'nsArenaMemoryStats.h',
     'nsBidi.h',
     'nsBidiPresUtils.h',
-    'nsCSSFrameConstructor.h',
     'nsCaret.h',
     'nsChangeHint.h',
     'nsCompatibility.h',
+    'nsCSSFrameConstructor.h',
     'nsDisplayItemTypes.h',
     'nsDisplayItemTypesList.h',
     'nsDisplayList.h',
     'nsDisplayListInvalidation.h',
     'nsFrameManager.h',
     'nsFrameManagerBase.h',
     'nsFrameTraversal.h',
     'nsIFrameTraversal.h',
@@ -54,55 +51,58 @@ EXPORTS += [
     'nsIPresShell.h',
     'nsIReflowCallback.h',
     'nsLayoutUtils.h',
     'nsPresArena.h',
     'nsPresContext.h',
     'nsPresState.h',
     'nsRefreshDriver.h',
     'nsStyleChangeList.h',
+    'ScrollbarStyles.h',
+    'StackArena.h',
+    'Units.h',
 ]
 
 EXPORTS.mozilla += [
     'PaintTracker.h',
 ]
 
 CPP_SOURCES += [
     'DisplayItemClip.cpp',
     'DisplayListClipState.cpp',
     'FrameLayerBuilder.cpp',
     'FramePropertyTable.cpp',
     'MaskLayerImageCache.cpp',
-    'PaintTracker.cpp',
-    'PositionedEventTargeting.cpp',
-    'RestyleManager.cpp',
-    'RestyleTracker.cpp',
-    'StackArena.cpp',
+    'nsCaret.cpp',
+    'nsCounterManager.cpp',
     'nsCSSColorUtils.cpp',
     'nsCSSFrameConstructor.cpp',
     'nsCSSRendering.cpp',
     'nsCSSRenderingBorders.cpp',
-    'nsCaret.cpp',
-    'nsCounterManager.cpp',
     'nsDisplayList.cpp',
     'nsDisplayListInvalidation.cpp',
     'nsDocumentViewer.cpp',
     'nsFrameManager.cpp',
     'nsFrameTraversal.cpp',
     'nsGenConList.cpp',
     'nsLayoutDebugger.cpp',
     'nsLayoutHistoryState.cpp',
     'nsLayoutUtils.cpp',
     'nsPresArena.cpp',
     'nsPresContext.cpp',
     'nsPresShell.cpp',
     'nsQuoteList.cpp',
     'nsRefreshDriver.cpp',
     'nsStyleChangeList.cpp',
     'nsStyleSheetService.cpp',
+    'PaintTracker.cpp',
+    'PositionedEventTargeting.cpp',
+    'RestyleManager.cpp',
+    'RestyleTracker.cpp',
+    'StackArena.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
--- a/layout/generic/moz.build
+++ b/layout/generic/moz.build
@@ -4,60 +4,57 @@
 # License, v. 2.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']
 
 MODULE = 'layout'
 
 EXPORTS += [
-    'ScrollbarActivity.h',
-    'Selection.h',
     'nsCanvasFrame.h',
     'nsDirection.h',
     'nsFrameIdList.h',
     'nsFrameList.h',
     'nsFrameSelection.h',
     'nsHTMLParts.h',
     'nsHTMLReflowMetrics.h',
     'nsHTMLReflowState.h',
     'nsIAnonymousContentCreator.h',
     'nsIFrame.h',
     'nsIFrameInlines.h',
     'nsIFrameUtil.h',
     'nsILineIterator.h',
     'nsIObjectFrame.h',
     'nsIPageSequenceFrame.h',
-    'nsIScrollPositionListener.h',
     'nsIScrollableFrame.h',
     'nsIScrollbarOwner.h',
+    'nsIScrollPositionListener.h',
     'nsIStatefulFrame.h',
     'nsObjectFrame.h',
     'nsQueryFrame.h',
     'nsSubDocumentFrame.h',
+    'ScrollbarActivity.h',
+    'Selection.h',
 ]
 
 EXPORTS.mozilla += [
     'Selection.h',
 ]
 
 EXPORTS.mozilla.layout += [
     'FrameChildList.h',
 ]
 
 CPP_SOURCES += [
     'FrameChildList.cpp',
-    'ScrollbarActivity.cpp',
-    'StickyScrollContainer.cpp',
-    'TextOverflow.cpp',
     'nsAbsoluteContainingBlock.cpp',
-    'nsBRFrame.cpp',
     'nsBlockFrame.cpp',
     'nsBlockReflowContext.cpp',
     'nsBlockReflowState.cpp',
+    'nsBRFrame.cpp',
     'nsBulletFrame.cpp',
     'nsCanvasFrame.cpp',
     'nsColumnSetFrame.cpp',
     'nsContainerFrame.cpp',
     'nsFirstLetterFrame.cpp',
     'nsFlexContainerFrame.cpp',
     'nsFloatManager.cpp',
     'nsFontInflationData.cpp',
@@ -84,16 +81,19 @@ CPP_SOURCES += [
     'nsSimplePageSequence.cpp',
     'nsSplittableFrame.cpp',
     'nsSubDocumentFrame.cpp',
     'nsTextFrame.cpp',
     'nsTextFrameUtils.cpp',
     'nsTextRunTransformations.cpp',
     'nsVideoFrame.cpp',
     'nsViewportFrame.cpp',
+    'ScrollbarActivity.cpp',
+    'StickyScrollContainer.cpp',
+    'TextOverflow.cpp',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     CMMSRCS += [
         'nsPluginUtilsOSX.mm',
     ]
 
 FAIL_ON_WARNINGS = not CONFIG['_MSC_VER']
--- a/layout/inspector/public/moz.build
+++ b/layout/inspector/public/moz.build
@@ -1,19 +1,19 @@
 # -*- 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/.
 
 XPIDL_SOURCES += [
     'inICSSValueSearch.idl',
+    'inIDeepTreeWalker.idl',
     'inIDOMUtils.idl',
     'inIDOMView.idl',
-    'inIDeepTreeWalker.idl',
     'inIFlasher.idl',
     'inISearchObserver.idl',
     'inISearchProcess.idl',
     'nsIDOMFontFace.idl',
     'nsIDOMFontFaceList.idl',
 ]
 
 MODULE = 'inspector'
--- a/layout/inspector/src/moz.build
+++ b/layout/inspector/src/moz.build
@@ -8,18 +8,18 @@ MODULE = 'inspector'
 
 EXPORTS += [
     'nsFontFace.h',
     'nsFontFaceList.h',
 ]
 
 CPP_SOURCES += [
     'inCSSValueSearch.cpp',
+    'inDeepTreeWalker.cpp',
     'inDOMUtils.cpp',
-    'inDeepTreeWalker.cpp',
     'inFlasher.cpp',
     'inLayoutUtils.cpp',
     'inSearchLoop.cpp',
     'nsFontFace.cpp',
     'nsFontFaceList.cpp',
 ]
 
 if CONFIG['MOZ_XUL']:
--- a/layout/mathml/moz.build
+++ b/layout/mathml/moz.build
@@ -5,35 +5,35 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'layout'
 
 CPP_SOURCES += [
     'nsMathMLChar.cpp',
     'nsMathMLContainerFrame.cpp',
     'nsMathMLFrame.cpp',
-    'nsMathMLOperators.cpp',
-    'nsMathMLSelectedFrame.cpp',
-    'nsMathMLTokenFrame.cpp',
     'nsMathMLmactionFrame.cpp',
     'nsMathMLmencloseFrame.cpp',
     'nsMathMLmfencedFrame.cpp',
     'nsMathMLmfracFrame.cpp',
     'nsMathMLmmultiscriptsFrame.cpp',
     'nsMathMLmoFrame.cpp',
     'nsMathMLmpaddedFrame.cpp',
     'nsMathMLmphantomFrame.cpp',
     'nsMathMLmrootFrame.cpp',
     'nsMathMLmrowFrame.cpp',
     'nsMathMLmspaceFrame.cpp',
     'nsMathMLmsqrtFrame.cpp',
     'nsMathMLmstyleFrame.cpp',
     'nsMathMLmtableFrame.cpp',
     'nsMathMLmunderoverFrame.cpp',
+    'nsMathMLOperators.cpp',
+    'nsMathMLSelectedFrame.cpp',
     'nsMathMLsemanticsFrame.cpp',
+    'nsMathMLTokenFrame.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'gkmathml_s'
 
--- a/layout/style/moz.build
+++ b/layout/style/moz.build
@@ -7,34 +7,34 @@
 DIRS += ['xbl-marquee']
 TEST_TOOL_DIRS += ['test']
 
 MODULE = 'layout'
 
 EXPORTS += [
     'AnimationCommon.h',
     'nsAnimationManager.h',
+    'nsComputedDOMStylePropertyList.h',
+    'nsCSSAnonBoxes.h',
     'nsCSSAnonBoxList.h',
-    'nsCSSAnonBoxes.h',
     'nsCSSFontDescList.h',
     'nsCSSKeywordList.h',
     'nsCSSKeywords.h',
     'nsCSSParser.h',
     'nsCSSPropAliasList.h',
+    'nsCSSProperty.h',
     'nsCSSPropList.h',
-    'nsCSSProperty.h',
     'nsCSSProps.h',
+    'nsCSSPseudoClasses.h',
     'nsCSSPseudoClassList.h',
-    'nsCSSPseudoClasses.h',
     'nsCSSPseudoElementList.h',
     'nsCSSPseudoElements.h',
     'nsCSSRuleProcessor.h',
     'nsCSSStyleSheet.h',
     'nsCSSValue.h',
-    'nsComputedDOMStylePropertyList.h',
     'nsDOMCSSAttrDeclaration.h',
     'nsDOMCSSDeclaration.h',
     'nsDOMCSSRGBColor.h',
     'nsDOMMediaQueryList.h',
     'nsICSSDeclaration.h',
     'nsICSSLoaderObserver.h',
     'nsICSSPseudoComparator.h',
     'nsICSSRuleList.h',
@@ -78,35 +78,34 @@ EXPORTS.mozilla.css += [
 
 CPP_SOURCES += [
     'AnimationCommon.cpp',
     'CSS.cpp',
     'Declaration.cpp',
     'ErrorReporter.cpp',
     'ImageLoader.cpp',
     'Loader.cpp',
-    'StyleRule.cpp',
     'nsAnimationManager.cpp',
+    'nsComputedDOMStyle.cpp',
     'nsCSSAnonBoxes.cpp',
     'nsCSSDataBlock.cpp',
     'nsCSSKeywords.cpp',
     'nsCSSParser.cpp',
     'nsCSSProps.cpp',
     'nsCSSPseudoClasses.cpp',
     'nsCSSPseudoElements.cpp',
     'nsCSSRuleProcessor.cpp',
     'nsCSSRules.cpp',
     'nsCSSScanner.cpp',
     'nsCSSStyleSheet.cpp',
     'nsCSSValue.cpp',
-    'nsComputedDOMStyle.cpp',
     'nsDOMCSSAttrDeclaration.cpp',
     'nsDOMCSSDeclaration.cpp',
+    'nsDOMCSSRect.cpp',
     'nsDOMCSSRGBColor.cpp',
-    'nsDOMCSSRect.cpp',
     'nsDOMCSSValueList.cpp',
     'nsDOMMediaQueryList.cpp',
     'nsFontFaceLoader.cpp',
     'nsHTMLCSSStyleSheet.cpp',
     'nsHTMLStyleSheet.cpp',
     'nsLayoutStylesheetCache.cpp',
     'nsMediaFeatures.cpp',
     'nsNthIndexCache.cpp',
@@ -116,16 +115,17 @@ CPP_SOURCES += [
     'nsStyleAnimation.cpp',
     'nsStyleContext.cpp',
     'nsStyleCoord.cpp',
     'nsStyleSet.cpp',
     'nsStyleStruct.cpp',
     'nsStyleTransformMatrix.cpp',
     'nsStyleUtil.cpp',
     'nsTransitionManager.cpp',
+    'StyleRule.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
--- a/layout/svg/moz.build
+++ b/layout/svg/moz.build
@@ -2,60 +2,60 @@
 # 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/.
 
 MODULE = 'layout'
 
 EXPORTS += [
-    'SVGImageContext.h',
     'nsSVGEffects.h',
     'nsSVGFilterInstance.h',
     'nsSVGForeignObjectFrame.h',
     'nsSVGIntegrationUtils.h',
     'nsSVGUtils.h',
+    'SVGImageContext.h',
 ]
 
 CPP_SOURCES += [
-    'SVGFEContainerFrame.cpp',
-    'SVGFEImageFrame.cpp',
-    'SVGFELeafFrame.cpp',
-    'SVGFEUnstyledLeafFrame.cpp',
-    'SVGViewFrame.cpp',
     'nsSVGAFrame.cpp',
     'nsSVGClipPathFrame.cpp',
     'nsSVGContainerFrame.cpp',
     'nsSVGEffects.cpp',
     'nsSVGFilterFrame.cpp',
     'nsSVGFilterInstance.cpp',
     'nsSVGForeignObjectFrame.cpp',
-    'nsSVGGFrame.cpp',
     'nsSVGGenericContainerFrame.cpp',
     'nsSVGGeometryFrame.cpp',
+    'nsSVGGFrame.cpp',
     'nsSVGGlyphFrame.cpp',
     'nsSVGGradientFrame.cpp',
     'nsSVGImageFrame.cpp',
     'nsSVGInnerSVGFrame.cpp',
     'nsSVGIntegrationUtils.cpp',
     'nsSVGMarkerFrame.cpp',
     'nsSVGMaskFrame.cpp',
     'nsSVGOuterSVGFrame.cpp',
     'nsSVGPaintServerFrame.cpp',
     'nsSVGPathGeometryFrame.cpp',
     'nsSVGPatternFrame.cpp',
     'nsSVGStopFrame.cpp',
     'nsSVGSwitchFrame.cpp',
-    'nsSVGTSpanFrame.cpp',
     'nsSVGTextContainerFrame.cpp',
     'nsSVGTextFrame.cpp',
     'nsSVGTextFrame2.cpp',
     'nsSVGTextPathFrame.cpp',
+    'nsSVGTSpanFrame.cpp',
     'nsSVGUseFrame.cpp',
     'nsSVGUtils.cpp',
+    'SVGFEContainerFrame.cpp',
+    'SVGFEImageFrame.cpp',
+    'SVGFELeafFrame.cpp',
+    'SVGFEUnstyledLeafFrame.cpp',
+    'SVGViewFrame.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'gksvgbase_s'
 
--- a/layout/tables/moz.build
+++ b/layout/tables/moz.build
@@ -10,26 +10,26 @@ MODULE = 'layout'
 
 EXPORTS += [
     'nsITableCellLayout.h',
 ]
 
 CPP_SOURCES += [
     'BasicTableLayoutStrategy.cpp',
     'FixedTableLayoutStrategy.cpp',
-    'SpanningCellSorter.cpp',
     'nsCellMap.cpp',
     'nsTableCellFrame.cpp',
     'nsTableColFrame.cpp',
     'nsTableColGroupFrame.cpp',
     'nsTableFrame.cpp',
     'nsTableOuterFrame.cpp',
     'nsTablePainter.cpp',
     'nsTableRowFrame.cpp',
     'nsTableRowGroupFrame.cpp',
+    'SpanningCellSorter.cpp',
 ]
 
 LIBRARY_NAME = 'gktable_s'
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
--- a/layout/xul/base/src/moz.build
+++ b/layout/xul/base/src/moz.build
@@ -10,19 +10,19 @@ CPP_SOURCES += [
     'nsBox.cpp',
     'nsBoxFrame.cpp',
     'nsBoxLayout.cpp',
     'nsBoxLayoutState.cpp',
     'nsBoxObject.cpp',
     'nsButtonBoxFrame.cpp',
     'nsRepeatService.cpp',
     'nsRootBoxFrame.cpp',
-    'nsScrollBoxFrame.cpp',
     'nsScrollbarButtonFrame.cpp',
     'nsScrollbarFrame.cpp',
+    'nsScrollBoxFrame.cpp',
     'nsSliderFrame.cpp',
     'nsSprocketLayout.cpp',
     'nsStackFrame.cpp',
     'nsStackLayout.cpp',
     'nsXULTooltipListener.cpp',
 ]
 
 if CONFIG['MOZ_XUL']:
--- a/media/libsoundtouch/src/moz.build
+++ b/media/libsoundtouch/src/moz.build
@@ -3,29 +3,29 @@
 # 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/.
 
 MODULE = 'soundtouch'
 
 EXPORTS.soundtouch += [
     'FIFOSamplePipe.h',
-    'STTypes.h',
     'SoundTouch.h',
     'soundtouch_config.h',
+    'STTypes.h',
 ]
 
 CPP_SOURCES += [
     'AAFilter.cpp',
+    'cpu_detect_x86.cpp',
     'FIFOSampleBuffer.cpp',
     'FIRFilter.cpp',
     'RateTransposer.cpp',
     'SoundTouch.cpp',
     'TDStretch.cpp',
-    'cpu_detect_x86.cpp',
 ]
 
 if CONFIG['INTEL_ARCHITECTURE']:
     if CONFIG['MOZ_SAMPLE_TYPE_FLOAT32']:
         CPP_SOURCES += [
             'sse_optimized.cpp',
         ]
     else:
--- a/media/mtransport/objs.mozbuild
+++ b/media/mtransport/objs.mozbuild
@@ -22,12 +22,11 @@ mtransport_lcppsrcs = [
     'transportlayerprsock.cpp',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     mtransport_lcppsrcs += [
         'gonk_addrs.cpp',
     ]
 
-mtransport_lcppsrcs.sort()
 mtransport_cppsrcs = [ 
-    '%s/media/mtransport/%s' % (TOPSRCDIR, s) for s in mtransport_lcppsrcs
+    '%s/media/mtransport/%s' % (TOPSRCDIR, s) for s in sorted(mtransport_lcppsrcs)
 ]
--- a/media/mtransport/test/moz.build
+++ b/media/mtransport/test/moz.build
@@ -3,21 +3,21 @@
 # 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/.
 
 MODULE = 'test_mtransport'
 
 if CONFIG['OS_TARGET'] != 'WINNT' and CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
     CPP_UNIT_TESTS += [
-        'TestSyncRunnable.cpp',
         'ice_unittest.cpp',
         'nrappkit_unittest.cpp',
         'runnable_utils_unittest.cpp',
         'sockettransportservice_unittest.cpp',
+        'TestSyncRunnable.cpp',
         'transport_unittests.cpp',
         'turn_unittest.cpp',
     ]
 
     if CONFIG['MOZ_SCTP']:
         CPP_UNIT_TESTS += [
             'sctp_unittest.cpp',
         ]
--- a/mfbt/tests/moz.build
+++ b/mfbt/tests/moz.build
@@ -11,17 +11,17 @@ CPP_UNIT_TESTS += [
     'TestCeilingFloor.cpp',
     'TestCheckedInt.cpp',
     'TestCountZeroes.cpp',
     'TestEndian.cpp',
     'TestEnumSet.cpp',
     'TestFloatingPoint.cpp',
     'TestIntegerPrintfMacros.cpp',
     'TestSHA1.cpp',
+    'TestTypedEnum.cpp',
     'TestTypeTraits.cpp',
-    'TestTypedEnum.cpp',
     'TestWeakPtr.cpp',
 ]
 
 if not CONFIG['MOZ_ASAN']:
     CPP_UNIT_TESTS += [
         'TestPoisonArea.cpp',
     ]
--- a/modules/libjar/zipwriter/src/moz.build
+++ b/modules/libjar/zipwriter/src/moz.build
@@ -2,22 +2,22 @@
 # 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/.
 
 MODULE = 'zipwriter'
 
 CPP_SOURCES += [
-    'StreamFunctions.cpp',
-    'ZipWriterModule.cpp',
     'nsDeflateConverter.cpp',
     'nsZipDataStream.cpp',
     'nsZipHeader.cpp',
     'nsZipWriter.cpp',
+    'StreamFunctions.cpp',
+    'ZipWriterModule.cpp',
 ]
 
 LIBRARY_NAME = 'zipwriter'
 
 LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
--- a/modules/libpref/src/moz.build
+++ b/modules/libpref/src/moz.build
@@ -2,20 +2,20 @@
 # 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/.
 
 MODULE = 'pref'
 
 CPP_SOURCES += [
-    'Preferences.cpp',
     'nsPrefBranch.cpp',
     'nsPrefsFactory.cpp',
     'prefapi.cpp',
+    'Preferences.cpp',
     'prefread.cpp',
 ]
 
 LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'pref'
--- a/mozglue/android/moz.build
+++ b/mozglue/android/moz.build
@@ -7,17 +7,17 @@
 MODULE = 'android'
 
 EXPORTS += [
     'APKOpen.h',
 ]
 
 CPP_SOURCES += [
     'APKOpen.cpp',
+    'nsGeckoUtils.cpp',
     'NSSBridge.cpp',
     'SQLiteBridge.cpp',
-    'nsGeckoUtils.cpp',
 ]
 
 LIBRARY_NAME = 'android'
 
 FAIL_ON_WARNINGS = True
 
--- a/mozglue/build/moz.build
+++ b/mozglue/build/moz.build
@@ -31,18 +31,18 @@ if CONFIG['OS_TARGET'] == 'Android':
     ]
 
 if CONFIG['MOZ_NUWA_PROCESS']:
     EXPORTS.ipc += [
         'Nuwa.h',
     ]
 
 EXPORTS.mozilla += [
+    'arm.h',
     'SSE.h',
-    'arm.h',
 ]
 
 if CONFIG['CPU_ARCH'].startswith('x86'):
     CPP_SOURCES += [
         'SSE.cpp',
     ]
 
 if CONFIG['CPU_ARCH'] == 'arm':
--- a/netwerk/base/public/moz.build
+++ b/netwerk/base/public/moz.build
@@ -27,41 +27,41 @@ XPIDL_SOURCES += [
     'nsICachingChannel.idl',
     'nsICancelable.idl',
     'nsIChannel.idl',
     'nsIChannelEventSink.idl',
     'nsIChannelPolicy.idl',
     'nsIChildChannel.idl',
     'nsIContentSniffer.idl',
     'nsICryptoFIPSInfo.idl',
+    'nsICryptoHash.idl',
     'nsICryptoHMAC.idl',
-    'nsICryptoHash.idl',
     'nsIDashboard.idl',
     'nsIDashboardEventNotifier.idl',
     'nsIDownloader.idl',
     'nsIEncodedChannel.idl',
     'nsIExternalProtocolHandler.idl',
     'nsIFileStreams.idl',
     'nsIFileURL.idl',
-    'nsIIOService.idl',
-    'nsIIOService2.idl',
     'nsIIncrementalDownload.idl',
     'nsIInputStreamChannel.idl',
     'nsIInputStreamPump.idl',
+    'nsIIOService.idl',
+    'nsIIOService2.idl',
     'nsILoadContextInfo.idl',
     'nsILoadGroup.idl',
     'nsILoadGroupChild.idl',
     'nsIMIMEInputStream.idl',
     'nsIMultiPartChannel.idl',
-    'nsINSSErrorsService.idl',
     'nsINestedURI.idl',
     'nsINetAddr.idl',
     'nsINetUtil.idl',
     'nsINetworkLinkService.idl',
     'nsINetworkProperties.idl',
+    'nsINSSErrorsService.idl',
     'nsIParentChannel.idl',
     'nsIParentRedirectingChannel.idl',
     'nsIPermission.idl',
     'nsIPermissionManager.idl',
     'nsIPrivateBrowsingChannel.idl',
     'nsIProgressEventSink.idl',
     'nsIPrompt.idl',
     'nsIProtocolHandler.idl',
@@ -86,39 +86,39 @@ XPIDL_SOURCES += [
     'nsISerializationHelper.idl',
     'nsIServerSocket.idl',
     'nsISimpleStreamListener.idl',
     'nsISiteSecurityService.idl',
     'nsISocketTransport.idl',
     'nsISocketTransportService.idl',
     'nsISpeculativeConnect.idl',
     'nsIStandardURL.idl',
+    'nsIStreamingProtocolController.idl',
+    'nsIStreamingProtocolService.idl',
     'nsIStreamListener.idl',
     'nsIStreamListenerTee.idl',
     'nsIStreamLoader.idl',
     'nsIStreamTransportService.idl',
-    'nsIStreamingProtocolController.idl',
-    'nsIStreamingProtocolService.idl',
     'nsISyncStreamListener.idl',
     'nsISystemProxySettings.idl',
     'nsIThreadRetargetableRequest.idl',
     'nsIThreadRetargetableStreamListener.idl',
     'nsITimedChannel.idl',
     'nsITraceableChannel.idl',
     'nsITransport.idl',
     'nsIUDPServerSocket.idl',
+    'nsIUnicharStreamLoader.idl',
+    'nsIUploadChannel.idl',
+    'nsIUploadChannel2.idl',
     'nsIURI.idl',
     'nsIURIChecker.idl',
     'nsIURIClassifier.idl',
     'nsIURIWithPrincipal.idl',
     'nsIURL.idl',
     'nsIURLParser.idl',
-    'nsIUnicharStreamLoader.idl',
-    'nsIUploadChannel.idl',
-    'nsIUploadChannel2.idl',
     'nsPILoadGroupInternal.idl',
     'nsPISocketTransportService.idl',
 ]
 
 if CONFIG['MOZ_TOOLKIT_SEARCH']:
     XPIDL_SOURCES += [
         'nsIBrowserSearchService.idl',
     ]
--- a/netwerk/base/src/moz.build
+++ b/netwerk/base/src/moz.build
@@ -20,39 +20,35 @@ EXPORTS.mozilla.net += [
 
 CPP_SOURCES += [
     'ArrayBufferInputStream.cpp',
     'BackgroundFileSaver.cpp',
     'Dashboard.cpp',
     'EventTokenBucket.cpp',
     'LoadContextInfo.cpp',
     'NetworkActivityMonitor.cpp',
-    'ProxyAutoConfig.cpp',
-    'RedirectChannelRegistrar.cpp',
-    'StreamingProtocolService.cpp',
-    'Tickler.cpp',
     'nsAsyncRedirectVerifyHelper.cpp',
     'nsAsyncStreamCopier.cpp',
     'nsAuthInformationHolder.cpp',
     'nsBase64Encoder.cpp',
     'nsBaseChannel.cpp',
     'nsBaseContentStream.cpp',
     'nsBufferedStreams.cpp',
     'nsChannelClassifier.cpp',
+    'nsDirectoryIndexStream.cpp',
     'nsDNSPrefetch.cpp',
-    'nsDirectoryIndexStream.cpp',
     'nsDownloader.cpp',
     'nsFileStreams.cpp',
-    'nsIOService.cpp',
     'nsIncrementalDownload.cpp',
     'nsInputStreamChannel.cpp',
     'nsInputStreamPump.cpp',
+    'nsIOService.cpp',
     'nsLoadGroup.cpp',
+    'nsMediaFragmentURIParser.cpp',
     'nsMIMEInputStream.cpp',
-    'nsMediaFragmentURIParser.cpp',
     'nsNetAddr.cpp',
     'nsNetStrings.cpp',
     'nsPACMan.cpp',
     'nsPreloadedStream.cpp',
     'nsProtocolProxyService.cpp',
     'nsProxyInfo.cpp',
     'nsRequestObserverProxy.cpp',
     'nsSerializationHelper.cpp',
@@ -66,20 +62,24 @@ CPP_SOURCES += [
     'nsStreamListenerTee.cpp',
     'nsStreamListenerWrapper.cpp',
     'nsStreamLoader.cpp',
     'nsStreamTransportService.cpp',
     'nsSyncStreamListener.cpp',
     'nsTemporaryFileInputStream.cpp',
     'nsTransportUtils.cpp',
     'nsUDPServerSocket.cpp',
+    'nsUnicharStreamLoader.cpp',
     'nsURIChecker.cpp',
     'nsURLHelper.cpp',
     'nsURLParsers.cpp',
-    'nsUnicharStreamLoader.cpp',
+    'ProxyAutoConfig.cpp',
+    'RedirectChannelRegistrar.cpp',
+    'StreamingProtocolService.cpp',
+    'Tickler.cpp',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'os2':
     CPP_SOURCES += [
         'nsURLHelperOS2.cpp',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     CPP_SOURCES += [
--- a/netwerk/cache2/moz.build
+++ b/netwerk/cache2/moz.build
@@ -23,18 +23,18 @@ EXPORTS += [
 ]
 
 CPP_SOURCES += [
     'AppCacheStorage.cpp',
     'CacheEntriesEnumerator.cpp',
     'CacheEntry.cpp',
     'CacheFile.cpp',
     'CacheFileChunk.cpp',
+    'CacheFileInputStream.cpp',
     'CacheFileIOManager.cpp',
-    'CacheFileInputStream.cpp',
     'CacheFileMetadata.cpp',
     'CacheFileOutputStream.cpp',
     'CacheHashUtils.cpp',
     'CacheIOThread.cpp',
     'CacheLog.cpp',
     'CacheObserver.cpp',
     'CacheStorage.cpp',
     'CacheStorageService.cpp',
--- a/netwerk/cookie/moz.build
+++ b/netwerk/cookie/moz.build
@@ -20,18 +20,18 @@ MODULE = 'necko'
 
 if CONFIG['NECKO_COOKIES']:
     LIBXUL_LIBRARY = True
     MSVC_ENABLE_PGO = True
 
     LIBRARY_NAME = 'neckocookie_s'
 
     EXPORTS.mozilla.net = [
+        'CookieServiceChild.h',
         'CookieServiceParent.h',
-        'CookieServiceChild.h',
     ]
     CPP_SOURCES += [
         'CookieServiceChild.cpp',
         'CookieServiceParent.cpp',
         'nsCookie.cpp',
         'nsCookieService.cpp',
     ]
 
--- a/netwerk/dash/mpd/moz.build
+++ b/netwerk/dash/mpd/moz.build
@@ -5,20 +5,20 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'necko'
 
 CPP_SOURCES += [
     'AdaptationSet.cpp',
     'IMPDManager.cpp',
     'MPD.cpp',
+    'nsDASHMPDParser.cpp',
+    'nsDASHWebMODManager.cpp',
+    'nsDASHWebMODParser.cpp',
     'Period.cpp',
     'Representation.cpp',
     'SegmentBase.cpp',
-    'nsDASHMPDParser.cpp',
-    'nsDASHWebMODManager.cpp',
-    'nsDASHWebMODParser.cpp',
 ]
 
 LIBRARY_NAME = 'nkdashmpd_s'
 
 LIBXUL_LIBRARY = True
 
--- a/netwerk/protocol/http/moz.build
+++ b/netwerk/protocol/http/moz.build
@@ -1,19 +1,19 @@
 # -*- 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/.
 
 XPIDL_SOURCES += [
     'nsIHttpActivityObserver.idl',
-    'nsIHttpAuthManager.idl',
     'nsIHttpAuthenticableChannel.idl',
     'nsIHttpAuthenticator.idl',
+    'nsIHttpAuthManager.idl',
     'nsIHttpChannel.idl',
     'nsIHttpChannelAuthProvider.idl',
     'nsIHttpChannelChild.idl',
     'nsIHttpChannelInternal.idl',
     'nsIHttpDataUsage.idl',
     'nsIHttpEventSink.idl',
     'nsIHttpHeaderVisitor.idl',
     'nsIHttpProtocolHandler.idl',
@@ -42,23 +42,16 @@ EXPORTS.mozilla.net += [
 CPP_SOURCES += [
     'ASpdySession.cpp',
     'ConnectionDiagnostics.cpp',
     'HttpBaseChannel.cpp',
     'HttpChannelChild.cpp',
     'HttpChannelParent.cpp',
     'HttpChannelParentListener.cpp',
     'HttpInfo.cpp',
-    'NullHttpTransaction.cpp',
-    'SpdyPush3.cpp',
-    'SpdyPush31.cpp',
-    'SpdySession3.cpp',
-    'SpdySession31.cpp',
-    'SpdyStream3.cpp',
-    'SpdyStream31.cpp',
     'nsHttp.cpp',
     'nsHttpActivityDistributor.cpp',
     'nsHttpAuthCache.cpp',
     'nsHttpAuthManager.cpp',
     'nsHttpBasicAuth.cpp',
     'nsHttpChannel.cpp',
     'nsHttpChannelAuthProvider.cpp',
     'nsHttpChunkedDecoder.cpp',
@@ -68,16 +61,23 @@ CPP_SOURCES += [
     'nsHttpDigestAuth.cpp',
     'nsHttpHandler.cpp',
     'nsHttpHeaderArray.cpp',
     'nsHttpNTLMAuth.cpp',
     'nsHttpPipeline.cpp',
     'nsHttpRequestHead.cpp',
     'nsHttpResponseHead.cpp',
     'nsHttpTransaction.cpp',
+    'NullHttpTransaction.cpp',
+    'SpdyPush3.cpp',
+    'SpdyPush31.cpp',
+    'SpdySession3.cpp',
+    'SpdySession31.cpp',
+    'SpdyStream3.cpp',
+    'SpdyStream31.cpp',
 ]
 
 IPDL_SOURCES += [
     'PHttpChannel.ipdl',
 ]
 EXTRA_JS_MODULES += [
     'UserAgentOverrides.jsm',
     'UserAgentUpdates.jsm',
--- a/netwerk/protocol/rtsp/moz.build
+++ b/netwerk/protocol/rtsp/moz.build
@@ -3,46 +3,46 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_MODULE = 'necko_rtsp'
 
 MODULE = 'necko'
 
 EXPORTS.mozilla.net += [
-    'RtspChannel.h',
-    'RtspHandler.h',
     'controller/RtspController.h',
     'controller/RtspControllerChild.h',
     'controller/RtspControllerParent.h',
     'controller/RtspMetaData.h',
     'rtsp/RTSPSource.h',
+    'RtspChannel.h',
+    'RtspHandler.h',
 ]
 
 CPP_SOURCES += [
-    'RtspChannel.cpp',
-    'RtspHandler.cpp',
     'controller/RtspController.cpp',
     'controller/RtspControllerChild.cpp',
     'controller/RtspControllerParent.cpp',
     'controller/RtspMetaData.cpp',
     'rtsp/AAMRAssembler.cpp',
     'rtsp/AAVCAssembler.cpp',
     'rtsp/AH263Assembler.cpp',
     'rtsp/AMPEG4AudioAssembler.cpp',
     'rtsp/AMPEG4ElementaryAssembler.cpp',
     'rtsp/APacketSource.cpp',
+    'rtsp/ARawAudioAssembler.cpp',
     'rtsp/ARTPAssembler.cpp',
     'rtsp/ARTPConnection.cpp',
     'rtsp/ARTPSource.cpp',
     'rtsp/ARTPWriter.cpp',
     'rtsp/ARTSPConnection.cpp',
-    'rtsp/ARawAudioAssembler.cpp',
     'rtsp/ASessionDescription.cpp',
     'rtsp/RTSPSource.cpp',
+    'RtspChannel.cpp',
+    'RtspHandler.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
--- a/netwerk/protocol/wyciwyg/moz.build
+++ b/netwerk/protocol/wyciwyg/moz.build
@@ -13,21 +13,21 @@ XPIDL_MODULE = 'necko_wyciwyg'
 MODULE = 'necko'
 
 EXPORTS.mozilla.net += [
     'WyciwygChannelChild.h',
     'WyciwygChannelParent.h',
 ]
 
 CPP_SOURCES += [
-    'WyciwygChannelChild.cpp',
-    'WyciwygChannelParent.cpp',
     'nsWyciwyg.cpp',
     'nsWyciwygChannel.cpp',
     'nsWyciwygProtocolHandler.cpp',
+    'WyciwygChannelChild.cpp',
+    'WyciwygChannelParent.cpp',
 ]
 
 IPDL_SOURCES += [
     'PWyciwygChannel.ipdl',
 ]
 
 FAIL_ON_WARNINGS = True
 
--- a/netwerk/socket/moz.build
+++ b/netwerk/socket/moz.build
@@ -1,30 +1,30 @@
 # -*- 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/.
 
 XPIDL_SOURCES += [
+    'nsISocketProvider.idl',
+    'nsISocketProviderService.idl',
     'nsISOCKSSocketInfo.idl',
     'nsISSLSocketControl.idl',
-    'nsISocketProvider.idl',
-    'nsISocketProviderService.idl',
     'nsITransportSecurityInfo.idl',
 ]
 
 XPIDL_MODULE = 'necko_socket'
 
 MODULE = 'necko'
 
 CPP_SOURCES += [
+    'nsSocketProviderService.cpp',
     'nsSOCKSIOLayer.cpp',
     'nsSOCKSSocketProvider.cpp',
-    'nsSocketProviderService.cpp',
     'nsUDPSocketProvider.cpp',
 ]
 
 LIBRARY_NAME = 'neckosocket_s'
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
--- a/netwerk/streamconv/converters/moz.build
+++ b/netwerk/streamconv/converters/moz.build
@@ -14,18 +14,18 @@ CPP_SOURCES += [
     'nsIndexedToHTML.cpp',
     'nsMultiMixedConv.cpp',
     'nsTXTToHTMLConv.cpp',
     'nsUnknownDecoder.cpp',
 ]
 
 if CONFIG['NECKO_PROTOCOLS'].find('ftp') != -1:
     CPP_SOURCES += [
+        'nsFTPDirListingConv.cpp',
         'ParseFTPList.cpp',
-        'nsFTPDirListingConv.cpp',
     ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'cocoa':
     CPP_SOURCES += [
         'nsBinHexDecoder.cpp',
     ]
 
 LIBRARY_NAME = 'nkcnvts_s'
--- a/netwerk/test/moz.build
+++ b/netwerk/test/moz.build
@@ -25,18 +25,18 @@ sources = [
     'TestDNS',
     'TestIncrementalDownload',
     'TestOpen',
     'TestPageLoad',
     'TestProtocols',
     'TestServ',
     'TestStandardURL',
     'TestStreamLoader',
+    'TestUpload',
     'TestURLParser',
-    'TestUpload',
     'urltest',
 ]
 
 # XXX Make this work in libxul builds.
 #sources += [
 #    TestIDN',
 #    TestIOThreads',
 #    TestPerf',
--- a/parser/html/moz.build
+++ b/parser/html/moz.build
@@ -12,77 +12,77 @@ XPIDL_SOURCES += [
 MODULE = 'html5'
 
 EXPORTS += [
     'jArray.h',
     'nsAHtml5TreeBuilderState.h',
     'nsAHtml5TreeOpSink.h',
     'nsHtml5ArrayCopy.h',
     'nsHtml5AtomList.h',
+    'nsHtml5Atoms.h',
     'nsHtml5AtomTable.h',
-    'nsHtml5Atoms.h',
     'nsHtml5ByteReadable.h',
     'nsHtml5DependentUTF16Buffer.h',
     'nsHtml5DocumentMode.h',
     'nsHtml5HtmlAttributes.h',
     'nsHtml5Macros.h',
     'nsHtml5MetaScanner.h',
     'nsHtml5MetaScannerHSupplement.h',
     'nsHtml5Module.h',
     'nsHtml5NamedCharacters.h',
     'nsHtml5NamedCharactersAccel.h',
     'nsHtml5OwningUTF16Buffer.h',
     'nsHtml5Parser.h',
     'nsHtml5PendingNotification.h',
     'nsHtml5PlainTextUtils.h',
-    'nsHtml5SVGLoadDispatcher.h',
     'nsHtml5Speculation.h',
     'nsHtml5SpeculativeLoad.h',
     'nsHtml5StreamParser.h',
     'nsHtml5StringParser.h',
+    'nsHtml5SVGLoadDispatcher.h',
+    'nsHtml5TreeOperation.h',
     'nsHtml5TreeOpExecutor.h',
     'nsHtml5TreeOpStage.h',
-    'nsHtml5TreeOperation.h',
     'nsHtml5UTF16Buffer.h',
     'nsHtml5UTF16BufferHSupplement.h',
     'nsHtml5ViewSourceUtils.h',
     'nsParserUtils.h',
 ]
 
 CPP_SOURCES += [
     'nsHtml5Atom.cpp',
+    'nsHtml5Atoms.cpp',
     'nsHtml5AtomTable.cpp',
-    'nsHtml5Atoms.cpp',
     'nsHtml5AttributeName.cpp',
     'nsHtml5DependentUTF16Buffer.cpp',
     'nsHtml5ElementName.cpp',
     'nsHtml5Highlighter.cpp',
     'nsHtml5HtmlAttributes.cpp',
     'nsHtml5MetaScanner.cpp',
     'nsHtml5Module.cpp',
     'nsHtml5NamedCharacters.cpp',
     'nsHtml5NamedCharactersAccel.cpp',
     'nsHtml5OwningUTF16Buffer.cpp',
     'nsHtml5Parser.cpp',
     'nsHtml5PlainTextUtils.cpp',
     'nsHtml5Portability.cpp',
     'nsHtml5ReleasableAttributeName.cpp',
     'nsHtml5ReleasableElementName.cpp',
-    'nsHtml5SVGLoadDispatcher.cpp',
     'nsHtml5Speculation.cpp',
     'nsHtml5SpeculativeLoad.cpp',
     'nsHtml5StackNode.cpp',
     'nsHtml5StateSnapshot.cpp',
     'nsHtml5StreamParser.cpp',
     'nsHtml5StringParser.cpp',
+    'nsHtml5SVGLoadDispatcher.cpp',
     'nsHtml5Tokenizer.cpp',
     'nsHtml5TreeBuilder.cpp',
+    'nsHtml5TreeOperation.cpp',
     'nsHtml5TreeOpExecutor.cpp',
     'nsHtml5TreeOpStage.cpp',
-    'nsHtml5TreeOperation.cpp',
     'nsHtml5UTF16Buffer.cpp',
     'nsHtml5ViewSourceUtils.cpp',
     'nsParserUtils.cpp',
 ]
 
 LIBRARY_NAME = 'html5p_s'
 
 LIBXUL_LIBRARY = True
--- a/profile/dirserviceprovider/src/objs.mozbuild
+++ b/profile/dirserviceprovider/src/objs.mozbuild
@@ -8,13 +8,12 @@ modules_profiledirservice_src_lcsrcs = [
     'nsProfileDirServiceProvider.cpp',
 ]
 
 if CONFIG['MOZ_PROFILELOCKING']:
     modules_profiledirservice_src_lcsrcs += [
         'nsProfileLock.cpp',
     ]
 
-modules_profiledirservice_src_lcsrcs.sort()
 modules_profiledirservice_src_csrcs = [ 
     '%s/profile/dirserviceprovider/src/%s' % (TOPSRCDIR, s) \
-        for s in modules_profiledirservice_src_lcsrcs
+        for s in sorted(modules_profiledirservice_src_lcsrcs)
 ]
--- a/python/mozbuild/mozbuild/frontend/sandbox.py
+++ b/python/mozbuild/mozbuild/frontend/sandbox.py
@@ -29,16 +29,24 @@ import sys
 from contextlib import contextmanager
 
 from mozbuild.util import (
     ReadOnlyDefaultDict,
     ReadOnlyDict,
 )
 
 
+def alphabetical_sorted(iterable, cmp=None, key=lambda x: x.lower(),
+                        reverse=False):
+    """sorted() replacement for the sandbox, ordering alphabetically by
+    default.
+    """
+    return sorted(iterable, cmp, key, reverse)
+
+
 class GlobalNamespace(dict):
     """Represents the globals namespace in a sandbox.
 
     This is a highly specialized dictionary employing light magic.
 
     At the crux we have the concept of a restricted keys set. Only very
     specific keys may be retrieved or mutated. The rules are as follows:
 
@@ -69,16 +77,17 @@ class GlobalNamespace(dict):
     """
 
     # The default set of builtins.
     BUILTINS = ReadOnlyDict({
         # Only real Python built-ins should go here.
         'None': None,
         'False': False,
         'True': True,
+        'sorted': alphabetical_sorted,
     })
 
     def __init__(self, allowed_variables=None, builtins=None):
         """Create a new global namespace having specific variables.
 
         allowed_variables is a dict of the variables that can be queried and
         mutated. Keys in this dict are the strings representing keys in this
         namespace which are valid. Values are tuples of stored type, assigned
--- a/python/mozbuild/mozbuild/util.py
+++ b/python/mozbuild/mozbuild/util.py
@@ -247,17 +247,17 @@ class UnsortedError(Exception):
 class StrictOrderingOnAppendList(list):
     """A list specialized for moz.build environments.
 
     We overload the assignment and append operations to require that incoming
     elements be ordered. This enforces cleaner style in moz.build files.
     """
     @staticmethod
     def ensure_sorted(l):
-        srtd = sorted(l)
+        srtd = sorted(l, key=lambda x: x.lower())
 
         if srtd != l:
             raise UnsortedError(srtd, l)
 
     def __init__(self, iterable=[]):
         StrictOrderingOnAppendList.ensure_sorted(iterable)
 
         list.__init__(self, iterable)
--- a/rdf/base/idl/moz.build
+++ b/rdf/base/idl/moz.build
@@ -5,18 +5,18 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'nsIRDFCompositeDataSource.idl',
     'nsIRDFContainer.idl',
     'nsIRDFContainerUtils.idl',
     'nsIRDFDataSource.idl',
     'nsIRDFDelegateFactory.idl',
+    'nsIRDFInferDataSource.idl',
     'nsIRDFInMemoryDataSource.idl',
-    'nsIRDFInferDataSource.idl',
     'nsIRDFLiteral.idl',
     'nsIRDFNode.idl',
     'nsIRDFObserver.idl',
     'nsIRDFPropagatableDataSource.idl',
     'nsIRDFPurgeableDataSource.idl',
     'nsIRDFRemoteDataSource.idl',
     'nsIRDFResource.idl',
     'nsIRDFService.idl',
--- a/security/manager/boot/public/moz.build
+++ b/security/manager/boot/public/moz.build
@@ -1,15 +1,15 @@
 # -*- 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/.
 
 XPIDL_SOURCES += [
     'nsIBufEntropyCollector.idl',
-    'nsISSLStatusProvider.idl',
     'nsISecurityUITelemetry.idl',
     'nsISecurityWarningDialogs.idl',
+    'nsISSLStatusProvider.idl',
 ]
 
 MODULE = 'pipboot'
 
--- a/security/manager/ssl/public/moz.build
+++ b/security/manager/ssl/public/moz.build
@@ -5,49 +5,49 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'nsIASN1Object.idl',
     'nsIASN1PrintableItem.idl',
     'nsIASN1Sequence.idl',
     'nsIAssociatedContentSecurity.idl',
     'nsIBadCertListener2.idl',
+    'nsICertificateDialogs.idl',
+    'nsICertificatePrincipal.idl',
+    'nsICertOverrideService.idl',
+    'nsICertPickDialogs.idl',
+    'nsIClientAuthDialogs.idl',
     'nsICMSDecoder.idl',
     'nsICMSEncoder.idl',
     'nsICMSMessage.idl',
     'nsICMSMessage2.idl',
     'nsICMSMessageErrors.idl',
     'nsICMSSecureMessage.idl',
-    'nsICertOverrideService.idl',
-    'nsICertPickDialogs.idl',
-    'nsICertificateDialogs.idl',
-    'nsICertificatePrincipal.idl',
-    'nsIClientAuthDialogs.idl',
+    'nsIDataSignatureVerifier.idl',
     'nsIDOMCryptoDialogs.idl',
-    'nsIDataSignatureVerifier.idl',
     'nsIFormSigningDialog.idl',
     'nsIGenKeypairInfoDlg.idl',
     'nsIIdentityInfo.idl',
+    'nsIKeygenThread.idl',
     'nsIKeyModule.idl',
-    'nsIKeygenThread.idl',
     'nsINSSCertCache.idl',
     'nsINSSVersion.idl',
     'nsIPK11Token.idl',
     'nsIPK11TokenDB.idl',
     'nsIPKCS11.idl',
     'nsIPKCS11Module.idl',
     'nsIPKCS11ModuleDB.idl',
     'nsIPKCS11Slot.idl',
     'nsIProtectedAuthThread.idl',
     'nsIRecentBadCertsService.idl',
+    'nsISignatureVerifier.idl',
     'nsISMimeCert.idl',
     'nsISSLCertErrorDialog.idl',
     'nsISSLErrorListener.idl',
     'nsISSLStatus.idl',
-    'nsISignatureVerifier.idl',
     'nsIStreamCipher.idl',
     'nsITokenDialogs.idl',
     'nsITokenPasswordDialogs.idl',
     'nsIUserCertPicker.idl',
     'nsIX509Cert.idl',
     'nsIX509Cert2.idl',
     'nsIX509Cert3.idl',
     'nsIX509CertDB.idl',
--- a/security/manager/ssl/src/moz.build
+++ b/security/manager/ssl/src/moz.build
@@ -3,79 +3,79 @@
 # 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/.
 
 MODULE = 'pipnss'
 
 EXPORTS += [
     'CryptoTask.h',
-    'ScopedNSSTypes.h',
     'nsNSSShutDown.h',
     'nsRandomGenerator.h',
+    'ScopedNSSTypes.h',
 ]
 
 EXPORTS.mozilla += [
     'PublicSSL.h',
 ]
 
 CPP_SOURCES += [
     'CertVerifier.cpp',
     'CryptoTask.cpp',
     'JARSignatureVerification.cpp',
-    'NSSErrorsService.cpp',
-    'PSMContentListener.cpp',
-    'PSMRunnable.cpp',
-    'SSLServerCertVerification.cpp',
-    'SharedSSLState.cpp',
-    'TransportSecurityInfo.cpp',
-    'nsCMS.cpp',
-    'nsCMSSecureMessage.cpp',
+    'nsCertificatePrincipal.cpp',
     'nsCertOverrideService.cpp',
     'nsCertPicker.cpp',
     'nsCertVerificationThread.cpp',
-    'nsCertificatePrincipal.cpp',
     'nsClientAuthRemember.cpp',
+    'nsCMS.cpp',
+    'nsCMSSecureMessage.cpp',
     'nsCrypto.cpp',
     'nsCryptoHash.cpp',
     'nsDataSignatureVerifier.cpp',
     'nsIdentityChecking.cpp',
-    'nsKeyModule.cpp',
     'nsKeygenHandler.cpp',
     'nsKeygenThread.cpp',
+    'nsKeyModule.cpp',
     'nsNSSASN1Object.cpp',
     'nsNSSCallbacks.cpp',
     'nsNSSCertCache.cpp',
     'nsNSSCertHelper.cpp',
-    'nsNSSCertTrust.cpp',
-    'nsNSSCertValidity.cpp',
     'nsNSSCertificate.cpp',
     'nsNSSCertificateDB.cpp',
     'nsNSSCertificateFakeTransport.cpp',
+    'nsNSSCertTrust.cpp',
+    'nsNSSCertValidity.cpp',
     'nsNSSCleaner.cpp',
     'nsNSSComponent.cpp',
     'nsNSSErrors.cpp',
     'nsNSSIOLayer.cpp',
     'nsNSSModule.cpp',
     'nsNSSShutDown.cpp',
     'nsNSSVersion.cpp',
     'nsNTLMAuthModule.cpp',
     'nsPK11TokenDB.cpp',
     'nsPKCS11Slot.cpp',
     'nsPKCS12Blob.cpp',
+    'nsProtectedAuthThread.cpp',
     'nsPSMBackgroundThread.cpp',
-    'nsProtectedAuthThread.cpp',
     'nsRandomGenerator.cpp',
     'nsRecentBadCerts.cpp',
     'nsSDR.cpp',
-	'nsSSLSocketProvider.cpp',
+    'NSSErrorsService.cpp',
+    'nsSSLSocketProvider.cpp',
     'nsSSLStatus.cpp',
     'nsStreamCipher.cpp',
     'nsTLSSocketProvider.cpp',
     'nsUsageArrayHelper.cpp',
+    'PSMContentListener.cpp',
+    'PSMRunnable.cpp',
+    'SharedSSLState.cpp',
+    'SSLServerCertVerification.cpp',
+    'TransportSecurityInfo.cpp',
 ]
 
 if not CONFIG['MOZ_DISABLE_CRYPTOLEGACY']:
     CPP_SOURCES += [
         'nsSmartCardMonitor.cpp',
     ]
 
 if CONFIG['MOZ_XUL']:
--- a/storage/src/moz.build
+++ b/storage/src/moz.build
@@ -8,36 +8,36 @@ MODULE = 'storage'
 
 EXPORTS.mozilla.storage += [
     'Variant.h',
     'Variant_inl.h',
 ]
 
 CPP_SOURCES += [
     'FileSystemModule.cpp',
-    'SQLCollations.cpp',
-    'StorageBaseStatementInternal.cpp',
-    'TelemetryVFS.cpp',
-    'VacuumManager.cpp',
     'mozStorageArgValueArray.cpp',
     'mozStorageAsyncStatement.cpp',
     'mozStorageAsyncStatementExecution.cpp',
     'mozStorageAsyncStatementJSHelper.cpp',
     'mozStorageAsyncStatementParams.cpp',
     'mozStorageBindingParams.cpp',
     'mozStorageBindingParamsArray.cpp',
     'mozStorageConnection.cpp',
     'mozStorageError.cpp',
     'mozStoragePrivateHelpers.cpp',
     'mozStorageResultSet.cpp',
     'mozStorageRow.cpp',
+    'mozStorageService.cpp',
     'mozStorageSQLFunctions.cpp',
-    'mozStorageService.cpp',
     'mozStorageStatement.cpp',
     'mozStorageStatementJSHelper.cpp',
     'mozStorageStatementParams.cpp',
     'mozStorageStatementRow.cpp',
+    'SQLCollations.cpp',
+    'StorageBaseStatementInternal.cpp',
+    'TelemetryVFS.cpp',
+    'VacuumManager.cpp',
 ]
 
 LIBRARY_NAME = 'storage_s'
 
 LIBXUL_LIBRARY = True
 
--- a/storage/test/moz.build
+++ b/storage/test/moz.build
@@ -5,24 +5,24 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'test_storage'
 
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
 
 CPP_UNIT_TESTS += [
     'test_AsXXX_helpers.cpp',
-    'test_StatementCache.cpp',
+    'test_async_callbacks_with_spun_event_loops.cpp',
     'test_asyncStatementExecution_transaction.cpp',
-    'test_async_callbacks_with_spun_event_loops.cpp',
     'test_binding_params.cpp',
     'test_file_perms.cpp',
     'test_mutex.cpp',
     'test_service_init_background_thread.cpp',
     'test_statement_scoper.cpp',
+    'test_StatementCache.cpp',
     'test_transaction_helper.cpp',
     'test_true_async.cpp',
     'test_unlock_notify.cpp',
 ]
 
 if CONFIG['MOZ_DEBUG'] and CONFIG['OS_ARCH'] not in ('WINNT', 'Darwin'):
     # FIXME bug 523392: test_deadlock_detector doesn't like Windows
     # FIXME bug 523378: also fails on OS X
--- a/toolkit/components/captivedetect/moz.build
+++ b/toolkit/components/captivedetect/moz.build
@@ -8,12 +8,12 @@ TEST_DIRS += ['test']
 
 XPIDL_SOURCES += [
     'nsICaptivePortalDetector.idl',
 ]
 
 MODULE = 'captivedetect'
 
 EXTRA_COMPONENTS += [
+    'captivedetect.js',
     'CaptivePortalDetectComponents.manifest',
-    'captivedetect.js',
 ]
 
--- a/toolkit/components/downloads/moz.build
+++ b/toolkit/components/downloads/moz.build
@@ -12,18 +12,18 @@ XPIDL_SOURCES += [
     'nsIDownloadManager.idl',
     'nsIDownloadManagerUI.idl',
     'nsIDownloadProgressListener.idl',
 ]
 
 MODULE = 'downloads'
 
 CPP_SOURCES += [
+    'nsDownloadManager.cpp',
     'SQLFunctions.cpp',
-    'nsDownloadManager.cpp',
 ]
 
 if CONFIG['MOZ_URL_CLASSIFIER']:
     CPP_SOURCES += [
         'ApplicationReputation.cpp',
         'csd.pb.cc'
     ]
 
--- a/toolkit/components/jsdownloads/src/moz.build
+++ b/toolkit/components/jsdownloads/src/moz.build
@@ -18,16 +18,16 @@ EXTRA_COMPONENTS += [
     'DownloadLegacy.js',
     'Downloads.manifest',
 ]
 
 EXTRA_JS_MODULES += [
     'DownloadCore.jsm',
     'DownloadImport.jsm',
     'DownloadList.jsm',
+    'Downloads.jsm',
     'DownloadStore.jsm',
-    'Downloads.jsm',
 ]
 
 EXTRA_PP_JS_MODULES += [
     'DownloadIntegration.jsm',
     'DownloadUIHelper.jsm',
 ]
--- a/toolkit/components/places/moz.build
+++ b/toolkit/components/places/moz.build
@@ -30,37 +30,37 @@ if CONFIG['MOZ_PLACES']:
         'nsIFaviconService.idl',
         'nsINavBookmarksService.idl',
         'nsITaggingService.idl',
         'nsPIPlacesDatabase.idl',
         'nsPIPlacesHistoryListenersNotifier.idl',
     ]
 
     EXPORTS.mozilla.places = [
+        'Database.h',
         'History.h',
-        'Database.h',
     ]
 
     CPP_SOURCES += [
         'AsyncFaviconHelpers.cpp',
         'Database.cpp',
         'Helpers.cpp',
         'History.cpp',
-        'PlaceInfo.cpp',
-        'SQLFunctions.cpp',
-        'VisitInfo.cpp',
         'nsAnnoProtocolHandler.cpp',
         'nsAnnotationService.cpp',
         'nsFaviconService.cpp',
         'nsMaybeWeakPtr.cpp',
         'nsNavBookmarks.cpp',
         'nsNavHistory.cpp',
         'nsNavHistoryQuery.cpp',
         'nsNavHistoryResult.cpp',
         'nsPlacesModule.cpp',
+        'PlaceInfo.cpp',
+        'SQLFunctions.cpp',
+        'VisitInfo.cpp',
     ]
 
     LOCAL_INCLUDES += [
         '../build',
     ]
 
     EXTRA_JS_MODULES = [
         'BookmarkJSONUtils.jsm',
@@ -73,19 +73,19 @@ if CONFIG['MOZ_PLACES']:
 
     EXTRA_PP_JS_MODULES += [
         'BookmarkHTMLUtils.jsm',
         'PlacesUtils.jsm',
     ]
 
     EXTRA_COMPONENTS += [
         'ColorAnalyzer.js',
-        'PlacesCategoriesStarter.js',
         'nsLivemarkService.js',
         'nsPlacesExpiration.js',
         'nsTaggingService.js',
+        'PlacesCategoriesStarter.js',
         'toolkitplaces.manifest',
     ]
     if CONFIG['MOZ_XUL']:
         EXTRA_COMPONENTS += [
             'nsPlacesAutoComplete.js',
             'nsPlacesAutoComplete.manifest',
         ]
--- a/toolkit/components/startup/moz.build
+++ b/toolkit/components/startup/moz.build
@@ -12,18 +12,18 @@ MODULE = 'toolkitcomps'
 
 EXPORTS.mozilla += [
     'StartupTimeline.h',
 ]
 
 XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
 
 CPP_SOURCES += [
+    'nsAppStartup.cpp',
     'StartupTimeline.cpp',
-    'nsAppStartup.cpp',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'os2':
     CPP_SOURCES += [
         'nsUserInfoOS2.cpp',
     ]
 elif CONFIG['OS_ARCH'] == 'WINNT':
     CPP_SOURCES += [
--- a/toolkit/components/url-classifier/moz.build
+++ b/toolkit/components/url-classifier/moz.build
@@ -17,23 +17,23 @@ XPIDL_SOURCES += [
 
 MODULE = 'url-classifier'
 
 CPP_SOURCES += [
     'ChunkSet.cpp',
     'Classifier.cpp',
     'HashStore.cpp',
     'LookupCache.cpp',
-    'ProtocolParser.cpp',
     'nsCheckSummedOutputStream.cpp',
     'nsUrlClassifierDBService.cpp',
     'nsUrlClassifierPrefixSet.cpp',
     'nsUrlClassifierProxies.cpp',
     'nsUrlClassifierStreamUpdater.cpp',
     'nsUrlClassifierUtils.cpp',
+    'ProtocolParser.cpp',
 ]
 
 EXTRA_COMPONENTS += [
     'nsURLClassifier.manifest',
     'nsUrlClassifierHashCompleter.js',
 ]
 
 # Same as JS components that are run through the pre-processor.
--- a/toolkit/devtools/apps/moz.build
+++ b/toolkit/devtools/apps/moz.build
@@ -3,12 +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/.
 
 TEST_DIRS += ['tests']
 
 JS_MODULES_PATH = 'modules/devtools'
 
 EXTRA_JS_MODULES += [
+    'app-actor-front.js',
     'Devices.jsm',
-    'Simulator.jsm',
-    'app-actor-front.js'
+    'Simulator.jsm'
 ]
--- a/toolkit/identity/moz.build
+++ b/toolkit/identity/moz.build
@@ -20,21 +20,21 @@ LIBRARY_NAME = 'identity'
 
 JS_MODULES_PATH = 'modules/identity'
 
 EXTRA_JS_MODULES += [
     'Identity.jsm',
     'IdentityProvider.jsm',
     'IdentityStore.jsm',
     'IdentityUtils.jsm',
+    'jwcrypto.jsm',
     'LogUtils.jsm',
     'MinimalIdentity.jsm',
     'RelyingParty.jsm',
     'Sandbox.jsm',
-    'jwcrypto.jsm',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 EXPORT_LIBRARY = True
 
--- a/toolkit/modules/moz.build
+++ b/toolkit/modules/moz.build
@@ -3,16 +3,17 @@
 # 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 += ['tests']
 
 EXTRA_JS_MODULES += [
     'AsyncShutdown.jsm',
+    'debug.js',
     'DeferredTask.jsm',
     'Deprecated.jsm',
     'Dict.jsm',
     'FileUtils.jsm',
     'Finder.jsm',
     'Geometry.jsm',
     'Http.jsm',
     'InlineSpellChecker.jsm',
@@ -37,17 +38,16 @@ EXTRA_JS_MODULES += [
     'SelectParentHelper.jsm',
     'ShortcutUtils.jsm',
     'Sntp.jsm',
     'SpatialNavigation.jsm',
     'Sqlite.jsm',
     'Task.jsm',
     'TelemetryTimestamps.jsm',
     'Timer.jsm',
-    'debug.js',
 ]
 
 EXTRA_PP_JS_MODULES += [
     'CertUtils.jsm',
     'ResetProfile.jsm',
     'Services.jsm',
     'Troubleshoot.jsm',
     'UpdateChannel.jsm',
--- a/toolkit/mozapps/extensions/moz.build
+++ b/toolkit/mozapps/extensions/moz.build
@@ -4,18 +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/.
 
 TEST_DIRS += ['test']
 
 XPIDL_SOURCES += [
     'amIAddonManager.idl',
     'amIInstallTrigger.idl',
+    'amIWebInstaller.idl',
     'amIWebInstallListener.idl',
-    'amIWebInstaller.idl',
 ]
 
 MODULE = 'extensions'
 
 EXTRA_COMPONENTS += [
     'addonManager.js',
     'amContentHandler.js',
     'amWebInstallListener.js',
--- a/toolkit/xre/moz.build
+++ b/toolkit/xre/moz.build
@@ -64,23 +64,23 @@ if CONFIG['MOZ_X11']:
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
     CPP_SOURCES += [
         'nsAndroidStartup.cpp',
     ]
 
 CPP_SOURCES += [
     'CreateAppData.cpp',
-    'ProfileReset.cpp',
     'nsAppRunner.cpp',
     'nsConsoleWriter.cpp',
     'nsEmbedFunctions.cpp',
     'nsNativeAppSupportBase.cpp',
     'nsSigHandlers.cpp',
     'nsXREDirProvider.cpp',
+    'ProfileReset.cpp',
 ]
 
 if CONFIG['MOZ_GL_DEFAULT_PROVIDER'] == 'GLX':
     CPP_SOURCES += [
         'glxtest.cpp',
     ]
 
 if CONFIG['MOZ_INSTRUMENT_EVENT_LOOP']:
--- a/tools/profiler/moz.build
+++ b/tools/profiler/moz.build
@@ -8,47 +8,47 @@ if CONFIG['MOZ_ENABLE_PROFILER_SPS']:
     FAIL_ON_WARNINGS = not CONFIG['_MSC_VER']
 
     LIBXUL_LIBRARY = True
     EXPORT_LIBRARY = True
 
     MODULE = 'profiler'
     LIBRARY_NAME = 'profiler'
     XPIDL_SOURCES += [
+        'nsIProfiler.idl',
         'nsIProfileSaveEvent.idl',
-        'nsIProfiler.idl',
     ]
     EXPORTS += [
         'GeckoProfilerFunc.h',
         'GeckoProfilerImpl.h',
         'ProfilerMarkers.h',
         'PseudoStack.h',
         'shared-libraries.h',
     ]
     EXTRA_JS_MODULES = [
         'Profiler.jsm',
     ]
     CPP_SOURCES += [
         'BreakpadSampler.cpp',
         'IOInterposer.cpp',
         'JSCustomObjectBuilder.cpp',
         'JSObjectBuilder.cpp',
+        'local_debug_info_symbolizer.cc',
         'NSPRInterposer.cpp',
+        'nsProfiler.cpp',
+        'nsProfilerFactory.cpp',
+        'platform.cpp',
         'ProfileEntry.cpp',
         'ProfilerBacktrace.cpp',
         'ProfilerIOInterposeObserver.cpp',
         'ProfilerMarkers.cpp',
         'SaveProfileTask.cpp',
         'SyncProfile.cpp',
         'TableTicker.cpp',
         'UnwinderThread2.cpp',
-        'local_debug_info_symbolizer.cc',
-        'nsProfiler.cpp',
-        'nsProfilerFactory.cpp',
-        'platform.cpp',
     ]
 
     if CONFIG['OS_TARGET'] in ('Android', 'Linux'):
         CPP_SOURCES += [
             'platform-linux.cc',
             'shared-libraries-linux.cc',
         ]
         if CONFIG['CPU_ARCH'] == 'arm':
--- a/uriloader/exthandler/moz.build
+++ b/uriloader/exthandler/moz.build
@@ -36,20 +36,20 @@ EXPORTS += [
     osdir + '/nsOSHelperAppService.h'
 ]
 
 EXPORTS += [
     'nsExternalHelperAppService.h',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
-    EXPORTS += [
-        osdir + '/nsExternalSharingAppService.h',
-        osdir + '/nsExternalURLHandlerService.h',
-    ]
+    EXPORTS += [ '%s/%s' % (osdir, f) for f in [
+        'nsExternalSharingAppService.h',
+        'nsExternalURLHandlerService.h',
+    ]]
 
 if CONFIG['MOZ_ENABLE_MEEGOTOUCHSHARE']:
     EXPORTS += [
         osdir + '/nsExternalSharingAppService.h',
     ]
 
 EXPORTS.mozilla.dom += [
     'ExternalHelperAppChild.h',
--- a/uriloader/prefetch/moz.build
+++ b/uriloader/prefetch/moz.build
@@ -16,22 +16,22 @@ EXPORTS += [
 ]
 
 EXPORTS.mozilla.docshell += [
     'OfflineCacheUpdateChild.h',
     'OfflineCacheUpdateParent.h',
 ]
 
 CPP_SOURCES += [
+    'nsOfflineCacheUpdate.cpp',
+    'nsOfflineCacheUpdateService.cpp',
+    'nsPrefetchService.cpp',
     'OfflineCacheUpdateChild.cpp',
     'OfflineCacheUpdateGlue.cpp',
     'OfflineCacheUpdateParent.cpp',
-    'nsOfflineCacheUpdate.cpp',
-    'nsOfflineCacheUpdateService.cpp',
-    'nsPrefetchService.cpp',
 ]
 
 IPDL_SOURCES += [
     'POfflineCacheUpdate.ipdl',
 ]
 
 FAIL_ON_WARNINGS = True
 
--- a/webapprt/moz.build
+++ b/webapprt/moz.build
@@ -10,28 +10,28 @@ elif CONFIG['OS_ARCH'] == 'Darwin':
     DIRS += ['mac']
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk2':
     DIRS += ['gtk2']
 
 DIRS += ['locales']
 
 EXTRA_COMPONENTS += [
     'CommandLineHandler.js',
+    'components.manifest',
     'ContentPermission.js',
     'DirectoryProvider.js',
     'PaymentUIGlue.js',
-    'components.manifest',
 ]
 
 EXTRA_JS_MODULES += [
     'RemoteDebugger.jsm',
     'Startup.jsm',
-    'WebRTCHandler.jsm',
     'WebappRT.jsm',
     'WebappsHandler.jsm',
+    'WebRTCHandler.jsm',
 ]
 
 MOCHITEST_WEBAPPRT_CHROME_MANIFESTS += ['test/chrome/webapprt.ini']
 MOCHITEST_MANIFESTS += ['test/content/mochitest.ini']
 
 # Place webapprt resources in a separate app dir
 DIST_SUBDIR = 'webapprt'
 export('DIST_SUBDIR')
--- a/widget/android/moz.build
+++ b/widget/android/moz.build
@@ -9,35 +9,35 @@ XPIDL_SOURCES += [
 ]
 
 XPIDL_MODULE = 'widget_android'
 
 MODULE = 'widget'
 
 EXPORTS += [
     'AndroidBridge.h',
+    'AndroidJavaWrappers.h',
     'AndroidJNIWrapper.h',
-    'AndroidJavaWrappers.h',
     'GeneratedJNIWrappers.h'
 ]
 
 CPP_SOURCES += [
     'AndroidBridge.cpp',
     'AndroidDirectTexture.cpp',
     'AndroidGraphicBuffer.cpp',
+    'AndroidJavaWrappers.cpp',
     'AndroidJNI.cpp',
     'AndroidJNIWrapper.cpp',
-    'AndroidJavaWrappers.cpp',
     'GeneratedJNIWrappers.cpp',
     'GfxInfo.cpp',
     'nsAppShell.cpp',
     'nsClipboard.cpp',
     'nsDeviceContextAndroid.cpp',
+    'nsIdleServiceAndroid.cpp',
     'nsIMEPicker.cpp',
-    'nsIdleServiceAndroid.cpp',
     'nsLookAndFeel.cpp',
     'nsPrintOptionsAndroid.cpp',
     'nsScreenManagerAndroid.cpp',
     'nsWidgetFactory.cpp',
     'nsWindow.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
--- a/widget/cocoa/moz.build
+++ b/widget/cocoa/moz.build
@@ -21,18 +21,16 @@ EXPORTS += [
 
 LIBRARY_NAME = 'widget_mac'
 
 LIBXUL_LIBRARY = True
 
 CMMSRCS += [
     'GfxInfo.mm',
     'NativeKeyBindings.mm',
-    'TextInputHandler.mm',
-    'WidgetTraceEvent.mm',
     'nsAppShell.mm',
     'nsBidiKeyboard.mm',
     'nsChildView.mm',
     'nsClipboard.mm',
     'nsCocoaFeatures.mm',
     'nsCocoaUtils.mm',
     'nsCocoaWindow.mm',
     'nsColorPicker.mm',
@@ -57,16 +55,18 @@ CMMSRCS += [
     'nsPrintSettingsX.mm',
     'nsScreenCocoa.mm',
     'nsScreenManagerCocoa.mm',
     'nsSound.mm',
     'nsStandaloneNativeMenu.mm',
     'nsToolkit.mm',
     'nsWidgetFactory.mm',
     'nsWindowMap.mm',
+    'TextInputHandler.mm',
+    'WidgetTraceEvent.mm',
 ]
 
 if CONFIG['TARGET_CPU'] == 'x86_64':
     CMMSRCS += [
         'ComplexTextInputPanel.mm',
     ]
 
 EXPORT_LIBRARY = True
--- a/widget/gonk/moz.build
+++ b/widget/gonk/moz.build
@@ -28,40 +28,40 @@ CPP_SOURCES += ['libui/' + src for src i
     'Input.cpp',
     'InputApplication.cpp',
     'InputDevice.cpp',
     'InputDispatcher.cpp',
     'InputListener.cpp',
     'InputReader.cpp',
     'InputTransport.cpp',
     'InputWindow.cpp',
+    'Keyboard.cpp',
     'KeyCharacterMap.cpp',
     'KeyLayoutMap.cpp',
-    'Keyboard.cpp',
     'PointerController.cpp',
     'SpriteController.cpp',
     'Tokenizer.cpp',
     'VelocityControl.cpp',
     'VelocityTracker.cpp',
     'VirtualKeyMap.cpp',
 ]]
 
 CPP_SOURCES += [
     'Framebuffer.cpp',
     'GfxInfo.cpp',
     'GonkMemoryPressureMonitoring.cpp',
     'HwcComposer2D.cpp',
     'HwcUtils.cpp',
-    'OrientationObserver.cpp',
-    'ProcessOrientation.cpp',
     'nsAppShell.cpp',
     'nsIdleServiceGonk.cpp',
     'nsLookAndFeel.cpp',
     'nsWidgetFactory.cpp',
-    'nsWindow.cpp'
+    'nsWindow.cpp',
+    'OrientationObserver.cpp',
+    'ProcessOrientation.cpp'
 ]
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'widget_gonk'
 
 EXPORT_LIBRARY = True
 
--- a/widget/gtk/moz.build
+++ b/widget/gtk/moz.build
@@ -13,49 +13,49 @@ else:
 
 EXPORTS += [
     'mozcontainer.h',
     'nsGTKToolkit.h',
     'nsIImageToPixbuf.h',
 ]
 
 CPP_SOURCES += [
-    'WidgetTraceEvent.cpp',
     'nsAppShell.cpp',
     'nsBidiKeyboard.cpp',
     'nsColorPicker.cpp',
     'nsFilePicker.cpp',
     'nsGtkIMModule.cpp',
     'nsGtkKeyUtils.cpp',
     'nsImageToPixbuf.cpp',
     'nsLookAndFeel.cpp',
     'nsNativeKeyBindings.cpp',
     'nsNativeThemeGTK.cpp',
     'nsScreenGtk.cpp',
     'nsScreenManagerGtk.cpp',
     'nsSound.cpp',
     'nsToolkit.cpp',
     'nsWidgetFactory.cpp',
     'nsWindow.cpp',
+    'WidgetTraceEvent.cpp',
 ]
 
 if CONFIG['MOZ_X11']:
     CPP_SOURCES += [
         'nsIdleServiceGTK.cpp',
     ]
 
 if CONFIG['NS_PRINTING']:
     CPP_SOURCES += [
         'nsCUPSShim.cpp',
         'nsDeviceContextSpecG.cpp',
-        'nsPSPrinters.cpp',
         'nsPaperPS.cpp',
         'nsPrintDialogGTK.cpp',
         'nsPrintOptionsGTK.cpp',
         'nsPrintSettingsGTK.cpp',
+        'nsPSPrinters.cpp',
     ]
 
 if CONFIG['MOZ_X11']:
     CPP_SOURCES += [
         'nsClipboard.cpp',
         'nsDragService.cpp',
     ]
 
--- a/widget/moz.build
+++ b/widget/moz.build
@@ -71,19 +71,19 @@ XPIDL_SOURCES += [
     'nsIClipboardOwner.idl',
     'nsIColorPicker.idl',
     'nsIDragService.idl',
     'nsIDragSession.idl',
     'nsIFilePicker.idl',
     'nsIFormatConverter.idl',
     'nsIGfxInfo.idl',
     'nsIGfxInfoDebug.idl',
-    'nsIIMEPicker.idl',
     'nsIIdleService.idl',
     'nsIIdleServiceInternal.idl',
+    'nsIIMEPicker.idl',
     'nsIPrintOptions.idl',
     'nsIPrintSession.idl',
     'nsIPrintSettings.idl',
     'nsIPrintSettingsService.idl',
     'nsIScreen.idl',
     'nsIScreenManager.idl',
     'nsISound.idl',
     'nsITransferable.idl',
--- a/widget/os2/moz.build
+++ b/widget/os2/moz.build
@@ -11,18 +11,18 @@ CPP_SOURCES += [
     'nsBidiKeyboard.cpp',
     'nsClipboard.cpp',
     'nsDeviceContextSpecOS2.cpp',
     'nsDragService.cpp',
     'nsFilePicker.cpp',
     'nsIdleServiceOS2.cpp',
     'nsLookAndFeel.cpp',
     'nsOS2Uni.cpp',
+    'nsPrintOptionsOS2.cpp',
     'nsPrintOS2.cpp',
-    'nsPrintOptionsOS2.cpp',
     'nsRwsService.cpp',
     'nsScreenManagerOS2.cpp',
     'nsScreenOS2.cpp',
     'nsSound.cpp',
     'nsWidgetFactory.cpp',
     'nsWindow.cpp',
     'os2FrameWindow.cpp',
 ]
--- a/widget/qt/moz.build
+++ b/widget/qt/moz.build
@@ -11,19 +11,19 @@ MODULE = 'widget'
 EXPORTS += [
     'nsQtKeyUtils.h',
 ]
 
 CPP_SOURCES += [
     'moc_moziqwidget.cpp',
     'moc_mozqwidget.cpp',
     'moc_nsAppShell.cpp',
-    'mozSwipeGesture.cpp',
     'mozqglwidgetwrapper.cpp',
     'mozqwidget.cpp',
+    'mozSwipeGesture.cpp',
     'nsAppShell.cpp',
     'nsBidiKeyboard.cpp',
     'nsClipboard.cpp',
     'nsDeviceContextSpecQt.cpp',
     'nsDragService.cpp',
     'nsFilePicker.cpp',
     'nsIdleServiceQt.cpp',
     'nsLookAndFeel.cpp',
--- a/widget/shared/moz.build
+++ b/widget/shared/moz.build
@@ -5,17 +5,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 if CONFIG['MOZ_X11']:
     PARALLEL_DIRS += ['x11']
 
 MODULE = 'widget'
 
 CPP_SOURCES += [
+    'nsShmImage.cpp',
     'WidgetEventImpl.cpp',
     'WidgetUtils.cpp',
-    'nsShmImage.cpp',
 ]
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'widget_shared'
 
--- a/widget/windows/moz.build
+++ b/widget/windows/moz.build
@@ -7,68 +7,68 @@
 if CONFIG['MOZ_METRO']:
     DIRS += ['winrt']
 
 TEST_DIRS += ['tests']
 
 MODULE = 'widget'
 
 EXPORTS += [
-    'WinUtils.h',
+    'nsdefs.h',
     'WindowHook.h',
-    'nsdefs.h',
+    'WinUtils.h',
 ]
 
 EXPORTS.mozilla.widget += [
     'AudioSession.h',
 ]
 
 CPP_SOURCES += [
     'AudioSession.cpp',
     'GfxInfo.cpp',
     'IEnumFE.cpp',
     'JumpListBuilder.cpp',
     'JumpListItem.cpp',
     'KeyboardLayout.cpp',
-    'TaskbarPreview.cpp',
-    'TaskbarPreviewButton.cpp',
-    'TaskbarTabPreview.cpp',
-    'TaskbarWindowPreview.cpp',
-    'WidgetTraceEvent.cpp',
-    'WinIMEHandler.cpp',
-    'WinMouseScrollHandler.cpp',
-    'WinTaskbar.cpp',
-    'WinUtils.cpp',
-    'WindowHook.cpp',
     'nsAppShell.cpp',
     'nsBidiKeyboard.cpp',
     'nsClipboard.cpp',
     'nsColorPicker.cpp',
     'nsDataObj.cpp',
     'nsDataObjCollection.cpp',
     'nsDragService.cpp',
     'nsFilePicker.cpp',
-    'nsIMM32Handler.cpp',
     'nsIdleServiceWin.cpp',
     'nsImageClipboard.cpp',
+    'nsIMM32Handler.cpp',
     'nsLookAndFeel.cpp',
     'nsNativeDragSource.cpp',
     'nsNativeDragTarget.cpp',
     'nsNativeThemeWin.cpp',
     'nsScreenManagerWin.cpp',
     'nsScreenWin.cpp',
     'nsSound.cpp',
     'nsToolkit.cpp',
     'nsUXThemeData.cpp',
     'nsWidgetFactory.cpp',
-    'nsWinGesture.cpp',
     'nsWindow.cpp',
     'nsWindowBase.cpp',
     'nsWindowDbg.cpp',
     'nsWindowGfx.cpp',
+    'nsWinGesture.cpp',
+    'TaskbarPreview.cpp',
+    'TaskbarPreviewButton.cpp',
+    'TaskbarTabPreview.cpp',
+    'TaskbarWindowPreview.cpp',
+    'WidgetTraceEvent.cpp',
+    'WindowHook.cpp',
+    'WinIMEHandler.cpp',
+    'WinMouseScrollHandler.cpp',
+    'WinTaskbar.cpp',
+    'WinUtils.cpp',
 ]
 
 if CONFIG['MOZ_CRASHREPORTER']:
     CPP_SOURCES += [
         'LSPAnnotator.cpp',
     ]
 
 if CONFIG['NS_PRINTING']:
--- a/widget/windows/winrt/moz.build
+++ b/widget/windows/winrt/moz.build
@@ -10,21 +10,21 @@ CPP_SOURCES += [
     'APZController.cpp',
     'FrameworkView.cpp',
     'MetroApp.cpp',
     'MetroAppShell.cpp',
     'MetroContracts.cpp',
     'MetroInput.cpp',
     'MetroUtils.cpp',
     'MetroWidget.cpp',
+    'nsMetroFilePicker.cpp',
+    'nsWinMetroUtils.cpp',
     'ToastNotificationHandler.cpp',
     'UIAAccessibilityBridge.cpp',
     'UIABridge.cpp',
-    'nsMetroFilePicker.cpp',
-    'nsWinMetroUtils.cpp',
 ]
 
 EXTRA_COMPONENTS += [
     'MetroUIUtils.js',
     'MetroUIUtils.manifest',
 ]
 
 LIBXUL_LIBRARY = True
--- a/widget/xpwidgets/moz.build
+++ b/widget/xpwidgets/moz.build
@@ -13,34 +13,34 @@ EXPORTS += [
 
 CPP_SOURCES += [
     'APZCCallbackHelper.cpp',
     'GfxDriverInfo.cpp',
     'GfxInfoBase.cpp',
     'GfxInfoCollector.cpp',
     'GfxInfoWebGL.cpp',
     'InputData.cpp',
-    'PuppetWidget.cpp',
-    'WidgetUtils.cpp',
     'nsBaseAppShell.cpp',
     'nsBaseDragService.cpp',
     'nsBaseScreen.cpp',
     'nsBaseWidget.cpp',
     'nsClipboardHelper.cpp',
     'nsClipboardPrivacyHandler.cpp',
     'nsFilePickerProxy.cpp',
     'nsHTMLFormatConverter.cpp',
+    'nsIdleService.cpp',
     'nsIWidgetListener.cpp',
-    'nsIdleService.cpp',
     'nsPrimitiveHelpers.cpp',
     'nsPrintOptionsImpl.cpp',
     'nsPrintSession.cpp',
     'nsPrintSettingsImpl.cpp',
     'nsTransferable.cpp',
     'nsXPLookAndFeel.cpp',
+    'PuppetWidget.cpp',
+    'WidgetUtils.cpp',
 ]
 
 if CONFIG['MOZ_X11']:
     CPP_SOURCES += [
         'GfxInfoX11.cpp'
     ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('os2', 'cocoa', 'windows'):
--- a/xpcom/base/moz.build
+++ b/xpcom/base/moz.build
@@ -41,62 +41,61 @@ XPIDL_MODULE = 'xpcom_base'
 MODULE = 'xpcom'
 
 EXPORTS += [
     'ErrorList.h',
     'nsAgg.h',
     'nsAutoPtr.h',
     'nsAutoRef.h',
     'nsCom.h',
+    'nscore.h',
     'nsCycleCollector.h',
     'nsDebugImpl.h',
     'nsError.h',
     'nsGZFileWriter.h',
     'nsIAllocator.h',
     'nsIID.h',
+    'nsInterfaceRequestorAgg.h',
     'nsISizeOf.h',
     'nsISupportsBase.h',
     'nsISupportsObsolete.h',
-    'nsInterfaceRequestorAgg.h',
     'nsObjCExceptions.h',
     'nsStackWalk.h',
     'nsTraceRefcntImpl.h',
     'nsWeakPtr.h',
-    'nscore.h',
 ]
 
 if CONFIG['MOZ_DEBUG']:
     EXPORTS += ['pure.h']
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     EXPORTS += [
         'nsWindowsHelpers.h',
     ]
 
 EXPORTS.mozilla += [
     'AvailableMemoryTracker.h',
     'ClearOnShutdown.h',
     'CycleCollectedJSRuntime.h',
+    'nsMemoryInfoDumper.h',
     'StackWalk.h',
     'StaticMutex.h',
     'StaticPtr.h',
     'VisualEventTracer.h',
-    'nsMemoryInfoDumper.h',
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     EXPORTS.mozilla += [
         'WindowsVersion.h',
     ]
 
 CPP_SOURCES += [
     'AvailableMemoryTracker.cpp',
     'ClearOnShutdown.cpp',
     'CycleCollectedJSRuntime.cpp',
-    'VisualEventTracer.cpp',
     'nsConsoleMessage.cpp',
     'nsConsoleService.cpp',
     'nsCycleCollector.cpp',
     'nsDebugImpl.cpp',
     'nsErrorService.cpp',
     'nsGZFileWriter.cpp',
     'nsInterfaceRequestorAgg.cpp',
     'nsMemoryImpl.cpp',
@@ -104,16 +103,17 @@ CPP_SOURCES += [
     'nsMemoryReporterManager.cpp',
     'nsMessageLoop.cpp',
     'nsSecurityConsoleMessage.cpp',
     'nsStackWalk.cpp',
     'nsSystemInfo.cpp',
     'nsTraceRefcntImpl.cpp',
     'nsUUIDGenerator.cpp',
     'nsVersionComparatorImpl.cpp',
+    'VisualEventTracer.cpp',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     CPP_SOURCES += [
         'nsMacUtilsImpl.cpp',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     CPP_SOURCES += [
--- a/xpcom/build/moz.build
+++ b/xpcom/build/moz.build
@@ -12,21 +12,21 @@ EXPORTS += [
     'nsXPCOMCIDInternal.h',
     'nsXREAppData.h',
     'nsXULAppAPI.h',
     'xrecore.h',
 ]
 
 EXPORTS.mozilla += [
     'FileLocation.h',
+    'mozPoisonWrite.h',
     'Omnijar.h',
     'ServiceList.h',
     'Services.h',
     'XPCOM.h',
-    'mozPoisonWrite.h',
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     EXPORTS.mozilla += ['perfprobe.h']
     CPP_SOURCES += [
         'mozPoisonWriteBase.cpp',
         'mozPoisonWriteWin.cpp',
         'perfprobe.cpp',
@@ -44,20 +44,20 @@ else:
 include('../glue/objs.mozbuild')
 
 CPP_SOURCES += xpcom_gluens_src_cppsrcs
 CPP_SOURCES += xpcom_glue_src_cppsrcs
 
 CPP_SOURCES += [
     'FileLocation.cpp',
     'FrozenFunctions.cpp',
+    'nsXPComInit.cpp',
+    'nsXPCOMStrings.cpp',
     'Omnijar.cpp',
     'Services.cpp',
-    'nsXPCOMStrings.cpp',
-    'nsXPComInit.cpp',
 ]
 
 LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'xpcom_core'
 
--- a/xpcom/ds/moz.build
+++ b/xpcom/ds/moz.build
@@ -43,19 +43,19 @@ if CONFIG['OS_ARCH'] == 'WINNT':
 
 XPIDL_MODULE = 'xpcom_ds'
 
 MODULE = 'xpcom'
 
 EXPORTS += [
     'nsArray.h',
     'nsAtomService.h',
-    'nsCRT.h',
     'nsCharSeparatedTokenizer.h',
     'nsCheapSets.h',
+    'nsCRT.h',
     'nsExpirationTracker.h',
     'nsHashPropertyBag.h',
     'nsHashtable.h',
     'nsMathUtils.h',
     'nsObserverList.h',
     'nsObserverService.h',
     'nsStaticAtom.h',
     'nsStaticNameTable.h',
@@ -68,17 +68,16 @@ EXPORTS += [
 
 EXPORTS.mozilla += [
     'CharTokenizer.h',
     'StringBuilder.h',
     'TimeStamp.h',
 ]
 
 CPP_SOURCES += [
-    'TimeStamp.cpp',
     'nsArray.cpp',
     'nsAtomService.cpp',
     'nsAtomTable.cpp',
     'nsCRT.cpp',
     'nsHashPropertyBag.cpp',
     'nsHashtable.cpp',
     'nsINIParserImpl.cpp',
     'nsObserverList.cpp',
@@ -86,16 +85,17 @@ CPP_SOURCES += [
     'nsPersistentProperties.cpp',
     'nsProperties.cpp',
     'nsStaticNameTable.cpp',
     'nsStringEnumerator.cpp',
     'nsSupportsArray.cpp',
     'nsSupportsArrayEnumerator.cpp',
     'nsSupportsPrimitives.cpp',
     'nsVariant.cpp',
+    'TimeStamp.cpp',
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     CPP_SOURCES += [
         'TimeStamp_windows.cpp',
     ]
 elif CONFIG['HAVE_CLOCK_MONOTONIC']:
     CPP_SOURCES += [
--- a/xpcom/glue/moz.build
+++ b/xpcom/glue/moz.build
@@ -13,57 +13,57 @@ if CONFIG['OS_ARCH'] == 'WINNT':
 
 MODULE = 'xpcom'
 
 EXPORTS += [
     'MainThreadUtils.h',
     'nsArrayEnumerator.h',
     'nsArrayUtils.h',
     'nsBaseHashtable.h',
+    'nsCategoryCache.h',
+    'nsClassHashtable.h',
     'nsCOMArray.h',
+    'nsComponentManagerUtils.h',
     'nsCOMPtr.h',
     'nsCRTGlue.h',
-    'nsCategoryCache.h',
-    'nsClassHashtable.h',
-    'nsComponentManagerUtils.h',
     'nsCycleCollectionNoteChild.h',
     'nsCycleCollectionNoteRootCallback.h',
     'nsCycleCollectionParticipant.h',
     'nsCycleCollectionTraversalCallback.h',
     'nsDataHashtable.h',
     'nsDebug.h',
     'nsDeque.h',
     'nsEnumeratorUtils.h',
     'nsHashKeys.h',
     'nsIClassInfoImpl.h',
     'nsID.h',
     'nsIInterfaceRequestorUtils.h',
     'nsINIParser.h',
+    'nsInterfaceHashtable.h',
     'nsISupportsImpl.h',
     'nsISupportsUtils.h',
     'nsIWeakReferenceUtils.h',
-    'nsInterfaceHashtable.h',
     'nsJSThingHashtable.h',
     'nsMemory.h',
     'nsProxyRelease.h',
     'nsQuickSort.h',
     'nsRefPtrHashtable.h',
     'nsServiceManagerUtils.h',
     'nsStringAPI.h',
     'nsStringGlue.h',
     'nsTArray-inl.h',
     'nsTArray.h',
     'nsTArrayForwardDeclare.h',
+    'nsTextFormatter.h',
     'nsTHashtable.h',
+    'nsThreadUtils.h',
     'nsTObserverArray.h',
     'nsTPriorityQueue.h',
+    'nsTraceRefcnt.h',
     'nsTWeakRef.h',
-    'nsTextFormatter.h',
-    'nsThreadUtils.h',
-    'nsTraceRefcnt.h',
     'nsVersionComparator.h',
     'nsVoidArray.h',
     'nsWeakReference.h',
     'nsXPTCUtils.h',
     'pldhash.h',
 ]
 
 EXPORTS.mozilla += [
--- a/xpcom/glue/objs.mozbuild
+++ b/xpcom/glue/objs.mozbuild
@@ -4,35 +4,35 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 xpcom_glue_src_lcppsrcs = [
     'AppData.cpp',
     'FileUtils.cpp',
     'nsArrayEnumerator.cpp',
     'nsArrayUtils.cpp',
+    'nsCategoryCache.cpp',
+    'nsClassInfoImpl.cpp',
     'nsCOMArray.cpp',
+    'nsComponentManagerUtils.cpp',
     'nsCOMPtr.cpp',
     'nsCRTGlue.cpp',
-    'nsCategoryCache.cpp',
-    'nsClassInfoImpl.cpp',
-    'nsComponentManagerUtils.cpp',
     'nsCycleCollectionParticipant.cpp',
     'nsDeque.cpp',
     'nsEnumeratorUtils.cpp',
     'nsID.cpp',
     'nsIInterfaceRequestorUtils.cpp',
     'nsINIParser.cpp',
     'nsISupportsImpl.cpp',
     'nsMemory.cpp',
     'nsQuickSort.cpp',
     'nsTArray.cpp',
     'nsTHashtable.cpp',
+    'nsThreadUtils.cpp',
     'nsTObserverArray.cpp',
-    'nsThreadUtils.cpp',
     'nsVersionComparator.cpp',
     'nsVoidArray.cpp',
     'nsWeakReference.cpp',
     'pldhash.cpp',
 ]
 
 xpcom_glue_src_cppsrcs = [
     '%s/xpcom/glue/%s' % (TOPSRCDIR, s) for s in xpcom_glue_src_lcppsrcs
--- a/xpcom/io/moz.build
+++ b/xpcom/io/moz.build
@@ -9,19 +9,19 @@ XPIDL_SOURCES += [
     'nsIAsyncOutputStream.idl',
     'nsIBinaryInputStream.idl',
     'nsIBinaryOutputStream.idl',
     'nsIConverterInputStream.idl',
     'nsIConverterOutputStream.idl',
     'nsIDirectoryEnumerator.idl',
     'nsIDirectoryService.idl',
     'nsIFile.idl',
-    'nsIIOUtil.idl',
     'nsIInputStream.idl',
     'nsIInputStreamTee.idl',
+    'nsIIOUtil.idl',
     'nsILineInputStream.idl',
     'nsILocalFile.idl',
     'nsILocalFileWin.idl',
     'nsIMultiplexInputStream.idl',
     'nsIObjectInputStream.idl',
     'nsIObjectOutputStream.idl',
     'nsIOutputStream.idl',
     'nsIPipe.idl',
@@ -63,17 +63,16 @@ else:
         'nsLocalFileUnix.cpp',
     ]
 
 XPIDL_MODULE = 'xpcom_io'
 
 MODULE = 'xpcom'
 
 EXPORTS += [
-    'SpecialSystemDirectory.h',
     'nsAnonymousTemporaryFile.h',
     'nsAppDirectoryServiceDefs.h',
     'nsDirectoryService.h',
     'nsDirectoryServiceAtomList.h',
     'nsDirectoryServiceDefs.h',
     'nsDirectoryServiceUtils.h',
     'nsEscape.h',
     'nsLinebreakConverter.h',
@@ -81,45 +80,46 @@ EXPORTS += [
     'nsMultiplexInputStream.h',
     'nsNativeCharsetUtils.h',
     'nsScriptableInputStream.h',
     'nsStorageStream.h',
     'nsStreamUtils.h',
     'nsStringStream.h',
     'nsUnicharInputStream.h',
     'nsWildCard.h',
+    'SpecialSystemDirectory.h',
 ]
 
 EXPORTS.mozilla += [
     'Base64.h',
 ]
 
 CPP_SOURCES += [
     'Base64.cpp',
-    'SpecialSystemDirectory.cpp',
     'nsAnonymousTemporaryFile.cpp',
     'nsAppFileLocationProvider.cpp',
     'nsBinaryStream.cpp',
     'nsDirectoryService.cpp',
     'nsEscape.cpp',
+    'nsInputStreamTee.cpp',
     'nsIOUtil.cpp',
-    'nsInputStreamTee.cpp',
     'nsLinebreakConverter.cpp',
     'nsLocalFileCommon.cpp',
     'nsMultiplexInputStream.cpp',
     'nsNativeCharsetUtils.cpp',
     'nsPipe3.cpp',
     'nsScriptableBase64Encoder.cpp',
     'nsScriptableInputStream.cpp',
     'nsSegmentedBuffer.cpp',
     'nsStorageStream.cpp',
     'nsStreamUtils.cpp',
     'nsStringStream.cpp',
     'nsUnicharInputStream.cpp',
     'nsWildCard.cpp',
+    'SpecialSystemDirectory.cpp',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     CMMSRCS += [
         'CocoaFileUtils.mm',
     ]
 
 LIBXUL_LIBRARY = True
--- a/xpcom/string/public/moz.build
+++ b/xpcom/string/public/moz.build
@@ -2,18 +2,18 @@
 # 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/.
 
 MODULE = 'string'
 
 EXPORTS += [
+    'nsAlgorithm.h',
     'nsAString.h',
-    'nsAlgorithm.h',
     'nsCharTraits.h',
     'nsDependentString.h',
     'nsDependentSubstring.h',
     'nsEmbedString.h',
     'nsLiteralString.h',
     'nsPrintfCString.h',
     'nsPromiseFlatString.h',
     'nsReadableUtils.h',
--- a/xpcom/system/moz.build
+++ b/xpcom/system/moz.build
@@ -3,20 +3,20 @@
 # 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/.
 
 XPIDL_SOURCES += [
     'nsIBlocklistService.idl',
     'nsIDeviceSensors.idl',
     'nsIGConfService.idl',
+    'nsIGeolocationProvider.idl',
     'nsIGIOService.idl',
+    'nsIGnomeVFSService.idl',
     'nsIGSettingsService.idl',
-    'nsIGeolocationProvider.idl',
-    'nsIGnomeVFSService.idl',
     'nsIHapticFeedback.idl',
     'nsIXULAppInfo.idl',
     'nsIXULRuntime.idl',
 ]
 
 if CONFIG['MOZ_CRASHREPORTER']:
     XPIDL_SOURCES += [
         'nsICrashReporter.idl',
--- a/xpcom/tests/moz.build
+++ b/xpcom/tests/moz.build
@@ -19,49 +19,47 @@ if CONFIG['DEHYDRA_PATH']:
 
 FAIL_ON_WARNINGS = True
 
 EXPORTS.testing += [
     'TestHarness.h',
 ]
 
 sources = [
+    'nsIFileEnumerator',
     'TestArguments',
     'TestBlockingProcess',
     'TestCallTemplates',
     'TestINIParser',
     'TestPRIntN',
     'TestQuickReturn',
     'TestRacingServiceManager',
     'TestRegistrationOrder',
     'TestThreadPoolListener',
     'TestTimers',
     'TestUnicodeArguments',
-    'nsIFileEnumerator',
 ]
 
 if CONFIG['OS_TARGET'] == 'WINNT':
     sources += [
         'TestBase64',
     ]
 
 if CONFIG['WRAP_STL_INCLUDES']:
     sources += [
         'TestSTLWrappers',
     ]
 
-sources.sort()
-
 CPP_SOURCES += [
-    '%s.cpp' % s for s in sources
+    '%s.cpp' % s for s in sorted(sources)
 ]
 
 bin_suffix = CONFIG['BIN_SUFFIX']
 SIMPLE_PROGRAMS += [
-    '%s%s' % (s, bin_suffix) for s in sources
+    '%s%s' % (s, bin_suffix) for s in sorted(sources)
 ]
 
 MODULE = 'xpcom'
 
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
 
 CPP_UNIT_TESTS += [
     'ShowAlignments.cpp',
@@ -71,18 +69,18 @@ CPP_UNIT_TESTS += [
     'TestCOMPtr.cpp',
     'TestCOMPtrEq.cpp',
     'TestDeque.cpp',
     'TestFile.cpp',
     'TestHashtables.cpp',
     'TestID.cpp',
     'TestObserverArray.cpp',
     'TestObserverService.cpp',
+    'TestPipe.cpp',
     'TestPLDHash.cpp',
-    'TestPipe.cpp',
     'TestRefPtr.cpp',
     'TestTArray.cpp',
     'TestTextFormatter.cpp',
     'TestThreadUtils.cpp'
 ]
 
 if CONFIG['MOZ_MEMORY']:
     CPP_UNIT_TESTS += [
--- a/xpcom/threads/moz.build
+++ b/xpcom/threads/moz.build
@@ -33,25 +33,25 @@ EXPORTS.mozilla += [
     'HangMonitor.h',
     'LazyIdleThread.h',
     'SyncRunnable.h',
 ]
 
 CPP_SOURCES += [
     'HangMonitor.cpp',
     'LazyIdleThread.cpp',
-    'TimerThread.cpp',
     'nsEnvironment.cpp',
     'nsEventQueue.cpp',
     'nsMemoryPressure.cpp',
     'nsProcessCommon.cpp',
     'nsThread.cpp',
     'nsThreadManager.cpp',
     'nsThreadPool.cpp',
     'nsTimerImpl.cpp',
+    'TimerThread.cpp',
 ]
 
 LIBRARY_NAME = 'xpcomthreads_s'
 
 LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True