diff --git a/mozilla/accessible/build/makefile.win b/mozilla/accessible/build/makefile.win
index d4d91331139..63377bea339 100644
--- a/mozilla/accessible/build/makefile.win
+++ b/mozilla/accessible/build/makefile.win
@@ -21,6 +21,7 @@
 
 DEPTH=..\..
 MODULE=accessibility
+REQUIRES	= xpcom string dom
 LIBRARY_NAME=accessibility
 MODULE_NAME=nsAccessibilityModule
 
diff --git a/mozilla/accessible/src/makefile.win b/mozilla/accessible/src/makefile.win
index 1237bb0ed5e..b599138ef72 100644
--- a/mozilla/accessible/src/makefile.win
+++ b/mozilla/accessible/src/makefile.win
@@ -22,6 +22,7 @@
 DEPTH=..\..
 MODULE=accessibility
 LIBRARY_NAME=accessibility_s
+REQUIRES  = xpcom string layout content widget dom view locale intl docshell webshell necko htmlparser xuldoc imglib2 gfx gfx2 raptor
 
 CPP_OBJS=\
         .\$(OBJDIR)\nsAccessible.obj    \
diff --git a/mozilla/caps/src/makefile.win b/mozilla/caps/src/makefile.win
index d14c3879acf..ff7f6c36271 100755
--- a/mozilla/caps/src/makefile.win
+++ b/mozilla/caps/src/makefile.win
@@ -44,6 +44,7 @@ DEPTH= ..\..
 MODULE=caps
 LIBRARY_NAME=caps
 MODULE_NAME=nsSecurityManagerModule
+REQUIRES	= xpcom string pref js dom xpconnect necko jar widget plugin intl docshell windowwatcher
 
 #//------------------------------------------------------------------------
 #// 
@@ -78,23 +79,6 @@ CPP_OBJS=                                    \
 #//     (ie. LCFLAGS, LLFLAGS, LLIBS, LINCS)
 #//
 #//------------------------------------------------------------------------
-LINCS= $(LINCS) \
-		-I$(PUBLIC)\js \
-		-I$(XPDIST)\public\js \
-		-I$(PUBLIC)\nspr \
-		-I$(PUBLIC)\xpcom \
-		-I$(PUBLIC)\security \
-		-I$(PUBLIC)\libimg   \
-		-I$(PUBLIC)\jar \
-		-I$(PUBLIC)\zlib \
-		-I$(PUBLIC)\pref \
-		-I$(DEPTH)\lib\layout \
-		-I$(DEPTH)\lib\libstyle \
-		-I$(PUBLIC)\caps \
-		-I$(PUBLIC)\public \
-		-I$(PUBLIC)\xpconnect \
-#		-I$(PUBLIC)\rdf \
-		$(NULL)
 
 LLIBS = \
 	$(LIBNSPR)                    \
diff --git a/mozilla/directory/xpcom/base/src/makefile.win b/mozilla/directory/xpcom/base/src/makefile.win
index 0b9e0ebd049..64cc4f5b77c 100644
--- a/mozilla/directory/xpcom/base/src/makefile.win
+++ b/mozilla/directory/xpcom/base/src/makefile.win
@@ -17,9 +17,11 @@
 
 DEPTH=..\..\..\..
 
+MODULE=mozldap
+REQUIRES	= xpcom string necko
+
 include <$(DEPTH)\config\config.mak>
 
-MODULE=mozldap
 LIBRARY_NAME=mozldap
 MODULE_NAME=nsLDAPProtocolModule
 
diff --git a/mozilla/docshell/base/makefile.win b/mozilla/docshell/base/makefile.win
index aafdb3b1ad8..f75747be05f 100644
--- a/mozilla/docshell/base/makefile.win
+++ b/mozilla/docshell/base/makefile.win
@@ -20,7 +20,9 @@
 #   Travis Bogard <travis@netscape.com>
 
 DEPTH=..\..
-MODULE=docshell_base
+MODULE=docshell
+XPIDL_MODULE=docshell_base
+REQUIRES	= xpcom string caps necko layout dom js uriloader exthandler htmlparser view pref locale webBrowser_core xpconnect timer widget shistory intl plugin gkplugin webshell chardet uconv appcomps xuldoc find nkcache content raptor gfx history
 
 LIBRARY_NAME=basedocshell_s
 
diff --git a/mozilla/docshell/build/makefile.win b/mozilla/docshell/build/makefile.win
index 3b93c01635e..622988c3932 100644
--- a/mozilla/docshell/build/makefile.win
+++ b/mozilla/docshell/build/makefile.win
@@ -20,9 +20,10 @@
 # Contributor(s): 
 
 DEPTH=..\..
+MODULE=docshell
+REQUIRES	= xpcom string dom shistory necko layout uriloader timer webshell widget pref view intl htmlparser chardet appcomps find raptor gfx history
 include <$(DEPTH)\config\config.mak>
 
-MODULE=docshell
 LIBRARY_NAME=docshell
 MODULE_NAME=docshell_provider
 
diff --git a/mozilla/dom/public/idl/base/makefile.win b/mozilla/dom/public/idl/base/makefile.win
index e712e442b01..5cf758615ab 100644
--- a/mozilla/dom/public/idl/base/makefile.win
+++ b/mozilla/dom/public/idl/base/makefile.win
@@ -22,7 +22,8 @@
 DEPTH=..\..\..\..
 
 
-MODULE=dom_base
+MODULE=dom
+XPIDL_MODULE=dom_base
 
 XPIDLSRCS =					\
 	.\domstubs.idl				\
diff --git a/mozilla/dom/public/makefile.win b/mozilla/dom/public/makefile.win
index b32c6866967..18e73b0e9e7 100644
--- a/mozilla/dom/public/makefile.win
+++ b/mozilla/dom/public/makefile.win
@@ -21,10 +21,10 @@
 
 DEPTH=..\..
 
+MODULE=dom 
 include <$(DEPTH)\config\config.mak>
 
 DIRS=idl coreEvents base
-MODULE=dom 
 
 XPIDLSRCS = \
 	.\nsIScriptContextOwner.idl \
diff --git a/mozilla/dom/src/base/makefile.win b/mozilla/dom/src/base/makefile.win
index 49e8c335883..c7b998096b8 100644
--- a/mozilla/dom/src/base/makefile.win
+++ b/mozilla/dom/src/base/makefile.win
@@ -27,6 +27,7 @@ LIBRARY_NAME=jsdombase_s
 DEFINES=-D_IMPL_NS_DOM -DWIN32_LEAN_AND_MEAN
 
 LINCS= -I..\build
+REQUIRES	= xpcom string webBrowser_core js widget gfx layout layout_xul content raptor caps docshell xpconnect pref oji necko java locale uriloader sidebar xuldoc timer webshell view uconv shistory plugin gkplugin windowwatcher htmlparser chardet transformiix xmlextras xsl_doc
 
 CPPSRCS =			\
 	nsBarProps.cpp          \
diff --git a/mozilla/dom/src/build/makefile.win b/mozilla/dom/src/build/makefile.win
index 8664c845803..307926c0a01 100644
--- a/mozilla/dom/src/build/makefile.win
+++ b/mozilla/dom/src/build/makefile.win
@@ -20,6 +20,8 @@
 # Contributor(s): 
 
 DEPTH=..\..\..
+MODULE=dom
+REQUIRES	= xpcom string js xpconnect widget layout caps timer webBrowser_core xuldoc docshell sidebar plugin gkplugin necko gfx content raptor
 include <$(DEPTH)/config/config.mak>
 
 DEFINES=-D_IMPL_NS_DOM
@@ -32,7 +34,6 @@ CPP_OBJS = .\$(OBJDIR)\nsDOMFactory.obj			\
 	   .\$(OBJDIR)\nsScriptNameSpaceManager.obj 
 
 
-MODULE=dom
 LIBRARY_NAME=jsdom
 MODULE_NAME=DOM_components
 
