diff --git a/browser/components/feeds/src/nsFeedSniffer.cpp b/browser/components/feeds/src/nsFeedSniffer.cpp
index a10394c98fad..909057617a45 100644
--- a/browser/components/feeds/src/nsFeedSniffer.cpp
+++ b/browser/components/feeds/src/nsFeedSniffer.cpp
@@ -5,7 +5,6 @@
 
 #include "nsFeedSniffer.h"
 
-#include "prmem.h"
 
 #include "nsNetCID.h"
 #include "nsXPCOM.h"
diff --git a/content/base/src/nsMappedAttributes.cpp b/content/base/src/nsMappedAttributes.cpp
index 9e6c197497b3..bd5dbeb00631 100644
--- a/content/base/src/nsMappedAttributes.cpp
+++ b/content/base/src/nsMappedAttributes.cpp
@@ -11,7 +11,6 @@
 #include "nsMappedAttributes.h"
 #include "nsHTMLStyleSheet.h"
 #include "nsRuleWalker.h"
-#include "prmem.h"
 #include "mozilla/HashFunctions.h"
 
 using namespace mozilla;
diff --git a/content/canvas/src/CanvasUtils.cpp b/content/canvas/src/CanvasUtils.cpp
index ffd9b07eb0c4..bbdddd257da1 100644
--- a/content/canvas/src/CanvasUtils.cpp
+++ b/content/canvas/src/CanvasUtils.cpp
@@ -6,7 +6,6 @@
 #include <stdlib.h>
 #include <stdarg.h>
 
-#include "prmem.h"
 #include "prprf.h"
 
 #include "nsIServiceManager.h"
diff --git a/content/canvas/src/nsCanvasRenderingContext2D.cpp b/content/canvas/src/nsCanvasRenderingContext2D.cpp
index c6f5ad240b3e..21b718f7524a 100644
--- a/content/canvas/src/nsCanvasRenderingContext2D.cpp
+++ b/content/canvas/src/nsCanvasRenderingContext2D.cpp
@@ -8,7 +8,6 @@
 
 #include "nsIDOMXULElement.h"
 
-#include "prmem.h"
 #include "prenv.h"
 
 #include "nsIServiceManager.h"
diff --git a/content/canvas/src/nsCanvasRenderingContext2DAzure.cpp b/content/canvas/src/nsCanvasRenderingContext2DAzure.cpp
index 295328c7c881..cedf70279f97 100644
--- a/content/canvas/src/nsCanvasRenderingContext2DAzure.cpp
+++ b/content/canvas/src/nsCanvasRenderingContext2DAzure.cpp
@@ -8,7 +8,6 @@
 
 #include "nsIDOMXULElement.h"
 
-#include "prmem.h"
 #include "prenv.h"
 
 #include "nsIServiceManager.h"
diff --git a/content/events/src/nsDOMEvent.cpp b/content/events/src/nsDOMEvent.cpp
index 32092650e01f..4407ad47f12f 100644
--- a/content/events/src/nsDOMEvent.cpp
+++ b/content/events/src/nsDOMEvent.cpp
@@ -19,7 +19,6 @@
 #include "nsIDocument.h"
 #include "nsIInterfaceRequestor.h"
 #include "nsIInterfaceRequestorUtils.h"
-#include "prmem.h"
 #include "nsGkAtoms.h"
 #include "nsMutationEvent.h"
 #include "nsContentUtils.h"
diff --git a/content/events/src/nsEventListenerManager.cpp b/content/events/src/nsEventListenerManager.cpp
index 02f8c90d8753..8df6f64c738b 100644
--- a/content/events/src/nsEventListenerManager.cpp
+++ b/content/events/src/nsEventListenerManager.cpp
@@ -19,7 +19,6 @@
 #include "nsGkAtoms.h"
 #include "nsPIDOMWindow.h"
 #include "nsIJSEventListener.h"
-#include "prmem.h"
 #include "nsIScriptGlobalObject.h"
 #include "nsIScriptRuntime.h"
 #include "nsLayoutUtils.h"
