--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
@@ -87,17 +87,16 @@ ifeq ($(USE_SHORT_LIBNAME), 1)
 PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX)
 else
 PROGRAM = $(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
 endif
 
 REQUIRES = \
 	xpcom \
 	string \
-	xulapp \
 	$(NULL)
 
 CPPSRCS = nsBrowserApp.cpp
 
 LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
 
 ifdef BUILD_STATIC_LIBS
 ifdef _MSC_VER

--- a/browser/components/build/Makefile.in
+++ b/browser/components/build/Makefile.in
@@ -12,28 +12,22 @@ IS_COMPONENT = 1
 MODULE_NAME = nsBrowserCompsModule
 FORCE_SHARED_LIB = 1
 
 # Because we are an application component, link against the CRT statically
 # (on Windows)
 USE_STATIC_LIBS = 1
 
 REQUIRES = \
-	docshell \
 	xpcom \
 	string \
-	pref \
 	rdf \
 	uriloader \
-	webbrowserpersist \
 	intl \
 	necko \
-	nkcache \
-	txmgr \
-	chardet \
 	migration \
 	shellservice \
 	xulapp \
 	places \
 	browserplaces \
 	microsummaries \
 	$(NULL)
 

--- a/browser/components/migration/src/Makefile.in
+++ b/browser/components/migration/src/Makefile.in
@@ -46,17 +46,16 @@ LIBRARY_NAME	= migration_s
 FORCE_STATIC_LIB = 1
 FORCE_USE_PIC = 1
 USE_STATIC_LIBS = 1
 
 REQUIRES	= \
 		  xpcom \
 		  string \
 		  necko \
-		  history \
 		  libreg \
 		  browsercomps \
 		  toolkitcomps \
 		  loginmgr \
 		  pref \
 		  rdf \
 		  satchel \
 		  intl \

--- a/browser/components/places/src/Makefile.in
+++ b/browser/components/places/src/Makefile.in
@@ -48,17 +48,16 @@ MODULE = browserplaces
 LIBRARY_NAME  = browserplaces_s
 FORCE_STATIC_LIB = 1
 FORCE_USE_PIC = 1
 USE_STATIC_LIBS = 1
 
 REQUIRES	= \
 		  xpcom \
 		  string \
-		  docshell \
 		  necko \
 		  browsercomps \
 		  toolkitcomps \
 		  unicharutil \
 		  htmlparser \
 		  content \
 		  places \
 		  microsummaries \

--- a/browser/components/safebrowsing/src/Makefile.in
+++ b/browser/components/safebrowsing/src/Makefile.in
@@ -44,16 +44,15 @@ include $(DEPTH)/config/autoconf.mk
 MODULE = safebrowsing
 LIBRARY_NAME = safebrowsing_s
 FORCE_STATIC_LIB = 1
 FORCE_USE_PIC = 1
 USE_STATIC_LIBS = 1
 
 REQUIRES = \
 						necko \
-						safebrowsing \
 						string \
 						uriloader \
 						xpcom
 
 CPPSRCS = nsDocNavStartProgressListener.cpp
 
 include $(topsrcdir)/config/rules.mk

--- a/browser/components/shell/src/Makefile.in
+++ b/browser/components/shell/src/Makefile.in
@@ -49,37 +49,40 @@ USE_STATIC_LIBS = 1
 
 REQUIRES	= \
 		  xpcom \
 		  string \
 		  uriloader \
 		  webbrowserpersist \
 		  dom \
 		  intl \
-		  unicharutil \
 		  necko \
 		  content \
 		  imglib2 \
-		  browsercomps \
 		  gfx \
-		  thebes \
 		  widget \
 		  pref \
 		  layout \
 		  $(NULL)
 
 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
 
 ifdef CPPSRCS
 LIBRARY_NAME = shellservice_s
 endif
 

--- a/content/base/src/Makefile.in
+++ b/content/base/src/Makefile.in
@@ -54,17 +54,16 @@ REQUIRES	= xpcom \
 		  layout \
 		  widget \
 		  view \
 		  locale \
 		  htmlparser \
 		  js \
 		  webshell \
 		  necko \
-		  nkcache \
 		  mimetype \
 		  exthandler \
 		  chardet \
 		  caps \
 		  lwbrk \
 		  uconv \
 		  docshell \
 		  pref \
@@ -77,19 +76,22 @@ REQUIRES	= xpcom \
 		  prefetch \
 		  xuldoc \
 		  uriloader \
 		  rdf \
 		  xultmpl \
 		  util \
 		  appshell \
 		  shistory \
-		  accessibility \
 		  $(NULL)
 
+ifdef ACCESSIBILITY
+REQUIRES	+= accessibility
+endif
+
 EXPORTS		= \
 		nsAtomListUtils.h \
 		nsAttrName.h \
 		nsContentList.h \
 		nsGkAtomList.h \
 		nsGkAtoms.h \
 		nsNodeInfoManager.h \
 		nsPropertyTable.h \

--- a/content/canvas/src/Makefile.in
+++ b/content/canvas/src/Makefile.in
@@ -52,34 +52,23 @@ REQUIRES	= \
 		gfx \
 		layout \
 		widget \
 		dom \
 		js \
 		locale \
 		unicharutil \
 		webshell \
-		uriloader \
-		htmlparser \
 		necko \
-		view \
 		pref \
 		docshell \
 		xpconnect \
-		xuldoc \
 		caps \
-		editor \
 		imglib2 \
-		mimetype \
-		exthandler \
-		uconv \
-		intl \
-		plugin \
 		cairo \
-		libpixman \
 		thebes \
 		$(NULL)
 
 # XXX some platforms can't handle building
 # an empty .a/lib.  Remove this dummy.cpp
 # whenever w have a rendering context
 # that doesn't depend on any non-default
 # libraries.

--- a/content/html/document/src/Makefile.in
+++ b/content/html/document/src/Makefile.in
@@ -60,21 +60,18 @@ REQUIRES	= xpcom \
 		  js \
 		  intl \
 		  webshell \
 		  docshell \
 		  caps \
 		  util \
 		  uconv \
 		  pref \
-		  uriloader \
-		  rdf \
 		  chardet \
 		  nkcache \
-		  lwbrk \
 		  imglib2 \
 		  xpconnect \
 		  unicharutil \
 		  commandhandler \
 		  composer \
 		  editor \
 		  plugin \
 		  txtsvc \

--- a/content/mathml/content/src/Makefile.in
+++ b/content/mathml/content/src/Makefile.in
@@ -44,26 +44,23 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= content
 LIBRARY_NAME	= gkcontentmathml_s
 LIBXUL_LIBRARY	= 1
 REQUIRES	= xpcom       \
 		  string      \
 		  layout      \
-		  content     \
 		  widget      \
 		  gfx         \
 		  dom         \
 		  js          \
 		  locale      \
 		  pref        \
 		  webshell    \
-		  unicharutil \
-		  docshell    \
 		  thebes      \
 		  $(NULL)
 
 CPPSRCS		= \
 		nsMathMLElement.cpp               \
 		nsMathMLElementFactory.cpp        \
 		$(NULL)
 

--- a/content/svg/content/src/Makefile.in
+++ b/content/svg/content/src/Makefile.in
@@ -44,24 +44,21 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= content
 LIBRARY_NAME	= gkcontentsvg_s
 LIBXUL_LIBRARY	= 1
 REQUIRES	= xpcom \
 		  string \
 		  layout \
-		  content \
 		  widget \
 		  gfx \
 		  dom \
 		  js \
 		  locale \
-		  htmlparser \
-		  view \
 		  pref \
 		  necko \
 		  xpconnect \
 		  webshell \
 		  xuldoc \
 		  unicharutil \
 		  imglib2 \
 		  docshell \

--- a/content/svg/document/src/Makefile.in
+++ b/content/svg/document/src/Makefile.in
@@ -40,34 +40,31 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= content
 LIBRARY_NAME	= gkconsvgdoc_s
 LIBXUL_LIBRARY	= 1
-REQUIRES	= content \
+REQUIRES	= \
 		  layout \
 		  widget \
 		  xpcom \
 		  string \
 		  gfx \
 		  thebes \
 		  dom \
 		  webshell \
 		  htmlparser \
-		  lwbrk \
 		  necko \
 		  pref \
 		  js \
 		  caps \
 		  locale \
-		  view \
-		  xpconnect \
 		  $(NULL)
 
 CPPSRCS		= \
 		nsSVGDocument.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/content/xbl/src/Makefile.in
+++ b/content/xbl/src/Makefile.in
@@ -57,17 +57,16 @@ REQUIRES	= xpcom \
 		  widget \
 		  caps \
 		  htmlparser \
 		  necko \
 		  xpconnect \
 		  pref \
 		  docshell \
 		  webshell \
-		  lwbrk \
 		  xuldoc \
 		  rdf \
 		  imglib2 \
 		  unicharutil \
 		  locale \
 		  util \
 		  $(NULL)
 

--- a/content/xml/content/src/Makefile.in
+++ b/content/xml/content/src/Makefile.in
@@ -50,21 +50,18 @@ REQUIRES	= xpcom \
 		  string \
 		  js \
 		  dom \
 		  gfx \
 		  thebes \
 		  layout \
 		  widget \
 		  necko \
-		  caps \
 		  webshell \
 		  docshell \
-		  htmlparser \
-		  xpconnect \
 		  unicharutil \
 		  pref \
 		  locale \
 		  $(NULL)
 
 CPPSRCS		= \
 		nsXMLElement.cpp \
 		nsXMLCDATASection.cpp \

--- a/content/xml/document/src/Makefile.in
+++ b/content/xml/document/src/Makefile.in
@@ -52,25 +52,22 @@ REQUIRES	= xpcom \
 		  dom \
 		  gfx \
 		  thebes \
 		  layout \
 		  widget \
 		  caps \
 		  htmlparser \
 		  necko \
-		  view \
 		  imglib2 \
 		  docshell \
 		  webshell \
-		  uriloader \
 		  pref \
 		  xpconnect \
 		  uconv \
-		  lwbrk \
 		  exthandler \
 		  mimetype \
 		  unicharutil \
 		  windowwatcher \
 		  locale \
 		  util \
 		  $(NULL)
 

--- a/content/xul/content/src/Makefile.in
+++ b/content/xul/content/src/Makefile.in
@@ -59,22 +59,20 @@ REQUIRES	= xpcom \
 		  necko \
 		  dom \
 		  js \
 		  caps \
 		  rdf \
 		  xpconnect \
 		  pref \
 		  locale \
-		  lwbrk \
 		  xuldoc \
 		  xultmpl \
 		  webshell \
 		  view \
-		  docshell \
 		  htmlparser \
 		  $(NULL)
 
 ifdef MOZ_XUL
 CPPSRCS		+= \
 		nsXULElement.cpp \
 		nsXULPopupListener.cpp \
 		$(NULL)

--- a/content/xul/document/src/Makefile.in
+++ b/content/xul/document/src/Makefile.in
@@ -58,19 +58,17 @@ REQUIRES	= xpcom \
 		  dom \
 		  rdf \
 		  js \
 		  xpconnect \
 		  caps \
 		  locale \
 		  view \
 		  necko \
-		  uriloader \
 		  htmlparser \
-		  lwbrk \
 		  docshell \
 		  pref \
 		  xultmpl \
 		  webshell \
 		  unicharutil \
 		  appshell \
 		  util \
 		  $(NULL)

--- a/docshell/base/Makefile.in
+++ b/docshell/base/Makefile.in
@@ -79,17 +79,16 @@ REQUIRES	= xpcom \
 		  xuldoc \
 		  find \
 		  nkcache \
 		  composer \
 		  commandhandler \
 		  editor \
 		  windowwatcher \
 		  imglib2 \
-		  mimetype \
 		  jar \
 		  $(NULL)
 
 SDK_XPIDLSRCS = \
 		nsIGlobalHistory.idl \
 		$(NULL)
 
 XPIDLSRCS	= \

--- a/docshell/build/Makefile.in
+++ b/docshell/build/Makefile.in
@@ -52,39 +52,36 @@ EXPORT_LIBRARY = 1
 GRE_MODULE	= 1
 LIBXUL_LIBRARY	= 1
 
 PACKAGE_FILE = docshell.pkg
 
 REQUIRES	= xpcom \
 		  string \
 		  dom \
-		  js \
 		  shistory \
 		  necko \
 		  nkcache \
 		  gfx \
 		  thebes \
 		  content \
 		  layout \
 		  webshell \
 		  widget \
 		  pref \
-		  view \
 		  intl \
 		  htmlparser \
 		  chardet \
 		  find \
 		  composer \
 		  editor \
 		  commandhandler \
 		  uriloader \
 		  exthandler \
 		  mimetype \
-		  rdf \
 		  prefetch \
 		  imglib2 \
 		  $(NULL)
 
 EXPORTS = \
 		  nsDocShellCID.h \
 		  $(NULL)
 

--- a/dom/src/base/Makefile.in
+++ b/dom/src/base/Makefile.in
@@ -61,17 +61,16 @@ REQUIRES	= xpcom \
 		  xpconnect \
 		  pref \
 		  oji \
 		  necko \
 		  nkcache \
 		  mimetype \
 		  java \
 		  locale \
-		  uriloader \
 		  prefetch \
 		  xuldoc \
 		  webshell \
 		  view \
 		  uconv \
 		  shistory \
 		  plugin \
 		  windowwatcher \

--- a/dom/src/json/Makefile.in
+++ b/dom/src/json/Makefile.in
@@ -44,24 +44,21 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE         = dom
 LIBRARY_NAME   = json_s
 LIBXUL_LIBRARY = 1
 
 REQUIRES       = xpcom         \
                  string        \
                  content       \
-                 caps          \
                  js            \
-                 locale        \
                  layout        \
                  necko         \
                  pref          \
                  uconv         \
-                 unicharutil   \
                  widget        \
                  xpconnect     \
                  $(NULL)
 
 CPPSRCS =                      \
        nsJSON.cpp              \
        $(NULL)
 

--- a/editor/composer/src/Makefile.in
+++ b/editor/composer/src/Makefile.in
@@ -50,17 +50,16 @@ MODULE_NAME	= nsComposerModule
 LIBXUL_LIBRARY	= 1
 
 PACKAGE_FILE = composer.pkg
 
 REQUIRES	= xpcom \
 		  string \
 		  unicharutil \
 		  dom \
-		  js \
 		  layout \
 		  content \
 		  uriloader \
 		  txmgr \
 		  necko \
 		  pref \
 		  webshell \
 		  docshell \

--- a/editor/libeditor/text/Makefile.in
+++ b/editor/libeditor/text/Makefile.in
@@ -49,17 +49,16 @@ LIBXUL_LIBRARY	= 1
 REQUIRES	= xpcom \
 		  string \
 		  dom \
 		  locale \
 		  layout \
 		  content \
 		  txmgr \
 		  txtsvc \
-		  htmlparser \
 		  necko \
 		  pref \
 		  lwbrk \
 		  view \
 		  gfx \
 		  thebes \
 		  widget \
 		  unicharutil \

--- a/editor/txtsvc/src/Makefile.in
+++ b/editor/txtsvc/src/Makefile.in
@@ -47,17 +47,16 @@ LIBRARY_NAME	= txtsvc_s
 FORCE_STATIC_LIB = 1
 MODULE_NAME	= nsTextServicesModule
 LIBXUL_LIBRARY	= 1
 
 REQUIRES	= xpcom \
 		  string \
 		  editor \
 		  gfx \
-		  thebes \
 		  layout \
 		  content \
 		  dom \
 		  widget \
 		  lwbrk \
 		  $(NULL)
 
 CPPSRCS		= \

--- a/embedding/browser/build/Makefile.in
+++ b/embedding/browser/build/Makefile.in
@@ -54,17 +54,16 @@ LIBXUL_LIBRARY	= 1
 PACKAGE_FILE = webbrowser.pkg
 
 REQUIRES	= xpcom \
 		  string \
 		  docshell \
 		  dom \
 		  widget \
 		  gfx \
-		  layout \
 		  content \
 		  necko \
 		  uriloader \
 		  shistory \
 		  windowwatcher \
 		  webbrowserpersist \
 		  embed_base \
 		  $(NULL)

--- a/embedding/components/commandhandler/src/Makefile.in
+++ b/embedding/components/commandhandler/src/Makefile.in
@@ -43,22 +43,20 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= commandhandler
 REQUIRES	= string \
 		  xpcom \
 		  dom \
 		  content \
 		  widget \
-		  necko \
 		  xuldoc \
 		  caps \
 		  xpconnect \
 		  js \
-		  layout \
 		  $(NULL)
 
 LIBRARY_NAME	= commandhandler_s
 LIBXUL_LIBRARY	= 1
 
 CPPSRCS		= \
       nsBaseCommandController.cpp \
       nsCommandGroup.cpp \

--- a/extensions/cookie/Makefile.in
+++ b/extensions/cookie/Makefile.in
@@ -51,18 +51,16 @@ GRE_MODULE	= 1
 LIBXUL_LIBRARY = 1
 
 PACKAGE_FILE = cookie.pkg
 
 REQUIRES	= xpcom \
 		  string \
 		  necko \
 		  dom \
-		  widget \
-		  content \
 		  pref \
 		  windowwatcher \
 		  docshell \
 		  appshell \
 		  storage \
 		  $(NULL)
 
 CPPSRCS		= \

--- a/extensions/layout-debug/src/Makefile.in
+++ b/extensions/layout-debug/src/Makefile.in
@@ -58,21 +58,23 @@ REQUIRES	= xpcom \
 		  thebes \
 		  content \
 		  necko \
 		  layout \
 		  widget \
 		  locale \
 		  view \
 		  pref \
-		  appshell \
-		  appcomps \
 		  toolkitcomps \
 		  $(NULL)
 
+ifndef MOZ_XUL_APP
+REQUIRES	+= appcomps
+endif
+
 XPIDLSRCS	= \
 		nsILayoutRegressionTester.idl \
 		nsILayoutDebuggingTools.idl \
 		$(NULL)
 
 EXPORTS		= \
 		nsLayoutDebugCIID.h \
 		$(NULL)

--- a/gfx/src/Makefile.in
+++ b/gfx/src/Makefile.in
@@ -46,23 +46,20 @@ MODULE      = gfx
 LIBRARY_NAME    = gkgfx
 EXPORT_LIBRARY = 1
 GRE_MODULE	= 1
 LIBXUL_LIBRARY = 1
 
 PACKAGE_FILE = gfx.pkg
 
 REQUIRES	= xpcom \
-		  windowwatcher \
-		  dom \
 		  string \
 		  widget \
 		  locale \
 		  view \
-		  pref \
 		  unicharutil \
 		  thebes \
 		  $(NULL)
 
 DIRS        = shared thebes
 
 ifdef MOZ_ENABLE_POSTSCRIPT
 DIRS        += psshared

--- a/gfx/src/shared/Makefile.in
+++ b/gfx/src/shared/Makefile.in
@@ -48,21 +48,16 @@ FORCE_STATIC_LIB=1
 EXPORT_LIBRARY=1
 LIBXUL_LIBRARY = 1
 
 REQUIRES= \
 		  xpcom \
 		  string \
 		  imglib2 \
 		  widget \
-		  content \
-		  layout \
-		  necko \
-		  dom \
-		  locale \
 		  thebes \
 		  $(NULL)
 
 CPPSRCS = \
 	nsRenderingContextImpl.cpp \
 	gfxImageFrame.cpp \
 	$(NULL)
 

--- a/gfx/src/thebes/Makefile.in
+++ b/gfx/src/thebes/Makefile.in
@@ -50,35 +50,22 @@ endif
 EXPORT_LIBRARY = 1
 IS_COMPONENT = 1
 MODULE_NAME = nsGfxModule
 GRE_MODULE = 1
 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)
 
 CPPSRCS		= \
 		nsThebesDeviceContext.cpp \
 		nsThebesImage.cpp \
 		nsThebesRegion.cpp \
 		nsThebesGfxFactory.cpp \
