Bug 512490 - Remove REQUIRES from comm-central. r=KaiRo, r=Standard8
authorJustin Wood <Callek@gmail.com>
Sat, 12 Jun 2010 03:11:30 -0400
changeset 5861 eacc929ccc278251557ad4beeafd0a0f9649cefa
parent 5860 3a70e023b8a3e78de734fd718e5608f8545387d8
child 5862 24bcb8811f93c18d2733331cf66ef2a8a423693d
push idunknown
push userunknown
push dateunknown
reviewersKaiRo, Standard8
bugs512490
Bug 512490 - Remove REQUIRES from comm-central. r=KaiRo, r=Standard8
calendar/base/build/Makefile.in
calendar/base/src/Makefile.in
calendar/sunbird/app/Makefile.in
config/autoconf.mk.in
directory/xpcom/base/src/Makefile.in
mail/app/Makefile.in
mail/components/build/Makefile.in
mail/components/migration/src/Makefile.in
mail/components/search/Makefile.in
mail/components/shell/Makefile.in
mailnews/addrbook/build/Makefile.in
mailnews/addrbook/src/Makefile.in
mailnews/base/build/Makefile.in
mailnews/base/search/src/Makefile.in
mailnews/base/src/Makefile.in
mailnews/base/test/Makefile.in
mailnews/base/util/Makefile.in
mailnews/build/Makefile.in
mailnews/compose/build/Makefile.in
mailnews/compose/src/Makefile.in
mailnews/db/msgdb/build/Makefile.in
mailnews/db/msgdb/src/Makefile.in
mailnews/extensions/bayesian-spam-filter/build/Makefile.in
mailnews/extensions/bayesian-spam-filter/src/Makefile.in
mailnews/extensions/fts3/build/Makefile.in
mailnews/extensions/fts3/src/Makefile.in
mailnews/extensions/mailviews/build/Makefile.in
mailnews/extensions/mailviews/src/Makefile.in
mailnews/extensions/mdn/build/Makefile.in
mailnews/extensions/mdn/src/Makefile.in
mailnews/extensions/smime/build/Makefile.in
mailnews/extensions/smime/src/Makefile.in
mailnews/imap/build/Makefile.in
mailnews/imap/src/Makefile.in
mailnews/imap/test/Makefile.in
mailnews/import/applemail/src/Makefile.in
mailnews/import/build/Makefile.in
mailnews/import/comm4x/src/Makefile.in
mailnews/import/eudora/src/Makefile.in
mailnews/import/oexpress/Makefile.in
mailnews/import/outlook/src/Makefile.in
mailnews/import/src/Makefile.in
mailnews/import/text/src/Makefile.in
mailnews/import/winlivemail/Makefile.in
mailnews/local/build/Makefile.in
mailnews/local/src/Makefile.in
mailnews/mapi/mapiDll/Makefile.in
mailnews/mapi/mapihook/src/Makefile.in
mailnews/mime/build/Makefile.in
mailnews/mime/cthandlers/calendar/Makefile.in
mailnews/mime/cthandlers/glue/Makefile.in
mailnews/mime/cthandlers/smimestub/Makefile.in
mailnews/mime/cthandlers/vcard/Makefile.in
mailnews/mime/emitters/build/Makefile.in
mailnews/mime/emitters/src/Makefile.in
mailnews/mime/src/Makefile.in
mailnews/news/build/Makefile.in
mailnews/news/src/Makefile.in
suite/app/Makefile.in
suite/browser/src/Makefile.in
suite/build/Makefile.in
suite/feeds/src/Makefile.in
suite/profile/Makefile.in
suite/profile/migration/src/Makefile.in
suite/shell/src/Makefile.in
--- a/calendar/base/build/Makefile.in
+++ b/calendar/base/build/Makefile.in
@@ -48,23 +48,16 @@ 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 # This links against the static CRT on Windows
 
-REQUIRES = \
-	xpcom \
-	js \
-	xpconnect \
-	string \
-	ical \
-	calbase
 
 CPPSRCS = calBaseModule.cpp \
 	$(NULL)
 
 LOCAL_INCLUDES = \
 	-I$(srcdir)/../src
 
 SHARED_LIBRARY_LIBS = \
--- a/calendar/base/src/Makefile.in
+++ b/calendar/base/src/Makefile.in
@@ -47,22 +47,16 @@ include $(DEPTH)/config/autoconf.mk
 MODULE           = calbase
 LIBRARY_NAME     = calbase_s
 MODULE_NAME      = calBaseModule
 FORCE_STATIC_LIB = 1
 GRE_MODULE       = 1
 FORCE_USE_PIC   = 1 # Force use of PIC
 USE_STATIC_LIBS = 1 # This links against the static CRT on Windows
 
-REQUIRES = xpcom \
-	   js \
-	   xpconnect \
-           string \
-	   ical \
-	   $(NULL)
 
 XPIDL_MODULE	= calbaseinternal
 XPIDLSRCS = \
 	calInternalInterfaces.idl \
 	$(NULL)
 
 CPPSRCS = calDateTime.cpp \
 	  calDuration.cpp \