diff --git a/content/html/content/src/nsHTMLCanvasElement.cpp b/content/html/content/src/nsHTMLCanvasElement.cpp
index 304bb39e2041..c5253cf68ff9 100644
--- a/content/html/content/src/nsHTMLCanvasElement.cpp
+++ b/content/html/content/src/nsHTMLCanvasElement.cpp
@@ -9,7 +9,6 @@
 #include "mozilla/Base64.h"
 #include "mozilla/CheckedInt.h"
 #include "nsNetUtil.h"
-#include "prmem.h"
 #include "nsDOMFile.h"
 
 #include "nsICanvasRenderingContextInternal.h"
diff --git a/content/html/content/src/nsHTMLVideoElement.cpp b/content/html/content/src/nsHTMLVideoElement.cpp
index 3656c582260d..361aace907e2 100644
--- a/content/html/content/src/nsHTMLVideoElement.cpp
+++ b/content/html/content/src/nsHTMLVideoElement.cpp
@@ -16,7 +16,6 @@
 #include "nsNodeInfoManager.h"
 #include "plbase64.h"
 #include "nsNetUtil.h"
-#include "prmem.h"
 #include "nsXPCOMStrings.h"
 #include "prlock.h"
 #include "nsThreadUtils.h"
diff --git a/content/html/document/src/nsHTMLDocument.cpp b/content/html/document/src/nsHTMLDocument.cpp
index a1753ac0d79c..0aa18bbfa97d 100644
--- a/content/html/document/src/nsHTMLDocument.cpp
+++ b/content/html/document/src/nsHTMLDocument.cpp
@@ -110,7 +110,6 @@ using namespace mozilla::dom;
 
 #define NS_MAX_DOCUMENT_WRITE_DEPTH 20
 
-#include "prmem.h"
 #include "prtime.h"
 
 // Find/Search Includes
diff --git a/content/media/nsBuiltinDecoderStateMachine.h b/content/media/nsBuiltinDecoderStateMachine.h
index 255b59b7a04f..60606ab33305 100644
--- a/content/media/nsBuiltinDecoderStateMachine.h
+++ b/content/media/nsBuiltinDecoderStateMachine.h
@@ -76,7 +76,6 @@ hardware (via nsAudioStream and libsydneyaudio).
 #if !defined(nsBuiltinDecoderStateMachine_h__)
 #define nsBuiltinDecoderStateMachine_h__
 
-#include "prmem.h"
 #include "nsThreadUtils.h"
 #include "nsBuiltinDecoder.h"
 #include "nsBuiltinDecoderReader.h"
diff --git a/dom/base/nsLocation.cpp b/dom/base/nsLocation.cpp
index 587b91ec023c..ab9d077b6013 100644
--- a/dom/base/nsLocation.cpp
+++ b/dom/base/nsLocation.cpp
@@ -17,9 +17,6 @@
 #include "nsIIOService.h"
 #include "nsIServiceManager.h"
 #include "nsNetUtil.h"
-#include "plstr.h"
-#include "prprf.h"
-#include "prmem.h"
 #include "nsCOMPtr.h"
 #include "nsEscape.h"
 #include "nsIDOMWindow.h"
diff --git a/embedding/components/printingui/src/win/nsPrintDialogUtil.cpp b/embedding/components/printingui/src/win/nsPrintDialogUtil.cpp
index 7b4e7ca109fb..b24ff651f372 100644
--- a/embedding/components/printingui/src/win/nsPrintDialogUtil.cpp
+++ b/embedding/components/printingui/src/win/nsPrintDialogUtil.cpp
@@ -20,7 +20,6 @@ WIN_LIBS=                                       \
 
 ---------------------------------------------------------------------- */
 
-#include "prmem.h"
 #include "plstr.h"
 #include <windows.h>
 #include <tchar.h>
diff --git a/extensions/universalchardet/src/xpcom/nsUdetXPCOMWrapper.cpp b/extensions/universalchardet/src/xpcom/nsUdetXPCOMWrapper.cpp
index 8ae67ecac4a8..7b58be41dbaf 100644
--- a/extensions/universalchardet/src/xpcom/nsUdetXPCOMWrapper.cpp
+++ b/extensions/universalchardet/src/xpcom/nsUdetXPCOMWrapper.cpp
@@ -13,8 +13,6 @@
 //---- for XPCOM
 #include "nsIFactory.h"
 #include "nsISupports.h"
