diff --git a/content/build/makefile.win b/content/build/makefile.win
index aa949351a0f..cd03e78238f 100644
--- a/content/build/makefile.win
+++ b/content/build/makefile.win
@@ -89,6 +89,7 @@ LLIBS=\
  $(DIST)\lib\xpcom.lib		        \
  $(DIST)\lib\gkgfx.lib			\
  $(DIST)\lib\timer_s.lib                \
+ $(DIST)\lib\unicharutil_s.lib \
  $(DIST)\lib\js32$(VERSION_NUMBER).lib	\
 !if defined(MOZ_PERF)
  $(DIST)\lib\util.lib		        \
diff --git a/editor/libeditor/build/makefile.win b/editor/libeditor/build/makefile.win
index e5ac8423f85..baa70aefd33 100644
--- a/editor/libeditor/build/makefile.win
+++ b/editor/libeditor/build/makefile.win
@@ -133,6 +133,7 @@ LLIBS =                                  \
 LLIBS =                                  \
         $(LLIBS)                         \
         $(DIST)\lib\xpcom.lib            \
+		$(DIST)\lib\unicharutil_s.lib    \
         $(DIST)\lib\js3250.lib	\
         $(DIST)\lib\gkgfx.lib		\
         $(LIBNSPR)                       \
diff --git a/gfx/src/makefile.win b/gfx/src/makefile.win
index 2fd958eec91..410271f6ff3 100644
--- a/gfx/src/makefile.win
+++ b/gfx/src/makefile.win
@@ -40,6 +40,7 @@ REQUIRES= 	xpcom \
             mimetype \
             content \
 			layout \
+			unicharutil \
 			$(NULL)
 
 include <$(DEPTH)\config\config.mak>
@@ -73,6 +74,7 @@ LCFLAGS = \
 LLIBS=				                \
         $(DIST)\lib\util.lib                    \
         $(DIST)\lib\xpcom.lib	                \
+		$(DIST)\lib\unicharutil_s.lib			\
         $(LIBNSPR)  
 
 include <$(DEPTH)\config\rules.mak>
diff --git a/intl/chardet/tools/makefile.win b/intl/chardet/tools/makefile.win
index e81cd64e5d5..ecfa7c4b5e2 100644
--- a/intl/chardet/tools/makefile.win
+++ b/intl/chardet/tools/makefile.win
@@ -28,7 +28,11 @@ PROG1 = .\$(OBJDIR)\GenCyrillicClass.exe
 PROGRAMS = $(PROG1)
 
 LCFLAGS=-DUSE_NSREG
-
+REQUIRES=\
+	xpcom \
+	string \
+	unicharutil \
+	uconv
 
 LLIBS= \
  $(DIST)\lib\xpcom.lib \
diff --git a/layout/build/makefile.win b/layout/build/makefile.win
index 493dd0fb877..e3c83966bfd 100644
--- a/layout/build/makefile.win
+++ b/layout/build/makefile.win
@@ -92,6 +92,7 @@ LLIBS=					\
  $(DIST)\lib\xpcom.lib		\
  $(DIST)\lib\gkgfx.lib		\
  $(DIST)\lib\timer_s.lib \
+ $(DIST)\lib\unicharutil_s.lib \
  $(DIST)\lib\js32$(VERSION_NUMBER).lib	\
 !if defined(MOZ_PERF)
  $(DIST)\lib\util.lib		        \
diff --git a/layout/html/style/src/makefile.win b/layout/html/style/src/makefile.win
index f16f3d289ac..7992205986f 100644
--- a/layout/html/style/src/makefile.win
+++ b/layout/html/style/src/makefile.win
@@ -42,8 +42,12 @@ REQUIRES	= xpcom \
 		  gfx \
 		  content \
 		  layout_xul \
+!ifdef MOZ_SVG
+              raptor \
+!endif
 		  $(NULL)
 
+
 DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
 
 EXPORTS =                               \
diff --git a/mailnews/addrbook/build/makefile.win b/mailnews/addrbook/build/makefile.win
index 28f538100e2..17ec7da770a 100644
--- a/mailnews/addrbook/build/makefile.win
+++ b/mailnews/addrbook/build/makefile.win
@@ -40,7 +40,6 @@ REQUIRES	= xpcom \
 		  locale \
 		  mork \
 		  appcomps \
-		  raptor \
 		  mozldap \
 		  $(NULL)
 
@@ -70,6 +69,7 @@ LLIBS=								\
 	$(DIST)\lib\xpcom.lib			\
     $(LIBNSPR)						\
     $(DIST)\lib\rdfutil_s.lib		\
+	$(DIST)\lib\unicharutil_s.lib	\
 	$(NULL)
 
 include <$(DEPTH)\config\rules.mak>