--- a/calendar/sunbird/app/Makefile.in
+++ b/calendar/sunbird/app/Makefile.in
@@ -85,22 +85,16 @@ ifndef LIBXUL_SDK
 MOZILLA_INTERNAL_API = 1
 
 ifneq (,$(filter OS2 WINCE WINNT,$(OS_ARCH)))
 PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX)
 else
 PROGRAM = $(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
 endif
 
-REQUIRES = \
-	appshell \
-	string \
-	xpcom \
-	xulapp \
-	$(NULL)
 
 CPPSRCS = nsCalendarApp.cpp
 
 LOCAL_INCLUDES += -I$(MOZILLA_SRCDIR)/toolkit/xre
 
 ifdef BUILD_STATIC_LIBS
 ifdef _MSC_VER
 STATIC_COMPONENTS_LINKER_PATH = -LIBPATH:$(DEPTH)/staticlib
@@ -176,17 +170,16 @@ else
 include $(topsrcdir)/config/static-config.mk
 
 EXTRA_DEPS	+= \
 	$(STATIC_EXTRA_DEPS) \
 	$(NULL)
 DEFINES		+= $(STATIC_DEFINES)
 CPPSRCS		+= $(STATIC_CPPSRCS)
 EXTRA_DSO_LIBS	+= $(STATIC_EXTRA_DSO_LIBS)
-REQUIRES	+= $(STATIC_REQUIRES)
 EXTRA_LIBS	+= $(STATIC_EXTRA_LIBS)
 
 # OpenGL is required by (mozilla/)content/canvas: see (mozilla/)layout/build/Makefile.in.
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 OS_LIBS += -framework OpenGL
 endif
 
 endif # BUILD_STATIC_LIBS
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -365,25 +365,23 @@ else
 JPEG_CFLAGS	= @MOZ_JPEG_CFLAGS@
 JPEG_LIBS	= @MOZ_JPEG_LIBS@
 JPEG_REQUIRES	= jpeg
 endif
 
 ifdef MOZ_NATIVE_ZLIB
 ZLIB_CFLAGS	= @ZLIB_CFLAGS@
 ZLIB_LIBS	= @ZLIB_LIBS@
-ZLIB_REQUIRES	=
 else
 ZLIB_CFLAGS	= @MOZ_ZLIB_CFLAGS@
 ifdef MOZ_ENABLE_LIBXUL
 MOZ_ZLIB_LIBS = @MOZ_ZLIB_LIBS@
 else
 ZLIB_LIBS = @MOZ_ZLIB_LIBS@
 endif
-ZLIB_REQUIRES	= zlib
 endif
 
 ifdef MOZ_NATIVE_BZ2
 BZ2_CFLAGS	= @BZ2_CFLAGS@
 BZ2_LIBS	= @BZ2_LIBS@
 BZ2_REQUIRES	=
 else
 BZ2_CFLAGS	= @MOZ_BZ2_CFLAGS@
--- a/directory/xpcom/base/src/Makefile.in
+++ b/directory/xpcom/base/src/Makefile.in
@@ -45,20 +45,16 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= mozldap
 LIBRARY_NAME	= mozldap
 EXPORT_LIBRARY	= 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsLDAPProtocolModule
 MOZILLA_INTERNAL_API = 1
 
-REQUIRES	= xpcom \
-		  string \
-		  necko \
-		  $(NULL)
 
 EXTRA_PP_COMPONENTS = \
 		nsLDAPProtocolHandler.js \
 		$(NULL)
 
 CPPSRCS		= \
 		nsLDAPProtocolModule.cpp \
 		nsLDAPMessage.cpp \
@@ -81,17 +77,16 @@ endif
 
 ifdef MOZ_LDAP_XPCOM_EXPERIMENTAL
 DEFINES		+= -DMOZ_LDAP_XPCOM_EXPERIMENTAL
 
 CPPSRCS		+= \
 		nsLDAPChannel.cpp \
 		$(NULL)
 
-REQUIRES	+= mimetype
 endif
 
 ifdef MOZ_PSM
 DEFINES		+= -DMOZ_PSM
 CPPSRCS		+= \
 		nsLDAPSecurityGlue.cpp \
 		$(NULL)
 endif
--- a/mail/app/Makefile.in
+++ b/mail/app/Makefile.in
@@ -80,21 +80,16 @@ PREF_JS_EXPORTS = \
     $(NULL)
 
 ifneq (,$(filter OS2 WINCE WINNT,$(OS_ARCH)))
 PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX)
 else
 PROGRAM = $(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
 endif
 
-REQUIRES = \
-	xpcom \
-	string \
-	xulapp \
-	$(NULL)
 
 CPPSRCS = nsMailApp.cpp
 
 DIST_FILES = application.ini
 
 LOCAL_INCLUDES += -I$(MOZILLA_SRCDIR)/toolkit/xre
 
 ifdef BUILD_STATIC_LIBS
@@ -178,17 +173,16 @@ ifdef BUILD_STATIC_LIBS
 include $(topsrcdir)/config/static-config.mk
 
 EXTRA_DEPS	+= \
 	$(STATIC_EXTRA_DEPS) \
 	$(NULL)
 DEFINES		+= $(STATIC_DEFINES)
 CPPSRCS		+= $(STATIC_CPPSRCS)
 EXTRA_DSO_LIBS	+= $(STATIC_EXTRA_DSO_LIBS)
-REQUIRES	+= $(STATIC_REQUIRES)
 EXTRA_LIBS	+= \
 	$(STATIC_EXTRA_LIBS) \
 	$(MOZ_HARFBUZZ_LIBS) \
 	$(NULL)
 
 # OpenGL is required by (mozilla/)content/canvas: see (mozilla/)layout/build/Makefile.in.
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 OS_LIBS += -framework OpenGL
--- a/mail/components/build/Makefile.in
+++ b/mail/components/build/Makefile.in
@@ -51,37 +51,16 @@ MODULE_NAME	= nsMailCompsModule
 ifdef BUILD_STATIC_LIBS
 MOZILLA_INTERNAL_API = 1
 else
 ifneq ($(MOZ_WIDGET_TOOLKIT), gtk2)
 MOZILLA_INTERNAL_API = 1
 endif
 endif
 
-REQUIRES = \
-	xpcom \
-	xulapp \
-	mailprofilemigration \
-	string \
-	libreg \
-	intl \
-	pref \
-	msgbase \
-	import \
-	shellservice \
-	$(NULL)
-
-ifneq (,$(filter windows, $(MOZ_WIDGET_TOOLKIT)))
-ifndef MOZ_DISABLE_VISTA_SDK_REQUIREMENTS
-REQUIRES += \
-	mailwinsearch \
-	$(NULL)
-endif
-endif
-
 CPPSRCS = nsModule.cpp \
           $(NULL)
 
 ifeq ($(OS_ARCH),WINNT)
 OS_LIBS += $(call EXPAND_LIBNAME,ole32 shell32)
 endif
 
 LOCAL_INCLUDES = \
--- a/mail/components/migration/src/Makefile.in
+++ b/mail/components/migration/src/Makefile.in
@@ -11,31 +11,16 @@ MODULE_NAME = nsMailProfileMigratorModul
 ifdef BUILD_STATIC_LIBS
 MOZILLA_INTERNAL_API = 1
 else
 ifneq ($(MOZ_WIDGET_TOOLKIT), gtk2)
 MOZILLA_INTERNAL_API = 1
 endif
 endif
 
-REQUIRES = \
-	string \
-	xpcom \
-	xulapp \
-	libreg \
-	windowwatcher \
-	dom \
-	pref \
-	rdf \
-	necko \
-	intl \
-	uconv \
-	import \
-	msgbase \
-	$(NULL)
 
 CPPSRCS = \
 	nsProfileMigrator.cpp \
 	nsMailProfileMigratorUtils.cpp \
 	nsNetscapeProfileMigratorBase.cpp \
 	nsSeamonkeyProfileMigrator.cpp \
 	$(NULL)
 
--- a/mail/components/search/Makefile.in
+++ b/mail/components/search/Makefile.in
@@ -73,20 +73,16 @@ MODULE_NAME = nsMailWinSearchHelperModul
 ifdef BUILD_STATIC_LIBS
 MOZILLA_INTERNAL_API = 1
 else
 ifneq ($(MOZ_WIDGET_TOOLKIT), gtk2)
 MOZILLA_INTERNAL_API = 1
 endif
 endif
 
-REQUIRES = \
-  xpcom \
-  string \
-  $(NULL)
 
 CPPSRCS = \
   nsMailWinSearchHelper.cpp \
   $(NULL)
 
 DIRS += public
 
 # Windows Search component
--- a/mail/components/shell/Makefile.in
+++ b/mail/components/shell/Makefile.in
@@ -53,30 +53,16 @@ ifdef BUILD_STATIC_LIBS
 MOZILLA_INTERNAL_API = 1
 else
 ifneq ($(MOZ_WIDGET_TOOLKIT), gtk2)
 MOZILLA_INTERNAL_API = 1
 endif
 endif
 
 
-REQUIRES = \
-	xpcom \
-	string \
-	mozgnome \
-	msgbase \
-	appcomps \
-	appshell \
-	intl \
-	unicharutil \
-	windowwatcher \
-	pref \
-	embed_base \
-	msgMapi \
-	$(NULL)
 
 ifeq ($(OS_ARCH),WINNT)
 CPPSRCS = nsMailWinIntegration.cpp
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT), gtk2)
 CPPSRCS = nsMailGNOMEIntegration.cpp
 endif
--- a/mailnews/addrbook/build/Makefile.in
+++ b/mailnews/addrbook/build/Makefile.in
@@ -48,41 +48,20 @@ LIBRARY_NAME	= addrbook
 META_COMPONENT = mail
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsAbModule
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
-REQUIRES	= xpcom \
-		  string \
-		  necko \
-		  pref \
-		  mime \
-		  rdf \
-		  msgbase \
-		  msgbaseutil \
-		  rdfutil \
-		  appcomps \
-		  toolkitcomps \
-		  dom \
-		  widget \
-		  locale \
-		  mork \
-		  layout \
-		  intl \
-		  uriloader \
-		  $(NULL)
 
 CPPSRCS		= nsAbFactory.cpp
 
 ifdef MOZ_LDAP_XPCOM
-REQUIRES	+= mozldap \
-                   $(NULL)
 DEFINES		+= -DMOZ_LDAP_XPCOM
 endif
 
 SHARED_LIBRARY_LIBS = \
 	../src/$(LIB_PREFIX)addrbook_s.$(LIB_SUFFIX) \
 	$(NULL)
 
 EXTRA_DSO_LIBS += msgbaseutil
--- a/mailnews/addrbook/src/Makefile.in
+++ b/mailnews/addrbook/src/Makefile.in
@@ -45,41 +45,16 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= addrbook
 LIBRARY_NAME	= addrbook_s
 META_COMPONENT = mail
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
-REQUIRES	= xpcom \
-		  string \
-		  rdf \
-		  rdfutil \
-		  toolkitcomps \
-		  appcomps \
-		  dom \
-		  layout \
-		  widget \
-		  mork \
-		  pref \
-		  necko \
-		  locale \
-		  unicharutil \
-		  uconv \
-		  msgbase \
-		  msgbaseutil \
-		  mime \
-		  intl \
-		  windowwatcher \
-		  uriloader \
-		  embed_base \
-		  loginmgr \
-		  $(NULL)
-
 CPPSRCS		= \
 		nsAbManager.cpp \
 		nsAbRDFDataSource.cpp \
 		nsDirectoryDataSource.cpp \
 		nsAbCardProperty.cpp \
 		nsDirPrefs.cpp \
 		nsAddrDatabase.cpp \
 		nsAbDirProperty.cpp \
