--- a/calendar/Makefile.in
+++ b/calendar/Makefile.in
@@ -4,13 +4,9 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifdef MOZ_SUNBIRD
-MODULE = calendar
-endif
-
 include $(topsrcdir)/config/rules.mk

--- a/calendar/base/Makefile.in
+++ b/calendar/base/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE = calbase
 MODULE_NAME = calBaseModule
 
 ifneq (,$(filter gtk2 qt,$(MOZ_WIDGET_TOOLKIT)))
 THEME = linux
 else
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 THEME = osx
 else

--- a/calendar/base/build/Makefile.in
+++ b/calendar/base/build/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH   = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE = calbasecomps
 LIBRARY_NAME = calbasecomps
 SHORT_LIBNAME = calbscmp
 IS_COMPONENT = 1
 MODULE_NAME = calBaseModule
 # We don't want an EXPORT_LIBRARY
 FORCE_SHARED_LIB = 1
 FORCE_USE_PIC   = 1 # Force use of PIC
 USE_STATIC_LIBS = 1

--- a/calendar/base/build/moz.build
+++ b/calendar/base/build/moz.build
@@ -1,5 +1,7 @@
 # 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 = 'calbasecomps'
+

--- a/calendar/base/modules/Makefile.in
+++ b/calendar/base/modules/Makefile.in
@@ -4,18 +4,16 @@
 
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE = calbase
-
 EXTRA_JS_MODULES = \
     calAlarmUtils.jsm \
     calAuthUtils.jsm \
     calHashedArray.jsm \
     calItemUtils.jsm \
     calIteratorUtils.jsm \
     calItipUtils.jsm \
     calPrintUtils.jsm \

--- a/calendar/base/modules/moz.build
+++ b/calendar/base/modules/moz.build
@@ -1,5 +1,7 @@
 # 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'
+

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

--- a/calendar/base/public/Makefile.in
+++ b/calendar/base/public/Makefile.in
@@ -4,12 +4,11 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= calbase
 EXPORTS		= calBaseCID.h
 
 include $(topsrcdir)/config/rules.mk

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

--- a/calendar/base/src/Makefile.in
+++ b/calendar/base/src/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH   = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE           = calbase
 LIBRARY_NAME     = calbase_s
 MODULE_NAME      = calBaseModule
 FORCE_STATIC_LIB = 1
 FORCE_USE_PIC   = 1 # Force use of PIC
 USE_STATIC_LIBS = 1
 
 
 CPPSRCS = calDateTime.cpp \

--- a/calendar/base/src/moz.build
+++ b/calendar/base/src/moz.build
@@ -4,8 +4,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'calInternalInterfaces.idl',
 ]
 
 XPIDL_MODULE = 'calbaseinternal'
 
+MODULE = 'calbase'
+

--- a/calendar/itip/Makefile.in
+++ b/calendar/itip/Makefile.in
@@ -5,16 +5,14 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE = calItipEmailTransport
-
 EXTRA_COMPONENTS = \
     calItipEmailTransport.js \
     calItipEmailTransport.manifest \
     $(NULL)
 
 include $(topsrcdir)/config/rules.mk

--- a/calendar/itip/moz.build
+++ b/calendar/itip/moz.build
@@ -1,5 +1,7 @@
 # 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'
+

--- a/calendar/libical/src/libical/Makefile.in
+++ b/calendar/libical/src/libical/Makefile.in
@@ -38,17 +38,16 @@
 DEPTH= @DEPTH@
 
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE           = ical
 LIBRARY_NAME     = mozical
 MODULE_NAME      = mozIcalModule
 FORCE_STATIC_LIB = 1
 FORCE_USE_PIC    = 1 # Force use of PIC
 USE_STATIC_LIBS  = 1
 
 EXPORTS = ical.h
 

--- a/calendar/libical/src/libical/moz.build
+++ b/calendar/libical/src/libical/moz.build
@@ -1,5 +1,7 @@
 # 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'
+

--- a/calendar/lightning/Makefile.in
+++ b/calendar/lightning/Makefile.in
@@ -7,18 +7,16 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 # Calendar builders currently use STRIP_XPI to reduce the binary component in
 # Lightning.
 
-MODULE		= lightning
-
 export XPI_NAME = lightning
 export USE_EXTENSION_MANIFEST = 1
 XPI_PKGNAME = lightning-$(LIGHTNING_VERSION).$(AB_CD).$(MOZ_PKG_PLATFORM)
 GDATA_XPI_PKGNAME = gdata-provider-$(GDATA_VERSION).$(AB_CD).$(MOZ_PKG_PLATFORM)
 
 XPI_EM_ID = {e2fda1a4-762b-4020-b5ad-a41df1933103}
 
 DIST_FILES = install.rdf application.ini

--- a/calendar/lightning/components/Makefile.in
+++ b/calendar/lightning/components/Makefile.in
@@ -5,18 +5,16 @@
 
 DEPTH   = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE           = lightning
-
 EXTRA_COMPONENTS = \
 	lightningTextCalendarConverter.js \
 	lightningTextCalendarConverter.manifest \
 	calItipProtocolHandler.js \
 	calItipProtocolHandler.manifest \
 	$(NULL)
 
 include $(topsrcdir)/config/rules.mk

--- a/calendar/lightning/components/moz.build
+++ b/calendar/lightning/components/moz.build
@@ -1,5 +1,7 @@
 # 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'
+

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

--- a/calendar/providers/Makefile.in
+++ b/calendar/providers/Makefile.in
@@ -5,12 +5,11 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE = calprovs
 MODULE_NAME = calProviderModule
 
 include $(topsrcdir)/config/rules.mk