@@ -98,17 +85,20 @@ REQUIRES        += glitzglx
 endif
 
 endif
 
 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))
 
 ifdef MOZ_ENABLE_GLITZ
 OS_LIBS += opengl32.lib 
 endif
 endif

--- a/gfx/thebes/src/Makefile.in
+++ b/gfx/thebes/src/Makefile.in
@@ -8,17 +8,16 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= thebes
 LIBRARY_NAME	= thebes
 LIBXUL_LIBRARY	= 1
 EXPORT_LIBRARY	= 1
 
 REQUIRES = \
 	cairo \
-	libpixman \
 	string \
 	pref \
 	xpcom \
 	unicharutil \
 	$(LCMS_REQUIRES) \
 	$(NULL)
 
 CPPSRCS	= \

--- a/intl/build/Makefile.in
+++ b/intl/build/Makefile.in
@@ -54,17 +54,16 @@ PACKAGE_VARS = MOZ_MATHML
 
 REQUIRES	= xpcom \
 		  string \
 		  unicharutil \
 		  uconv \
 		  lwbrk \
 		  intl \
 		  locale \
-		  necko \
 		  $(NULL)
 
 CPPSRCS		= \
 			nsI18nModule.cpp \
 			$(NULL)
 
 # see also intl/locale/src/Makefile.in
 ifneq (,$(filter mac os2 windows, $(MOZ_WIDGET_TOOLKIT)))