@@ -125,19 +100,16 @@ CPPSRCS		+= \
 		nsMapiAddressBook.cpp \
 		nsWabAddressBook.cpp \
 		$(NULL)
 
 endif
 endif
 
 ifdef MOZ_LDAP_XPCOM
-REQUIRES    += mozldap \
-               $(NULL)
-
 DEFINES += -DMOZ_LDAP_XPCOM
 
 CPPSRCS		+= \
 		nsAbLDAPDirectory.cpp \
 		nsAbLDAPDirFactory.cpp	\
 		nsAbLDAPCard.cpp \
 		nsAbLDAPListenerBase.cpp \
 		nsAbLDAPDirectoryQuery.cpp \
--- a/mailnews/base/build/Makefile.in
+++ b/mailnews/base/build/Makefile.in
@@ -50,48 +50,16 @@ endif
 META_COMPONENT = mail
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsMsgBaseModule
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
-REQUIRES	= xpcom \
-		  string \
-		  necko \
-		  intl \
-		  locale \
-		  rdf \
-		  content \
-		  dom \
-		  docshell \
-		  widget \
-		  layout \
-		  mime \
-		  uriloader \
-		  addrbook \
-		  mork \
-		  txmgr \
-		  pref \
-		  msgcompose \
-		  msgbaseutil \
-		  msgdb \
-		  appcomps \
-		  toolkitcomps \
-		  msgnews \
-		  msgimap \
-		  gfx \
-		  webbrwsr \
-		  $(NULL)
-
-ifeq ($(OS_TARGET),Darwin)
-REQUIRES += alerts
-endif
-
 CPPSRCS		= nsMsgFactory.cpp
 
 SHARED_LIBRARY_LIBS = \
 		../src/$(LIB_PREFIX)msgbase_s.$(LIB_SUFFIX) \
 		../search/src/$(LIB_PREFIX)msgsearch_s.$(LIB_SUFFIX) \
 		$(NULL)
 
 EXTRA_DSO_LIBS = msgbaseutil
--- a/mailnews/base/search/src/Makefile.in
+++ b/mailnews/base/search/src/Makefile.in
@@ -46,35 +46,16 @@ MODULE		= msgbase
 XPIDL_MODULE	= msgsearch
 LIBRARY_NAME	= msgsearch_s
 META_COMPONENT = mail
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 EXPORT_DIR	= $(DIST)/bin/isp
 
-REQUIRES	= xpcom \
-		  string \
-		  msgdb \
-		  msgbaseutil \
-		  necko \
-		  mime \
-		  msgimap \
-		  rdf \
-		  msglocal \
-		  intl \
-		  unicharutil \
-		  locale \
-                  msgcompose \
-		  pref \
-		  msgnews \
-		  txmgr \
-		  addrbook \
-		  docshell \
-		  $(NULL)
 
 CPPSRCS		= \
 		nsMsgFilterService.cpp \
 		nsMsgFilterList.cpp \
 		nsMsgFilter.cpp \
 		nsMsgSearchTerm.cpp \
 		nsMsgBodyHandler.cpp \
 		nsMsgLocalSearch.cpp \
--- a/mailnews/base/src/Makefile.in
+++ b/mailnews/base/src/Makefile.in
@@ -44,60 +44,16 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= msgbase
 LIBRARY_NAME	= msgbase_s
 META_COMPONENT = mail
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
-REQUIRES	= xpcom \
-	  	  alerts \
-		  string \
-		  necko \
-		  dom \
-		  appshell \
-		  toolkitcomps \
-		  appcomps \
-		  uconv \
-		  intl \
-		  htmlparser \
-		  widget \
-		  docshell \
-		  rdf \
-		  gfx \
-		  thebes \
-		  layout \
-		  content \
-		  mailnews \
-		  locale \
-		  unicharutil \
-		  msgbaseutil \
-		  webshell \
-		  txmgr \
-		  msgcompose \
-		  msgdb \
-		  uriloader \
-		  pref \
-		  msglocal \
-		  msgimap \
-		  mork \
-		  msgnews \
-		  addrbook \
-		  mime \
-		  mimetype \
-		  windowwatcher \
-		  webbrwsr \
-		  exthandler \
-		  xulapp \
-		  caps \
-		  xpconnect \
-		  js \
-		  $(NULL)
-
 CPPSRCS		= \
 		nsMessenger.cpp \
 		nsMessengerBootstrap.cpp \
 		nsMsgMailSession.cpp \
 		nsMsgAccountManager.cpp \
 		nsMsgAccount.cpp \
 		nsCopyMessageStreamListener.cpp \
 		nsMsgRDFDataSource.cpp \
@@ -137,41 +93,33 @@ CPPSRCS		= \
 		nsMailDirProvider.cpp\
 		$(NULL)
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 CMMSRCS = nsMessengerOSXIntegration.mm
 endif
 
 ifeq ($(OS_ARCH),WINNT)
-REQUIRES	+= appcomps \
-		   profile \
-		   $(NULL)
-
 ifdef BUILD_STATIC_LIBS
 DEFINES	+= -DMOZ_STATIC_BUILD
 endif
 
 CPPSRCS		+= nsMessengerWinIntegration.cpp 
 endif
 
 ifeq ($(OS_ARCH),OS2)
 CPPSRCS		+= nsMessengerOS2Integration.cpp 
 endif
 
 ifneq (,$(filter $(MOZ_WIDGET_TOOLKIT),gtk gtk2))
 CPPSRCS		+= nsMessengerUnixIntegration.cpp 
 endif
 
 ifdef MOZ_LDAP_XPCOM
-REQUIRES    += mozldap \
-               $(NULL)
-
 DEFINES         += -DMOZ_LDAP_XPCOM
-
 endif
 
 EXPORTS = \
 		nsMsgRDFDataSource.h \
 		nsMsgRDFUtils.h \
 		nsMailDirServiceDefs.h \
 		$(NULL)
 
--- a/mailnews/base/test/Makefile.in
+++ b/mailnews/base/test/Makefile.in
@@ -46,23 +46,16 @@ include $(DEPTH)/config/autoconf.mk
 
 # Module name for xpcshell tests.
 MODULE         = test_mailnewsbase
 
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
-REQUIRES = \
-	pref \
-	necko \
-	string \
-	msgbase \
-	msgbaseutil \
-	$(NULL)
 
 CPP_UNIT_TESTS = \
     TestMsgStripRE.cpp \
     $(NULL)
 
 include $(topsrcdir)/config/config.mk
 
 XPCSHELL_TESTS = unit
--- a/mailnews/base/util/Makefile.in
+++ b/mailnews/base/util/Makefile.in
@@ -52,49 +52,16 @@ else
 LIBRARY_NAME	= msgbsutl_s
 endif
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
 META_COMPONENT = mail
 
-REQUIRES	= xpcom \
-		  string \
-		  msgbase \
-		  rdf \
-		  necko \
-		  msgdb \
-		  intl \
-		  mork \
-		  locale \
-		  pref \
-		  rdfutil \
-		  mime \
-		  caps \
-		  msgcompose \
-		  addrbook \
-		  docshell \
-		  uriloader \
-		  msgimap \
-		  msglocal \
-		  msgnews \
-		  txmgr \
-		  uconv \
-		  unicharutil \
-		  nkcache \
-		  mimetype \
-		  windowwatcher \
-		  htmlparser \
-		  content \
-		  layout \
-		  loginmgr \
-		  pipnss \
-		  $(ZLIB_REQUIRES) \
-		  $(NULL)
 
 CPPSRCS		= \
 		nsMsgLineBuffer.cpp \
 		nsMsgDBFolder.cpp \
 		nsMsgKeySet.cpp \
 		nsMsgIdentity.cpp \
 		nsMsgIncomingServer.cpp \
 		nsMsgUtils.cpp \
--- a/mailnews/build/Makefile.in
+++ b/mailnews/build/Makefile.in
@@ -40,78 +40,32 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= mail
 LIBRARY_NAME = mail
 
-
 ifndef BUILD_STATIC_LIBS
 ifeq ($(OS_ARCH),WINNT)
 RESFILE		= mail.res
 endif
 endif
 
 META_COMPONENT = mail
 
 EXPORT_LIBRARY = 1
 
 IS_COMPONENT	= 1
 MOZILLA_INTERNAL_API = 1
 
 MODULE_NAME	= nsMailModule
 
