--- a/calendar/base/backend/libical/build/moz.build
+++ b/calendar/base/backend/libical/build/moz.build
@@ -1,16 +1,13 @@
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-XPIDL_MODULE = 'caldatetime_libical'
-MODULE = 'calbasecomps'
-
 SOURCES += [
     'calBaseModule.cpp',
 ]
 
 # We don't want an EXPORT_LIBRARY
 FORCE_SHARED_LIB = True
 IS_COMPONENT = True
 

--- a/calendar/base/backend/libical/moz.build
+++ b/calendar/base/backend/libical/moz.build
@@ -1,15 +1,13 @@
 # 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 = 'calbase'
-
 DIRS = [
     'build'
 ]
 
 XPIDL_SOURCES += [
     'calIDateTime.idl',
 ]
 

--- a/calendar/base/modules/moz.build
+++ b/calendar/base/modules/moz.build
@@ -1,15 +1,13 @@
 # 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 = 'calbase'
-
 EXTRA_JS_MODULES += [
     'calAlarmUtils.jsm',
     'calAuthUtils.jsm',
     'calExtract.jsm',
     'calHashedArray.jsm',
     'calItemUtils.jsm',
     'calIteratorUtils.jsm',
     'calItipUtils.jsm',

--- a/calendar/base/moz.build
+++ b/calendar/base/moz.build
@@ -5,10 +5,8 @@
 
 DIRS = [
     'public',
     'backend',
     'src',
     'modules',
 ]
 
-MODULE = 'calbase'
-

--- a/calendar/base/public/moz.build
+++ b/calendar/base/public/moz.build
@@ -42,14 +42,14 @@ XPIDL_SOURCES += [
     'calIStatusObserver.idl',
     'calITimezone.idl',
     'calITimezoneProvider.idl',
     'calITodo.idl',
     'calITransactionManager.idl',
     'calIWeekInfoService.idl',
 ]
 
-MODULE = 'calbase'
+XPIDL_MODULE = 'calbase'
 
 EXPORTS += [
     'calBaseCID.h',
 ]
 

--- a/calendar/base/src/moz.build
+++ b/calendar/base/src/moz.build
@@ -4,18 +4,16 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'calInternalInterfaces.idl',
 ]
 
 XPIDL_MODULE = 'calbaseinternal'
 
-MODULE = 'calbase'
-
 EXTRA_COMPONENTS += [
     'calDefaultACLManager.js',
     'calDefaultACLManager.manifest',
     'calItemModule.js',
     'calItemModule.manifest',
     'calTimezoneService.js',
     'calTimezoneService.manifest',
 ]

--- a/calendar/itip/moz.build
+++ b/calendar/itip/moz.build
@@ -1,12 +1,10 @@
 # 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 = 'calItipEmailTransport'
-
 EXTRA_COMPONENTS += [
     'calItipEmailTransport.js',
     'calItipEmailTransport.manifest',
 ]
 

--- a/calendar/libical/src/libical/moz.build
+++ b/calendar/libical/src/libical/moz.build
@@ -1,15 +1,13 @@
 # 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 = 'ical'
-
 SOURCES += [
     'caldate.c',
     'icalarray.c',
     'icalattach.c',
     'icalcomponent.c',
     'icalduration.c',
     'icalenums.c',
     'icalerror.c',

--- a/calendar/lightning/components/moz.build
+++ b/calendar/lightning/components/moz.build
@@ -1,14 +1,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/.
 
-MODULE = 'lightning'
-
 EXTRA_COMPONENTS += [
     'calItipProtocolHandler.js',
     'calItipProtocolHandler.manifest',
     'lightningTextCalendarConverter.js',
     'lightningTextCalendarConverter.manifest',
 ]
 

--- a/calendar/lightning/moz.build
+++ b/calendar/lightning/moz.build
@@ -10,11 +10,10 @@ DIRS += [
     '../import-export',
     '../itip',
     'components',
     'locales',
 ]
 
 TEST_DIRS += ['../test']
 
-MODULE = 'lightning'
 XPI_NAME = 'lightning'
 export('XPI_NAME')

--- a/calendar/providers/caldav/moz.build
+++ b/calendar/providers/caldav/moz.build
@@ -1,14 +1,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/.
 
 DIRS += ['public']
 
-MODULE = 'caldav'
-
 EXTRA_COMPONENTS += [
     'calDavCalendar.js',
     'calDavCalendar.manifest',
 ]
 

--- a/calendar/providers/caldav/public/moz.build
+++ b/calendar/providers/caldav/public/moz.build
@@ -2,10 +2,10 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'calICalDavCalendar.idl',
 ]
 
-MODULE = 'caldav'
+XPIDL_MODULE = 'caldav'
 

--- a/calendar/providers/composite/moz.build
+++ b/calendar/providers/composite/moz.build
@@ -1,12 +1,10 @@
 # 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 = 'calCompositeCalendar'
-
 EXTRA_COMPONENTS += [
     'calCompositeCalendar.js',
     'calCompositeCalendar.manifest',
 ]
 

--- a/calendar/providers/gdata/components/moz.build
+++ b/calendar/providers/gdata/components/moz.build
@@ -1,12 +1,10 @@
 # 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 = 'gdata-provider'
-
 EXTRA_COMPONENTS += [
     'calGoogleCalendarModule.js',
     'calGoogleCalendarModule.manifest',
 ]
 

--- a/calendar/providers/gdata/moz.build
+++ b/calendar/providers/gdata/moz.build
@@ -4,10 +4,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DIRS += [
     'components',
     'locales',
     'public',
 ]
 
-MODULE = 'gdata-provider'
 XPI_NAME = 'gdata-provider'

--- a/calendar/providers/gdata/public/moz.build
+++ b/calendar/providers/gdata/public/moz.build
@@ -4,10 +4,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'calIGoogleCalendar.idl',
     'calIGoogleRequest.idl',
     'calIGoogleSession.idl',
 ]
 
