diff --git a/mozilla/network/cache/nu/src/nsCachePref.cpp b/mozilla/network/cache/nu/src/nsCachePref.cpp
index 1db6d9b4e35..eb93b9c7397 100644
--- a/mozilla/network/cache/nu/src/nsCachePref.cpp
+++ b/mozilla/network/cache/nu/src/nsCachePref.cpp
@@ -44,10 +44,7 @@ static const char* FREQ_PREF        = "browser.cache.check_doc_frequency";
 /* Find a bug in NU_CACHE, get these many chocolates */
 static const PRUint16 CHOCOLATES_PER_BUG_FOUND = 2^BUGS_FOUND_SO_FAR; 
 
-int PR_CALLBACK Cache_PrefChangedFunc(const char *pref, void *data) {
-    nsCachePref::GetInstance()->SetupPrefs(pref);
-	return PR_TRUE;
-} 
+static int PR_CALLBACK Cache_PrefChangedFunc(const char *pref, void *data);
 
 nsCachePref::nsCachePref(void):
     m_BkgSleepTime(BKG_THREAD_SLEEP),
@@ -207,4 +204,8 @@ nsresult nsCachePref::QueryInterface(const nsIID& aIID,
 }
 */
 
+int PR_CALLBACK Cache_PrefChangedFunc(const char *pref, void *data) {
+    nsCachePref::GetInstance()->SetupPrefs(pref);
+	return PR_TRUE;
+} 
 
diff --git a/mozilla/network/cache/nu/src/nsDiskModule.cpp b/mozilla/network/cache/nu/src/nsDiskModule.cpp
index d0ec8467702..a1539e712d7 100644
--- a/mozilla/network/cache/nu/src/nsDiskModule.cpp
+++ b/mozilla/network/cache/nu/src/nsDiskModule.cpp
@@ -73,10 +73,10 @@ const static int MAX_OBJECTS_IN_RECENTLY_USED_LIST = 20; // change later TODO.
 #define CLEANUP_FACTOR 0.75
 
 //Returns the full filename including the cache directory.
-char* FullFilename(const char* i_Filename);
+static char* FullFilename(const char* i_Filename);
 
 //Returns the Least Recently Used object in the database
-nsCacheObject* LRUObject(DB* pDB);
+static nsCacheObject* LRUObject(DB* pDB);
 
 //
 // Constructor: nsDiskModule
@@ -295,15 +295,6 @@ nsStream* nsDiskModule::GetStreamFor(const nsCacheObject* i_pObject)
     MonitorLocker ml(this);
     if (i_pObject)
     {
-        /* 
-        if (Contains((nsCacheObject*)i_pObject))
-        {
-            nsStream* pStream = i_pObject->Stream();
-            if (pStream)
-                return pStream;
-        }
-        */
-        
         nsStream* pStream = i_pObject->Stream();
         if (pStream)
             return pStream;
@@ -316,8 +307,6 @@ nsStream* nsDiskModule::GetStreamFor(const nsCacheObject* i_pObject)
         {
             return new nsFileStream(fullname);
         }
-        
-        return 0;
     }
     return 0;
 }