diff --git a/mozilla/dom/src/events/makefile.win b/mozilla/dom/src/events/makefile.win
index 64a408399c1..056babaf42b 100644
--- a/mozilla/dom/src/events/makefile.win
+++ b/mozilla/dom/src/events/makefile.win
@@ -23,7 +23,8 @@ DEPTH=..\..\..
 
 
 LIBRARY_NAME=jsdomevents_s
-MODULE=raptor
+MODULE=dom
+REQUIRES	= xpcom string js caps xpconnect
 
 DEFINES=-D_IMPL_NS_DOM -DWIN32_LEAN_AND_MEAN
 
diff --git a/mozilla/dom/src/jsurl/makefile.win b/mozilla/dom/src/jsurl/makefile.win
index 1870e0095b1..6a7df8848e9 100644
--- a/mozilla/dom/src/jsurl/makefile.win
+++ b/mozilla/dom/src/jsurl/makefile.win
@@ -21,6 +21,7 @@
 
 DEPTH=..\..\..
 MODULE=jsurl
+REQUIRES	= xpcom string js dom necko caps widget appshell rdf xpconnect jsconsole raptor
 include <$(DEPTH)/config/config.mak>
 
 MODULE=jsurl
@@ -53,7 +54,7 @@ LLIBS=  \
 OBJS=   \
 	.\$(OBJDIR)\nsJSProtocolHandler.obj	\
 	$(NULL)
-	
+
 CPPSRCS = \
 	nsJSProtocolHandler.cpp	\
 	$(NULL)
diff --git a/mozilla/editor/base/makefile.win b/mozilla/editor/base/makefile.win
index 9b45229a0e0..5e30e02b413 100644
--- a/mozilla/editor/base/makefile.win
+++ b/mozilla/editor/base/makefile.win
@@ -21,6 +21,8 @@
 
 DEPTH=..\..
 
+MODULE=editor 
+REQUIRES	= xpcom string dom locale layout uriloader widget txmgr htmlparser necko pref view appshell rdf webshell timer txtsvc intl lwbrk docshell chrome appcomps xuldoc windowwatcher exthandler mimetype content raptor gfx
 include <$(DEPTH)/config/config.mak>
 
 LIBRARY_NAME=editor
@@ -184,7 +186,6 @@ DEFINES = -DENABLE_EDITOR_API_LOG $(DEFINES)
 
 !endif
 
-MODULE=editor 
 LIBRARY_NAME=editor
 MODULE_NAME=nsEditorModule
 
diff --git a/mozilla/editor/txmgr/src/makefile.win b/mozilla/editor/txmgr/src/makefile.win
index f1da868602b..93440abdd54 100644
--- a/mozilla/editor/txmgr/src/makefile.win
+++ b/mozilla/editor/txmgr/src/makefile.win
@@ -23,6 +23,8 @@ DEPTH=..\..\..
 
 
 LIBRARY_NAME=txmgr
+MODULE=txmgr 
+REQUIRES	= xpcom string
 
 CPPSRCS =				\
 	nsTransactionItem.cpp	\
@@ -40,14 +42,9 @@ CPP_OBJS =					\
 	.\$(OBJDIR)\nsTransactionManagerFactory.obj	\
 	$(NULL)
 
-MODULE=txmgr 
 LIBRARY_NAME=txmgr
 MODULE_NAME=nsTransactionManagerModule
 
-LINCS=-I$(PUBLIC)\xpcom \
-      -I$(PUBLIC)\txmgr \
-      -I$(PUBLIC)\base \
-      -I$(PUBLIC)\raptor
 LCFLAGS = \
         $(LCFLAGS) \
         $(DEFINES) \
diff --git a/mozilla/editor/txtsvc/src/makefile.win b/mozilla/editor/txtsvc/src/makefile.win
index 0d7d061afcb..c44ea8cd874 100644
--- a/mozilla/editor/txtsvc/src/makefile.win
+++ b/mozilla/editor/txtsvc/src/makefile.win
@@ -22,6 +22,7 @@
 DEPTH=..\..\..
 
 MODULE=txtsvc
+REQUIRES	= xpcom string editor content layout dom widget gfx
 LIBRARY_NAME=txtsvc
 MODULE_NAME=nsTextServicesModule
 
diff --git a/mozilla/embedding/base/makefile.win b/mozilla/embedding/base/makefile.win
index dfe0cb6130b..0f256f10f10 100644
--- a/mozilla/embedding/base/makefile.win
+++ b/mozilla/embedding/base/makefile.win
@@ -21,6 +21,7 @@
 
 DEPTH=..\..
 MODULE=embed_base
+REQUIRES	= xpcom string widget view dom necko rdf appshell uriloader layout editor intl chrome embedcomponents timer gfx
 
 EXPORTS =                  \
         nsEmbedAPI.h       \
diff --git a/mozilla/embedding/browser/build/makefile.win b/mozilla/embedding/browser/build/makefile.win
index 6043bd75a95..5b83a4e01e9 100644
--- a/mozilla/embedding/browser/build/makefile.win
+++ b/mozilla/embedding/browser/build/makefile.win
@@ -22,9 +22,11 @@
 
 DEPTH=..\..\..
 
+MODULE=webBrowser_core
+REQUIRES	= xpcom string docshell dom widget layout necko uriloader shistory timer windowwatcher gfx content
+
 include <$(DEPTH)\config\config.mak>
 
-MODULE=webbrwsr 
 LIBRARY_NAME=webbrwsr
 MODULE_NAME=Browser_Embedding_Module
 
diff --git a/mozilla/embedding/browser/webBrowser/makefile.win b/mozilla/embedding/browser/webBrowser/makefile.win
index 31dddf32bfa..83c4145035f 100644
--- a/mozilla/embedding/browser/webBrowser/makefile.win
+++ b/mozilla/embedding/browser/webBrowser/makefile.win
@@ -21,6 +21,7 @@
 
 DEPTH=..\..\..
 MODULE=webBrowser_core
+REQUIRES	= xpcom string docshell widget layout dom js necko uriloader shistory webshell mimetype exthandler timer windowwatcher wallet appcomps gfx raptor content history
 
 XPIDLSRCS=                        \
     .\nsIContextMenuListener.idl   \
diff --git a/mozilla/embedding/components/appstartup/src/makefile.win b/mozilla/embedding/components/appstartup/src/makefile.win
index 2aa740f8e03..182d4b89990 100644
--- a/mozilla/embedding/components/appstartup/src/makefile.win
+++ b/mozilla/embedding/components/appstartup/src/makefile.win
@@ -21,6 +21,7 @@
 DEPTH=..\..\..\..
 
 MODULE=embedcomponents
+REQUIRES	= xpcom string
 LIBRARY_NAME=appstartupnotifier_s
 
 EXPORTS = \
diff --git a/mozilla/embedding/components/build/makefile.win b/mozilla/embedding/components/build/makefile.win
index 179d3057365..84f2720468a 100644
--- a/mozilla/embedding/components/build/makefile.win
+++ b/mozilla/embedding/components/build/makefile.win
@@ -20,9 +20,10 @@
 
 DEPTH=..\..\..
 
+MODULE=embedcomponents
+REQUIRES	= js xpcom string windowwatcher jsconsole find embed_base dom txtsvc
 include <$(DEPTH)\config\config.mak>
 
-MODULE=embedcomponents
 LIBRARY_NAME=embedcomponents
 MODULE_NAME=embedcomponents
 
diff --git a/mozilla/embedding/components/find/src/makefile.win b/mozilla/embedding/components/find/src/makefile.win
index 79425ddf13d..e92593e2ff1 100644
--- a/mozilla/embedding/components/find/src/makefile.win
+++ b/mozilla/embedding/components/find/src/makefile.win
@@ -21,6 +21,7 @@
 DEPTH=..\..\..\..
 
 MODULE=embedcomponents
+REQUIRES	= string xpcom find txtsvc dom docshell layout widget content gfx
 LIBRARY_NAME=find_s
 
 CPP_OBJS= \
