diff --git a/mozilla/accessible/build/Makefile.in b/mozilla/accessible/build/Makefile.in
index 51018b71aca..66d1f3b2386 100644
--- a/mozilla/accessible/build/Makefile.in
+++ b/mozilla/accessible/build/Makefile.in
@@ -36,11 +36,8 @@ IS_COMPONENT	= 1
 MODULE_NAME	= nsAccessibilityModule
 GRE_MODULE	= 1
 
-REQUIRES = \
-	xpcom \
-	string \
-	dom \
-	$(NULL)
+REQUIRES	= xpcom \
+		  $(NULL)
 
 CPPSRCS		= nsAccessibilityFactory.cpp
 
diff --git a/mozilla/accessible/src/base/Makefile.in b/mozilla/accessible/src/base/Makefile.in
index c694d54dc78..57c00be3c0d 100644
--- a/mozilla/accessible/src/base/Makefile.in
+++ b/mozilla/accessible/src/base/Makefile.in
@@ -32,10 +32,8 @@ REQUIRES	= commandhandler \
 		  content \
 		  docshell \
 		  dom \
-		  js \
 		  editor \
 		  gfx \
-		  htmlparser \
 		  intl \
 		  layout \
 		  locale \
diff --git a/mozilla/accessible/src/html/Makefile.in b/mozilla/accessible/src/html/Makefile.in
index ad38d4d6d42..ba08f3b0051 100644
--- a/mozilla/accessible/src/html/Makefile.in
+++ b/mozilla/accessible/src/html/Makefile.in
@@ -28,27 +28,22 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE = accessibility
 LIBRARY_NAME = accessibility_html_s
-REQUIRES = \
-  appshell \
-  content \
-  docshell \
-  dom \
-  editor \
-  gfx \
-  htmlparser \
-  imglib2 \
-  intl \
-  layout \
-  locale \
-  necko \
-  plugin \
-  string \
-  uriloader \
-  view \
-  webshell \
-  widget \
-  xpcom \
-  $(NULL)
+REQUIRES	= content \
+		  dom \
+		  gfx \
+		  imglib2 \
+		  intl \
+		  layout \
+		  locale \
+		  necko \
+		  string \
+		  widget \
+		  xpcom \
+		  $(NULL)
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
+REQUIRES += editor
+endif
 
 CPPSRCS = \
   nsHTMLAreaAccessible.cpp \
diff --git a/mozilla/accessible/src/mac/Makefile.in b/mozilla/accessible/src/mac/Makefile.in
index 3e729b3368d..2907baa3d12 100644
--- a/mozilla/accessible/src/mac/Makefile.in
+++ b/mozilla/accessible/src/mac/Makefile.in
@@ -44,24 +44,15 @@ include $(DEPTH)/config/autoconf.mk
 MODULE = accessibility
 LIBRARY_NAME = accessibility_toolkit_s
 REQUIRES	= content \
-		  docshell \
 		  dom \
 		  editor \
 		  gfx \
-		  htmlparser \
 		  intl \
-		  layout \
-		  locale \
-		  necko \
-		  plugin \
-		  pref \
 		  string \
 		  uriloader \
 		  view \
-		  webshell \
 		  widget \
 		  xpcom \
-		  xuldoc \
 		  $(NULL)
 
 CPPSRCS = \
diff --git a/mozilla/accessible/src/xul/Makefile.in b/mozilla/accessible/src/xul/Makefile.in
index 9d58245dbd7..761de71eed5 100644
--- a/mozilla/accessible/src/xul/Makefile.in
+++ b/mozilla/accessible/src/xul/Makefile.in
@@ -28,27 +28,22 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE = accessibility
 LIBRARY_NAME = accessibility_xul_s
-REQUIRES = \
-  appshell \
-  content \
-  docshell \
-  dom \
-  editor \
-  gfx \
-  htmlparser \
-  intl \
-  layout \
-  locale \
-  necko \
-  plugin \
-  pref \
-  string \
-  view \
-  webbrwsr \
-  webshell \
-  widget \
-  xpcom \
-  $(NULL)
+REQUIRES	= content \
+		  dom \
+		  gfx \
+		  intl \
+		  layout \
+		  locale \
+		  necko \
+		  pref \
+		  string \
+		  widget \
+		  xpcom \
+		  $(NULL)
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
+REQUIRES += editor
+endif
 
 CPPSRCS = \
   nsXULColorPickerAccessible.cpp \
diff --git a/mozilla/content/base/src/Makefile.in b/mozilla/content/base/src/Makefile.in
index 7665090d926..8dfcf7d101b 100644
--- a/mozilla/content/base/src/Makefile.in
+++ b/mozilla/content/base/src/Makefile.in
@@ -56,7 +56,6 @@ REQUIRES	= xpcom \
 		  imglib2 \
 		  uriloader \
 		  webbrwsr \
-		  debug \
 		  plugin \
 		  $(NULL)
 
diff --git a/mozilla/content/events/src/Makefile.in b/mozilla/content/events/src/Makefile.in
index bdfada15fa6..7eca3711497 100644
--- a/mozilla/content/events/src/Makefile.in
+++ b/mozilla/content/events/src/Makefile.in
@@ -40,7 +40,6 @@ REQUIRES	= xpcom \
 		  xpconnect \
 		  docshell \
 		  pref \
-		  htmlparser \
 		  view \
 		  necko \
 		  unicharutil \
diff --git a/mozilla/content/html/style/src/Makefile.in b/mozilla/content/html/style/src/Makefile.in
index fca18ea5864..7ac393970f3 100644
--- a/mozilla/content/html/style/src/Makefile.in
+++ b/mozilla/content/html/style/src/Makefile.in
@@ -41,7 +41,6 @@ REQUIRES	= xpcom \
 		  necko \
 		  mimetype \
 		  webshell \
-		  xul \
 		  htmlparser \
 		  uconv \
 		  xuldoc \
diff --git a/mozilla/content/shared/src/Makefile.in b/mozilla/content/shared/src/Makefile.in
index 9959b389d78..b9dff9889f7 100644
--- a/mozilla/content/shared/src/Makefile.in
+++ b/mozilla/content/shared/src/Makefile.in
@@ -36,9 +36,7 @@ REQUIRES	= xpcom \
 		  locale \
 		  dom \
 		  necko \
-		  htmlparser \
 		  unicharutil \
-		  uconv \
 		  $(NULL)
 
 CPPSRCS		= \
diff --git a/mozilla/content/xml/document/src/Makefile.in b/mozilla/content/xml/document/src/Makefile.in
index fcc66a47123..f1bf9132e57 100644
--- a/mozilla/content/xml/document/src/Makefile.in
+++ b/mozilla/content/xml/document/src/Makefile.in
@@ -46,7 +46,6 @@ REQUIRES	= xpcom \
 		  pref \
 		  xpconnect \
 		  uconv \
-		  chardet \
 		  lwbrk \
 		  exthandler \
 		  mimetype \
diff --git a/mozilla/dom/src/base/Makefile.in b/mozilla/dom/src/base/Makefile.in
index 2f076aab5bf..cca1b5fa730 100644
--- a/mozilla/dom/src/base/Makefile.in
+++ b/mozilla/dom/src/base/Makefile.in
@@ -55,7 +55,6 @@ REQUIRES	= xpcom \
 		  shistory \
 		  plugin \
 		  windowwatcher \
-		  htmlparser \
 		  chardet \
 		  find \
 		  appshell \
diff --git a/mozilla/editor/composer/src/Makefile.in b/mozilla/editor/composer/src/Makefile.in
index f18c586b87c..ad3ac97a637 100644
--- a/mozilla/editor/composer/src/Makefile.in
+++ b/mozilla/editor/composer/src/Makefile.in
@@ -39,23 +39,16 @@ REQUIRES	= xpcom \
 		  content \
 		  uriloader \
 		  txmgr \
-		  htmlparser \
 		  necko \
 		  pref \
 		  webshell \
-		  intl \
 		  docshell \
 		  gfx \
 		  widget \
 		  xuldoc \
 		  txtsvc \
-		  appcomps \
-		  windowwatcher \
 		  chrome \
-		  mimetype \
 		  imglib2 \
-		  webbrwsr \
-		  unicharutil \
 		  commandhandler \
 		  composer \
 		  appshell \
diff --git a/mozilla/editor/libeditor/base/Makefile.in b/mozilla/editor/libeditor/base/Makefile.in
index 49e537f800c..8b3601cd4db 100644
--- a/mozilla/editor/libeditor/base/Makefile.in
+++ b/mozilla/editor/libeditor/base/Makefile.in
@@ -36,14 +36,12 @@ REQUIRES	= xpcom \
 		  layout \
 		  content \
 		  txmgr \
-		  txtsvc \
 		  htmlparser \
 		  necko \
 		  pref \
 		  view \
 		  gfx \
 		  widget \
-		  xuldoc \
 		  unicharutil \
 		  commandhandler \
 		  docshell \
