Clean up unneeded REQUIRES (bug 73353). r+sr=dbaron.

2005-02-03 23:01:54 +00:00 · 2005-02-03 23:01:54 +00:00 · 67dba23ae4
--- a/accessible/src/atk/Makefile.in
+++ b/accessible/src/atk/Makefile.in
@ -46,24 +46,19 @@ LIBRARY_NAME = accessibility_toolkit_s
 LIBXUL_LIBRARY = 1

 REQUIRES	= content \
-		  docshell \
 		  dom \
 		  editor \
 		  gfx \
-		  htmlparser \
 		  intl \
 		  layout \
 		  locale \
 		  necko \
-		  plugin \
-		  pref \
 		  string \
 		  uriloader \
 		  view \
 		  webshell \
 		  widget \
 		  xpcom \
-		  xuldoc \
 		  $(NULL)

 CPPSRCS = \
--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
@ -60,10 +60,7 @@ PROGRAM = firefox-bin$(BIN_SUFFIX)
 endif

 REQUIRES = \
-	appshell \
-	string \
 	xpcom \
-	xulapp \
 	$(NULL)

 CPPSRCS = nsBrowserApp.cpp
--- a/browser/components/bookmarks/src/Makefile.in
+++ b/browser/components/bookmarks/src/Makefile.in
@ -48,9 +48,6 @@ LIBRARY_NAME	= bookmarks_s
 REQUIRES	= xpcom \
 		  string \
 		  rdf \
-		  appshell \
-      appcomps \
-      appstartup \
 		  widget \
 		  necko \
 		  nkcache \
@ -58,7 +55,6 @@ REQUIRES	= xpcom \
 		  pref \
 		  dom \
 		  intl \
-		  webshell \
 		  windowwatcher \
 		  unicharutil \
 		  txmgr \
--- a/browser/components/build/Makefile.in
+++ b/browser/components/build/Makefile.in
@ -15,13 +15,9 @@ MODULE_NAME = nsBrowserCompsModule
 REQUIRES = \
 	xpcom \
 	string \
-	autocomplete \
-	mork \
 	pref \
 	rdf \
 	intl \
-	uriloader \
-	dom \
 	necko \
 	nkcache \
 	txmgr \
--- a/browser/components/migration/src/Makefile.in
+++ b/browser/components/migration/src/Makefile.in
@ -62,7 +62,6 @@ REQUIRES	= \
 		  windowwatcher \
 		  dom \
 		  docshell \
-		  cookie \
 		  xulapp \
 		  $(NULL)

--- a/browser/components/shell/src/Makefile.in
+++ b/browser/components/shell/src/Makefile.in
@ -48,20 +48,13 @@ REQUIRES	= \
 		  xpcom \
 		  string \
 		  dom \
-		  windowwatcher \
 		  intl \
-		  appshell \
 		  necko \
-		  layout \
 		  content \
-		  widget \
-		  appcomps \
-		  browsercomps \
 		  imglib2 \
+		  browsercomps \
 		  gfx \
-		  locale \
 		  pref \
-		  strres \
 		  $(NULL)

 ifeq ($(OS_ARCH),WINNT)
--- a/browser/components/shell/src/nsWindowsShellService.cpp
+++ b/browser/components/shell/src/nsWindowsShellService.cpp
@ -41,17 +41,14 @@
 #include "gfxIImageFrame.h"
 #include "imgIContainer.h"
 #include "imgIRequest.h"
-#include "nsIContent.h"
-#include "nsIDocument.h"
+#include "nsCRT.h"
 #include "nsIDOMDocument.h"
 #include "nsIDOMElement.h"
 #include "nsIDOMHTMLImageElement.h"
-#include "nsIFrame.h"
 #include "nsIImageLoadingContent.h"
 #include "nsIOutputStream.h"
 #include "nsIPrefService.h"
 #include "nsIPrefLocalizedString.h"