-REQUIRES	= xpcom \
-		  addrbook \
-		  appcomps \
-		  toolkitcomps \
-		  content \
-		  dom \
-		  docshell \
-		  editor \
-		  fts3tok \
-		  gfx \
-		  intl \
-	     	  locale \
-		  layout \
-		  lwbrk \
-	          mailview \
-	          msglocal \
-		  msgcompose \
-	          msgbase  \
-		  msgnews \
-		  msgimap \
-		  msgdb \
-		  mime \
-		  mork \
-		  necko \
-		  nkcache \
-		  pref \
-		  rdf \
-		  rdfutil \
-		  string \
-		  sqlite3 \
-		  txmgr \
-		  widget \
-		  webbrwsr \
-		  uconv \
-		  uriloader \
-		  $(ZLIB_REQUIRES) \
-		  $(NULL)
-
-ifeq ($(OS_TARGET),Darwin)
-REQUIRES += alerts
-endif
-
 ifdef MOZ_LDAP_XPCOM
-REQUIRES	+= mozldap \
-               $(NULL)
-
 DEFINES		+= -DMOZ_LDAP_XPCOM
 endif
 
 ifeq ($(OS_ARCH),WINNT)
 DEFINES		+= -DZLIB_DLL
 endif
 
 CPPSRCS		= nsMailModule.cpp
--- a/mailnews/compose/build/Makefile.in
+++ b/mailnews/compose/build/Makefile.in
@@ -49,36 +49,16 @@ META_COMPONENT = mail
 EXPORT_LIBRARY = 1
 SHORT_LIBNAME	= msgcompo
 IS_COMPONENT	= 1
 MODULE_NAME	= nsMsgComposeModule
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
-REQUIRES	= xpcom \
-		  string \
-		  msgbase \
-		  msgbaseutil \
-		  editor \
-		  necko \
-		  dom \
-		  uriloader \
-		  mime \
-		  addrbook \
-		  rdf \
-		  intl \
-		  uconv \
-		  pref \
-		  widget \
-		  msgdb \
-		  appcomps \
-		  toolkitcomps \
-		  nkcache \
-		  $(NULL)
 
 EXTRA_DSO_LIBS = msgbaseutil
 
 CPPSRCS		= nsMsgCompFactory.cpp
 
 SHARED_LIBRARY_LIBS = \
 		../src/$(LIB_PREFIX)msgcompose_s.$(LIB_SUFFIX) \
 		$(NULL)
--- a/mailnews/compose/src/Makefile.in
+++ b/mailnews/compose/src/Makefile.in
@@ -44,59 +44,16 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= msgcompose
 LIBRARY_NAME	= msgcompose_s
 META_COMPONENT = mail
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
-REQUIRES	= xpcom \
-		  string \
-		  dom \
-		  layout \
-		  editor \
-		  uriloader \
-		  msgbase \
-		  necko \
-		  mime \
-		  pref \
-		  intl \
-		  lwbrk \
-		  uconv \
-		  locale \
-		  unicharutil \
-		  content \
-		  msgbaseutil \
-		  msgdb \
-		  rdf \
-		  appshell \
-		  toolkitcomps \
-		  appcomps \
-		  msgimap \
-		  msgnews \
-		  docshell \
-		  addrbook \
-		  widget \
-		  htmlparser \
-		  txmgr \
-		  caps \
-		  exthandler \
-		  nkcache \
-		  mimetype \
-		  windowwatcher \
-		  gfx \
-		  zipwriter \
-		  loginmgr \
-		  $(NULL)
-
-ifdef MOZ_THUNDERBIRD
-REQUIRES	+= xulapp
-endif
-
 EXTRA_COMPONENTS = \
 		nsSMTPProtocolHandler.js \
 		$(NULL)
 
 CPPSRCS		= \
 		nsMsgCompFields.cpp \
 		nsSmtpUrl.cpp \
 		nsSmtpProtocol.cpp \
--- a/mailnews/db/msgdb/build/Makefile.in
+++ b/mailnews/db/msgdb/build/Makefile.in
@@ -47,25 +47,16 @@ LIBRARY_NAME	= msgdb
 META_COMPONENT = mail
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsMsgDBModule
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
-REQUIRES	= xpcom \
-		  string \
-		  locale \
-		  mork \
-		  mime \
-		  msgbase \
-		  msgbaseutil \
-		  necko \
-		  $(NULL)
 
 EXTRA_DSO_LIBS = msgbaseutil
 
 CPPSRCS		= nsMsgDBFactory.cpp
 
 SHARED_LIBRARY_LIBS = ../src/$(LIB_PREFIX)msgdb_s.$(LIB_SUFFIX)
 
 ifdef MOZILLA_INTERNAL_API
--- a/mailnews/db/msgdb/src/Makefile.in
+++ b/mailnews/db/msgdb/src/Makefile.in
@@ -44,26 +44,16 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= msgdb
 LIBRARY_NAME	= msgdb_s
 META_COMPONENT = mail
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
-REQUIRES	= xpcom \
-		  string \
-		  mork \
-		  msgbase \
-		  msgbaseutil \
-		  locale \
-		  mime \
-		  necko \
-		  pref \
-		  $(NULL)
 
 CPPSRCS		= \
 		nsMsgDatabase.cpp \
 		nsDBFolderInfo.cpp \
 		nsMsgHdr.cpp \
 		nsNewsDatabase.cpp \
 		nsMailDatabase.cpp \
 		nsImapMailDatabase.cpp \
--- a/mailnews/extensions/bayesian-spam-filter/build/Makefile.in
+++ b/mailnews/extensions/bayesian-spam-filter/build/Makefile.in
@@ -47,21 +47,16 @@ LIBRARY_NAME	= bayesflt
 META_COMPONENT = mail
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsBayesianFilterModule
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
-REQUIRES	= xpcom \
-		  msgbase \
-		  lwbrk \
-		  string \
-		  $(NULL)
 
 EXTRA_DSO_LIBS = msgbaseutil
 
 CPPSRCS		= nsBayesianFilterFactory.cpp
 
 LOCAL_INCLUDES += -I$(srcdir)/../src
 
 SHARED_LIBRARY_LIBS = \
--- a/mailnews/extensions/bayesian-spam-filter/src/Makefile.in
+++ b/mailnews/extensions/bayesian-spam-filter/src/Makefile.in
@@ -44,30 +44,16 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= bayesflt
 LIBRARY_NAME	= bayesflt_s
 META_COMPONENT = mail
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
-REQUIRES	= xpcom \
-		  string \
-		  unicharutil \
-		  msgbase \
-		  necko \
-		  msgbaseutil \
-		  lwbrk \
-      mimetype \
-      mime \
-      pref \
-		  content \
-		  htmlparser \
-		  layout \
-		  $(NULL)
 
 CPPSRCS		= \
 		nsBayesianFilter.cpp \
 		$(NULL)
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
--- a/mailnews/extensions/fts3/build/Makefile.in
+++ b/mailnews/extensions/fts3/build/Makefile.in
@@ -48,21 +48,16 @@ LIBRARY_NAME	= fts3tok
 META_COMPONENT = mail
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsFts3TokenizerModule
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
-REQUIRES	= xpcom \
-		  string \
-		  sqlite3 \
-		  storage \
-		  $(NULL)
 
 EXTRA_DSO_LIBS = msgbaseutil
 
 CPPSRCS		= nsFts3TokenizerFactory.cpp
 
 LOCAL_INCLUDES += -I$(srcdir)/../src
 
 SHARED_LIBRARY_LIBS = \
--- a/mailnews/extensions/fts3/src/Makefile.in
+++ b/mailnews/extensions/fts3/src/Makefile.in
@@ -45,22 +45,16 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= fts3tok
 LIBRARY_NAME	= fts3tok_s
 META_COMPONENT = mail
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
-REQUIRES	= \
-		xpcom \
-		string \
-		sqlite3 \
-		storage \
-		$(NULL)
 
 CPPSRCS		= \
 		nsFts3Tokenizer.cpp \
 		nsGlodaRankerFunction.cpp \
 		$(NULL)
 
 CSRCS		= \
 		fts3_porter.c \