diff --git a/mozilla/editor/libeditor/build/Makefile.in b/mozilla/editor/libeditor/build/Makefile.in
index b51ed2b928b..c81618e7032 100644
--- a/mozilla/editor/libeditor/build/Makefile.in
+++ b/mozilla/editor/libeditor/build/Makefile.in
@@ -52,7 +52,6 @@ REQUIRES	= xpcom \
 		  txmgr \
 		  htmlparser \
 		  necko \
-		  appshell \
 		  xuldoc \
 		  commandhandler \
 		  gfx \
diff --git a/mozilla/editor/txtsvc/src/Makefile.in b/mozilla/editor/txtsvc/src/Makefile.in
index bcfcc1b2e9e..c279feab076 100644
--- a/mozilla/editor/txtsvc/src/Makefile.in
+++ b/mozilla/editor/txtsvc/src/Makefile.in
@@ -38,7 +38,6 @@ REQUIRES	= xpcom \
 		  content \
 		  dom \
 		  widget \
-		  unicharutil \
 		  lwbrk \
 		  $(NULL)
 
diff --git a/mozilla/embedding/base/Makefile.in b/mozilla/embedding/base/Makefile.in
index ba17ecaa1bf..a98089fe0b9 100644
--- a/mozilla/embedding/base/Makefile.in
+++ b/mozilla/embedding/base/Makefile.in
@@ -31,8 +31,6 @@ include $(DEPTH)/config/autoconf.mk
 
 REQUIRES	= xpcom \
 		  string \
-		  view \
-		  uriloader \
 		  intl \
 		  embedcomponents \
 		  $(NULL)
diff --git a/mozilla/embedding/browser/webBrowser/Makefile.in b/mozilla/embedding/browser/webBrowser/Makefile.in
index f0586085467..4b8330e1a06 100644
--- a/mozilla/embedding/browser/webBrowser/Makefile.in
+++ b/mozilla/embedding/browser/webBrowser/Makefile.in
@@ -39,8 +39,6 @@ REQUIRES	= xpcom \
 		  js \
 		  necko \
 		  uriloader \
-		  history \
-		  toolkitcomps \
 		  shistory \
 		  webshell \
 		  windowwatcher \
diff --git a/mozilla/embedding/components/build/Makefile.in b/mozilla/embedding/components/build/Makefile.in
index b8e38ce9290..81798a47096 100644
--- a/mozilla/embedding/components/build/Makefile.in
+++ b/mozilla/embedding/components/build/Makefile.in
@@ -49,7 +49,6 @@ REQUIRES	= js \
 		  htmlparser \
 		  embed_base \
 		  dom \
-		  txtsvc \
 		  lwbrk \
 		  mimetype \
 		  content \
diff --git a/mozilla/embedding/components/commandhandler/src/Makefile.in b/mozilla/embedding/components/commandhandler/src/Makefile.in
index 5f0b6019172..ce9d2fc50b7 100644
--- a/mozilla/embedding/components/commandhandler/src/Makefile.in
+++ b/mozilla/embedding/components/commandhandler/src/Makefile.in
@@ -29,7 +29,6 @@ REQUIRES	= string \
 		  xpcom \
 		  dom \
 		  widget \
-		  layout \
 		  content \
 		  xuldoc \
 		  caps \
diff --git a/mozilla/embedding/components/printingui/src/mac/Makefile.in b/mozilla/embedding/components/printingui/src/mac/Makefile.in
index 14b418aa5ee..c0f454c4d06 100644
--- a/mozilla/embedding/components/printingui/src/mac/Makefile.in
+++ b/mozilla/embedding/components/printingui/src/mac/Makefile.in
@@ -32,16 +32,9 @@ REQUIRES	= xpcom \
 		  windowwatcher \
 		  widget \
 		  gfx \
-		  js \
-		  xpconnect \
-		  caps \
 		  content \
-		  necko \
 		  uriloader \
-		  docshell \
 		  webbrwsr \
-		  embed_base \
-		  intl \
 		  $(NULL)
 
 DIRS      = printpde
diff --git a/mozilla/embedding/components/webbrowserpersist/src/Makefile.in b/mozilla/embedding/components/webbrowserpersist/src/Makefile.in
index c7aec1b5bab..77b4b8bd314 100644
--- a/mozilla/embedding/components/webbrowserpersist/src/Makefile.in
+++ b/mozilla/embedding/components/webbrowserpersist/src/Makefile.in
@@ -31,7 +31,6 @@ REQUIRES	= xpcom \
 		  dom \
 		  content \
 		  necko \
-		  necko2 \
 		  widget \
 		  exthandler \
 		  uriloader \
diff --git a/mozilla/embedding/components/windowwatcher/src/Makefile.in b/mozilla/embedding/components/windowwatcher/src/Makefile.in
index 386b1ea5526..5ac357c4117 100644
--- a/mozilla/embedding/components/windowwatcher/src/Makefile.in
+++ b/mozilla/embedding/components/windowwatcher/src/Makefile.in
@@ -31,14 +31,12 @@ REQUIRES	= xpcom \
 		  dom \
 		  windowwatcher \
 		  widget \
-		  gfx \
 		  js \
 		  xpconnect \
 		  caps \
 		  content \
 		  pref \
 		  necko \
-		  uriloader \
 		  docshell \
 		  webbrwsr \
 		  embed_base \
diff --git a/mozilla/embedding/lite/Makefile.in b/mozilla/embedding/lite/Makefile.in
index 3a13ef83987..9e7c566eba1 100644
--- a/mozilla/embedding/lite/Makefile.in
+++ b/mozilla/embedding/lite/Makefile.in
@@ -33,13 +33,7 @@ REQUIRES	= xpcom \
 		  string \
 		  chrome \
 		  necko \
-		  history \
 		  pref \
-		  content \
-		  caps \
-		  xpconnect \
-		  js \
-		  xuldoc \
 		  appcomps \
 		  $(NULL)
 
diff --git a/mozilla/extensions/cookie/Makefile.in b/mozilla/extensions/cookie/Makefile.in
index 8dd061249c0..19b09518d36 100644
--- a/mozilla/extensions/cookie/Makefile.in
+++ b/mozilla/extensions/cookie/Makefile.in
@@ -40,7 +40,6 @@ REQUIRES	= xpcom \
 		  widget \
 		  content \
 		  pref \
-		  intl \
 		  uriloader \
 		  windowwatcher \
 		  docshell \
diff --git a/mozilla/extensions/layout-debug/src/Makefile.in b/mozilla/extensions/layout-debug/src/Makefile.in
index 54187c25b22..48dd808f486 100644
--- a/mozilla/extensions/layout-debug/src/Makefile.in
+++ b/mozilla/extensions/layout-debug/src/Makefile.in
@@ -32,24 +32,21 @@ EXPORT_LIBRARY	= 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsLayoutDebugModule
 
-REQUIRES=	xpcom \
-		string \
-		windowwatcher \
-		docshell \
-		string \
-		dom \
-		gfx \
-		content \
-		necko \
-		layout \
-		widget \
-		locale \
-		view \
-		pref \
-		imglib2 \
-		unicharutil \
-		appshell \
-		$(NULL)
+REQUIRES	= xpcom \
+		  string \
+		  windowwatcher \
+		  docshell \
+		  dom \
+		  gfx \
+		  content \
+		  necko \
+		  layout \
+		  widget \
+		  locale \
+		  view \
+		  pref \
+		  appshell \
+		  $(NULL)
 
 XPIDLSRCS	= \
 		nsILayoutRegressionTester.idl \
diff --git a/mozilla/extensions/p3p/src/Makefile.in b/mozilla/extensions/p3p/src/Makefile.in
index c90edf30ad7..4601d4a5c2f 100644
--- a/mozilla/extensions/p3p/src/Makefile.in
+++ b/mozilla/extensions/p3p/src/Makefile.in
@@ -47,16 +47,13 @@ EXPORT_LIBRARY = 1
 IS_COMPONENT   = 1
 MODULE_NAME	   = nsP3PModule
 
-REQUIRES = xpcom  \
-	string     \
-	necko      \
-	pref       \
-	cookie     \
-	xmlextras  \
-	dom        \
-	content    \
-	widget     \
-	$(NULL)
+REQUIRES	= xpcom \
+		  string \
+		  necko \
+		  cookie \
+		  xmlextras \
+		  dom \
+		  $(NULL)
 
 CPPSRCS =                 \
 		nsP3PService.cpp      \
diff --git a/mozilla/extensions/typeaheadfind/src/Makefile.in b/mozilla/extensions/typeaheadfind/src/Makefile.in
index 29d84ff9ed0..bb671e1abbf 100644
--- a/mozilla/extensions/typeaheadfind/src/Makefile.in
+++ b/mozilla/extensions/typeaheadfind/src/Makefile.in
@@ -38,25 +38,22 @@ SHORT_LIBNAME = typahead
 endif
 GRE_MODULE	= 1
 
-REQUIRES        = appcomps \
+REQUIRES	= appcomps \
 		  embedcomponents \
 		  content \
 		  docshell \
 		  dom \
