diff --git a/content/media/AudioStream.cpp b/content/media/AudioStream.cpp
index 673cff38c02..35c237fcb8e 100644
--- a/content/media/AudioStream.cpp
+++ b/content/media/AudioStream.cpp
@@ -6,7 +6,6 @@
 #include <stdio.h>
 #include <math.h>
 #include "prlog.h"
-#include "prmem.h"
 #include "prdtoa.h"
 #include "AudioStream.h"
 #include "nsAlgorithm.h"
diff --git a/content/media/webrtc/MediaEngineDefault.cpp b/content/media/webrtc/MediaEngineDefault.cpp
index f1a1a8e6bbc..2daf48f5f0f 100644
--- a/content/media/webrtc/MediaEngineDefault.cpp
+++ b/content/media/webrtc/MediaEngineDefault.cpp
@@ -10,6 +10,7 @@
 #include "Layers.h"
 #include "ImageContainer.h"
 #include "ImageTypes.h"
+#include "prmem.h"
 
 #ifdef MOZ_WIDGET_ANDROID
 #include "AndroidBridge.h"
diff --git a/content/media/webrtc/MediaEngineDefault.h b/content/media/webrtc/MediaEngineDefault.h
index ad89cca0558..4b0b9bd77e0 100644
--- a/content/media/webrtc/MediaEngineDefault.h
+++ b/content/media/webrtc/MediaEngineDefault.h
@@ -5,7 +5,6 @@
 #ifndef MEDIAENGINEDEFAULT_H_
 #define MEDIAENGINEDEFAULT_H_
 
-#include "prmem.h"
 #include "nsITimer.h"
 
 #include "nsCOMPtr.h"
diff --git a/content/media/webrtc/MediaEngineWebRTC.h b/content/media/webrtc/MediaEngineWebRTC.h
index 044c48b68cc..627cdbd6cb6 100644
--- a/content/media/webrtc/MediaEngineWebRTC.h
+++ b/content/media/webrtc/MediaEngineWebRTC.h
@@ -5,7 +5,6 @@
 #ifndef MEDIAENGINEWEBRTC_H_
 #define MEDIAENGINEWEBRTC_H_
 
-#include "prmem.h"
 #include "prcvar.h"
 #include "prthread.h"
 #include "nsIThread.h"
diff --git a/content/xslt/src/base/txLog.h b/content/xslt/src/base/txLog.h
index 438a5d797d5..56ec1a6dbeb 100644
--- a/content/xslt/src/base/txLog.h
+++ b/content/xslt/src/base/txLog.h
@@ -7,7 +7,6 @@
 #define txLog_h__
 
 #include "prlog.h"
-#include "prmem.h"
 #endif
 
 #ifdef PR_LOGGING
diff --git a/content/xul/document/src/nsXULContentSink.cpp b/content/xul/document/src/nsXULContentSink.cpp
index f4704e8704e..7d70913f865 100644
--- a/content/xul/document/src/nsXULContentSink.cpp
+++ b/content/xul/document/src/nsXULContentSink.cpp
@@ -170,7 +170,7 @@ XULContentSinkImpl::~XULContentSinkImpl()
     NS_ASSERTION(mContextStack.Depth() == 0, "Context stack not empty?");
     mContextStack.Clear();
 
-    PR_FREEIF(mText);
+    moz_free(mText);
 }
 
 //----------------------------------------------------------------------
@@ -1051,7 +1051,7 @@ XULContentSinkImpl::AddText(const PRUnichar* aText,
 {
   // Create buffer when we first need it
   if (0 == mTextSize) {
-      mText = (PRUnichar *) PR_MALLOC(sizeof(PRUnichar) * 4096);
+      mText = (PRUnichar *) moz_malloc(sizeof(PRUnichar) * 4096);
       if (nullptr == mText) {
           return NS_ERROR_OUT_OF_MEMORY;
       }
@@ -1074,7 +1074,7 @@ XULContentSinkImpl::AddText(const PRUnichar* aText,
       }
       else {
         mTextSize += aLength;
-        mText = (PRUnichar *) PR_REALLOC(mText, sizeof(PRUnichar) * mTextSize);
+        mText = (PRUnichar *) moz_realloc(mText, sizeof(PRUnichar) * mTextSize);
         if (nullptr == mText) {
             return NS_ERROR_OUT_OF_MEMORY;
         }
diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index 05601db4047..3301fd14c8c 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -161,7 +161,6 @@
 #include "nsIJARChannel.h"
 
 #include "prlog.h"
-#include "prmem.h"
 
 #include "nsISelectionDisplay.h"
 
diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index f2f4977f01e..2716ace3ca2 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -32,7 +32,6 @@
 // Helper Classes
 #include "nsXPIDLString.h"
 #include "nsJSUtils.h"
-#include "prmem.h"
 #include "jsapi.h"              // for JSAutoRequest
 #include "jsdbgapi.h"           // for JS_ClearWatchPointsForObject
 #include "jsfriendapi.h"        // for JS_GetGlobalForFrame
diff --git a/dom/file/ArchiveZipEvent.cpp b/dom/file/ArchiveZipEvent.cpp
index d9cb8c9b58f..4ddfbeef755 100644
--- a/dom/file/ArchiveZipEvent.cpp
+++ b/dom/file/ArchiveZipEvent.cpp
@@ -191,7 +191,7 @@ ArchiveReaderZipEvent::Exec()
     }
 
     // Read the name:
-    char* filename = (char*)PR_Malloc(filenameLen + 1);
+    nsAutoArrayPtr<char> filename(new char[filenameLen + 1]);
     rv = inputStream->Read(filename, filenameLen, &ret);
     if (NS_FAILED(rv) || ret != filenameLen) {
       return RunShare(NS_ERROR_UNEXPECTED);
@@ -204,8 +204,6 @@ ArchiveReaderZipEvent::Exec()
       mFileList.AppendElement(new ArchiveZipItem(filename, centralStruct, mOptions));
     }
 
-    PR_Free(filename);
-
     // Ignore the rest
     seekableStream->Seek(nsISeekableStream::NS_SEEK_CUR, extraLen + commentLen);
   }
diff --git a/dom/plugins/base/nsPluginDirServiceProvider.cpp b/dom/plugins/base/nsPluginDirServiceProvider.cpp
index 6a205f6e772..b7e9c006b72 100644
--- a/dom/plugins/base/nsPluginDirServiceProvider.cpp
+++ b/dom/plugins/base/nsPluginDirServiceProvider.cpp
@@ -8,7 +8,6 @@
 #include "nsCRT.h"
 #include "nsIFile.h"
 #include "nsDependentString.h"
-#include "prmem.h"
 #include "nsArrayEnumerator.h"
 #include "mozilla/Preferences.h"