Bug 73353: Clean up our MODULE/REQUIRES story. rs=dbaron, a=brendan

2008-02-18 00:50:04 -08:00 · 2008-02-18 00:50:04 -08:00 · 60e16aa5b6
--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
@ -92,7 +92,6 @@ endif
 REQUIRES = \
 	xpcom \
 	string \
-	xulapp \
 	$(NULL)

 CPPSRCS = nsBrowserApp.cpp
--- a/browser/components/build/Makefile.in
+++ b/browser/components/build/Makefile.in
@ -17,18 +17,12 @@ FORCE_SHARED_LIB = 1
 USE_STATIC_LIBS = 1

 REQUIRES = \
-	docshell \
 	xpcom \
 	string \
-	pref \
 	rdf \
 	uriloader \
-	webbrowserpersist \
 	intl \
 	necko \
-	nkcache \
-	txmgr \
-	chardet \
 	migration \
 	shellservice \
 	xulapp \
--- a/browser/components/migration/src/Makefile.in
+++ b/browser/components/migration/src/Makefile.in
@ -51,7 +51,6 @@ REQUIRES	= \
 		  xpcom \
 		  string \
 		  necko \
-		  history \
 		  libreg \
 		  browsercomps \
 		  toolkitcomps \
--- a/browser/components/places/src/Makefile.in
+++ b/browser/components/places/src/Makefile.in
@ -53,7 +53,6 @@ USE_STATIC_LIBS = 1
 REQUIRES	= \
 		  xpcom \
 		  string \
-		  docshell \
 		  necko \
 		  browsercomps \
 		  toolkitcomps \
--- a/browser/components/safebrowsing/src/Makefile.in
+++ b/browser/components/safebrowsing/src/Makefile.in
@ -49,7 +49,6 @@ USE_STATIC_LIBS = 1

 REQUIRES = \
 						necko \
-						safebrowsing \
 						string \
 						uriloader \
 						xpcom
--- a/browser/components/shell/src/Makefile.in
+++ b/browser/components/shell/src/Makefile.in
@ -54,13 +54,10 @@ REQUIRES	= \
 		  webbrowserpersist \
 		  dom \
 		  intl \
-		  unicharutil \
 		  necko \
 		  content \
 		  imglib2 \
-		  browsercomps \
 		  gfx \
-		  thebes \
 		  widget \
 		  pref \
 		  layout \
@ -68,13 +65,19 @@ REQUIRES	= \

 ifeq ($(OS_ARCH),WINNT)
 CPPSRCS = nsWindowsShellService.cpp
+REQUIRES	+= \
+		browsercomps \
+		$(NULL)
 else
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 CPPSRCS = nsMacShellService.cpp
 else
 ifeq ($(MOZ_WIDGET_TOOLKIT), gtk2)
 CPPSRCS = nsGNOMEShellService.cpp
-REQUIRES += mozgnome
+REQUIRES	+= \
+		mozgnome \
+		thebes \
+		$(NULL)
 endif
 endif
 endif
--- a/content/base/src/Makefile.in
+++ b/content/base/src/Makefile.in
@ -59,7 +59,6 @@ REQUIRES	= xpcom \
 		  js \
 		  webshell \
 		  necko \
-		  nkcache \
 		  mimetype \
 		  exthandler \
 		  chardet \
@ -82,9 +81,12 @@ REQUIRES	= xpcom \
 		  util \
 		  appshell \
 		  shistory \
-		  accessibility \
 		  $(NULL)

+ifdef ACCESSIBILITY
+REQUIRES	+= accessibility
+endif
+
 EXPORTS		= \
 		nsAtomListUtils.h \
 		nsAttrName.h \
--- a/content/canvas/src/Makefile.in
+++ b/content/canvas/src/Makefile.in
@ -57,24 +57,13 @@ REQUIRES	= \
 		locale \
 		unicharutil \
 		webshell \
-		uriloader \
-		htmlparser \
 		necko \
-		view \
 		pref \
 		docshell \
 		xpconnect \
-		xuldoc \
 		caps \
-		editor \
 		imglib2 \
-		mimetype \
-		exthandler \
-		uconv \
-		intl \
-		plugin \
 		cairo \
-		libpixman \
 		thebes \
 		$(NULL)

--- a/content/html/document/src/Makefile.in
+++ b/content/html/document/src/Makefile.in
@ -65,11 +65,8 @@ REQUIRES	= xpcom \
 		  util \
 		  uconv \
 		  pref \
-		  uriloader \
-		  rdf \
 		  chardet \
 		  nkcache \
-		  lwbrk \
 		  imglib2 \
 		  xpconnect \
 		  unicharutil \