-		  js \
 		  find \
 		  intl \
 		  gfx \
 		  layout \
 		  locale \
-		  mozcomps \
 		  necko \
 		  pref \
 		  string \
 		  unicharutil \
 		  uriloader \
 		  view \
-		  webBrowser_core \
 		  webshell \
 		  widget \
 		  webbrwsr \
diff --git a/mozilla/extensions/webservices/build/src/Makefile.in b/mozilla/extensions/webservices/build/src/Makefile.in
index b85cb7ac5c1..bca6552aee7 100755
--- a/mozilla/extensions/webservices/build/src/Makefile.in
+++ b/mozilla/extensions/webservices/build/src/Makefile.in
@@ -40,8 +40,6 @@ REQUIRES	= xpcom \
 		  widget \
 		  caps \
 		  necko \
-		  webbrwsr \
-		  embedcomponents \
 		  xpconnect \
 		  xmlextras \
 		  $(NULL)
diff --git a/mozilla/extensions/webservices/proxy/src/Makefile.in b/mozilla/extensions/webservices/proxy/src/Makefile.in
index c4c612c5ba1..1db59a440d1 100644
--- a/mozilla/extensions/webservices/proxy/src/Makefile.in
+++ b/mozilla/extensions/webservices/proxy/src/Makefile.in
@@ -28,15 +28,12 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE    = websrvcs
 LIBRARY_NAME	= websrvcsproxy_s
-REQUIRES 	= xpcom \
-		string \
-		xpconnect \
-		caps \
-		js \
-		necko \
-		dom \
-		iiextras \
-		$(NULL)
+REQUIRES	= xpcom \
+		  string \
+		  xpconnect \
+		  js \
+		  dom \
+		  $(NULL)
 
 CPPSRCS=			\
 	wspinfoservice.cpp	\
diff --git a/mozilla/extensions/webservices/proxy/tests/Makefile.in b/mozilla/extensions/webservices/proxy/tests/Makefile.in
index 09febe9a023..79acfe1510d 100644
--- a/mozilla/extensions/webservices/proxy/tests/Makefile.in
+++ b/mozilla/extensions/webservices/proxy/tests/Makefile.in
@@ -33,16 +33,12 @@ XPIDL_MODULE	= wsproxytest
 IS_COMPONENT	= 1
 MODULE_NAME	= WSPProxyTestModule
 
-REQUIRES = xpcom \
-	   string \
-	   xmlextras \
-	   xpconnect \
-	   caps \
-	   js \
-	   necko \
-	   dom \
-	   websrvcs \
-	   $(NULL)
+REQUIRES	= xpcom \
+		  string \
+		  xpconnect \
+		  dom \
+		  websrvcs \
+		  $(NULL)
 
 XPIDLSRCS       = \
 		nsIWSPProxyTest.idl \
diff --git a/mozilla/extensions/webservices/wsdl/src/Makefile.in b/mozilla/extensions/webservices/wsdl/src/Makefile.in
index 46f03b2bbde..3a1360e943c 100644
--- a/mozilla/extensions/webservices/wsdl/src/Makefile.in
+++ b/mozilla/extensions/webservices/wsdl/src/Makefile.in
@@ -28,19 +28,18 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE    = websrvcs
 LIBRARY_NAME	= websrvcswsdl_s
-REQUIRES = xpcom \
-	   string \
-	   dom \
-	   xpconnect \
-	   caps \
-	   layout \
-	   widget \
-	   content \
-	   js \
-	   necko \
-	   pref \
-	   xmlextras \
-	   $(NULL)
+REQUIRES	= xpcom \
+		  string \
+		  dom \
+		  xpconnect \
+		  caps \
+		  widget \
+		  content \
+		  js \
+		  necko \
+		  pref \
+		  xmlextras \
+		  $(NULL)
 
 CPPSRCS	= 				\
 		nsWSDLLoader.cpp	\
diff --git a/mozilla/extensions/xmlextras/base/src/Makefile.in b/mozilla/extensions/xmlextras/base/src/Makefile.in
index d1cb3788406..41937cf180c 100644
--- a/mozilla/extensions/xmlextras/base/src/Makefile.in
+++ b/mozilla/extensions/xmlextras/base/src/Makefile.in
@@ -39,7 +39,6 @@ REQUIRES	= xpcom \
 		  caps \
 		  uconv \
 		  necko \
-		  docshell \
 		  xpconnect \
 		  htmlparser \
 		  windowwatcher \
diff --git a/mozilla/extensions/xmlextras/build/src/Makefile.in b/mozilla/extensions/xmlextras/build/src/Makefile.in
index e368b2fda72..5b4d4c553a5 100644
--- a/mozilla/extensions/xmlextras/build/src/Makefile.in
+++ b/mozilla/extensions/xmlextras/build/src/Makefile.in
@@ -44,7 +44,6 @@ REQUIRES	= xpcom \
 		  widget \
 		  caps \
 		  necko \
-		  webbrwsr \
 		  embedcomponents \
 		  xpconnect \
 		  $(NULL)
diff --git a/mozilla/gfx/src/Makefile.in b/mozilla/gfx/src/Makefile.in
index 46b667f25f7..8f7e36f2d5d 100644
--- a/mozilla/gfx/src/Makefile.in
+++ b/mozilla/gfx/src/Makefile.in
@@ -38,7 +38,6 @@ REQUIRES	= xpcom \
 		  locale \
 		  view \
 		  pref \
-		  imglib2 \
 		  unicharutil \
 		  $(NULL)
 
diff --git a/mozilla/gfx/src/mac/Makefile.in b/mozilla/gfx/src/mac/Makefile.in
index 42a3d013059..db81c74340f 100644
--- a/mozilla/gfx/src/mac/Makefile.in
+++ b/mozilla/gfx/src/mac/Makefile.in
@@ -30,23 +30,18 @@ IS_COMPONENT    = 1
 MODULE_NAME     = nsGfxMacModule
 GRE_MODULE	= 1
 
-REQUIRES    = xpcom \
-        string \
-        img \
-        widget \
-        view \
-        util \
-        pref \
-        js \
-        uconv \
-        necko \
-        unicharutil \
-        mozcomps \
-        content \
-        layout \
-        locale \
-        dom \
-        $(NULL)
+REQUIRES	= xpcom \
+		  string \
+		  widget \
+		  view \
+		  pref \
+		  uconv \
+		  necko \
+		  unicharutil \
+		  content \
+		  layout \
+		  locale \
+		  $(NULL)
 
 CPPSRCS = \
         nsATSUIUtils.cpp \
diff --git a/mozilla/htmlparser/robot/test/Makefile.in b/mozilla/htmlparser/robot/test/Makefile.in
index df102c08b4b..9de4f1bc99a 100644
--- a/mozilla/htmlparser/robot/test/Makefile.in
+++ b/mozilla/htmlparser/robot/test/Makefile.in
@@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk
 PROGRAM		= htmlrobot$(BIN_SUFFIX)
 REQUIRES	= xpcom \
 		  string \
-		  webshell \
 		  $(NULL)
 
 CPPSRCS		= RobotMain.cpp
diff --git a/mozilla/htmlparser/tests/html/Makefile.in b/mozilla/htmlparser/tests/html/Makefile.in
index 202ec7309fb..e1b58e1e0da 100644
--- a/mozilla/htmlparser/tests/html/Makefile.in
+++ b/mozilla/htmlparser/tests/html/Makefile.in
@@ -28,12 +28,10 @@ include $(DEPTH)/config/autoconf.mk
 
 PROGRAM		= TestParser$(BIN_SUFFIX)
 
-REQUIRES	= \
-   xpcom \
-	 string \
-	 necko \
-   htmlparser \
-	 $(NULL)
+REQUIRES	= xpcom \
+		  string \
+		  necko \
+		  $(NULL)
 
 CPPSRCS		= \
   TestParser.cpp\
diff --git a/mozilla/intl/build/Makefile.in b/mozilla/intl/build/Makefile.in
index 68b4190f33e..f816c80abd9 100644
--- a/mozilla/intl/build/Makefile.in
+++ b/mozilla/intl/build/Makefile.in
@@ -36,7 +36,6 @@ REQUIRES	= xpcom \
 		  chardet \
 		  uconv \
 		  lwbrk \
-		  unicharutil \
 		  intl \
 		  locale \
 		  htmlparser \
diff --git a/mozilla/intl/locale/src/mac/Makefile.in b/mozilla/intl/locale/src/mac/Makefile.in
index e948a1b953b..614aee1039a 100644
--- a/mozilla/intl/locale/src/mac/Makefile.in
+++ b/mozilla/intl/locale/src/mac/Makefile.in
@@ -49,9 +49,7 @@ FORCE_STATIC_LIB	= 1
 REQUIRES	= xpcom \
 		  string \
 		  unicharutil \
-		  pref \
 		  uconv \
-		  intl \
 		  $(NULL)
 
 CPPSRCS		= \
