diff --git a/dom/bindings/BindingDeclarations.h b/dom/bindings/BindingDeclarations.h
index bbf1bbc51b2d..0acaef30597e 100644
--- a/dom/bindings/BindingDeclarations.h
+++ b/dom/bindings/BindingDeclarations.h
@@ -44,7 +44,7 @@ struct EnumEntry {
   size_t length;
 };
 
-class NS_STACK_CLASS GlobalObject
+class MOZ_STACK_CLASS GlobalObject
 {
 public:
   GlobalObject(JSContext* aCx, JSObject* aObject);
@@ -65,7 +65,7 @@ private:
   nsCOMPtr<nsISupports> mGlobalObjectRef;
 };
 
-class NS_STACK_CLASS WorkerGlobalObject
+class MOZ_STACK_CLASS WorkerGlobalObject
 {
 public:
   WorkerGlobalObject(JSContext* aCx, JSObject* aObject);
@@ -111,7 +111,7 @@ private:
  * empty string.  If HasStringBuffer() returns false, call AsAString() and get
  * the value from that.
  */
-class NS_STACK_CLASS DOMString {
+class MOZ_STACK_CLASS DOMString {
 public:
   DOMString()
     : mStringBuffer(nullptr)
diff --git a/dom/bindings/BindingUtils.cpp b/dom/bindings/BindingUtils.cpp
index 387a4a265b1f..db155f37b0db 100644
--- a/dom/bindings/BindingUtils.cpp
+++ b/dom/bindings/BindingUtils.cpp
@@ -1414,7 +1414,7 @@ NativeToString(JSContext* cx, JSObject* wrapper, JSObject* object, const char* p
 }
 
 // Dynamically ensure that two objects don't end up with the same reserved slot.
-class AutoCloneDOMObjectSlotGuard NS_STACK_CLASS
+class MOZ_STACK_CLASS AutoCloneDOMObjectSlotGuard
 {
 public:
   AutoCloneDOMObjectSlotGuard(JSObject* aOld, JSObject* aNew)
diff --git a/dom/bindings/CallbackObject.h b/dom/bindings/CallbackObject.h
index a3741a91f5bd..c8a678bc58ea 100644
--- a/dom/bindings/CallbackObject.h
+++ b/dom/bindings/CallbackObject.h
@@ -134,7 +134,7 @@ protected:
 
   JSObject* mCallback;
 
-  class NS_STACK_CLASS CallSetup
+  class MOZ_STACK_CLASS CallSetup
   {
     /**
      * A class that performs whatever setup we need to safely make a
diff --git a/dom/indexedDB/AsyncConnectionHelper.cpp b/dom/indexedDB/AsyncConnectionHelper.cpp
index 1becc7c39ca5..36c91730606c 100644
--- a/dom/indexedDB/AsyncConnectionHelper.cpp
+++ b/dom/indexedDB/AsyncConnectionHelper.cpp
@@ -33,7 +33,7 @@ IDBTransaction* gCurrentTransaction = nullptr;
 
 const uint32_t kProgressHandlerGranularity = 1000;
 
-class TransactionPoolEventTarget : public StackBasedEventTarget
+class MOZ_STACK_CLASS TransactionPoolEventTarget : public StackBasedEventTarget
 {
 public:
   NS_DECL_NSIEVENTTARGET
diff --git a/dom/indexedDB/AsyncConnectionHelper.h b/dom/indexedDB/AsyncConnectionHelper.h
index 04965cc3c012..027e80de4d24 100644
--- a/dom/indexedDB/AsyncConnectionHelper.h
+++ b/dom/indexedDB/AsyncConnectionHelper.h
@@ -241,20 +241,19 @@ private:
   bool mDispatched;
 };
 
-NS_STACK_CLASS
-class StackBasedEventTarget : public nsIEventTarget
+class MOZ_STACK_CLASS StackBasedEventTarget : public nsIEventTarget
 {
 public:
   NS_DECL_ISUPPORTS_INHERITED
 };
 
-class ImmediateRunEventTarget : public StackBasedEventTarget
+class MOZ_STACK_CLASS ImmediateRunEventTarget : public StackBasedEventTarget
 {
 public:
   NS_DECL_NSIEVENTTARGET
 };
 
-class NoDispatchEventTarget : public StackBasedEventTarget
+class MOZ_STACK_CLASS NoDispatchEventTarget : public StackBasedEventTarget
 {
 public:
   NS_DECL_NSIEVENTTARGET
diff --git a/dom/indexedDB/IDBDatabase.cpp b/dom/indexedDB/IDBDatabase.cpp
index c20717620e0a..3e333c58bd65 100644
--- a/dom/indexedDB/IDBDatabase.cpp
+++ b/dom/indexedDB/IDBDatabase.cpp
@@ -144,8 +144,7 @@ private:
   nsRefPtr<FileInfo> mFileInfo;
 };
 
-NS_STACK_CLASS
-class AutoRemoveObjectStore
+class MOZ_STACK_CLASS AutoRemoveObjectStore
 {
 public:
   AutoRemoveObjectStore(DatabaseInfo* aInfo, const nsAString& aName)
diff --git a/dom/indexedDB/IDBObjectStore.cpp b/dom/indexedDB/IDBObjectStore.cpp
index 9d753db74cc6..9519ba58b90d 100644
--- a/dom/indexedDB/IDBObjectStore.cpp
+++ b/dom/indexedDB/IDBObjectStore.cpp
@@ -472,8 +472,7 @@ private:
   uint64_t mCount;
 };
 
-NS_STACK_CLASS
-class AutoRemoveIndex
+class MOZ_STACK_CLASS AutoRemoveIndex
 {
 public:
   AutoRemoveIndex(ObjectStoreInfo* aObjectStoreInfo,
diff --git a/dom/indexedDB/TransactionThreadPool.cpp b/dom/indexedDB/TransactionThreadPool.cpp
index d1c65f90b2ef..ff599ef15456 100644
--- a/dom/indexedDB/TransactionThreadPool.cpp
+++ b/dom/indexedDB/TransactionThreadPool.cpp
@@ -418,7 +418,7 @@ TransactionThreadPool::AbortTransactionsForDatabase(IDBDatabase* aDatabase)
   }
 }
 
-struct NS_STACK_CLASS TransactionSearchInfo
+struct MOZ_STACK_CLASS TransactionSearchInfo
 {
   TransactionSearchInfo(nsIOfflineStorage* aDatabase)
     : db(aDatabase), found(false)
diff --git a/dom/plugins/base/nsNPAPIPlugin.h b/dom/plugins/base/nsNPAPIPlugin.h
index 3d79668749a8..9c38e8df68f9 100644
--- a/dom/plugins/base/nsNPAPIPlugin.h
+++ b/dom/plugins/base/nsNPAPIPlugin.h
@@ -362,7 +362,7 @@ OnShutdown();
  * within a lexical scope, locks and unlocks the mutex used to
  * serialize modifications to plugin async callback state.
  */
-struct NS_STACK_CLASS AsyncCallbackAutoLock
+struct MOZ_STACK_CLASS AsyncCallbackAutoLock
 {
   AsyncCallbackAutoLock();
   ~AsyncCallbackAutoLock();
@@ -389,8 +389,8 @@ protected:
 // separate objects on the stack since we always want a
 // PluginDestructionGuard where we use an NPPAutoPusher.
 
-class NPPAutoPusher : public NPPStack,
-                      protected PluginDestructionGuard
+class MOZ_STACK_CLASS NPPAutoPusher : public NPPStack,
+                                      protected PluginDestructionGuard
 {
 public:
   NPPAutoPusher(NPP npp)
diff --git a/dom/plugins/base/nsNPAPIPluginInstance.cpp b/dom/plugins/base/nsNPAPIPluginInstance.cpp
index 132146008088..cba0788068a5 100644
--- a/dom/plugins/base/nsNPAPIPluginInstance.cpp
+++ b/dom/plugins/base/nsNPAPIPluginInstance.cpp
@@ -1171,7 +1171,7 @@ nsNPAPIPluginInstance::IsWindowless(bool* isWindowless)
   return NS_OK;
 }
 
-class NS_STACK_CLASS AutoPluginLibraryCall
+class MOZ_STACK_CLASS AutoPluginLibraryCall
 {
 public:
   AutoPluginLibraryCall(nsNPAPIPluginInstance* aThis)
diff --git a/dom/plugins/base/nsPluginHost.h b/dom/plugins/base/nsPluginHost.h
index 87c11930c13c..d27f8ab9ad28 100644
--- a/dom/plugins/base/nsPluginHost.h
+++ b/dom/plugins/base/nsPluginHost.h
@@ -301,7 +301,7 @@ private:
   static nsPluginHost* sInst;
 };
 
-class NS_STACK_CLASS PluginDestructionGuard : protected PRCList
+class MOZ_STACK_CLASS PluginDestructionGuard : protected PRCList
 {
 public:
   PluginDestructionGuard(nsNPAPIPluginInstance *aInstance)
diff --git a/dom/plugins/ipc/PluginIdentifierChild.h b/dom/plugins/ipc/PluginIdentifierChild.h
index 65527b016b09..fcc7e6d9e7e2 100644
--- a/dom/plugins/ipc/PluginIdentifierChild.h
+++ b/dom/plugins/ipc/PluginIdentifierChild.h
@@ -45,7 +45,7 @@ public:
 
   void MakePermanent();
 
-  class NS_STACK_CLASS StackIdentifier
+  class MOZ_STACK_CLASS StackIdentifier
   {
   public:
     StackIdentifier(PPluginIdentifierChild* actor)
diff --git a/dom/plugins/ipc/PluginIdentifierParent.h b/dom/plugins/ipc/PluginIdentifierParent.h
index 31eaf882899a..3a7c6526581e 100644
--- a/dom/plugins/ipc/PluginIdentifierParent.h
+++ b/dom/plugins/ipc/PluginIdentifierParent.h
@@ -34,7 +34,7 @@ public:
   /**
    * Holds a perhaps-temporary identifier for the current stack frame.
    */
-  class NS_STACK_CLASS StackIdentifier
+  class MOZ_STACK_CLASS StackIdentifier
   {
   public:
     StackIdentifier(PluginInstanceParent* inst, NPIdentifier aIdentifier);
diff --git a/dom/src/json/nsJSON.h b/dom/src/json/nsJSON.h
index cf6e8dd4c5b2..bf188b10bfee 100644
--- a/dom/src/json/nsJSON.h
+++ b/dom/src/json/nsJSON.h
@@ -20,7 +20,7 @@
 
 class nsIURI;
 
-class NS_STACK_CLASS nsJSONWriter
+class MOZ_STACK_CLASS nsJSONWriter
 {
 public:
   nsJSONWriter();