Bug 913268 - Make CPP_SOURCES a StrictOrderingOnAppendList. r=mshal
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 24 Oct 2013 08:00:23 +0900
changeset 151861 56c3abf3f03093fbb638d3bb6ce15de743f7e12f
parent 151860 bf77633ddab06c137fc4008504cafe0524962024
child 151862 b84acd40490ee5dc4922dc0326ec39b27041273d
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
bugs913268
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 913268 - Make CPP_SOURCES a StrictOrderingOnAppendList. r=mshal
accessible/src/base/moz.build
accessible/src/windows/msaa/moz.build
content/base/src/moz.build
content/canvas/src/moz.build
content/media/directshow/moz.build
content/media/gstreamer/moz.build
content/media/omx/moz.build
content/media/webrtc/moz.build
content/media/webspeech/synth/moz.build
content/xbl/src/moz.build
content/xul/content/src/moz.build
content/xul/document/src/moz.build
dom/base/moz.build
dom/bluetooth/moz.build
dom/camera/moz.build
dom/ipc/moz.build
dom/mobilemessage/src/moz.build
dom/plugins/base/moz.build
dom/plugins/ipc/interpose/moz.build
dom/plugins/ipc/moz.build
dom/plugins/test/testplugin/testplugin.mozbuild
dom/system/gonk/moz.build
dom/system/unix/moz.build
gfx/2d/moz.build
gfx/angle/moz.build
gfx/angle/src/libEGL/moz.build
gfx/angle/src/libGLESv2/moz.build
gfx/gl/moz.build
gfx/graphite2/src/moz.build
gfx/harfbuzz/src/moz.build
gfx/ipc/moz.build
gfx/layers/moz.build
gfx/skia/moz.build
gfx/thebes/moz.build
hal/moz.build
ipc/chromium/moz.build
ipc/glue/moz.build
js/src/moz.build
js/xpconnect/src/moz.build
layout/base/moz.build
layout/xul/base/src/moz.build
media/libtheora/lib/moz.build
media/mtransport/objs.mozbuild
memory/replace/dmd/moz.build
mozglue/tests/moz.build
netwerk/base/src/moz.build
netwerk/cache2/moz.build
netwerk/cookie/moz.build
python/mozbuild/mozbuild/frontend/sandbox_symbols.py
security/manager/ssl/src/moz.build
toolkit/components/places/moz.build
toolkit/components/protobuf/moz.build
toolkit/crashreporter/client/moz.build
toolkit/crashreporter/google-breakpad/src/client/linux/handler/moz.build
toolkit/crashreporter/google-breakpad/src/common/moz.build
toolkit/crashreporter/moz.build
toolkit/crashreporter/test/moz.build
toolkit/mozapps/update/common/moz.build
toolkit/mozapps/update/updater/moz.build
toolkit/profile/moz.build
tools/profiler/moz.build
uriloader/exthandler/moz.build
widget/gonk/libdisplay/moz.build
widget/gonk/moz.build
widget/gonk/nativewindow/moz.build
widget/gtk/moz.build
widget/windows/moz.build
widget/windows/winrt/moz.build
widget/xpwidgets/moz.build
xpcom/ds/moz.build
xpcom/glue/objs.mozbuild
xpcom/reflect/xptcall/src/md/unix/moz.build
--- a/accessible/src/base/moz.build
+++ b/accessible/src/base/moz.build
@@ -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/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',
+    'IUnknownImpl.cpp',
     'ImageAccessibleWrap.cpp',
-    'IUnknownImpl.cpp',
+    'Platform.cpp',
+    'RootAccessibleWrap.cpp',
+    'ServiceProvider.cpp',
+    'TextLeafAccessibleWrap.cpp',
     'nsWinUtils.cpp',
-    'Compatibility.cpp',
-    'EnumVariant.cpp',
-    'Platform.cpp',
-    'ServiceProvider.cpp',
-    'RootAccessibleWrap.cpp',
-    'TextLeafAccessibleWrap.cpp',
 ]
 
 if CONFIG['MOZ_XUL']:
     CPP_SOURCES += [
         'XULListboxAccessibleWrap.cpp',
         'XULMenuAccessibleWrap.cpp',
         'XULTreeGridAccessibleWrap.cpp',
     ]