--- a/calendar/providers/caldav/Makefile.in
+++ b/calendar/providers/caldav/Makefile.in
@@ -4,18 +4,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE = caldav
-
 EXTRA_COMPONENTS = calDavCalendar.js calDavCalendar.manifest
 EXTRA_SCRIPTS = calDavRequestHandlers.js
 
 libs:: $(EXTRA_SCRIPTS)
 	if test ! -d $(FINAL_TARGET)/calendar-js; then $(NSINSTALL) -D $(FINAL_TARGET)/calendar-js; fi
 	$(INSTALL) $^ $(FINAL_TARGET)/calendar-js
 
 # The install target must use SYSINSTALL, which is NSINSTALL in copy mode.

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

--- a/calendar/providers/caldav/public/Makefile.in
+++ b/calendar/providers/caldav/public/Makefile.in
@@ -4,10 +4,9 @@
 
 DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE          = caldav
 include $(topsrcdir)/config/rules.mk

--- 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',
 ]
 
-XPIDL_MODULE = 'caldav'
+MODULE = 'caldav'
 

--- a/calendar/providers/composite/Makefile.in
+++ b/calendar/providers/composite/Makefile.in
@@ -5,13 +5,11 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE = calCompositeCalendar
-
 EXTRA_COMPONENTS = calCompositeCalendar.js calCompositeCalendar.manifest
 
 include $(topsrcdir)/config/rules.mk

--- a/calendar/providers/composite/moz.build
+++ b/calendar/providers/composite/moz.build
@@ -1,5 +1,7 @@
 # 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'
+

--- a/calendar/providers/gdata/Makefile.in
+++ b/calendar/providers/gdata/Makefile.in
@@ -5,18 +5,16 @@
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/package-name.mk
 
-MODULE = gdata-provider
-
 export USE_EXTENSION_MANIFEST = 1
 export XPI_NAME = gdata-provider
 DIST_FILES = install.rdf
 XPI_PKGNAME = gdata-provider-$(GDATA_VERSION).$(AB_CD).$(MOZ_PKG_PLATFORM)
 
 CALENDAR_VERSION := $(shell cat $(topsrcdir)/calendar/sunbird/config/version.txt)
 THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version.txt)
 SEAMONKEY_VERSION := $(shell cat $(topsrcdir)/suite/config/version.txt)

--- a/calendar/providers/gdata/components/Makefile.in
+++ b/calendar/providers/gdata/components/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE = gdata-provider
 EXTRA_COMPONENTS = calGoogleCalendarModule.js calGoogleCalendarModule.manifest
 
 EXTRA_SCRIPTS = \
     calGoogleCalendar.js \
     calGoogleRequest.js \
     calGoogleSession.js \
     calGoogleUtils.js \
     $(NULL)

--- a/calendar/providers/gdata/components/moz.build
+++ b/calendar/providers/gdata/components/moz.build
@@ -1,5 +1,7 @@
 # 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'
+

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

--- a/calendar/providers/gdata/public/Makefile.in
+++ b/calendar/providers/gdata/public/Makefile.in
@@ -4,10 +4,9 @@
 
 DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE          = gdata
 include $(topsrcdir)/config/rules.mk

--- 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',
 ]
 
-XPIDL_MODULE = 'gdata'
+MODULE = 'gdata'
 

--- a/calendar/providers/ics/Makefile.in
+++ b/calendar/providers/ics/Makefile.in
@@ -5,13 +5,11 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE = calICSCalendar
-
 EXTRA_COMPONENTS = calICSCalendar.js calICSCalendar.manifest
 
 include $(topsrcdir)/config/rules.mk

--- a/calendar/providers/ics/moz.build
+++ b/calendar/providers/ics/moz.build
@@ -1,4 +1,7 @@
 # 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'
+

--- a/calendar/providers/memory/Makefile.in
+++ b/calendar/providers/memory/Makefile.in
@@ -5,13 +5,11 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE = calMemoryCalendar
-
 EXTRA_COMPONENTS = calMemoryCalendar.js calMemoryCalendar.manifest
 
 include $(topsrcdir)/config/rules.mk

--- a/calendar/providers/memory/moz.build
+++ b/calendar/providers/memory/moz.build
@@ -1,4 +1,7 @@
 # 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'
+

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

--- a/calendar/providers/storage/Makefile.in
+++ b/calendar/providers/storage/Makefile.in
@@ -4,18 +4,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE = calStorageCalendar
-
 EXTRA_COMPONENTS = \
     calStorageCalendar.js \
     calStorageCalendar.manifest \
     $(NULL)
 
 EXTRA_JS_MODULES = \
     calStorageHelpers.jsm \
     calStorageUpgrade.jsm \

--- a/calendar/providers/storage/moz.build
+++ b/calendar/providers/storage/moz.build
@@ -1,4 +1,7 @@
 # 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'
+

--- a/calendar/providers/wcap/Makefile.in
+++ b/calendar/providers/wcap/Makefile.in
@@ -4,18 +4,16 @@
 
 DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE          = wcap
-
 EXTRA_SCRIPTS = \
                 calWcapUtils.js \
                 calWcapRequest.js \
                 calWcapErrors.js \
                 calWcapSession.js \
                 calWcapCalendarItems.js \
                 calWcapCalendar.js \
                 $(NULL)

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

--- a/calendar/providers/wcap/public/Makefile.in
+++ b/calendar/providers/wcap/public/Makefile.in
@@ -4,10 +4,9 @@
 
 DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE          = wcap
 include $(topsrcdir)/config/rules.mk

--- 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',
 ]
 
-XPIDL_MODULE = 'wcap'
+MODULE = 'wcap'
 

