diff --git a/content/html/content/src/Makefile.in b/content/html/content/src/Makefile.in
index 96e100f2786..b6487a67c00 100644
--- a/content/html/content/src/Makefile.in
+++ b/content/html/content/src/Makefile.in
@@ -32,7 +32,6 @@ REQUIRES = xpcom \
string \
gfx \
layout \
- uriloader \
widget \
dom \
js \
diff --git a/dom/src/jsurl/Makefile.in b/dom/src/jsurl/Makefile.in
index 8e669082e74..40678cb708b 100644
--- a/dom/src/jsurl/Makefile.in
+++ b/dom/src/jsurl/Makefile.in
@@ -39,7 +39,6 @@ REQUIRES = xpcom \
caps \
widget \
appshell \
- rdf \
xpconnect \
jsconsole \
$(NULL)
diff --git a/editor/base/Makefile.in b/editor/base/Makefile.in
index b76aa4ab7b5..e69de29bb2d 100644
--- a/editor/base/Makefile.in
+++ b/editor/base/Makefile.in
@@ -1,160 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation. Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s):
-#
-
-DEPTH = ../..
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE = editor
-LIBRARY_NAME = editor
-EXPORT_LIBRARY = 1
-IS_COMPONENT = 1
-MODULE_NAME = nsEditorModule
-REQUIRES = xpcom \
- string \
- dom \
- locale \
- gfx \
- layout \
- content \
- uriloader \
- widget \
- txmgr \
- htmlparser \
- necko \
- pref \
- view \
- appshell \
- rdf \
- webshell \
- timer \
- txtsvc \
- intl \
- lwbrk \
- docshell \
- chrome \
- appcomps \
- xuldoc \
- windowwatcher \
- exthandler \
- mimetype \
- $(NULL)
-
-CPPSRCS = \
- nsAOLCiter.cpp \
- ChangeAttributeTxn.cpp \
- CreateElementTxn.cpp \
- DeleteElementTxn.cpp \
- DeleteRangeTxn.cpp \
- DeleteTextTxn.cpp \
- EditAggregateTxn.cpp \
- EditTxn.cpp \
- IMETextTxn.cpp \
- InsertElementTxn.cpp \
- InsertTextTxn.cpp \
- JoinElementTxn.cpp \
- nsEditorCommands.cpp \
- nsComposerCommands.cpp \
- nsEditorController.cpp \
- nsComposerController.cpp \
- nsEditor.cpp \
- nsEditorEventListeners.cpp \
- nsEditorUtils.cpp \
- nsEditProperty.cpp \
- nsTextEditUtils.cpp \
- nsHTMLEditUtils.cpp \
- nsInternetCiter.cpp \
- nsPlaintextDataTransfer.cpp \
- nsPlaintextEditor.cpp \
- nsSelectionState.cpp \
- nsStyleSheetTxns.cpp \
- nsTextEditRules.cpp \
- nsWrapUtils.cpp \
- PlaceholderTxn.cpp \
- SplitElementTxn.cpp \
- TransactionFactory.cpp \
- $(NULL)
-
-ifdef IBMBIDI
-CPPSRCS += \
- nsTextEditRulesBidi.cpp \
- $(NULL)
-endif
-
-# MOZ_BUILD_PLAINTEXT_EDITOR_CORE_ONLY=1
-
-ifdef MOZ_BUILD_PLAINTEXT_EDITOR_CORE_ONLY
-
-# We're only building the Core PlainText Editor Source so just include
-# the plain text registration file.
-
-CPPSRCS += nsTextEditorReg.cpp
-
-DEFINES += -DMOZILLA_PLAINTEXT_EDITOR_ONLY
-
-else
-
-# Building the full blown HTML Editor so add it's source files and objects:
-
-CPPSRCS += nsEditorParserObserver.cpp \
- nsEditorRegistration.cpp \
- nsEditorShell.cpp \
- nsEditorShellMouseListener.cpp \
- nsEditorService.cpp \
- nsHTMLDataTransfer.cpp \
- nsHTMLEditor.cpp \
- nsHTMLEditorStyle.cpp \
- nsHTMLEditRules.cpp \
- nsInterfaceState.cpp \
- nsHTMLURIRefObject.cpp \
- nsTableEditor.cpp \
- nsWSRunObject.cpp \
- TextEditorTest.cpp \
- TypeInState.cpp \
- SetDocTitleTxn.cpp \
- $(NULL)
-
-# Enable Editor API Logging!
-ENABLE_EDITOR_API_LOG=1
-
-ifdef ENABLE_EDITOR_API_LOG
-
-CPPSRCS += nsHTMLEditorLog.cpp \
- nsEditorTxnLog.cpp \
- $(NULL)
-
-DEFINES += -DENABLE_EDITOR_API_LOG=1
-
-endif
-
-endif
-
-EXTRA_DSO_LDOPTS = \
- $(MOZ_NECKO_UTIL_LIBS) \
- $(MOZ_COMPONENT_LIBS) \
- $(MOZ_JS_LIBS) \
- $(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/editor/composer/src/Makefile.in b/editor/composer/src/Makefile.in
index 6d0959546f7..4b926187e88 100644
--- a/editor/composer/src/Makefile.in
+++ b/editor/composer/src/Makefile.in
@@ -35,14 +35,12 @@ REQUIRES = xpcom \
string \
dom \
layout \
- locale \
content \
uriloader \
txmgr \
htmlparser \
necko \
pref \
- view \
webshell \
timer \
intl \
diff --git a/editor/libeditor/base/Makefile.in b/editor/libeditor/base/Makefile.in
index d7d9b4fa349..1eceb64c052 100644
--- a/editor/libeditor/base/Makefile.in
+++ b/editor/libeditor/base/Makefile.in
@@ -35,19 +35,12 @@ REQUIRES = xpcom \
locale \
layout \
content \
- uriloader \
txmgr \
htmlparser \
necko \
pref \
view \
appshell \
- rdf \
- webshell \
- timer \
- txtsvc \
- intl \
- docshell \
gfx \
widget \
xuldoc \
diff --git a/editor/libeditor/build/Makefile.in b/editor/libeditor/build/Makefile.in
index 041a3d8e202..6576a9a9586 100644
--- a/editor/libeditor/build/Makefile.in
+++ b/editor/libeditor/build/Makefile.in
@@ -40,23 +40,11 @@ REQUIRES = xpcom \
string \
dom \
layout \
- locale \
content \
- uriloader \
txmgr \
htmlparser \
- necko \
- pref \
- view \
- webshell \
- timer \
- intl \
- docshell \
- gfx \
- widget \
appshell \
xuldoc \
- txtsvc \
$(NULL)
# MOZ_BUILD_PLAINTEXT_EDITOR_CORE_ONLY=1
diff --git a/editor/libeditor/html/Makefile.in b/editor/libeditor/html/Makefile.in
index ed9e5c1cbd3..ff3e84a8efc 100644
--- a/editor/libeditor/html/Makefile.in
+++ b/editor/libeditor/html/Makefile.in
@@ -35,16 +35,10 @@ REQUIRES = xpcom \
layout \
locale \
content \
- uriloader \
txmgr \
htmlparser \
necko \
pref \
- view \
- webshell \
- timer \
- intl \
- docshell \
gfx \
widget \
$(NULL)
diff --git a/editor/libeditor/text/Makefile.in b/editor/libeditor/text/Makefile.in
index e7fe3b4c69d..92a881fe944 100644
--- a/editor/libeditor/text/Makefile.in
+++ b/editor/libeditor/text/Makefile.in
@@ -36,18 +36,12 @@ REQUIRES = xpcom \
locale \
layout \
content \
- uriloader \
txmgr \
htmlparser \
necko \
pref \
view \
- webshell \
- timer \
- txtsvc \
- intl \
lwbrk \
- docshell \
gfx \
widget \
$(NULL)
diff --git a/embedding/base/Makefile.in b/embedding/base/Makefile.in
index dc729f540b5..d23b4d4b506 100644
--- a/embedding/base/Makefile.in
+++ b/embedding/base/Makefile.in
@@ -35,11 +35,8 @@ REQUIRES = xpcom \
view \
dom \
necko \
- rdf \
- appshell \
uriloader \
gfx \
- editor \
intl \
chrome \
embedcomponents \
diff --git a/gfx/src/Makefile.in b/gfx/src/Makefile.in
index aad0543ff96..4c6702503a4 100644
--- a/gfx/src/Makefile.in
+++ b/gfx/src/Makefile.in
@@ -32,7 +32,6 @@ LIBRARY_NAME = gkgfx
EXPORT_LIBRARY = 1
REQUIRES = xpcom \
string \
- content \
widget \
locale \
view \
diff --git a/intl/locale/src/Makefile.in b/intl/locale/src/Makefile.in
index 8d6c8ab8482..a50f1a7be39 100644
--- a/intl/locale/src/Makefile.in
+++ b/intl/locale/src/Makefile.in
@@ -33,7 +33,6 @@ REQUIRES = xpcom \
uconv \
unicharutil \
necko \
- intl \
$(NULL)
ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
diff --git a/intl/uconv/src/Makefile.in b/intl/uconv/src/Makefile.in
index ac1b59e5bbe..53786116e33 100644
--- a/intl/uconv/src/Makefile.in
+++ b/intl/uconv/src/Makefile.in
@@ -40,7 +40,6 @@ REQUIRES = xpcom \
locale \
chardet \
necko \
- pref \
$(NULL)
CSRCS = \
diff --git a/js/jsd/Makefile.in b/js/jsd/Makefile.in
index 28efdeac78c..247024fb224 100644
--- a/js/jsd/Makefile.in
+++ b/js/jsd/Makefile.in
@@ -37,7 +37,6 @@ REQUIRES = xpcom \
js \
xpconnect \
widget \
- appshell \
pref \
$(NULL)
diff --git a/js/src/xpconnect/src/Makefile.in b/js/src/xpconnect/src/Makefile.in
index 1e06f562b24..67cfcefefcc 100644
--- a/js/src/xpconnect/src/Makefile.in
+++ b/js/src/xpconnect/src/Makefile.in
@@ -48,7 +48,6 @@ MODULE_NAME = xpconnect
REQUIRES = xpcom \
string \
js \
- dom \
caps \
$(NULL)
diff --git a/profile/pref-migrator/src/Makefile.in b/profile/pref-migrator/src/Makefile.in
index afe9860d63c..1c0970a4034 100644
--- a/profile/pref-migrator/src/Makefile.in
+++ b/profile/pref-migrator/src/Makefile.in
@@ -39,7 +39,6 @@ REQUIRES = xpcom \
docshell \
dom \
necko \
- rdf \
widget \
webbrwsr \
uconv \
diff --git a/profile/src/Makefile.in b/profile/src/Makefile.in
index d46c7329204..3f5e23fb48d 100644
--- a/profile/src/Makefile.in
+++ b/profile/src/Makefile.in
@@ -45,7 +45,6 @@ REQUIRES = xpcom \
pref \
prefmigr \
appshell \
- rdf \
uconv \
appcomps \
windowwatcher \
diff --git a/xpcom/glue/Makefile.in b/xpcom/glue/Makefile.in
index 92e27cde9cf..0e115b50097 100644
--- a/xpcom/glue/Makefile.in
+++ b/xpcom/glue/Makefile.in
@@ -30,7 +30,7 @@ MODULE = xpcom
XPIDL_MODULE = xpcom_glue
LIBRARY_NAME = xpcomglue
-REQUIRES = string
+REQUIRES = $(NULL)
CPPSRCS = \
nsCOMPtr.cpp \
diff --git a/xpfe/bootstrap/Makefile.in b/xpfe/bootstrap/Makefile.in
index c61077e8a76..b4b2ffaf157 100644
--- a/xpfe/bootstrap/Makefile.in
+++ b/xpfe/bootstrap/Makefile.in
@@ -39,10 +39,8 @@ REQUIRES = xpcom \
appshell \
gfx \
chrome \
- rdf \
xpinstall \
uriloader \
- editor \
view \
windowwatcher \
embed_base \
diff --git a/xpfe/browser/src/Makefile.in b/xpfe/browser/src/Makefile.in
index 01b27bbae76..b5af6914990 100644
--- a/xpfe/browser/src/Makefile.in
+++ b/xpfe/browser/src/Makefile.in
@@ -48,7 +48,6 @@ REQUIRES = xpcom \
pref \
editor \
appcomps \
- rdf \
webbrwsr \
uconv \
chardet \
diff --git a/xpinstall/src/Makefile.in b/xpinstall/src/Makefile.in
index d3f5da90bf8..44749427f36 100644
--- a/xpinstall/src/Makefile.in
+++ b/xpinstall/src/Makefile.in
@@ -51,7 +51,6 @@ REQUIRES = xpcom \
libreg \
js \
pref \
- appshell \
widget \
layout \
content \
@@ -59,7 +58,6 @@ REQUIRES = xpcom \
xpconnect \
docshell \
dom \
- mozcomps \
windowwatcher \
$(ZLIB_REQUIRES) \
$(NULL)