diff --git a/mozilla/intl/uconv/src/Makefile.in b/mozilla/intl/uconv/src/Makefile.in
index aeb673b4b0d..15e8dd2e8e3 100644
--- a/mozilla/intl/uconv/src/Makefile.in
+++ b/mozilla/intl/uconv/src/Makefile.in
@@ -38,8 +38,6 @@ ifneq ($(OS_ARCH),WINNT)
 SHORT_LIBNAME  = mozuconv
 endif
 REQUIRES	= xpcom \
-                  mozreg \
-                  xpcom_obsolete \
 		  string \
 		  intl \
 		  locale \
diff --git a/mozilla/intl/uconv/ucvibm/Makefile.in b/mozilla/intl/uconv/ucvibm/Makefile.in
index 6ceed9014eb..69dcee1403c 100644
--- a/mozilla/intl/uconv/ucvibm/Makefile.in
+++ b/mozilla/intl/uconv/ucvibm/Makefile.in
@@ -42,7 +42,6 @@ LIBRARY_NAME	= ucvibm_s
 FORCE_STATIC_LIB = 1
 MODULE_NAME	= nsUCvIBMModule
 REQUIRES	= xpcom \
-		  string \
 		  uconv \
 		  $(NULL)
 
diff --git a/mozilla/intl/uconv/ucvlatin/Makefile.in b/mozilla/intl/uconv/ucvlatin/Makefile.in
index fe4fca33eac..1f87890ac4c 100644
--- a/mozilla/intl/uconv/ucvlatin/Makefile.in
+++ b/mozilla/intl/uconv/ucvlatin/Makefile.in
@@ -31,7 +31,6 @@ LIBRARY_NAME	= ucvlatin_s
 FORCE_STATIC_LIB = 1
 MODULE_NAME	= nsUCvLatinModule
 REQUIRES	= xpcom \
-		  string \
 		  uconv \
 		  $(NULL)
 
diff --git a/mozilla/intl/uconv/ucvtw/Makefile.in b/mozilla/intl/uconv/ucvtw/Makefile.in
index d7319deafe2..798286d6458 100644
--- a/mozilla/intl/uconv/ucvtw/Makefile.in
+++ b/mozilla/intl/uconv/ucvtw/Makefile.in
@@ -31,7 +31,6 @@ LIBRARY_NAME	= ucvtw_s
 MODULE_NAME	= nsUCvTWModule
 FORCE_STATIC_LIB=1
 REQUIRES	= xpcom \
-		  string \
 		  uconv \
 		  $(NULL)
 
diff --git a/mozilla/intl/uconv/ucvtw2/Makefile.in b/mozilla/intl/uconv/ucvtw2/Makefile.in
index af07c608e45..bf6c7a03d63 100644
--- a/mozilla/intl/uconv/ucvtw2/Makefile.in
+++ b/mozilla/intl/uconv/ucvtw2/Makefile.in
@@ -33,7 +33,6 @@ LIBRARY_NAME	= ucvtw2_s
 FORCE_STATIC_LIB=1
 MODULE_NAME	= nsUCvTW2Module
 REQUIRES	= xpcom \
-		  string \
 		  uconv \
 		  $(NULL)
 
diff --git a/mozilla/intl/uconv/util/Makefile.in b/mozilla/intl/uconv/util/Makefile.in
index fe340d416a5..a7078354ada 100644
--- a/mozilla/intl/uconv/util/Makefile.in
+++ b/mozilla/intl/uconv/util/Makefile.in
@@ -34,7 +34,6 @@ FORCE_STATIC_LIB = 1
 MODULE_NAME	= nsUCUtil
 REQUIRES	= xpcom \
 		  string \
-		  uconv \
 		  $(NULL)
 
 CPPSRCS		= \
diff --git a/mozilla/js/src/xpconnect/shell/Makefile.in b/mozilla/js/src/xpconnect/shell/Makefile.in
index 9fdf0f8904a..351c00cbf3b 100644
--- a/mozilla/js/src/xpconnect/shell/Makefile.in
+++ b/mozilla/js/src/xpconnect/shell/Makefile.in
@@ -42,7 +42,6 @@ MODULE		= xpcshell
 SIMPLE_PROGRAMS	= xpcshell$(BIN_SUFFIX)
 REQUIRES	= xpconnect \
 		  xpcom \
-		  string \
 		  js \
 		  $(NULL)
 
diff --git a/mozilla/layout/base/src/Makefile.in b/mozilla/layout/base/src/Makefile.in
index 1280d58aa7b..c0da1932296 100644
--- a/mozilla/layout/base/src/Makefile.in
+++ b/mozilla/layout/base/src/Makefile.in
@@ -36,7 +36,6 @@ REQUIRES	= xpcom \
 		  widget \
 		  view \
 		  locale \
-		  htmlparser \
 		  webshell \
 		  necko \
 		  uconv \
diff --git a/mozilla/layout/html/forms/src/Makefile.in b/mozilla/layout/html/forms/src/Makefile.in
index 842cda6b1d7..2cc3ab4cb50 100644
--- a/mozilla/layout/html/forms/src/Makefile.in
+++ b/mozilla/layout/html/forms/src/Makefile.in
@@ -36,11 +36,8 @@ REQUIRES	= xpcom \
 		  widget \
 		  view \
 		  dom \
-		  js \
-		  htmlparser \
 		  necko \
 		  webshell \
-		  caps \
 		  editor \
 		  intl \
 		  uconv \
@@ -48,7 +45,6 @@ REQUIRES	= xpcom \
 		  xuldoc \
 		  imglib2 \
 		  accessibility \
-		  xpconnect \
 		  unicharutil \
 		  commandhandler \
 		  $(NULL)
diff --git a/mozilla/layout/html/style/src/Makefile.in b/mozilla/layout/html/style/src/Makefile.in
index f8f8d9ef2df..cc0b372c3a6 100644
--- a/mozilla/layout/html/style/src/Makefile.in
+++ b/mozilla/layout/html/style/src/Makefile.in
@@ -31,7 +31,6 @@ LIBRARY_NAME	= gkhtmlstyle_s
 REQUIRES	= xpcom \
 		  string \
 		  dom \
-		  js \
 		  content \
 		  gfx \
 		  widget \
diff --git a/mozilla/layout/html/table/src/Makefile.in b/mozilla/layout/html/table/src/Makefile.in
index 8fabce31e48..b783f878c0c 100644
--- a/mozilla/layout/html/table/src/Makefile.in
+++ b/mozilla/layout/html/table/src/Makefile.in
@@ -35,7 +35,6 @@ REQUIRES	= xpcom \
 		  gfx \
 		  widget \
 		  locale \
-		  webshell \
 		  view \
 		  accessibility \
 		  necko \
diff --git a/mozilla/layout/mathml/content/src/Makefile.in b/mozilla/layout/mathml/content/src/Makefile.in
index edbb8a7b40d..fa2cfb9c76e 100644
--- a/mozilla/layout/mathml/content/src/Makefile.in
+++ b/mozilla/layout/mathml/content/src/Makefile.in
@@ -34,7 +34,6 @@ REQUIRES	= xpcom \
 		  string \
 		  necko \
 		  gfx \
-		  content \
 		  $(NULL)
 
 include $(topsrcdir)/config/config.mk
diff --git a/mozilla/layout/xul/base/src/Makefile.in b/mozilla/layout/xul/base/src/Makefile.in
index 8814bd9003b..433ca38157f 100644
--- a/mozilla/layout/xul/base/src/Makefile.in
+++ b/mozilla/layout/xul/base/src/Makefile.in
@@ -38,8 +38,6 @@ REQUIRES	= xpcom \
 		  view \
 		  docshell \
 		  necko \
-		  editor \
-		  htmlparser \
 		  webshell \
 		  pref \
 		  intl \
diff --git a/mozilla/mailnews/addrbook/src/Makefile.in b/mozilla/mailnews/addrbook/src/Makefile.in
index 43d89a042d7..0b35dc465d2 100644
--- a/mozilla/mailnews/addrbook/src/Makefile.in
+++ b/mozilla/mailnews/addrbook/src/Makefile.in
@@ -37,7 +37,6 @@ REQUIRES	= xpcom \
 		  appshell \
 		  dom \
 		  layout \
-		  content \
 		  widget \
 		  mork \
 		  docshell \
diff --git a/mozilla/mailnews/base/build/Makefile.in b/mozilla/mailnews/base/build/Makefile.in
index d17208bae4e..7f93dff6075 100644
--- a/mozilla/mailnews/base/build/Makefile.in
+++ b/mozilla/mailnews/base/build/Makefile.in
@@ -38,7 +38,6 @@ IS_COMPONENT	= 1
 MODULE_NAME	= nsMsgBaseModule
 REQUIRES	= xpcom \
 		  xpcom_obsolete \
-		  xpobsolete \
 		  string \
 		  necko \
 		  intl \
@@ -51,15 +50,13 @@ REQUIRES	= xpcom \
 		  mime \
 		  uriloader \
 		  mailnews \