--- a/mailnews/extensions/mailviews/build/Makefile.in
+++ b/mailnews/extensions/mailviews/build/Makefile.in
@@ -47,25 +47,16 @@ LIBRARY_NAME	= mailview
 META_COMPONENT = mail
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsMsgMailViewModule
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
-REQUIRES	= xpcom \
-		  string \
-		  msgbase \
-		  necko \
-		  msgbaseutil \
-          	  msgdb \
-          	  mime \
-		  intl \
-		  $(NULL)
 
 EXTRA_DSO_LIBS = msgbaseutil
 
 CPPSRCS		= nsMsgMailViewsFactory.cpp
 
 LOCAL_INCLUDES += -I$(srcdir)/../src
 
 SHARED_LIBRARY_LIBS = \
--- a/mailnews/extensions/mailviews/src/Makefile.in
+++ b/mailnews/extensions/mailviews/src/Makefile.in
@@ -44,23 +44,16 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= mailview
 LIBRARY_NAME	= mailview_s
 META_COMPONENT = mail
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
-REQUIRES	= xpcom \
-		  string \
-		  msgbase \
-		  necko \
-          	  mime \
-		  intl \
-		  $(NULL)
 
 CPPSRCS		= \
                 nsMsgMailViewList.cpp \
 		$(NULL)
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
--- a/mailnews/extensions/mdn/build/Makefile.in
+++ b/mailnews/extensions/mdn/build/Makefile.in
@@ -47,24 +47,16 @@ LIBRARY_NAME	= msgmdn
 META_COMPONENT = mail
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsMsgMdnModule
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
-REQUIRES	= xpcom \
-		  string \
-		  mime \
-		  msgbase \
-		  msgbaseutil \
-		  msgdb \
-		  necko \
-		  $(NULL)
 
 EXTRA_DSO_LIBS = msgbaseutil
 
 CPPSRCS		= nsMsgMdnFactory.cpp
 
 LOCAL_INCLUDES += -I$(srcdir)/../src
 
 SHARED_LIBRARY_LIBS = \
--- a/mailnews/extensions/mdn/src/Makefile.in
+++ b/mailnews/extensions/mdn/src/Makefile.in
@@ -44,28 +44,16 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= msgmdn
 LIBRARY_NAME	= msgmdn_s
 META_COMPONENT = mail
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
-REQUIRES	= xpcom \
-		  string \
-		  msgbase \
-		  necko \
-		  mime \
-		  pref \
-		  intl \
-		  msgbaseutil \
-		  msgimap \
-		  mimetype \
-		  msgcompose \
-		  $(NULL)
 
 CPPSRCS		= \
                 nsMsgMdnGenerator.cpp \
 		$(NULL)
 
 EXTRA_COMPONENTS =  mdn-service.js
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
--- a/mailnews/extensions/smime/build/Makefile.in
+++ b/mailnews/extensions/smime/build/Makefile.in
@@ -47,24 +47,16 @@ LIBRARY_NAME	= msgsmime
 META_COMPONENT = mail
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsMsgSMIMEModule
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
-REQUIRES	= xpcom \
-		  string \
-		  mime \
-		  msgcompose \
-		  pipnss \
-		  necko \
-		  intl \
-		  $(NULL)
 
 ifndef MOZ_STATIC_MAIL_BUILD
 
 EXTRA_DSO_LIBS = msgbaseutil
 
 endif
 
 CPPSRCS		= nsMsgSMIMEFactory.cpp
--- a/mailnews/extensions/smime/src/Makefile.in
+++ b/mailnews/extensions/smime/src/Makefile.in
@@ -44,26 +44,16 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= msgsmime
 LIBRARY_NAME	= msgsmime_s
 META_COMPONENT = mail
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
-REQUIRES	= xpcom \
-		  string \
-		  msgbase \
-		  mime \
-		  mimetype \
-		  pipnss \
-		  msgcompose \
-		  necko \
-		  intl \
-		  $(NULL)
 
 CPPSRCS		= \
                 nsMsgComposeSecure.cpp \
                 nsSMimeJSHelper.cpp \
                 nsEncryptedSMIMEURIsService.cpp \
 		$(NULL)
 
 EXTRA_COMPONENTS = smime-service.js
--- a/mailnews/imap/build/Makefile.in
+++ b/mailnews/imap/build/Makefile.in
@@ -48,32 +48,16 @@ LIBRARY_NAME	= msgimap
 META_COMPONENT = mail
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= IMAP_factory
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
-REQUIRES	= xpcom \
-		  string \
-		  msgbase \
-		  msgbaseutil \
-		  rdf \
-		  rdfutil \
-		  necko \
-		  msgdb \
-		  txmgr \
-		  mime \
-		  pref \
-		  intl \
-		  msglocal \
-		  nkcache \
-      uriloader \
-		  $(NULL)
 
 EXTRA_DSO_LIBS	= msgbaseutil
 
 CPPSRCS		= nsImapFactory.cpp
 
 SHARED_LIBRARY_LIBS = \
 		../src/$(LIB_PREFIX)msgimap_s.$(LIB_SUFFIX) \
 		$(NULL)
--- a/mailnews/imap/src/Makefile.in
+++ b/mailnews/imap/src/Makefile.in
@@ -44,46 +44,16 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= msgimap
 LIBRARY_NAME	= msgimap_s
 META_COMPONENT = mail
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
-REQUIRES	= xpcom \
-		  string \
-		  rdf \
-		  msgbase \
-		  msgbaseutil \
-		  rdfutil \
-		  necko \
-		  widget \
-		  appshell \
-		  msgdb \
-		  dom \
-		  uconv \
-		  unicharutil \
-		  mime \
-		  caps \
-		  pref \
-		  intl \
-		  nkcache \
-		  txmgr \
-		  docshell \
-                  msgcompose \
-		  msglocal \
-		  msgnews \
-		  mimetype \
-      uriloader \
-		  windowwatcher \
-		  embed_base \
-                  exthandler \
-                  $(ZLIB_REQUIRES) \
-		  $(NULL)
 
 EXPORTS = \
 		nsImapCore.h \
 		$(NULL)
 
 CPPSRCS		= \
 		nsImapUtils.cpp \
 		nsIMAPBodyShell.cpp \
--- a/mailnews/imap/test/Makefile.in
+++ b/mailnews/imap/test/Makefile.in
@@ -46,25 +46,16 @@ include $(DEPTH)/config/autoconf.mk
 
 # Module name for xpcshell tests.
 MODULE         = test_imap
 
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
-REQUIRES = 	\
-		xpcom \
-		xpcom_ds \
-		necko \
-		nkcache \
-		string \
-		msgbase \
-		msgimap \
-		$(NULL)
 
 CPP_UNIT_TESTS = \
 		TestImapHdrXferInfo.cpp \
 		TestImapFlagAndUidState.cpp \
 		$(NULL)
 
 include $(topsrcdir)/config/config.mk
 
--- a/mailnews/import/applemail/src/Makefile.in
+++ b/mailnews/import/applemail/src/Makefile.in
@@ -44,27 +44,16 @@ include $(DEPTH)/config/autoconf.mk
 MODULE				= impapplemail
 LIBRARY_NAME	= applmail_s
 
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
 META_COMPONENT = mail
-REQUIRES	= \
-		xpcom \
-		string \
-		intl \
-		import \
-		necko \
-		msgbase \
-		msgbaseutil \
-		unicharutil \
-		libreg \
-		$(NULL)
 
 CPPSRCS = \
 		nsAppleMailImport.cpp \
 		$(NULL)
 
 CMMSRCS = \
 		nsEmlxHelperUtils.mm \
 		$(NULL)
--- a/mailnews/import/build/Makefile.in
+++ b/mailnews/import/build/Makefile.in
@@ -48,38 +48,16 @@ META_COMPONENT = mail
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
 MODULE_NAME	= nsImportServiceModule
 
-REQUIRES	= xpcom \
-		  string \
-		  uconv \
-		  intl \
-		  impComm4xMail \
-		  $(NULL)
-
-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-REQUIRES += impEudra impapplemail
-endif
-
-ifeq ($(OS_ARCH),WINNT)
-REQUIRES += impEudra
-
-ifndef GNU_CC
-
-REQUIRES += importOE impOutlk importWM
-
-endif
-
-endif
-
 CPPSRCS		=  nsImportModule.cpp
 
 SHARED_LIBRARY_LIBS = \
 		../src/$(LIB_PREFIX)import_s.$(LIB_SUFFIX) \
 		../text/src/$(LIB_PREFIX)imptext_s.$(LIB_SUFFIX) \
 		../comm4x/src/$(LIB_PREFIX)imp4mail_s.$(LIB_SUFFIX) \
 		$(NULL)
 
