diff --git a/gfx/layers/basic/BasicLayersImpl.h b/gfx/layers/basic/BasicLayersImpl.h
index e7e697e594bf..1d537ebd6a53 100644
--- a/gfx/layers/basic/BasicLayersImpl.h
+++ b/gfx/layers/basic/BasicLayersImpl.h
@@ -74,7 +74,7 @@ protected:
  * This helper class manages the gfxASurface-or-SurfaceDescriptor
  * logic.
  */
-class NS_STACK_CLASS AutoMaskData {
+class MOZ_STACK_CLASS AutoMaskData {
 public:
   AutoMaskData() { }
   ~AutoMaskData() { }
diff --git a/gfx/layers/ipc/AutoOpenSurface.h b/gfx/layers/ipc/AutoOpenSurface.h
index dbd1e0ce8b1a..4f628cd2686f 100644
--- a/gfx/layers/ipc/AutoOpenSurface.h
+++ b/gfx/layers/ipc/AutoOpenSurface.h
@@ -23,7 +23,7 @@ namespace layers {
  * ahsolutely necessary.  And after being forced to open, it remembers
  * the mapping so it doesn't need to be redone.
  */
-class NS_STACK_CLASS AutoOpenSurface
+class MOZ_STACK_CLASS AutoOpenSurface
 {
 public:
   typedef gfxASurface::gfxContentType gfxContentType;
diff --git a/gfx/layers/ipc/CompositorParent.cpp b/gfx/layers/ipc/CompositorParent.cpp
index 5ca64cdd3784..d1ef5a66fe32 100644
--- a/gfx/layers/ipc/CompositorParent.cpp
+++ b/gfx/layers/ipc/CompositorParent.cpp
@@ -468,7 +468,7 @@ CompositorParent::SetTransformation(float aScale, nsIntPoint aScrollOffset)
  * to the layer tree, if found.  On exiting scope, detaches all
  * resolved referents.
  */
-class NS_STACK_CLASS AutoResolveRefLayers {
+class MOZ_STACK_CLASS AutoResolveRefLayers {
 public:
   /**
    * |aRoot| must remain valid in the scope of this, which should be
diff --git a/gfx/thebes/gfxUtils.cpp b/gfx/thebes/gfxUtils.cpp
index f958db62b1a3..fe91597954b2 100644
--- a/gfx/thebes/gfxUtils.cpp
+++ b/gfx/thebes/gfxUtils.cpp
@@ -264,7 +264,7 @@ CreateSamplingRestrictedDrawable(gfxDrawable* aDrawable,
 
 // working around cairo/pixman bug (bug 364968)
 // Our device-space-to-image-space transform may not be acceptable to pixman.
-struct NS_STACK_CLASS AutoCairoPixmanBugWorkaround
+struct MOZ_STACK_CLASS AutoCairoPixmanBugWorkaround
 {
     AutoCairoPixmanBugWorkaround(gfxContext*      aContext,
                                  const gfxMatrix& aDeviceSpaceToImageSpace,