-          addrbook \
+		  addrbook \
 		  mork \
 		  txmgr \
 		  pref \
 		  msgcompose \
 		  msgbaseutil \
-		  appcomps \
 		  msgdb \
-		  editor \
 		  appshell \
 		  msgnews \
 		  msgimap \
@@ -68,6 +65,10 @@ REQUIRES	= xpcom \
 		  content \
 		  $(NULL)
 
+ifeq ($(OS_ARCH),WINNT)
+REQUIRES	+= appcomps
+endif
+
 ifeq ($(USE_SHORT_LIBNAME),1)
 EXTRA_DSO_LIBS = msgbsutl
 else
diff --git a/mozilla/mailnews/base/src/Makefile.in b/mozilla/mailnews/base/src/Makefile.in
index 34c20099412..a1371418d23 100644
--- a/mozilla/mailnews/base/src/Makefile.in
+++ b/mozilla/mailnews/base/src/Makefile.in
@@ -34,16 +34,13 @@ REQUIRES	= xpcom \
 		  string \
 		  necko \
 		  dom \
-		  js \
 		  appshell \
-		  appcomps \
 		  uconv \
 		  intl \
 		  htmlparser \
 		  widget \
 		  docshell \
 		  rdf \
-		  editor \
 		  gfx \
 		  layout \
 		  content \
@@ -67,7 +64,6 @@ REQUIRES	= xpcom \
 		  mime \
 		  mimetype \
 		  windowwatcher \
-		  profile \
 		  webbrwsr \
 		  exthandler \
 		  $(NULL)
@@ -93,15 +89,15 @@ CPPSRCS		= \
 		nsMsgStatusFeedback.cpp \
 		nsMsgWindow.cpp \
 		nsMessengerMigrator.cpp \
-		nsMsgServiceProvider.cpp	\
-		nsSubscribeDataSource.cpp	\
+		nsMsgServiceProvider.cpp \
+		nsSubscribeDataSource.cpp \
 		nsSubscribableServer.cpp \
-		nsMsgPrintEngine.cpp	\
+		nsMsgPrintEngine.cpp \
 		nsStatusBarBiffManager.cpp \
 		nsMsgDBView.cpp \
 		nsMsgThreadedDBView.cpp \
 		nsMsgSpecialViews.cpp \
-    nsMsgQuickSearchDBView.cpp \
+		nsMsgQuickSearchDBView.cpp \
 		nsMsgSearchDBView.cpp \
 		nsMsgOfflineManager.cpp \
 		nsMsgProgress.cpp \
@@ -116,6 +112,9 @@ REQUIRES += macmorefiles
 endif
 
 ifeq ($(OS_ARCH),WINNT)
+REQUIRES	+= appcomps \
+		   profile \
+		   $(NULL)
 CPPSRCS		+= nsMessengerWinIntegration.cpp 
 endif
 
diff --git a/mozilla/mailnews/compose/src/Makefile.in b/mozilla/mailnews/compose/src/Makefile.in
index b76f7d10105..24a851b2b67 100644
--- a/mozilla/mailnews/compose/src/Makefile.in
+++ b/mozilla/mailnews/compose/src/Makefile.in
@@ -30,7 +30,7 @@ MODULE		= msgcompose
 LIBRARY_NAME	= msgcompose_s
 META_COMPONENT = mail
 REQUIRES	= xpcom \
-                  xpcom_obsolete \
+		  xpcom_obsolete \
 		  string \
 		  dom \
 		  js \
@@ -60,7 +60,6 @@ REQUIRES	= xpcom \
 		  txmgr \
 		  caps \
 		  exthandler \
-		  mork \
 		  nkcache \
 		  mimetype \
 		  windowwatcher \
diff --git a/mozilla/mailnews/extensions/bayesian-spam-filter/build/Makefile.in b/mozilla/mailnews/extensions/bayesian-spam-filter/build/Makefile.in
index 25b306003cc..43666256519 100644
--- a/mozilla/mailnews/extensions/bayesian-spam-filter/build/Makefile.in
+++ b/mozilla/mailnews/extensions/bayesian-spam-filter/build/Makefile.in
@@ -34,13 +34,8 @@ SHORT_LIBNAME	= bayesflt
 IS_COMPONENT	= 1
 MODULE_NAME	= nsBayesianFilterModule
 REQUIRES	= xpcom \
-		  string \
 		  mailnews \
-		  mime \
 		  msgbase \
-		  msgbaseutil \
-		  msgdb \
-		  necko \
 		  lwbrk \
 		  $(NULL)
 
diff --git a/mozilla/mailnews/extensions/bayesian-spam-filter/src/Makefile.in b/mozilla/mailnews/extensions/bayesian-spam-filter/src/Makefile.in
index aed1da7b671..d42de95fe37 100644
--- a/mozilla/mailnews/extensions/bayesian-spam-filter/src/Makefile.in
+++ b/mozilla/mailnews/extensions/bayesian-spam-filter/src/Makefile.in
@@ -36,7 +36,6 @@ REQUIRES	= xpcom \
 		  mailnews \
 		  msgbaseutil \
 		  msgdb \
-		  mime \
 		  profile \
 		  lwbrk \
 		  $(NULL)
diff --git a/mozilla/mailnews/extensions/mdn/src/Makefile.in b/mozilla/mailnews/extensions/mdn/src/Makefile.in
index 064d824f8c3..7d4a2f37a6e 100644
--- a/mozilla/mailnews/extensions/mdn/src/Makefile.in
+++ b/mozilla/mailnews/extensions/mdn/src/Makefile.in
@@ -32,7 +32,6 @@ META_COMPONENT = mail
 REQUIRES	= xpcom \
 		  xpcom_obsolete \
 		  string \
-		  dom \
 		  msgbase \
 		  mailnews \
 		  necko \
diff --git a/mozilla/mailnews/import/eudora/src/Makefile.in b/mozilla/mailnews/import/eudora/src/Makefile.in
index 085b97a05ad..ac13fc6227a 100644
--- a/mozilla/mailnews/import/eudora/src/Makefile.in
+++ b/mozilla/mailnews/import/eudora/src/Makefile.in
@@ -44,7 +44,7 @@ endif
 META_COMPONENT	= mail
 
 REQUIRES	= xpcom \
-          xpcom_obsolete \
+		  xpcom_obsolete \
 		  string \
 		  import \
 		  intl \
@@ -53,7 +53,6 @@ REQUIRES	= xpcom \
 		  mork \
 		  msgcompose \
 		  msgbase \
-		  editor \
 		  dom \
 		  uriloader \
 		  mailnews \
diff --git a/mozilla/mailnews/import/src/Makefile.in b/mozilla/mailnews/import/src/Makefile.in
index 4f3223b4f9e..2b5ec3416c1 100644
--- a/mozilla/mailnews/import/src/Makefile.in
+++ b/mozilla/mailnews/import/src/Makefile.in
@@ -47,7 +47,6 @@ REQUIRES	= xpcom \
 		  mailnews \
 		  addrbook \
 		  uconv \
-		  mork \
 		  msgbase \
 		  msgbaseutil \
 		  intl \
diff --git a/mozilla/mailnews/mime/build/Makefile.in b/mozilla/mailnews/mime/build/Makefile.in
index b4dc9507fee..53d05ba229a 100644
--- a/mozilla/mailnews/mime/build/Makefile.in
+++ b/mozilla/mailnews/mime/build/Makefile.in
@@ -33,7 +33,6 @@ EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= mime_services
 REQUIRES	= xpcom \
-                  xpcom_obsolete \
 		  string \
 		  necko \
 		  msgbase \
diff --git a/mozilla/mailnews/mime/emitters/src/Makefile.in b/mozilla/mailnews/mime/emitters/src/Makefile.in
index a84769195af..b81e5b7080b 100644
--- a/mozilla/mailnews/mime/emitters/src/Makefile.in
+++ b/mozilla/mailnews/mime/emitters/src/Makefile.in
@@ -30,9 +30,8 @@ MODULE		= mimeemitter
 LIBRARY_NAME	= emitterutil_s
 META_COMPONENT = mail
 REQUIRES	= xpcom \
-                  xpcom_obsolete \
-		  string \
 		  xpcom_obsolete \
+		  string \
 		  mime \
 		  msgbase \
 		  msgbaseutil \
diff --git a/mozilla/mailnews/mime/src/Makefile.in b/mozilla/mailnews/mime/src/Makefile.in
index a815ccec592..2111a91d42b 100644
--- a/mozilla/mailnews/mime/src/Makefile.in
+++ b/mozilla/mailnews/mime/src/Makefile.in
@@ -38,7 +38,7 @@ MODULE		= mime
 LIBRARY_NAME	= mime_s
 META_COMPONENT = mail
 REQUIRES	= xpcom \
-                  xpcom_obsolete \
+		  xpcom_obsolete \
 		  string \
 		  msgbase \
 		  msgbaseutil \
