diff --git a/xpfe/appshell/src/nsWebShellWindow.cpp b/xpfe/appshell/src/nsWebShellWindow.cpp
index 2859ad54c69..f3f325b09f5 100644
--- a/xpfe/appshell/src/nsWebShellWindow.cpp
+++ b/xpfe/appshell/src/nsWebShellWindow.cpp
@@ -453,7 +453,7 @@ public:
     : mWindow(aWindow)
   {}
 
-  NS_DECL_ISUPPORTS
+  NS_DECL_THREADSAFE_ISUPPORTS
 
   NS_IMETHOD Notify(nsITimer* aTimer)
   {
@@ -469,10 +469,7 @@ private:
   nsRefPtr<nsWebShellWindow> mWindow;
 };
 
-NS_IMPL_THREADSAFE_ADDREF(WebShellWindowTimerCallback)
-NS_IMPL_THREADSAFE_RELEASE(WebShellWindowTimerCallback)
-NS_IMPL_THREADSAFE_QUERY_INTERFACE1(WebShellWindowTimerCallback,
-                                    nsITimerCallback)
+NS_IMPL_ISUPPORTS1(WebShellWindowTimerCallback, nsITimerCallback)
 
 } // namespace mozilla
 
diff --git a/xpfe/appshell/src/nsXULWindow.cpp b/xpfe/appshell/src/nsXULWindow.cpp
index 77a0260ff6c..5100ec58618 100644
--- a/xpfe/appshell/src/nsXULWindow.cpp
+++ b/xpfe/appshell/src/nsXULWindow.cpp
@@ -116,8 +116,8 @@ nsXULWindow::~nsXULWindow()
 // nsXULWindow::nsISupports
 //*****************************************************************************
 
-NS_IMPL_THREADSAFE_ADDREF(nsXULWindow)
-NS_IMPL_THREADSAFE_RELEASE(nsXULWindow)
+NS_IMPL_ADDREF(nsXULWindow)
+NS_IMPL_RELEASE(nsXULWindow)
 
 NS_INTERFACE_MAP_BEGIN(nsXULWindow)
   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIXULWindow)
diff --git a/xpfe/appshell/src/nsXULWindow.h b/xpfe/appshell/src/nsXULWindow.h
index 08b6e5bd168..30ba7170937 100644
--- a/xpfe/appshell/src/nsXULWindow.h
+++ b/xpfe/appshell/src/nsXULWindow.h
@@ -59,7 +59,7 @@ friend class nsChromeTreeOwner;
 friend class nsContentTreeOwner;
 
 public:
-   NS_DECL_ISUPPORTS
+   NS_DECL_THREADSAFE_ISUPPORTS
 
    NS_DECL_NSIINTERFACEREQUESTOR
    NS_DECL_NSIXULWINDOW