--- a/content/mathml/content/src/Makefile.in
+++ b/content/mathml/content/src/Makefile.in
@ -49,7 +49,6 @@ LIBXUL_LIBRARY	= 1
 REQUIRES	= xpcom       \
 		  string      \
 		  layout      \
-		  content     \
 		  widget      \
 		  gfx         \
 		  dom         \
@ -57,8 +56,6 @@ REQUIRES	= xpcom       \
 		  locale      \
 		  pref        \
 		  webshell    \
-		  unicharutil \
-		  docshell    \
 		  thebes      \
 		  $(NULL)

--- a/content/svg/content/src/Makefile.in
+++ b/content/svg/content/src/Makefile.in
@ -49,14 +49,11 @@ LIBXUL_LIBRARY	= 1
 REQUIRES	= xpcom \
 		  string \
 		  layout \
-		  content \
 		  widget \
 		  gfx \
 		  dom \
 		  js \
 		  locale \
-		  htmlparser \
-		  view \
 		  pref \
 		  necko \
 		  xpconnect \
--- a/content/svg/document/src/Makefile.in
+++ b/content/svg/document/src/Makefile.in
@ -45,7 +45,7 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= content
 LIBRARY_NAME	= gkconsvgdoc_s
 LIBXUL_LIBRARY	= 1
-REQUIRES	= content \
+REQUIRES	= \
 		  layout \
 		  widget \
 		  xpcom \
@ -55,14 +55,11 @@ REQUIRES	= content \
 		  dom \
 		  webshell \
 		  htmlparser \
-		  lwbrk \
 		  necko \
 		  pref \
 		  js \
 		  caps \
 		  locale \
-		  view \
-		  xpconnect \
 		  $(NULL)

 CPPSRCS		= \
--- a/content/xbl/src/Makefile.in
+++ b/content/xbl/src/Makefile.in
@ -62,7 +62,6 @@ REQUIRES	= xpcom \
 		  pref \
 		  docshell \
 		  webshell \
-		  lwbrk \
 		  xuldoc \
 		  rdf \
 		  imglib2 \
--- a/content/xml/content/src/Makefile.in
+++ b/content/xml/content/src/Makefile.in
@ -55,11 +55,8 @@ REQUIRES	= xpcom \
 		  layout \
 		  widget \
 		  necko \
-		  caps \
 		  webshell \
 		  docshell \
-		  htmlparser \
-		  xpconnect \
 		  unicharutil \
 		  pref \
 		  locale \
--- a/content/xml/document/src/Makefile.in
+++ b/content/xml/document/src/Makefile.in
@ -57,15 +57,12 @@ REQUIRES	= xpcom \
 		  caps \
 		  htmlparser \
 		  necko \
-		  view \
 		  imglib2 \
 		  docshell \
 		  webshell \
-		  uriloader \
 		  pref \
 		  xpconnect \
 		  uconv \
-		  lwbrk \
 		  exthandler \
 		  mimetype \
 		  unicharutil \
--- a/content/xul/content/src/Makefile.in
+++ b/content/xul/content/src/Makefile.in
@ -64,12 +64,10 @@ REQUIRES	= xpcom \
 		  xpconnect \
 		  pref \
 		  locale \
-		  lwbrk \
 		  xuldoc \
 		  xultmpl \
 		  webshell \
 		  view \
-		  docshell \
 		  htmlparser \
 		  $(NULL)

--- a/content/xul/document/src/Makefile.in
+++ b/content/xul/document/src/Makefile.in
@ -63,9 +63,7 @@ REQUIRES	= xpcom \
 		  locale \
 		  view \
 		  necko \
-		  uriloader \
 		  htmlparser \
-		  lwbrk \
 		  docshell \
 		  pref \
 		  xultmpl \
--- a/docshell/base/Makefile.in
+++ b/docshell/base/Makefile.in
@ -84,7 +84,6 @@ REQUIRES	= xpcom \
 		  editor \
 		  windowwatcher \
 		  imglib2 \
-		  mimetype \
 		  jar \
 		  $(NULL)

--- a/docshell/build/Makefile.in
+++ b/docshell/build/Makefile.in
@ -57,7 +57,6 @@ PACKAGE_FILE = docshell.pkg
 REQUIRES	= xpcom \
 		  string \
 		  dom \
-		  js \
 		  shistory \
 		  necko \
 		  nkcache \
@ -68,7 +67,6 @@ REQUIRES	= xpcom \
 		  webshell \
 		  widget \
 		  pref \
-		  view \
 		  intl \
 		  htmlparser \
 		  chardet \
@ -79,7 +77,6 @@ REQUIRES	= xpcom \
 		  uriloader \
 		  exthandler \
 		  mimetype \
-		  rdf \
 		  prefetch \
 		  imglib2 \
 		  $(NULL)
