diff --git a/mozilla/content/xul/document/src/nsXULDocument.cpp b/mozilla/content/xul/document/src/nsXULDocument.cpp
index b4b9a485358..ec2825d792c 100644
--- a/mozilla/content/xul/document/src/nsXULDocument.cpp
+++ b/mozilla/content/xul/document/src/nsXULDocument.cpp
@@ -110,7 +110,6 @@
 #include "nsIFastLoadService.h"
 #include "nsIObjectInputStream.h"
 #include "nsIObjectOutputStream.h"
-#include "nsIPref.h"
 #include "nsIFocusController.h"
 #include "nsContentList.h"
 #include "nsIScriptGlobalObject.h"
diff --git a/mozilla/editor/libeditor/html/nsHTMLEditor.cpp b/mozilla/editor/libeditor/html/nsHTMLEditor.cpp
index 694bfa5010d..11622b92cbe 100644
--- a/mozilla/editor/libeditor/html/nsHTMLEditor.cpp
+++ b/mozilla/editor/libeditor/html/nsHTMLEditor.cpp
@@ -122,7 +122,6 @@
 // Misc
 #include "TextEditorTest.h"
 #include "nsEditorUtils.h"
-#include "nsIPref.h"
 #include "nsITextContent.h"
 #include "nsWSRunObject.h"
 #include "nsHTMLObjectResizer.h"
diff --git a/mozilla/embedding/browser/photon/src/nsPrintSettingsImpl.cpp b/mozilla/embedding/browser/photon/src/nsPrintSettingsImpl.cpp
index 0c92a944d89..a995963fecf 100644
--- a/mozilla/embedding/browser/photon/src/nsPrintSettingsImpl.cpp
+++ b/mozilla/embedding/browser/photon/src/nsPrintSettingsImpl.cpp
@@ -41,8 +41,6 @@
 #include "nsUnitConversion.h"
 #include "nsReadableUtils.h"
 
-// For Prefs
-#include "nsIPref.h"
 #include "nsIServiceManager.h"
 
 NS_IMPL_ISUPPORTS1(nsPrintSettings, nsIPrintSettings)
diff --git a/mozilla/embedding/components/printingui/src/win/nsPrintDialogUtil.cpp b/mozilla/embedding/components/printingui/src/win/nsPrintDialogUtil.cpp
index 710ff34f03a..cabdeb9a2b1 100644
--- a/mozilla/embedding/components/printingui/src/win/nsPrintDialogUtil.cpp
+++ b/mozilla/embedding/components/printingui/src/win/nsPrintDialogUtil.cpp
@@ -80,7 +80,6 @@ static NS_DEFINE_IID(kPrinterEnumeratorCID, NS_PRINTER_ENUMERATOR_CID);
 
 #include "nsRect.h"
 
-#include "nsIPref.h"
 #include "nsCRT.h"
 #include "prenv.h" /* for PR_GetEnv */
 
diff --git a/mozilla/embedding/tests/mfcembed/components/nsPrintDialogUtil.cpp b/mozilla/embedding/tests/mfcembed/components/nsPrintDialogUtil.cpp
index e8efb4a3bc0..ee7c0c28dd2 100644
--- a/mozilla/embedding/tests/mfcembed/components/nsPrintDialogUtil.cpp
+++ b/mozilla/embedding/tests/mfcembed/components/nsPrintDialogUtil.cpp
@@ -80,7 +80,6 @@ static NS_DEFINE_IID(kPrinterEnumeratorCID, NS_PRINTER_ENUMERATOR_CID);
 
 #include "nsRect.h"
 
-#include "nsIPref.h"
 #include "nsCRT.h"
 #include "prenv.h" /* for PR_GetEnv */
 
diff --git a/mozilla/extensions/webservices/security/src/nsWebScriptsAccess.cpp b/mozilla/extensions/webservices/security/src/nsWebScriptsAccess.cpp
index f53f10eb50a..80b77a49907 100755
--- a/mozilla/extensions/webservices/security/src/nsWebScriptsAccess.cpp
+++ b/mozilla/extensions/webservices/security/src/nsWebScriptsAccess.cpp
@@ -60,7 +60,6 @@
 #include "nsIVariant.h"
 #include "nsIPrefService.h"
 #include "nsIPrefBranchInternal.h"
-#include "nsIPref.h"
 #include "nsIJSContextStack.h"
 
 #define WSA_GRANT_ACCESS_TO_ALL     (1 << 0)