--- a/mailnews/import/comm4x/src/Makefile.in
+++ b/mailnews/import/comm4x/src/Makefile.in
@@ -45,26 +45,16 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= impComm4xMail
 LIBRARY_NAME   = imp4mail_s
 
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
 META_COMPONENT  = mail
-REQUIRES	= xpcom \
-		  string \
-		  intl \
-		  import \
-		  necko \
-		  msgbase \
-		  msgbaseutil \
-		  unicharutil \
-		  libreg \
-		  $(NULL)
 
 CPPSRCS		= 	\
 			nsComm4xMailImport.cpp			\
 			nsComm4xMail.cpp				\
 			nsComm4xProfile.cpp				\
 			$(NULL)
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
--- a/mailnews/import/eudora/src/Makefile.in
+++ b/mailnews/import/eudora/src/Makefile.in
@@ -44,35 +44,16 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= impEudra
 LIBRARY_NAME   = impEudra_s
 META_COMPONENT	= mail
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
-REQUIRES	= xpcom \
-		  string \
-		  import \
-		  intl \
-		  necko \
-		  addrbook \
-		  pref \
-		  mork \
-		  mime \
-		  msgcompose \
-		  msgbase \
-		  dom \
-		  editor \
-		  msgbaseutil \
-		  msglocal \
-		  mime \
-		  mimetype \
-		  unicharutil \
-		  $(NULL)
 
 CPPSRCS		= \
 		nsEudoraStringBundle.cpp \
 		nsEudoraImport.cpp \
 		nsEudoraMailbox.cpp \
 		nsEudoraSettings.cpp \
 		nsEudoraEditor.cpp \
 		nsEudoraCompose.cpp \
--- a/mailnews/import/oexpress/Makefile.in
+++ b/mailnews/import/oexpress/Makefile.in
@@ -44,33 +44,16 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= importOE
 LIBRARY_NAME   = importOE_s
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 META_COMPONENT	= mail
 
-REQUIRES	= xpcom \
-		  string \
-		  import \
-		  addrbook \
-		  mork \
-		  intl \
-		  msgbase \
-		  pref \
-		  necko \
-		  msgdb \
-		  msgbaseutil \
-		  msgcompose \
-		  msglocal \
-		  msgimap \
-		  msgnews \
-		  unicharutil \
-		  $(NULL)
 
 CPPSRCS		= \
 		nsOEImport.cpp			\
 		nsOEScanBoxes.cpp		\
 		nsOEMailbox.cpp			\
 		nsOEAddressIterator.cpp		\
 		WabObject.cpp			\
 		nsOERegUtil.cpp			\
--- a/mailnews/import/outlook/src/Makefile.in
+++ b/mailnews/import/outlook/src/Makefile.in
@@ -44,35 +44,16 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= impOutlk
 LIBRARY_NAME   = impOutlk_s
 META_COMPONENT	= mail
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
-REQUIRES	= xpcom \
-		  string \
-		  import \
-		  intl \
-		  necko \
-		  addrbook \
-		  mork \
-		  msgcompose \
-		  msgbase \
-		  editor \
-		  dom \
-		  uriloader \
-		  msgbaseutil \
-		  msgdb \
-		  msglocal \
-		  mimetype \
-		  unicharutil \
-		  pref \
-		  $(NULL)
 
 CPPSRCS		= \
 		nsOutlookRegUtil.cpp		\
 		nsOutlookStringBundle.cpp	\
 		nsOutlookImport.cpp		\
 		nsOutlookSettings.cpp		\
 		MapiApi.cpp			\
 		nsOutlookMail.cpp		\
--- a/mailnews/import/src/Makefile.in
+++ b/mailnews/import/src/Makefile.in
@@ -45,27 +45,16 @@ include $(DEPTH)/config/autoconf.mk
 MODULE = import
 LIBRARY_NAME = import_s
 
 META_COMPONENT = mail
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
-REQUIRES	= xpcom \
-		  string \
-		  addrbook \
-		  uconv \
-		  msgbase \
-		  msgbaseutil \
-		  intl \
-		  necko \
-		  rdf \
-		  unicharutil \
-		  $(NULL)
 
 
 
 CPPSRCS		= 	\
 			nsImportService.cpp				\
 			nsImportMail.cpp				\
 			nsImportMailboxDescriptor.cpp 	\
 			nsImportABDescriptor.cpp		\
--- a/mailnews/import/text/src/Makefile.in
+++ b/mailnews/import/text/src/Makefile.in
@@ -46,26 +46,16 @@ MODULE		= impText
 
 LIBRARY_NAME   = imptext_s
 
 META_COMPONENT = mail
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
-REQUIRES =	xpcom \
-		string \
-		import \
-		intl \
-		necko \
-		addrbook \
-		pref \
-		msgbase \
-		msgbaseutil \
-		$(NULL)
 
 CPPSRCS		= \
 		nsTextImport.cpp				\
 		nsTextAddress.cpp 				\
 		$(NULL)
 
 LOCAL_INCLUDES += -I$(srcdir)/../../src
 
--- a/mailnews/import/winlivemail/Makefile.in
+++ b/mailnews/import/winlivemail/Makefile.in
@@ -42,37 +42,16 @@ VPATH       =   @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE      =           importWM
 LIBRARY_NAME   =        importWM_s
 MOZILLA_INTERNAL_API =  1
 META_COMPONENT  =       mail
 
-REQUIRES    = \
-                        xpcom \
-                        string \
-                        content   \
-                        widget    \
-                        dom       \
-                        import \
-                        addrbook \
-                        mork \
-                        intl \
-                        msgbase \
-                        pref \
-                        necko \
-                        msgdb \
-                        msgbaseutil \
-                        msgcompose \
-                        msglocal \
-                        msgimap \
-                        msgnews \
-                        unicharutil \
-                        $(NULL)
 
 CPPSRCS     = \
                         nsWMSettings.cpp        \
                         nsWMImport.cpp  \
                         nsWMStringBundle.cpp    \
                         $(NULL)
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
--- a/mailnews/local/build/Makefile.in
+++ b/mailnews/local/build/Makefile.in
@@ -48,30 +48,16 @@ META_COMPONENT = mail
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= local_mail_services
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 LOCAL_INCLUDES += -I$(srcdir)/../src
 
-REQUIRES	= xpcom \
-		  string \
-		  msgbase \
-		  msgbaseutil \
-		  msgdb \
-		  necko \
-		  txmgr \
-		  rdf \
-		  rdfutil \
-		  mime \
-		  intl \
-		  pref \
-		  nkcache \
-		  $(NULL)
 
 EXTRA_DSO_LIBS = msgbaseutil
 
 CPPSRCS		= nsMsgLocalFactory.cpp
 
 SHARED_LIBRARY_LIBS = \
 		../src/$(LIB_PREFIX)msglocal_s.$(LIB_SUFFIX) \
 		$(NULL)
--- a/mailnews/local/src/Makefile.in
+++ b/mailnews/local/src/Makefile.in
@@ -44,38 +44,16 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= msglocal
 LIBRARY_NAME	= msglocal_s
 META_COMPONENT = mail
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
-REQUIRES	= xpcom \
-		  string \
-		  msgbase \
-		  msgbaseutil \
-		  pref \
-		  necko \
-		  msgdb \
-		  rdf \
-		  intl \
-		  unicharutil \
-		  mime \
-		  dom \
-		  rdfutil \
-		  txmgr \
-		  caps \
-		  docshell \
-		  msgimap \
-                  msgcompose \
-		  nkcache \
-		  windowwatcher \
-		  embed_base \
-		  $(NULL)
 
 CPPSRCS		= \
 		nsPop3Protocol.cpp \
 		nsPop3URL.cpp \
 		nsPop3Sink.cpp \
 		nsParseMailbox.cpp \
 		nsMailboxProtocol.cpp \
 		nsMailboxUrl.cpp \
--- a/mailnews/mapi/mapiDll/Makefile.in
+++ b/mailnews/mapi/mapiDll/Makefile.in
@@ -48,21 +48,16 @@ USE_STATIC_LIBS = 1
 
 MODULE		= mozMapi32
 LIBRARY_NAME	= $(MODULE)
 DEFFILE		= $(win_srcdir)/Mapi32.def
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
-REQUIRES	= MapiProxy \
-		  msgMapi \
-		  xpcom \
-		  string \
-		  $(NULL)
 
 CPPSRCS		= MapiDll.cpp
 
 OS_LIBS		+= ole32.lib
 
 # Force use of PIC
 FORCE_USE_PIC	= 1 
 FORCE_SHARED_LIB = 1