--- a/dom/src/base/Makefile.in
+++ b/dom/src/base/Makefile.in
@ -66,7 +66,6 @@ REQUIRES	= xpcom \
 		  mimetype \
 		  java \
 		  locale \
-		  uriloader \
 		  prefetch \
 		  xuldoc \
 		  webshell \
--- a/dom/src/json/Makefile.in
+++ b/dom/src/json/Makefile.in
@ -49,14 +49,11 @@ LIBXUL_LIBRARY = 1
 REQUIRES       = xpcom         \
                 string        \
                 content       \
-                 caps          \
                 js            \
-                 locale        \
                 layout        \
                 necko         \
                 pref          \
                 uconv         \
-                 unicharutil   \
                 widget        \
                 xpconnect     \
                 $(NULL)
--- a/editor/composer/src/Makefile.in
+++ b/editor/composer/src/Makefile.in
@ -55,7 +55,6 @@ REQUIRES	= xpcom \
 		  string \
 		  unicharutil \
 		  dom \
-		  js \
 		  layout \
 		  content \
 		  uriloader \
--- a/editor/libeditor/text/Makefile.in
+++ b/editor/libeditor/text/Makefile.in
@ -54,7 +54,6 @@ REQUIRES	= xpcom \
 		  content \
 		  txmgr \
 		  txtsvc \
-		  htmlparser \
 		  necko \
 		  pref \
 		  lwbrk \
--- a/editor/txtsvc/src/Makefile.in
+++ b/editor/txtsvc/src/Makefile.in
@ -52,7 +52,6 @@ REQUIRES	= xpcom \
 		  string \
 		  editor \
 		  gfx \
-		  thebes \
 		  layout \
 		  content \
 		  dom \
--- a/embedding/browser/build/Makefile.in
+++ b/embedding/browser/build/Makefile.in
@ -59,7 +59,6 @@ REQUIRES	= xpcom \
 		  dom \
 		  widget \
 		  gfx \
-		  layout \
 		  content \
 		  necko \
 		  uriloader \
--- a/embedding/components/commandhandler/src/Makefile.in
+++ b/embedding/components/commandhandler/src/Makefile.in
@ -48,12 +48,10 @@ REQUIRES	= string \
 		  dom \
 		  content \
 		  widget \
-		  necko \
 		  xuldoc \
 		  caps \
 		  xpconnect \
 		  js \
-		  layout \
 		  $(NULL)

 LIBRARY_NAME	= commandhandler_s
--- a/extensions/cookie/Makefile.in
+++ b/extensions/cookie/Makefile.in
@ -56,8 +56,6 @@ REQUIRES	= xpcom \
 		  string \
 		  necko \
 		  dom \
-		  widget \
-		  content \
 		  pref \
 		  windowwatcher \
 		  docshell \
--- a/extensions/layout-debug/src/Makefile.in
+++ b/extensions/layout-debug/src/Makefile.in
@ -63,11 +63,13 @@ REQUIRES	= xpcom \
 		  locale \
 		  view \
 		  pref \
-		  appshell \
-		  appcomps \
 		  toolkitcomps \
 		  $(NULL)

+ifndef MOZ_XUL_APP
+REQUIRES	+= appcomps
+endif
+
 XPIDLSRCS	= \
 		nsILayoutRegressionTester.idl \
 		nsILayoutDebuggingTools.idl \
--- a/gfx/src/Makefile.in
+++ b/gfx/src/Makefile.in
@ -51,13 +51,10 @@ LIBXUL_LIBRARY = 1
 PACKAGE_FILE = gfx.pkg

 REQUIRES	= xpcom \
-		  windowwatcher \
-		  dom \
 		  string \
 		  widget \
 		  locale \
 		  view \
-		  pref \
 		  unicharutil \
 		  thebes \
 		  $(NULL)
--- a/gfx/src/shared/Makefile.in
+++ b/gfx/src/shared/Makefile.in
@ -53,11 +53,6 @@ REQUIRES= \
 		  string \
 		  imglib2 \
 		  widget \
-		  content \
-		  layout \
-		  necko \
-		  dom \
-		  locale \
 		  thebes \
 		  $(NULL)

--- a/gfx/src/thebes/Makefile.in
+++ b/gfx/src/thebes/Makefile.in
@ -55,25 +55,12 @@ LIBXUL_LIBRARY = 1

 REQUIRES =  xpcom \
            string \
-            cairo \
-            libpixman \
-            glitz \
            thebes \
-            gfx \
            widget \
-            intl \
            view \
            pref \
-            uconv \
            unicharutil \
-            locale \
-            necko \
-            content \
-            layout \
-            dom \
-            debug \
            imglib2 \
-            widget \
            $(ZLIB_REQUIRES) \
            $(NULL)