-#include "pratom.h"
-#include "prmem.h"
 #include "nsCOMPtr.h"
 
 static NS_DEFINE_CID(kUniversalDetectorCID, NS_UNIVERSAL_DETECTOR_CID);
diff --git a/gfx/thebes/gfxCoreTextShaper.cpp b/gfx/thebes/gfxCoreTextShaper.cpp
index 9e621eccdd28..76c6515f93ff 100644
--- a/gfx/thebes/gfxCoreTextShaper.cpp
+++ b/gfx/thebes/gfxCoreTextShaper.cpp
@@ -6,7 +6,6 @@
 #include "mozilla/Util.h"
 
 #include "nsAlgorithm.h"
-#include "prmem.h"
 #include "nsString.h"
 #include "nsBidiUtils.h"
 
diff --git a/gfx/thebes/gfxGraphiteShaper.cpp b/gfx/thebes/gfxGraphiteShaper.cpp
index 2578b510fafe..cae516a3a7a6 100644
--- a/gfx/thebes/gfxGraphiteShaper.cpp
+++ b/gfx/thebes/gfxGraphiteShaper.cpp
@@ -3,7 +3,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "prmem.h"
 #include "nsString.h"
 #include "nsBidiUtils.h"
 #include "nsMathUtils.h"
diff --git a/gfx/thebes/gfxHarfBuzzShaper.cpp b/gfx/thebes/gfxHarfBuzzShaper.cpp
index a240edafa3cf..ec57907f09bd 100644
--- a/gfx/thebes/gfxHarfBuzzShaper.cpp
+++ b/gfx/thebes/gfxHarfBuzzShaper.cpp
@@ -4,7 +4,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsAlgorithm.h"
-#include "prmem.h"
 #include "nsString.h"
 #include "nsBidiUtils.h"
 #include "nsMathUtils.h"
diff --git a/gfx/thebes/gfxImageSurface.cpp b/gfx/thebes/gfxImageSurface.cpp
index df330e1a5459..926d109708cc 100644
--- a/gfx/thebes/gfxImageSurface.cpp
+++ b/gfx/thebes/gfxImageSurface.cpp
@@ -3,7 +3,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "prmem.h"
 
 #include "gfxAlphaRecovery.h"
 #include "gfxImageSurface.h"
diff --git a/intl/locale/src/mac/nsDateTimeFormatMac.cpp b/intl/locale/src/mac/nsDateTimeFormatMac.cpp
index 5904779c0b06..14e3f4aad218 100644
--- a/intl/locale/src/mac/nsDateTimeFormatMac.cpp
+++ b/intl/locale/src/mac/nsDateTimeFormatMac.cpp
@@ -12,7 +12,6 @@
 #include "nsILocaleService.h"
 #include "nsCRT.h"
 #include "plstr.h"
-#include "prmem.h"
 #include "nsUnicharUtils.h"
 #include "nsTArray.h"
 
diff --git a/intl/locale/src/windows/nsDateTimeFormatWin.cpp b/intl/locale/src/windows/nsDateTimeFormatWin.cpp
index 5dd1f995d518..1d27115b3824 100644
--- a/intl/locale/src/windows/nsDateTimeFormatWin.cpp
+++ b/intl/locale/src/windows/nsDateTimeFormatWin.cpp
@@ -12,7 +12,6 @@
 #include "nsUnicharUtils.h"
 #include "nsCRT.h"
 #include "nsCOMPtr.h"
-#include "prmem.h"
 
 
 #define NSDATETIMEFORMAT_BUFFER_LEN  80
diff --git a/intl/lwbrk/src/nsSemanticUnitScanner.cpp b/intl/lwbrk/src/nsSemanticUnitScanner.cpp
index 1cd53a36e525..cb50d5e7573e 100644
--- a/intl/lwbrk/src/nsSemanticUnitScanner.cpp
+++ b/intl/lwbrk/src/nsSemanticUnitScanner.cpp
@@ -4,7 +4,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsSemanticUnitScanner.h"
-#include "prmem.h"
 
 NS_IMPL_ISUPPORTS1(nsSemanticUnitScanner, nsISemanticUnitScanner)
 