@@ -48,7 +48,6 @@ REQUIRES	= xpcom \
 		  uconv \
 		  unicharutil \
 		  msgcompose \
-		  editor \
 		  dom \
 		  intl \
 		  msgimap \
diff --git a/mozilla/modules/plugin/base/src/Makefile.in b/mozilla/modules/plugin/base/src/Makefile.in
index fa4ebbc2ae0..9918422f997 100644
--- a/mozilla/modules/plugin/base/src/Makefile.in
+++ b/mozilla/modules/plugin/base/src/Makefile.in
@@ -40,8 +40,6 @@ REQUIRES	= xpcom \
 		  java \
 		  pref \
 		  necko \
-		  gtkxtbin \
-		  webshell \
 		  caps \
 		  intl \
 		  uconv \
@@ -54,14 +52,18 @@ REQUIRES	= xpcom \
 		  oji \
 		  exthandler \
 		  docshell \
-		  webbrwsr \
 		  windowwatcher \
 		  imglib2 \
 		  layout \
 		  js \
 		  $(NULL)
-# for xlib port
+
+ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT)))
+REQUIRES	+= gtkxtbin
+endif
+ifeq ($(MOZ_WIDGET_TOOLKIT),xlib)
 REQUIRES	+= xlibxtbin xlibrgb
+endif
 
 CPPSRCS		= \
 		ns4xPlugin.cpp \
diff --git a/mozilla/netwerk/base/src/Makefile.in b/mozilla/netwerk/base/src/Makefile.in
index 884d4fc198b..2107abdb93d 100644
--- a/mozilla/netwerk/base/src/Makefile.in
+++ b/mozilla/netwerk/base/src/Makefile.in
@@ -32,7 +32,6 @@ REQUIRES	= xpcom \
 		  string \
 		  exthandler \
 		  mimetype \
-		  intl \
 		  uconv \
 		  locale \
 		  pref \
diff --git a/mozilla/netwerk/build2/Makefile.in b/mozilla/netwerk/build2/Makefile.in
index b5e483ebbe2..352216ad954 100644
--- a/mozilla/netwerk/build2/Makefile.in
+++ b/mozilla/netwerk/build2/Makefile.in
@@ -42,7 +42,6 @@ GRE_MODULE	= 1
 REQUIRES	= xpcom \
 		  string \
 		  necko \
-		  nkcache \
 		  $(NULL)
 
 CPPSRCS		= nsNetModule2.cpp
diff --git a/mozilla/netwerk/mime/src/Makefile.in b/mozilla/netwerk/mime/src/Makefile.in
index 89a105c184d..55ea933ec16 100644
--- a/mozilla/netwerk/mime/src/Makefile.in
+++ b/mozilla/netwerk/mime/src/Makefile.in
@@ -32,7 +32,6 @@ REQUIRES	= xpcom \
 		  string \
 		  necko \
 		  uconv \
-		  pref \
 		  $(NULL)
 
 CPPSRCS		= \
diff --git a/mozilla/netwerk/protocol/ftp/src/Makefile.in b/mozilla/netwerk/protocol/ftp/src/Makefile.in
index 2a1be328ad2..c74f8d8acf0 100644
--- a/mozilla/netwerk/protocol/ftp/src/Makefile.in
+++ b/mozilla/netwerk/protocol/ftp/src/Makefile.in
@@ -30,11 +30,9 @@ MODULE		= necko
 LIBRARY_NAME	= nkftp_s
 REQUIRES	= xpcom \
 		  string \
-		  exthandler \
 		  mimetype \
 		  pref \
 		  intl \
-		  necko \
 		  nkcache \
 		  $(NULL)
 
diff --git a/mozilla/netwerk/protocol/http/src/Makefile.in b/mozilla/netwerk/protocol/http/src/Makefile.in
index 3da6d3fa7be..1d45228d40f 100644
--- a/mozilla/netwerk/protocol/http/src/Makefile.in
+++ b/mozilla/netwerk/protocol/http/src/Makefile.in
@@ -34,7 +34,6 @@ REQUIRES	= xpcom \
 		  nkcache \
 		  mimetype \
 		  intl \
-		  exthandler \
 		  caps \
 		  xpconnect \
 		  js \
diff --git a/mozilla/netwerk/test/Makefile.in b/mozilla/netwerk/test/Makefile.in
index e233d351be9..ac472657830 100644
--- a/mozilla/netwerk/test/Makefile.in
+++ b/mozilla/netwerk/test/Makefile.in
@@ -30,7 +30,6 @@ MODULE		= test_necko
 REQUIRES	= xpcom \
 		  string \
 		  necko \
-		  nkcache \
 		  util \
 		  $(NULL)
 
diff --git a/mozilla/parser/htmlparser/robot/test/Makefile.in b/mozilla/parser/htmlparser/robot/test/Makefile.in
index df102c08b4b..9de4f1bc99a 100644
--- a/mozilla/parser/htmlparser/robot/test/Makefile.in
+++ b/mozilla/parser/htmlparser/robot/test/Makefile.in
@@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk
 PROGRAM		= htmlrobot$(BIN_SUFFIX)
 REQUIRES	= xpcom \
 		  string \
-		  webshell \
 		  $(NULL)
 
 CPPSRCS		= RobotMain.cpp
diff --git a/mozilla/parser/htmlparser/tests/html/Makefile.in b/mozilla/parser/htmlparser/tests/html/Makefile.in
index 202ec7309fb..e1b58e1e0da 100644
--- a/mozilla/parser/htmlparser/tests/html/Makefile.in
+++ b/mozilla/parser/htmlparser/tests/html/Makefile.in
@@ -28,12 +28,10 @@ include $(DEPTH)/config/autoconf.mk
 
 PROGRAM		= TestParser$(BIN_SUFFIX)
 
-REQUIRES	= \
-   xpcom \
-	 string \
-	 necko \
-   htmlparser \
-	 $(NULL)
+REQUIRES	= xpcom \
+		  string \
+		  necko \
+		  $(NULL)
 
 CPPSRCS		= \
   TestParser.cpp\
diff --git a/mozilla/profile/build/Makefile.in b/mozilla/profile/build/Makefile.in
index e9f7077c0a6..f8ae50ddee4 100644
--- a/mozilla/profile/build/Makefile.in
+++ b/mozilla/profile/build/Makefile.in
@@ -50,22 +50,9 @@ GRE_MODULE	= 1
 
 REQUIRES	= xpcom \
 		  xpcom_obsolete \
-		  libreg \
 		  string \
-		  chrome \
-		  docshell \
-		  webbrwsr \
-		  dom \
-		  widget \
-		  necko \
 		  uriloader \
-		  intl \
-		  pref \
-		  prefmigr \
 		  appshell \
-		  uconv \
-		  windowwatcher \
-		  profdirserviceprovider \
 		  $(NULL)
 
 CPPSRCS		= \
diff --git a/mozilla/profile/src/Makefile.in b/mozilla/profile/src/Makefile.in
index 7959d67f003..90433ec9e3e 100644
--- a/mozilla/profile/src/Makefile.in
+++ b/mozilla/profile/src/Makefile.in
@@ -30,8 +30,7 @@ MODULE		= profile
 LIBRARY_NAME	= profile_s
 REQUIRES	= xpcom \
 		  xpcom_obsolete \
-		  xpcom_obsolete \
-	          string \
+		  string \
 		  chrome \
 		  docshell \
 		  webbrwsr \
diff --git a/mozilla/rdf/datasource/src/Makefile.in b/mozilla/rdf/datasource/src/Makefile.in
index 807dcb8e689..dd6a07d2823 100644
--- a/mozilla/rdf/datasource/src/Makefile.in
+++ b/mozilla/rdf/datasource/src/Makefile.in
@@ -31,7 +31,6 @@ LIBRARY_NAME	= rdfdatasource_s
 REQUIRES	= xpcom \
 		  string \
 		  necko \
-		  uconv \
 		  $(NULL)
 
 CPPSRCS		= \
diff --git a/mozilla/security/manager/boot/src/Makefile.in b/mozilla/security/manager/boot/src/Makefile.in
index f2d7eddbe9c..80e6eb772c1 100644
--- a/mozilla/security/manager/boot/src/Makefile.in
+++ b/mozilla/security/manager/boot/src/Makefile.in
@@ -63,17 +63,13 @@ REQUIRES	= nspr \
 		  xpcom \
 		  string \
 		  necko \
-		  necko2 \
 		  uriloader \
 		  dom \
 		  intl \
-		  js \
 		  docshell \
 		  widget \
 		  layout \
 		  content \
-		  unicharutil \
-		  pipnss \
 		  pref \
 		  $(NULL)
 
diff --git a/mozilla/security/manager/pki/src/Makefile.in b/mozilla/security/manager/pki/src/Makefile.in
index 93afb2300a7..9bfc93b5061 100644
--- a/mozilla/security/manager/pki/src/Makefile.in
+++ b/mozilla/security/manager/pki/src/Makefile.in
@@ -68,7 +68,6 @@ REQUIRES	= nspr \
 		  necko \
 		  pipnss \
 		  layout \