--- a/intl/locale/src/Makefile.in
+++ b/intl/locale/src/Makefile.in
@@ -42,17 +42,16 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= locale
 LIBRARY_NAME	= nslocale_s
 LIBXUL_LIBRARY  = 1
 
 REQUIRES	= xpcom \
-		  gfx \
 		  string \
 		  uconv \
 		  unicharutil \
 		  intl \
 		  $(NULL)
 
 ifneq (,$(filter mac os2 windows, $(MOZ_WIDGET_TOOLKIT)))
 DIRS		= $(MOZ_WIDGET_TOOLKIT)

--- a/intl/unicharutil/util/Makefile.in
+++ b/intl/unicharutil/util/Makefile.in
@@ -52,17 +52,16 @@ include $(srcdir)/objs.mk
 
 MODULE=unicharutil
 LIBRARY_NAME=unicharutil_external_s
 DIST_INSTALL = 1
 SDK_LIBRARY = $(LIBRARY)
 
 REQUIRES=xpcom \
 		string \
-		uconv \
 		$(NULL)
 
 SDK_HEADERS = \
 	nsUnicharUtils.h \
 	$(NULL)
 
 EXPORTS = \
 	nsCompressedCharMap.h \

--- a/layout/base/Makefile.in
+++ b/layout/base/Makefile.in
@@ -51,17 +51,16 @@ XPIDL_MODULE	= layout_base
 GRE_MODULE	= 1
 LIBRARY_NAME	= gkbase_s
 LIBXUL_LIBRARY	= 1
 
 REQUIRES	= xpcom \
 		  string \
 		  dom \
 		  content \