diff --git a/intl/uconv/src/nsCharsetConverterManager.cpp b/intl/uconv/src/nsCharsetConverterManager.cpp
index a99076826ac0..022d6fb908e1 100644
--- a/intl/uconv/src/nsCharsetConverterManager.cpp
+++ b/intl/uconv/src/nsCharsetConverterManager.cpp
@@ -13,7 +13,6 @@
 #include "nsICharsetConverterManager.h"
 #include "nsEncoderDecoderUtils.h"
 #include "nsIStringBundle.h"
-#include "prmem.h"
 #include "nsCRT.h"
 #include "nsTArray.h"
 #include "nsStringEnumerator.h"
diff --git a/intl/uconv/src/nsTextToSubURI.cpp b/intl/uconv/src/nsTextToSubURI.cpp
index 8335488bb32a..41e00eb519cb 100644
--- a/intl/uconv/src/nsTextToSubURI.cpp
+++ b/intl/uconv/src/nsTextToSubURI.cpp
@@ -9,7 +9,6 @@
 #include "nsITextToSubURI.h"
 #include "nsIServiceManager.h"
 #include "nsEscape.h"
-#include "prmem.h"
 #include "nsTextToSubURI.h"
 #include "nsCRT.h"
 
diff --git a/intl/uconv/src/nsUTF8ConverterService.cpp b/intl/uconv/src/nsUTF8ConverterService.cpp
index 2ba81996762c..b42ae2360b9f 100644
--- a/intl/uconv/src/nsUTF8ConverterService.cpp
+++ b/intl/uconv/src/nsUTF8ConverterService.cpp
@@ -9,7 +9,6 @@
 #include "nsICharsetConverterManager.h"
 #include "nsReadableUtils.h"
 #include "nsIServiceManager.h"
-#include "prmem.h"
 #include "nsUTF8ConverterService.h"
 #include "nsEscape.h"
 #include "nsAutoPtr.h"
diff --git a/intl/uconv/tests/nsTestUConv.cpp b/intl/uconv/tests/nsTestUConv.cpp
index e1cb208b7b25..dec3cc702b8f 100644
--- a/intl/uconv/tests/nsTestUConv.cpp
+++ b/intl/uconv/tests/nsTestUConv.cpp
@@ -11,7 +11,6 @@
 #include "nsISupports.h"
 #include "nsICharsetConverterManager.h"
 #include "nsIPlatformCharset.h"
-#include "prmem.h"
 #include "nsReadableUtils.h"
 
 
diff --git a/js/xpconnect/loader/mozJSComponentLoader.cpp b/js/xpconnect/loader/mozJSComponentLoader.cpp
index 3ab57a56b213..75fd77704a04 100644
--- a/js/xpconnect/loader/mozJSComponentLoader.cpp
+++ b/js/xpconnect/loader/mozJSComponentLoader.cpp
@@ -51,7 +51,6 @@
 #include "nsIConsoleService.h"
 #include "nsIStorageStream.h"
 #include "nsIStringStream.h"
-#include "prmem.h"
 #if defined(XP_WIN)
 #include "nsILocalFileWin.h"
 #endif
diff --git a/js/xpconnect/src/xpcprivate.h b/js/xpconnect/src/xpcprivate.h
index 70b5022b82cf..b7fa8cd01f2f 100644
--- a/js/xpconnect/src/xpcprivate.h
+++ b/js/xpconnect/src/xpcprivate.h
@@ -133,7 +133,6 @@
 #include "xpcexception.h"
 #include "xpcjsid.h"
 #include "prlong.h"
-#include "prmem.h"
 #include "prenv.h"
 #include "prclist.h"
 #include "nsString.h"
diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp
index 09b3782e5892..98f3a1c29dab 100644
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -42,7 +42,6 @@
 #include "nsView.h"
 #include "nsCRTGlue.h"
 #include "prlog.h"
-#include "prmem.h"
 #include "prprf.h"
 #include "prinrval.h"
 #include "nsTArray.h"
diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp
index 5a13317fac33..b56598a47176 100644
--- a/layout/generic/nsObjectFrame.cpp
+++ b/layout/generic/nsObjectFrame.cpp
@@ -20,7 +20,6 @@
 #include "nsPluginHost.h"
 #include "nsString.h"
 #include "nsReadableUtils.h"
