diff --git a/mozilla/gfx/src/beos/nsRenderingContextBeOS.cpp b/mozilla/gfx/src/beos/nsRenderingContextBeOS.cpp
index 17d515b2a5d..038d4e7c45f 100644
--- a/mozilla/gfx/src/beos/nsRenderingContextBeOS.cpp
+++ b/mozilla/gfx/src/beos/nsRenderingContextBeOS.cpp
@@ -48,7 +48,7 @@
 #include <math.h>
 
 
-NS_IMPL_THREADSAFE_ISUPPORTS1(nsRenderingContextBeOS, nsIRenderingContext)
+NS_IMPL_ISUPPORTS1(nsRenderingContextBeOS, nsIRenderingContext)
 
 static NS_DEFINE_CID(kRegionCID, NS_REGION_CID);
 
diff --git a/mozilla/gfx/src/gtk/nsRenderingContextGTK.cpp b/mozilla/gfx/src/gtk/nsRenderingContextGTK.cpp
index e5e72e33a29..fe28517b95b 100644
--- a/mozilla/gfx/src/gtk/nsRenderingContextGTK.cpp
+++ b/mozilla/gfx/src/gtk/nsRenderingContextGTK.cpp
@@ -58,7 +58,7 @@
 #include <gdk/gdkwindow.h>
 #endif
 
-NS_IMPL_THREADSAFE_ISUPPORTS1(nsRenderingContextGTK, nsIRenderingContext)
+NS_IMPL_ISUPPORTS1(nsRenderingContextGTK, nsIRenderingContext)
 
 static NS_DEFINE_CID(kRegionCID, NS_REGION_CID);
 
diff --git a/mozilla/gfx/src/ps/nsRenderingContextPS.cpp b/mozilla/gfx/src/ps/nsRenderingContextPS.cpp
index a34af1dab35..c9a8a147839 100644
--- a/mozilla/gfx/src/ps/nsRenderingContextPS.cpp
+++ b/mozilla/gfx/src/ps/nsRenderingContextPS.cpp
@@ -131,7 +131,7 @@ PS_State :: ~PS_State()
 }
 
 
-NS_IMPL_THREADSAFE_ISUPPORTS1(nsRenderingContextPS, nsIRenderingContext)
+NS_IMPL_ISUPPORTS1(nsRenderingContextPS, nsIRenderingContext)
 
 /** ---------------------------------------------------
  *  See documentation in nsIRenderingContext.h
diff --git a/mozilla/gfx/src/xlib/nsRenderingContextXlib.cpp b/mozilla/gfx/src/xlib/nsRenderingContextXlib.cpp
index 4f95d5df361..05c9d1c4c9f 100644
--- a/mozilla/gfx/src/xlib/nsRenderingContextXlib.cpp
+++ b/mozilla/gfx/src/xlib/nsRenderingContextXlib.cpp
@@ -58,7 +58,7 @@
 
 #define NS_TO_XLIBRGB_RGB(ns) (ns & 0xff) << 16 | (ns & 0xff00) | ((ns >> 16) & 0xff)
 
-NS_IMPL_THREADSAFE_ISUPPORTS1(nsRenderingContextXlib, nsIRenderingContext)
+NS_IMPL_ISUPPORTS1(nsRenderingContextXlib, nsIRenderingContext)
 
 #ifdef PR_LOGGING 
 static PRLogModuleInfo * RenderingContextXlibLM = PR_NewLogModule("RenderingContextXlib");