--- a/calendar/timezones/Makefile.in
+++ b/calendar/timezones/Makefile.in
@@ -23,17 +23,16 @@
 
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE = timezones
 export USE_EXTENSION_MANIFEST = 1
 export XPI_NAME = calendar-timezones
 DIST_FILES = install.rdf
 XPI_PKGNAME = calendar-timezones
 
 PREF_JS_EXPORTS = $(srcdir)/defaults/preferences.js
 
 ifndef DISABLE_LIGHTNING_INSTALL

--- a/calendar/timezones/moz.build
+++ b/calendar/timezones/moz.build
@@ -1,7 +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'
+

--- a/chat/components/public/Makefile.in
+++ b/chat/components/public/Makefile.in
@@ -4,11 +4,9 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= chat
-
 include $(topsrcdir)/config/rules.mk

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

--- a/db/mork/build/Makefile.in
+++ b/db/mork/build/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 VPATH		= @srcdir@
 srcdir		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= mork
 LIBRARY_NAME	= mork
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsMorkModule
 
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 LIBXUL_LIBRARY	= 1

--- a/db/mork/build/moz.build
+++ b/db/mork/build/moz.build
@@ -1,4 +1,7 @@
 # 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'
+

--- a/db/mork/public/Makefile.in
+++ b/db/mork/public/Makefile.in
@@ -5,13 +5,12 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= mork
 EXPORTS		= mdb.h
 
 include $(topsrcdir)/config/rules.mk
 

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

--- a/db/mork/src/Makefile.in
+++ b/db/mork/src/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= mork
 LIBRARY_NAME	= msgmork_s
 FORCE_STATIC_LIB=1
 
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 LIBXUL_LIBRARY	= 1
 endif
 

--- a/db/mork/src/moz.build
+++ b/db/mork/src/moz.build
@@ -1,4 +1,7 @@
 # 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'
+

--- a/ldap/xpcom/public/Makefile.in
+++ b/ldap/xpcom/public/Makefile.in
@@ -5,12 +5,10 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= mozldap
-
 include $(topsrcdir)/config/rules.mk
 

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

--- a/ldap/xpcom/src/Makefile.in
+++ b/ldap/xpcom/src/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= mozldap
 LIBRARY_NAME	= mozldap
 EXPORT_LIBRARY	= 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsLDAPProtocolModule
 
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 LIBXUL_LIBRARY	= 1

--- a/ldap/xpcom/src/moz.build
+++ b/ldap/xpcom/src/moz.build
@@ -1,4 +1,7 @@
 # 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'
+

--- a/mail/components/Makefile.in
+++ b/mail/components/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH   = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE = mailcomps
 EXTRA_COMPONENTS = \
 	nsMailDefaultHandler.js \
 	mailContentHandler.js \
 	aboutRedirector.js \
 	mailGlue.js \
 	mailComponents.manifest \
 	$(NULL)
 

