diff --git a/mozilla/network/cache/nu/src/Makefile b/mozilla/network/cache/nu/src/Makefile
index 8dcf37b9941..889a436a481 100644
--- a/mozilla/network/cache/nu/src/Makefile
+++ b/mozilla/network/cache/nu/src/Makefile
@@ -15,10 +15,39 @@
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
 
-DEPTH=../../..
-
-include $(DEPTH)/config/config.mk
+DEPTH=../../../..
 
 TARGET = $(LIBRARY)
 
+LIBRARY_NAME=cachelib
+
+MISCDEP = 		    \
+    $(LIBNSPR)  	    \
+    $(DIST)/lib/xpcom32.lib \
+    $(NULL)
+
+MODULE = cache
+
+CPPSRCS	= nsCacheObject.cpp 	\
+		  nsCacheModule.cpp 	\
+		  nsCacheManager.cpp 	\
+		  nsMemModule.cpp 		\
+		  nsDiskModule.cpp 		\
+		  nsCacheTrace.cpp 		\
+		  nsCachePref.cpp 		\
+		  nsMemCacheObject.cpp	\
+	 	  $(NULL)
+
+REQUIRES = dbm nspr pref xpcom 
+
+LLIBS =				 \
+ 	$(DIST)/lib/xpcom32.lib  \
+	$(LIBNSPR)		 \
+	$(NULL)
+
 include $(DEPTH)/config/rules.mk
+
+INCLUDES += -I../include	\
+			-I../public		\
+			$(NULL)
+
diff --git a/mozilla/network/cache/nu/src/makefile.win b/mozilla/network/cache/nu/src/makefile.win
index 06fb19808d5..5487d30b9e6 100644
--- a/mozilla/network/cache/nu/src/makefile.win
+++ b/mozilla/network/cache/nu/src/makefile.win
@@ -70,5 +70,4 @@ install:: $(EXE)
 
 clobber::
 	rm -f $(DIST)\lib\$(DLLNAME).$(LIB_SUFFIX)
-# rm -f $(DIST)\bin\$(DLLNAME).$(DLL_SUFFIX)
 
diff --git a/mozilla/network/cache/nu/src/nsMemModule.cpp b/mozilla/network/cache/nu/src/nsMemModule.cpp
index e915ca4143d..ed8dcc33684 100644
--- a/mozilla/network/cache/nu/src/nsMemModule.cpp
+++ b/mozilla/network/cache/nu/src/nsMemModule.cpp
@@ -16,7 +16,6 @@
  * Reserved.
  */
 
-#include <string.h>
 #include <prtypes.h>
 #include <plstr.h>
 
@@ -124,10 +123,10 @@ nsCacheObject* nsMemModule::GetObject(const char* i_url) const
 	if (m_pFirstObject && i_url && *i_url)
 	{
 		nsMemCacheObject* pObj = m_pFirstObject;
-		int inlen = strlen(i_url);
+		int inlen = PL_strlen(i_url);
 		do
 		{
-			if (0 == _strnicmp(pObj->ThisObject()->Address(), i_url, inlen))
+			if (0 == PL_strncasecmp(pObj->ThisObject()->Address(), i_url, inlen))
 				return pObj->ThisObject();
 			pObj = pObj->Next();
 		}
@@ -183,4 +182,4 @@ nsMemModule::nsMemKey::neMemKey()
 {
 }
 
-  */
\ No newline at end of file
+  */