-#include "nsIPresShell.h"
 #include "nsIServiceManager.h"
 #include "nsIStringBundle.h"
 #include "nsNetUtil.h"
--- a/chrome/src/Makefile.in
+++ b/chrome/src/Makefile.in
@ -58,15 +58,12 @@ REQUIRES	= xpcom \
 		  xuldoc \
 		  gfx \
 		  layout \
-		  content \
 		  locale \
 		  necko \
 		  dom \
 		  widget \
 		  js \
 		  appshell \
-		  appstartup \
-		  appcomps \
 		  toolkitcomps \
 		  caps \
 		  pref \
--- a/content/base/src/Makefile.in
+++ b/content/base/src/Makefile.in
@ -62,21 +62,13 @@ REQUIRES	= xpcom \
 		  caps \
 		  lwbrk \
 		  uconv \
-		  chrome \
 		  docshell \
 		  pref \
-		  profile \
 		  xpconnect \
-		  util \
 		  unicharutil \
-		  xuldoc \
 		  intl \
-		  windowwatcher \
 		  webbrowserpersist \
 		  imglib2 \
-		  uriloader \
-		  webbrwsr \
-		  plugin \
 		  prefetch \
 		  $(NULL)

--- a/content/events/src/Makefile.in
+++ b/content/events/src/Makefile.in
@ -56,7 +56,6 @@ REQUIRES	= xpcom \
 		  xpconnect \
 		  webshell \
 		  docshell \
-		  htmlparser \
 		  pref \
 		  view \
 		  necko \
--- a/content/xbl/src/Makefile.in
+++ b/content/xbl/src/Makefile.in
@ -54,7 +54,6 @@ REQUIRES	= xpcom \
 		  layout \
 		  xultmpl \
 		  widget \
-		  view \
 		  caps \
 		  htmlparser \
 		  necko \
@ -63,13 +62,11 @@ REQUIRES	= xpcom \
 		  docshell \
 		  webshell \
 		  lwbrk \
-		  xul \
 		  xuldoc \
 		  rdf \
 		  imglib2 \
 		  unicharutil \
 		  locale \
-		  intl \
 		  $(NULL)

 EXPORTS		= \
--- a/content/xtf/src/Makefile.in
+++ b/content/xtf/src/Makefile.in
@ -47,18 +47,16 @@ LIBRARY_NAME	= gkcontentxtf_s
 REQUIRES	= xpcom \
 		  string \
 		  layout \
-		  content \
 		  widget \
 		  gfx \
 		  dom \
 		  js \
 		  locale \
-		  htmlparser \
-		  view \
 		  pref \
 		  necko \
 		  xpconnect \
-		  webshell
+		  webshell \
+		  $(NULL)

 CPPSRCS		= \
 		nsXMLContentBuilder.cpp \
--- a/content/xul/content/src/Makefile.in
+++ b/content/xul/content/src/Makefile.in
@ -52,7 +52,6 @@ REQUIRES	= xpcom \
 		  layout \
 		  content \
 		  widget \
-		  htmlparser \
 		  necko \
 		  dom \
 		  js \
@ -66,7 +65,6 @@ REQUIRES	= xpcom \
 		  xultmpl \
 		  webshell \
 		  view \
-		  pref \
 		  $(NULL)

 EXPORTS		= \
--- a/content/xul/document/src/Makefile.in
+++ b/content/xul/document/src/Makefile.in
@ -67,11 +67,9 @@ REQUIRES	= xpcom \
 		  lwbrk \
 		  docshell \
 		  pref \
-		  xul \
 		  xultmpl \
 		  webshell \
 		  unicharutil \
-		  intl \
 		  $(NULL)

 CPPSRCS		= nsXULControllers.cpp
--- a/content/xul/templates/src/Makefile.in
+++ b/content/xul/templates/src/Makefile.in
@ -52,7 +52,6 @@ REQUIRES	= xpcom \
 		  xpconnect \
 		  caps \
 		  gfx \
