diff --git a/browser/components/shell/src/nsGNOMEShellService.h b/browser/components/shell/src/nsGNOMEShellService.h
index a676f56b96b7..8444b5a66d02 100644
--- a/browser/components/shell/src/nsGNOMEShellService.h
+++ b/browser/components/shell/src/nsGNOMEShellService.h
@@ -18,7 +18,7 @@ public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSISHELLSERVICE
 
-  nsresult Init() NS_HIDDEN;
+  nsresult Init();
 
 private:
   ~nsGNOMEShellService() {}
diff --git a/content/base/public/nsXMLNameSpaceMap.h b/content/base/public/nsXMLNameSpaceMap.h
index 07e559b21e63..18570dcae63e 100644
--- a/content/base/public/nsXMLNameSpaceMap.h
+++ b/content/base/public/nsXMLNameSpaceMap.h
@@ -66,7 +66,7 @@ public:
   ~nsXMLNameSpaceMap() { Clear(); }
 
 private:
-  nsXMLNameSpaceMap() NS_HIDDEN;  // use Create() to create new instances
+  nsXMLNameSpaceMap();  // use Create() to create new instances
 
   nsTArray<nsNameSpaceEntry> mNameSpaces;
 };
diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp
index c692b3305b9a..71dc948fa4eb 100644
--- a/content/base/src/nsDocument.cpp
+++ b/content/base/src/nsDocument.cpp
@@ -320,7 +320,7 @@ struct FireChangeArgs {
 // XXX Workaround for bug 980560 to maintain the existing broken semantics
 template<>
 struct nsIStyleRule::COMTypeInfo<css::Rule, void> {
-  static const nsIID kIID NS_HIDDEN;
+  static const nsIID kIID;
 };
 const nsIID nsIStyleRule::COMTypeInfo<css::Rule, void>::kIID = NS_ISTYLE_RULE_IID;
 
diff --git a/content/base/src/nsPropertyTable.cpp b/content/base/src/nsPropertyTable.cpp
index c99acf2c9687..ff4265d7bcdc 100644
--- a/content/base/src/nsPropertyTable.cpp
+++ b/content/base/src/nsPropertyTable.cpp
@@ -40,8 +40,8 @@ public:
   PropertyList(nsIAtom*           aName,
                NSPropertyDtorFunc aDtorFunc,
                void*              aDtorData,
-               bool               aTransfer) NS_HIDDEN;
-  ~PropertyList() NS_HIDDEN;
+               bool               aTransfer);
+  ~PropertyList();
 
   // Removes the property associated with the given object, and destroys
   // the property value
diff --git a/dom/ipc/ContentParent.cpp b/dom/ipc/ContentParent.cpp
index 7dec36d5446f..a4bbd8c4ea79 100644
--- a/dom/ipc/ContentParent.cpp
+++ b/dom/ipc/ContentParent.cpp
@@ -311,7 +311,7 @@ MaybeTestPBackground()
 // XXX Workaround for bug 986973 to maintain the existing broken semantics
 template<>
 struct nsIConsoleService::COMTypeInfo<nsConsoleService, void> {
-  static const nsIID kIID NS_HIDDEN;
+  static const nsIID kIID;
 };
 const nsIID nsIConsoleService::COMTypeInfo<nsConsoleService, void>::kIID = NS_ICONSOLESERVICE_IID;
 
diff --git a/dom/media/MediaManager.cpp b/dom/media/MediaManager.cpp
index 9c15d2fdc27c..22a3b827ea26 100644
--- a/dom/media/MediaManager.cpp
+++ b/dom/media/MediaManager.cpp
@@ -62,12 +62,12 @@
 // XXX Workaround for bug 986974 to maintain the existing broken semantics
 template<>
 struct nsIMediaDevice::COMTypeInfo<mozilla::VideoDevice, void> {
-  static const nsIID kIID NS_HIDDEN;
+  static const nsIID kIID;
 };
 const nsIID nsIMediaDevice::COMTypeInfo<mozilla::VideoDevice, void>::kIID = NS_IMEDIADEVICE_IID;
 template<>
 struct nsIMediaDevice::COMTypeInfo<mozilla::AudioDevice, void> {
-  static const nsIID kIID NS_HIDDEN;
+  static const nsIID kIID;
 };
 const nsIID nsIMediaDevice::COMTypeInfo<mozilla::AudioDevice, void>::kIID = NS_IMEDIADEVICE_IID;
 