--- a/mailnews/mapi/mapihook/src/Makefile.in
+++ b/mailnews/mapi/mapihook/src/Makefile.in
@@ -47,40 +47,16 @@ LIBRARY_NAME	= $(MODULE)
 MODULE_NAME	= msgMapiModule
 EXPORT_LIBRARY  = 1
 IS_COMPONENT	= 1
 META_COMPONENT	= mail
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
-REQUIRES	= xpcom \
-                  string \
-		  MapiProxy \
-		  appshell \
-		  appcomps \
-		  windowwatcher \
-		  dom \
-		  profile \
-		  msgbase \
-		  pref \
-		  msgbaseutil \
-		  msgcompose \
-      mime \
-      msgimap \
-		  necko \
-		  intl \
-		  editor \
-		  msgdb \
-		  uriloader \
-		  unicharutil \
-		  embedcomponents \
-      xulapp \
-		  embed_base \
-		  $(NULL)
 
 CPPSRCS		= \
 		msgMapiFactory.cpp \
 		msgMapiHook.cpp \
 		msgMapiImp.cpp \
 		msgMapiMain.cpp \
 		msgMapiSupport.cpp \
 		Registry.cpp \
--- a/mailnews/mime/build/Makefile.in
+++ b/mailnews/mime/build/Makefile.in
@@ -48,23 +48,16 @@ META_COMPONENT = mail
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= mime_services
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 LOCAL_INCLUDES += -I$(srcdir)/../src
 
-REQUIRES	= xpcom \
-		  string \
-		  necko \
-		  msgbase \
-		  pref \
-		  uconv \
-		  $(NULL)
 
 EXTRA_DSO_LIBS = msgbaseutil
 
 CPPSRCS			= nsMimeModule.cpp
 
 SHARED_LIBRARY_LIBS = \
                 ../src/$(LIB_PREFIX)mime_s.$(LIB_SUFFIX) \
                 $(NULL)
--- a/mailnews/mime/cthandlers/calendar/Makefile.in
+++ b/mailnews/mime/cthandlers/calendar/Makefile.in
@@ -54,28 +54,16 @@ IS_COMPONENT	= 1
 MODULE_NAME	= nsCalendarModule
 
 else
 LIBRARY_NAME = calendar_s
 endif
 
 META_COMPONENT = mail
 
-REQUIRES	= xpcom \
-		  string \
-		  mime \
-		  msgbase \
-		  msgbaseutil \
-		  uconv \
-		  necko \
-		  intl \
-		  pref \
-		  msgdb \
-		  addrbook \
-		  $(NULL)
 
 ifeq ($(OS_ARCH),WINNT)
 MAPFILE		= calendar.map
 DEFFILE		= $(win_srcdir)/calendar.def
 endif
 
 LOCAL_INCLUDES = -I$(srcdir)/../glue
 
--- a/mailnews/mime/cthandlers/glue/Makefile.in
+++ b/mailnews/mime/cthandlers/glue/Makefile.in
@@ -45,23 +45,16 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= mime
 LIBRARY_NAME	= mimecthglue_s
 META_COMPONENT = mail
 EXPORT_LIBRARY = 1
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
-REQUIRES	= xpcom \
-		  string \
-		  pref \
-		  uconv \
-		  necko \
-		  msgbase \
-		  $(NULL)
 
 CPPSRCS		= \
 		mimexpcom.cpp \
 		nsMimeContentTypeHandler.cpp \
 		$(NULL)
 
 EXPORTS     = nsMimeContentTypeHandler.h
 
--- a/mailnews/mime/cthandlers/smimestub/Makefile.in
+++ b/mailnews/mime/cthandlers/smimestub/Makefile.in
@@ -47,25 +47,16 @@ LIBRARY_NAME	= smimestb
 META_COMPONENT = mail
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsSMIMEModule
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
-REQUIRES	= xpcom \
-		  string \
-		  mime \
-		  msgbase \
-		  pref \
-		  necko \
-		  uconv \
-		  intl \
-		  $(NULL)
 
 ifeq ($(OS_ARCH),WINNT)
 MAPFILE		= smimestb.map
 DEFFILE		= $(win_srcdir)/smime.def
 endif
 
 EXTRA_DSO_LIBS	= mimecthglue_s
 
--- a/mailnews/mime/cthandlers/vcard/Makefile.in
+++ b/mailnews/mime/cthandlers/vcard/Makefile.in
@@ -54,27 +54,16 @@ IS_COMPONENT	= 1
 MODULE_NAME	= nsVCardModule
 
 else
 LIBRARY_NAME = vcard_s
 endif
 
 META_COMPONENT = mail
 
-REQUIRES	= xpcom \
-		  string \
-		  mime \
-		  msgbase \
-		  msgbaseutil \
-		  uconv \
-		  necko \
-		  intl \
-		  pref \
-		  addrbook \
-		  $(NULL)
 
 ifeq ($(OS_ARCH),WINNT)
 MAPFILE		= vcard.map
 DEFFILE		= $(win_srcdir)/vcard.def
 endif
 
 LOCAL_INCLUDES = -I$(srcdir)/../glue
 
--- a/mailnews/mime/emitters/build/Makefile.in
+++ b/mailnews/mime/emitters/build/Makefile.in
@@ -49,24 +49,16 @@ EXPORT_LIBRARY = 1
 SHORT_LIBNAME	= mimeemit
 IS_COMPONENT	= 1
 MODULE_NAME	= nsMimeEmitterModule
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 LOCAL_INCLUDES += -I$(srcdir)/../src
 
-REQUIRES	= xpcom \
-		  string \
-		  mime \
-		  necko \
-		  intl \
-		  locale \
-		  msgbase \
-		  $(NULL)
 
 EXTRA_DSO_LIBS = msgbaseutil
 
 CPPSRCS		= nsEmitterFactory.cpp
 
 SHARED_LIBRARY_LIBS = \
 		../src/$(LIB_PREFIX)emitterutil_s.$(LIB_SUFFIX) \
 		$(NULL)
--- a/mailnews/mime/emitters/src/Makefile.in
+++ b/mailnews/mime/emitters/src/Makefile.in
@@ -44,29 +44,16 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= mimeemitter
 LIBRARY_NAME	= emitterutil_s
 META_COMPONENT = mail
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
-REQUIRES	= xpcom \
-		  string \
-		  mime \
-		  msgbase \
-		  msgbaseutil \
-		  pref \
-		  necko \
-		  intl \
-		  locale \
-		  mimetype \
-		  msgnews \
-		  unicharutil \
-		  $(NULL)
 
 EXPORTS		= \
 		nsMimeEmitterCID.h \
 		$(NULL)
 
 CPPSRCS		= \
 		nsMimeBaseEmitter.cpp \
 		nsEmitterUtils.cpp \
--- a/mailnews/mime/src/Makefile.in
+++ b/mailnews/mime/src/Makefile.in
@@ -52,48 +52,16 @@ endif
 
 MODULE		= mime
 LIBRARY_NAME	= mime_s
 META_COMPONENT = mail
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
-REQUIRES	= xpcom \
-		  string \
-		  msgbase \
-		  msgbaseutil \
-		  pref \
-		  js \
-		  necko \
-		  uconv \
-		  unicharutil \
-		  msgcompose \
-		  dom \
-		  intl \
-		  msgimap \
-		  exthandler \
-		  chardet \
-		  caps \
-		  mimetype \
-		  xpconnect \
-		  nkcache \
-		  pipnss \
-		  imglib2 \
-		  content \
-		  htmlparser \
-		  layout \
-		  $(NULL)
-#content, htmlparser and layout are for HTML*() in mimemoz2.cpp.
-
-ifdef BUILD_SMIME
-REQUIRES += \
-            msgsmime
-endif
-
 CPPSRCS		= \
 		nsMimeObjectClassAccess.cpp \
 		nsMimeConverter.cpp \
 		nsSimpleMimeConverterStub.cpp \
 		mimecont.cpp \
 		mimeebod.cpp \
 		mimeenc.cpp \
 		mimeeobj.cpp \