-		  pipboot \
 		  $(NULL)
 
 INCLUDES	+= \
diff --git a/mozilla/security/manager/ssl/src/Makefile.in b/mozilla/security/manager/ssl/src/Makefile.in
index 63865c9e2d9..93b0ff240a3 100644
--- a/mozilla/security/manager/ssl/src/Makefile.in
+++ b/mozilla/security/manager/ssl/src/Makefile.in
@@ -101,7 +101,6 @@ REQUIRES	= nspr \
 		  widget \
 		  layout \
 		  content \
-		  pippki \
 		  xpconnect \
 		  jar \
 		  unicharutil \
diff --git a/mozilla/string/embed/Makefile.in b/mozilla/string/embed/Makefile.in
index b486989bef8..abe994ff628 100644
--- a/mozilla/string/embed/Makefile.in
+++ b/mozilla/string/embed/Makefile.in
@@ -53,8 +53,7 @@ LOCAL_INCLUDES	= \
 		-I$(srcdir)/../obsolete \
 		$(NULL)
 
-REQUIRES	= string \
-		  xpcom \
+REQUIRES	= xpcom \
 		  $(NULL)
 
 STRING_LCSRCS   = \
diff --git a/mozilla/string/embed/standalone/Makefile.in b/mozilla/string/embed/standalone/Makefile.in
index e54fe46cae1..0f2bcc65a4b 100644
--- a/mozilla/string/embed/standalone/Makefile.in
+++ b/mozilla/string/embed/standalone/Makefile.in
@@ -51,8 +51,7 @@ LOCAL_INCLUDES	= \
 		-I$(srcdir)/../../obsolete \
 		$(NULL)
 
-REQUIRES	= string \
-		  xpcom \
+REQUIRES	= xpcom \
 		  $(NULL)
 
 STRING_LCSRCS   = \
diff --git a/mozilla/uriloader/prefetch/Makefile.in b/mozilla/uriloader/prefetch/Makefile.in
index b2c43beba6c..abfcc307113 100644
--- a/mozilla/uriloader/prefetch/Makefile.in
+++ b/mozilla/uriloader/prefetch/Makefile.in
@@ -29,14 +29,13 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= prefetch
 LIBRARY_NAME	= prefetch_s
 REQUIRES	= xpcom \
-			string \
-			necko \
-			uriloader \
-			nkcache \
-			htmlparser \
-			chardet \
-			pref \
-			$(NULL)
+		  string \
+		  necko \
+		  uriloader \
+		  nkcache \
+		  chardet \
+		  pref \
+		  $(NULL)
 
 CPPSRCS = \
 		nsPrefetchService.cpp \
diff --git a/mozilla/widget/src/mac/Makefile.in b/mozilla/widget/src/mac/Makefile.in
index 7e2e345a965..cf4677cb476 100644
--- a/mozilla/widget/src/mac/Makefile.in
+++ b/mozilla/widget/src/mac/Makefile.in
@@ -30,7 +30,7 @@ MODULE_NAME	= nsWidgetMacModule
 XPIDL_MODULE	= widget_mac
 GRE_MODULE	= 1
 
-REQUIRES = xpcom \
+REQUIRES	= xpcom \
 		  gfx \
 		  string \
 		  uconv \
@@ -46,7 +46,6 @@ REQUIRES = xpcom \
 		  nkcache \
 		  locale \
 		  pref \
-		  appshell \
 		  intl \
 		  mimetype \
 		  unicharutil \
diff --git a/mozilla/xpcom/build/Makefile.in b/mozilla/xpcom/build/Makefile.in
index 47151b082b1..c558ff9dfe2 100644
--- a/mozilla/xpcom/build/Makefile.in
+++ b/mozilla/xpcom/build/Makefile.in
@@ -33,8 +33,7 @@ LIBRARY_NAME	= xpcom
 #EXPORT_LIBRARY = 1
 GRE_MODULE	= 1
 
-REQUIRES	= libreg \
-		  string \
+REQUIRES	= string \
 		  $(NULL)
 
 # pull in MoreFiles for MacOSX
diff --git a/mozilla/xpcom/components/Makefile.in b/mozilla/xpcom/components/Makefile.in
index 48299dc2396..736016fa98b 100644
--- a/mozilla/xpcom/components/Makefile.in
+++ b/mozilla/xpcom/components/Makefile.in
@@ -31,8 +31,7 @@ XPIDL_MODULE	= xpcom_components
 LIBRARY_NAME	= xpcomcomponents_s
 GRE_MODULE	= 1
 
-REQUIRES	= libreg \
-		  string \
+REQUIRES	= string \
 		  $(NULL)
 
 CPPSRCS		= \
diff --git a/mozilla/xpcom/obsolete/Makefile.in b/mozilla/xpcom/obsolete/Makefile.in
index 498fdeccc4a..b506d006b9c 100644
--- a/mozilla/xpcom/obsolete/Makefile.in
+++ b/mozilla/xpcom/obsolete/Makefile.in
@@ -36,9 +36,7 @@ GRE_MODULE	= 1
 
 DIRS            = component
 
-REQUIRES	= xpcom  \
-		  mozreg \
-		  libreg \
+REQUIRES	= xpcom \
 		  string \
 		  $(NULL)
 
@@ -56,6 +54,7 @@ CPPSRCS         = \
 		$(NULL)
 
 ifeq ($(OS_ARCH),WINNT)
+REQUIRES	+= libreg
 CPPSRCS		+= dlldeps.cpp
 endif
 
diff --git a/mozilla/xpcom/proxy/tests/Makefile.in b/mozilla/xpcom/proxy/tests/Makefile.in
index a2bc00b939a..5e3152ea33e 100644
--- a/mozilla/xpcom/proxy/tests/Makefile.in
+++ b/mozilla/xpcom/proxy/tests/Makefile.in
@@ -28,8 +28,7 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= xpcom
 XPIDL_MODULE	= proxytest
-REQUIRES	= string \
-		  $(NULL)
+REQUIRES	= $(NULL)
 
 CPPSRCS		= proxytests.cpp
 XPIDLSRCS	= nsITestProxy.idl
diff --git a/mozilla/xpcom/sample/Makefile.in b/mozilla/xpcom/sample/Makefile.in
index 86947756a01..b3e1e3685a8 100644
--- a/mozilla/xpcom/sample/Makefile.in
+++ b/mozilla/xpcom/sample/Makefile.in
@@ -42,7 +42,6 @@ DEFINES		+= -DXPCOM_GLUE
 REQUIRES	= string \
 		  embedstring \
 		  xpcom \
-		  xpcomsample \
 		  $(NULL)
 
 CPPSRCS		=		   \
diff --git a/mozilla/xpcom/string/embed/Makefile.in b/mozilla/xpcom/string/embed/Makefile.in
index b486989bef8..abe994ff628 100644
--- a/mozilla/xpcom/string/embed/Makefile.in
+++ b/mozilla/xpcom/string/embed/Makefile.in
@@ -53,8 +53,7 @@ LOCAL_INCLUDES	= \
 		-I$(srcdir)/../obsolete \
 		$(NULL)
 
-REQUIRES	= string \
-		  xpcom \
+REQUIRES	= xpcom \
 		  $(NULL)
 
 STRING_LCSRCS   = \
diff --git a/mozilla/xpcom/string/embed/standalone/Makefile.in b/mozilla/xpcom/string/embed/standalone/Makefile.in
index e54fe46cae1..0f2bcc65a4b 100644
--- a/mozilla/xpcom/string/embed/standalone/Makefile.in
+++ b/mozilla/xpcom/string/embed/standalone/Makefile.in
@@ -51,8 +51,7 @@ LOCAL_INCLUDES	= \
 		-I$(srcdir)/../../obsolete \
 		$(NULL)
 
-REQUIRES	= string \
-		  xpcom \
+REQUIRES	= xpcom \
 		  $(NULL)
 
 STRING_LCSRCS   = \
diff --git a/mozilla/xpcom/tools/registry/Makefile.in b/mozilla/xpcom/tools/registry/Makefile.in
index 13e53e4d7b7..de9b6522dd0 100644
--- a/mozilla/xpcom/tools/registry/Makefile.in
+++ b/mozilla/xpcom/tools/registry/Makefile.in
@@ -33,8 +33,7 @@ DEFINES		+= -DXPCOM_GLUE
 
 REQUIRES	= string \
 		  embedstring \
-		  xpcom \
-	          $(NULL)
+		  $(NULL)
 
 
 LOCAL_INCLUDES	= \
diff --git a/mozilla/xpcom_obsolete/Makefile.in b/mozilla/xpcom_obsolete/Makefile.in
index 498fdeccc4a..b506d006b9c 100644
--- a/mozilla/xpcom_obsolete/Makefile.in
+++ b/mozilla/xpcom_obsolete/Makefile.in
@@ -36,9 +36,7 @@ GRE_MODULE	= 1
 
 DIRS            = component
 