diff --git a/mozilla/embedding/components/jsconsole/src/makefile.win b/mozilla/embedding/components/jsconsole/src/makefile.win
index 33f34431b64..15a7a1f4bb4 100644
--- a/mozilla/embedding/components/jsconsole/src/makefile.win
+++ b/mozilla/embedding/components/jsconsole/src/makefile.win
@@ -21,6 +21,7 @@
 DEPTH=..\..\..\..
 
 MODULE=embedcomponents
+REQUIRES	= jsconsole xpcom string dom windowwatcher js
 LIBRARY_NAME=jsconsole_s
 
 CPP_OBJS= \
diff --git a/mozilla/embedding/components/windowwatcher/src/makefile.win b/mozilla/embedding/components/windowwatcher/src/makefile.win
index 736db57159c..2069cbd5b5e 100644
--- a/mozilla/embedding/components/windowwatcher/src/makefile.win
+++ b/mozilla/embedding/components/windowwatcher/src/makefile.win
@@ -21,6 +21,8 @@
 DEPTH=..\..\..\..
 
 MODULE=embedcomponents
+REQUIRES	= xpcom string dom windowwatcher widget js xpconnect caps layout necko docshell webBrowser_core embed_base wallet intl content
+
 LIBRARY_NAME=windowwatcher_s
 
 CPP_OBJS= \
diff --git a/mozilla/embedding/tests/winEmbed/makefile.win b/mozilla/embedding/tests/winEmbed/makefile.win
index 9ea5a04b8ea..8cb06821599 100644
--- a/mozilla/embedding/tests/winEmbed/makefile.win
+++ b/mozilla/embedding/tests/winEmbed/makefile.win
@@ -24,6 +24,7 @@ DEPTH=..\..\..
 MAKE_OBJ_TYPE   = EXE
 
 MODULE          = winEmbed
+REQUIRES		= xpcom string embed_base webBrowser_core raptor embedding windowwatcher profile necko docshell dom gfx widget layout uriloader shistory
 PROGRAM         = .\$(OBJDIR)\$(MODULE).exe
 RESFILE         = $(MODULE).res
 
diff --git a/mozilla/htmlparser/public/makefile.win b/mozilla/htmlparser/public/makefile.win
index ccb834191ae..a2116bc0908 100755
--- a/mozilla/htmlparser/public/makefile.win
+++ b/mozilla/htmlparser/public/makefile.win
@@ -21,8 +21,6 @@
 
 DEPTH=..\..
 
-include <$(DEPTH)\config\config.mak>
-
 MODULE  = htmlparser
 
 EXPORTS =                       \
diff --git a/mozilla/htmlparser/robot/makefile.win b/mozilla/htmlparser/robot/makefile.win
index 7dba7cac725..4b3206e07dd 100644
--- a/mozilla/htmlparser/robot/makefile.win
+++ b/mozilla/htmlparser/robot/makefile.win
@@ -27,6 +27,7 @@ LIBNAME = .\$(OBJDIR)\DebugRobot
 DLL = $(LIBNAME).dll
 
 DEPTH=..\..
+REQUIRES	= xpcom string htmlparser necko docshell dom uriloader
 
 include <$(DEPTH)\config\config.mak>
 
diff --git a/mozilla/htmlparser/robot/test/makefile.win b/mozilla/htmlparser/robot/test/makefile.win
index b700441f09a..ef021528f2f 100644
--- a/mozilla/htmlparser/robot/test/makefile.win
+++ b/mozilla/htmlparser/robot/test/makefile.win
@@ -21,7 +21,7 @@
 
 DEPTH=..\..\..
 
-
+REQUIRES=xpcom string raptor htmlparser
 MAKE_OBJ_TYPE   = EXE
 PROGRAM = .\$(OBJDIR)\htmlrobot.exe
 
diff --git a/mozilla/htmlparser/src/makefile.win b/mozilla/htmlparser/src/makefile.win
index abf5af08f5a..f248a88ef90 100644
--- a/mozilla/htmlparser/src/makefile.win
+++ b/mozilla/htmlparser/src/makefile.win
@@ -21,12 +21,13 @@
 
 DEPTH=..\..
 
+MODULE         = htmlparser
+REQUIRES       = xpcom string necko util uconv expat layout dom pref nkcache intl widget raptor content
 include <$(DEPTH)\config\config.mak>
 
 LIBRARY_NAME=raptorhtmlpars 
 DEFINES=-D_IMPL_NS_HTMLPARS -DWIN32_LEAN_AND_MEAN -DXML_DTD
 
-MODULE         = htmlparser
 LIBRARY_NAME   = gkparser
 MODULE_NAME	   = nsParserModule
 
diff --git a/mozilla/htmlparser/tests/outsinks/makefile.win b/mozilla/htmlparser/tests/outsinks/makefile.win
index d2c9936a26f..8f65f1a77bf 100644
--- a/mozilla/htmlparser/tests/outsinks/makefile.win
+++ b/mozilla/htmlparser/tests/outsinks/makefile.win
@@ -21,6 +21,7 @@
 
 DEPTH=..\..\..
 
+REQUIRES	= xpcom string htmlparser necko layout dom content
 
 MAKE_OBJ_TYPE   = EXE
 PROGRAM = .\$(OBJDIR)\TestOutput.exe
diff --git a/mozilla/modules/plugin/base/src/makefile.win b/mozilla/modules/plugin/base/src/makefile.win
index aed906bd3a9..85dbb646a3a 100644
--- a/mozilla/modules/plugin/base/src/makefile.win
+++ b/mozilla/modules/plugin/base/src/makefile.win
@@ -20,8 +20,6 @@
 # Contributor(s): 
 
 DEPTH=..\..\..\..
-include <$(DEPTH)/config/config.mak>
-
 
 EXPORTS =	\
         nsPluginsCID.h          \
@@ -31,6 +29,7 @@ EXPORTS =	\
 MODULE		= gkplugin
 LIBRARY_NAME	= gkplugin
 MODULE_NAME	= nsPluginModule
+REQUIRES	= xpcom string java pref necko gtkxtbin webshell caps intl dom content layout widget cookie mimetype oji exthandler docshell webBrowser_core timer windowwatcher plugin raptor gfx
 
 DEFINES =-D_IMPL_NS_PLUGIN -DWIN32_LEAN_AND_MEAN
 
diff --git a/mozilla/modules/plugin/samples/default/windows/makefile.win b/mozilla/modules/plugin/samples/default/windows/makefile.win
index 73e0a58cc2b..c005abcd124 100644
--- a/mozilla/modules/plugin/samples/default/windows/makefile.win
+++ b/mozilla/modules/plugin/samples/default/windows/makefile.win
@@ -20,6 +20,8 @@
 # Contributor(s): 
 
 DEPTH=..\..\..\..\..
+MODULE=npnul32
+REQUIRES=java
 include <$(DEPTH)/config/config.mak>
 
 
@@ -29,7 +31,6 @@ RESFILE = npnul32.res
 DEFFILE = npnul32.def
 DLL=.\$(OBJDIR)\$(DLLNAME).dll
 
-MODULE=npnul32 
 
 DEFINES =-D_IMPL_NS_PLUGIN -DWIN32_LEAN_AND_MEAN
 
diff --git a/mozilla/parser/htmlparser/public/makefile.win b/mozilla/parser/htmlparser/public/makefile.win
index ccb834191ae..a2116bc0908 100755
--- a/mozilla/parser/htmlparser/public/makefile.win
+++ b/mozilla/parser/htmlparser/public/makefile.win
@@ -21,8 +21,6 @@
 
 DEPTH=..\..
 
-include <$(DEPTH)\config\config.mak>
-
 MODULE  = htmlparser
 
 EXPORTS =                       \
diff --git a/mozilla/parser/htmlparser/robot/makefile.win b/mozilla/parser/htmlparser/robot/makefile.win
index 7dba7cac725..4b3206e07dd 100644
--- a/mozilla/parser/htmlparser/robot/makefile.win
+++ b/mozilla/parser/htmlparser/robot/makefile.win
@@ -27,6 +27,7 @@ LIBNAME = .\$(OBJDIR)\DebugRobot
 DLL = $(LIBNAME).dll
 
 DEPTH=..\..
