diff --git a/mozilla/intl/unicharutil/macbuild/unicharutil.mcp b/mozilla/intl/unicharutil/macbuild/unicharutil.mcp
index 0a27d309ffc..c554dfaf97e 100644
Binary files a/mozilla/intl/unicharutil/macbuild/unicharutil.mcp and b/mozilla/intl/unicharutil/macbuild/unicharutil.mcp differ
diff --git a/mozilla/intl/unicharutil/src/makefile.win b/mozilla/intl/unicharutil/src/makefile.win
index 29a664b7aa9..f4d7f13ff36 100644
--- a/mozilla/intl/unicharutil/src/makefile.win
+++ b/mozilla/intl/unicharutil/src/makefile.win
@@ -23,20 +23,18 @@ DEFINES= -DWIN32_LEAN_AND_MEAN
 LIBRARY_NAME= unicharutil
 
 OBJS= \
-	.\$(OBJDIR)\ucdata.obj \
 	$(NULL)
 
 CSRCS= \
-	ucdata.c \
 	$(NULL)
 
 CPPSRCS= \
-	nsCaseConversionImp.cpp	\
+	nsCaseConversionImp2.cpp	\
 	nsUnicharUtilFactory.cpp	\
 	$(NULL)
 
 CPP_OBJS= \
-	.\$(OBJDIR)\nsCaseConversionImp.obj \
+	.\$(OBJDIR)\nsCaseConversionImp2.obj \
 	.\$(OBJDIR)\nsUnicharUtilFactory.obj \
 	$(NULL)
 
diff --git a/mozilla/intl/unicharutil/src/nsUnicharUtilFactory.cpp b/mozilla/intl/unicharutil/src/nsUnicharUtilFactory.cpp
index 6429dbe15ee..3b8c4a4f76e 100644
--- a/mozilla/intl/unicharutil/src/nsUnicharUtilFactory.cpp
+++ b/mozilla/intl/unicharutil/src/nsUnicharUtilFactory.cpp
@@ -22,7 +22,7 @@
 #include "nsIFactory.h"
 #include "nsUnicharUtilCIID.h"
 #include "nsICaseConversion.h"
-#include "nsCaseConversionImp.h"
+#include "nsCaseConversionImp2.h"
 
 
 NS_DEFINE_IID(kFactoryIID, NS_IFACTORY_IID);
@@ -68,7 +68,7 @@ nsresult nsUnicharUtilFactory::CreateInstance(nsISupports *aDelegate,
   
   *aResult = NULL;
    
-  nsISupports *inst = new nsCaseConversionImp();
+  nsISupports *inst = new nsCaseConversionImp2();
   if(NULL == inst) {
     return NS_ERROR_OUT_OF_MEMORY;  
   }