From 8a87c138481791ad772b370f7107d5b9675a3b6a Mon Sep 17 00:00:00 2001
From: "jaggernaut%netscape.com"
 <jaggernaut%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 18 Sep 2001 22:01:13 +0000
Subject: [PATCH] One module per line for REQUIRES. r=/sr=alecf

git-svn-id: svn://10.0.0.236/trunk@103116 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/accessible/build/makefile.win         |  5 ++-
 mozilla/accessible/src/makefile.win           | 20 +++++++++-
 mozilla/caps/src/makefile.win                 | 15 ++++++-
 mozilla/content/base/src/makefile.win         | 27 ++++++++++++-
 mozilla/content/build/makefile.win            | 22 +++++++++-
 mozilla/content/events/src/makefile.win       | 19 ++++++++-
 mozilla/content/html/content/src/makefile.win | 23 ++++++++++-
 .../content/html/document/src/makefile.win    | 33 ++++++++++++++-
 mozilla/content/html/style/src/makefile.win   | 19 ++++++++-
 mozilla/content/shared/src/makefile.win       | 14 ++++++-
 mozilla/content/xbl/src/makefile.win          | 20 +++++++++-
 mozilla/content/xml/content/src/makefile.win  | 15 ++++++-
 mozilla/content/xml/document/src/makefile.win | 23 ++++++++++-
 mozilla/content/xsl/document/src/makefile.win | 12 +++++-
 mozilla/content/xul/content/src/makefile.win  | 21 +++++++++-
 mozilla/content/xul/document/src/makefile.win | 26 +++++++++++-
 .../content/xul/templates/src/makefile.win    | 17 +++++++-
 mozilla/db/mork/build/makefile.win            |  3 +-
 mozilla/db/mork/src/makefile.win              |  3 +-
 mozilla/directory/xpcom/base/src/makefile.win |  5 ++-
 mozilla/docshell/base/makefile.win            | 34 +++++++++++++++-
 mozilla/docshell/build/makefile.win           | 22 +++++++++-
 mozilla/dom/src/base/makefile.win             | 37 ++++++++++++++++-
 mozilla/dom/src/build/makefile.win            | 20 +++++++++-
 mozilla/dom/src/events/makefile.win           |  7 +++-
 mozilla/dom/src/jsurl/makefile.win            | 14 ++++++-
 mozilla/editor/base/makefile.win              | 31 +++++++++++++-
 mozilla/editor/txmgr/src/makefile.win         |  4 +-
 mozilla/editor/txmgr/tests/makefile.win       |  4 +-
 mozilla/editor/txtsvc/src/makefile.win        | 10 ++++-
 mozilla/embedding/base/makefile.win           | 18 ++++++++-
 mozilla/embedding/browser/build/makefile.win  | 15 ++++++-
 .../embedding/browser/webBrowser/makefile.win | 23 ++++++++++-
 .../components/appstartup/src/makefile.win    |  4 +-
 .../embedding/components/build/makefile.win   | 11 ++++-
 .../components/find/src/makefile.win          | 12 +++++-
 .../components/jsconsole/src/makefile.win     |  8 +++-
 .../components/windowwatcher/src/makefile.win | 18 ++++++++-
 mozilla/embedding/tests/winEmbed/makefile.win | 18 ++++++++-
 mozilla/extensions/cookie/makefile.win        | 13 +++++-
 mozilla/extensions/cookie/tests/makefile.win  |  7 +++-
 mozilla/extensions/p3p/src/makefile.win       |  4 +-
 .../transformiix/build/makefile.win           | 10 ++++-
 .../transformiix/source/base/makefile.win     |  4 +-
 .../transformiix/source/net/makefile.win      |  5 ++-
 .../source/xml/dom/mozImpl/makefile.win       |  9 ++++-
 .../transformiix/source/xml/makefile.win      |  8 +++-
 .../source/xml/parser/makefile.win            | 14 ++++++-
 .../transformiix/source/xml/util/makefile.win |  8 +++-
 .../transformiix/source/xpath/makefile.win    |  8 +++-
 .../source/xslt/functions/makefile.win        |  8 +++-
 .../transformiix/source/xslt/makefile.win     | 10 ++++-
 .../source/xslt/util/makefile.win             |  8 +++-
 .../universalchardet/src/makefile.win         |  6 ++-
 .../universalchardet/tests/makefile.win       |  4 +-
 mozilla/extensions/wallet/build/makefile.win  |  6 ++-
 mozilla/extensions/wallet/editor/makefile.win |  9 ++++-
 .../wallet/signonviewer/makefile.win          |  8 +++-
 mozilla/extensions/wallet/src/makefile.win    | 18 ++++++++-
 .../wallet/walletpreview/makefile.win         |  9 ++++-
 .../xmlextras/base/src/makefile.win           | 17 +++++++-
 .../xmlextras/build/src/makefile.win          | 13 +++++-
 .../extensions/xmlextras/tests/makefile.win   | 10 ++++-
 mozilla/gfx2/src/makefile.win                 |  4 +-
 mozilla/htmlparser/robot/makefile.win         |  9 ++++-
 mozilla/htmlparser/robot/test/makefile.win    |  6 ++-
 mozilla/htmlparser/src/makefile.win           | 16 +++++++-
 .../htmlparser/tests/outsinks/makefile.win    |  9 ++++-
 mozilla/intl/chardet/src/classic/makefile.win |  6 ++-
 mozilla/intl/chardet/src/makefile.win         | 16 +++++++-
 mozilla/intl/chardet/src/windows/makefile.win |  6 ++-
 mozilla/intl/chardet/tests/makefile.win       |  4 +-
 mozilla/intl/compatibility/src/makefile.win   |  4 +-
 mozilla/intl/locale/src/makefile.win          | 11 ++++-
 mozilla/intl/locale/src/windows/makefile.win  |  6 ++-
 mozilla/intl/lwbrk/src/makefile.win           |  4 +-
 mozilla/intl/lwbrk/tests/makefile.win         |  5 ++-
 mozilla/intl/strres/src/makefile.win          |  6 ++-
 mozilla/intl/strres/tests/makefile.win        |  7 +++-
 mozilla/intl/uconv/src/makefile.win           | 10 ++++-
 mozilla/intl/uconv/tests/makefile.win         |  6 ++-
 mozilla/intl/uconv/ucvcn/makefile.win         |  5 ++-
 mozilla/intl/uconv/ucvibm/makefile.win        |  5 ++-
 mozilla/intl/uconv/ucvja/makefile.win         |  5 ++-
 mozilla/intl/uconv/ucvko/makefile.win         |  5 ++-
 mozilla/intl/uconv/ucvlatin/makefile.win      |  5 ++-
 mozilla/intl/uconv/ucvtw/makefile.win         |  5 ++-
 mozilla/intl/uconv/ucvtw2/makefile.win        |  5 ++-
 mozilla/intl/unicharutil/src/makefile.win     |  6 ++-
 mozilla/intl/unicharutil/tests/makefile.win   |  7 +++-
 mozilla/js/src/liveconnect/makefile.win       |  5 ++-
 mozilla/js/src/xpconnect/loader/makefile.win  |  9 ++++-
 mozilla/js/src/xpconnect/shell/makefile.win   |  6 ++-
 mozilla/js/src/xpconnect/src/makefile.win     |  7 +++-
 .../xpconnect/tests/components/makefile.win   |  7 +++-
 mozilla/js/src/xpconnect/tests/makefile.win   |  6 ++-
 mozilla/layout/base/src/makefile.win          | 21 +++++++++-
 mozilla/layout/base/tests/makefile.win        |  5 ++-
 mozilla/layout/build/makefile.win             | 10 ++++-
 mozilla/layout/html/base/src/makefile.win     | 32 ++++++++++++++-
 mozilla/layout/html/document/src/makefile.win | 21 +++++++++-
 mozilla/layout/html/forms/src/makefile.win    | 30 +++++++++++++-
 mozilla/layout/html/style/src/makefile.win    | 21 +++++++++-
 mozilla/layout/html/table/src/makefile.win    | 12 +++++-
 mozilla/layout/html/tests/makefile.win        |  6 ++-
 mozilla/layout/xul/base/src/makefile.win      | 22 +++++++++-
 .../xul/base/src/outliner/src/makefile.win    | 16 +++++++-
 mozilla/mailnews/absync/build/makefile.win    | 12 +++++-
 mozilla/mailnews/absync/src/makefile.win      | 20 +++++++++-
 mozilla/mailnews/addrbook/build/makefile.win  | 20 +++++++++-
 mozilla/mailnews/addrbook/src/makefile.win    | 26 +++++++++++-
 mozilla/mailnews/base/build/makefile.win      | 32 ++++++++++++++-
 mozilla/mailnews/base/search/src/makefile.win | 18 ++++++++-
 mozilla/mailnews/base/src/makefile.win        | 40 ++++++++++++++++++-
 mozilla/mailnews/base/util/makefile.win       | 34 +++++++++++++++-
 mozilla/mailnews/compose/build/makefile.win   | 21 +++++++++-
 mozilla/mailnews/compose/src/makefile.win     | 37 ++++++++++++++++-
 mozilla/mailnews/db/msgdb/build/makefile.win  | 11 ++++-
 mozilla/mailnews/db/msgdb/src/makefile.win    | 13 +++++-
 mozilla/mailnews/imap/build/makefile.win      | 18 ++++++++-
 mozilla/mailnews/imap/src/makefile.win        | 25 +++++++++++-
 .../mailnews/import/eudora/src/makefile.win   | 19 ++++++++-
 mozilla/mailnews/import/oexpress/makefile.win | 15 ++++++-
 .../mailnews/import/outlook/src/makefile.win  | 19 ++++++++-
 mozilla/mailnews/import/src/makefile.win      | 14 ++++++-
 mozilla/mailnews/import/text/src/makefile.win | 10 ++++-
 mozilla/mailnews/local/build/makefile.win     | 17 +++++++-
 mozilla/mailnews/local/src/makefile.win       | 21 +++++++++-
 mozilla/mailnews/mime/build/makefile.win      |  8 +++-
 .../mime/cthandlers/vcard/makefile.win        | 13 +++++-
 .../mailnews/mime/emitters/build/makefile.win | 10 ++++-
 .../mailnews/mime/emitters/src/makefile.win   | 16 +++++++-
 mozilla/mailnews/mime/src/makefile.win        | 23 ++++++++++-
 mozilla/mailnews/news/build/makefile.win      | 23 ++++++++++-
 mozilla/mailnews/news/src/makefile.win        | 29 +++++++++++++-
 mozilla/modules/libimg/mng/makefile.win       |  4 +-
 mozilla/modules/libimg/png/makefile.win       |  3 +-
 mozilla/modules/libjar/makefile.win           |  6 ++-
 .../modules/libjar/standalone/makefile.win    |  3 +-
 .../modules/libpr0n/decoders/gif/makefile.win |  7 +++-
 .../libpr0n/decoders/icon/makefile.win        |  8 +++-
 .../libpr0n/decoders/icon/win/makefile.win    |  7 +++-
 .../libpr0n/decoders/jpeg/makefile.win        |  9 ++++-
 .../modules/libpr0n/decoders/mng/makefile.win | 11 ++++-
 .../modules/libpr0n/decoders/png/makefile.win |  9 ++++-
 .../modules/libpr0n/decoders/ppm/makefile.win |  7 +++-
 mozilla/modules/libpr0n/src/makefile.win      | 10 ++++-
 mozilla/modules/libpref/src/makefile.win      | 12 +++++-
 .../modules/libreg/standalone/makefile.win    |  3 +-
 mozilla/modules/libutil/src/makefile.win      |  3 +-
 .../mpfilelocprovider/src/makefile.win        |  4 +-
 mozilla/modules/oji/src/makefile.win          | 22 +++++++++-
 mozilla/modules/plugin/base/src/makefile.win  | 26 +++++++++++-
 .../samples/default/windows/makefile.win      |  3 +-
 mozilla/netwerk/base/src/makefile.win         |  8 +++-
 mozilla/netwerk/build/makefile.win            | 12 +++++-
 mozilla/netwerk/build2/makefile.win           |  5 ++-
 mozilla/netwerk/cache/src/makefile.win        |  6 ++-
 mozilla/netwerk/dns/src/makefile.win          |  5 ++-
 mozilla/netwerk/mime/src/makefile.win         |  6 ++-
 .../netwerk/protocol/about/src/makefile.win   |  8 +++-
 .../netwerk/protocol/data/src/makefile.win    |  4 +-
 .../protocol/datetime/src/makefile.win        |  4 +-
 .../netwerk/protocol/file/src/makefile.win    |  6 ++-
 .../netwerk/protocol/finger/src/makefile.win  |  5 ++-
 mozilla/netwerk/protocol/ftp/src/makefile.win | 10 ++++-
 .../netwerk/protocol/gopher/src/makefile.win  |  5 ++-
 .../netwerk/protocol/http/src/makefile.win    |  9 ++++-
 mozilla/netwerk/protocol/jar/src/makefile.win | 11 ++++-
 .../netwerk/protocol/keyword/src/makefile.win |  5 ++-
 mozilla/netwerk/protocol/res/src/makefile.win |  6 ++-
 .../protocol/viewsource/src/makefile.win      |  5 ++-
 mozilla/netwerk/socket/base/makefile.win      |  4 +-
 .../streamconv/converters/makefile.win        | 10 ++++-
 mozilla/netwerk/streamconv/src/makefile.win   |  4 +-
 mozilla/netwerk/streamconv/test/makefile.win  |  5 ++-
 mozilla/netwerk/test/makefile.win             | 10 ++++-
 mozilla/parser/htmlparser/robot/makefile.win  |  9 ++++-
 .../parser/htmlparser/robot/test/makefile.win |  6 ++-
 mozilla/parser/htmlparser/src/makefile.win    | 16 +++++++-
 .../htmlparser/tests/outsinks/makefile.win    |  9 ++++-
 .../profile/pref-migrator/src/makefile.win    | 17 +++++++-
 mozilla/profile/src/makefile.win              | 21 +++++++++-
 mozilla/rdf/base/src/makefile.win             | 10 ++++-
 mozilla/rdf/build/makefile.win                |  8 +++-
 mozilla/rdf/chrome/build/makefile.win         |  9 ++++-
 mozilla/rdf/chrome/src/makefile.win           | 20 +++++++++-
 .../rdf/chrome/tools/chromereg/makefile.win   |  5 ++-
 mozilla/rdf/datasource/src/makefile.win       |  6 ++-
 mozilla/rdf/tests/rdfcat/makefile.win         | 12 +++++-
 mozilla/rdf/tests/rdfpoll/makefile.win        |  9 ++++-
 mozilla/rdf/util/src/makefile.win             |  5 ++-
 mozilla/string/obsolete/makefile.win          |  4 +-
 mozilla/string/src/makefile.win               |  3 +-
 mozilla/uriloader/base/makefile.win           | 18 ++++++++-
 mozilla/uriloader/build/makefile.win          | 10 ++++-
 mozilla/uriloader/exthandler/makefile.win     | 15 ++++++-
 mozilla/uriloader/exthandler/win/makefile.win | 10 ++++-
 mozilla/view/src/makefile.win                 | 12 +++++-
 .../webshell/tests/ComFactory/makefile.win    |  5 ++-
 mozilla/webshell/tests/viewer/makefile.win    | 26 +++++++++++-
 .../tests/viewer/windows/makefile.win         |  8 +++-
 .../appshell/eventloop/windows/makefile.win   |  3 +-
 .../xpcom/appshell/eventloop/xp/makefile.win  |  3 +-
 mozilla/xpcom/appshell/nativeApp/makefile.win |  3 +-
 mozilla/xpcom/base/makefile.win               |  3 +-
 mozilla/xpcom/build/makefile.win              |  5 ++-
 mozilla/xpcom/components/makefile.win         |  4 +-
 mozilla/xpcom/ds/makefile.win                 |  4 +-
 mozilla/xpcom/io/makefile.win                 |  6 ++-
 mozilla/xpcom/proxy/src/makefile.win          |  3 +-
 mozilla/xpcom/proxy/tests/makefile.win        |  4 +-
 .../xpcom/reflect/xptcall/tests/makefile.win  |  3 +-
 .../xpcom/reflect/xptinfo/src/makefile.win    |  3 +-
 .../xpcom/reflect/xptinfo/tests/makefile.win  |  3 +-
 mozilla/xpcom/sample/makefile.win             |  3 +-
 mozilla/xpcom/string/obsolete/makefile.win    |  4 +-
 mozilla/xpcom/string/src/makefile.win         |  3 +-
 mozilla/xpcom/tests/makefile.win              |  5 ++-
 mozilla/xpcom/tests/windows/makefile.win      |  3 +-
 mozilla/xpcom/threads/makefile.win            |  3 +-
 mozilla/xpcom/tools/registry/makefile.win     |  4 +-
 mozilla/xpcom/typelib/xpidl/makefile.win      |  3 +-
 mozilla/xpcom/typelib/xpt/tests/makefile.win  |  3 +-
 mozilla/xpcom/typelib/xpt/tools/makefile.win  |  3 +-
 mozilla/xpfe/appshell/src/makefile.win        | 30 +++++++++++++-
 mozilla/xpfe/bootstrap/makefile.win           | 31 +++++++++++++-
 mozilla/xpfe/browser/src/makefile.win         | 27 ++++++++++++-
 .../components/autocomplete/src/makefile.win  |  8 +++-
 .../components/bookmarks/src/makefile.win     | 17 +++++++-
 mozilla/xpfe/components/build/makefile.win    | 23 ++++++++++-
 .../xpfe/components/directory/makefile.win    | 19 ++++++++-
 mozilla/xpfe/components/find/src/makefile.win | 13 +++++-
 .../xpfe/components/history/src/makefile.win  | 11 ++++-
 .../xpfe/components/regviewer/makefile.win    |  5 ++-
 .../xpfe/components/related/src/makefile.win  |  8 +++-
 .../xpfe/components/search/src/makefile.win   | 11 ++++-
 .../xpfe/components/shistory/src/makefile.win |  9 ++++-
 mozilla/xpfe/components/timebomb/makefile.win |  9 ++++-
 .../components/urlbarhistory/src/makefile.win |  8 +++-
 .../xpfe/components/urlwidget/makefile.win    |  8 +++-
 mozilla/xpfe/components/winhooks/makefile.win |  9 ++++-
 mozilla/xpfe/components/xfer/src/makefile.win | 10 ++++-
 mozilla/xpinstall/cleanup/makefile.win        |  3 +-
 mozilla/xpinstall/src/makefile.win            | 24 ++++++++++-
 mozilla/xpinstall/stub/makefile.win           |  7 +++-
 .../wizard/windows/nsztool/makefile.win       |  3 +-
 .../wizard/windows/setup/makefile.win         |  5 ++-
 248 files changed, 2565 insertions(+), 248 deletions(-)

diff --git a/mozilla/accessible/build/makefile.win b/mozilla/accessible/build/makefile.win
index 63377bea339..e25e12f620b 100644
--- a/mozilla/accessible/build/makefile.win
+++ b/mozilla/accessible/build/makefile.win
@@ -21,7 +21,10 @@
 
 DEPTH=..\..
 MODULE=accessibility
-REQUIRES	= xpcom string dom
+REQUIRES	= xpcom \
+		  string \
+		  dom \
+		  $(NULL)
 LIBRARY_NAME=accessibility
 MODULE_NAME=nsAccessibilityModule
 
diff --git a/mozilla/accessible/src/makefile.win b/mozilla/accessible/src/makefile.win
index b599138ef72..3b3233b4191 100644
--- a/mozilla/accessible/src/makefile.win
+++ b/mozilla/accessible/src/makefile.win
@@ -22,7 +22,25 @@
 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
+REQUIRES	= xpcom \
+		  string \
+		  layout \
+		  content \
+		  widget \
+		  dom \
+		  view \
+		  locale \
+		  intl \
+		  docshell \
+		  webshell \
+		  necko \
+		  htmlparser \
+		  xuldoc \
+		  imglib2 \
+		  gfx \
+		  gfx2 \
+		  raptor \
+		  $(NULL)
 
 CPP_OBJS=\
         .\$(OBJDIR)\nsAccessible.obj    \
diff --git a/mozilla/caps/src/makefile.win b/mozilla/caps/src/makefile.win
index ff7f6c36271..893a1eabaae 100755
--- a/mozilla/caps/src/makefile.win
+++ b/mozilla/caps/src/makefile.win
@@ -44,7 +44,20 @@ DEPTH= ..\..
 MODULE=caps
 LIBRARY_NAME=caps
 MODULE_NAME=nsSecurityManagerModule
-REQUIRES	= xpcom string pref js dom xpconnect necko jar widget plugin intl docshell windowwatcher
+REQUIRES	= xpcom \
+		  string \
+		  pref \
+		  js \
+		  dom \
+		  xpconnect \
+		  necko \
+		  jar \
+		  widget \
+		  plugin \
+		  intl \
+		  docshell \
+		  windowwatcher \
+		  $(NULL)
 
 #//------------------------------------------------------------------------
 #// 
diff --git a/mozilla/content/base/src/makefile.win b/mozilla/content/base/src/makefile.win
index cc3ebf0f38c..5970b44deec 100644
--- a/mozilla/content/base/src/makefile.win
+++ b/mozilla/content/base/src/makefile.win
@@ -64,7 +64,32 @@ CPPSRCS =				\
 	$(NULL)
 
 MODULE=content
-REQUIRES	= xpcom string dom widget view locale timer htmlparser js webshell necko caps lwbrk uconv chrome docshell pref xpconnect util unicharutil layout_xsl layout gfx layout_xul content_xsl
+REQUIRES	= xpcom \
+		  string \
+		  dom \
+		  widget \
+		  view \
+		  locale \
+		  timer \
+		  htmlparser \
+		  js \
+		  webshell \
+		  necko \
+		  caps \
+		  lwbrk \
+		  uconv \
+		  chrome \
+		  docshell \
+		  pref \
+		  xpconnect \
+		  util \
+		  unicharutil \
+		  layout_xsl \
+		  layout \
+		  gfx \
+		  layout_xul \
+		  content_xsl \
+		  $(NULL)
 
 CPP_OBJS=					\
 	.\$(OBJDIR)\nsStyleContext.obj		\
diff --git a/mozilla/content/build/makefile.win b/mozilla/content/build/makefile.win
index f6fa18da08c..aa949351a0f 100644
--- a/mozilla/content/build/makefile.win
+++ b/mozilla/content/build/makefile.win
@@ -34,7 +34,27 @@ EXPORTS=nsContentCID.h
 MODULE=content
 LIBRARY_NAME=gkcontent
 MODULE_NAME=nsContentModule
-REQUIRES	= xpcom string widget necko rdf docshell dom htmlparser uriloader webshell locale unicharutil lwbrk js pref timer layout gfx layout_xul content_xul
+REQUIRES	= xpcom \
+		  string \
+		  widget \
+		  necko \
+		  rdf \
+		  docshell \
+		  dom \
+		  htmlparser \
+		  uriloader \
+		  webshell \
+		  locale \
+		  unicharutil \
+		  lwbrk \
+		  js \
+		  pref \
+		  timer \
+		  layout \
+		  gfx \
+		  layout_xul \
+		  content_xul \
+		  $(NULL)
 
 LCFLAGS = \
         $(LCFLAGS) \
diff --git a/mozilla/content/events/src/makefile.win b/mozilla/content/events/src/makefile.win
index f2484344ab1..ee822d73356 100644
--- a/mozilla/content/events/src/makefile.win
+++ b/mozilla/content/events/src/makefile.win
@@ -25,7 +25,24 @@ DEPTH=..\..\..
 
 LIBRARY_NAME=contentevents_s 
 MODULE=content
-REQUIRES	= xpcom string dom js locale widget timer caps xpconnect docshell webshell pref htmlparser view gfx layout layout_xul
+REQUIRES	= xpcom \
+		  string \
+		  dom \
+		  js \
+		  locale \
+		  widget \
+		  timer \
+		  caps \
+		  xpconnect \
+		  docshell \
+		  webshell \
+		  pref \
+		  htmlparser \
+		  view \
+		  gfx \
+		  layout \
+		  layout_xul \
+		  $(NULL)
 
 include <$(DEPTH)\config\config.mak>
 
diff --git a/mozilla/content/html/content/src/makefile.win b/mozilla/content/html/content/src/makefile.win
index fbeb4caec00..5c89a92c214 100644
--- a/mozilla/content/html/content/src/makefile.win
+++ b/mozilla/content/html/content/src/makefile.win
@@ -23,7 +23,28 @@ DEPTH=..\..\..\..
 
 LIBRARY_NAME = contenthtmlcontent_s
 MODULE=content
-REQUIRES	= xpcom string widget dom js locale webshell htmlparser necko view pref docshell xpconnect caps editor uconv gfx2 imglib2 layout gfx content_xul
+REQUIRES	= xpcom \
+		  string \
+		  widget \
+		  dom \
+		  js \
+		  locale \
+		  webshell \
+		  htmlparser \
+		  necko \
+		  view \
+		  pref \
+		  docshell \
+		  xpconnect \
+		  caps \
+		  editor \
+		  uconv \
+		  gfx2 \
+		  imglib2 \
+		  layout \
+		  gfx \
+		  content_xul \
+		  $(NULL)
 DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
 !if defined(XP_NEW_SELECTION)
 DEFINES = $(DEFINES) -DXP_NEW_SELECTION
diff --git a/mozilla/content/html/document/src/makefile.win b/mozilla/content/html/document/src/makefile.win
index c3c09f34bdb..618b23a849a 100644
--- a/mozilla/content/html/document/src/makefile.win
+++ b/mozilla/content/html/document/src/makefile.win
@@ -23,7 +23,38 @@ DEPTH=..\..\..\..
 
 LIBRARY_NAME=contenthtmldoc_s 
 MODULE=content
-REQUIRES	= xpcom string widget dom necko htmlparser locale view js intl webshell docshell cookie caps util timer uconv pref uriloader rdf chardet nkcache appcomps lwbrk gfx2 imglib2 xpconnect unicharutil layout gfx bookmarks
+REQUIRES	= xpcom \
+		  string \
+		  widget \
+		  dom \
+		  necko \
+		  htmlparser \
+		  locale \
+		  view \
+		  js \
+		  intl \
+		  webshell \
+		  docshell \
+		  cookie \
+		  caps \
+		  util \
+		  timer \
+		  uconv \
+		  pref \
+		  uriloader \
+		  rdf \
+		  chardet \
+		  nkcache \
+		  appcomps \
+		  lwbrk \
+		  gfx2 \
+		  imglib2 \
+		  xpconnect \
+		  unicharutil \
+		  layout \
+		  gfx \
+		  bookmarks \
+		  $(NULL)
 
 DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN 
 !if defined(XP_NEW_SELECTION)
diff --git a/mozilla/content/html/style/src/makefile.win b/mozilla/content/html/style/src/makefile.win
index 72317ff6770..44df79e4ccd 100644
--- a/mozilla/content/html/style/src/makefile.win
+++ b/mozilla/content/html/style/src/makefile.win
@@ -23,7 +23,24 @@ DEPTH=..\..\..\..
 
 LIBRARY_NAME=contenthtmlstyle_s 
 MODULE=content
-REQUIRES	= xpcom string dom widget caps locale js necko webshell htmlparser docshell uconv xpconnect pref layout gfx content_xul
+REQUIRES	= xpcom \
+		  string \
+		  dom \
+		  widget \
+		  caps \
+		  locale \
+		  js \
+		  necko \
+		  webshell \
+		  htmlparser \
+		  docshell \
+		  uconv \
+		  xpconnect \
+		  pref \
+		  layout \
+		  gfx \
+		  content_xul \
+		  $(NULL)
 
 DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
 
diff --git a/mozilla/content/shared/src/makefile.win b/mozilla/content/shared/src/makefile.win
index d91aa947d1c..4bc7c1208c5 100644
--- a/mozilla/content/shared/src/makefile.win
+++ b/mozilla/content/shared/src/makefile.win
@@ -22,7 +22,19 @@
 DEPTH=..\..\..
 
 MODULE=content
-REQUIRES	= xpcom string widget locale dom webshell pref necko htmlparser unicharutil layout gfx
+REQUIRES	= xpcom \
+		  string \
+		  widget \
+		  locale \
+		  dom \
+		  webshell \
+		  pref \
+		  necko \
+		  htmlparser \
+		  unicharutil \
+		  layout \
+		  gfx \
+		  $(NULL)
 LIBRARY_NAME=contentshared_s 
 DEFINES=-D_IMPL_NS_LAYOUT -DWIN32_LEAN_AND_MEAN
 !if defined(XP_NEW_SELECTION)
diff --git a/mozilla/content/xbl/src/makefile.win b/mozilla/content/xbl/src/makefile.win
index 30035f6870d..18f2decf908 100644
--- a/mozilla/content/xbl/src/makefile.win
+++ b/mozilla/content/xbl/src/makefile.win
@@ -23,7 +23,25 @@ DEPTH=..\..\..
 
 LIBRARY_NAME=contentxbl_s 
 MODULE=content
-REQUIRES	= xpcom string js dom widget caps htmlparser necko xpconnect pref docshell chrome lwbrk gfx2 imglib2 layout gfx content_xul
+REQUIRES	= xpcom \
+		  string \
+		  js \
+		  dom \
+		  widget \
+		  caps \
+		  htmlparser \
+		  necko \
+		  xpconnect \
+		  pref \
+		  docshell \
+		  chrome \
+		  lwbrk \
+		  gfx2 \
+		  imglib2 \
+		  layout \
+		  gfx \
+		  content_xul \
+		  $(NULL)
 
 DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
 
diff --git a/mozilla/content/xml/content/src/makefile.win b/mozilla/content/xml/content/src/makefile.win
index 1577289878b..4774eaaff0d 100644
--- a/mozilla/content/xml/content/src/makefile.win
+++ b/mozilla/content/xml/content/src/makefile.win
@@ -23,7 +23,20 @@ DEPTH=..\..\..\..
 
 LIBRARY_NAME=contentxmlcontent_s 
 MODULE=content
-REQUIRES	= xpcom string js dom widget necko caps webshell docshell htmlparser xpconnect layout gfx
+REQUIRES	= xpcom \
+		  string \
+		  js \
+		  dom \
+		  widget \
+		  necko \
+		  caps \
+		  webshell \
+		  docshell \
+		  htmlparser \
+		  xpconnect \
+		  layout \
+		  gfx \
+		  $(NULL)
 
 DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
 
diff --git a/mozilla/content/xml/document/src/makefile.win b/mozilla/content/xml/document/src/makefile.win
index d0c4f41f430..b5340f3ee1b 100644
--- a/mozilla/content/xml/document/src/makefile.win
+++ b/mozilla/content/xml/document/src/makefile.win
@@ -23,7 +23,28 @@ DEPTH=..\..\..\..
 
 LIBRARY_NAME=contentxmldoc_s 
 MODULE=content
-REQUIRES	= xpcom string js dom widget caps htmlparser necko view docshell webshell uriloader pref xpconnect uconv chardet lwbrk exthandler mimetype gfx layout
+REQUIRES	= xpcom \
+		  string \
+		  js \
+		  dom \
+		  widget \
+		  caps \
+		  htmlparser \
+		  necko \
+		  view \
+		  docshell \
+		  webshell \
+		  uriloader \
+		  pref \
+		  xpconnect \
+		  uconv \
+		  chardet \
+		  lwbrk \
+		  exthandler \
+		  mimetype \
+		  gfx \
+		  layout \
+		  $(NULL)
 
 DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
 
diff --git a/mozilla/content/xsl/document/src/makefile.win b/mozilla/content/xsl/document/src/makefile.win
index a4b8a18d4b8..e7c37109bc6 100644
--- a/mozilla/content/xsl/document/src/makefile.win
+++ b/mozilla/content/xsl/document/src/makefile.win
@@ -23,7 +23,17 @@ DEPTH=..\..\..\..
 
 LIBRARY_NAME=contentxsldoc_s 
 MODULE=content_xsl
-REQUIRES = xpcom string htmlparser view widget dom necko layout gfx content
+REQUIRES	= xpcom \
+		  string \
+		  htmlparser \
+		  view \
+		  widget \
+		  dom \
+		  necko \
+		  layout \
+		  gfx \
+		  content \
+		  $(NULL)
 
 DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
 
diff --git a/mozilla/content/xul/content/src/makefile.win b/mozilla/content/xul/content/src/makefile.win
index 7d6ade09322..f36dda99324 100644
--- a/mozilla/content/xul/content/src/makefile.win
+++ b/mozilla/content/xul/content/src/makefile.win
@@ -23,7 +23,26 @@ DEPTH=..\..\..\..
 
 LIBRARY_NAME=contentxulcontent_s 
 MODULE=content_xul
-REQUIRES	= xpcom string widget htmlparser necko dom js caps rdf xpconnect locale timer lwbrk pref webshell layout layout_xul gfx content
+REQUIRES	= xpcom \
+		  string \
+		  widget \
+		  htmlparser \
+		  necko \
+		  dom \
+		  js \
+		  caps \
+		  rdf \
+		  xpconnect \
+		  locale \
+		  timer \
+		  lwbrk \
+		  pref \
+		  webshell \
+		  layout \
+		  layout_xul \
+		  gfx \
+		  content \
+		  $(NULL)
 
 DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
 
diff --git a/mozilla/content/xul/document/src/makefile.win b/mozilla/content/xul/document/src/makefile.win
index 9d52b5fcfa6..8e8a131e9c2 100644
--- a/mozilla/content/xul/document/src/makefile.win
+++ b/mozilla/content/xul/document/src/makefile.win
@@ -23,7 +23,31 @@ DEPTH=..\..\..\..
 
 LIBRARY_NAME=contentxuldocument_s 
 MODULE=content_xul
-REQUIRES	= xpcom string exthandler mimetype widget dom rdf js xpconnect caps locale view necko uriloader htmlparser lwbrk timer chrome docshell pref layout gfx layout_xul content
+REQUIRES	= xpcom \
+		  string \
+		  exthandler \
+		  mimetype \
+		  widget \
+		  dom \
+		  rdf \
+		  js \
+		  xpconnect \
+		  caps \
+		  locale \
+		  view \
+		  necko \
+		  uriloader \
+		  htmlparser \
+		  lwbrk \
+		  timer \
+		  chrome \
+		  docshell \
+		  pref \
+		  layout \
+		  gfx \
+		  layout_xul \
+		  content \
+		  $(NULL)
 
 DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
 
diff --git a/mozilla/content/xul/templates/src/makefile.win b/mozilla/content/xul/templates/src/makefile.win
index d19b491489b..2f1045567af 100644
--- a/mozilla/content/xul/templates/src/makefile.win
+++ b/mozilla/content/xul/templates/src/makefile.win
@@ -23,7 +23,22 @@ DEPTH=..\..\..\..
 
 LIBRARY_NAME=contentxultemplates_s 
 MODULE=content_xul
-REQUIRES	= xpcom string js xpconnect timer caps widget dom rdf necko locale layout gfx layout_xul content
+REQUIRES	= xpcom \
+		  string \
+		  js \
+		  xpconnect \
+		  timer \
+		  caps \
+		  widget \
+		  dom \
+		  rdf \
+		  necko \
+		  locale \
+		  layout \
+		  gfx \
+		  layout_xul \
+		  content \
+		  $(NULL)
 
 DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
 
diff --git a/mozilla/db/mork/build/makefile.win b/mozilla/db/mork/build/makefile.win
index b0c0c271f03..3b1e1525d7b 100644
--- a/mozilla/db/mork/build/makefile.win
+++ b/mozilla/db/mork/build/makefile.win
@@ -23,7 +23,8 @@ DEPTH=..\..\..
 MODULE          = mork
 LIBRARY_NAME    = mork
 MODULE_NAME  = nsMorkModule
-REQUIRES=xpcom
+REQUIRES	= xpcom \
+		  $(NULL)
 
 ################################################################################
 ## exports
diff --git a/mozilla/db/mork/src/makefile.win b/mozilla/db/mork/src/makefile.win
index 19c2cbe2cd9..5fdf865a74a 100644
--- a/mozilla/db/mork/src/makefile.win
+++ b/mozilla/db/mork/src/makefile.win
@@ -22,7 +22,8 @@
 
 DEPTH=..\..\..
 MODULE= mork
-REQUIRES = xpcom
+REQUIRES	= xpcom \
+		  $(NULL)
 include <$(DEPTH)\config\config.mak>
 
 ################################################################################
diff --git a/mozilla/directory/xpcom/base/src/makefile.win b/mozilla/directory/xpcom/base/src/makefile.win
index 64cc4f5b77c..a2a86ff6a76 100644
--- a/mozilla/directory/xpcom/base/src/makefile.win
+++ b/mozilla/directory/xpcom/base/src/makefile.win
@@ -18,7 +18,10 @@
 DEPTH=..\..\..\..
 
 MODULE=mozldap
-REQUIRES	= xpcom string necko
+REQUIRES	= xpcom \
+		  string \
+		  necko \
+		  $(NULL)
 
 include <$(DEPTH)\config\config.mak>
 
diff --git a/mozilla/docshell/base/makefile.win b/mozilla/docshell/base/makefile.win
index c974a2bc037..2efbaeffb21 100644
--- a/mozilla/docshell/base/makefile.win
+++ b/mozilla/docshell/base/makefile.win
@@ -22,7 +22,39 @@
 DEPTH=..\..
 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 content_xul find nkcache content raptor gfx history
+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 \
+		  content_xul \
+		  find \
+		  nkcache \
+		  content \
+		  raptor \
+		  gfx \
+		  history \
+		  $(NULL)
 
 LIBRARY_NAME=basedocshell_s
 
diff --git a/mozilla/docshell/build/makefile.win b/mozilla/docshell/build/makefile.win
index 622988c3932..fd839f3caa7 100644
--- a/mozilla/docshell/build/makefile.win
+++ b/mozilla/docshell/build/makefile.win
@@ -21,7 +21,27 @@
 
 DEPTH=..\..
 MODULE=docshell
-REQUIRES	= xpcom string dom shistory necko layout uriloader timer webshell widget pref view intl htmlparser chardet appcomps find raptor gfx history
+REQUIRES	= xpcom \
+		  string \
+		  dom \
+		  shistory \
+		  necko \
+		  layout \
+		  uriloader \
+		  timer \
+		  webshell \
+		  widget \
+		  pref \
+		  view \
+		  intl \
+		  htmlparser \
+		  chardet \
+		  appcomps \
+		  find \
+		  raptor \
+		  gfx \
+		  history \
+		  $(NULL)
 include <$(DEPTH)\config\config.mak>
 
 LIBRARY_NAME=docshell
diff --git a/mozilla/dom/src/base/makefile.win b/mozilla/dom/src/base/makefile.win
index 842d756672e..bda6295e0f4 100644
--- a/mozilla/dom/src/base/makefile.win
+++ b/mozilla/dom/src/base/makefile.win
@@ -27,7 +27,42 @@ 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 content_xul content_xsl 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
+REQUIRES	= xpcom \
+		  string \
+		  webBrowser_core \
+		  js \
+		  widget \
+		  gfx \
+		  layout \
+		  layout_xul \
+		  content \
+		  content_xul \
+		  content_xsl \
+		  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 \
+		  $(NULL)
 
 CPPSRCS =			\
 	nsBarProps.cpp          \
diff --git a/mozilla/dom/src/build/makefile.win b/mozilla/dom/src/build/makefile.win
index c2a1f3a55d7..c412d401615 100644
--- a/mozilla/dom/src/build/makefile.win
+++ b/mozilla/dom/src/build/makefile.win
@@ -21,7 +21,25 @@
 
 DEPTH=..\..\..
 MODULE=dom
-REQUIRES	= xpcom string js xpconnect widget layout caps timer webBrowser_core xuldoc docshell sidebar plugin gkplugin necko gfx content content_xul
+REQUIRES	= xpcom \
+		  string \
+		  js \
+		  xpconnect \
+		  widget \
+		  layout \
+		  caps \
+		  timer \
+		  webBrowser_core \
+		  xuldoc \
+		  docshell \
+		  sidebar \
+		  plugin \
+		  gkplugin \
+		  necko \
+		  gfx \
+		  content \
+		  content_xul \
+		  $(NULL)
 include <$(DEPTH)/config/config.mak>
 
 DEFINES=-D_IMPL_NS_DOM
diff --git a/mozilla/dom/src/events/makefile.win b/mozilla/dom/src/events/makefile.win
index 056babaf42b..704bc466bc7 100644
--- a/mozilla/dom/src/events/makefile.win
+++ b/mozilla/dom/src/events/makefile.win
@@ -24,7 +24,12 @@ DEPTH=..\..\..
 
 LIBRARY_NAME=jsdomevents_s
 MODULE=dom
-REQUIRES	= xpcom string js caps xpconnect
+REQUIRES	= xpcom \
+		  string \
+		  js \
+		  caps \
+		  xpconnect \
+		  $(NULL)
 
 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 6a7df8848e9..8e3d042e05b 100644
--- a/mozilla/dom/src/jsurl/makefile.win
+++ b/mozilla/dom/src/jsurl/makefile.win
@@ -21,7 +21,19 @@
 
 DEPTH=..\..\..
 MODULE=jsurl
-REQUIRES	= xpcom string js dom necko caps widget appshell rdf xpconnect jsconsole raptor
+REQUIRES	= xpcom \
+		  string \
+		  js \
+		  dom \
+		  necko \
+		  caps \
+		  widget \
+		  appshell \
+		  rdf \
+		  xpconnect \
+		  jsconsole \
+		  raptor \
+		  $(NULL)
 include <$(DEPTH)/config/config.mak>
 
 MODULE=jsurl
diff --git a/mozilla/editor/base/makefile.win b/mozilla/editor/base/makefile.win
index 8326ee2fd02..6ca6549b712 100644
--- a/mozilla/editor/base/makefile.win
+++ b/mozilla/editor/base/makefile.win
@@ -22,7 +22,36 @@
 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 content_xul gfx
+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 \
+		  content_xul \
+		  gfx \
+		  $(NULL)
 include <$(DEPTH)/config/config.mak>
 
 LIBRARY_NAME=editor
diff --git a/mozilla/editor/txmgr/src/makefile.win b/mozilla/editor/txmgr/src/makefile.win
index 93440abdd54..8a74a0a334c 100644
--- a/mozilla/editor/txmgr/src/makefile.win
+++ b/mozilla/editor/txmgr/src/makefile.win
@@ -24,7 +24,9 @@ DEPTH=..\..\..
 
 LIBRARY_NAME=txmgr
 MODULE=txmgr 
-REQUIRES	= xpcom string
+REQUIRES	= xpcom \
+		  string \
+		  $(NULL)
 
 CPPSRCS =				\
 	nsTransactionItem.cpp	\
diff --git a/mozilla/editor/txmgr/tests/makefile.win b/mozilla/editor/txmgr/tests/makefile.win
index efe91c727f8..7de123b7ef9 100644
--- a/mozilla/editor/txmgr/tests/makefile.win
+++ b/mozilla/editor/txmgr/tests/makefile.win
@@ -21,7 +21,9 @@
 
 DEPTH=..\..\..
 
-REQUIRES=xpcom txmgr
+REQUIRES	= xpcom \
+		  txmgr \
+		  $(NULL)
 
 MAKE_OBJ_TYPE	= EXE
 PROG1 = .\$(OBJDIR)\TestTXMgr.exe
diff --git a/mozilla/editor/txtsvc/src/makefile.win b/mozilla/editor/txtsvc/src/makefile.win
index d52b6bcd6ea..353b983efef 100644
--- a/mozilla/editor/txtsvc/src/makefile.win
+++ b/mozilla/editor/txtsvc/src/makefile.win
@@ -22,7 +22,15 @@
 DEPTH=..\..\..
 
 MODULE=txtsvc
-REQUIRES	= xpcom string editor content layout dom widget gfx
+REQUIRES	= xpcom \
+		  string \
+		  editor \
+		  content \
+		  layout \
+		  dom \
+		  widget \
+		  gfx \
+		  $(NULL)
 LIBRARY_NAME=txtsvc
 MODULE_NAME=nsTextServicesModule
 
diff --git a/mozilla/embedding/base/makefile.win b/mozilla/embedding/base/makefile.win
index 0f256f10f10..8d19ef0d5e6 100644
--- a/mozilla/embedding/base/makefile.win
+++ b/mozilla/embedding/base/makefile.win
@@ -21,7 +21,23 @@
 
 DEPTH=..\..
 MODULE=embed_base
-REQUIRES	= xpcom string widget view dom necko rdf appshell uriloader layout editor intl chrome embedcomponents timer gfx
+REQUIRES	= xpcom \
+		  string \
+		  widget \
+		  view \
+		  dom \
+		  necko \
+		  rdf \
+		  appshell \
+		  uriloader \
+		  layout \
+		  editor \
+		  intl \
+		  chrome \
+		  embedcomponents \
+		  timer \
+		  gfx \
+		  $(NULL)
 
 EXPORTS =                  \
         nsEmbedAPI.h       \
diff --git a/mozilla/embedding/browser/build/makefile.win b/mozilla/embedding/browser/build/makefile.win
index 5b83a4e01e9..f82c35fbe8a 100644
--- a/mozilla/embedding/browser/build/makefile.win
+++ b/mozilla/embedding/browser/build/makefile.win
@@ -23,7 +23,20 @@
 DEPTH=..\..\..
 
 MODULE=webBrowser_core
-REQUIRES	= xpcom string docshell dom widget layout necko uriloader shistory timer windowwatcher gfx content
+REQUIRES	= xpcom \
+		  string \
+		  docshell \
+		  dom \
+		  widget \
+		  layout \
+		  necko \
+		  uriloader \
+		  shistory \
+		  timer \
+		  windowwatcher \
+		  gfx \
+		  content \
+		  $(NULL)
 
 include <$(DEPTH)\config\config.mak>
 
diff --git a/mozilla/embedding/browser/webBrowser/makefile.win b/mozilla/embedding/browser/webBrowser/makefile.win
index 83c4145035f..fab4ff62338 100644
--- a/mozilla/embedding/browser/webBrowser/makefile.win
+++ b/mozilla/embedding/browser/webBrowser/makefile.win
@@ -21,7 +21,28 @@
 
 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
+REQUIRES	= xpcom \
+		  string \
+		  docshell \
+		  widget \
+		  layout \
+		  dom \
+		  js \
+		  necko \
+		  uriloader \
+		  shistory \
+		  webshell \
+		  mimetype \
+		  exthandler \
+		  timer \
+		  windowwatcher \
+		  wallet \
+		  appcomps \
+		  gfx \
+		  raptor \
+		  content \
+		  history \
+		  $(NULL)
 
 XPIDLSRCS=                        \
     .\nsIContextMenuListener.idl   \
diff --git a/mozilla/embedding/components/appstartup/src/makefile.win b/mozilla/embedding/components/appstartup/src/makefile.win
index 182d4b89990..f277958f911 100644
--- a/mozilla/embedding/components/appstartup/src/makefile.win
+++ b/mozilla/embedding/components/appstartup/src/makefile.win
@@ -21,7 +21,9 @@
 DEPTH=..\..\..\..
 
 MODULE=embedcomponents
-REQUIRES	= xpcom string
+REQUIRES	= xpcom \
+		  string \
+		  $(NULL)
 LIBRARY_NAME=appstartupnotifier_s
 
 EXPORTS = \
diff --git a/mozilla/embedding/components/build/makefile.win b/mozilla/embedding/components/build/makefile.win
index 84f2720468a..8c8f77696da 100644
--- a/mozilla/embedding/components/build/makefile.win
+++ b/mozilla/embedding/components/build/makefile.win
@@ -21,7 +21,16 @@
 DEPTH=..\..\..
 
 MODULE=embedcomponents
-REQUIRES	= js xpcom string windowwatcher jsconsole find embed_base dom txtsvc
+REQUIRES	= js \
+		  xpcom \
+		  string \
+		  windowwatcher \
+		  jsconsole \
+		  find \
+		  embed_base \
+		  dom \
+		  txtsvc \
+		  $(NULL)
 include <$(DEPTH)\config\config.mak>
 
 LIBRARY_NAME=embedcomponents
diff --git a/mozilla/embedding/components/find/src/makefile.win b/mozilla/embedding/components/find/src/makefile.win
index e92593e2ff1..482d0d5d84b 100644
--- a/mozilla/embedding/components/find/src/makefile.win
+++ b/mozilla/embedding/components/find/src/makefile.win
@@ -21,7 +21,17 @@
 DEPTH=..\..\..\..
 
 MODULE=embedcomponents
-REQUIRES	= string xpcom find txtsvc dom docshell layout widget content gfx
+REQUIRES	= string \
+		  xpcom \
+		  find \
+		  txtsvc \
+		  dom \
+		  docshell \
+		  layout \
+		  widget \
+		  content \
+		  gfx \
+		  $(NULL)
 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 15a7a1f4bb4..958ff9c5c66 100644
--- a/mozilla/embedding/components/jsconsole/src/makefile.win
+++ b/mozilla/embedding/components/jsconsole/src/makefile.win
@@ -21,7 +21,13 @@
 DEPTH=..\..\..\..
 
 MODULE=embedcomponents
-REQUIRES	= jsconsole xpcom string dom windowwatcher js
+REQUIRES	= jsconsole \
+		  xpcom \
+		  string \
+		  dom \
+		  windowwatcher \
+		  js \
+		  $(NULL)
 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 2069cbd5b5e..6b53f8d2b28 100644
--- a/mozilla/embedding/components/windowwatcher/src/makefile.win
+++ b/mozilla/embedding/components/windowwatcher/src/makefile.win
@@ -21,7 +21,23 @@
 DEPTH=..\..\..\..
 
 MODULE=embedcomponents
-REQUIRES	= xpcom string dom windowwatcher widget js xpconnect caps layout necko docshell webBrowser_core embed_base wallet intl content
+REQUIRES	= xpcom \
+		  string \
+		  dom \
+		  windowwatcher \
+		  widget \
+		  js \
+		  xpconnect \
+		  caps \
+		  layout \
+		  necko \
+		  docshell \
+		  webBrowser_core \
+		  embed_base \
+		  wallet \
+		  intl \
+		  content \
+		  $(NULL)
 
 LIBRARY_NAME=windowwatcher_s
 
diff --git a/mozilla/embedding/tests/winEmbed/makefile.win b/mozilla/embedding/tests/winEmbed/makefile.win
index 0ef29fc6da4..1f424fd456c 100644
--- a/mozilla/embedding/tests/winEmbed/makefile.win
+++ b/mozilla/embedding/tests/winEmbed/makefile.win
@@ -24,7 +24,23 @@ DEPTH=..\..\..
 MAKE_OBJ_TYPE   = EXE
 
 MODULE          = winEmbed
-REQUIRES		= xpcom string embed_base webBrowser_core webshell embedding windowwatcher profile necko docshell dom gfx widget layout uriloader shistory
+REQUIRES	= xpcom \
+		  string \
+		  embed_base \
+		  webBrowser_core \
+		  webshell \
+		  embedding \
+		  windowwatcher \
+		  profile \
+		  necko \
+		  docshell \
+		  dom \
+		  gfx \
+		  widget \
+		  layout \
+		  uriloader \
+		  shistory \
+		  $(NULL)
 PROGRAM         = .\$(OBJDIR)\$(MODULE).exe
 RESFILE         = $(MODULE).res
 
diff --git a/mozilla/extensions/cookie/makefile.win b/mozilla/extensions/cookie/makefile.win
index f750e214116..f27bb71f71c 100644
--- a/mozilla/extensions/cookie/makefile.win
+++ b/mozilla/extensions/cookie/makefile.win
@@ -25,7 +25,18 @@ DEFINES=-D_IMPL_NS_COOKIE -DWIN32_LEAN_AND_MEAN
 MODULE=cookie 
 LIBRARY_NAME=cookie
 MODULE_NAME=nsCookieModule
-REQUIRES	= xpcom string necko dom widget layout pref intl uriloader windowwatcher content
+REQUIRES	= xpcom \
+		  string \
+		  necko \
+		  dom \
+		  widget \
+		  layout \
+		  pref \
+		  intl \
+		  uriloader \
+		  windowwatcher \
+		  content \
+		  $(NULL)
 
 EXPORTS = nsCookieHTTPNotify.h
 
diff --git a/mozilla/extensions/cookie/tests/makefile.win b/mozilla/extensions/cookie/tests/makefile.win
index fd22ff516eb..f02455dd88f 100644
--- a/mozilla/extensions/cookie/tests/makefile.win
+++ b/mozilla/extensions/cookie/tests/makefile.win
@@ -23,7 +23,12 @@
 DEPTH	= ..\..\..
 DEFINES=-D_IMPL_NS_COOKIE -DWIN32_LEAN_AND_MEAN
 MODULE=cookie 
-REQUIRES	= xpcom string cookie necko intl
+REQUIRES	= xpcom \
+		  string \
+		  cookie \
+		  necko \
+		  intl \
+		  $(NULL)
 
 MAKE_OBJ_TYPE = EXE
 
diff --git a/mozilla/extensions/p3p/src/makefile.win b/mozilla/extensions/p3p/src/makefile.win
index 146dff4acdb..670d5388631 100644
--- a/mozilla/extensions/p3p/src/makefile.win
+++ b/mozilla/extensions/p3p/src/makefile.win
@@ -28,7 +28,9 @@ MODULE         = p3p
 LIBRARY_NAME   = p3p
 MODULE_NAME = nsP3PModule
 
-REQUIRES     = p3p xpcom
+REQUIRES	= p3p \
+		  xpcom \
+		  $(NULL)
 
 EXPORTS      = $(NULL)
 
diff --git a/mozilla/extensions/transformiix/build/makefile.win b/mozilla/extensions/transformiix/build/makefile.win
index 6e6353e1f66..51ff317458d 100644
--- a/mozilla/extensions/transformiix/build/makefile.win
+++ b/mozilla/extensions/transformiix/build/makefile.win
@@ -21,7 +21,15 @@
 
 DEPTH=..\..\..
 MODULE=transformiix
-REQUIRES	= xpcom string dom layout widget content_xsl necko content
+REQUIRES	= xpcom \
+		  string \
+		  dom \
+		  layout \
+		  widget \
+		  content_xsl \
+		  necko \
+		  content \
+		  $(NULL)
 include <$(DEPTH)/config/config.mak>
 
 LIBRARY_NAME=transformiix
diff --git a/mozilla/extensions/transformiix/source/base/makefile.win b/mozilla/extensions/transformiix/source/base/makefile.win
index d628d57c112..3c179e0c46f 100644
--- a/mozilla/extensions/transformiix/source/base/makefile.win
+++ b/mozilla/extensions/transformiix/source/base/makefile.win
@@ -20,7 +20,9 @@
 # Contributor(s): 
 
 DEPTH=..\..\..\..
-REQUIRES = string xpcom
+REQUIRES	= string \
+		  xpcom \
+		  $(NULL)
 
 include <$(DEPTH)/config/config.mak>
 
diff --git a/mozilla/extensions/transformiix/source/net/makefile.win b/mozilla/extensions/transformiix/source/net/makefile.win
index 670c4d87719..45aa9f6ca59 100644
--- a/mozilla/extensions/transformiix/source/net/makefile.win
+++ b/mozilla/extensions/transformiix/source/net/makefile.win
@@ -20,7 +20,10 @@
 # Contributor(s): 
 
 DEPTH=..\..\..\..
-REQUIRES = string xpcom necko
+REQUIRES	= string \
+		  xpcom \
+		  necko \
+		  $(NULL)
 include <$(DEPTH)/config/config.mak>
 
 !if defined(TX_EXE)
diff --git a/mozilla/extensions/transformiix/source/xml/dom/mozImpl/makefile.win b/mozilla/extensions/transformiix/source/xml/dom/mozImpl/makefile.win
index 79bf80960bf..c308038e281 100644
--- a/mozilla/extensions/transformiix/source/xml/dom/mozImpl/makefile.win
+++ b/mozilla/extensions/transformiix/source/xml/dom/mozImpl/makefile.win
@@ -20,7 +20,14 @@
 # Contributor(s): 
 
 DEPTH=..\..\..\..\..\..
-REQUIRES = string xpcom dom layout widget necko content
+REQUIRES	= string \
+		  xpcom \
+		  dom \
+		  layout \
+		  widget \
+		  necko \
+		  content \
+		  $(NULL)
 
 include <$(DEPTH)/config/config.mak>
 
diff --git a/mozilla/extensions/transformiix/source/xml/makefile.win b/mozilla/extensions/transformiix/source/xml/makefile.win
index e661fbd94ec..00c7d657b20 100644
--- a/mozilla/extensions/transformiix/source/xml/makefile.win
+++ b/mozilla/extensions/transformiix/source/xml/makefile.win
@@ -21,7 +21,13 @@
 
 DEPTH=..\..\..\..
 MODULE = transformiix
-REQUIRES = string xpcom dom layout widget content
+REQUIRES	= string \
+		  xpcom \
+		  dom \
+		  layout \
+		  widget \
+		  content \
+		  $(NULL)
 include <$(DEPTH)/config/config.mak>
 
 DIRS=dom parser util
diff --git a/mozilla/extensions/transformiix/source/xml/parser/makefile.win b/mozilla/extensions/transformiix/source/xml/parser/makefile.win
index 653ab6c137a..4351ca46bdd 100644
--- a/mozilla/extensions/transformiix/source/xml/parser/makefile.win
+++ b/mozilla/extensions/transformiix/source/xml/parser/makefile.win
@@ -21,7 +21,19 @@
 
 DEPTH=..\..\..\..\..
 MODULE=transformiix
-REQUIRES = string xpcom necko dom layout widget js appshell xpconnect caps raptor content
+REQUIRES	= string \
+		  xpcom \
+		  necko \
+		  dom \
+		  layout \
+		  widget \
+		  js \
+		  appshell \
+		  xpconnect \
+		  caps \
+		  raptor \
+		  content \
+		  $(NULL)
 
 include <$(DEPTH)/config/config.mak>
 
diff --git a/mozilla/extensions/transformiix/source/xml/util/makefile.win b/mozilla/extensions/transformiix/source/xml/util/makefile.win
index 20a3830fe1b..5ebf15bf650 100644
--- a/mozilla/extensions/transformiix/source/xml/util/makefile.win
+++ b/mozilla/extensions/transformiix/source/xml/util/makefile.win
@@ -21,7 +21,13 @@
 
 DEPTH=..\..\..\..\..
 MODULE=transformiix
-REQUIRES = xpcom string dom layout widget content
+REQUIRES	= xpcom \
+		  string \
+		  dom \
+		  layout \
+		  widget \
+		  content \
+		  $(NULL)
 
 include <$(DEPTH)/config/config.mak>
 
diff --git a/mozilla/extensions/transformiix/source/xpath/makefile.win b/mozilla/extensions/transformiix/source/xpath/makefile.win
index a73e520c479..4065348eebd 100644
--- a/mozilla/extensions/transformiix/source/xpath/makefile.win
+++ b/mozilla/extensions/transformiix/source/xpath/makefile.win
@@ -21,7 +21,13 @@
 
 DEPTH=..\..\..\..
 MODULE = transformiix
-REQUIRES = string xpcom dom layout widget content
+REQUIRES	= string \
+		  xpcom \
+		  dom \
+		  layout \
+		  widget \
+		  content \
+		  $(NULL)
 include <$(DEPTH)/config/config.mak>
 
 !if defined(TX_EXE)
diff --git a/mozilla/extensions/transformiix/source/xslt/functions/makefile.win b/mozilla/extensions/transformiix/source/xslt/functions/makefile.win
index f505292b5af..4ebbf7810b1 100644
--- a/mozilla/extensions/transformiix/source/xslt/functions/makefile.win
+++ b/mozilla/extensions/transformiix/source/xslt/functions/makefile.win
@@ -21,7 +21,13 @@
 
 DEPTH=..\..\..\..\..
 MODULE = transformiix
-REQUIRES = string xpcom dom layout widget content
+REQUIRES	= string \
+		  xpcom \
+		  dom \
+		  layout \
+		  widget \
+		  content \
+		  $(NULL)
 include <$(DEPTH)/config/config.mak>
 
 !if defined(TX_EXE)
diff --git a/mozilla/extensions/transformiix/source/xslt/makefile.win b/mozilla/extensions/transformiix/source/xslt/makefile.win
index e75672f539d..29f3dac1862 100644
--- a/mozilla/extensions/transformiix/source/xslt/makefile.win
+++ b/mozilla/extensions/transformiix/source/xslt/makefile.win
@@ -21,7 +21,15 @@
 
 DEPTH=..\..\..\..
 MODULE = transformiix
-REQUIRES = string xpcom dom layout widget necko content_xsl content
+REQUIRES	= string \
+		  xpcom \
+		  dom \
+		  layout \
+		  widget \
+		  necko \
+		  content_xsl \
+		  content \
+		  $(NULL)
 include <$(DEPTH)/config/config.mak>
 
 DIRS=util functions
diff --git a/mozilla/extensions/transformiix/source/xslt/util/makefile.win b/mozilla/extensions/transformiix/source/xslt/util/makefile.win
index 5244c94ab1d..6eafd7119c7 100644
--- a/mozilla/extensions/transformiix/source/xslt/util/makefile.win
+++ b/mozilla/extensions/transformiix/source/xslt/util/makefile.win
@@ -21,7 +21,13 @@
 
 DEPTH=..\..\..\..\..
 MODULE = transformiix
-REQUIRES = string xpcom dom layout widget content
+REQUIRES	= string \
+		  xpcom \
+		  dom \
+		  layout \
+		  widget \
+		  content \
+		  $(NULL)
 include <$(DEPTH)/config/config.mak>
 
 !if defined(TX_EXE)
diff --git a/mozilla/extensions/universalchardet/src/makefile.win b/mozilla/extensions/universalchardet/src/makefile.win
index 404e10578fe..c27d50f90b5 100644
--- a/mozilla/extensions/universalchardet/src/makefile.win
+++ b/mozilla/extensions/universalchardet/src/makefile.win
@@ -23,7 +23,11 @@ DEPTH=..\..\..
 MOZ_DEPTH=$(DEPTH)\..\mozilla\intl\chardet\src
 
 LCFLAGS= $(LCFLAGS) -D__STDC__
-REQUIRES	= xpcom string uconv chardet
+REQUIRES	= xpcom \
+		  string \
+		  uconv \
+		  chardet \
+		  $(NULL)
 
 DEFINES= -DWIN32_LEAN_AND_MEAN 
 LIBRARY_NAME= universalchardet
diff --git a/mozilla/extensions/universalchardet/tests/makefile.win b/mozilla/extensions/universalchardet/tests/makefile.win
index 3593d487101..bcac342168c 100644
--- a/mozilla/extensions/universalchardet/tests/makefile.win
+++ b/mozilla/extensions/universalchardet/tests/makefile.win
@@ -19,7 +19,9 @@
 #
 # Contributor(s): 
 DEPTH = ..\..\..
-REQUIRES	= xpcom chardet
+REQUIRES	= xpcom \
+		  chardet \
+		  $(NULL)
 include <$(DEPTH)\config\config.mak>
 
 MAKE_OBJ_TYPE = EXE
diff --git a/mozilla/extensions/wallet/build/makefile.win b/mozilla/extensions/wallet/build/makefile.win
index 8c38b86aacb..e19c80c26ef 100644
--- a/mozilla/extensions/wallet/build/makefile.win
+++ b/mozilla/extensions/wallet/build/makefile.win
@@ -25,7 +25,11 @@ DEPTH=..\..\..
 MODULE = walletviewers
 LIBRARY_NAME = wlltvwrs
 MODULE_NAME = nsWalletViewerModule
-REQUIRES	= xpcom walleteditor signonviewer walletpreview
+REQUIRES	= xpcom \
+		  walleteditor \
+		  signonviewer \
+		  walletpreview \
+		  $(NULL)
 
 LINCS = \
         -I..\editor             \
diff --git a/mozilla/extensions/wallet/editor/makefile.win b/mozilla/extensions/wallet/editor/makefile.win
index 42d4c4fbcf1..4848a7aa0d7 100644
--- a/mozilla/extensions/wallet/editor/makefile.win
+++ b/mozilla/extensions/wallet/editor/makefile.win
@@ -21,7 +21,14 @@
 
 DEPTH=..\..\..
 MODULE=walleteditor
-REQUIRES	= xpcom string wallet dom docshell necko widget
+REQUIRES	= xpcom \
+		  string \
+		  wallet \
+		  dom \
+		  docshell \
+		  necko \
+		  widget \
+		  $(NULL)
 
 #MAKE_OBJ_TYPE=DLL
 #DLLNAME=$(MODULE)
diff --git a/mozilla/extensions/wallet/signonviewer/makefile.win b/mozilla/extensions/wallet/signonviewer/makefile.win
index 0b1af3fea8b..a3600be0eed 100644
--- a/mozilla/extensions/wallet/signonviewer/makefile.win
+++ b/mozilla/extensions/wallet/signonviewer/makefile.win
@@ -21,7 +21,13 @@
 
 DEPTH=..\..\..
 MODULE=signonviewer
-REQUIRES	= xpcom string wallet dom widget necko
+REQUIRES	= xpcom \
+		  string \
+		  wallet \
+		  dom \
+		  widget \
+		  necko \
+		  $(NULL)
 
 #MAKE_OBJ_TYPE=DLL
 #DLLNAME=$(MODULE)
diff --git a/mozilla/extensions/wallet/src/makefile.win b/mozilla/extensions/wallet/src/makefile.win
index 40a483a93a9..de262d2ad39 100644
--- a/mozilla/extensions/wallet/src/makefile.win
+++ b/mozilla/extensions/wallet/src/makefile.win
@@ -21,7 +21,23 @@
 
 DEPTH=..\..\..
 MODULE=wallet
-REQUIRES	= xpcom string necko dom layout widget uriloader pref webshell docshell appshell intl windowwatcher gfx content raptor
+REQUIRES	= xpcom \
+		  string \
+		  necko \
+		  dom \
+		  layout \
+		  widget \
+		  uriloader \
+		  pref \
+		  webshell \
+		  docshell \
+		  appshell \
+		  intl \
+		  windowwatcher \
+		  gfx \
+		  content \
+		  raptor \
+		  $(NULL)
 
 include <$(DEPTH)/config/config.mak>
 
diff --git a/mozilla/extensions/wallet/walletpreview/makefile.win b/mozilla/extensions/wallet/walletpreview/makefile.win
index 18088373957..23b1a58b10d 100644
--- a/mozilla/extensions/wallet/walletpreview/makefile.win
+++ b/mozilla/extensions/wallet/walletpreview/makefile.win
@@ -21,7 +21,14 @@
 
 DEPTH=..\..\..
 MODULE=walletpreview
-REQUIRES	= xpcom string wallet dom widget necko docshell
+REQUIRES	= xpcom \
+		  string \
+		  wallet \
+		  dom \
+		  widget \
+		  necko \
+		  docshell \
+		  $(NULL)
 
 #MAKE_OBJ_TYPE=DLL
 #DLLNAME=$(MODULE)
diff --git a/mozilla/extensions/xmlextras/base/src/makefile.win b/mozilla/extensions/xmlextras/base/src/makefile.win
index 5b5c1137d9c..abf0f984187 100644
--- a/mozilla/extensions/xmlextras/base/src/makefile.win
+++ b/mozilla/extensions/xmlextras/base/src/makefile.win
@@ -23,7 +23,22 @@ DEPTH=..\..\..\..
 
 LIBRARY_NAME=xmlextrasbase_s 
 MODULE=xmlextras
-REQUIRES	= xpcom string dom js layout widget caps uconv necko docshell xpconnect webBrowser_core content raptor gfx
+REQUIRES	= xpcom \
+		  string \
+		  dom \
+		  js \
+		  layout \
+		  widget \
+		  caps \
+		  uconv \
+		  necko \
+		  docshell \
+		  xpconnect \
+		  webBrowser_core \
+		  content \
+		  raptor \
+		  gfx \
+		  $(NULL)
 
 DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
 
diff --git a/mozilla/extensions/xmlextras/build/src/makefile.win b/mozilla/extensions/xmlextras/build/src/makefile.win
index 74727c12a3a..40b45ec7cfa 100644
--- a/mozilla/extensions/xmlextras/build/src/makefile.win
+++ b/mozilla/extensions/xmlextras/build/src/makefile.win
@@ -19,7 +19,18 @@
 
 DEPTH=..\..\..\..
 MODULE=xmlextras
-REQUIRES	= xpcom string dom js layout widget caps necko webBrowser_core embedcomponents content
+REQUIRES	= xpcom \
+		  string \
+		  dom \
+		  js \
+		  layout \
+		  widget \
+		  caps \
+		  necko \
+		  webBrowser_core \
+		  embedcomponents \
+		  content \
+		  $(NULL)
 LIBRARY_NAME=xmlextras
 MODULE_NAME=nsXMLExtrasModule
 
diff --git a/mozilla/extensions/xmlextras/tests/makefile.win b/mozilla/extensions/xmlextras/tests/makefile.win
index 268b076bbe6..29c58e9f8d8 100755
--- a/mozilla/extensions/xmlextras/tests/makefile.win
+++ b/mozilla/extensions/xmlextras/tests/makefile.win
@@ -23,7 +23,15 @@
 
 DEPTH = ..\..\..
 
-REQUIRES=xpcom string xmlextras necko dom content layout widget
+REQUIRES	= xpcom \
+		  string \
+		  xmlextras \
+		  necko \
+		  dom \
+		  content \
+		  layout \
+		  widget \
+		  $(NULL)
 
 include <$(DEPTH)/config/config.mak>
 
diff --git a/mozilla/gfx2/src/makefile.win b/mozilla/gfx2/src/makefile.win
index 27ef2f4afeb..5d742ebb9db 100644
--- a/mozilla/gfx2/src/makefile.win
+++ b/mozilla/gfx2/src/makefile.win
@@ -24,7 +24,9 @@
 DEPTH=..\..
 
 MODULE=gfx2
-REQUIRES	= xpcom gfx
+REQUIRES	= xpcom \
+		  gfx \
+		  $(NULL)
 include <$(DEPTH)/config/config.mak>
 
 LIBRARY_NAME=gfx2
diff --git a/mozilla/htmlparser/robot/makefile.win b/mozilla/htmlparser/robot/makefile.win
index 8d40dc8f6d4..7b8ddc25de7 100644
--- a/mozilla/htmlparser/robot/makefile.win
+++ b/mozilla/htmlparser/robot/makefile.win
@@ -27,7 +27,14 @@ LIBNAME = .\$(OBJDIR)\DebugRobot
 DLL = $(LIBNAME).dll
 
 DEPTH=..\..
-REQUIRES	= xpcom string htmlparser necko docshell dom uriloader
+REQUIRES	= xpcom \
+		  string \
+		  htmlparser \
+		  necko \
+		  docshell \
+		  dom \
+		  uriloader \
+		  $(NULL)
 
 include <$(DEPTH)\config\config.mak>
 
diff --git a/mozilla/htmlparser/robot/test/makefile.win b/mozilla/htmlparser/robot/test/makefile.win
index caa2f346caa..22e36cff96d 100644
--- a/mozilla/htmlparser/robot/test/makefile.win
+++ b/mozilla/htmlparser/robot/test/makefile.win
@@ -21,7 +21,11 @@
 
 DEPTH=..\..\..
 
-REQUIRES=xpcom string webshell htmlparser
+REQUIRES	= xpcom \
+		  string \
+		  webshell \
+		  htmlparser \
+		  $(NULL)
 MAKE_OBJ_TYPE   = EXE
 PROGRAM = .\$(OBJDIR)\htmlrobot.exe
 
diff --git a/mozilla/htmlparser/src/makefile.win b/mozilla/htmlparser/src/makefile.win
index cacc2016e7a..4fb03c8afa6 100644
--- a/mozilla/htmlparser/src/makefile.win
+++ b/mozilla/htmlparser/src/makefile.win
@@ -22,7 +22,21 @@
 DEPTH=..\..
 
 MODULE         = htmlparser
-REQUIRES       = xpcom string necko util uconv expat layout dom pref nkcache intl widget raptor content
+REQUIRES	= xpcom \
+		  string \
+		  necko \
+		  util \
+		  uconv \
+		  expat \
+		  layout \
+		  dom \
+		  pref \
+		  nkcache \
+		  intl \
+		  widget \
+		  raptor \
+		  content \
+		  $(NULL)
 include <$(DEPTH)\config\config.mak>
 
 LIBRARY_NAME=raptorhtmlpars 
diff --git a/mozilla/htmlparser/tests/outsinks/makefile.win b/mozilla/htmlparser/tests/outsinks/makefile.win
index 0131a88e45c..264a424c885 100644
--- a/mozilla/htmlparser/tests/outsinks/makefile.win
+++ b/mozilla/htmlparser/tests/outsinks/makefile.win
@@ -21,7 +21,14 @@
 
 DEPTH=..\..\..
 
-REQUIRES	= xpcom string htmlparser necko layout dom content
+REQUIRES	= xpcom \
+		  string \
+		  htmlparser \
+		  necko \
+		  layout \
+		  dom \
+		  content \
+		  $(NULL)
 
 MAKE_OBJ_TYPE   = EXE
 PROGRAM = .\$(OBJDIR)\TestOutput.exe
diff --git a/mozilla/intl/chardet/src/classic/makefile.win b/mozilla/intl/chardet/src/classic/makefile.win
index 800b93dc1a3..7a03abd44c7 100644
--- a/mozilla/intl/chardet/src/classic/makefile.win
+++ b/mozilla/intl/chardet/src/classic/makefile.win
@@ -20,7 +20,11 @@
 # Contributor(s): 
 DEPTH=..\..\..\..
 
-REQUIRES=xpcom string uconv chardet
+REQUIRES	= xpcom \
+		  string \
+		  uconv \
+		  chardet \
+		  $(NULL)
 LCFLAGS= $(LCFLAGS) -D__STDC__
 
 DEFINES= -DWIN32_LEAN_AND_MEAN
diff --git a/mozilla/intl/chardet/src/makefile.win b/mozilla/intl/chardet/src/makefile.win
index f50a48e5a51..9970a915d53 100644
--- a/mozilla/intl/chardet/src/makefile.win
+++ b/mozilla/intl/chardet/src/makefile.win
@@ -62,7 +62,21 @@ CPP_OBJS= \
 MODULE=chardet
 LIBARARY_NAME=chardet
 MODULE_NAME=nsCharDetModule
-REQUIRES	= xpcom string uconv webshell uriloader docshell htmlparser dom necko widget layout embedcomponents raptor content
+REQUIRES	= xpcom \
+		  string \
+		  uconv \
+		  webshell \
+		  uriloader \
+		  docshell \
+		  htmlparser \
+		  dom \
+		  necko \
+		  widget \
+		  layout \
+		  embedcomponents \
+		  raptor \
+		  content \
+		  $(NULL)
 
 INCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\chardet -I$(PUBLIC)\raptor \
      -I$(PUBLIC)\netlib -I$(PUBLIC)\uconv -I$(PUBLIC)\webshell
diff --git a/mozilla/intl/chardet/src/windows/makefile.win b/mozilla/intl/chardet/src/windows/makefile.win
index 60adc77c7e9..9a8dc76715f 100644
--- a/mozilla/intl/chardet/src/windows/makefile.win
+++ b/mozilla/intl/chardet/src/windows/makefile.win
@@ -20,7 +20,11 @@
 # Contributor(s): 
 DEPTH=..\..\..\..
 
-REQUIRES=xpcom string chardet uconv
+REQUIRES	= xpcom \
+		  string \
+		  chardet \
+		  uconv \
+		  $(NULL)
 LCFLAGS= $(LCFLAGS) -D__STDC__
 
 DEFINES= -DWIN32_LEAN_AND_MEAN
diff --git a/mozilla/intl/chardet/tests/makefile.win b/mozilla/intl/chardet/tests/makefile.win
index d90b569d544..865b6e74053 100644
--- a/mozilla/intl/chardet/tests/makefile.win
+++ b/mozilla/intl/chardet/tests/makefile.win
@@ -20,7 +20,9 @@
 # Contributor(s): 
 DEPTH = ..\..\..
 
-REQUIRES=xpcom chardet
+REQUIRES	= xpcom \
+		  chardet \
+		  $(NULL)
 
 
 MAKE_OBJ_TYPE = EXE
diff --git a/mozilla/intl/compatibility/src/makefile.win b/mozilla/intl/compatibility/src/makefile.win
index bc68340dc1c..33bb9a72dfc 100644
--- a/mozilla/intl/compatibility/src/makefile.win
+++ b/mozilla/intl/compatibility/src/makefile.win
@@ -40,7 +40,9 @@ CPP_OBJS= \
 MODULE=intlcmpt
 LIBRARY_NAME=intlcmpt
 MODULE_NAME=I18nCompatibility
-REQUIRES=xpcom string
+REQUIRES	= xpcom \
+		  string \
+		  $(NULL)
 
 INCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor
 
diff --git a/mozilla/intl/locale/src/makefile.win b/mozilla/intl/locale/src/makefile.win
index 01a67a98415..d6598cde942 100644
--- a/mozilla/intl/locale/src/makefile.win
+++ b/mozilla/intl/locale/src/makefile.win
@@ -27,7 +27,16 @@ DEPTH		= ..\..\..
 DEFINES		= -D_IMPL_NS_INTL -DWIN32_LEAN_AND_MEAN
 
 MODULE		= locale
-REQUIRES	= xpcom string uconv unicharutil necko dom windowwatcher uriloader intl
+REQUIRES	= xpcom \
+		  string \
+		  uconv \
+		  unicharutil \
+		  necko \
+		  dom \
+		  windowwatcher \
+		  uriloader \
+		  intl \
+		  $(NULL)
 LIBRARY_NAME	= nslocale_s
 
 DIRS		= windows
diff --git a/mozilla/intl/locale/src/windows/makefile.win b/mozilla/intl/locale/src/windows/makefile.win
index 0a01d49034a..e41d08f9858 100644
--- a/mozilla/intl/locale/src/windows/makefile.win
+++ b/mozilla/intl/locale/src/windows/makefile.win
@@ -21,7 +21,11 @@
 
 DEPTH=..\..\..\..
 MODULE		= locale
-REQUIRES=xpcom string unicharutil uconv
+REQUIRES	= xpcom \
+		  string \
+		  unicharutil \
+		  uconv \
+		  $(NULL)
 include <$(DEPTH)/config/config.mak>
 
 LIBRARY_NAME	= nslocale
diff --git a/mozilla/intl/lwbrk/src/makefile.win b/mozilla/intl/lwbrk/src/makefile.win
index 4f4212396bc..afd3bf5e250 100644
--- a/mozilla/intl/lwbrk/src/makefile.win
+++ b/mozilla/intl/lwbrk/src/makefile.win
@@ -51,7 +51,9 @@ CPP_OBJS= \
 MODULE=lwbrk
 LIBRARY_NAME=lwbrk
 MODULE_NAME=nsLWBrkModule
-REQUIRES=xpcom string
+REQUIRES	= xpcom \
+		  string \
+		  $(NULL)
 
 LLIBS= \
 	$(DIST)\lib\xpcom.lib	\
diff --git a/mozilla/intl/lwbrk/tests/makefile.win b/mozilla/intl/lwbrk/tests/makefile.win
index 0b8c306a130..5a4589c7916 100644
--- a/mozilla/intl/lwbrk/tests/makefile.win
+++ b/mozilla/intl/lwbrk/tests/makefile.win
@@ -21,7 +21,10 @@
 DEPTH = ..\..\..
 
 
-REQUIRES	= xpcom string lwbrk
+REQUIRES	= xpcom \
+		  string \
+		  lwbrk \
+		  $(NULL)
 
 
 MAKE_OBJ_TYPE = EXE
diff --git a/mozilla/intl/strres/src/makefile.win b/mozilla/intl/strres/src/makefile.win
index 0d43ad3b8dd..4eddde0864e 100644
--- a/mozilla/intl/strres/src/makefile.win
+++ b/mozilla/intl/strres/src/makefile.win
@@ -22,7 +22,11 @@
 DEPTH=..\..\..
 
 MODULE=intl
-REQUIRES	= xpcom string necko locale
+REQUIRES	= xpcom \
+		  string \
+		  necko \
+		  locale \
+		  $(NULL)
 include <$(DEPTH)\config\config.mak>
 
 LIBRARY_NAME=strres
diff --git a/mozilla/intl/strres/tests/makefile.win b/mozilla/intl/strres/tests/makefile.win
index 6ae88f41252..efa62ec355d 100644
--- a/mozilla/intl/strres/tests/makefile.win
+++ b/mozilla/intl/strres/tests/makefile.win
@@ -20,7 +20,12 @@
 # Contributor(s): 
 
 DEPTH=..\..\..
-REQUIRES=xpcom string intl necko locale
+REQUIRES	= xpcom \
+		  string \
+		  intl \
+		  necko \
+		  locale \
+		  $(NULL)
 MAKE_OBJ_TYPE	= EXE
 PROG0 = .\$(OBJDIR)\StringBundleTest.exe
 PROGRAMS = $(PROG0)
diff --git a/mozilla/intl/uconv/src/makefile.win b/mozilla/intl/uconv/src/makefile.win
index 23f88bbbfec..141b09a777a 100644
--- a/mozilla/intl/uconv/src/makefile.win
+++ b/mozilla/intl/uconv/src/makefile.win
@@ -21,7 +21,15 @@
 
 DEPTH=..\..\..
 MODULE=uconv
-REQUIRES	= xpcom string intl locale chardet necko rdf pref
+REQUIRES	= xpcom \
+		  string \
+		  intl \
+		  locale \
+		  chardet \
+		  necko \
+		  rdf \
+		  pref \
+		  $(NULL)
 include <$(DEPTH)/config/config.mak>
 
 DEFINES=-D_IMPL_NS_INTL -DWIN32_LEAN_AND_MEAN
diff --git a/mozilla/intl/uconv/tests/makefile.win b/mozilla/intl/uconv/tests/makefile.win
index c778d792e52..572221fdeb7 100644
--- a/mozilla/intl/uconv/tests/makefile.win
+++ b/mozilla/intl/uconv/tests/makefile.win
@@ -20,7 +20,11 @@
 # Contributor(s): 
 
 DEPTH = ..\..\..
-REQUIRES = xpcom uconv string locale
+REQUIRES	= xpcom \
+		  uconv \
+		  string \
+		  locale \
+		  $(NULL)
 MAKE_OBJ_TYPE = EXE
 
 PROG1 = .\$(OBJDIR)\convperf.exe
diff --git a/mozilla/intl/uconv/ucvcn/makefile.win b/mozilla/intl/uconv/ucvcn/makefile.win
index 0dd9524bb0d..bc733aa68d4 100644
--- a/mozilla/intl/uconv/ucvcn/makefile.win
+++ b/mozilla/intl/uconv/ucvcn/makefile.win
@@ -24,7 +24,10 @@ DEPTH=..\..\..
 DEFINES=-D_IMPL_NS_INTL -DWIN32_LEAN_AND_MEAN
 
 MODULE=uconv
-REQUIRES=xpcom string uconv
+REQUIRES	= xpcom \
+		  string \
+		  uconv \
+		  $(NULL)
 LIBRARY_NAME=ucvcn
 MODULE_NAME=nsUCvCnModule
 
diff --git a/mozilla/intl/uconv/ucvibm/makefile.win b/mozilla/intl/uconv/ucvibm/makefile.win
index b44661ea52b..e83b5ed641a 100644
--- a/mozilla/intl/uconv/ucvibm/makefile.win
+++ b/mozilla/intl/uconv/ucvibm/makefile.win
@@ -36,7 +36,10 @@ DEPTH=..\..\..
 DEFINES=-D_IMPL_NS_INTL -DWIN32_LEAN_AND_MEAN
 
 MODULE=uconv
-REQUIRES=xpcom string uconv
+REQUIRES	= xpcom \
+		  string \
+		  uconv \
+		  $(NULL)
 LIBRARY_NAME=ucvibm
 MODULE_NAME=nsUCvIBMModule
 
diff --git a/mozilla/intl/uconv/ucvja/makefile.win b/mozilla/intl/uconv/ucvja/makefile.win
index f203a1f7b1f..1e294879c4d 100644
--- a/mozilla/intl/uconv/ucvja/makefile.win
+++ b/mozilla/intl/uconv/ucvja/makefile.win
@@ -24,7 +24,10 @@ DEPTH=..\..\..
 DEFINES=-D_IMPL_NS_INTL -DWIN32_LEAN_AND_MEAN
 
 MODULE=uconv
-REQUIRES=xpcom string uconv
+REQUIRES	= xpcom \
+		  string \
+		  uconv \
+		  $(NULL)
 LIBRARY_NAME=ucvja
 MODULE_NAME=nsUCvJAModule
 
diff --git a/mozilla/intl/uconv/ucvko/makefile.win b/mozilla/intl/uconv/ucvko/makefile.win
index fe0f9e5fc4d..87a62d2995a 100644
--- a/mozilla/intl/uconv/ucvko/makefile.win
+++ b/mozilla/intl/uconv/ucvko/makefile.win
@@ -24,7 +24,10 @@ DEPTH=..\..\..
 DEFINES=-D_IMPL_NS_INTL -DWIN32_LEAN_AND_MEAN
 
 MODULE=uconv
-REQUIRES=xpcom string uconv
+REQUIRES	= xpcom \
+		  string \
+		  uconv \
+		  $(NULL)
 LIBRARY_NAME=ucvko
 MODULE_NAME=nsUCvKoModule
 
diff --git a/mozilla/intl/uconv/ucvlatin/makefile.win b/mozilla/intl/uconv/ucvlatin/makefile.win
index b96220ce1b3..03a43cf754c 100644
--- a/mozilla/intl/uconv/ucvlatin/makefile.win
+++ b/mozilla/intl/uconv/ucvlatin/makefile.win
@@ -26,7 +26,10 @@ DEFINES=-D_IMPL_NS_INTL -DWIN32_LEAN_AND_MEAN
 MODULE=uconv
 LIBRARY_NAME=ucvlatin
 MODULE_NAME=nsUCvLatinModule
-REQUIRES	= xpcom string uconv
+REQUIRES	= xpcom \
+		  string \
+		  uconv \
+		  $(NULL)
 
 CPPSRCS =				\
 	nsUEscapeToUnicode.cpp		\
diff --git a/mozilla/intl/uconv/ucvtw/makefile.win b/mozilla/intl/uconv/ucvtw/makefile.win
index d8034172062..08f0aa645fc 100644
--- a/mozilla/intl/uconv/ucvtw/makefile.win
+++ b/mozilla/intl/uconv/ucvtw/makefile.win
@@ -24,7 +24,10 @@ DEPTH=..\..\..
 DEFINES=-D_IMPL_NS_INTL -DWIN32_LEAN_AND_MEAN
 
 MODULE=uconv
-REQUIRES=xpcom string uconv
+REQUIRES	= xpcom \
+		  string \
+		  uconv \
+		  $(NULL)
 LIBRARY_NAME=ucvtw
 MODULE_NAME=nsUCvTWModule
 
diff --git a/mozilla/intl/uconv/ucvtw2/makefile.win b/mozilla/intl/uconv/ucvtw2/makefile.win
index a751e1cadc4..58ab718255d 100644
--- a/mozilla/intl/uconv/ucvtw2/makefile.win
+++ b/mozilla/intl/uconv/ucvtw2/makefile.win
@@ -24,7 +24,10 @@ DEPTH=..\..\..
 DEFINES=-D_IMPL_NS_INTL -DWIN32_LEAN_AND_MEAN
 
 MODULE=uconv
-REQUIRES=xpcom string uconv
+REQUIRES	= xpcom \
+		  string \
+		  uconv \
+		  $(NULL)
 LIBRARY_NAME=ucvtw2
 MODULE_NAME=nsUCvTW2Module
 
diff --git a/mozilla/intl/unicharutil/src/makefile.win b/mozilla/intl/unicharutil/src/makefile.win
index 0ca55078046..9d1a37ed6fd 100644
--- a/mozilla/intl/unicharutil/src/makefile.win
+++ b/mozilla/intl/unicharutil/src/makefile.win
@@ -20,7 +20,11 @@
 # Contributor(s): 
 DEPTH=..\..\..
 MODULE=unicharutil
-REQUIRES	= xpcom string uconv necko
+REQUIRES	= xpcom \
+		  string \
+		  uconv \
+		  necko \
+		  $(NULL)
 include <$(DEPTH)\config\config.mak>
 
 
diff --git a/mozilla/intl/unicharutil/tests/makefile.win b/mozilla/intl/unicharutil/tests/makefile.win
index 2c3c89139e9..fa217fed1a5 100644
--- a/mozilla/intl/unicharutil/tests/makefile.win
+++ b/mozilla/intl/unicharutil/tests/makefile.win
@@ -20,7 +20,12 @@
 # Contributor(s): 
 DEPTH = ..\..\..
 
-REQUIRES=xpcom string unicharutil uconv necko
+REQUIRES	= xpcom \
+		  string \
+		  unicharutil \
+		  uconv \
+		  necko \
+		  $(NULL)
 
 
 MAKE_OBJ_TYPE = EXE
diff --git a/mozilla/js/src/liveconnect/makefile.win b/mozilla/js/src/liveconnect/makefile.win
index cd26bf0038c..ad27e7a7920 100644
--- a/mozilla/js/src/liveconnect/makefile.win
+++ b/mozilla/js/src/liveconnect/makefile.win
@@ -46,7 +46,10 @@
 #//------------------------------------------------------------------------
 DEPTH= ..\..\..
 MODULE = java
-REQUIRES=xpcom js xpconnect
+REQUIRES	= xpcom \
+		  js \
+		  xpconnect \
+		  $(NULL)
 include <$(DEPTH)/config/config.mak>
 
 !ifdef NSJVM
diff --git a/mozilla/js/src/xpconnect/loader/makefile.win b/mozilla/js/src/xpconnect/loader/makefile.win
index 89a527bb6ab..b29c4beb3d2 100755
--- a/mozilla/js/src/xpconnect/loader/makefile.win
+++ b/mozilla/js/src/xpconnect/loader/makefile.win
@@ -56,7 +56,14 @@ DEPTH= ..\..\..\..
 MODULE=jsloader
 LIBRARY_NAME=jsloader
 MODULE_NAME=JS_component_loader
-REQUIRES=xpcom string js xpconnect caps dom necko
+REQUIRES	= xpcom \
+		  string \
+		  js \
+		  xpconnect \
+		  caps \
+		  dom \
+		  necko \
+		  $(NULL)
 
 #//------------------------------------------------------------------------
 #// 
diff --git a/mozilla/js/src/xpconnect/shell/makefile.win b/mozilla/js/src/xpconnect/shell/makefile.win
index 3bbe5a5be99..9442ddf29a7 100644
--- a/mozilla/js/src/xpconnect/shell/makefile.win
+++ b/mozilla/js/src/xpconnect/shell/makefile.win
@@ -32,7 +32,11 @@
 # file under either the NPL or the GPL.
 
 DEPTH=..\..\..\..
-REQUIRES=xpcom string xpconnect js
+REQUIRES	= xpcom \
+		  string \
+		  xpconnect \
+		  js \
+		  $(NULL)
 
 
 MAKE_OBJ_TYPE	= EXE
diff --git a/mozilla/js/src/xpconnect/src/makefile.win b/mozilla/js/src/xpconnect/src/makefile.win
index 38b69c887f2..5e4eb0896e0 100644
--- a/mozilla/js/src/xpconnect/src/makefile.win
+++ b/mozilla/js/src/xpconnect/src/makefile.win
@@ -37,7 +37,12 @@ DEPTH=..\..\..\..
 MODULE=xpconnect
 LIBRARY_NAME=xpc$(MOZ_BITS)$(VERSION_NUMBER)
 MODULE_NAME=xpconnect
-REQUIRES=xpcom string js dom caps
+REQUIRES	= xpcom \
+		  string \
+		  js \
+		  dom \
+		  caps \
+		  $(NULL)
 
 #PDBFILE		= $(DLLNAME).pdb
 #MAPFILE		= $(DLLNAME).map
diff --git a/mozilla/js/src/xpconnect/tests/components/makefile.win b/mozilla/js/src/xpconnect/tests/components/makefile.win
index 7501ae0fc83..a6b9afde38a 100644
--- a/mozilla/js/src/xpconnect/tests/components/makefile.win
+++ b/mozilla/js/src/xpconnect/tests/components/makefile.win
@@ -39,7 +39,12 @@ DLLNAME		= xpctest
 DLL		=.\$(OBJDIR)\$(DLLNAME).dll
 
 MODULE=xpconnect_tests
-REQUIRES=xpcom string xpconnect js timer
+REQUIRES	= xpcom \
+		  string \
+		  xpconnect \
+		  js \
+		  timer \
+		  $(NULL)
 
 DEFINES=-DWIN32_LEAN_AND_MEAN
 
diff --git a/mozilla/js/src/xpconnect/tests/makefile.win b/mozilla/js/src/xpconnect/tests/makefile.win
index d0d96f97df7..940074be3ca 100644
--- a/mozilla/js/src/xpconnect/tests/makefile.win
+++ b/mozilla/js/src/xpconnect/tests/makefile.win
@@ -37,7 +37,11 @@ DEPTH=..\..\..\..
 
 DIRS	= idl components
 MODULE=xpconnect_tests
-REQUIRES = xpcom string js xpconnect
+REQUIRES	= xpcom \
+		  string \
+		  js \
+		  xpconnect \
+		  $(NULL)
 MAKE_OBJ_TYPE	= EXE
 PROG1 = .\$(OBJDIR)\TestXPC.exe
 PROGRAMS = $(PROG1)
diff --git a/mozilla/layout/base/src/makefile.win b/mozilla/layout/base/src/makefile.win
index 47d96ccfe9c..3566789be80 100644
--- a/mozilla/layout/base/src/makefile.win
+++ b/mozilla/layout/base/src/makefile.win
@@ -21,7 +21,26 @@
 
 DEPTH=..\..\..
 MODULE=layout
-REQUIRES	= xpcom string dom widget view locale timer htmlparser webshell necko uconv pref uriloader unicharutil docshell imglib2 gfx2 content gfx
+REQUIRES	= xpcom \
+		  string \
+		  dom \
+		  widget \
+		  view \
+		  locale \
+		  timer \
+		  htmlparser \
+		  webshell \
+		  necko \
+		  uconv \
+		  pref \
+		  uriloader \
+		  unicharutil \
+		  docshell \
+		  imglib2 \
+		  gfx2 \
+		  content \
+		  gfx \
+		  $(NULL)
 
 include <$(DEPTH)\config\config.mak>
 
diff --git a/mozilla/layout/base/tests/makefile.win b/mozilla/layout/base/tests/makefile.win
index 68ae02c4e0f..d2452d4a6f8 100644
--- a/mozilla/layout/base/tests/makefile.win
+++ b/mozilla/layout/base/tests/makefile.win
@@ -20,7 +20,10 @@
 # Contributor(s): 
 
 DEPTH=..\..\..
-REQUIRES=xpcom layout gfx
+REQUIRES	= xpcom \
+		  layout \
+		  gfx \
+		  $(NULL)
 MAKE_OBJ_TYPE	= EXE
 PROG1 = .\$(OBJDIR)\TestSpaceManager.exe
 PROGRAMS = $(PROG1)
diff --git a/mozilla/layout/build/makefile.win b/mozilla/layout/build/makefile.win
index a0e93080a9c..7431ff1f898 100644
--- a/mozilla/layout/build/makefile.win
+++ b/mozilla/layout/build/makefile.win
@@ -21,7 +21,15 @@
 
 DEPTH=..\..
 MODULE=layout
-REQUIRES	= xpcom string widget locale timer gfx content layout_xul
+REQUIRES	= xpcom \
+		  string \
+		  widget \
+		  locale \
+		  timer \
+		  gfx \
+		  content \
+		  layout_xul \
+		  $(NULL)
 include <$(DEPTH)/config/config.mak>
 
 DEFINES=-D_IMPL_NS_HTML 
diff --git a/mozilla/layout/html/base/src/makefile.win b/mozilla/layout/html/base/src/makefile.win
index 7c2a5301f5e..072b47405e3 100644
--- a/mozilla/layout/html/base/src/makefile.win
+++ b/mozilla/layout/html/base/src/makefile.win
@@ -21,7 +21,37 @@
 
 DEPTH=..\..\..\..
 MODULE=layout
-REQUIRES	= xpcom string dom widget locale view necko js caps pref htmlparser webshell plugin gkplugin timer docshell mimetype webBrowser_core oji util unicharutil lwbrk gfx2 gfx imglib2 accessibility xpconnect java exthandler content
+REQUIRES	= xpcom \
+		  string \
+		  dom \
+		  widget \
+		  locale \
+		  view \
+		  necko \
+		  js \
+		  caps \
+		  pref \
+		  htmlparser \
+		  webshell \
+		  plugin \
+		  gkplugin \
+		  timer \
+		  docshell \
+		  mimetype \
+		  webBrowser_core \
+		  oji \
+		  util \
+		  unicharutil \
+		  lwbrk \
+		  gfx2 \
+		  gfx \
+		  imglib2 \
+		  accessibility \
+		  xpconnect \
+		  java \
+		  exthandler \
+		  content \
+		  $(NULL)
 include <$(DEPTH)\config\config.mak>
 
 LIBRARY_NAME=layouthtmlbase_s 
diff --git a/mozilla/layout/html/document/src/makefile.win b/mozilla/layout/html/document/src/makefile.win
index c302062c5c9..93bc2746619 100644
--- a/mozilla/layout/html/document/src/makefile.win
+++ b/mozilla/layout/html/document/src/makefile.win
@@ -23,7 +23,26 @@ DEPTH=..\..\..\..
 
 LIBRARY_NAME=layouthtmldoc_s 
 MODULE=layout
-REQUIRES	= xpcom string widget dom necko locale view js webshell docshell caps pref uriloader shistory xpconnect accessibility gfx content layout_xul
+REQUIRES	= xpcom \
+		  string \
+		  widget \
+		  dom \
+		  necko \
+		  locale \
+		  view \
+		  js \
+		  webshell \
+		  docshell \
+		  caps \
+		  pref \
+		  uriloader \
+		  shistory \
+		  xpconnect \
+		  accessibility \
+		  gfx \
+		  content \
+		  layout_xul \
+		  $(NULL)
 
 DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN 
 !if defined(XP_NEW_SELECTION)
diff --git a/mozilla/layout/html/forms/src/makefile.win b/mozilla/layout/html/forms/src/makefile.win
index 7a5883c4d0d..ae69f713ce5 100644
--- a/mozilla/layout/html/forms/src/makefile.win
+++ b/mozilla/layout/html/forms/src/makefile.win
@@ -25,7 +25,35 @@ LIBRARY_NAME=layouthtmlforms_s
 
 DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
 MODULE=layout
-REQUIRES	= xpcom string locale widget view dom js htmlparser necko webshell caps editor intl uconv exthandler mimetype txmgr gfx2 imglib2 accessibility xpconnect unicharutil timer pref gfx content content_xul layout_xul
+REQUIRES	= xpcom \
+		  string \
+		  locale \
+		  widget \
+		  view \
+		  dom \
+		  js \
+		  htmlparser \
+		  necko \
+		  webshell \
+		  caps \
+		  editor \
+		  intl \
+		  uconv \
+		  exthandler \
+		  mimetype \
+		  txmgr \
+		  gfx2 \
+		  imglib2 \
+		  accessibility \
+		  xpconnect \
+		  unicharutil \
+		  timer \
+		  pref \
+		  gfx \
+		  content \
+		  content_xul \
+		  layout_xul \
+		  $(NULL)
 
 CPPSRCS= \
   nsFormControlHelper.cpp \
diff --git a/mozilla/layout/html/style/src/makefile.win b/mozilla/layout/html/style/src/makefile.win
index a222bfaeba8..8f0fca88ea2 100644
--- a/mozilla/layout/html/style/src/makefile.win
+++ b/mozilla/layout/html/style/src/makefile.win
@@ -23,7 +23,26 @@ DEPTH=..\..\..\..
 
 LIBRARY_NAME=layouthtmlstyle_s 
 MODULE=layout
-REQUIRES	= xpcom string dom widget timer locale view necko webshell pref docshell plugin gkplugin content_xul imglib2 gfx2 gfx content layout_xul
+REQUIRES	= xpcom \
+		  string \
+		  dom \
+		  widget \
+		  timer \
+		  locale \
+		  view \
+		  necko \
+		  webshell \
+		  pref \
+		  docshell \
+		  plugin \
+		  gkplugin \
+		  content_xul \
+		  imglib2 \
+		  gfx2 \
+		  gfx \
+		  content \
+		  layout_xul \
+		  $(NULL)
 
 DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
 
diff --git a/mozilla/layout/html/table/src/makefile.win b/mozilla/layout/html/table/src/makefile.win
index 505ec1e0e44..795e99ccdbb 100644
--- a/mozilla/layout/html/table/src/makefile.win
+++ b/mozilla/layout/html/table/src/makefile.win
@@ -23,7 +23,17 @@ DEPTH=..\..\..\..
 
 LIBRARY_NAME=layouthtmltable_s 
 MODULE=layout
-REQUIRES	= xpcom string dom widget locale webshell view accessibility gfx content
+REQUIRES	= xpcom \
+		  string \
+		  dom \
+		  widget \
+		  locale \
+		  webshell \
+		  view \
+		  accessibility \
+		  gfx \
+		  content \
+		  $(NULL)
 
 
 DEFINES		=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN -DoffDEBUG_TABLE_REFLOW \
diff --git a/mozilla/layout/html/tests/makefile.win b/mozilla/layout/html/tests/makefile.win
index b6daa07c236..5f3ecec661d 100644
--- a/mozilla/layout/html/tests/makefile.win
+++ b/mozilla/layout/html/tests/makefile.win
@@ -20,7 +20,11 @@
 # Contributor(s): 
 
 DEPTH=..\..\..
-REQUIRES	= xpcom string layout content
+REQUIRES	= xpcom \
+		  string \
+		  layout \
+		  content \
+		  $(NULL)
 include <$(DEPTH)/config/config.mak>
 
 MAKE_OBJ_TYPE	= EXE
diff --git a/mozilla/layout/xul/base/src/makefile.win b/mozilla/layout/xul/base/src/makefile.win
index 5609c0d4c38..c685498f545 100644
--- a/mozilla/layout/xul/base/src/makefile.win
+++ b/mozilla/layout/xul/base/src/makefile.win
@@ -24,7 +24,27 @@ DEPTH=..\..\..\..
 LIBRARY_NAME=layoutxulbase_s 
 MODULE=layout_xul
 DIRS=outliner
-REQUIRES	= xpcom string dom locale widget view timer docshell necko editor htmlparser webshell pref intl gfx2 imglib2 unicharutil gfx content layout
+REQUIRES	= xpcom \
+		  string \
+		  dom \
+		  locale \
+		  widget \
+		  view \
+		  timer \
+		  docshell \
+		  necko \
+		  editor \
+		  htmlparser \
+		  webshell \
+		  pref \
+		  intl \
+		  gfx2 \
+		  imglib2 \
+		  unicharutil \
+		  gfx \
+		  content \
+		  layout \
+		  $(NULL)
 
 DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
 
diff --git a/mozilla/layout/xul/base/src/outliner/src/makefile.win b/mozilla/layout/xul/base/src/outliner/src/makefile.win
index 0503a8c79f9..a260f1f2e1f 100644
--- a/mozilla/layout/xul/base/src/outliner/src/makefile.win
+++ b/mozilla/layout/xul/base/src/outliner/src/makefile.win
@@ -23,7 +23,21 @@ DEPTH=..\..\..\..\..\..
 
 LIBRARY_NAME=raptorxuloutliner_s 
 MODULE=layout_xul
-REQUIRES	= xpcom string dom widget timer locale view rdf necko gfx2 imglib2 gfx content content_xul
+REQUIRES	= xpcom \
+		  string \
+		  dom \
+		  widget \
+		  timer \
+		  locale \
+		  view \
+		  rdf \
+		  necko \
+		  gfx2 \
+		  imglib2 \
+		  gfx \
+		  content \
+		  content_xul \
+		  $(NULL)
 
 DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
 
diff --git a/mozilla/mailnews/absync/build/makefile.win b/mozilla/mailnews/absync/build/makefile.win
index c1c2b2125eb..1e6e2cf4bd2 100644
--- a/mozilla/mailnews/absync/build/makefile.win
+++ b/mozilla/mailnews/absync/build/makefile.win
@@ -19,7 +19,17 @@
 
 DEPTH=..\..\..
 MODULE=absync
-REQUIRES	= xpcom string necko docshell uriloader msgbase intl addrbook dom mork
+REQUIRES	= xpcom \
+		  string \
+		  necko \
+		  docshell \
+		  uriloader \
+		  msgbase \
+		  intl \
+		  addrbook \
+		  dom \
+		  mork \
+		  $(NULL)
 LIBRARY_NAME=absyncsv
 IS_COMPONENT=1
 META_COMPONENT=mail
diff --git a/mozilla/mailnews/absync/src/makefile.win b/mozilla/mailnews/absync/src/makefile.win
index 6b04d7af955..ab0f6c6c31a 100644
--- a/mozilla/mailnews/absync/src/makefile.win
+++ b/mozilla/mailnews/absync/src/makefile.win
@@ -21,7 +21,25 @@
 
 DEPTH=..\..\..
 MODULE= absync
-REQUIRES	= xpcom string necko mime cookie docshell uriloader pref widget msgbase msgbaseutil dom rdf addrbook intl mork mimetype windowwatcher
+REQUIRES	= xpcom \
+		  string \
+		  necko \
+		  mime \
+		  cookie \
+		  docshell \
+		  uriloader \
+		  pref \
+		  widget \
+		  msgbase \
+		  msgbaseutil \
+		  dom \
+		  rdf \
+		  addrbook \
+		  intl \
+		  mork \
+		  mimetype \
+		  windowwatcher \
+		  $(NULL)
 
 include <$(DEPTH)\config\config.mak>
 
diff --git a/mozilla/mailnews/addrbook/build/makefile.win b/mozilla/mailnews/addrbook/build/makefile.win
index 290aa511337..28f538100e2 100644
--- a/mozilla/mailnews/addrbook/build/makefile.win
+++ b/mozilla/mailnews/addrbook/build/makefile.win
@@ -24,7 +24,25 @@ MODULE=addrbook
 LIBRARY_NAME=addrbook
 META_COMPONENT=mail
 MODULE_NAME=nsAbModule
-REQUIRES	= xpcom string addrbook necko msgcompo mime msgbase rdf rdfutil docshell appshell dom widget locale mork appcomps raptor mozldap
+REQUIRES	= xpcom \
+		  string \
+		  addrbook \
+		  necko \
+		  msgcompo \
+		  mime \
+		  msgbase \
+		  rdf \
+		  rdfutil \
+		  docshell \
+		  appshell \
+		  dom \
+		  widget \
+		  locale \
+		  mork \
+		  appcomps \
+		  raptor \
+		  mozldap \
+		  $(NULL)
 
 ################################################################################
 ## exports
diff --git a/mozilla/mailnews/addrbook/src/makefile.win b/mozilla/mailnews/addrbook/src/makefile.win
index f0bcdad44e6..7e6fb0da07d 100644
--- a/mozilla/mailnews/addrbook/src/makefile.win
+++ b/mozilla/mailnews/addrbook/src/makefile.win
@@ -21,7 +21,31 @@
 
 DEPTH=..\..\..
 MODULE= addrbook
-REQUIRES	= xpcom string rdf rdfutil appshell dom layout widget mork docshell pref necko locale webshell uconv msgbase msgbaseutil mime msgcompo appcomps raptor gfx content mozldap
+REQUIRES	= xpcom \
+		  string \
+		  rdf \
+		  rdfutil \
+		  appshell \
+		  dom \
+		  layout \
+		  widget \
+		  mork \
+		  docshell \
+		  pref \
+		  necko \
+		  locale \
+		  webshell \
+		  uconv \
+		  msgbase \
+		  msgbaseutil \
+		  mime \
+		  msgcompo \
+		  appcomps \
+		  raptor \
+		  gfx \
+		  content \
+		  mozldap \
+		  $(NULL)
 
 include <$(DEPTH)\config\config.mak>
 
diff --git a/mozilla/mailnews/base/build/makefile.win b/mozilla/mailnews/base/build/makefile.win
index e0313e7ce52..f09b85157cc 100644
--- a/mozilla/mailnews/base/build/makefile.win
+++ b/mozilla/mailnews/base/build/makefile.win
@@ -22,7 +22,37 @@ MODULE=msgbase
 LIBRARY_NAME=msgbase
 META_COMPONENT=mail
 MODULE_NAME=nsMsgBaseModule
-REQUIRES	= xpcom string necko intl locale timer rdf dom docshell widget layout webshell mime uriloader mailnews mork txmgr pref msgcompo msgbaseutil appcomps msgdb msgsearch editor appshell msgnews msgimap raptor gfx layout_xul
+REQUIRES	= xpcom \
+		  string \
+		  necko \
+		  intl \
+		  locale \
+		  timer \
+		  rdf \
+		  dom \
+		  docshell \
+		  widget \
+		  layout \
+		  webshell \
+		  mime \
+		  uriloader \
+		  mailnews \
+		  mork \
+		  txmgr \
+		  pref \
+		  msgcompo \
+		  msgbaseutil \
+		  appcomps \
+		  msgdb \
+		  msgsearch \
+		  editor \
+		  appshell \
+		  msgnews \
+		  msgimap \
+		  raptor \
+		  gfx \
+		  layout_xul \
+		  $(NULL)
 
 ################################################################################
 ## exports
diff --git a/mozilla/mailnews/base/search/src/makefile.win b/mozilla/mailnews/base/search/src/makefile.win
index 3dce802d3b3..46b66b70b75 100644
--- a/mozilla/mailnews/base/search/src/makefile.win
+++ b/mozilla/mailnews/base/search/src/makefile.win
@@ -22,7 +22,23 @@
 DEPTH=..\..\..\..
 
 MODULE=msgsearch
-REQUIRES	= xpcom string mailnews msgdb msgbaseutil necko mime msgimap rdf msglocal intl pref timer msgnews txmgr msgbase
+REQUIRES	= xpcom \
+		  string \
+		  mailnews \
+		  msgdb \
+		  msgbaseutil \
+		  necko \
+		  mime \
+		  msgimap \
+		  rdf \
+		  msglocal \
+		  intl \
+		  pref \
+		  timer \
+		  msgnews \
+		  txmgr \
+		  msgbase \
+		  $(NULL)
 include <$(DEPTH)\config\config.mak>
 
 LIBRARY_NAME=msgsearch_s
diff --git a/mozilla/mailnews/base/src/makefile.win b/mozilla/mailnews/base/src/makefile.win
index 52234652321..e15823977c1 100644
--- a/mozilla/mailnews/base/src/makefile.win
+++ b/mozilla/mailnews/base/src/makefile.win
@@ -21,7 +21,45 @@
 
 DEPTH=..\..\..
 MODULE= msgbase
-REQUIRES	= xpcom string necko dom appshell appcomps uconv intl htmlparser widget docshell rdf editor layout mailnews locale msgbaseutil webshell txmgr msgcompo msgdb uriloader pref msglocal msgimap timer mork msgnews addrbook prefmigr chrome mime mimetype windowwatcher gfx content msgsearch layout_xul
+REQUIRES	= xpcom \
+		  string \
+		  necko \
+		  dom \
+		  appshell \
+		  appcomps \
+		  uconv \
+		  intl \
+		  htmlparser \
+		  widget \
+		  docshell \
+		  rdf \
+		  editor \
+		  layout \
+		  mailnews \
+		  locale \
+		  msgbaseutil \
+		  webshell \
+		  txmgr \
+		  msgcompo \
+		  msgdb \
+		  uriloader \
+		  pref \
+		  msglocal \
+		  msgimap \
+		  timer \
+		  mork \
+		  msgnews \
+		  addrbook \
+		  prefmigr \
+		  chrome \
+		  mime \
+		  mimetype \
+		  windowwatcher \
+		  gfx \
+		  content \
+		  msgsearch \
+		  layout_xul \
+		  $(NULL)
 
 include <$(DEPTH)\config\config.mak>
 
diff --git a/mozilla/mailnews/base/util/makefile.win b/mozilla/mailnews/base/util/makefile.win
index 45fc04d3923..c65bd7198eb 100644
--- a/mozilla/mailnews/base/util/makefile.win
+++ b/mozilla/mailnews/base/util/makefile.win
@@ -24,7 +24,39 @@ MODULE          = msgbaseutil
 LIBRARY_NAME    = msgbsutl
 META_COMPONENT  = mail
 EXPORT_LIBRARY  = 1
-REQUIRES	= xpcom string msgbase rdf necko msgdb intl mork mailnews locale pref rdfutil rdfutil mime msgcompo docshell webshell wallet dom uriloader appshell msgimap msglocal msgnews txmgr uconv unicharutil nkcache mimetype windowwatcher msgsearch raptor
+REQUIRES	= xpcom \
+		  string \
+		  msgbase \
+		  rdf \
+		  necko \
+		  msgdb \
+		  intl \
+		  mork \
+		  mailnews \
+		  locale \
+		  pref \
+		  rdfutil \
+		  rdfutil \
+		  mime \
+		  msgcompo \
+		  docshell \
+		  webshell \
+		  wallet \
+		  dom \
+		  uriloader \
+		  appshell \
+		  msgimap \
+		  msglocal \
+		  msgnews \
+		  txmgr \
+		  uconv \
+		  unicharutil \
+		  nkcache \
+		  mimetype \
+		  windowwatcher \
+		  msgsearch \
+		  raptor \
+		  $(NULL)
 
 include <$(DEPTH)\config\config.mak>
 
diff --git a/mozilla/mailnews/compose/build/makefile.win b/mozilla/mailnews/compose/build/makefile.win
index 3a670da1184..b372b12ee37 100644
--- a/mozilla/mailnews/compose/build/makefile.win
+++ b/mozilla/mailnews/compose/build/makefile.win
@@ -22,7 +22,26 @@ MODULE          = msgcompo
 LIBRARY_NAME    = msgcompo
 META_COMPONENT  = mail
 MODULE_NAME  = nsMsgComposeModule
-REQUIRES	= xpcom string msgbase msgsearch msgbaseutil editor necko dom uriloader mime addrbook rdf intl mailnews widget msgdb appshell nkcache raptor
+REQUIRES	= xpcom \
+		  string \
+		  msgbase \
+		  msgsearch \
+		  msgbaseutil \
+		  editor \
+		  necko \
+		  dom \
+		  uriloader \
+		  mime \
+		  addrbook \
+		  rdf \
+		  intl \
+		  mailnews \
+		  widget \
+		  msgdb \
+		  appshell \
+		  nkcache \
+		  raptor \
+		  $(NULL)
 
 ################################################################################
 ## exports
diff --git a/mozilla/mailnews/compose/src/makefile.win b/mozilla/mailnews/compose/src/makefile.win
index fac8716cc4f..01062182c5b 100644
--- a/mozilla/mailnews/compose/src/makefile.win
+++ b/mozilla/mailnews/compose/src/makefile.win
@@ -21,7 +21,42 @@
 
 DEPTH=..\..\..
 MODULE= msgcompo
-REQUIRES	= xpcom string dom editor uriloader msgbase msgsearch mailnews necko mime pref intl locale layout msgbaseutil msgdb rdf appshell msgimap msgnews uconv docshell webshell addrbook widget htmlparser txmgr exthandler mork wallet nkcache mimetype windowwatcher content raptor
+REQUIRES	= xpcom \
+		  string \
+		  dom \
+		  editor \
+		  uriloader \
+		  msgbase \
+		  msgsearch \
+		  mailnews \
+		  necko \
+		  mime \
+		  pref \
+		  intl \
+		  locale \
+		  layout \
+		  msgbaseutil \
+		  msgdb \
+		  rdf \
+		  appshell \
+		  msgimap \
+		  msgnews \
+		  uconv \
+		  docshell \
+		  webshell \
+		  addrbook \
+		  widget \
+		  htmlparser \
+		  txmgr \
+		  exthandler \
+		  mork \
+		  wallet \
+		  nkcache \
+		  mimetype \
+		  windowwatcher \
+		  content \
+		  raptor \
+		  $(NULL)
 
 include <$(DEPTH)\config\config.mak>
 
diff --git a/mozilla/mailnews/db/msgdb/build/makefile.win b/mozilla/mailnews/db/msgdb/build/makefile.win
index 594d7da2a7d..af7bb6f037f 100644
--- a/mozilla/mailnews/db/msgdb/build/makefile.win
+++ b/mozilla/mailnews/db/msgdb/build/makefile.win
@@ -24,7 +24,16 @@ MODULE          = msgdb
 LIBRARY_NAME    = msgdb
 META_COMPONENT  = mail
 MODULE_NAME  = nsMsgDBModule
-REQUIRES	= xpcom string mailnews locale mork mime msgbase msgbaseutil necko
+REQUIRES	= xpcom \
+		  string \
+		  mailnews \
+		  locale \
+		  mork \
+		  mime \
+		  msgbase \
+		  msgbaseutil \
+		  necko \
+		  $(NULL)
 
 ################################################################################
 ## exports
diff --git a/mozilla/mailnews/db/msgdb/src/makefile.win b/mozilla/mailnews/db/msgdb/src/makefile.win
index 05672d05086..00520f7f4a8 100644
--- a/mozilla/mailnews/db/msgdb/src/makefile.win
+++ b/mozilla/mailnews/db/msgdb/src/makefile.win
@@ -21,7 +21,18 @@
 
 DEPTH=..\..\..\..
 MODULE= msgdb
-REQUIRES	= xpcom string mailnews mork msgbase msgbaseutil locale mime necko pref msgimap
+REQUIRES	= xpcom \
+		  string \
+		  mailnews \
+		  mork \
+		  msgbase \
+		  msgbaseutil \
+		  locale \
+		  mime \
+		  necko \
+		  pref \
+		  msgimap \
+		  $(NULL)
 
 include <$(DEPTH)\config\config.mak>
 
diff --git a/mozilla/mailnews/imap/build/makefile.win b/mozilla/mailnews/imap/build/makefile.win
index 88999ce5084..69bedd31718 100644
--- a/mozilla/mailnews/imap/build/makefile.win
+++ b/mozilla/mailnews/imap/build/makefile.win
@@ -24,7 +24,23 @@ MODULE          = msgimap
 LIBRARY_NAME    = msgimap
 META_COMPONENT  = mail
 MODULE_NAME  = IMAP_factory
-REQUIRES	= xpcom string mailnews msgbase msgsearch msgbaseutil rdf rdfutil necko msgdb txmgr mime pref intl msglocal nkcache
+REQUIRES	= xpcom \
+		  string \
+		  mailnews \
+		  msgbase \
+		  msgsearch \
+		  msgbaseutil \
+		  rdf \
+		  rdfutil \
+		  necko \
+		  msgdb \
+		  txmgr \
+		  mime \
+		  pref \
+		  intl \
+		  msglocal \
+		  nkcache \
+		  $(NULL)
 
 ################################################################################
 ## exports
diff --git a/mozilla/mailnews/imap/src/makefile.win b/mozilla/mailnews/imap/src/makefile.win
index 721177f681c..4798bdca992 100644
--- a/mozilla/mailnews/imap/src/makefile.win
+++ b/mozilla/mailnews/imap/src/makefile.win
@@ -21,7 +21,30 @@
 
 DEPTH=..\..\..
 MODULE= msgimap
-REQUIRES	= xpcom string mailnews rdf msgbase msgsearch msgbaseutil rdfutil necko msgdb uconv mime pref intl nkcache timer txmgr dom docshell msglocal msgnews mimetype windowwatcher
+REQUIRES	= xpcom \
+		  string \
+		  mailnews \
+		  rdf \
+		  msgbase \
+		  msgsearch \
+		  msgbaseutil \
+		  rdfutil \
+		  necko \
+		  msgdb \
+		  uconv \
+		  mime \
+		  pref \
+		  intl \
+		  nkcache \
+		  timer \
+		  txmgr \
+		  dom \
+		  docshell \
+		  msglocal \
+		  msgnews \
+		  mimetype \
+		  windowwatcher \
+		  $(NULL)
 
 include <$(DEPTH)\config\config.mak>
 
diff --git a/mozilla/mailnews/import/eudora/src/makefile.win b/mozilla/mailnews/import/eudora/src/makefile.win
index ce0058b2527..bd5f0e9fb3e 100644
--- a/mozilla/mailnews/import/eudora/src/makefile.win
+++ b/mozilla/mailnews/import/eudora/src/makefile.win
@@ -18,7 +18,24 @@
 DEPTH=..\..\..\..
 
 MODULE          = impEudra
-REQUIRES=xpcom string import intl necko addrbook mork msgcompo msgbase editor dom uriloader mailnews msgdb msgbaseutil msglocal mimetype
+REQUIRES	= xpcom \
+		  string \
+		  import \
+		  intl \
+		  necko \
+		  addrbook \
+		  mork \
+		  msgcompo \
+		  msgbase \
+		  editor \
+		  dom \
+		  uriloader \
+		  mailnews \
+		  msgdb \
+		  msgbaseutil \
+		  msglocal \
+		  mimetype \
+		  $(NULL)
 LIBRARY_NAME    = $(MODULE)
 META_COMPONENT  = mail
 MODULE_NAME  = nsEudoraImportModule
diff --git a/mozilla/mailnews/import/oexpress/makefile.win b/mozilla/mailnews/import/oexpress/makefile.win
index a7eb906c771..27f2fa6d4e9 100644
--- a/mozilla/mailnews/import/oexpress/makefile.win
+++ b/mozilla/mailnews/import/oexpress/makefile.win
@@ -24,7 +24,20 @@ DEPTH=..\..\..
 DIRS=resources
 
 MODULE          = importOE
-REQUIRES = xpcom string import addrbook mork intl msgbase mailnews necko msgdb msgbaseutil msgcompo msglocal
+REQUIRES	= xpcom \
+		  string \
+		  import \
+		  addrbook \
+		  mork \
+		  intl \
+		  msgbase \
+		  mailnews \
+		  necko \
+		  msgdb \
+		  msgbaseutil \
+		  msgcompo \
+		  msglocal \
+		  $(NULL)
 LIBRARY_NAME    = $(MODULE)
 META_COMPONENT  = mail
 MODULE_NAME  = nsOEImport
diff --git a/mozilla/mailnews/import/outlook/src/makefile.win b/mozilla/mailnews/import/outlook/src/makefile.win
index 3606960be58..81e36df3e03 100644
--- a/mozilla/mailnews/import/outlook/src/makefile.win
+++ b/mozilla/mailnews/import/outlook/src/makefile.win
@@ -22,7 +22,24 @@
 DEPTH=..\..\..\..
 
 MODULE          = impOutlk
-REQUIRES = xpcom string import intl necko addrbook mork msgcompo msgbase editor dom uriloader mailnews msgbaseutil msgdb msglocal mimetype
+REQUIRES	= xpcom \
+		  string \
+		  import \
+		  intl \
+		  necko \
+		  addrbook \
+		  mork \
+		  msgcompo \
+		  msgbase \
+		  editor \
+		  dom \
+		  uriloader \
+		  mailnews \
+		  msgbaseutil \
+		  msgdb \
+		  msglocal \
+		  mimetype \
+		  $(NULL)
 LIBRARY_NAME    = $(MODULE)
 META_COMPONENT  = mail
 MODULE_NAME  = nsOutlookImport
diff --git a/mozilla/mailnews/import/src/makefile.win b/mozilla/mailnews/import/src/makefile.win
index 0826ccf0f5d..e1bda0659fd 100644
--- a/mozilla/mailnews/import/src/makefile.win
+++ b/mozilla/mailnews/import/src/makefile.win
@@ -24,7 +24,19 @@ MODULE          = import
 LIBRARY_NAME    = $(MODULE)
 META_COMPONENT  = mail
 MODULE_NAME  = nsImportServiceModule
-REQUIRES	= xpcom string mailnews addrbook uconv mork msgbase msgbaseutil intl necko rdf msgdb
+REQUIRES	= xpcom \
+		  string \
+		  mailnews \
+		  addrbook \
+		  uconv \
+		  mork \
+		  msgbase \
+		  msgbaseutil \
+		  intl \
+		  necko \
+		  rdf \
+		  msgdb \
+		  $(NULL)
 
 CPP_OBJS=\
         .\$(OBJDIR)\nsImportFactory.obj  	\
diff --git a/mozilla/mailnews/import/text/src/makefile.win b/mozilla/mailnews/import/text/src/makefile.win
index 87c545f5a12..0b1948c54d3 100644
--- a/mozilla/mailnews/import/text/src/makefile.win
+++ b/mozilla/mailnews/import/text/src/makefile.win
@@ -18,7 +18,15 @@
 DEPTH=..\..\..\..
 
 MODULE          = impText
-REQUIRES	= xpcom string import intl necko addrbook pref mork
+REQUIRES	= xpcom \
+		  string \
+		  import \
+		  intl \
+		  necko \
+		  addrbook \
+		  pref \
+		  mork \
+		  $(NULL)
 LIBRARY_NAME    = $(MODULE)
 META_COMPONENT  = mail
 MODULE_NAME  = nsTextImportModule
diff --git a/mozilla/mailnews/local/build/makefile.win b/mozilla/mailnews/local/build/makefile.win
index 46d527f0221..88d9725a19d 100644
--- a/mozilla/mailnews/local/build/makefile.win
+++ b/mozilla/mailnews/local/build/makefile.win
@@ -24,7 +24,22 @@ MODULE          = msglocal
 LIBRARY_NAME    = msglocal
 META_COMPONENT  = mail
 MODULE_NAME  = local_mail_services
-REQUIRES	= xpcom string mailnews msgbase msgsearch msgbaseutil msgdb necko txmgr rdf rdfutil mime intl pref nkcache
+REQUIRES	= xpcom \
+		  string \
+		  mailnews \
+		  msgbase \
+		  msgsearch \
+		  msgbaseutil \
+		  msgdb \
+		  necko \
+		  txmgr \
+		  rdf \
+		  rdfutil \
+		  mime \
+		  intl \
+		  pref \
+		  nkcache \
+		  $(NULL)
 
 ################################################################################
 ## exports
diff --git a/mozilla/mailnews/local/src/makefile.win b/mozilla/mailnews/local/src/makefile.win
index 1b2cd62beff..3100855c67b 100644
--- a/mozilla/mailnews/local/src/makefile.win
+++ b/mozilla/mailnews/local/src/makefile.win
@@ -21,7 +21,26 @@
 
 DEPTH=..\..\..
 MODULE= msglocal
-REQUIRES	= xpcom string msgbase msgsearch msgbaseutil mailnews pref necko msgdb rdf intl mime dom rdfutil txmgr docshell msgimap chrome nkcache
+REQUIRES	= xpcom \
+		  string \
+		  msgbase \
+		  msgsearch \
+		  msgbaseutil \
+		  mailnews \
+		  pref \
+		  necko \
+		  msgdb \
+		  rdf \
+		  intl \
+		  mime \
+		  dom \
+		  rdfutil \
+		  txmgr \
+		  docshell \
+		  msgimap \
+		  chrome \
+		  nkcache \
+		  $(NULL)
 
 include <$(DEPTH)\config\config.mak>
 
diff --git a/mozilla/mailnews/mime/build/makefile.win b/mozilla/mailnews/mime/build/makefile.win
index 29c7a15e0f6..597d92bb2a4 100644
--- a/mozilla/mailnews/mime/build/makefile.win
+++ b/mozilla/mailnews/mime/build/makefile.win
@@ -22,7 +22,13 @@ MODULE          = mime
 LIBRARY_NAME    = mime
 META_COMPONENT  = mail
 MODULE_NAME  = mime_services
-REQUIRES	= xpcom string msgbase pref necko uconv
+REQUIRES	= xpcom \
+		  string \
+		  msgbase \
+		  pref \
+		  necko \
+		  uconv \
+		  $(NULL)
 
 EXPORTS=								\
 			nsMsgMimeCID.h				\
diff --git a/mozilla/mailnews/mime/cthandlers/vcard/makefile.win b/mozilla/mailnews/mime/cthandlers/vcard/makefile.win
index 9a7dc2432f0..1f618ece139 100644
--- a/mozilla/mailnews/mime/cthandlers/vcard/makefile.win
+++ b/mozilla/mailnews/mime/cthandlers/vcard/makefile.win
@@ -44,7 +44,18 @@ MODULE          = vcard
 LIBRARY_NAME    = vcard
 META_COMPONENT  = mail
 MODULE_NAME  = nsVCardModule
-REQUIRES	= xpcom string mime msgbase msgbaseutil uconv necko intl pref mailnews msgdb
+REQUIRES	= xpcom \
+		  string \
+		  mime \
+		  msgbase \
+		  msgbaseutil \
+		  uconv \
+		  necko \
+		  intl \
+		  pref \
+		  mailnews \
+		  msgdb \
+		  $(NULL)
 
 # EXPORTS =
 # Put any necessary exported headers here!!!               	
diff --git a/mozilla/mailnews/mime/emitters/build/makefile.win b/mozilla/mailnews/mime/emitters/build/makefile.win
index 41ca2c3a166..0907d90aca2 100644
--- a/mozilla/mailnews/mime/emitters/build/makefile.win
+++ b/mozilla/mailnews/mime/emitters/build/makefile.win
@@ -30,7 +30,15 @@ MODULE          = mimeemitter
 LIBRARY_NAME    = emitter
 META_COMPONENT  = mail
 MODULE_NAME  = nsMimeEmitterModule
-REQUIRES	= xpcom string mime necko pref intl locale msgbase
+REQUIRES	= xpcom \
+		  string \
+		  mime \
+		  necko \
+		  pref \
+		  intl \
+		  locale \
+		  msgbase \
+		  $(NULL)
 
 ################################################################################
 ## exports
diff --git a/mozilla/mailnews/mime/emitters/src/makefile.win b/mozilla/mailnews/mime/emitters/src/makefile.win
index 182384506d4..e1c6f647dba 100644
--- a/mozilla/mailnews/mime/emitters/src/makefile.win
+++ b/mozilla/mailnews/mime/emitters/src/makefile.win
@@ -21,7 +21,21 @@
 
 DEPTH=..\..\..\..
 MODULE=mimeemitter
-REQUIRES	= xpcom string mime msgbase msgbaseutil pref necko intl locale mailnews msgdb addrbook mimetype msgnews
+REQUIRES	= xpcom \
+		  string \
+		  mime \
+		  msgbase \
+		  msgbaseutil \
+		  pref \
+		  necko \
+		  intl \
+		  locale \
+		  mailnews \
+		  msgdb \
+		  addrbook \
+		  mimetype \
+		  msgnews \
+		  $(NULL)
 
 include <$(DEPTH)\config\config.mak>
 
diff --git a/mozilla/mailnews/mime/src/makefile.win b/mozilla/mailnews/mime/src/makefile.win
index 9ef02d70bf4..c6b46a2fcc8 100644
--- a/mozilla/mailnews/mime/src/makefile.win
+++ b/mozilla/mailnews/mime/src/makefile.win
@@ -20,7 +20,28 @@
 
 DEPTH=..\..\..
 MODULE= mime
-REQUIRES	= xpcom string msgbase msgbaseutil pref js necko uconv msgcompo editor dom intl msgimap exthandler mailnews msgdb chardet caps mimetype uriloader xpconnect
+REQUIRES	= xpcom \
+		  string \
+		  msgbase \
+		  msgbaseutil \
+		  pref \
+		  js \
+		  necko \
+		  uconv \
+		  msgcompo \
+		  editor \
+		  dom \
+		  intl \
+		  msgimap \
+		  exthandler \
+		  mailnews \
+		  msgdb \
+		  chardet \
+		  caps \
+		  mimetype \
+		  uriloader \
+		  xpconnect \
+		  $(NULL)
 
 include <$(DEPTH)\config\config.mak>
 
diff --git a/mozilla/mailnews/news/build/makefile.win b/mozilla/mailnews/news/build/makefile.win
index c9c00766636..42f6ebe837e 100644
--- a/mozilla/mailnews/news/build/makefile.win
+++ b/mozilla/mailnews/news/build/makefile.win
@@ -22,7 +22,28 @@ MODULE          = msgnews
 LIBRARY_NAME    = msgnews
 META_COMPONENT  = mail
 MODULE_NAME  = nsMsgNewsModule
-REQUIRES	= xpcom string mailnews msgbase msgsearch msgbaseutil msgdb appshell timer mime necko rdf rdfutil pref uriloader nkcache layout dom intl raptor layout_xul
+REQUIRES	= xpcom \
+		  string \
+		  mailnews \
+		  msgbase \
+		  msgsearch \
+		  msgbaseutil \
+		  msgdb \
+		  appshell \
+		  timer \
+		  mime \
+		  necko \
+		  rdf \
+		  rdfutil \
+		  pref \
+		  uriloader \
+		  nkcache \
+		  layout \
+		  dom \
+		  intl \
+		  raptor \
+		  layout_xul \
+		  $(NULL)
 
 ################################################################################
 ## exports
diff --git a/mozilla/mailnews/news/src/makefile.win b/mozilla/mailnews/news/src/makefile.win
index 9dc97ba9288..9a0e17b48e0 100644
--- a/mozilla/mailnews/news/src/makefile.win
+++ b/mozilla/mailnews/news/src/makefile.win
@@ -21,7 +21,34 @@
 
 DEPTH=..\..\..
 MODULE= msgnews
-REQUIRES	= xpcom string mailnews msgbase msgsearch msgbaseutil necko msgdb locale mork dom rdf docshell layout pref uriloader appshell mime intl timer webshell wallet rdfutil nkcache windowwatcher raptor layout_xul
+REQUIRES	= xpcom \
+		  string \
+		  mailnews \
+		  msgbase \
+		  msgsearch \
+		  msgbaseutil \
+		  necko \
+		  msgdb \
+		  locale \
+		  mork \
+		  dom \
+		  rdf \
+		  docshell \
+		  layout \
+		  pref \
+		  uriloader \
+		  appshell \
+		  mime \
+		  intl \
+		  timer \
+		  webshell \
+		  wallet \
+		  rdfutil \
+		  nkcache \
+		  windowwatcher \
+		  raptor \
+		  layout_xul \
+		  $(NULL)
 
 include <$(DEPTH)\config\config.mak>
 
diff --git a/mozilla/modules/libimg/mng/makefile.win b/mozilla/modules/libimg/mng/makefile.win
index 5c51f622c0c..bacfec8467f 100644
--- a/mozilla/modules/libimg/mng/makefile.win
+++ b/mozilla/modules/libimg/mng/makefile.win
@@ -37,7 +37,9 @@ LCFLAGS = $(LCFLAGS) -DDEBUG_GC
 EXPORTS = libmng.h libmng_conf.h libmng_types.h
 
 MODULE=mng
-REQUIRES=zlib jpeg
+REQUIRES	= zlib \
+		  jpeg \
+		  $(NULL)
 DEPTH=..\..\..
 LOCAL_INCLUDES=-I.
 LIBRARY_NAME=mng
diff --git a/mozilla/modules/libimg/png/makefile.win b/mozilla/modules/libimg/png/makefile.win
index c337c24d0a0..f51763ed647 100644
--- a/mozilla/modules/libimg/png/makefile.win
+++ b/mozilla/modules/libimg/png/makefile.win
@@ -37,7 +37,8 @@ LCFLAGS = $(LCFLAGS) -DDEBUG_GC
 EXPORTS = png.h pngconf.h
 
 MODULE=png
-REQUIRES=zlib
+REQUIRES	= zlib \
+		  $(NULL)
 DEPTH=..\..\.. 
 LOCAL_INCLUDES=-I. 
 LIBRARY_NAME=png 
diff --git a/mozilla/modules/libjar/makefile.win b/mozilla/modules/libjar/makefile.win
index 79ad7fb0e8a..92f7d829236 100644
--- a/mozilla/modules/libjar/makefile.win
+++ b/mozilla/modules/libjar/makefile.win
@@ -33,7 +33,11 @@ DIRS=standalone
 MODULE=jar
 LIBRARY_NAME=jar$(VERSION_NUMBER)
 MODULE_NAME=nsJarModule
-REQUIRES= xpcom string caps zlib
+REQUIRES	= xpcom \
+		  string \
+		  caps \
+		  zlib \
+		  $(NULL)
 
 DEPTH=..\..
 
diff --git a/mozilla/modules/libjar/standalone/makefile.win b/mozilla/modules/libjar/standalone/makefile.win
index bb3ab0e2b27..4781f90d10e 100644
--- a/mozilla/modules/libjar/standalone/makefile.win
+++ b/mozilla/modules/libjar/standalone/makefile.win
@@ -24,7 +24,8 @@
 
 MODULE=jar 
 DEPTH=..\..\..
-REQUIRES=zlib
+REQUIRES	= zlib \
+		  $(NULL)
 USE_NON_MT_LIBS=1
 LIBRARY=$(OBJDIR)\jar_s.lib
 
diff --git a/mozilla/modules/libpr0n/decoders/gif/makefile.win b/mozilla/modules/libpr0n/decoders/gif/makefile.win
index bc25bce9098..b9b872156c9 100644
--- a/mozilla/modules/libpr0n/decoders/gif/makefile.win
+++ b/mozilla/modules/libpr0n/decoders/gif/makefile.win
@@ -23,7 +23,12 @@
 
 DEPTH=..\..\..\..
 MODULE		= imggif
-REQUIRES	= xpcom necko gfx gfx2 imglib2
+REQUIRES	= xpcom \
+		  necko \
+		  gfx \
+		  gfx2 \
+		  imglib2 \
+		  $(NULL)
 include <$(DEPTH)/config/config.mak>
 
 LIBRARY_NAME	= imggif
diff --git a/mozilla/modules/libpr0n/decoders/icon/makefile.win b/mozilla/modules/libpr0n/decoders/icon/makefile.win
index 480f7b3ad1b..fbadbfaa690 100644
--- a/mozilla/modules/libpr0n/decoders/icon/makefile.win
+++ b/mozilla/modules/libpr0n/decoders/icon/makefile.win
@@ -26,7 +26,13 @@ DEPTH=..\..\..\..
 DIRS=win
 
 MODULE		= imgicon
-REQUIRES=xpcom string imglib2 gfx gfx2 necko
+REQUIRES	= xpcom \
+		  string \
+		  imglib2 \
+		  gfx \
+		  gfx2 \
+		  necko \
+		  $(NULL)
 LIBRARY_NAME	= imgicon
 XPIDL_MODULE	= imgicon
 MODULE_NAME	= nsIconDecoderModule
diff --git a/mozilla/modules/libpr0n/decoders/icon/win/makefile.win b/mozilla/modules/libpr0n/decoders/icon/win/makefile.win
index 85da5065e80..121812fb461 100644
--- a/mozilla/modules/libpr0n/decoders/icon/win/makefile.win
+++ b/mozilla/modules/libpr0n/decoders/icon/win/makefile.win
@@ -22,7 +22,12 @@
 
 DEPTH=..\..\..\..\..
 MODULE=imgicon
-REQUIRES	= xpcom string necko mimetype exthandler
+REQUIRES	= xpcom \
+		  string \
+		  necko \
+		  mimetype \
+		  exthandler \
+		  $(NULL)
 
 LIBRARY_NAME=imgiconwin_s
 
diff --git a/mozilla/modules/libpr0n/decoders/jpeg/makefile.win b/mozilla/modules/libpr0n/decoders/jpeg/makefile.win
index 82567ac4ff1..061e31de8f8 100644
--- a/mozilla/modules/libpr0n/decoders/jpeg/makefile.win
+++ b/mozilla/modules/libpr0n/decoders/jpeg/makefile.win
@@ -23,7 +23,14 @@
 
 DEPTH=..\..\..\..
 MODULE		= imgjpeg
-REQUIRES	= xpcom string necko gfx gfx2 imglib2 jpeg
+REQUIRES	= xpcom \
+		  string \
+		  necko \
+		  gfx \
+		  gfx2 \
+		  imglib2 \
+		  jpeg \
+		  $(NULL)
 include <$(DEPTH)/config/config.mak>
 
 LIBRARY_NAME	= imgjpeg
diff --git a/mozilla/modules/libpr0n/decoders/mng/makefile.win b/mozilla/modules/libpr0n/decoders/mng/makefile.win
index 41f5a965cb9..c20f567e476 100644
--- a/mozilla/modules/libpr0n/decoders/mng/makefile.win
+++ b/mozilla/modules/libpr0n/decoders/mng/makefile.win
@@ -21,7 +21,16 @@
 
 DEPTH=..\..\..\..
 MODULE		= imgmng
-REQUIRES = xpcom necko imglib2 gfx gfx2 mng jpeg timer zlib
+REQUIRES	= xpcom \
+		  necko \
+		  imglib2 \
+		  gfx \
+		  gfx2 \
+		  mng \
+		  jpeg \
+		  timer \
+		  zlib \
+		  $(NULL)
 include <$(DEPTH)/config/config.mak>
 
 LIBRARY_NAME	= imgmng
diff --git a/mozilla/modules/libpr0n/decoders/png/makefile.win b/mozilla/modules/libpr0n/decoders/png/makefile.win
index af910f502bd..3457eb50d76 100644
--- a/mozilla/modules/libpr0n/decoders/png/makefile.win
+++ b/mozilla/modules/libpr0n/decoders/png/makefile.win
@@ -23,7 +23,14 @@
 
 DEPTH=..\..\..\..
 MODULE		= imgpng
-REQUIRES	= xpcom necko gfx gfx2 imglib2 png zlib
+REQUIRES	= xpcom \
+		  necko \
+		  gfx \
+		  gfx2 \
+		  imglib2 \
+		  png \
+		  zlib \
+		  $(NULL)
 include <$(DEPTH)/config/config.mak>
 
 LIBRARY_NAME	= imgpng
diff --git a/mozilla/modules/libpr0n/decoders/ppm/makefile.win b/mozilla/modules/libpr0n/decoders/ppm/makefile.win
index a6264d56966..5331f297828 100644
--- a/mozilla/modules/libpr0n/decoders/ppm/makefile.win
+++ b/mozilla/modules/libpr0n/decoders/ppm/makefile.win
@@ -23,7 +23,12 @@
 
 DEPTH=..\..\..\..
 MODULE		= imgppm
-REQUIRES	= xpcom necko gfx2 imglib2 gfx
+REQUIRES	= xpcom \
+		  necko \
+		  gfx2 \
+		  imglib2 \
+		  gfx \
+		  $(NULL)
 include <$(DEPTH)/config/config.mak>
 
 LIBRARY_NAME	= imgppm
diff --git a/mozilla/modules/libpr0n/src/makefile.win b/mozilla/modules/libpr0n/src/makefile.win
index 9e8a69b53c9..48115f86449 100644
--- a/mozilla/modules/libpr0n/src/makefile.win
+++ b/mozilla/modules/libpr0n/src/makefile.win
@@ -23,7 +23,15 @@
 
 DEPTH=..\..\..
 MODULE		= imglib2
-REQUIRES	= xpcom string necko nkcache timer gfx2 mimetype gfx
+REQUIRES	= xpcom \
+		  string \
+		  necko \
+		  nkcache \
+		  timer \
+		  gfx2 \
+		  mimetype \
+		  gfx \
+		  $(NULL)
 include <$(DEPTH)/config/config.mak>
 
 LIBRARY_NAME	= imglib2
diff --git a/mozilla/modules/libpref/src/makefile.win b/mozilla/modules/libpref/src/makefile.win
index 816874cbf0a..9b64b1ce37e 100644
--- a/mozilla/modules/libpref/src/makefile.win
+++ b/mozilla/modules/libpref/src/makefile.win
@@ -40,7 +40,17 @@ DEPTH = ..\..\..
 MODULE		= pref
 LIBRARY_NAME	= xppref$(MOZ_BITS)
 MODULE_NAME	= nsPrefModule
-REQUIRES	= xpcom string js xpconnect caps intl timer necko embedcomponents profile
+REQUIRES	= xpcom \
+		  string \
+		  js \
+		  xpconnect \
+		  caps \
+		  intl \
+		  timer \
+		  necko \
+		  embedcomponents \
+		  profile \
+		  $(NULL)
 
 
 LCFLAGS = -DMOZILLA_CLIENT
diff --git a/mozilla/modules/libreg/standalone/makefile.win b/mozilla/modules/libreg/standalone/makefile.win
index 1a3c9e3e882..cd61d587136 100644
--- a/mozilla/modules/libreg/standalone/makefile.win
+++ b/mozilla/modules/libreg/standalone/makefile.win
@@ -63,7 +63,8 @@ OBJS=                                       \
 #//
 #//------------------------------------------------------------------------
 
-REQUIRES=mozreg
+REQUIRES	= mozreg \
+		  $(NULL)
 LIBNAME=nsreg
 DLL=$(OBJDIR)\$(LIBNAME).dll
 LIBRARY=$(OBJDIR)\$(LIBNAME)_s.lib
diff --git a/mozilla/modules/libutil/src/makefile.win b/mozilla/modules/libutil/src/makefile.win
index 1a372902930..4d863ba06e6 100644
--- a/mozilla/modules/libutil/src/makefile.win
+++ b/mozilla/modules/libutil/src/makefile.win
@@ -32,7 +32,8 @@ CPP_OBJS=.\$(OBJDIR)\stopwatch.obj \
 C_OBJS=.\$(OBJDIR)\obs.obj
 
 LINCS=-I$(DEPTH)\include
-REQUIRES=xpcom
+REQUIRES	= xpcom \
+		  $(NULL)
 !include $(DEPTH)\config\rules.mak
 
 install::  $(LIBRARY)
diff --git a/mozilla/modules/mpfilelocprovider/src/makefile.win b/mozilla/modules/mpfilelocprovider/src/makefile.win
index ba5fc068409..a58d48312fd 100755
--- a/mozilla/modules/mpfilelocprovider/src/makefile.win
+++ b/mozilla/modules/mpfilelocprovider/src/makefile.win
@@ -21,7 +21,9 @@
 
 DEPTH=..\..\..
 MODULE = mpfilelocprovider
-REQUIRES=xpcom string
+REQUIRES	= xpcom \
+		  string \
+		  $(NULL)
 LIBRARY_NAME=mpfilelocprovider_s
 
 
diff --git a/mozilla/modules/oji/src/makefile.win b/mozilla/modules/oji/src/makefile.win
index 1f9277094a9..aa29f7bd9ac 100644
--- a/mozilla/modules/oji/src/makefile.win
+++ b/mozilla/modules/oji/src/makefile.win
@@ -18,7 +18,27 @@ DEPTH= ..\..\..
 MODULE=oji
 LIBRARY_NAME=oji
 MODULE_NAME=nsCJVMManagerModule
-REQUIRES	= xpcom string java js plugin gkplugin caps pref js jar necko dom widget xpconnect windowwatcher layout docshell webBrowser_core intl gfx
+REQUIRES	= xpcom \
+		  string \
+		  java \
+		  js \
+		  plugin \
+		  gkplugin \
+		  caps \
+		  pref \
+		  js \
+		  jar \
+		  necko \
+		  dom \
+		  widget \
+		  xpconnect \
+		  windowwatcher \
+		  layout \
+		  docshell \
+		  webBrowser_core \
+		  intl \
+		  gfx \
+		  $(NULL)
 include <$(DEPTH)/config/config.mak>
 
 !ifdef MOZ_OJI
diff --git a/mozilla/modules/plugin/base/src/makefile.win b/mozilla/modules/plugin/base/src/makefile.win
index 99bac51ca5a..78dba0cefd2 100644
--- a/mozilla/modules/plugin/base/src/makefile.win
+++ b/mozilla/modules/plugin/base/src/makefile.win
@@ -29,7 +29,31 @@ 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
+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 \
+		  $(NULL)
 
 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 c005abcd124..a1ddc110f6e 100644
--- a/mozilla/modules/plugin/samples/default/windows/makefile.win
+++ b/mozilla/modules/plugin/samples/default/windows/makefile.win
@@ -21,7 +21,8 @@
 
 DEPTH=..\..\..\..\..
 MODULE=npnul32
-REQUIRES=java
+REQUIRES	= java \
+		  $(NULL)
 include <$(DEPTH)/config/config.mak>
 
 
diff --git a/mozilla/netwerk/base/src/makefile.win b/mozilla/netwerk/base/src/makefile.win
index 3eccdbc37f2..fde794038ad 100644
--- a/mozilla/netwerk/base/src/makefile.win
+++ b/mozilla/netwerk/base/src/makefile.win
@@ -20,7 +20,13 @@
 MODULE = necko
 
 DEPTH = ..\..\..
-REQUIRES	= xpcom string exthandler mimetype intl pref
+REQUIRES	= xpcom \
+		  string \
+		  exthandler \
+		  mimetype \
+		  intl \
+		  pref \
+		  $(NULL)
 include <$(DEPTH)/config/config.mak>
 
 LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET
diff --git a/mozilla/netwerk/build/makefile.win b/mozilla/netwerk/build/makefile.win
index 8e3c7e3ce9a..e34a5b4b95c 100644
--- a/mozilla/netwerk/build/makefile.win
+++ b/mozilla/netwerk/build/makefile.win
@@ -24,7 +24,17 @@ DEPTH=..\..
 MODULE		= necko
 LIBRARY_NAME	= necko
 MODULE_NAME	= necko_core_and_primary_protocols
-REQUIRES	= xpcom string nkcache pref mimetype util jar locale intl zlib
+REQUIRES	= xpcom \
+		  string \
+		  nkcache \
+		  pref \
+		  mimetype \
+		  util \
+		  jar \
+		  locale \
+		  intl \
+		  zlib \
+		  $(NULL)
 
 include <$(DEPTH)/config/config.mak>
 
diff --git a/mozilla/netwerk/build2/makefile.win b/mozilla/netwerk/build2/makefile.win
index ff07569e116..7ae71eab85c 100644
--- a/mozilla/netwerk/build2/makefile.win
+++ b/mozilla/netwerk/build2/makefile.win
@@ -24,7 +24,10 @@ DEPTH=..\..
 MODULE		= necko
 LIBRARY_NAME	= necko2
 MODULE_NAME	= necko_secondary_protocols
-REQUIRES	= xpcom string nkcache
+REQUIRES	= xpcom \
+		  string \
+		  nkcache \
+		  $(NULL)
 
 LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET
 
diff --git a/mozilla/netwerk/cache/src/makefile.win b/mozilla/netwerk/cache/src/makefile.win
index 12549c0eae7..cc4c00167f0 100755
--- a/mozilla/netwerk/cache/src/makefile.win
+++ b/mozilla/netwerk/cache/src/makefile.win
@@ -24,7 +24,11 @@ DEPTH = ..\..\..
 MODULE		= nkcache
 LIBRARY_NAME	= nkcache
 MODULE_NAME	= cacheservice
-REQUIRES	= xpcom string necko pref
+REQUIRES	= xpcom \
+		  string \
+		  necko \
+		  pref \
+		  $(NULL)
 
 include <$(DEPTH)/config/config.mak>
 
diff --git a/mozilla/netwerk/dns/src/makefile.win b/mozilla/netwerk/dns/src/makefile.win
index 4a1ccec7fef..60558c5efeb 100644
--- a/mozilla/netwerk/dns/src/makefile.win
+++ b/mozilla/netwerk/dns/src/makefile.win
@@ -21,7 +21,10 @@ MODULE = necko
 
 DEPTH = ..\..\..
 
-REQUIRES	= xpcom string pref
+REQUIRES	= xpcom \
+		  string \
+		  pref \
+		  $(NULL)
 LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET
 
 LIBRARY_NAME=neckodns_s
diff --git a/mozilla/netwerk/mime/src/makefile.win b/mozilla/netwerk/mime/src/makefile.win
index e1e84cffe27..7572e3f8441 100644
--- a/mozilla/netwerk/mime/src/makefile.win
+++ b/mozilla/netwerk/mime/src/makefile.win
@@ -19,7 +19,11 @@
 
 DEPTH = ..\..\..
 MODULE = mimetype
-REQUIRES	= xpcom string necko pref
+REQUIRES	= xpcom \
+		  string \
+		  necko \
+		  pref \
+		  $(NULL)
 
 include <$(DEPTH)/config/config.mak>
 
diff --git a/mozilla/netwerk/protocol/about/src/makefile.win b/mozilla/netwerk/protocol/about/src/makefile.win
index 30e40a6abb3..322134383aa 100644
--- a/mozilla/netwerk/protocol/about/src/makefile.win
+++ b/mozilla/netwerk/protocol/about/src/makefile.win
@@ -21,7 +21,13 @@
 
 DEPTH=..\..\..\..
 MODULE=necko
-REQUIRES	= xpcom string nkcache caps xpconnect js
+REQUIRES	= xpcom \
+		  string \
+		  nkcache \
+		  caps \
+		  xpconnect \
+		  js \
+		  $(NULL)
 include <$(DEPTH)/config/config.mak>
 
 LIBRARY_NAME=nkabout_s
diff --git a/mozilla/netwerk/protocol/data/src/makefile.win b/mozilla/netwerk/protocol/data/src/makefile.win
index f73f9dd1611..0ac982834ed 100644
--- a/mozilla/netwerk/protocol/data/src/makefile.win
+++ b/mozilla/netwerk/protocol/data/src/makefile.win
@@ -20,7 +20,9 @@
 MODULE = necko
 
 DEPTH = ..\..\..\..
-REQUIRES	= xpcom string
+REQUIRES	= xpcom \
+		  string \
+		  $(NULL)
 
 LIBRARY_NAME=nkdata_s
 
diff --git a/mozilla/netwerk/protocol/datetime/src/makefile.win b/mozilla/netwerk/protocol/datetime/src/makefile.win
index 52ae45a6b47..e155f59b6d0 100644
--- a/mozilla/netwerk/protocol/datetime/src/makefile.win
+++ b/mozilla/netwerk/protocol/datetime/src/makefile.win
@@ -20,7 +20,9 @@
 MODULE = necko
 
 DEPTH = ..\..\..\..
-REQUIRES	= xpcom string
+REQUIRES	= xpcom \
+		  string \
+		  $(NULL)
 
 LIBRARY_NAME=nkdatetm_s
 
diff --git a/mozilla/netwerk/protocol/file/src/makefile.win b/mozilla/netwerk/protocol/file/src/makefile.win
index 5df0b4ac5dd..17ef5461ba0 100644
--- a/mozilla/netwerk/protocol/file/src/makefile.win
+++ b/mozilla/netwerk/protocol/file/src/makefile.win
@@ -21,7 +21,11 @@
 
 DEPTH=..\..\..\..
 MODULE=necko
-REQUIRES	= xpcom string exthandler mimetype
+REQUIRES	= xpcom \
+		  string \
+		  exthandler \
+		  mimetype \
+		  $(NULL)
 include <$(DEPTH)/config/config.mak>
 
 LIBRARY_NAME=nkfile_s
diff --git a/mozilla/netwerk/protocol/finger/src/makefile.win b/mozilla/netwerk/protocol/finger/src/makefile.win
index 49ed345026b..761268508ff 100644
--- a/mozilla/netwerk/protocol/finger/src/makefile.win
+++ b/mozilla/netwerk/protocol/finger/src/makefile.win
@@ -20,7 +20,10 @@
 MODULE = necko
 
 DEPTH = ..\..\..\..
-REQUIRES	= xpcom string mimetype
+REQUIRES	= xpcom \
+		  string \
+		  mimetype \
+		  $(NULL)
 
 LIBRARY_NAME=nkfinger_s
 
diff --git a/mozilla/netwerk/protocol/ftp/src/makefile.win b/mozilla/netwerk/protocol/ftp/src/makefile.win
index 5328d5b05d7..f91705b02ae 100644
--- a/mozilla/netwerk/protocol/ftp/src/makefile.win
+++ b/mozilla/netwerk/protocol/ftp/src/makefile.win
@@ -18,7 +18,15 @@
 # Contributor(s): 
 
 MODULE = necko
-REQUIRES	= xpcom string exthandler mimetype wallet pref intl nkcache
+REQUIRES	= xpcom \
+		  string \
+		  exthandler \
+		  mimetype \
+		  wallet \
+		  pref \
+		  intl \
+		  nkcache \
+		  $(NULL)
 
 DEPTH = ..\..\..\..
 
diff --git a/mozilla/netwerk/protocol/gopher/src/makefile.win b/mozilla/netwerk/protocol/gopher/src/makefile.win
index 8e01175fbd7..de8c1a044e8 100644
--- a/mozilla/netwerk/protocol/gopher/src/makefile.win
+++ b/mozilla/netwerk/protocol/gopher/src/makefile.win
@@ -20,7 +20,10 @@
 MODULE = necko
 
 DEPTH = ..\..\..\..
-REQUIRES        = xpcom string mimetype
+REQUIRES	= xpcom \
+		  string \
+		  mimetype \
+		  $(NULL)
 
 LIBRARY_NAME=nkgopher_s
 
diff --git a/mozilla/netwerk/protocol/http/src/makefile.win b/mozilla/netwerk/protocol/http/src/makefile.win
index ecec756c361..d999818173c 100644
--- a/mozilla/netwerk/protocol/http/src/makefile.win
+++ b/mozilla/netwerk/protocol/http/src/makefile.win
@@ -21,7 +21,14 @@
 
 DEPTH=..\..\..\..
 MODULE=necko
-REQUIRES	= xpcom string pref nkcache mimetype intl exthandler
+REQUIRES	= xpcom \
+		  string \
+		  pref \
+		  nkcache \
+		  mimetype \
+		  intl \
+		  exthandler \
+		  $(NULL)
 include <$(DEPTH)/config/config.mak>
 
 
diff --git a/mozilla/netwerk/protocol/jar/src/makefile.win b/mozilla/netwerk/protocol/jar/src/makefile.win
index 64360819ccc..fe5d9259136 100644
--- a/mozilla/netwerk/protocol/jar/src/makefile.win
+++ b/mozilla/netwerk/protocol/jar/src/makefile.win
@@ -21,7 +21,16 @@
 
 DEPTH=..\..\..\..
 MODULE=necko
-REQUIRES	= xpcom string jar exthandler mimetype caps js pref xpconnect
+REQUIRES	= xpcom \
+		  string \
+		  jar \
+		  exthandler \
+		  mimetype \
+		  caps \
+		  js \
+		  pref \
+		  xpconnect \
+		  $(NULL)
 
 LIBRARY_NAME=nkjar_s
 
diff --git a/mozilla/netwerk/protocol/keyword/src/makefile.win b/mozilla/netwerk/protocol/keyword/src/makefile.win
index 09daaaab03e..03db95914dc 100644
--- a/mozilla/netwerk/protocol/keyword/src/makefile.win
+++ b/mozilla/netwerk/protocol/keyword/src/makefile.win
@@ -21,7 +21,10 @@
 
 DEPTH=..\..\..\..
 MODULE=necko
-REQUIRES	= xpcom string pref
+REQUIRES	= xpcom \
+		  string \
+		  pref \
+		  $(NULL)
 
 LIBRARY_NAME=nkkwd_s
 
diff --git a/mozilla/netwerk/protocol/res/src/makefile.win b/mozilla/netwerk/protocol/res/src/makefile.win
index ed3d02d8d59..55e052d953f 100644
--- a/mozilla/netwerk/protocol/res/src/makefile.win
+++ b/mozilla/netwerk/protocol/res/src/makefile.win
@@ -21,7 +21,11 @@
 
 DEPTH=..\..\..\..
 MODULE=necko
-REQUIRES	= xpcom string exthandler mimetype
+REQUIRES	= xpcom \
+		  string \
+		  exthandler \
+		  mimetype \
+		  $(NULL)
 
 LIBRARY_NAME=nkres_s
 
diff --git a/mozilla/netwerk/protocol/viewsource/src/makefile.win b/mozilla/netwerk/protocol/viewsource/src/makefile.win
index ea244988c7b..ac2dc4fb757 100644
--- a/mozilla/netwerk/protocol/viewsource/src/makefile.win
+++ b/mozilla/netwerk/protocol/viewsource/src/makefile.win
@@ -23,7 +23,10 @@
 MODULE = necko
 
 DEPTH = ..\..\..\..
-REQUIRES	= xpcom string mimetype
+REQUIRES	= xpcom \
+		  string \
+		  mimetype \
+		  $(NULL)
 
 LIBRARY_NAME=nkviewsource_s
 
diff --git a/mozilla/netwerk/socket/base/makefile.win b/mozilla/netwerk/socket/base/makefile.win
index 3ecc8e085de..83d5077ffda 100644
--- a/mozilla/netwerk/socket/base/makefile.win
+++ b/mozilla/netwerk/socket/base/makefile.win
@@ -20,7 +20,9 @@
 # Contributor(s): 
 
 MODULE = necko
-REQUIRES	= xpcom string
+REQUIRES	= xpcom \
+		  string \
+		  $(NULL)
 
 DEPTH=..\..\..
 
diff --git a/mozilla/netwerk/streamconv/converters/makefile.win b/mozilla/netwerk/streamconv/converters/makefile.win
index 812504473da..76e4e3a360b 100644
--- a/mozilla/netwerk/streamconv/converters/makefile.win
+++ b/mozilla/netwerk/streamconv/converters/makefile.win
@@ -20,7 +20,15 @@
 DEPTH = ..\..\..
 
 MODULE = necko
-REQUIRES	= xpcom string mimetype locale util pref exthandler zlib
+REQUIRES	= xpcom \
+		  string \
+		  mimetype \
+		  locale \
+		  util \
+		  pref \
+		  exthandler \
+		  zlib \
+		  $(NULL)
 include <$(DEPTH)/config/config.mak>
 
 LIBRARY_NAME=nkcnvts_s
diff --git a/mozilla/netwerk/streamconv/src/makefile.win b/mozilla/netwerk/streamconv/src/makefile.win
index 1daa6ff48eb..dc738a23937 100644
--- a/mozilla/netwerk/streamconv/src/makefile.win
+++ b/mozilla/netwerk/streamconv/src/makefile.win
@@ -19,7 +19,9 @@
 
 DEPTH = ..\..\..
 MODULE = necko
-REQUIRES	= xpcom string
+REQUIRES	= xpcom \
+		  string \
+		  $(NULL)
 
 include <$(DEPTH)/config/config.mak>
 
diff --git a/mozilla/netwerk/streamconv/test/makefile.win b/mozilla/netwerk/streamconv/test/makefile.win
index 9fc33aff3a2..5bf1f88e76c 100644
--- a/mozilla/netwerk/streamconv/test/makefile.win
+++ b/mozilla/netwerk/streamconv/test/makefile.win
@@ -30,7 +30,10 @@ LLIBS=                  \
 
 
 DEPTH=..\..\..
-REQUIRES	= necko xpcom string
+REQUIRES	= necko \
+		  xpcom \
+		  string \
+		  $(NULL)
 
 include <$(DEPTH)/config/config.mak>
 
diff --git a/mozilla/netwerk/test/makefile.win b/mozilla/netwerk/test/makefile.win
index 823024821f5..0e695a4d5eb 100644
--- a/mozilla/netwerk/test/makefile.win
+++ b/mozilla/netwerk/test/makefile.win
@@ -20,7 +20,15 @@
 # Contributor(s): 
 
 DEPTH=..\..
-REQUIRES	= xpcom string necko nkcache timer cookie dbm util
+REQUIRES	= xpcom \
+		  string \
+		  necko \
+		  nkcache \
+		  timer \
+		  cookie \
+		  dbm \
+		  util \
+		  $(NULL)
 
 MAKE_OBJ_TYPE	= EXE
 PROG1 = .\$(OBJDIR)\TestFileInput.exe
diff --git a/mozilla/parser/htmlparser/robot/makefile.win b/mozilla/parser/htmlparser/robot/makefile.win
index 8d40dc8f6d4..7b8ddc25de7 100644
--- a/mozilla/parser/htmlparser/robot/makefile.win
+++ b/mozilla/parser/htmlparser/robot/makefile.win
@@ -27,7 +27,14 @@ LIBNAME = .\$(OBJDIR)\DebugRobot
 DLL = $(LIBNAME).dll
 
 DEPTH=..\..
-REQUIRES	= xpcom string htmlparser necko docshell dom uriloader
+REQUIRES	= xpcom \
+		  string \
+		  htmlparser \
+		  necko \
+		  docshell \
+		  dom \
+		  uriloader \
+		  $(NULL)
 
 include <$(DEPTH)\config\config.mak>
 
diff --git a/mozilla/parser/htmlparser/robot/test/makefile.win b/mozilla/parser/htmlparser/robot/test/makefile.win
index caa2f346caa..22e36cff96d 100644
--- a/mozilla/parser/htmlparser/robot/test/makefile.win
+++ b/mozilla/parser/htmlparser/robot/test/makefile.win
@@ -21,7 +21,11 @@
 
 DEPTH=..\..\..
 
-REQUIRES=xpcom string webshell htmlparser
+REQUIRES	= xpcom \
+		  string \
+		  webshell \
+		  htmlparser \
+		  $(NULL)
 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 cacc2016e7a..4fb03c8afa6 100644
--- a/mozilla/parser/htmlparser/src/makefile.win
+++ b/mozilla/parser/htmlparser/src/makefile.win
@@ -22,7 +22,21 @@
 DEPTH=..\..
 
 MODULE         = htmlparser
-REQUIRES       = xpcom string necko util uconv expat layout dom pref nkcache intl widget raptor content
+REQUIRES	= xpcom \
+		  string \
+		  necko \
+		  util \
+		  uconv \
+		  expat \
+		  layout \
+		  dom \
+		  pref \
+		  nkcache \
+		  intl \
+		  widget \
+		  raptor \
+		  content \
+		  $(NULL)
 include <$(DEPTH)\config\config.mak>
 
 LIBRARY_NAME=raptorhtmlpars 
diff --git a/mozilla/parser/htmlparser/tests/outsinks/makefile.win b/mozilla/parser/htmlparser/tests/outsinks/makefile.win
index 0131a88e45c..264a424c885 100644
--- a/mozilla/parser/htmlparser/tests/outsinks/makefile.win
+++ b/mozilla/parser/htmlparser/tests/outsinks/makefile.win
@@ -21,7 +21,14 @@
 
 DEPTH=..\..\..
 
-REQUIRES	= xpcom string htmlparser necko layout dom content
+REQUIRES	= xpcom \
+		  string \
+		  htmlparser \
+		  necko \
+		  layout \
+		  dom \
+		  content \
+		  $(NULL)
 
 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 18181aeffca..24472f508c8 100644
--- a/mozilla/profile/pref-migrator/src/makefile.win
+++ b/mozilla/profile/pref-migrator/src/makefile.win
@@ -22,7 +22,22 @@
 
 DEPTH=..\..\..
 MODULE=nsprefm
-REQUIRES	= xpcom string pref appshell intl docshell dom necko rdf widget webBrowser_core uconv windowwatcher raptor prefmigr
+REQUIRES	= xpcom \
+		  string \
+		  pref \
+		  appshell \
+		  intl \
+		  docshell \
+		  dom \
+		  necko \
+		  rdf \
+		  widget \
+		  webBrowser_core \
+		  uconv \
+		  windowwatcher \
+		  raptor \
+		  prefmigr \
+		  $(NULL)
 include <$(DEPTH)/config/config.mak>
 
 
diff --git a/mozilla/profile/src/makefile.win b/mozilla/profile/src/makefile.win
index 204991611e4..86fecb17b72 100644
--- a/mozilla/profile/src/makefile.win
+++ b/mozilla/profile/src/makefile.win
@@ -31,7 +31,26 @@
 #//------------------------------------------------------------------------
 DEPTH = ..\..
 MODULE		= profile
-REQUIRES = xpcom string appshell uriloader pref necko nsprefm prefmigr dom windowwatcher bookmarks cookie chrome intl docshell webBrowser_core widget rdf uconv
+REQUIRES	= xpcom \
+		  string \
+		  appshell \
+		  uriloader \
+		  pref \
+		  necko \
+		  nsprefm \
+		  prefmigr \
+		  dom \
+		  windowwatcher \
+		  bookmarks \
+		  cookie \
+		  chrome \
+		  intl \
+		  docshell \
+		  webBrowser_core \
+		  widget \
+		  rdf \
+		  uconv \
+		  $(NULL)
 include <$(DEPTH)\config\config.mak>
 #//------------------------------------------------------------------------
 #//
diff --git a/mozilla/rdf/base/src/makefile.win b/mozilla/rdf/base/src/makefile.win
index 774d79a6c69..30600decfeb 100644
--- a/mozilla/rdf/base/src/makefile.win
+++ b/mozilla/rdf/base/src/makefile.win
@@ -25,7 +25,15 @@ LCFLAGS=
 
 MODULE=rdf
 LIBRARY_NAME=rdfbase_s
-REQUIRES=xpcom string rdfutil htmlparser content necko js layout
+REQUIRES	= xpcom \
+		  string \
+		  rdfutil \
+		  htmlparser \
+		  content \
+		  necko \
+		  js \
+		  layout \
+		  $(NULL)
 CPP_OBJS=\
         .\$(OBJDIR)\nsCompositeDataSource.obj     \
         .\$(OBJDIR)\nsContainerEnumerator.obj     \
diff --git a/mozilla/rdf/build/makefile.win b/mozilla/rdf/build/makefile.win
index 925f22f1d5e..123738fc832 100644
--- a/mozilla/rdf/build/makefile.win
+++ b/mozilla/rdf/build/makefile.win
@@ -23,7 +23,13 @@ DEPTH=..\..
 MODULE=rdf
 LIBRARY_NAME=rdf
 MODULE_NAME=nsRDFModule
-REQUIRES	= xpcom string layout htmlparser necko content
+REQUIRES	= xpcom \
+		  string \
+		  layout \
+		  htmlparser \
+		  necko \
+		  content \
+		  $(NULL)
 include <$(DEPTH)/config/config.mak>
 
 EXPORTS=\
diff --git a/mozilla/rdf/chrome/build/makefile.win b/mozilla/rdf/chrome/build/makefile.win
index 6d3ca4df56b..655e3c66b71 100644
--- a/mozilla/rdf/chrome/build/makefile.win
+++ b/mozilla/rdf/chrome/build/makefile.win
@@ -25,7 +25,14 @@ MODULE=chrome
 MODULE		= chrome
 LIBRARY_NAME	= chrome
 MODULE_NAME	= nsChromeModule
-REQUIRES	= xpcom string rdf necko layout raptor content
+REQUIRES	= xpcom \
+		  string \
+		  rdf \
+		  necko \
+		  layout \
+		  raptor \
+		  content \
+		  $(NULL)
 
 CPP_OBJS=\
         .\$(OBJDIR)\nsChromeFactory.obj    \
diff --git a/mozilla/rdf/chrome/src/makefile.win b/mozilla/rdf/chrome/src/makefile.win
index 6b0ce2b35d4..c579436ad28 100644
--- a/mozilla/rdf/chrome/src/makefile.win
+++ b/mozilla/rdf/chrome/src/makefile.win
@@ -22,7 +22,25 @@
 DEPTH=..\..\..
 MODULE=chrome
 LIBRARY_NAME=chrome_s
-REQUIRES=xpcom string necko rdf appshell layout content intl dom widget content_xul gfx docshell pref imglib2 caps xpconnect js
+REQUIRES	= xpcom \
+		  string \
+		  necko \
+		  rdf \
+		  appshell \
+		  layout \
+		  content \
+		  intl \
+		  dom \
+		  widget \
+		  content_xul \
+		  gfx \
+		  docshell \
+		  pref \
+		  imglib2 \
+		  caps \
+		  xpconnect \
+		  js \
+		  $(NULL)
 CPP_OBJS=\
         .\$(OBJDIR)\nsChromeRegistry.obj    \
 	    .\$(OBJDIR)\nsChromeProtocolHandler.obj    \
diff --git a/mozilla/rdf/chrome/tools/chromereg/makefile.win b/mozilla/rdf/chrome/tools/chromereg/makefile.win
index 678c535ac6b..2ed3ec2b6aa 100644
--- a/mozilla/rdf/chrome/tools/chromereg/makefile.win
+++ b/mozilla/rdf/chrome/tools/chromereg/makefile.win
@@ -14,7 +14,10 @@
 
 DEPTH=..\..\..\..
 
-REQUIRES=xpcom chrome necko
+REQUIRES	= xpcom \
+		  chrome \
+		  necko \
+		  $(NULL)
 CPPSRCS		= regchrome.cpp
 
 MAKE_OBJ_TYPE   = EXE
diff --git a/mozilla/rdf/datasource/src/makefile.win b/mozilla/rdf/datasource/src/makefile.win
index 7e8755d45b4..9febf5a06bb 100644
--- a/mozilla/rdf/datasource/src/makefile.win
+++ b/mozilla/rdf/datasource/src/makefile.win
@@ -22,7 +22,11 @@
 DEPTH=..\..\..
 MODULE=rdf
 LIBRARY_NAME=rdfdatasource_s
-REQUIRES	= xpcom string necko uconv
+REQUIRES	= xpcom \
+		  string \
+		  necko \
+		  uconv \
+		  $(NULL)
 
 CPP_OBJS=\
         .\$(OBJDIR)\nsFileSystemDataSource.obj  \
diff --git a/mozilla/rdf/tests/rdfcat/makefile.win b/mozilla/rdf/tests/rdfcat/makefile.win
index 29550c2306b..5a55333b17b 100644
--- a/mozilla/rdf/tests/rdfcat/makefile.win
+++ b/mozilla/rdf/tests/rdfcat/makefile.win
@@ -21,7 +21,17 @@
 
 
 DEPTH	= ..\..\..
-REQUIRES	= xpcom string rdf necko widget view dom uriloader layout gfx
+REQUIRES	= xpcom \
+		  string \
+		  rdf \
+		  necko \
+		  widget \
+		  view \
+		  dom \
+		  uriloader \
+		  layout \
+		  gfx \
+		  $(NULL)
 MODULE=rdfcat
 include <$(DEPTH)/config/config.mak>
 
diff --git a/mozilla/rdf/tests/rdfpoll/makefile.win b/mozilla/rdf/tests/rdfpoll/makefile.win
index 772c7757903..cda1b6e7e99 100644
--- a/mozilla/rdf/tests/rdfpoll/makefile.win
+++ b/mozilla/rdf/tests/rdfpoll/makefile.win
@@ -21,7 +21,14 @@
 
 
 DEPTH	= ..\..\..
-REQUIRES	= xpcom string rdf necko layout dom htmlparser
+REQUIRES	= xpcom \
+		  string \
+		  rdf \
+		  necko \
+		  layout \
+		  dom \
+		  htmlparser \
+		  $(NULL)
 MODULE=rdfpoll
 include <$(DEPTH)/config/config.mak>
 
diff --git a/mozilla/rdf/util/src/makefile.win b/mozilla/rdf/util/src/makefile.win
index 210896fb54b..01f4586baf1 100644
--- a/mozilla/rdf/util/src/makefile.win
+++ b/mozilla/rdf/util/src/makefile.win
@@ -25,7 +25,10 @@ LCFLAGS=-DUSE_XPIDL_INTERFACES -D_IMPL_NS_RDF
 
 MODULE=rdfutil
 LIBRARY_NAME=rdfutil_s
-REQUIRES	= xpcom string rdf
+REQUIRES	= xpcom \
+		  string \
+		  rdf \
+		  $(NULL)
 
 CPP_OBJS=\
         .\$(OBJDIR)\nsRDFResource.obj             \
diff --git a/mozilla/string/obsolete/makefile.win b/mozilla/string/obsolete/makefile.win
index 50b0a3c7209..552893019a6 100644
--- a/mozilla/string/obsolete/makefile.win
+++ b/mozilla/string/obsolete/makefile.win
@@ -24,7 +24,9 @@
 DEPTH=..\..
 
 MODULE=string
-REQUIRES	= unicharutil xpcom
+REQUIRES	= unicharutil \
+		  xpcom \
+		  $(NULL)
 
 EXPORTS =                               \
         nsStr.h                         \
diff --git a/mozilla/string/src/makefile.win b/mozilla/string/src/makefile.win
index b027f8972cc..d88e1d31d9f 100644
--- a/mozilla/string/src/makefile.win
+++ b/mozilla/string/src/makefile.win
@@ -26,7 +26,8 @@ DEPTH=..\..
 
 MODULE=string
 LIBRARY_NAME=string_s
-REQUIRES	= xpcom
+REQUIRES	= xpcom \
+		  $(NULL)
 LCFLAGS = -D_IMPL_NS_COM -D_IMPL_NS_BASE -DWIN32_LEAN_AND_MEAN
 
 CPP_OBJS =                                        \
diff --git a/mozilla/uriloader/base/makefile.win b/mozilla/uriloader/base/makefile.win
index b815b50e2b4..bd6caa7d799 100644
--- a/mozilla/uriloader/base/makefile.win
+++ b/mozilla/uriloader/base/makefile.win
@@ -20,7 +20,23 @@
 MODULE = uriloader
 
 DEPTH = ..\..
-REQUIRES	= xpcom string necko dom exthandler js docshell layout widget caps intl webshell xpconnect raptor content gfx
+REQUIRES	= xpcom \
+		  string \
+		  necko \
+		  dom \
+		  exthandler \
+		  js \
+		  docshell \
+		  layout \
+		  widget \
+		  caps \
+		  intl \
+		  webshell \
+		  xpconnect \
+		  raptor \
+		  content \
+		  gfx \
+		  $(NULL)
 
 include <$(DEPTH)\config\config.mak>
 
diff --git a/mozilla/uriloader/build/makefile.win b/mozilla/uriloader/build/makefile.win
index 87ceb70ec30..219b4535d50 100644
--- a/mozilla/uriloader/build/makefile.win
+++ b/mozilla/uriloader/build/makefile.win
@@ -19,7 +19,15 @@
 
 DEPTH=..\..
 MODULE		= uriloader
-REQUIRES	= xpcom string necko mimetype exthandler rdf helperAppDlg dom
+REQUIRES	= xpcom \
+		  string \
+		  necko \
+		  mimetype \
+		  exthandler \
+		  rdf \
+		  helperAppDlg \
+		  dom \
+		  $(NULL)
 LIBRARY_NAME	= urildr
 MODULE_NAME	= nsURILoaderModule
 
diff --git a/mozilla/uriloader/exthandler/makefile.win b/mozilla/uriloader/exthandler/makefile.win
index 8139bf89d7e..bbf556b334c 100644
--- a/mozilla/uriloader/exthandler/makefile.win
+++ b/mozilla/uriloader/exthandler/makefile.win
@@ -20,7 +20,20 @@
 MODULE = exthandler
 
 DEPTH = ..\..
-REQUIRES	= xpcom string mimetype uriloader dom necko rdf webshell helperAppDlg plugin gkplugin pref raptor
+REQUIRES	= xpcom \
+		  string \
+		  mimetype \
+		  uriloader \
+		  dom \
+		  necko \
+		  rdf \
+		  webshell \
+		  helperAppDlg \
+		  plugin \
+		  gkplugin \
+		  pref \
+		  raptor \
+		  $(NULL)
 
 include <$(DEPTH)\config\config.mak>
 
diff --git a/mozilla/uriloader/exthandler/win/makefile.win b/mozilla/uriloader/exthandler/win/makefile.win
index db2ad392c97..7a2202a0f93 100644
--- a/mozilla/uriloader/exthandler/win/makefile.win
+++ b/mozilla/uriloader/exthandler/win/makefile.win
@@ -21,7 +21,15 @@
 
 DEPTH=..\..\..
 MODULE=exthandler
-REQUIRES=xpcom string uriloader helperAppDlg dom mimetype necko rdf
+REQUIRES	= xpcom \
+		  string \
+		  uriloader \
+		  helperAppDlg \
+		  dom \
+		  mimetype \
+		  necko \
+		  rdf \
+		  $(NULL)
 LIBRARY_NAME=exthandlerwin_s
 
 CPP_OBJS=\
diff --git a/mozilla/view/src/makefile.win b/mozilla/view/src/makefile.win
index 440ad5af3d1..675baafe80c 100644
--- a/mozilla/view/src/makefile.win
+++ b/mozilla/view/src/makefile.win
@@ -24,7 +24,17 @@ DEPTH=..\..
 MODULE		= view
 LIBRARY_NAME	= gkview
 MODULE_NAME	= nsViewModule
-REQUIRES	= xpcom string layout gfx widget dom locale timer pref content
+REQUIRES	= xpcom \
+		  string \
+		  layout \
+		  gfx \
+		  widget \
+		  dom \
+		  locale \
+		  timer \
+		  pref \
+		  content \
+		  $(NULL)
 
 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 f4b30af5ca0..7d346b8c956 100644
--- a/mozilla/webshell/tests/ComFactory/makefile.win
+++ b/mozilla/webshell/tests/ComFactory/makefile.win
@@ -20,7 +20,10 @@
 IGNORE_MANIFEST = 1
 
 DEPTH= ..\..\..
-REQUIRES=xpcom raptor webshell
+REQUIRES	= xpcom \
+		  raptor \
+		  webshell \
+		  $(NULL)
 
 
 MAKE_OBJ_TYPE=EXE
diff --git a/mozilla/webshell/tests/viewer/makefile.win b/mozilla/webshell/tests/viewer/makefile.win
index 3946ea54ac5..c3e24478792 100644
--- a/mozilla/webshell/tests/viewer/makefile.win
+++ b/mozilla/webshell/tests/viewer/makefile.win
@@ -21,7 +21,31 @@
 
 DEPTH=..\..\..
 MODULE=viewer
-REQUIRES		= xpcom string webshell widget layout dom webBrowser_core docshell util uriloader locale necko htmlparser view timer pref intl editor cookie xpconnect gfx content wallet js
+REQUIRES	= xpcom \
+		  string \
+		  webshell \
+		  widget \
+		  layout \
+		  dom \
+		  webBrowser_core \
+		  docshell \
+		  util \
+		  uriloader \
+		  locale \
+		  necko \
+		  htmlparser \
+		  view \
+		  timer \
+		  pref \
+		  intl \
+		  editor \
+		  cookie \
+		  xpconnect \
+		  gfx \
+		  content \
+		  wallet \
+		  js \
+		  $(NULL)
 
 include <$(DEPTH)/config/config.mak>
 
diff --git a/mozilla/webshell/tests/viewer/windows/makefile.win b/mozilla/webshell/tests/viewer/windows/makefile.win
index 889a21b7f37..2900f609364 100644
--- a/mozilla/webshell/tests/viewer/windows/makefile.win
+++ b/mozilla/webshell/tests/viewer/windows/makefile.win
@@ -20,7 +20,13 @@
 # Contributor(s): 
 
 DEPTH=..\..\..\.. 
-REQUIRES=xpcom string dom accessibility widget gfx
+REQUIRES	= xpcom \
+		  string \
+		  dom \
+		  accessibility \
+		  widget \
+		  gfx \
+		  $(NULL)
 LIBRARY_NAME=raptornativewidgets_s 
 
 DEFINES=-DWIN32_LEAN_AND_MEAN
diff --git a/mozilla/xpcom/appshell/eventloop/windows/makefile.win b/mozilla/xpcom/appshell/eventloop/windows/makefile.win
index 15e5d64d486..b7cf0003f1c 100644
--- a/mozilla/xpcom/appshell/eventloop/windows/makefile.win
+++ b/mozilla/xpcom/appshell/eventloop/windows/makefile.win
@@ -22,7 +22,8 @@
 
 DEPTH=..\..\..\..
 MODULE		= xpcom
-REQUIRES=string
+REQUIRES	= string \
+		  $(NULL)
 XPIDL_MODULE = xpcom_eventloop_windows
 LIBRARY_NAME	= evntloop
 MODULE_NAME	= nsNativeAppModule
diff --git a/mozilla/xpcom/appshell/eventloop/xp/makefile.win b/mozilla/xpcom/appshell/eventloop/xp/makefile.win
index e0f44a52f38..25239dc5c9c 100644
--- a/mozilla/xpcom/appshell/eventloop/xp/makefile.win
+++ b/mozilla/xpcom/appshell/eventloop/xp/makefile.win
@@ -21,7 +21,8 @@
 
 DEPTH=..\..\..\..
 MODULE=xpcom
-REQUIRES=string
+REQUIRES	= string \
+		  $(NULL)
 XPIDL_MODULE=xpcom_eventloop_xp
 
 LIBRARY_NAME= xp_eventloop
diff --git a/mozilla/xpcom/appshell/nativeApp/makefile.win b/mozilla/xpcom/appshell/nativeApp/makefile.win
index 60330e8918c..55452a1263c 100644
--- a/mozilla/xpcom/appshell/nativeApp/makefile.win
+++ b/mozilla/xpcom/appshell/nativeApp/makefile.win
@@ -22,7 +22,8 @@
 DEPTH=..\..\..
 
 MODULE=xpcom
-REQUIRES=string
+REQUIRES	= string \
+		  $(NULL)
 XPIDL_MODULE=xpcom_nativeapp
 LIBRARY_NAME=nativapp
 MODULE_NAME=nsCNativeAppModule
diff --git a/mozilla/xpcom/base/makefile.win b/mozilla/xpcom/base/makefile.win
index d0f56865319..b3907ff143b 100644
--- a/mozilla/xpcom/base/makefile.win
+++ b/mozilla/xpcom/base/makefile.win
@@ -24,7 +24,8 @@
 DEPTH=..\..
 MODULE = xpcom 
 
-REQUIRES=string
+REQUIRES	= string \
+		  $(NULL)
 ################################################################################
 ## exports
 
diff --git a/mozilla/xpcom/build/makefile.win b/mozilla/xpcom/build/makefile.win
index 5e35340ab3b..cdb526f08ed 100644
--- a/mozilla/xpcom/build/makefile.win
+++ b/mozilla/xpcom/build/makefile.win
@@ -23,7 +23,10 @@
 
 DEPTH=..\..
 MODULE = xpcom 
-REQUIRES	= mozreg unicharutil string
+REQUIRES	= mozreg \
+		  unicharutil \
+		  string \
+		  $(NULL)
 
 include <$(DEPTH)\config\config.mak>
 
diff --git a/mozilla/xpcom/components/makefile.win b/mozilla/xpcom/components/makefile.win
index f34511cc34e..ed6596d392a 100644
--- a/mozilla/xpcom/components/makefile.win
+++ b/mozilla/xpcom/components/makefile.win
@@ -24,7 +24,9 @@
 DEPTH=..\..
 MODULE = xpcom
 XPIDL_MODULE = xpcom_components
-REQUIRES	= mozreg string
+REQUIRES	= mozreg \
+		  string \
+		  $(NULL)
 
 ################################################################################
 ## exports
diff --git a/mozilla/xpcom/ds/makefile.win b/mozilla/xpcom/ds/makefile.win
index ffcb8ca9044..302683fc3a9 100644
--- a/mozilla/xpcom/ds/makefile.win
+++ b/mozilla/xpcom/ds/makefile.win
@@ -23,7 +23,9 @@
 
 DEPTH=..\..
 MODULE = xpcom 
-REQUIRES=string unicharutil
+REQUIRES	= string \
+		  unicharutil \
+		  $(NULL)
 ################################################################################
 ## exports
 
diff --git a/mozilla/xpcom/io/makefile.win b/mozilla/xpcom/io/makefile.win
index fbe4ab1e050..684ebf55e34 100644
--- a/mozilla/xpcom/io/makefile.win
+++ b/mozilla/xpcom/io/makefile.win
@@ -21,7 +21,11 @@
 
 DEPTH=..\..
 MODULE = xpcom 
-REQUIRES	= uconv string necko chrome
+REQUIRES	= uconv \
+		  string \
+		  necko \
+		  chrome \
+		  $(NULL)
 
 ################################################################################
 ## exports
diff --git a/mozilla/xpcom/proxy/src/makefile.win b/mozilla/xpcom/proxy/src/makefile.win
index 4c5de7a5f35..ec28b26eca9 100644
--- a/mozilla/xpcom/proxy/src/makefile.win
+++ b/mozilla/xpcom/proxy/src/makefile.win
@@ -24,7 +24,8 @@ DEPTH=..\..\..
 
 LIBRARY_NAME=xpcomproxy_s
 MODULE=xpcom
-REQUIRES	= string
+REQUIRES	= string \
+		  $(NULL)
 
 
 LCFLAGS = -D_IMPL_NS_COM -D_IMPL_NS_BASE -DWIN32_LEAN_AND_MEAN -DEXPORT_XPTC_API
diff --git a/mozilla/xpcom/proxy/tests/makefile.win b/mozilla/xpcom/proxy/tests/makefile.win
index d43bd9c82d4..8916b1b1613 100644
--- a/mozilla/xpcom/proxy/tests/makefile.win
+++ b/mozilla/xpcom/proxy/tests/makefile.win
@@ -20,7 +20,9 @@
 # Contributor(s): 
 DEPTH=..\..\..
 
-REQUIRES=string xpcom
+REQUIRES	= string \
+		  xpcom \
+		  $(NULL)
 MAKE_OBJ_TYPE   = EXE
 PROGRAM = .\$(OBJDIR)\ProxyTest.exe
 
diff --git a/mozilla/xpcom/reflect/xptcall/tests/makefile.win b/mozilla/xpcom/reflect/xptcall/tests/makefile.win
index ae443ddfaa8..d9a4b2e849b 100644
--- a/mozilla/xpcom/reflect/xptcall/tests/makefile.win
+++ b/mozilla/xpcom/reflect/xptcall/tests/makefile.win
@@ -21,7 +21,8 @@
 
 DEPTH=..\..\..\..
 
-REQUIRES=xpcom
+REQUIRES	= xpcom \
+		  $(NULL)
 
 MAKE_OBJ_TYPE	= EXE
 PROG1 = .\$(OBJDIR)\TestXPTCInvoke.exe
diff --git a/mozilla/xpcom/reflect/xptinfo/src/makefile.win b/mozilla/xpcom/reflect/xptinfo/src/makefile.win
index d8d125c75c5..e55208ef8ab 100644
--- a/mozilla/xpcom/reflect/xptinfo/src/makefile.win
+++ b/mozilla/xpcom/reflect/xptinfo/src/makefile.win
@@ -22,7 +22,8 @@
 
 DEPTH=..\..\..\..
 MODULE	= 	xpcom
-REQUIRES	= jar
+REQUIRES	= jar \
+		  $(NULL)
 
 LIBRARY_NAME=xpcomxptinfo_s
 
diff --git a/mozilla/xpcom/reflect/xptinfo/tests/makefile.win b/mozilla/xpcom/reflect/xptinfo/tests/makefile.win
index d421719a554..f6ce61cb95c 100644
--- a/mozilla/xpcom/reflect/xptinfo/tests/makefile.win
+++ b/mozilla/xpcom/reflect/xptinfo/tests/makefile.win
@@ -22,7 +22,8 @@
 DEPTH=..\..\..\..
 
 
-REQUIRES=xpcom
+REQUIRES	= xpcom \
+		  $(NULL)
 MAKE_OBJ_TYPE	= EXE
 PROG1 = .\$(OBJDIR)\TestInterfaceInfo.exe
 PROGRAMS = $(PROG1)
diff --git a/mozilla/xpcom/sample/makefile.win b/mozilla/xpcom/sample/makefile.win
index f60ad513548..9c469c0b70d 100644
--- a/mozilla/xpcom/sample/makefile.win
+++ b/mozilla/xpcom/sample/makefile.win
@@ -21,7 +21,8 @@
 
 DEPTH=..\..
 MODULE=sample
-REQUIRES=xpcom
+REQUIRES	= xpcom \
+		  $(NULL)
 
 MAKE_OBJ_TYPE=DLL
 DLLNAME=$(MODULE)
diff --git a/mozilla/xpcom/string/obsolete/makefile.win b/mozilla/xpcom/string/obsolete/makefile.win
index 50b0a3c7209..552893019a6 100644
--- a/mozilla/xpcom/string/obsolete/makefile.win
+++ b/mozilla/xpcom/string/obsolete/makefile.win
@@ -24,7 +24,9 @@
 DEPTH=..\..
 
 MODULE=string
-REQUIRES	= unicharutil xpcom
+REQUIRES	= unicharutil \
+		  xpcom \
+		  $(NULL)
 
 EXPORTS =                               \
         nsStr.h                         \
diff --git a/mozilla/xpcom/string/src/makefile.win b/mozilla/xpcom/string/src/makefile.win
index b027f8972cc..d88e1d31d9f 100644
--- a/mozilla/xpcom/string/src/makefile.win
+++ b/mozilla/xpcom/string/src/makefile.win
@@ -26,7 +26,8 @@ DEPTH=..\..
 
 MODULE=string
 LIBRARY_NAME=string_s
-REQUIRES	= xpcom
+REQUIRES	= xpcom \
+		  $(NULL)
 LCFLAGS = -D_IMPL_NS_COM -D_IMPL_NS_BASE -DWIN32_LEAN_AND_MEAN
 
 CPP_OBJS =                                        \
diff --git a/mozilla/xpcom/tests/makefile.win b/mozilla/xpcom/tests/makefile.win
index d3dc0fc6b3c..52770189296 100644
--- a/mozilla/xpcom/tests/makefile.win
+++ b/mozilla/xpcom/tests/makefile.win
@@ -20,7 +20,10 @@
 # Contributor(s): 
 
 DEPTH=..\..
-REQUIRES=xpcom string necko
+REQUIRES	= xpcom \
+		  string \
+		  necko \
+		  $(NULL)
 include <$(DEPTH)/config/config.mak>
 
 
diff --git a/mozilla/xpcom/tests/windows/makefile.win b/mozilla/xpcom/tests/windows/makefile.win
index c0abd7d58dc..9f9c7d2805f 100644
--- a/mozilla/xpcom/tests/windows/makefile.win
+++ b/mozilla/xpcom/tests/windows/makefile.win
@@ -21,7 +21,8 @@
 
 DEPTH=..\..\..
 
-REQUIRES=xpcom
+REQUIRES	= xpcom \
+		  $(NULL)
 MAKE_OBJ_TYPE	= EXE
 
 PROG1 = .\$(OBJDIR)\TestCOM.exe
diff --git a/mozilla/xpcom/threads/makefile.win b/mozilla/xpcom/threads/makefile.win
index e4e7ec5ddab..bdeb5160cd7 100644
--- a/mozilla/xpcom/threads/makefile.win
+++ b/mozilla/xpcom/threads/makefile.win
@@ -23,7 +23,8 @@
 
 DEPTH=..\..
 MODULE = xpcom
-REQUIRES	= string
+REQUIRES	= string \
+		  $(NULL)
 
 ################################################################################
 ## exports
diff --git a/mozilla/xpcom/tools/registry/makefile.win b/mozilla/xpcom/tools/registry/makefile.win
index 8a73bfc7056..4b55bdd4bbf 100644
--- a/mozilla/xpcom/tools/registry/makefile.win
+++ b/mozilla/xpcom/tools/registry/makefile.win
@@ -21,7 +21,9 @@
 
 DEPTH=..\..\..
 
-REQUIRES=xpcom string
+REQUIRES	= xpcom \
+		  string \
+		  $(NULL)
 MAKE_OBJ_TYPE	= EXE
 PROG1 = .\$(OBJDIR)\regExport.exe
 PROG2 = .\$(OBJDIR)\regxpcom.exe
diff --git a/mozilla/xpcom/typelib/xpidl/makefile.win b/mozilla/xpcom/typelib/xpidl/makefile.win
index d11792c8d27..1a6822b94e6 100644
--- a/mozilla/xpcom/typelib/xpidl/makefile.win
+++ b/mozilla/xpcom/typelib/xpidl/makefile.win
@@ -23,7 +23,8 @@ DEPTH=..\..\..
 
 MAKE_OBJ_TYPE   = EXE
 PROGRAM = .\$(OBJDIR)\xpidl.exe
-REQUIRES = xpcom
+REQUIRES	= xpcom \
+		  $(NULL)
 #RESFILE = xpidl.res
 
 # glib and libIDL link against the non-debug msvcrt
diff --git a/mozilla/xpcom/typelib/xpt/tests/makefile.win b/mozilla/xpcom/typelib/xpt/tests/makefile.win
index 8d898cdabd4..29598239973 100644
--- a/mozilla/xpcom/typelib/xpt/tests/makefile.win
+++ b/mozilla/xpcom/typelib/xpt/tests/makefile.win
@@ -21,7 +21,8 @@
 
 DEPTH=..\..\..\..
 
-REQUIRES=xpcom
+REQUIRES	= xpcom \
+		  $(NULL)
 
 MAKE_OBJ_TYPE	= EXE
 PROG1 = .\$(OBJDIR)\PrimitiveTest.exe
diff --git a/mozilla/xpcom/typelib/xpt/tools/makefile.win b/mozilla/xpcom/typelib/xpt/tools/makefile.win
index a2e62f63b27..67529a58f88 100644
--- a/mozilla/xpcom/typelib/xpt/tools/makefile.win
+++ b/mozilla/xpcom/typelib/xpt/tools/makefile.win
@@ -22,7 +22,8 @@
 DEPTH=..\..\..\..
 
 
-REQUIRES=xpcom
+REQUIRES	= xpcom \
+		  $(NULL)
 MAKE_OBJ_TYPE	= EXE
 PROG1 = .\$(OBJDIR)\xpt_dump.exe
 PROG2 = .\$(OBJDIR)\xpt_link.exe
diff --git a/mozilla/xpfe/appshell/src/makefile.win b/mozilla/xpfe/appshell/src/makefile.win
index 2f36f07ba8b..de2822005cf 100644
--- a/mozilla/xpfe/appshell/src/makefile.win
+++ b/mozilla/xpfe/appshell/src/makefile.win
@@ -21,7 +21,35 @@
 
 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 content_xul mozbrwsr content
+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 \
+		  content_xul \
+		  mozbrwsr \
+		  content \
+		  $(NULL)
 include <$(DEPTH)/config/config.mak>
 
 LIBRARY_NAME=appshell
diff --git a/mozilla/xpfe/bootstrap/makefile.win b/mozilla/xpfe/bootstrap/makefile.win
index bc866d69716..8e06fcab097 100644
--- a/mozilla/xpfe/bootstrap/makefile.win
+++ b/mozilla/xpfe/bootstrap/makefile.win
@@ -21,7 +21,36 @@
 
 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
+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 \
+		  $(NULL)
 include <$(DEPTH)/config/config.mak>
 
 DEFINES=-DWIN32_LEAN_AND_MEAN
diff --git a/mozilla/xpfe/browser/src/makefile.win b/mozilla/xpfe/browser/src/makefile.win
index 0049f4ce415..d58fd252cf7 100644
--- a/mozilla/xpfe/browser/src/makefile.win
+++ b/mozilla/xpfe/browser/src/makefile.win
@@ -26,7 +26,32 @@ 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
+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 \
+		  $(NULL)
 
 DEFINES=-DWIN32_LEAN_AND_MEAN
 
diff --git a/mozilla/xpfe/components/autocomplete/src/makefile.win b/mozilla/xpfe/components/autocomplete/src/makefile.win
index 37c48592e31..0b039ca0450 100644
--- a/mozilla/xpfe/components/autocomplete/src/makefile.win
+++ b/mozilla/xpfe/components/autocomplete/src/makefile.win
@@ -29,7 +29,13 @@
 #//------------------------------------------------------------------------
 DEPTH = ..\..\..\..
 MODULE=appcomps
-REQUIRES	= xpcom string layout dom mozldap necko
+REQUIRES	= xpcom \
+		  string \
+		  layout \
+		  dom \
+		  mozldap \
+		  necko \
+		  $(NULL)
 
 include <$(DEPTH)/config/config.mak>
 LIBRARY_NAME=autocomplete_s
diff --git a/mozilla/xpfe/components/bookmarks/src/makefile.win b/mozilla/xpfe/components/bookmarks/src/makefile.win
index 56fea6a289d..59e23203fd6 100644
--- a/mozilla/xpfe/components/bookmarks/src/makefile.win
+++ b/mozilla/xpfe/components/bookmarks/src/makefile.win
@@ -21,7 +21,22 @@
 
 DEPTH=..\..\..\..
 MODULE=bookmarks
-REQUIRES	= xpcom string rdf appshell widget necko uconv docshell pref timer dom intl webshell windowwatcher raptor
+REQUIRES	= xpcom \
+		  string \
+		  rdf \
+		  appshell \
+		  widget \
+		  necko \
+		  uconv \
+		  docshell \
+		  pref \
+		  timer \
+		  dom \
+		  intl \
+		  webshell \
+		  windowwatcher \
+		  raptor \
+		  $(NULL)
 
 CPP_OBJS=                               \
  .\$(OBJDIR)\nsBookmarksService.obj     \
diff --git a/mozilla/xpfe/components/build/makefile.win b/mozilla/xpfe/components/build/makefile.win
index 2283a503069..96548cf1e87 100644
--- a/mozilla/xpfe/components/build/makefile.win
+++ b/mozilla/xpfe/components/build/makefile.win
@@ -23,7 +23,28 @@ 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
+REQUIRES	= xpcom \
+		  string \
+		  layout \
+		  rdf \
+		  necko \
+		  timer \
+		  intl \
+		  mork \
+		  widget \
+		  dom \
+		  pref \
+		  docshell \
+		  webshell \
+		  bookmarks \
+		  content \
+		  raptor \
+		  history \
+		  search \
+		  related \
+		  urlbarhistory \
+		  mozldap \
+		  $(NULL)
 
 LCFLAGS = -DWIN32_LEAN_AND_MEAN
 
diff --git a/mozilla/xpfe/components/directory/makefile.win b/mozilla/xpfe/components/directory/makefile.win
index 1923f9b4922..46a8f1078f1 100644
--- a/mozilla/xpfe/components/directory/makefile.win
+++ b/mozilla/xpfe/components/directory/makefile.win
@@ -37,7 +37,24 @@ CHROME_L10N = \
 	$(NULL)
 
 MODULE=appcomps
-REQUIRES	= xpcom string necko rdf layout timer js xpconnect docshell widget dom webshell uconv uriloader windowwatcher content raptor
+REQUIRES	= xpcom \
+		  string \
+		  necko \
+		  rdf \
+		  layout \
+		  timer \
+		  js \
+		  xpconnect \
+		  docshell \
+		  widget \
+		  dom \
+		  webshell \
+		  uconv \
+		  uriloader \
+		  windowwatcher \
+		  content \
+		  raptor \
+		  $(NULL)
 XPIDL_MODULE=directory
 XPIDLSRCS =                             \
         .\nsIHTTPIndex.idl              \
diff --git a/mozilla/xpfe/components/find/src/makefile.win b/mozilla/xpfe/components/find/src/makefile.win
index 33d97ef949e..dd74001beea 100644
--- a/mozilla/xpfe/components/find/src/makefile.win
+++ b/mozilla/xpfe/components/find/src/makefile.win
@@ -29,7 +29,18 @@
 #//------------------------------------------------------------------------
 DEPTH = ..\..\..\..
 MODULE		= appcomps
-REQUIRES	= xpcom string dom layout widget editor necko txtsvc docshell content gfx
+REQUIRES	= xpcom \
+		  string \
+		  dom \
+		  layout \
+		  widget \
+		  editor \
+		  necko \
+		  txtsvc \
+		  docshell \
+		  content \
+		  gfx \
+		  $(NULL)
 
 include <$(DEPTH)/config/config.mak>
 
diff --git a/mozilla/xpfe/components/history/src/makefile.win b/mozilla/xpfe/components/history/src/makefile.win
index f2247fd04df..609a77401e0 100644
--- a/mozilla/xpfe/components/history/src/makefile.win
+++ b/mozilla/xpfe/components/history/src/makefile.win
@@ -21,7 +21,16 @@
 
 DEPTH=..\..\..\..
 MODULE=history
-REQUIRES	= xpcom string rdf mork pref necko intl timer appcomps
+REQUIRES	= xpcom \
+		  string \
+		  rdf \
+		  mork \
+		  pref \
+		  necko \
+		  intl \
+		  timer \
+		  appcomps \
+		  $(NULL)
 
 CPP_OBJS=                               \
  .\$(OBJDIR)\nsGlobalHistory.obj        \
diff --git a/mozilla/xpfe/components/regviewer/makefile.win b/mozilla/xpfe/components/regviewer/makefile.win
index 5fc1ad3b6be..6ea99181d8a 100644
--- a/mozilla/xpfe/components/regviewer/makefile.win
+++ b/mozilla/xpfe/components/regviewer/makefile.win
@@ -37,7 +37,10 @@ CHROME_L10N = \
 		$(NULL)
 
 MODULE=regviewer
-REQUIRES	= xpcom string rdf
+REQUIRES	= xpcom \
+		  string \
+		  rdf \
+		  $(NULL)
 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 0c930315280..9f5f050b431 100644
--- a/mozilla/xpfe/components/related/src/makefile.win
+++ b/mozilla/xpfe/components/related/src/makefile.win
@@ -21,7 +21,13 @@
 
 DEPTH=..\..\..\..
 MODULE=related
-REQUIRES	= xpcom string rdf necko uconv pref
+REQUIRES	= xpcom \
+		  string \
+		  rdf \
+		  necko \
+		  uconv \
+		  pref \
+		  $(NULL)
 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 e62539803df..cdc041b2d04 100755
--- a/mozilla/xpfe/components/search/src/makefile.win
+++ b/mozilla/xpfe/components/search/src/makefile.win
@@ -21,7 +21,16 @@
 
 DEPTH=..\..\..\..
 MODULE=search
-REQUIRES	= xpcom string rdf necko timer pref uconv intl bookmarks
+REQUIRES	= xpcom \
+		  string \
+		  rdf \
+		  necko \
+		  timer \
+		  pref \
+		  uconv \
+		  intl \
+		  bookmarks \
+		  $(NULL)
 
 CPP_OBJS=                                \
  .\$(OBJDIR)\nsLocalSearchService.obj    \
diff --git a/mozilla/xpfe/components/shistory/src/makefile.win b/mozilla/xpfe/components/shistory/src/makefile.win
index 2284b0eafa5..331c25b8f92 100644
--- a/mozilla/xpfe/components/shistory/src/makefile.win
+++ b/mozilla/xpfe/components/shistory/src/makefile.win
@@ -20,7 +20,14 @@
 
 DEPTH=..\..\..\..
 MODULE=shistory
-REQUIRES	= xpcom string necko dom layout docshell pref
+REQUIRES	= xpcom \
+		  string \
+		  necko \
+		  dom \
+		  layout \
+		  docshell \
+		  pref \
+		  $(NULL)
 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 05ae72804fb..1afc25f3172 100644
--- a/mozilla/xpfe/components/timebomb/makefile.win
+++ b/mozilla/xpfe/components/timebomb/makefile.win
@@ -23,7 +23,14 @@
 
 DEPTH         = ..\..\..
 MODULE        = appcomps
-REQUIRES	= xpcom string pref appshell necko webBrowser_core raptor
+REQUIRES	= xpcom \
+		  string \
+		  pref \
+		  appshell \
+		  necko \
+		  webBrowser_core \
+		  raptor \
+		  $(NULL)
 LIBRARY_NAME=timebomb_s
 
 include <$(DEPTH)/config/config.mak>
diff --git a/mozilla/xpfe/components/urlbarhistory/src/makefile.win b/mozilla/xpfe/components/urlbarhistory/src/makefile.win
index 51f53df9513..4cbdfe30c0c 100644
--- a/mozilla/xpfe/components/urlbarhistory/src/makefile.win
+++ b/mozilla/xpfe/components/urlbarhistory/src/makefile.win
@@ -20,7 +20,13 @@
 
 DEPTH=..\..\..\..
 MODULE=urlbarhistory
-REQUIRES	= xpcom string rdf pref necko appcomps
+REQUIRES	= xpcom \
+		  string \
+		  rdf \
+		  pref \
+		  necko \
+		  appcomps \
+		  $(NULL)
 LIBRARY_NAME=urlbarhistory_s
 
 CPP_OBJS=                               \
diff --git a/mozilla/xpfe/components/urlwidget/makefile.win b/mozilla/xpfe/components/urlwidget/makefile.win
index 652596486f3..bf5c255685a 100644
--- a/mozilla/xpfe/components/urlwidget/makefile.win
+++ b/mozilla/xpfe/components/urlwidget/makefile.win
@@ -20,7 +20,13 @@
 # Contributor(s): 
 
 MODULE=appcomps
-REQUIRES=xpcom string docshell dom widget gfx
+REQUIRES	= xpcom \
+		  string \
+		  docshell \
+		  dom \
+		  widget \
+		  gfx \
+		  $(NULL)
 DEPTH=..\..\..
 
 XPIDL_MODULE=urlwidgt
diff --git a/mozilla/xpfe/components/winhooks/makefile.win b/mozilla/xpfe/components/winhooks/makefile.win
index 7a53e0aec3e..ece428c83fb 100644
--- a/mozilla/xpfe/components/winhooks/makefile.win
+++ b/mozilla/xpfe/components/winhooks/makefile.win
@@ -21,7 +21,14 @@
 #   Bill Law    <law@netscape.com>
 
 MODULE=appcomps
-REQUIRES=xpcom string dom windowwatcher intl appshell necko
+REQUIRES	= xpcom \
+		  string \
+		  dom \
+		  windowwatcher \
+		  intl \
+		  appshell \
+		  necko \
+		  $(NULL)
 DEPTH=..\..\..
 
 XPIDL_MODULE=winhooks
diff --git a/mozilla/xpfe/components/xfer/src/makefile.win b/mozilla/xpfe/components/xfer/src/makefile.win
index 3f3f422aecc..deda27f507f 100644
--- a/mozilla/xpfe/components/xfer/src/makefile.win
+++ b/mozilla/xpfe/components/xfer/src/makefile.win
@@ -29,7 +29,15 @@
 #//------------------------------------------------------------------------
 DEPTH = ..\..\..\..
 MODULE		= appcomps
-REQUIRES	= xpcom string necko dom js widget pref intl
+REQUIRES	= xpcom \
+		  string \
+		  necko \
+		  dom \
+		  js \
+		  widget \
+		  pref \
+		  intl \
+		  $(NULL)
 include <$(DEPTH)/config/config.mak>
 #//------------------------------------------------------------------------
 #//
diff --git a/mozilla/xpinstall/cleanup/makefile.win b/mozilla/xpinstall/cleanup/makefile.win
index ddf0e80deda..f629da1637c 100644
--- a/mozilla/xpinstall/cleanup/makefile.win
+++ b/mozilla/xpinstall/cleanup/makefile.win
@@ -26,7 +26,8 @@ MAKE_OBJ_TYPE   = EXE
 USE_NON_MT_LIBS = 1
 
 MODULE          = xpicleanup
-REQUIRES=mozreg
+REQUIRES	= mozreg \
+		  $(NULL)
 PROGRAM         = .\$(OBJDIR)\$(MODULE).exe
 
 OBJS =                                   \
diff --git a/mozilla/xpinstall/src/makefile.win b/mozilla/xpinstall/src/makefile.win
index dae0a1b9bb5..e891af522a9 100644
--- a/mozilla/xpinstall/src/makefile.win
+++ b/mozilla/xpinstall/src/makefile.win
@@ -30,7 +30,29 @@
 
 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
+REQUIRES	= xpcom \
+		  string \
+		  jar \
+		  chrome \
+		  necko \
+		  intl \
+		  locale \
+		  mozreg \
+		  js \
+		  pref \
+		  appshell \
+		  widget \
+		  layout \
+		  uriloader \
+		  xpconnect \
+		  docshell \
+		  dom \
+		  appcomps \
+		  windowwatcher \
+		  zlib \
+		  content \
+		  raptor \
+		  $(NULL)
 
 include <$(DEPTH)/config/config.mak>
 
diff --git a/mozilla/xpinstall/stub/makefile.win b/mozilla/xpinstall/stub/makefile.win
index de43cf63333..ce0e310cf1f 100644
--- a/mozilla/xpinstall/stub/makefile.win
+++ b/mozilla/xpinstall/stub/makefile.win
@@ -23,7 +23,12 @@
 
 DEPTH=..\..
 
-REQUIRES=xpcom string dom appcomps xpinstall
+REQUIRES	= xpcom \
+		  string \
+		  dom \
+		  appcomps \
+		  xpinstall \
+		  $(NULL)
 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 ce1e2558b06..ef40c8af420 100644
--- a/mozilla/xpinstall/wizard/windows/nsztool/makefile.win
+++ b/mozilla/xpinstall/wizard/windows/nsztool/makefile.win
@@ -25,7 +25,8 @@ MAKE_OBJ_TYPE   = EXE
 USE_NON_MT_LIBS = 1
 
 MODULE          = nsztool
-REQUIRES=zlib
+REQUIRES	= zlib \
+		  $(NULL)
 PROGRAM         = .\$(OBJDIR)\$(MODULE).exe
 
 OBJS =                          \
diff --git a/mozilla/xpinstall/wizard/windows/setup/makefile.win b/mozilla/xpinstall/wizard/windows/setup/makefile.win
index 285bccd371d..ad1432f25ef 100644
--- a/mozilla/xpinstall/wizard/windows/setup/makefile.win
+++ b/mozilla/xpinstall/wizard/windows/setup/makefile.win
@@ -26,7 +26,10 @@ MAKE_OBJ_TYPE   = EXE
 USE_NON_MT_LIBS = 1
 
 MODULE          = setup
-REQUIRES=setuprsc uninstall xpnet
+REQUIRES	= setuprsc \
+		  uninstall \
+		  xpnet \
+		  $(NULL)
 PROGRAM         = .\$(OBJDIR)\$(MODULE).exe
 RESFILE         = $(MODULE).res