+REQUIRES	= xpcom string htmlparser necko docshell dom uriloader
 
 include <$(DEPTH)\config\config.mak>
 
diff --git a/mozilla/parser/htmlparser/robot/test/makefile.win b/mozilla/parser/htmlparser/robot/test/makefile.win
index b700441f09a..ef021528f2f 100644
--- a/mozilla/parser/htmlparser/robot/test/makefile.win
+++ b/mozilla/parser/htmlparser/robot/test/makefile.win
@@ -21,7 +21,7 @@
 
 DEPTH=..\..\..
 
-
+REQUIRES=xpcom string raptor htmlparser
 MAKE_OBJ_TYPE   = EXE
 PROGRAM = .\$(OBJDIR)\htmlrobot.exe
 
diff --git a/mozilla/parser/htmlparser/src/makefile.win b/mozilla/parser/htmlparser/src/makefile.win
index abf5af08f5a..f248a88ef90 100644
--- a/mozilla/parser/htmlparser/src/makefile.win
+++ b/mozilla/parser/htmlparser/src/makefile.win
@@ -21,12 +21,13 @@
 
 DEPTH=..\..
 
+MODULE         = htmlparser
+REQUIRES       = xpcom string necko util uconv expat layout dom pref nkcache intl widget raptor content
 include <$(DEPTH)\config\config.mak>
 
 LIBRARY_NAME=raptorhtmlpars 
 DEFINES=-D_IMPL_NS_HTMLPARS -DWIN32_LEAN_AND_MEAN -DXML_DTD
 
-MODULE         = htmlparser
 LIBRARY_NAME   = gkparser
 MODULE_NAME	   = nsParserModule
 
diff --git a/mozilla/parser/htmlparser/tests/outsinks/makefile.win b/mozilla/parser/htmlparser/tests/outsinks/makefile.win
index d2c9936a26f..8f65f1a77bf 100644
--- a/mozilla/parser/htmlparser/tests/outsinks/makefile.win
+++ b/mozilla/parser/htmlparser/tests/outsinks/makefile.win
@@ -21,6 +21,7 @@
 
 DEPTH=..\..\..
 
+REQUIRES	= xpcom string htmlparser necko layout dom content
 
 MAKE_OBJ_TYPE   = EXE
 PROGRAM = .\$(OBJDIR)\TestOutput.exe
diff --git a/mozilla/profile/pref-migrator/src/makefile.win b/mozilla/profile/pref-migrator/src/makefile.win
index 9512cb8b647..18181aeffca 100644
--- a/mozilla/profile/pref-migrator/src/makefile.win
+++ b/mozilla/profile/pref-migrator/src/makefile.win
@@ -21,10 +21,11 @@
 
 
 DEPTH=..\..\..
+MODULE=nsprefm
+REQUIRES	= xpcom string pref appshell intl docshell dom necko rdf widget webBrowser_core uconv windowwatcher raptor prefmigr
 include <$(DEPTH)/config/config.mak>
 
 
-MODULE=nsprefm
 LIBRARY_NAME=nsprefm
 MODULE_NAME=nsPrefMigrationModule
 
diff --git a/mozilla/profile/src/makefile.win b/mozilla/profile/src/makefile.win
index fa4f00eb027..c33e4c38220 100644
--- a/mozilla/profile/src/makefile.win
+++ b/mozilla/profile/src/makefile.win
@@ -30,6 +30,8 @@
 #//
 #//------------------------------------------------------------------------
 DEPTH = ..\..
+MODULE		= profile
+REQUIRES = xpcom string raptor uriloader pref necko nsprefm prefmigr dom windowwatcher bookmarks cookie chrome intl docshell webBrowser_core widget rdf uconv
 include <$(DEPTH)\config\config.mak>
 #//------------------------------------------------------------------------
 #//
@@ -37,23 +39,9 @@ include <$(DEPTH)\config\config.mak>
 #//
 #//------------------------------------------------------------------------
 
-MODULE		= profile
 LIBRARY_NAME	= profile
 MODULE_NAME	= nsProfileModule
 
-LINCS = -I$(PUBLIC)/js \
-    -I$(PUBLIC)/profile \
-    -I$(PUBLIC)/pref \
-    -I$(PUBLIC)/prefm \
-    -I$(PUBLIC)/java \
-    -I$(PUBLIC)/ldap \
-    -I$(PUBLIC)/dbm \
-    -I$(PUBLIC)/security \
-    -I$(PUBLIC)/raptor \
-    -I$(PUBLIC)/xpcom \
-        -I$(DEPTH)\include \
-    -I$(PUBLIC)/libreg \
-
 LCFLAGS = -DMOZILLA_CLIENT -DNECKO
 
 # I'm hardcoding the directory name here to fix MOZ_LITE
diff --git a/mozilla/rdf/base/src/makefile.win b/mozilla/rdf/base/src/makefile.win
index 5a4cfe41cf9..a7d820316b8 100644
--- a/mozilla/rdf/base/src/makefile.win
+++ b/mozilla/rdf/base/src/makefile.win
@@ -25,7 +25,7 @@ LCFLAGS=
 
 MODULE=rdf
 LIBRARY_NAME=rdfbase_s
-
+REQUIRES=xpcom string rdfutil htmlparser raptor necko js layout
 CPP_OBJS=\
         .\$(OBJDIR)\nsCompositeDataSource.obj     \
         .\$(OBJDIR)\nsContainerEnumerator.obj     \
diff --git a/mozilla/rdf/build/makefile.win b/mozilla/rdf/build/makefile.win
index 8486fbafddf..d5f8c19c187 100644
--- a/mozilla/rdf/build/makefile.win
+++ b/mozilla/rdf/build/makefile.win
@@ -20,10 +20,11 @@
 # Contributor(s): 
 
 DEPTH=..\..
-include <$(DEPTH)/config/config.mak>
 MODULE=rdf
 LIBRARY_NAME=rdf
 MODULE_NAME=nsRDFModule
+REQUIRES	= xpcom string layout htmlparser necko raptor
+include <$(DEPTH)/config/config.mak>
 
 EXPORTS=\
         nsRDFCID.h                      \
diff --git a/mozilla/rdf/chrome/build/makefile.win b/mozilla/rdf/chrome/build/makefile.win
index 68ddb2884f4..6d3ca4df56b 100644
--- a/mozilla/rdf/chrome/build/makefile.win
+++ b/mozilla/rdf/chrome/build/makefile.win
@@ -25,6 +25,7 @@ MODULE=chrome
 MODULE		= chrome
 LIBRARY_NAME	= chrome
 MODULE_NAME	= nsChromeModule
+REQUIRES	= xpcom string rdf necko layout raptor content
 
 CPP_OBJS=\
         .\$(OBJDIR)\nsChromeFactory.obj    \
diff --git a/mozilla/rdf/chrome/src/makefile.win b/mozilla/rdf/chrome/src/makefile.win
index 36fa40535e0..38f38d54ef3 100644
--- a/mozilla/rdf/chrome/src/makefile.win
+++ b/mozilla/rdf/chrome/src/makefile.win
@@ -22,7 +22,7 @@
 DEPTH=..\..\..
 MODULE=chrome
 LIBRARY_NAME=chrome_s
-
+REQUIRES=xpcom string necko rdf raptor layout content intl dom widget xuldoc gfx docshell pref imglib2 caps xpconnect js
 CPP_OBJS=\
         .\$(OBJDIR)\nsChromeRegistry.obj    \
 	    .\$(OBJDIR)\nsChromeProtocolHandler.obj    \
diff --git a/mozilla/rdf/datasource/src/makefile.win b/mozilla/rdf/datasource/src/makefile.win
index 6cf9a31d9d8..7e8755d45b4 100644
--- a/mozilla/rdf/datasource/src/makefile.win
+++ b/mozilla/rdf/datasource/src/makefile.win
@@ -22,6 +22,7 @@
 DEPTH=..\..\..
 MODULE=rdf
 LIBRARY_NAME=rdfdatasource_s