@ -103,7 +90,10 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 CPPSRCS		+= nsSystemFontsWin.cpp \
 		   $(NULL)

-REQUIRES        += glitzwgl
+REQUIRES	+= \
+		glitzwgl \
+		cairo \
+		$(NULL)

 _OS_LIBS	= usp10
 OS_LIBS		+= $(call EXPAND_LIBNAME,$(_OS_LIBS))
--- a/gfx/thebes/src/Makefile.in
+++ b/gfx/thebes/src/Makefile.in
@ -13,7 +13,6 @@ EXPORT_LIBRARY	= 1

 REQUIRES = \
 	cairo \
-	libpixman \
 	string \
 	pref \
 	xpcom \
--- a/intl/build/Makefile.in
+++ b/intl/build/Makefile.in
@ -59,7 +59,6 @@ REQUIRES	= xpcom \
 		  lwbrk \
 		  intl \
 		  locale \
-		  necko \
 		  $(NULL)

 CPPSRCS		= \
--- a/intl/locale/src/Makefile.in
+++ b/intl/locale/src/Makefile.in
@ -47,7 +47,6 @@ LIBRARY_NAME	= nslocale_s
 LIBXUL_LIBRARY  = 1

 REQUIRES	= xpcom \
-		  gfx \
 		  string \
 		  uconv \
 		  unicharutil \
--- a/intl/unicharutil/util/Makefile.in
+++ b/intl/unicharutil/util/Makefile.in
@ -57,7 +57,6 @@ SDK_LIBRARY = $(LIBRARY)

 REQUIRES=xpcom \
 		string \
-		uconv \
 		$(NULL)

 SDK_HEADERS = \
--- a/layout/base/Makefile.in
+++ b/layout/base/Makefile.in
@ -56,7 +56,6 @@ REQUIRES	= xpcom \
 		  string \
 		  dom \
 		  content \
-		  xul \
 		  xuldoc \
 		  gfx \
 		  widget \
@ -76,13 +75,14 @@ REQUIRES	= xpcom \
 		  htmlparser \
 		  util \
 		  windowwatcher \
-		  accessibility \
 		  shistory \
 		  caps \
 		  thebes \
-		  cairo \
 		  $(NULL)

+ifdef ACCESSIBILITY
+REQUIRES	+= accessibility
+endif

 XPIDLSRCS	= \
 		nsIStyleSheetService.idl	\
--- a/layout/build/Makefile.in
+++ b/layout/build/Makefile.in
@ -83,14 +83,12 @@ REQUIRES	= xpcom \
 		  htmlparser \
 		  js \
 		  xpconnect \
-		  uriloader \
 		  caps \
 		  rdf \
 		  xuldoc \
 		  imglib2 \
 		  pref \
 		  unicharutil \
-		  xul \
 		  xultmpl \
 		  lwbrk \
 		  plugin \
--- a/layout/forms/Makefile.in
+++ b/layout/forms/Makefile.in
@ -64,13 +64,10 @@ REQUIRES	= xpcom \
 		  necko \
 		  webshell \
 		  editor \
-		  txtsvc \
-		  intl \
 		  uconv \
 		  txmgr \
 		  xuldoc \
 		  imglib2 \
-		  accessibility \
 		  unicharutil \
 		  commandhandler \
 		  xpconnect \
@ -79,6 +76,10 @@ REQUIRES	= xpcom \
 		  docshell \
 		  $(NULL)

+ifdef ACCESSIBILITY
+REQUIRES	+= accessibility
+endif
+
 EXPORTS		= \
 		nsIListControlFrame.h \
 		nsIComboboxControlFrame.h \
--- a/layout/generic/Makefile.in
+++ b/layout/generic/Makefile.in
@ -54,7 +54,6 @@ REQUIRES	= xpcom \
 		  dom \
 		  content \
 		  thebes \
-		  cairo \
 		  gfx \
 		  widget \
 		  locale \
@ -67,23 +66,22 @@ REQUIRES	= xpcom \
 		  webshell \
 		  plugin \
 		  docshell \
-		  uriloader \
-		  mimetype \
 		  webbrwsr \
 		  oji \
 		  unicharutil \
 		  lwbrk \
 		  imglib2 \
-		  accessibility \
 		  xpconnect \
 		  java \
-		  exthandler \
 		  intl \
-		  uconv \
 		  thebes \
 		  cairo \
 		  $(NULL)

+ifdef ACCESSIBILITY
+REQUIRES	+= accessibility
+endif
+
 # Sun's Complex Text Layout support
 ifdef SUNCTL
 REQUIRES	+= ctl
--- a/layout/inspector/src/Makefile.in
+++ b/layout/inspector/src/Makefile.in
@ -57,7 +57,6 @@ REQUIRES	= xpcom \
 		  locale \
 		  necko \
 		  docshell \