--- a/mail/components/activity/Makefile.in
+++ b/mail/components/activity/Makefile.in
@@ -4,18 +4,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE    = activity
-
 EXTRA_COMPONENTS = \
   nsActivity.js \
   nsActivityManager.js \
   nsActivityManagerUI.js \
   activityComponents.manifest \
   $(NULL)
 
 libs:: $(wildcard $(srcdir)/modules/*.js)

--- a/mail/components/activity/moz.build
+++ b/mail/components/activity/moz.build
@@ -4,8 +4,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'nsIActivity.idl',
     'nsIActivityManager.idl',
     'nsIActivityManagerUI.idl',
 ]
 
+MODULE = 'activity'
+

--- a/mail/components/build/Makefile.in
+++ b/mail/components/build/Makefile.in
@@ -7,17 +7,16 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 # NOTE: if we switch away from LIBXUL_LIBRARY at any stage
 # we need to clear the EMBED_MANIFEST_AT flag. (See Bug 714495)
 
-MODULE		= mailcomps
 LIBRARY_NAME	= mailcomps
 SHORT_LIBNAME	= mailcmp
 EXPORT_LIBRARY	= 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsMailCompsModule
 LIBXUL_LIBRARY = 1
 MOZILLA_INTERNAL_API = 1
 FORCE_USE_PIC = 1

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

--- a/mail/components/cloudfile/Makefile.in
+++ b/mail/components/cloudfile/Makefile.in
@@ -4,18 +4,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE    = cloudfile
-
 EXTRA_COMPONENTS = \
   nsYouSendIt.js \
   nsUbuntuOne.js \
   nsBox.js \
   cloudFileComponents.manifest \
   $(NULL)
 
 EXTRA_JS_MODULES = \

--- a/mail/components/cloudfile/moz.build
+++ b/mail/components/cloudfile/moz.build
@@ -2,8 +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 += [
     'nsIMsgCloudFileProvider.idl',
 ]
 
+MODULE = 'cloudfile'
+

--- a/mail/components/migration/public/Makefile.in
+++ b/mail/components/migration/public/Makefile.in
@@ -4,13 +4,12 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= mailprofilemigration
 EXPORTS = nsMailMigrationCID.h
 
 include $(topsrcdir)/config/rules.mk
 

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

--- a/mail/components/migration/src/Makefile.in
+++ b/mail/components/migration/src/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH=@DEPTH@
 topsrcdir=@top_srcdir@
 srcdir=@srcdir@
 VPATH=@srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE=mailprofilemigration
 LIBRARY_NAME = profilemigration_s
 MODULE_NAME = nsMailProfileMigratorModule
 MOZILLA_INTERNAL_API = 1
 
 CPPSRCS = \
 	nsProfileMigrator.cpp \
 	nsMailProfileMigratorUtils.cpp \
 	nsNetscapeProfileMigratorBase.cpp \

--- a/mail/components/migration/src/moz.build
+++ b/mail/components/migration/src/moz.build
@@ -1,4 +1,7 @@
 # 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'
+

--- a/mail/components/moz.build
+++ b/mail/components/moz.build
@@ -30,8 +30,10 @@ TEST_DIRS += ['test']
 DIRS += ['build']
 
 XPIDL_SOURCES += [
     'nsIMailGlue.idl',
 ]
 
 XPIDL_MODULE = 'mailcompsbase'
 
+MODULE = 'mailcomps'
+

--- a/mail/components/search/Makefile.in
+++ b/mail/components/search/Makefile.in
@@ -18,17 +18,16 @@ EXTRA_PP_JS_MODULES = \
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 EXTRA_PP_JS_MODULES += \
   SpotlightIntegration.js \
   $(NULL)
 endif
 
 # If on Windows, build Windows Search integration
 ifneq (,$(filter windows, $(MOZ_WIDGET_TOOLKIT)))
-MODULE = mailwinsearch
 LIBRARY_NAME = winsearch_s
 MODULE_NAME = nsMailWinSearchHelperModule
 ifneq ($(MOZ_WIDGET_TOOLKIT), gtk2)
 MOZILLA_INTERNAL_API = 1
 endif
 
 
 CPPSRCS = \

--- a/mail/components/search/mdimporter/Makefile.in
+++ b/mail/components/search/mdimporter/Makefile.in
@@ -8,18 +8,16 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 # Xcode 2.1 and newer puts its build products in a directory corresponding to
 # the selected build style/configuration.
 XCODE_PRODUCT_DIR = build/$(BUILDSTYLE)
 
-MODULE = mdimporter
-
 include $(topsrcdir)/config/rules.mk
 
 ifeq (,$(findstring pbxbuild,$(PBBUILD)))
     # pbbuild or xcodebuild indicates Xcode; the Xcode project contains
     # native targets needed for proper SDK builds.
     PROJECT=TBSpotlight.xcodeproj
     PROJECT_ARG=-project $(PROJECT)
     PBBUILD_ARG=$(PBBUILD_SETTINGS)

--- a/mail/components/search/mdimporter/moz.build
+++ b/mail/components/search/mdimporter/moz.build
@@ -1,4 +1,7 @@
 # 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
@@ -3,10 +3,12 @@
 # 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_WIDGET_TOOLKIT'] == 'cocoa':
     DIRS += ['mdimporter']
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     DIRS += ['wsenable']
 
+    MODULE = ['mailwinsearch']
+
 DIRS += ['public']
 

--- a/mail/components/search/public/Makefile.in
+++ b/mail/components/search/public/Makefile.in
@@ -4,10 +4,9 @@
 
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE = mailwinsearch
 include $(topsrcdir)/config/rules.mk

--- 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',
 ]
 
-XPIDL_MODULE = 'mailwinsearch'
+MODULE = 'mailwinsearch'
 

--- a/mail/components/shell/Makefile.in
+++ b/mail/components/shell/Makefile.in
@@ -6,17 +6,16 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 DEFINES += -DMOZ_APP_NAME=\"$(MOZ_APP_NAME)\"
 
-MODULE = shellservice
 LIBRARY_NAME = shellservice_s
 MODULE_NAME = nsMailShellModule
 MOZILLA_INTERNAL_API = 1
 
 EXTRA_COMPONENTS = \
   nsSetDefaultMail.js \
   shell.manifest \
   $(NULL)

--- a/mail/components/shell/moz.build
+++ b/mail/components/shell/moz.build
@@ -1,7 +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 += ['public']
 
+MODULE = 'shellservice'
+

--- a/mail/components/shell/public/Makefile.in
+++ b/mail/components/shell/public/Makefile.in
@@ -5,10 +5,9 @@
 
 DEPTH   = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE = shellservice
 include $(topsrcdir)/config/rules.mk

--- 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',
 ]
 
-XPIDL_MODULE = 'shellservice'
+MODULE = 'shellservice'
 

--- a/mail/components/wintaskbar/Makefile.in
+++ b/mail/components/wintaskbar/Makefile.in
@@ -4,15 +4,13 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE = wintaskbar
-
 EXTRA_JS_MODULES = \
 	windowsJumpLists.js \
 	$(NULL)
 
 include $(topsrcdir)/config/rules.mk

--- a/mail/components/wintaskbar/moz.build
+++ b/mail/components/wintaskbar/moz.build
@@ -1,4 +1,7 @@
 # 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'
+

--- a/mail/test/mozmill/Makefile.in
+++ b/mail/test/mozmill/Makefile.in
@@ -6,18 +6,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE = mozmill
-
 include $(topsrcdir)/config/rules.mk
 
 # We're installing to _tests/mozmill
 TARGET_DEPTH = ../..
 include $(MOZILLA_DIR)/build/automation-build.mk
 
 _DEST_DIR = $(MOZDEPTH)/_tests/mozmill
 

--- a/mail/test/mozmill/moz.build
+++ b/mail/test/mozmill/moz.build
@@ -1,4 +1,7 @@
 # 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/Makefile.in
+++ b/mailnews/Makefile.in
@@ -5,18 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE       = mailnews
-
 PREF_JS_EXPORTS = $(srcdir)/mailnews.js
 
 DEFINES += -DOS_ARCH=$(OS_ARCH) \
            -DMOZ_WIDGET_TOOLKIT=$(MOZ_WIDGET_TOOLKIT) \
            -DNO_NSPR_10_SUPPORT \
            $(NULL)
 
 include $(topsrcdir)/config/rules.mk

--- a/mailnews/addrbook/public/Makefile.in
+++ b/mailnews/addrbook/public/Makefile.in
@@ -5,15 +5,13 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= addrbook
-
 EXPORTS		= \
 		nsAbBaseCID.h \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk

--- a/mailnews/addrbook/public/moz.build
+++ b/mailnews/addrbook/public/moz.build
@@ -40,8 +40,11 @@ if CONFIG['MOZ_LDAP_XPCOM']:
     ]
 
     if not CONFIG['MOZ_INCOMPLETE_TOOLKIT_LDAP_AUTOCOMPLETE']:
         XPIDL_SOURCES += [
             'nsIAbLDAPAutoCompFormatter.idl',
             'nsILDAPAutoCompFormatter.idl',
             'nsILDAPAutoCompleteSession.idl',
         ]
+
+MODULE = 'addrbook'
+

--- a/mailnews/addrbook/src/Makefile.in
+++ b/mailnews/addrbook/src/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= addrbook
 LIBRARY_NAME	= addrbook_s
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 LIBXUL_LIBRARY = 1
 endif
 
 CPPSRCS		= \
 		nsAbManager.cpp \

--- a/mailnews/addrbook/src/moz.build
+++ b/mailnews/addrbook/src/moz.build
@@ -1,4 +1,7 @@
 # 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'
+

--- a/mailnews/base/Makefile.in
+++ b/mailnews/base/Makefile.in
@@ -5,12 +5,10 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= msgbase
-
 include $(topsrcdir)/config/rules.mk
 

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

--- a/mailnews/base/public/Makefile.in
+++ b/mailnews/base/public/Makefile.in
@@ -5,18 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= msgbase
-
 EXPORTS		= \
 		MailNewsTypes.h \
 		msgCore.h \
 		nsMsgBaseCID.h \
 		nsMsgHeaderMasks.h \
 		nsMsgLocalFolderHdrs.h \
 		$(NULL)
 

--- a/mailnews/base/public/moz.build
+++ b/mailnews/base/public/moz.build
@@ -56,8 +56,10 @@ XPIDL_SOURCES += [
     'nsIStatusBarBiffManager.idl',
     'nsIStopwatch.idl',
     'nsISubscribableServer.idl',
     'nsIUrlListener.idl',
     'nsMsgFolderFlags.idl',
     'nsMsgMessageFlags.idl',
 ]
 
+MODULE = 'msgbase'
+

--- a/mailnews/base/search/public/Makefile.in
+++ b/mailnews/base/search/public/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= msgbase
 EXPORTS		= \
 		nsMsgBodyHandler.h \
 		nsMsgResultElement.h \
 		nsMsgSearchBoolExpression.h \
 		nsMsgSearchScopeTerm.h \
 		nsMsgSearchTerm.h \
 		nsMsgSearchAdapter.h \
 		$(NULL)

--- a/mailnews/base/search/public/moz.build
+++ b/mailnews/base/search/public/moz.build
@@ -25,8 +25,10 @@ XPIDL_SOURCES += [
 ]
 
 XPIDL_MODULE = 'msgsearch'
 
 XPIDL_FLAGS += [
     '-I$(topsrcdir)/mailnews/base/public',
 ]
 
+MODULE = 'msgbase'
+

--- a/mailnews/base/search/src/Makefile.in
+++ b/mailnews/base/search/src/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= msgbase
 LIBRARY_NAME	= msgsearch_s
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 LIBXUL_LIBRARY = 1
 endif
 EXPORT_DIR	= $(DIST)/bin/isp
 
 

--- a/mailnews/base/search/src/moz.build
+++ b/mailnews/base/search/src/moz.build
@@ -1,7 +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/.
 
 XPIDL_MODULE = 'msgsearch'
 
+MODULE = 'msgbase'
+

--- a/mailnews/base/src/Makefile.in
+++ b/mailnews/base/src/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= msgbase
 LIBRARY_NAME	= msgbase_s
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 LIBXUL_LIBRARY = 1
 endif
 
 CPPSRCS		= \
 		nsMessenger.cpp \

--- a/mailnews/base/src/moz.build
+++ b/mailnews/base/src/moz.build
@@ -1,4 +1,7 @@
 # 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'
+

--- a/mailnews/base/util/Makefile.in
+++ b/mailnews/base/util/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= msgbaseutil
 LIBRARY_NAME	= msgbsutl_s
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 LIBXUL_LIBRARY = 1
 endif
 
 CPPSRCS		= \
 		nsMsgLineBuffer.cpp \

--- a/mailnews/base/util/moz.build
+++ b/mailnews/base/util/moz.build
@@ -1,4 +1,7 @@
 # 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'
+

--- a/mailnews/build/Makefile.in
+++ b/mailnews/build/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= mail
 LIBRARY_NAME = mail
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 LIBXUL_LIBRARY	= 1
 else
 FORCE_SHARED_LIB = 1

--- a/mailnews/build/moz.build
+++ b/mailnews/build/moz.build
@@ -1,4 +1,7 @@
 # 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'
+

--- a/mailnews/compose/Makefile.in
+++ b/mailnews/compose/Makefile.in
@@ -5,12 +5,10 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= msgcompose
-
 include $(topsrcdir)/config/rules.mk
 

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

--- a/mailnews/compose/public/Makefile.in
+++ b/mailnews/compose/public/Makefile.in
@@ -5,17 +5,15 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= msgcompose
-
 EXPORTS		= \
 		nsMsgCompCID.h \
 		nsMsgAttachmentData.h \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 

--- a/mailnews/compose/public/moz.build
+++ b/mailnews/compose/public/moz.build
@@ -25,8 +25,10 @@ XPIDL_SOURCES += [
     'nsIURLFetcher.idl',
 ]
 
 XPIDL_FLAGS += [
     '-I$(topsrcdir)/mailnews/base/public',
     '-I$(topsrcdir)/mailnews/mime/public',
 ]
 
+MODULE = 'msgcompose'
+

--- a/mailnews/compose/src/Makefile.in
+++ b/mailnews/compose/src/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= msgcompose
 LIBRARY_NAME	= msgcompose_s
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 LIBXUL_LIBRARY = 1
 endif
 
 EXTRA_COMPONENTS = \
 		nsSMTPProtocolHandler.js \

--- a/mailnews/compose/src/moz.build
+++ b/mailnews/compose/src/moz.build
@@ -1,4 +1,7 @@
 # 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'
+

--- a/mailnews/db/gloda/components/Makefile.in
+++ b/mailnews/db/gloda/components/Makefile.in
@@ -5,13 +5,11 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE = mailnewsglobaldb
-
 EXTRA_COMPONENTS = $(wildcard $(srcdir)/*.js) \
                    gloda.manifest
 include $(topsrcdir)/config/rules.mk

--- a/mailnews/db/gloda/components/moz.build
+++ b/mailnews/db/gloda/components/moz.build
@@ -1,4 +1,7 @@
 # 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'
+

--- a/mailnews/db/gloda/modules/Makefile.in
+++ b/mailnews/db/gloda/modules/Makefile.in
@@ -5,14 +5,12 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE = mailnewsglobaldb
-
 libs:: $(wildcard $(srcdir)/*.js)
 	$(INSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/modules/gloda
 
 include $(topsrcdir)/config/rules.mk

--- a/mailnews/db/gloda/modules/moz.build
+++ b/mailnews/db/gloda/modules/moz.build
@@ -1,4 +1,7 @@
 # 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'
+

--- a/mailnews/db/msgdb/Makefile.in
+++ b/mailnews/db/msgdb/Makefile.in
@@ -5,11 +5,9 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= msgdb
-
 include $(topsrcdir)/config/rules.mk

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

--- a/mailnews/db/msgdb/public/Makefile.in
+++ b/mailnews/db/msgdb/public/Makefile.in
@@ -5,18 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= msgdb
-
 EXPORTS		= \
 		nsMsgDBCID.h \
 		nsMsgHdr.h \
 		nsMsgDatabase.h \
 		nsMailDatabase.h \
 		nsImapMailDatabase.h \
 		nsNewsDatabase.h \
 		nsDBFolderInfo.h \

--- a/mailnews/db/msgdb/public/moz.build
+++ b/mailnews/db/msgdb/public/moz.build
@@ -11,8 +11,10 @@ XPIDL_SOURCES += [
     'nsIMsgOfflineImapOperation.idl',
     'nsINewsDatabase.idl',
 ]
 
 XPIDL_FLAGS += [
     '-I$(topsrcdir)/mailnews/base/public',
 ]
 
+MODULE = 'msgdb'
+

--- a/mailnews/db/msgdb/src/Makefile.in
+++ b/mailnews/db/msgdb/src/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= msgdb
 LIBRARY_NAME	= msgdb_s
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 LIBXUL_LIBRARY = 1
 endif
 
 
 CPPSRCS		= \

--- a/mailnews/db/msgdb/src/moz.build
+++ b/mailnews/db/msgdb/src/moz.build
@@ -1,4 +1,7 @@
 # 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'
+

--- a/mailnews/extensions/bayesian-spam-filter/Makefile.in
+++ b/mailnews/extensions/bayesian-spam-filter/Makefile.in
@@ -5,11 +5,9 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= bayesflt
-
 include $(topsrcdir)/config/rules.mk

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

--- a/mailnews/extensions/bayesian-spam-filter/src/Makefile.in
+++ b/mailnews/extensions/bayesian-spam-filter/src/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= bayesflt
 LIBRARY_NAME	= bayesflt_s
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 LIBXUL_LIBRARY = 1
 endif
 
 
 CPPSRCS		= \

--- a/mailnews/extensions/bayesian-spam-filter/src/moz.build
+++ b/mailnews/extensions/bayesian-spam-filter/src/moz.build
@@ -1,4 +1,7 @@
 # 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'
+

--- a/mailnews/extensions/dsn/Makefile.in
+++ b/mailnews/extensions/dsn/Makefile.in
@@ -5,18 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= msgdsn
-
 EXTRA_COMPONENTS =  src/dsn-service.js \
                     src/dsn-service.manifest
 
 include $(topsrcdir)/config/rules.mk
 
 libs::
 	$(INSTALL) $(srcdir)/content/dsn.js $(DIST)/bin/defaults/pref
 

--- a/mailnews/extensions/dsn/moz.build
+++ b/mailnews/extensions/dsn/moz.build
@@ -1,4 +1,7 @@
 # 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'
+

--- a/mailnews/extensions/fts3/public/Makefile.in
+++ b/mailnews/extensions/fts3/public/Makefile.in
@@ -5,11 +5,9 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= fts3tok
-
 include $(topsrcdir)/config/rules.mk

--- a/mailnews/extensions/fts3/public/moz.build
+++ b/mailnews/extensions/fts3/public/moz.build
@@ -2,8 +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'
+

--- a/mailnews/extensions/fts3/src/Makefile.in
+++ b/mailnews/extensions/fts3/src/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= fts3tok
 LIBRARY_NAME	= fts3tok_s
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 LIBXUL_LIBRARY = 1
 endif
 
 
 CPPSRCS		= \

--- a/mailnews/extensions/fts3/src/moz.build
+++ b/mailnews/extensions/fts3/src/moz.build
@@ -1,4 +1,7 @@
 # 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'
+

--- a/mailnews/extensions/mailviews/content/Makefile.in
+++ b/mailnews/extensions/mailviews/content/Makefile.in
@@ -5,18 +5,16 @@
 
 DEPTH = @DEPTH@
 topsrcdir	= @top_srcdir@
 VPATH		= @srcdir@
 srcdir		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE       = mailview
-
 EXPORT_DIR	= $(DIST)/bin/defaults/messenger
 
 EXPORT_RESOURCE_FILES	= \
 			mailViews.dat \
 			$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 

--- a/mailnews/extensions/mailviews/content/moz.build
+++ b/mailnews/extensions/mailviews/content/moz.build
@@ -1,4 +1,7 @@
 # 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/Makefile.in
+++ b/mailnews/extensions/mailviews/public/Makefile.in
@@ -5,12 +5,10 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= mailview
-
 include $(topsrcdir)/config/rules.mk
 

--- a/mailnews/extensions/mailviews/public/moz.build
+++ b/mailnews/extensions/mailviews/public/moz.build
@@ -3,8 +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'
+

--- a/mailnews/extensions/mailviews/src/Makefile.in
+++ b/mailnews/extensions/mailviews/src/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= mailview
 LIBRARY_NAME	= mailview_s
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 LIBXUL_LIBRARY = 1
 endif
 
 
 CPPSRCS		= \

--- a/mailnews/extensions/mailviews/src/moz.build
+++ b/mailnews/extensions/mailviews/src/moz.build
@@ -1,4 +1,7 @@
 # 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/mdn/Makefile.in
+++ b/mailnews/extensions/mdn/Makefile.in
@@ -5,17 +5,15 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= msgmdn
-
 include $(topsrcdir)/config/rules.mk
 
 libs::
 	$(INSTALL) $(srcdir)/content/mdn.js $(DIST)/bin/defaults/pref
 
 install::
 	$(SYSINSTALL) $(IFLAGS1) $(srcdir)/content/mdn.js $(DESTDIR)$(mozappdir)/defaults/pref

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

--- a/mailnews/extensions/mdn/src/Makefile.in
+++ b/mailnews/extensions/mdn/src/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= msgmdn
 LIBRARY_NAME	= msgmdn_s
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 LIBXUL_LIBRARY = 1
 endif
 
 
 CPPSRCS		= \

--- a/mailnews/extensions/mdn/src/moz.build
+++ b/mailnews/extensions/mdn/src/moz.build
@@ -1,4 +1,7 @@
 # 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'
+

--- a/mailnews/extensions/newsblog/Makefile.in
+++ b/mailnews/extensions/newsblog/Makefile.in
@@ -14,18 +14,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= newsblog
-
 EXPORT_DIR	= $(DIST)/bin/isp
 
 GARBAGE += $(EXPORT_DIR)/rss.rdf 
 
 libs:: rss.rdf
 	$(INSTALL) $^ $(EXPORT_DIR)
 
 install:: rss.rdf

--- a/mailnews/extensions/newsblog/moz.build
+++ b/mailnews/extensions/newsblog/moz.build
@@ -1,4 +1,7 @@
 # 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'
+

--- a/mailnews/extensions/offline-startup/Makefile.in
+++ b/mailnews/extensions/offline-startup/Makefile.in
@@ -5,16 +5,14 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= offline-startup
-
 EXTRA_COMPONENTS = \
   js/offlineStartup.js \
   js/offlineStartup.manifest \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk

--- a/mailnews/extensions/offline-startup/moz.build
+++ b/mailnews/extensions/offline-startup/moz.build
@@ -1,4 +1,7 @@
 # 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'
+

--- a/mailnews/extensions/smime/Makefile.in
+++ b/mailnews/extensions/smime/Makefile.in
@@ -5,17 +5,15 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= msgsmime
-
 include $(topsrcdir)/config/rules.mk
 
 libs::
 	$(INSTALL) $(srcdir)/content/smime.js $(DIST)/bin/defaults/pref
 
 install::
 	$(SYSINSTALL) $(IFLAGS1) $(srcdir)/content/smime.js $(DESTDIR)$(mozappdir)/defaults/pref

--- a/mailnews/extensions/smime/build/Makefile.in
+++ b/mailnews/extensions/smime/build/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= msgsmime
 LIBRARY_NAME	= msgsmime
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsMsgSMIMEModule
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 LIBXUL_LIBRARY = 1
 endif

--- a/mailnews/extensions/smime/build/moz.build
+++ b/mailnews/extensions/smime/build/moz.build
@@ -1,4 +1,7 @@
 # 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'
+

--- a/mailnews/extensions/smime/moz.build
+++ b/mailnews/extensions/smime/moz.build
@@ -5,8 +5,10 @@
 
 PARALLEL_DIRS += [
     'public',
     'src',
 ]
 
 DIRS += ['build']
 
+MODULE = 'msgsmime'
+

--- a/mailnews/extensions/smime/public/Makefile.in
+++ b/mailnews/extensions/smime/public/Makefile.in
@@ -5,12 +5,10 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= msgsmime
-
 include $(topsrcdir)/config/rules.mk
 

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

--- a/mailnews/extensions/smime/src/Makefile.in
+++ b/mailnews/extensions/smime/src/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= msgsmime
 LIBRARY_NAME	= msgsmime_s
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 LIBXUL_LIBRARY = 1
 endif
 
 
 CPPSRCS		= \

--- a/mailnews/extensions/smime/src/moz.build
+++ b/mailnews/extensions/smime/src/moz.build
@@ -1,4 +1,7 @@
 # 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'
+

--- a/mailnews/imap/public/Makefile.in
+++ b/mailnews/imap/public/Makefile.in
@@ -5,17 +5,15 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= msgimap
-
 EXPORTS		= \
 		nsMsgImapCID.h \
 		nsIIMAPHostSessionList.h \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 

--- a/mailnews/imap/public/moz.build
+++ b/mailnews/imap/public/moz.build
@@ -22,8 +22,10 @@ XPIDL_SOURCES += [
     'nsIMailboxSpec.idl',
     'nsIMsgImapMailFolder.idl',
 ]
 
 XPIDL_FLAGS += [
     '-I$(topsrcdir)/mailnews/base/public',
 ]
 
+MODULE = 'msgimap'
+

--- a/mailnews/imap/src/Makefile.in
+++ b/mailnews/imap/src/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= msgimap
 LIBRARY_NAME	= msgimap_s
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 LIBXUL_LIBRARY = 1
 endif
 
 
 EXPORTS = \

--- a/mailnews/imap/src/moz.build
+++ b/mailnews/imap/src/moz.build
@@ -1,4 +1,7 @@
 # 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'
+

--- a/mailnews/import/applemail/src/Makefile.in
+++ b/mailnews/import/applemail/src/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH			= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH			= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE				= impapplemail
 LIBRARY_NAME	= applmail_s
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 LIBXUL_LIBRARY = 1
 endif
 
 CPPSRCS = \
 		nsAppleMailImport.cpp \

--- a/mailnews/import/applemail/src/moz.build
+++ b/mailnews/import/applemail/src/moz.build
@@ -1,4 +1,7 @@
 # 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'
+

--- a/mailnews/import/build/Makefile.in
+++ b/mailnews/import/build/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE = import
 LIBRARY_NAME = import
 IS_COMPONENT	= 1
 ifdef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 FORCE_SHARED_LIB=1
 else
 EXPORT_LIBRARY = 1
 MOZILLA_INTERNAL_API = 1
 LIBXUL_LIBRARY = 1

--- a/mailnews/import/build/moz.build
+++ b/mailnews/import/build/moz.build
@@ -1,4 +1,7 @@
 # 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'
+

--- a/mailnews/import/eudora/src/Makefile.in
+++ b/mailnews/import/eudora/src/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= impEudra
 LIBRARY_NAME   = impEudra_s
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 LIBXUL_LIBRARY = 1
 endif
 
 
 CPPSRCS		= \

--- a/mailnews/import/eudora/src/moz.build
+++ b/mailnews/import/eudora/src/moz.build
@@ -1,4 +1,7 @@
 # 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'
+

--- a/mailnews/import/oexpress/Makefile.in
+++ b/mailnews/import/oexpress/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= importOE
 LIBRARY_NAME   = importOE_s
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 LIBXUL_LIBRARY = 1
 endif
 
 CPPSRCS		= \
 		nsOEImport.cpp			\

--- a/mailnews/import/oexpress/moz.build
+++ b/mailnews/import/oexpress/moz.build
@@ -1,4 +1,7 @@
 # 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'
+

--- a/mailnews/import/outlook/src/Makefile.in
+++ b/mailnews/import/outlook/src/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= impOutlk
 LIBRARY_NAME   = impOutlk_s
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 LIBXUL_LIBRARY = 1
 endif
 
 
 CPPSRCS		= \

--- a/mailnews/import/outlook/src/moz.build
+++ b/mailnews/import/outlook/src/moz.build
@@ -1,4 +1,7 @@
 # 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'
+

--- a/mailnews/import/public/Makefile.in
+++ b/mailnews/import/public/Makefile.in
@@ -5,12 +5,10 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= import
-
 include $(topsrcdir)/config/rules.mk
 

--- a/mailnews/import/public/moz.build
+++ b/mailnews/import/public/moz.build
@@ -17,8 +17,10 @@ XPIDL_SOURCES += [
     'nsIImportSettings.idl',
 ]
 
 XPIDL_FLAGS += [
     '-I$(topsrcdir)/mailnews/base/public',
     '-I$(topsrcdir)/mailnews/compose/public',
 ]
 
+MODULE = 'import'
+

--- a/mailnews/import/src/Makefile.in
+++ b/mailnews/import/src/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE = import
 LIBRARY_NAME = import_s
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 LIBXUL_LIBRARY = 1
 endif
 
 
 

--- a/mailnews/import/src/moz.build
+++ b/mailnews/import/src/moz.build
@@ -1,4 +1,7 @@
 # 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'
+

--- a/mailnews/import/text/src/Makefile.in
+++ b/mailnews/import/text/src/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= impText
 LIBRARY_NAME   = imptext_s
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 LIBXUL_LIBRARY = 1
 endif
 
 CPPSRCS		= \
 		nsTextImport.cpp				\

--- a/mailnews/import/text/src/moz.build
+++ b/mailnews/import/text/src/moz.build
@@ -1,4 +1,7 @@
 # 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'
+

--- a/mailnews/import/vcard/src/Makefile.in
+++ b/mailnews/import/vcard/src/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= impvcard
 LIBRARY_NAME   = impvcard_s
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 LIBXUL_LIBRARY = 1
 endif
 
 REQUIRES	= xpcom \
 		  string \

--- a/mailnews/import/vcard/src/moz.build
+++ b/mailnews/import/vcard/src/moz.build
@@ -1,4 +1,7 @@
 # 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'
+

--- a/mailnews/import/winlivemail/Makefile.in
+++ b/mailnews/import/winlivemail/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH       =   @DEPTH@
 topsrcdir   =   @top_srcdir@
 srcdir      =   @srcdir@
 VPATH       =   @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE      =           importWM
 LIBRARY_NAME   =        importWM_s
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 LIBXUL_LIBRARY = 1
 endif
 
 CPPSRCS     = \
                         nsWMSettings.cpp        \