+REQUIRES	= xpcom string necko uconv
 
 CPP_OBJS=\
         .\$(OBJDIR)\nsFileSystemDataSource.obj  \
diff --git a/mozilla/rdf/tests/rdfcat/makefile.win b/mozilla/rdf/tests/rdfcat/makefile.win
index 84b4b0a1727..29550c2306b 100644
--- a/mozilla/rdf/tests/rdfcat/makefile.win
+++ b/mozilla/rdf/tests/rdfcat/makefile.win
@@ -21,8 +21,9 @@
 
 
 DEPTH	= ..\..\..
-include <$(DEPTH)/config/config.mak>
+REQUIRES	= xpcom string rdf necko widget view dom uriloader layout gfx
 MODULE=rdfcat
+include <$(DEPTH)/config/config.mak>
 
 MAKE_OBJ_TYPE=EXE
 
diff --git a/mozilla/rdf/tests/rdfpoll/makefile.win b/mozilla/rdf/tests/rdfpoll/makefile.win
index 18ebe168971..772c7757903 100644
--- a/mozilla/rdf/tests/rdfpoll/makefile.win
+++ b/mozilla/rdf/tests/rdfpoll/makefile.win
@@ -21,8 +21,9 @@
 
 
 DEPTH	= ..\..\..
-include <$(DEPTH)/config/config.mak>
+REQUIRES	= xpcom string rdf necko layout dom htmlparser
 MODULE=rdfpoll
+include <$(DEPTH)/config/config.mak>
 
 MAKE_OBJ_TYPE=EXE
 
diff --git a/mozilla/rdf/util/src/makefile.win b/mozilla/rdf/util/src/makefile.win
index 276af74b8e9..210896fb54b 100644
--- a/mozilla/rdf/util/src/makefile.win
+++ b/mozilla/rdf/util/src/makefile.win
@@ -25,6 +25,7 @@ LCFLAGS=-DUSE_XPIDL_INTERFACES -D_IMPL_NS_RDF
 
 MODULE=rdfutil
 LIBRARY_NAME=rdfutil_s
+REQUIRES	= xpcom string rdf
 
 CPP_OBJS=\
         .\$(OBJDIR)\nsRDFResource.obj             \
diff --git a/mozilla/uriloader/base/makefile.win b/mozilla/uriloader/base/makefile.win
index 5cdc834b3d7..b815b50e2b4 100644
--- a/mozilla/uriloader/base/makefile.win
+++ b/mozilla/uriloader/base/makefile.win
@@ -20,7 +20,7 @@
 MODULE = uriloader
 
 DEPTH = ..\..
-include <$(DEPTH)/config/config.mak>
+REQUIRES	= xpcom string necko dom exthandler js docshell layout widget caps intl webshell xpconnect raptor content gfx
 
 include <$(DEPTH)\config\config.mak>
 
diff --git a/mozilla/uriloader/build/makefile.win b/mozilla/uriloader/build/makefile.win
index 75d6bfc0e30..87ceb70ec30 100644
--- a/mozilla/uriloader/build/makefile.win
+++ b/mozilla/uriloader/build/makefile.win
@@ -19,6 +19,7 @@
 
 DEPTH=..\..
 MODULE		= uriloader
+REQUIRES	= xpcom string necko mimetype exthandler rdf helperAppDlg dom
 LIBRARY_NAME	= urildr
 MODULE_NAME	= nsURILoaderModule
 
diff --git a/mozilla/uriloader/exthandler/makefile.win b/mozilla/uriloader/exthandler/makefile.win
index 94dd432e111..8139bf89d7e 100644
--- a/mozilla/uriloader/exthandler/makefile.win
+++ b/mozilla/uriloader/exthandler/makefile.win
@@ -20,7 +20,7 @@
 MODULE = exthandler
 
 DEPTH = ..\..
-include <$(DEPTH)/config/config.mak>
+REQUIRES	= xpcom string mimetype uriloader dom necko rdf webshell helperAppDlg plugin gkplugin pref raptor
 
 include <$(DEPTH)\config\config.mak>
 
diff --git a/mozilla/uriloader/exthandler/win/makefile.win b/mozilla/uriloader/exthandler/win/makefile.win
index 46496a5da88..db2ad392c97 100644
--- a/mozilla/uriloader/exthandler/win/makefile.win
+++ b/mozilla/uriloader/exthandler/win/makefile.win
@@ -21,7 +21,7 @@
 
 DEPTH=..\..\..
 MODULE=exthandler
-
+REQUIRES=xpcom string uriloader helperAppDlg dom mimetype necko rdf
 LIBRARY_NAME=exthandlerwin_s
 
 CPP_OBJS=\
diff --git a/mozilla/view/public/makefile.win b/mozilla/view/public/makefile.win
index 76df734b82c..214edb2acb9 100644
--- a/mozilla/view/public/makefile.win
+++ b/mozilla/view/public/makefile.win
@@ -25,7 +25,7 @@ DEPTH=..\..
 DEFINES=-D_IMPL_NS_UI 
 EXPORTS=nsIView.h nsIViewManager.h nsIScrollableView.h nsViewsCID.h nsIViewObserver.h \
  nsIClipView.h nsIScrollPositionListener.h nsICompositeListener.h
-MODULE=raptor 
+MODULE=view 
 
 include <$(DEPTH)\config\rules.mak>
 
diff --git a/mozilla/view/src/makefile.win b/mozilla/view/src/makefile.win
index e3e5e53c6f5..6cf6eaf6c48 100644
--- a/mozilla/view/src/makefile.win
+++ b/mozilla/view/src/makefile.win
@@ -24,6 +24,7 @@ DEPTH=..\..
 MODULE		= view
 LIBRARY_NAME	= gkview
 MODULE_NAME	= nsViewModule
+REQUIRES	= xpcom string layout gfx widget dom locale timer pref
 
 DEFINES =-D_IMPL_NS_VIEW -DWIN32_LEAN_AND_MEAN
 
diff --git a/mozilla/webshell/tests/ComFactory/makefile.win b/mozilla/webshell/tests/ComFactory/makefile.win
index a497df2d870..b99226d4ea4 100644
--- a/mozilla/webshell/tests/ComFactory/makefile.win
+++ b/mozilla/webshell/tests/ComFactory/makefile.win
@@ -19,23 +19,9 @@
 
 IGNORE_MANIFEST = 1
 
-#//------------------------------------------------------------------------
-#//
-# New build system where zip dll is build indepenant of java stubs.
-#//
-#//------------------------------------------------------------------------
-MODULE =testcomfactory
-#EXPORTS =               \
-#        $(NULL)
-
-
-#//------------------------------------------------------------------------
-#//
-#// Specify the depth of the current directory relative to the
-#// root of NS
-#//
-#//------------------------------------------------------------------------
 DEPTH= ..\..\..
+REQUIRES=xpcom raptor
+
 
 MAKE_OBJ_TYPE=EXE
 #//------------------------------------------------------------------------
@@ -75,11 +61,6 @@ LCFLAGS=-DNETSCAPE
 LLIBS= $(DIST)\lib\xpcom.lib
 WIN_LIBS=ole32.lib
 
-LINCS=$(LINCS)  -I. \
-                -I$(PUBLIC)\raptor   \
-                -I$(PUBLIC)\xpcom    \
-                -I$(PUBLIC)\netlib
-
 # clobber and clobber_all will remove the following garbage:
 GARBAGE	= $(GARBAGE) _gen
 
diff --git a/mozilla/webshell/tests/viewer/makefile.win b/mozilla/webshell/tests/viewer/makefile.win
index 53d23ddc025..6d40be03f57 100644
--- a/mozilla/webshell/tests/viewer/makefile.win
+++ b/mozilla/webshell/tests/viewer/makefile.win
@@ -20,6 +20,7 @@
 # Contributor(s): 
 
 DEPTH=..\..\..
+REQUIRES		= xpcom string webshell widget layout dom webBrowser_core docshell util uriloader locale necko htmlparser view timer pref intl editor cookie xpconnect gfx content
 
 include <$(DEPTH)/config/config.mak>
 
