diff --git a/mozilla/network/cache/nu/src/nsCachePref.cpp b/mozilla/network/cache/nu/src/nsCachePref.cpp
index f1a319c6a2a..e888ac4c145 100644
--- a/mozilla/network/cache/nu/src/nsCachePref.cpp
+++ b/mozilla/network/cache/nu/src/nsCachePref.cpp
@@ -17,7 +17,9 @@
  */
 
 #include "nsCachePref.h"
-#include "xp.h"
+#ifndef XP_UNIX
+#include "xp.h" // This complains on unix. Works ok without there.
+#endif
 #include "prefapi.h"
 #include "prmem.h"
 #include "nsCacheManager.h"
@@ -69,7 +71,7 @@ nsCachePref::SetupPrefs(const char* i_Pref)
 {
     PRBool bSetupAll = PR_FALSE;
     
-    long nTemp;
+    int32 nTemp;
     char* tempPref=0;
 
     if (!i_Pref)