-MODULE = 'gdata'
+XPIDL_MODULE = 'gdata'
 

--- a/calendar/providers/ics/moz.build
+++ b/calendar/providers/ics/moz.build
@@ -1,12 +1,10 @@
 # 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 = 'calICSCalendar'
-
 EXTRA_COMPONENTS += [
     'calICSCalendar.js',
     'calICSCalendar.manifest',
 ]
 

--- a/calendar/providers/memory/moz.build
+++ b/calendar/providers/memory/moz.build
@@ -1,12 +1,10 @@
 # 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 = 'calMemoryCalendar'
-
 EXTRA_COMPONENTS += [
     'calMemoryCalendar.js',
     'calMemoryCalendar.manifest',
 ]
 

--- a/calendar/providers/moz.build
+++ b/calendar/providers/moz.build
@@ -8,10 +8,8 @@ DIRS += [
     'composite',
     'gdata',
     'ics',
     'memory',
     'storage',
     'wcap',
 ]
 
-MODULE = 'calprovs'
-

--- a/calendar/providers/storage/moz.build
+++ b/calendar/providers/storage/moz.build
@@ -1,15 +1,13 @@
 # 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 = 'calStorageCalendar'
-
 EXTRA_COMPONENTS += [
     'calStorageCalendar.js',
     'calStorageCalendar.manifest',
 ]
 
 EXTRA_JS_MODULES += [
     'calStorageHelpers.jsm',
     'calStorageUpgrade.jsm',

--- a/calendar/providers/wcap/moz.build
+++ b/calendar/providers/wcap/moz.build
@@ -1,14 +1,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/.
 
 DIRS += ['public']
 
-MODULE = 'wcap'
-
 EXTRA_COMPONENTS += [
     'calWcapCalendarModule.js',
     'calWcapCalendarModule.manifest',
 ]
 

--- a/calendar/providers/wcap/public/moz.build
+++ b/calendar/providers/wcap/public/moz.build
@@ -4,10 +4,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'calIWcapCalendar.idl',
     'calIWcapErrors.idl',
     'calIWcapSession.idl',
 ]
 
-MODULE = 'wcap'
+XPIDL_MODULE = 'wcap'
 

--- a/calendar/timezones/moz.build
+++ b/calendar/timezones/moz.build
@@ -1,11 +1,9 @@
 # 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 += ['locales']
 
-MODULE = 'timezones'
-
 XPI_NAME = 'calendar-timezones'
 export('XPI_NAME')

--- a/chat/components/public/moz.build
+++ b/chat/components/public/moz.build
@@ -17,10 +17,10 @@ XPIDL_SOURCES += [
     'prplIConversation.idl',
     'prplIMessage.idl',
     'prplIPref.idl',
     'prplIProtocol.idl',
     'prplIRequest.idl',
     'prplITooltipInfo.idl',
 ]
 
-MODULE = 'chat'
+XPIDL_MODULE = 'chat'
 

--- a/db/mork/build/moz.build
+++ b/db/mork/build/moz.build
@@ -1,15 +1,13 @@
 # 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 = 'mork'
-
 EXPORTS += [
     'nsIMdbFactoryFactory.h',
     'nsMorkCID.h',
 ]
 
 SOURCES += [
     'nsMorkFactory.cpp',
 ]

--- a/db/mork/public/moz.build
+++ b/db/mork/public/moz.build
@@ -1,13 +1,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/.
 
 XPIDL_MODULE = 'msgmdb'
 
-MODULE = 'mork'
-
 EXPORTS += [
     'mdb.h',
 ]
 

--- a/db/mork/src/moz.build
+++ b/db/mork/src/moz.build
@@ -1,15 +1,13 @@
 # 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 = 'mork'