diff --git a/mozilla/webshell/tests/viewer/windows/makefile.win b/mozilla/webshell/tests/viewer/windows/makefile.win
index ed8f5e9b2cb..889a21b7f37 100644
--- a/mozilla/webshell/tests/viewer/windows/makefile.win
+++ b/mozilla/webshell/tests/viewer/windows/makefile.win
@@ -20,11 +20,10 @@
 # Contributor(s): 
 
 DEPTH=..\..\..\.. 
-
+REQUIRES=xpcom string dom accessibility widget gfx
 LIBRARY_NAME=raptornativewidgets_s 
 
 DEFINES=-DWIN32_LEAN_AND_MEAN
-MODULE=raptor 
 
 CPPSRCS= \
 	nsButton.cpp         \
@@ -43,13 +42,9 @@ OBJS =                                      \
 	$(NULL)
 
 
-LINCS= -I$(PUBLIC)\xpcom  \
-       -I$(PUBLIC)\raptor \
-       -I$(PUBLIC)\widget	    \
-       -I..\..\..\..\widget\src\windows	    \
+LINCS=       -I..\..\..\..\widget\src\windows	    \
        -I..\..\..\..\widget\src\xpwidgets	    \
-       -I$(PUBLIC)\uconv
-
+		$(NULL)
 
 LCFLAGS = \
         $(LCFLAGS) \
diff --git a/mozilla/xpfe/appshell/public/makefile.win b/mozilla/xpfe/appshell/public/makefile.win
index 8bb5e0065f1..65864280ecb 100644
--- a/mozilla/xpfe/appshell/public/makefile.win
+++ b/mozilla/xpfe/appshell/public/makefile.win
@@ -33,6 +33,7 @@ XPIDLSRCS =                        \
 		.\nsIXULWindow.idl       \
         .\nsIUserInfo.idl   \
 		.\nsITimingService.idl \
+		.\nsIInternetService.idl \
         .\nsINativeAppSupport.idl \
 		$(NULL)
 
diff --git a/mozilla/xpfe/appshell/src/makefile.win b/mozilla/xpfe/appshell/src/makefile.win
index 18fbbecdb90..0becce0d318 100644
--- a/mozilla/xpfe/appshell/src/makefile.win
+++ b/mozilla/xpfe/appshell/src/makefile.win
@@ -20,9 +20,10 @@
 # Contributor(s): 
 
 DEPTH=..\..\..
+MODULE=appshell
+REQUIRES	= xpcom string widget docshell webshell layout layout_xul dom necko uriloader js locale webBrowser_core rdf pref xpconnect timer intl xul windowwatcher browser appcomps caps profile gfx raptor mozbrwsr content
 include <$(DEPTH)/config/config.mak>
 
-MODULE=appshell
 LIBRARY_NAME=appshell
 MODULE_NAME=appshell
 
diff --git a/mozilla/xpfe/bootstrap/makefile.win b/mozilla/xpfe/bootstrap/makefile.win
index 3b93059f6de..bc866d69716 100644
--- a/mozilla/xpfe/bootstrap/makefile.win
+++ b/mozilla/xpfe/bootstrap/makefile.win
@@ -20,6 +20,8 @@
 # Contributor(s): 
 
 DEPTH=..\..
+MODULE		= apprunner
+REQUIRES	= xpcom string webBrowser_core widget dom necko pref appshell layout chrome rdf xpinstall xpicleanup uriloader editor view windowwatcher embed_base embedcomponents mpfilelocprovider mozbrwsr appcomps docshell xremoteservice raptor gfx intl profile xpconnect
 include <$(DEPTH)/config/config.mak>
 
 DEFINES=-DWIN32_LEAN_AND_MEAN
@@ -55,30 +57,6 @@ CPP_OBJS=                               \
 !endif
  $(NULL)
 
-LINCS=-I$(PUBLIC)\raptor                \
-      -I$(PUBLIC)\xpcom                 \
-      -I$(PUBLIC)\base                  \
-      -I$(PUBLIC)\necko                 \
-      -I$(PUBLIC)\pref                  \
-      -I$(PUBLIC)\js                    \
-      -I$(PUBLIC)\dom                   \
-      -I$(PUBLIC)\pref                  \
-      -I$(PUBLIC)\profile               \
-      -I$(PUBLIC)\rdf                   \
-      -I$(PUBLIC)\editor                \
-      -I$(PUBLIC)\caps                  \
-      -I$(PUBLIC)\plugin                \
-      -I$(PUBLIC)\java                  \
-      -I$(PUBLIC)\uconv                 \
-      -I$(PUBLIC)\strres                \
-      -I$(PUBLIC)\locale                \
-      -I$(PUBLIC)\lwbrk                 \
-      -I$(PUBLIC)\unicharutil           \
-      -I$(PUBLIC)\intl                  \
-      -I$(PUBLIC)\xpfe\components       \
-      -I$(PUBLIC)\oji                   \
-      $(NULL)
-
 MAKE_OBJ_TYPE = EXE
 PROGRAM = .\$(OBJDIR)\mozilla.exe
 RESFILE = splash.res
diff --git a/mozilla/xpfe/browser/makefile.win b/mozilla/xpfe/browser/makefile.win
index d4029ff5c17..fa3d2f4e93c 100644
--- a/mozilla/xpfe/browser/makefile.win
+++ b/mozilla/xpfe/browser/makefile.win
@@ -21,7 +21,7 @@
 
 DEPTH=..\..
 
-DIRS=public src samples resources
+DIRS=public src
 
 include <$(DEPTH)\config\rules.mak>
 
diff --git a/mozilla/xpfe/browser/src/makefile.win b/mozilla/xpfe/browser/src/makefile.win
index 0ff28cbb1b3..0049f4ce415 100644
--- a/mozilla/xpfe/browser/src/makefile.win
+++ b/mozilla/xpfe/browser/src/makefile.win
@@ -26,6 +26,7 @@ IGNORE_MANIFEST=1
 MODULE		= mozbrwsr
 LIBRARY_NAME	= mozbrwsr
 MODULE_NAME	= nsBrowserModule
+REQUIRES	= xpcom string webshell necko shistory widget layout docshell appshell dom timer uriloader pref editor appcomps rdf webBrowser_core uconv chardet windowwatcher raptor urlbarhistory content gfx history
 
 DEFINES=-DWIN32_LEAN_AND_MEAN
 
diff --git a/mozilla/xpfe/components/autocomplete/public/makefile.win b/mozilla/xpfe/components/autocomplete/public/makefile.win
index cf67181977f..bdf59848fb2 100644
--- a/mozilla/xpfe/components/autocomplete/public/makefile.win
+++ b/mozilla/xpfe/components/autocomplete/public/makefile.win
@@ -21,7 +21,7 @@
 
 
 
-MODULE=xpfe\components
+MODULE=appcomps
 
 DEPTH=..\..\..\..
 
diff --git a/mozilla/xpfe/components/autocomplete/src/makefile.win b/mozilla/xpfe/components/autocomplete/src/makefile.win
index 780e12544d2..ec59cea83d3 100644
--- a/mozilla/xpfe/components/autocomplete/src/makefile.win
+++ b/mozilla/xpfe/components/autocomplete/src/makefile.win
@@ -28,8 +28,10 @@
 #//
 #//------------------------------------------------------------------------
 DEPTH = ..\..\..\..
-include <$(DEPTH)/config/config.mak>
 MODULE=appcomps
+REQUIRES	= xpcom string layout dom mozldap necko
+
+include <$(DEPTH)/config/config.mak>
 LIBRARY_NAME=autocomplete_s
 LCFLAGS = -DWIN32_LEAN_AND_MEAN
 
diff --git a/mozilla/xpfe/components/bookmarks/src/makefile.win b/mozilla/xpfe/components/bookmarks/src/makefile.win
index 6a4ee4921cb..56fea6a289d 100644
--- a/mozilla/xpfe/components/bookmarks/src/makefile.win
+++ b/mozilla/xpfe/components/bookmarks/src/makefile.win
@@ -20,7 +20,8 @@
 # Contributor(s): 
 
 DEPTH=..\..\..\..
