diff --git a/content/base/src/nsStyleLinkElement.cpp b/content/base/src/nsStyleLinkElement.cpp
index ef8c1766e35a..ddbed55a5d3b 100644
--- a/content/base/src/nsStyleLinkElement.cpp
+++ b/content/base/src/nsStyleLinkElement.cpp
@@ -30,6 +30,7 @@
 #include "nsIDOMStyleSheet.h"
 #include "nsIHTMLContentContainer.h"
 #include "nsINameSpaceManager.h"
+#include "nsUnicharUtils.h"
 
 #include "nsNetUtil.h"
 #include "nsVoidArray.h"
diff --git a/content/html/content/src/makefile.win b/content/html/content/src/makefile.win
index 312e5e0636e8..0a83a73aa060 100644
--- a/content/html/content/src/makefile.win
+++ b/content/html/content/src/makefile.win
@@ -39,7 +39,6 @@ REQUIRES	= xpcom \
 		  xpconnect \
 		  caps \
 		  editor \
-		  uconv \
 		  gfx2 \
 		  imglib2 \
 		  layout \
diff --git a/content/html/content/src/nsGenericHTMLElement.cpp b/content/html/content/src/nsGenericHTMLElement.cpp
index 1f1689f1bf69..d2d970449833 100644
--- a/content/html/content/src/nsGenericHTMLElement.cpp
+++ b/content/html/content/src/nsGenericHTMLElement.cpp
@@ -88,6 +88,7 @@
 #include "nsHTMLParts.h"
 #include "nsString.h"
 #include "nsReadableUtils.h"
+#include "nsUnicharUtils.h"
 #include "nsLayoutAtoms.h"
 #include "nsHTMLAtoms.h"
 #include "nsIEventStateManager.h"
diff --git a/content/html/content/src/nsHTMLLinkElement.cpp b/content/html/content/src/nsHTMLLinkElement.cpp
index 74c49edeaf1f..c48093c32a4f 100644
--- a/content/html/content/src/nsHTMLLinkElement.cpp
+++ b/content/html/content/src/nsHTMLLinkElement.cpp
@@ -51,6 +51,7 @@
 #include "nsIStyleSheetLinkingElement.h"
 #include "nsStyleLinkElement.h"
 #include "nsReadableUtils.h"
+#include "nsUnicharUtils.h"
 #include "nsHTMLUtils.h"
 #include "nsIURL.h"
 #include "nsNetUtil.h"
diff --git a/content/xml/content/src/Makefile.in b/content/xml/content/src/Makefile.in
index b352516097af..94fca2475f94 100644
--- a/content/xml/content/src/Makefile.in
+++ b/content/xml/content/src/Makefile.in
@@ -41,6 +41,7 @@ REQUIRES	= xpcom \
 		  docshell \
 		  htmlparser \
 		  xpconnect \
+		  unicharutil \
 		  $(NULL)
 
 CPPSRCS		= \
diff --git a/content/xml/content/src/makefile.win b/content/xml/content/src/makefile.win
index 4774eaaff0d8..b0563498dd29 100644
--- a/content/xml/content/src/makefile.win
+++ b/content/xml/content/src/makefile.win
@@ -36,6 +36,7 @@ REQUIRES	= xpcom \
 		  xpconnect \
 		  layout \
 		  gfx \
+		  unicharutil \
 		  $(NULL)
 
 DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
diff --git a/content/xml/content/src/nsXMLProcessingInstruction.cpp b/content/xml/content/src/nsXMLProcessingInstruction.cpp
index 29d6ed45426a..66cfdaa1d7e4 100644
--- a/content/xml/content/src/nsXMLProcessingInstruction.cpp
+++ b/content/xml/content/src/nsXMLProcessingInstruction.cpp
@@ -51,6 +51,7 @@
 #include "nsHTMLAtoms.h"
 #include "nsString.h"
 #include "nsXPIDLString.h"
+#include "nsUnicharUtils.h"
 #include "nsIXMLContent.h"
 #include "nsStyleLinkElement.h"
 
diff --git a/htmlparser/src/Makefile.in b/htmlparser/src/Makefile.in
index 987751e855cb..14cacc8e0543 100644
--- a/htmlparser/src/Makefile.in
+++ b/htmlparser/src/Makefile.in
@@ -37,6 +37,7 @@ REQUIRES	= xpcom \
 		  necko \
 		  util \
 		  uconv \
+		  unicharutil \
 		  expat \
 		  layout \
 		  dom \
diff --git a/htmlparser/src/makefile.win b/htmlparser/src/makefile.win
index a513687ca014..4e603971e054 100644
--- a/htmlparser/src/makefile.win
+++ b/htmlparser/src/makefile.win
@@ -27,6 +27,7 @@ REQUIRES	= xpcom \
 		  necko \
 		  util \
 		  uconv \
+		  unicharutil \
 		  expat \
 		  layout \
 		  dom \
@@ -106,6 +107,7 @@ SUB_LIBRARIES=         \
  $(NULL)
 
 LLIBS=                  \
+ $(DIST)\lib\unicharutil_s.lib \
  $(DIST)\lib\xpcom.lib  \
 !ifdef MOZ_PERF
  $(DIST)\lib\util.lib   \
diff --git a/htmlparser/src/nsHTMLTokens.cpp b/htmlparser/src/nsHTMLTokens.cpp
index 84e9b7050fcc..650d8d71f1d9 100644
--- a/htmlparser/src/nsHTMLTokens.cpp
+++ b/htmlparser/src/nsHTMLTokens.cpp
@@ -48,6 +48,7 @@
 #include "nsHTMLEntities.h"
 #include "nsCRT.h"
 #include "nsReadableUtils.h"
+#include "nsUnicharUtils.h"
 #include "nsScanner.h"
 
 
diff --git a/parser/htmlparser/src/Makefile.in b/parser/htmlparser/src/Makefile.in
index 987751e855cb..14cacc8e0543 100644
--- a/parser/htmlparser/src/Makefile.in
+++ b/parser/htmlparser/src/Makefile.in
@@ -37,6 +37,7 @@ REQUIRES	= xpcom \
 		  necko \
 		  util \
 		  uconv \
+		  unicharutil \
 		  expat \
 		  layout \
 		  dom \
diff --git a/parser/htmlparser/src/makefile.win b/parser/htmlparser/src/makefile.win
index a513687ca014..4e603971e054 100644
--- a/parser/htmlparser/src/makefile.win
+++ b/parser/htmlparser/src/makefile.win
@@ -27,6 +27,7 @@ REQUIRES	= xpcom \
 		  necko \
 		  util \
 		  uconv \
+		  unicharutil \
 		  expat \
 		  layout \
 		  dom \
@@ -106,6 +107,7 @@ SUB_LIBRARIES=         \
  $(NULL)
 
 LLIBS=                  \
+ $(DIST)\lib\unicharutil_s.lib \
  $(DIST)\lib\xpcom.lib  \
 !ifdef MOZ_PERF
  $(DIST)\lib\util.lib   \
diff --git a/parser/htmlparser/src/nsHTMLTokens.cpp b/parser/htmlparser/src/nsHTMLTokens.cpp
index 84e9b7050fcc..650d8d71f1d9 100644
--- a/parser/htmlparser/src/nsHTMLTokens.cpp
+++ b/parser/htmlparser/src/nsHTMLTokens.cpp
@@ -48,6 +48,7 @@
 #include "nsHTMLEntities.h"
 #include "nsCRT.h"
 #include "nsReadableUtils.h"
+#include "nsUnicharUtils.h"
 #include "nsScanner.h"