-		  htmlparser \
 		  layout \
 		  content \
 		  pref \
@ -62,7 +61,6 @@ REQUIRES	= xpcom \
 		  necko \
 		  locale \
 		  unicharutil \
-		  xul \
 		  xuldoc \
 		  webshell \
 		  $(NULL)
--- a/docshell/base/Makefile.in
+++ b/docshell/base/Makefile.in
@ -81,7 +81,6 @@ REQUIRES	= xpcom \
 		  composer \
 		  commandhandler \
 		  editor \
-		  history \
 		  $(NULL)

 SDK_XPIDLSRCS = \
--- a/docshell/build/Makefile.in
+++ b/docshell/build/Makefile.in
@ -74,7 +74,6 @@ REQUIRES	= xpcom \
 		  composer \
 		  editor \
 		  commandhandler \
-		  history \
 		  uriloader \
 		  exthandler \
 		  mimetype \
--- a/editor/composer/src/Makefile.in
+++ b/editor/composer/src/Makefile.in
@ -71,7 +71,6 @@ REQUIRES	= xpcom \
 		  imglib2 \
 		  commandhandler \
 		  composer \
-		  appshell \
 		  locale \
 		  $(NULL)

--- a/editor/libeditor/base/Makefile.in
+++ b/editor/libeditor/base/Makefile.in
@ -60,7 +60,6 @@ REQUIRES	= xpcom \
 		  view \
 		  gfx \
 		  widget \
-		  lwbrk \
 		  unicharutil \
 		  commandhandler \
 		  docshell \
--- a/editor/libeditor/text/Makefile.in
+++ b/editor/libeditor/text/Makefile.in
@ -57,7 +57,6 @@ REQUIRES	= xpcom \
 		  htmlparser \
 		  necko \
 		  pref \
-		  view \
 		  lwbrk \
 		  gfx \
 		  widget \
--- a/embedding/base/Makefile.in
+++ b/embedding/base/Makefile.in
@ -48,7 +48,6 @@ XPIDL_MODULE	= embed_base
 include $(DEPTH)/config/autoconf.mk

 REQUIRES	= xpcom \
-		  string \
 		  intl \
 		  embedcomponents \
 		  $(NULL)
--- a/embedding/browser/gtk/src/Makefile.in
+++ b/embedding/browser/gtk/src/Makefile.in
@ -48,14 +48,11 @@ LIBRARY_NAME	= gtkembedmoz
 REQUIRES	= xpcom \
 		  string \
 		  docshell \
-		  webshell \
 		  necko \
 		  widget \
 		  dom \
-		  js \
 		  gfx \
 		  layout \
-		  content \
 		  uriloader \
 		  webbrwsr \
 		  shistory \
--- a/embedding/browser/gtk/tests/Makefile.in
+++ b/embedding/browser/gtk/tests/Makefile.in
@ -45,7 +45,6 @@ include $(DEPTH)/config/autoconf.mk

 MODULE		= gtkembedmoz
 REQUIRES	= xpcom \
-		  string \
 		  dom \
 		  $(NULL)

--- a/embedding/browser/webBrowser/Makefile.in
+++ b/embedding/browser/webBrowser/Makefile.in
@ -63,7 +63,6 @@ REQUIRES	= xpcom \
 		  shistory \
 		  webshell \
 		  windowwatcher \
-		  history \
 		  webbrowserpersist \
 		  unicharutil \
 		  imglib2 \
--- a/embedding/components/commandhandler/src/Makefile.in
+++ b/embedding/components/commandhandler/src/Makefile.in
@ -47,7 +47,6 @@ REQUIRES	= string \
 		  xpcom \
 		  dom \
 		  widget \
-		  content \
 		  necko \
 		  xuldoc \
 		  caps \