-REQUIRES	= xpcom  \
-		  mozreg \
-		  libreg \
+REQUIRES	= xpcom \
 		  string \
 		  $(NULL)
 
@@ -56,6 +54,7 @@ CPPSRCS         = \
 		$(NULL)
 
 ifeq ($(OS_ARCH),WINNT)
+REQUIRES	+= libreg
 CPPSRCS		+= dlldeps.cpp
 endif
 
diff --git a/mozilla/xpfe/appshell/src/Makefile.in b/mozilla/xpfe/appshell/src/Makefile.in
index 2525a6ff4ef..122ffec8814 100644
--- a/mozilla/xpfe/appshell/src/Makefile.in
+++ b/mozilla/xpfe/appshell/src/Makefile.in
@@ -52,13 +52,11 @@ REQUIRES	= xpcom \
 		  pref \
 		  xpconnect \
 		  intl \
-		  xul \
 		  windowwatcher \
 		  browser \
 		  caps \
 		  profile \
 		  unicharutil \
-		  embed_base \
 		  uconv \
 		  exthandler \
 		  $(NULL)
diff --git a/mozilla/xpfe/bootstrap/Makefile.in b/mozilla/xpfe/bootstrap/Makefile.in
index 49414cdb361..7a605f3d3c6 100644
--- a/mozilla/xpfe/bootstrap/Makefile.in
+++ b/mozilla/xpfe/bootstrap/Makefile.in
@@ -51,7 +51,6 @@ endif
 
 MODULE		= apprunner
 REQUIRES	= xpcom \
-		  xpconnect \
 		  string \
 		  webbrwsr \
 		  widget \
@@ -63,34 +62,24 @@ REQUIRES	= xpcom \
 		  chrome \
 		  xpinstall \
 		  uriloader \
-		  view \
 		  windowwatcher \
 		  embed_base \
 		  embedcomponents \
-		  browser \
 		  docshell \
-		  uconv \
 		  locale \
-		  xremoteservice \
 		  profile \
 		  $(NULL)
 # for jprof
 REQUIRES	+= jprof
-ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
-REQUIRES	+= \
-		  intl \
-		  profile \
-		  $(NULL)
-DIRS		+= os2turbo
-endif
-ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
-REQUIRES	+= intl profile appcomps
-endif
 
 ifdef NS_TRACE_MALLOC
 REQUIRES	+= tracemalloc
 endif
 
+ifdef MOZ_ENABLE_XREMOTE
+REQUIRES	+= xremoteservice
+endif
+
 include $(topsrcdir)/config/config.mk
 
 ifeq ($(USE_SHORT_LIBNAME),1)
@@ -203,6 +192,8 @@ LIBS += -lphexlib -lph
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
+DIRS += os2turbo
+REQUIRES += xpconnect intl profile
 CPPSRCS += nsNativeAppSupportOS2.cpp
 CPPSRCS += nsNativeAppSupportBase.cpp
 RESFILE = splashos2.res
@@ -231,6 +222,7 @@ LIBS += $(MOZ_GTK2_LIBS)
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
+REQUIRES += xpconnect intl appcomps
 RCINCLUDE = splash.rc
 CPPSRCS += nsNativeAppSupportWin.cpp nsNativeAppSupportBase.cpp
 OS_LIBS	+= $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 version winspool gdi32)
diff --git a/mozilla/xpfe/bootstrap/appleevents/Makefile.in b/mozilla/xpfe/bootstrap/appleevents/Makefile.in
index 80bb5b6a8ec..1fa2fd81acd 100644
--- a/mozilla/xpfe/bootstrap/appleevents/Makefile.in
+++ b/mozilla/xpfe/bootstrap/appleevents/Makefile.in
@@ -34,19 +34,11 @@ REQUIRES	= xpcom \
 		  content \
 		  gfx \
 		  widget \
-		  locale \
-		  view \
 		  necko \
-		  webshell \
 		  pref \
 		  docshell \
-		  plugin \
-		  xuldoc \
-		  imglib2 \
-		  gfx2 \
-	 	  webbrwsr \
+		  webbrwsr \
 		  appshell \
-		  layout \
 		  caps \
 		  uriloader \
 		  $(NULL)
diff --git a/mozilla/xpfe/browser/src/Makefile.in b/mozilla/xpfe/browser/src/Makefile.in
index d719f1fc81a..b85e2e4846d 100644
--- a/mozilla/xpfe/browser/src/Makefile.in
+++ b/mozilla/xpfe/browser/src/Makefile.in
@@ -46,7 +46,6 @@ REQUIRES	= xpcom \
 		  pref \
 		  appcomps \
 		  webbrwsr \
-		  chardet \
 		  windowwatcher \
 		  $(NULL)
 
diff --git a/mozilla/xpfe/components/bookmarks/src/Makefile.in b/mozilla/xpfe/components/bookmarks/src/Makefile.in
index eb4e63af71d..c6d18dd59ce 100644
--- a/mozilla/xpfe/components/bookmarks/src/Makefile.in
+++ b/mozilla/xpfe/components/bookmarks/src/Makefile.in
@@ -41,7 +41,6 @@ REQUIRES	= xpcom \
 		  profile \
 		  dom \
 		  intl \
-		  webshell \
 		  windowwatcher \
 		  unicharutil \
 		  txmgr \
diff --git a/mozilla/xpfe/components/build/Makefile.in b/mozilla/xpfe/components/build/Makefile.in
index e5f230f7fab..f768fb463b7 100644
--- a/mozilla/xpfe/components/build/Makefile.in
+++ b/mozilla/xpfe/components/build/Makefile.in
@@ -38,18 +38,16 @@ REQUIRES	= xpcom \
 		  content \
 		  rdf \
 		  necko \
-		  necko2 \
 		  nkcache \
 		  intl \
 		  locale \
 		  mork \
 		  widget \
 		  dom \
-                  alerts\
-                  uriloader \
-                  mimetype \
-                  webbrowserpersist \
-                  progressDlg \
+		  uriloader \
+		  mimetype \
+		  webbrowserpersist \
+		  progressDlg \
 		  pref \
 		  docshell \
 		  webshell \
diff --git a/mozilla/xpfe/components/directory/Makefile.in b/mozilla/xpfe/components/directory/Makefile.in
index d5745c087fb..a37df358472 100644
--- a/mozilla/xpfe/components/directory/Makefile.in
+++ b/mozilla/xpfe/components/directory/Makefile.in
@@ -33,7 +33,6 @@ XPIDLSRCS	= nsIHTTPIndex.idl
 REQUIRES	= xpcom \
 		  string \
 		  necko \
-		  necko2 \
 		  rdf \
 		  content \
 		  js \
diff --git a/mozilla/xpfe/components/find/src/Makefile.in b/mozilla/xpfe/components/find/src/Makefile.in
index e5f797fbca6..63bef6a023c 100644
--- a/mozilla/xpfe/components/find/src/Makefile.in
+++ b/mozilla/xpfe/components/find/src/Makefile.in
@@ -34,15 +34,6 @@ IS_COMPONENT	= 1
 MODULE_NAME	= nsFindComponent
 REQUIRES	= xpcom \
 		  string \
-		  dom \
-		  gfx \
-		  layout \
-		  content \
-		  widget \
-		  editor \
-		  necko \
-		  txtsvc \
-		  docshell \
 		  $(NULL)
 
 CPPSRCS		= \
diff --git a/mozilla/xpfe/components/windowds/Makefile.in b/mozilla/xpfe/components/windowds/Makefile.in
index 8308707dc2c..dfaec999010 100644
--- a/mozilla/xpfe/components/windowds/Makefile.in
+++ b/mozilla/xpfe/components/windowds/Makefile.in
@@ -35,7 +35,6 @@ REQUIRES	= xpcom \
 		  appshell \
 		  rdf \
 		  dom \
-		  content \
 		  docshell \
 		  $(NULL)
 
diff --git a/mozilla/xpinstall/src/Makefile.in b/mozilla/xpinstall/src/Makefile.in
index 804af053e60..6414df2d511 100644
--- a/mozilla/xpinstall/src/Makefile.in
+++ b/mozilla/xpinstall/src/Makefile.in
@@ -51,10 +51,8 @@ REQUIRES	= xpcom \
 		  js \
 		  pref \
 		  widget \
-		  content \
 		  uriloader \
 		  xpconnect \
-		  docshell \
 		  dom \
 		  windowwatcher \
 		  plugin \
diff --git a/mozilla/xpinstall/stub/Makefile.in b/mozilla/xpinstall/stub/Makefile.in
index bbd803555a8..368f3021477 100644
--- a/mozilla/xpinstall/stub/Makefile.in
+++ b/mozilla/xpinstall/stub/Makefile.in
@@ -39,7 +39,6 @@ LIBRARY_NAME	= xpistub
 REQUIRES	= xpcom \
 		  string \
 		  xpinstall \
-		  dom \
 		  $(NULL)
 
 CPPSRCS		= \