-		  view \
 		  webshell \
 		  $(NULL)

--- a/layout/mathml/base/src/Makefile.in
+++ b/layout/mathml/base/src/Makefile.in
@ -60,12 +60,10 @@ REQUIRES	= xpcom \
 		  view \
 		  webshell \
 		  locale \
-		  intl \
 		  unicharutil \
 		  necko \
 		  docshell \
 		  webbrwsr \
-		  windowwatcher \
 		  pref \
 		  js \
 		  $(NULL)
--- a/layout/printing/Makefile.in
+++ b/layout/printing/Makefile.in
@ -66,7 +66,6 @@ REQUIRES	= xpcom \
 		  windowwatcher \
 		  htmlparser \
 		  js \
-		  xpconnect \
 		  pref \
 		  $(NULL)

--- a/layout/style/Makefile.in
+++ b/layout/style/Makefile.in
@ -65,8 +65,6 @@ REQUIRES	= xpcom \
 		  necko \
 		  mimetype \
 		  webshell \
-		  docshell \
-		  htmlparser \
 		  uconv \
 		  xuldoc \
 		  xpconnect \
--- a/layout/svg/base/src/Makefile.in
+++ b/layout/svg/base/src/Makefile.in
@ -59,8 +59,6 @@ REQUIRES	= xpcom \
 		  unicharutil \
 		  webshell \
 		  imglib2 \
-		  intl \
-		  windowwatcher \
 		  js \
 		  xpconnect \
 		  docshell \
--- a/layout/tables/Makefile.in
+++ b/layout/tables/Makefile.in
@ -55,15 +55,17 @@ REQUIRES	= xpcom \
 		  widget \
 		  locale \
 		  view \
-		  accessibility \
 		  necko \
 		  webshell \
 		  js \
-		  xpconnect \
 		  pref \
 		  docshell \
 		  $(NULL)

+ifdef ACCESSIBILITY
+REQUIRES	+= accessibility
+endif
+
 EXPORTS		= \
 		nsITableCellLayout.h \
 		nsITableLayout.h \
--- a/layout/xul/base/src/Makefile.in
+++ b/layout/xul/base/src/Makefile.in
@ -51,7 +51,6 @@ REQUIRES	= xpcom \
 		  dom \
 		  locale \
 		  content \
-		  xul \
 		  gfx \
 		  thebes \
 		  widget \
--- a/layout/xul/base/src/tree/src/Makefile.in
+++ b/layout/xul/base/src/tree/src/Makefile.in
@ -49,7 +49,6 @@ REQUIRES	= xpcom \
 		  string \
 		  dom \
 		  content \
-		  xul \
 		  gfx \
 		  thebes \
 		  widget \
--- a/modules/libpr0n/build/Makefile.in
+++ b/modules/libpr0n/build/Makefile.in
@ -59,8 +59,6 @@ REQUIRES	= xpcom \
 		  nkcache \
 		  gfx \
 		  caps \
-		  xpconnect \
-		  js \
 		  $(JPEG_REQUIRES) \
 		  $(PNG_REQUIRES) \
 		  $(ZLIB_REQUIRES) \
--- a/modules/libpr0n/decoders/gif/Makefile.in
+++ b/modules/libpr0n/decoders/gif/Makefile.in
@ -52,7 +52,6 @@ REQUIRES	= xpcom \
 		  string \
 		  gfx \
 		  thebes \
-		  cairo \
 		  imglib2 \
 		  $(LCMS_REQUIRES) \
 		  $(NULL)
--- a/modules/libpr0n/encoders/jpeg/Makefile.in
+++ b/modules/libpr0n/encoders/jpeg/Makefile.in
@ -49,7 +49,6 @@ LIBXUL_LIBRARY = 1
 EXTRA_DSO_LIBS	= gkgfx

 REQUIRES	= xpcom \
-		  gfx \
 		  string \
 		  imglib2 \
 		  $(JPEG_REQUIRES) \
--- a/modules/libpr0n/encoders/png/Makefile.in
+++ b/modules/libpr0n/encoders/png/Makefile.in
@ -49,7 +49,6 @@ LIBXUL_LIBRARY = 1
 EXTRA_DSO_LIBS	= gkgfx

 REQUIRES	= xpcom \
-		  gfx \
 		  string \
 		  imglib2 \
 		  $(PNG_REQUIRES) \
--- a/modules/libpr0n/src/Makefile.in
+++ b/modules/libpr0n/src/Makefile.in
@ -55,7 +55,6 @@ REQUIRES	= xpcom \
 		  nkcache \
 		  gfx \
 		  thebes \