-MODULE=appcomps
+MODULE=bookmarks
+REQUIRES	= xpcom string rdf appshell widget necko uconv docshell pref timer dom intl webshell windowwatcher raptor
 
 CPP_OBJS=                               \
  .\$(OBJDIR)\nsBookmarksService.obj     \
diff --git a/mozilla/xpfe/components/build/makefile.win b/mozilla/xpfe/components/build/makefile.win
index 3b5a15a3018..2283a503069 100644
--- a/mozilla/xpfe/components/build/makefile.win
+++ b/mozilla/xpfe/components/build/makefile.win
@@ -23,6 +23,7 @@ DEPTH=..\..\..
 MODULE=appcomps
 LIBRARY_NAME=appcomps
 MODULE_NAME=application
+REQUIRES	= xpcom string layout rdf necko timer intl mork widget dom pref docshell webshell bookmarks content raptor history search related urlbarhistory mozldap
 
 LCFLAGS = -DWIN32_LEAN_AND_MEAN
 
diff --git a/mozilla/xpfe/components/directory/makefile.win b/mozilla/xpfe/components/directory/makefile.win
index 8780a771b86..1923f9b4922 100644
--- a/mozilla/xpfe/components/directory/makefile.win
+++ b/mozilla/xpfe/components/directory/makefile.win
@@ -37,6 +37,7 @@ CHROME_L10N = \
 	$(NULL)
 
 MODULE=appcomps
+REQUIRES	= xpcom string necko rdf layout timer js xpconnect docshell widget dom webshell uconv uriloader windowwatcher content raptor
 XPIDL_MODULE=directory
 XPIDLSRCS =                             \
         .\nsIHTTPIndex.idl              \
diff --git a/mozilla/xpfe/components/find/public/makefile.win b/mozilla/xpfe/components/find/public/makefile.win
index 4088e686a50..f58064df9ec 100644
--- a/mozilla/xpfe/components/find/public/makefile.win
+++ b/mozilla/xpfe/components/find/public/makefile.win
@@ -21,7 +21,7 @@
 
 
 
-MODULE=xpfe\components
+MODULE=appcomps
 
 DEPTH=..\..\..\..
 
diff --git a/mozilla/xpfe/components/find/src/makefile.win b/mozilla/xpfe/components/find/src/makefile.win
index d36096b58a2..33d97ef949e 100644
--- a/mozilla/xpfe/components/find/src/makefile.win
+++ b/mozilla/xpfe/components/find/src/makefile.win
@@ -28,6 +28,9 @@
 #//
 #//------------------------------------------------------------------------
 DEPTH = ..\..\..\..
+MODULE		= appcomps
+REQUIRES	= xpcom string dom layout widget editor necko txtsvc docshell content gfx
+
 include <$(DEPTH)/config/config.mak>
 
 #//------------------------------------------------------------------------
@@ -36,20 +39,10 @@ include <$(DEPTH)/config/config.mak>
 #//
 #//------------------------------------------------------------------------
 
-MODULE		= appcomps
 XPIDL_MODULE	= mozfind
 LIBRARY_NAME	= mozfind
 MODULE_NAME	= nsFindComponent
 
-LINCS = \
-	-I$(PUBLIC)/xpcom \
-	-I$(PUBLIC)/txtsvc \
-	-I$(PUBLIC)/xpfe/components \
-	-I$(PUBLIC)/raptor \
-	-I$(PUBLIC)/rdf \
-	-I$(PUBLIC)/dom \
-	$(NULL)
-
 LLIBS	= \
 	$(LIBNSPR) \
 	$(DIST)\lib\xpcom.lib \
diff --git a/mozilla/xpfe/components/history/src/makefile.win b/mozilla/xpfe/components/history/src/makefile.win
index c31e211e73a..d61b684271a 100644
--- a/mozilla/xpfe/components/history/src/makefile.win
+++ b/mozilla/xpfe/components/history/src/makefile.win
@@ -20,10 +20,12 @@
 # Contributor(s): 
 
 DEPTH=..\..\..\..
-MODULE=appcomps
+MODULE=history
+REQUIRES	= xpcom string rdf mork pref necko intl timer appcomps
 
 CPP_OBJS=                               \
  .\$(OBJDIR)\nsGlobalHistory.obj        \
+ .\$(OBJDIR)\nsHistoryLoadListener.obj   \
  $(NULL)
 
 LIBRARY_NAME=history_s
diff --git a/mozilla/xpfe/components/public/makefile.win b/mozilla/xpfe/components/public/makefile.win
index 9ab42f1e80b..1d855c428de 100644
--- a/mozilla/xpfe/components/public/makefile.win
+++ b/mozilla/xpfe/components/public/makefile.win
@@ -21,7 +21,7 @@
 
 
 
-MODULE=xpfe\components
+MODULE=appcomps
 
 DEPTH=..\..\..
 
diff --git a/mozilla/xpfe/components/regviewer/makefile.win b/mozilla/xpfe/components/regviewer/makefile.win
index ab8f0f3ed95..5fc1ad3b6be 100644
--- a/mozilla/xpfe/components/regviewer/makefile.win
+++ b/mozilla/xpfe/components/regviewer/makefile.win
@@ -37,6 +37,7 @@ CHROME_L10N = \
 		$(NULL)
 
 MODULE=regviewer
+REQUIRES	= xpcom string rdf
 LIBRARY_NAME=regviewr
 MODULE_NAME=nsRegistryViewerModule
 
diff --git a/mozilla/xpfe/components/related/src/makefile.win b/mozilla/xpfe/components/related/src/makefile.win
index 66b7d13384b..0c930315280 100644
--- a/mozilla/xpfe/components/related/src/makefile.win
+++ b/mozilla/xpfe/components/related/src/makefile.win
@@ -20,7 +20,8 @@
 # Contributor(s): 
 
 DEPTH=..\..\..\..
-MODULE=appcomps
+MODULE=related
+REQUIRES	= xpcom string rdf necko uconv pref
 include <$(DEPTH)/config/config.mak>
 
 CPP_OBJS=                               \
diff --git a/mozilla/xpfe/components/search/src/makefile.win b/mozilla/xpfe/components/search/src/makefile.win
index 61d5c908792..e62539803df 100755
--- a/mozilla/xpfe/components/search/src/makefile.win
+++ b/mozilla/xpfe/components/search/src/makefile.win
@@ -20,7 +20,8 @@
 # Contributor(s): 
 
 DEPTH=..\..\..\..
-MODULE=appcomps
+MODULE=search
+REQUIRES	= xpcom string rdf necko timer pref uconv intl bookmarks
 
 CPP_OBJS=                                \
  .\$(OBJDIR)\nsLocalSearchService.obj    \
diff --git a/mozilla/xpfe/components/shistory/src/makefile.win b/mozilla/xpfe/components/shistory/src/makefile.win
index 021e1aa2531..2284b0eafa5 100644
--- a/mozilla/xpfe/components/shistory/src/makefile.win
+++ b/mozilla/xpfe/components/shistory/src/makefile.win
@@ -20,6 +20,7 @@
 
 DEPTH=..\..\..\..
 MODULE=shistory
+REQUIRES	= xpcom string necko dom layout docshell pref
 LIBRARY_NAME=shistory
 MODULE_NAME=Session_History_Module
 
diff --git a/mozilla/xpfe/components/timebomb/makefile.win b/mozilla/xpfe/components/timebomb/makefile.win
index a559639977f..404e6d0d7d5 100644
--- a/mozilla/xpfe/components/timebomb/makefile.win
+++ b/mozilla/xpfe/components/timebomb/makefile.win
@@ -23,6 +23,7 @@
 
 DEPTH         = ..\..\..
 MODULE        = appcomps
+REQUIRES	= xpcom string pref appshell necko webBrowser_core raptor
 LIBRARY_NAME=timebomb_s
 
 include <$(DEPTH)/config/config.mak>