diff --git a/intl/locale/src/nsLanguageAtomService.h b/intl/locale/src/nsLanguageAtomService.h
index 74c8732abddd..c155d32dd2cd 100644
--- a/intl/locale/src/nsLanguageAtomService.h
+++ b/intl/locale/src/nsLanguageAtomService.h
@@ -30,7 +30,7 @@ public:
   virtual nsIAtom* GetLanguageGroup(nsIAtom *aLanguage,
                                                 nsresult *aError);
 
-  nsLanguageAtomService() NS_HIDDEN;
+  nsLanguageAtomService();
 
 private:
   NS_HIDDEN ~nsLanguageAtomService() { }
diff --git a/layout/base/nsFrameManager.cpp b/layout/base/nsFrameManager.cpp
index c71e672664e7..3ac3d6470a11 100644
--- a/layout/base/nsFrameManager.cpp
+++ b/layout/base/nsFrameManager.cpp
@@ -84,8 +84,8 @@ static const PLDHashTableOps PlaceholderMapOps = {
 
 class nsFrameManagerBase::UndisplayedMap {
 public:
-  UndisplayedMap(uint32_t aNumBuckets = 16) NS_HIDDEN;
-  ~UndisplayedMap(void) NS_HIDDEN;
+  UndisplayedMap(uint32_t aNumBuckets = 16);
+  ~UndisplayedMap(void);
 
   UndisplayedNode* GetFirstNode(nsIContent* aParentContent);
 
diff --git a/layout/base/nsFrameManager.h b/layout/base/nsFrameManager.h
index a3b033eb9999..fe5685f4c97c 100644
--- a/layout/base/nsFrameManager.h
+++ b/layout/base/nsFrameManager.h
@@ -82,7 +82,7 @@ public:
     MOZ_ASSERT(mPresShell, "need a pres shell");
     MOZ_ASSERT(mStyleSet, "need a style set");
   }
-  ~nsFrameManager() NS_HIDDEN;
+  ~nsFrameManager();
 
   /*
    * After Destroy is called, it is an error to call any FrameManager methods.
diff --git a/layout/base/nsPresContext.h b/layout/base/nsPresContext.h
index 428c554cc6bb..d1948eb332e8 100644
--- a/layout/base/nsPresContext.h
+++ b/layout/base/nsPresContext.h
@@ -155,7 +155,7 @@ public:
     eAlwaysRebuildStyle
   };
 
-  nsPresContext(nsIDocument* aDocument, nsPresContextType aType) NS_HIDDEN;
+  nsPresContext(nsIDocument* aDocument, nsPresContextType aType);
 
   /**
    * Initialize the presentation context from a particular device.
@@ -1345,7 +1345,7 @@ protected:
 
 protected:
 
-  virtual ~nsPresContext() NS_HIDDEN;
+  virtual ~nsPresContext();
 
   // these are private, use the list in nsFont.h if you want a public list
   enum {
@@ -1377,7 +1377,7 @@ public:
 
 class nsRootPresContext MOZ_FINAL : public nsPresContext {
 public:
-  nsRootPresContext(nsIDocument* aDocument, nsPresContextType aType) NS_HIDDEN;
+  nsRootPresContext(nsIDocument* aDocument, nsPresContextType aType);
   virtual ~nsRootPresContext();
   virtual void Detach() MOZ_OVERRIDE;
 
diff --git a/layout/base/nsStyleSheetService.h b/layout/base/nsStyleSheetService.h
index 05d8139e2268..245d1f59f754 100644
--- a/layout/base/nsStyleSheetService.h
+++ b/layout/base/nsStyleSheetService.h
@@ -32,8 +32,8 @@ class nsStyleSheetService MOZ_FINAL
   , public nsIMemoryReporter
 {
  public:
-  nsStyleSheetService() NS_HIDDEN;
-  ~nsStyleSheetService() NS_HIDDEN;
+  nsStyleSheetService();
+  ~nsStyleSheetService();
 
   NS_DECL_ISUPPORTS
   NS_DECL_NSISTYLESHEETSERVICE
diff --git a/layout/xul/nsBoxLayoutState.h b/layout/xul/nsBoxLayoutState.h
index 0cd9da5ab2ac..b9fc69f0e44a 100644
--- a/layout/xul/nsBoxLayoutState.h
+++ b/layout/xul/nsBoxLayoutState.h
@@ -31,8 +31,8 @@ public:
                    nsRenderingContext* aRenderingContext = nullptr,
                    // see OuterReflowState() below
                    const nsHTMLReflowState* aOuterReflowState = nullptr,
-                   uint16_t aReflowDepth = 0) NS_HIDDEN;
-  nsBoxLayoutState(const nsBoxLayoutState& aState) NS_HIDDEN;
+                   uint16_t aReflowDepth = 0);
+  nsBoxLayoutState(const nsBoxLayoutState& aState);
 
   nsPresContext* PresContext() const { return mPresContext; }
   nsIPresShell* PresShell() const { return mPresContext->PresShell(); }
diff --git a/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp b/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
index b3d2f94addf5..64a0f1a1ec6a 100644
--- a/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
+++ b/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
@@ -151,7 +151,7 @@ PRLogModuleInfo *signalingLogInfo() {
 // XXX Workaround for bug 998092 to maintain the existing broken semantics
 template<>
 struct nsISupportsWeakReference::COMTypeInfo<nsSupportsWeakReference, void> {
-  static const nsIID kIID NS_HIDDEN;
+  static const nsIID kIID;
 };
 const nsIID nsISupportsWeakReference::COMTypeInfo<nsSupportsWeakReference, void>::kIID = NS_ISUPPORTSWEAKREFERENCE_IID;
 
diff --git a/netwerk/base/src/nsIOService.h b/netwerk/base/src/nsIOService.h
index d61b52bc402d..1d91615bcf4b 100644
--- a/netwerk/base/src/nsIOService.h
+++ b/netwerk/base/src/nsIOService.h
@@ -78,8 +78,8 @@ private:
     // These shouldn't be called directly:
     // - construct using GetInstance
     // - destroy using Release
-    nsIOService() NS_HIDDEN;
-    ~nsIOService() NS_HIDDEN;
+    nsIOService();
+    ~nsIOService();
 
     nsresult TrackNetworkLinkStatusForOffline();
 
diff --git a/netwerk/base/src/nsProtocolProxyService.h b/netwerk/base/src/nsProtocolProxyService.h
index 762d6a80a536..34d717b71b60 100644
--- a/netwerk/base/src/nsProtocolProxyService.h
+++ b/netwerk/base/src/nsProtocolProxyService.h
@@ -36,14 +36,14 @@ public:
     NS_DECL_NSIPROTOCOLPROXYSERVICE
     NS_DECL_NSIOBSERVER
 
-    nsProtocolProxyService() NS_HIDDEN;
+    nsProtocolProxyService();
 
     nsresult Init();
 
 protected:
     friend class nsAsyncResolveRequest;
 
-    ~nsProtocolProxyService() NS_HIDDEN;
+    ~nsProtocolProxyService();
 
     /**
      * This method is called whenever a preference may have changed or
diff --git a/toolkit/system/gnome/nsGConfService.h b/toolkit/system/gnome/nsGConfService.h
index 8a77a6fca994..8ba705fab9e0 100644
--- a/toolkit/system/gnome/nsGConfService.h
+++ b/toolkit/system/gnome/nsGConfService.h
@@ -23,7 +23,7 @@ public:
   nsresult Init();
 
 private:
-  ~nsGConfService() NS_HIDDEN;
+  ~nsGConfService();
 
   GConfClient *mClient;
 };
diff --git a/uriloader/exthandler/android/nsAndroidHandlerApp.cpp b/uriloader/exthandler/android/nsAndroidHandlerApp.cpp
index 9885dab52051..d183fe137406 100644
--- a/uriloader/exthandler/android/nsAndroidHandlerApp.cpp
+++ b/uriloader/exthandler/android/nsAndroidHandlerApp.cpp
@@ -58,7 +58,7 @@ nsAndroidHandlerApp::SetDetailedDescription(const nsAString & aDescription)
 // XXX Workaround for bug 986975 to maintain the existing broken semantics
 template<>
 struct nsISharingHandlerApp::COMTypeInfo<nsAndroidHandlerApp, void> {
-  static const nsIID kIID NS_HIDDEN;
+  static const nsIID kIID;
 };
 const nsIID nsISharingHandlerApp::COMTypeInfo<nsAndroidHandlerApp, void>::kIID = NS_IHANDLERAPP_IID;
 
diff --git a/uriloader/exthandler/android/nsMIMEInfoAndroid.cpp b/uriloader/exthandler/android/nsMIMEInfoAndroid.cpp
index 68466daf2f32..826022a1ce90 100644
--- a/uriloader/exthandler/android/nsMIMEInfoAndroid.cpp
+++ b/uriloader/exthandler/android/nsMIMEInfoAndroid.cpp
@@ -405,7 +405,7 @@ nsMIMEInfoAndroid::SystemChooser::SetDetailedDescription(const nsAString&) {
 // XXX Workaround for bug 986975 to maintain the existing broken semantics
 template<>
 struct nsIHandlerApp::COMTypeInfo<nsMIMEInfoAndroid::SystemChooser, void> {
-  static const nsIID kIID NS_HIDDEN;
+  static const nsIID kIID;
 };
 const nsIID nsIHandlerApp::COMTypeInfo<nsMIMEInfoAndroid::SystemChooser, void>::kIID = NS_IHANDLERAPP_IID;
 
diff --git a/uriloader/exthandler/nsMIMEInfoImpl.h b/uriloader/exthandler/nsMIMEInfoImpl.h
index 0608f13ec459..9e26c99ff1d0 100644
--- a/uriloader/exthandler/nsMIMEInfoImpl.h
+++ b/uriloader/exthandler/nsMIMEInfoImpl.h
@@ -67,9 +67,9 @@ class nsMIMEInfoBase : public nsIMIMEInfo {
     };
 
     // nsMIMEInfoBase methods
-    nsMIMEInfoBase(const char *aMIMEType = "") NS_HIDDEN;
-    nsMIMEInfoBase(const nsACString& aMIMEType) NS_HIDDEN;
-    nsMIMEInfoBase(const nsACString& aType, HandlerClass aClass) NS_HIDDEN;
+    nsMIMEInfoBase(const char *aMIMEType = "");
+    nsMIMEInfoBase(const nsACString& aMIMEType);
+    nsMIMEInfoBase(const nsACString& aType, HandlerClass aClass);
     virtual ~nsMIMEInfoBase();        // must be virtual, as the the base class's Release should call the subclass's destructor
 
     void SetMIMEType(const nsACString & aMIMEType) { mSchemeOrType = aMIMEType; }
diff --git a/xpcom/base/nscore.h b/xpcom/base/nscore.h
index 64082c3fa2fc..459630bf3f2f 100644
--- a/xpcom/base/nscore.h
+++ b/xpcom/base/nscore.h
@@ -66,7 +66,7 @@
  * Other examples:
  *
  * NS_HIDDEN_(int) someMethod();
- * SomeCtor() NS_HIDDEN;
+ * SomeCtor();
  */
 
 #ifdef HAVE_VISIBILITY_HIDDEN_ATTRIBUTE