diff --git a/mailnews/base/build/makefile.win b/mailnews/base/build/makefile.win
index f09b85157cc..191c66779c9 100644
--- a/mailnews/base/build/makefile.win
+++ b/mailnews/base/build/makefile.win
@@ -78,10 +78,10 @@ SUB_LIBRARIES=							\
 
 LLIBS=										\
 			$(DIST)\lib\xpcom.lib			\
-			$(DIST)\lib\js32$(VERSION_NUMBER).lib \
 			$(DIST)\lib\msgbsutl.lib		\
 			$(DIST)\lib\timer_s.lib 		\
 			$(DIST)\lib\rdfutil_s.lib		\
+			$(DIST)\lib\unicharutil_s.lib   \
 			$(LIBNSPR)						\
 			$(NULL)
 
diff --git a/mailnews/base/search/src/makefile.win b/mailnews/base/search/src/makefile.win
index 183545f0218..3e4ea2c11b6 100644
--- a/mailnews/base/search/src/makefile.win
+++ b/mailnews/base/search/src/makefile.win
@@ -33,6 +33,7 @@ REQUIRES	= xpcom \
 		  rdf \
 		  msglocal \
 		  intl \
+		  unicharutil \
 		  pref \
 		  timer \
 		  msgnews \
diff --git a/mailnews/compose/build/makefile.win b/mailnews/compose/build/makefile.win
index b372b12ee37..d5fd8b66de7 100644
--- a/mailnews/compose/build/makefile.win
+++ b/mailnews/compose/build/makefile.win
@@ -66,6 +66,7 @@ LLIBS=											\
 			$(DIST)\lib\xpcom.lib				\
 			$(DIST)\lib\js32$(VERSION_NUMBER).lib	\
 			$(DIST)\lib\msgbsutl.lib			\
+			$(DIST)\lib\unicharutil_s.lib       \
 			$(LIBNSPR)							\
 			$(NULL)
 
diff --git a/mailnews/imap/build/makefile.win b/mailnews/imap/build/makefile.win
index 69bedd31718..3a22b89595b 100644
--- a/mailnews/imap/build/makefile.win
+++ b/mailnews/imap/build/makefile.win
@@ -64,6 +64,7 @@ LLIBS=								\
 	$(DIST)\lib\xpcom.lib			\
 	$(DIST)\lib\msgbsutl.lib		\
     $(DIST)\lib\rdfutil_s.lib		\
+	$(DIST)\lib\unicharutil_s.lib	\
     $(LIBNSPR)						\
 	$(NULL)
 
diff --git a/mailnews/import/outlook/src/makefile.win b/mailnews/import/outlook/src/makefile.win
index 81e36df3e03..7a9b9e8d8e5 100644
--- a/mailnews/import/outlook/src/makefile.win
+++ b/mailnews/import/outlook/src/makefile.win
@@ -39,6 +39,7 @@ REQUIRES	= xpcom \
 		  msgdb \
 		  msglocal \
 		  mimetype \
+	      unicharutil \
 		  $(NULL)
 LIBRARY_NAME    = $(MODULE)
 META_COMPONENT  = mail
@@ -59,6 +60,7 @@ CPP_OBJS=\
 
 LLIBS=\
         $(DIST)\lib\xpcom.lib       \
+		$(DIST)\lib\unicharutil_s.lib \
 		$(LIBNSPR)  				\
         $(NULL)
 
diff --git a/mailnews/local/build/makefile.win b/mailnews/local/build/makefile.win
index 88d9725a19d..e69de29bb2d 100644
--- a/mailnews/local/build/makefile.win
+++ b/mailnews/local/build/makefile.win
@@ -1,69 +0,0 @@
-#!gmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-DEPTH=..\..\..
-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 \
-		  $(NULL)
-
-################################################################################
-## exports
-
-EXPORTS=								\
-			nsMsgLocalCID.h				\
-			$(NULL)
-
-################################################################################
-## library
-
-CPP_OBJS=\
-	.\$(OBJDIR)\nsMsgLocalFactory.obj	\
-	$(NULL)
-
-SUB_LIBRARIES=					\
-	$(DIST)\lib\msglocal_s.lib		\
-	$(NULL)
-
-LLIBS=\
-	$(DIST)\lib\xpcom.lib			\
-    $(LIBNSPR)						\
-    $(DIST)\lib\rdfutil_s.lib		\
-	$(DIST)\lib\msgbsutl.lib		\
-	$(NULL)
-
-include <$(DEPTH)\config\rules.mak>
diff --git a/mailnews/mime/build/makefile.win b/mailnews/mime/build/makefile.win
index 597d92bb2a4..e69de29bb2d 100644
--- a/mailnews/mime/build/makefile.win
+++ b/mailnews/mime/build/makefile.win
@@ -1,56 +0,0 @@
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-DEPTH=..\..\..
-MODULE          = mime
-LIBRARY_NAME    = mime
-META_COMPONENT  = mail
-MODULE_NAME  = mime_services
-REQUIRES	= xpcom \
-		  string \
-		  msgbase \
-		  pref \
-		  necko \
-		  uconv \
-		  $(NULL)
-
-EXPORTS=								\
-			nsMsgMimeCID.h				\
-			$(NULL)
-
-################################################################################
-## library
-
-CPP_OBJS=\
-	.\$(OBJDIR)\nsMimeModule.obj	\
-	$(NULL)
-
-SUB_LIBRARIES=						\
-			$(DIST)\lib\mime_s.lib		\
-			$(NULL)
-
-LLIBS=										\
-			$(LLIBS)						\
-			$(LIBNSPR)						\
-			$(DIST)\lib\js32$(VERSION_NUMBER).lib	\
-			$(DIST)\lib\xpcom.lib       	\
-			$(DIST)\lib\msgbsutl.lib       	\
-			$(NULL)
-
-include <$(DEPTH)\config\rules.mak>
diff --git a/netwerk/build/makefile.win b/netwerk/build/makefile.win
index 024b8ffdbab..24cac16963f 100644
--- a/netwerk/build/makefile.win
+++ b/netwerk/build/makefile.win
@@ -33,7 +33,7 @@ REQUIRES	= xpcom \
 		  jar \
 		  locale \
 		  intl \