--- a/embedding/components/jsconsole/src/Makefile.in
+++ b/embedding/components/jsconsole/src/Makefile.in
@ -48,7 +48,6 @@ LIBXUL_LIBRARY	= 1

 REQUIRES	= jsconsole \
 		  xpcom \
-		  string \
 		  dom \
 		  windowwatcher \
 		  js \
--- a/embedding/components/printingui/src/unixshared/Makefile.in
+++ b/embedding/components/printingui/src/unixshared/Makefile.in
@ -52,16 +52,9 @@ REQUIRES	= xpcom \
 		  windowwatcher \
 		  widget \
 		  gfx \
-		  js \
-		  xpconnect \
-		  caps \
 		  layout \
-		  necko \
 		  uriloader \
-		  docshell \
 		  webbrwsr \
-		  embed_base \
-		  intl \
 		  $(NULL)

 CPPSRCS		= \
--- a/extensions/cookie/Makefile.in
+++ b/extensions/cookie/Makefile.in
@ -58,7 +58,6 @@ REQUIRES	= xpcom \
 		  widget \
 		  content \
 		  pref \
-		  uriloader \
 		  windowwatcher \
 		  docshell \
 		  appshell \
--- a/extensions/permissions/Makefile.in
+++ b/extensions/permissions/Makefile.in
@ -58,8 +58,6 @@ REQUIRES	= xpcom \
 		  content \
 		  pref \
 		  docshell \
-		  appshell \
-		  cookie \
 		  $(NULL)

 CPPSRCS		= \
--- a/extensions/pref/system-pref/src/Makefile.in
+++ b/extensions/pref/system-pref/src/Makefile.in
@ -55,8 +55,6 @@ FORCE_STATIC_LIB = 1
 REQUIRES        = xpcom \
 		  string \
 		  embedcomponents \
-		  mozcomps \
-                  profile \
 		  pref \
 		  $(NULL)

--- a/extensions/xmlextras/build/src/Makefile.in
+++ b/extensions/xmlextras/build/src/Makefile.in
@ -60,7 +60,6 @@ REQUIRES	= xpcom \
 		  js \
 		  content \
 		  widget \
-		  caps \
 		  necko \
 		  embedcomponents \
 		  xpconnect \
--- a/gfx/src/gtk/Makefile.in
+++ b/gfx/src/gtk/Makefile.in
@ -62,9 +62,7 @@ REQUIRES	= xpcom \
 		  locale \
 		  necko \
 		  content \
-		  dom \
 		  layout \
-		  imglib2 \
 		  $(NULL)

 # Sun's Complex Text Layout support
--- a/gfx/src/xprint/Makefile.in
+++ b/gfx/src/xprint/Makefile.in
@ -58,7 +58,6 @@ REQUIRES	= xpcom \
 		  xlibrgb \
 		  xprintutil \
 		  widget \
-		  view \
 		  pref \
 		  locale \
 		  uconv \
--- a/intl/build/Makefile.in
+++ b/intl/build/Makefile.in
@ -62,7 +62,6 @@ REQUIRES	= xpcom \
 		  locale \
 		  htmlparser \
 		  content \
-		  dom \
 		  widget \
 		  webshell \
 		  necko \
--- a/intl/locale/src/unix/Makefile.in
+++ b/intl/locale/src/unix/Makefile.in
@ -52,7 +52,6 @@ REQUIRES	= xpcom \
 		  unicharutil \
 		  pref \
 		  uconv \
-		  intl \
 		  $(NULL)

 CPPSRCS		= \
--- a/intl/uconv/src/Makefile.in
+++ b/intl/uconv/src/Makefile.in
@ -62,7 +62,6 @@ REQUIRES	= xpcom \
 		  locale \
 		  unicharutil \
 		  chardet \
-		  ucnative \
 		  $(NULL)

 CSRCS		= \
@ -96,6 +95,9 @@ CPPSRCS         += \
 		nsUnicodeToMacRoman.cpp \
 		nsUnicodeToUTF8.cpp \
 		$(NULL)