-		  xul \
 		  xuldoc \
 		  gfx \
 		  widget \
 		  view \
 		  necko \
 		  docshell \
 		  webshell \
 		  webbrwsr \
@@ -71,23 +70,24 @@ REQUIRES	= xpcom \
 		  plugin \
 		  locale \
 		  pref \
 		  imglib2 \
 		  unicharutil \
 		  htmlparser \
 		  util \
 		  windowwatcher \
-		  accessibility \
 		  shistory \
 		  caps \
 		  thebes \
-		  cairo \
 		  $(NULL)
 
+ifdef ACCESSIBILITY
+REQUIRES	+= accessibility
+endif
 
 XPIDLSRCS	= \
 		nsIStyleSheetService.idl	\
 		$(NULL)
 
 EXPORTS		= \
 		nsBidi.h \
 		nsBidiPresUtils.h \

--- a/layout/build/Makefile.in
+++ b/layout/build/Makefile.in
@@ -78,24 +78,22 @@ REQUIRES	= xpcom \
 		  storage \
 		  editor \
 		  txmgr \
 		  webshell \
 		  docshell \
 		  htmlparser \
 		  js \
 		  xpconnect \
-		  uriloader \
 		  caps \
 		  rdf \
 		  xuldoc \
 		  imglib2 \
 		  pref \
 		  unicharutil \
-		  xul \
 		  xultmpl \
 		  lwbrk \
 		  plugin \
 		  commandhandler \
 		  webbrwsr \
 		  uconv \
 		  txtsvc \
 		  thebes \

--- a/layout/forms/Makefile.in
+++ b/layout/forms/Makefile.in
@@ -59,31 +59,32 @@ REQUIRES	= xpcom \
 		  gfx \
 		  thebes \
 		  widget \
 		  view \
 		  dom \
 		  necko \
 		  webshell \
 		  editor \
-		  txtsvc \
-		  intl \
 		  uconv \
 		  txmgr \
 		  xuldoc \
 		  imglib2 \
-		  accessibility \
 		  unicharutil \
 		  commandhandler \
 		  xpconnect \
 		  js \
 		  pref \
 		  docshell \
 		  $(NULL)
 
+ifdef ACCESSIBILITY
+REQUIRES	+= accessibility
+endif
+
 EXPORTS		= \
 		nsIListControlFrame.h \
 		nsIComboboxControlFrame.h \
 		nsIFormControlFrame.h \
 		nsIRadioControlFrame.h \
 		nsICheckboxControlFrame.h \
 		nsISelectControlFrame.h \
 		nsITextControlFrame.h \

--- a/layout/generic/Makefile.in
+++ b/layout/generic/Makefile.in
@@ -49,46 +49,44 @@ MODULE		= layout
 LIBRARY_NAME	= gkgeneric_s
 LIBXUL_LIBRARY	= 1
 
 REQUIRES	= xpcom \
 		  string \
 		  dom \
 		  content \
 		  thebes \
-		  cairo \
 		  gfx \
 		  widget \
 		  locale \
 		  view \
 		  necko \
 		  js \
 		  caps \
 		  pref \
 		  htmlparser \
 		  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
 endif
 
 EXPORTS		= \
 		nsFrameList.h \
 		nsHTMLParts.h \

--- a/layout/inspector/src/Makefile.in
+++ b/layout/inspector/src/Makefile.in
@@ -52,17 +52,16 @@ REQUIRES	= xpcom \
 		  gfx \
 		  thebes \
 		  layout \
 		  content \
 		  widget \
 		  locale \
 		  necko \
 		  docshell \
-		  view \
 		  webshell \
 		  $(NULL)
 
 ifdef ACCESSIBILITY
 REQUIRES        += accessibility
 endif
 
 CPPSRCS= \

--- a/layout/mathml/base/src/Makefile.in
+++ b/layout/mathml/base/src/Makefile.in
@@ -55,22 +55,20 @@ REQUIRES	= xpcom \
 		  dom \
 		  content \
 		  gfx \
 		  thebes \
 		  widget \
 		  view \
 		  webshell \
 		  locale \
-		  intl \
 		  unicharutil \
 		  necko \
 		  docshell \
 		  webbrwsr \
-		  windowwatcher \
 		  pref \
 		  js \
 		  $(NULL)
 
 LOCAL_INCLUDES = \
 	-I$(srcdir)/../../../style \
 	-I$(srcdir)/../../../base \
 	-I$(srcdir)/../../../generic \

--- a/layout/printing/Makefile.in
+++ b/layout/printing/Makefile.in
@@ -61,17 +61,16 @@ REQUIRES	= xpcom \
 		  uriloader \
 		  webbrwsr \
 		  locale \
 		  intl \
 		  imglib2 \
 		  windowwatcher \
 		  htmlparser \
 		  js \
