--- a/calendar/base/backend/libical/build/moz.build
+++ b/calendar/base/backend/libical/build/moz.build
@@ -2,19 +2,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 += [
     'calBaseModule.cpp',
 ]
 
-IS_COMPONENT = True
-
-LIBRARY_NAME = 'calbasecomps'
+XPCOMBinaryComponent('calbasecomps')
 LOCAL_INCLUDES += [
     '..'
 ]
 
 USE_LIBS += [
         'mozalloc',
         'nspr',
         'xul',

--- a/db/mork/build/moz.build
+++ b/db/mork/build/moz.build
@@ -12,19 +12,17 @@ SOURCES += [
     'nsMorkFactory.cpp',
 ]
 
 USE_LIBS += [
     'mozalloc',
 ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
-    IS_COMPONENT = True
+    XPCOMBinaryComponent('mork')
     USE_LIBS += [
         'nspr',
         'xpcomglue_s',
         'xul',
     ]
 else:
+    Library('mork')
     FINAL_LIBRARY = 'xul'
-
-LIBRARY_NAME = 'mork'
-

--- a/im/app/moz.build
+++ b/im/app/moz.build
@@ -1,17 +1,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/.
 
 DIRS += ['profile']
 
 if not CONFIG['LIBXUL_SDK']:
-    PROGRAM = CONFIG['MOZ_APP_NAME']
+    Program(CONFIG['MOZ_APP_NAME'])
     SOURCES += ['nsMain.cpp']
     LOCAL_INCLUDES += [
         '/mozilla/toolkit/xre',
         '/mozilla/xpcom/base',
         '/mozilla/xpcom/build',
     ]
 
     USE_LIBS += [

--- a/im/components/mintrayr/moz.build
+++ b/im/components/mintrayr/moz.build
@@ -18,19 +18,17 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'wind
     RESFILE = 'resources.res'
 
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk2':
     SOURCES += ['trayPlatformGtk2.cpp']
     OS_LIBS += CONFIG['TK_LIBS']
     OS_LIBS += CONFIG['XLIBS']
     CXXFLAGS += CONFIG['MOZ_GTK2_CFLAGS']
 
-IS_COMPONENT = True
-
-LIBRARY_NAME = 'trayToolkit'
+XPCOMBinaryComponent('trayToolkit')
 
 XPIDL_SOURCES += [
     'trayIToolkit.idl',
 ]
 
 XPIDL_MODULE = 'trayToolkit'
 
 EXPORTS += [

--- a/ldap/moz.build
+++ b/ldap/moz.build
@@ -1,14 +1,14 @@
 # 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 = 'ldapsdks'
+Library('ldapsdks')
 
 USE_LIBS += ['nspr']
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     USE_LIBS += [
         '/ldap/sdks/c-sdk/ldap/libraries/libldap/nsldap32v60',
         '/ldap/sdks/c-sdk/ldap/libraries/libldif/nsldif32v60',
         '/ldap/sdks/c-sdk/ldap/libraries/libprldap/nsldappr32v60',

--- a/ldap/xpcom/src/moz.build
+++ b/ldap/xpcom/src/moz.build
@@ -27,24 +27,23 @@ EXTRA_COMPONENTS += [
 ]
 
 USE_LIBS += [
     'ldapsdks',
     'mozalloc',
 ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
-    IS_COMPONENT = True
+    XPCOMBinaryComponent('mozldap')
     USE_LIBS += [
         'nspr',
         'xpcomglue_s',
         'xul',
     ]
 # js needs to come after xul for now, because it is an archive and its content
 # is discarded when it comes first.
     USE_LIBS += [
         'js',
     ]
 else:
+    Library('mozldap')
     FINAL_LIBRARY = 'xul'
 
-LIBRARY_NAME = 'mozldap'
-

--- a/mail/app/moz.build
+++ b/mail/app/moz.build
@@ -5,17 +5,17 @@
 
 DIRS += ['profile']
 
 GENERATED_INCLUDES += [
     '/build',
 ]
 
 if not CONFIG['LIBXUL_SDK']:
-    PROGRAM = CONFIG['MOZ_APP_NAME']
+    Program(CONFIG['MOZ_APP_NAME'])
     SOURCES += ['nsMailApp.cpp']
     LOCAL_INCLUDES += [
         '/mozilla/toolkit/xre',
         '/mozilla/xpcom/base',
         '/mozilla/xpcom/build',
     ]
 
     DELAYLOAD_DLLS += [

--- a/mail/components/build/moz.build
+++ b/mail/components/build/moz.build
@@ -9,29 +9,28 @@ SOURCES += [
 
 USE_LIBS += [
     'mozalloc',
 ]
 
 # NOTE: if we switch away from LIBXUL_LIBRARY at any stage
 # we need to clear the EMBED_MANIFEST_AT flag. (See Bug 714495)
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
-    IS_COMPONENT = True
+    XPCOMBinaryComponent('mailcomps')
     USE_LIBS += [
         'nspr',
         'unicharutil_external_s',
         'xpcomglue_s',
         'xul',
     ]
     OS_LIBS += CONFIG['GLIB_LIBS']
 else:
+    Library('mailcomps')
     FINAL_LIBRARY = 'xul'
 
-LIBRARY_NAME = 'mailcomps'
-
 LOCAL_INCLUDES += [
     '../migration/src',
     '../shell',
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     OS_LIBS += [
         'ole32',

--- a/mail/components/search/mdimporter/moz.build
+++ b/mail/components/search/mdimporter/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/.
 
 SOURCES = [
     'GetMetadataForFile.c',
     'main.c',
 ]
 
-PROGRAM = 'thunderbird-mdimport'
+Program('thunderbird-mdimport')
 # This directory is producing a framework as a target. The output of this
 # framework will be located here.
 FINAL_TARGET = 'mozilla/dist/package/thunderbird.mdimporter/Contents/MacOS'
 
 OS_LIBS += [
     '-framework CoreFoundation',
     '-framework CoreServices',
 ]

--- a/mail/components/search/wsenable/moz.build
+++ b/mail/components/search/wsenable/moz.build
@@ -1,14 +1,14 @@
 # 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 = 'WSEnable'
+Program('WSEnable')
 
 SOURCES += [
     'WSEnable.cpp',
 ]
 
 OS_LIBS += [
     'ole32',
     'shell32',

--- a/mailnews/base/test/moz.build
+++ b/mailnews/base/test/moz.build
@@ -1,18 +1,18 @@
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
 
-CPP_UNIT_TESTS += [
+CppUnitTests([
     'TestMailCookie',
-]
+])
 
 SOURCES += sorted('%s.cpp' % t for t in CPP_UNIT_TESTS)
 
 LOCAL_INCLUDES += [
     '/mozilla/netwerk/test',
     '/mozilla/xpcom/tests',
 ]
 

--- a/mailnews/base/util/moz.build
+++ b/mailnews/base/util/moz.build
@@ -62,11 +62,11 @@ EXTRA_JS_MODULES += [
     'OAuth2.jsm',
     'StringBundle.js',
     'templateUtils.js',
     'traceHelper.js',
 ]
 
 FINAL_LIBRARY = 'mail'
 
-LIBRARY_NAME = 'msgbsutl_s'
+Library('msgbsutl_s')
 
 DEFINES['_IMPL_NS_MSG_BASE'] = True

--- a/mailnews/build/moz.build
+++ b/mailnews/build/moz.build
@@ -8,24 +8,25 @@ SOURCES += [
 ]
 
 USE_LIBS += [
     'mozalloc',
     'nspr',
 ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
-    IS_COMPONENT = True
+    XPCOMBinaryComponent('mail')
     USE_LIBS += [
         'rdfutil_external_s',
         'unicharutil_external_s',
         'xpcomglue_s',
         'xul',
     ]
 else:
+    Library('mail')
     FINAL_LIBRARY = 'xul'
 
 # js needs to come after xul for now, because it is an archive and its content
 # is discarded when it comes first.
 USE_LIBS += [
     'js',
 ]
 
@@ -35,18 +36,16 @@ if CONFIG['OS_ARCH'] == 'WINNT':
     ]
 else:
     OS_LIBS += CONFIG['MOZ_ZLIB_LIBS']
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     OS_LIBS += CONFIG['TK_LIBS']
     OS_LIBS += ['-framework Cocoa']
 
-LIBRARY_NAME = 'mail'
-
 LOCAL_INCLUDES += [
     '/mailnews/addrbook/src',
     '/mailnews/base/search/src',
     '/mailnews/base/src',
     '/mailnews/base/util',
     '/mailnews/compose/src',
     '/mailnews/extensions/bayesian-spam-filter/src',
     '/mailnews/extensions/fts3/src',

--- a/mailnews/import/build/moz.build
+++ b/mailnews/import/build/moz.build
@@ -8,34 +8,33 @@ SOURCES += [
 ]
 
 USE_LIBS += [
     'mozalloc',
     'nspr',
 ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
-    IS_COMPONENT = True
+    XPCOMBinaryComponent('import')
     USE_LIBS += [
         'rdfutil_external_s',
         'unicharutil_external_s',
         'xpcomglue_s',
         'xul',
     ]
 else:
+    Library('import')
     FINAL_LIBRARY = 'xul'
 
 # js needs to come after xul for now, because it is an archive and its content
 # is discarded when it comes first.
 USE_LIBS += [
     'js',
 ]
 
-LIBRARY_NAME = 'import'
-
 LOCAL_INCLUDES += [
     '../src',
     '../text/src',
     '../vcard/src',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     LOCAL_INCLUDES += [

--- a/mailnews/mapi/mapiDll/moz.build
+++ b/mailnews/mapi/mapiDll/moz.build
@@ -1,14 +1,14 @@
 # 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 = 'mozMapi32'
+Library('mozMapi32')
 
 SOURCES += [
     'MapiDll.cpp',
 ]
 
 FORCE_SHARED_LIB = True
 
 OS_LIBS += [

--- a/mailnews/mapi/mapihook/build/moz.build
+++ b/mailnews/mapi/mapihook/build/moz.build
@@ -1,14 +1,14 @@
 # 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 = 'MapiProxy'
+Library('MapiProxy')
 
 FORCE_SHARED_LIB = True
 
 OS_LIBS += [
     'rpcrt4',
 ]
 
 for var in ('REGISTER_PROXY_DLL', 'UNICODE', '_UNICODE'):

--- a/mailnews/mapi/mapihook/src/moz.build
+++ b/mailnews/mapi/mapihook/src/moz.build
@@ -1,26 +1,24 @@
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-LIBRARY_NAME = 'msgMapi'
-
 SOURCES += [
     'msgMapiFactory.cpp',
     'msgMapiHook.cpp',
     'msgMapiImp.cpp',
     'msgMapiMain.cpp',
     'msgMapiSupport.cpp',
     'Registry.cpp',
 ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
-    IS_COMPONENT = True
+    XPCOMBinaryComponent('msgMapi')
 else:
     FINAL_LIBRARY = 'xul'
 
 OS_LIBS += [
     'ole32',
 ]
 
 DEFINES['UNICODE'] = True

--- a/mailnews/mime/cthandlers/glue/moz.build
+++ b/mailnews/mime/cthandlers/glue/moz.build
@@ -9,10 +9,10 @@ EXPORTS += [
 
 SOURCES += [
     'mimexpcom.cpp',
     'nsMimeContentTypeHandler.cpp',
 ]
 
 FINAL_LIBRARY = 'mail'
 
-LIBRARY_NAME = 'mimecthglue_s'
+Library('mimecthglue_s')
 

--- a/mailnews/mime/cthandlers/pgpmime/moz.build
+++ b/mailnews/mime/cthandlers/pgpmime/moz.build
@@ -8,13 +8,13 @@ EXPORTS += [
 ]
 
 SOURCES += [
     'nsPgpMimeProxy.cpp',
 ]
 
 FINAL_LIBRARY = 'mail'
 
-LIBRARY_NAME = 'pgpmime_s'
+Library('pgpmime_s')
 
 LOCAL_INCLUDES += [
     '../glue',
 ]

--- a/suite/app/moz.build
+++ b/suite/app/moz.build
@@ -1,15 +1,15 @@
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 if not CONFIG['LIBXUL_SDK']:
-    PROGRAM = CONFIG['MOZ_APP_NAME']
+    Program(CONFIG['MOZ_APP_NAME'])
     SOURCES += ['nsSuiteApp.cpp']
     LOCAL_INCLUDES += [
         '/mozilla/toolkit/xre',
         '/mozilla/xpcom/base',
         '/mozilla/xpcom/build',
     ]
     GENERATED_INCLUDES += ['/build']
 

--- a/suite/build/moz.build
+++ b/suite/build/moz.build
@@ -2,19 +2,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 += [
     'nsSuiteModule.cpp',
 ]
 
-IS_COMPONENT = True
-
-LIBRARY_NAME = 'suite'
+XPCOMBinaryComponent('suite')
 
 LOCAL_INCLUDES += [
     '/suite/feeds/src',
     '/suite/profile',
     '/suite/profile/migration/src',
     '/suite/shell/src',
 ]