+
+REQUIRES	+= ucnative
+
 endif

 EXPORT_RESOURCE	= \
--- a/intl/uconv/util/Makefile.in
+++ b/intl/uconv/util/Makefile.in
@ -50,7 +50,6 @@ LIBXUL_LIBRARY = 1

 MODULE_NAME	= nsUCUtil
 REQUIRES	= xpcom \
-		  string \
 		  $(NULL)

 CPPSRCS		= \
--- a/js/src/xpconnect/loader/Makefile.in
+++ b/js/src/xpconnect/loader/Makefile.in
@ -51,7 +51,6 @@ REQUIRES	= xpcom \
 		  xpconnect \
 		  js \
 		  caps \
-		  dom \
 		  necko \
 		  $(NULL)

--- a/layout/base/Makefile.in
+++ b/layout/base/Makefile.in
@ -72,7 +72,6 @@ REQUIRES	= xpcom \
 		  htmlparser \
 		  util \
 		  windowwatcher \
-		  intl \
 		  accessibility \
 		  $(NULL)

--- a/layout/generic/Makefile.in
+++ b/layout/generic/Makefile.in
@ -65,7 +65,6 @@ REQUIRES	= xpcom \
 		  mimetype \
 		  webbrwsr \
 		  oji \
-		  util \
 		  unicharutil \
 		  lwbrk \
 		  imglib2 \
--- a/layout/xtf/src/Makefile.in
+++ b/layout/xtf/src/Makefile.in
@ -54,10 +54,7 @@ REQUIRES	= xpcom \
 		  widget \
 		  dom \
 		  locale \
-		  view \
-		  pref \
 		  necko \
-		  unicharutil \
 		  webshell \
 		  $(NULL)

--- a/modules/libjar/Makefile.in
+++ b/modules/libjar/Makefile.in
@ -72,9 +72,7 @@ REQUIRES	= xpcom \
 		  caps \
 		  mimetype \
 		  js \
-		  pref \
 		  xpconnect \
-		  uconv \
 		  necko \
 		  $(ZLIB_REQUIRES) \
 		  $(NULL)
--- a/modules/libjar/standalone/Makefile.in
+++ b/modules/libjar/standalone/Makefile.in
@ -46,10 +46,7 @@ include $(srcdir)/../objs.mk

 MODULE		= jar
 LIBRARY_NAME	= jar$(VERSION_NUMBER)_s
-REQUIRES	= xpcom \
-		  string \
-		  caps \
-		  zlib \
+REQUIRES	= zlib \
 		  $(NULL)

 #DEP_XPIDLSRCS	= $(MODULES_LIBJAR_XPIDLSRCS)
--- a/modules/libpr0n/decoders/png/Makefile.in
+++ b/modules/libpr0n/decoders/png/Makefile.in
@ -51,7 +51,6 @@ LIBXUL_LIBRARY = 1
 EXTRA_DSO_LIBS	= gkgfx

 REQUIRES	= xpcom \
-		  string \
 		  gfx \
 		  imglib2 \
 		  $(PNG_REQUIRES) \
--- a/modules/oji/src/Makefile.in
+++ b/modules/oji/src/Makefile.in
@ -58,7 +58,6 @@ REQUIRES	= xpcom \
 		  plugin \
 		  caps \
 		  pref \
-		  jar \
 		  necko \
 		  dom \
 		  widget \
--- a/modules/plugin/samples/default/unix/Makefile.in
+++ b/modules/plugin/samples/default/unix/Makefile.in
@ -49,7 +49,6 @@ GRE_MODULE   = 1
 PACKAGE_FILE = npnul.pkg

 REQUIRES	= java \
-		  plugin \
 		  $(NULL)

 CSRCS		= \