-
 SOURCES += [
     'morkArray.cpp',
     'morkAtom.cpp',
     'morkAtomMap.cpp',
     'morkAtomSpace.cpp',
     'morkBead.cpp',
     'morkBlob.cpp',
     'morkBuilder.cpp',

--- a/ldap/xpcom/public/moz.build
+++ b/ldap/xpcom/public/moz.build
@@ -18,10 +18,10 @@ XPIDL_SOURCES += [
     'nsILDAPURL.idl',
 ]
 
 if CONFIG['MOZ_PREF_EXTENSIONS']:
     XPIDL_SOURCES += [
         'nsILDAPSyncQuery.idl',
     ]
 
-MODULE = 'mozldap'
+XPIDL_MODULE = 'mozldap'
 

--- a/ldap/xpcom/src/moz.build
+++ b/ldap/xpcom/src/moz.build
@@ -1,15 +1,13 @@
 # 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 = 'mozldap'
-
 SOURCES += [
     'nsLDAPBERElement.cpp',
     'nsLDAPBERValue.cpp',
     'nsLDAPConnection.cpp',
     'nsLDAPControl.cpp',
     'nsLDAPMessage.cpp',
     'nsLDAPModification.cpp',
     'nsLDAPOperation.cpp',

--- a/mail/components/activity/moz.build
+++ b/mail/components/activity/moz.build
@@ -4,17 +4,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'nsIActivity.idl',
     'nsIActivityManager.idl',
     'nsIActivityManagerUI.idl',
 ]
 
-MODULE = 'activity'
+XPIDL_MODULE = 'activity'
 
 EXTRA_COMPONENTS += [
     'activityComponents.manifest',
     'nsActivity.js',
     'nsActivityManager.js',
     'nsActivityManagerUI.js',
 ]
 

--- a/mail/components/build/moz.build
+++ b/mail/components/build/moz.build
@@ -1,15 +1,13 @@
 # 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 = 'mailcomps'
-
 SOURCES += [
     'nsMailComps.cpp',
 ]
 
 LIBXUL_LIBRARY = True
 EXPORT_LIBRARY = True
 
 LIBRARY_NAME = 'mailcomps'

--- a/mail/components/cloudfile/moz.build
+++ b/mail/components/cloudfile/moz.build
@@ -2,17 +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/.
 
 XPIDL_SOURCES += [
     'nsIMsgCloudFileProvider.idl',
 ]
 
-MODULE = 'cloudfile'
+XPIDL_MODULE = 'cloudfile'
 
 EXTRA_COMPONENTS += [
     'cloudFileComponents.manifest',
     'nsBox.js',
     'nsUbuntuOne.js',
     'nsYouSendIt.js',
 ]
 

--- a/mail/components/migration/public/moz.build
+++ b/mail/components/migration/public/moz.build
@@ -2,14 +2,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/.
 
 XPIDL_SOURCES += [
     'nsIMailProfileMigrator.idl',
 ]
 
-MODULE = 'mailprofilemigration'
+XPIDL_MODULE = 'mailprofilemigration'
 
 EXPORTS += [
     'nsMailMigrationCID.h',
 ]
 

--- a/mail/components/migration/src/moz.build
+++ b/mail/components/migration/src/moz.build
@@ -1,15 +1,13 @@
 # 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 = 'mailprofilemigration'
-
 SOURCES += [
     'nsMailProfileMigratorUtils.cpp',
     'nsNetscapeProfileMigratorBase.cpp',
     'nsProfileMigrator.cpp',
     'nsSeamonkeyProfileMigrator.cpp',
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':

--- a/mail/components/moz.build
+++ b/mail/components/moz.build
@@ -31,18 +31,16 @@ TEST_DIRS += ['test']
 DIRS += ['build']
 
 XPIDL_SOURCES += [
     'nsIMailGlue.idl',
 ]
 
 XPIDL_MODULE = 'mailcompsbase'
 
-MODULE = 'mailcomps'
-
 EXTRA_COMPONENTS += [
     'aboutRedirector.js',
     'mailComponents.manifest',
     'mailContentHandler.js',
     'mailGlue.js',
     'nsMailDefaultHandler.js',
 ]
 

--- a/mail/components/search/mdimporter/moz.build
+++ b/mail/components/search/mdimporter/moz.build
@@ -1,7 +1,5 @@
 # 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 = 'mdimporter'
-

--- a/mail/components/search/moz.build
+++ b/mail/components/search/moz.build
@@ -8,16 +8,14 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
     EXTRA_PP_JS_MODULES += ['SpotlightIntegration.js']
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     DIRS += ['wsenable']
     SOURCES += ['nsMailWinSearchHelper.cpp']
     EXTRA_PP_JS_MODULES += ['WinSearchIntegration.js']
     FORCE_STATIC_LIB = True
     LIBRARY_NAME = 'winsearch_s'
 
-MODULE = 'mailwinsearch'
-
 DIRS += ['public']
 
 EXTRA_PP_JS_MODULES += [
     'SearchIntegration.js',
 ]
 

--- a/mail/components/search/public/moz.build
+++ b/mail/components/search/public/moz.build
@@ -2,10 +2,10 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'nsIMailWinSearchHelper.idl',
 ]
 
-MODULE = 'mailwinsearch'
+XPIDL_MODULE = 'mailwinsearch'
 

--- a/mail/components/shell/moz.build
+++ b/mail/components/shell/moz.build
@@ -1,17 +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/.
 
 DIRS += ['public']
 
-MODULE = 'shellservice'
-
 SOURCES += [
     'DirectoryProvider.cpp',
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     SOURCES += ['nsMailWinIntegration.cpp']
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk2':

--- a/mail/components/shell/public/moz.build
+++ b/mail/components/shell/public/moz.build
@@ -3,10 +3,10 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'nsIShellService.idl',
     'nsIWindowsShellService.idl',
 ]
 
-MODULE = 'shellservice'
+XPIDL_MODULE = 'shellservice'
 

--- a/mail/components/wintaskbar/moz.build
+++ b/mail/components/wintaskbar/moz.build
@@ -1,11 +1,9 @@
 # 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 = 'wintaskbar'
-
 EXTRA_JS_MODULES += [
     'windowsJumpLists.js',
 ]
 

--- a/mail/test/mozmill/moz.build
+++ b/mail/test/mozmill/moz.build
@@ -1,7 +1,5 @@
 # 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 = 'mozmill'
-

--- a/mailnews/addrbook/public/moz.build
+++ b/mailnews/addrbook/public/moz.build
@@ -34,14 +34,14 @@ if CONFIG['MOZ_LDAP_XPCOM']:
     XPIDL_SOURCES += [
         'nsIAbLDAPCard.idl',
         'nsIAbLDAPDirectory.idl',
         'nsIAbLDAPReplicationData.idl',
         'nsIAbLDAPReplicationQuery.idl',
         'nsIAbLDAPReplicationService.idl',
     ]
 
-MODULE = 'addrbook'
+XPIDL_MODULE = 'addrbook'
 
 EXPORTS += [
     'nsAbBaseCID.h',
 ]
 

--- a/mailnews/addrbook/src/moz.build
+++ b/mailnews/addrbook/src/moz.build
@@ -1,15 +1,13 @@
 # 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 = 'addrbook'
-
 EXPORTS += [
     'nsVCardObj.h',
 ]
 
 SOURCES += [
     'nsAbAddressCollector.cpp',
     'nsAbBooleanExpression.cpp',
     'nsAbBSDirectory.cpp',

--- a/mailnews/base/moz.build
+++ b/mailnews/base/moz.build
@@ -9,10 +9,8 @@ PARALLEL_DIRS += [
     'util',
     'ispdata',
     'search/public',
     'search/src',
 ]
 
 TEST_TOOL_DIRS += ['test']
 
-MODULE = 'msgbase'
-

--- a/mailnews/base/public/moz.build
+++ b/mailnews/base/public/moz.build
@@ -56,17 +56,17 @@ XPIDL_SOURCES += [
     'nsIStatusBarBiffManager.idl',
     'nsIStopwatch.idl',
     'nsISubscribableServer.idl',
     'nsIUrlListener.idl',
     'nsMsgFolderFlags.idl',
     'nsMsgMessageFlags.idl',
 ]
 
-MODULE = 'msgbase'
+XPIDL_MODULE = 'msgbase'
 
 EXPORTS += [
     'MailNewsTypes.h',
     'msgCore.h',
     'nsMsgBaseCID.h',
     'nsMsgHeaderMasks.h',
     'nsMsgLocalFolderHdrs.h',
 ]

--- a/mailnews/base/search/public/moz.build
+++ b/mailnews/base/search/public/moz.build
@@ -21,18 +21,16 @@ XPIDL_SOURCES += [
     'nsIMsgSearchValue.idl',
     'nsIMsgTraitService.idl',
     'nsMsgFilterCore.idl',
     'nsMsgSearchCore.idl',
 ]
 
 XPIDL_MODULE = 'msgsearch'
 
-MODULE = 'msgbase'
-
 EXPORTS += [
     'nsMsgBodyHandler.h',
     'nsMsgResultElement.h',
     'nsMsgSearchAdapter.h',
     'nsMsgSearchBoolExpression.h',
     'nsMsgSearchScopeTerm.h',
     'nsMsgSearchTerm.h',
 ]

--- a/mailnews/base/search/src/moz.build
+++ b/mailnews/base/search/src/moz.build
@@ -1,17 +1,13 @@
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-XPIDL_MODULE = 'msgsearch'
-
-MODULE = 'msgbase'
-
 SOURCES += [
     'nsMsgBodyHandler.cpp',
     'nsMsgFilter.cpp',
     'nsMsgFilterList.cpp',
     'nsMsgFilterService.cpp',
     'nsMsgImapSearch.cpp',
     'nsMsgLocalSearch.cpp',
     'nsMsgSearchAdapter.cpp',

--- a/mailnews/base/src/moz.build
+++ b/mailnews/base/src/moz.build
@@ -1,15 +1,13 @@
 # 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 = 'msgbase'
-
 EXPORTS += [
     'nsMailDirServiceDefs.h',
     'nsMsgRDFDataSource.h',
     'nsMsgRDFUtils.h',
 ]
 
 SOURCES += [
     'MailNewsDLF.cpp',

--- a/mailnews/base/util/moz.build
+++ b/mailnews/base/util/moz.build
@@ -1,15 +1,13 @@
 # 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 = 'msgbaseutil'
-
 EXPORTS += [
     'nsImapMoveCoalescer.h',
     'nsMsgCompressIStream.h',
     'nsMsgCompressOStream.h',
     'nsMsgDBFolder.h',
     'nsMsgDBFolderAtomList.h',
     'nsMsgI18N.h',
     'nsMsgIdentity.h',

--- a/mailnews/build/moz.build
+++ b/mailnews/build/moz.build
@@ -1,15 +1,13 @@
 # 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 = 'mail'
-
 SOURCES += [
     'nsMailModule.cpp',
 ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     IS_COMPONENT = True
     FORCE_SHARED_LIB = True
 else:

--- a/mailnews/compose/moz.build
+++ b/mailnews/compose/moz.build
@@ -5,10 +5,8 @@
 
 PARALLEL_DIRS += [
     'public',
     'src',
 ]
 
 TEST_DIRS += ['test']
 
-MODULE = 'msgcompose'
-

--- a/mailnews/compose/public/moz.build
+++ b/mailnews/compose/public/moz.build
@@ -20,15 +20,15 @@ XPIDL_SOURCES += [
     'nsIMsgSendListener.idl',
     'nsIMsgSendReport.idl',
     'nsISmtpServer.idl',
     'nsISmtpService.idl',
     'nsISmtpUrl.idl',
     'nsIURLFetcher.idl',
 ]
 
-MODULE = 'msgcompose'
+XPIDL_MODULE = 'msgcompose'
 
 EXPORTS += [
     'nsMsgAttachmentData.h',
     'nsMsgCompCID.h',
 ]
 

--- a/mailnews/compose/src/moz.build
+++ b/mailnews/compose/src/moz.build
@@ -1,15 +1,13 @@
 # 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 = 'msgcompose'
-
 EXPORTS += [
     'nsComposeStrings.h',
 ]
 
 SOURCES += [
     'nsMsgAttachment.cpp',
     'nsMsgAttachmentHandler.cpp',
     'nsMsgCompFields.cpp',

--- a/mailnews/db/gloda/components/moz.build
+++ b/mailnews/db/gloda/components/moz.build
@@ -1,13 +1,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/.
 
-MODULE = 'mailnewsglobaldb'
-
 EXTRA_COMPONENTS += [
     'glautocomp.js',
     'gloda.manifest',
     'jsmimeemitter.js',
 ]
 

--- a/mailnews/db/gloda/modules/moz.build
+++ b/mailnews/db/gloda/modules/moz.build
@@ -1,15 +1,13 @@
 # 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 = 'mailnewsglobaldb'
-
 EXTRA_JS_MODULES += [
     'collection.js',
     'connotent.js',
     'databind.js',
     'datamodel.js',
     'datastore.js',
     'dbview.js',
     'everybody.js',

--- a/mailnews/db/msgdb/moz.build
+++ b/mailnews/db/msgdb/moz.build
@@ -5,10 +5,8 @@
 
 PARALLEL_DIRS += [
     'public',
     'src',
 ]
 
 TEST_DIRS += ['test']
 
-MODULE = 'msgdb'
-

--- a/mailnews/db/msgdb/public/moz.build
+++ b/mailnews/db/msgdb/public/moz.build
@@ -7,17 +7,17 @@ XPIDL_SOURCES += [
     'nsIDBChangeAnnouncer.idl',
     'nsIDBChangeListener.idl',
     'nsIDBFolderInfo.idl',
     'nsIMsgDatabase.idl',
     'nsIMsgOfflineImapOperation.idl',
     'nsINewsDatabase.idl',
 ]
 
-MODULE = 'msgdb'
+XPIDL_MODULE = 'msgdb'
 
 EXPORTS += [
     'nsDBFolderInfo.h',
     'nsImapMailDatabase.h',
     'nsMailDatabase.h',
     'nsMsgDatabase.h',
     'nsMsgDBCID.h',
     'nsMsgHdr.h',

--- a/mailnews/db/msgdb/src/moz.build
+++ b/mailnews/db/msgdb/src/moz.build
@@ -1,15 +1,13 @@
 # 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 = 'msgdb'
-
 SOURCES += [
     'nsDBFolderInfo.cpp',
     'nsImapMailDatabase.cpp',
     'nsMailDatabase.cpp',
     'nsMsgDatabase.cpp',
     'nsMsgHdr.cpp',
     'nsMsgOfflineImapOperation.cpp',
     'nsMsgThread.cpp',

--- a/mailnews/extensions/bayesian-spam-filter/moz.build
+++ b/mailnews/extensions/bayesian-spam-filter/moz.build
@@ -1,10 +1,8 @@
 # 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/.
 
 PARALLEL_DIRS += ['src']
 TEST_DIRS += ['test']
 
-MODULE = 'bayesflt'
-

--- a/mailnews/extensions/bayesian-spam-filter/src/moz.build
+++ b/mailnews/extensions/bayesian-spam-filter/src/moz.build
@@ -1,15 +1,13 @@
 # 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 = 'bayesflt'
-
 SOURCES += [
     'nsBayesianFilter.cpp',
 ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     FORCE_STATIC_LIB = True
 else:
     LIBXUL_LIBRARY = True

--- a/mailnews/extensions/dsn/moz.build
+++ b/mailnews/extensions/dsn/moz.build
@@ -1,12 +1,10 @@
 # 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 = 'msgdsn'
-
 EXTRA_COMPONENTS += [
     'src/dsn-service.js',
     'src/dsn-service.manifest',
 ]
 

--- a/mailnews/extensions/fts3/public/moz.build
+++ b/mailnews/extensions/fts3/public/moz.build
@@ -2,10 +2,10 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'nsIFts3Tokenizer.idl',
 ]
 
-MODULE = 'fts3tok'
+XPIDL_MODULE = 'fts3tok'
 

--- a/mailnews/extensions/fts3/src/moz.build
+++ b/mailnews/extensions/fts3/src/moz.build
@@ -1,15 +1,13 @@
 # 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 = 'fts3tok'
-
 SOURCES += [
     'fts3_porter.c',
     'Normalize.c',
 ]
 
 SOURCES += [
     'nsFts3Tokenizer.cpp',
     'nsGlodaRankerFunction.cpp',

--- a/mailnews/extensions/mailviews/content/moz.build
+++ b/mailnews/extensions/mailviews/content/moz.build
@@ -1,7 +1,5 @@
 # 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 = 'mailview'
-

--- a/mailnews/extensions/mailviews/public/moz.build
+++ b/mailnews/extensions/mailviews/public/moz.build
@@ -3,10 +3,10 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'nsIMsgMailView.idl',
     'nsIMsgMailViewList.idl',
 ]
 
-MODULE = 'mailview'
+XPIDL_MODULE = 'mailview'
 

--- a/mailnews/extensions/mailviews/src/moz.build
+++ b/mailnews/extensions/mailviews/src/moz.build
@@ -1,15 +1,13 @@
 # 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 = 'mailview'
-
 SOURCES += [
     'nsMsgMailViewList.cpp',
 ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     FORCE_STATIC_LIB = True
 else:
     LIBXUL_LIBRARY = True

--- a/mailnews/extensions/mdn/moz.build
+++ b/mailnews/extensions/mdn/moz.build
@@ -1,10 +1,8 @@
 # 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 += ['src']
 TEST_DIRS += ['test']
 
-MODULE = 'msgmdn'
-

--- a/mailnews/extensions/mdn/src/moz.build
+++ b/mailnews/extensions/mdn/src/moz.build
@@ -1,15 +1,13 @@
 # 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 = 'msgmdn'
-
 SOURCES += [
     'nsMsgMdnGenerator.cpp',
 ]
 
 EXTRA_COMPONENTS += [
     'mdn-service.js',
     'mdn-service.manifest',
 ]

--- a/mailnews/extensions/newsblog/moz.build
+++ b/mailnews/extensions/newsblog/moz.build
@@ -1,12 +1,10 @@
 # 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 = 'newsblog'
-
 EXTRA_COMPONENTS += [
     'js/newsblog.js',
     'js/newsblog.manifest',
 ]
 

--- a/mailnews/extensions/offline-startup/moz.build
+++ b/mailnews/extensions/offline-startup/moz.build
@@ -1,12 +1,10 @@
 # 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 = 'offline-startup'
-
 EXTRA_COMPONENTS += [
     'js/offlineStartup.js',
     'js/offlineStartup.manifest',
 ]
 

--- a/mailnews/extensions/smime/moz.build
+++ b/mailnews/extensions/smime/moz.build
@@ -3,10 +3,8 @@
 # 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/.
 
 PARALLEL_DIRS += [
     'public',
     'src',
 ]
 
-MODULE = 'msgsmime'
-

--- a/mailnews/extensions/smime/public/moz.build
+++ b/mailnews/extensions/smime/public/moz.build
@@ -5,10 +5,10 @@
 
 XPIDL_SOURCES += [
     'nsIEncryptedSMIMEURIsSrvc.idl',
     'nsIMsgSMIMECompFields.idl',
     'nsIMsgSMIMEHeaderSink.idl',
     'nsISMimeJSHelper.idl',
 ]
 
-MODULE = 'msgsmime'
+XPIDL_MODULE = 'msgsmime'
 

--- a/mailnews/extensions/smime/src/moz.build
+++ b/mailnews/extensions/smime/src/moz.build
@@ -1,15 +1,13 @@
 # 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 = 'msgsmime'
-
 SOURCES += [
     'nsEncryptedSMIMEURIsService.cpp',
     'nsMsgComposeSecure.cpp',
     'nsSMimeJSHelper.cpp',
 ]
 
 EXTRA_COMPONENTS += [
     'smime-service.js',

--- a/mailnews/imap/public/moz.build
+++ b/mailnews/imap/public/moz.build
@@ -18,15 +18,15 @@ XPIDL_SOURCES += [
     'nsIImapProtocolSink.idl',
     'nsIImapServerSink.idl',
     'nsIImapService.idl',
     'nsIImapUrl.idl',
     'nsIMailboxSpec.idl',
     'nsIMsgImapMailFolder.idl',
 ]
 
-MODULE = 'msgimap'
+XPIDL_MODULE = 'msgimap'
 
 EXPORTS += [
     'nsIIMAPHostSessionList.h',
     'nsMsgImapCID.h',
 ]
 

--- a/mailnews/imap/src/moz.build
+++ b/mailnews/imap/src/moz.build
@@ -1,15 +1,13 @@
 # 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 = 'msgimap'
-
 EXPORTS += [
     'nsImapCore.h',
 ]
 
 SOURCES += [
     'nsAutoSyncManager.cpp',
     'nsAutoSyncState.cpp',
     'nsIMAPBodyShell.cpp',

--- a/mailnews/import/applemail/src/moz.build
+++ b/mailnews/import/applemail/src/moz.build
@@ -1,15 +1,13 @@
 # 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 = 'impapplemail'
-
 SOURCES += [
     'nsAppleMailImport.cpp',
 ]
 
 SOURCES += [
     'nsEmlxHelperUtils.mm',
 ]
 

--- a/mailnews/import/build/moz.build
+++ b/mailnews/import/build/moz.build
@@ -1,15 +1,13 @@
 # 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 = 'import'
-
 SOURCES += [
     'nsImportModule.cpp',
 ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     IS_COMPONENT = True
     FORCE_SHARED_LIB = True
 else:

--- a/mailnews/import/eudora/src/moz.build
+++ b/mailnews/import/eudora/src/moz.build
@@ -1,15 +1,13 @@
 # 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 = 'impEudra'
-
 SOURCES += [
     'nsEudoraAddress.cpp',
     'nsEudoraCompose.cpp',
     'nsEudoraEditor.cpp',
     'nsEudoraFilters.cpp',
     'nsEudoraImport.cpp',
     'nsEudoraMailbox.cpp',
     'nsEudoraSettings.cpp',

--- a/mailnews/import/oexpress/moz.build
+++ b/mailnews/import/oexpress/moz.build
@@ -1,15 +1,13 @@
 # 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 = 'importOE'
-
 SOURCES += [
     'nsOE5File.cpp',
     'nsOEAddressIterator.cpp',
     'nsOEImport.cpp',
     'nsOEMailbox.cpp',
     'nsOERegUtil.cpp',
     'nsOEScanBoxes.cpp',
     'nsOESettings.cpp',

--- a/mailnews/import/outlook/src/moz.build
+++ b/mailnews/import/outlook/src/moz.build
@@ -1,15 +1,13 @@
 # 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 = 'impOutlk'
-
 SOURCES += [
     'MapiApi.cpp',
     'MapiMessage.cpp',
     'MapiMimeTypes.cpp',
     'nsOutlookCompose.cpp',
     'nsOutlookImport.cpp',
     'nsOutlookMail.cpp',
     'nsOutlookSettings.cpp',

--- a/mailnews/import/public/moz.build
+++ b/mailnews/import/public/moz.build
@@ -12,10 +12,10 @@ XPIDL_SOURCES += [
     'nsIImportMail.idl',
     'nsIImportMailboxDescriptor.idl',
     'nsIImportMimeEncode.idl',
     'nsIImportModule.idl',
     'nsIImportService.idl',
     'nsIImportSettings.idl',
 ]
 
-MODULE = 'import'
+XPIDL_MODULE = 'import'
 

--- a/mailnews/import/src/moz.build
+++ b/mailnews/import/src/moz.build
@@ -1,15 +1,13 @@
 # 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 = 'import'
-
 SOURCES += [
     'ImportCharSet.cpp',
     'ImportOutFile.cpp',
     'ImportTranslate.cpp',
     'nsImportABDescriptor.cpp',
     'nsImportAddressBooks.cpp',
     'nsImportEmbeddedImageData.cpp',
     'nsImportEncodeScan.cpp',

--- a/mailnews/import/text/src/moz.build
+++ b/mailnews/import/text/src/moz.build
@@ -1,15 +1,13 @@
 # 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 = 'impText'
-
 SOURCES += [
     'nsTextAddress.cpp',
     'nsTextImport.cpp',
 ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     FORCE_STATIC_LIB = True
 else:

--- a/mailnews/import/vcard/src/moz.build
+++ b/mailnews/import/vcard/src/moz.build
@@ -1,15 +1,13 @@
 # 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 = 'impvcard'
-
 SOURCES += [
     'nsVCardAddress.cpp',
     'nsVCardImport.cpp',
 ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     FORCE_STATIC_LIB = True
 else:

--- a/mailnews/import/winlivemail/moz.build
+++ b/mailnews/import/winlivemail/moz.build
@@ -1,15 +1,13 @@
 # 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 = 'importWM'
-
 SOURCES += [
     'nsWMImport.cpp',
     'nsWMSettings.cpp',
     'nsWMStringBundle.cpp',
     'nsWMUtils.cpp',
 ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:

--- a/mailnews/local/public/moz.build
+++ b/mailnews/local/public/moz.build
@@ -18,14 +18,14 @@ XPIDL_SOURCES += [
     'nsIPop3Protocol.idl',
     'nsIPop3Service.idl',
     'nsIPop3Sink.idl',
     'nsIPop3URL.idl',
     'nsIRssIncomingServer.idl',
     'nsIRssService.idl',
 ]
 
-MODULE = 'msglocal'
+XPIDL_MODULE = 'msglocal'
 
 EXPORTS += [
     'nsMsgLocalCID.h',
 ]
 

--- a/mailnews/local/src/moz.build
+++ b/mailnews/local/src/moz.build
@@ -1,15 +1,13 @@
 # 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 = 'msglocal'
-
 SOURCES += [
     'nsLocalMailFolder.cpp',
     'nsLocalUndoTxn.cpp',
     'nsLocalUtils.cpp',
     'nsMailboxProtocol.cpp',
     'nsMailboxServer.cpp',
     'nsMailboxService.cpp',
     'nsMailboxUrl.cpp',

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

--- a/mailnews/mapi/mapihook/build/moz.build
+++ b/mailnews/mapi/mapihook/build/moz.build
@@ -1,10 +1,9 @@
 # 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 = 'MapiProxy'
 LIBRARY_NAME = 'MapiProxy'
 
 FORCE_SHARED_LIB = True
 

--- a/mailnews/mapi/mapihook/public/moz.build
+++ b/mailnews/mapi/mapihook/public/moz.build
@@ -4,10 +4,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'nsIMapiSupport.idl',
 ]
 
 XPIDL_MODULE = 'mapihook'
 
-MODULE = 'msgMapi'
-

--- a/mailnews/mapi/mapihook/src/moz.build
+++ b/mailnews/mapi/mapihook/src/moz.build
@@ -1,14 +1,13 @@
 # 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 = 'msgMapi'
 LIBRARY_NAME = 'msgMapi'
 
 SOURCES += [
     'msgMapiFactory.cpp',
     'msgMapiHook.cpp',
     'msgMapiImp.cpp',
     'msgMapiMain.cpp',
     'msgMapiSupport.cpp',

--- a/mailnews/mime/cthandlers/glue/moz.build
+++ b/mailnews/mime/cthandlers/glue/moz.build
@@ -1,15 +1,13 @@
 # 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 = 'mime'
-
 EXPORTS += [
     'nsMimeContentTypeHandler.h',
 ]
 
 SOURCES += [
     'mimexpcom.cpp',
     'nsMimeContentTypeHandler.cpp',
 ]

--- a/mailnews/mime/cthandlers/pgpmime/moz.build
+++ b/mailnews/mime/cthandlers/pgpmime/moz.build
@@ -1,15 +1,13 @@
 # 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 = 'pgpmime'
-
 EXPORTS += [
     'nsPgpMimeProxy.h',
 ]
 
 SOURCES += [
     'nsPgpMimeProxy.cpp',
 ]
 

--- a/mailnews/mime/cthandlers/vcard/moz.build
+++ b/mailnews/mime/cthandlers/vcard/moz.build
@@ -1,15 +1,13 @@
 # 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 = 'vcard'
-
 SOURCES += [
     'mimevcrd.cpp',
 ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     FORCE_STATIC_LIB = True
 else:
     LIBXUL_LIBRARY = True

--- a/mailnews/mime/emitters/moz.build
+++ b/mailnews/mime/emitters/moz.build
@@ -1,15 +1,13 @@
 # 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 = 'mimeemitter'
-
 EXPORTS += [
     'nsMimeEmitterCID.h',
 ]
 
 SOURCES += [
     'nsEmitterUtils.cpp',
     'nsMimeBaseEmitter.cpp',
     'nsMimeHtmlEmitter.cpp',

--- a/mailnews/mime/moz.build
+++ b/mailnews/mime/moz.build
@@ -7,16 +7,14 @@ PARALLEL_DIRS += [
     'public',
     'src',
     'emitters',
     'cthandlers',
 ]
 
 TEST_DIRS += ['test']
 
-MODULE = 'mime'
-
 EXTRA_JS_MODULES += [
     'jsmime/mimeParserCore.js',
 ]
 
 JS_MODULES_PATH = 'modules/mime'
 

--- a/mailnews/mime/public/moz.build
+++ b/mailnews/mime/public/moz.build
@@ -9,17 +9,17 @@ XPIDL_SOURCES += [
     'nsIMimeHeaders.idl',
     'nsIMimeMiscStatus.idl',
     'nsIMimeStreamConverter.idl',
     'nsIMsgHeaderParser.idl',
     'nsIPgpMimeProxy.idl',
     'nsISimpleMimeConverter.idl',
 ]
 
-MODULE = 'mime'
+XPIDL_MODULE = 'mime'
 
 EXPORTS += [
     'nsIMimeContentTypeHandler.h',
     'nsIMimeObjectClassAccess.h',
     'nsMailHeaders.h',
     'nsMsgMimeCID.h',
 ]
 

--- a/mailnews/mime/src/moz.build
+++ b/mailnews/mime/src/moz.build
@@ -1,15 +1,13 @@
 # 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 = 'mime'
-
 EXPORTS += [
     'comi18n.h',
     'mimecont.h',
     'mimecryp.h',
     'mimecth.h',
     'mimehdrs.h',
     'mimei.h',
     'mimeleaf.h',

--- a/mailnews/moz.build
+++ b/mailnews/moz.build
@@ -52,10 +52,8 @@ if CONFIG['MOZ_MAPI_SUPPORT']:
         'mapi/mapihook',
     ]
 
 DIRS += [
     'build',
     'import/build',
 ]
 
-MODULE = 'mailnews'
-

--- a/mailnews/news/public/moz.build
+++ b/mailnews/news/public/moz.build
@@ -11,14 +11,14 @@ XPIDL_SOURCES += [
     'nsINntpIncomingServer.idl',
     'nsINNTPNewsgroupList.idl',
     'nsINNTPNewsgroupPost.idl',
     'nsINNTPProtocol.idl',
     'nsINntpService.idl',
     'nsINntpUrl.idl',
 ]
 
-MODULE = 'msgnews'
+XPIDL_MODULE = 'msgnews'
 
 EXPORTS += [
     'nsMsgNewsCID.h',
 ]
 

--- a/mailnews/news/src/moz.build
+++ b/mailnews/news/src/moz.build
@@ -1,15 +1,13 @@
 # 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 = 'msgnews'
-
 SOURCES += [
     'nsNewsDownloadDialogArgs.cpp',
     'nsNewsDownloader.cpp',
     'nsNewsFolder.cpp',
     'nsNewsUtils.cpp',
     'nsNNTPArticleList.cpp',
     'nsNntpIncomingServer.cpp',
     'nsNntpMockChannel.cpp',

--- a/suite/build/moz.build
+++ b/suite/build/moz.build
@@ -1,15 +1,13 @@
 # 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 = 'suite'
-
 SOURCES += [
     'nsSuiteModule.cpp',
 ]
 
 FORCE_SHARED_LIB = True
 IS_COMPONENT = True
 
 LIBRARY_NAME = 'suite'

--- a/suite/common/public/moz.build
+++ b/suite/common/public/moz.build
@@ -6,10 +6,10 @@
 XPIDL_SOURCES += [
     'nsISessionStartup.idl',
     'nsISessionStore.idl',
     'nsISidebarPanel.idl',
     'nsISuiteDownloadManagerUI.idl',
     'nsISuiteGlue.idl',
 ]
 
-MODULE = 'suitecommon'
+XPIDL_MODULE = 'suitecommon'
 

--- a/suite/common/src/moz.build
+++ b/suite/common/src/moz.build
@@ -1,15 +1,13 @@
 # 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 = 'suitecommon'
-
 EXTRA_COMPONENTS += [
     'nsAbout.js',
     'nsSessionStartup.js',
     'nsSidebar.js',
     'nsSuiteDownloadManagerUI.js',
     'nsSuiteGlue.js',
     'SuiteCommon.manifest',
 ]

--- a/suite/common/tests/moz.build
+++ b/suite/common/tests/moz.build
@@ -4,10 +4,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 TEST_DIRS += [
     'browser',
     'chrome',
     'preferences',
 ]
 
-MODULE = 'test_suite_common'
-

--- a/suite/debugQA/moz.build
+++ b/suite/debugQA/moz.build
@@ -1,9 +1,8 @@
 # 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 += ['locales']
 
-MODULE = 'debugQA'
 XPI_NAME = 'debugQA'

--- a/suite/feeds/public/moz.build
+++ b/suite/feeds/public/moz.build
@@ -3,10 +3,10 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'nsIFeedResultService.idl',
     'nsIWebContentConverterRegistrar.idl',
 ]
 
-MODULE = 'suitefeeds'
+XPIDL_MODULE = 'suitefeeds'
 

--- a/suite/feeds/src/moz.build
+++ b/suite/feeds/src/moz.build
@@ -1,15 +1,13 @@
 # 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 = 'suitefeeds'
-
 SOURCES += [
     'nsFeedSniffer.cpp',
 ]
 
 EXTRA_COMPONENTS += [
     'FeedConverter.js',
     'FeedWriter.js',
     'SuiteFeeds.manifest',

--- a/suite/profile/migration/public/moz.build
+++ b/suite/profile/migration/public/moz.build
@@ -2,10 +2,10 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'nsISuiteProfileMigrator.idl',
 ]
 
-MODULE = 'suitemigration'
+XPIDL_MODULE = 'suitemigration'
 

--- a/suite/profile/migration/src/moz.build
+++ b/suite/profile/migration/src/moz.build
@@ -1,15 +1,13 @@
 # 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 = 'suitemigration'
-
 SOURCES += [
     'nsNetscapeProfileMigratorBase.cpp',
     'nsSuiteProfileMigratorUtils.cpp',
     'nsThunderbirdProfileMigrator.cpp',
 ]
 
 EXTRA_COMPONENTS += [
     'SuiteProfileMigrator.manifest',

--- a/suite/profile/moz.build
+++ b/suite/profile/moz.build
@@ -3,18 +3,16 @@
 # 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/.
 
 PARALLEL_DIRS += [
     'migration/public',
     'migration/src',
 ]
 
-MODULE = 'suiteprofile'
-
 SOURCES += [
     'nsSuiteDirectoryProvider.cpp',
 ]
 
 FORCE_STATIC_LIB = True
 
 LIBRARY_NAME = 'suiteprofile_s'
 

--- a/suite/shell/public/moz.build
+++ b/suite/shell/public/moz.build
@@ -7,10 +7,10 @@ XPIDL_SOURCES += [
     'nsIShellService.idl',
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     XPIDL_SOURCES += [
         'nsIWindowsShellService.idl',
     ]
 
-MODULE = 'shellservice'
+XPIDL_MODULE = 'shellservice'
 

--- a/suite/shell/src/moz.build
+++ b/suite/shell/src/moz.build
@@ -1,15 +1,13 @@
 # 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':
     SOURCES += ['nsWindowsShellService.cpp']
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     SOURCES += ['nsMacShellService.cpp']
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk2':
     SOURCES += ['nsGNOMEShellService.cpp']
 
 if SOURCES:

--- a/suite/smile/public/moz.build
+++ b/suite/smile/public/moz.build
@@ -2,10 +2,10 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'smileIApplication.idl',
 ]
 
-MODULE = 'smile'
+XPIDL_MODULE = 'smile'
 

--- a/suite/smile/src/moz.build
+++ b/suite/smile/src/moz.build
@@ -1,15 +1,13 @@
 # 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 = 'smile'
-
 EXTRA_COMPONENTS += [
     'smileApplication.manifest',
 ]
 
 EXTRA_PP_COMPONENTS += [
     'smileApplication.js',
 ]