-		  xpconnect \
 		  pref \
 		  $(NULL)
 
 XPIDLSRCS	= \
 		nsIPrintProgress.idl  \
 		nsIPrintProgressParams.idl  \
 		nsIPrintStatusFeedback.idl  \
 		$(NULL)

--- a/layout/style/Makefile.in
+++ b/layout/style/Makefile.in
@@ -60,18 +60,16 @@ REQUIRES	= xpcom \
 		  widget \
 		  caps \
 		  locale \
 		  unicharutil \
 		  js \
 		  necko \
 		  mimetype \
 		  webshell \
-		  docshell \
-		  htmlparser \
 		  uconv \
 		  xuldoc \
 		  xpconnect \
 		  view \
 		  intl \
 		  pref \
 		  imglib2 \
 		  $(NULL)

--- a/layout/svg/base/src/Makefile.in
+++ b/layout/svg/base/src/Makefile.in
@@ -54,18 +54,16 @@ REQUIRES	= xpcom \
 		  dom \
 		  locale \
 		  view \
 		  pref \
 		  necko \
 		  unicharutil \
 		  webshell \
 		  imglib2 \
-		  intl \
-		  windowwatcher \
 		  js \
 		  xpconnect \
 		  docshell \
 		  thebes \
 		  $(NULL)
 
 CPPSRCS		= \
 		nsSVGAFrame.cpp \

--- a/layout/tables/Makefile.in
+++ b/layout/tables/Makefile.in
@@ -50,25 +50,27 @@ REQUIRES	= xpcom \
 		  string \
 		  dom \
 		  content \
 		  gfx \
 		  thebes \
 		  widget \
 		  locale \
 		  view \
-		  accessibility \
 		  necko \
 		  webshell \
 		  js \
-		  xpconnect \
 		  pref \
 		  docshell \
 		  $(NULL)
 
+ifdef ACCESSIBILITY
+REQUIRES	+= accessibility
+endif
+
 EXPORTS		= \
 		nsITableCellLayout.h \
 		nsITableLayout.h \
 		$(NULL)
 
 CPPSRCS		= \
 		BasicTableLayoutStrategy.cpp \
 		FixedTableLayoutStrategy.cpp \

--- a/layout/xul/base/src/Makefile.in
+++ b/layout/xul/base/src/Makefile.in
@@ -46,17 +46,16 @@ MODULE		= layout
 LIBRARY_NAME	= gkxulbase_s
 LIBXUL_LIBRARY	= 1
 
 REQUIRES	= xpcom \
 		  string \
 		  dom \
 		  locale \
 		  content \
-		  xul \
 		  gfx \
 		  thebes \
 		  widget \
 		  view \
 		  docshell \
 		  necko \
 		  webshell \
 		  pref \

--- a/layout/xul/base/src/tree/src/Makefile.in
+++ b/layout/xul/base/src/tree/src/Makefile.in
@@ -44,17 +44,16 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= layout
 LIBRARY_NAME	= gkxultree_s
 LIBXUL_LIBRARY  = 1
 REQUIRES	= xpcom \
 		  string \
 		  dom \
 		  content \
-		  xul \
 		  gfx \
 		  thebes \
 		  widget \
 		  locale \
 		  view \
 		  xultmpl \
 		  rdf \
 		  necko \

--- a/modules/libpr0n/build/Makefile.in
+++ b/modules/libpr0n/build/Makefile.in
@@ -54,18 +54,16 @@ PACKAGE_FILE = imglib2.pkg
 
 REQUIRES	= xpcom \
 		  string \
 		  thebes \
 		  necko \
 		  nkcache \
 		  gfx \
 		  caps \
-		  xpconnect \
-		  js \
 		  $(JPEG_REQUIRES) \
 		  $(PNG_REQUIRES) \
 		  $(ZLIB_REQUIRES) \
 		  $(LCMS_REQUIRES) \
 		  $(NULL)
 
 CPPSRCS = \
 		nsImageModule.cpp \

--- a/modules/libpr0n/decoders/gif/Makefile.in
+++ b/modules/libpr0n/decoders/gif/Makefile.in
@@ -47,17 +47,16 @@ LIBRARY_NAME	= imggif_s
 FORCE_STATIC_LIB = 1
 MODULE_NAME	= nsGIFModule2
 LIBXUL_LIBRARY = 1
 
 REQUIRES	= xpcom \
 		  string \
 		  gfx \
 		  thebes \
-		  cairo \
 		  imglib2 \
 		  $(LCMS_REQUIRES) \
 		  $(NULL)
 
 CPPSRCS		= nsGIFDecoder2.cpp
 
 # nsGIFDecoder2.cpp includes imgContainer.h
 LOCAL_INCLUDES += -I$(topsrcdir)/modules/libpr0n/src

--- a/modules/libpr0n/encoders/jpeg/Makefile.in
+++ b/modules/libpr0n/encoders/jpeg/Makefile.in
@@ -44,17 +44,16 @@ MODULE		= imgjpege
 LIBRARY_NAME	= imgjpege_s
 FORCE_STATIC_LIB = 1
 MODULE_NAME	= imgEncoderJPEGModule
 LIBXUL_LIBRARY = 1
 
 EXTRA_DSO_LIBS	= gkgfx
 
 REQUIRES	= xpcom \
-		  gfx \
 		  string \
 		  imglib2 \
 		  $(JPEG_REQUIRES) \
 		  $(NULL)
 
 CPPSRCS		= nsJPEGEncoder.cpp
 
 include $(topsrcdir)/config/rules.mk

--- a/modules/libpr0n/encoders/png/Makefile.in
+++ b/modules/libpr0n/encoders/png/Makefile.in
@@ -44,17 +44,16 @@ MODULE		= imgpnge
 LIBRARY_NAME	= imgpnge_s
 FORCE_STATIC_LIB = 1
 MODULE_NAME	= imgEncoderPNGModule
 LIBXUL_LIBRARY = 1
 
 EXTRA_DSO_LIBS	= gkgfx
 
 REQUIRES	= xpcom \
-		  gfx \
 		  string \
 		  imglib2 \
 		  $(PNG_REQUIRES) \
 		  $(ZLIB_REQUIRES) \
 		  $(NULL)
 
 ifneq (,$(filter png,$(MOZ_IMG_ENCODERS)))
 DEFINES		+= -DMOZ_PNG_WRITE

--- a/modules/libpr0n/src/Makefile.in
+++ b/modules/libpr0n/src/Makefile.in
@@ -50,17 +50,16 @@ GRE_MODULE	= 1
 LIBXUL_LIBRARY  = 1
 
 REQUIRES	= xpcom \
 		  string \
 		  necko \
 		  nkcache \
 		  gfx \
 		  thebes \
-		  cairo \
 		  caps \
 		  xpconnect \
 		  js \
 		  $(NULL)
 
 CPPSRCS		= \
 			imgCache.cpp     \
 			imgContainer.cpp \