--- a/modules/plugin/samples/unixprinting/Makefile.in
+++ b/modules/plugin/samples/unixprinting/Makefile.in
@ -49,7 +49,6 @@ GRE_MODULE   = 1
 PACKAGE_FILE = npprint.pkg

 REQUIRES	= java \
-		  plugin \
 		  $(NULL)

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

--- a/netwerk/mime/src/Makefile.in
+++ b/netwerk/mime/src/Makefile.in
@ -48,7 +48,6 @@ LIBXUL_LIBRARY  = 1

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

--- a/security/manager/pki/src/Makefile.in
+++ b/security/manager/pki/src/Makefile.in
@ -68,7 +68,6 @@ REQUIRES	= nspr \
 		  xpcom \
 		  string \
 		  dom \
-		  pref \
 		  intl \
 		  locale \
 		  windowwatcher \
--- a/security/manager/ssl/src/Makefile.in
+++ b/security/manager/ssl/src/Makefile.in
@ -111,7 +111,6 @@ REQUIRES	= nspr \
 		  layout \
 		  content \
 		  xpconnect \
-		  jar \
 		  unicharutil \
 		  pipboot \
 		  $(NULL)
--- a/toolkit/components/build/Makefile.in
+++ b/toolkit/components/build/Makefile.in
@ -75,16 +75,11 @@ REQUIRES = 	\
 		xpinstall \
 		xulapp \
 		embed_base \
-		embedcomponents \
 		content \
 		find \
 		gfx \
 		locale \
-		necko \
 		unicharutil \
-		view \
-		webshell \
-		webbrwsr \
 		xuldoc \
 		$(NULL)

--- a/toolkit/components/downloads/src/Makefile.in
+++ b/toolkit/components/downloads/src/Makefile.in
@ -60,10 +60,9 @@ REQUIRES  = xpcom \
            webbrowserpersist \
            appshell \
            dom \
-            toolkitcomps \
            xpinstall \
            $(NULL)
-            
+
 ifeq ($(OS_ARCH),WINNT)
 REQUIRES += alerts
 endif
--- a/toolkit/components/passwordmgr/base/Makefile.in
+++ b/toolkit/components/passwordmgr/base/Makefile.in
@ -51,7 +51,6 @@ REQUIRES = 	\
 		xpcom \
 		string \
 		windowwatcher \
-		layout \
 		uriloader \
 		pref \
 		intl \
--- a/toolkit/components/satchel/src/Makefile.in
+++ b/toolkit/components/satchel/src/Makefile.in
@ -47,7 +47,7 @@ MODULE = satchel
 LIBRARY_NAME = satchel_s
 FORCE_STATIC_LIB = 1

-REQUIRES = 	\
+REQUIRES =	\
 		xpcom \
 		string \
 		autocomplete \
@ -63,8 +63,6 @@ REQUIRES = 	\
 		locale \
 		mork \
 		unicharutil \
-		js \
-		windowwatcher \
 		intl \
 		pref \
 		$(NULL)
--- a/toolkit/components/startup/src/Makefile.in
+++ b/toolkit/components/startup/src/Makefile.in
@ -48,22 +48,17 @@ FORCE_STATIC_LIB = 1
 REQUIRES = \
 	xpcom \
 	string \
-	js \
 	widget \
 	appshell \
 	appcomps \
-	docshell \
 	exthandler \
-	webshell \
 	dom \
-	necko \
 	pref \
 	profile \
 	embed_base \
 	webbrwsr \
 	windowwatcher \
 	intl \
-	util \
 	xulapp \
 	$(NULL)

--- a/toolkit/components/typeaheadfind/src/Makefile.in
+++ b/toolkit/components/typeaheadfind/src/Makefile.in
@ -48,12 +48,10 @@ FORCE_STATIC_LIB = 1

 PACKAGE_FILE = typeaheadfind.pkg

-REQUIRES = embedcomponents \
-		  content \
+REQUIRES	= content \
 		  docshell \
 		  dom \
 		  find \