-#include "prmem.h"
 #include "nsGkAtoms.h"
 #include "nsIAppShell.h"
 #include "nsIDocument.h"
diff --git a/modules/libjar/nsJAR.h b/modules/libjar/nsJAR.h
index d8e0355b3229..5d7024a93d1d 100644
--- a/modules/libjar/nsJAR.h
+++ b/modules/libjar/nsJAR.h
@@ -9,7 +9,6 @@
 
 #include "nscore.h"
 #include "pratom.h"
-#include "prmem.h"
 #include "prio.h"
 #include "plstr.h"
 #include "prlog.h"
diff --git a/modules/libjar/nsJARFactory.cpp b/modules/libjar/nsJARFactory.cpp
index f4c29c98710d..e3eff26ced2e 100644
--- a/modules/libjar/nsJARFactory.cpp
+++ b/modules/libjar/nsJARFactory.cpp
@@ -6,11 +6,6 @@
 #include <string.h>
 
 #include "nscore.h"
-#include "pratom.h"
-#include "prmem.h"
-#include "prio.h"
-#include "plstr.h"
-#include "prlog.h"
 
 #include "nsIComponentManager.h"
 #include "nsIServiceManager.h"
diff --git a/modules/libpref/src/nsPrefBranch.cpp b/modules/libpref/src/nsPrefBranch.cpp
index 86758c8d9a46..56936d916b93 100644
--- a/modules/libpref/src/nsPrefBranch.cpp
+++ b/modules/libpref/src/nsPrefBranch.cpp
@@ -17,10 +17,8 @@
 #include "nsXPIDLString.h"
 #include "nsIStringBundle.h"
 #include "prefapi.h"
-#include "prmem.h"
 #include "pldhash.h"
 
-#include "plstr.h"
 #include "nsCRT.h"
 #include "mozilla/Services.h"
 
diff --git a/modules/libpref/src/prefapi.cpp b/modules/libpref/src/prefapi.cpp
index 483e672a9fd8..172d1fe99673 100644
--- a/modules/libpref/src/prefapi.cpp
+++ b/modules/libpref/src/prefapi.cpp
@@ -25,7 +25,6 @@
 #include "pldhash.h"
 #include "plbase64.h"
 #include "prlog.h"
-#include "prmem.h"
 #include "prprf.h"
 #include "mozilla/dom/PContent.h"
 #include "nsQuickSort.h"
diff --git a/netwerk/base/src/nsPreloadedStream.cpp b/netwerk/base/src/nsPreloadedStream.cpp
index d9ab3639daeb..84f97c094927 100644
--- a/netwerk/base/src/nsPreloadedStream.cpp
+++ b/netwerk/base/src/nsPreloadedStream.cpp
@@ -8,7 +8,6 @@
 
 #include "nsThreadUtils.h"
 #include "nsAlgorithm.h"