--- a/modules/libpref/src/Makefile.in
+++ b/modules/libpref/src/Makefile.in
@@ -49,28 +49,31 @@ IS_COMPONENT	= 1
 MODULE_NAME	= nsPrefModule
 ifeq ($(OS_ARCH)$(MOZ_ENABLE_LIBXUL),WINNT)
 LIBRARY_NAME	= xppref$(MOZ_BITS)
 endif
 GRE_MODULE	= 1
 LIBXUL_LIBRARY = 1
 
 REQUIRES	= xpcom \
-		  xpcom_obsolete \
 		  string \
 		  intl \
 		  necko \
 		  $(NULL)
 
 ifdef MOZ_PROFILESHARING
 REQUIRES	+= ipcd \
 		  profilesharingsetup \
 		  $(NULL)
 endif
 
+ifndef MOZ_NO_XPCOM_OBSOLETE
+REQUIRES	+= xpcom_obsolete
+endif
+
 include $(topsrcdir)/config/config.mk
 
 CPPSRCS		= nsPref.cpp \
 			  nsPrefBranch.cpp	\
 			  nsPrefService.cpp	\
 			  nsPrefsFactory.cpp	\
 			  prefapi.cpp \
 			  prefread.cpp \

--- a/netwerk/protocol/file/src/Makefile.in
+++ b/netwerk/protocol/file/src/Makefile.in
@@ -44,17 +44,16 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= necko
 LIBRARY_NAME	= nkfile_s
 LIBXUL_LIBRARY  = 1
 
 REQUIRES	= xpcom \
 		  string \
 		  mimetype \
-		  pref \
 		  uconv \
 		  $(NULL)
 
 CPPSRCS		= \
 		nsFileProtocolHandler.cpp \
 		nsFileChannel.cpp \
 		$(NULL)
 

--- a/netwerk/protocol/gopher/src/Makefile.in
+++ b/netwerk/protocol/gopher/src/Makefile.in
@@ -43,20 +43,18 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= necko
 LIBRARY_NAME	= nkgopher_s
 LIBXUL_LIBRARY  = 1
 
 REQUIRES	= xpcom \
-		  necko \
 		  string \
 		  mimetype \
-		  pref \
 		  intl \
 		  uconv \
 		  $(NULL)
 
 CPPSRCS		= \
 		nsGopherHandler.cpp \
 		nsGopherChannel.cpp \
 		$(NULL)

--- a/netwerk/protocol/viewsource/src/Makefile.in
+++ b/netwerk/protocol/viewsource/src/Makefile.in
@@ -44,17 +44,16 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= necko
 LIBRARY_NAME	= nkviewsource_s
 LIBXUL_LIBRARY  = 1
 
 REQUIRES	= xpcom \
 		  string \
-		  necko \
 		  mimetype \
 		  $(NULL)
 
 CPPSRCS		= \
 		nsViewSourceHandler.cpp \
 		nsViewSourceChannel.cpp \
 		$(NULL)
 

--- a/storage/build/Makefile.in
+++ b/storage/build/Makefile.in
@@ -48,23 +48,21 @@ MODULE		= storage
 LIBRARY_NAME = storagecomps
 SHORT_LIBNAME = strgcmps
 EXPORT_LIBRARY = 1
 IS_COMPONENT = 1
 MODULE_NAME = mozStorageModule
 LIBXUL_LIBRARY = 1
 
 REQUIRES = \
-	storage \
 	sqlite3 \
 	xpcom \
 	string \
 	js \
 	xpconnect \
-	intl \
 	$(NULL)
 
 EXPORTS = mozStorageCID.h
 
 CPPSRCS = mozStorageModule.cpp
 
 LOCAL_INCLUDES = \
 	-I$(srcdir)/../src

--- a/storage/src/Makefile.in
+++ b/storage/src/Makefile.in
@@ -46,18 +46,16 @@ include $(DEPTH)/config/autoconf.mk
 MODULE           = storage
 LIBRARY_NAME     = storage_s
 MODULE_NAME      = mozStorageModule
 FORCE_STATIC_LIB = 1
 GRE_MODULE       = 1
 LIBXUL_LIBRARY = 1
 
 REQUIRES = xpcom \
-           intl \
-           necko \
            string \
            sqlite3 \
            js \
            xpconnect \
            $(NULL)
 
 CPPSRCS = \
 	mozStorageService.cpp \

--- a/storage/test/Makefile.in
+++ b/storage/test/Makefile.in
@@ -51,17 +51,16 @@ MODULE = test_storage
 XPCSHELL_TESTS = unit
 
 CPPSRCS = storage1.cpp
 
 REQUIRES = \
 	xpcom \
 	string \
 	storage \
-	storagecomps \
 	$(NULL)
 
 LIBS = \
 	$(LIBS_DIR) \
 	$(XPCOM_GLUE_LDOPTS) \
 	$(NSPR_LIBS) \
 	$(NULL)
 

--- a/toolkit/components/alerts/src/mac/Makefile.in
+++ b/toolkit/components/alerts/src/mac/Makefile.in
@@ -45,17 +45,16 @@ MODULE = alerts
 LIBRARY_NAME = alerts_s
 IS_COMPONENT = 1
 FORCE_SHARED_LIB = 1
 
 REQUIRES = \
   xpcom \
   string \
   necko \
-  xulapp \
   intl \
   $(NULL)
 
 CMMSRCS = \
   nsAlertsService.mm \
   mozGrowlDelegate.mm \
   nsAlertsImageLoadListener.mm \
   nsNotificationsList.mm \

--- a/toolkit/components/build/Makefile.in
+++ b/toolkit/components/build/Makefile.in
@@ -56,46 +56,42 @@ DEFINES += -DALERTS_SERVICE
 endif
 
 REQUIRES = 	\
 		xpcom \
 		string \
 		widget \
 		layout \
 		dom \
-		pref \
-		rdf \
 		intl \
 		docshell \
-		autocomplete \
 		appcomps \
 		downloads \
 		fastfind \
 		mimetype \
 		webbrowserpersist \
-		progressDlg \
 		necko \
-		windowwatcher \
 		uriloader \
-		xpinstall \
 		xulapp \
 		embed_base \
 		content \
 		find \
 		gfx \
 		thebes \
 		locale \
 		unicharutil \
 		xuldoc \
-		alerts \
-		url-classifier \
 		feeds \
 		storage \
 		$(NULL)
 
+ifdef ALERTS_SERVICE
+REQUIRES	+= alerts
+endif
+
 EXPORTS = nsToolkitCompsCID.h
 
 CPPSRCS = nsToolkitCompsModule.cpp
 
 LOCAL_INCLUDES = \
 	-I$(srcdir)/../downloads/src \
 	-I$(srcdir)/../startup/src \
 	-I$(srcdir)/../typeaheadfind/src \
@@ -126,16 +122,17 @@ endif
 ifdef ALERTS_SERVICE_MAC
 SHARED_LIBRARY_LIBS += ../alerts/src/mac/$(LIB_PREFIX)alerts_s.$(LIB_SUFFIX)
 SHARED_LIBRARY_LIBS += ../alerts/src/mac/growl/$(LIB_PREFIX)growl_s.$(LIB_SUFFIX)
 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
 SHARED_LIBRARY_LIBS += ../feeds/src/$(LIB_PREFIX)feed_s.$(LIB_SUFFIX)
 endif
 
 SHARED_LIBRARY_LIBS += ../typeaheadfind/src/$(LIB_PREFIX)fastfind_s.$(LIB_SUFFIX)
 EXTRA_DSO_LIBS = gkgfx