-		  cairo \
 		  caps \
 		  xpconnect \
 		  js \
--- a/modules/libpref/src/Makefile.in
+++ b/modules/libpref/src/Makefile.in
@ -54,7 +54,6 @@ GRE_MODULE	= 1
 LIBXUL_LIBRARY = 1

 REQUIRES	= xpcom \
-		  xpcom_obsolete \
 		  string \
 		  intl \
 		  necko \
@ -66,6 +65,10 @@ REQUIRES	+= ipcd \
 		  $(NULL)
 endif

+ifndef MOZ_NO_XPCOM_OBSOLETE
+REQUIRES	+= xpcom_obsolete
+endif
+
 include $(topsrcdir)/config/config.mk

 CPPSRCS		= nsPref.cpp \
--- a/netwerk/protocol/file/src/Makefile.in
+++ b/netwerk/protocol/file/src/Makefile.in
@ -49,7 +49,6 @@ LIBXUL_LIBRARY  = 1
 REQUIRES	= xpcom \
 		  string \
 		  mimetype \
-		  pref \
 		  uconv \
 		  $(NULL)

--- a/netwerk/protocol/gopher/src/Makefile.in
+++ b/netwerk/protocol/gopher/src/Makefile.in
@ -48,10 +48,8 @@ LIBRARY_NAME	= nkgopher_s
 LIBXUL_LIBRARY  = 1

 REQUIRES	= xpcom \
-		  necko \
 		  string \
 		  mimetype \
-		  pref \
 		  intl \
 		  uconv \
 		  $(NULL)
--- a/netwerk/protocol/viewsource/src/Makefile.in
+++ b/netwerk/protocol/viewsource/src/Makefile.in
@ -49,7 +49,6 @@ LIBXUL_LIBRARY  = 1

 REQUIRES	= xpcom \
 		  string \
-		  necko \
 		  mimetype \
 		  $(NULL)

--- a/storage/build/Makefile.in
+++ b/storage/build/Makefile.in
@ -53,13 +53,11 @@ MODULE_NAME = mozStorageModule
 LIBXUL_LIBRARY = 1

 REQUIRES = \
-	storage \
 	sqlite3 \
 	xpcom \
 	string \
 	js \
 	xpconnect \
-	intl \
 	$(NULL)

 EXPORTS = mozStorageCID.h
--- a/storage/src/Makefile.in
+++ b/storage/src/Makefile.in
@ -51,8 +51,6 @@ GRE_MODULE       = 1
 LIBXUL_LIBRARY = 1

 REQUIRES = xpcom \
-           intl \
-           necko \
           string \
           sqlite3 \
           js \
--- a/storage/test/Makefile.in
+++ b/storage/test/Makefile.in
@ -56,7 +56,6 @@ REQUIRES = \
 	xpcom \
 	string \
 	storage \
-	storagecomps \
 	$(NULL)

 LIBS = \
--- a/toolkit/components/alerts/src/mac/Makefile.in
+++ b/toolkit/components/alerts/src/mac/Makefile.in
@ -50,7 +50,6 @@ REQUIRES = \
  xpcom \
  string \
  necko \
-  xulapp \
  intl \
  $(NULL)

--- a/toolkit/components/build/Makefile.in
+++ b/toolkit/components/build/Makefile.in
@ -61,21 +61,15 @@ REQUIRES = 	\
 		widget \
 		layout \
 		dom \
-		pref \
-		rdf \
 		intl \
 		docshell \
-		autocomplete \
 		appcomps \
 		downloads \
 		fastfind \
 		mimetype \
 		webbrowserpersist \
-		progressDlg \
 		necko \
-		windowwatcher \
 		uriloader \
-		xpinstall \
 		xulapp \
 		embed_base \
 		content \
@ -85,12 +79,14 @@ REQUIRES = 	\
 		locale \
 		unicharutil \
 		xuldoc \
-		alerts \
-		url-classifier \
 		feeds \
 		storage \
 		$(NULL)

+ifdef ALERTS_SERVICE
+REQUIRES	+= alerts
+endif
+
 EXPORTS = nsToolkitCompsCID.h

 CPPSRCS = nsToolkitCompsModule.cpp
@ -131,6 +127,7 @@ endif
 ifdef MOZ_URL_CLASSIFIER
 SHARED_LIBRARY_LIBS += ../url-classifier/src/$(LIB_PREFIX)urlclassifier_s.$(LIB_SUFFIX)
 EXTRA_DSO_LDOPTS += $(ZLIB_LIBS)
+REQUIRES += url-classifier
 endif

 ifdef MOZ_FEEDS
--- a/toolkit/components/downloads/src/Makefile.in
+++ b/toolkit/components/downloads/src/Makefile.in
@ -56,7 +56,6 @@ REQUIRES  = xpcom \
            mimetype \
            necko \
            pref \