diff --git a/mozilla/gfx/src/mac/nsPrintOptionsX.cpp b/mozilla/gfx/src/mac/nsPrintOptionsX.cpp
index a3af9a0c30b..472cce79ec4 100644
--- a/mozilla/gfx/src/mac/nsPrintOptionsX.cpp
+++ b/mozilla/gfx/src/mac/nsPrintOptionsX.cpp
@@ -43,7 +43,6 @@
 #include "nsWatchTask.h"
 #include "nsPrintOptionsX.h"
 #include "nsPrintSettingsX.h"
-#include "nsIPref.h"
 
 #include "nsGfxUtils.h"
 #include "nsCRT.h"
diff --git a/mozilla/gfx/src/os2/nsDeviceContextSpecOS2.cpp b/mozilla/gfx/src/os2/nsDeviceContextSpecOS2.cpp
index 44139da5378..dc2635d5e38 100644
--- a/mozilla/gfx/src/os2/nsDeviceContextSpecOS2.cpp
+++ b/mozilla/gfx/src/os2/nsDeviceContextSpecOS2.cpp
@@ -26,7 +26,6 @@
 #include "nsReadableUtils.h"
 #include "nsISupportsArray.h"
 
-#include "nsIPref.h"
 #include "prenv.h" /* for PR_GetEnv */
 
 #include "nsIServiceManager.h"
diff --git a/mozilla/gfx/src/photon/nsDeviceContextSpecPh.cpp b/mozilla/gfx/src/photon/nsDeviceContextSpecPh.cpp
index e3375aefd63..a44d9e2451d 100644
--- a/mozilla/gfx/src/photon/nsDeviceContextSpecPh.cpp
+++ b/mozilla/gfx/src/photon/nsDeviceContextSpecPh.cpp
@@ -55,7 +55,6 @@
 #include "nsString.h"
 #include "nsIServiceManager.h"
 #include "nsReadableUtils.h"
-#include "nsIPref.h"
 
 nsDeviceContextSpecPh :: nsDeviceContextSpecPh()
 {
diff --git a/mozilla/gfx/src/windows/nsDeviceContextSpecWin.cpp b/mozilla/gfx/src/windows/nsDeviceContextSpecWin.cpp
index adf3c8cdf5b..ddfbd870e19 100644
--- a/mozilla/gfx/src/windows/nsDeviceContextSpecWin.cpp
+++ b/mozilla/gfx/src/windows/nsDeviceContextSpecWin.cpp
@@ -57,8 +57,6 @@
 #include "nsIStringBundle.h"
 #define NS_ERROR_GFX_PRINTER_BUNDLE_URL "chrome://global/locale/printing.properties"
 
-#include "nsIPref.h"
-
 #include "prlog.h"
 #ifdef PR_LOGGING 
 extern PRLogModuleInfo * kGfxPrintingLogMod;
diff --git a/mozilla/modules/plugin/base/src/ns4xPluginInstance.cpp b/mozilla/modules/plugin/base/src/ns4xPluginInstance.cpp
index d7848b0683f..8e843ffb04a 100644
--- a/mozilla/modules/plugin/base/src/ns4xPluginInstance.cpp
+++ b/mozilla/modules/plugin/base/src/ns4xPluginInstance.cpp
@@ -46,7 +46,6 @@
 #include "ns4xPluginStreamListener.h"
 #include "nsPluginHostImpl.h"
 #include "nsPluginSafety.h"
-#include "nsIPref.h" // needed for NS_TRY_SAFE_CALL_*
 #include "nsPluginLogging.h"
 
 #ifdef XP_OS2
diff --git a/mozilla/webshell/tests/viewer/nsXPBaseWindow.cpp b/mozilla/webshell/tests/viewer/nsXPBaseWindow.cpp
index dc5ad8927ee..b7327a0f3d2 100644
--- a/mozilla/webshell/tests/viewer/nsXPBaseWindow.cpp
+++ b/mozilla/webshell/tests/viewer/nsXPBaseWindow.cpp
@@ -35,7 +35,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 #include "nsCOMPtr.h"
-#include "nsIPref.h"
 #include "prmem.h"
 
 #include "nsXPBaseWindow.h"
diff --git a/mozilla/widget/src/gtk/nsAppShell.cpp b/mozilla/widget/src/gtk/nsAppShell.cpp
index 213738c1150..5abf285f670 100644
--- a/mozilla/widget/src/gtk/nsAppShell.cpp
+++ b/mozilla/widget/src/gtk/nsAppShell.cpp
@@ -49,7 +49,6 @@
 #include <gdk/gdkx.h>
 
 #include "nsIWidget.h"
-#include "nsIPref.h"
 
 #include "glib.h"
 #include "nsVoidArray.h"