--- a/content/base/src/moz.build
+++ b/content/base/src/moz.build
@@ -63,23 +63,24 @@ EXPORTS.mozilla.dom += [
     'Link.h',
     'NodeIterator.h',
     'Text.h',
     'TreeWalker.h',
 ]
 
 CPP_SOURCES += [
     'Attr.cpp',
+    'ChildIterator.cpp',
     'Comment.cpp',
     'DOMImplementation.cpp',
+    'DOMParser.cpp',
     'DOMRect.cpp',
     'DirectionalityUtils.cpp',
     'DocumentFragment.cpp',
     'DocumentType.cpp',
-    'DOMParser.cpp',
     'Element.cpp',
     'EventSource.cpp',
     'FileIOObject.cpp',
     'FragmentOrElement.cpp',
     'Link.cpp',
     'NodeIterator.cpp',
     'Text.cpp',
     'ThirdPartyUtil.cpp',
@@ -87,17 +88,16 @@ CPP_SOURCES += [
     'WebSocket.cpp',
     'nsAtomListUtils.cpp',
     'nsAttrAndChildArray.cpp',
     'nsAttrValue.cpp',
     'nsAttrValueOrString.cpp',
     'nsCCUncollectableMarker.cpp',
     'nsCSPService.cpp',
     'nsChannelPolicy.cpp',
-    'ChildIterator.cpp',
     'nsContentAreaDragDrop.cpp',
     'nsContentIterator.cpp',
     'nsContentList.cpp',
     'nsContentPolicy.cpp',
     'nsContentSink.cpp',
     'nsContentUtils.cpp',
     'nsCopySupport.cpp',
     'nsCrossSiteListenerProxy.cpp',
--- a/content/canvas/src/moz.build
+++ b/content/canvas/src/moz.build
@@ -22,31 +22,31 @@ CPP_SOURCES += [
     'DocumentRendererChild.cpp',
     'DocumentRendererParent.cpp',
     'ImageData.cpp',
     'ImageEncoder.cpp',
 ]
 
 if CONFIG['MOZ_WEBGL']:
     CPP_SOURCES += [
+        'WebGL1Context.cpp',
+        'WebGL2Context.cpp',
         'WebGLActiveInfo.cpp',
         'WebGLBuffer.cpp',
-        'WebGL1Context.cpp',
-        'WebGL2Context.cpp',
         'WebGLContext.cpp',
         'WebGLContextAsyncQueries.cpp',
         'WebGLContextBuffers.cpp',
-        'WebGLContextLossTimer.cpp',
+        'WebGLContextExtensions.cpp',
+        'WebGLContextFramebufferOperations.cpp',
         'WebGLContextGL.cpp',
-        'WebGLContextUtils.cpp',
+        'WebGLContextLossTimer.cpp',
         'WebGLContextReporter.cpp',
         'WebGLContextState.cpp',
+        'WebGLContextUtils.cpp',
         'WebGLContextValidate.cpp',
-        'WebGLContextExtensions.cpp',
-        'WebGLContextFramebufferOperations.cpp',
         'WebGLContextVertexArray.cpp',
         'WebGLContextVertices.cpp',
         'WebGLElementArrayCache.cpp',
         'WebGLExtensionBase.cpp',
         'WebGLExtensionCompressedTextureATC.cpp',
         'WebGLExtensionCompressedTexturePVRTC.cpp',
         'WebGLExtensionCompressedTextureS3TC.cpp',
         'WebGLExtensionDebugRendererInfo.cpp',
--- a/content/media/directshow/moz.build
+++ b/content/media/directshow/moz.build
@@ -22,21 +22,21 @@ CPP_SOURCES += [
     'DirectShowUtils.cpp',
     'SampleSink.cpp',
     'SourceFilter.cpp',
 ]
 
 # If WebRTC isn't being built, we need to compile the DirectShow base classes so that
 # they're available at link time.
 if not CONFIG['MOZ_WEBRTC']:
-    CPP_SOURCES += [
-        TOPSRCDIR + '/media/webrtc/trunk/webrtc/modules/video_capture/windows/BaseFilter.cpp',
-        TOPSRCDIR + '/media/webrtc/trunk/webrtc/modules/video_capture/windows/BaseInputPin.cpp',
-        TOPSRCDIR + '/media/webrtc/trunk/webrtc/modules/video_capture/windows/BasePin.cpp',
-        TOPSRCDIR + '/media/webrtc/trunk/webrtc/modules/video_capture/windows/MediaType.cpp',
-    ]
+    CPP_SOURCES += [ '%s/%s' % (TOPSRCDIR, p) for p in [
+        'media/webrtc/trunk/webrtc/modules/video_capture/windows/BaseFilter.cpp',
+        'media/webrtc/trunk/webrtc/modules/video_capture/windows/BaseInputPin.cpp',
+        'media/webrtc/trunk/webrtc/modules/video_capture/windows/BasePin.cpp',
+        'media/webrtc/trunk/webrtc/modules/video_capture/windows/MediaType.cpp',
+    ]]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'gkcondirectshow_s'
 
--- a/content/media/gstreamer/moz.build
+++ b/content/media/gstreamer/moz.build
@@ -11,19 +11,19 @@ EXPORTS += [
     'GStreamerFormatHelper.h',
     'GStreamerLoader.h',
     'GStreamerReader.h',
 ]
 
 CPP_SOURCES += [
     'GStreamerDecoder.cpp',
     'GStreamerFormatHelper.cpp',
-    'GStreamerReader.cpp',
+    'GStreamerLoader.cpp',
     'GStreamerMozVideoBuffer.cpp',
-    'GStreamerLoader.cpp',
+    'GStreamerReader.cpp',
 ]
 
 LIBRARY_NAME = 'gkcongstreamer_s'
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
--- a/content/media/omx/moz.build
+++ b/content/media/omx/moz.build
@@ -9,18 +9,18 @@ MODULE = 'content'
 EXPORTS += [
     'MediaOmxDecoder.h',
     'MediaOmxReader.h',
 ]
 
 CPP_SOURCES += [
     'MediaOmxDecoder.cpp',
     'MediaOmxReader.cpp',
+    'OMXCodecProxy.cpp',
     'OmxDecoder.cpp',
-    'OMXCodecProxy.cpp',
 ]
 
 if CONFIG['MOZ_RTSP']:
     EXPORTS += [
         'RtspOmxDecoder.h',
         'RtspOmxReader.h',
     ]
     CPP_SOURCES += [
--- a/content/media/webrtc/moz.build
+++ b/content/media/webrtc/moz.build
@@ -13,18 +13,18 @@ EXPORTS += [
     'MediaEngineDefault.h',
 ]
 
 if CONFIG['MOZ_WEBRTC']:
     EXPORTS += ['MediaEngineWebRTC.h']
     CPP_SOURCES += [
         'MediaEngineTabVideoSource.cpp',
         'MediaEngineWebRTC.cpp',
+        'MediaEngineWebRTCAudio.cpp',
         'MediaEngineWebRTCVideo.cpp',
-        'MediaEngineWebRTCAudio.cpp',
     ]
 XPIDL_SOURCES += [
         'nsITabSource.idl'
 ]
 
 CPP_SOURCES += [
     'MediaEngineDefault.cpp',
 ]
--- a/content/media/webspeech/synth/moz.build
+++ b/content/media/webspeech/synth/moz.build
@@ -25,20 +25,20 @@ if CONFIG['MOZ_WEBSPEECH']:
         'ipc/SpeechSynthesisParent.h',
         'nsSpeechTask.h',
         'nsSynthVoiceRegistry.h',
     ]
 
     CPP_SOURCES += [
         'EnableSpeechSynthesisCheck.cpp',
         'SpeechSynthesis.cpp',
+        'SpeechSynthesisUtterance.cpp',
+        'SpeechSynthesisVoice.cpp',
         'ipc/SpeechSynthesisChild.cpp',
         'ipc/SpeechSynthesisParent.cpp',
-        'SpeechSynthesisUtterance.cpp',
-        'SpeechSynthesisVoice.cpp',
         'nsSpeechTask.cpp',
         'nsSynthVoiceRegistry.cpp',
     ]
 
     if CONFIG['MOZ_SYNTH_PICO']:
         PARALLEL_DIRS = ['pico']
 
 IPDL_SOURCES += [
--- 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/xul/content/src/moz.build
+++ b/content/xul/content/src/moz.build
@@ -6,19 +6,19 @@
 
 MODULE = 'xul'
 
 if CONFIG['MOZ_XUL']:
     LIBXUL_LIBRARY = True
     MSVC_ENABLE_PGO = True
 
     CPP_SOURCES += [
+        'nsXULContextMenuBuilder.cpp',
         'nsXULElement.cpp',
         'nsXULPopupListener.cpp',
-        'nsXULContextMenuBuilder.cpp',
     ]
     LIBRARY_NAME = 'gkconxulcon_s'
 
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
     '../../document/src',
     '../../templates/src',
--- a/content/xul/document/src/moz.build
+++ b/content/xul/document/src/moz.build
@@ -7,19 +7,19 @@
 MODULE = 'xuldoc'
 
 CPP_SOURCES += [
     'nsXULControllers.cpp',
 ]
 
 if CONFIG['MOZ_XUL']:
     CPP_SOURCES += [
+        'XULDocument.cpp',
         'nsXULCommandDispatcher.cpp',
         'nsXULContentSink.cpp',
-        'XULDocument.cpp',
         'nsXULPrototypeCache.cpp',
         'nsXULPrototypeDocument.cpp',
     ]
 
 LIBRARY_NAME = 'gkconxuldoc_s'
 
 FAIL_ON_WARNINGS = True
 
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@@ -66,20 +66,22 @@ EXPORTS.mozilla.dom += [
 CPP_SOURCES += [
     'BarProps.cpp',
     'CompositionStringSynthesizer.cpp',
     'Crypto.cpp',
     'DOMCursor.cpp',
     'DOMError.cpp',
     'DOMException.cpp',
     'DOMRequest.cpp',
-    'Navigator.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',
@@ -94,18 +96,16 @@ 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/bluetooth/moz.build
+++ b/dom/bluetooth/moz.build
@@ -21,47 +21,47 @@ if CONFIG['MOZ_B2G_BT']:
     XPIDL_MODULE = 'dom_bluetooth'
     XPIDL_SOURCES += [
         'nsIDOMBluetoothDevice.idl',
         'nsIDOMBluetoothDeviceEvent.idl',
         'nsIDOMBluetoothStatusChangedEvent.idl',
     ]
 
     CPP_SOURCES += [
-        'BluetoothService.cpp',
-        'BluetoothManager.cpp',
+        'BluetoothA2dpManager.cpp',
         'BluetoothAdapter.cpp',
         'BluetoothDevice.cpp',
-        'BluetoothReplyRunnable.cpp',
+        'BluetoothHfpManager.cpp',
+        'BluetoothHidManager.cpp',
+        'BluetoothManager.cpp',
+        'BluetoothOppManager.cpp',
+        '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',
-        'BluetoothUnixSocketConnector.cpp',
-        'BluetoothA2dpManager.cpp',
-        'BluetoothHfpManager.cpp',
-        'BluetoothHidManager.cpp',
-        'BluetoothOppManager.cpp',
-        'ObexBase.cpp',
-        'BluetoothUuid.cpp',
-        'BluetoothSocket.cpp',
-        'BluetoothProfileController.cpp'
+        'ipc/BluetoothServiceChildProcess.cpp'
     ]
 
     if CONFIG['MOZ_B2G_RIL']:
         CPP_SOURCES += [
             'BluetoothRilListener.cpp',
         ]
 
     if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
         if CONFIG['MOZ_B2G_BT_BLUEZ']:
             CPP_SOURCES += [
+               'gonk/BluetoothGonkService.cpp',
                'linux/BluetoothDBusService.cpp',
-               'gonk/BluetoothGonkService.cpp',
             ]
         if CONFIG['MOZ_B2G_BT_BLUEDROID']:
             CPP_SOURCES += [
                 'BluetoothServiceBluedroid.cpp',
             ]
     else:
         if CONFIG['MOZ_ENABLE_DBUS']:
             CPP_SOURCES += [
--- a/dom/camera/moz.build
+++ b/dom/camera/moz.build
@@ -29,27 +29,27 @@ CPP_SOURCES += [
     'DOMCameraCapabilities.cpp',
     'DOMCameraControl.cpp',
     'DOMCameraManager.cpp',
     'DOMCameraPreview.cpp',
 ]
 
 if CONFIG['MOZ_B2G_CAMERA']:
     CPP_SOURCES += [
-        'GonkCameraManager.cpp',
         'GonkCameraControl.cpp',
         'GonkCameraHwMgr.cpp',
+        'GonkCameraManager.cpp',
+        'GonkCameraSource.cpp',
         'GonkRecorder.cpp',
-        'GonkCameraSource.cpp',
         'GonkRecorderProfiles.cpp',
     ]
 else:
     CPP_SOURCES += [
+        'FallbackCameraControl.cpp',
         'FallbackCameraManager.cpp',
-        'FallbackCameraControl.cpp',
     ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'domcamera_s'
 
--- a/dom/ipc/moz.build
+++ b/dom/ipc/moz.build
@@ -37,29 +37,29 @@ EXPORTS.mozilla += [
     'AppProcessChecker.h',
     'PreallocatedProcessManager.h',
     'ProcessPriorityManager.h',
 ]
 
 CPP_SOURCES += [
     'AppProcessChecker.cpp',
     'Blob.cpp',
-    'ContentProcess.cpp',
+    'ContentChild.cpp',
     'ContentParent.cpp',
-    'ContentChild.cpp',
+    'ContentProcess.cpp',
+    'CrashReporterChild.cpp',
     'CrashReporterParent.cpp',
-    'CrashReporterChild.cpp',
     'PermissionMessageUtils.cpp',
     'PreallocatedProcessManager.cpp',
     'ProcessPriorityManager.cpp',
     'StructuredCloneUtils.cpp',
-    'TabParent.cpp',
     'TabChild.cpp',
     'TabContext.cpp',
     'TabMessageUtils.cpp',
+    'TabParent.cpp',
 ]
 
 IPDL_SOURCES += [
     'DOMTypes.ipdlh',
     'PBlob.ipdl',
     'PBlobStream.ipdl',
     'PBrowser.ipdl',
     'PContent.ipdl',
--- a/dom/mobilemessage/src/moz.build
+++ b/dom/mobilemessage/src/moz.build
@@ -10,19 +10,19 @@ EXPORTS.mozilla.dom.mobilemessage += [
     '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',
-        'android/MmsService.cpp',
     ]
 elif CONFIG['MOZ_B2G_RIL']:
     EXTRA_JS_MODULES = [
         'gonk/MmsPduHelper.jsm',
         'gonk/WspPduHelper.jsm',
         'gonk/mms_consts.js',
         'gonk/wap_consts.js',
     ]
@@ -32,18 +32,18 @@ elif CONFIG['MOZ_B2G_RIL']:
         'gonk/MobileMessageDatabaseService.js',
         'gonk/MobileMessageDatabaseService.manifest',
     ]
     CPP_SOURCES += [
         'gonk/SmsService.cpp',
     ]
 else:
     CPP_SOURCES += [
+        'fallback/MmsService.cpp',
         'fallback/MobileMessageDatabaseService.cpp',
-        'fallback/MmsService.cpp',
         'fallback/SmsService.cpp',
     ]
 
 EXPORTS.mozilla.dom += [
     'MmsMessage.h',
     'MobileMessageManager.h',
     'SmsFilter.h',
     'SmsMessage.h',
--- a/dom/plugins/base/moz.build
+++ b/dom/plugins/base/moz.build
@@ -53,29 +53,29 @@ CPP_SOURCES += [
     'nsPluginModule.cpp',
     'nsPluginPlayPreviewInfo.cpp',
     'nsPluginStreamListenerPeer.cpp',
     'nsPluginTags.cpp',
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     CPP_SOURCES += [
-        'nsPluginsDirWin.cpp',
+        'nsPluginDirServiceProvider.cpp',
         'nsPluginNativeWindowWin.cpp',
-        'nsPluginDirServiceProvider.cpp',
+        'nsPluginsDirWin.cpp',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'os2':
     CPP_SOURCES += [
+        'nsPluginNativeWindowOS2.cpp',
         'nsPluginsDirOS2.cpp',
-        'nsPluginNativeWindowOS2.cpp',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     CPP_SOURCES += [
+        'nsPluginNativeWindow.cpp',
         'nsPluginsDirDarwin.cpp',
-        'nsPluginNativeWindow.cpp',
     ]
 else:
     CPP_SOURCES += [
         'nsPluginsDirUnix.cpp',
     ]
     if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk2':
         CPP_SOURCES += [
             'nsPluginNativeWindowGtk2.cpp',
--- a/dom/plugins/ipc/interpose/moz.build
+++ b/dom/plugins/ipc/interpose/moz.build
@@ -1,12 +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/.
 
 LIBRARY_NAME = 'plugin_child_interpose'
 
+CMMSRCS += [ "%s.mm" % (LIBRARY_NAME) ]
+
 CMMSRCS += [
-    "%s.mm" % (LIBRARY_NAME),
     'plugin_child_quirks.mm',
 ]
--- a/dom/plugins/ipc/moz.build
+++ b/dom/plugins/ipc/moz.build
@@ -45,30 +45,30 @@ EXPORTS.mozilla.plugins += [
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     EXPORTS.mozilla.plugins += [
         'PluginSurfaceParent.h',
     ]
     CPP_SOURCES += [
         'COMMessageFilter.cpp',
-        'PluginSurfaceParent.cpp',
         'MiniShmParent.cpp',
         'PluginHangUIParent.cpp',
+        'PluginSurfaceParent.cpp',
     ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     EXPORTS.mozilla.plugins += [
         'PluginInterposeOSX.h',
     ]
 
 if CONFIG['MOZ_ENABLE_QT']:
     CPP_SOURCES += [
+        'NestedLoopTimer.cpp',
         'moc_NestedLoopTimer.cpp',
-        'NestedLoopTimer.cpp',
     ]
 
 CPP_SOURCES += [
     'BrowserStreamChild.cpp',
     'BrowserStreamParent.cpp',
     'ChildAsyncCall.cpp',
     'ChildTimer.cpp',
     'PluginBackgroundDestroyer.cpp',
--- a/dom/plugins/test/testplugin/testplugin.mozbuild
+++ b/dom/plugins/test/testplugin/testplugin.mozbuild
@@ -1,19 +1,22 @@
 # -*- 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/.
 
 NO_DIST_INSTALL = True
 
+CPP_SOURCES += [ '%s/%s' % (relative_path, p) for p in [
+    'nptest.cpp',
+    'nptest_utils.cpp',
+]]
+
 CPP_SOURCES += [
-    relative_path + '/nptest.cpp',
-    relative_path + '/nptest_utils.cpp',
     'nptest_name.cpp',
 ]
 
 toolkit = CONFIG['MOZ_WIDGET_TOOLKIT']
 if toolkit == 'cocoa':
     CMMSRCS += [
         relative_path + '/nptest_macosx.mm'
     ]
--- a/dom/system/gonk/moz.build
+++ b/dom/system/gonk/moz.build
@@ -33,32 +33,32 @@ MODULE = 'dom'
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     EXPORTS += [
         'GonkGPSGeolocationProvider.h',
         'nsVolume.h',
         'nsVolumeService.h',
     ]
     CPP_SOURCES += [
+        'AudioChannelManager.cpp',
         'AudioManager.cpp',
         'AutoMounter.cpp',
         'AutoMounterSetting.cpp',
         'GonkGPSGeolocationProvider.cpp',
-        'AudioChannelManager.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',
 ]
--- 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 += [
+        'QTMLocationProvider.cpp',
         'moc_QTMLocationProvider.cpp',
-        'QTMLocationProvider.cpp',
     ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'domsystemunix_s'
 
--- a/gfx/2d/moz.build
+++ b/gfx/2d/moz.build
@@ -32,56 +32,56 @@ EXPORTS.mozilla.gfx += [
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     EXPORTS.mozilla.gfx += [
         'MacIOSurface.h',
         'QuartzSupport.h',
     ]
     CPP_SOURCES += [
-        'SourceSurfaceCG.cpp',
         'DrawTargetCG.cpp',
         'PathCG.cpp',
         'ScaledFontMac.cpp',
+        'SourceSurfaceCG.cpp',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     CPP_SOURCES += [
         'DrawTargetD2D.cpp',
+        'PathD2D.cpp',
+        'ScaledFontDWrite.cpp',
         'SourceSurfaceD2D.cpp',
         'SourceSurfaceD2DTarget.cpp',
-        'PathD2D.cpp',
-        'ScaledFontDWrite.cpp',
     ]
     if CONFIG['MOZ_ENABLE_DIRECT2D1_1']:
         CPP_SOURCES += [
+            'DrawTargetD2D1.cpp',
             'RadialGradientEffectD2D1.cpp',
-            'DrawTargetD2D1.cpp',
             'SourceSurfaceD2D1.cpp'
         ]
     if CONFIG['MOZ_ENABLE_SKIA']:
         CPP_SOURCES += [
             'ScaledFontWin.cpp',
         ]
 
 if CONFIG['MOZ_ENABLE_SKIA']:
     CPP_SOURCES += [
-        'SourceSurfaceSkia.cpp',
         'DrawTargetSkia.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',
             'ImageScalingSSE2.cpp',
-            'BlurSSE2.cpp',
         ]
 
 CPP_SOURCES += [
     'Blur.cpp',
     'DrawEventRecorder.cpp',
     'DrawTargetCairo.cpp',
     'DrawTargetDual.cpp',
     'DrawTargetRecording.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',
+    'IntermTraverse.cpp',
     'Intermediate.cpp',
-    'intermOut.cpp',
-    'IntermTraverse.cpp',
     'MapLongVariableNames.cpp',
-    'parseConst.cpp',
     'ParseHelper.cpp',
     'PoolAlloc.cpp',
     'QualifierAlive.cpp',
     'RemoveTree.cpp',
     'SymbolTable.cpp',
-    'CompilerUniform.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',
@@ -104,18 +104,18 @@ else:
 
 
 # Target: 'translator_glsl'
 #   Requires: 'translator_common'
 # src/compiler:
 CPP_SOURCES += ['src/compiler/' + src for src in [
     'CodeGenGLSL.cpp',
     'OutputESSL.cpp',
+    'OutputGLSL.cpp',
     'OutputGLSLBase.cpp',
-    'OutputGLSL.cpp',
     'ShaderLang.cpp',
     'TranslatorESSL.cpp',
     'TranslatorGLSL.cpp',
     'VersionGLSL.cpp',
 ]]
 
 LIBRARY_NAME = 'angle'
 LIBXUL_LIBRARY = True
--- 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 [
+    'RefCountObject.cpp',
     'debug.cpp',
-    'RefCountObject.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',
+    'IntermTraverse.cpp',
     'Intermediate.cpp',
-    'intermOut.cpp',
-    'IntermTraverse.cpp',
     'MapLongVariableNames.cpp',
-    'parseConst.cpp',
     'ParseHelper.cpp',
     'PoolAlloc.cpp',
     'QualifierAlive.cpp',
     'RemoveTree.cpp',
     'SymbolTable.cpp',
-    'CompilerUniform.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',
@@ -90,91 +90,91 @@ else:
         '../compiler/ossource_posix.cpp',
     ]
 
 
 # Target: 'translator_hlsl'
 #   Requires: 'translator_common'
 # src/compiler:
 CPP_SOURCES += ['../compiler/' + src for src in [
-    'ShaderLang.cpp',
+    'CodeGenHLSL.cpp',
     'DetectDiscontinuity.cpp',
-    'CodeGenHLSL.cpp',
     'OutputHLSL.cpp',
+    'SearchSymbol.cpp',
+    'ShaderLang.cpp',
     'TranslatorHLSL.cpp',
     'UnfoldShortCircuit.cpp',
-    'SearchSymbol.cpp',
 ]]
 
 
 # Target: 'libGLESv2'
 #   Requires: 'translator_hlsl'
 # src/common:
 CPP_SOURCES += ['../common/' + src for src in [
+    'RefCountObject.cpp',
     'debug.cpp',
-    'RefCountObject.cpp',
 ]]
 
 # src/libGLESv2:
 CPP_SOURCES += [
-    'precompiled.cpp',
     'Buffer.cpp',
     'Context.cpp',
     'Fence.cpp',
     'Float16ToFloat32.cpp',
     'Framebuffer.cpp',
     'HandleAllocator.cpp',
-    'libGLESv2.cpp',
-    'main.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',
     'BufferStorage9.cpp',
-    'BufferStorage11.cpp',
+    'Fence11.cpp',
     'Fence9.cpp',
-    'Fence11.cpp',
     'Image.cpp',
     'Image11.cpp',
     'Image9.cpp',
     'ImageSSE2.cpp',
     'IndexBuffer.cpp',
+    'IndexBuffer11.cpp',
     'IndexBuffer9.cpp',
-    'IndexBuffer11.cpp',
     'IndexDataManager.cpp',
     'IndexRangeCache.cpp',
     'InputLayoutCache.cpp',
+    'Query11.cpp',
     'Query9.cpp',
-    'Query11.cpp',
-    'Renderer.cpp',
-    'Renderer11.cpp',
-    'renderer11_utils.cpp',
-    'Renderer9.cpp',
-    'renderer9_utils.cpp',
     'RenderStateCache.cpp',
     'RenderTarget11.cpp',
     'RenderTarget9.cpp',
-    'ShaderExecutable9.cpp',
+    'Renderer.cpp',
+    'Renderer11.cpp',
+    'Renderer9.cpp',
     'ShaderExecutable11.cpp',
+    'ShaderExecutable9.cpp',
+    'SwapChain11.cpp',
     'SwapChain9.cpp',
-    'SwapChain11.cpp',
     'TextureStorage.cpp',
     'TextureStorage11.cpp',
     'TextureStorage9.cpp',
     'VertexBuffer.cpp',
+    'VertexBuffer11.cpp',
     'VertexBuffer9.cpp',
-    'VertexBuffer11.cpp',
     'VertexDataManager.cpp',
     'VertexDeclarationCache.cpp',
+    'renderer11_utils.cpp',
+    'renderer9_utils.cpp',
 ]]
 
 LIBRARY_NAME = 'libGLESv2'
--- a/gfx/gl/moz.build
+++ b/gfx/gl/moz.build
@@ -90,29 +90,29 @@ else:
         'GLContextProvider%s.cpp' % gl_provider,
     ]
 
 CPP_SOURCES += [
     'GLContext.cpp',
     'GLContextFeatures.cpp',
     'GLContextTypes.cpp',
     'GLContextUtils.cpp',
+    'GLLibraryEGL.cpp',
     'GLLibraryLoader.cpp',
     'GLScreenBuffer.cpp',
     'GLTextureImage.cpp',
     'GfxTexturesReporter.cpp',
     'SharedSurface.cpp',
-    'GLLibraryEGL.cpp',
     'SharedSurfaceEGL.cpp',
-    'TextureImageEGL.cpp',
     'SharedSurfaceGL.cpp',
     'SurfaceFactory.cpp',
     'SurfaceStream.cpp',
+    'TextureGarbageBin.cpp',
+    'TextureImageEGL.cpp',
     'VBOArena.cpp',
-    'TextureGarbageBin.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
--- a/gfx/graphite2/src/moz.build
+++ b/gfx/graphite2/src/moz.build
@@ -26,24 +26,16 @@ if CONFIG['GNU_CC']:
     ]
 else:
     CPP_SOURCES += [
         'call_machine.cpp'
     ]
 
 # This should contain all of the _SOURCES from files.mk, except *_machine.cpp
 CPP_SOURCES += [
-    'gr_char_info.cpp',
-    'gr_face.cpp',
-    'gr_features.cpp',
-    'gr_font.cpp',
-    'gr_logging.cpp',
-    'gr_segment.cpp',
-    'gr_slot.cpp',
-    'json.cpp',
     'Bidi.cpp',
     'CachedFace.cpp',
     'CmapCache.cpp',
     'Code.cpp',
     'Face.cpp',
     'FeatureMap.cpp',
     'FileFace.cpp',
     'Font.cpp',
@@ -56,14 +48,22 @@ CPP_SOURCES += [
     '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/harfbuzz/src/moz.build
+++ b/gfx/harfbuzz/src/moz.build
@@ -29,18 +29,18 @@ EXPORTS.harfbuzz += [
     'hb-version.h',
     'hb.h',
 ]
 
 CPP_SOURCES += [
     'hb-blob.cc',
     'hb-buffer.cc',
     'hb-common.cc',
+    'hb-face.cc',
     'hb-fallback-shape.cc',
-    'hb-face.cc',
     'hb-font.cc',
     'hb-ot-layout.cc',
     'hb-ot-map.cc',
     'hb-ot-shape-complex-arabic.cc',
     'hb-ot-shape-complex-default.cc',
     'hb-ot-shape-complex-indic-table.cc',
     'hb-ot-shape-complex-indic.cc',
     'hb-ot-shape-complex-myanmar.cc',
--- a/gfx/ipc/moz.build
+++ b/gfx/ipc/moz.build
@@ -15,18 +15,18 @@ EXPORTS.mozilla.gfx += [
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     EXPORTS.mozilla.gfx += [
         'SharedDIBSurface.h',
         'SharedDIBWin.h',
     ]
     CPP_SOURCES += [
+        'SharedDIBSurface.cpp',
         'SharedDIBWin.cpp',
-        'SharedDIBSurface.cpp',
     ]
 
 CPP_SOURCES += [
     'SharedDIB.cpp',
 ]
 
 LIBXUL_LIBRARY = True
 
--- a/gfx/layers/moz.build
+++ b/gfx/layers/moz.build
@@ -52,48 +52,48 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'wind
             'd3d9/DeviceManagerD3D9.h',
             'd3d9/LayerManagerD3D9.h',
         ]
         EXPORTS.mozilla.layers += [
             'd3d9/CompositorD3D9.h',
             'd3d9/TextureD3D9.h',
         ]
         CPP_SOURCES += [
+            'd3d9/CanvasLayerD3D9.cpp',
+            'd3d9/ColorLayerD3D9.cpp',
             'd3d9/CompositorD3D9.cpp',
-            'd3d9/TextureD3D9.cpp',
-            'd3d9/LayerManagerD3D9.cpp',
-            'd3d9/ThebesLayerD3D9.cpp',
             'd3d9/ContainerLayerD3D9.cpp',
+            'd3d9/DeviceManagerD3D9.cpp',
             'd3d9/ImageLayerD3D9.cpp',
-            'd3d9/ColorLayerD3D9.cpp',
-            'd3d9/CanvasLayerD3D9.cpp',
-            'd3d9/DeviceManagerD3D9.cpp',
+            'd3d9/LayerManagerD3D9.cpp',
             'd3d9/Nv3DVUtils.cpp',
+            'd3d9/TextureD3D9.cpp',
+            'd3d9/ThebesLayerD3D9.cpp',
         ]
     if CONFIG['MOZ_ENABLE_D3D10_LAYER']:
         EXPORTS += [
             'd3d10/LayerManagerD3D10.h',
             'd3d10/ReadbackManagerD3D10.h',
         ]
         EXPORTS.mozilla.layers += [
             'd3d11/CompositorD3D11.h',
             'd3d11/TextureD3D11.h',
             'ipc/ShadowLayerUtilsD3D10.h',
         ]
         CPP_SOURCES += [
             'd3d10/CanvasLayerD3D10.cpp',
             'd3d10/ColorLayerD3D10.cpp',
-            'd3d11/CompositorD3D11.cpp',
             'd3d10/ContainerLayerD3D10.cpp',
             'd3d10/ImageLayerD3D10.cpp',
             'd3d10/LayerManagerD3D10.cpp',
             'd3d10/ReadbackManagerD3D10.cpp',
-            'ipc/ShadowLayerUtilsD3D10.cpp',
+            'd3d10/ThebesLayerD3D10.cpp',
+            'd3d11/CompositorD3D11.cpp',
             'd3d11/TextureD3D11.cpp',
-            'd3d10/ThebesLayerD3D10.cpp',
+            'ipc/ShadowLayerUtilsD3D10.cpp',
         ]
 
 EXPORTS.gfxipc += [
     'ipc/ShadowLayerUtils.h',
 ]
 
 EXPORTS.mozilla.layers += [
     'Compositor.h',
@@ -170,102 +170,102 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
 # libraries, but only Gonk is able to use it reliably because Gecko
 # has full system permissions there.
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     EXPORTS.mozilla.layers += [
         'ipc/ShadowLayerUtilsGralloc.h',
     ]
     CPP_SOURCES += [
         'GrallocImages.cpp',
+        'ipc/ShadowLayerUtilsGralloc.cpp',
         'opengl/GrallocTextureClient.cpp',
         'opengl/GrallocTextureHost.cpp',
-        'ipc/ShadowLayerUtilsGralloc.cpp',
     ]
 
 CPP_SOURCES += [
-    'composite/APZCTreeManager.cpp',
-    'composite/AsyncCompositionManager.cpp',
-    'ipc/AsyncPanZoomController.cpp',
-    'ipc/Axis.cpp',
+    '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',
-    'composite/CanvasLayerComposite.cpp',
-    'opengl/CanvasLayerOGL.cpp',
     'client/ClientCanvasLayer.cpp',
     'client/ClientColorLayer.cpp',
     'client/ClientContainerLayer.cpp',
     'client/ClientImageLayer.cpp',
     'client/ClientLayerManager.cpp',
     'client/ClientThebesLayer.cpp',
     'client/ClientTiledThebesLayer.cpp',
+    'client/CompositableClient.cpp',
+    'client/ContentClient.cpp',
+    'client/ImageClient.cpp',
+    'client/TextureClient.cpp',
+    'client/TiledContentClient.cpp',
+    'composite/APZCTreeManager.cpp',
+    'composite/AsyncCompositionManager.cpp',
+    'composite/CanvasLayerComposite.cpp',
     'composite/ColorLayerComposite.cpp',
-    'opengl/ColorLayerOGL.cpp',
-    'client/CompositableClient.cpp',
     'composite/CompositableHost.cpp',
+    'composite/ContainerLayerComposite.cpp',
+    'composite/ContentHost.cpp',
+    'composite/ImageHost.cpp',
+    'composite/ImageLayerComposite.cpp',
+    'composite/LayerManagerComposite.cpp',
+    'composite/TextureHost.cpp',
+    'composite/ThebesLayerComposite.cpp',
+    'composite/TiledContentHost.cpp',
+    'ipc/AsyncPanZoomController.cpp',
+    'ipc/Axis.cpp',
     'ipc/CompositableTransactionParent.cpp',
-    'Compositor.cpp',
-    'opengl/CompositingRenderTargetOGL.cpp',
     'ipc/CompositorChild.cpp',
     'ipc/CompositorCocoaWidgetHelper.cpp',
-    'opengl/CompositorOGL.cpp',
     'ipc/CompositorParent.cpp',
-    'composite/ContainerLayerComposite.cpp',
-    'opengl/ContainerLayerOGL.cpp',
-    'client/ContentClient.cpp',
-    'composite/ContentHost.cpp',
-    'CopyableCanvasLayer.cpp',
-    'Effects.cpp',
     'ipc/GestureEventListener.cpp',
     'ipc/ISurfaceAllocator.cpp',
     'ipc/ImageBridgeChild.cpp',
     'ipc/ImageBridgeParent.cpp',
-    'client/ImageClient.cpp',
-    'ImageContainer.cpp',
-    'ImageDataSerializer.cpp',
-    'composite/ImageHost.cpp',
-    'composite/ImageLayerComposite.cpp',
-    'opengl/ImageLayerOGL.cpp',
-    'ImageLayers.cpp',
-    'composite/LayerManagerComposite.cpp',
-    'opengl/LayerManagerOGL.cpp',
-    'opengl/LayerManagerOGLProgram.cpp',
-    'LayerSorter.cpp',
     'ipc/LayerTransactionChild.cpp',
     'ipc/LayerTransactionParent.cpp',
-    'LayerTreeInvalidation.cpp',
-    'Layers.cpp',
-    'LayersLogging.cpp',
-    'ReadbackProcessor.cpp',
-    'RenderTrace.cpp',
     'ipc/ShadowLayerChild.cpp',
     'ipc/ShadowLayerParent.cpp',
     'ipc/ShadowLayers.cpp',
     'ipc/SharedPlanarYCbCrImage.cpp',
     'ipc/SharedRGBImage.cpp',
     'ipc/TaskThrottler.cpp',
-    'client/TextureClient.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',
-    'composite/TextureHost.cpp',
     'opengl/TextureHostOGL.cpp',
     'opengl/TexturePoolOGL.cpp',
-    'ThebesLayerBuffer.cpp',
-    'composite/ThebesLayerComposite.cpp',
     'opengl/ThebesLayerOGL.cpp',
-    'client/TiledContentClient.cpp',
-    'composite/TiledContentHost.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
@@ -148,89 +148,89 @@ EXPORTS.skia += [
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     EXPORTS.skia += [
         'include/ports/SkTypeface_mac.h',
     ]
     CPP_SOURCES += [
         'src/ports/SkFontHost_mac.cpp',
-        'src/utils/mac/SkStream_mac.cpp',
         'src/ports/SkThread_pthread.cpp',
+        'src/ports/SkTime_Unix.cpp',
         'src/utils/SkThreadUtils_pthread.cpp',
         'src/utils/SkThreadUtils_pthread_mach.cpp',
-        'src/ports/SkTime_Unix.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',
         'src/ports/SkFontHost_win.cpp',
-        'src/ports/SkFontHost_sandbox_none.cpp',
         'src/ports/SkThread_win.cpp',
+        'src/ports/SkTime_win.cpp',
         'src/utils/SkThreadUtils_win.cpp',
-        'src/ports/SkTime_win.cpp',
     ]
 elif CONFIG['MOZ_WIDGET_GTK']:
     EXPORTS.skia += [
         'include/ports/SkTypeface_cairo.h',
     ]
     CPP_SOURCES += [
+        'src/ports/SkFontHost_FreeType_common.cpp',
         'src/ports/SkFontHost_cairo.cpp',
-        'src/ports/SkFontHost_FreeType_common.cpp',
         'src/ports/SkThread_pthread.cpp',
-        'src/utils/SkThreadUtils_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_FreeType_common.cpp',
         'src/ports/SkFontHost_cairo.cpp',
-        'src/ports/SkFontHost_FreeType_common.cpp',
         'src/utils/SkOSFile.cpp',
     ]
     if CONFIG['OS_TARGET'] == 'Linux':
         EXPORTS.skia += [
             'include/ports/SkTypeface_cairo.h',
         ]
         CPP_SOURCES += [
             'src/ports/SkThread_pthread.cpp',
+            'src/ports/SkTime_Unix.cpp',
             'src/utils/SkThreadUtils_pthread.cpp',
             'src/utils/SkThreadUtils_pthread_linux.cpp',
-            'src/ports/SkTime_Unix.cpp',
         ]
 # Separate 'if' from above, since the else below applies to all != 'android'
 # toolkits.
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk'):
     EXPORTS.skia += [
         'include/ports/SkTypeface_cairo.h',
     ]
     CPP_SOURCES += [
-        'src/utils/android/ashmem.cpp',
+        'src/images/SkImageRef_ashmem.cpp',
         'src/ports/SkDebug_android.cpp',
+        'src/ports/SkFontHost_FreeType.cpp',
+        'src/ports/SkFontHost_FreeType_common.cpp',
         'src/ports/SkFontHost_cairo.cpp',
         'src/ports/SkFontHost_linux.cpp',
-        'src/ports/SkFontHost_FreeType_common.cpp',
-        'src/ports/SkFontHost_FreeType.cpp',
-        'src/images/SkImageRef_ashmem.cpp',
+        'src/ports/SkThread_pthread.cpp',
+        'src/ports/SkTime_Unix.cpp',
         'src/utils/SkOSFile.cpp',
-        'src/ports/SkTime_Unix.cpp',
-        'src/ports/SkThread_pthread.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 += [
@@ -265,242 +265,178 @@ if CONFIG['MOZ_ENABLE_SKIA_GPU']:
         'src/gpu/GrAddPathRenderers_default.cpp',
         'src/gpu/GrAllocPool.cpp',
         'src/gpu/GrAtlas.cpp',
         'src/gpu/GrBufferAllocPool.cpp',
         'src/gpu/GrCacheID.cpp',
         'src/gpu/GrClipData.cpp',
         'src/gpu/GrClipMaskCache.cpp',
         'src/gpu/GrClipMaskManager.cpp',
-        'src/gpu/effects/GrConfigConversionEffect.cpp',
         'src/gpu/GrContext.cpp',
-        'src/gpu/effects/GrConvolutionEffect.cpp',
         'src/gpu/GrDefaultPathRenderer.cpp',
+        'src/gpu/GrDrawState.cpp',
         'src/gpu/GrDrawTarget.cpp',
-        'src/gpu/GrDrawState.cpp',
         'src/gpu/GrEffect.cpp',
         'src/gpu/GrGeometryBuffer.cpp',
         'src/gpu/GrGpu.cpp',
         'src/gpu/GrGpuFactory.cpp',
         'src/gpu/GrInOrderDrawBuffer.cpp',
         'src/gpu/GrMemory.cpp',
         'src/gpu/GrMemoryPool.cpp',
         'src/gpu/GrOvalRenderer.cpp',
         'src/gpu/GrPath.cpp',
+        'src/gpu/GrPathRenderer.cpp',
         'src/gpu/GrPathRendererChain.cpp',
-        'src/gpu/GrPathRenderer.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/GrResource.cpp',
-        'src/gpu/effects/GrSimpleTextureEffect.cpp',
-        'src/gpu/effects/GrSingleTextureEffect.cpp',
+        'src/gpu/GrSWMaskHelper.cpp',
         'src/gpu/GrSoftwarePathRenderer.cpp',
+        'src/gpu/GrStencil.cpp',
         'src/gpu/GrStencilAndCoverPathRenderer.cpp',
         'src/gpu/GrStencilBuffer.cpp',
-        'src/gpu/GrStencil.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/GrTexture.cpp',
-        'src/gpu/effects/GrTextureDomainEffect.cpp',
-        'src/gpu/effects/GrTextureStripAtlas.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/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',
     ]
 
 CPP_SOURCES += [
-        'src/effects/Sk1DPathEffect.cpp',
-        'src/effects/Sk2DPathEffect.cpp',
         'src/core/Sk64.cpp',
         'src/core/SkAAClip.cpp',
         'src/core/SkAdvancedTypefaceMetrics.cpp',
         'src/core/SkAlphaRuns.cpp',
         'src/core/SkAnnotation.cpp',
-        'src/effects/SkAvoidXfermode.cpp',
-        'src/core/SkBBoxRecord.cpp',
         'src/core/SkBBoxHierarchy.cpp',
         'src/core/SkBBoxHierarchyRecord.cpp',
-        'src/utils/SkBase64.cpp',
-        'src/effects/SkBicubicImageFilter.cpp',
-        'src/utils/SkBitSet.cpp',
+        'src/core/SkBBoxRecord.cpp',
         'src/core/SkBitmap.cpp',
-        'src/effects/gradients/SkBitmapCache.cpp',
-        'src/lazy/SkBitmapFactory.cpp',
         'src/core/SkBitmapHeap.cpp',
         'src/core/SkBitmapProcShader.cpp',
         'src/core/SkBitmapProcState.cpp',
         'src/core/SkBitmapProcState_matrixProcs.cpp',
         'src/core/SkBitmapSampler.cpp',
-        'src/effects/SkBitmapSource.cpp',
-        'src/utils/SkBitmapTransformer.cpp',
         'src/core/SkBitmap_scroll.cpp',
-        'src/effects/SkBlendImageFilter.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',
         'src/core/SkBlitter_ARGB32.cpp',
         'src/core/SkBlitter_RGB16.cpp',
         'src/core/SkBlitter_Sprite.cpp',
-        'src/effects/SkBlurDrawLooper.cpp',
-        'src/effects/SkBlurImageFilter.cpp',
-        'src/effects/SkBlurMaskFilter.cpp',
-        'src/effects/SkBlurMask.cpp',
         'src/core/SkBuffer.cpp',
         'src/core/SkCanvas.cpp',
         'src/core/SkChunkAlloc.cpp',
         'src/core/SkClipStack.cpp',
         'src/core/SkColor.cpp',
         'src/core/SkColorFilter.cpp',
-        'src/effects/SkColorFilterImageFilter.cpp',
-        'src/effects/SkColorFilters.cpp',
-        'src/effects/SkColorMatrix.cpp',
-        'src/effects/SkColorMatrixFilter.cpp',
         'src/core/SkColorTable.cpp',
-        'src/effects/SkCornerPathEffect.cpp',
-        'src/effects/gradients/SkClampRange.cpp',
         'src/core/SkComposeShader.cpp',
-        'src/utils/SkCondVar.cpp',
         'src/core/SkConfig8888.cpp',
-        'src/utils/SkCountdown.cpp',
         'src/core/SkCordic.cpp',
         'src/core/SkCubicClipper.cpp',
-        'src/effects/SkDashPathEffect.cpp',
         'src/core/SkData.cpp',
-        'src/image/SkDataPixelRef.cpp',
         'src/core/SkDebug.cpp',
-        'src/utils/SkDeferredCanvas.cpp',
         'src/core/SkDeque.cpp',
         'src/core/SkDevice.cpp',
         'src/core/SkDeviceProfile.cpp',
-        'src/effects/SkDiscretePathEffect.cpp',
-        'src/effects/SkDisplacementMapEffect.cpp',
         'src/core/SkDither.cpp',
         'src/core/SkDraw.cpp',
         'src/core/SkEdge.cpp',
         'src/core/SkEdgeBuilder.cpp',
         'src/core/SkEdgeClipper.cpp',
-        'src/effects/SkEmbossMask.cpp',
-        'src/effects/SkEmbossMaskFilter.cpp',
         'src/core/SkFilterProc.cpp',
         'src/core/SkFlattenable.cpp',
         'src/core/SkFlattenableBuffers.cpp',
         'src/core/SkFloat.cpp',
         'src/core/SkFloatBits.cpp',
         'src/core/SkFontDescriptor.cpp',
         'src/core/SkFontHost.cpp',
         'src/core/SkFontStream.cpp',
         'src/core/SkGeometry.cpp',
-        'src/ports/SkGlobalInitialization_default.cpp',
         'src/core/SkGlyphCache.cpp',
-        'src/effects/gradients/SkGradientShader.cpp',
-        'src/effects/gradients/SkGradientTileProc.cpp',
         'src/core/SkGraphics.cpp',
-        'src/pipe/SkGPipeRead.cpp',
-        'src/pipe/SkGPipeWrite.cpp',
-        'src/image/SkImage.cpp',
-        'src/images/SkImages.cpp',
-        'src/image/SkImage_Codec.cpp',
-        'src/image/SkImage_Picture.cpp',
-        'src/image/SkImage_Raster.cpp',
-        'src/images/SkImageDecoder.cpp',
-        'src/images/SkImageDecoder_Factory.cpp',
         'src/core/SkImageFilter.cpp',
-        'src/effects/SkImageFilterUtils.cpp',
-        'src/image/SkImagePriv.cpp',
-        'src/images/SkImageRef.cpp',
-        'src/images/SkImageRefPool.cpp',
-        'src/images/SkImageRef_GlobalPool.cpp',
         'src/core/SkInstCnt.cpp',
-        'src/effects/SkLayerDrawLooper.cpp',
-        'src/effects/SkLayerRasterizer.cpp',
-        'src/lazy/SkLazyPixelRef.cpp',
-        'src/effects/SkLightingImageFilter.cpp',
-        'src/effects/gradients/SkLinearGradient.cpp',
         'src/core/SkLineClipper.cpp',
         'src/core/SkMallocPixelRef.cpp',
-        'src/effects/SkMagnifierImageFilter.cpp',
         'src/core/SkMask.cpp',
         'src/core/SkMaskFilter.cpp',
         'src/core/SkMaskGamma.cpp',
         'src/core/SkMath.cpp',
         'src/core/SkMatrix.cpp',
-        'src/effects/SkMatrixConvolutionImageFilter.cpp',
-        'src/ports/SkMemory_malloc.cpp',
-        'src/effects/SkMergeImageFilter.cpp',
         'src/core/SkMetaData.cpp',
-        'src/effects/SkMorphologyImageFilter.cpp',
-        'src/effects/SkOffsetImageFilter.cpp',
         'src/core/SkOrderedReadBuffer.cpp',
         'src/core/SkOrderedWriteBuffer.cpp',
-        'src/ports/SkOSFile_stdio.cpp',
-        'src/sfnt/SkOTUtils.cpp',
         'src/core/SkPackBits.cpp',
         'src/core/SkPaint.cpp',
         'src/core/SkPaintPriv.cpp',
         'src/core/SkPath.cpp',
         'src/core/SkPathEffect.cpp',
         'src/core/SkPathHeap.cpp',
         'src/core/SkPathMeasure.cpp',
         'src/core/SkPicture.cpp',
         'src/core/SkPictureFlat.cpp',
         'src/core/SkPicturePlayback.cpp',
         'src/core/SkPictureRecord.cpp',
         'src/core/SkPictureStateTree.cpp',
-        'src/utils/SkPictureUtils.cpp',
         'src/core/SkPixelRef.cpp',
-        'src/effects/SkPixelXorXfermode.cpp',
         'src/core/SkPoint.cpp',
         'src/core/SkProcSpriteBlitter.cpp',
         'src/core/SkPtrRecorder.cpp',
         'src/core/SkQuadClipper.cpp',
         'src/core/SkRRect.cpp',
-        'src/utils/SkRTConf.cpp',
         'src/core/SkRTree.cpp',
-        'src/effects/gradients/SkRadialGradient.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',
@@ -509,42 +445,106 @@ CPP_SOURCES += [
         'src/core/SkScan.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/effects/SkStippleMaskFilter.cpp',
         'src/core/SkStream.cpp',
         'src/core/SkString.cpp',
         'src/core/SkStroke.cpp',
         'src/core/SkStrokeRec.cpp',
         'src/core/SkStrokerPriv.cpp',
-        'src/image/SkSurface.cpp',
-        'src/image/SkSurface_Raster.cpp',
-        'src/image/SkSurface_Picture.cpp',
-        'src/effects/gradients/SkSweepGradient.cpp',
-        'src/effects/SkTableColorFilter.cpp',
-        'src/effects/SkTableMaskFilter.cpp',
-        'src/effects/SkTestImageFilters.cpp',
-        'src/utils/SkThreadPool.cpp',
+        'src/core/SkTLS.cpp',
+        'src/core/SkTSearch.cpp',
         'src/core/SkTileGrid.cpp',
         'src/core/SkTileGridPicture.cpp',
-        'src/core/SkTLS.cpp',
-        'src/core/SkTSearch.cpp',
-        'src/effects/gradients/SkTwoPointConicalGradient.cpp',
-        'src/effects/gradients/SkTwoPointRadialGradient.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/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',
+        'src/effects/SkBlurMask.cpp',
+        'src/effects/SkBlurMaskFilter.cpp',
+        'src/effects/SkColorFilterImageFilter.cpp',
+        'src/effects/SkColorFilters.cpp',
+        'src/effects/SkColorMatrix.cpp',
+        'src/effects/SkColorMatrixFilter.cpp',
+        'src/effects/SkCornerPathEffect.cpp',
+        'src/effects/SkDashPathEffect.cpp',
+        'src/effects/SkDiscretePathEffect.cpp',
+        'src/effects/SkDisplacementMapEffect.cpp',
+        'src/effects/SkEmbossMask.cpp',
+        'src/effects/SkEmbossMaskFilter.cpp',
+        'src/effects/SkImageFilterUtils.cpp',
+        'src/effects/SkLayerDrawLooper.cpp',
+        'src/effects/SkLayerRasterizer.cpp',
+        'src/effects/SkLightingImageFilter.cpp',
+        'src/effects/SkMagnifierImageFilter.cpp',
+        'src/effects/SkMatrixConvolutionImageFilter.cpp',
+        '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/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/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/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',
 ]
 
 if not CONFIG['INTEL_ARCHITECTURE'] and CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC']:
     SSRCS += [
         'memset.arm.S',
     ]
 
 LIBRARY_NAME = 'skia'
--- a/gfx/thebes/moz.build
+++ b/gfx/thebes/moz.build
@@ -56,83 +56,83 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'andr
     EXPORTS += [
         'gfxAndroidPlatform.h',
         'gfxFT2FontBase.h',
         'gfxFT2Fonts.h',
         'gfxPDFSurface.h',
     ]
     CPP_SOURCES += [
         'gfxAndroidPlatform.cpp',
+        'gfxFT2FontBase.cpp',
+        'gfxFT2FontList.cpp',
         'gfxFT2Fonts.cpp',
-        'gfxFT2FontBase.cpp',
         'gfxFT2Utils.cpp',
-        'gfxFT2FontList.cpp',
         'gfxPDFSurface.cpp',
         'nsUnicodeRange.cpp',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     EXPORTS += [
         'gfxAndroidPlatform.h',
         'gfxFT2FontBase.h',
         'gfxFT2Fonts.h',
         'gfxPDFSurface.h',
     ]
     CPP_SOURCES += [
         'gfxAndroidPlatform.cpp',
+        'gfxFT2FontBase.cpp',
+        'gfxFT2FontList.cpp',
         'gfxFT2Fonts.cpp',
-        'gfxFT2FontBase.cpp',
         'gfxFT2Utils.cpp',
-        'gfxFT2FontList.cpp',
         'gfxPDFSurface.cpp',
         'nsUnicodeRange.cpp',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     EXPORTS += [
         'gfxPlatformMac.h',
         'gfxQuartzImageSurface.h',
         'gfxQuartzNativeDrawing.h',
         'gfxQuartzSurface.h',
     ]
     CPP_SOURCES += [
-        'gfxQuartzSurface.cpp',
-        'gfxQuartzImageSurface.cpp',
-        'gfxPlatformMac.cpp',
+        'gfxCoreTextShaper.cpp',
         'gfxMacFont.cpp',
-        'gfxCoreTextShaper.cpp',
+        'gfxPlatformMac.cpp',
+        'gfxQuartzImageSurface.cpp',
+        'gfxQuartzNativeDrawing.cpp',
+        'gfxQuartzSurface.cpp',
         'nsUnicodeRange.cpp',
-        'gfxQuartzNativeDrawing.cpp',
     ]
 elif CONFIG['MOZ_WIDGET_GTK']:
     EXPORTS += [
         'gfxFT2FontBase.h',
         'gfxGdkNativeRenderer.h',
         'gfxPDFSurface.h',
         'gfxPSSurface.h',
         'gfxPlatformGtk.h',
     ]
 
     CPP_SOURCES += [
-        'gfxPlatformGtk.cpp',
+        'gfxFT2FontBase.cpp',
+        'gfxFT2Utils.cpp',
+        'gfxFontconfigUtils.cpp',
         'gfxGdkNativeRenderer.cpp',
         'gfxPDFSurface.cpp',
         'gfxPSSurface.cpp',
-        'gfxFontconfigUtils.cpp',
-        'gfxFT2FontBase.cpp',
-        'gfxFT2Utils.cpp',
+        'gfxPlatformGtk.cpp',
         'nsUnicodeRange.cpp',
     ]
 
     if CONFIG['MOZ_X11']:
         EXPORTS += [
             'gfxXlibNativeRenderer.h',
             'gfxXlibSurface.h',
         ]
         CPP_SOURCES += [
+            'gfxXlibNativeRenderer.cpp',
             'gfxXlibSurface.cpp',
-            'gfxXlibNativeRenderer.cpp',
         ]
 
     if CONFIG['MOZ_PANGO']:
         EXPORTS += ['gfxPangoFonts.h']
         CPP_SOURCES += [
             'gfxPangoFonts.cpp',
         ]
     else:
@@ -143,48 +143,48 @@ elif CONFIG['MOZ_WIDGET_GTK']:
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'os2':
     EXPORTS += [
         'gfxOS2Fonts.h',
         'gfxOS2Platform.h',
         'gfxOS2Surface.h',
         'gfxPDFSurface.h',
     ]
     CPP_SOURCES += [
+        'gfxFontconfigUtils.cpp',
         'gfxOS2Fonts.cpp',
         'gfxOS2Platform.cpp',
         'gfxOS2Surface.cpp',
-        'nsUnicodeRange.cpp',
-        'gfxFontconfigUtils.cpp',
-        'gfxPDFSurface.cpp'
+        'gfxPDFSurface.cpp',
+        'nsUnicodeRange.cpp'
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
     EXPORTS += [
         'gfxFT2FontBase.h',
         'gfxPDFSurface.h',
         'gfxQPainterSurface.h',
         'gfxQtNativeRenderer.h',
         'gfxQtPlatform.h',
     ]
     CPP_SOURCES += [
-        'gfxQtPlatform.cpp',
-        'gfxQPainterSurface.cpp',
         'gfxFT2FontBase.cpp',
         'gfxFT2Utils.cpp',
         'gfxFontconfigUtils.cpp',
+        'gfxPDFSurface.cpp',
+        'gfxQPainterSurface.cpp',
+        'gfxQtPlatform.cpp',
         'nsUnicodeRange.cpp',
-        'gfxPDFSurface.cpp',
     ]
 
     if CONFIG['MOZ_X11']:
         EXPORTS += [
             'gfxXlibSurface.h',
         ]
         CPP_SOURCES += [
+            'gfxQtNativeRenderer.cpp',
             'gfxXlibSurface.cpp',
-            'gfxQtNativeRenderer.cpp',
         ]
 
     if CONFIG['MOZ_PANGO']:
         EXPORTS += ['gfxPangoFonts.h']
         CPP_SOURCES += [
             'gfxPangoFonts.cpp',
         ]
     else:
@@ -200,34 +200,34 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'wi
         'gfxGDIFontList.h',
         'gfxPDFSurface.h',
         'gfxPlatformFontList.h',
         'gfxWindowsNativeDrawing.h',
         'gfxWindowsPlatform.h',
         'gfxWindowsSurface.h',
     ]
     CPP_SOURCES += [
-        'gfxWindowsPlatform.cpp',
-        'gfxWindowsSurface.cpp',
-        'gfxWindowsNativeDrawing.cpp',
-        'nsUnicodeRange.cpp',
         'gfxGDIFont.cpp',
         'gfxGDIFontList.cpp',
         'gfxGDIShaper.cpp',
+        'gfxPDFSurface.cpp',
         'gfxUniscribeShaper.cpp',
-        'gfxPDFSurface.cpp',
+        'gfxWindowsNativeDrawing.cpp',
+        'gfxWindowsPlatform.cpp',
+        'gfxWindowsSurface.cpp',
+        'nsUnicodeRange.cpp',
     ]
     if CONFIG['MOZ_ENABLE_DWRITE_FONT']:
         CPP_SOURCES += [
+            'gfxD2DSurface.cpp',
+            'gfxDWriteCommon.cpp',
+            'gfxDWriteFontList.cpp',
             'gfxDWriteFonts.cpp',
             'gfxDWriteShaper.cpp',
             'gfxDWriteTextAnalysis.cpp',
-            'gfxDWriteCommon.cpp',
-            'gfxD2DSurface.cpp',
-            'gfxDWriteFontList.cpp',
         ]
 
 # Are we targeting x86 or x64?  If so, build gfxAlphaRecoverySSE2.cpp.
 if CONFIG['INTEL_ARCHITECTURE']:
     CPP_SOURCES += [
         'gfxAlphaRecoverySSE2.cpp',
     ]
 
--- a/hal/moz.build
+++ b/hal/moz.build
@@ -43,93 +43,93 @@ elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'l
     CPP_SOURCES += [
         'linux/LinuxGamepad.cpp'
     ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
     CPP_SOURCES += [
         'android/AndroidHal.cpp',
         'android/AndroidSensor.cpp',
+        'fallback/FallbackAlarm.cpp',
         'fallback/FallbackPower.cpp',
-        'fallback/FallbackAlarm.cpp',
         'linux/LinuxMemory.cpp',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     CPP_SOURCES += [
         'gonk/GonkDiskSpaceWatcher.cpp',
         'gonk/GonkFMRadio.cpp',
         'gonk/GonkHal.cpp',
         'gonk/GonkSensor.cpp',
         'gonk/GonkSwitch.cpp',
         'gonk/UeventPoller.cpp',
+        'linux/LinuxMemory.cpp',
         'linux/LinuxPower.cpp',
-        'linux/LinuxMemory.cpp',
     ]
 elif CONFIG['OS_TARGET'] == 'Linux':
     CPP_SOURCES += [
         'fallback/FallbackAlarm.cpp',
         'fallback/FallbackScreenConfiguration.cpp',
         'fallback/FallbackSensor.cpp',
         'fallback/FallbackVibration.cpp',
+        'linux/LinuxMemory.cpp',
         'linux/LinuxPower.cpp',
-        'linux/LinuxMemory.cpp',
     ]
     if CONFIG['MOZ_ENABLE_DBUS']:
         CPP_SOURCES += [
             'linux/UPowerClient.cpp',
         ]
     else:
         CPP_SOURCES += [
             'fallback/FallbackBattery.cpp',
         ]
 elif CONFIG['OS_TARGET'] == 'WINNT':
     CPP_SOURCES += [
         'fallback/FallbackAlarm.cpp',
+        'fallback/FallbackMemory.cpp',
         'fallback/FallbackPower.cpp',
         'fallback/FallbackScreenConfiguration.cpp',
         'fallback/FallbackVibration.cpp',
         'windows/WindowsBattery.cpp',
         'windows/WindowsSensor.cpp',
-        'fallback/FallbackMemory.cpp',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     CPP_SOURCES += [
         'cocoa/CocoaBattery.cpp',
         'fallback/FallbackAlarm.cpp',
+        'fallback/FallbackMemory.cpp',
         'fallback/FallbackPower.cpp',
         'fallback/FallbackScreenConfiguration.cpp',
         'fallback/FallbackVibration.cpp',
-        'fallback/FallbackMemory.cpp',
     ]
 elif CONFIG['OS_TARGET'] in ('OpenBSD', 'NetBSD', 'FreeBSD', 'DragonFly'):
     CPP_SOURCES += [
         'fallback/FallbackAlarm.cpp',
+        'fallback/FallbackMemory.cpp',
         'fallback/FallbackPower.cpp',
         'fallback/FallbackScreenConfiguration.cpp',
         'fallback/FallbackSensor.cpp',
         'fallback/FallbackVibration.cpp',
-        'fallback/FallbackMemory.cpp',
     ]
     if CONFIG['MOZ_ENABLE_DBUS']:
         CPP_SOURCES += [
             'linux/UPowerClient.cpp',
         ]
     else:
         CPP_SOURCES += [
             'fallback/FallbackBattery.cpp',
         ]
 else:
     CPP_SOURCES += [
         'fallback/FallbackAlarm.cpp',
         'fallback/FallbackBattery.cpp',
+        'fallback/FallbackMemory.cpp',
         'fallback/FallbackPower.cpp',
         'fallback/FallbackScreenConfiguration.cpp',
         'fallback/FallbackSensor.cpp',
         'fallback/FallbackVibration.cpp',
-        'fallback/FallbackMemory.cpp',
     ]
 
 # Fallbacks for backends implemented on Gonk only.
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
     CPP_SOURCES += [
         'fallback/FallbackDiskSpaceWatcher.cpp',
         'fallback/FallbackFMRadio.cpp',
         'fallback/FallbackFactoryReset.cpp',
--- a/ipc/chromium/moz.build
+++ b/ipc/chromium/moz.build
@@ -34,76 +34,76 @@ else:
         os_bsd = 1
     else:
         os_linux = 1
 
 CPP_SOURCES += [
     'src/base/at_exit.cc',
     'src/base/base_paths.cc',
     'src/base/base_switches.cc',
-    'src/chrome/common/child_process.cc',
-    'src/chrome/common/child_process_host.cc',
-    'src/chrome/common/child_process_info.cc',
-    'src/chrome/common/child_thread.cc',
-    'src/chrome/common/chrome_counters.cc',
-    'src/chrome/common/chrome_paths.cc',
-    'src/chrome/common/chrome_switches.cc',
     'src/base/command_line.cc',
-    'src/chrome/common/debug_flags.cc',
     'src/base/debug_util.cc',
-    'src/chrome/common/env_vars.cc',
     'src/base/file_path.cc',
     'src/base/file_util.cc',
     'src/base/histogram.cc',
-    'src/chrome/common/ipc_channel_proxy.cc',
-    'src/chrome/common/ipc_logging.cc',
-    'src/chrome/common/ipc_message.cc',
-    'src/chrome/common/ipc_sync_channel.cc',
-    'src/chrome/common/ipc_sync_message.cc',
     'src/base/lazy_instance.cc',
     'src/base/lock.cc',
     'src/base/logging.cc',
     'src/base/memory_debug.cc',
     'src/base/message_loop.cc',
     'src/base/message_pump_default.cc',
-    'src/chrome/common/message_router.cc',
     'src/base/non_thread_safe.cc',
-    'src/chrome/common/notification_service.cc',
     'src/base/path_service.cc',
     'src/base/pickle.cc',
     'src/base/rand_util.cc',
     'src/base/ref_counted.cc',
     'src/base/revocable_store.cc',
     'src/base/scoped_temp_dir.cc',
     'src/base/simple_thread.cc',
     'src/base/stats_table.cc',
     'src/base/string_piece.cc',
     'src/base/string_util.cc',
     'src/base/system_monitor.cc',
-    'src/chrome/common/task_queue.cc',
     'src/base/thread.cc',
     'src/base/thread_collision_warner.cc',
     'src/base/time.cc',
     'src/base/timer.cc',
     'src/base/trace_event.cc',
     'src/base/tracked.cc',
     'src/base/tracked_objects.cc',
+    'src/chrome/common/child_process.cc',
+    'src/chrome/common/child_process_host.cc',
+    'src/chrome/common/child_process_info.cc',
+    'src/chrome/common/child_thread.cc',
+    'src/chrome/common/chrome_counters.cc',
+    'src/chrome/common/chrome_paths.cc',
+    'src/chrome/common/chrome_switches.cc',
+    'src/chrome/common/debug_flags.cc',
+    'src/chrome/common/env_vars.cc',
+    'src/chrome/common/ipc_channel_proxy.cc',
+    'src/chrome/common/ipc_logging.cc',
+    'src/chrome/common/ipc_message.cc',
+    'src/chrome/common/ipc_sync_channel.cc',
+    'src/chrome/common/ipc_sync_message.cc',
+    'src/chrome/common/message_router.cc',
+    'src/chrome/common/notification_service.cc',
+    'src/chrome/common/task_queue.cc',
 ]
 
 if os_win:
     CPP_SOURCES += [
         'src/base/base_paths_win.cc',
+        'src/base/condition_variable_win.cc',
         'src/base/cpu.cc',
-        'src/base/condition_variable_win.cc',
         'src/base/debug_util_win.cc',
         'src/base/event_recorder.cc',
         'src/base/file_util_win.cc',
         'src/base/file_version_info.cc',
+        'src/base/idle_timer.cc',
         'src/base/lock_impl_win.cc',
-        'src/base/idle_timer.cc',
         'src/base/message_pump_win.cc',
         'src/base/object_watcher.cc',
         'src/base/platform_file_win.cc',
         'src/base/platform_thread_win.cc',
         'src/base/process_util_win.cc',
         'src/base/process_win.cc',
         'src/base/rand_util_win.cc',
         'src/base/registry.cc',
@@ -112,18 +112,18 @@ if os_win:
         'src/base/sys_string_conversions_win.cc',
         'src/base/system_monitor_win.cc',
         'src/base/thread_local_storage_win.cc',
         'src/base/thread_local_win.cc',
         'src/base/time_win.cc',
         'src/base/waitable_event_watcher_win.cc',
         'src/base/waitable_event_win.cc',
         'src/base/win_util.cc',
+        'src/chrome/common/chrome_constants.cc',
         'src/chrome/common/chrome_paths_win.cc',
-        'src/chrome/common/chrome_constants.cc',
         'src/chrome/common/ipc_channel_win.cc',
         'src/chrome/common/process_watcher_win.cc',
         'src/chrome/common/transport_dib_win.cc',
     ]
 
 if os_posix:
     CPP_SOURCES += [
         'src/base/condition_variable_posix.cc',
@@ -135,18 +135,18 @@ if os_posix:
         'src/base/message_pump_libevent.cc',
         'src/base/platform_file_posix.cc',
         'src/base/platform_thread_posix.cc',
         'src/base/process_posix.cc',
         'src/base/process_util_posix.cc',
         'src/base/rand_util_posix.cc',
         'src/base/shared_memory_posix.cc',
         'src/base/string16.cc',
+        'src/base/sys_info_posix.cc',
         'src/base/system_monitor_posix.cc',
-        'src/base/sys_info_posix.cc',
         'src/base/thread_local_posix.cc',
         'src/base/thread_local_storage_posix.cc',
         'src/base/waitable_event_posix.cc',
         'src/base/waitable_event_watcher_posix.cc',
         'src/chrome/common/file_descriptor_set_posix.cc',
         'src/chrome/common/ipc_channel_posix.cc',
         'src/chrome/common/process_watcher_posix_sigchld.cc',
     ]
@@ -191,18 +191,18 @@ if os_linux:
         'src/base/time_posix.cc',
     ]
     if CONFIG['MOZ_WIDGET_GTK']:
         CPP_SOURCES += [
             'src/base/message_pump_glib.cc',
         ]
     if CONFIG['MOZ_ENABLE_QT']:
         CPP_SOURCES += [
+            'src/base/message_pump_qt.cc',
             'src/base/moc_message_pump_qt.cc',
-            'src/base/message_pump_qt.cc',
         ]
 
 if os_bsd:
     CPP_SOURCES += [
         'src/base/atomicops_internals_x86_gcc.cc',
         'src/base/time_posix.cc',
     ]
     if CONFIG['OS_ARCH'] == 'GNU_kFreeBSD':
@@ -214,18 +214,18 @@ if os_bsd:
             'src/base/process_util_bsd.cc'
         ]
     if CONFIG['MOZ_WIDGET_GTK']:
         CPP_SOURCES += [
             'src/base/message_pump_glib.cc',
         ]
     if CONFIG['MOZ_ENABLE_QT']:
         CPP_SOURCES += [
+            'src/base/message_pump_qt.cc',
             'src/base/moc_message_pump_qt.cc',
-            'src/base/message_pump_qt.cc',
         ]
 
 if CONFIG['_MSC_VER']:
     CPP_SOURCES += [
         'src/base/debug_on_start.cc',
     ]
 
 ost = CONFIG['OS_TEST']
--- a/ipc/glue/moz.build
+++ b/ipc/glue/moz.build
@@ -32,29 +32,29 @@ EXPORTS.mozilla.ipc += [
     'URIUtils.h',
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     EXPORTS.mozilla.ipc += [
         'Transport_win.h',
     ]
     CPP_SOURCES += [
+        'CrossProcessMutex_windows.cpp',
         'SharedMemory_windows.cpp',
         'Transport_win.cpp',
         'WindowsMessageLoop.cpp',
-        'CrossProcessMutex_windows.cpp',
     ]
 else:
     EXPORTS.mozilla.ipc += [
         'Transport_posix.h',
     ]
     CPP_SOURCES += [
+        'CrossProcessMutex_unimplemented.cpp',
         'SharedMemory_posix.cpp',
         'Transport_posix.cpp',
-        'CrossProcessMutex_unimplemented.cpp',
     ]
 
 # Android has its own,
 # almost-but-not-quite-compatible-with-POSIX-or-/dev/shm shared memory
 # impl.
 if CONFIG['OS_TARGET'] == 'Android':
     EXPORTS.mozilla.ipc += ['SharedMemoryBasic_android.h']
     CPP_SOURCES += [
--- a/js/src/moz.build
+++ b/js/src/moz.build
@@ -73,84 +73,48 @@ EXPORTS.js += [
     '../public/Tracer.h',
     '../public/TypeDecls.h',
     '../public/Utility.h',
     '../public/Value.h',
     '../public/Vector.h',
 ]
 
 CPP_SOURCES += [
-    'vm/ArgumentsObject.cpp',
-    'gc/Barrier.cpp',
+    'assembler/jit/ExecutableAllocator.cpp',
+    'builtin/Eval.cpp',
+    '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/TypeRepresentation.cpp',
+    'builtin/TypedObject.cpp',
+    'devtools/sharkctl.cpp',
+    'ds/LifoAlloc.cpp',
     'frontend/BytecodeCompiler.cpp',
     'frontend/BytecodeEmitter.cpp',
-    'vm/CallNonGenericMethod.cpp',
-    'vm/CharacterEncoding.cpp',
-    'vm/DateTime.cpp',
-    'vm/Debugger.cpp',
-    'builtin/Eval.cpp',
-    'assembler/jit/ExecutableAllocator.cpp',
     'frontend/FoldConstants.cpp',
-    'vm/ForkJoin.cpp',
-    'vm/GlobalObject.cpp',
-    'vm/Id.cpp',
-    'vm/Interpreter.cpp',
-    'builtin/Intl.cpp',
-    'gc/Iteration.cpp',
-    'ds/LifoAlloc.cpp',
-    'builtin/MapObject.cpp',
-    'gc/Marking.cpp',
-    'gc/Memory.cpp',
-    'vm/MemoryMetrics.cpp',
-    'builtin/Module.cpp',
-    'vm/Monitor.cpp',
     'frontend/NameFunctions.cpp',
-    'gc/Nursery.cpp',
-    'builtin/Object.cpp',
-    'vm/ObjectImpl.cpp',
-    'vm/OldDebugAPI.cpp',
-    'yarr/PageBlock.cpp',
-    'builtin/ParallelArray.cpp',
     'frontend/ParseMaps.cpp',
     'frontend/ParseNode.cpp',
     'frontend/Parser.cpp',
-    'vm/Probes.cpp',
-    'builtin/Profilers.cpp',
-    'vm/PropertyKey.cpp',
-    'vm/ProxyObject.cpp',
-    'builtin/RegExp.cpp',
-    'vm/RegExpObject.cpp',
-    'vm/RegExpStatics.cpp',
+    'frontend/TokenStream.cpp',
+    'gc/Barrier.cpp',
+    'gc/Iteration.cpp',
+    'gc/Marking.cpp',
+    'gc/Memory.cpp',
+    'gc/Nursery.cpp',
     'gc/RootMarking.cpp',
-    'vm/Runtime.cpp',
-    'vm/SPSProfiler.cpp',
-    'vm/ScopeObject.cpp',
-    'vm/SelfHosting.cpp',
-    'vm/Shape.cpp',
-    'vm/Stack.cpp',
     'gc/Statistics.cpp',
     'gc/StoreBuffer.cpp',
-    'vm/String.cpp',
-    'vm/StringBuffer.cpp',
-    'vm/StructuredClone.cpp',
-    'builtin/TestingFunctions.cpp',
-    'vm/ThreadPool.cpp',
-    'frontend/TokenStream.cpp',
     'gc/Tracer.cpp',
-    'builtin/TypeRepresentation.cpp',
-    'vm/TypedArrayObject.cpp',
-    'builtin/TypedObject.cpp',
-    'vm/Unicode.cpp',
-    'vm/Value.cpp',
     'gc/Verifier.cpp',
-    'vm/Xdr.cpp',
-    'yarr/YarrCanonicalizeUCS2.cpp',
-    'yarr/YarrInterpreter.cpp',
-    'yarr/YarrPattern.cpp',
-    'yarr/YarrSyntaxChecker.cpp',
     'gc/Zone.cpp',
     'jsalloc.cpp',
     'jsanalyze.cpp',
     'jsapi.cpp',
     'jsarray.cpp',
     'jsatom.cpp',
     'jsbool.cpp',
     'jscntxt.cpp',
@@ -166,30 +130,66 @@ CPP_SOURCES += [
     'jsiter.cpp',
     'jsmath.cpp',
     'jsnativestack.cpp',
     'jsnum.cpp',
     'jsobj.cpp',
     'json.cpp',
     'jsonparser.cpp',
     'jsopcode.cpp',
-    'perf/jsperf.cpp',
     'jsprf.cpp',
     'jspropertytree.cpp',
     'jsproxy.cpp',
     'jsreflect.cpp',
     'jsscript.cpp',
     'jsstr.cpp',
     'jsutil.cpp',
     'jswatchpoint.cpp',
     'jsweakmap.cpp',
     'jsworkers.cpp',
     'jswrapper.cpp',
+    'perf/jsperf.cpp',
     'prmjtime.cpp',
-    'devtools/sharkctl.cpp',
+    'vm/ArgumentsObject.cpp',
+    'vm/CallNonGenericMethod.cpp',
+    'vm/CharacterEncoding.cpp',
+    'vm/DateTime.cpp',
+    'vm/Debugger.cpp',
+    'vm/ForkJoin.cpp',
+    'vm/GlobalObject.cpp',
+    'vm/Id.cpp',
+    'vm/Interpreter.cpp',
+    'vm/MemoryMetrics.cpp',
+    'vm/Monitor.cpp',
+    '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/Stack.cpp',
+    'vm/String.cpp',
+    'vm/StringBuffer.cpp',
+    'vm/StructuredClone.cpp',
+    'vm/ThreadPool.cpp',
+    'vm/TypedArrayObject.cpp',
+    'vm/Unicode.cpp',
+    'vm/Value.cpp',
+    'vm/Xdr.cpp',
+    'yarr/PageBlock.cpp',
+    'yarr/YarrCanonicalizeUCS2.cpp',
+    'yarr/YarrInterpreter.cpp',
+    'yarr/YarrPattern.cpp',
+    'yarr/YarrSyntaxChecker.cpp',
 ]
 
 if CONFIG['MOZ_INSTRUMENTS']:
     CPP_SOURCES += [
         'devtools/Instruments.cpp',
     ]
 
 if CONFIG['ENABLE_TRACE_LOGGING']:
@@ -202,61 +202,61 @@ if CONFIG['ENABLE_ION']:
         'jit/AliasAnalysis.cpp',
         'jit/AsmJS.cpp',
         'jit/AsmJSLink.cpp',
         'jit/AsmJSModule.cpp',
         'jit/AsmJSSignalHandlers.cpp',
         'jit/BacktrackingAllocator.cpp',
         'jit/Bailouts.cpp',
         'jit/BaselineBailouts.cpp',
-        'jit/shared/BaselineCompiler-shared.cpp',
         'jit/BaselineCompiler.cpp',
         'jit/BaselineFrame.cpp',
         'jit/BaselineFrameInfo.cpp',
         'jit/BaselineIC.cpp',
         'jit/BaselineInspector.cpp',
         'jit/BaselineJIT.cpp',
         'jit/BitSet.cpp',
         'jit/BytecodeAnalysis.cpp',
         'jit/C1Spewer.cpp',
-        'jit/shared/CodeGenerator-shared.cpp',
         'jit/CodeGenerator.cpp',
         'jit/EdgeCaseAnalysis.cpp',
         'jit/EffectiveAddressAnalysis.cpp',
         'jit/Ion.cpp',
         'jit/IonAnalysis.cpp',
         'jit/IonBuilder.cpp',
         'jit/IonCaches.cpp',
         'jit/IonFrames.cpp',
         'jit/IonMacroAssembler.cpp',
         'jit/IonSpewer.cpp',
         'jit/JSONSpewer.cpp',
-        'jit/PerfSpewer.cpp',
         'jit/LICM.cpp',
         'jit/LIR.cpp',
         'jit/LinearScan.cpp',
         'jit/LiveRangeAllocator.cpp',
-        'jit/shared/Lowering-shared.cpp',
         'jit/Lowering.cpp',
         'jit/MCallOptimize.cpp',
         'jit/MIR.cpp',
         'jit/MIRGraph.cpp',
         'jit/MoveResolver.cpp',
+        'jit/ParallelFunctions.cpp',
         'jit/ParallelSafetyAnalysis.cpp',
-        'jit/ParallelFunctions.cpp',
+        'jit/PerfSpewer.cpp',
         'jit/RangeAnalysis.cpp',
         'jit/RegisterAllocator.cpp',
         'jit/Safepoints.cpp',
         'jit/Snapshots.cpp',
         'jit/StupidAllocator.cpp',
         'jit/TypePolicy.cpp',
         'jit/TypeRepresentationSet.cpp',
         'jit/UnreachableCodeElimination.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/src/moz.build
+++ b/js/xpconnect/src/moz.build
@@ -11,16 +11,17 @@ EXPORTS += [
     'XPCJSMemoryReporter.h',
     'nsCxPusher.h',
     'qsObjectHelper.h',
     'xpcObjectHelper.h',
     'xpcpublic.h',
 ]
 
 CPP_SOURCES += [
+    'Sandbox.cpp',
     'XPCCallContext.cpp',
     'XPCComponents.cpp',
     'XPCContext.cpp',
     'XPCConvert.cpp',
     'XPCDebug.cpp',
     'XPCException.cpp',
     'XPCJSContextStack.cpp',
     'XPCJSID.cpp',
@@ -42,17 +43,16 @@ CPP_SOURCES += [
     'XPCWrappedNativeInfo.cpp',
     'XPCWrappedNativeJSOps.cpp',
     'XPCWrappedNativeProto.cpp',
     'XPCWrappedNativeScope.cpp',
     'XPCWrapper.cpp',
     'nsCxPusher.cpp',
     'nsScriptError.cpp',
     'nsXPConnect.cpp',
-    'Sandbox.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
--- a/layout/base/moz.build
+++ b/layout/base/moz.build
@@ -7,18 +7,18 @@
 TEST_DIRS += ['tests']
 
 XPIDL_SOURCES += [
     'nsIStyleSheetService.idl',
 ]
 
 if CONFIG['IBMBIDI']:
     CPP_SOURCES += [
+        'nsBidi.cpp',
         'nsBidiPresUtils.cpp',
-        'nsBidi.cpp',
     ]
 
 if CONFIG['MOZ_DEBUG']:
     CPP_SOURCES += [
         'nsAutoLayoutPhase.cpp',
     ]
 
 XPIDL_MODULE = 'layout_base'
--- a/layout/xul/base/src/moz.build
+++ b/layout/xul/base/src/moz.build
@@ -22,39 +22,39 @@ CPP_SOURCES += [
     'nsSprocketLayout.cpp',
     'nsStackFrame.cpp',
     'nsStackLayout.cpp',
     'nsXULTooltipListener.cpp',
 ]
 
 if CONFIG['MOZ_XUL']:
     CPP_SOURCES += [
-        'nsScrollBoxObject.cpp',
         'nsContainerBoxObject.cpp',
-        'nsMenuBoxObject.cpp',
-        'nsPopupBoxObject.cpp',
-        'nsListBoxObject.cpp',
+        'nsDeckFrame.cpp',
+        'nsDocElementBoxFrame.cpp',
+        'nsGroupBoxFrame.cpp',
         'nsImageBoxFrame.cpp',
-        'nsDocElementBoxFrame.cpp',
         'nsLeafBoxFrame.cpp',
-        'nsTextBoxFrame.cpp',
-        'nsGroupBoxFrame.cpp',
-        'nsSplitterFrame.cpp',
-        'nsDeckFrame.cpp',
-        'nsProgressMeterFrame.cpp',
-        'nsMenuPopupFrame.cpp',
-        'nsMenuFrame.cpp',
+        'nsListBoxBodyFrame.cpp',
+        'nsListBoxLayout.cpp',
+        'nsListBoxObject.cpp',
+        'nsListItemFrame.cpp',
         'nsMenuBarFrame.cpp',
         'nsMenuBarListener.cpp',
+        'nsMenuBoxObject.cpp',
+        'nsMenuFrame.cpp',
+        'nsMenuPopupFrame.cpp',
+        'nsPopupBoxObject.cpp',
         'nsPopupSetFrame.cpp',
-        'nsTitleBarFrame.cpp',
+        'nsProgressMeterFrame.cpp',
         'nsResizerFrame.cpp',
-        'nsListBoxBodyFrame.cpp',
-        'nsListItemFrame.cpp',
-        'nsListBoxLayout.cpp',
+        'nsScrollBoxObject.cpp',
+        'nsSplitterFrame.cpp',
+        'nsTextBoxFrame.cpp',
+        'nsTitleBarFrame.cpp',
         'nsXULLabelFrame.cpp',
         'nsXULPopupManager.cpp',
     ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
--- a/media/libtheora/lib/moz.build
+++ b/media/libtheora/lib/moz.build
@@ -5,22 +5,22 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'theora'
 
 LIBRARY_NAME = 'theora'
 
 if CONFIG['OS_TEST'] == 'arm' and CONFIG['GNU_AS']:
     asm_suffix = CONFIG['ASM_SUFFIX']
-    ASFILES += [
-        'armbits-gnu.%s' % asm_suffix,
-        'armfrag-gnu.%s' % asm_suffix,
-        'armidct-gnu.%s' % asm_suffix,
-        'armloop-gnu.%s' % asm_suffix,
-    ]
+    ASFILES += [ '%s.%s' % (f, asm_suffix) for f in [
+        'armbits-gnu',
+        'armfrag-gnu',
+        'armidct-gnu',
+        'armloop-gnu',
+    ]]
 
 CSRCS += [
     'apiwrapper.c',
     'bitpack.c',
     'decapiwrapper.c',
     'decinfo.c',
     'decode.c',
     'dequant.c',
--- a/media/mtransport/objs.mozbuild
+++ b/media/mtransport/objs.mozbuild
@@ -1,27 +1,27 @@
 # -*- 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/.
 
 mtransport_lcppsrcs = [
     'dtlsidentity.cpp',
+    'nr_socket_prsock.cpp',
+    'nr_timer.cpp',
     'nricectx.cpp',
     'nricemediastream.cpp',
+    'nriceresolver.cpp',
     'nriceresolverfake.cpp',
-    'nriceresolver.cpp',
     'nrinterfaceprioritizer.cpp',
-    'nr_socket_prsock.cpp',
-    'nr_timer.cpp',
     'transportflow.cpp',
     'transportlayer.cpp',
+    'transportlayerdtls.cpp',
     'transportlayerice.cpp',
-    'transportlayerdtls.cpp',
     'transportlayerlog.cpp',
     'transportlayerloopback.cpp',
     'transportlayerprsock.cpp',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     mtransport_lcppsrcs += [
         'gonk_addrs.cpp',
--- a/memory/replace/dmd/moz.build
+++ b/memory/replace/dmd/moz.build
@@ -6,19 +6,19 @@
 
 MODULE = 'dmd'
 
 EXPORTS += [
     'DMD.h',
 ]
 
 CPP_SOURCES += [
-    'DMD.cpp',
     '../../../mfbt/HashFunctions.cpp',
     '../../../xpcom/base/nsStackWalk.cpp',
+    'DMD.cpp',
 ]
 
 CSRCS += [
     '../../../nsprpub/lib/libc/src/strcpy.c',
 ]
 
 LIBRARY_NAME = 'dmd'
 
--- a/mozglue/tests/moz.build
+++ b/mozglue/tests/moz.build
@@ -3,14 +3,14 @@
 # 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/.
 
 NO_DIST_INSTALL = True
 
 if CONFIG['MOZ_LINKER']:
     CPP_SOURCES += [
+        'ShowSSEConfig.cpp',
         'TestZip.cpp',
-        'ShowSSEConfig.cpp',
     ]
     SIMPLE_PROGRAMS += [
         'TestZip' + CONFIG['BIN_SUFFIX'],
     ]
--- a/netwerk/base/src/moz.build
+++ b/netwerk/base/src/moz.build
@@ -22,16 +22,17 @@ 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',
@@ -69,28 +70,27 @@ CPP_SOURCES += [
     'nsSyncStreamListener.cpp',
     'nsTemporaryFileInputStream.cpp',
     'nsTransportUtils.cpp',
     'nsUDPServerSocket.cpp',
     'nsURIChecker.cpp',
     'nsURLHelper.cpp',
     'nsURLParsers.cpp',
     'nsUnicharStreamLoader.cpp',
-    'StreamingProtocolService.cpp',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'os2':
     CPP_SOURCES += [
         'nsURLHelperOS2.cpp',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     CPP_SOURCES += [
-        'nsURLHelperWin.cpp',
+        'nsAutodialWin.cpp',
         'nsNativeConnectionHelper.cpp',
-        'nsAutodialWin.cpp',
+        'nsURLHelperWin.cpp',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     CPP_SOURCES += [
         'nsURLHelperOSX.cpp',
     ]
 else:
     CPP_SOURCES += [
         'nsURLHelperUnix.cpp',
--- a/netwerk/cache2/moz.build
+++ b/netwerk/cache2/moz.build
@@ -23,19 +23,19 @@ EXPORTS += [
 ]
 
 CPP_SOURCES += [
     'AppCacheStorage.cpp',
     'CacheEntriesEnumerator.cpp',
     'CacheEntry.cpp',
     'CacheFile.cpp',
     'CacheFileChunk.cpp',
-    'CacheFileMetadata.cpp',
+    'CacheFileIOManager.cpp',
     'CacheFileInputStream.cpp',
-    'CacheFileIOManager.cpp',
+    'CacheFileMetadata.cpp',
     'CacheFileOutputStream.cpp',
     'CacheHashUtils.cpp',
     'CacheIOThread.cpp',
     'CacheLog.cpp',
     'CacheObserver.cpp',
     'CacheStorage.cpp',
     'CacheStorageService.cpp',
     'OldWrappers.cpp',
--- a/netwerk/cookie/moz.build
+++ b/netwerk/cookie/moz.build
@@ -24,20 +24,20 @@ if CONFIG['NECKO_COOKIES']:
 
     LIBRARY_NAME = 'neckocookie_s'
 
     EXPORTS.mozilla.net = [
         'CookieServiceParent.h',
         'CookieServiceChild.h',
     ]
     CPP_SOURCES += [
+        'CookieServiceChild.cpp',
+        'CookieServiceParent.cpp',
         'nsCookie.cpp',
         'nsCookieService.cpp',
-        'CookieServiceParent.cpp',
-        'CookieServiceChild.cpp',
     ]
 
 if CONFIG['NECKO_COOKIES']:
     XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
 
 # FIXME/bug 575918: out-of-process xpcshell is broken on OS X
 if CONFIG['NECKO_COOKIES'] and CONFIG['OS_ARCH'] != 'Darwin':
     XPCSHELL_TESTS_MANIFESTS += ['test/unit_ipc/xpcshell.ini']
--- a/python/mozbuild/mozbuild/frontend/sandbox_symbols.py
+++ b/python/mozbuild/mozbuild/frontend/sandbox_symbols.py
@@ -397,17 +397,17 @@ VARIABLES = {
     'PROGRAM' : (unicode, unicode, "",
         """Compiled executable name.
 
         If the configuration token ``BIN_SUFFIX`` is set, its value will be
         automatically appended to ``PROGRAM``. If ``PROGRAM`` already ends with
         ``BIN_SUFFIX``, ``PROGRAM`` will remain unchanged.
         """, 'binaries'),
 
-    'CPP_SOURCES': (list, list, [],
+    'CPP_SOURCES': (StrictOrderingOnAppendList, list, [],
         """C++ source file list.
 
         This is a list of C++ files to be compiled. Entries must be files that
         exist. These generally have ``.cpp``, ``.cc``, or ``.cxx`` extensions.
         """, 'compile'),
 
     'NO_DIST_INSTALL': (bool, bool, False,
         """Disable installing certain files into the distribution directory.
--- a/security/manager/ssl/src/moz.build
+++ b/security/manager/ssl/src/moz.build
@@ -16,66 +16,66 @@ EXPORTS += [
 EXPORTS.mozilla += [
     'PublicSSL.h',
 ]
 
 CPP_SOURCES += [
     'CertVerifier.cpp',
     'CryptoTask.cpp',
     'JARSignatureVerification.cpp',
-    'nsCertificatePrincipal.cpp',
+    'NSSErrorsService.cpp',
+    'PSMContentListener.cpp',
+    'PSMRunnable.cpp',
+    'SSLServerCertVerification.cpp',
+    'SharedSSLState.cpp',
+    'TransportSecurityInfo.cpp',
+    'nsCMS.cpp',
+    'nsCMSSecureMessage.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',
+    'nsPSMBackgroundThread.cpp',
     'nsProtectedAuthThread.cpp',
-    'nsPSMBackgroundThread.cpp',
     'nsRandomGenerator.cpp',
     'nsRecentBadCerts.cpp',
     'nsSDR.cpp',
-    'NSSErrorsService.cpp',
-    'nsSSLSocketProvider.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/toolkit/components/places/moz.build
+++ b/toolkit/components/places/moz.build
@@ -35,32 +35,32 @@ if CONFIG['MOZ_PLACES']:
     ]
 
     EXPORTS.mozilla.places = [
         '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',
-        'nsNavBookmarks.cpp',
-        'nsMaybeWeakPtr.cpp',
         'nsPlacesModule.cpp',
-        'SQLFunctions.cpp',
-        'Helpers.cpp',
-        'History.cpp',
-        'AsyncFaviconHelpers.cpp',
-        'PlaceInfo.cpp',
-        'VisitInfo.cpp',
-        'Database.cpp',
     ]
 
     LOCAL_INCLUDES += [
         '../build',
     ]
 
     EXTRA_JS_MODULES = [
         'BookmarkJSONUtils.jsm',
--- a/toolkit/components/protobuf/moz.build
+++ b/toolkit/components/protobuf/moz.build
@@ -28,22 +28,22 @@ EXPORTS.protobuf.google.protobuf.io += [
     'google/protobuf/io/coded_stream_inl.h',
     'google/protobuf/io/zero_copy_stream.h',
     'google/protobuf/io/zero_copy_stream_impl.h',
     'google/protobuf/io/zero_copy_stream_impl_lite.h',
     'google/protobuf/package_info.h',
 ]
 
 CPP_SOURCES += [
-    'google/protobuf/io/coded_stream.cc',
-    'google/protobuf/stubs/common.cc',
     'google/protobuf/extension_set.cc',
     'google/protobuf/generated_message_util.cc',
-    'google/protobuf/message_lite.cc',
-    'google/protobuf/stubs/once.cc',
-    'google/protobuf/repeated_field.cc',
-    'google/protobuf/wire_format_lite.cc',
+    'google/protobuf/io/coded_stream.cc',
     'google/protobuf/io/zero_copy_stream.cc',
     'google/protobuf/io/zero_copy_stream_impl_lite.cc',
+    'google/protobuf/message_lite.cc',
+    'google/protobuf/repeated_field.cc',
+    'google/protobuf/stubs/common.cc',
+    'google/protobuf/stubs/once.cc',
+    'google/protobuf/wire_format_lite.cc',
 ]
 
 LIBRARY_NAME = 'protobuf_s'
 
--- a/toolkit/crashreporter/client/moz.build
+++ b/toolkit/crashreporter/client/moz.build
@@ -26,16 +26,16 @@ elif CONFIG['OS_ARCH'] == 'SunOS':
     CPP_SOURCES += [
         'crashreporter_linux.cpp',
         'crashreporter_unix.cpp',
     ]
 
 if CONFIG['MOZ_ENABLE_GTK']:
     CPP_SOURCES += [
         'crashreporter_gtk_common.cpp',
-        'crashreporter_unix_common.cpp',
-        'crashreporter_linux.cpp'
+        'crashreporter_linux.cpp',
+        'crashreporter_unix_common.cpp'
         ]
 
 if CONFIG['OS_ARCH'] == 'Darwin':
     CMMSRCS += [
         'crashreporter_osx.mm',
     ]
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/moz.build
+++ b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/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 = 'handler'
 
 CPP_SOURCES += [
+    '../log/log.cc',
     'exception_handler.cc',
-    '../log/log.cc',
     'minidump_descriptor.cc',
 ]
 
 LIBRARY_NAME = 'exception_handler_s'
 
 XPI_NAME = 'crashreporter'
--- a/toolkit/crashreporter/google-breakpad/src/common/moz.build
+++ b/toolkit/crashreporter/google-breakpad/src/common/moz.build
@@ -18,41 +18,41 @@ CPP_SOURCES += [
     'module.cc',
     'pathname_stripper.cc',
     'string_conversion.cc',
     'unique_string.cc',
 ]
 
 if CONFIG['OS_TARGET'] != 'WINNT':
     CPP_SOURCES += [
-        'md5.cc',
-        'dwarf/bytereader.cc',
-        'dwarf_cfi_to_module.cc',
-        'dwarf/dwarf2reader.cc',
-        'dwarf_cu_to_module.cc',
-        'language.cc',
-        'dwarf/dwarf2diehandler.cc',
-        'dwarf_line_to_module.cc',
         'arm_ex_reader.cc',
         'arm_ex_to_module.cc',
+        'dwarf/bytereader.cc',
+        'dwarf/dwarf2diehandler.cc',
+        'dwarf/dwarf2reader.cc',
+        'dwarf_cfi_to_module.cc',
+        'dwarf_cu_to_module.cc',
+        'dwarf_line_to_module.cc',
+        'language.cc',
+        'md5.cc',
     ]
 
 if CONFIG['OS_ARCH'] == 'Linux':
     CPP_SOURCES += [
         'linux/dump_symbols.cc',
         'linux/elf_symbols_to_module.cc',
     ]
 
 if CONFIG['OS_TARGET'] == 'Android':
     pass
 else:
     if CONFIG['OS_TARGET'] != 'WINNT':
         CPP_SOURCES += [
+            'stabs_reader.cc',
             'stabs_to_module.cc',
-            'stabs_reader.cc',
         ]
 
 if CONFIG['OS_TARGET'] != 'WINNT' and CONFIG['MOZ_CRASHREPORTER']:
     HOST_CSRCS += CSRCS
     HOST_LIBRARY_NAME = 'host_breakpad_common_s'
     HOST_CPPSRCS += [
         'arm_ex_reader.cc',
         'arm_ex_to_module.cc',
--- a/toolkit/crashreporter/moz.build
+++ b/toolkit/crashreporter/moz.build
@@ -46,18 +46,18 @@ elif CONFIG['OS_ARCH'] == 'SunOS':
         'google-breakpad/src/tools/solaris/dump_syms',
     ]
 
 DIRS += ['client']
 
 if CONFIG['MOZ_CRASHREPORTER_INJECTOR']:
     DIRS += ['injector']
     CPP_SOURCES += [
+        'InjectCrashReporter.cpp',
         'LoadLibraryRemote.cpp',
-        'InjectCrashReporter.cpp',
     ]
 
 TEST_TOOL_DIRS += ['test']
 
 MODULE = 'crashreporter'
 
 EXPORTS += [
     'nsExceptionHandler.h',
--- a/toolkit/crashreporter/test/moz.build
+++ b/toolkit/crashreporter/test/moz.build
@@ -5,21 +5,21 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'crashreporter_test'
 NO_DIST_INSTALL = True
 
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini', 'unit_ipc/xpcshell.ini']
 
 CPP_SOURCES += [
+    '../google-breakpad/src/common/logging.cc',
+    '../google-breakpad/src/common/pathname_stripper.cc',
     '../google-breakpad/src/processor/basic_code_modules.cc',
+    '../google-breakpad/src/processor/minidump.cc',
     'dumputils.cpp',
-    '../google-breakpad/src/common/logging.cc',
-    '../google-breakpad/src/processor/minidump.cc',
     'nsTestCrasher.cpp',
-    '../google-breakpad/src/common/pathname_stripper.cc',
 ]
 
 LIBRARY_NAME = 'testcrasher'
 
 EXTRA_JS_MODULES += [
     'CrashTestUtils.jsm',
 ]
--- a/toolkit/mozapps/update/common/moz.build
+++ b/toolkit/mozapps/update/common/moz.build
@@ -15,19 +15,19 @@ EXPORTS += [
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     EXPORTS += [
         'pathhash.h',
         'uachelper.h',
         'updatehelper.cpp',
         'updatehelper.h',
     ]
     CPP_SOURCES += [
-        'updatehelper.cpp',
+        'pathhash.cpp',
         'uachelper.cpp',
-        'pathhash.cpp',
+        'updatehelper.cpp',
     ]
 
 CPP_SOURCES += [
     'readstrings.cpp',
     'updatelogging.cpp',
 ]
 
 LIBRARY_NAME = 'updatecommon'
--- a/toolkit/mozapps/update/updater/moz.build
+++ b/toolkit/mozapps/update/updater/moz.build
@@ -27,18 +27,18 @@ if CONFIG['MOZ_ENABLE_GTK']:
         'progressui_gtk.cpp',
     ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     have_progressui = 1
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     have_progressui = 1
     CPP_SOURCES += [
+        'automounter_gonk.cpp',
         'progressui_gonk.cpp',
-        'automounter_gonk.cpp',
     ]
 
 if have_progressui == 0:
     CPP_SOURCES += [
         'progressui_null.cpp',
     ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
--- a/toolkit/profile/moz.build
+++ b/toolkit/profile/moz.build
@@ -11,19 +11,20 @@ XPIDL_SOURCES += [
     'nsIToolkitProfile.idl',
     'nsIToolkitProfileService.idl',
 ]
 
 XPIDL_MODULE = 'toolkitprofile'
 
 MODULE = 'xulapp'
 
+CPP_SOURCES += [ TOPSRCDIR + '/profile/dirserviceprovider/src/nsProfileLock.cpp' ]
+
 CPP_SOURCES += [
-    TOPSRCDIR + '/profile/dirserviceprovider/src/nsProfileLock.cpp',
-    'nsToolkitProfileService.cpp',
+    'nsToolkitProfileService.cpp'
 ]
 
 LIBRARY_NAME = 'profile_s'
 
 LIBXUL_LIBRARY = True
 
 LOCAL_INCLUDES += [
     '../xre',
--- a/tools/profiler/moz.build
+++ b/tools/profiler/moz.build
@@ -22,56 +22,56 @@ if CONFIG['MOZ_ENABLE_PROFILER_SPS']:
         'ProfilerMarkers.h',
         'PseudoStack.h',
         'shared-libraries.h',
     ]
     EXTRA_JS_MODULES = [
         'Profiler.jsm',
     ]
     CPP_SOURCES += [
-        'platform.cpp',
-        'nsProfilerFactory.cpp',
-        'nsProfiler.cpp',
-        'TableTicker.cpp',
-        'SaveProfileTask.cpp',
         'BreakpadSampler.cpp',
-        'UnwinderThread2.cpp',
-        'ProfileEntry.cpp',
-        'local_debug_info_symbolizer.cc',
+        'IOInterposer.cpp',
+        'JSCustomObjectBuilder.cpp',
         'JSObjectBuilder.cpp',
-        'JSCustomObjectBuilder.cpp',
-        'IOInterposer.cpp',
         'NSPRInterposer.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',
-            'platform-linux.cc',
         ]
         if CONFIG['CPU_ARCH'] == 'arm':
             CPP_SOURCES += [
                 'EHABIStackWalk.cpp',
             ]
     elif CONFIG['OS_TARGET'] == 'Darwin':
         CPP_SOURCES += [
+            'platform-macos.cc',
             'shared-libraries-macos.cc',
-            'platform-macos.cc',
         ]
         CMMSRCS += [
             'shim_mac_dump_syms.mm',
         ]
     elif CONFIG['OS_TARGET'] == 'WINNT':
         CPP_SOURCES += [
+            'platform-win32.cc',
             'shared-libraries-win32.cc',
-            'platform-win32.cc',
         ]
 
     LOCAL_INCLUDES += [
         '/ipc/chromium/src',
         '/mozglue/linker',
         '/toolkit/crashreporter/google-breakpad/src',
     ]
 
--- a/uriloader/exthandler/moz.build
+++ b/uriloader/exthandler/moz.build
@@ -78,20 +78,20 @@ else:
 
 if CONFIG['MOZ_ENABLE_GTK']:
     CPP_SOURCES += [
         'unix/nsGNOMERegistry.cpp',
         'unix/nsMIMEInfoUnix.cpp',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
     CPP_SOURCES += [
-        'android/nsMIMEInfoAndroid.cpp',
         'android/nsAndroidHandlerApp.cpp',
         'android/nsExternalSharingAppService.cpp',
         'android/nsExternalURLHandlerService.cpp',
+        'android/nsMIMEInfoAndroid.cpp',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
     CPP_SOURCES += [
         'unix/nsGNOMERegistry.cpp',
         'unix/nsMIMEInfoUnix.cpp',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     CPP_SOURCES += [
--- a/widget/gonk/libdisplay/moz.build
+++ b/widget/gonk/libdisplay/moz.build
@@ -23,18 +23,18 @@ CPP_SOURCES += [
 if CONFIG['ANDROID_VERSION'] >= '18':
     CPP_SOURCES += [
         'FramebufferSurface.cpp',
         'GonkDisplayJB.cpp',
     ]
 elif CONFIG['ANDROID_VERSION'] == '17':
     CPP_SOURCES += [
         'FramebufferSurface.cpp',
+        'GonkDisplayJB.cpp',
         'GraphicBufferAlloc.cpp',
-        'GonkDisplayJB.cpp',
     ]
 elif CONFIG['ANDROID_VERSION'] == '15':
     CPP_SOURCES += [
         'GonkDisplayICS.cpp'
     ]
 else:
     error('Unsupported platform version: %s' % (CONFIG['ANDROID_VERSION']))
 
--- a/widget/gonk/moz.build
+++ b/widget/gonk/moz.build
@@ -42,26 +42,26 @@ CPP_SOURCES += ['libui/' + src for src i
     'VelocityControl.cpp',
     'VelocityTracker.cpp',
     'VirtualKeyMap.cpp',
 ]]
 
 CPP_SOURCES += [
     'Framebuffer.cpp',
     'GfxInfo.cpp',
+    'GonkMemoryPressureMonitoring.cpp',
+    'HwcComposer2D.cpp',
     'HwcUtils.cpp',
-    'GonkMemoryPressureMonitoring.cpp',
     'OrientationObserver.cpp',
     'ProcessOrientation.cpp',
     'nsAppShell.cpp',
     'nsIdleServiceGonk.cpp',
     'nsLookAndFeel.cpp',
     'nsWidgetFactory.cpp',
-    'nsWindow.cpp',
-    'HwcComposer2D.cpp'
+    'nsWindow.cpp'
 ]
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'widget_gonk'
 
 EXPORT_LIBRARY = True
 
--- a/widget/gonk/nativewindow/moz.build
+++ b/widget/gonk/nativewindow/moz.build
@@ -34,18 +34,18 @@ elif CONFIG['ANDROID_VERSION'] == '15':
         'GonkNativeWindowICS.h',
     ]
 
 if CONFIG['MOZ_B2G_CAMERA'] or CONFIG['MOZ_OMX_DECODER']:
     if CONFIG['ANDROID_VERSION'] in ('17', '18'):
         CPP_SOURCES += [
             'GonkBufferQueue.cpp',
             'GonkConsumerBase.cpp',
+            'GonkNativeWindowClientJB.cpp',
             'GonkNativeWindowJB.cpp',
-            'GonkNativeWindowClientJB.cpp',
         ]
     elif CONFIG['ANDROID_VERSION'] == '15':
         CPP_SOURCES += [
             'GonkNativeWindowClientICS.cpp',
             'GonkNativeWindowICS.cpp',
         ]
 
 FAIL_ON_WARNINGS = True
--- a/widget/gtk/moz.build
+++ b/widget/gtk/moz.build
@@ -39,23 +39,23 @@ CPP_SOURCES += [
 
 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',
-        'nsPrintDialogGTK.cpp',
         'nsPrintSettingsGTK.cpp',
-        'nsCUPSShim.cpp',
-        'nsPaperPS.cpp',
-        'nsPSPrinters.cpp',
     ]
 
 if CONFIG['MOZ_X11']:
     CPP_SOURCES += [
         'nsClipboard.cpp',
         'nsDragService.cpp',
     ]
 
--- a/widget/windows/moz.build
+++ b/widget/windows/moz.build
@@ -68,19 +68,19 @@ CPP_SOURCES += [
 
 if CONFIG['MOZ_CRASHREPORTER']:
     CPP_SOURCES += [
         'LSPAnnotator.cpp',
     ]
 
 if CONFIG['NS_PRINTING']:
     CPP_SOURCES += [
+        'nsDeviceContextSpecWin.cpp',
         'nsPrintOptionsWin.cpp',
         'nsPrintSettingsWin.cpp',
-        'nsDeviceContextSpecWin.cpp',
     ]
 
 if CONFIG['NS_ENABLE_TSF']:
     CPP_SOURCES += [
         'nsTextStore.cpp',
     ]
 
 LIBXUL_LIBRARY = True
--- a/widget/windows/winrt/moz.build
+++ b/widget/windows/winrt/moz.build
@@ -2,29 +2,29 @@
 # 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 = 'widget'
 
 CPP_SOURCES += [
+    'APZController.cpp',
     'FrameworkView.cpp',
     'MetroApp.cpp',
     'MetroAppShell.cpp',
     'MetroContracts.cpp',
     'MetroInput.cpp',
     'MetroUtils.cpp',
     'MetroWidget.cpp',
     'ToastNotificationHandler.cpp',
     'UIAAccessibilityBridge.cpp',
     'UIABridge.cpp',
     'nsMetroFilePicker.cpp',
     'nsWinMetroUtils.cpp',
-    'APZController.cpp',
 ]
 
 EXTRA_COMPONENTS += [
     'MetroUIUtils.js',
     'MetroUIUtils.manifest',
 ]
 
 LIBXUL_LIBRARY = True
--- a/widget/xpwidgets/moz.build
+++ b/widget/xpwidgets/moz.build
@@ -23,18 +23,18 @@ CPP_SOURCES += [
     'nsBaseAppShell.cpp',
     'nsBaseDragService.cpp',
     'nsBaseScreen.cpp',
     'nsBaseWidget.cpp',
     'nsClipboardHelper.cpp',
     'nsClipboardPrivacyHandler.cpp',
     'nsFilePickerProxy.cpp',
     'nsHTMLFormatConverter.cpp',
+    'nsIWidgetListener.cpp',
     'nsIdleService.cpp',
-    'nsIWidgetListener.cpp',
     'nsPrimitiveHelpers.cpp',
     'nsPrintOptionsImpl.cpp',
     'nsPrintSession.cpp',
     'nsPrintSettingsImpl.cpp',
     'nsTransferable.cpp',
     'nsXPLookAndFeel.cpp',
 ]
 
--- a/xpcom/ds/moz.build
+++ b/xpcom/ds/moz.build
@@ -68,16 +68,17 @@ 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',
@@ -85,17 +86,16 @@ 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/objs.mozbuild
+++ b/xpcom/glue/objs.mozbuild
@@ -21,18 +21,18 @@ xpcom_glue_src_lcppsrcs = [
     'nsID.cpp',
     'nsIInterfaceRequestorUtils.cpp',
     'nsINIParser.cpp',
     'nsISupportsImpl.cpp',
     'nsMemory.cpp',
     'nsQuickSort.cpp',
     'nsTArray.cpp',
     'nsTHashtable.cpp',
+    'nsTObserverArray.cpp',
     'nsThreadUtils.cpp',
-    'nsTObserverArray.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/reflect/xptcall/src/md/unix/moz.build
+++ b/xpcom/reflect/xptcall/src/md/unix/moz.build
@@ -61,23 +61,23 @@ if CONFIG['OS_TARGET'] == 'NTO':
             'xptcinvoke_nto_shle.cpp',
             'xptcstubs_nto_shle.cpp'
         ]
 
 if CONFIG['OS_ARCH'] == 'SunOS':
     if CONFIG['OS_TEST'] == 'x86_64':
         if CONFIG['GNU_CC']:
             CPP_SOURCES += [
-                'xptcstubs_x86_64_linux.cpp',
-                'xptcinvoke_x86_64_unix.cpp'
+                'xptcinvoke_x86_64_unix.cpp',
+                'xptcstubs_x86_64_linux.cpp'
             ]
         else:
             CPP_SOURCES += [
+                'xptcinvoke_x86_64_solaris.cpp',
                 'xptcstubs_x86_64_solaris.cpp',
-                'xptcinvoke_x86_64_solaris.cpp',
             ]
     elif CONFIG['OS_TEST'].find('86') != -1:
         if CONFIG['GNU_CC']:
             CPP_SOURCES += [
                 'xptcinvoke_gcc_x86_unix.cpp',
                 'xptcstubs_gcc_x86_unix.cpp'
             ]
         else: