diff --git a/mozilla/config/dll.inc b/mozilla/config/dll.inc
index 46dcc4f9f0d..e2b7dd1cec7 100644
--- a/mozilla/config/dll.inc
+++ b/mozilla/config/dll.inc
@@ -32,7 +32,7 @@ CONFIG_DLL_INC=1
 #// Rule to build a 16-bit DLL using the DLL target
 #//
 #//------------------------------------------------------------------------
-$(DLL): $(OBJDIR) $(OBJS) $(RESFILE) $(DEFFILE) $(MISCDEP)
+$(DLL): $(OBJDIR) $(OBJS) $(LLIBS) $(RESFILE) $(DEFFILE) $(MISCDEP)
 	echo +++ make: Creating DLL: $@
 #   //
 #   // create response file for the command.  The format is:
@@ -46,7 +46,7 @@ $(DLL): $(OBJDIR) $(OBJS) $(RESFILE) $(DEFFILE) $(MISCDEP)
 !ifdef MAPFILE
         echo $(MAPFILE),                     >> $(CFGFILE)
 !endif
-        echo $(LLIBS) $(OS_LIBS)             >> $(CFGFILE)
+        echo $(LLIBS) $(WIN_LIBS) $(OS_LIBS) >> $(CFGFILE)
 !ifdef DEFFILE
         echo $(DEFFILE),                     >> $(CFGFILE)
 !else
@@ -68,7 +68,7 @@ $(DLL): $(OBJDIR) $(OBJS) $(RESFILE) $(DEFFILE) $(MISCDEP)
 #// Rule to build a 32-bit DLL using the DLL target
 #//
 #//------------------------------------------------------------------------
-$(DLL): $(OBJDIR) $(OBJS) $(RESFILE) $(DEFFILE) $(MISCDEP)
+$(DLL): $(OBJDIR) $(OBJS) $(LLIBS) $(RESFILE) $(DEFFILE) $(MISCDEP)
 	echo +++ make: Creating DLL: $@
     $(LD) @<<$(CFGFILE)
         /NOLOGO /DLL /OUT:$@ 
@@ -83,7 +83,7 @@ $(DLL): $(OBJDIR) $(OBJS) $(RESFILE) $(DEFFILE) $(MISCDEP)
         $(LFLAGS)
         $(OBJS) 
         $(RESFILE)
-        $(LLIBS) $(OS_LIBS)
+        $(LLIBS) $(WIN_LIBS) $(OS_LIBS)
 <<KEEP
 !endif
 
diff --git a/mozilla/config/exe.inc b/mozilla/config/exe.inc
index 66226ffcb1e..4645b51b2ea 100644
--- a/mozilla/config/exe.inc
+++ b/mozilla/config/exe.inc
@@ -32,7 +32,7 @@ CONFIG_EXE_INC=1
 #// Rule to build a 16-bit executable using the PROGRAM target
 #//
 #//------------------------------------------------------------------------
-$(PROGRAM):: $(OBJDIR) $(OBJS) $(RESFILE) $(DEFFILE) $(MISCDEP)
+$(PROGRAM):: $(OBJDIR) $(OBJS) $(LLIBS) $(RESFILE) $(DEFFILE) $(MISCDEP)
 	echo +++ make: Creating EXE: $@
 #   //
 #   // create response file for the command.  The format is:
@@ -43,7 +43,7 @@ $(PROGRAM):: $(OBJDIR) $(OBJS) $(RESFILE) $(DEFFILE) $(MISCDEP)
         echo.                               >> $(CFGFILE)
         echo $(OBJDIR)\$(*B).exe,           >> $(CFGFILE)
         echo $(MAPFILE),                    >> $(CFGFILE)
-        echo $(LLIBS) $(OS_LIBS)            >> $(CFGFILE)
+        echo $(LLIBS) $(WIN_LIBS) $(OS_LIBS)>> $(CFGFILE)
 !ifdef DEFFILE
         echo $(DEFFILE),                    >> $(CFGFILE)
 !else
@@ -65,7 +65,7 @@ $(PROGRAM):: $(OBJDIR) $(OBJS) $(RESFILE) $(DEFFILE) $(MISCDEP)
 #// Rule to build a 32-bit executable using the PROGRAM target
 #//
 #//------------------------------------------------------------------------
-$(PROGRAM):: $(OBJDIR) $(OBJS) $(RESFILE) $(DEFFILE) $(MISCDEP)
+$(PROGRAM):: $(OBJDIR) $(OBJS) $(LLIBS) $(RESFILE) $(DEFFILE) $(MISCDEP)
 	echo +++ make: Creating EXE: $@
     $(LD) @<<$(CFGFILE)
         /NOLOGO /OUT:$@ 
@@ -80,7 +80,7 @@ $(PROGRAM):: $(OBJDIR) $(OBJS) $(RESFILE) $(DEFFILE) $(MISCDEP)
         $(LFLAGS)
         $(OBJS) 
         $(RESFILE)
-        $(LLIBS) $(OS_LIBS)
+        $(LLIBS) $(WIN_LIBS) $(OS_LIBS)
 <<KEEP
 !endif
 
diff --git a/mozilla/config/obj.inc b/mozilla/config/obj.inc
index ba36bddb546..4d7e7fdae85 100644
--- a/mozilla/config/obj.inc
+++ b/mozilla/config/obj.inc
@@ -149,7 +149,7 @@ CONFIG_OBJ_INC=1
         $(OBJDIR)\$(*B).obj,
         $(OBJDIR)\$(*B).exe,
         $(MAPFILE),
-        $(LLIBS) $(OS_LIBS),
+        $(LLIBS) $(WIN_LIBS) $(OS_LIBS),
         $(DEFFILE),
         $(RESFILE),
 <<
@@ -171,6 +171,23 @@ CONFIG_OBJ_INC=1
         -Fe.\$(OBJDIR)\
         $(CURDIR)$(*B).c
 <<KEEP
+
+.cpp{.\$(OBJDIR)\}.exe:
+    $(CC) @<<$(CFGFILE)
+        $(CFLAGS)
+        $(LCFLAGS)
+        $(LINCS)
+        $(LINCS_1)
+        $(INCS)
+        $(LLIBS)
+        $(WIN_LIBS)
+        $(OS_LIBS)
+        -Fd$(PDBFILE)
+        -Fe.\$(OBJDIR)\
+        -Fo.\$(OBJDIR)\
+        $(CURDIR)$(*B).cpp
+<<KEEP
+
 !endif
 
 
diff --git a/mozilla/dom/tools/Makefile.win b/mozilla/dom/tools/Makefile.win
index 396c4687d95..8ba8e3e5918 100644
--- a/mozilla/dom/tools/Makefile.win
+++ b/mozilla/dom/tools/Makefile.win
@@ -42,8 +42,9 @@ OBJS = \
 
 LLIBS= \
  $(DIST)\lib\xpcom.lib	\
- $(LIBNSPR)                     \
-  -SUBSYSTEM:CONSOLE
+ $(LIBNSPR)
+
+LLFLAGS=-SUBSYSTEM:CONSOLE
 
 LINCS= \
   -I$(PUBLIC)\raptor \
diff --git a/mozilla/extensions/wallet/build/makefile.win b/mozilla/extensions/wallet/build/makefile.win
index 090656511e0..e93a1b4fa6b 100644
--- a/mozilla/extensions/wallet/build/makefile.win
+++ b/mozilla/extensions/wallet/build/makefile.win
@@ -30,7 +30,7 @@ CPP_OBJS =                             \
         .\$(OBJDIR)\nsWalletViewerFactory.obj        \
        $(NULL)
 
-OURLIBS =                               \
+LLIBS =                               \
 	$(DIST)\lib\cookieviewer_s.lib  \
         $(DIST)\lib\signonviewer_s.lib  \
         $(DIST)\lib\walletpreview_s.lib \
@@ -38,8 +38,7 @@ OURLIBS =                               \
         $(DIST)\lib\xpcom.lib  \
         $(NULL)
 
-LLIBS =                                \
-        $(OURLIBS)                     \
+WIN_LIBS =                            \
         shell32.lib                    \
 	$(NULL)
 
diff --git a/mozilla/gfx/src/windows/makefile.win b/mozilla/gfx/src/windows/makefile.win
index 6ae30e7ef16..3961f8dec70 100644
--- a/mozilla/gfx/src/windows/makefile.win
+++ b/mozilla/gfx/src/windows/makefile.win
@@ -83,12 +83,16 @@ LLIBS=				\
 !endif
  $(DIST)\lib\raptorgfx_s.lib \
 !if defined(NGLAYOUT_DDRAW)
- ole32.lib \
  $(NGLAYOUT_DDRAW)\lib\ddraw.lib \
 !endif
- comdlg32.lib \
  $(LIBNSPR)  
 
+WIN_LIBS=   \
+!if defined(NGLAYOUT_DDRAW)
+ ole32.lib \
+!endif
+ comdlg32.lib
+
 LLFLAGS = \
 		$(LLFLAGS) \
 		/INCLUDE:_NS_HexToRGB@8 \
diff --git a/mozilla/gfx/tests/btest/makefile.win b/mozilla/gfx/tests/btest/makefile.win
index 57116a20912..4a2b575f6b5 100644
--- a/mozilla/gfx/tests/btest/makefile.win
+++ b/mozilla/gfx/tests/btest/makefile.win
@@ -31,9 +31,10 @@ LLIBS=				\
  $(DIST)\lib\plc3.lib		\
  $(DIST)\lib\img32$(VERSION_NUMBER).lib		\
  $(DIST)\lib\util.lib 		 \
- comdlg32.lib                    \
  $(RESFILE)
 
+WIN_LIBS=comdlg32.lib
+
 include <$(DEPTH)\config\rules.mak>
 
 install:: $(PROGRAMS)
diff --git a/mozilla/htmlparser/robot/test/makefile.win b/mozilla/htmlparser/robot/test/makefile.win
index a6e69218070..430e0161c9a 100644
--- a/mozilla/htmlparser/robot/test/makefile.win
+++ b/mozilla/htmlparser/robot/test/makefile.win
@@ -21,19 +21,14 @@ IGNORE_MANIFEST=1
 MAKE_OBJ_TYPE   = EXE
 PROGRAM = .\$(OBJDIR)\htmlrobot.exe
 
-MISCDEP=			\
+LLIBS=				\
  $(DIST)\lib\DebugRobot.lib	\
  $(DIST)\lib\xpcom.lib	\
  $(NULL)
 
-MYLIBS=				\
- $(DIST)\lib\DebugRobot.lib	\
- $(DIST)\lib\xpcom.lib	\
- $(NULL)
+WIN_LIBS= shell32.lib           
 
-LLIBS= $(MYLIBS)                \
- shell32.lib                    \
- -SUBSYSTEM:CONSOLE
+LLFLAGS=-SUBSYSTEM:CONSOLE
 
 CPPSRCS=			\
  RobotMain.cpp			\
diff --git a/mozilla/htmlparser/tests/grabpage/makefile.win b/mozilla/htmlparser/tests/grabpage/makefile.win
index 2c93fb12124..11f6cb0edd1 100644
--- a/mozilla/htmlparser/tests/grabpage/makefile.win
+++ b/mozilla/htmlparser/tests/grabpage/makefile.win
@@ -36,14 +36,14 @@ LINCS=					\
   -I$(PUBLIC)\xpcom			\
   -I$(PUBLIC)\netlib
 
-MYLIBS=					\
+LLIBS=					\
  $(DIST)\lib\raptorhtmlpars.lib		\
  $(DIST)\lib\netlib.lib			\
  $(DIST)\lib\xpcom.lib	        \
  $(LIBNSPR)				\
  $(NULL)
 
-LLIBS= $(MYLIBS) -SUBSYSTEM:CONSOLE
+LLFLAGS= -SUBSYSTEM:CONSOLE
 
 include <$(DEPTH)\config\rules.mak>
 
diff --git a/mozilla/htmlparser/tests/logparse/makefile.win b/mozilla/htmlparser/tests/logparse/makefile.win
index f95d75c1e9f..bfe785714fb 100644
--- a/mozilla/htmlparser/tests/logparse/makefile.win
+++ b/mozilla/htmlparser/tests/logparse/makefile.win
@@ -35,13 +35,13 @@ LINCS=					\
   -I$(PUBLIC)\xpcom			\
   -I$(PUBLIC)\netlib
 
-MYLIBS=					\
+LLIBS=					\
  $(DIST)\lib\raptorhtmlpars.lib		\
  $(DIST)\lib\xpcom.lib	        \
  $(LIBNSPR)				\
  $(NULL)
 
-LLIBS= $(MYLIBS) -SUBSYSTEM:CONSOLE
+LLFLAGS= -SUBSYSTEM:CONSOLE
 
 include <$(DEPTH)\config\rules.mak>
 
diff --git a/mozilla/intl/uconv/tests/makefile.win b/mozilla/intl/uconv/tests/makefile.win
index 08a8aece53a..74ee11ac70f 100644
--- a/mozilla/intl/uconv/tests/makefile.win
+++ b/mozilla/intl/uconv/tests/makefile.win
@@ -43,8 +43,9 @@ LINCS=  \
 
 LLIBS=				\
  $(DIST)\lib\xpcom.lib	\
- $(DIST)\lib\nspr3.lib \
- -SUBSYSTEM:CONSOLE
+ $(DIST)\lib\nspr3.lib
+
+LLFLAGS= -SUBSYSTEM:CONSOLE
 
 include <$(DEPTH)\config\rules.mak>
 
diff --git a/mozilla/mailnews/base/search/tests/makefile.win b/mozilla/mailnews/base/search/tests/makefile.win
index 36c6c861e3f..82e6ff2f970 100644
--- a/mozilla/mailnews/base/search/tests/makefile.win
+++ b/mozilla/mailnews/base/search/tests/makefile.win
@@ -36,7 +36,7 @@ LINCS= \
 	-I$(PUBLIC)\js \
 	-I$(PUBLIC)\rdf
 
-MYLIBS=							\
+LLIBS=							\
  $(DIST)\lib\xpcom32.lib		\
  $(LIBNSPR)						\
  $(DIST)\lib\raptorbase.lib		\
@@ -47,8 +47,7 @@ MYLIBS=							\
  $(DIST)\lib\xplib.lib			\
  $(NULL)
 
-LLIBS= $(MYLIBS)				\
- -SUBSYSTEM:CONSOLE 
+LLFLAGS= -SUBSYSTEM:CONSOLE 
 
 include <$(DEPTH)\config\rules.mak>
 
diff --git a/mozilla/mailnews/base/tests/makefile.win b/mozilla/mailnews/base/tests/makefile.win
index 83d33ed4642..adc48eeac57 100644
--- a/mozilla/mailnews/base/tests/makefile.win
+++ b/mozilla/mailnews/base/tests/makefile.win
@@ -67,8 +67,8 @@ PROGRAM=.\$(OBJDIR)\$(EXENAME).EXE
 #//
 #//------------------------------------------------------------------------
 LCFLAGS=-DNETSCAPE
-LLIBS=	 $(LLIBS) ole32.lib	\
-	 $(DIST)\lib\xpcom.lib
+WIN_LIBS= ole32.lib
+LLIBS= $(DIST)\lib\xpcom.lib
 	
 
 LINCS=$(LINCS)  -I. \
diff --git a/mozilla/mailnews/compose/tests/compose/makefile.win b/mozilla/mailnews/compose/tests/compose/makefile.win
index d01944227f8..80458bfef46 100644
--- a/mozilla/mailnews/compose/tests/compose/makefile.win
+++ b/mozilla/mailnews/compose/tests/compose/makefile.win
@@ -66,9 +66,9 @@ PROGRAM=.\$(OBJDIR)\$(EXENAME).EXE
 #//
 #//------------------------------------------------------------------------
 LCFLAGS=-DNETSCAPE
-LLIBS=	 $(LLIBS) ole32.lib	\
+WIN_LIBS= ole32.lib
+LLIBS=  \
 	 $(DIST)\lib\xpcom.lib \
-	 $(DIST)\lib\plc3.lib \
 	 $(LIBNSPR)		\
 
 # clobber and clobber_all will remove the following garbage:
diff --git a/mozilla/mailnews/compose/tests/compose2/makefile.win b/mozilla/mailnews/compose/tests/compose2/makefile.win
index 29043ccc3ba..46e2b637e52 100644
--- a/mozilla/mailnews/compose/tests/compose2/makefile.win
+++ b/mozilla/mailnews/compose/tests/compose2/makefile.win
@@ -66,9 +66,9 @@ PROGRAM=.\$(OBJDIR)\$(EXENAME).EXE
 #//
 #//------------------------------------------------------------------------
 LCFLAGS=-DNETSCAPE
-LLIBS=	 $(LLIBS) ole32.lib	\
+WIN_LIBS= ole32.lib
+LLIBS=  \
 	 $(DIST)\lib\xpcom.lib \
-	 $(DIST)\lib\plc3.lib \
 	 $(LIBNSPR)		\
 
 # clobber and clobber_all will remove the following garbage:
diff --git a/mozilla/mailnews/compose/tests/sendlater/makefile.win b/mozilla/mailnews/compose/tests/sendlater/makefile.win
index 2ede00981d6..bbd296bc75e 100644
--- a/mozilla/mailnews/compose/tests/sendlater/makefile.win
+++ b/mozilla/mailnews/compose/tests/sendlater/makefile.win
@@ -66,9 +66,9 @@ PROGRAM=.\$(OBJDIR)\$(EXENAME).EXE
 #//
 #//------------------------------------------------------------------------
 LCFLAGS=-DNETSCAPE
-LLIBS=	 $(LLIBS) ole32.lib	\
+WIN_LIBS= ole32.lib
+LLIBS=  \
 	 $(DIST)\lib\xpcom.lib \
-	 $(DIST)\lib\plc3.lib \
 	 $(LIBNSPR)		\
 
 # clobber and clobber_all will remove the following garbage:
diff --git a/mozilla/mailnews/compose/tests/sendpage/makefile.win b/mozilla/mailnews/compose/tests/sendpage/makefile.win
index 32e1ab47cff..1c9350f9bc9 100644
--- a/mozilla/mailnews/compose/tests/sendpage/makefile.win
+++ b/mozilla/mailnews/compose/tests/sendpage/makefile.win
@@ -66,9 +66,9 @@ PROGRAM=.\$(OBJDIR)\$(EXENAME).EXE
 #//
 #//------------------------------------------------------------------------
 LCFLAGS=-DNETSCAPE
-LLIBS=	 $(LLIBS) ole32.lib	\
+WIN_LIBS= ole32.lib
+LLIBS= \
 	 $(DIST)\lib\xpcom.lib \
-	 $(DIST)\lib\plc3.lib \
 	 $(LIBNSPR)		\
 
 # clobber and clobber_all will remove the following garbage:
diff --git a/mozilla/mailnews/compose/tests/smtp/makefile.win b/mozilla/mailnews/compose/tests/smtp/makefile.win
index d2ea9902863..1340679d827 100644
--- a/mozilla/mailnews/compose/tests/smtp/makefile.win
+++ b/mozilla/mailnews/compose/tests/smtp/makefile.win
@@ -24,7 +24,7 @@ OBJS =                          \
 	.\$(OBJDIR)\smtpTest.obj    \
 	$(NULL)
 
-MYLIBS=							\
+LLIBS=							\
  $(DIST)\lib\xpcom.lib		\
  $(LIBNSPR)						\
  $(DIST)\lib\raptorgfxwin.lib	\
@@ -34,8 +34,7 @@ MYLIBS=							\
  $(DIST)\lib\xplib.lib			\
  $(NULL)
 
-LLIBS= $(MYLIBS)				\
- -SUBSYSTEM:CONSOLE 
+LLFLAGS=-SUBSYSTEM:CONSOLE 
 
 include <$(DEPTH)\config\rules.mak>
 
diff --git a/mozilla/mailnews/imap/tests/harness/makefile.win b/mozilla/mailnews/imap/tests/harness/makefile.win
index 83d2f63cf0b..cee82473748 100644
--- a/mozilla/mailnews/imap/tests/harness/makefile.win
+++ b/mozilla/mailnews/imap/tests/harness/makefile.win
@@ -64,7 +64,9 @@ PROGRAM=.\$(OBJDIR)\$(EXENAME).EXE
 #//
 #//------------------------------------------------------------------------
 LCFLAGS=-DNETSCAPE
-LLIBS=	 $(LLIBS) ole32.lib	\
+WIN_LIBS= ole32.lib
+
+LLIBS = \
 		$(LIBNSPR)\
  		$(DIST)\lib\plc3.lib                   \
 		$(DIST)\lib\msgbaseutil.lib	\
diff --git a/mozilla/mailnews/local/tests/mailbox/makefile.win b/mozilla/mailnews/local/tests/mailbox/makefile.win
index a2ab178438b..6b06a1052ac 100644
--- a/mozilla/mailnews/local/tests/mailbox/makefile.win
+++ b/mozilla/mailnews/local/tests/mailbox/makefile.win
@@ -37,7 +37,7 @@ LINCS=  -I$(PUBLIC)\raptor					\
 		-I$(PUBLIC)\rdf						\
 		-I$(PUBLIC)\js						\
 
-MYLIBS=							\
+LLIBS=							\
  $(DIST)\lib\xpcom.lib		\
  $(LIBNSPR)						\
  $(DIST)\lib\raptorgfxwin.lib	\
@@ -49,8 +49,7 @@ MYLIBS=							\
  $(DIST)\lib\mork.lib			\
  $(NULL)
 
-LLIBS= $(MYLIBS)				\
- -SUBSYSTEM:CONSOLE 
+LLFLAGS= -SUBSYSTEM:CONSOLE 
 
 include <$(DEPTH)\config\rules.mak>
 
diff --git a/mozilla/mailnews/local/tests/mboxParser/makefile.win b/mozilla/mailnews/local/tests/mboxParser/makefile.win
index d20c320a9be..28893ba20c5 100644
--- a/mozilla/mailnews/local/tests/mboxParser/makefile.win
+++ b/mozilla/mailnews/local/tests/mboxParser/makefile.win
@@ -35,7 +35,7 @@ LINCS= \
 	-I$(PUBLIC)\pref \
 	-I$(PUBLIC)\rdf
 
-MYLIBS=							\
+LLIBS=							\
  $(DIST)\lib\xpcom.lib		\
  $(LIBNSPR)						\
  $(DIST)\lib\raptorgfxwin.lib	\
@@ -48,8 +48,7 @@ MYLIBS=							\
  $(DIST)\lib\xplib.lib			\
  $(NULL)
 
-LLIBS= $(MYLIBS)				\
- -SUBSYSTEM:CONSOLE 
+LLFLAGS= -SUBSYSTEM:CONSOLE 
 
 include <$(DEPTH)\config\rules.mak>
 
diff --git a/mozilla/mailnews/local/tests/pop3/makefile.win b/mozilla/mailnews/local/tests/pop3/makefile.win
index eaa443a3e9d..3ac8bff3fb1 100644
--- a/mozilla/mailnews/local/tests/pop3/makefile.win
+++ b/mozilla/mailnews/local/tests/pop3/makefile.win
@@ -24,7 +24,7 @@ OBJS =                          \
 	.\$(OBJDIR)\pop3Test.obj    \
 	$(NULL)
 
-MYLIBS=							\
+LLIBS=							\
  $(DIST)\lib\xpcom.lib		\
  $(LIBNSPR)						\
  $(DIST)\lib\raptorgfxwin.lib	\
@@ -36,8 +36,7 @@ MYLIBS=							\
  $(DIST)\lib\xplib.lib			\
  $(NULL)
 
-LLIBS= $(MYLIBS)				\
- -SUBSYSTEM:CONSOLE 
+LLFLAGS= -SUBSYSTEM:CONSOLE 
 
 include <$(DEPTH)\config\rules.mak>
 
diff --git a/mozilla/mailnews/mime/tests/xpcomtest/makefile.win b/mozilla/mailnews/mime/tests/xpcomtest/makefile.win
index 97bd786d80a..9b6da7fa5ea 100644
--- a/mozilla/mailnews/mime/tests/xpcomtest/makefile.win
+++ b/mozilla/mailnews/mime/tests/xpcomtest/makefile.win
@@ -69,8 +69,8 @@ PROGRAM=.\$(OBJDIR)\$(EXENAME).EXE
 #//
 #//------------------------------------------------------------------------
 LCFLAGS=-DNETSCAPE
-LLIBS=	 $(LLIBS) ole32.lib	\
-        	 $(DIST)\lib\xpcom.lib
+WIN_LIBS= ole32.lib
+LLIBS= $(DIST)\lib\xpcom.lib
 	
 # clobber and clobber_all will remove the following garbage:
 GARBAGE	= $(GARBAGE) _gen
diff --git a/mozilla/mailnews/news/tests/newsParser/makefile.win b/mozilla/mailnews/news/tests/newsParser/makefile.win
index f715e530e1a..6616dc1e011 100644
--- a/mozilla/mailnews/news/tests/newsParser/makefile.win
+++ b/mozilla/mailnews/news/tests/newsParser/makefile.win
@@ -24,7 +24,7 @@ OBJS =                          \
 	.\$(OBJDIR)\newsParserTest.obj    \
 	$(NULL)
 
-MYLIBS=							\
+LLIBS=							\
  $(DIST)\lib\xpcom.lib		\
  $(LIBNSPR)						\
  $(DIST)\lib\raptorgfxwin.lib	\
@@ -37,8 +37,7 @@ MYLIBS=							\
  $(DIST)\lib\xplib.lib			\
  $(NULL)
 
-LLIBS= $(MYLIBS)				\
- -SUBSYSTEM:CONSOLE 
+LLFLAGS=-SUBSYSTEM:CONSOLE 
 
 include <$(DEPTH)\config\rules.mak>
 
diff --git a/mozilla/mailnews/news/tests/nntp/makefile.win b/mozilla/mailnews/news/tests/nntp/makefile.win
index 42fb19ea8b3..e3eda84650b 100644
--- a/mozilla/mailnews/news/tests/nntp/makefile.win
+++ b/mozilla/mailnews/news/tests/nntp/makefile.win
@@ -24,7 +24,7 @@ OBJS =                          \
 	.\$(OBJDIR)\nntpTest.obj    \
 	$(NULL)
 
-MYLIBS=							\
+LLIBS=							\
  $(DIST)\lib\xpcom.lib		\
  $(LIBNSPR)						\
  $(DIST)\lib\raptorgfxwin.lib	\
@@ -36,8 +36,7 @@ MYLIBS=							\
  $(DIST)\lib\xplib.lib			\
  $(NULL)
 
-LLIBS= $(MYLIBS)				\
- -SUBSYSTEM:CONSOLE 
+LLFLAGS=-SUBSYSTEM:CONSOLE 
 
 include <$(DEPTH)\config\rules.mak>
 
diff --git a/mozilla/modules/plugin/base/src/makefile.win b/mozilla/modules/plugin/base/src/makefile.win
index 57f50faac2b..3fc512d5a33 100644
--- a/mozilla/modules/plugin/base/src/makefile.win
+++ b/mozilla/modules/plugin/base/src/makefile.win
@@ -26,7 +26,6 @@ EXPORTS =	\
 MAKE_OBJ_TYPE	= DLL
 DLLNAME = raptorplugin
 DLL=.\$(OBJDIR)\$(DLLNAME).dll
-MISCDEP = $(OURLIBS)
 
 MODULE=raptor 
 
@@ -70,7 +69,7 @@ CACHELIBNAME=cache.lib
 CACHELIBNAME=netcache.lib
 !endif
 
-OURLIBS = \
+LLIBS = \
  $(DIST)\lib\xpcom.lib \
  $(DIST)\lib\plc3.lib \
 !ifdef NECKO
@@ -83,8 +82,7 @@ OURLIBS = \
  $(DIST)\lib\dbm32.lib \
  $(LIBNSPR)  
 
-LLIBS = \
-  $(OURLIBS) \
+WIN_LIBS = \
   version.lib
 
 include <$(DEPTH)\config\rules.mak>
diff --git a/mozilla/modules/plugin/nglsrc/makefile.win b/mozilla/modules/plugin/nglsrc/makefile.win
index 57f50faac2b..3fc512d5a33 100644
--- a/mozilla/modules/plugin/nglsrc/makefile.win
+++ b/mozilla/modules/plugin/nglsrc/makefile.win
@@ -26,7 +26,6 @@ EXPORTS =	\
 MAKE_OBJ_TYPE	= DLL
 DLLNAME = raptorplugin
 DLL=.\$(OBJDIR)\$(DLLNAME).dll
-MISCDEP = $(OURLIBS)
 
 MODULE=raptor 
 
@@ -70,7 +69,7 @@ CACHELIBNAME=cache.lib
 CACHELIBNAME=netcache.lib
 !endif
 
-OURLIBS = \
+LLIBS = \
  $(DIST)\lib\xpcom.lib \
  $(DIST)\lib\plc3.lib \
 !ifdef NECKO
@@ -83,8 +82,7 @@ OURLIBS = \
  $(DIST)\lib\dbm32.lib \
  $(LIBNSPR)  
 
-LLIBS = \
-  $(OURLIBS) \
+WIN_LIBS = \
   version.lib
 
 include <$(DEPTH)\config\rules.mak>
diff --git a/mozilla/parser/htmlparser/robot/test/makefile.win b/mozilla/parser/htmlparser/robot/test/makefile.win
index a6e69218070..430e0161c9a 100644
--- a/mozilla/parser/htmlparser/robot/test/makefile.win
+++ b/mozilla/parser/htmlparser/robot/test/makefile.win
@@ -21,19 +21,14 @@ IGNORE_MANIFEST=1
 MAKE_OBJ_TYPE   = EXE
 PROGRAM = .\$(OBJDIR)\htmlrobot.exe
 
-MISCDEP=			\
+LLIBS=				\
  $(DIST)\lib\DebugRobot.lib	\
  $(DIST)\lib\xpcom.lib	\
  $(NULL)
 
-MYLIBS=				\
- $(DIST)\lib\DebugRobot.lib	\
- $(DIST)\lib\xpcom.lib	\
- $(NULL)
+WIN_LIBS= shell32.lib           
 
-LLIBS= $(MYLIBS)                \
- shell32.lib                    \
- -SUBSYSTEM:CONSOLE
+LLFLAGS=-SUBSYSTEM:CONSOLE
 
 CPPSRCS=			\
  RobotMain.cpp			\
diff --git a/mozilla/parser/htmlparser/tests/grabpage/makefile.win b/mozilla/parser/htmlparser/tests/grabpage/makefile.win
index 2c93fb12124..11f6cb0edd1 100644
--- a/mozilla/parser/htmlparser/tests/grabpage/makefile.win
+++ b/mozilla/parser/htmlparser/tests/grabpage/makefile.win
@@ -36,14 +36,14 @@ LINCS=					\
   -I$(PUBLIC)\xpcom			\
   -I$(PUBLIC)\netlib
 
-MYLIBS=					\
+LLIBS=					\
  $(DIST)\lib\raptorhtmlpars.lib		\
  $(DIST)\lib\netlib.lib			\
  $(DIST)\lib\xpcom.lib	        \
  $(LIBNSPR)				\
  $(NULL)
 
-LLIBS= $(MYLIBS) -SUBSYSTEM:CONSOLE
+LLFLAGS= -SUBSYSTEM:CONSOLE
 
 include <$(DEPTH)\config\rules.mak>
 
diff --git a/mozilla/parser/htmlparser/tests/logparse/makefile.win b/mozilla/parser/htmlparser/tests/logparse/makefile.win
index f95d75c1e9f..bfe785714fb 100644
--- a/mozilla/parser/htmlparser/tests/logparse/makefile.win
+++ b/mozilla/parser/htmlparser/tests/logparse/makefile.win
@@ -35,13 +35,13 @@ LINCS=					\
   -I$(PUBLIC)\xpcom			\
   -I$(PUBLIC)\netlib
 
-MYLIBS=					\
+LLIBS=					\
  $(DIST)\lib\raptorhtmlpars.lib		\
  $(DIST)\lib\xpcom.lib	        \
  $(LIBNSPR)				\
  $(NULL)
 
-LLIBS= $(MYLIBS) -SUBSYSTEM:CONSOLE
+LLFLAGS= -SUBSYSTEM:CONSOLE
 
 include <$(DEPTH)\config\rules.mak>
 
diff --git a/mozilla/webshell/embed/ActiveX/makefile.win b/mozilla/webshell/embed/ActiveX/makefile.win
index 9b7715e1e92..90c3ba748da 100644
--- a/mozilla/webshell/embed/ActiveX/makefile.win
+++ b/mozilla/webshell/embed/ActiveX/makefile.win
@@ -93,7 +93,7 @@ LINCS=  \
   -I$(PUBLIC)\profile \
   $(NULL) 
 
-MYLIBS=                         \
+LLIBS=                         \
 !ifdef MOZ_ACTIVEX_CONTROL_SUPPORT
  $(DIST)\lib\raptorgfxwin.lib   \
  $(DIST)\lib\raptorweb.lib      \
@@ -102,16 +102,17 @@ MYLIBS=                         \
 !endif
  $(NULL)
 
-LLIBS = $(MYLIBS)               \
+WIN_LIBS = \
  comdlg32.lib                   \
  ole32.lib                      \
  oleaut32.lib                   \
  uuid.lib                       \
  shell32.lib                    \
- -SUBSYSTEM:windows
+ $(NULL)
+
 
 LCFLAGS = /D "WIN32" /GX /FR /U "ClientWallet"
-LFLAGS = /DLL
+LLFLAGS = -SUBSYSTEM:windows /DLL
 
 include <$(DEPTH)\config\rules.mak>
 
diff --git a/mozilla/webshell/embed/ngprefs/win/makefile.win b/mozilla/webshell/embed/ngprefs/win/makefile.win
index b608bbc9a2c..b8a98c15b79 100644
--- a/mozilla/webshell/embed/ngprefs/win/makefile.win
+++ b/mozilla/webshell/embed/ngprefs/win/makefile.win
@@ -31,11 +31,14 @@ LINCS = \
 
 LLIBS = \
 	$(LIBNSPR)			\
-	$(DIST)\lib\plc3.lib	\
 	$(DIST)\lib\xppref32.lib	\
+	$(NULL)
+
+WIN_LIBS=   \
 	OLE32.lib			\
 	UUID.lib			\
-	$(NULL)
+    $(NULL)
+
 
 LIBNAME = .\$(OBJDIR)\ngprefs
 DLL = $(LIBNAME).dll
diff --git a/mozilla/webshell/src/makefile.win b/mozilla/webshell/src/makefile.win
index 25b7583cee1..220dc4bbc8f 100644
--- a/mozilla/webshell/src/makefile.win
+++ b/mozilla/webshell/src/makefile.win
@@ -82,8 +82,9 @@ LLIBS=				\
 !else
  $(DIST)\lib\netlib.lib       \
 !endif
- $(LIBNSPR)                   \
- OLE32.LIB
+ $(LIBNSPR)
+
+WIN_LIBS= OLE32.LIB
 
 include <$(DEPTH)\config\rules.mak>
 
diff --git a/mozilla/webshell/tests/ComFactory/makefile.win b/mozilla/webshell/tests/ComFactory/makefile.win
index fd19d346bb0..527fc4e4f41 100644
--- a/mozilla/webshell/tests/ComFactory/makefile.win
+++ b/mozilla/webshell/tests/ComFactory/makefile.win
@@ -68,7 +68,7 @@ PROGRAM=.\$(OBJDIR)\$(EXENAME).EXE
 #//
 #//------------------------------------------------------------------------
 LCFLAGS=-DNETSCAPE
-LLIBS=$(LLIBS) ole32.lib	
+WIN_LIBS=ole32.lib	
 
 LINCS=$(LINCS)  -I. \
                 -I$(PUBLIC)\raptor   \
diff --git a/mozilla/webshell/tests/imgtest/makefile.win b/mozilla/webshell/tests/imgtest/makefile.win
index 808d1dbe951..7f724e0ed10 100644
--- a/mozilla/webshell/tests/imgtest/makefile.win
+++ b/mozilla/webshell/tests/imgtest/makefile.win
@@ -36,8 +36,9 @@ LLIBS=				\
  $(LIBNSPR)			\
  $(DIST)\lib\plc3.lib		\
  $(DIST)\lib\img32$(VERSION_NUMBER).lib		\
- $(DIST)\lib\util.lib 		 \
- comdlg32.lib                 
+ $(DIST)\lib\util.lib
+
+WIN_LIBS= comdlg32.lib                 
 
 include <$(DEPTH)\config\rules.mak>
 
diff --git a/mozilla/webshell/tests/viewer/makefile.win b/mozilla/webshell/tests/viewer/makefile.win
index df4357fea3a..b5f1e55b22d 100644
--- a/mozilla/webshell/tests/viewer/makefile.win
+++ b/mozilla/webshell/tests/viewer/makefile.win
@@ -84,7 +84,7 @@ LINCS=  \
   -I$(PUBLIC)\caps \
   $(NULL)
 
-MYLIBS=                         \
+LLIBS=                         \
  $(DIST)\lib\raptorgfxwin.lib   \
  $(DIST)\lib\raptorhtml.lib     \
  $(DIST)\lib\raptorweb.lib      \
@@ -101,18 +101,19 @@ MYLIBS=                         \
  $(DIST)\lib\netlib.lib \
 !endif
  $(DIST)\lib\jsdom.lib          \
- comdlg32.lib                   \
-!if defined(NGPREFS)
- ole32.lib                      \
-!endif
 !ifdef MOZ_FULLCIRCLE
  $(MOZ_TOOLS)\lib\fulls32.lib \
 !endif
  $(NULL)
 
-LLIBS= $(MYLIBS)                \
- shell32.lib                     \
- -SUBSYSTEM:CONSOLE
+WIN_LIBS= \
+  shell32.lib               \
+!if defined(NGPREFS)
+  ole32.lib                  \
+!endif
+  comdlg32.lib
+
+LLFLAGS=-SUBSYSTEM:CONSOLE
 
 include <$(DEPTH)\config\rules.mak>
 
diff --git a/mozilla/widget/src/build/makefile.win b/mozilla/widget/src/build/makefile.win
index 75b5356c034..ea47d3bbbe3 100644
--- a/mozilla/widget/src/build/makefile.win
+++ b/mozilla/widget/src/build/makefile.win
@@ -53,13 +53,15 @@ LCFLAGS =                               \
 	-D_IMPL_NS_WIDGET               \
 	$(NULL)
 
-LLIBS=                                  \
+WIN_LIBS=                               \
  comctl32.lib                           \
  comdlg32.lib                           \
  imm32.lib								\
  Uuid.lib								\
  ole32.lib								\
- shell32.lib                           \
+ shell32.lib
+
+LLIBS= \
  $(DIST)\lib\xpcom.lib                \
  $(DIST)\lib\raptorhtmlpars.lib		\
  $(DIST)\lib\raptorgfxwin.lib           \
diff --git a/mozilla/widget/src/windows/makefile.win b/mozilla/widget/src/windows/makefile.win
index fcd93fa39ef..9d7a04480f3 100644
--- a/mozilla/widget/src/windows/makefile.win
+++ b/mozilla/widget/src/windows/makefile.win
@@ -108,7 +108,7 @@ LCFLAGS =                               \
   $(DEFINES) \
 	$(NULL)
 
-LLIBS=                                  \
+WIN_LIBS=                        \
  ole32.lib                           
 
 include <$(DEPTH)\config\rules.mak>
diff --git a/mozilla/widget/tests/scribble/makefile.win b/mozilla/widget/tests/scribble/makefile.win
index 6bff4403365..e4f3e33e655 100644
--- a/mozilla/widget/tests/scribble/makefile.win
+++ b/mozilla/widget/tests/scribble/makefile.win
@@ -30,7 +30,7 @@ OBJS =                                  \
 
 LINCS=-I$(PUBLIC)\raptor -I$(PUBLIC)\xpcom 
 
-MYLIBS=				\
+LLIBS=				\
  $(DIST)\lib\xpcom.lib	\
  $(LIBNSPR)			\
  $(DIST)\lib\raptorgfxwin.lib \
@@ -41,8 +41,7 @@ MYLIBS=				\
 !endif
  $(NULL)
 
-LLIBS= $(MYLIBS)		\
- -SUBSYSTEM:CONSOLE 
+LLFLAGS=-SUBSYSTEM:CONSOLE 
 
 include <$(DEPTH)\config\rules.mak>
 
diff --git a/mozilla/widget/tests/widget/makefile.win b/mozilla/widget/tests/widget/makefile.win
index 73f0694f6aa..6f11b6eb707 100644
--- a/mozilla/widget/tests/widget/makefile.win
+++ b/mozilla/widget/tests/widget/makefile.win
@@ -29,15 +29,14 @@ OBJS =  \
 LINCS=-I$(PUBLIC)\raptor \
       -I$(PUBLIC)\xpcom -I\ns\raptor\ui\src\windows
 
-MYLIBS=                         \
+LLIBS=                         \
  $(DIST)\lib\xpcom.lib        \
  $(LIBNSPR)                     \
  $(DIST)\lib\raptorwidget.lib   \
  $(DIST)\lib\raptorgfxwin.lib   \
  $(NULL)
 
-LLIBS= $(MYLIBS)                \
- -SUBSYSTEM:CONSOLE 
+LLFLAGS=-SUBSYSTEM:CONSOLE 
 
 include <$(DEPTH)\config\rules.mak>
 
diff --git a/mozilla/xpcom/build/makefile.win b/mozilla/xpcom/build/makefile.win
index c1c2c3f22a9..99ba1a82796 100644
--- a/mozilla/xpcom/build/makefile.win
+++ b/mozilla/xpcom/build/makefile.win
@@ -24,7 +24,7 @@ LIBNAME = .\$(OBJDIR)\xpcom
 DLL = $(LIBNAME).dll
 
 LINCS =                          \
-	-I$(PUBLIC)\xpcom        \
+        -I$(PUBLIC)\xpcom        \
         -I..\base                \
         -I..\ds                  \
         -I..\io                  \
@@ -51,31 +51,33 @@ CPP_OBJS =                             \
 !endif
 
 OURLIBS =                              \
-	$(LIBNSPR)                     \
-	$(DIST)\lib\plc3.lib           \
+        $(LIBNSPR)                     \
         $(DIST)\lib\xpcombase_s.lib    \
         $(DIST)\lib\xpcomds_s.lib      \
         $(DIST)\lib\xpcomio_s.lib      \
         $(DIST)\lib\xpcomcomp_s.lib    \
         $(DIST)\lib\xpcomthreads_s.lib \
         $(DIST)\lib\xpcomxpt_s.lib     \
-	$(DIST)\lib\xpcomxptcall_s.lib \
-	$(DIST)\lib\xpcomxptcmd_s.lib  \
+        $(DIST)\lib\xpcomxptcall_s.lib \
+        $(DIST)\lib\xpcomxptcmd_s.lib  \
         $(DIST)\lib\xpcomxptinfo_s.lib \
         $(DIST)\lib\xpcomproxy_s.lib   \
-	$(DIST)\lib\libreg32.lib       \
-	$(NULL)
+        $(DIST)\lib\libreg32.lib       \
+        $(NULL)
 
 LLIBS =                                \
         $(OURLIBS)                     \
-        shell32.lib                    \
 !if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
-	$(GLOWDIR)\glowcode.lib        \
+        $(GLOWDIR)\glowcode.lib        \
 !endif
+        $(NULL)
+
+WIN_LIBS =                             \
+        shell32.lib                    \
 !if defined(MOZ_TRACE_XPCOM_REFCNT)
-	imagehlp.lib                   \
-!endif	
-	$(NULL)
+        imagehlp.lib                   \
+!endif
+        $(NULL)
 
 MISCDEP=$(OURLIBS)
 
diff --git a/mozilla/xpcom/tools/windows/makefile.win b/mozilla/xpcom/tools/windows/makefile.win
index c06158edd32..ef192c6cd6f 100644
--- a/mozilla/xpcom/tools/windows/makefile.win
+++ b/mozilla/xpcom/tools/windows/makefile.win
@@ -23,7 +23,7 @@ MAKE_OBJ_TYPE	= EXE
 PROG1 = .\$(OBJDIR)\rebasedlls.exe
 PROGRAMS = $(PROG1)
 
-LLIBS= imagehlp.lib
+WIN_LIBS= imagehlp.lib
 !if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
 LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib
 !endif
diff --git a/mozilla/xpcom/typelib/xpidl/makefile.win b/mozilla/xpcom/typelib/xpidl/makefile.win
index 4c4fb24ac1c..bf2b5744658 100644
--- a/mozilla/xpcom/typelib/xpidl/makefile.win
+++ b/mozilla/xpcom/typelib/xpidl/makefile.win
@@ -41,14 +41,13 @@ LCFLAGS = -DEXPORT_XPT_API
 
 MYDIR=C:\USR\LOCAL
 
-MYLIBS=                         \
+LLIBS=                         \
  $(DIST)\lib\xpcomxpt_s.lib		\
  $(MOZ_TOOLS)\lib\glib-1.2.lib		\
  $(MOZ_TOOLS)\lib\libidl-0.6.lib	\
  $(NULL)
 
-LLIBS= $(MYLIBS)                \
- -SUBSYSTEM:CONSOLE 
+LLFLAGS= $(LLFLAGS) -SUBSYSTEM:CONSOLE 
 
 include <$(DEPTH)\config\rules.mak>