-                  uconv \
+		  uconv \
 		  zlib \
 		  $(NULL)
 
@@ -67,6 +67,7 @@ SUB_LIBRARIES=                        \
         $(NULL)
 
 LLIBS=                                \
+		$(DIST)\lib\unicharutil_s.lib \
 !ifdef MOZ_PERF
         $(DIST)\lib\util.lib          \
 !endif
diff --git a/profile/src/makefile.win b/profile/src/makefile.win
index 86fecb17b72..705ef324c1b 100644
--- a/profile/src/makefile.win
+++ b/profile/src/makefile.win
@@ -48,7 +48,6 @@ REQUIRES	= xpcom \
 		  docshell \
 		  webBrowser_core \
 		  widget \
-		  rdf \
 		  uconv \
 		  $(NULL)
 include <$(DEPTH)\config\config.mak>
diff --git a/rdf/build/makefile.win b/rdf/build/makefile.win
index 123738fc832..f879c906401 100644
--- a/rdf/build/makefile.win
+++ b/rdf/build/makefile.win
@@ -49,6 +49,7 @@ SUB_LIBRARIES=\
 LLIBS=\
  $(DIST)\lib\xpcom.lib   \
  $(DIST)\lib\timer_s.lib \
+ $(DIST)\lib\unicharutil_s.lib \
  $(LIBNSPR)  
 
 # XXX Note dependencies on implementation dirs for factory methods.
diff --git a/widget/src/build/makefile.win b/widget/src/build/makefile.win
index f2d17644efb..9eddca372a4 100644
--- a/widget/src/build/makefile.win
+++ b/widget/src/build/makefile.win
@@ -27,7 +27,6 @@ LIBRARY_NAME   = gkwidget
 MODULE_NAME = nsWidgetModule
 REQUIRES	= xpcom \
 		  string \
-		  widget \
 		  necko \
 		  uconv \
 		  gfx \
diff --git a/widget/src/support/makefile.win b/widget/src/support/makefile.win
index d86355369ad..6e8a5c022dd 100644
--- a/widget/src/support/makefile.win
+++ b/widget/src/support/makefile.win
@@ -36,7 +36,6 @@ EXPORTS = \
 MODULE=widget 
 REQUIRES	= xpcom \
 		  string \
-		  widget \
 		  layout \
 		  gfx \
 		  $(NULL)
diff --git a/xpfe/browser/src/makefile.win b/xpfe/browser/src/makefile.win
index d58fd252cf7..0ca8d145627 100644
--- a/xpfe/browser/src/makefile.win
+++ b/xpfe/browser/src/makefile.win
@@ -41,7 +41,6 @@ REQUIRES	= xpcom \
 		  pref \
 		  editor \
 		  appcomps \
-		  rdf \
 		  webBrowser_core \
 		  uconv \
 		  chardet \
diff --git a/xpfe/components/build/makefile.win b/xpfe/components/build/makefile.win
index 723a496f4f9..07758bca155 100644
--- a/xpfe/components/build/makefile.win
+++ b/xpfe/components/build/makefile.win
@@ -79,6 +79,7 @@ LLIBS=                                   \
         $(DIST)\lib\js3250.lib           \
         $(DIST)\lib\xpcom.lib            \
         $(DIST)\lib\timer_s.lib          \
+		$(DIST)\lib\unicharutil_s.lib    \
         $(LIBNSPR)                       \
 	$(NULL)