--- a/toolkit/components/downloads/src/Makefile.in
+++ b/toolkit/components/downloads/src/Makefile.in
@@ -51,37 +51,36 @@ LIBXUL_LIBRARY = 1
 
 REQUIRES  = xpcom \
             string \
             rdf \
             uriloader \
             mimetype \
             necko \
             pref \
-            progressDlg \
             intl \
             windowwatcher \
             webbrowserpersist \
             appshell \
             dom \
             embed_base \
             alerts \
             storage \
-            xulapp \
             exthandler \
             docshell \
             $(NULL)
 
 CPPSRCS   = \
     nsDownloadManager.cpp \
     $(NULL)
 
 ifndef GNU_CXX
 ifeq ($(OS_ARCH),WINNT)
 CPPSRCS += nsDownloadScanner.cpp
+REQUIRES += xulapp
 endif
 endif
 
 EXTRA_COMPONENTS = \
   nsDownloadManagerUI.js \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk

--- a/toolkit/components/feeds/src/Makefile.in
+++ b/toolkit/components/feeds/src/Makefile.in
@@ -48,17 +48,16 @@ MOZILLA_INTERNAL_API = 1
 FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 
 REQUIRES	= \
 		xpcom \
 		necko \
 		string \
 		widget \
-		js \
 		dom \
 		htmlparser \
 		content \
 		layout \
 		$(NULL)
 
 CPPSRCS		= nsScriptableUnescapeHTML.cpp \
 		$(NULL)

--- a/toolkit/components/places/src/Makefile.in
+++ b/toolkit/components/places/src/Makefile.in
@@ -47,42 +47,32 @@ MODULE = places
 LIBRARY_NAME  = places
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 MODULE_NAME = nsPlacesModule
 IS_COMPONENT = 1
 
 REQUIRES = xpcom \
            string \
-           history \
            docshell \
-           rdf \
            dom \
            morkreader \
            pref \
            necko \
            imglib2 \
            gfx \
            intl \
            layout \
            locale \
            unicharutil \
            autocomplete \
            storage \
-           uconv \
-           htmlparser \
-           content \
            txmgr \
-           caps \
-           xpconnect \
-           js \
            nkcache \
            widget \
-           url-classifier \
-           microsummaries \
            $(NULL)
 
 CPPSRCS = \
           nsAnnoProtocolHandler.cpp \
           nsAnnotationService.cpp \
           nsFaviconService.cpp \
           nsNavHistory.cpp \
           nsNavHistoryExpire.cpp \

--- a/toolkit/components/satchel/src/Makefile.in
+++ b/toolkit/components/satchel/src/Makefile.in
@@ -49,32 +49,27 @@ MODULE_NAME = satchel
 IS_COMPONENT = 1
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 
 REQUIRES =	\
 		xpcom \
 		string \
 		autocomplete \
-		uriloader \
 		dom \
 		layout \
 		docshell \
 		gfx \
 		thebes \
 		necko \
 		widget \
 		content \
-		view \
 		locale \
 		unicharutil \
-		intl \
 		pref \
-		windowwatcher \
-		toolkitcomps \
 		loginmgr \
 		$(NULL)
 
 CPPSRCS = nsFormFillController.cpp \
           $(NULL)
 
 REQUIRES += storage morkreader
 CPPSRCS += nsStorageFormHistory.cpp

--- a/toolkit/crashreporter/Makefile.in
+++ b/toolkit/crashreporter/Makefile.in
@@ -43,17 +43,16 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE = crashreporter
 LIBXUL_LIBRARY = 1
 LIBRARY_NAME = exception_handler_s
 
 REQUIRES = \
 	xpcom \
 	string \
-	xulapp \
 	$(NULL)
 
 DIRS = \
 	$(NULL)
 
 ifeq  ($(OS_ARCH),WINNT)
 	DIRS += google-breakpad/src/common/windows \
 		google-breakpad/src/client/windows \

--- a/toolkit/crashreporter/client/Makefile.in
+++ b/toolkit/crashreporter/client/Makefile.in
@@ -41,17 +41,18 @@ DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 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
 
 CPPSRCS = crashreporter.cpp
 
 ifeq ($(OS_ARCH),WINNT)
 CPPSRCS += crashreporter_win.cpp
 LIBS += \

--- a/toolkit/mozapps/update/src/updater/Makefile.in
+++ b/toolkit/mozapps/update/src/updater/Makefile.in
@@ -47,17 +47,20 @@ include $(DEPTH)/config/autoconf.mk
 CPPSRCS = \
 	updater.cpp \
 	bspatch.cpp \
 	archivereader.cpp \
 	$(NULL)
 
 PROGRAM = updater$(BIN_SUFFIX)
 
-REQUIRES = libmar libbz2 string
+REQUIRES	= \
+		libmar \
+		libbz2 \
+		$(NULL)
 
 LIBS += \
 	$(DEPTH)/modules/libmar/src/$(LIB_PREFIX)mar.$(LIB_SUFFIX) \
 	$(DEPTH)/modules/libbz2/src/$(LIB_PREFIX)bz2.$(LIB_SUFFIX) \
 	$(NULL)
 
 ifeq ($(OS_ARCH),WINNT)
 USE_STATIC_LIBS = 1
@@ -120,9 +123,10 @@ libs::
 	$(NSINSTALL) -D $(DIST)/bin/updater.app/Contents/MacOS
 	$(NSINSTALL) $(DIST)/bin/updater $(DIST)/bin/updater.app/Contents/MacOS
 	rm -f $(DIST)/bin/updater
 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
@@ -46,40 +46,36 @@ include $(DEPTH)/config/autoconf.mk
 MODULE = xulapp
 LIBRARY_NAME = xulapp_s
 LIBXUL_LIBRARY = 1
 
 REQUIRES = \
 	appcomps \
 	toolkitcomps \
 	appshell \
-	appstartup \
 	chrome \
 	content \
 	docshell \
 	dom \
-	layout \
 	embed_base \
 	embedcomponents \
 	extensions \
 	gfx \
 	intl \
 	js \
 	necko \
 	pref \
 	profile \
 	string \
 	uriloader \
-        layout \
 	widget \
 	windowwatcher \
 	xpcom \
 	xpconnect \
 	xpinstall \
-	xremoteservice \
 	$(NULL)
 
 ifdef MOZ_JPROF
 REQUIRES += jprof
 endif
 
 ifdef NS_TRACE_MALLOC
 REQUIRES += tracemalloc

--- a/widget/src/cocoa/Makefile.in
+++ b/widget/src/cocoa/Makefile.in
@@ -55,25 +55,23 @@ REQUIRES = xpcom \
 		  gfx \
 		  string \
 		  uconv \
 		  dom \
 		  plugin \
 		  content \
 		  layout \
 		  view \