-#include "prmem.h"
    
 namespace mozilla {
 namespace net {
diff --git a/netwerk/base/src/nsProtocolProxyService.h b/netwerk/base/src/nsProtocolProxyService.h
index dede166e9b1f..35ec5c26c8a6 100644
--- a/netwerk/base/src/nsProtocolProxyService.h
+++ b/netwerk/base/src/nsProtocolProxyService.h
@@ -20,7 +20,6 @@
 #include "nsHashKeys.h"
 #include "nsPACMan.h"
 #include "prtime.h"
-#include "prmem.h"
 #include "prio.h"
 #include "mozilla/Attributes.h"
 
diff --git a/netwerk/base/src/nsSimpleURI.cpp b/netwerk/base/src/nsSimpleURI.cpp
index 5665103abe1f..c677bb952347 100644
--- a/netwerk/base/src/nsSimpleURI.cpp
+++ b/netwerk/base/src/nsSimpleURI.cpp
@@ -10,7 +10,6 @@
 #include "nsCRT.h"
 #include "nsString.h"
 #include "nsReadableUtils.h"
-#include "prmem.h"
 #include "prprf.h"
 #include "nsURLHelper.h"
 #include "nsNetCID.h"
diff --git a/netwerk/protocol/http/nsHttpBasicAuth.cpp b/netwerk/protocol/http/nsHttpBasicAuth.cpp
index 59ca02b56e2f..f513bdafc21b 100644
--- a/netwerk/protocol/http/nsHttpBasicAuth.cpp
+++ b/netwerk/protocol/http/nsHttpBasicAuth.cpp
@@ -8,7 +8,6 @@
 #include "nsHttpBasicAuth.h"
 #include "plbase64.h"
 #include "plstr.h"
-#include "prmem.h"
 #include "nsString.h"
 
 //-----------------------------------------------------------------------------
diff --git a/netwerk/protocol/http/nsHttpConnection.cpp b/netwerk/protocol/http/nsHttpConnection.cpp
index 1e6bc028fcd9..884668e2c861 100644
--- a/netwerk/protocol/http/nsHttpConnection.cpp
+++ b/netwerk/protocol/http/nsHttpConnection.cpp
@@ -18,7 +18,6 @@
 #include "netCore.h"
 #include "nsNetCID.h"
 #include "nsProxyRelease.h"
-#include "prmem.h"
 #include "nsPreloadedStream.h"
 #include "ASpdySession.h"
 #include "mozilla/Telemetry.h"
diff --git a/netwerk/protocol/http/nsHttpDigestAuth.cpp b/netwerk/protocol/http/nsHttpDigestAuth.cpp
index 2e38d2ee0f29..f314536ae3bb 100644
--- a/netwerk/protocol/http/nsHttpDigestAuth.cpp
+++ b/netwerk/protocol/http/nsHttpDigestAuth.cpp
@@ -19,7 +19,6 @@
 #include "plbase64.h"
 #include "plstr.h"
 #include "prprf.h"
-#include "prmem.h"
 #include "nsCRT.h"
 
 //-----------------------------------------------------------------------------
diff --git a/netwerk/protocol/res/nsResProtocolHandler.cpp b/netwerk/protocol/res/nsResProtocolHandler.cpp
index 8d200825436f..f115c809c639 100644
--- a/netwerk/protocol/res/nsResProtocolHandler.cpp
+++ b/netwerk/protocol/res/nsResProtocolHandler.cpp
@@ -10,7 +10,6 @@
 #include "nsIIOService.h"
 #include "nsIServiceManager.h"
 #include "prenv.h"
-#include "prmem.h"
 #include "prprf.h"
 #include "nsXPIDLString.h"
 #include "nsIFile.h"
diff --git a/netwerk/system/win32/nsNotifyAddrListener.cpp b/netwerk/system/win32/nsNotifyAddrListener.cpp
index dd08a2b4abdc..d111a15e5f95 100644
--- a/netwerk/system/win32/nsNotifyAddrListener.cpp
+++ b/netwerk/system/win32/nsNotifyAddrListener.cpp
@@ -13,7 +13,6 @@
 #include <netcon.h>
 #include <objbase.h>
 #include <iprtrmib.h>
-#include "prmem.h"
 #include "plstr.h"
 #include "nsThreadUtils.h"
 #include "nsIObserverService.h"
diff --git a/parser/htmlparser/src/CNavDTD.cpp b/parser/htmlparser/src/CNavDTD.cpp
index efd6b23b0691..3088512d7c4f 100644
--- a/parser/htmlparser/src/CNavDTD.cpp
+++ b/parser/htmlparser/src/CNavDTD.cpp
@@ -27,7 +27,6 @@
 #include "nsTArray.h"
 #include "nsReadableUtils.h"
 #include "nsUnicharUtils.h"
-#include "prmem.h"
 #include "nsIServiceManager.h"
 #include "nsParserConstants.h"
 
diff --git a/security/manager/boot/src/nsSecureBrowserUIImpl.cpp b/security/manager/boot/src/nsSecureBrowserUIImpl.cpp
index 49716789ea56..027b744cbe1c 100644
--- a/security/manager/boot/src/nsSecureBrowserUIImpl.cpp
+++ b/security/manager/boot/src/nsSecureBrowserUIImpl.cpp
@@ -9,7 +9,6 @@
 
 #include "nspr.h"
 #include "prlog.h"
-#include "prmem.h"
 
 #include "nsISecureBrowserUI.h"
 #include "nsSecureBrowserUIImpl.h"
diff --git a/security/manager/ssl/src/nsCRLInfo.cpp b/security/manager/ssl/src/nsCRLInfo.cpp
index 81594496303f..d87459e41a2e 100644
--- a/security/manager/ssl/src/nsCRLInfo.cpp
+++ b/security/manager/ssl/src/nsCRLInfo.cpp
@@ -2,7 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "prmem.h"
 #include "prerror.h"
 #include "prprf.h"
 
diff --git a/security/manager/ssl/src/nsCrypto.cpp b/security/manager/ssl/src/nsCrypto.cpp
index 8e0aa439d08d..ca32342f4dad 100644
--- a/security/manager/ssl/src/nsCrypto.cpp
+++ b/security/manager/ssl/src/nsCrypto.cpp
@@ -18,7 +18,6 @@
 #include "nsAlgorithm.h"
 #include "nsCRT.h"
 #include "prprf.h"
-#include "prmem.h"
 #include "nsDOMCID.h"
 #include "nsIDOMWindow.h"
 #include "nsIDOMClassInfo.h"
diff --git a/security/manager/ssl/src/nsNSSCertHelper.cpp b/security/manager/ssl/src/nsNSSCertHelper.cpp
index 50dea4b05208..f58536009aeb 100644
--- a/security/manager/ssl/src/nsNSSCertHelper.cpp
+++ b/security/manager/ssl/src/nsNSSCertHelper.cpp
@@ -2,7 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "prmem.h"
 #include "prerror.h"
 #include "prprf.h"
 
diff --git a/startupcache/StartupCacheModule.cpp b/startupcache/StartupCacheModule.cpp
index f199ebb5c4da..5ec4c584224a 100644
--- a/startupcache/StartupCacheModule.cpp
+++ b/startupcache/StartupCacheModule.cpp
@@ -6,11 +6,6 @@
 #include <string.h>
 
 #include "nscore.h"
-#include "pratom.h"
-#include "prmem.h"
-#include "prio.h"
-#include "plstr.h"
-#include "prlog.h"
 
 #include "nsID.h"
 #include "nsIComponentManager.h"
diff --git a/toolkit/components/filepicker/nsFileView.cpp b/toolkit/components/filepicker/nsFileView.cpp
index 548c151166ca..1e04d6939ae5 100644
--- a/toolkit/components/filepicker/nsFileView.cpp
+++ b/toolkit/components/filepicker/nsFileView.cpp
@@ -13,7 +13,6 @@
 #include "nsString.h"
 #include "nsReadableUtils.h"
 #include "nsCRT.h"
-#include "prmem.h"
 #include "nsPrintfCString.h"
 #include "nsIDateTimeFormat.h"
 #include "nsDateTimeFormatCID.h"
diff --git a/toolkit/components/url-classifier/nsUrlClassifierUtils.cpp b/toolkit/components/url-classifier/nsUrlClassifierUtils.cpp
index e5aa57411ffb..00ee52b1e0b5 100644
--- a/toolkit/components/url-classifier/nsUrlClassifierUtils.cpp
+++ b/toolkit/components/url-classifier/nsUrlClassifierUtils.cpp
@@ -10,7 +10,6 @@
 #include "nsTArray.h"
 #include "nsReadableUtils.h"
 #include "plbase64.h"
-#include "prmem.h"
 #include "prprf.h"
 
 static char int_to_hex_digit(int32_t i)
diff --git a/uriloader/exthandler/unix/nsGNOMERegistry.cpp b/uriloader/exthandler/unix/nsGNOMERegistry.cpp
index a4b8a0df7396..0dfe283f01f0 100644
--- a/uriloader/exthandler/unix/nsGNOMERegistry.cpp
+++ b/uriloader/exthandler/unix/nsGNOMERegistry.cpp
@@ -4,8 +4,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsGNOMERegistry.h"
-#include "prlink.h"
-#include "prmem.h"
 #include "nsString.h"
 #include "nsIComponentManager.h"
 #include "nsIFile.h"
diff --git a/widget/cocoa/nsDeviceContextSpecX.mm b/widget/cocoa/nsDeviceContextSpecX.mm
index f2eb545c07fa..2c3721d86fe1 100644
--- a/widget/cocoa/nsDeviceContextSpecX.mm
+++ b/widget/cocoa/nsDeviceContextSpecX.mm
@@ -6,8 +6,6 @@
 #include "nsDeviceContextSpecX.h"
 #include "nsObjCExceptions.h"
 
-#include "prmem.h"
-#include "plstr.h"
 #include "nsCRT.h"
 #include <unistd.h>
 
diff --git a/widget/cocoa/nsMenuItemIconX.mm b/widget/cocoa/nsMenuItemIconX.mm
index 0978269c0713..e3bcae1e689f 100644
--- a/widget/cocoa/nsMenuItemIconX.mm
+++ b/widget/cocoa/nsMenuItemIconX.mm
@@ -10,7 +10,6 @@
 #include "nsMenuItemIconX.h"
 
 #include "nsObjCExceptions.h"
-#include "prmem.h"
 #include "nsIContent.h"
 #include "nsIDocument.h"
 #include "nsINameSpaceManager.h"
diff --git a/widget/gtk2/nsFilePicker.cpp b/widget/gtk2/nsFilePicker.cpp
index 2a54d3c5347c..fd915a4dcb28 100644
--- a/widget/gtk2/nsFilePicker.cpp
+++ b/widget/gtk2/nsFilePicker.cpp
@@ -20,9 +20,6 @@
 #include "nsReadableUtils.h"
 #include "mozcontainer.h"
 
-#include "prmem.h"
-#include "prlink.h"
-
 #include "nsFilePicker.h"
 
 #if (MOZ_PLATFORM_MAEMO == 5)
diff --git a/widget/os2/nsClipboard.cpp b/widget/os2/nsClipboard.cpp
index 0e062e64fdad..e494c7972ea6 100644
--- a/widget/os2/nsClipboard.cpp
+++ b/widget/os2/nsClipboard.cpp
@@ -9,7 +9,6 @@
 #include "nsCOMPtr.h"
 #include "nsPrimitiveHelpers.h"
 #include "nsXPIDLString.h"
-#include "prmem.h"
 #include "nsOS2Uni.h"
 #include "nsClipboard.h"
 
diff --git a/xpcom/base/nsAllocator.h b/xpcom/base/nsAllocator.h
index 8f817bca1791..cae01c7e7942 100644
--- a/xpcom/base/nsAllocator.h
+++ b/xpcom/base/nsAllocator.h
@@ -11,7 +11,6 @@
 #define nsAllocator_h__
 
 #include "nsIAllocator.h"
-#include "prmem.h"
 #include "nsAgg.h"
 #include "nsIFactory.h"
 
diff --git a/xpcom/base/nsMemoryImpl.cpp b/xpcom/base/nsMemoryImpl.cpp
index fa7bd6cc8d85..169463f41823 100644
--- a/xpcom/base/nsMemoryImpl.cpp
+++ b/xpcom/base/nsMemoryImpl.cpp
@@ -12,7 +12,6 @@
 #include "nsIServiceManager.h"
 #include "nsISupportsArray.h"
 
-#include "prmem.h"
 #include "prcvar.h"
 #include "pratom.h"
 
diff --git a/xpcom/threads/nsTimerImpl.cpp b/xpcom/threads/nsTimerImpl.cpp
index 788f99e5dca8..47845ce8a981 100644
--- a/xpcom/threads/nsTimerImpl.cpp
+++ b/xpcom/threads/nsTimerImpl.cpp
@@ -8,7 +8,6 @@
 #include "nsAutoPtr.h"
 #include "nsThreadManager.h"
 #include "nsThreadUtils.h"
-#include "prmem.h"
 #include "sampler.h"
 #include NEW_H
 #include "nsFixedSizeAllocator.h"
diff --git a/xpfe/appshell/src/nsWebShellWindow.cpp b/xpfe/appshell/src/nsWebShellWindow.cpp
index 3f6886afd6e4..4d458e360777 100644
--- a/xpfe/appshell/src/nsWebShellWindow.cpp
+++ b/xpfe/appshell/src/nsWebShellWindow.cpp
@@ -38,7 +38,6 @@
 #include "nsITimer.h"
 #include "nsXULPopupManager.h"
 
-#include "prmem.h"
 
 #include "nsIDOMXULDocument.h"