-            progressDlg \
            intl \
            windowwatcher \
            webbrowserpersist \
@ -65,7 +64,6 @@ REQUIRES  = xpcom \
            embed_base \
            alerts \
            storage \
-            xulapp \
            exthandler \
            docshell \
            $(NULL)
@ -77,6 +75,7 @@ CPPSRCS   = \
 ifndef GNU_CXX
 ifeq ($(OS_ARCH),WINNT)
 CPPSRCS += nsDownloadScanner.cpp
+REQUIRES += xulapp
 endif
 endif

--- a/toolkit/components/feeds/src/Makefile.in
+++ b/toolkit/components/feeds/src/Makefile.in
@ -53,7 +53,6 @@ REQUIRES	= \
 		necko \
 		string \
 		widget \
-		js \
 		dom \
 		htmlparser \
 		content \
--- a/toolkit/components/places/src/Makefile.in
+++ b/toolkit/components/places/src/Makefile.in
@ -52,9 +52,7 @@ IS_COMPONENT = 1

 REQUIRES = xpcom \
           string \
-           history \
           docshell \
-           rdf \
           dom \
           morkreader \
           pref \
@ -67,17 +65,9 @@ REQUIRES = xpcom \
           unicharutil \
           autocomplete \
           storage \
-           uconv \
-           htmlparser \
-           content \
           txmgr \
-           caps \
-           xpconnect \
-           js \
           nkcache \
           widget \
-           url-classifier \
-           microsummaries \
           $(NULL)

 CPPSRCS = \
--- a/toolkit/components/satchel/src/Makefile.in
+++ b/toolkit/components/satchel/src/Makefile.in
@ -54,7 +54,6 @@ REQUIRES =	\
 		xpcom \
 		string \
 		autocomplete \
-		uriloader \
 		dom \
 		layout \
 		docshell \
@ -63,13 +62,9 @@ REQUIRES =	\
 		necko \
 		widget \
 		content \
-		view \
 		locale \
 		unicharutil \
-		intl \
 		pref \
-		windowwatcher \
-		toolkitcomps \
 		loginmgr \
 		$(NULL)

--- a/toolkit/crashreporter/Makefile.in
+++ b/toolkit/crashreporter/Makefile.in
@ -48,7 +48,6 @@ LIBRARY_NAME = exception_handler_s
 REQUIRES = \
 	xpcom \
 	string \
-	xulapp \
 	$(NULL)

 DIRS = \
--- a/toolkit/crashreporter/client/Makefile.in
+++ b/toolkit/crashreporter/client/Makefile.in
@ -46,7 +46,8 @@ include $(DEPTH)/config/autoconf.mk

 PROGRAM = crashreporter$(BIN_SUFFIX)
 DIST_PROGRAM = crashreporter$(BIN_SUFFIX)
-REQUIRES = sender
+REQUIRES	= \
+		$(NULL)

 LOCAL_INCLUDES = -I$(srcdir)/../google-breakpad/src

--- a/toolkit/mozapps/update/src/updater/Makefile.in
+++ b/toolkit/mozapps/update/src/updater/Makefile.in
@ -52,7 +52,10 @@ CPPSRCS = \

 PROGRAM = updater$(BIN_SUFFIX)

-REQUIRES = libmar libbz2 string
+REQUIRES	= \
+		libmar \
+		libbz2 \
+		$(NULL)

 LIBS += \
 	$(DEPTH)/modules/libmar/src/$(LIB_PREFIX)mar.$(LIB_SUFFIX) \
@ -125,4 +128,5 @@ endif
 ifeq ($(OS_ARCH),WINNT)
 # Pick up nsWindowsRestart.cpp
 LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
+REQUIRES += string
 endif
--- a/toolkit/xre/Makefile.in
+++ b/toolkit/xre/Makefile.in
@ -51,12 +51,10 @@ REQUIRES = \
 	appcomps \
 	toolkitcomps \
 	appshell \
-	appstartup \
 	chrome \
 	content \
 	docshell \
 	dom \
-	layout \
 	embed_base \
 	embedcomponents \
 	extensions \
@ -68,13 +66,11 @@ REQUIRES = \
 	profile \
 	string \
 	uriloader \
-        layout \
 	widget \
 	windowwatcher \
 	xpcom \
 	xpconnect \
 	xpinstall \
-	xremoteservice \
 	$(NULL)

 ifdef MOZ_JPROF
--- a/widget/src/cocoa/Makefile.in
+++ b/widget/src/cocoa/Makefile.in
@ -60,7 +60,6 @@ REQUIRES = xpcom \
 		  content \
 		  layout \
 		  view \
