diff --git a/mozilla/docshell/base/nsDocShell.cpp b/mozilla/docshell/base/nsDocShell.cpp
index 486c4fe72b6..7d9d4c7b444 100644
--- a/mozilla/docshell/base/nsDocShell.cpp
+++ b/mozilla/docshell/base/nsDocShell.cpp
@@ -82,6 +82,7 @@
 #include "nsXPCOMCID.h"
 #include "nsISeekableStream.h"
 #include "nsAutoPtr.h"
+#include "nsIPrefService.h"
 
 // we want to explore making the document own the load group
 // so we can associate the document URI with the load group.
@@ -3092,7 +3093,7 @@ NS_IMETHODIMP
 nsDocShell::Create()
 {
     nsresult rv = NS_ERROR_FAILURE;
-    mPrefs = do_GetService(NS_PREF_CONTRACTID, &rv);
+    mPrefs = do_GetService(NS_PREFSERVICE_CONTRACTID, &rv);
     NS_ENSURE_SUCCESS(rv, rv);
 
     PRBool tmpbool;
diff --git a/mozilla/docshell/base/nsDocShell.h b/mozilla/docshell/base/nsDocShell.h
index 103bce59a1d..9271c6f4c6c 100644
--- a/mozilla/docshell/base/nsDocShell.h
+++ b/mozilla/docshell/base/nsDocShell.h
@@ -46,7 +46,7 @@
 #include "nsIViewManager.h"
 #include "nsIScrollableView.h"
 #include "nsIContentViewer.h"
-#include "nsIPref.h"
+#include "nsIPrefBranch.h"
 #include "nsVoidArray.h"
 #include "nsIScriptContext.h"
 #include "nsITimer.h"
@@ -402,7 +402,7 @@ protected:
     nsCOMPtr<nsIDeviceContext> mDeviceContext;
     nsCOMPtr<nsIDocumentLoader>mDocLoader;
     nsCOMPtr<nsIWidget>        mParentWidget;
-    nsCOMPtr<nsIPref>          mPrefs;
+    nsCOMPtr<nsIPrefBranch>    mPrefs;
     nsCOMPtr<nsIURI>           mCurrentURI;
     nsCOMPtr<nsIURI>           mReferrerURI;
     nsCOMPtr<nsIScriptGlobalObject> mScriptGlobal;