--- a/content/media/gmp/moz.build
+++ b/content/media/gmp/moz.build
@@ -69,18 +69,16 @@ UNIFIED_SOURCES += [
 
 IPDL_SOURCES += [
   'GMPTypes.ipdlh',
   'PGMP.ipdl',
   'PGMPVideoDecoder.ipdl',
   'PGMPVideoEncoder.ipdl',
 ]
 
-LIBRARY_NAME = 'mozgmp'
-
 if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
     NO_VISIBILITY_FLAGS = True
 
 # comment this out to use Unsafe Shmem for more performance
 DEFINES['GMP_SAFE_SHMEM'] = True
 
 FAIL_ON_WARNINGS = True
 

--- a/content/media/gtest/moz.build
+++ b/content/media/gtest/moz.build
@@ -1,16 +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/.
 
-LIBRARY_NAME = 'media_gtest'
-
 UNIFIED_SOURCES += [
     'TestAudioCompactor.cpp',
     'TestTrackEncoder.cpp',
     'TestVideoSegment.cpp'
 ]
 
 if CONFIG['MOZ_WEBM_ENCODER']:
     UNIFIED_SOURCES += ['TestVideoTrackEncoder.cpp',

--- a/dom/fmradio/ipc/moz.build
+++ b/dom/fmradio/ipc/moz.build
@@ -15,18 +15,16 @@ SOURCES += [
     'FMRadioChild.cpp',
     'FMRadioParent.cpp',
     'FMRadioRequestChild.cpp',
     'FMRadioRequestParent.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME   = 'domfmradio_s'
-
 LOCAL_INCLUDES += [
     '/dom/base',
 ]
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 

--- a/embedding/browser/build/moz.build
+++ b/embedding/browser/build/moz.build
@@ -3,18 +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/.
 
 SOURCES += [
     'nsWebBrowserModule.cpp',
 ]
 
-LIBRARY_NAME = 'webbrwsr'
-
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '../setup',
     '../webBrowser',
 ]
 

--- a/embedding/components/build/moz.build
+++ b/embedding/components/build/moz.build
@@ -3,18 +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/.
 
 SOURCES += [
     'nsEmbeddingModule.cpp',
 ]
 
-LIBRARY_NAME = 'embedcomponents'
-
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '../appstartup/src',
     '../commandhandler/src',
     '../find/src',
     '../webbrowserpersist/src',

--- a/extensions/spellcheck/src/moz.build
+++ b/extensions/spellcheck/src/moz.build
@@ -11,18 +11,16 @@ SOURCES += [
     'mozInlineSpellChecker.cpp',
     'mozInlineSpellWordUtil.cpp',
     'mozPersonalDictionary.cpp',
     'mozSpellChecker.cpp',
     'mozSpellCheckerFactory.cpp',
     'mozSpellI18NManager.cpp',
 ]
 
-LIBRARY_NAME = 'spellchecker'
-
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '../hunspell/src',
     '/content/base/src',
     '/editor/libeditor/base',
 ]
 EXPORTS.mozilla += [

--- a/extensions/universalchardet/src/xpcom/moz.build
+++ b/extensions/universalchardet/src/xpcom/moz.build
@@ -4,17 +4,15 @@
 # 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/.
 
 UNIFIED_SOURCES += [
     'nsUdetXPCOMWrapper.cpp',
     'nsUniversalCharDetModule.cpp',
 ]
 
-LIBRARY_NAME = 'universalchardet'
-
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '../base',
 ]
 
 FAIL_ON_WARNINGS = True

--- a/gfx/tests/gtest/moz.build
+++ b/gfx/tests/gtest/moz.build
@@ -1,16 +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/.
 
-LIBRARY_NAME = 'gfxtest'
-
 UNIFIED_SOURCES += [
     'gfxSurfaceRefCountTest.cpp',
     # Disabled on suspicion of causing bug 904227
     #'gfxWordCacheTest.cpp',
     'TestAsyncPanZoomController.cpp',
     'TestBufferRotation.cpp',
     'TestColorNames.cpp',
     'TestGfxPrefs.cpp',

--- a/gfx/thebes/moz.build
+++ b/gfx/thebes/moz.build
@@ -250,18 +250,16 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
     SOURCES += [
         'gfxMacPlatformFontList.mm',
     ]
 
 FAIL_ON_WARNINGS = not CONFIG['_MSC_VER']
 
 MSVC_ENABLE_PGO = True
 
-LIBRARY_NAME = 'thebes'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
 GENERATED_FILES = [
     'DeprecatedPremultiplyTables.h',
 ]
 

--- a/image/build/moz.build
+++ b/image/build/moz.build
@@ -7,18 +7,16 @@
 EXPORTS += [
     'nsImageModule.h',
 ]
 
 SOURCES += [
     'nsImageModule.cpp',
 ]
 
-LIBRARY_NAME = 'imglib2'
-
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '../encoders/bmp',
     '../encoders/ico',
     '../encoders/jpeg',
     '../encoders/png',

--- a/image/decoders/icon/moz.build
+++ b/image/decoders/icon/moz.build
@@ -11,18 +11,16 @@ XPIDL_SOURCES += [
 XPIDL_MODULE = 'imgicon'
 
 UNIFIED_SOURCES += [
     'nsIconModule.cpp',
     'nsIconProtocolHandler.cpp',
     'nsIconURI.cpp',
 ]
 
-LIBRARY_NAME = 'imgicon'
-
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'xul'
 
 platform = None
 
 if CONFIG['MOZ_WIDGET_GTK']:
     platform = 'gtk'

--- a/intl/build/moz.build
+++ b/intl/build/moz.build
@@ -3,18 +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/.
 
 SOURCES += [
     'nsI18nModule.cpp',
 ]
 
-LIBRARY_NAME = 'i18n'
-
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '../locale/src',
     '../lwbrk/src',
     '../strres/src',
     '../uconv/src',
     '../unicharutil/src',
 ]

--- a/js/xpconnect/src/moz.build
+++ b/js/xpconnect/src/moz.build
@@ -56,18 +56,16 @@ SOURCES += [
 GENERATED_SOURCES += [
     'dom_quickstubs.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
-LIBRARY_NAME = 'xpconnect_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
 GENERATED_FILES = [
     'dom_quickstubs.h',
 ]
 

--- a/layout/build/moz.build
+++ b/layout/build/moz.build
@@ -20,18 +20,16 @@ if CONFIG['MOZ_NFC']:
     LOCAL_INCLUDES += [
         '/dom/nfc'
     ]
 
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
-LIBRARY_NAME = 'gklayout'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 LOCAL_INCLUDES += [
     '../base',
     '../forms',
     '../generic',
     '../inspector',
     '../mathml',

--- a/media/mtransport/build/moz.build
+++ b/media/mtransport/build/moz.build
@@ -25,18 +25,16 @@ EXPORTS.mtransport += [
     '../transportlayerprsock.h',
 ]
 
 include('../objs.mozbuild')
 
 # These files cannot be built in unified mode because they force NSPR logging.
 SOURCES += mtransport_cppsrcs
 
-LIBRARY_NAME = 'mtransport'
-
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES = [
     '/media/webrtc/trunk/third_party/libjingle/source/',
 ]
 LOCAL_INCLUDES += [
     '/media/mtransport/',
     '/media/mtransport/third_party/',

--- a/mobile/android/components/build/moz.build
+++ b/mobile/android/components/build/moz.build
@@ -23,11 +23,9 @@ if CONFIG['MOZ_ANDROID_HISTORY']:
     SOURCES += [
         'nsAndroidHistory.cpp',
     ]
     LOCAL_INCLUDES += [
         '/content/base/src',
         '/docshell/base',
     ]
 
-LIBRARY_NAME = 'browsercomps'
-
 FINAL_LIBRARY = 'xul'

--- a/modules/libjar/moz.build
+++ b/modules/libjar/moz.build
@@ -12,17 +12,16 @@ TEST_TOOL_DIRS += ['test']
 XPIDL_SOURCES += [
     'nsIJARChannel.idl',
     'nsIJARProtocolHandler.idl',
     'nsIJARURI.idl',
     'nsIZipReader.idl',
 ]
 
 XPIDL_MODULE = 'jar'
-LIBRARY_NAME = 'jar'
 
 EXPORTS += [
     'nsJARURI.h',
     'nsZipArchive.h',
     'zipstruct.h',
 ]
 
 UNIFIED_SOURCES += [

--- a/netwerk/build/moz.build
+++ b/netwerk/build/moz.build
@@ -11,18 +11,16 @@ EXPORTS += [
 SOURCES += [
     'nsNetModule.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
-LIBRARY_NAME = 'necko'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '../base/src',
     '../cache',
     '../dns',

--- a/parser/htmlparser/src/moz.build
+++ b/parser/htmlparser/src/moz.build
@@ -15,13 +15,11 @@ UNIFIED_SOURCES += [
     'nsParser.cpp',
     'nsParserModule.cpp',
     'nsParserMsgUtils.cpp',
     'nsParserService.cpp',
     'nsScanner.cpp',
     'nsScannerString.cpp',
 ]
 
-LIBRARY_NAME = 'htmlpars'
-
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'xul'

--- a/rdf/build/moz.build
+++ b/rdf/build/moz.build
@@ -7,16 +7,14 @@
 EXPORTS += [
     'nsRDFCID.h',
 ]
 
 SOURCES += [
     'nsRDFModule.cpp',
 ]
 
-LIBRARY_NAME = 'rdf'
-
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '/rdf/base',
     '/rdf/datasource',
 ]

--- a/security/certverifier/moz.build
+++ b/security/certverifier/moz.build
@@ -58,11 +58,9 @@ if CONFIG['_MSC_VER']:
   CXXFLAGS += [
     '-wd4100', # 'symbol' : unreferenced formal parameter
     '-wd4127', # conditional expression is constant
     '-wd4946', # reinterpret_cast used between related types
   ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'certverifier'
-
 FINAL_LIBRARY = 'xul'

--- a/security/manager/ssl/tests/gtest/moz.build
+++ b/security/manager/ssl/tests/gtest/moz.build
@@ -1,16 +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/.
 
-LIBRARY_NAME = 'ssltest'
-
 SOURCES += [
     'OCSPCacheTest.cpp',
     'TLSIntoleranceTest.cpp',
 ]
 
 LOCAL_INCLUDES += [
     '../../../../certverifier',
     '../../../../pkix/include',

--- a/security/pkix/test/gtest/moz.build
+++ b/security/pkix/test/gtest/moz.build
@@ -1,16 +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/.
 
-LIBRARY_NAME = 'mozillapkix_gtest'
-
 SOURCES += [
     'nssgtest.cpp',
     'pkixbuild_tests.cpp',
     'pkixcert_extension_tests.cpp',
     'pkixcheck_CheckKeyUsage_tests.cpp',
     'pkixcheck_CheckValidity_tests.cpp',
 
     # The naming conventions are described in ./README.txt.

--- a/storage/build/moz.build
+++ b/storage/build/moz.build
@@ -9,13 +9,11 @@ EXPORTS += [
 ]
 
 SOURCES += [
     'mozStorageModule.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'storagecomps'
-
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += ['../src']

--- a/toolkit/components/build/moz.build
+++ b/toolkit/components/build/moz.build
@@ -7,18 +7,16 @@
 EXPORTS += [
     'nsToolkitCompsCID.h',
 ]
 
 SOURCES += [
     'nsToolkitCompsModule.cpp',
 ]
 
-LIBRARY_NAME = 'toolkitcomps'
-
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '../../xre',
     '../alerts',
     '../downloads',
     '../feeds',
     '../find',

--- a/toolkit/xre/moz.build
+++ b/toolkit/xre/moz.build
@@ -100,18 +100,16 @@ if CONFIG['MOZ_INSTRUMENT_EVENT_LOOP']:
 if CONFIG['MOZ_UPDATER']:
     if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
         UNIFIED_SOURCES += [
             'nsUpdateDriver.cpp',
         ]
 
 MSVC_ENABLE_PGO = True
 
-LIBRARY_NAME = 'xulapp_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
 if CONFIG['MOZ_GL_DEFAULT_PROVIDER'] == 'GLX':
     DEFINES['USE_GLX_TEST'] = True
 
 for var in ('MOZ_APP_NAME', 'MOZ_APP_BASENAME', 'MOZ_APP_VERSION', 'OS_TARGET',

--- a/tools/profiler/tests/gtest/moz.build
+++ b/tools/profiler/tests/gtest/moz.build
@@ -1,16 +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/.
 
-LIBRARY_NAME = 'sps_test'
-
 if CONFIG['OS_TARGET'] in ('Android', 'Linux'):
     UNIFIED_SOURCES += [
         'LulTest.cpp',
     ]
 
 LOCAL_INCLUDES += [
     '/tools/profiler',
 ]

--- a/widget/android/moz.build
+++ b/widget/android/moz.build
@@ -37,18 +37,16 @@ SOURCES += [
     'nsPrintOptionsAndroid.cpp',
     'nsScreenManagerAndroid.cpp',
     'nsWidgetFactory.cpp',
     'nsWindow.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'widget_android'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '/docshell/base',
     '/dom/base',
     '/dom/system/android',

--- a/widget/cocoa/moz.build
+++ b/widget/cocoa/moz.build
@@ -12,18 +12,16 @@ XPIDL_MODULE = 'widget_cocoa'
 
 EXPORTS += [
     'mozView.h',
     'nsChangeObserver.h',
     'nsCocoaFeatures.h',
     'nsCocoaUtils.h',
 ]
 
-LIBRARY_NAME = 'widget_mac'
-
 UNIFIED_SOURCES += [
     'GfxInfo.mm',
     'NativeKeyBindings.mm',
     'nsAppShell.mm',
     'nsBidiKeyboard.mm',
     'nsCocoaFeatures.mm',
     'nsCocoaUtils.mm',
     'nsCocoaWindow.mm',

--- a/widget/gonk/moz.build
+++ b/widget/gonk/moz.build
@@ -57,18 +57,16 @@ SOURCES += [
     'nsWidgetFactory.cpp',
     'nsWindow.cpp',
     'OrientationObserver.cpp',
     'ParentProcessController.cpp',
     'ProcessOrientation.cpp',
     'WidgetTraceEvent.cpp'
 ]
 
-LIBRARY_NAME = 'widget_gonk'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '/content/media/omx/mediaresourcemanager',
     '/dom/system/android',
     '/gfx/skia/trunk/include/config',

--- a/widget/gtk/moz.build
+++ b/widget/gtk/moz.build
@@ -2,21 +2,16 @@
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 if CONFIG['MOZ_ENABLE_GTK3']:
     DIRS += ['mozgtk']
 
-if CONFIG['MOZ_ENABLE_GTK2']:
-    LIBRARY_NAME = 'widget_gtk2'
-else:
-    LIBRARY_NAME = 'widget_gtk3'
-
 EXPORTS += [
     'mozcontainer.h',
     'nsGTKToolkit.h',
     'nsIImageToPixbuf.h',
 ]
 
 UNIFIED_SOURCES += [
     'mozcontainer.c',

--- a/widget/qt/moz.build
+++ b/widget/qt/moz.build
@@ -27,18 +27,16 @@ SOURCES += [
 if CONFIG['NS_PRINTING']:
     SOURCES += [
         'nsDeviceContextSpecQt.cpp',
         'nsPrintDialogQt.cpp',
         'nsPrintOptionsQt.cpp',
         'nsPrintSettingsQt.cpp',
     ]
 
-LIBRARY_NAME = 'widget_qt'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '../shared',
     '/widget/xpwidgets',
 ]

--- a/widget/windows/moz.build
+++ b/widget/windows/moz.build
@@ -86,18 +86,16 @@ if CONFIG['NS_PRINTING']:
 
 if CONFIG['NS_ENABLE_TSF']:
     SOURCES += [
         'nsTextStore.cpp',
     ]
 
 MSVC_ENABLE_PGO = True
 
-LIBRARY_NAME = 'widget_windows'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '../shared',
     '../xpwidgets',
     '/layout/generic',

--- a/widget/xpwidgets/moz.build
+++ b/widget/xpwidgets/moz.build
@@ -69,18 +69,16 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('qt'
 
 if not CONFIG['MOZ_B2G']:
     DEFINES['MOZ_CROSS_PROCESS_IME'] = True
 
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
-LIBRARY_NAME = 'xpwidgets_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 LOCAL_INCLUDES += [
     '../shared',
     '/layout/base',
     '/layout/forms',
     '/layout/generic',
     '/layout/xul',

--- a/xpcom/build/moz.build
+++ b/xpcom/build/moz.build
@@ -65,18 +65,16 @@ if CONFIG['OS_ARCH'] != 'WINNT':
 # use plarena.h.
 SOURCES += [
     'FileLocation.cpp',
     'Omnijar.cpp',
 ]
 
 MSVC_ENABLE_PGO = True
 
-LIBRARY_NAME = 'xpcom_core'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
 DEFINES['_IMPL_NS_STRINGAPI'] = True
 DEFINES['OMNIJAR_NAME'] = CONFIG['OMNIJAR_NAME']
 
 if CONFIG['MOZ_OPTIMIZE']:

--- a/xpcom/glue/tests/gtest/moz.build
+++ b/xpcom/glue/tests/gtest/moz.build
@@ -10,11 +10,9 @@ UNIFIED_SOURCES += [
 ]
 
 LOCAL_INCLUDES = [
     '../..',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'xpcom_glue_gtest'
-
 FINAL_LIBRARY = 'xul-gtest'

--- a/xpfe/components/build/moz.build
+++ b/xpfe/components/build/moz.build
@@ -3,15 +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/.
 
 SOURCES += [
     'nsModule.cpp',
 ]
 
-LIBRARY_NAME = 'appcomps'
-
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '../directory',
 ]