diff --git a/mozilla/xpcom/base/nsISupportsImpl.h b/mozilla/xpcom/base/nsISupportsImpl.h
index b1f0c0effef..e48191a8303 100644
--- a/mozilla/xpcom/base/nsISupportsImpl.h
+++ b/mozilla/xpcom/base/nsISupportsImpl.h
@@ -571,11 +571,6 @@ NS_IMETHODIMP _class::QueryInterface(REFNSIID aIID, void** aInstancePtr)      \
  * for the class (e.g. NS_ISUPPORTS_IID)
  */
 
-#define NS_IMPL_THREADSAFE_ISUPPORTS(_class,_classiiddef)                     \
-  NS_IMPL_THREADSAFE_ADDREF(_class)                                           \
-  NS_IMPL_THREADSAFE_RELEASE(_class)                                          \
-  NS_IMPL_THREADSAFE_QUERY_INTERFACE(_class,_classiiddef)
-
 #define NS_IMPL_THREADSAFE_ADDREF(_class)  NS_IMPL_ADDREF(_class)
 
 #define NS_IMPL_THREADSAFE_RELEASE(_class) NS_IMPL_RELEASE(_class)
diff --git a/mozilla/xpcom/base/nsISupportsObsolete.h b/mozilla/xpcom/base/nsISupportsObsolete.h
index 567996c4d54..0d37e301902 100644
--- a/mozilla/xpcom/base/nsISupportsObsolete.h
+++ b/mozilla/xpcom/base/nsISupportsObsolete.h
@@ -295,6 +295,10 @@ NS_IMPL_SETTER_STR(_class::Set##_postfix, _member)
 #define NS_VERIFY_THREADSAFE_INTERFACE(_iface)
 #endif
 
+#define NS_IMPL_THREADSAFE_ISUPPORTS(_class,_classiiddef)                     \
+  NS_IMPL_THREADSAFE_ADDREF(_class)                                           \
+  NS_IMPL_THREADSAFE_RELEASE(_class)                                          \
+  NS_IMPL_THREADSAFE_QUERY_INTERFACE(_class,_classiiddef)
 
 /*
  The following macro is deprecated.  We need to switch all instances
diff --git a/mozilla/xpcom/glue/nsISupportsImpl.h b/mozilla/xpcom/glue/nsISupportsImpl.h
index b1f0c0effef..e48191a8303 100644
--- a/mozilla/xpcom/glue/nsISupportsImpl.h
+++ b/mozilla/xpcom/glue/nsISupportsImpl.h
@@ -571,11 +571,6 @@ NS_IMETHODIMP _class::QueryInterface(REFNSIID aIID, void** aInstancePtr)      \
  * for the class (e.g. NS_ISUPPORTS_IID)
  */
 
-#define NS_IMPL_THREADSAFE_ISUPPORTS(_class,_classiiddef)                     \
-  NS_IMPL_THREADSAFE_ADDREF(_class)                                           \
-  NS_IMPL_THREADSAFE_RELEASE(_class)                                          \
-  NS_IMPL_THREADSAFE_QUERY_INTERFACE(_class,_classiiddef)
-
 #define NS_IMPL_THREADSAFE_ADDREF(_class)  NS_IMPL_ADDREF(_class)
 
 #define NS_IMPL_THREADSAFE_RELEASE(_class) NS_IMPL_RELEASE(_class)