--- a/mailnews/news/build/Makefile.in
+++ b/mailnews/news/build/Makefile.in
@@ -47,34 +47,16 @@ LIBRARY_NAME	= msgnews
 META_COMPONENT = mail
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsMsgNewsModule
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
-REQUIRES	= xpcom \
-		  string \
-		  msgbase \
-		  msgbaseutil \
-		  msgdb \
-		  appcomps \
-		  toolkitcomps \
-		  mime \
-		  necko \
-		  rdf \
-		  rdfutil \
-		  pref \
-		  uriloader \
-		  nkcache \
-		  layout \
-		  dom \
-		  intl \
-		  $(NULL)
 
 CPPSRCS		= nsMsgNewsFactory.cpp
 
 LOCAL_INCLUDES += -I$(srcdir)/../src
 
 SHARED_LIBRARY_LIBS = ../src/$(LIB_PREFIX)msgnews_s.$(LIB_SUFFIX)
 
 EXTRA_DSO_LIBS += msgbaseutil
--- a/mailnews/news/src/Makefile.in
+++ b/mailnews/news/src/Makefile.in
@@ -44,41 +44,16 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= msgnews
 LIBRARY_NAME	= msgnews_s
 META_COMPONENT = mail
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
-REQUIRES	= xpcom \
-		  string \
-		  msgbase \
-		  msgbaseutil \
-		  necko \
-		  msgdb \
-		  locale \
-		  mork \
-		  dom \
-		  rdf \
-		  docshell \
-		  layout \
-		  pref \
-		  uriloader \
-		  appshell \
-		  toolkitcomps \
-		  mime \
-		  intl \
-		  rdfutil \
-		  nkcache \
-		  windowwatcher \
-		  unicharutil \
-		  embed_base \
-		  loginmgr \
-		  $(NULL)
 
 CPPSRCS		= \
 		nsNNTPArticleList.cpp \
 		nsNNTPNewsgroupList.cpp \
 		nsNNTPNewsgroupPost.cpp \
 		nsNNTPProtocol.cpp \
 		nsNntpUrl.cpp \
 		nsNntpService.cpp \
--- a/suite/app/Makefile.in
+++ b/suite/app/Makefile.in
@@ -66,20 +66,16 @@ DEFINES += -DMOZ_SOURCE_REPO="$(SOURCE_R
 endif
 
 ifneq (,$(filter OS2 WINCE WINNT,$(OS_ARCH)))
 PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX)
 else
 PROGRAM = $(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
 endif
 
-REQUIRES = \
-	xpcom \
-	string \
-	$(NULL)
 
 CPPSRCS = nsSuiteApp.cpp
 
 DIST_FILES = application.ini
 
 LOCAL_INCLUDES += -I$(MOZILLA_SRCDIR)/toolkit/xre
 
 ifdef BUILD_STATIC_LIBS
@@ -164,17 +160,16 @@ endif
 include $(topsrcdir)/config/static-config.mk
 
 EXTRA_DEPS	+= \
 	$(STATIC_EXTRA_DEPS) \
 	$(NULL)
 DEFINES		+= $(STATIC_DEFINES)
 CPPSRCS		+= $(STATIC_CPPSRCS)
 EXTRA_DSO_LIBS	+= $(STATIC_EXTRA_DSO_LIBS)
-REQUIRES	+= $(STATIC_REQUIRES)
 EXTRA_LIBS	+= \
 	$(STATIC_EXTRA_LIBS) \
 	$(MOZ_HARFBUZZ_LIBS) \
 	$(NULL)
 endif
 
 # OpenGL is required by (mozilla/)content/canvas: see (mozilla/)layout/build/Makefile.in.
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
--- a/suite/browser/src/Makefile.in
+++ b/suite/browser/src/Makefile.in
@@ -41,41 +41,24 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= suitebrowser
 LIBRARY_NAME	= suitebrowser_s
 META_COMPONENT  = suite
 
-REQUIRES = \
-	chardet \
-	docshell \
-	dom \
-	widget \
-	intl \
-	locale \
-	necko \
-	nkcache \
-	pref \
-	rdf \
-	string \
-	uconv \
-	txmgr \
-	xpcom \
-	$(NULL)
 
 CPPSRCS = \
 	nsBookmarksService.cpp \
 	nsInternetSearchService.cpp \
 	nsLocalSearchService.cpp \
 	$(NULL)
 
 ifeq ($(OS_ARCH),WINNT)
 CPPSRCS += nsUrlWidget.cpp
-REQUIRES += content gfx
 endif
 
 FORCE_STATIC_LIB = 1
 FORCE_USE_PIC=1
 
 include $(topsrcdir)/config/rules.mk
 
--- a/suite/build/Makefile.in
+++ b/suite/build/Makefile.in
@@ -43,30 +43,16 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		 = suite
 LIBRARY_NAME	 = suite
 FORCE_SHARED_LIB = 1
 IS_COMPONENT	 = 1
 MODULE_NAME	 = nsSuiteModule
 
-REQUIRES	= \
-		chardet \
-		intl \
-		necko \
-		nkcache \
-		rdf \
-		shellservice \
-		string \
-		suitebrowser \
-		suitemigration \
-		txmgr \
-		xpcom \
-		xulapp \
-		$(NULL)
 
 CPPSRCS 	= \
 		nsSuiteModule.cpp \
 		$(NULL)
 
 ifdef MOZ_ENABLE_LIBXUL
 CPPSRCS		+= \
 		nsSupportsArray.cpp \
--- a/suite/feeds/src/Makefile.in
+++ b/suite/feeds/src/Makefile.in
@@ -54,15 +54,14 @@ DEFINES += \
 
 EXTRA_PP_COMPONENTS = \
 	FeedConverter.js \
 	FeedWriter.js \
 	WebContentConverter.js \
 	nsAboutFeeds.js \
 	$(NULL)
 
-REQUIRES = xpcom string necko caps js xpconnect mimetype
 
 CPPSRCS = \
 	nsFeedSniffer.cpp \
 	$(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/suite/profile/Makefile.in
+++ b/suite/profile/Makefile.in
@@ -42,21 +42,16 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 PARALLEL_DIRS	= migration/public migration/src
 
 MODULE		= suiteprofile
 LIBRARY_NAME	= suiteprofile_s
 
-REQUIRES	= \
-		xpcom \
-		string \
-		xulapp \
-		$(NULL)
 
 CPPSRCS 	= \
 		nsSuiteDirectoryProvider.cpp \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = $(MOZ_COMPONENT_LIBS)
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
--- a/suite/profile/migration/src/Makefile.in
+++ b/suite/profile/migration/src/Makefile.in
@@ -40,30 +40,16 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= suitemigration
 LIBRARY_NAME	= suitemigration_s
 META_COMPONENT  = suite
 
-REQUIRES	= \
-		xpcom \
-		string \
-		intl \
-		necko \
-		dom \
-		libreg \
-		pref \
-		rdf \
-		windowwatcher \
-		suitebrowser \
-		xulapp \
-		loginmgr \
-		$(NULL)
 
 CPPSRCS = \
 		nsProfileMigrator.cpp \
 		nsSuiteProfileMigratorUtils.cpp \
 		nsNetscapeProfileMigratorBase.cpp \
 		nsSeamonkeyProfileMigrator.cpp \
 		nsThunderbirdProfileMigrator.cpp \
 		$(NULL)
--- a/suite/shell/src/Makefile.in
+++ b/suite/shell/src/Makefile.in
@@ -3,47 +3,28 @@ topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = shellservice
 FORCE_STATIC_LIB=1
 
-REQUIRES = \
-	xpcom \
-	string \
-	uriloader \
-	dom \
-	intl \
-	necko \
-	content \
-	imglib2 \
-	gfx \
-	widget \
-	pref \
-	msgMapi \
-	layout \
-	$(NULL)
 
 ifeq ($(OS_ARCH),WINNT)
 CPPSRCS = nsWindowsShellService.cpp
 OS_LIBS         += $(call EXPAND_LIBNAME,ole32 version uuid shell32)
 
 EXTRA_COMPONENTS = nsSetDefault.js
 else
 ifeq ($(MOZ_WIDGET_TOOLKIT), cocoa)
 CPPSRCS = nsMacShellService.cpp
 else
 ifeq ($(MOZ_WIDGET_TOOLKIT), gtk2)
 CPPSRCS = nsGNOMEShellService.cpp
-REQUIRES	+= \
-		mozgnome \
-		thebes \
-		$(NULL)
 endif
 endif
 endif
 
 # We need to link the windows shell service into seamonkey.exe.
 # DEFINES needs to be set before config.mk is included,
 # because app-config.mk is loaded after config.mk reads DEFINES.
 ifdef BUILD_STATIC_LIBS