Bug 929905 - Consolidate sources in moz.build. r=gps
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 25 Oct 2013 08:23:05 +0900
changeset 160664 5dd08c88e328c4b821f5880340d15eaff8b3f92b
parent 160663 345cb5e077b119ff4f7a19125a6cb827a2c2a1b8
child 160665 88c6e28f4acdb2ad3580ed90c483e2f85c78db71
push id4537
push userlsblakk@mozilla.com
push dateMon, 28 Oct 2013 22:18:47 +0000
treeherdermozilla-aurora@60c6fd67470e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs929905
milestone27.0a1
Bug 929905 - Consolidate sources in moz.build. r=gps
accessible/src/atk/moz.build
accessible/src/base/moz.build
accessible/src/generic/moz.build
accessible/src/html/moz.build
accessible/src/mac/moz.build
accessible/src/other/moz.build
accessible/src/windows/ia2/moz.build
accessible/src/windows/msaa/moz.build
accessible/src/windows/sdn/moz.build
accessible/src/windows/uia/moz.build
accessible/src/xpcom/moz.build
accessible/src/xul/moz.build
b2g/app/moz.build
b2g/gaia/moz.build
browser/app/moz.build
browser/components/about/moz.build
browser/components/build/moz.build
browser/components/dirprovider/moz.build
browser/components/feeds/src/moz.build
browser/components/migration/src/moz.build
browser/components/shell/src/moz.build
browser/metro/shell/commandexecutehandler/moz.build
browser/metro/shell/linktool/moz.build
browser/metro/shell/testing/moz.build
build/unix/elfhack/moz.build
build/unix/stdc++compat/moz.build
build/win32/crashinjectdll/moz.build
build/win32/moz.build
build/win32/vmwarerecordinghelper/moz.build
caps/src/moz.build
chrome/src/moz.build
config/moz.build
content/base/src/moz.build
content/canvas/src/moz.build
content/events/src/moz.build
content/html/content/src/moz.build
content/html/document/src/moz.build
content/mathml/content/src/moz.build
content/media/apple/moz.build
content/media/dash/moz.build
content/media/directshow/moz.build
content/media/encoder/moz.build
content/media/gstreamer/moz.build
content/media/mediasource/moz.build
content/media/moz.build
content/media/ogg/moz.build
content/media/omx/mediaresourcemanager/moz.build
content/media/omx/moz.build
content/media/plugins/moz.build
content/media/raw/moz.build
content/media/wave/moz.build
content/media/webaudio/blink/moz.build
content/media/webaudio/moz.build
content/media/webm/moz.build
content/media/webrtc/moz.build
content/media/webspeech/recognition/moz.build
content/media/webspeech/synth/moz.build
content/media/webspeech/synth/pico/moz.build
content/media/wmf/moz.build
content/smil/moz.build
content/svg/content/src/moz.build
content/svg/document/src/moz.build
content/xbl/src/moz.build
content/xml/content/src/moz.build
content/xml/document/src/moz.build
content/xslt/src/base/moz.build
content/xslt/src/xml/moz.build
content/xslt/src/xpath/moz.build
content/xslt/src/xslt/moz.build
content/xul/content/src/moz.build
content/xul/document/src/moz.build
content/xul/templates/src/moz.build
db/sqlite3/src/moz.build
docshell/base/moz.build
docshell/build/moz.build
docshell/shistory/src/moz.build
dom/activities/src/moz.build
dom/alarm/moz.build
dom/apps/src/moz.build
dom/audiochannel/moz.build
dom/base/moz.build
dom/battery/moz.build
dom/bluetooth/moz.build
dom/browser-element/moz.build
dom/camera/moz.build
dom/cellbroadcast/src/moz.build
dom/devicestorage/moz.build
dom/encoding/moz.build
dom/file/moz.build
dom/fmradio/ipc/moz.build
dom/fmradio/moz.build
dom/gamepad/moz.build
dom/icc/src/moz.build
dom/indexedDB/ipc/moz.build
dom/indexedDB/moz.build
dom/ipc/moz.build
dom/media/bridge/moz.build
dom/media/moz.build
dom/mobilemessage/src/moz.build
dom/network/src/moz.build
dom/plugins/base/android/moz.build
dom/plugins/base/moz.build
dom/plugins/ipc/hangui/moz.build
dom/plugins/ipc/interpose/moz.build
dom/plugins/ipc/moz.build
dom/plugins/test/testplugin/testplugin.mozbuild
dom/power/moz.build
dom/promise/moz.build
dom/quota/moz.build
dom/src/events/moz.build
dom/src/geolocation/moz.build
dom/src/json/moz.build
dom/src/jsurl/moz.build
dom/src/notification/moz.build
dom/src/offline/moz.build
dom/src/storage/moz.build
dom/system/android/moz.build
dom/system/gonk/moz.build
dom/system/mac/moz.build
dom/system/moz.build
dom/system/unix/moz.build
dom/system/windows/moz.build
dom/telephony/moz.build
dom/time/moz.build
dom/voicemail/moz.build
dom/wifi/moz.build
dom/workers/moz.build
editor/composer/src/moz.build
editor/libeditor/base/moz.build
editor/libeditor/html/moz.build
editor/libeditor/text/moz.build
editor/txmgr/src/moz.build
editor/txtsvc/src/moz.build
embedding/browser/build/moz.build
embedding/browser/webBrowser/moz.build
embedding/components/appstartup/src/moz.build
embedding/components/build/moz.build
embedding/components/commandhandler/src/moz.build
embedding/components/find/src/moz.build
embedding/components/printingui/src/mac/moz.build
embedding/components/printingui/src/os2/moz.build
embedding/components/printingui/src/unixshared/moz.build
embedding/components/printingui/src/win/moz.build
embedding/components/webbrowserpersist/src/moz.build
embedding/components/windowwatcher/src/moz.build
embedding/tests/winEmbed/moz.build
extensions/auth/moz.build
extensions/cookie/moz.build
extensions/gio/moz.build
extensions/gnomevfs/moz.build
extensions/permissions/moz.build
extensions/pref/autoconfig/src/moz.build
extensions/spellcheck/hunspell/src/moz.build
extensions/spellcheck/src/moz.build
extensions/universalchardet/src/base/moz.build
extensions/universalchardet/src/xpcom/moz.build
extensions/widgetutils/src/moz.build
gfx/2d/moz.build
gfx/angle/moz.build
gfx/angle/src/libEGL/moz.build
gfx/angle/src/libGLESv2/moz.build
gfx/cairo/cairo/src/moz.build
gfx/cairo/libpixman/src/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/ots/src/moz.build
gfx/qcms/moz.build
gfx/skia/moz.build
gfx/src/moz.build
gfx/tests/gtest/moz.build
gfx/thebes/moz.build
gfx/ycbcr/moz.build
hal/moz.build
image/build/moz.build
image/decoders/icon/android/moz.build
image/decoders/icon/gtk/moz.build
image/decoders/icon/mac/moz.build
image/decoders/icon/moz.build
image/decoders/icon/os2/moz.build
image/decoders/icon/qt/moz.build
image/decoders/icon/win/moz.build
image/decoders/moz.build
image/encoders/bmp/moz.build
image/encoders/ico/moz.build
image/encoders/jpeg/moz.build
image/encoders/png/moz.build
image/src/moz.build
intl/build/moz.build
intl/chardet/src/moz.build
intl/hyphenation/src/moz.build
intl/locale/src/mac/moz.build
intl/locale/src/moz.build
intl/locale/src/os2/moz.build
intl/locale/src/unix/moz.build
intl/locale/src/windows/moz.build
intl/lwbrk/src/moz.build
intl/strres/src/moz.build
intl/uconv/src/moz.build
intl/uconv/tools/moz.build
intl/uconv/ucvcn/moz.build
intl/uconv/ucvibm/moz.build
intl/uconv/ucvja/moz.build
intl/uconv/ucvko/moz.build
intl/uconv/ucvlatin/moz.build
intl/uconv/ucvtw/moz.build
intl/uconv/ucvtw2/moz.build
intl/uconv/util/moz.build
intl/unicharutil/src/moz.build
intl/unicharutil/tests/moz.build
intl/unicharutil/tools/moz.build
intl/unicharutil/util/internal/moz.build
intl/unicharutil/util/moz.build
ipc/app/moz.build
ipc/chromium/moz.build
ipc/dbus/moz.build
ipc/glue/moz.build
ipc/ipdl/test/cxx/app/moz.build
ipc/ipdl/test/cxx/moz.build
ipc/keystore/moz.build
ipc/netd/moz.build
ipc/nfc/moz.build
ipc/ril/moz.build
ipc/testshell/moz.build
ipc/unixsocket/moz.build
js/ductwork/debugger/moz.build
js/ipc/moz.build
js/jsd/moz.build
js/src/config/moz.build
js/src/editline/moz.build
js/src/gdb/moz.build
js/src/jsapi-tests/moz.build
js/src/moz.build
js/src/shell/moz.build
js/xpconnect/loader/moz.build
js/xpconnect/shell/moz.build
js/xpconnect/src/moz.build
js/xpconnect/tests/components/native/moz.build
js/xpconnect/wrappers/moz.build
layout/base/moz.build
layout/build/moz.build
layout/forms/moz.build
layout/generic/moz.build
layout/inspector/src/moz.build
layout/ipc/moz.build
layout/mathml/moz.build
layout/printing/moz.build
layout/style/moz.build
layout/style/test/moz.build
layout/svg/moz.build
layout/tables/moz.build
layout/tools/layout-debug/src/moz.build
layout/xul/base/src/moz.build
layout/xul/grid/moz.build
layout/xul/tree/moz.build
media/kiss_fft/moz.build
media/libcubeb/src/moz.build
media/libjpeg/moz.build
media/libnestegg/src/moz.build
media/libogg/src/moz.build
media/libpng/moz.build
media/libsoundtouch/src/moz.build
media/libspeex_resampler/src/moz.build
media/libtheora/lib/moz.build
media/libtremor/lib/moz.build
media/libvorbis/lib/moz.build
media/libvpx/moz.build
media/mtransport/build/moz.build
media/mtransport/standalone/moz.build
media/omx-plugin/froyo/moz.build
media/omx-plugin/gb/moz.build
media/omx-plugin/gb235/moz.build
media/omx-plugin/hc/moz.build
media/omx-plugin/lib/froyo/libstagefright/moz.build
media/omx-plugin/lib/gb/libstagefright/moz.build
media/omx-plugin/lib/gb/libstagefright_color_conversion/moz.build
media/omx-plugin/lib/gb/libutils/moz.build
media/omx-plugin/lib/gb235/libstagefright/moz.build
media/omx-plugin/lib/hc/libstagefright/moz.build
media/omx-plugin/lib/ics/libstagefright/moz.build
media/omx-plugin/lib/ics/libutils/moz.build
media/omx-plugin/moz.build
memory/build/moz.build
memory/jemalloc/moz.build
memory/mozalloc/moz.build
memory/mozjemalloc/moz.build
memory/replace/dmd/moz.build
memory/replace/dummy/moz.build
memory/replace/jemalloc/moz.build
mobile/android/components/build/moz.build
modules/libbz2/src/moz.build
modules/libjar/moz.build
modules/libjar/zipwriter/src/moz.build
modules/libmar/sign/moz.build
modules/libmar/src/moz.build
modules/libmar/tool/moz.build
modules/libmar/verify/moz.build
modules/libpref/src/moz.build
modules/zlib/src/moz.build
mozglue/android/moz.build
mozglue/build/moz.build
mozglue/linker/moz.build
mozglue/tests/moz.build
netwerk/base/src/moz.build
netwerk/build/moz.build
netwerk/cache/moz.build
netwerk/cache2/moz.build
netwerk/cookie/moz.build
netwerk/dash/mpd/moz.build
netwerk/dns/moz.build
netwerk/ipc/moz.build
netwerk/mime/moz.build
netwerk/protocol/about/moz.build
netwerk/protocol/app/moz.build
netwerk/protocol/data/moz.build
netwerk/protocol/device/moz.build
netwerk/protocol/file/moz.build
netwerk/protocol/ftp/moz.build
netwerk/protocol/http/moz.build
netwerk/protocol/res/moz.build
netwerk/protocol/rtsp/moz.build
netwerk/protocol/viewsource/moz.build
netwerk/protocol/websocket/moz.build
netwerk/protocol/wyciwyg/moz.build
netwerk/sctp/datachannel/moz.build
netwerk/sctp/src/moz.build
netwerk/socket/moz.build
netwerk/srtp/src/moz.build
netwerk/streamconv/converters/moz.build
netwerk/streamconv/src/moz.build
netwerk/streamconv/test/moz.build
netwerk/system/android/moz.build
netwerk/system/mac/moz.build
netwerk/system/qt/moz.build
netwerk/system/win32/moz.build
netwerk/test/moz.build
netwerk/wifi/moz.build
other-licenses/android/moz.build
other-licenses/bsdiff/moz.build
other-licenses/skia-npapi/moz.build
other-licenses/snappy/moz.build
parser/expat/lib/moz.build
parser/html/moz.build
parser/htmlparser/src/moz.build
parser/xml/src/moz.build
profile/dirserviceprovider/src/moz.build
profile/dirserviceprovider/standalone/moz.build
python/mozbuild/mozbuild/frontend/emitter.py
python/mozbuild/mozbuild/frontend/sandbox_symbols.py
python/mozbuild/mozbuild/test/backend/data/variable_passthru/moz.build
python/mozbuild/mozbuild/test/frontend/data/variable-passthru/moz.build
python/mozbuild/mozbuild/test/frontend/test_emitter.py
rdf/base/src/moz.build
rdf/build/moz.build
rdf/datasource/src/moz.build
rdf/tests/dsds/moz.build
rdf/tests/rdfcat/moz.build
rdf/tests/rdfpoll/moz.build
rdf/tests/triplescat/moz.build
rdf/util/src/internal/moz.build
rdf/util/src/moz.build
security/manager/boot/src/moz.build
security/manager/pki/src/moz.build
security/manager/ssl/src/moz.build
security/manager/ssl/tests/gtest/moz.build
security/manager/ssl/tests/unit/tlsserver/cmd/moz.build
security/manager/ssl/tests/unit/tlsserver/lib/moz.build
security/sandbox/moz.build
services/crypto/component/moz.build
startupcache/moz.build
storage/build/moz.build
storage/src/moz.build
testing/gtest/moz.build
testing/mochitest/ssltunnel/moz.build
testing/tools/screenshot/moz.build
toolkit/components/alerts/moz.build
toolkit/components/autocomplete/moz.build
toolkit/components/build/moz.build
toolkit/components/commandlines/moz.build
toolkit/components/ctypes/moz.build
toolkit/components/ctypes/tests/moz.build
toolkit/components/diskspacewatcher/moz.build
toolkit/components/downloads/moz.build
toolkit/components/filepicker/moz.build
toolkit/components/finalizationwitness/moz.build
toolkit/components/find/moz.build
toolkit/components/intl/moz.build
toolkit/components/jsdownloads/src/moz.build
toolkit/components/maintenanceservice/moz.build
toolkit/components/mediasniffer/moz.build
toolkit/components/parentalcontrols/moz.build
toolkit/components/perf/moz.build
toolkit/components/places/moz.build
toolkit/components/protobuf/moz.build
toolkit/components/reflect/moz.build
toolkit/components/remote/moz.build
toolkit/components/satchel/moz.build
toolkit/components/startup/moz.build
toolkit/components/statusfilter/moz.build
toolkit/components/telemetry/moz.build
toolkit/components/typeaheadfind/moz.build
toolkit/components/url-classifier/moz.build
toolkit/crashreporter/breakpad-windows-libxul/moz.build
toolkit/crashreporter/client/moz.build
toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/moz.build
toolkit/crashreporter/google-breakpad/src/client/linux/handler/moz.build
toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/moz.build
toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/moz.build
toolkit/crashreporter/google-breakpad/src/client/mac/handler/moz.build
toolkit/crashreporter/google-breakpad/src/client/moz.build
toolkit/crashreporter/google-breakpad/src/client/solaris/handler/moz.build
toolkit/crashreporter/google-breakpad/src/common/dwarf/moz.build
toolkit/crashreporter/google-breakpad/src/common/linux/moz.build
toolkit/crashreporter/google-breakpad/src/common/mac/moz.build
toolkit/crashreporter/google-breakpad/src/common/moz.build
toolkit/crashreporter/google-breakpad/src/common/solaris/moz.build
toolkit/crashreporter/google-breakpad/src/processor/moz.build
toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/moz.build
toolkit/crashreporter/google-breakpad/src/tools/solaris/dump_syms/moz.build
toolkit/crashreporter/injector/moz.build
toolkit/crashreporter/moz.build
toolkit/crashreporter/test/moz.build
toolkit/devtools/server/moz.build
toolkit/identity/moz.build
toolkit/library/moz.build
toolkit/library/winvccorlib/moz.build
toolkit/mozapps/plugins/tests/moz.build
toolkit/mozapps/update/common/moz.build
toolkit/mozapps/update/test/moz.build
toolkit/mozapps/update/updater/moz.build
toolkit/profile/moz.build
toolkit/system/androidproxy/moz.build
toolkit/system/dbus/moz.build
toolkit/system/gnome/moz.build
toolkit/system/osxproxy/moz.build
toolkit/system/unixproxy/moz.build
toolkit/system/windowsproxy/moz.build
toolkit/xre/moz.build
toolkit/xre/test/win/moz.build
tools/jprof/moz.build
tools/jprof/stub/moz.build
tools/profiler/moz.build
tools/trace-malloc/lib/moz.build
tools/trace-malloc/moz.build
uriloader/base/moz.build
uriloader/exthandler/moz.build
uriloader/exthandler/tests/moz.build
uriloader/prefetch/moz.build
view/src/moz.build
webapprt/gtk2/moz.build
webapprt/mac/moz.build
webapprt/win/moz.build
widget/android/moz.build
widget/cocoa/moz.build
widget/gonk/libdisplay/moz.build
widget/gonk/moz.build
widget/gonk/nativewindow/moz.build
widget/gtk/moz.build
widget/gtkxtbin/moz.build
widget/os2/moz.build
widget/qt/faststartupqt/moz.build
widget/qt/moz.build
widget/shared/moz.build
widget/shared/x11/moz.build
widget/windows/moz.build
widget/windows/winrt/moz.build
widget/xpwidgets/moz.build
xpcom/base/moz.build
xpcom/build/moz.build
xpcom/components/moz.build
xpcom/ds/moz.build
xpcom/glue/moz.build
xpcom/glue/nomozalloc/moz.build
xpcom/glue/standalone/moz.build
xpcom/glue/standalone/staticruntime/moz.build
xpcom/glue/staticruntime/moz.build
xpcom/glue/tests/gtest/moz.build
xpcom/io/moz.build
xpcom/reflect/xptcall/src/md/os2/moz.build
xpcom/reflect/xptcall/src/md/test/moz.build
xpcom/reflect/xptcall/src/md/unix/moz.build
xpcom/reflect/xptcall/src/md/win32/moz.build
xpcom/reflect/xptcall/src/moz.build
xpcom/reflect/xptcall/tests/moz.build
xpcom/reflect/xptinfo/src/moz.build
xpcom/reflect/xptinfo/tests/moz.build
xpcom/sample/moz.build
xpcom/sample/program/moz.build
xpcom/string/src/moz.build
xpcom/tests/bug656331_component/moz.build
xpcom/tests/component/moz.build
xpcom/tests/component_no_aslr/moz.build
xpcom/tests/external/moz.build
xpcom/tests/moz.build
xpcom/threads/moz.build
xpcom/typelib/xpt/src/moz.build
xpcom/typelib/xpt/tests/moz.build
xpcom/windbgdlg/moz.build
xpfe/appshell/src/moz.build
xpfe/components/build/moz.build
xpfe/components/directory/moz.build
xpfe/components/windowds/moz.build
xulrunner/app/moz.build
xulrunner/examples/simple/components/src/moz.build
xulrunner/stub/moz.build
xulrunner/tools/redit/moz.build
--- a/accessible/src/atk/moz.build
+++ b/accessible/src/atk/moz.build
@@ -6,17 +6,17 @@
 
 MODULE = 'accessibility'
 
 EXPORTS.mozilla.a11y += [
     'AccessibleWrap.h',
     'HyperTextAccessibleWrap.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'AccessibleWrap.cpp',
     'ApplicationAccessibleWrap.cpp',
     'AtkSocketAccessible.cpp',
     'DocAccessibleWrap.cpp',
     'nsMaiHyperlink.cpp',
     'nsMaiInterfaceAction.cpp',
     'nsMaiInterfaceComponent.cpp',
     'nsMaiInterfaceDocument.cpp',
--- a/accessible/src/base/moz.build
+++ b/accessible/src/base/moz.build
@@ -25,17 +25,17 @@ EXPORTS.mozilla.a11y += [
     'States.h',
 ]
 
 if CONFIG['MOZ_DEBUG']:
     EXPORTS.mozilla.a11y += [
         'Logging.h',
     ]
 
-CPP_SOURCES += [
+SOURCES += [
     'AccCollector.cpp',
     'AccEvent.cpp',
     'AccGroupInfo.cpp',
     'AccIterator.cpp',
     'ARIAMap.cpp',
     'ARIAStateMap.cpp',
     'Asserts.cpp',
     'DocManager.cpp',
@@ -53,17 +53,17 @@ CPP_SOURCES += [
     'SelectionManager.cpp',
     'StyleInfo.cpp',
     'TextAttrs.cpp',
     'TextUpdater.cpp',
     'TreeWalker.cpp',
 ]
 
 if a11y_log:
-    CPP_SOURCES += [
+    SOURCES += [
         'Logging.cpp',
     ]
 
 LIBRARY_NAME = 'accessibility_base_s'
 
 LIBXUL_LIBRARY = True
 
 LOCAL_INCLUDES += [
--- a/accessible/src/generic/moz.build
+++ b/accessible/src/generic/moz.build
@@ -7,17 +7,17 @@
 MODULE = 'accessibility'
 
 EXPORTS.mozilla.a11y += [
     'Accessible.h',
     'DocAccessible.h',
     'HyperTextAccessible.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'Accessible.cpp',
     'ApplicationAccessible.cpp',
     'ARIAGridAccessible.cpp',
     'BaseAccessibles.cpp',
     'DocAccessible.cpp',
     'FormControlAccessible.cpp',
     'HyperTextAccessible.cpp',
     'ImageAccessible.cpp',
--- a/accessible/src/html/moz.build
+++ b/accessible/src/html/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 MODULE = 'accessibility'
 
-CPP_SOURCES += [
+SOURCES += [
     'HTMLCanvasAccessible.cpp',
     'HTMLElementAccessibles.cpp',
     'HTMLFormControlAccessible.cpp',
     'HTMLImageMapAccessible.cpp',
     'HTMLLinkAccessible.cpp',
     'HTMLListAccessible.cpp',
     'HTMLSelectAccessible.cpp',
     'HTMLTableAccessible.cpp',
--- a/accessible/src/mac/moz.build
+++ b/accessible/src/mac/moz.build
@@ -12,17 +12,17 @@ EXPORTS += [
 
 EXPORTS.mozilla.a11y += [
     'AccessibleWrap.h',
     'HyperTextAccessibleWrap.h',
 ]
 
 LIBRARY_NAME = 'accessibility_toolkit_s'
 
-CMMSRCS += [
+SOURCES += [
     'AccessibleWrap.mm',
     'DocAccessibleWrap.mm',
     'MacUtils.mm',
     'mozAccessible.mm',
     'mozActionElements.mm',
     'mozDocAccessible.mm',
     'mozHTMLAccessible.mm',
     'mozTextAccessible.mm',
--- a/accessible/src/other/moz.build
+++ b/accessible/src/other/moz.build
@@ -6,17 +6,17 @@
 
 MODULE = 'accessibility'
 
 EXPORTS.mozilla.a11y += [
     'AccessibleWrap.h',
     'HyperTextAccessibleWrap.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'AccessibleWrap.cpp',
     'Platform.cpp',
 ]
 
 LIBRARY_NAME = 'accessibility_toolkit_s'
 
 LIBXUL_LIBRARY = True
 
--- a/accessible/src/windows/ia2/moz.build
+++ b/accessible/src/windows/ia2/moz.build
@@ -12,17 +12,17 @@ EXPORTS += [
     'ia2AccessibleComponent.h',
     'ia2AccessibleEditableText.h',
     'ia2AccessibleHyperlink.h',
     'ia2AccessibleHypertext.h',
     'ia2AccessibleText.h',
     'ia2AccessibleValue.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'ia2Accessible.cpp',
     'ia2AccessibleAction.cpp',
     'ia2AccessibleComponent.cpp',
     'ia2AccessibleEditableText.cpp',
     'ia2AccessibleHyperlink.cpp',
     'ia2AccessibleHypertext.cpp',
     'ia2AccessibleImage.cpp',
     'ia2AccessibleRelation.cpp',
--- a/accessible/src/windows/msaa/moz.build
+++ b/accessible/src/windows/msaa/moz.build
@@ -11,17 +11,17 @@ EXPORTS += [
 ]
 
 EXPORTS.mozilla.a11y += [
     'AccessibleWrap.h',
     'Compatibility.h',
     'HyperTextAccessibleWrap.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'AccessibleWrap.cpp',
     'ApplicationAccessibleWrap.cpp',
     'ARIAGridAccessibleWrap.cpp',
     'Compatibility.cpp',
     'DocAccessibleWrap.cpp',
     'EnumVariant.cpp',
     'HTMLTableAccessibleWrap.cpp',
     'HTMLWin32ObjectAccessible.cpp',
@@ -31,17 +31,17 @@ CPP_SOURCES += [
     'nsWinUtils.cpp',
     'Platform.cpp',
     'RootAccessibleWrap.cpp',
     'ServiceProvider.cpp',
     'TextLeafAccessibleWrap.cpp',
 ]
 
 if CONFIG['MOZ_XUL']:
-    CPP_SOURCES += [
+    SOURCES += [
         'XULListboxAccessibleWrap.cpp',
         'XULMenuAccessibleWrap.cpp',
         'XULTreeGridAccessibleWrap.cpp',
     ]
 
 LIBXUL_LIBRARY = True
 
 LOCAL_INCLUDES += [
--- a/accessible/src/windows/sdn/moz.build
+++ b/accessible/src/windows/sdn/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 MODULE = 'accessibility'
 
-CPP_SOURCES += [
+SOURCES += [
     'sdnAccessible.cpp',
     'sdnDocAccessible.cpp',
     'sdnTextAccessible.cpp',
 ]
 
 LIBXUL_LIBRARY = True
 
 LOCAL_INCLUDES += [
--- a/accessible/src/windows/uia/moz.build
+++ b/accessible/src/windows/uia/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 MODULE = 'accessibility'
 
-CPP_SOURCES += [
+SOURCES += [
     'uiaRawElmProvider.cpp',
 ]
 
 LIBXUL_LIBRARY = True
 
 LOCAL_INCLUDES += [
     '../../base',
     '../../generic',
--- a/accessible/src/xpcom/moz.build
+++ b/accessible/src/xpcom/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 MODULE = 'accessibility'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsAccessibleRelation.cpp',
     'xpcAccessibleTable.cpp',
     'xpcAccessibleTableCell.cpp',
 ]
 
 LIBRARY_NAME = 'accessibility_xpcom_s'
 
 LIBXUL_LIBRARY = True
--- a/accessible/src/xul/moz.build
+++ b/accessible/src/xul/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 MODULE = 'accessibility'
 
-CPP_SOURCES += [
+SOURCES += [
     'XULAlertAccessible.cpp',
     'XULColorPickerAccessible.cpp',
     'XULComboboxAccessible.cpp',
     'XULElementAccessibles.cpp',
     'XULFormControlAccessible.cpp',
     'XULListboxAccessible.cpp',
     'XULMenuAccessible.cpp',
     'XULSelectControlAccessible.cpp',
--- a/b2g/app/moz.build
+++ b/b2g/app/moz.build
@@ -4,11 +4,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 if not CONFIG['LIBXUL_SDK']:
     if CONFIG['GAIADIR']:
         PROGRAM = CONFIG['MOZ_APP_NAME'] + "-bin"
     else:
         PROGRAM = CONFIG['MOZ_APP_NAME']
-    CPP_SOURCES += [
+    SOURCES += [
         'nsBrowserApp.cpp',
     ]
--- a/b2g/gaia/moz.build
+++ b/b2g/gaia/moz.build
@@ -2,11 +2,11 @@
 # 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/.
 
 PROGRAM = CONFIG['MOZ_APP_NAME']
 
 if CONFIG['OS_ARCH'] == 'WINNT':
-    CPP_SOURCES += [
+    SOURCES += [
         'run-b2g.cpp',
     ]
--- a/browser/app/moz.build
+++ b/browser/app/moz.build
@@ -3,11 +3,11 @@
 # 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/.
 
 DIRS += ['profile/extensions']
 
 PROGRAM = CONFIG['MOZ_APP_NAME']
 
-CPP_SOURCES += [
+SOURCES += [
     'nsBrowserApp.cpp',
 ]
--- a/browser/components/about/moz.build
+++ b/browser/components/about/moz.build
@@ -5,14 +5,14 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'browserabout'
 
 EXPORTS.mozilla.browser += [
     'AboutRedirector.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'AboutRedirector.cpp',
 ]
 
 LIBRARY_NAME = 'browserabout_s'
 
--- a/browser/components/build/moz.build
+++ b/browser/components/build/moz.build
@@ -5,16 +5,16 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'browsercomps'
 
 EXPORTS += [
     'nsBrowserCompsCID.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'nsModule.cpp',
 ]
 
 LIBRARY_NAME = 'browsercomps'
 
 IS_COMPONENT = True
 
--- a/browser/components/dirprovider/moz.build
+++ b/browser/components/dirprovider/moz.build
@@ -5,17 +5,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'browserdir'
 
 EXPORTS.mozilla.browser += [
     'DirectoryProvider.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'DirectoryProvider.cpp',
 ]
 
 LIBRARY_NAME = 'browserdir_s'
 
 XPCSHELL_TESTS_MANIFESTS += [
     'tests/unit/xpcshell.ini',
 ]
--- a/browser/components/feeds/src/moz.build
+++ b/browser/components/feeds/src/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 MODULE = 'browser_feeds'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsFeedSniffer.cpp',
 ]
 
 EXTRA_COMPONENTS += [
     'BrowserFeeds.manifest',
     'FeedConverter.js',
     'WebContentConverter.js',
 ]
--- a/browser/components/migration/src/moz.build
+++ b/browser/components/migration/src/moz.build
@@ -2,17 +2,17 @@
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'migration'
 
 if CONFIG['OS_ARCH'] == 'WINNT':
-    CPP_SOURCES += [
+    SOURCES += [
         'nsIEHistoryEnumerator.cpp',
     ]
 
 EXTRA_COMPONENTS += [
     'FirefoxProfileMigrator.js',
     'ProfileMigrator.js',
 ]
 
--- a/browser/components/shell/src/moz.build
+++ b/browser/components/shell/src/moz.build
@@ -2,27 +2,27 @@
 # 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 = 'shellservice'
 
 if CONFIG['OS_ARCH'] == 'WINNT':
-    CPP_SOURCES += [
+    SOURCES += [
         'nsWindowsShellService.cpp',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    CPP_SOURCES += [
+    SOURCES += [
         'nsMacShellService.cpp',
     ]
 elif CONFIG['MOZ_WIDGET_GTK']:
-    CPP_SOURCES += [
+    SOURCES += [
         'nsGNOMEShellService.cpp',
     ]
 
-if CPP_SOURCES:
+if SOURCES:
     LIBRARY_NAME = 'shellservice_s'
 
 EXTRA_COMPONENTS += [
     'nsSetDefaultBrowser.js',
     'nsSetDefaultBrowser.manifest',
 ]
--- a/browser/metro/shell/commandexecutehandler/moz.build
+++ b/browser/metro/shell/commandexecutehandler/moz.build
@@ -1,15 +1,15 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 PROGRAM = 'CommandExecuteHandler'
 
-CPP_SOURCES += [
+SOURCES += [
     'CEHHelper.cpp',
     'CommandExecuteHandler.cpp',
 ]
 
 # We want this exe in dist/bin
 DIST_SUBDIR = ''
--- a/browser/metro/shell/linktool/moz.build
+++ b/browser/metro/shell/linktool/moz.build
@@ -1,13 +1,13 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 PROGRAM = 'linktool'
 
-CPP_SOURCES += [
+SOURCES += [
     'linktool.cpp',
 ]
 
 DIST_SUBDIR = 'metro/install'
--- a/browser/metro/shell/testing/moz.build
+++ b/browser/metro/shell/testing/moz.build
@@ -1,14 +1,14 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 PROGRAM = 'metrotestharness'
 
-CPP_SOURCES += [
+SOURCES += [
     'metrotestharness.cpp',
 ]
 
 # We want this exe in dist/bin
 DIST_SUBDIR = ''
--- a/build/unix/elfhack/moz.build
+++ b/build/unix/elfhack/moz.build
@@ -2,22 +2,22 @@
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 NO_DIST_INSTALL = True
 DIRS += ['inject']
 
-CSRCS += [
+SOURCES += [
     'test-array.c',
     'test-ctors.c',
 ]
 
 if not CONFIG['CROSS_COMPILE']:
-    CSRCS += [
+    SOURCES += [
         'dummy.c',
     ]
 
-HOST_CPPSRCS += [
+HOST_SOURCES += [
     'elf.cpp',
     'elfhack.cpp',
 ]
--- a/build/unix/stdc++compat/moz.build
+++ b/build/unix/stdc++compat/moz.build
@@ -3,16 +3,16 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'build'
 
 if CONFIG['MOZ_LIBSTDCXX_TARGET_VERSION']:
     LIBRARY_NAME = 'stdc++compat'
-    CPP_SOURCES += ['stdc++compat.cpp']
+    SOURCES += ['stdc++compat.cpp']
 
 if CONFIG['MOZ_LIBSTDCXX_HOST_VERSION']:
     HOST_LIBRARY_NAME = 'host_stdc++compat'
-    HOST_CPPSRCS += [
+    HOST_SOURCES += [
         'stdc++compat.cpp',
     ]
 
--- a/build/win32/crashinjectdll/moz.build
+++ b/build/win32/crashinjectdll/moz.build
@@ -1,12 +1,12 @@
 # -*- 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/.
 
-CPP_SOURCES += [
+SOURCES += [
     'crashinjectdll.cpp',
 ]
 
 LIBRARY_NAME = 'crashinjectdll'
 
--- a/build/win32/moz.build
+++ b/build/win32/moz.build
@@ -6,11 +6,11 @@
 
 if CONFIG['_MSC_VER'] and CONFIG['OS_TEST'] != 'x86_64':
     TEST_DIRS += ['vmwarerecordinghelper']
 
 TEST_DIRS += ['crashinjectdll']
 
 if CONFIG['ENABLE_TESTS']:
     PROGRAM = 'crashinject'
-    CPP_SOURCES += [
+    SOURCES += [
         'crashinject.cpp',
     ]
--- a/build/win32/vmwarerecordinghelper/moz.build
+++ b/build/win32/vmwarerecordinghelper/moz.build
@@ -1,12 +1,12 @@
 # -*- 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/.
 
-CPP_SOURCES += [
+SOURCES += [
     'vmwarerecordinghelper.cpp',
 ]
 
 LIBRARY_NAME = 'vmwarerecordinghelper'
 
--- a/caps/src/moz.build
+++ b/caps/src/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 MODULE = 'caps'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsJSPrincipals.cpp',
     'nsNullPrincipal.cpp',
     'nsNullPrincipalURI.cpp',
     'nsPrincipal.cpp',
     'nsScriptSecurityManager.cpp',
     'nsSecurityManagerFactory.cpp',
     'nsSystemPrincipal.cpp',
 ]
--- a/chrome/src/moz.build
+++ b/chrome/src/moz.build
@@ -5,17 +5,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'chrome'
 
 EXPORTS.mozilla.chrome += [
     'RegistryMessageUtils.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'nsChromeProtocolHandler.cpp',
     'nsChromeRegistry.cpp',
     'nsChromeRegistryChrome.cpp',
     'nsChromeRegistryContent.cpp',
 ]
 
 LIBXUL_LIBRARY = True
 
--- a/config/moz.build
+++ b/config/moz.build
@@ -11,12 +11,12 @@ CONFIGURE_SUBST_FILES += [
     'doxygen.cfg',
     'emptyvars.mk',
     'makefiles/test/Makefile',
     'tests/makefiles/autodeps/Makefile',
     'tests/src-simple/Makefile',
 ]
 
 if CONFIG['HOST_OS_ARCH'] != 'WINNT':
-    HOST_CSRCS += [
+    HOST_SOURCES += [
         'nsinstall.c',
         'pathsub.c',
     ]
--- a/content/base/src/moz.build
+++ b/content/base/src/moz.build
@@ -35,24 +35,24 @@ EXPORTS += [
     'nsTextFragment.h',
 ]
 
 if CONFIG['MOZ_WEBRTC']:
     EXPORTS += [
         'nsDOMDataChannel.h',
         'nsDOMDataChannelDeclarations.h',
     ]
-    CPP_SOURCES += [
+    SOURCES += [
         'nsDOMDataChannel.cpp',
     ]
 
 # Are we targeting x86-32 or x86-64?  If so, we want to include SSE2 code for
 # nsTextFragment.cpp
 if CONFIG['INTEL_ARCHITECTURE']:
-    CPP_SOURCES += [
+    SOURCES += [
         'nsTextFragmentSSE2.cpp',
     ]
 
 EXPORTS.mozilla.dom += [
     'Attr.h',
     'Comment.h',
     'DocumentFragment.h',
     'DocumentType.h',
@@ -61,17 +61,17 @@ EXPORTS.mozilla.dom += [
     'DOMRect.h',
     'EventSource.h',
     'Link.h',
     'NodeIterator.h',
     'Text.h',
     'TreeWalker.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'Attr.cpp',
     'ChildIterator.cpp',
     'Comment.cpp',
     'DirectionalityUtils.cpp',
     'DocumentFragment.cpp',
     'DocumentType.cpp',
     'DOMImplementation.cpp',
     'DOMParser.cpp',
--- a/content/canvas/src/moz.build
+++ b/content/canvas/src/moz.build
@@ -10,28 +10,28 @@ EXPORTS.mozilla.dom += [
     'CanvasGradient.h',
     'CanvasPattern.h',
     'CanvasRenderingContext2D.h',
     'CanvasUtils.h',
     'ImageData.h',
     'TextMetrics.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'CanvasImageCache.cpp',
     'CanvasRenderingContext2D.cpp',
     'CanvasUtils.cpp',
     'DocumentRendererChild.cpp',
     'DocumentRendererParent.cpp',
     'ImageData.cpp',
     'ImageEncoder.cpp',
 ]
 
 if CONFIG['MOZ_WEBGL']:
-    CPP_SOURCES += [
+    SOURCES += [
         'WebGL1Context.cpp',
         'WebGL2Context.cpp',
         'WebGLActiveInfo.cpp',
         'WebGLBuffer.cpp',
         'WebGLContext.cpp',
         'WebGLContextAsyncQueries.cpp',
         'WebGLContextBuffers.cpp',
         'WebGLContextExtensions.cpp',
@@ -68,17 +68,17 @@ if CONFIG['MOZ_WEBGL']:
         'WebGLShader.cpp',
         'WebGLShaderPrecisionFormat.cpp',
         'WebGLTexelConversions.cpp',
         'WebGLTexture.cpp',
         'WebGLUniformLocation.cpp',
         'WebGLVertexArray.cpp',
     ]
 else:
-    CPP_SOURCES += [
+    SOURCES += [
         'WebGLContextNotSupported.cpp',
     ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
--- a/content/events/src/moz.build
+++ b/content/events/src/moz.build
@@ -17,17 +17,17 @@ EXPORTS += [
 
 EXPORTS.mozilla.dom += [
     'Touch.h',
 ]
 
 if CONFIG['MOZ_WEBSPEECH']:
     EXPORTS.mozilla.dom += ['SpeechRecognitionError.h']
 
-CPP_SOURCES += [
+SOURCES += [
     'DOMWheelEvent.cpp',
     'EventTarget.cpp',
     'nsAsyncDOMEvent.cpp',
     'nsContentEventHandler.cpp',
     'nsDOMAnimationEvent.cpp',
     'nsDOMBeforeUnloadEvent.cpp',
     'nsDOMClipboardEvent.cpp',
     'nsDOMCommandEvent.cpp',
@@ -60,17 +60,17 @@ CPP_SOURCES += [
     'nsIMEStateManager.cpp',
     'nsPaintRequest.cpp',
     'nsPrivateTextRange.cpp',
     'TextComposition.cpp',
     'Touch.cpp',
 ]
 
 if CONFIG['MOZ_WEBSPEECH']:
-    CPP_SOURCES += ['SpeechRecognitionError.cpp']
+    SOURCES += ['SpeechRecognitionError.cpp']
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'gkconevents_s'
--- a/content/html/content/src/moz.build
+++ b/content/html/content/src/moz.build
@@ -72,17 +72,17 @@ EXPORTS.mozilla.dom += [
     'HTMLUnknownElement.h',
     'MediaError.h',
     'TextTrackManager.h',
     'TimeRanges.h',
     'UndoManager.h',
     'ValidityState.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'HTMLAnchorElement.cpp',
     'HTMLAreaElement.cpp',
     'HTMLAudioElement.cpp',
     'HTMLBodyElement.cpp',
     'HTMLBRElement.cpp',
     'HTMLButtonElement.cpp',
     'HTMLCanvasElement.cpp',
     'HTMLDataElement.cpp',
--- a/content/html/document/src/moz.build
+++ b/content/html/document/src/moz.build
@@ -10,17 +10,17 @@ EXPORTS += [
     'nsIHTMLDocument.h',
 ]
 
 EXPORTS.mozilla.dom += [
     'HTMLAllCollection.h',
     'ImageDocument.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'HTMLAllCollection.cpp',
     'ImageDocument.cpp',
     'MediaDocument.cpp',
     'nsHTMLContentSink.cpp',
     'nsHTMLDocument.cpp',
     'PluginDocument.cpp',
     'VideoDocument.cpp',
 ]
--- a/content/mathml/content/src/moz.build
+++ b/content/mathml/content/src/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 MODULE = 'content'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsMathMLElement.cpp',
     'nsMathMLElementFactory.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
--- a/content/media/apple/moz.build
+++ b/content/media/apple/moz.build
@@ -6,17 +6,17 @@
 
 MODULE = 'content'
 
 EXPORTS += [
     'AppleDecoder.h',
     'AppleMP3Reader.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'AppleDecoder.cpp',
     'AppleMP3Reader.cpp',
 ]
 
 LIBRARY_NAME = 'gkconapplemedia_s'
 
 FAIL_ON_WARNINGS = True
 
--- a/content/media/dash/moz.build
+++ b/content/media/dash/moz.build
@@ -8,17 +8,17 @@ MODULE = 'content'
 
 EXPORTS += [
     'DASHDecoder.h',
     'DASHReader.h',
     'DASHRepDecoder.h',
     'DASHRepReader.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'DASHDecoder.cpp',
     'DASHReader.cpp',
     'DASHRepDecoder.cpp',
 ]
 
 LIBRARY_NAME = 'gkcondash_s'
 
 LIBXUL_LIBRARY = True
--- a/content/media/directshow/moz.build
+++ b/content/media/directshow/moz.build
@@ -9,30 +9,30 @@ MODULE = 'content'
 EXPORTS += [
     'AudioSinkFilter.h',
     'AudioSinkInputPin.h',
     'DirectShowDecoder.h',
     'DirectShowReader.h',
     'DirectShowUtils.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'AudioSinkFilter.cpp',
     'AudioSinkInputPin.cpp',
     'DirectShowDecoder.cpp',
     'DirectShowReader.cpp',
     '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 += [ '%s/%s' % (TOPSRCDIR, p) for p in [
+    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
 
--- a/content/media/encoder/moz.build
+++ b/content/media/encoder/moz.build
@@ -7,23 +7,23 @@
 MODULE = 'content'
 
 EXPORTS += [
     'ContainerWriter.h',
     'MediaEncoder.h',
     'TrackEncoder.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'MediaEncoder.cpp',
     'TrackEncoder.cpp',
 ]
 
 if CONFIG['MOZ_OPUS']:
     EXPORTS += ['OpusTrackEncoder.h']
-    CPP_SOURCES += ['OpusTrackEncoder.cpp']
+    SOURCES += ['OpusTrackEncoder.cpp']
 
 LIBRARY_NAME = 'gkconencoder_s'
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
--- a/content/media/gstreamer/moz.build
+++ b/content/media/gstreamer/moz.build
@@ -8,17 +8,17 @@ MODULE = 'content'
 
 EXPORTS += [
     'GStreamerDecoder.h',
     'GStreamerFormatHelper.h',
     'GStreamerLoader.h',
     'GStreamerReader.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'GStreamerDecoder.cpp',
     'GStreamerFormatHelper.cpp',
     'GStreamerLoader.cpp',
     'GStreamerMozVideoBuffer.cpp',
     'GStreamerReader.cpp',
 ]
 
 LIBRARY_NAME = 'gkcongstreamer_s'
--- a/content/media/mediasource/moz.build
+++ b/content/media/mediasource/moz.build
@@ -15,17 +15,17 @@ EXPORTS += [
 ]
 
 EXPORTS.mozilla.dom += [
     'MediaSource.h',
     'SourceBuffer.h',
     'SourceBufferList.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'MediaSource.cpp',
     'MediaSourceDecoder.cpp',
     'SourceBuffer.cpp',
     'SourceBufferList.cpp',
     'SourceBufferResource.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
--- a/content/media/moz.build
+++ b/content/media/moz.build
@@ -101,17 +101,17 @@ EXPORTS.mozilla.dom += [
     'TextTrackCueList.h',
     'TextTrackList.h',
     'TextTrackRegion.h',
     'TextTrackRegionList.h',
     'VideoPlaybackQuality.h',
     'VideoStreamTrack.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'AudioAvailableEventManager.cpp',
     'AudioChannelFormat.cpp',
     'AudioNodeEngine.cpp',
     'AudioNodeExternalInputStream.cpp',
     'AudioNodeStream.cpp',
     'AudioSegment.cpp',
     'AudioStream.cpp',
     'AudioStreamTrack.cpp',
@@ -144,17 +144,17 @@ CPP_SOURCES += [
     'VideoStreamTrack.cpp',
     'VideoUtils.cpp',
     'WebVTTListener.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['BUILD_ARM_NEON']:
-    CPP_SOURCES += [
+    SOURCES += [
         'AudioNodeEngineNEON.cpp',
     ]
 
 LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'gkconmedia_s'
--- a/content/media/ogg/moz.build
+++ b/content/media/ogg/moz.build
@@ -8,17 +8,17 @@ MODULE = 'content'
 
 EXPORTS += [
     'OggCodecState.h',
     'OggDecoder.h',
     'OggReader.h',
     'OggWriter.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'OggCodecState.cpp',
     'OggDecoder.cpp',
     'OggReader.cpp',
     'OggWriter.cpp',
 ]
 
 LIBRARY_NAME = 'gkconogg_s'
 
--- a/content/media/omx/mediaresourcemanager/moz.build
+++ b/content/media/omx/mediaresourcemanager/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 MODULE = 'content'
 
-CPP_SOURCES += [
+SOURCES += [
     'IMediaResourceManagerClient.cpp',
     'IMediaResourceManagerDeathNotifier.cpp',
     'IMediaResourceManagerService.cpp',
     'MediaResourceManagerClient.cpp',
     'MediaResourceManagerService.cpp',
 ]
 
 LIBRARY_NAME = 'mediaresourcemanager'
--- a/content/media/omx/moz.build
+++ b/content/media/omx/moz.build
@@ -6,29 +6,29 @@
 
 MODULE = 'content'
 
 EXPORTS += [
     'MediaOmxDecoder.h',
     'MediaOmxReader.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'MediaOmxDecoder.cpp',
     'MediaOmxReader.cpp',
     'OMXCodecProxy.cpp',
     'OmxDecoder.cpp',
 ]
 
 if CONFIG['MOZ_RTSP']:
     EXPORTS += [
         'RtspOmxDecoder.h',
         'RtspOmxReader.h',
     ]
-    CPP_SOURCES += [
+    SOURCES += [
         'RtspOmxDecoder.cpp',
         'RtspOmxReader.cpp',
     ]
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'gkconomx_s'
 
--- a/content/media/plugins/moz.build
+++ b/content/media/plugins/moz.build
@@ -9,17 +9,17 @@ MODULE = 'content'
 EXPORTS += [
     'MediaPluginDecoder.h',
     'MediaPluginHost.h',
     'MediaPluginReader.h',
     'MediaResourceServer.h',
     'MPAPI.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'MediaPluginDecoder.cpp',
     'MediaPluginHost.cpp',
     'MediaPluginReader.cpp',
     'MediaResourceServer.cpp',
 ]
 
 LIBRARY_NAME = 'gkconmediaplugins_s'
 
--- a/content/media/raw/moz.build
+++ b/content/media/raw/moz.build
@@ -7,17 +7,17 @@
 MODULE = 'content'
 
 EXPORTS += [
     'RawDecoder.h',
     'RawReader.h',
     'RawStructs.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'RawDecoder.cpp',
     'RawReader.cpp',
 ]
 
 LIBRARY_NAME = 'gkconraw_s'
 
 FAIL_ON_WARNINGS = True
 
--- a/content/media/wave/moz.build
+++ b/content/media/wave/moz.build
@@ -6,17 +6,17 @@
 
 MODULE = 'content'
 
 EXPORTS += [
     'WaveDecoder.h',
     'WaveReader.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'WaveDecoder.cpp',
     'WaveReader.cpp',
 ]
 
 LIBRARY_NAME = 'gkconwave_s'
 
 FAIL_ON_WARNINGS = True
 
--- a/content/media/webaudio/blink/moz.build
+++ b/content/media/webaudio/blink/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 MODULE = 'content'
 
-CPP_SOURCES += [
+SOURCES += [
     'Biquad.cpp',
     'DirectConvolver.cpp',
     'DynamicsCompressor.cpp',
     'DynamicsCompressorKernel.cpp',
     'FFTConvolver.cpp',
     'HRTFDatabase.cpp',
     'HRTFDatabaseLoader.cpp',
     'HRTFElevation.cpp',
--- a/content/media/webaudio/moz.build
+++ b/content/media/webaudio/moz.build
@@ -45,17 +45,17 @@ EXPORTS.mozilla.dom += [
     'OfflineAudioCompletionEvent.h',
     'OscillatorNode.h',
     'PannerNode.h',
     'PeriodicWave.h',
     'ScriptProcessorNode.h',
     'WaveShaperNode.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'AnalyserNode.cpp',
     'AudioBuffer.cpp',
     'AudioBufferSourceNode.cpp',
     'AudioContext.cpp',
     'AudioDestinationNode.cpp',
     'AudioListener.cpp',
     'AudioNode.cpp',
     'AudioParam.cpp',
--- a/content/media/webm/moz.build
+++ b/content/media/webm/moz.build
@@ -6,17 +6,17 @@
 
 MODULE = 'content'
 
 EXPORTS += [
     'WebMDecoder.h',
     'WebMReader.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'WebMBufferedParser.cpp',
     'WebMDecoder.cpp',
     'WebMReader.cpp',
 ]
 
 LIBRARY_NAME = 'gkconwebm_s'
 
 FAIL_ON_WARNINGS = True
--- a/content/media/webrtc/moz.build
+++ b/content/media/webrtc/moz.build
@@ -10,27 +10,27 @@ MODULE = 'content'
 
 EXPORTS += [
     'MediaEngine.h',
     'MediaEngineDefault.h',
 ]
 
 if CONFIG['MOZ_WEBRTC']:
     EXPORTS += ['MediaEngineWebRTC.h']
-    CPP_SOURCES += [
+    SOURCES += [
         'MediaEngineTabVideoSource.cpp',
         'MediaEngineWebRTC.cpp',
         'MediaEngineWebRTCAudio.cpp',
         'MediaEngineWebRTCVideo.cpp',
     ]
 XPIDL_SOURCES += [
         'nsITabSource.idl'
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'MediaEngineDefault.cpp',
 ]
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'gkconwebrtc_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
--- a/content/media/webspeech/recognition/moz.build
+++ b/content/media/webspeech/recognition/moz.build
@@ -20,17 +20,17 @@ EXPORTS.mozilla.dom += [
     'SpeechRecognition.h',
     'SpeechRecognitionAlternative.h',
     'SpeechRecognitionResult.h',
     'SpeechRecognitionResultList.h',
     'SpeechStreamListener.h',
     'test/FakeSpeechRecognitionService.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'EnableWebSpeechRecognitionCheck.cpp',
     'endpointer.cc',
     'energy_endpointer.cc',
     'energy_endpointer_params.cc',
     'SpeechGrammar.cpp',
     'SpeechGrammarList.cpp',
     'SpeechRecognition.cpp',
     'SpeechRecognitionAlternative.cpp',
--- a/content/media/webspeech/synth/moz.build
+++ b/content/media/webspeech/synth/moz.build
@@ -22,17 +22,17 @@ if CONFIG['MOZ_WEBSPEECH']:
         'ipc/SpeechSynthesisParent.h',
         'nsSpeechTask.h',
         'nsSynthVoiceRegistry.h',
         'SpeechSynthesis.h',
         'SpeechSynthesisUtterance.h',
         'SpeechSynthesisVoice.h',
     ]
 
-    CPP_SOURCES += [
+    SOURCES += [
         'EnableSpeechSynthesisCheck.cpp',
         'ipc/SpeechSynthesisChild.cpp',
         'ipc/SpeechSynthesisParent.cpp',
         'nsSpeechTask.cpp',
         'nsSynthVoiceRegistry.cpp',
         'SpeechSynthesis.cpp',
         'SpeechSynthesisUtterance.cpp',
         'SpeechSynthesisVoice.cpp',
--- a/content/media/webspeech/synth/pico/moz.build
+++ b/content/media/webspeech/synth/pico/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 MODULE = 'synthpico'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsPicoService.cpp',
     'PicoModule.cpp'
 ]
 
 LIBRARY_NAME = 'synthpico'
 LIBXUL_LIBRARY = True
 EXPORT_LIBRARY = True
 FAIL_ON_WARNINGS = True
--- a/content/media/wmf/moz.build
+++ b/content/media/wmf/moz.build
@@ -7,17 +7,17 @@
 MODULE = 'content'
 
 EXPORTS += [
     'WMF.h',
     'WMFDecoder.h',
     'WMFReader.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'DXVA2Manager.cpp',
     'WMFByteStream.cpp',
     'WMFDecoder.cpp',
     'WMFReader.cpp',
     'WMFSourceReaderCallback.cpp',
     'WMFUtils.cpp',
 ]
 
--- a/content/smil/moz.build
+++ b/content/smil/moz.build
@@ -29,17 +29,17 @@ EXPORTS += [
     'nsSMILTimedElement.h',
     'nsSMILTimeValue.h',
     'nsSMILTimeValueSpec.h',
     'nsSMILTimeValueSpecParams.h',
     'nsSMILTypes.h',
     'nsSMILValue.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'nsDOMTimeEvent.cpp',
     'nsSMILAnimationController.cpp',
     'nsSMILAnimationFunction.cpp',
     'nsSMILCompositor.cpp',
     'nsSMILCSSProperty.cpp',
     'nsSMILCSSValueType.cpp',
     'nsSMILFloatType.cpp',
     'nsSMILInstanceTime.cpp',
--- a/content/svg/content/src/moz.build
+++ b/content/svg/content/src/moz.build
@@ -94,17 +94,17 @@ EXPORTS.mozilla.dom += [
     'SVGTransform.h',
     'SVGTransformableElement.h',
     'SVGTSpanElement.h',
     'SVGUseElement.h',
     'SVGViewElement.h',
     'SVGZoomEvent.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'DOMSVGAnimatedLengthList.cpp',
     'DOMSVGAnimatedNumberList.cpp',
     'DOMSVGLength.cpp',
     'DOMSVGLengthList.cpp',
     'DOMSVGNumber.cpp',
     'DOMSVGNumberList.cpp',
     'DOMSVGPathSeg.cpp',
     'DOMSVGPathSegList.cpp',
--- a/content/svg/document/src/moz.build
+++ b/content/svg/document/src/moz.build
@@ -5,17 +5,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'content'
 
 EXPORTS.mozilla.dom += [
     'SVGDocument.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'SVGDocument.cpp',
 ]
 
 LIBRARY_NAME = 'gkconsvgdoc_s'
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
--- a/content/xbl/src/moz.build
+++ b/content/xbl/src/moz.build
@@ -11,17 +11,17 @@ EXPORTS += [
     'nsXBLBinding.h',
     'nsXBLService.h',
 ]
 
 EXPORTS.mozilla.dom += [
     'XBLChildrenElement.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'nsBindingManager.cpp',
     'nsXBLBinding.cpp',
     'nsXBLContentSink.cpp',
     'nsXBLDocumentInfo.cpp',
     'nsXBLEventHandler.cpp',
     'nsXBLProtoImpl.cpp',
     'nsXBLProtoImplField.cpp',
     'nsXBLProtoImplMethod.cpp',
--- a/content/xml/content/src/moz.build
+++ b/content/xml/content/src/moz.build
@@ -8,17 +8,17 @@ MODULE = 'content'
 
 EXPORTS.mozilla.dom += [
     'CDATASection.h',
     'nsXMLElement.h',
     'ProcessingInstruction.h',
     'XMLStylesheetProcessingInstruction.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'CDATASection.cpp',
     'nsXMLElement.cpp',
     'ProcessingInstruction.cpp',
     'XMLStylesheetProcessingInstruction.cpp',
 ]
 
 LIBRARY_NAME = 'gkconxmlcon_s'
 
--- a/content/xml/document/src/moz.build
+++ b/content/xml/document/src/moz.build
@@ -5,17 +5,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'content'
 
 EXPORTS.mozilla.dom += [
     'XMLDocument.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'nsXMLContentSink.cpp',
     'nsXMLFragmentContentSink.cpp',
     'nsXMLPrettyPrinter.cpp',
     'XMLDocument.cpp',
 ]
 
 LIBRARY_NAME = 'gkconxmldoc_s'
 
--- a/content/xslt/src/base/moz.build
+++ b/content/xslt/src/base/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 MODULE = 'transformiix'
 
-CPP_SOURCES += [
+SOURCES += [
     'txDouble.cpp',
     'txExpandedNameMap.cpp',
     'txList.cpp',
     'txNamespaceMap.cpp',
     'txURIUtils.cpp',
 ]
 
 LIBRARY_NAME = 'txbase_s'
--- a/content/xslt/src/xml/moz.build
+++ b/content/xslt/src/xml/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 MODULE = 'transformiix'
 
-CPP_SOURCES += [
+SOURCES += [
     'txXMLParser.cpp',
     'txXMLUtils.cpp',
 ]
 
 LIBRARY_NAME = 'txxml_s'
 
 FAIL_ON_WARNINGS = True
 
--- a/content/xslt/src/xpath/moz.build
+++ b/content/xslt/src/xpath/moz.build
@@ -5,17 +5,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'transformiix'
 
 EXPORTS.mozilla.dom += [
     'XPathEvaluator.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'nsXPathExpression.cpp',
     'nsXPathNSResolver.cpp',
     'nsXPathResult.cpp',
     'txBooleanExpr.cpp',
     'txBooleanResult.cpp',
     'txCoreFunctionCall.cpp',
     'txErrorExpr.cpp',
     'txExpr.cpp',
--- a/content/xslt/src/xslt/moz.build
+++ b/content/xslt/src/xslt/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 MODULE = 'transformiix'
 
-CPP_SOURCES += [
+SOURCES += [
     'txBufferingHandler.cpp',
     'txCurrentFunctionCall.cpp',
     'txDocumentFunctionCall.cpp',
     'txExecutionState.cpp',
     'txEXSLTFunctions.cpp',
     'txFormatNumberFunctionCall.cpp',
     'txGenerateIdFunctionCall.cpp',
     'txInstructions.cpp',
--- a/content/xul/content/src/moz.build
+++ b/content/xul/content/src/moz.build
@@ -5,17 +5,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'xul'
 
 if CONFIG['MOZ_XUL']:
     LIBXUL_LIBRARY = True
     MSVC_ENABLE_PGO = True
 
-    CPP_SOURCES += [
+    SOURCES += [
         'nsXULContextMenuBuilder.cpp',
         'nsXULElement.cpp',
         'nsXULPopupListener.cpp',
     ]
     LIBRARY_NAME = 'gkconxulcon_s'
 
 FAIL_ON_WARNINGS = True
 
--- a/content/xul/document/src/moz.build
+++ b/content/xul/document/src/moz.build
@@ -1,22 +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/.
 
 MODULE = 'xuldoc'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsXULControllers.cpp',
 ]
 
 if CONFIG['MOZ_XUL']:
-    CPP_SOURCES += [
+    SOURCES += [
         'nsXULCommandDispatcher.cpp',
         'nsXULContentSink.cpp',
         'nsXULPrototypeCache.cpp',
         'nsXULPrototypeDocument.cpp',
         'XULDocument.cpp',
     ]
 
 LIBRARY_NAME = 'gkconxuldoc_s'
--- a/content/xul/templates/src/moz.build
+++ b/content/xul/templates/src/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 MODULE = 'xultmpl'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsContentSupportMap.cpp',
     'nsContentTestNode.cpp',
     'nsInstantiationNode.cpp',
     'nsRDFBinding.cpp',
     'nsRDFConInstanceTestNode.cpp',
     'nsRDFConMemberTestNode.cpp',
     'nsRDFPropertyTestNode.cpp',
     'nsRDFQuery.cpp',
--- a/db/sqlite3/src/moz.build
+++ b/db/sqlite3/src/moz.build
@@ -7,12 +7,12 @@
 MODULE = 'sqlite3'
 
 EXPORTS += [
     'sqlite3.h',
 ]
 
 LIBRARY_NAME = 'mozsqlite3'
 
-CSRCS += [
+SOURCES += [
     'sqlite3.c',
 ]
 
--- a/docshell/base/moz.build
+++ b/docshell/base/moz.build
@@ -42,17 +42,17 @@ EXPORTS += [
     'SerializedLoadContext.h',
 ]
 
 EXPORTS.mozilla += [
     'IHistory.h',
     'LoadContext.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'LoadContext.cpp',
     'nsAboutRedirector.cpp',
     'nsDefaultURIFixup.cpp',
     'nsDocShell.cpp',
     'nsDocShellEditorData.cpp',
     'nsDocShellEnumerator.cpp',
     'nsDocShellLoadInfo.cpp',
     'nsDocShellTransferableHooks.cpp',
--- a/docshell/build/moz.build
+++ b/docshell/build/moz.build
@@ -5,17 +5,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'docshell'
 
 EXPORTS += [
     'nsDocShellCID.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'nsDocShellModule.cpp',
 ]
 
 LIBRARY_NAME = 'docshell'
 
 LIBXUL_LIBRARY = True
 
 LOCAL_INCLUDES += [
--- a/docshell/shistory/src/moz.build
+++ b/docshell/shistory/src/moz.build
@@ -5,17 +5,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'shistory'
 
 EXPORTS += [
     'nsSHEntryShared.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'nsSHEntry.cpp',
     'nsSHEntryShared.cpp',
     'nsSHistory.cpp',
     'nsSHTransaction.cpp',
 ]
 
 LIBRARY_NAME = 'shistory_s'
 
--- a/dom/activities/src/moz.build
+++ b/dom/activities/src/moz.build
@@ -5,17 +5,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'dom'
 
 EXPORTS.mozilla.dom += [
     'Activity.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'Activity.cpp',
 ]
 
 EXTRA_COMPONENTS += [
     'Activities.manifest',
     'ActivityMessageConfigurator.js',
     'ActivityOptions.js',
     'ActivityProxy.js',
--- a/dom/alarm/moz.build
+++ b/dom/alarm/moz.build
@@ -14,17 +14,17 @@ XPIDL_SOURCES += [
 XPIDL_MODULE = 'dom_alarm'
 
 MODULE = 'dom'
 
 EXPORTS.mozilla.dom.alarm += [
     'AlarmHalService.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'AlarmHalService.cpp',
 ]
 
 EXTRA_COMPONENTS += [
     'AlarmsManager.js',
     'AlarmsManager.manifest',
 ]
 
--- a/dom/apps/src/moz.build
+++ b/dom/apps/src/moz.build
@@ -3,17 +3,17 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 EXPORTS.mozilla.dom += [
     'InterAppComm.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'InterAppComm.cpp',
 ]
 
 EXTRA_COMPONENTS += [
     'AppsService.js',
     'AppsService.manifest',
     'InterAppComm.manifest',
     'InterAppCommService.js',
--- a/dom/audiochannel/moz.build
+++ b/dom/audiochannel/moz.build
@@ -16,17 +16,17 @@ MODULE = 'dom'
 
 EXPORTS += [
     'AudioChannelAgent.h',
     'AudioChannelCommon.h',
     'AudioChannelService.h',
     'AudioChannelServiceChild.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'AudioChannelAgent.cpp',
     'AudioChannelService.cpp',
     'AudioChannelServiceChild.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@@ -58,17 +58,17 @@ EXPORTS.mozilla.dom += [
     'MessageChannel.h',
     'MessagePort.h',
     'MessagePortList.h',
     'ScreenOrientation.h',
     'StructuredCloneTags.h',
     'URL.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'BarProps.cpp',
     'CompositionStringSynthesizer.cpp',
     'Crypto.cpp',
     'DOMCursor.cpp',
     'DOMError.cpp',
     'DOMException.cpp',
     'DOMRequest.cpp',
     'MessageChannel.cpp',
--- a/dom/battery/moz.build
+++ b/dom/battery/moz.build
@@ -6,17 +6,17 @@
 
 TEST_DIRS += ['test']
 
 EXPORTS.mozilla.dom.battery += [
     'Constants.h',
     'Types.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'BatteryManager.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'dom_battery_s'
--- a/dom/bluetooth/moz.build
+++ b/dom/bluetooth/moz.build
@@ -20,17 +20,17 @@ if CONFIG['MOZ_B2G_BT']:
     LIBRARY_NAME = 'dombluetooth_s'
     XPIDL_MODULE = 'dom_bluetooth'
     XPIDL_SOURCES += [
         'nsIDOMBluetoothDevice.idl',
         'nsIDOMBluetoothDeviceEvent.idl',
         'nsIDOMBluetoothStatusChangedEvent.idl',
     ]
 
-    CPP_SOURCES += [
+    SOURCES += [
         'BluetoothA2dpManager.cpp',
         'BluetoothAdapter.cpp',
         'BluetoothDevice.cpp',
         'BluetoothHfpManager.cpp',
         'BluetoothHidManager.cpp',
         'BluetoothManager.cpp',
         'BluetoothOppManager.cpp',
         'BluetoothProfileController.cpp',
@@ -43,33 +43,33 @@ if CONFIG['MOZ_B2G_BT']:
         'BluetoothUuid.cpp',
         'ipc/BluetoothChild.cpp',
         'ipc/BluetoothParent.cpp',
         'ipc/BluetoothServiceChildProcess.cpp',
         'ObexBase.cpp'
     ]
 
     if CONFIG['MOZ_B2G_RIL']:
-        CPP_SOURCES += [
+        SOURCES += [
             'BluetoothRilListener.cpp',
         ]
 
     if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
         if CONFIG['MOZ_B2G_BT_BLUEZ']:
-            CPP_SOURCES += [
+            SOURCES += [
                'gonk/BluetoothGonkService.cpp',
                'linux/BluetoothDBusService.cpp',
             ]
         if CONFIG['MOZ_B2G_BT_BLUEDROID']:
-            CPP_SOURCES += [
+            SOURCES += [
                 'BluetoothServiceBluedroid.cpp',
             ]
     else:
         if CONFIG['MOZ_ENABLE_DBUS']:
-            CPP_SOURCES += [
+            SOURCES += [
                  'linux/BluetoothDBusService.cpp',
             ]
 
 EXPORTS.mozilla.dom.bluetooth.ipc += [
     'ipc/BluetoothMessageUtils.h',
 ]
 
 EXPORTS.mozilla.dom.bluetooth += [
--- a/dom/browser-element/moz.build
+++ b/dom/browser-element/moz.build
@@ -9,17 +9,17 @@ TEST_DIRS += ['mochitest']
 XPIDL_MODULE = 'dom_browserelement'
 
 MODULE = 'dom'
 
 EXPORTS.mozilla += [
     'BrowserElementParent.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'BrowserElementParent.cpp',
 ]
 
 EXTRA_COMPONENTS += [
     'BrowserElementParent.js',
     'BrowserElementParent.manifest',
 ]
 
--- a/dom/camera/moz.build
+++ b/dom/camera/moz.build
@@ -17,37 +17,37 @@ MODULE = 'dom'
 
 EXPORTS += [
     'CameraCommon.h',
     'CameraPreviewMediaStream.h',
     'DOMCameraManager.h',
     'GonkCameraControl.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'CameraControlImpl.cpp',
     'CameraPreviewMediaStream.cpp',
     'CameraRecorderProfiles.cpp',
     'DOMCameraCapabilities.cpp',
     'DOMCameraControl.cpp',
     'DOMCameraManager.cpp',
     'DOMCameraPreview.cpp',
 ]
 
 if CONFIG['MOZ_B2G_CAMERA']:
-    CPP_SOURCES += [
+    SOURCES += [
         'GonkCameraControl.cpp',
         'GonkCameraHwMgr.cpp',
         'GonkCameraManager.cpp',
         'GonkCameraSource.cpp',
         'GonkRecorder.cpp',
         'GonkRecorderProfiles.cpp',
     ]
 else:
-    CPP_SOURCES += [
+    SOURCES += [
         'FallbackCameraControl.cpp',
         'FallbackCameraManager.cpp',
     ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
--- a/dom/cellbroadcast/src/moz.build
+++ b/dom/cellbroadcast/src/moz.build
@@ -5,17 +5,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_MODULE = 'dom_cellbroadcast'
 
 EXPORTS.mozilla.dom += [
     'CellBroadcast.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'CellBroadcast.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'dom_cellbroadcast_s'
--- a/dom/devicestorage/moz.build
+++ b/dom/devicestorage/moz.build
@@ -15,17 +15,17 @@ EXPORTS += [
     'nsDeviceStorage.h',
 ]
 
 EXPORTS.mozilla.dom.devicestorage += [
     'DeviceStorageRequestChild.h',
     'DeviceStorageRequestParent.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'DeviceStorageRequestChild.cpp',
     'DeviceStorageRequestParent.cpp',
     'nsDeviceStorage.cpp',
 ]
 
 IPDL_SOURCES += [
     'PDeviceStorageRequest.ipdl',
 ]
--- a/dom/encoding/moz.build
+++ b/dom/encoding/moz.build
@@ -9,17 +9,17 @@ TEST_DIRS += ['test']
 MODULE = 'dom'
 
 EXPORTS.mozilla.dom += [
     'EncodingUtils.h',
     'TextDecoder.h',
     'TextEncoder.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'EncodingUtils.cpp',
     'TextDecoder.cpp',
     'TextEncoder.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
--- a/dom/file/moz.build
+++ b/dom/file/moz.build
@@ -30,17 +30,17 @@ EXPORTS.mozilla.dom.file += [
     'File.h',
     'FileCommon.h',
     'FileHandle.h',
     'FileHelper.h',
     'FileService.h',
     'LockedFile.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'ArchiveEvent.cpp',
     'ArchiveReader.cpp',
     'ArchiveRequest.cpp',
     'ArchiveZipEvent.cpp',
     'ArchiveZipFile.cpp',
     'AsyncHelper.cpp',
     'DOMFileHandle.cpp',
     'DOMFileRequest.cpp',
--- a/dom/fmradio/ipc/moz.build
+++ b/dom/fmradio/ipc/moz.build
@@ -6,17 +6,17 @@
 
 EXPORTS.mozilla.dom += [
     'FMRadioChild.h',
     'FMRadioParent.h',
     'FMRadioRequestChild.h',
     'FMRadioRequestParent.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'FMRadioChild.cpp',
     'FMRadioParent.cpp',
     'FMRadioRequestChild.cpp',
     'FMRadioRequestParent.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
--- a/dom/fmradio/moz.build
+++ b/dom/fmradio/moz.build
@@ -12,17 +12,17 @@ if CONFIG['MOZ_B2G_FM']:
     MODULE = 'dom'
 
     EXPORTS.mozilla.dom += [
         'FMRadio.h',
         'FMRadioCommon.h',
         'FMRadioService.h',
     ]
 
-    CPP_SOURCES += [
+    SOURCES += [
         'FMRadio.cpp',
         'FMRadioService.cpp',
     ]
 
     LIBXUL_LIBRARY = True
 
     LIBRARY_NAME = 'domfmradio_s'
 
--- a/dom/gamepad/moz.build
+++ b/dom/gamepad/moz.build
@@ -5,17 +5,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 EXPORTS.mozilla.dom += [
     'Gamepad.h',
     'GamepadButton.h',
     'GamepadService.h',
     ]
 
-CPP_SOURCES = [
+SOURCES = [
     'Gamepad.cpp',
     'GamepadButton.cpp',
     'GamepadService.cpp',
     ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
--- a/dom/icc/src/moz.build
+++ b/dom/icc/src/moz.build
@@ -4,17 +4,17 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 EXPORTS.mozilla.dom += [
     'IccManager.h',
     'StkCommandEvent.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'IccManager.cpp',
     'StkCommandEvent.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
--- a/dom/indexedDB/ipc/moz.build
+++ b/dom/indexedDB/ipc/moz.build
@@ -8,17 +8,17 @@ MODULE = 'dom'
 
 EXPORTS.mozilla.dom.indexedDB += [
     'SerializationHelpers.h',
 ]
 
 # Need to enable these tests sometime soon.
 #XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
 
-CPP_SOURCES += [
+SOURCES += [
     'IndexedDBChild.cpp',
     'IndexedDBParent.cpp',
 ]
 
 IPDL_SOURCES += [
     'IndexedDBParams.ipdlh',
     'PIndexedDB.ipdl',
     'PIndexedDBCursor.ipdl',
--- a/dom/indexedDB/moz.build
+++ b/dom/indexedDB/moz.build
@@ -32,17 +32,17 @@ EXPORTS.mozilla.dom.indexedDB += [
     'IDBTransaction.h',
     'IDBWrapperCache.h',
     'IndexedDatabase.h',
     'IndexedDatabaseManager.h',
     'Key.h',
     'KeyPath.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'AsyncConnectionHelper.cpp',
     'CheckPermissionsHelper.cpp',
     'Client.cpp',
     'DatabaseInfo.cpp',
     'FileInfo.cpp',
     'FileManager.cpp',
     'IDBCursor.cpp',
     'IDBDatabase.cpp',
--- a/dom/ipc/moz.build
+++ b/dom/ipc/moz.build
@@ -34,17 +34,17 @@ EXPORTS.mozilla.dom += [
 ]
 
 EXPORTS.mozilla += [
     'AppProcessChecker.h',
     'PreallocatedProcessManager.h',
     'ProcessPriorityManager.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'AppProcessChecker.cpp',
     'Blob.cpp',
     'ContentChild.cpp',
     'ContentParent.cpp',
     'ContentProcess.cpp',
     'CrashReporterChild.cpp',
     'CrashReporterParent.cpp',
     'PermissionMessageUtils.cpp',
--- a/dom/media/bridge/moz.build
+++ b/dom/media/bridge/moz.build
@@ -5,17 +5,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'IPeerConnection.idl',
 ]
 
 MODULE = 'peerconnection'
 
-CPP_SOURCES += [
+SOURCES += [
     'MediaModule.cpp',
 ]
 
 LOCAL_INCLUDES += [
     '/ipc/chromium/src',
     '/media/mtransport',
     '/media/webrtc/signaling/include',
     '/media/webrtc/signaling/src/common/time_profiling',
--- a/dom/media/moz.build
+++ b/dom/media/moz.build
@@ -22,31 +22,31 @@ MODULE = 'dom'
 EXPORTS.mozilla.dom += [
     'GetUserMediaRequest.h',
 ]
 
 EXPORTS.mozilla += [
     'MediaManager.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'GetUserMediaRequest.cpp',
     'MediaManager.cpp',
 ]
 
 EXTRA_COMPONENTS += [
     'PeerConnection.js',
     'PeerConnection.manifest',
 ]
 
 if CONFIG['MOZ_B2G']:
     EXPORTS.mozilla += [
         'MediaPermissionGonk.h',
     ]
-    CPP_SOURCES += [
+    SOURCES += [
         'MediaPermissionGonk.cpp',
     ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'dom_media_s'
--- a/dom/mobilemessage/src/moz.build
+++ b/dom/mobilemessage/src/moz.build
@@ -9,17 +9,17 @@ EXPORTS.mozilla.dom.mobilemessage += [
     'ipc/SmsChild.h',
     'ipc/SmsParent.h',
     'MobileMessageService.h', # Required by nsLayoutModule.cpp
     'SmsServicesFactory.h',   # Required by nsLayoutModule.cpp
     'Types.h',                # Required by IPDL SmsTypes.h
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
-    CPP_SOURCES += [
+    SOURCES += [
         'android/MmsService.cpp',
         'android/MobileMessageDatabaseService.cpp',
         'android/SmsService.cpp',
     ]
 elif CONFIG['MOZ_B2G_RIL']:
     EXTRA_JS_MODULES = [
         'gonk/mms_consts.js',
         'gonk/MmsPduHelper.jsm',
@@ -27,35 +27,35 @@ elif CONFIG['MOZ_B2G_RIL']:
         'gonk/WspPduHelper.jsm',
     ]
     EXTRA_COMPONENTS += [
         'gonk/MmsService.js',
         'gonk/MmsService.manifest',
         'gonk/MobileMessageDatabaseService.js',
         'gonk/MobileMessageDatabaseService.manifest',
     ]
-    CPP_SOURCES += [
+    SOURCES += [
         'gonk/SmsService.cpp',
     ]
 else:
-    CPP_SOURCES += [
+    SOURCES += [
         'fallback/MmsService.cpp',
         'fallback/MobileMessageDatabaseService.cpp',
         'fallback/SmsService.cpp',
     ]
 
 EXPORTS.mozilla.dom += [
     'MmsMessage.h',
     'MobileMessageManager.h',
     'SmsFilter.h',
     'SmsMessage.h',
     'SmsSegmentInfo.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'Constants.cpp',
     'ipc/SmsChild.cpp',
     'ipc/SmsIPCService.cpp',
     'ipc/SmsParent.cpp',
     'MmsMessage.cpp',
     'MobileMessageCallback.cpp',
     'MobileMessageCursorCallback.cpp',
     'MobileMessageManager.cpp',
--- a/dom/network/src/moz.build
+++ b/dom/network/src/moz.build
@@ -8,26 +8,26 @@ EXPORTS.mozilla.dom.network += [
     'Constants.h',
     'TCPServerSocketChild.h',
     'TCPServerSocketParent.h',
     'TCPSocketChild.h',
     'TCPSocketParent.h',
     'Types.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'Connection.cpp',
     'TCPServerSocketChild.cpp',
     'TCPServerSocketParent.cpp',
     'TCPSocketChild.cpp',
     'TCPSocketParent.cpp',
 ]
 
 if CONFIG['MOZ_B2G_RIL']:
-    CPP_SOURCES += [
+    SOURCES += [
         'MobileConnection.cpp',
     ]
     EXTRA_JS_MODULES = [
         'NetworkStatsDB.jsm',
         'NetworkStatsService.jsm',
     ]
 
 EXTRA_COMPONENTS += [
--- a/dom/plugins/base/android/moz.build
+++ b/dom/plugins/base/android/moz.build
@@ -6,17 +6,17 @@
 
 MODULE = 'plugin'
 
 EXPORTS += [
     'android_npapi.h',
     'ANPKeyCodes.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'ANPAudio.cpp',
     'ANPBitmap.cpp',
     'ANPEvent.cpp',
     'ANPLog.cpp',
     'ANPMatrix.cpp',
     'ANPNativeWindow.cpp',
     'ANPOpenGL.cpp',
     'ANPSurface.cpp',
--- a/dom/plugins/base/moz.build
+++ b/dom/plugins/base/moz.build
@@ -37,60 +37,60 @@ EXPORTS += [
     'nsPluginsDir.h',
     'nsPluginTags.h',
 ]
 
 EXPORTS.mozilla += [
     'PluginPRLibrary.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'nsJSNPRuntime.cpp',
     'nsNPAPIPlugin.cpp',
     'nsNPAPIPluginInstance.cpp',
     'nsNPAPIPluginStreamListener.cpp',
     'nsPluginHost.cpp',
     'nsPluginInstanceOwner.cpp',
     'nsPluginModule.cpp',
     'nsPluginPlayPreviewInfo.cpp',
     'nsPluginStreamListenerPeer.cpp',
     'nsPluginTags.cpp',
     'PluginPRLibrary.cpp',
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':
-    CPP_SOURCES += [
+    SOURCES += [
         'nsPluginDirServiceProvider.cpp',
         'nsPluginNativeWindowWin.cpp',
         'nsPluginsDirWin.cpp',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'os2':
-    CPP_SOURCES += [
+    SOURCES += [
         'nsPluginNativeWindowOS2.cpp',
         'nsPluginsDirOS2.cpp',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    CPP_SOURCES += [
+    SOURCES += [
         'nsPluginNativeWindow.cpp',
         'nsPluginsDirDarwin.cpp',
     ]
 else:
-    CPP_SOURCES += [
+    SOURCES += [
         'nsPluginsDirUnix.cpp',
     ]
     if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk2':
-        CPP_SOURCES += [
+        SOURCES += [
             'nsPluginNativeWindowGtk2.cpp',
         ]
     elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
-        CPP_SOURCES += [
+        SOURCES += [
             'nsPluginNativeWindowQt.cpp',
         ]
     else:
-        CPP_SOURCES += [
+        SOURCES += [
             'nsPluginNativeWindow.cpp',
         ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
     # android_npapi.h extends the NPNVariable and NPPVariable enums
     # using #defines, which results in Wswitch warnings in gcc-4.6.
     # Therefore, enable FAIL_ON_WARNINGS only on non-Android platforms.
     FAIL_ON_WARNINGS = True
--- a/dom/plugins/ipc/hangui/moz.build
+++ b/dom/plugins/ipc/hangui/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/.
 
 FAIL_ON_WARNINGS = True
 
 PROGRAM = 'plugin-hang-ui'
 
-CPP_SOURCES += [
+SOURCES += [
     'MiniShmChild.cpp',
     'PluginHangUIChild.cpp',
 ]
 include('/ipc/chromium/chromium-config.mozbuild')
 
--- a/dom/plugins/ipc/interpose/moz.build
+++ b/dom/plugins/ipc/interpose/moz.build
@@ -1,13 +1,13 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 LIBRARY_NAME = 'plugin_child_interpose'
 
-CMMSRCS += [ "%s.mm" % (LIBRARY_NAME) ]
+SOURCES += [ "%s.mm" % (LIBRARY_NAME) ]
 
-CMMSRCS += [
+SOURCES += [
     'plugin_child_quirks.mm',
 ]
--- a/dom/plugins/ipc/moz.build
+++ b/dom/plugins/ipc/moz.build
@@ -43,35 +43,35 @@ EXPORTS.mozilla.plugins += [
     'StreamNotifyChild.h',
     'StreamNotifyParent.h',
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     EXPORTS.mozilla.plugins += [
         'PluginSurfaceParent.h',
     ]
-    CPP_SOURCES += [
+    SOURCES += [
         'COMMessageFilter.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 += [
+    SOURCES += [
         'moc_NestedLoopTimer.cpp',
         'NestedLoopTimer.cpp',
     ]
 
-CPP_SOURCES += [
+SOURCES += [
     'BrowserStreamChild.cpp',
     'BrowserStreamParent.cpp',
     'ChildAsyncCall.cpp',
     'ChildTimer.cpp',
     'PluginBackgroundDestroyer.cpp',
     'PluginIdentifierChild.cpp',
     'PluginIdentifierParent.cpp',
     'PluginInstanceChild.cpp',
@@ -83,17 +83,17 @@ CPP_SOURCES += [
     'PluginProcessParent.cpp',
     'PluginScriptableObjectChild.cpp',
     'PluginScriptableObjectParent.cpp',
     'PluginStreamChild.cpp',
     'PluginStreamParent.cpp',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    CMMSRCS += [
+    SOURCES += [
         'PluginInterposeOSX.mm',
         'PluginUtilsOSX.mm',
     ]
 
 IPDL_SOURCES += [
     'PBrowserStream.ipdl',
     'PPluginBackgroundDestroyer.ipdl',
     'PPluginIdentifier.ipdl',
--- a/dom/plugins/test/testplugin/testplugin.mozbuild
+++ b/dom/plugins/test/testplugin/testplugin.mozbuild
@@ -1,42 +1,42 @@
 # -*- 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 [
+SOURCES += [ '%s/%s' % (relative_path, p) for p in [
     'nptest.cpp',
     'nptest_utils.cpp',
 ]]
 
-CPP_SOURCES += [
+SOURCES += [
     'nptest_name.cpp',
 ]
 
 toolkit = CONFIG['MOZ_WIDGET_TOOLKIT']
 if toolkit == 'cocoa':
-    CMMSRCS += [
+    SOURCES += [
         relative_path + '/nptest_macosx.mm'
     ]
 elif toolkit == 'gtk2':
-    CPP_SOURCES += [
+    SOURCES += [
         relative_path + '/nptest_gtk2.cpp',
     ]
 elif toolkit == 'android':
-    CPP_SOURCES += [
+    SOURCES += [
         relative_path + '/nptest_droid.cpp',
     ]
 elif toolkit == 'os2':
-    CPP_SOURCES += [
+    SOURCES += [
         relative_path + '/nptest_os2.cpp',
     ]
 elif toolkit == 'qt':
-    CPP_SOURCES += [
+    SOURCES += [
         relative_path + '/nptest_qt.cpp',
     ]
 elif toolkit == 'windows':
-    CPP_SOURCES += [
+    SOURCES += [
         relative_path + '/nptest_windows.cpp',
     ]
--- a/dom/power/moz.build
+++ b/dom/power/moz.build
@@ -19,17 +19,17 @@ EXPORTS.mozilla.dom += [
     'PowerManager.h',
 ]
 
 EXPORTS.mozilla.dom.power += [
     'PowerManagerService.h',
     'Types.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'PowerManager.cpp',
     'PowerManagerService.cpp',
     'WakeLock.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
--- a/dom/promise/moz.build
+++ b/dom/promise/moz.build
@@ -9,17 +9,17 @@ TEST_DIRS += ['tests']
 XPIDL_MODULE = 'dom_promise'
 
 MODULE = 'dom'
 
 EXPORTS.mozilla.dom += [
     'Promise.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'Promise.cpp',
     'PromiseCallback.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
--- a/dom/quota/moz.build
+++ b/dom/quota/moz.build
@@ -28,17 +28,17 @@ EXPORTS.mozilla.dom.quota += [
     'QuotaCommon.h',
     'QuotaManager.h',
     'QuotaObject.h',
     'StoragePrivilege.h',
     'UsageInfo.h',
     'Utilities.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'CheckQuotaHelper.cpp',
     'FileStreams.cpp',
     'QuotaManager.cpp',
     'QuotaObject.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
--- a/dom/src/events/moz.build
+++ b/dom/src/events/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 MODULE = 'dom'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsJSEventListener.cpp',
 ]
 
 LIBRARY_NAME = 'jsdomevents_s'
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
--- a/dom/src/geolocation/moz.build
+++ b/dom/src/geolocation/moz.build
@@ -6,17 +6,17 @@
 
 MODULE = 'dom'
 
 EXPORTS += [
     'nsGeoPosition.h',
     'nsGeoPositionIPCSerialiser.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'nsGeolocation.cpp',
     'nsGeoPosition.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
--- a/dom/src/json/moz.build
+++ b/dom/src/json/moz.build
@@ -7,17 +7,17 @@
 TEST_DIRS += ['test']
 
 MODULE = 'dom'
 
 EXPORTS += [
     'nsJSON.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'nsJSON.cpp',
 ]
 
 LIBRARY_NAME = 'json_s'
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
--- a/dom/src/jsurl/moz.build
+++ b/dom/src/jsurl/moz.build
@@ -7,17 +7,17 @@
 TEST_DIRS += ['test']
 
 MODULE = 'jsurl'
 
 EXPORTS += [
     'nsJSProtocolHandler.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'nsJSProtocolHandler.cpp',
 ]
 
 LIBRARY_NAME = 'jsurl_s'
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
--- a/dom/src/notification/moz.build
+++ b/dom/src/notification/moz.build
@@ -15,17 +15,17 @@ EXTRA_JS_MODULES += [
     'NotificationDB.jsm'
 ]
 
 EXPORTS.mozilla.dom += [
     'DesktopNotification.h',
     'Notification.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'DesktopNotification.cpp',
     'Notification.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
--- a/dom/src/offline/moz.build
+++ b/dom/src/offline/moz.build
@@ -4,17 +4,17 @@
 # License, v. 2.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'
 
 EXPORTS += [
     'nsDOMOfflineResourceList.h',
 ]
-CPP_SOURCES += [
+SOURCES += [
     'nsDOMOfflineResourceList.cpp',
 ]
 
 LIBRARY_NAME = 'jsdomoffline_s'
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
--- a/dom/src/storage/moz.build
+++ b/dom/src/storage/moz.build
@@ -5,17 +5,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'dom'
 
 EXPORTS.mozilla.dom += [
     'DOMStorageIPC.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'DOMStorage.cpp',
     'DOMStorageCache.cpp',
     'DOMStorageDBThread.cpp',
     'DOMStorageIPC.cpp',
     'DOMStorageManager.cpp',
     'DOMStorageObserver.cpp',
 ]
 
--- a/dom/system/android/moz.build
+++ b/dom/system/android/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 MODULE = 'dom'
 
-CPP_SOURCES += [
+SOURCES += [
     'AndroidLocationProvider.cpp',
     'nsHapticFeedback.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
--- a/dom/system/gonk/moz.build
+++ b/dom/system/gonk/moz.build
@@ -32,17 +32,17 @@ XPIDL_MODULE = 'dom_system_gonk'
 MODULE = 'dom'
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     EXPORTS += [
         'GonkGPSGeolocationProvider.h',
         'nsVolume.h',
         'nsVolumeService.h',
     ]
-    CPP_SOURCES += [
+    SOURCES += [
         'AudioChannelManager.cpp',
         'AudioManager.cpp',
         'AutoMounter.cpp',
         'AutoMounterSetting.cpp',
         'GonkGPSGeolocationProvider.cpp',
         'nsVolume.cpp',
         'nsVolumeMountLock.cpp',
         'nsVolumeService.cpp',
@@ -54,17 +54,17 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk
         'VolumeManager.cpp',
         'VolumeServiceIOThread.cpp',
         'VolumeServiceTest.cpp',
     ]
 
 if CONFIG['ENABLE_TESTS']:
     XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell.ini']
 
-CPP_SOURCES += [
+SOURCES += [
     'SystemWorkerManager.cpp',
 ]
 
 EXTRA_COMPONENTS += [
     'NetworkInterfaceListService.js',
     'NetworkInterfaceListService.manifest',
     'NetworkManager.js',
     'NetworkManager.manifest',
--- a/dom/system/mac/moz.build
+++ b/dom/system/mac/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 MODULE = 'dom'
 
-CMMSRCS += ['CoreLocationLocationProvider.mm']
+SOURCES += ['CoreLocationLocationProvider.mm']
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'domsystemmac_s'
 
 EXPORT_LIBRARY = True
--- a/dom/system/moz.build
+++ b/dom/system/moz.build
@@ -31,17 +31,17 @@ MODULE = 'dom'
 EXPORTS += [
     'nsDeviceSensors.h',
 ]
 
 EXPORTS.mozilla += [
     'OSFileConstants.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'nsDeviceSensors.cpp',
     'OSFileConstants.cpp',
 ]
 
 # On Systems that have build in geolocation providers,
 # we really do not need these.
 if CONFIG['OS_TARGET'] != 'Android' or CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     EXTRA_COMPONENTS += [
--- a/dom/system/unix/moz.build
+++ b/dom/system/unix/moz.build
@@ -2,17 +2,17 @@
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'dom'
 
 if CONFIG['MOZ_ENABLE_QTMOBILITY']:
-    CPP_SOURCES += [
+    SOURCES += [
         'moc_QTMLocationProvider.cpp',
         'QTMLocationProvider.cpp',
     ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
--- a/dom/system/windows/moz.build
+++ b/dom/system/windows/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 MODULE = 'dom'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsHapticFeedback.cpp',
 ]
 
 # We fire the nsDOMDeviceAcceleration
 LOCAL_INCLUDES += [
     '/content/events/src',
 ]
 
--- a/dom/telephony/moz.build
+++ b/dom/telephony/moz.build
@@ -22,17 +22,17 @@ EXPORTS.mozilla.dom += [
 
 EXPORTS.mozilla.dom.telephony += [
     'ipc/TelephonyChild.h',
     'ipc/TelephonyParent.h',
     'TelephonyCommon.h',
     'TelephonyFactory.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'CallEvent.cpp',
     'CallsList.cpp',
     'ipc/TelephonyChild.cpp',
     'ipc/TelephonyIPCProvider.cpp',
     'ipc/TelephonyParent.cpp',
     'Telephony.cpp',
     'TelephonyCall.cpp',
     'TelephonyCallGroup.cpp',
--- a/dom/time/moz.build
+++ b/dom/time/moz.build
@@ -14,17 +14,17 @@ MODULE = 'dom'
 
 EXPORTS.mozilla.dom.time += [
     'DateCacheCleaner.h',
     'TimeChangeObserver.h',
     'TimeManager.h',
     'TimeService.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'DateCacheCleaner.cpp',
     'TimeChangeObserver.cpp',
     'TimeManager.cpp',
     'TimeService.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
--- a/dom/voicemail/moz.build
+++ b/dom/voicemail/moz.build
@@ -13,17 +13,17 @@ XPIDL_SOURCES += [
 XPIDL_MODULE = 'dom_voicemail'
 
 MODULE = 'dom'
 
 EXPORTS.mozilla.dom += [
     'Voicemail.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'Voicemail.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'domvoicemail_s'
--- a/dom/wifi/moz.build
+++ b/dom/wifi/moz.build
@@ -23,17 +23,17 @@ EXTRA_COMPONENTS += [
 ]
 
 EXTRA_JS_MODULES += [
     'WifiCommand.jsm',
     'WifiNetUtil.jsm',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
-    CPP_SOURCES = [
+    SOURCES = [
         'NetUtils.cpp',
         'WifiProxyService.cpp',
         'WifiUtils.cpp',
     ]
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'domwifi_s'
--- a/dom/workers/moz.build
+++ b/dom/workers/moz.build
@@ -26,17 +26,17 @@ EXPORTS.mozilla.dom.workers.bindings += 
     'URL.h',
     'WorkerFeature.h',
     'WorkerMessagePort.h',
     'XMLHttpRequest.h',
     'XMLHttpRequestEventTarget.h',
     'XMLHttpRequestUpload.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'ChromeWorkerScope.cpp',
     'DOMBindingBase.cpp',
     'EventListenerManager.cpp',
     'Events.cpp',
     'EventTarget.cpp',
     'File.cpp',
     'FileReaderSync.cpp',
     'Location.cpp',
--- a/editor/composer/src/moz.build
+++ b/editor/composer/src/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 MODULE = 'editor'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsComposerCommands.cpp',
     'nsComposerCommandsUpdater.cpp',
     'nsComposerController.cpp',
     'nsComposerDocumentCommands.cpp',
     'nsComposerRegistration.cpp',
     'nsComposeTxtSrvFilter.cpp',
     'nsEditingSession.cpp',
     'nsEditorSpellCheck.cpp',
--- a/editor/libeditor/base/moz.build
+++ b/editor/libeditor/base/moz.build
@@ -3,17 +3,17 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 TEST_DIRS += ['tests']
 
 MODULE = 'editor'
 
-CPP_SOURCES += [
+SOURCES += [
     'ChangeAttributeTxn.cpp',
     'ChangeCSSInlineStyleTxn.cpp',
     'CreateElementTxn.cpp',
     'DeleteNodeTxn.cpp',
     'DeleteRangeTxn.cpp',
     'DeleteTextTxn.cpp',
     'EditAggregateTxn.cpp',
     'EditTxn.cpp',
--- a/editor/libeditor/html/moz.build
+++ b/editor/libeditor/html/moz.build
@@ -3,17 +3,17 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 TEST_DIRS += ['tests']
 
 MODULE = 'editor'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsEditProperty.cpp',
     'nsHTMLAbsPosition.cpp',
     'nsHTMLAnonymousUtils.cpp',
     'nsHTMLCSSUtils.cpp',
     'nsHTMLDataTransfer.cpp',
     'nsHTMLEditor.cpp',
     'nsHTMLEditorEventListener.cpp',
     'nsHTMLEditorStyle.cpp',
--- a/editor/libeditor/text/moz.build
+++ b/editor/libeditor/text/moz.build
@@ -3,17 +3,17 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 TEST_DIRS += ['tests']
 
 MODULE = 'editor'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsInternetCiter.cpp',
     'nsPlaintextDataTransfer.cpp',
     'nsPlaintextEditor.cpp',
     'nsTextEditRules.cpp',
     'nsTextEditRulesBidi.cpp',
     'nsTextEditUtils.cpp',
 ]
 
--- a/editor/txmgr/src/moz.build
+++ b/editor/txmgr/src/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 MODULE = 'txmgr'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsTransactionItem.cpp',
     'nsTransactionList.cpp',
     'nsTransactionManager.cpp',
     'nsTransactionManagerFactory.cpp',
     'nsTransactionStack.cpp',
 ]
 
 LIBRARY_NAME = 'txmgr'
--- a/editor/txtsvc/src/moz.build
+++ b/editor/txtsvc/src/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 MODULE = 'txtsvc'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsFilteredContentIterator.cpp',
     'nsTextServicesDocument.cpp',
 ]
 
 LIBRARY_NAME = 'txtsvc_s'
 
 FAIL_ON_WARNINGS = True
 
--- a/embedding/browser/build/moz.build
+++ b/embedding/browser/build/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 MODULE = 'webbrwsr'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsWebBrowserModule.cpp',
 ]
 
 LIBRARY_NAME = 'webbrwsr'
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
--- a/embedding/browser/webBrowser/moz.build
+++ b/embedding/browser/webBrowser/moz.build
@@ -32,17 +32,17 @@ if CONFIG['NS_PRINTING']:
 XPIDL_MODULE = 'webBrowser_core'
 
 MODULE = 'webbrwsr'
 
 EXPORTS += [
     'nsCTooltipTextProvider.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'nsCommandHandler.cpp',
     'nsContextMenuInfo.cpp',
     'nsDocShellTreeOwner.cpp',
     'nsEmbedStream.cpp',
     'nsWebBrowser.cpp',
     'nsWebBrowserContentPolicy.cpp',
 ]
 
--- a/embedding/components/appstartup/src/moz.build
+++ b/embedding/components/appstartup/src/moz.build
@@ -5,17 +5,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'embedcomponents'
 
 EXPORTS += [
     'nsIAppStartupNotifier.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'nsAppStartupNotifier.cpp',
 ]
 
 LIBRARY_NAME = 'appstartupnotifier_s'
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
--- a/embedding/components/build/moz.build
+++ b/embedding/components/build/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 MODULE = 'embedcomponents'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsEmbeddingModule.cpp',
 ]
 
 LIBRARY_NAME = 'embedcomponents'
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
--- a/embedding/components/commandhandler/src/moz.build
+++ b/embedding/components/commandhandler/src/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 MODULE = 'commandhandler'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsBaseCommandController.cpp',
     'nsCommandGroup.cpp',
     'nsCommandManager.cpp',
     'nsCommandParams.cpp',
     'nsControllerCommandTable.cpp',
 ]
 
 LIBRARY_NAME = 'commandhandler_s'
--- a/embedding/components/find/src/moz.build
+++ b/embedding/components/find/src/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 MODULE = 'find'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsFind.cpp',
     'nsWebBrowserFind.cpp',
 ]
 
 LIBRARY_NAME = 'find_s'
 
 FAIL_ON_WARNINGS = True
 
--- a/embedding/components/printingui/src/mac/moz.build
+++ b/embedding/components/printingui/src/mac/moz.build
@@ -1,23 +1,23 @@
 # -*- 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/.
 
 MODULE = 'embedcomponents'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsPrintProgress.cpp',
     'nsPrintProgressParams.cpp',
 ]
 
 LIBRARY_NAME = 'printingui_s'
 
-CMMSRCS += [
+SOURCES += [
     'nsPrintingPromptServiceX.mm',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
--- a/embedding/components/printingui/src/os2/moz.build
+++ b/embedding/components/printingui/src/os2/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 MODULE = 'embedcomponents'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsPrintingPromptService.cpp',
     'nsPrintProgress.cpp',
     'nsPrintProgressParams.cpp',
 ]
 
 LIBRARY_NAME = 'printingui_s'
 
 LIBXUL_LIBRARY = True
--- a/embedding/components/printingui/src/unixshared/moz.build
+++ b/embedding/components/printingui/src/unixshared/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 MODULE = 'embedcomponents'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsPrintingPromptService.cpp',
     'nsPrintProgress.cpp',
     'nsPrintProgressParams.cpp',
 ]
 
 LIBRARY_NAME = 'printingui_s'
 
 FAIL_ON_WARNINGS = True
--- a/embedding/components/printingui/src/win/moz.build
+++ b/embedding/components/printingui/src/win/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 MODULE = 'embedcomponents'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsPrintDialogUtil.cpp',
     'nsPrintingPromptService.cpp',
     'nsPrintProgress.cpp',
     'nsPrintProgressParams.cpp',
 ]
 
 LIBRARY_NAME = 'printingui_s'
 
--- a/embedding/components/webbrowserpersist/src/moz.build
+++ b/embedding/components/webbrowserpersist/src/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 MODULE = 'webbrowserpersist'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsWebBrowserPersist.cpp',
 ]
 
 LIBRARY_NAME = 'webbrowserpersist_s'
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
--- a/embedding/components/windowwatcher/src/moz.build
+++ b/embedding/components/windowwatcher/src/moz.build
@@ -1,23 +1,23 @@
 # -*- 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/.
 
 MODULE = 'embedcomponents'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsAutoWindowStateHelper.cpp',
     'nsWindowWatcher.cpp',
 ]
 
 if CONFIG['MOZ_XUL']:
-    CPP_SOURCES += [
+    SOURCES += [
         'nsDialogParamBlock.cpp',
     ]
 
 LIBRARY_NAME = 'windowwatcher_s'
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
--- a/embedding/tests/winEmbed/moz.build
+++ b/embedding/tests/winEmbed/moz.build
@@ -3,15 +3,15 @@
 # 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 = 'winEmbed'
 
 PROGRAM = 'winEmbed'
 
-CPP_SOURCES += [
+SOURCES += [
     'WebBrowserChrome.cpp',
     'WindowCreator.cpp',
     'winEmbed.cpp',
 ]
 
 XPI_NAME = 'winembed'
--- a/extensions/auth/moz.build
+++ b/extensions/auth/moz.build
@@ -1,30 +1,30 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'auth'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsAuthFactory.cpp',
     'nsAuthGSSAPI.cpp',
     'nsAuthSASL.cpp',
     'nsHttpNegotiateAuth.cpp',
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':
-    CPP_SOURCES += [
+    SOURCES += [
         'nsAuthSSPI.cpp',
     ]
     DEFINES['USE_SSPI'] = True
 else:
-    CPP_SOURCES += [
+    SOURCES += [
         'nsAuthSambaNTLM.cpp',
     ]
 
 LIBRARY_NAME = 'auth'
 
 LIBXUL_LIBRARY = True
 
 EXPORT_LIBRARY = True
--- a/extensions/cookie/moz.build
+++ b/extensions/cookie/moz.build
@@ -8,17 +8,17 @@ TEST_TOOL_DIRS += ['test']
 
 XPIDL_SOURCES += [
     'nsICookieAcceptDialog.idl',
     'nsICookiePromptService.idl',
 ]
 
 MODULE = 'cookie'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsCookieModule.cpp',
     'nsCookiePermission.cpp',
     'nsCookiePromptService.cpp',
     'nsPermission.cpp',
     'nsPermissionManager.cpp',
     'nsPopupWindowManager.cpp',
 ]
 
--- a/extensions/gio/moz.build
+++ b/extensions/gio/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 MODULE = 'nkgio'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsGIOProtocolHandler.cpp',
 ]
 
 LIBRARY_NAME = 'nkgio'
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
--- a/extensions/gnomevfs/moz.build
+++ b/extensions/gnomevfs/moz.build
@@ -1,16 +1,16 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'nkgnomevfs'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsGnomeVFSProtocolHandler.cpp',
 ]
 
 LIBRARY_NAME = 'nkgnomevfs'
 
 IS_COMPONENT = True
 
--- a/extensions/permissions/moz.build
+++ b/extensions/permissions/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 MODULE = 'permissions'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsContentBlocker.cpp',
     'nsModuleFactory.cpp',
 ]
 
 LIBRARY_NAME = 'permissions'
 
 LIBXUL_LIBRARY = True
 
--- a/extensions/pref/autoconfig/src/moz.build
+++ b/extensions/pref/autoconfig/src/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 MODULE = 'autoconfig'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsAutoConfig.cpp',
     'nsConfigFactory.cpp',
     'nsJSConfigTriggers.cpp',
     'nsReadConfig.cpp',
 ]
 
 LIBXUL_LIBRARY = True
 
--- a/extensions/spellcheck/hunspell/src/moz.build
+++ b/extensions/spellcheck/hunspell/src/moz.build
@@ -1,23 +1,23 @@
 # -*- 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/.
 
 MODULE = 'hunspell'
 
-CPP_SOURCES += [
+SOURCES += [
     'mozHunspell.cpp',
     'mozHunspellDirProvider.cpp',
 ]
 
 if not CONFIG['MOZ_NATIVE_HUNSPELL']:
-    CPP_SOURCES += [
+    SOURCES += [
         'affentry.cpp',
         'affixmgr.cpp',
         'csutil.cpp',
         'dictmgr.cpp',
         'filemgr.cpp',
         'hashmgr.cpp',
         'hunspell.cpp',
         'hunzip.cpp',
--- a/extensions/spellcheck/src/moz.build
+++ b/extensions/spellcheck/src/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 MODULE = 'spellchecker'
 
-CPP_SOURCES += [
+SOURCES += [
     'mozEnglishWordUtils.cpp',
     'mozGenericWordUtils.cpp',
     'mozInlineSpellChecker.cpp',
     'mozInlineSpellWordUtil.cpp',
     'mozPersonalDictionary.cpp',
     'mozSpellChecker.cpp',
     'mozSpellCheckerFactory.cpp',
     'mozSpellI18NManager.cpp',
--- a/extensions/universalchardet/src/base/moz.build
+++ b/extensions/universalchardet/src/base/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 MODULE = 'universalchardet_s'
 
-CPP_SOURCES += [
+SOURCES += [
     'CharDistribution.cpp',
     'JpCntx.cpp',
     'LangBulgarianModel.cpp',
     'LangCyrillicModel.cpp',
     'LangGreekModel.cpp',
     'LangHebrewModel.cpp',
     'LangHungarianModel.cpp',
     'LangThaiModel.cpp',
--- a/extensions/universalchardet/src/xpcom/moz.build
+++ b/extensions/universalchardet/src/xpcom/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 MODULE = 'universalchardet'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsUdetXPCOMWrapper.cpp',
     'nsUniversalCharDetModule.cpp',
 ]
 
 LIBRARY_NAME = 'universalchardet'
 
 LIBXUL_LIBRARY = True
 
--- a/extensions/widgetutils/src/moz.build
+++ b/extensions/widgetutils/src/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 MODULE = 'widgetutils'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsWidgetUtils.cpp',
 ]
 
 LIBRARY_NAME = 'widgetutils'
 
 IS_COMPONENT = True
 
 XPI_NAME = 'widgetutils'
--- a/gfx/2d/moz.build
+++ b/gfx/2d/moz.build
@@ -31,60 +31,60 @@ EXPORTS.mozilla.gfx += [
     'UserData.h',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     EXPORTS.mozilla.gfx += [
         'MacIOSurface.h',
         'QuartzSupport.h',
     ]
-    CPP_SOURCES += [
+    SOURCES += [
         'DrawTargetCG.cpp',
         'PathCG.cpp',
         'ScaledFontMac.cpp',
         'SourceSurfaceCG.cpp',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
-    CPP_SOURCES += [
+    SOURCES += [
         'DrawTargetD2D.cpp',
         'PathD2D.cpp',
         'ScaledFontDWrite.cpp',
         'SourceSurfaceD2D.cpp',
         'SourceSurfaceD2DTarget.cpp',
     ]
     if CONFIG['MOZ_ENABLE_DIRECT2D1_1']:
-        CPP_SOURCES += [
+        SOURCES += [
             'DrawTargetD2D1.cpp',
             'RadialGradientEffectD2D1.cpp',
             'SourceSurfaceD2D1.cpp'
         ]
     if CONFIG['MOZ_ENABLE_SKIA']:
-        CPP_SOURCES += [
+        SOURCES += [
             'ScaledFontWin.cpp',
         ]
 
 if CONFIG['MOZ_ENABLE_SKIA']:
-    CPP_SOURCES += [
+    SOURCES += [
         'convolver.cpp',
         'DrawTargetSkia.cpp',
         'image_operations.cpp',
         'PathSkia.cpp',
         'SourceSurfaceSkia.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 += [
+        SOURCES += [
             'BlurSSE2.cpp',
             'ImageScalingSSE2.cpp',
         ]
 
-CPP_SOURCES += [
+SOURCES += [
     'Blur.cpp',
     'DrawEventRecorder.cpp',
     'DrawTargetCairo.cpp',
     'DrawTargetDual.cpp',
     'DrawTargetRecording.cpp',
     'Factory.cpp',
     'ImageScaling.cpp',
     'Matrix.cpp',
@@ -94,17 +94,17 @@ CPP_SOURCES += [
     'Scale.cpp',
     'ScaledFontBase.cpp',
     'ScaledFontCairo.cpp',
     'SourceSurfaceCairo.cpp',
     'SourceSurfaceRawData.cpp',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    CMMSRCS += [
+    SOURCES += [
         'QuartzSupport.mm',
     ]
 
 LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'gfx2d'
--- a/gfx/angle/moz.build
+++ b/gfx/angle/moz.build
@@ -15,17 +15,17 @@ EXPORTS.angle += [
     'include/KHR/khrplatform.h',
 ]
 
 # WARNING: CPP_SOURCES seems very dependent on ordering. Grouping all of these
 # CPP_SOURCES lines into one list may break webgl tests.
 
 # Target: 'preprocessor'
 # src/compiler/preprocessor:
-CPP_SOURCES += ['src/compiler/preprocessor/' + src for src in [
+SOURCES += ['src/compiler/preprocessor/' + src for src in [
     'DiagnosticsBase.cpp',
     'DirectiveHandlerBase.cpp',
     'DirectiveParser.cpp',
     'ExpressionParser.cpp',
     'Input.cpp',
     'Lexer.cpp',
     'Macro.cpp',
     'MacroExpander.cpp',
@@ -33,17 +33,17 @@ CPP_SOURCES += ['src/compiler/preprocess
     'Token.cpp',
     'Tokenizer.cpp',
 ]]
 
 
 # Target: 'translator_common'
 #   Requires: 'preprocessor'
 # src/compiler:
-CPP_SOURCES += ['src/compiler/' + src for src in [
+SOURCES += ['src/compiler/' + src for src in [
     'BuiltInFunctionEmulator.cpp',
     'Compiler.cpp',
     'compiler_debug.cpp',
     'CompilerUniform.cpp',
     'DetectCallDepth.cpp',
     'Diagnostics.cpp',
     'DirectiveHandler.cpp',
     'ForLoopUnroll.cpp',
@@ -65,53 +65,53 @@ CPP_SOURCES += ['src/compiler/' + src fo
     'SymbolTable.cpp',
     'util.cpp',
     'ValidateLimitations.cpp',
     'VariableInfo.cpp',
     'VariablePacker.cpp',
 ]]
 
 # src/compiler/depgraph:
-CPP_SOURCES += ['src/compiler/depgraph/' + src for src in [
+SOURCES += ['src/compiler/depgraph/' + src for src in [
     'DependencyGraph.cpp',
     'DependencyGraphBuilder.cpp',
     'DependencyGraphOutput.cpp',
     'DependencyGraphTraverse.cpp',
 ]]
 
 # src/compiler/timing:
-CPP_SOURCES += ['src/compiler/timing/' + src for src in [
+SOURCES += ['src/compiler/timing/' + src for src in [
     'RestrictFragmentShaderTiming.cpp',
     'RestrictVertexShaderTiming.cpp',
 ]]
 
 # src/third_party/compiler:
-CPP_SOURCES += ['src/third_party/compiler/' + src for src in [
+SOURCES += ['src/third_party/compiler/' + src for src in [
     'ArrayBoundsClamper.cpp',
 ]]
 
 # src/third_party/murmurhash:
-CPP_SOURCES += ['src/third_party/murmurhash/' + src for src in [
+SOURCES += ['src/third_party/murmurhash/' + src for src in [
     'MurmurHash3.cpp',
 ]]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
-    CPP_SOURCES += [
+    SOURCES += [
         'src/compiler/ossource_win.cpp',
     ]
 else:
-    CPP_SOURCES += [
+    SOURCES += [
         'src/compiler/ossource_posix.cpp',
     ]
 
 
 # Target: 'translator_glsl'
 #   Requires: 'translator_common'
 # src/compiler:
-CPP_SOURCES += ['src/compiler/' + src for src in [
+SOURCES += ['src/compiler/' + src for src in [
     'CodeGenGLSL.cpp',
     'OutputESSL.cpp',
     'OutputGLSL.cpp',
     'OutputGLSLBase.cpp',
     'ShaderLang.cpp',
     'TranslatorESSL.cpp',
     'TranslatorGLSL.cpp',
     'VersionGLSL.cpp',
--- a/gfx/angle/src/libEGL/moz.build
+++ b/gfx/angle/src/libEGL/moz.build
@@ -4,23 +4,23 @@
 # License, v. 2.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 = 'libegl'
 
 # Target: 'libEGL'
 #   Requires: 'libGLESv2'
 # src/common:
-CPP_SOURCES += ['../common/' + src for src in [
+SOURCES += ['../common/' + src for src in [
     'debug.cpp',
     'RefCountObject.cpp',
 ]]
 
 # src/libEGL
-CPP_SOURCES += [
+SOURCES += [
     'Config.cpp',
     'Display.cpp',
     'libEGL.cpp',
     'main.cpp',
     'Surface.cpp',
 ]
 
 LIBRARY_NAME = 'libEGL'
--- a/gfx/angle/src/libGLESv2/moz.build
+++ b/gfx/angle/src/libGLESv2/moz.build
@@ -3,17 +3,17 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'libglesv2'
 
 # Target: 'preprocessor'
 # src/compiler/preprocessor:
-CPP_SOURCES += ['../compiler/preprocessor/' + src for src in [
+SOURCES += ['../compiler/preprocessor/' + src for src in [
     'DiagnosticsBase.cpp',
     'DirectiveHandlerBase.cpp',
     'DirectiveParser.cpp',
     'ExpressionParser.cpp',
     'Input.cpp',
     'Lexer.cpp',
     'Macro.cpp',
     'MacroExpander.cpp',
@@ -21,17 +21,17 @@ CPP_SOURCES += ['../compiler/preprocesso
     'Token.cpp',
     'Tokenizer.cpp',
 ]]
 
 
 # Target: 'translator_common'
 #   Requires: 'preprocessor'
 # src/compiler:
-CPP_SOURCES += ['../compiler/' + src for src in [
+SOURCES += ['../compiler/' + src for src in [
     'BuiltInFunctionEmulator.cpp',
     'Compiler.cpp',
     'compiler_debug.cpp',
     'CompilerUniform.cpp',
     'DetectCallDepth.cpp',
     'Diagnostics.cpp',
     'DirectiveHandler.cpp',
     'ForLoopUnroll.cpp',
@@ -53,73 +53,73 @@ CPP_SOURCES += ['../compiler/' + src for
     'SymbolTable.cpp',
     'util.cpp',
     'ValidateLimitations.cpp',
     'VariableInfo.cpp',
     'VariablePacker.cpp',
 ]]
 
 # src/compiler/depgraph:
-CPP_SOURCES += ['../compiler/depgraph/' + src for src in [
+SOURCES += ['../compiler/depgraph/' + src for src in [
     'DependencyGraph.cpp',
     'DependencyGraphBuilder.cpp',
     'DependencyGraphOutput.cpp',
     'DependencyGraphTraverse.cpp',
 ]]
 
 # src/compiler/timing:
-CPP_SOURCES += ['../compiler/timing/' + src for src in [
+SOURCES += ['../compiler/timing/' + src for src in [
     'RestrictFragmentShaderTiming.cpp',
     'RestrictVertexShaderTiming.cpp',
 ]]
 
 # src/third_party/compiler:
-CPP_SOURCES += ['../third_party/compiler/' + src for src in [
+SOURCES += ['../third_party/compiler/' + src for src in [
     'ArrayBoundsClamper.cpp',
 ]]
 
 # src/third_party/murmurhash:
-CPP_SOURCES += ['../third_party/murmurhash/' + src for src in [
+SOURCES += ['../third_party/murmurhash/' + src for src in [
     'MurmurHash3.cpp',
 ]]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
-    CPP_SOURCES += [
+    SOURCES += [
         '../compiler/ossource_win.cpp',
     ]
 else:
-    CPP_SOURCES += [
+    SOURCES += [
         '../compiler/ossource_posix.cpp',
     ]
 
 
 # Target: 'translator_hlsl'
 #   Requires: 'translator_common'
 # src/compiler:
-CPP_SOURCES += ['../compiler/' + src for src in [
+SOURCES += ['../compiler/' + src for src in [
     'CodeGenHLSL.cpp',
     'DetectDiscontinuity.cpp',
     'OutputHLSL.cpp',
     'SearchSymbol.cpp',
     'ShaderLang.cpp',
     'TranslatorHLSL.cpp',
     'UnfoldShortCircuit.cpp',
 ]]
 
 
 # Target: 'libGLESv2'
 #   Requires: 'translator_hlsl'
 # src/common:
-CPP_SOURCES += ['../common/' + src for src in [
+SOURCES += ['../common/' + src for src in [
     'debug.cpp',
     'RefCountObject.cpp',
 ]]
 
 # src/libGLESv2:
-CPP_SOURCES += [
+SOURCES += [
     'Buffer.cpp',
     'Context.cpp',
     'Fence.cpp',
     'Float16ToFloat32.cpp',
     'Framebuffer.cpp',
     'HandleAllocator.cpp',
     'libGLESv2.cpp',
     'main.cpp',
@@ -131,17 +131,17 @@ CPP_SOURCES += [
     'ResourceManager.cpp',
     'Shader.cpp',
     'Texture.cpp',
     'Uniform.cpp',
     'utilities.cpp',
 ]
 
 # src/libGLESv2/renderer:
-CPP_SOURCES += ['renderer/' + src for src in [
+SOURCES += ['renderer/' + src for src in [
     'Blit.cpp',
     'BufferStorage.cpp',
     'BufferStorage11.cpp',
     'BufferStorage9.cpp',
     'Fence11.cpp',
     'Fence9.cpp',
     'Image.cpp',
     'Image11.cpp',
--- a/gfx/cairo/cairo/src/moz.build
+++ b/gfx/cairo/cairo/src/moz.build
@@ -18,21 +18,21 @@ EXPORTS.cairo += [
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     EXPORTS.cairo += [
         'cairo-pdf.h',
         'cairo-win32.h',
     ]
     if CONFIG['MOZ_ENABLE_DWRITE_FONT']:
-        CPP_SOURCES += [
+        SOURCES += [
             'cairo-dwrite-font.cpp',
         ]
     if CONFIG['MOZ_ENABLE_D2D_SURFACE']:
-        CPP_SOURCES += [
+        SOURCES += [
             'cairo-d2d-surface.cpp',
         ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'os2':
     EXPORTS.cairo += [
         'cairo-os2-private.h',
         'cairo-os2.h',
         'cairo-pdf.h',
     ]
@@ -40,34 +40,34 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co
     EXPORTS.cairo += [
         'cairo-quartz-image.h',
         'cairo-quartz.h',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'beos':
     EXPORTS.cairo += [
         'cairo-beos.h',
     ]
-    CPP_SOURCES += [
+    SOURCES += [
         'cairo-beos-surface.cpp',
     ]
 elif CONFIG['MOZ_WIDGET_GTK']:
     EXPORTS.cairo += [
         'cairo-pdf.h',
         'cairo-ps.h',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk'):
     EXPORTS.cairo += [
         'cairo-pdf.h',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
     EXPORTS.cairo += [
         'cairo-pdf.h',
         'cairo-qt.h',
     ]
-    CPP_SOURCES += [
+    SOURCES += [
         'cairo-qt-surface.cpp',
     ]
 
 if CONFIG['MOZ_X11']:
     EXPORTS.cairo += [
         'cairo-xlib-xrender.h',
         'cairo-xlib.h',
     ]
@@ -76,17 +76,17 @@ if CONFIG['MOZ_ENABLE_CAIRO_FT']:
     EXPORTS.cairo += [
         'cairo-ft.h',
     ]
 
 LIBRARY_NAME = 'mozcairo'
 
 LIBXUL_LIBRARY = True
 
-CSRCS += [
+SOURCES += [
     'cairo-analysis-surface.c',
     'cairo-arc.c',
     'cairo-array.c',
     'cairo-atomic.c',
     'cairo-base64-stream.c',
     'cairo-bentley-ottmann-rectangular.c',
     'cairo-bentley-ottmann-rectilinear.c',
     'cairo-bentley-ottmann.c',
--- a/gfx/cairo/libpixman/src/moz.build
+++ b/gfx/cairo/libpixman/src/moz.build
@@ -12,29 +12,29 @@ EXPORTS += [
 ]
 
 # Apple's arm assembler doesn't support the same syntax as
 # the standard GNU assembler, so use the C fallback paths for now.
 # This may be fixable if clang's ARM/iOS assembler improves into a
 # viable solution in the future.
 if CONFIG['OS_ARCH'] != 'Darwin' and CONFIG['GNU_CC']:
     if CONFIG['HAVE_ARM_NEON']:
-        SSRCS += [
+        SOURCES += [
             'pixman-arm-neon-asm-bilinear.S',
             'pixman-arm-neon-asm.S',
         ]
     if CONFIG['HAVE_ARM_SIMD']:
-        SSRCS += [
+        SOURCES += [
             'pixman-arm-simd-asm-scaled.S',
             'pixman-arm-simd-asm.S',
         ]
 
 LIBXUL_LIBRARY = True
 
-CSRCS += [
+SOURCES += [
     'pixman-access-accessors.c',
     'pixman-access.c',
     'pixman-arm.c',
     'pixman-bits-image.c',
     'pixman-combine-float.c',
     'pixman-combine16.c',
     'pixman-combine32.c',
     'pixman-conical-gradient.c',
--- a/gfx/gl/moz.build
+++ b/gfx/gl/moz.build
@@ -56,46 +56,46 @@ if CONFIG['MOZ_X11']:
     EXPORTS += ['GLXLibrary.h']
 
 # Win32 is a special snowflake, for ANGLE
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     EXPORTS += [
         'SharedSurfaceANGLE.h',
         'WGLLibrary.h',
     ]
-    CPP_SOURCES += [
+    SOURCES += [
         'GLContextProviderEGL.cpp',
         'SharedSurfaceANGLE.cpp',
     ]
 if CONFIG['MOZ_ENABLE_SKIA_GPU']:
     EXPORTS += ['GLContextSkia.h']
-    CPP_SOURCES += [
+    SOURCES += [
         'GLContextSkia.cpp',
     ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
-    CPP_SOURCES += ['SharedSurfaceGralloc.cpp']
+    SOURCES += ['SharedSurfaceGralloc.cpp']
     EXPORTS += ['SharedSurfaceGralloc.h']
 
 if gl_provider == 'CGL':
-    CMMSRCS += [
+    SOURCES += [
         "GLContextProvider%s.mm" % (gl_provider),
     ]
     EXPORTS += [
         'SharedSurfaceIO.h',
     ]
-    CPP_SOURCES += [
+    SOURCES += [
         'SharedSurfaceIO.cpp',
     ]
 else:
-    CPP_SOURCES += [
+    SOURCES += [
         'GLContextProvider%s.cpp' % gl_provider,
     ]
 
-CPP_SOURCES += [
+SOURCES += [
     'GfxTexturesReporter.cpp',
     'GLContext.cpp',
     'GLContextFeatures.cpp',
     'GLContextTypes.cpp',
     'GLContextUtils.cpp',
     'GLLibraryEGL.cpp',
     'GLLibraryLoader.cpp',
     'GLScreenBuffer.cpp',
--- a/gfx/graphite2/src/moz.build
+++ b/gfx/graphite2/src/moz.build
@@ -16,26 +16,26 @@ else:
 EXPORTS.graphite2 += [
     '../include/graphite2/Font.h',
     '../include/graphite2/Log.h',
     '../include/graphite2/Segment.h',
     '../include/graphite2/Types.h',
 ]
 
 if CONFIG['GNU_CC']:
-    CPP_SOURCES += [
+    SOURCES += [
         'direct_machine.cpp'
     ]
 else:
-    CPP_SOURCES += [
+    SOURCES += [
         'call_machine.cpp'
     ]
 
 # This should contain all of the _SOURCES from files.mk, except *_machine.cpp
-CPP_SOURCES += [
+SOURCES += [
     'Bidi.cpp',
     'CachedFace.cpp',
     'CmapCache.cpp',
     'Code.cpp',
     'Face.cpp',
     'FeatureMap.cpp',
     'FileFace.cpp',
     'Font.cpp',
--- a/gfx/harfbuzz/src/moz.build
+++ b/gfx/harfbuzz/src/moz.build
@@ -25,17 +25,17 @@ EXPORTS.harfbuzz += [
     'hb-set.h',
     'hb-shape-plan.h',
     'hb-shape.h',
     'hb-unicode.h',
     'hb-version.h',
     'hb.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'hb-blob.cc',
     'hb-buffer.cc',
     'hb-common.cc',
     'hb-face.cc',
     'hb-fallback-shape.cc',
     'hb-font.cc',
     'hb-ot-layout.cc',
     'hb-ot-map.cc',
--- a/gfx/ipc/moz.build
+++ b/gfx/ipc/moz.build
@@ -14,22 +14,22 @@ EXPORTS.mozilla.gfx += [
     'SharedDIB.h',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     EXPORTS.mozilla.gfx += [
         'SharedDIBSurface.h',
         'SharedDIBWin.h',
     ]
-    CPP_SOURCES += [
+    SOURCES += [
         'SharedDIBSurface.cpp',
         'SharedDIBWin.cpp',
     ]
 
-CPP_SOURCES += [
+SOURCES += [
     'SharedDIB.cpp',
 ]
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'gfxipc_s'
 
 EXPORT_LIBRARY = True
--- a/gfx/layers/moz.build
+++ b/gfx/layers/moz.build
@@ -39,29 +39,29 @@ EXPORTS += [
     'opengl/LayerManagerOGLProgram.h',
     'opengl/LayerManagerOGLShaders.h',
     'opengl/TexturePoolOGL.h',
     'ReadbackLayer.h',
     'SharedTextureImage.h',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
-    CPP_SOURCES += [
+    SOURCES += [
         'D3D9SurfaceImage.cpp',
     ]
     if CONFIG['MOZ_ENABLE_D3D9_LAYER']:
         EXPORTS += [
             'd3d9/DeviceManagerD3D9.h',
             'd3d9/LayerManagerD3D9.h',
         ]
         EXPORTS.mozilla.layers += [
             'd3d9/CompositorD3D9.h',
             'd3d9/TextureD3D9.h',
         ]
-        CPP_SOURCES += [
+        SOURCES += [
             'd3d9/CanvasLayerD3D9.cpp',
             'd3d9/ColorLayerD3D9.cpp',
             'd3d9/CompositorD3D9.cpp',
             'd3d9/ContainerLayerD3D9.cpp',
             'd3d9/DeviceManagerD3D9.cpp',
             'd3d9/ImageLayerD3D9.cpp',
             'd3d9/LayerManagerD3D9.cpp',
             'd3d9/Nv3DVUtils.cpp',
@@ -73,17 +73,17 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'wind
             'd3d10/LayerManagerD3D10.h',
             'd3d10/ReadbackManagerD3D10.h',
         ]
         EXPORTS.mozilla.layers += [
             'd3d11/CompositorD3D11.h',
             'd3d11/TextureD3D11.h',
             'ipc/ShadowLayerUtilsD3D10.h',
         ]
-        CPP_SOURCES += [
+        SOURCES += [
             'd3d10/CanvasLayerD3D10.cpp',
             'd3d10/ColorLayerD3D10.cpp',
             'd3d10/ContainerLayerD3D10.cpp',
             'd3d10/ImageLayerD3D10.cpp',
             'd3d10/LayerManagerD3D10.cpp',
             'd3d10/ReadbackManagerD3D10.cpp',
             'd3d10/ThebesLayerD3D10.cpp',
             'd3d11/CompositorD3D11.cpp',
@@ -148,44 +148,44 @@ EXPORTS.mozilla.layers += [
     'RenderTrace.h',
     'YCbCrImageDataSerializer.h',
 ]
 
 if CONFIG['MOZ_X11']:
     EXPORTS.mozilla.layers += [
         'ipc/ShadowLayerUtilsX11.h',
     ]
-    CPP_SOURCES += [
+    SOURCES += [
         'ipc/ShadowLayerUtilsX11.cpp'
     ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     EXPORTS.mozilla.layers += [
         'opengl/GLManager.h',
     ]
-    CPP_SOURCES += [
+    SOURCES += [
         'ipc/ShadowLayerUtilsMac.cpp',
         'opengl/GLManager.cpp',
     ]
 
 # NB: Gralloc is available on other platforms that use the android GL
 # 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 += [
+    SOURCES += [
         'GrallocImages.cpp',
         'ipc/ShadowLayerUtilsGralloc.cpp',
         'opengl/GrallocTextureClient.cpp',
         'opengl/GrallocTextureHost.cpp',
     ]
 
-CPP_SOURCES += [
+SOURCES += [
     'basic/BasicCanvasLayer.cpp',
     'basic/BasicColorLayer.cpp',
     'basic/BasicCompositor.cpp',
     'basic/BasicContainerLayer.cpp',
     'basic/BasicImageLayer.cpp',
     'basic/BasicImages.cpp',
     'basic/BasicLayerManager.cpp',
     'basic/BasicLayersImpl.cpp',
--- a/gfx/ots/src/moz.build
+++ b/gfx/ots/src/moz.build
@@ -12,17 +12,17 @@ else:
     # FORCE_STATIC_LIB = True
     pass
 
 EXPORTS += [
     '../include/opentype-sanitiser.h',
     '../include/ots-memory-stream.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'cff.cc',
     'cff_type2_charstring.cc',
     'cmap.cc',
     'cvt.cc',
     'fpgm.cc',
     'gasp.cc',
     'gdef.cc',
     'glyf.cc',
--- a/gfx/qcms/moz.build
+++ b/gfx/qcms/moz.build
@@ -10,17 +10,17 @@ EXPORTS += [
     'qcms.h',
     'qcmstypes.h',
 ]
 
 LIBRARY_NAME = 'mozqcms'
 
 LIBXUL_LIBRARY = True
 
-CSRCS += [
+SOURCES += [
     'chain.c',
     'iccread.c',
     'matrix.c',
     'transform.c',
     'transform_util.c',
 ]
 
 MSVC_ENABLE_PGO = True
--- a/gfx/skia/moz.build
+++ b/gfx/skia/moz.build
@@ -146,124 +146,124 @@ EXPORTS.skia += [
     'include/views/SkTextBox.h',
     'src/core/SkTypefaceCache.h',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     EXPORTS.skia += [
         'include/ports/SkTypeface_mac.h',
     ]
-    CPP_SOURCES += [
+    SOURCES += [
         'src/ports/SkFontHost_mac.cpp',
         'src/ports/SkThread_pthread.cpp',
         'src/ports/SkTime_Unix.cpp',
         'src/utils/mac/SkStream_mac.cpp',
         'src/utils/SkThreadUtils_pthread.cpp',
         'src/utils/SkThreadUtils_pthread_mach.cpp',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     EXPORTS.skia += [
         'include/config/sk_stdint.h',
         'include/ports/SkTypeface_win.h',
     ]
-    CPP_SOURCES += [
+    SOURCES += [
         'src/ports/SkFontHost_sandbox_none.cpp',
         'src/ports/SkFontHost_win.cpp',
         'src/ports/SkThread_win.cpp',
         'src/ports/SkTime_win.cpp',
         'src/utils/SkThreadUtils_win.cpp',
     ]
 elif CONFIG['MOZ_WIDGET_GTK']:
     EXPORTS.skia += [
         'include/ports/SkTypeface_cairo.h',
     ]
-    CPP_SOURCES += [
+    SOURCES += [
         'src/ports/SkFontHost_cairo.cpp',
         'src/ports/SkFontHost_FreeType_common.cpp',
         'src/ports/SkThread_pthread.cpp',
         'src/ports/SkTime_Unix.cpp',
         'src/utils/SkOSFile.cpp',
         'src/utils/SkThreadUtils_pthread.cpp',
     ]
     if CONFIG['OS_TARGET'] in ('Linux', 'FreeBSD', 'NetBSD'):
-        CPP_SOURCES += [
+        SOURCES += [
             'src/utils/SkThreadUtils_pthread_linux.cpp',
         ]
     else:
-        CPP_SOURCES += [
+        SOURCES += [
             'src/utils/SkThreadUtils_pthread_other.cpp',
         ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
-    CPP_SOURCES += [
+    SOURCES += [
         '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 += [
+        SOURCES += [
             'src/ports/SkThread_pthread.cpp',
             'src/ports/SkTime_Unix.cpp',
             'src/utils/SkThreadUtils_pthread.cpp',
             'src/utils/SkThreadUtils_pthread_linux.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 += [
+    SOURCES += [
         'src/images/SkImageRef_ashmem.cpp',
         'src/ports/SkDebug_android.cpp',
         'src/ports/SkFontHost_cairo.cpp',
         'src/ports/SkFontHost_FreeType.cpp',
         'src/ports/SkFontHost_FreeType_common.cpp',
         'src/ports/SkFontHost_linux.cpp',
         'src/ports/SkThread_pthread.cpp',
         'src/ports/SkTime_Unix.cpp',
         'src/utils/android/ashmem.cpp',
         'src/utils/SkOSFile.cpp',
         'src/utils/SkThreadUtils_pthread.cpp',
         'src/utils/SkThreadUtils_pthread_other.cpp',
     ]
 else:
-    CPP_SOURCES += [
+    SOURCES += [
         'src/ports/SkDebug_stdio.cpp',
     ]
 
 if CONFIG['INTEL_ARCHITECTURE']:
-    CPP_SOURCES += [
+    SOURCES += [
         'src/opts/opts_check_SSE2.cpp',
         'src/opts/SkBitmapProcState_opts_SSE2.cpp',
         'src/opts/SkBlitRect_opts_SSE2.cpp',
         'src/opts/SkBlitRow_opts_SSE2.cpp',
         'src/opts/SkUtils_opts_SSE2.cpp',
     ]
     if CONFIG['HAVE_TOOLCHAIN_SUPPORT_MSSSE3']:
-        CPP_SOURCES += [
+        SOURCES += [
             'src/opts/SkBitmapProcState_opts_SSSE3.cpp',
         ]
 elif CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC']:
-        CPP_SOURCES += [
+        SOURCES += [
             'src/opts/opts_check_arm.cpp',
             'src/opts/SkBitmapProcState_opts_arm.cpp',
             'src/opts/SkBlitRow_opts_arm.cpp',
         ]
 else:
-    CPP_SOURCES += [
+    SOURCES += [
         'src/opts/SkBitmapProcState_opts_none.cpp',
         'src/opts/SkBlitRow_opts_none.cpp',
         'src/opts/SkUtils_opts_none.cpp',
     ]
 
 if CONFIG['MOZ_ENABLE_SKIA_GPU']:
-    CPP_SOURCES += [
+    SOURCES += [
         'src/gpu/effects/GrConfigConversionEffect.cpp',
         'src/gpu/effects/GrConvolutionEffect.cpp',
         'src/gpu/effects/GrSimpleTextureEffect.cpp',
         'src/gpu/effects/GrSingleTextureEffect.cpp',
         'src/gpu/effects/GrTextureDomainEffect.cpp',
         'src/gpu/effects/GrTextureStripAtlas.cpp',
         'src/gpu/gl/GrGLBufferImpl.cpp',
         'src/gpu/gl/GrGLCaps.cpp',
@@ -337,17 +337,17 @@ if CONFIG['MOZ_ENABLE_SKIA_GPU']:
         'src/gpu/GrTextureAccess.cpp',
         'src/gpu/SkGpuDevice.cpp',
         'src/gpu/SkGr.cpp',
         'src/gpu/SkGrFontScaler.cpp',
         'src/gpu/SkGrPixelRef.cpp',
         'src/gpu/SkGrTexturePixelRef.cpp',
     ]
 
-CPP_SOURCES += [
+SOURCES += [
         'src/core/Sk64.cpp',
         'src/core/SkAAClip.cpp',
         'src/core/SkAdvancedTypefaceMetrics.cpp',
         'src/core/SkAlphaRuns.cpp',
         'src/core/SkAnnotation.cpp',
         'src/core/SkBBoxHierarchy.cpp',
         'src/core/SkBBoxHierarchyRecord.cpp',
         'src/core/SkBBoxRecord.cpp',
@@ -538,17 +538,17 @@ CPP_SOURCES += [
         '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 += [
+    SOURCES += [
         'src/opts/memset.arm.S',
     ]
 
 LIBRARY_NAME = 'skia'
 
 LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
--- a/gfx/src/moz.build
+++ b/gfx/src/moz.build
@@ -35,21 +35,21 @@ EXPORTS += [
 ]
 
 EXPORTS.mozilla += [
     'AppUnits.h',
 ]
 
 if CONFIG['MOZ_X11']:
     EXPORTS.mozilla += ['X11Util.h']
-    CPP_SOURCES += [
+    SOURCES += [
         'X11Util.cpp',
     ]
 
-CPP_SOURCES += [
+SOURCES += [
     'gfxCrashReporterUtils.cpp',
     'nsColor.cpp',
     'nsDeviceContext.cpp',
     'nsFont.cpp',
     'nsFontMetrics.cpp',
     'nsRect.cpp',
     'nsRegion.cpp',
     'nsRenderingContext.cpp',
--- a/gfx/tests/gtest/moz.build
+++ b/gfx/tests/gtest/moz.build
@@ -3,17 +3,17 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'gfxtest'
 
 LIBRARY_NAME = 'gfxtest'
 
-GTEST_CPP_SOURCES += [
+GTEST_SOURCES += [
     'gfxSurfaceRefCountTest.cpp',
     'gfxWordCacheTest.cpp',
     'TestAsyncPanZoomController.cpp',
     'TestBufferRotation.cpp',
     'TestColorNames.cpp',
     'TestLayers.cpp',
     'TestRegion.cpp',
     # Hangs on linux in ApplyGdkScreenFontOptions
@@ -22,22 +22,22 @@ GTEST_CPP_SOURCES += [
     # Test works but it doesn't assert anything
     #'gfxTextRunPerfTest.cpp',
     'TestTiledLayerBuffer.cpp',
 ]
 
 # Because of gkmedia on windows we wont find these
 # symbols in xul.dll.
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'windows':
-    GTEST_CPP_SOURCES += [ '%s/gfx/2d/unittest/%s' % (TOPSRCDIR, p) for p in [
+    GTEST_SOURCES += [ '%s/gfx/2d/unittest/%s' % (TOPSRCDIR, p) for p in [
         'TestBase.cpp',
         'TestPoint.cpp',
         'TestScaling.cpp',
     ]]
-    GTEST_CPP_SOURCES += [
+    GTEST_SOURCES += [
         'TestMoz2D.cpp',
         'TestRect.cpp',
     ]
 
 LIBXUL_LIBRARY = True
 
 EXPORT_LIBRARY = True
 
--- a/gfx/thebes/moz.build
+++ b/gfx/thebes/moz.build
@@ -54,49 +54,49 @@ EXPORTS += [
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
     EXPORTS += [
         'gfxAndroidPlatform.h',
         'gfxFT2FontBase.h',
         'gfxFT2Fonts.h',
         'gfxPDFSurface.h',
     ]
-    CPP_SOURCES += [
+    SOURCES += [
         'gfxAndroidPlatform.cpp',
         'gfxFT2FontBase.cpp',
         'gfxFT2FontList.cpp',
         'gfxFT2Fonts.cpp',
         'gfxFT2Utils.cpp',
         'gfxPDFSurface.cpp',
         'nsUnicodeRange.cpp',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     EXPORTS += [
         'gfxAndroidPlatform.h',
         'gfxFT2FontBase.h',
         'gfxFT2Fonts.h',
         'gfxPDFSurface.h',
     ]
-    CPP_SOURCES += [
+    SOURCES += [
         'gfxAndroidPlatform.cpp',
         'gfxFT2FontBase.cpp',
         'gfxFT2FontList.cpp',
         'gfxFT2Fonts.cpp',
         'gfxFT2Utils.cpp',
         'gfxPDFSurface.cpp',
         'nsUnicodeRange.cpp',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     EXPORTS += [
         'gfxPlatformMac.h',
         'gfxQuartzImageSurface.h',
         'gfxQuartzNativeDrawing.h',
         'gfxQuartzSurface.h',
     ]
-    CPP_SOURCES += [
+    SOURCES += [
         'gfxCoreTextShaper.cpp',
         'gfxMacFont.cpp',
         'gfxPlatformMac.cpp',
         'gfxQuartzImageSurface.cpp',
         'gfxQuartzNativeDrawing.cpp',
         'gfxQuartzSurface.cpp',
         'nsUnicodeRange.cpp',
     ]
@@ -104,139 +104,139 @@ elif CONFIG['MOZ_WIDGET_GTK']:
     EXPORTS += [
         'gfxFT2FontBase.h',
         'gfxGdkNativeRenderer.h',
         'gfxPDFSurface.h',
         'gfxPlatformGtk.h',
         'gfxPSSurface.h',
     ]
 
-    CPP_SOURCES += [
+    SOURCES += [
         'gfxFontconfigUtils.cpp',
         'gfxFT2FontBase.cpp',
         'gfxFT2Utils.cpp',
         'gfxGdkNativeRenderer.cpp',
         'gfxPDFSurface.cpp',
         'gfxPlatformGtk.cpp',
         'gfxPSSurface.cpp',
         'nsUnicodeRange.cpp',
     ]
 
     if CONFIG['MOZ_X11']:
         EXPORTS += [
             'gfxXlibNativeRenderer.h',
             'gfxXlibSurface.h',
         ]
-        CPP_SOURCES += [
+        SOURCES += [
             'gfxXlibNativeRenderer.cpp',
             'gfxXlibSurface.cpp',
         ]
 
     if CONFIG['MOZ_PANGO']:
         EXPORTS += ['gfxPangoFonts.h']
-        CPP_SOURCES += [
+        SOURCES += [
             'gfxPangoFonts.cpp',
         ]
     else:
         EXPORTS += ['gfxFT2Fonts.h']
-        CPP_SOURCES += [
+        SOURCES += [
             'gfxPangoFonts.cpp',
         ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'os2':
     EXPORTS += [
         'gfxOS2Fonts.h',
         'gfxOS2Platform.h',
         'gfxOS2Surface.h',
         'gfxPDFSurface.h',
     ]
-    CPP_SOURCES += [
+    SOURCES += [
         'gfxFontconfigUtils.cpp',
         'gfxOS2Fonts.cpp',
         'gfxOS2Platform.cpp',
         'gfxOS2Surface.cpp',
         'gfxPDFSurface.cpp',
         'nsUnicodeRange.cpp'
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
     EXPORTS += [
         'gfxFT2FontBase.h',
         'gfxPDFSurface.h',
         'gfxQPainterSurface.h',
         'gfxQtNativeRenderer.h',
         'gfxQtPlatform.h',
     ]
-    CPP_SOURCES += [
+    SOURCES += [
         'gfxFontconfigUtils.cpp',
         'gfxFT2FontBase.cpp',
         'gfxFT2Utils.cpp',
         'gfxPDFSurface.cpp',
         'gfxQPainterSurface.cpp',
         'gfxQtPlatform.cpp',
         'nsUnicodeRange.cpp',
     ]
 
     if CONFIG['MOZ_X11']:
         EXPORTS += [
             'gfxXlibSurface.h',
         ]
-        CPP_SOURCES += [
+        SOURCES += [
             'gfxQtNativeRenderer.cpp',
             'gfxXlibSurface.cpp',
         ]
 
     if CONFIG['MOZ_PANGO']:
         EXPORTS += ['gfxPangoFonts.h']
-        CPP_SOURCES += [
+        SOURCES += [
             'gfxPangoFonts.cpp',
         ]
     else:
         EXPORTS += ['gfxFT2Fonts.h']
-        CPP_SOURCES += [
+        SOURCES += [
             'gfxFT2Fonts.cpp',
         ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     EXPORTS += [
         'gfxD2DSurface.h',
         'gfxDWriteFonts.h',
         'gfxGDIFont.h',
         'gfxGDIFontList.h',
         'gfxPDFSurface.h',
         'gfxPlatformFontList.h',
         'gfxWindowsNativeDrawing.h',
         'gfxWindowsPlatform.h',
         'gfxWindowsSurface.h',
     ]
-    CPP_SOURCES += [
+    SOURCES += [
         'gfxGDIFont.cpp',
         'gfxGDIFontList.cpp',
         'gfxGDIShaper.cpp',
         'gfxPDFSurface.cpp',
         'gfxUniscribeShaper.cpp',
         'gfxWindowsNativeDrawing.cpp',
         'gfxWindowsPlatform.cpp',
         'gfxWindowsSurface.cpp',
         'nsUnicodeRange.cpp',
     ]
     if CONFIG['MOZ_ENABLE_DWRITE_FONT']:
-        CPP_SOURCES += [
+        SOURCES += [
             'gfxD2DSurface.cpp',
             'gfxDWriteCommon.cpp',
             'gfxDWriteFontList.cpp',
             'gfxDWriteFonts.cpp',
             'gfxDWriteShaper.cpp',
             'gfxDWriteTextAnalysis.cpp',
         ]
 
 # Are we targeting x86 or x64?  If so, build gfxAlphaRecoverySSE2.cpp.
 if CONFIG['INTEL_ARCHITECTURE']:
-    CPP_SOURCES += [
+    SOURCES += [
         'gfxAlphaRecoverySSE2.cpp',
     ]
 
-CPP_SOURCES += [
+SOURCES += [
     'gfx3DMatrix.cpp',
     'gfxAlphaRecovery.cpp',
     'gfxASurface.cpp',
     'gfxBaseSharedMemorySurface.cpp',
     'gfxBlur.cpp',
     'gfxCachedTempSurface.cpp',
     'gfxContext.cpp',
     'gfxDrawable.cpp',
@@ -261,17 +261,17 @@ CPP_SOURCES += [
     'gfxSVGGlyphs.cpp',
     'gfxTeeSurface.cpp',
     'gfxUserFontSet.cpp',
     'gfxUtils.cpp',
     'nsSurfaceTexture.cpp',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    CMMSRCS += [
+    SOURCES += [
         'gfxMacPlatformFontList.mm',
     ]
 
 FAIL_ON_WARNINGS = not CONFIG['_MSC_VER']
 
 LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
--- a/gfx/ycbcr/moz.build
+++ b/gfx/ycbcr/moz.build
@@ -8,69 +8,69 @@ MODULE = 'ycbcr'
 
 EXPORTS += [
     'chromium_types.h',
     'ycbcr_to_rgb565.h',
     'yuv_convert.h',
     'yuv_row.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'ycbcr_to_rgb565.cpp',
     'yuv_convert.cpp',
     'yuv_row_c.cpp',
     'yuv_row_table.cpp',
 ]
 
 if CONFIG['INTEL_ARCHITECTURE']:
-    CPP_SOURCES += [
+    SOURCES += [
         'yuv_convert_sse2.cpp',
     ]
 
     # MSVC doesn't support MMX when targeting AMD64.
     if CONFIG['_MSC_VER']:
         if CONFIG['OS_TEST'] != 'x86_64':
-            CPP_SOURCES += [
+            SOURCES += [
                 'yuv_convert_mmx.cpp',
             ]
     else:
-        CPP_SOURCES += [
+        SOURCES += [
             'yuv_convert_mmx.cpp',
         ]
 
 if CONFIG['_MSC_VER']:
     if CONFIG['OS_TEST'] == 'x86_64':
         if CONFIG['_MSC_VER'] == '1400':
             # VC8 doesn't support some SSE2 built-in functions
-            CPP_SOURCES += [
+            SOURCES += [
                 'yuv_row_win.cpp',
             ]
         else:
-            CPP_SOURCES += [
+            SOURCES += [
                 'yuv_row_win64.cpp',
             ]
     else:
-        CPP_SOURCES += [
+        SOURCES += [
             'yuv_row_win.cpp',
         ]
 elif CONFIG['OS_ARCH'] in ('Linux', 'SunOS', 'Darwin', 'DragonFly',
                            'FreeBSD', 'NetBSD', 'OpenBSD'):
-    CPP_SOURCES += [
+    SOURCES += [
         'yuv_row_posix.cpp',
     ]
 else:
-    CPP_SOURCES += [
+    SOURCES += [
         'yuv_row_other.cpp',
     ]
 
 if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['HAVE_ARM_NEON']:
-    ASFILES += [
+    SOURCES += [
         'yuv_row_arm.s',
     ]
-    CPP_SOURCES += [
+    SOURCES += [
         'yuv_convert_arm.cpp',
     ]
 
 LIBRARY_NAME = 'ycbcr'
 
 LIBXUL_LIBRARY = True
 
 EXPORT_LIBRARY = True
--- a/hal/moz.build
+++ b/hal/moz.build
@@ -15,145 +15,145 @@ EXPORTS.mozilla += [
     'HalImpl.h',
     'HalSandbox.h',
     'HalSensor.h',
     'HalTypes.h',
     'HalWakeLock.h',
 ]
 
 TEST_DIRS += ['tests']
-CPP_SOURCES += [
+SOURCES += [
     'Hal.cpp',
     'HalWakeLock.cpp',
     'sandbox/SandboxHal.cpp',
     'WindowIdentifier.cpp',
 ]
 
 if CONFIG['MOZ_GAMEPAD_BACKEND'] == 'stub':
-    CPP_SOURCES += [
+    SOURCES += [
         'fallback/FallbackGamepad.cpp'
     ]
 elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'cocoa':
-    CPP_SOURCES += [
+    SOURCES += [
         'cocoa/CocoaGamepad.cpp'
     ]
 elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'windows':
-    CPP_SOURCES += [
+    SOURCES += [
         'windows/WindowsGamepad.cpp'
     ]
 elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'linux':
-    CPP_SOURCES += [
+    SOURCES += [
         'linux/LinuxGamepad.cpp'
     ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
-    CPP_SOURCES += [
+    SOURCES += [
         'android/AndroidHal.cpp',
         'android/AndroidSensor.cpp',
         'fallback/FallbackAlarm.cpp',
         'fallback/FallbackPower.cpp',
         'linux/LinuxMemory.cpp',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
-    CPP_SOURCES += [
+    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',
     ]
 elif CONFIG['OS_TARGET'] == 'Linux':
-    CPP_SOURCES += [
+    SOURCES += [
         'fallback/FallbackAlarm.cpp',
         'fallback/FallbackScreenConfiguration.cpp',
         'fallback/FallbackSensor.cpp',
         'fallback/FallbackVibration.cpp',
         'linux/LinuxMemory.cpp',
         'linux/LinuxPower.cpp',
     ]
     if CONFIG['MOZ_ENABLE_DBUS']:
-        CPP_SOURCES += [
+        SOURCES += [
             'linux/UPowerClient.cpp',
         ]
     else:
-        CPP_SOURCES += [
+        SOURCES += [
             'fallback/FallbackBattery.cpp',
         ]
 elif CONFIG['OS_TARGET'] == 'WINNT':
-    CPP_SOURCES += [
+    SOURCES += [
         'fallback/FallbackAlarm.cpp',
         'fallback/FallbackMemory.cpp',
         'fallback/FallbackPower.cpp',
         'fallback/FallbackScreenConfiguration.cpp',
         'fallback/FallbackVibration.cpp',
         'windows/WindowsBattery.cpp',
         'windows/WindowsSensor.cpp',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    CPP_SOURCES += [
+    SOURCES += [
         'cocoa/CocoaBattery.cpp',
         'fallback/FallbackAlarm.cpp',
         'fallback/FallbackMemory.cpp',
         'fallback/FallbackPower.cpp',
         'fallback/FallbackScreenConfiguration.cpp',
         'fallback/FallbackVibration.cpp',
     ]
 elif CONFIG['OS_TARGET'] in ('OpenBSD', 'NetBSD', 'FreeBSD', 'DragonFly'):
-    CPP_SOURCES += [
+    SOURCES += [
         'fallback/FallbackAlarm.cpp',
         'fallback/FallbackMemory.cpp',
         'fallback/FallbackPower.cpp',
         'fallback/FallbackScreenConfiguration.cpp',
         'fallback/FallbackSensor.cpp',
         'fallback/FallbackVibration.cpp',
     ]
     if CONFIG['MOZ_ENABLE_DBUS']:
-        CPP_SOURCES += [
+        SOURCES += [
             'linux/UPowerClient.cpp',
         ]
     else:
-        CPP_SOURCES += [
+        SOURCES += [
             'fallback/FallbackBattery.cpp',
         ]
 else:
-    CPP_SOURCES += [
+    SOURCES += [
         'fallback/FallbackAlarm.cpp',
         'fallback/FallbackBattery.cpp',
         'fallback/FallbackMemory.cpp',
         'fallback/FallbackPower.cpp',
         'fallback/FallbackScreenConfiguration.cpp',
         'fallback/FallbackSensor.cpp',
         'fallback/FallbackVibration.cpp',
     ]
 
 # Fallbacks for backends implemented on Gonk only.
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
-    CPP_SOURCES += [
+    SOURCES += [
         'fallback/FallbackDiskSpaceWatcher.cpp',
         'fallback/FallbackFactoryReset.cpp',
         'fallback/FallbackFMRadio.cpp',
         'fallback/FallbackLights.cpp',
         'fallback/FallbackProcessPriority.cpp',
         'fallback/FallbackScreenPower.cpp',
         'fallback/FallbackSwitch.cpp',
         'fallback/FallbackTime.cpp',
         'fallback/FallbackWakeLocks.cpp',
     ]
 
 # Fallbacks for backends implemented on Android only.
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
-    CPP_SOURCES += [
+    SOURCES += [
         'fallback/FallbackNetwork.cpp',
     ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    CMMSRCS += [
+    SOURCES += [
         'cocoa/CocoaSensor.mm',
         'cocoa/smslib.mm',
     ]
 
 IPDL_SOURCES = [
     'sandbox/PHal.ipdl',
 ]
 
--- a/image/build/moz.build
+++ b/image/build/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 MODULE = 'imglib2'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsImageModule.cpp',
 ]
 
 LIBRARY_NAME = 'imglib2'
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
--- a/image/decoders/icon/android/moz.build
+++ b/image/decoders/icon/android/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 MODULE = 'imgicon'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsIconChannel.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'imgiconandroid_s'
--- a/image/decoders/icon/gtk/moz.build
+++ b/image/decoders/icon/gtk/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 MODULE = 'imgicon'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsIconChannel.cpp',
 ]
 
 LIBRARY_NAME = 'imgicongtk_s'
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
--- a/image/decoders/icon/mac/moz.build
+++ b/image/decoders/icon/mac/moz.build
@@ -3,16 +3,16 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'imgicon'
 
 LIBRARY_NAME = 'imgiconmac_s'
 
-CMMSRCS += [
+SOURCES += [
     'nsIconChannelCocoa.mm',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
--- a/image/decoders/icon/moz.build
+++ b/image/decoders/icon/moz.build
@@ -5,17 +5,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'nsIIconURI.idl',
 ]
 
 MODULE = 'imgicon'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsIconModule.cpp',
     'nsIconProtocolHandler.cpp',
     'nsIconURI.cpp',
 ]
 
 LIBRARY_NAME = 'imgicon'
 
 FAIL_ON_WARNINGS = True
--- a/image/decoders/icon/os2/moz.build
+++ b/image/decoders/icon/os2/moz.build
@@ -1,16 +1,16 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'imgicon'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsIconChannel.cpp',
 ]
 
 LIBRARY_NAME = 'imgiconos2_s'
 
 LIBXUL_LIBRARY = True
 
--- a/image/decoders/icon/qt/moz.build
+++ b/image/decoders/icon/qt/moz.build
@@ -3,17 +3,17 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DIRS += ['public']
 
 MODULE = 'imgicon'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsIconChannel.cpp',
 ]
 
 EXTRA_COMPONENTS += [
     'gtkqticonsconverter.manifest',
 ]
 
 EXTRA_PP_COMPONENTS += [
--- a/image/decoders/icon/win/moz.build
+++ b/image/decoders/icon/win/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 MODULE = 'imgicon'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsIconChannel.cpp',
 ]
 
 LIBRARY_NAME = 'imgiconwin_s'
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
--- a/image/decoders/moz.build
+++ b/image/decoders/moz.build
@@ -20,32 +20,32 @@ elif CONFIG['OS_ARCH'] == 'OS2':
 
 if toolkit == 'cocoa':
     DIRS += ['icon/mac', 'icon']
 elif toolkit == 'android':
     DIRS += ['icon/android', 'icon']
 
 MODULE = 'imgdecoders'
 
-CPP_SOURCES += [
+SOURCES += [
     'EXIF.cpp',
     'nsBMPDecoder.cpp',
     'nsGIFDecoder2.cpp',
     'nsICODecoder.cpp',
     'nsIconDecoder.cpp',
     'nsJPEGDecoder.cpp',
     'nsPNGDecoder.cpp',
 ]
 
 LIBRARY_NAME = 'imgdecoders_s'
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
-CSRCS += [
+SOURCES += [
     'iccjpeg.c',
 ]
 
 # Decoders need RasterImage.h
 LOCAL_INCLUDES += [
     '/image/src',
 ]
--- a/image/encoders/bmp/moz.build
+++ b/image/encoders/bmp/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 MODULE = 'imgbmpe'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsBMPEncoder.cpp',
 ]
 
 LIBRARY_NAME = 'imgbmpe_s'
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
--- a/image/encoders/ico/moz.build
+++ b/image/encoders/ico/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 MODULE = 'imgicoe'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsICOEncoder.cpp',
 ]
 
 LIBRARY_NAME = 'imgicoe_s'
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
--- a/image/encoders/jpeg/moz.build
+++ b/image/encoders/jpeg/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 MODULE = 'imgjpege'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsJPEGEncoder.cpp',
 ]
 
 LIBRARY_NAME = 'imgjpege_s'
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
--- a/image/encoders/png/moz.build
+++ b/image/encoders/png/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 MODULE = 'imgpnge'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsPNGEncoder.cpp',
 ]
 
 LIBRARY_NAME = 'imgpnge_s'
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
--- a/image/src/moz.build
+++ b/image/src/moz.build
@@ -9,17 +9,17 @@ MODULE = 'imglib2'
 EXPORTS += [
     'ImageOps.h',
     'imgLoader.h',
     'imgRequest.h',
     'imgRequestProxy.h',
     'Orientation.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'ClippedImage.cpp',
     'Decoder.cpp',
     'DiscardTracker.cpp',
     'FrameAnimator.cpp',
     'FrameBlender.cpp',
     'FrameSequence.cpp',
     'FrozenImage.cpp',
     'Image.cpp',
--- a/intl/build/moz.build
+++ b/intl/build/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 MODULE = 'i18n'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsI18nModule.cpp',
 ]
 
 LIBRARY_NAME = 'i18n'
 
 LIBXUL_LIBRARY = True
 
 EXPORT_LIBRARY = True
--- a/intl/chardet/src/moz.build
+++ b/intl/chardet/src/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 MODULE = 'chardet'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsChardetModule.cpp',
     'nsCyrillicDetector.cpp',
 ]
 
 LIBRARY_NAME = 'chardet'
 
 LIBXUL_LIBRARY = True
 
--- a/intl/hyphenation/src/moz.build
+++ b/intl/hyphenation/src/moz.build
@@ -1,24 +1,24 @@
 # -*- 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/.
 
 MODULE = 'hyphenation'
 
-CPP_SOURCES += [
+SOURCES += [
     'hnjstdio.cpp',
     'nsHyphenationManager.cpp',
     'nsHyphenator.cpp',
 ]
 
 LIBRARY_NAME = 'hyphenation_s'
 
 LIBXUL_LIBRARY = True
 
-CSRCS += [
+SOURCES += [
     'hyphen.c',
 ]
 
 MSVC_ENABLE_PGO = True
 
--- a/intl/locale/src/mac/moz.build
+++ b/intl/locale/src/mac/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 MODULE = 'locale'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsCollationMacUC.cpp',
     'nsDateTimeFormatMac.cpp',
     'nsMacCharset.cpp',
 ]
 
 LIBRARY_NAME = 'platlocale_s'
 
 LIBXUL_LIBRARY = True
--- a/intl/locale/src/moz.build
+++ b/intl/locale/src/moz.build
@@ -14,17 +14,17 @@ else:
     DIRS += ['unix']
 
 MODULE = 'locale'
 
 EXPORTS += [
     'nsCollation.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'nsCharsetAlias.cpp',
     'nsCollation.cpp',
     'nsLanguageAtomService.cpp',
     'nsLocale.cpp',
     'nsLocaleService.cpp',
     'nsScriptableDateFormat.cpp',
     'nsUConvPropertySearch.cpp',
 ]
--- a/intl/locale/src/os2/moz.build
+++ b/intl/locale/src/os2/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 MODULE = 'locale'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsCollationOS2.cpp',
     'nsDateTimeFormatOS2.cpp',
     'nsOS2Charset.cpp',
     'nsOS2Locale.cpp',
 ]
 
 LIBRARY_NAME = 'platlocale_s'
 
--- a/intl/locale/src/unix/moz.build
+++ b/intl/locale/src/unix/moz.build
@@ -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/.
 
 MODULE = 'locale'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsCollationUnix.cpp',
     'nsDateTimeFormatUnix.cpp',
     'nsPosixLocale.cpp',
 ]
 
 if CONFIG['OS_TARGET'] == 'Android':
-    CPP_SOURCES += [
+    SOURCES += [
         'nsAndroidCharset.cpp',
     ]
 else:
-    CPP_SOURCES += [
+    SOURCES += [
         'nsUNIXCharset.cpp',
     ]
 
 LIBRARY_NAME = 'platlocale_s'
 
 LIBXUL_LIBRARY = True
 
--- a/intl/locale/src/windows/moz.build
+++ b/intl/locale/src/windows/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 MODULE = 'locale'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsCollationWin.cpp',
     'nsDateTimeFormatWin.cpp',
     'nsWin32Locale.cpp',
     'nsWinCharset.cpp',
 ]
 
 LIBRARY_NAME = 'platlocale_s'
 
--- a/intl/lwbrk/src/moz.build
+++ b/intl/lwbrk/src/moz.build
@@ -1,39 +1,39 @@
 # -*- 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/.
 
 MODULE = 'lwbrk'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsJISx4051LineBreaker.cpp',
     'nsSampleWordBreaker.cpp',
     'nsSemanticUnitScanner.cpp',
 ]
 
 if CONFIG['MOZ_WIDGET_GTK']:
-    CPP_SOURCES += [
+    SOURCES += [
         'nsPangoBreaker.cpp',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
-    CPP_SOURCES += [
+    SOURCES += [
         'nsUniscribeBreaker.cpp',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    CPP_SOURCES += [
+    SOURCES += [
         'nsCarbonBreaker.cpp',
     ]
 else:
-    CPP_SOURCES += [
+    SOURCES += [
         'nsRuleBreaker.cpp',
     ]
-    CSRCS += [
+    SOURCES += [
         'rulebrk.c',
     ]
 
 
 LIBRARY_NAME = 'lwbrk_s'
 
 LIBXUL_LIBRARY = True
 
--- a/intl/strres/src/moz.build
+++ b/intl/strres/src/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 MODULE = 'intl'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsStringBundle.cpp',
     'nsStringBundleTextOverride.cpp',
 ]
 
 LIBRARY_NAME = 'strres_s'
 
 LIBXUL_LIBRARY = True
 
--- a/intl/uconv/src/moz.build
+++ b/intl/uconv/src/moz.build
@@ -1,22 +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/.
 
 MODULE = 'uconv'
 
-CPP_SOURCES += [
+SOURCES += [
     'UnifiedUCV.cpp',
 ]
 
 if CONFIG['INTEL_ARCHITECTURE']:
-    CPP_SOURCES += [
+    SOURCES += [
         'nsUTF8ToUnicodeSSE2.cpp',
     ]
 
 LIBRARY_NAME = 'uconv'
 
 LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
--- a/intl/uconv/tools/moz.build
+++ b/intl/uconv/tools/moz.build
@@ -3,17 +3,17 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 sources = [
     'umaptable',
 ]
 
-CSRCS += [
+SOURCES += [
     '%s.c' % s for s in sources
 ]
 
 bin_suffix = CONFIG['BIN_SUFFIX']
 SIMPLE_PROGRAMS += [
     '%s%s' % (s, bin_suffix) for s in sources
 ]
 
--- a/intl/uconv/ucvcn/moz.build
+++ b/intl/uconv/ucvcn/moz.build
@@ -5,17 +5,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'ucvcn'
 
 EXPORTS += [
     'nsUCvCnCID.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'UnifiedUCVCN.cpp',
 ]
 
 LIBRARY_NAME = 'ucvcn_s'
 
 LIBXUL_LIBRARY = True
 
 LOCAL_INCLUDES += [
--- a/intl/uconv/ucvibm/moz.build
+++ b/intl/uconv/ucvibm/moz.build
@@ -5,22 +5,22 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'ucvibm'
 
 EXPORTS += [
     'nsUCvIBMCID.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'UnifiedUCVIBM.cpp',
 ]
 
 if CONFIG['OS_ARCH'] == 'OS2':
-    CPP_SOURCES += [
+    SOURCES += [
         'UnifiedUCVIBMOS2.cpp',
     ]
 
 LIBRARY_NAME = 'ucvibm_s'
 
 LIBXUL_LIBRARY = True
 
 LOCAL_INCLUDES += [
--- a/intl/uconv/ucvja/moz.build
+++ b/intl/uconv/ucvja/moz.build
@@ -6,17 +6,17 @@
 
 MODULE = 'ucvja'
 
 EXPORTS += [
     'nsUCVJA2CID.h',
     'nsUCVJACID.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'UnifiedUCVJA.cpp',
 ]
 
 LIBRARY_NAME = 'ucvja_s'
 
 LIBXUL_LIBRARY = True
 
 LOCAL_INCLUDES += [
--- a/intl/uconv/ucvko/moz.build
+++ b/intl/uconv/ucvko/moz.build
@@ -5,17 +5,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'ucvko'
 
 EXPORTS += [
     'nsUCvKOCID.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'UnifiedUCVKO.cpp',
 ]
 
 LIBRARY_NAME = 'ucvko_s'
 
 LIBXUL_LIBRARY = True
 
 LOCAL_INCLUDES += [
--- a/intl/uconv/ucvlatin/moz.build
+++ b/intl/uconv/ucvlatin/moz.build
@@ -5,17 +5,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'ucvlatin'
 
 EXPORTS += [
     'nsUCvLatinCID.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'UnifiedUCVLatin.cpp',
 ]
 
 LIBRARY_NAME = 'ucvlatin_s'
 
 LIBXUL_LIBRARY = True
 
 LOCAL_INCLUDES += [
--- a/intl/uconv/ucvtw/moz.build
+++ b/intl/uconv/ucvtw/moz.build
@@ -5,17 +5,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'ucvtw'
 
 EXPORTS += [
     'nsUCvTWCID.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'UnifiedUCVTW.cpp',
 ]
 
 LIBRARY_NAME = 'ucvtw_s'
 
 LIBXUL_LIBRARY = True
 
 LOCAL_INCLUDES += [
--- a/intl/uconv/ucvtw2/moz.build
+++ b/intl/uconv/ucvtw2/moz.build
@@ -5,17 +5,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'ucvtw2'
 
 EXPORTS += [
     'nsUCvTW2CID.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'UnifiedUCVTW2.cpp',
 ]
 
 LIBRARY_NAME = 'ucvtw2_s'
 
 LIBXUL_LIBRARY = True
 
 LOCAL_INCLUDES += [
--- a/intl/uconv/util/moz.build
+++ b/intl/uconv/util/moz.build
@@ -1,24 +1,24 @@
 # -*- 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/.
 
 MODULE = 'uconv'
 
-CPP_SOURCES += [
+SOURCES += [
     'UnifiedUCVUtils.cpp',
 ]
 
 LIBRARY_NAME = 'ucvutil_s'
 
 LIBXUL_LIBRARY = True
 
-CSRCS += [
+SOURCES += [
     'UnifiedUCVCUtils.c',
 ]
 
 MSVC_ENABLE_PGO = True
 
 EXPORT_LIBRARY = True
 
--- a/intl/unicharutil/src/moz.build
+++ b/intl/unicharutil/src/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 MODULE = 'unicharutil'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsCaseConversionImp2.cpp',
     'nsCategoryImp.cpp',
     'nsEntityConverter.cpp',
     'nsSaveAsCharset.cpp',
     'nsUnicodeNormalizer.cpp',
 ]
 
 LIBRARY_NAME = 'ucharucomp_s'
--- a/intl/unicharutil/tests/moz.build
+++ b/intl/unicharutil/tests/moz.build
@@ -3,17 +3,17 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'test_intl_unicharutil'
 
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
 
-CPP_SOURCES += [
+SOURCES += [
     'NormalizationTest.cpp',
     'UnicharSelfTest.cpp',
 ]
 
 bin_suffix = CONFIG['BIN_SUFFIX']
 SIMPLE_PROGRAMS += [
-    "%s%s" % (fyl[0:-4], bin_suffix) for fyl in CPP_SOURCES
+    "%s%s" % (fyl[0:-4], bin_suffix) for fyl in SOURCES
 ]
--- a/intl/unicharutil/tools/moz.build
+++ b/intl/unicharutil/tools/moz.build
@@ -3,12 +3,12 @@
 # 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 = 'ucgendat'
 
 PROGRAM = 'ucgendat'
 
-CSRCS += [
+SOURCES += [
     'ucgendat.c',
 ]
 
--- a/intl/unicharutil/util/internal/moz.build
+++ b/intl/unicharutil/util/internal/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/.
 
 MODULE = 'unicharutil'
 
 include('../objs.mozbuild')
 
-CPP_SOURCES += intl_unicharutil_util_cppsrcs
+SOURCES += intl_unicharutil_util_cppsrcs
 
 LIBRARY_NAME = 'unicharutil_s'
 
 EXPORT_LIBRARY = True
 
--- a/intl/unicharutil/util/moz.build
+++ b/intl/unicharutil/util/moz.build
@@ -13,11 +13,11 @@ EXPORTS += [
     'nsSpecialCasingData.h',
     'nsUnicharUtils.h',
     'nsUnicodeProperties.h',
     'nsUnicodeScriptCodes.h',
 ]
 
 include('objs.mozbuild')
 
-CPP_SOURCES += intl_unicharutil_util_cppsrcs
+SOURCES += intl_unicharutil_util_cppsrcs
 
 LIBRARY_NAME = 'unicharutil_external_s'
--- a/ipc/app/moz.build
+++ b/ipc/app/moz.build
@@ -4,18 +4,18 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'ipc'
 
 PROGRAM = CONFIG['MOZ_CHILD_PROCESS_NAME']
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
-    CPP_SOURCES += [
+    SOURCES += [
         'MozillaRuntimeMainAndroid.cpp',
     ]
     FINAL_TARGET = 'dist/bin/lib'
 else:
-    CPP_SOURCES += [
+    SOURCES += [
         'MozillaRuntimeMain.cpp',
     ]
 include('/ipc/chromium/chromium-config.mozbuild')
 
--- a/ipc/chromium/moz.build
+++ b/ipc/chromium/moz.build
@@ -30,17 +30,17 @@ else:
         os_netbsd = 1
         os_bsd = 1
     elif CONFIG['OS_ARCH'] == 'OpenBSD':
         os_openbsd = 1
         os_bsd = 1
     else:
         os_linux = 1
 
-CPP_SOURCES += [
+SOURCES += [
     'src/base/at_exit.cc',
     'src/base/base_paths.cc',
     'src/base/base_switches.cc',
     'src/base/command_line.cc',
     'src/base/debug_util.cc',
     'src/base/file_path.cc',
     'src/base/file_util.cc',
     'src/base/histogram.cc',
@@ -84,17 +84,17 @@ CPP_SOURCES += [
     '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 += [
+    SOURCES += [
         'src/base/base_paths_win.cc',
         'src/base/condition_variable_win.cc',
         'src/base/cpu.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',
@@ -120,17 +120,17 @@ if os_win:
         'src/chrome/common/chrome_constants.cc',
         'src/chrome/common/chrome_paths_win.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 += [
+    SOURCES += [
         'src/base/condition_variable_posix.cc',
         'src/base/debug_util_posix.cc',
         'src/base/event_recorder_stubs.cc',
         'src/base/file_descriptor_shuffle.cc',
         'src/base/file_util_posix.cc',
         'src/base/lock_impl_posix.cc',
         'src/base/message_pump_libevent.cc',
         'src/base/platform_file_posix.cc',
@@ -146,96 +146,96 @@ if os_posix:
         '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',
     ]
     if CONFIG['OS_TARGET'] == 'Android':
-        CPP_SOURCES += [
+        SOURCES += [
             'src/base/message_pump_android.cc',
         ]
 
 if os_macosx:
-    CPP_SOURCES += [
+    SOURCES += [
         'src/base/debug_util_mac.cc',
         'src/base/hmac_mac.cc',
         'src/base/idle_timer.cc',
         'src/base/sys_info_mac.cc',
         'src/base/time_mac.cc',
         'src/chrome/common/mach_message_source_mac.cc',
         'src/chrome/common/transport_dib_mac.cc',
     ]
-    CMMSRCS += [
+    SOURCES += [
         'src/base/base_paths_mac.mm',
         'src/base/chrome_application_mac.mm',
         'src/base/file_util_mac.mm',
         'src/base/file_version_info_mac.mm',
         'src/base/mac_util.mm',
         'src/base/message_pump_mac.mm',
         'src/base/platform_thread_mac.mm',
         'src/base/process_util_mac.mm',
         'src/base/scoped_nsautorelease_pool.mm',
         'src/base/sys_string_conversions_mac.mm',
         'src/base/worker_pool_mac.mm',
         'src/chrome/common/chrome_paths_mac.mm',
         'src/chrome/common/mach_ipc_mac.mm',
     ]
 
 if os_linux:
-    CPP_SOURCES += [
+    SOURCES += [
         'src/base/atomicops_internals_x86_gcc.cc',
         'src/base/base_paths_linux.cc',
         'src/base/file_version_info_linux.cc',
         'src/base/idle_timer_none.cc',
         'src/base/process_util_linux.cc',
         'src/base/time_posix.cc',
     ]
     if CONFIG['MOZ_WIDGET_GTK']:
-        CPP_SOURCES += [
+        SOURCES += [
             'src/base/message_pump_glib.cc',
         ]
     if CONFIG['MOZ_ENABLE_QT']:
-        CPP_SOURCES += [
+        SOURCES += [
             'src/base/message_pump_qt.cc',
             'src/base/moc_message_pump_qt.cc',
         ]
 
 if os_bsd:
-    CPP_SOURCES += [
+    SOURCES += [
         'src/base/atomicops_internals_x86_gcc.cc',
         'src/base/time_posix.cc',
     ]
     if CONFIG['OS_ARCH'] == 'GNU_kFreeBSD':
-        CPP_SOURCES += [
+        SOURCES += [
             'src/base/process_util_linux.cc'
         ]
     else:
-        CPP_SOURCES += [
+        SOURCES += [
             'src/base/process_util_bsd.cc'
         ]
     if CONFIG['MOZ_WIDGET_GTK']:
-        CPP_SOURCES += [
+        SOURCES += [
             'src/base/message_pump_glib.cc',
         ]
     if CONFIG['MOZ_ENABLE_QT']:
-        CPP_SOURCES += [
+        SOURCES += [
             'src/base/message_pump_qt.cc',
             'src/base/moc_message_pump_qt.cc',
         ]
 
 if CONFIG['_MSC_VER']:
-    CPP_SOURCES += [
+    SOURCES += [
         'src/base/debug_on_start.cc',
     ]
 
 ost = CONFIG['OS_TEST']
 if ost.find('86') == -1 and ost.find('arm') == -1 and ost.find('mips') == -1:
-    CPP_SOURCES += [
+    SOURCES += [
         'src/base/atomicops_internals_mutex.cc',
     ]
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'chromium_s'
 
 EXPORT_LIBRARY = True
--- a/ipc/dbus/moz.build
+++ b/ipc/dbus/moz.build
@@ -7,17 +7,17 @@
 MODULE = 'ipc'
 
 EXPORTS.mozilla.ipc += [
     'DBusThread.h',
     'DBusUtils.h',
     'RawDBusConnection.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'DBusThread.cpp',
     'DBusUtils.cpp',
     'RawDBusConnection.cpp',
 ]
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'mozdbus_s'
--- a/ipc/glue/moz.build
+++ b/ipc/glue/moz.build
@@ -31,57 +31,57 @@ EXPORTS.mozilla.ipc += [
     'Transport.h',
     'URIUtils.h',
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     EXPORTS.mozilla.ipc += [
         'Transport_win.h',
     ]
-    CPP_SOURCES += [
+    SOURCES += [
         'CrossProcessMutex_windows.cpp',
         'SharedMemory_windows.cpp',
         'Transport_win.cpp',
         'WindowsMessageLoop.cpp',
     ]
 else:
     EXPORTS.mozilla.ipc += [
         'Transport_posix.h',
     ]
-    CPP_SOURCES += [
+    SOURCES += [
         'CrossProcessMutex_unimplemented.cpp',
         'SharedMemory_posix.cpp',
         'Transport_posix.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 += [
+    SOURCES += [
         'SharedMemoryBasic_android.cpp',
     ]
 else:
     EXPORTS.mozilla.ipc += ['SharedMemoryBasic_chromium.h']
 
 if CONFIG['OS_ARCH'] == 'Linux':
-    CPP_SOURCES += [
+    SOURCES += [
         'ProcessUtils_linux.cpp',
     ]
 else:
-    CPP_SOURCES += [
+    SOURCES += [
         'ProcessUtils_none.cpp',
     ]
 
 EXPORTS.ipc += [
     'IPCMessageUtils.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'BrowserProcessSubThread.cpp',
     'FileDescriptor.cpp',
     'FileDescriptorUtils.cpp',
     'GeckoChildProcessHost.cpp',
     'InputStreamUtils.cpp',
     'MessageChannel.cpp',
     'MessageLink.cpp',
     'MessagePump.cpp',
--- a/ipc/ipdl/test/cxx/app/moz.build
+++ b/ipc/ipdl/test/cxx/app/moz.build
@@ -3,13 +3,13 @@
 # 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 = 'ipdlunittest'
 
 PROGRAM = 'ipdlunittest'
 
-CPP_SOURCES += [
+SOURCES += [
     'TestIPDL.cpp',
 ]
 include('/ipc/chromium/chromium-config.mozbuild')
 
--- a/ipc/ipdl/test/cxx/moz.build
+++ b/ipc/ipdl/test/cxx/moz.build
@@ -11,17 +11,17 @@ LIBRARY_NAME = 'ipdlunittest_s'
 
 EXPORTS.mozilla._ipdltest += [
     'IPDLUnitTestProcessChild.h',
     'IPDLUnitTests.h',
     'IPDLUnitTestTypes.h',
     'IPDLUnitTestUtils.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     '$(IPDLTESTSRCS)',
     'IPDLUnitTestProcessChild.cpp',
     'IPDLUnitTests.cpp',
     'IPDLUnitTestSubprocess.cpp',
 ]
 
 IPDL_SOURCES += [
     'PTestActorPunning.ipdl',
--- a/ipc/keystore/moz.build
+++ b/ipc/keystore/moz.build
@@ -5,17 +5,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'ipc'
 
 EXPORTS.mozilla.ipc += [
   'KeyStore.h'
 ]
 
-CPP_SOURCES += [
+SOURCES += [
   'KeyStore.cpp'
 ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'mozkeystore_s'
--- a/ipc/netd/moz.build
+++ b/ipc/netd/moz.build
@@ -5,17 +5,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'ipc'
 
 EXPORTS.mozilla.ipc += [
     'Netd.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'Netd.cpp',
 ]
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'moznetd_s'
 
 EXPORT_LIBRARY = True
--- a/ipc/nfc/moz.build
+++ b/ipc/nfc/moz.build
@@ -3,17 +3,17 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 if CONFIG['MOZ_B2G_NFC']:
     MODULE = 'ipc'
     EXPORTS.mozilla.ipc += [
         'Nfc.h',
     ]
-    CPP_SOURCES += [
+    SOURCES += [
         'Nfc.cpp',
     ]
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'moznfc_s'
 
 EXPORT_LIBRARY = True
--- a/ipc/ril/moz.build
+++ b/ipc/ril/moz.build
@@ -5,17 +5,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'ipc'
 
 EXPORTS.mozilla.ipc += [
     'Ril.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'Ril.cpp',
 ]
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'mozril_s'
 
 EXPORT_LIBRARY = True
--- a/ipc/testshell/moz.build
+++ b/ipc/testshell/moz.build
@@ -11,17 +11,17 @@ EXPORTS.mozilla.ipc += [
     'TestShellParent.h',
     'XPCShellEnvironment.h',
 ]
 
 # FIXME/bug 575918: out-of-process xpcshell is broken on OS X
 if CONFIG['OS_ARCH'] != 'Darwin':
     XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell.ini']
 
-CPP_SOURCES += [
+SOURCES += [
     'TestShellChild.cpp',
     'TestShellParent.cpp',
     'XPCShellEnvironment.cpp',
 ]
 
 IPDL_SOURCES = [
     'PTestShell.ipdl',
     'PTestShellCommand.ipdl',
--- a/ipc/unixsocket/moz.build
+++ b/ipc/unixsocket/moz.build
@@ -5,17 +5,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'ipc'
 
 EXPORTS.mozilla.ipc += [
     'UnixSocket.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'UnixSocket.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'mozipcunixsocket_s'
--- a/js/ductwork/debugger/moz.build
+++ b/js/ductwork/debugger/moz.build
@@ -7,17 +7,17 @@
 XPIDL_SOURCES += [
     'IJSDebugger.idl',
 ]
 
 MODULE = 'jsdebugger'
 
 XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell.ini']
 
-CPP_SOURCES += [
+SOURCES += [
     'JSDebugger.cpp',
 ]
 
 LIBRARY_NAME = 'jsdebugger'
 
 EXTRA_JS_MODULES += [
     'jsdebugger.jsm',
 ]
--- a/js/ipc/moz.build
+++ b/js/ipc/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 MODULE = 'js'
 
-CPP_SOURCES += [
+SOURCES += [
     'JavaScriptChild.cpp',
     'JavaScriptParent.cpp',
     'JavaScriptShared.cpp',
 ]
 
 IPDL_SOURCES += [
     'JavaScriptTypes.ipdlh',
     'PJavaScript.ipdl',
--- a/js/jsd/moz.build
+++ b/js/jsd/moz.build
@@ -10,17 +10,17 @@ TEST_TOOL_DIRS += ['test']
 MODULE = 'jsdebug'
 
 EXPORTS += [
     'jsdebug.h',
 ]
 
 XPCSHELL_TESTS_MANIFESTS += ['test/xpcshell.ini']
 
-CPP_SOURCES += [
+SOURCES += [
     'jsd_atom.cpp',
     'jsd_high.cpp',
     'jsd_hook.cpp',
     'jsd_lock.cpp',
     'jsd_obj.cpp',
     'jsd_scpt.cpp',
     'jsd_stak.cpp',
     'jsd_step.cpp',
--- a/js/src/config/moz.build
+++ b/js/src/config/moz.build
@@ -2,12 +2,12 @@
 # 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
 
 if CONFIG['HOST_OS_ARCH'] != 'WINNT':
-    HOST_CSRCS += [
+    HOST_SOURCES += [
         'nsinstall.c',
         'pathsub.c',
     ]
--- a/js/src/editline/moz.build
+++ b/js/src/editline/moz.build
@@ -1,13 +1,13 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 LIBRARY_NAME = 'editline'
 
-CSRCS += [
+SOURCES += [
     'editline.c',
     'sysunix.c',
 ]
 
--- a/js/src/gdb/moz.build
+++ b/js/src/gdb/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 PROGRAM = 'gdb-tests'
 
-CPP_SOURCES += [
+SOURCES += [
     'gdb-tests.cpp',
     'tests/test-jsid.cpp',
     'tests/test-JSObject.cpp',
     'tests/test-JSString.cpp',
     'tests/test-jsval.cpp',
     'tests/test-prettyprinters.cpp',
     'tests/test-Root.cpp',
     'tests/typedef-printers.cpp',
--- a/js/src/jsapi-tests/moz.build
+++ b/js/src/jsapi-tests/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 PROGRAM = 'jsapi-tests'
 
-CPP_SOURCES += [
+SOURCES += [
     'selfTest.cpp',
     'testAddPropertyPropcache.cpp',
     'testArgumentsObject.cpp',
     'testArrayBuffer.cpp',
     'testBindCallable.cpp',
     'testBug604087.cpp',
     'testCallNonGenericMethodOnProxy.cpp',
     'testChromeBuffer.cpp',
--- a/js/src/moz.build
+++ b/js/src/moz.build
@@ -72,17 +72,17 @@ EXPORTS.js += [
     '../public/StructuredClone.h',
     '../public/Tracer.h',
     '../public/TypeDecls.h',
     '../public/Utility.h',
     '../public/Value.h',
     '../public/Vector.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     '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',
@@ -183,27 +183,27 @@ CPP_SOURCES += [
     'yarr/PageBlock.cpp',
     'yarr/YarrCanonicalizeUCS2.cpp',
     'yarr/YarrInterpreter.cpp',
     'yarr/YarrPattern.cpp',
     'yarr/YarrSyntaxChecker.cpp',
 ]
 
 if CONFIG['MOZ_INSTRUMENTS']:
-    CPP_SOURCES += [
+    SOURCES += [
         'devtools/Instruments.cpp',
     ]
 
 if CONFIG['ENABLE_TRACE_LOGGING']:
-    CPP_SOURCES += [
+    SOURCES += [
         'TraceLogging.cpp',
     ]
 
 if CONFIG['ENABLE_ION']:
-    CPP_SOURCES += [
+    SOURCES += [
         'jit/AliasAnalysis.cpp',
         'jit/AsmJS.cpp',
         'jit/AsmJSLink.cpp',
         'jit/AsmJSModule.cpp',
         'jit/AsmJSSignalHandlers.cpp',
         'jit/BacktrackingAllocator.cpp',
         'jit/Bailouts.cpp',
         'jit/BaselineBailouts.cpp',
@@ -249,108 +249,108 @@ if CONFIG['ENABLE_ION']:
         'jit/StupidAllocator.cpp',
         'jit/TypePolicy.cpp',
         'jit/TypeRepresentationSet.cpp',
         'jit/UnreachableCodeElimination.cpp',
         'jit/ValueNumbering.cpp',
         'jit/VMFunctions.cpp',
     ]
     if CONFIG['TARGET_CPU'].find('86') != -1:
-        CPP_SOURCES += [
+        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',
             'jit/shared/Lowering-x86-shared.cpp',
             'jit/shared/MoveEmitter-x86-shared.cpp',
         ]
         if CONFIG['TARGET_CPU'] == 'x86_64':
-            CPP_SOURCES += [
+            SOURCES += [
                 'jit/x64/Assembler-x64.cpp',
                 'jit/x64/Bailouts-x64.cpp',
                 'jit/x64/BaselineCompiler-x64.cpp',
                 'jit/x64/BaselineIC-x64.cpp',
                 'jit/x64/CodeGenerator-x64.cpp',
                 'jit/x64/Lowering-x64.cpp',
                 'jit/x64/MacroAssembler-x64.cpp',
                 'jit/x64/Trampoline-x64.cpp',
             ]
         else:
-            CPP_SOURCES += [
+            SOURCES += [
                 'jit/x86/Assembler-x86.cpp',
                 'jit/x86/Bailouts-x86.cpp',
                 'jit/x86/BaselineCompiler-x86.cpp',
                 'jit/x86/BaselineIC-x86.cpp',
                 'jit/x86/CodeGenerator-x86.cpp',
                 'jit/x86/Lowering-x86.cpp',
                 'jit/x86/MacroAssembler-x86.cpp',
                 'jit/x86/Trampoline-x86.cpp',
             ]
     elif CONFIG['TARGET_CPU'].find('arm') != -1:
-        CPP_SOURCES += [
+        SOURCES += [
             'jit/arm/Architecture-arm.cpp',
             'jit/arm/Assembler-arm.cpp',
             'jit/arm/Bailouts-arm.cpp',
             'jit/arm/BaselineCompiler-arm.cpp',
             'jit/arm/BaselineIC-arm.cpp',
             'jit/arm/CodeGenerator-arm.cpp',
             'jit/arm/IonFrames-arm.cpp',
             'jit/arm/Lowering-arm.cpp',
             'jit/arm/MacroAssembler-arm.cpp',
             'jit/arm/MoveEmitter-arm.cpp',
             'jit/arm/Trampoline-arm.cpp',
         ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':
-    CPP_SOURCES += [
+    SOURCES += [
         'assembler/jit/ExecutableAllocatorWin.cpp',
         'yarr/OSAllocatorWin.cpp',
     ]
 elif CONFIG['OS_ARCH'] == 'OS2':
-    CPP_SOURCES += [
+    SOURCES += [
         'assembler/jit/ExecutableAllocatorOS2.cpp',
         'yarr/OSAllocatorOS2.cpp',
     ]
 else:
-    CPP_SOURCES += [
+    SOURCES += [
         'assembler/jit/ExecutableAllocatorPosix.cpp',
         'yarr/OSAllocatorPosix.cpp',
     ]
 
 if CONFIG['ENABLE_ION'] or CONFIG['ENABLE_YARR_JIT']:
-    CPP_SOURCES += [
+    SOURCES += [
         'assembler/assembler/ARMAssembler.cpp',
         'assembler/assembler/MacroAssemblerARM.cpp',
         'assembler/assembler/MacroAssemblerX86Common.cpp',
     ]
 
 if CONFIG['ENABLE_YARR_JIT']:
-    CPP_SOURCES += [
+    SOURCES += [
         'yarr/YarrJIT.cpp'
     ]
 
 if CONFIG['JS_HAS_CTYPES']:
-    CPP_SOURCES += [
+    SOURCES += [
         'ctypes/CTypes.cpp',
         'ctypes/Library.cpp',
     ]
 
 if CONFIG['MOZ_VTUNE']:
-    CSRCS += [
+    SOURCES += [
         'vtune/jitprofiling.c'
     ]
 
 if CONFIG['HAVE_LINUX_PERF_EVENT_H']:
-    CPP_SOURCES += [
+    SOURCES += [
         'perf/pm_linux.cpp'
     ]
 else:
-    CPP_SOURCES += [
+    SOURCES += [
         'perf/pm_stub.cpp'
     ]
 
 MSVC_ENABLE_PGO = True
 
-HOST_CPPSRCS += [
+HOST_SOURCES += [
     'jskwgen.cpp',
     'jsoplengen.cpp',
 ]
--- a/js/src/shell/moz.build
+++ b/js/src/shell/moz.build
@@ -1,13 +1,13 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 PROGRAM = CONFIG['JS_SHELL_NAME']
 
-CPP_SOURCES += [
+SOURCES += [
     'js.cpp',
     'jsheaptools.cpp',
     'jsoptparse.cpp',
 ]
--- a/js/xpconnect/loader/moz.build
+++ b/js/xpconnect/loader/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 MODULE = 'jsloader'
 
-CPP_SOURCES += [
+SOURCES += [
     'mozJSComponentLoader.cpp',
     'mozJSLoaderUtils.cpp',
     'mozJSSubScriptLoader.cpp',
 ]
 
 LIBRARY_NAME = 'jsloader_s'
 
 EXTRA_JS_MODULES += [
--- a/js/xpconnect/shell/moz.build
+++ b/js/xpconnect/shell/moz.build
@@ -5,22 +5,22 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 FAIL_ON_WARNINGS = True
 
 MODULE = 'xpcshell'
 
 PROGRAM = 'xpcshell'
 
-CPP_SOURCES += [
+SOURCES += [
     'xpcshell.cpp',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    CMMSRCS += [
+    SOURCES += [
         'xpcshellMacUtils.mm',
     ]
 
 DEFINES['JS_THREADSAFE'] = True
 
 if CONFIG['MOZ_SHARK']:
     DEFINES['MOZ_SHARK'] = True
 if CONFIG['MOZ_CALLGRIND']:
--- a/js/xpconnect/src/moz.build
+++ b/js/xpconnect/src/moz.build
@@ -10,17 +10,17 @@ EXPORTS += [
     'BackstagePass.h',
     'nsCxPusher.h',
     'qsObjectHelper.h',
     'XPCJSMemoryReporter.h',
     'xpcObjectHelper.h',
     'xpcpublic.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'nsCxPusher.cpp',
     'nsScriptError.cpp',
     'nsXPConnect.cpp',
     'Sandbox.cpp',
     'XPCCallContext.cpp',
     'XPCComponents.cpp',
     'XPCContext.cpp',
     'XPCConvert.cpp',
--- a/js/xpconnect/tests/components/native/moz.build
+++ b/js/xpconnect/tests/components/native/moz.build
@@ -2,17 +2,17 @@
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'xpctest'
 NO_DIST_INSTALL = True
 
-CPP_SOURCES += [
+SOURCES += [
     'xpctest_attributes.cpp',
     'xpctest_module.cpp',
     'xpctest_params.cpp',
 ]
 
 LIBRARY_NAME = 'xpctest'
 
 IS_COMPONENT = True
--- a/js/xpconnect/wrappers/moz.build
+++ b/js/xpconnect/wrappers/moz.build
@@ -5,17 +5,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'xpcwrappers'
 
 EXPORTS += [
     'WrapperFactory.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'AccessCheck.cpp',
     'ChromeObjectWrapper.cpp',
     'FilteringWrapper.cpp',
     'WaiveXrayWrapper.cpp',
     'WrapperFactory.cpp',
     'XrayWrapper.cpp',
 ]
 
--- a/layout/base/moz.build
+++ b/layout/base/moz.build
@@ -6,23 +6,23 @@
 
 TEST_DIRS += ['tests']
 
 XPIDL_SOURCES += [
     'nsIStyleSheetService.idl',
 ]
 
 if CONFIG['IBMBIDI']:
-    CPP_SOURCES += [
+    SOURCES += [
         'nsBidi.cpp',
         'nsBidiPresUtils.cpp',
     ]
 
 if CONFIG['MOZ_DEBUG']:
-    CPP_SOURCES += [
+    SOURCES += [
         'nsAutoLayoutPhase.cpp',
     ]
 
 XPIDL_MODULE = 'layout_base'
 
 MODULE = 'layout'
 
 EXPORTS += [
@@ -60,17 +60,17 @@ EXPORTS += [
     'StackArena.h',
     'Units.h',
 ]
 
 EXPORTS.mozilla += [
     'PaintTracker.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'DisplayItemClip.cpp',
     'DisplayListClipState.cpp',
     'FrameLayerBuilder.cpp',
     'FramePropertyTable.cpp',
     'MaskLayerImageCache.cpp',
     'nsCaret.cpp',
     'nsCounterManager.cpp',
     'nsCSSColorUtils.cpp',
--- a/layout/build/moz.build
+++ b/layout/build/moz.build
@@ -7,17 +7,17 @@
 MODULE = 'layout'
 
 EXPORTS += [
     'nsContentDLF.h',
     'nsLayoutCID.h',
     'nsLayoutStatics.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'nsContentDLF.cpp',
     'nsLayoutModule.cpp',
     'nsLayoutStatics.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
--- a/layout/forms/moz.build
+++ b/layout/forms/moz.build
@@ -11,17 +11,17 @@ MODULE = 'layout'
 EXPORTS += [
     'nsIComboboxControlFrame.h',
     'nsIFormControlFrame.h',
     'nsIListControlFrame.h',
     'nsISelectControlFrame.h',
     'nsITextControlFrame.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'nsButtonFrameRenderer.cpp',
     'nsColorControlFrame.cpp',
     'nsComboboxControlFrame.cpp',
     'nsFieldSetFrame.cpp',
     'nsFileControlFrame.cpp',
     'nsFormControlFrame.cpp',
     'nsGfxButtonControlFrame.cpp',
     'nsGfxCheckboxControlFrame.cpp',
--- a/layout/generic/moz.build
+++ b/layout/generic/moz.build
@@ -38,17 +38,17 @@ EXPORTS += [
 EXPORTS.mozilla += [
     'Selection.h',
 ]
 
 EXPORTS.mozilla.layout += [
     'FrameChildList.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'FrameChildList.cpp',
     'nsAbsoluteContainingBlock.cpp',
     'nsBlockFrame.cpp',
     'nsBlockReflowContext.cpp',
     'nsBlockReflowState.cpp',
     'nsBRFrame.cpp',
     'nsBulletFrame.cpp',
     'nsCanvasFrame.cpp',
@@ -87,17 +87,17 @@ CPP_SOURCES += [
     'nsVideoFrame.cpp',
     'nsViewportFrame.cpp',
     'ScrollbarActivity.cpp',
     'StickyScrollContainer.cpp',
     'TextOverflow.cpp',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    CMMSRCS += [
+    SOURCES += [
         'nsPluginUtilsOSX.mm',
     ]
 
 FAIL_ON_WARNINGS = not CONFIG['_MSC_VER']
 
 LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
--- a/layout/inspector/src/moz.build
+++ b/layout/inspector/src/moz.build
@@ -6,29 +6,29 @@
 
 MODULE = 'inspector'
 
 EXPORTS += [
     'nsFontFace.h',
     'nsFontFaceList.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'inCSSValueSearch.cpp',
     'inDeepTreeWalker.cpp',
     'inDOMUtils.cpp',
     'inFlasher.cpp',
     'inLayoutUtils.cpp',
     'inSearchLoop.cpp',
     'nsFontFace.cpp',
     'nsFontFaceList.cpp',
 ]
 
 if CONFIG['MOZ_XUL']:
-    CPP_SOURCES += [
+    SOURCES += [
         'inDOMView.cpp',
     ]
 
 LIBRARY_NAME = 'inspector_s'
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
--- a/layout/ipc/moz.build
+++ b/layout/ipc/moz.build
@@ -7,17 +7,17 @@
 MODULE = 'layout'
 
 EXPORTS.mozilla.layout += [
     'RenderFrameChild.h',
     'RenderFrameParent.h',
     'RenderFrameUtils.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'RenderFrameChild.cpp',
     'RenderFrameParent.cpp',
 ]
 
 IPDL_SOURCES = [
     'PRenderFrame.ipdl',
 ]
 
--- a/layout/mathml/moz.build
+++ b/layout/mathml/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 MODULE = 'layout'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsMathMLChar.cpp',
     'nsMathMLContainerFrame.cpp',
     'nsMathMLFrame.cpp',
     'nsMathMLmactionFrame.cpp',
     'nsMathMLmencloseFrame.cpp',
     'nsMathMLmfencedFrame.cpp',
     'nsMathMLmfracFrame.cpp',
     'nsMathMLmmultiscriptsFrame.cpp',
--- a/layout/printing/moz.build
+++ b/layout/printing/moz.build
@@ -9,17 +9,17 @@ XPIDL_SOURCES += [
     'nsIPrintProgressParams.idl',
     'nsIPrintStatusFeedback.idl',
 ]
 
 XPIDL_MODULE = 'layout_printing'
 
 MODULE = 'layout'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsPagePrintTimer.cpp',
     'nsPrintData.cpp',
     'nsPrintEngine.cpp',
     'nsPrintObject.cpp',
     'nsPrintPreviewListener.cpp',
 ]
 
 LIBRARY_NAME = 'gkprinting_s'
--- a/layout/style/moz.build
+++ b/layout/style/moz.build
@@ -71,17 +71,17 @@ EXPORTS.mozilla.css += [
     'ImageLoader.h',
     'ImportRule.h',
     'Loader.h',
     'NameSpaceRule.h',
     'Rule.h',
     'StyleRule.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'AnimationCommon.cpp',
     'CSS.cpp',
     'Declaration.cpp',
     'ErrorReporter.cpp',
     'ImageLoader.cpp',
     'Loader.cpp',
     'nsAnimationManager.cpp',
     'nsComputedDOMStyle.cpp',
--- a/layout/style/test/moz.build
+++ b/layout/style/test/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/.
 
 TEST_TOOL_DIRS += ['chrome']
 
 MODULE = 'layout'
 
-HOST_CPPSRCS += [
+HOST_SOURCES += [
     'ListCSSProperties.cpp',
 ]
 
 BROWSER_CHROME_MANIFESTS += ['browser.ini']
 
--- a/layout/svg/moz.build
+++ b/layout/svg/moz.build
@@ -10,17 +10,17 @@ EXPORTS += [
     'nsSVGEffects.h',
     'nsSVGFilterInstance.h',
     'nsSVGForeignObjectFrame.h',
     'nsSVGIntegrationUtils.h',
     'nsSVGUtils.h',
     'SVGImageContext.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'nsSVGAFrame.cpp',
     'nsSVGClipPathFrame.cpp',
     'nsSVGContainerFrame.cpp',
     'nsSVGEffects.cpp',
     'nsSVGFilterFrame.cpp',
     'nsSVGFilterInstance.cpp',
     'nsSVGForeignObjectFrame.cpp',
     'nsSVGGenericContainerFrame.cpp',
--- a/layout/tables/moz.build
+++ b/layout/tables/moz.build
@@ -7,17 +7,17 @@
 TEST_DIRS += ['test']
 
 MODULE = 'layout'
 
 EXPORTS += [
     'nsITableCellLayout.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'BasicTableLayoutStrategy.cpp',
     'FixedTableLayoutStrategy.cpp',
     'nsCellMap.cpp',
     'nsTableCellFrame.cpp',
     'nsTableColFrame.cpp',
     'nsTableColGroupFrame.cpp',
     'nsTableFrame.cpp',
     'nsTableOuterFrame.cpp',
--- a/layout/tools/layout-debug/src/moz.build
+++ b/layout/tools/layout-debug/src/moz.build
@@ -10,17 +10,17 @@ XPIDL_SOURCES += [
 ]
 
 MODULE = 'layout_debug'
 
 EXPORTS += [
     'nsLayoutDebugCIID.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'nsDebugFactory.cpp',
     'nsLayoutDebugCLH.cpp',
     'nsLayoutDebuggingTools.cpp',
     'nsRegressionTester.cpp',
 ]
 
 LIBRARY_NAME = 'gkdebug'
 
--- a/layout/xul/base/src/moz.build
+++ b/layout/xul/base/src/moz.build
@@ -1,17 +1,17 @@
 # -*- 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/.
 
 MODULE = 'layout'
 
-CPP_SOURCES += [
+SOURCES += [
     'nsBox.cpp',
     'nsBoxFrame.cpp',
     'nsBoxLayout.cpp',
     'nsBoxLayoutState.cpp',
     'nsBoxObject.cpp',
     'nsButtonBoxFrame.cpp',
     'nsRepeatService.cpp',
     'nsRootBoxFrame.cpp',
@@ -21,17 +21,17 @@ CPP_SOURCES += [
     'nsSliderFrame.cpp',
     'nsSprocketLayout.cpp',
     'nsStackFrame.cpp',
     'nsStackLayout.cpp',
     'nsXULTooltipListener.cpp',
 ]
 
 if CONFIG['MOZ_XUL']:
-    CPP_SOURCES += [
+    SOURCES += [
         'nsContainerBoxObject.cpp',
         'nsDeckFrame.cpp',
         'nsDocElementBoxFrame.cpp',
         'nsGroupBoxFrame.cpp',
         'nsImageBoxFrame.cpp',
         'nsLeafBoxFrame.cpp',
         'nsListBoxBodyFrame.cpp',
         'nsListBoxLayout.cpp',
--- a/layout/xul/grid/moz.build
+++ b/layout/xul/grid/moz.build
@@ -13,17 +13,17 @@ EXPORTS += [
     'nsGridRow.h',
     'nsGridRowGroupLayout.h',
     'nsGridRowLayout.h',
     'nsGridRowLeafFrame.h',
     'nsGridRowLeafLayout.h',
     'nsIGridPart.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'nsGrid.cpp',
     'nsGridCell.cpp',
     'nsGridLayout2.cpp',
     'nsGridRow.cpp',
     'nsGridRowGroupFrame.cpp',
     'nsGridRowGroupLayout.cpp',
     'nsGridRowLayout.cpp',
     'nsGridRowLeafFrame.cpp',
--- a/layout/xul/tree/moz.build
+++ b/layout/xul/tree/moz.build
@@ -16,17 +16,17 @@ XPIDL_MODULE = 'layout_xul_tree'
 
 MODULE = 'layout'
 
 EXPORTS += [
     'nsTreeColFrame.h',
     'nsTreeUtils.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'nsTreeBodyFrame.cpp',
     'nsTreeBoxObject.cpp',
     'nsTreeColFrame.cpp',
     'nsTreeColumns.cpp',
     'nsTreeContentView.cpp',
     'nsTreeImageListener.cpp',
     'nsTreeSelection.cpp',
     'nsTreeStyleCache.cpp',
--- a/media/kiss_fft/moz.build
+++ b/media/kiss_fft/moz.build
@@ -6,15 +6,15 @@
 
 MODULE = 'kiss_fft'
 
 EXPORTS.kiss_fft += [
     'kiss_fft.h',
     'kiss_fftr.h',
 ]
 
-CSRCS += [
+SOURCES += [
     'kiss_fft.c',
     'kiss_fftr.c',
 ]
 
 LIBRARY_NAME = 'kiss_fft'
 
--- a/media/libcubeb/src/moz.build
+++ b/media/libcubeb/src/moz.build
@@ -1,53 +1,53 @@
 # -*- 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/.
 
 MODULE = 'cubeb'
 
-CSRCS += [
+SOURCES += [
     'cubeb.c',
 ]
 
 if CONFIG['MOZ_ALSA']:
-    CSRCS += [
+    SOURCES += [
         'cubeb_alsa.c',
     ]
 
 if CONFIG['MOZ_PULSEAUDIO']:
-    CSRCS += [
+    SOURCES += [
         'cubeb_pulse.c',
     ]
 
 if CONFIG['OS_ARCH'] == 'OpenBSD':
-    CSRCS += [
+    SOURCES += [
         'cubeb_sndio.c',
     ]
 
 if CONFIG['OS_TARGET'] == 'Darwin':
-    CSRCS += [
+    SOURCES += [
         'cubeb_audiounit.c',
     ]
 
 if CONFIG['OS_TARGET'] == 'WINNT':
-    CSRCS += [
+    SOURCES += [
         'cubeb_winmm.c',
     ]
-    CPP_SOURCES += [
+    SOURCES += [
         'cubeb_wasapi.cpp'
     ]
 
 if CONFIG['OS_TARGET'] == 'Android':
-    CSRCS += [
+    SOURCES += [
         'cubeb_opensl.c',
     ]
     if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
-        CSRCS += [
+        SOURCES += [
             'cubeb_audiotrack.c',
         ]