diff --git a/mozilla/netwerk/streamconv/converters/nsDirIndex.cpp b/mozilla/netwerk/streamconv/converters/nsDirIndex.cpp
index 59aad9fd5bc..58b5cf126b7 100644
--- a/mozilla/netwerk/streamconv/converters/nsDirIndex.cpp
+++ b/mozilla/netwerk/streamconv/converters/nsDirIndex.cpp
@@ -41,8 +41,8 @@
 #include "nsCRT.h"
 #include "nsISupportsObsolete.h"
 
-NS_IMPL_THREADSAFE_ISUPPORTS1(nsDirIndex,
-                              nsIDirIndex)
+NS_IMPL_ISUPPORTS1(nsDirIndex,
+                   nsIDirIndex)
 
 nsDirIndex::nsDirIndex() : mType(TYPE_UNKNOWN),
                            mSize(LL_MAXUINT),
diff --git a/mozilla/netwerk/streamconv/converters/nsDirIndexParser.cpp b/mozilla/netwerk/streamconv/converters/nsDirIndexParser.cpp
index 473316c3019..41b50fe2833 100644
--- a/mozilla/netwerk/streamconv/converters/nsDirIndexParser.cpp
+++ b/mozilla/netwerk/streamconv/converters/nsDirIndexParser.cpp
@@ -56,10 +56,10 @@
 #include "nsIPrefBranch.h"
 #include "nsIPrefLocalizedString.h"
 
-NS_IMPL_THREADSAFE_ISUPPORTS3(nsDirIndexParser,
-                              nsIRequestObserver,
-                              nsIStreamListener,
-                              nsIDirIndexParser)
+NS_IMPL_ISUPPORTS3(nsDirIndexParser,
+                   nsIRequestObserver,
+                   nsIStreamListener,
+                   nsIDirIndexParser)
 
 nsDirIndexParser::nsDirIndexParser() {
 }
diff --git a/mozilla/netwerk/streamconv/converters/nsFTPDirListingConv.cpp b/mozilla/netwerk/streamconv/converters/nsFTPDirListingConv.cpp
index e0e15883225..df97148a4d2 100644
--- a/mozilla/netwerk/streamconv/converters/nsFTPDirListingConv.cpp
+++ b/mozilla/netwerk/streamconv/converters/nsFTPDirListingConv.cpp
@@ -40,7 +40,6 @@
 #include "nsMemory.h"
 #include "plstr.h"
 #include "prlog.h"
-#include "nsIAtom.h"
 #include "nsIServiceManager.h"
 #include "nsIGenericFactory.h"
 #include "nsXPIDLString.h"
@@ -76,10 +75,10 @@ PRLogModuleInfo* gFTPDirListConvLog = nsnull;
 #endif /* PR_LOGGING */
 
 // nsISupports implementation
-NS_IMPL_THREADSAFE_ISUPPORTS3(nsFTPDirListingConv,
-                              nsIStreamConverter,
-                              nsIStreamListener, 
-                              nsIRequestObserver)
+NS_IMPL_ISUPPORTS3(nsFTPDirListingConv,
+                   nsIStreamConverter,
+                   nsIStreamListener, 
+                   nsIRequestObserver)
 
 
 // nsIStreamConverter implementation
diff --git a/mozilla/netwerk/streamconv/converters/nsGopherDirListingConv.cpp b/mozilla/netwerk/streamconv/converters/nsGopherDirListingConv.cpp
index 7ebc11bb0e0..ad364fad6f8 100644
--- a/mozilla/netwerk/streamconv/converters/nsGopherDirListingConv.cpp
+++ b/mozilla/netwerk/streamconv/converters/nsGopherDirListingConv.cpp
@@ -59,10 +59,10 @@
 #include "nsGopherDirListingConv.h"
 
 // nsISupports implementation
-NS_IMPL_THREADSAFE_ISUPPORTS3(nsGopherDirListingConv,
-                              nsIStreamConverter,
-                              nsIStreamListener,
-                              nsIRequestObserver)
+NS_IMPL_ISUPPORTS3(nsGopherDirListingConv,
+                   nsIStreamConverter,
+                   nsIStreamListener,
+                   nsIRequestObserver)
 
 // nsIStreamConverter implementation
 
diff --git a/mozilla/netwerk/streamconv/converters/nsIndexedToHTML.cpp b/mozilla/netwerk/streamconv/converters/nsIndexedToHTML.cpp
index ce14dd92994..05d2f44a975 100644
--- a/mozilla/netwerk/streamconv/converters/nsIndexedToHTML.cpp
+++ b/mozilla/netwerk/streamconv/converters/nsIndexedToHTML.cpp
@@ -51,11 +51,11 @@
 #include "nsIPlatformCharset.h"
 #include "nsInt64.h"
 