-		  xul \
 		  necko \
 		  locale \
 		  pref \
 		  intl \
 		  exthandler \
 		  appshell \
 		  thebes \
-		  cairo \
 		  js \
 		  xpconnect \
 		  imglib2 \
 		  $(NULL)
 
 ifdef MOZ_ENABLE_GLITZ
 REQUIRES += glitz glitzagl
 endif

--- a/widget/src/support/Makefile.in
+++ b/widget/src/support/Makefile.in
@@ -41,17 +41,16 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= widget
 LIBRARY_NAME	= widgetsupport_s
 LIBXUL_LIBRARY  = 1
 REQUIRES	= xpcom \
-		  string \
 		  gfx \
 		  $(NULL)
 
 CPPSRCS		= nsWidgetSupport.cpp
 
 EXPORTS		= nsWidgetSupport.h
 
 # we don't want the shared lib, but we want to force the creation of a static lib.

--- a/widget/src/xpwidgets/Makefile.in
+++ b/widget/src/xpwidgets/Makefile.in
@@ -58,17 +58,16 @@ REQUIRES	= xpcom \
 		  necko \
 		  htmlparser \
 		  uconv \
 		  unicharutil \
 		  view \
 		  windowwatcher \
 		  lcms \
 		  thebes \
-		  cairo \
 		  $(NULL)
 
 DEFINES		+= -D_IMPL_NS_WIDGET -DUSE_TLS_FOR_TOOLKIT
 
 CPPSRCS		= \
 		nsBaseAppShell.cpp \
 		nsBaseWidget.cpp \
 		nsTransferable.cpp \

--- a/xpfe/bootstrap/appleevents/Makefile.in
+++ b/xpfe/bootstrap/appleevents/Makefile.in
@@ -47,17 +47,16 @@ LIBRARY_NAME	= appleevents_s
 REQUIRES	= xpcom \
 		  string \
 		  dom \
 		  content \
 		  layout \
 		  gfx \
 		  widget \
 		  necko \
-		  pref \
 		  docshell \
 		  appshell \
 		  appcomps \
 		  xulapp \
 		  $(NULL)
 
 #    PatriciaTree.cpp \
 #    nsAppleEventsService.cpp \

--- a/xpfe/browser/src/Makefile.in
+++ b/xpfe/browser/src/Makefile.in
@@ -49,22 +49,19 @@ LIBXUL_LIBRARY = 1
 MODULE_NAME	= nsBrowserModule
 REQUIRES	= xpcom \
 		  string \
 		  necko \
 		  shistory \
 		  widget \
 		  gfx \
 		  docshell \
-		  appshell \
 		  appcomps \
 		  dom \
 		  content \
-		  layout \
-		  js \
 		  uriloader \
 		  pref \
 		  webbrwsr \
 		  windowwatcher \
 		  $(NULL)
 
 ifdef MOZ_PLACES
 REQUIRES +=	  places

--- a/xpfe/components/autocomplete/src/Makefile.in
+++ b/xpfe/components/autocomplete/src/Makefile.in
@@ -48,17 +48,16 @@ LIBRARY_NAME	= xpautocomplete
 SHORT_LIBNAME	= xpautoc
 MOZILLA_INTERNAL_API = 1
 EXPORT_LIBRARY	= 1
 IS_COMPONENT	= 1
 
 REQUIRES	= xpcom \
 		  string \
 		  dom \
-		  intl \
 		  $(NULL)
 
 CPPSRCS		= nsAutoComplete.cpp
 
 EXTRA_DSO_LDOPTS += \
 	$(MOZ_UNICHARUTIL_LIBS) \
 	$(MOZ_COMPONENT_LIBS) \
 	$(NULL)

--- a/xpfe/components/build/Makefile.in
+++ b/xpfe/components/build/Makefile.in
@@ -49,38 +49,22 @@ IS_COMPONENT	= 1
 MODULE_NAME	= application
 LIBXUL_LIBRARY	= 1
 
 PACKAGE_FILE = appcomps.pkg
 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
 
 ifdef MOZ_PERF_METRICS
 SHARED_LIBRARY_LIBS += $(DEPTH)/modules/libutil/src/$(LIB_PREFIX)mozutil_s.$(LIB_SUFFIX)
 endif
 
@@ -91,17 +75,24 @@ LOCAL_INCLUDES += -I$(srcdir)/../directo
 # Non-Mac Browser requirements
 ifneq ($(MOZ_BUILD_APP),macbrowser)
 SHARED_LIBRARY_LIBS += ../../browser/src/$(LIB_PREFIX)mozbrwsr_s.$(LIB_SUFFIX)
 LOCAL_INCLUDES += -I$(srcdir)/../../browser/src
 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) \
 	../related/src/$(LIB_PREFIX)related_s.$(LIB_SUFFIX) \
 	$(NULL)
 LOCAL_INCLUDES += \
 	-I$(srcdir)/../download-manager/src \
 	-I$(srcdir)/../related/src       \

--- a/xpfe/components/directory/Makefile.in
+++ b/xpfe/components/directory/Makefile.in
@@ -57,17 +57,16 @@ REQUIRES	= xpcom \
 		  js \
 		  xpconnect \
 		  docshell \
 		  widget \
 		  dom \
 		  webshell \
 		  uconv \
 		  pref \
-		  uriloader \
 		  windowwatcher \
 		  $(NULL)
 
 CPPSRCS		= nsDirectoryViewer.cpp
 
 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
 FORCE_STATIC_LIB = 1

--- a/xpfe/components/download-manager/src/Makefile.in
+++ b/xpfe/components/download-manager/src/Makefile.in
@@ -49,26 +49,24 @@ LIBRARY_NAME  = downloadmanager_s
 MOZILLA_INTERNAL_API = 1
 
 REQUIRES  = xpcom \
             string \
             rdf \
             uriloader \
             mimetype \
             necko \
-            progressDlg \
             intl \
             windowwatcher \
             webbrowserpersist \
             appshell \
             dom \
             profile \
             widget \
             pref \
-            appcomps \
             embed_base \
             $(NULL)
 
 ifdef MOZ_XUL_APP
 REQUIRES += alerts toolkitcomps
 endif
 
 CPPSRCS   = \

--- a/xpfe/components/intl/Makefile.in
+++ b/xpfe/components/intl/Makefile.in
@@ -47,25 +47,20 @@ LIBRARY_NAME      = intlapp
 LIBXUL_LIBRARY    = 1
 MODULE_NAME       = nsXPIntlModule
 EXPORT_LIBRARY    = 1
 IS_COMPONENT      = 1
 
 REQUIRES	= xpcom \
 		  string \
 		  uconv \
-		  unicharutil \
 		  locale \
-		  intl \
 		  rdf \
 		  pref \
 		  necko \
-		  dom \
-		  windowwatcher \
-		  appshell \
 		  $(NULL)
 
 CPPSRCS= \
 	nsCharsetMenu.cpp \
 	$(NULL)
 
 EXTRA_DSO_LDOPTS = \
 	$(MOZ_UNICHARUTIL_LIBS) \