-		  intl \
 		  gfx \
 		  layout \
 		  locale \
--- a/toolkit/profile/src/Makefile.in
+++ b/toolkit/profile/src/Makefile.in
@ -49,7 +49,6 @@ FORCE_STATIC_LIB = 1
 REQUIRES = \
 		xpcom \
 		string \
-		appcomps \
 		$(NULL)

 LOCAL_INCLUDES = \
--- a/toolkit/xre/Makefile.in
+++ b/toolkit/xre/Makefile.in
@ -50,7 +50,6 @@ REQUIRES = \
 	appcomps \
 	toolkitcomps \
 	appshell \
-	appstartup \
 	content \
 	docshell \
 	dom \
@ -58,21 +57,15 @@ REQUIRES = \
 	embedcomponents \
 	extensions \
 	gfx \
-	intl \
 	js \
-	locale \
 	necko \
 	pref \
 	profile \
 	shellservice \
 	string \
-	uconv \
 	uriloader \
-	webbrwsr \
 	widget \
 	windowwatcher \
-  winhooks \
-	xulapp \
 	xpcom \
 	xpconnect \
 	xpinstall \
--- a/uriloader/base/Makefile.in
+++ b/uriloader/base/Makefile.in
@ -59,7 +59,6 @@ REQUIRES	= xpcom \
 		  widget \
 		  caps \
 		  intl \
-		  webshell \
 		  xpconnect \
 		  mimetype \
 		  locale \
--- a/view/src/Makefile.in
+++ b/view/src/Makefile.in
@ -54,9 +54,7 @@ REQUIRES	= xpcom \
 		  gfx \
 		  widget \
 		  dom \
-		  locale \
 		  pref \
-		  necko \
 		  $(NULL)

 EXTRA_DSO_LIBS = gkgfx
--- a/widget/src/xremoteclient/Makefile.in
+++ b/widget/src/xremoteclient/Makefile.in
@ -52,7 +52,6 @@ LIBXUL_LIBRARY = 1
 PACKAGE_FILE = xremoteclient.pkg

 REQUIRES	= xpcom \
-		  string \
 		  $(NULL)

 CPPSRCS		= \
--- a/xpfe/appshell/src/Makefile.in
+++ b/xpfe/appshell/src/Makefile.in
@ -71,11 +71,9 @@ REQUIRES	= xpcom \
 		  xpconnect \
 		  intl \
 		  windowwatcher \
-		  browser \
 		  caps \
 		  unicharutil \
 		  uconv \
-		  exthandler \
 		  $(NULL)

 CPPSRCS		= \
--- a/xpfe/browser/src/Makefile.in
+++ b/xpfe/browser/src/Makefile.in
@ -48,7 +48,6 @@ FORCE_STATIC_LIB = 1
 MODULE_NAME	= nsBrowserModule
 REQUIRES	= xpcom \
 		  string \
-		  webshell \
 		  necko \
 		  shistory \
 		  widget \
@ -60,7 +59,6 @@ REQUIRES	= xpcom \
 		  js \
 		  uriloader \
 		  pref \
-		  appcomps \
 		  webbrwsr \
 		  windowwatcher \
 		  history \
--- a/xpfe/components/xremote/src/Makefile.in
+++ b/xpfe/components/xremote/src/Makefile.in
@ -62,8 +62,6 @@ REQUIRES	= xpcom \
 		  necko \
 		  appshell \
 		  toolkitcomps \
-		  appcomps \
-		  rdf \
 		  exthandler \
 		  profile \
 		  $(NULL)
--- a/xpinstall/src/Makefile.in
+++ b/xpinstall/src/Makefile.in
@ -82,7 +82,6 @@ REQUIRES	= xpcom \
 		  unicharutil \
 		  appshell \
 		  docshell \
-		  cookie \
 		  layout \
 		  chrome \
 		  extensions \