diff --git a/mozilla/xpfe/components/ucth/src/makefile.win b/mozilla/xpfe/components/ucth/src/makefile.win
index 3a9e24b9a42..78268036781 100644
--- a/mozilla/xpfe/components/ucth/src/makefile.win
+++ b/mozilla/xpfe/components/ucth/src/makefile.win
@@ -52,9 +52,6 @@ LLIBS	= \
 	$(LIBNSPR) \
 	$(DIST)\lib\xpcom.lib \
 	$(DIST)\lib\js3250.lib \
-!ifndef NECKO
-	$(DIST)\lib\netlib.lib \
-!endif
 	$(NULL)
 
 #//------------------------------------------------------------------------
diff --git a/mozilla/xpfe/components/urlbarhistory/src/makefile.win b/mozilla/xpfe/components/urlbarhistory/src/makefile.win
index 29716cf5952..51f53df9513 100644
--- a/mozilla/xpfe/components/urlbarhistory/src/makefile.win
+++ b/mozilla/xpfe/components/urlbarhistory/src/makefile.win
@@ -19,7 +19,8 @@
 # Contributor(s): 
 
 DEPTH=..\..\..\..
-MODULE=appcomps
+MODULE=urlbarhistory
+REQUIRES	= xpcom string rdf pref necko appcomps
 LIBRARY_NAME=urlbarhistory_s
 
 CPP_OBJS=                               \
diff --git a/mozilla/xpfe/components/urlwidget/makefile.win b/mozilla/xpfe/components/urlwidget/makefile.win
index 9da7c0fa3f4..652596486f3 100644
--- a/mozilla/xpfe/components/urlwidget/makefile.win
+++ b/mozilla/xpfe/components/urlwidget/makefile.win
@@ -20,7 +20,7 @@
 # Contributor(s): 
 
 MODULE=appcomps
-
+REQUIRES=xpcom string docshell dom widget gfx
 DEPTH=..\..\..
 
 XPIDL_MODULE=urlwidgt
diff --git a/mozilla/xpfe/components/winhooks/makefile.win b/mozilla/xpfe/components/winhooks/makefile.win
index 70bb311776a..a87387eeb9b 100644
--- a/mozilla/xpfe/components/winhooks/makefile.win
+++ b/mozilla/xpfe/components/winhooks/makefile.win
@@ -21,7 +21,7 @@
 #   Bill Law    <law@netscape.com>
 
 MODULE=appcomps
-
+REQUIRES=xpcom string dom windowwatcher intl raptor necko
 DEPTH=..\..\..
 
 XPIDL_MODULE=winhooks
diff --git a/mozilla/xpfe/components/xfer/public/makefile.win b/mozilla/xpfe/components/xfer/public/makefile.win
index 30da8e13145..dc0c6032b47 100644
--- a/mozilla/xpfe/components/xfer/public/makefile.win
+++ b/mozilla/xpfe/components/xfer/public/makefile.win
@@ -21,7 +21,7 @@
 
 
 
-MODULE=xpfe\components
+MODULE=appcomps
 
 DEPTH=..\..\..\..
 
diff --git a/mozilla/xpfe/components/xfer/src/makefile.win b/mozilla/xpfe/components/xfer/src/makefile.win
index dfce8c61d9c..3f3f422aecc 100644
--- a/mozilla/xpfe/components/xfer/src/makefile.win
+++ b/mozilla/xpfe/components/xfer/src/makefile.win
@@ -28,6 +28,8 @@
 #//
 #//------------------------------------------------------------------------
 DEPTH = ..\..\..\..
+MODULE		= appcomps
+REQUIRES	= xpcom string necko dom js widget pref intl
 include <$(DEPTH)/config/config.mak>
 #//------------------------------------------------------------------------
 #//
@@ -35,23 +37,9 @@ include <$(DEPTH)/config/config.mak>
 #//
 #//------------------------------------------------------------------------
 
-MODULE		= mozxfer
 LIBRARY_NAME	= mozxfer
 MODULE_NAME	= nsStreamTransferModule
 
-LINCS = \
-	-I$(PUBLIC)/xpcom \
-	-I$(PUBLIC)/xpfe/components \
-	-I$(PUBLIC)/raptor \
-!ifdef NECKO
-        -I$(PUBLIC)\necko                 \
-!else
-        -I$(PUBLIC)\netlib                \
-!endif
-	-I$(PUBLIC)/rdf \
-	-I$(PUBLIC)/dom \
-	$(NULL)
-
 LLIBS	= \
 	$(LIBNSPR) \
 	$(DIST)\lib\xpcom.lib \
diff --git a/mozilla/xpinstall/cleanup/makefile.win b/mozilla/xpinstall/cleanup/makefile.win
index 11dfdc51699..ddf0e80deda 100644
--- a/mozilla/xpinstall/cleanup/makefile.win
+++ b/mozilla/xpinstall/cleanup/makefile.win
@@ -26,6 +26,7 @@ MAKE_OBJ_TYPE   = EXE
 USE_NON_MT_LIBS = 1
 
 MODULE          = xpicleanup
+REQUIRES=mozreg
 PROGRAM         = .\$(OBJDIR)\$(MODULE).exe
 
 OBJS =                                   \
diff --git a/mozilla/xpinstall/src/makefile.win b/mozilla/xpinstall/src/makefile.win
index 9229ff03ae3..dae0a1b9bb5 100644
--- a/mozilla/xpinstall/src/makefile.win
+++ b/mozilla/xpinstall/src/makefile.win
@@ -29,10 +29,11 @@
 !undef MOZ_STATIC_COMPONENT_LIBS
 
 DEPTH=..\..
+MODULE		= xpinstall
+REQUIRES	= xpcom string jar chrome necko intl locale mozreg js pref appshell widget layout uriloader xpconnect docshell dom appcomps windowwatcher zlib content raptor
 
 include <$(DEPTH)/config/config.mak>
 
-MODULE		= xpinstall
 LIBRARY_NAME	= xpinstal
 MODULE_NAME	= nsSoftwareUpdate
 
diff --git a/mozilla/xpinstall/stub/makefile.win b/mozilla/xpinstall/stub/makefile.win
index 08e817f8705..265f0a58bad 100644
--- a/mozilla/xpinstall/stub/makefile.win
+++ b/mozilla/xpinstall/stub/makefile.win
@@ -23,6 +23,7 @@
 
 DEPTH=..\..
 
+REQUIRES=string dom appcomps
 MAKE_OBJ_TYPE   = DLL
 LIBRARY_NAME=xpistub
 DLL = .\$(OBJDIR)\xpistub.dll
diff --git a/mozilla/xpinstall/wizard/windows/nsztool/makefile.win b/mozilla/xpinstall/wizard/windows/nsztool/makefile.win
index 1c634e489f9..ce1e2558b06 100644
--- a/mozilla/xpinstall/wizard/windows/nsztool/makefile.win
+++ b/mozilla/xpinstall/wizard/windows/nsztool/makefile.win
@@ -25,6 +25,7 @@ MAKE_OBJ_TYPE   = EXE
 USE_NON_MT_LIBS = 1
 
 MODULE          = nsztool
+REQUIRES=zlib
 PROGRAM         = .\$(OBJDIR)\$(MODULE).exe
 
 OBJS =                          \
diff --git a/mozilla/xpinstall/wizard/windows/setup/makefile.win b/mozilla/xpinstall/wizard/windows/setup/makefile.win
index 81b6bbb2b68..285bccd371d 100644
--- a/mozilla/xpinstall/wizard/windows/setup/makefile.win
+++ b/mozilla/xpinstall/wizard/windows/setup/makefile.win
@@ -26,6 +26,7 @@ MAKE_OBJ_TYPE   = EXE
 USE_NON_MT_LIBS = 1
 
 MODULE          = setup
+REQUIRES=setuprsc uninstall xpnet
 PROGRAM         = .\$(OBJDIR)\$(MODULE).exe
 RESFILE         = $(MODULE).res