-		  xul \
 		  necko \
 		  locale \
 		  pref \
@ -68,7 +67,6 @@ REQUIRES = xpcom \
 		  exthandler \
 		  appshell \
 		  thebes \
-		  cairo \
 		  js \
 		  xpconnect \
 		  imglib2 \
--- a/widget/src/support/Makefile.in
+++ b/widget/src/support/Makefile.in
@ -46,7 +46,6 @@ MODULE		= widget
 LIBRARY_NAME	= widgetsupport_s
 LIBXUL_LIBRARY  = 1
 REQUIRES	= xpcom \
-		  string \
 		  gfx \
 		  $(NULL)

--- a/widget/src/xpwidgets/Makefile.in
+++ b/widget/src/xpwidgets/Makefile.in
@ -63,7 +63,6 @@ REQUIRES	= xpcom \
 		  windowwatcher \
 		  lcms \
 		  thebes \
-		  cairo \
 		  $(NULL)

 DEFINES		+= -D_IMPL_NS_WIDGET -DUSE_TLS_FOR_TOOLKIT
--- a/xpfe/bootstrap/appleevents/Makefile.in
+++ b/xpfe/bootstrap/appleevents/Makefile.in
@ -52,7 +52,6 @@ REQUIRES	= xpcom \
 		  gfx \
 		  widget \
 		  necko \
-		  pref \
 		  docshell \
 		  appshell \
 		  appcomps \
--- a/xpfe/browser/src/Makefile.in
+++ b/xpfe/browser/src/Makefile.in
@ -54,12 +54,9 @@ REQUIRES	= xpcom \
 		  widget \
 		  gfx \
 		  docshell \
-		  appshell \
 		  appcomps \
 		  dom \
 		  content \
-		  layout \
-		  js \
 		  uriloader \
 		  pref \
 		  webbrwsr \
--- a/xpfe/components/autocomplete/src/Makefile.in
+++ b/xpfe/components/autocomplete/src/Makefile.in
@ -53,7 +53,6 @@ IS_COMPONENT	= 1
 REQUIRES	= xpcom \
 		  string \
 		  dom \
-		  intl \
 		  $(NULL)

 CPPSRCS		= nsAutoComplete.cpp
--- a/xpfe/components/build/Makefile.in
+++ b/xpfe/components/build/Makefile.in
@ -54,28 +54,12 @@ PACKAGE_VARS += MOZ_PHOENIX

 REQUIRES	= xpcom \
 		  string \
-		  content \
 		  rdf \
 		  necko \
-		  nkcache \
-		  intl \
-		  locale \
-		  mork \
-		  widget \
-		  dom \
 		  uriloader \
-		  mimetype \
-		  embed_base \
-		  webbrowserpersist \
-		  progressDlg \
-		  pref \
 		  docshell \
 		  webshell \
-		  appshell \
 		  browser \
-		  txmgr \
-		  chardet \
-		  autocomplete \
 		  $(NULL)

 CPPSRCS		= nsModule.cpp
@ -96,7 +80,14 @@ endif

 # Suite specific includes
 ifdef MOZ_SUITE
-REQUIRES += downloadmanager
+REQUIRES	+= \
+		downloadmanager \
+		intl \
+		mork \
+		widget \
+		mimetype \
+		autocomplete \
+		$(NULL)

 SHARED_LIBRARY_LIBS += \
 	../download-manager/src/$(LIB_PREFIX)downloadmanager_s.$(LIB_SUFFIX) \
--- a/xpfe/components/directory/Makefile.in
+++ b/xpfe/components/directory/Makefile.in
@ -62,7 +62,6 @@ REQUIRES	= xpcom \
 		  webshell \
 		  uconv \
 		  pref \
-		  uriloader \
 		  windowwatcher \
 		  $(NULL)

--- a/xpfe/components/download-manager/src/Makefile.in
+++ b/xpfe/components/download-manager/src/Makefile.in
@ -54,7 +54,6 @@ REQUIRES  = xpcom \
            uriloader \
            mimetype \
            necko \
-            progressDlg \
            intl \
            windowwatcher \
            webbrowserpersist \
@ -63,7 +62,6 @@ REQUIRES  = xpcom \
            profile \
            widget \
            pref \
-            appcomps \
            embed_base \
            $(NULL)

--- a/xpfe/components/intl/Makefile.in
+++ b/xpfe/components/intl/Makefile.in
@ -52,15 +52,10 @@ IS_COMPONENT      = 1
 REQUIRES	= xpcom \
 		  string \
 		  uconv \
-		  unicharutil \
 		  locale \
-		  intl \
 		  rdf \
 		  pref \
 		  necko \
-		  dom \
-		  windowwatcher \
-		  appshell \
 		  $(NULL)

 CPPSRCS= \