--- a/gfx/thebes/gfxImageSurface.cpp
+++ b/gfx/thebes/gfxImageSurface.cpp
@@ -91,19 +91,19 @@ gfxImageSurface::InitWithData(unsigned c
 static void*
 TryAllocAlignedBytes(size_t aSize)
 {
     // Use fallible allocators here
 #if defined(HAVE_POSIX_MEMALIGN)
     void* ptr;
     // Try to align for fast alpha recovery.  This should only help
     // cairo too, can't hurt.
-    return moz_posix_memalign(&ptr,
-                              1 << gfxAlphaRecovery::GoodAlignmentLog2(),
-                              aSize) ?
+    return posix_memalign(&ptr,
+                          1 << gfxAlphaRecovery::GoodAlignmentLog2(),
+                          aSize) ?
              nullptr : ptr;
 #else
     // Oh well, hope that luck is with us in the allocator
     return malloc(aSize);
 #endif
 }
 
 gfxImageSurface::gfxImageSurface(const IntSize& size, gfxImageFormat format, bool aClear)

--- a/memory/volatile/VolatileBufferFallback.cpp
+++ b/memory/volatile/VolatileBufferFallback.cpp
@@ -22,24 +22,20 @@ VolatileBuffer::VolatileBuffer()
 
 bool VolatileBuffer::Init(size_t aSize, size_t aAlignment)
 {
   MOZ_ASSERT(!mSize && !mBuf, "Init called twice");
   MOZ_ASSERT(!(aAlignment % sizeof(void *)),
              "Alignment must be multiple of pointer size");
 
   mSize = aSize;
-#if defined(MOZ_MEMORY)
+#if defined(MOZ_MEMORY) || defined(HAVE_POSIX_MEMALIGN)
   if (posix_memalign(&mBuf, aAlignment, aSize) != 0) {
     return false;
   }
-#elif defined(HAVE_POSIX_MEMALIGN)
-  if (moz_posix_memalign(&mBuf, aAlignment, aSize) != 0) {
-    return false;
-  }
 #else
 #error "No memalign implementation found"
 #endif
   return !!mBuf;
 }
 
 VolatileBuffer::~VolatileBuffer()
 {

--- a/memory/volatile/VolatileBufferOSX.cpp
+++ b/memory/volatile/VolatileBufferOSX.cpp
@@ -42,17 +42,17 @@ VolatileBuffer::Init(size_t aSize, size_
                     (vm_address_t*)&mBuf,
                     mSize,
                     VM_FLAGS_PURGABLE | VM_FLAGS_ANYWHERE);
   if (ret == KERN_SUCCESS) {
     return true;
   }
 
 heap_alloc:
-  (void)moz_posix_memalign(&mBuf, aAlignment, aSize);
+  (void)posix_memalign(&mBuf, aAlignment, aSize);
   mHeap = true;
   return !!mBuf;
 }
 
 VolatileBuffer::~VolatileBuffer()
 {
   MOZ_ASSERT(mLockCount == 0, "Being destroyed with non-zero lock count?");