-NS_IMPL_THREADSAFE_ISUPPORTS4(nsIndexedToHTML,
-                              nsIDirIndexListener,
-                              nsIStreamConverter,
-                              nsIRequestObserver,
-                              nsIStreamListener)
+NS_IMPL_ISUPPORTS4(nsIndexedToHTML,
+                   nsIDirIndexListener,
+                   nsIStreamConverter,
+                   nsIRequestObserver,
+                   nsIStreamListener)
 
 static void ConvertNonAsciiToNCR(const nsAString& in, nsAFlatString& out)
 {
diff --git a/mozilla/netwerk/streamconv/converters/nsMultiMixedConv.cpp b/mozilla/netwerk/streamconv/converters/nsMultiMixedConv.cpp
index ccefbcb4bcd..9765ffffa89 100644
--- a/mozilla/netwerk/streamconv/converters/nsMultiMixedConv.cpp
+++ b/mozilla/netwerk/streamconv/converters/nsMultiMixedConv.cpp
@@ -381,10 +381,10 @@ nsPartChannel::GetBaseChannel(nsIChannel ** aReturn)
 
 
 // nsISupports implementation
-NS_IMPL_THREADSAFE_ISUPPORTS3(nsMultiMixedConv,
-                              nsIStreamConverter, 
-                              nsIStreamListener,
-                              nsIRequestObserver)
+NS_IMPL_ISUPPORTS3(nsMultiMixedConv,
+                   nsIStreamConverter,
+                   nsIStreamListener,
+                   nsIRequestObserver)
 
 
 // nsIStreamConverter implementation
diff --git a/mozilla/netwerk/streamconv/converters/nsTXTToHTMLConv.cpp b/mozilla/netwerk/streamconv/converters/nsTXTToHTMLConv.cpp
index 80d09461980..0a171088322 100644
--- a/mozilla/netwerk/streamconv/converters/nsTXTToHTMLConv.cpp
+++ b/mozilla/netwerk/streamconv/converters/nsTXTToHTMLConv.cpp
@@ -43,11 +43,11 @@
 #define TOKEN_DELIMITERS NS_LITERAL_STRING("\t\r\n ").get()
 
 // nsISupports methods
-NS_IMPL_THREADSAFE_ISUPPORTS4(nsTXTToHTMLConv,
-                              nsIStreamConverter,
-                              nsITXTToHTMLConv,
-                              nsIRequestObserver,
-                              nsIStreamListener)
+NS_IMPL_ISUPPORTS4(nsTXTToHTMLConv,
+                   nsIStreamConverter,
+                   nsITXTToHTMLConv,
+                   nsIRequestObserver,
+                   nsIStreamListener)
 
 
 // nsIStreamConverter methods
diff --git a/mozilla/netwerk/streamconv/src/nsAppleFileDecoder.cpp b/mozilla/netwerk/streamconv/src/nsAppleFileDecoder.cpp
index d7c4557136c..4d6a3452d56 100644
--- a/mozilla/netwerk/streamconv/src/nsAppleFileDecoder.cpp
+++ b/mozilla/netwerk/streamconv/src/nsAppleFileDecoder.cpp
@@ -41,7 +41,7 @@
 #include "nsCRT.h"
 
 
-NS_IMPL_THREADSAFE_ISUPPORTS2(nsAppleFileDecoder, nsIAppleFileDecoder, nsIOutputStream)
+NS_IMPL_ISUPPORTS2(nsAppleFileDecoder, nsIAppleFileDecoder, nsIOutputStream)
 
 nsAppleFileDecoder::nsAppleFileDecoder()
 {
diff --git a/mozilla/netwerk/streamconv/src/nsStreamConverterService.cpp b/mozilla/netwerk/streamconv/src/nsStreamConverterService.cpp
index e507a1125a9..0cdae7cab01 100644
--- a/mozilla/netwerk/streamconv/src/nsStreamConverterService.cpp
+++ b/mozilla/netwerk/streamconv/src/nsStreamConverterService.cpp
@@ -68,7 +68,7 @@
 
 ////////////////////////////////////////////////////////////
 // nsISupports methods
-NS_IMPL_THREADSAFE_ISUPPORTS1(nsStreamConverterService, nsIStreamConverterService)
+NS_IMPL_ISUPPORTS1(nsStreamConverterService, nsIStreamConverterService)
 
 
 ////////////////////////////////////////////////////////////