diff --git a/mozilla/modules/libjar/nsJARChannel.cpp b/mozilla/modules/libjar/nsJARChannel.cpp
index 00333c1e077..814e42ba47a 100644
--- a/mozilla/modules/libjar/nsJARChannel.cpp
+++ b/mozilla/modules/libjar/nsJARChannel.cpp
@@ -70,8 +70,6 @@ nsJARChannel::nsJARChannel()
     , mInitiator(nsnull)
 #endif
 {
-    NS_INIT_ISUPPORTS();
-
 #if defined(PR_LOGGING)
     //
     // Initialize the global PRLogModule for socket transport logging
diff --git a/mozilla/modules/libjar/nsJARProtocolHandler.cpp b/mozilla/modules/libjar/nsJARProtocolHandler.cpp
index 080c806af7e..141a55ab015 100644
--- a/mozilla/modules/libjar/nsJARProtocolHandler.cpp
+++ b/mozilla/modules/libjar/nsJARProtocolHandler.cpp
@@ -58,7 +58,6 @@ static NS_DEFINE_CID(kZipReaderCacheCID, NS_ZIPREADERCACHE_CID);
 
 nsJARProtocolHandler::nsJARProtocolHandler()
 {
-    NS_INIT_ISUPPORTS();
 }
 
 nsresult
diff --git a/mozilla/modules/libjar/nsJARURI.cpp b/mozilla/modules/libjar/nsJARURI.cpp
index 22732c87541..232268f95d5 100644
--- a/mozilla/modules/libjar/nsJARURI.cpp
+++ b/mozilla/modules/libjar/nsJARURI.cpp
@@ -32,7 +32,6 @@
 nsJARURI::nsJARURI()
     : mJAREntry(nsnull)
 {
-    NS_INIT_ISUPPORTS();
 }
  
 nsJARURI::~nsJARURI()
diff --git a/mozilla/modules/oji/src/nsCNullSecurityContext.h b/mozilla/modules/oji/src/nsCNullSecurityContext.h
index 4644c97b11e..65d43653b39 100644
--- a/mozilla/modules/oji/src/nsCNullSecurityContext.h
+++ b/mozilla/modules/oji/src/nsCNullSecurityContext.h
@@ -84,7 +84,7 @@ public:
     //////////////////////////////////////////////////////////////////////
     // from nsISecureJNI:
 
-    nsCNullSecurityContext() { NS_INIT_ISUPPORTS();};
+    nsCNullSecurityContext() { };
 };
 
 #endif // CSecurityContext_h___
diff --git a/mozilla/modules/oji/src/nsCSecurityContext.cpp b/mozilla/modules/oji/src/nsCSecurityContext.cpp
index 3f52f67d1e4..e40c51c7993 100644
--- a/mozilla/modules/oji/src/nsCSecurityContext.cpp
+++ b/mozilla/modules/oji/src/nsCSecurityContext.cpp
@@ -238,7 +238,6 @@ nsCSecurityContext::nsCSecurityContext(JSContext* cx)
                      m_HasUniversalBrowserReadCapability(PR_FALSE)
 {
     MOZ_COUNT_CTOR(nsCSecurityContext);
-    NS_INIT_ISUPPORTS();
 
       // Get the Script Security Manager.
 
@@ -282,7 +281,6 @@ nsCSecurityContext::nsCSecurityContext(nsIPrincipal *principal)
                      m_HasUniversalBrowserReadCapability(PR_FALSE)
 {
     MOZ_COUNT_CTOR(nsCSecurityContext);
-    NS_INIT_ISUPPORTS();
 
       // Get the Script Security Manager.
 
diff --git a/mozilla/modules/oji/tests/src/TestLoader/OJITestLoader.cpp b/mozilla/modules/oji/tests/src/TestLoader/OJITestLoader.cpp
index 320ef93df1f..c5ad847a6bf 100755
--- a/mozilla/modules/oji/tests/src/TestLoader/OJITestLoader.cpp
+++ b/mozilla/modules/oji/tests/src/TestLoader/OJITestLoader.cpp
@@ -30,8 +30,6 @@ NS_IMPL_ISUPPORTS1(OJITestLoader, OJITestLoader)
 OJITestLoader::OJITestLoader(void) 
 {
 
-  NS_INIT_ISUPPORTS();
-
   TestResult* res = NULL;
   char** testCase = loadTestList();
   int i = 0;
diff --git a/mozilla/modules/oji/tests/src/TestLoader/OJITestLoaderFactory.cpp b/mozilla/modules/oji/tests/src/TestLoader/OJITestLoaderFactory.cpp
index 9d674ec9a9d..73d56df875c 100755
--- a/mozilla/modules/oji/tests/src/TestLoader/OJITestLoaderFactory.cpp
+++ b/mozilla/modules/oji/tests/src/TestLoader/OJITestLoaderFactory.cpp
@@ -170,7 +170,6 @@ OJITestLoaderFactory::LockFactory(PRBool aLock)
 
 OJITestLoaderFactory::OJITestLoaderFactory(void)
 {
-      NS_INIT_ISUPPORTS();
 }
 
 OJITestLoaderFactory::~OJITestLoaderFactory()
diff --git a/mozilla/modules/plugin/base/src/ns4xPlugin.cpp b/mozilla/modules/plugin/base/src/ns4xPlugin.cpp
index 01a2c04f6ad..5ff26b5b917 100644
--- a/mozilla/modules/plugin/base/src/ns4xPlugin.cpp
+++ b/mozilla/modules/plugin/base/src/ns4xPlugin.cpp
@@ -296,7 +296,6 @@ NS_IMPL_ISUPPORTS2(ns4xPlugin, nsIPlugin, nsIFactory);
 
 ns4xPlugin::ns4xPlugin(NPPluginFuncs* callbacks, PRLibrary* aLibrary, NP_PLUGINSHUTDOWN aShutdown, nsIServiceManagerObsolete* serviceMgr)
 {
-  NS_INIT_ISUPPORTS();
   memset((void*) &fCallbacks, 0, sizeof(fCallbacks));
   gServiceMgr = serviceMgr;
   fLibrary = nsnull;
diff --git a/mozilla/modules/plugin/base/src/ns4xPluginInstance.cpp b/mozilla/modules/plugin/base/src/ns4xPluginInstance.cpp
index 4c5fb8b3430..df5c12276e6 100644
--- a/mozilla/modules/plugin/base/src/ns4xPluginInstance.cpp
+++ b/mozilla/modules/plugin/base/src/ns4xPluginInstance.cpp
@@ -94,7 +94,6 @@ ns4xPluginStreamListener::ns4xPluginStreamListener(nsIPluginInstance* inst,
       mCallNotify(PR_FALSE),      
       mStreamInfo(nsnull)
 {
-  NS_INIT_ISUPPORTS();
   mInst = (ns4xPluginInstance*) inst;
   mPosition = 0;
   mStreamBufferSize = 0;
@@ -563,8 +562,6 @@ NS_IMPL_ISUPPORTS2(ns4xPluginInstance, nsIPluginInstance, nsIScriptablePlugin)
 ns4xPluginInstance :: ns4xPluginInstance(NPPluginFuncs* callbacks, PRLibrary* aLibrary)
   : fCallbacks(callbacks)
 {
-  NS_INIT_ISUPPORTS();
-
   NS_ASSERTION(fCallbacks != NULL, "null callbacks");
 
   // Initialize the NPP structure.
diff --git a/mozilla/modules/plugin/base/src/nsPluginClassicModule.cpp b/mozilla/modules/plugin/base/src/nsPluginClassicModule.cpp
index 6eb9657b635..53fe9dc5c1a 100644
--- a/mozilla/modules/plugin/base/src/nsPluginClassicModule.cpp
+++ b/mozilla/modules/plugin/base/src/nsPluginClassicModule.cpp
@@ -57,7 +57,6 @@ NS_IMPL_ISUPPORTS1(nsClassicPluginFactory, nsIClassicPluginFactory)
 
 nsClassicPluginFactory::nsClassicPluginFactory()
 {
-    NS_INIT_ISUPPORTS();
 }
 
 nsresult nsClassicPluginFactory::Create(nsISupports* aOuter, REFNSIID aIID, void** aResult)
diff --git a/mozilla/modules/plugin/base/src/nsPluginDirServiceProvider.cpp b/mozilla/modules/plugin/base/src/nsPluginDirServiceProvider.cpp
index ccc6e128b10..0c4d604a015 100644
--- a/mozilla/modules/plugin/base/src/nsPluginDirServiceProvider.cpp
+++ b/mozilla/modules/plugin/base/src/nsPluginDirServiceProvider.cpp
@@ -185,7 +185,6 @@ static int CompareVersion(verBlock vbVersionOld, verBlock vbVersionNew)
 
 nsPluginDirServiceProvider::nsPluginDirServiceProvider()
 {
-  NS_INIT_ISUPPORTS();
 }
 
 nsPluginDirServiceProvider::~nsPluginDirServiceProvider()
diff --git a/mozilla/modules/plugin/base/src/nsPluginDocLoaderFactory.h b/mozilla/modules/plugin/base/src/nsPluginDocLoaderFactory.h
index 4146e2454e0..bc7d0c60be9 100644
--- a/mozilla/modules/plugin/base/src/nsPluginDocLoaderFactory.h
+++ b/mozilla/modules/plugin/base/src/nsPluginDocLoaderFactory.h
@@ -57,7 +57,7 @@ class nsIStreamListener;
 class nsPluginDocLoaderFactory : public nsIDocumentLoaderFactory
 {
 protected:
-  nsPluginDocLoaderFactory() { NS_INIT_ISUPPORTS(); }
+  nsPluginDocLoaderFactory() { }
   virtual ~nsPluginDocLoaderFactory() {}
 
 public:
diff --git a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
index e7d8ab82858..a6d4cdc9604 100644
--- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
+++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
@@ -1305,8 +1305,6 @@ private:
 ////////////////////////////////////////////////////////////////////////
 nsPluginStreamInfo::nsPluginStreamInfo()
 {
-  NS_INIT_ISUPPORTS();
-
   mPluginInstance = nsnull;
   mPluginStreamListenerPeer = nsnull;
 
@@ -1618,8 +1616,6 @@ private:
 ////////////////////////////////////////////////////////////////////////
 nsPluginCacheListener::nsPluginCacheListener(nsPluginStreamListenerPeer* aListener)
 {
-  NS_INIT_ISUPPORTS();
-
   mListener = aListener;
   NS_ADDREF(mListener);
 }
@@ -1680,8 +1676,6 @@ nsPluginCacheListener::OnStopRequest(nsIRequest *request,
 
 nsPluginStreamListenerPeer::nsPluginStreamListenerPeer()
 {
-  NS_INIT_ISUPPORTS();
-
   mURL = nsnull;
   mOwner = nsnull;
   mInstance = nsnull;
@@ -2567,7 +2561,6 @@ nsPluginStreamListenerPeer::VisitHeader(const nsACString &header, const nsACStri
 
 nsPluginHostImpl::nsPluginHostImpl()
 {
-  NS_INIT_ISUPPORTS();
   mPluginsLoaded = PR_FALSE;
   mDontShowBadPluginMessage = PR_FALSE;
   mIsDestroyed = PR_FALSE;
@@ -4183,7 +4176,6 @@ public:
 
   DOMMimeTypeImpl(nsPluginTag* aPluginTag, PRUint32 aMimeTypeIndex)
   {
-    NS_INIT_ISUPPORTS();
     (void) CreateUnicodeDecoder(getter_AddRefs(mUnicodeDecoder));
     if (aPluginTag) {
       if (aPluginTag->mMimeDescriptionArray)
@@ -4241,8 +4233,6 @@ public:
   
   DOMPluginImpl(nsPluginTag* aPluginTag) : mPluginTag(aPluginTag)
   {
-    NS_INIT_ISUPPORTS();
-
     (void) CreateUnicodeDecoder(getter_AddRefs(mUnicodeDecoder));
   }
   
@@ -6548,7 +6538,6 @@ nsresult nsPluginStreamListenerPeer::ServeStreamAsFile(nsIRequest *request,
 NS_IMPL_ISUPPORTS1(nsPluginByteRangeStreamListener, nsIStreamListener)
 nsPluginByteRangeStreamListener::nsPluginByteRangeStreamListener(nsIWeakReference* aWeakPtr)
 {
-  NS_INIT_ISUPPORTS();
   mWeakPtrPluginStreamListenerPeer = aWeakPtr;
   mRemoveMagicNumber = PR_FALSE;
 }
diff --git a/mozilla/modules/plugin/base/src/nsPluginInstancePeer.cpp b/mozilla/modules/plugin/base/src/nsPluginInstancePeer.cpp
index a71418eb387..aa5bf4040f2 100644
--- a/mozilla/modules/plugin/base/src/nsPluginInstancePeer.cpp
+++ b/mozilla/modules/plugin/base/src/nsPluginInstancePeer.cpp
@@ -65,8 +65,6 @@
 
 nsPluginInstancePeerImpl::nsPluginInstancePeerImpl()
 {
-  NS_INIT_ISUPPORTS();
-
   mInstance = nsnull;
   mOwner = nsnull;
   mMIMEType = nsnull;
@@ -155,8 +153,6 @@ nsPluginStreamToFile::nsPluginStreamToFile(const char* target, nsIPluginInstance
   mTarget(PL_strdup(target)),
   mOwner(owner)
 {
-  NS_INIT_ISUPPORTS();
-
   nsresult rv;
   nsCOMPtr<nsIFile> pluginTmp;
   rv = NS_GetSpecialDirectory(NS_OS_TEMP_DIR, getter_AddRefs(pluginTmp));
diff --git a/mozilla/modules/plugin/base/src/nsPluginViewer.cpp b/mozilla/modules/plugin/base/src/nsPluginViewer.cpp
index bd5198a8986..0f2c4e66868 100644
--- a/mozilla/modules/plugin/base/src/nsPluginViewer.cpp
+++ b/mozilla/modules/plugin/base/src/nsPluginViewer.cpp
@@ -202,7 +202,6 @@ NS_NewPluginContentViewer(const char* aCommand,
 // Note: operator new zeros our memory
 PluginViewerImpl::PluginViewerImpl(const char* aCommand)
 {
-  NS_INIT_ISUPPORTS();
   mEnableRendering = PR_TRUE;
 }
 
@@ -985,7 +984,6 @@ PluginViewerImpl::CopyImageContents()
 
 PluginListener::PluginListener(PluginViewerImpl* aViewer)
 {
-  NS_INIT_ISUPPORTS();
   mViewer = aViewer;
   NS_ADDREF(aViewer);
   mNextStream = nsnull;                                                         
@@ -1038,8 +1036,6 @@ PluginListener::OnDataAvailable(nsIRequest *request, nsISupports *ctxt,
 
 pluginInstanceOwner :: pluginInstanceOwner()
 {
-  NS_INIT_ISUPPORTS();
-
   // create nsPluginNativeWindow object, it is derived from nsPluginWindow
   // struct and allows to manipulate native window procedure
   nsCOMPtr<nsIPluginHost> ph = do_GetService(kCPluginManagerCID);
diff --git a/mozilla/modules/plugin/samples/4x-scriptable/nsScriptablePeer1.cpp b/mozilla/modules/plugin/samples/4x-scriptable/nsScriptablePeer1.cpp
index 39a262cafaa..bf2e4e49de7 100644
--- a/mozilla/modules/plugin/samples/4x-scriptable/nsScriptablePeer1.cpp
+++ b/mozilla/modules/plugin/samples/4x-scriptable/nsScriptablePeer1.cpp
@@ -51,7 +51,6 @@
 nsScriptablePeer::nsScriptablePeer(CPlugin* aPlugin)
 {
 
-  NS_INIT_ISUPPORTS();
   mPlugin = aPlugin;
 }
 
diff --git a/mozilla/modules/plugin/samples/SanePlugin/nsSanePlugin.cpp b/mozilla/modules/plugin/samples/SanePlugin/nsSanePlugin.cpp
index 2f352991b05..63e1182451c 100644
--- a/mozilla/modules/plugin/samples/SanePlugin/nsSanePlugin.cpp
+++ b/mozilla/modules/plugin/samples/SanePlugin/nsSanePlugin.cpp
@@ -91,7 +91,6 @@ nsSanePluginInstance::nsSanePluginInstance( void )
     printf("nsSanePluginInstance::nsSanePluginInstance()\n");
 #endif
 
-    NS_INIT_ISUPPORTS();
     PR_AtomicIncrement(&gPluginObjectCount);
 
     // set default jpeg compression attributes
@@ -1994,7 +1993,6 @@ nsSanePluginStreamListener::nsSanePluginStreamListener(nsSanePluginInstance* ins
 #endif
 
     PR_AtomicIncrement(&gPluginObjectCount);
-    NS_INIT_ISUPPORTS();
 
     mPlugInst = inst;
 }
diff --git a/mozilla/modules/plugin/samples/SanePlugin/nsSanePluginFactory.cpp b/mozilla/modules/plugin/samples/SanePlugin/nsSanePluginFactory.cpp
index 9270dfc4af0..fbb545ecb08 100644
--- a/mozilla/modules/plugin/samples/SanePlugin/nsSanePluginFactory.cpp
+++ b/mozilla/modules/plugin/samples/SanePlugin/nsSanePluginFactory.cpp
@@ -47,9 +47,6 @@ nsSanePluginFactoryImpl::nsSanePluginFactoryImpl( const nsCID &aClass,
 #ifdef DEBUG
     printf("nsSanePluginFactoryImpl::nsSanePluginFactoryImpl()\n");
 #endif
-
-    NS_INIT_ISUPPORTS();
-
 }
 
 nsSanePluginFactoryImpl::~nsSanePluginFactoryImpl()
diff --git a/mozilla/modules/plugin/samples/backward/badapter.cpp b/mozilla/modules/plugin/samples/backward/badapter.cpp
index d09a59b7fb6..d862e1f9046 100644
--- a/mozilla/modules/plugin/samples/backward/badapter.cpp
+++ b/mozilla/modules/plugin/samples/backward/badapter.cpp
@@ -1071,9 +1071,6 @@ NPP_HandleEvent(NPP instance, void* event)
 
 CPluginManager::CPluginManager(void)
 {
-    // Set reference count to 0.
-    NS_INIT_ISUPPORTS();
-    
     mLiveconnect = NULL;
 }
 
@@ -1374,9 +1371,6 @@ CPluginInstancePeer::CPluginInstancePeer(nsIPluginInstance* pluginInstance,
 		npp(npp), typeString(typeString), type(type), attribute_cnt(attr_cnt),
 		attribute_list(NULL), values_list(NULL)
 {
-    // Set the reference count to 0.
-    NS_INIT_ISUPPORTS();
-    
     NS_IF_ADDREF(mInstance);
 
     attribute_list = (char**) NPN_MemAlloc(attr_cnt * sizeof(const char*));
@@ -1620,8 +1614,6 @@ CPluginInstancePeer::QueryInterface(const nsIID& iid, void** ptr)
 CPluginManagerStream::CPluginManagerStream(NPP npp, NPStream* pstr)
     : npp(npp), pstream(pstr)
 {
-    // Set the reference count to 0.
-    NS_INIT_ISUPPORTS();
 }
 
 CPluginManagerStream::~CPluginManagerStream(void)
@@ -1726,8 +1718,6 @@ CPluginInputStream::CPluginInputStream(nsIPluginStreamListener* listener)
       mBuffer(NULL), mBufferLength(0), mAmountRead(0),
       mStreamInfo(NULL)
 {
-    NS_INIT_ISUPPORTS();
-
     if (mListener != NULL) {
         mListener->AddRef();
         mListener->GetStreamType(&mStreamType);
diff --git a/mozilla/modules/plugin/samples/simple/npsimple.cpp b/mozilla/modules/plugin/samples/simple/npsimple.cpp
index d18c9ad2f4c..04defddf27e 100644
--- a/mozilla/modules/plugin/samples/simple/npsimple.cpp
+++ b/mozilla/modules/plugin/samples/simple/npsimple.cpp
@@ -496,8 +496,6 @@ SimplePluginInstance::UnregisterSelf(nsIComponentManager* aCompMgr,
 SimplePluginInstance::SimplePluginInstance(void)
     : fText(NULL), fPeer(NULL), fWindow(NULL), fMode(nsPluginMode_Embedded)
 {
-    NS_INIT_ISUPPORTS();
-
     static const char text[] = "Hello World!";
     fText = (char*) nsMemory::Clone(text, sizeof(text));
 
@@ -811,7 +809,6 @@ SimplePluginStreamListener::SimplePluginStreamListener(SimplePluginInstance* ins
                                                        const char* msgName)
     : fMessageName(msgName)
 {
-    NS_INIT_ISUPPORTS();
     char msg[256];
     sprintf(msg, "### Creating SimplePluginStreamListener for %s\n", fMessageName);
 }
diff --git a/mozilla/modules/plugin/samples/testevents/npevents.cpp b/mozilla/modules/plugin/samples/testevents/npevents.cpp
index d594a5892e8..e44d085d5c6 100644
--- a/mozilla/modules/plugin/samples/testevents/npevents.cpp
+++ b/mozilla/modules/plugin/samples/testevents/npevents.cpp
@@ -337,7 +337,6 @@ NS_IMPL_ISUPPORTS2(EventsPluginInstance, nsIPluginInstance, nsIEventsSampleInsta
 EventsPluginInstance::EventsPluginInstance() :
 		fPeer(NULL), fWindow(NULL), fMode(nsPluginMode_Embedded)
 {
-	NS_INIT_ISUPPORTS();
 	wChild = 0;
 }
 
@@ -560,7 +559,6 @@ NS_METHOD EventsPluginInstance::GetValue(nsPluginInstanceVariable /*variable*/,
 EventsPluginStreamListener::EventsPluginStreamListener(EventsPluginInstance* inst_,
         const char* msgName)
 		: fMessageName(msgName), inst(inst_) {
-	NS_INIT_ISUPPORTS();
 #ifdef EVENTSPLUGIN_DEBUG
 	printf("EventsPluginStreamListener: EventsPluginStreamListener for %s\n", fMessageName);
 #endif
diff --git a/mozilla/modules/staticmod/macbuild/nsMetaModule_crypto.cpp b/mozilla/modules/staticmod/macbuild/nsMetaModule_crypto.cpp
index cfa3b3f5abd..6252f0bdde1 100644
--- a/mozilla/modules/staticmod/macbuild/nsMetaModule_crypto.cpp
+++ b/mozilla/modules/staticmod/macbuild/nsMetaModule_crypto.cpp
@@ -90,7 +90,6 @@ public:
 
 nsMetaModuleImpl::nsMetaModuleImpl()
 {
-    NS_INIT_ISUPPORTS();
 }
 
 nsMetaModuleImpl::~nsMetaModuleImpl()
diff --git a/mozilla/modules/staticmod/macbuild/nsMetaModule_mail.cpp b/mozilla/modules/staticmod/macbuild/nsMetaModule_mail.cpp
index e3e96100dcf..d416178481e 100644
--- a/mozilla/modules/staticmod/macbuild/nsMetaModule_mail.cpp
+++ b/mozilla/modules/staticmod/macbuild/nsMetaModule_mail.cpp
@@ -122,7 +122,6 @@ public:
 
 nsMetaModuleImpl::nsMetaModuleImpl()
 {
-    NS_INIT_ISUPPORTS();
 }
 
 nsMetaModuleImpl::~nsMetaModuleImpl()
diff --git a/mozilla/netwerk/base/src/nsAsyncStreamListener.h b/mozilla/netwerk/base/src/nsAsyncStreamListener.h
index b3a417d2585..0eeeec467b4 100644
--- a/mozilla/netwerk/base/src/nsAsyncStreamListener.h
+++ b/mozilla/netwerk/base/src/nsAsyncStreamListener.h
@@ -56,7 +56,6 @@ public:
     // nsAsyncStreamObserver methods:
     nsAsyncStreamObserver() 
     { 
-        NS_INIT_ISUPPORTS();
     }
     
     virtual ~nsAsyncStreamObserver() {}
diff --git a/mozilla/netwerk/base/src/nsBufferedStreams.cpp b/mozilla/netwerk/base/src/nsBufferedStreams.cpp
index cf1af0d30c2..c377699ccf2 100644
--- a/mozilla/netwerk/base/src/nsBufferedStreams.cpp
+++ b/mozilla/netwerk/base/src/nsBufferedStreams.cpp
@@ -74,7 +74,6 @@ nsBufferedStream::nsBufferedStream()
       mBufferDisabled(PR_FALSE),
       mGetBufferCount(0)
 {
-    NS_INIT_ISUPPORTS();
 }
 
 nsBufferedStream::~nsBufferedStream()
diff --git a/mozilla/netwerk/base/src/nsDirectoryIndexStream.cpp b/mozilla/netwerk/base/src/nsDirectoryIndexStream.cpp
index 64fac5b1b4b..5ccc7b8af44 100644
--- a/mozilla/netwerk/base/src/nsDirectoryIndexStream.cpp
+++ b/mozilla/netwerk/base/src/nsDirectoryIndexStream.cpp
@@ -82,8 +82,6 @@ static NS_DEFINE_CID(kCollationFactoryCID, NS_COLLATIONFACTORY_CID);
 nsDirectoryIndexStream::nsDirectoryIndexStream()
     : mOffset(0), mPos(0)
 {
-    NS_INIT_ISUPPORTS();
-
 #ifdef PR_LOGGING
     if (! gLog)
         gLog = PR_NewLogModule("nsDirectoryIndexStream");
diff --git a/mozilla/netwerk/base/src/nsDownloader.h b/mozilla/netwerk/base/src/nsDownloader.h
index 9e5b4db1459..d98db50ca5b 100644
--- a/mozilla/netwerk/base/src/nsDownloader.h
+++ b/mozilla/netwerk/base/src/nsDownloader.h
@@ -53,7 +53,7 @@ public:
   NS_DECL_NSIREQUESTOBSERVER
   NS_DECL_NSISTREAMLISTENER
 
-  nsDownloader() { NS_INIT_ISUPPORTS();} ;
+  nsDownloader() { } ;
   virtual ~nsDownloader() {};
 
   static NS_METHOD
diff --git a/mozilla/netwerk/base/src/nsFileStreams.cpp b/mozilla/netwerk/base/src/nsFileStreams.cpp
index 8c2e967cf43..878ef16a2c7 100644
--- a/mozilla/netwerk/base/src/nsFileStreams.cpp
+++ b/mozilla/netwerk/base/src/nsFileStreams.cpp
@@ -107,7 +107,6 @@ nsFileIO::nsFileIO()
       mPerm(0),
       mStatus(NS_OK)
 {
-    NS_INIT_ISUPPORTS();
 #if defined(PR_LOGGING)
     //
     // Initialize the global PRLogModule for socket transport logging
@@ -401,7 +400,6 @@ nsFileStream::nsFileStream()
     : mFD(nsnull)
     , mCloseFD(PR_TRUE)
 {
-    NS_INIT_ISUPPORTS();
 }
 
 nsFileStream::~nsFileStream()
diff --git a/mozilla/netwerk/base/src/nsFileTransport.cpp b/mozilla/netwerk/base/src/nsFileTransport.cpp
index 7093a166933..bea84ccd880 100644
--- a/mozilla/netwerk/base/src/nsFileTransport.cpp
+++ b/mozilla/netwerk/base/src/nsFileTransport.cpp
@@ -75,7 +75,7 @@ public:
     NS_DECL_ISUPPORTS
 
     nsFileTransportSourceWrapper()
-        : mBytesRead(0), mLastError(NS_OK) { NS_INIT_ISUPPORTS(); }
+        : mBytesRead(0), mLastError(NS_OK) { }
     virtual ~nsFileTransportSourceWrapper() {}
 
     //
@@ -143,7 +143,7 @@ public:
     NS_DECL_ISUPPORTS
 
     nsFileTransportSinkWrapper()
-        : mBytesWritten(0), mLastError(NS_OK) { NS_INIT_ISUPPORTS(); }
+        : mBytesWritten(0), mLastError(NS_OK) { }
     virtual ~nsFileTransportSinkWrapper() {}
 
     //
@@ -226,8 +226,6 @@ nsFileTransport::nsFileTransport()
       mSinkWrapper(nsnull),
       mService(nsnull)
 {
-    NS_INIT_ISUPPORTS();
-
 #if defined(PR_LOGGING)
     if (!gFileTransportLog)
         gFileTransportLog = PR_NewLogModule("nsFileTransport");
diff --git a/mozilla/netwerk/base/src/nsFileTransportService.cpp b/mozilla/netwerk/base/src/nsFileTransportService.cpp
index 991f5f12e65..8cac44f2e5a 100644
--- a/mozilla/netwerk/base/src/nsFileTransportService.cpp
+++ b/mozilla/netwerk/base/src/nsFileTransportService.cpp
@@ -61,7 +61,6 @@ nsFileTransportService::nsFileTransportService()    :
     mShuttingDown(PR_FALSE),
     mLock(nsnull)
 {
-    NS_INIT_ISUPPORTS();
     mInstance = this;
 }
 
diff --git a/mozilla/netwerk/base/src/nsIOService.cpp b/mozilla/netwerk/base/src/nsIOService.cpp
index bb35d38607b..3fec0985762 100644
--- a/mozilla/netwerk/base/src/nsIOService.cpp
+++ b/mozilla/netwerk/base/src/nsIOService.cpp
@@ -154,8 +154,6 @@ nsIOService::nsIOService()
     : mOffline(PR_FALSE),
       mOfflineForProfileChange(PR_FALSE)
 {
-    NS_INIT_ISUPPORTS();
-
     // Get the allocator ready
     if (!gBufferCache)
     {
diff --git a/mozilla/netwerk/base/src/nsInputStreamChannel.cpp b/mozilla/netwerk/base/src/nsInputStreamChannel.cpp
index f868d7e10fc..94765a2a342 100644
--- a/mozilla/netwerk/base/src/nsInputStreamChannel.cpp
+++ b/mozilla/netwerk/base/src/nsInputStreamChannel.cpp
@@ -55,7 +55,6 @@ NS_IMPL_THREADSAFE_ISUPPORTS2(nsInputStreamIO,
 nsInputStreamIO::nsInputStreamIO()
     : mContentLength(-1), mStatus(NS_OK)
 {
-    NS_INIT_ISUPPORTS();
 }
 
 nsInputStreamIO::~nsInputStreamIO()
@@ -160,7 +159,6 @@ nsStreamIOChannel::nsStreamIOChannel()
       mBufferSegmentSize(0), mBufferMaxSize(0),
       mLoadFlags(LOAD_NORMAL), mStatus(NS_OK)
 {
-    NS_INIT_ISUPPORTS(); 
 }
 
 nsStreamIOChannel::~nsStreamIOChannel()
diff --git a/mozilla/netwerk/base/src/nsMIMEInputStream.cpp b/mozilla/netwerk/base/src/nsMIMEInputStream.cpp
index b8926e3dbd3..d3c2eac045b 100644
--- a/mozilla/netwerk/base/src/nsMIMEInputStream.cpp
+++ b/mozilla/netwerk/base/src/nsMIMEInputStream.cpp
@@ -95,7 +95,6 @@ NS_IMPL_THREADSAFE_ISUPPORTS3(nsMIMEInputStream,
 nsMIMEInputStream::nsMIMEInputStream() : mAddContentLength(PR_FALSE),
                                          mStartedReading(PR_FALSE)
 {
-    NS_INIT_ISUPPORTS();
 }
 
 nsMIMEInputStream::~nsMIMEInputStream()
diff --git a/mozilla/netwerk/base/src/nsNetModRegEntry.cpp b/mozilla/netwerk/base/src/nsNetModRegEntry.cpp
index 7a2d61adb5b..117ccfc45be 100644
--- a/mozilla/netwerk/base/src/nsNetModRegEntry.cpp
+++ b/mozilla/netwerk/base/src/nsNetModRegEntry.cpp
@@ -156,7 +156,6 @@ nsNetModRegEntry::nsNetModRegEntry(const char *aTopic,
                                    nsINetNotify *aNotify, 
                                    nsresult *result)
 {
-    NS_INIT_ISUPPORTS();
     mTopic = new char [PL_strlen(aTopic) + 1];
     PL_strcpy(mTopic, aTopic);
    
diff --git a/mozilla/netwerk/base/src/nsNetModuleMgr.cpp b/mozilla/netwerk/base/src/nsNetModuleMgr.cpp
index 16fdcf7ef1c..e1619e56e71 100644
--- a/mozilla/netwerk/base/src/nsNetModuleMgr.cpp
+++ b/mozilla/netwerk/base/src/nsNetModuleMgr.cpp
@@ -181,7 +181,6 @@ nsNetModuleMgr::EnumerateModules(const char *aTopic, nsISimpleEnumerator **aEnum
 ///////////////////////////////////
 
 nsNetModuleMgr::nsNetModuleMgr() {
-    NS_INIT_ISUPPORTS();
     mMonitor = nsAutoMonitor::NewMonitor("nsNetModuleMgr");
 }
 
diff --git a/mozilla/netwerk/base/src/nsProtocolProxyService.cpp b/mozilla/netwerk/base/src/nsProtocolProxyService.cpp
index e24d4e6e3b2..bccf9e3a2aa 100644
--- a/mozilla/netwerk/base/src/nsProtocolProxyService.cpp
+++ b/mozilla/netwerk/base/src/nsProtocolProxyService.cpp
@@ -74,7 +74,6 @@ nsProtocolProxyService::nsProtocolProxyService()
     , mSOCKSProxyPort(-1)
     , mSOCKSProxyVersion(4)
 {
-    NS_INIT_ISUPPORTS();
 }
 
 nsProtocolProxyService::~nsProtocolProxyService()
diff --git a/mozilla/netwerk/base/src/nsProtocolProxyService.h b/mozilla/netwerk/base/src/nsProtocolProxyService.h
index ead321af8a2..71461a1d293 100644
--- a/mozilla/netwerk/base/src/nsProtocolProxyService.h
+++ b/mozilla/netwerk/base/src/nsProtocolProxyService.h
@@ -87,7 +87,6 @@ public:
         }
 
         nsProxyInfo() : mType(nsnull), mHost(nsnull), mPort(-1) {
-            NS_INIT_ISUPPORTS();
         }
 
         const char* mType;
diff --git a/mozilla/netwerk/base/src/nsRequestObserverProxy.h b/mozilla/netwerk/base/src/nsRequestObserverProxy.h
index 2f2563d1abe..211dde0a374 100644
--- a/mozilla/netwerk/base/src/nsRequestObserverProxy.h
+++ b/mozilla/netwerk/base/src/nsRequestObserverProxy.h
@@ -54,7 +54,7 @@ public:
     NS_DECL_NSIREQUESTOBSERVER
     NS_DECL_NSIREQUESTOBSERVERPROXY
 
-    nsRequestObserverProxy() { NS_INIT_ISUPPORTS(); }
+    nsRequestObserverProxy() { }
     virtual ~nsRequestObserverProxy();
 
     nsIRequestObserver *Observer() { return mObserver; }
diff --git a/mozilla/netwerk/base/src/nsResumableEntityID.cpp b/mozilla/netwerk/base/src/nsResumableEntityID.cpp
index 3ab725f6fb8..1b036536199 100644
--- a/mozilla/netwerk/base/src/nsResumableEntityID.cpp
+++ b/mozilla/netwerk/base/src/nsResumableEntityID.cpp
@@ -43,7 +43,6 @@ NS_IMPL_ISUPPORTS1(nsResumableEntityID, nsIResumableEntityID)
 nsResumableEntityID::nsResumableEntityID() :
     mSize(PRUint32(-1)),
     mLastModified(PRTime(LL_INIT(-1,-1))) {
-    NS_INIT_ISUPPORTS();
 }
 
 nsResumableEntityID::~nsResumableEntityID() {}
diff --git a/mozilla/netwerk/base/src/nsSimpleStreamListener.h b/mozilla/netwerk/base/src/nsSimpleStreamListener.h
index 84000ac42f1..32af139d257 100644
--- a/mozilla/netwerk/base/src/nsSimpleStreamListener.h
+++ b/mozilla/netwerk/base/src/nsSimpleStreamListener.h
@@ -48,7 +48,7 @@ public:
     NS_DECL_NSISTREAMLISTENER
     NS_DECL_NSISIMPLESTREAMLISTENER
 
-    nsSimpleStreamListener() { NS_INIT_ISUPPORTS(); }
+    nsSimpleStreamListener() { }
     virtual ~nsSimpleStreamListener() {}
 
 protected:
diff --git a/mozilla/netwerk/base/src/nsSimpleStreamProvider.h b/mozilla/netwerk/base/src/nsSimpleStreamProvider.h
index a32e57bc277..fa30127c704 100644
--- a/mozilla/netwerk/base/src/nsSimpleStreamProvider.h
+++ b/mozilla/netwerk/base/src/nsSimpleStreamProvider.h
@@ -48,7 +48,7 @@ public:
     NS_DECL_NSISTREAMPROVIDER
     NS_DECL_NSISIMPLESTREAMPROVIDER
 
-    nsSimpleStreamProvider() { NS_INIT_ISUPPORTS(); }
+    nsSimpleStreamProvider() { }
     virtual ~nsSimpleStreamProvider() {}
 
 protected:
diff --git a/mozilla/netwerk/base/src/nsSocketTransport.cpp b/mozilla/netwerk/base/src/nsSocketTransport.cpp
index 09154f6b002..5c19f4ac2e8 100644
--- a/mozilla/netwerk/base/src/nsSocketTransport.cpp
+++ b/mozilla/netwerk/base/src/nsSocketTransport.cpp
@@ -197,8 +197,6 @@ nsSocketTransport::nsSocketTransport():
     mReadRequest(nsnull),
     mWriteRequest(nsnull)
 {
-    NS_INIT_ISUPPORTS();
-
 #if defined(PR_LOGGING)
     if (!gSocketTransportLog)
         gSocketTransportLog = PR_NewLogModule("nsSocketTransport");
@@ -2318,7 +2316,6 @@ NS_IMPL_THREADSAFE_ISUPPORTS1(nsSocketBIS, nsIInputStream)
 
 nsSocketBIS::nsSocketBIS()
 {
-    NS_INIT_ISUPPORTS();
 }
 
 nsSocketBIS::~nsSocketBIS()
@@ -2399,7 +2396,6 @@ NS_IMPL_THREADSAFE_ISUPPORTS1(nsSocketBOS, nsIOutputStream)
 
 nsSocketBOS::nsSocketBOS()
 {
-    NS_INIT_ISUPPORTS();
 }
 
 nsSocketBOS::~nsSocketBOS()
@@ -2503,7 +2499,6 @@ nsSocketIS::nsSocketIS()
     , mSock(nsnull)
     , mError(0)
 {
-    NS_INIT_ISUPPORTS();
 }
 
 NS_IMETHODIMP
@@ -2605,7 +2600,6 @@ nsSocketOS::nsSocketOS()
     , mSock(nsnull)
     , mError(0)
 {
-    NS_INIT_ISUPPORTS();
 }
 
 NS_METHOD
@@ -2720,7 +2714,6 @@ nsSocketRequest::nsSocketRequest()
     , mStartFired(0)
     , mStopFired(0)
 {
-    NS_INIT_ISUPPORTS();
 }
 
 nsSocketRequest::~nsSocketRequest()
diff --git a/mozilla/netwerk/base/src/nsSocketTransportService.cpp b/mozilla/netwerk/base/src/nsSocketTransportService.cpp
index 488b3fdb992..c3efbfb1d4b 100644
--- a/mozilla/netwerk/base/src/nsSocketTransportService.cpp
+++ b/mozilla/netwerk/base/src/nsSocketTransportService.cpp
@@ -77,8 +77,6 @@ nsSocketTransportService::nsSocketTransportService ()   :
     gSocketTransportServiceLog = PR_NewLogModule("nsSocketTransportService");
 #endif
   LOG(("nsSocketTransportService::nsSocketTransportService"));
-    
-  NS_INIT_ISUPPORTS();
 
   PR_INIT_CLIST(&mWorkQ);
 
diff --git a/mozilla/netwerk/base/src/nsStandardURL.cpp b/mozilla/netwerk/base/src/nsStandardURL.cpp
index 8f88ebd6aed..2827648b5cd 100644
--- a/mozilla/netwerk/base/src/nsStandardURL.cpp
+++ b/mozilla/netwerk/base/src/nsStandardURL.cpp
@@ -318,8 +318,6 @@ nsStandardURL::nsStandardURL(PRBool aSupportsFileURL)
 
     LOG(("Creating nsStandardURL @%p\n", this));
 
-    NS_INIT_ISUPPORTS();
-
     if (!gInitialized) {
         gInitialized = PR_TRUE;
         InitGlobalObjects();
diff --git a/mozilla/netwerk/base/src/nsStandardURL.h b/mozilla/netwerk/base/src/nsStandardURL.h
index 2a0cb43a9e8..919e1356b84 100644
--- a/mozilla/netwerk/base/src/nsStandardURL.h
+++ b/mozilla/netwerk/base/src/nsStandardURL.h
@@ -104,7 +104,7 @@ public: /* internal -- HPUX compiler can't handle this being private */
         NS_DECL_ISUPPORTS
         NS_DECL_NSIOBSERVER
 
-        nsPrefObserver() { NS_INIT_ISUPPORTS(); }
+        nsPrefObserver() { }
     };
     friend class nsPrefObserver;
 
diff --git a/mozilla/netwerk/base/src/nsStorageTransport.cpp b/mozilla/netwerk/base/src/nsStorageTransport.cpp
index cab4d552d42..051d9fad81d 100644
--- a/mozilla/netwerk/base/src/nsStorageTransport.cpp
+++ b/mozilla/netwerk/base/src/nsStorageTransport.cpp
@@ -93,8 +93,6 @@ nsStorageTransport::nsStorageTransport()
     , mWriteSegment(nsnull)
     , mWriteCursor(0)
 {
-    NS_INIT_ISUPPORTS();
-
     PR_INIT_CLIST(&mReadRequests);
     PR_INIT_CLIST(&mInputStreams);
 }
@@ -433,7 +431,6 @@ nsStorageTransport::nsReadRequest::nsReadRequest()
     , mOnStartFired(PR_FALSE)
     , mWaitingForWrite(PR_FALSE)
 {
-    NS_INIT_ISUPPORTS();
     PR_INIT_CLIST(this);
 }
 
@@ -792,7 +789,6 @@ nsStorageTransport::nsBlockingStream::~nsBlockingStream()
 nsStorageTransport::nsInputStream::nsInputStream()
     : mOffset(0)
 {
-    NS_INIT_ISUPPORTS();
 }
 
 nsStorageTransport::nsInputStream::~nsInputStream()
@@ -843,7 +839,6 @@ nsStorageTransport::nsInputStream::IsNonBlocking(PRBool *aNonBlocking)
 
 nsStorageTransport::nsOutputStream::nsOutputStream()
 {
-    NS_INIT_ISUPPORTS();
 }
 
 nsStorageTransport::nsOutputStream::~nsOutputStream()
diff --git a/mozilla/netwerk/base/src/nsStreamListenerProxy.cpp b/mozilla/netwerk/base/src/nsStreamListenerProxy.cpp
index e7fa43a1f2b..3425b1f8a37 100644
--- a/mozilla/netwerk/base/src/nsStreamListenerProxy.cpp
+++ b/mozilla/netwerk/base/src/nsStreamListenerProxy.cpp
@@ -81,7 +81,6 @@ nsStreamListenerProxy::nsStreamListenerProxy()
     , mPipeEmptied(PR_FALSE)
     , mListenerStatus(NS_OK)
 {
-    NS_INIT_ISUPPORTS();
 }
 
 nsStreamListenerProxy::~nsStreamListenerProxy()
diff --git a/mozilla/netwerk/base/src/nsStreamListenerTee.h b/mozilla/netwerk/base/src/nsStreamListenerTee.h
index c504d4da966..2e81cea8953 100644
--- a/mozilla/netwerk/base/src/nsStreamListenerTee.h
+++ b/mozilla/netwerk/base/src/nsStreamListenerTee.h
@@ -51,7 +51,7 @@ public:
     NS_DECL_NSISTREAMLISTENER
     NS_DECL_NSISTREAMLISTENERTEE
 
-    nsStreamListenerTee() { NS_INIT_ISUPPORTS(); }
+    nsStreamListenerTee() { }
     virtual ~nsStreamListenerTee() { }
 
 private:
diff --git a/mozilla/netwerk/base/src/nsStreamLoader.h b/mozilla/netwerk/base/src/nsStreamLoader.h
index 66cb38a4b4c..92a781de301 100644
--- a/mozilla/netwerk/base/src/nsStreamLoader.h
+++ b/mozilla/netwerk/base/src/nsStreamLoader.h
@@ -52,7 +52,7 @@ public:
   NS_DECL_NSIREQUESTOBSERVER
   NS_DECL_NSISTREAMLISTENER
 
-  nsStreamLoader() { NS_INIT_ISUPPORTS(); };
+  nsStreamLoader() { };
   virtual ~nsStreamLoader() {};
 
   static NS_METHOD
diff --git a/mozilla/netwerk/base/src/nsStreamObserverProxy.h b/mozilla/netwerk/base/src/nsStreamObserverProxy.h
index 75464b6b9be..f5e3b9e2c55 100644
--- a/mozilla/netwerk/base/src/nsStreamObserverProxy.h
+++ b/mozilla/netwerk/base/src/nsStreamObserverProxy.h
@@ -54,7 +54,7 @@ public:
     NS_DECL_ISUPPORTS
     NS_DECL_NSISTREAMOBSERVER
 
-    nsStreamProxyBase() { NS_INIT_ISUPPORTS(); }
+    nsStreamProxyBase() { }
     virtual ~nsStreamProxyBase() {}
 
     nsIEventQueue *GetEventQueue() { return mEventQ.get(); }
diff --git a/mozilla/netwerk/base/src/nsStreamProviderProxy.cpp b/mozilla/netwerk/base/src/nsStreamProviderProxy.cpp
index cbb40c7af6e..f8cd9d16967 100644
--- a/mozilla/netwerk/base/src/nsStreamProviderProxy.cpp
+++ b/mozilla/netwerk/base/src/nsStreamProviderProxy.cpp
@@ -67,7 +67,6 @@ nsStreamProviderProxy::nsStreamProviderProxy()
     : mObserverProxy(nsnull),
       mProviderStatus(NS_OK)
 {
-    NS_INIT_ISUPPORTS();
 }
 
 nsStreamProviderProxy::~nsStreamProviderProxy()
diff --git a/mozilla/netwerk/base/src/nsSyncStreamListener.h b/mozilla/netwerk/base/src/nsSyncStreamListener.h
index 51f0633ee3a..98b0c5c76b3 100644
--- a/mozilla/netwerk/base/src/nsSyncStreamListener.h
+++ b/mozilla/netwerk/base/src/nsSyncStreamListener.h
@@ -35,7 +35,6 @@ public:
     // nsSyncStreamListener methods:
     nsSyncStreamListener()
         : mOutputStream(nsnull) {
-        NS_INIT_ISUPPORTS();
     }
     virtual ~nsSyncStreamListener();
 
diff --git a/mozilla/netwerk/base/src/nsURIChecker.cpp b/mozilla/netwerk/base/src/nsURIChecker.cpp
index f0ef7cb521e..914b76b5bbd 100644
--- a/mozilla/netwerk/base/src/nsURIChecker.cpp
+++ b/mozilla/netwerk/base/src/nsURIChecker.cpp
@@ -53,7 +53,6 @@ NS_IMPL_ISUPPORTS5(nsURIChecker, nsIURIChecker,
 
 nsURIChecker::nsURIChecker()
 {
-    NS_INIT_ISUPPORTS();
     mStatus = NS_OK;
     mIsPending = PR_FALSE;
 }
diff --git a/mozilla/netwerk/base/src/nsURLParsers.h b/mozilla/netwerk/base/src/nsURLParsers.h
index 68cf3ab1d61..78134b72fe3 100644
--- a/mozilla/netwerk/base/src/nsURLParsers.h
+++ b/mozilla/netwerk/base/src/nsURLParsers.h
@@ -51,7 +51,7 @@ public:
     NS_DECL_ISUPPORTS
     NS_DECL_NSIURLPARSER
 
-    nsBaseURLParser() { NS_INIT_ISUPPORTS(); }
+    nsBaseURLParser() { }
 
 protected:
     // implemented by subclasses
diff --git a/mozilla/netwerk/base/src/nsUnicharStreamLoader.h b/mozilla/netwerk/base/src/nsUnicharStreamLoader.h
index 3d0713742f4..24ee64cd1e7 100644
--- a/mozilla/netwerk/base/src/nsUnicharStreamLoader.h
+++ b/mozilla/netwerk/base/src/nsUnicharStreamLoader.h
@@ -56,7 +56,7 @@ public:
   NS_DECL_NSIREQUESTOBSERVER
   NS_DECL_NSISTREAMLISTENER
 
-  nsUnicharStreamLoader() { NS_INIT_ISUPPORTS(); }
+  nsUnicharStreamLoader() { }
   virtual ~nsUnicharStreamLoader() {};
 
   static NS_METHOD
diff --git a/mozilla/netwerk/base/tests/urltest.cpp b/mozilla/netwerk/base/tests/urltest.cpp
index 816de77ac9e..2f6931fec40 100644
--- a/mozilla/netwerk/base/tests/urltest.cpp
+++ b/mozilla/netwerk/base/tests/urltest.cpp
@@ -104,7 +104,6 @@ protected:
 
 TestConsumer::TestConsumer()
 {
-    NS_INIT_ISUPPORTS();
 }
 
 
diff --git a/mozilla/netwerk/cache/src/nsANSIFileStreams.cpp b/mozilla/netwerk/cache/src/nsANSIFileStreams.cpp
index c38d44d670c..8a6a503ea52 100644
--- a/mozilla/netwerk/cache/src/nsANSIFileStreams.cpp
+++ b/mozilla/netwerk/cache/src/nsANSIFileStreams.cpp
@@ -27,7 +27,6 @@ NS_IMPL_ISUPPORTS2(nsANSIInputStream, nsIInputStream, nsISeekableStream);
 
 nsANSIInputStream::nsANSIInputStream() : mFile(nsnull), mSize(0)
 {
-    NS_INIT_ISUPPORTS();
 }
 
 nsANSIInputStream::~nsANSIInputStream()
@@ -113,7 +112,6 @@ NS_IMPL_ISUPPORTS2(nsANSIOutputStream, nsIOutputStream, nsISeekableStream);
 
 nsANSIOutputStream::nsANSIOutputStream() : mFile(nsnull)
 {
-    NS_INIT_ISUPPORTS();
 }
 
 nsANSIOutputStream::~nsANSIOutputStream()
@@ -212,7 +210,6 @@ NS_IMPL_ISUPPORTS3(nsANSIFileStream, nsIInputStream, nsIOutputStream, nsISeekabl
 
 nsANSIFileStream::nsANSIFileStream() : mFile(nsnull), mSize(0)
 {
-    NS_INIT_ISUPPORTS();
 }
 
 nsANSIFileStream::~nsANSIFileStream()
diff --git a/mozilla/netwerk/cache/src/nsCacheEntry.h b/mozilla/netwerk/cache/src/nsCacheEntry.h
index cbd6efd0ed2..fdc9d338cd3 100644
--- a/mozilla/netwerk/cache/src/nsCacheEntry.h
+++ b/mozilla/netwerk/cache/src/nsCacheEntry.h
@@ -247,7 +247,6 @@ public:
     nsCacheEntryInfo(nsCacheEntry* entry)
         :   mCacheEntry(entry)
     {
-        NS_INIT_ISUPPORTS();
     }
 
     virtual ~nsCacheEntryInfo() {}
diff --git a/mozilla/netwerk/cache/src/nsCacheEntryDescriptor.cpp b/mozilla/netwerk/cache/src/nsCacheEntryDescriptor.cpp
index c79ea38b4b3..308975adbd6 100644
--- a/mozilla/netwerk/cache/src/nsCacheEntryDescriptor.cpp
+++ b/mozilla/netwerk/cache/src/nsCacheEntryDescriptor.cpp
@@ -40,7 +40,6 @@ nsCacheEntryDescriptor::nsCacheEntryDescriptor(nsCacheEntry * entry,
     : mCacheEntry(entry),
       mAccessGranted(accessGranted)
 {
-  NS_INIT_ISUPPORTS();
   PR_INIT_CLIST(this);
   NS_ADDREF(nsCacheService::GlobalInstance());  // ensure it lives for the lifetime of the descriptor
 }
diff --git a/mozilla/netwerk/cache/src/nsCacheEntryDescriptor.h b/mozilla/netwerk/cache/src/nsCacheEntryDescriptor.h
index ea3e1aca274..0ca53074893 100644
--- a/mozilla/netwerk/cache/src/nsCacheEntryDescriptor.h
+++ b/mozilla/netwerk/cache/src/nsCacheEntryDescriptor.h
@@ -128,7 +128,6 @@ private:
                                nsIOutputStream *        output)
              : mDescriptor(nsnull), mOutput(output)
          {
-             NS_INIT_ISUPPORTS();
              NS_ADDREF(mDescriptor = descriptor);
          }
     
diff --git a/mozilla/netwerk/cache/src/nsCacheService.cpp b/mozilla/netwerk/cache/src/nsCacheService.cpp
index 905f1d03f38..d38795f4ddd 100644
--- a/mozilla/netwerk/cache/src/nsCacheService.cpp
+++ b/mozilla/netwerk/cache/src/nsCacheService.cpp
@@ -74,7 +74,6 @@ public:
         , mMemoryCacheEnabled(PR_TRUE)
         , mMemoryCacheCapacity(4 * 1024 * 1024)
     {
-        NS_INIT_ISUPPORTS();
     }
 
     virtual ~nsCacheProfilePrefObserver() {}
@@ -384,8 +383,6 @@ nsCacheService::nsCacheService()
       mDeactivateFailures(0),
       mDeactivatedUnboundEntries(0)
 {
-    NS_INIT_ISUPPORTS();
-
     NS_ASSERTION(gService==nsnull, "multiple nsCacheService instances!");
     gService = this;
 
diff --git a/mozilla/netwerk/cache/src/nsCacheSession.cpp b/mozilla/netwerk/cache/src/nsCacheSession.cpp
index f4fe1c89685..2bc1ca548f3 100644
--- a/mozilla/netwerk/cache/src/nsCacheSession.cpp
+++ b/mozilla/netwerk/cache/src/nsCacheSession.cpp
@@ -35,7 +35,6 @@ nsCacheSession::nsCacheSession(const char *         clientID,
     : mClientID(clientID),
       mInfo(0)
 {
-  NS_INIT_ISUPPORTS();
   SetStoragePolicy(storagePolicy);
 
   if (streamBased) MarkStreamBased();
diff --git a/mozilla/netwerk/cache/src/nsDiskCacheBinding.cpp b/mozilla/netwerk/cache/src/nsDiskCacheBinding.cpp
index 495dfb58f75..299c7b568ec 100644
--- a/mozilla/netwerk/cache/src/nsDiskCacheBinding.cpp
+++ b/mozilla/netwerk/cache/src/nsDiskCacheBinding.cpp
@@ -112,7 +112,6 @@ nsDiskCacheBinding::nsDiskCacheBinding(nsCacheEntry* entry, nsDiskCacheRecord *
     :   mCacheEntry(entry)
 {
     NS_ASSERTION(record->ValidRecord(), "bad record");
-    NS_INIT_ISUPPORTS();
     PR_INIT_CLIST(this);
     mRecord     = *record;
     mDoomed     = entry->IsDoomed();
diff --git a/mozilla/netwerk/cache/src/nsDiskCacheDevice.cpp b/mozilla/netwerk/cache/src/nsDiskCacheDevice.cpp
index f64f9a7c1e2..1bd752b0452 100644
--- a/mozilla/netwerk/cache/src/nsDiskCacheDevice.cpp
+++ b/mozilla/netwerk/cache/src/nsDiskCacheDevice.cpp
@@ -174,7 +174,6 @@ public:
     nsDiskCacheDeviceInfo(nsDiskCacheDevice* device)
         :   mDevice(device)
     {
-        NS_INIT_ISUPPORTS();
     }
 
     virtual ~nsDiskCacheDeviceInfo() {}
diff --git a/mozilla/netwerk/cache/src/nsDiskCacheEntry.h b/mozilla/netwerk/cache/src/nsDiskCacheEntry.h
index cfaf7cb6e24..a60e5b67447 100644
--- a/mozilla/netwerk/cache/src/nsDiskCacheEntry.h
+++ b/mozilla/netwerk/cache/src/nsDiskCacheEntry.h
@@ -108,7 +108,6 @@ public:
         : mDeviceID(deviceID)
         , mDiskEntry(diskEntry)
     {
-        NS_INIT_ISUPPORTS();
     }
 
     virtual ~nsDiskCacheEntryInfo() {}
diff --git a/mozilla/netwerk/cache/src/nsDiskCacheStreams.cpp b/mozilla/netwerk/cache/src/nsDiskCacheStreams.cpp
index 5473594d95f..2b4a381c6f2 100644
--- a/mozilla/netwerk/cache/src/nsDiskCacheStreams.cpp
+++ b/mozilla/netwerk/cache/src/nsDiskCacheStreams.cpp
@@ -87,7 +87,6 @@ nsDiskCacheInputStream::nsDiskCacheInputStream( nsDiskCacheStreamIO * parent,
     , mPos(0)
     , mClosed(PR_FALSE)
 {
-    NS_INIT_ISUPPORTS();
     mStreamIO->IncrementInputStreamCount();
 }
 
@@ -208,7 +207,6 @@ nsDiskCacheOutputStream::nsDiskCacheOutputStream( nsDiskCacheStreamIO * parent)
     : mStreamIO(parent)
     , mClosed(PR_FALSE)
 {
-    NS_INIT_ISUPPORTS();
 }
 
 
@@ -327,7 +325,6 @@ nsDiskCacheStreamIO::nsDiskCacheStreamIO(nsDiskCacheBinding *   binding)
     , mBufDirty(PR_FALSE)
     , mBuffer(nsnull)
 {
-    NS_INIT_ISUPPORTS();
     mDevice = (nsDiskCacheDevice *)mBinding->mCacheEntry->CacheDevice();
 
     // acquire "death grip" on cache service
diff --git a/mozilla/netwerk/cache/src/nsMemoryCacheDevice.h b/mozilla/netwerk/cache/src/nsMemoryCacheDevice.h
index 94a12a427e1..ad8a0a4634e 100644
--- a/mozilla/netwerk/cache/src/nsMemoryCacheDevice.h
+++ b/mozilla/netwerk/cache/src/nsMemoryCacheDevice.h
@@ -107,7 +107,6 @@ public:
     nsMemoryCacheDeviceInfo(nsMemoryCacheDevice* device)
         :   mDevice(device)
     {
-        NS_INIT_ISUPPORTS();
     }
 
     virtual ~nsMemoryCacheDeviceInfo() {}
diff --git a/mozilla/netwerk/dns/src/nsDnsService.cpp b/mozilla/netwerk/dns/src/nsDnsService.cpp
index 5af5d1dee7f..07dcb74eb66 100644
--- a/mozilla/netwerk/dns/src/nsDnsService.cpp
+++ b/mozilla/netwerk/dns/src/nsDnsService.cpp
@@ -146,7 +146,6 @@ public:
         , mStartTime(PR_IntervalNow())
 #endif
     {
-        NS_INIT_ISUPPORTS(); 
         PR_INIT_CLIST(this);
     }
 
@@ -538,7 +537,6 @@ nsDNSLookup::nsDNSLookup()
     , mFlags(eCacheableMask)
     , mExpires(0)
 {
-	NS_INIT_ISUPPORTS();
 	MOZ_COUNT_CTOR(nsDNSLookup);
 	PR_INIT_CLIST(this);
     PR_INIT_CLIST(&mRequestQ);
@@ -926,8 +924,6 @@ nsDNSService::nsDNSService()
     , mOut(nsnull)
 #endif
 {
-    NS_INIT_ISUPPORTS();
-    
     NS_ASSERTION(gService==nsnull,"multiple nsDNSServices allocated!");
     gService    = this;
     
diff --git a/mozilla/netwerk/dns/src/nsIDNService.cpp b/mozilla/netwerk/dns/src/nsIDNService.cpp
index 546daa60ef7..732584d50b7 100644
--- a/mozilla/netwerk/dns/src/nsIDNService.cpp
+++ b/mozilla/netwerk/dns/src/nsIDNService.cpp
@@ -47,7 +47,6 @@ NS_IMPL_ISUPPORTS1(nsIDNService, nsIIDNService)
 
 nsIDNService::nsIDNService()
 {
-  NS_INIT_ISUPPORTS();
   /* member initializers and constructor code */
 }
 
diff --git a/mozilla/netwerk/mime/src/nsMIMEInfoImpl.cpp b/mozilla/netwerk/mime/src/nsMIMEInfoImpl.cpp
index 716e8829f66..f54f960e38d 100644
--- a/mozilla/netwerk/mime/src/nsMIMEInfoImpl.cpp
+++ b/mozilla/netwerk/mime/src/nsMIMEInfoImpl.cpp
@@ -50,12 +50,10 @@ NS_IMPL_THREADSAFE_ISUPPORTS1(nsMIMEInfoImpl, nsIMIMEInfo);
 
 // nsMIMEInfoImpl methods
 nsMIMEInfoImpl::nsMIMEInfoImpl() {
-    NS_INIT_ISUPPORTS();
     mPreferredAction = nsIMIMEInfo::saveToDisk;
 }
 
 nsMIMEInfoImpl::nsMIMEInfoImpl(const char *aMIMEType) :mMIMEType( aMIMEType ){
-    NS_INIT_ISUPPORTS();
     mPreferredAction = nsIMIMEInfo::saveToDisk;
 }
 
diff --git a/mozilla/netwerk/protocol/about/src/nsAboutBlank.h b/mozilla/netwerk/protocol/about/src/nsAboutBlank.h
index a884b7e6aef..3c2106daaf4 100644
--- a/mozilla/netwerk/protocol/about/src/nsAboutBlank.h
+++ b/mozilla/netwerk/protocol/about/src/nsAboutBlank.h
@@ -47,7 +47,7 @@ public:
 
     NS_DECL_NSIABOUTMODULE
 
-    nsAboutBlank() { NS_INIT_ISUPPORTS(); }
+    nsAboutBlank() {}
     virtual ~nsAboutBlank() {}
 
     static NS_METHOD
diff --git a/mozilla/netwerk/protocol/about/src/nsAboutBloat.h b/mozilla/netwerk/protocol/about/src/nsAboutBloat.h
index ede6a685290..f2d414b5057 100644
--- a/mozilla/netwerk/protocol/about/src/nsAboutBloat.h
+++ b/mozilla/netwerk/protocol/about/src/nsAboutBloat.h
@@ -47,7 +47,7 @@ public:
 
     NS_DECL_NSIABOUTMODULE
 
-    nsAboutBloat() { NS_INIT_ISUPPORTS(); }
+    nsAboutBloat() {}
     virtual ~nsAboutBloat() {}
 
     static NS_METHOD
diff --git a/mozilla/netwerk/protocol/about/src/nsAboutCache.h b/mozilla/netwerk/protocol/about/src/nsAboutCache.h
index 5d0585d828a..6ee89bb05ce 100644
--- a/mozilla/netwerk/protocol/about/src/nsAboutCache.h
+++ b/mozilla/netwerk/protocol/about/src/nsAboutCache.h
@@ -54,7 +54,7 @@ public:
     NS_DECL_NSIABOUTMODULE
     NS_DECL_NSICACHEVISITOR
 
-    nsAboutCache() { NS_INIT_ISUPPORTS(); }
+    nsAboutCache() {}
     virtual ~nsAboutCache() {}
 
     static NS_METHOD
diff --git a/mozilla/netwerk/protocol/about/src/nsAboutCacheEntry.h b/mozilla/netwerk/protocol/about/src/nsAboutCacheEntry.h
index 6f08f3b9d07..5bc5533d6b5 100644
--- a/mozilla/netwerk/protocol/about/src/nsAboutCacheEntry.h
+++ b/mozilla/netwerk/protocol/about/src/nsAboutCacheEntry.h
@@ -66,7 +66,7 @@ public:
 
     nsAboutCacheEntry()
         : mBuffer(nsnull)
-    { NS_INIT_ISUPPORTS(); }
+    {}
 
     virtual ~nsAboutCacheEntry() {}
 
diff --git a/mozilla/netwerk/protocol/about/src/nsAboutProtocolHandler.cpp b/mozilla/netwerk/protocol/about/src/nsAboutProtocolHandler.cpp
index cff2b976dda..4885b743138 100644
--- a/mozilla/netwerk/protocol/about/src/nsAboutProtocolHandler.cpp
+++ b/mozilla/netwerk/protocol/about/src/nsAboutProtocolHandler.cpp
@@ -53,7 +53,6 @@ static NS_DEFINE_CID(kSimpleURICID,     NS_SIMPLEURI_CID);
 
 nsAboutProtocolHandler::nsAboutProtocolHandler()
 {
-    NS_INIT_ISUPPORTS();
 }
 
 nsresult
diff --git a/mozilla/netwerk/protocol/about/src/nsAboutRedirector.h b/mozilla/netwerk/protocol/about/src/nsAboutRedirector.h
index 74829a95f2f..ae9aa41059b 100644
--- a/mozilla/netwerk/protocol/about/src/nsAboutRedirector.h
+++ b/mozilla/netwerk/protocol/about/src/nsAboutRedirector.h
@@ -48,7 +48,7 @@ public:
 
     NS_DECL_NSIABOUTMODULE
 
-    nsAboutRedirector() { NS_INIT_ISUPPORTS(); }
+    nsAboutRedirector() {}
     virtual ~nsAboutRedirector() {}
 
     static NS_METHOD
diff --git a/mozilla/netwerk/protocol/data/src/nsDataChannel.cpp b/mozilla/netwerk/protocol/data/src/nsDataChannel.cpp
index 86db852acf3..c43fe7abb5c 100644
--- a/mozilla/netwerk/protocol/data/src/nsDataChannel.cpp
+++ b/mozilla/netwerk/protocol/data/src/nsDataChannel.cpp
@@ -56,8 +56,6 @@ static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
 
 // nsDataChannel methods
 nsDataChannel::nsDataChannel() {
-    NS_INIT_ISUPPORTS();
-
     mStatus = NS_OK;
     mContentLength = -1;
     mLoadFlags = nsIRequest::LOAD_NORMAL;
diff --git a/mozilla/netwerk/protocol/data/src/nsDataHandler.cpp b/mozilla/netwerk/protocol/data/src/nsDataHandler.cpp
index ba0c002e58a..e43b77ffcb0 100644
--- a/mozilla/netwerk/protocol/data/src/nsDataHandler.cpp
+++ b/mozilla/netwerk/protocol/data/src/nsDataHandler.cpp
@@ -52,7 +52,6 @@ static NS_DEFINE_CID(kSimpleURICID, NS_SIMPLEURI_CID);
 ////////////////////////////////////////////////////////////////////////////////
 
 nsDataHandler::nsDataHandler() {
-    NS_INIT_ISUPPORTS();
 }
 
 nsDataHandler::~nsDataHandler() {
diff --git a/mozilla/netwerk/protocol/file/src/nsFileChannel.cpp b/mozilla/netwerk/protocol/file/src/nsFileChannel.cpp
index 49ebce82f96..8625150bf78 100644
--- a/mozilla/netwerk/protocol/file/src/nsFileChannel.cpp
+++ b/mozilla/netwerk/protocol/file/src/nsFileChannel.cpp
@@ -74,7 +74,6 @@ nsFileChannel::nsFileChannel()
       ,mInitiator(nsnull)
 #endif
 {
-    NS_INIT_ISUPPORTS();
 }
 
 nsresult
diff --git a/mozilla/netwerk/protocol/file/src/nsFileProtocolHandler.cpp b/mozilla/netwerk/protocol/file/src/nsFileProtocolHandler.cpp
index c2f3e8fe374..3e8d5e83abc 100644
--- a/mozilla/netwerk/protocol/file/src/nsFileProtocolHandler.cpp
+++ b/mozilla/netwerk/protocol/file/src/nsFileProtocolHandler.cpp
@@ -63,7 +63,6 @@ static NS_DEFINE_CID(kPrefCID, NS_PREF_CID);
 
 nsFileProtocolHandler::nsFileProtocolHandler()
 {
-    NS_INIT_ISUPPORTS();
     mGenerateHTMLContent = PR_FALSE;
 }
 
diff --git a/mozilla/netwerk/protocol/ftp/src/nsFTPChannel.cpp b/mozilla/netwerk/protocol/ftp/src/nsFTPChannel.cpp
index cc1cdeb2e8c..96959ba198e 100644
--- a/mozilla/netwerk/protocol/ftp/src/nsFTPChannel.cpp
+++ b/mozilla/netwerk/protocol/ftp/src/nsFTPChannel.cpp
@@ -87,7 +87,6 @@ nsFTPChannel::nsFTPChannel()
       mStatus(NS_OK),
       mCanceled(PR_FALSE)
 {
-    NS_INIT_ISUPPORTS();
 }
 
 nsFTPChannel::~nsFTPChannel()
diff --git a/mozilla/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp b/mozilla/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp
index 799f949e4ba..8be8f10053b 100644
--- a/mozilla/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp
+++ b/mozilla/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp
@@ -155,7 +155,6 @@ DataRequestForwarder::DataRequestForwarder()
 
     mBytesTransfered = 0;
     mRetrying = mUploading = mDelayedOnStartFired = PR_FALSE;
-    NS_INIT_ISUPPORTS();
 }
 
 DataRequestForwarder::~DataRequestForwarder()
@@ -400,8 +399,6 @@ NS_IMPL_THREADSAFE_ISUPPORTS3(nsFtpState,
                               nsIRequest);
 
 nsFtpState::nsFtpState() {
-    NS_INIT_ISUPPORTS();
-
     PR_LOG(gFTPLog, PR_LOG_ALWAYS, ("(%x) nsFtpState created", this));
     // bool init
     mRETRFailed = PR_FALSE;
diff --git a/mozilla/netwerk/protocol/ftp/src/nsFtpControlConnection.cpp b/mozilla/netwerk/protocol/ftp/src/nsFtpControlConnection.cpp
index 565155e45b1..bcd01170159 100644
--- a/mozilla/netwerk/protocol/ftp/src/nsFtpControlConnection.cpp
+++ b/mozilla/netwerk/protocol/ftp/src/nsFtpControlConnection.cpp
@@ -56,7 +56,7 @@ class nsFtpStreamProvider : public nsIStreamProvider {
 public:
     NS_DECL_ISUPPORTS
 
-    nsFtpStreamProvider() { NS_INIT_ISUPPORTS(); }
+    nsFtpStreamProvider() {}
     virtual ~nsFtpStreamProvider() {}
 
     //
@@ -112,7 +112,6 @@ nsFtpControlConnection::nsFtpControlConnection(const char* host,
                                                PRUint32 port) 
     : mServerType(0), mSuspendedWrite(0), mPort(port)
 {
-    NS_INIT_ISUPPORTS();
     PR_LOG(gFTPLog, PR_LOG_ALWAYS, ("(%x) nsFtpControlConnection created", this));
 
     mHost.Adopt(nsCRT::strdup(host));
diff --git a/mozilla/netwerk/protocol/ftp/src/nsFtpProtocolHandler.cpp b/mozilla/netwerk/protocol/ftp/src/nsFtpProtocolHandler.cpp
index 6dd06e6fc91..715c454d809 100644
--- a/mozilla/netwerk/protocol/ftp/src/nsFtpProtocolHandler.cpp
+++ b/mozilla/netwerk/protocol/ftp/src/nsFtpProtocolHandler.cpp
@@ -76,7 +76,6 @@ nsVoidArray* nsFtpProtocolHandler::mRootConnectionList = nsnull;
 PRInt32 nsFtpProtocolHandler::mIdleTimeout = -1;
 ////////////////////////////////////////////////////////////////////////////////
 nsFtpProtocolHandler::nsFtpProtocolHandler() {
-    NS_INIT_ISUPPORTS();
 }
 
 nsFtpProtocolHandler::~nsFtpProtocolHandler() {
diff --git a/mozilla/netwerk/protocol/gopher/src/nsGopherChannel.cpp b/mozilla/netwerk/protocol/gopher/src/nsGopherChannel.cpp
index a3a61dcb130..2c000d2e796 100644
--- a/mozilla/netwerk/protocol/gopher/src/nsGopherChannel.cpp
+++ b/mozilla/netwerk/protocol/gopher/src/nsGopherChannel.cpp
@@ -60,7 +60,6 @@ nsGopherChannel::nsGopherChannel()
       mType(-1),
       mStatus(NS_OK)
 {
-    NS_INIT_ISUPPORTS();
 }
 
 nsGopherChannel::~nsGopherChannel()
diff --git a/mozilla/netwerk/protocol/gopher/src/nsGopherHandler.cpp b/mozilla/netwerk/protocol/gopher/src/nsGopherHandler.cpp
index 4534db92557..6c596aa896e 100644
--- a/mozilla/netwerk/protocol/gopher/src/nsGopherHandler.cpp
+++ b/mozilla/netwerk/protocol/gopher/src/nsGopherHandler.cpp
@@ -48,7 +48,6 @@ static NS_DEFINE_CID(kStandardURLCID, NS_STANDARDURL_CID);
 ////////////////////////////////////////////////////////////////////////////////
 
 nsGopherHandler::nsGopherHandler() {
-    NS_INIT_ISUPPORTS();
 #ifdef PR_LOGGING
     if (!gGopherLog)
         gGopherLog = PR_NewLogModule("nsGopherProtocol");
diff --git a/mozilla/netwerk/protocol/http/src/nsHttpBasicAuth.cpp b/mozilla/netwerk/protocol/http/src/nsHttpBasicAuth.cpp
index 388dd68f04e..8e18b353201 100644
--- a/mozilla/netwerk/protocol/http/src/nsHttpBasicAuth.cpp
+++ b/mozilla/netwerk/protocol/http/src/nsHttpBasicAuth.cpp
@@ -53,7 +53,6 @@
 
 nsHttpBasicAuth::nsHttpBasicAuth()
 {
-    NS_INIT_ISUPPORTS();
 }
 
 nsHttpBasicAuth::~nsHttpBasicAuth()
diff --git a/mozilla/netwerk/protocol/http/src/nsHttpChannel.cpp b/mozilla/netwerk/protocol/http/src/nsHttpChannel.cpp
index f5b450a7a12..fc478a282e0 100644
--- a/mozilla/netwerk/protocol/http/src/nsHttpChannel.cpp
+++ b/mozilla/netwerk/protocol/http/src/nsHttpChannel.cpp
@@ -79,8 +79,6 @@ nsHttpChannel::nsHttpChannel()
 {
     LOG(("Creating nsHttpChannel @%x\n", this));
 
-    NS_INIT_ISUPPORTS();
-
     // grab a reference to the handler to ensure that it doesn't go away.
     nsHttpHandler *handler = nsHttpHandler::get();
     NS_ADDREF(handler);
@@ -3329,7 +3327,6 @@ nsHttpChannel::nsContentEncodings::nsContentEncodings(nsIHttpChannel* aChannel,
 {
     mCurEnd = aEncodingHeader + strlen(aEncodingHeader);
     mCurStart = mCurEnd;
-    NS_INIT_ISUPPORTS();
 }
     
 nsHttpChannel::nsContentEncodings::~nsContentEncodings()
diff --git a/mozilla/netwerk/protocol/http/src/nsHttpConnection.cpp b/mozilla/netwerk/protocol/http/src/nsHttpConnection.cpp
index c6a085b95ee..e8590eeab45 100644
--- a/mozilla/netwerk/protocol/http/src/nsHttpConnection.cpp
+++ b/mozilla/netwerk/protocol/http/src/nsHttpConnection.cpp
@@ -63,8 +63,6 @@ nsHttpConnection::nsHttpConnection()
 {
     LOG(("Creating nsHttpConnection @%x\n", this));
 
-    NS_INIT_ISUPPORTS();
-
     // grab a reference to the handler to ensure that it doesn't go away.
     nsHttpHandler *handler = nsHttpHandler::get();
     NS_ADDREF(handler);
diff --git a/mozilla/netwerk/protocol/http/src/nsHttpDigestAuth.cpp b/mozilla/netwerk/protocol/http/src/nsHttpDigestAuth.cpp
index 9a18929ff02..a8665302cb0 100644
--- a/mozilla/netwerk/protocol/http/src/nsHttpDigestAuth.cpp
+++ b/mozilla/netwerk/protocol/http/src/nsHttpDigestAuth.cpp
@@ -45,8 +45,6 @@
 
 nsHttpDigestAuth::nsHttpDigestAuth()
 {
-  NS_INIT_ISUPPORTS();
-
   mVerifier = do_GetService(SIGNATURE_VERIFIER_CONTRACTID);
   mGotVerifier = (mVerifier != nsnull);
 
diff --git a/mozilla/netwerk/protocol/http/src/nsHttpHandler.cpp b/mozilla/netwerk/protocol/http/src/nsHttpHandler.cpp
index 97009cae324..5bd1c41e68d 100644
--- a/mozilla/netwerk/protocol/http/src/nsHttpHandler.cpp
+++ b/mozilla/netwerk/protocol/http/src/nsHttpHandler.cpp
@@ -128,8 +128,6 @@ nsHttpHandler::nsHttpHandler()
     , mUseCache(PR_TRUE)
     , mSendSecureXSiteReferrer(PR_TRUE)
 {
-    NS_INIT_ISUPPORTS();
-
 #if defined(PR_LOGGING)
     gHttpLog = PR_NewLogModule("nsHttp");
 #endif
diff --git a/mozilla/netwerk/protocol/http/src/nsHttpHandler.h b/mozilla/netwerk/protocol/http/src/nsHttpHandler.h
index b48c6c7e9d8..0097ace5a33 100644
--- a/mozilla/netwerk/protocol/http/src/nsHttpHandler.h
+++ b/mozilla/netwerk/protocol/http/src/nsHttpHandler.h
@@ -333,7 +333,7 @@ public:
     NS_FORWARD_NSIPROXIEDPROTOCOLHANDLER (nsHttpHandler::get()->)
     NS_FORWARD_NSIHTTPPROTOCOLHANDLER    (nsHttpHandler::get()->)
 
-    nsHttpsHandler() { NS_INIT_ISUPPORTS(); }
+    nsHttpsHandler() { }
     virtual ~nsHttpsHandler() { }
 
     nsresult Init();
diff --git a/mozilla/netwerk/protocol/http/src/nsHttpPipeline.cpp b/mozilla/netwerk/protocol/http/src/nsHttpPipeline.cpp
index 067ec6a8cc5..56cee884192 100644
--- a/mozilla/netwerk/protocol/http/src/nsHttpPipeline.cpp
+++ b/mozilla/netwerk/protocol/http/src/nsHttpPipeline.cpp
@@ -149,8 +149,6 @@ nsHttpPipeline::nsHttpPipeline()
     , mLock(nsnull)
     , mStatus(NS_OK)
 {
-    NS_INIT_ISUPPORTS();
-
     memset(mTransactionQ,     0, sizeof(PRUint32) * NS_HTTP_MAX_PIPELINED_REQUESTS);
     memset(mTransactionFlags, 0, sizeof(PRUint32) * NS_HTTP_MAX_PIPELINED_REQUESTS);
 }
diff --git a/mozilla/netwerk/protocol/http/src/nsHttpTransaction.cpp b/mozilla/netwerk/protocol/http/src/nsHttpTransaction.cpp
index 2b3bd96efbf..189a0d75460 100644
--- a/mozilla/netwerk/protocol/http/src/nsHttpTransaction.cpp
+++ b/mozilla/netwerk/protocol/http/src/nsHttpTransaction.cpp
@@ -107,8 +107,6 @@ nsHttpTransaction::nsHttpTransaction(nsIStreamListener *listener,
 {
     LOG(("Creating nsHttpTransaction @%x\n", this));
 
-    NS_INIT_ISUPPORTS();
-
     NS_PRECONDITION(listener, "null listener");
 }
 
diff --git a/mozilla/netwerk/protocol/jar/src/nsJARChannel.cpp b/mozilla/netwerk/protocol/jar/src/nsJARChannel.cpp
index 00333c1e077..814e42ba47a 100644
--- a/mozilla/netwerk/protocol/jar/src/nsJARChannel.cpp
+++ b/mozilla/netwerk/protocol/jar/src/nsJARChannel.cpp
@@ -70,8 +70,6 @@ nsJARChannel::nsJARChannel()
     , mInitiator(nsnull)
 #endif
 {
-    NS_INIT_ISUPPORTS();
-
 #if defined(PR_LOGGING)
     //
     // Initialize the global PRLogModule for socket transport logging
diff --git a/mozilla/netwerk/protocol/jar/src/nsJARProtocolHandler.cpp b/mozilla/netwerk/protocol/jar/src/nsJARProtocolHandler.cpp
index 080c806af7e..141a55ab015 100644
--- a/mozilla/netwerk/protocol/jar/src/nsJARProtocolHandler.cpp
+++ b/mozilla/netwerk/protocol/jar/src/nsJARProtocolHandler.cpp
@@ -58,7 +58,6 @@ static NS_DEFINE_CID(kZipReaderCacheCID, NS_ZIPREADERCACHE_CID);
 
 nsJARProtocolHandler::nsJARProtocolHandler()
 {
-    NS_INIT_ISUPPORTS();
 }
 
 nsresult
diff --git a/mozilla/netwerk/protocol/jar/src/nsJARURI.cpp b/mozilla/netwerk/protocol/jar/src/nsJARURI.cpp
index 22732c87541..232268f95d5 100644
--- a/mozilla/netwerk/protocol/jar/src/nsJARURI.cpp
+++ b/mozilla/netwerk/protocol/jar/src/nsJARURI.cpp
@@ -32,7 +32,6 @@
 nsJARURI::nsJARURI()
     : mJAREntry(nsnull)
 {
-    NS_INIT_ISUPPORTS();
 }
  
 nsJARURI::~nsJARURI()
diff --git a/mozilla/netwerk/protocol/keyword/src/nsKeywordProtocolHandler.cpp b/mozilla/netwerk/protocol/keyword/src/nsKeywordProtocolHandler.cpp
index e3fcb48d6bc..2232b1ef365 100644
--- a/mozilla/netwerk/protocol/keyword/src/nsKeywordProtocolHandler.cpp
+++ b/mozilla/netwerk/protocol/keyword/src/nsKeywordProtocolHandler.cpp
@@ -54,7 +54,6 @@ static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID);
 ////////////////////////////////////////////////////////////////////////////////
 
 nsKeywordProtocolHandler::nsKeywordProtocolHandler() {
-    NS_INIT_ISUPPORTS();
 }
 
 nsresult
diff --git a/mozilla/netwerk/protocol/res/src/nsResProtocolHandler.cpp b/mozilla/netwerk/protocol/res/src/nsResProtocolHandler.cpp
index 77af993a26c..282ad80c1dc 100644
--- a/mozilla/netwerk/protocol/res/src/nsResProtocolHandler.cpp
+++ b/mozilla/netwerk/protocol/res/src/nsResProtocolHandler.cpp
@@ -103,8 +103,6 @@ nsResURL::GetFile(nsIFile **result)
 nsResProtocolHandler::nsResProtocolHandler()
     : mSubstitutions(32)
 {
-    NS_INIT_ISUPPORTS();
-
 #if defined(PR_LOGGING)
     gResLog = PR_NewLogModule("nsResProtocol");
 #endif
diff --git a/mozilla/netwerk/protocol/viewsource/src/nsViewSourceChannel.cpp b/mozilla/netwerk/protocol/viewsource/src/nsViewSourceChannel.cpp
index f0f679d607f..340e0c3b0d9 100644
--- a/mozilla/netwerk/protocol/viewsource/src/nsViewSourceChannel.cpp
+++ b/mozilla/netwerk/protocol/viewsource/src/nsViewSourceChannel.cpp
@@ -34,7 +34,6 @@
 // nsViewSourceChannel methods
 nsViewSourceChannel::nsViewSourceChannel() : mIsDocument(PR_FALSE)
 {
-    NS_INIT_ISUPPORTS();
 }
 
 nsViewSourceChannel::~nsViewSourceChannel()
diff --git a/mozilla/netwerk/protocol/viewsource/src/nsViewSourceHandler.cpp b/mozilla/netwerk/protocol/viewsource/src/nsViewSourceHandler.cpp
index 68da8adfc24..4ab199580a9 100644
--- a/mozilla/netwerk/protocol/viewsource/src/nsViewSourceHandler.cpp
+++ b/mozilla/netwerk/protocol/viewsource/src/nsViewSourceHandler.cpp
@@ -48,7 +48,6 @@ static NS_DEFINE_CID(kSimpleURICID,     NS_SIMPLEURI_CID);
 ////////////////////////////////////////////////////////////////////////////////
 
 nsViewSourceHandler::nsViewSourceHandler() {
-    NS_INIT_ISUPPORTS();
 }
 
 nsViewSourceHandler::~nsViewSourceHandler() {
diff --git a/mozilla/netwerk/socket/base/nsSOCKS4SocketProvider.cpp b/mozilla/netwerk/socket/base/nsSOCKS4SocketProvider.cpp
index 6fc1de6dd84..591c01e0b4c 100644
--- a/mozilla/netwerk/socket/base/nsSOCKS4SocketProvider.cpp
+++ b/mozilla/netwerk/socket/base/nsSOCKS4SocketProvider.cpp
@@ -30,7 +30,6 @@
 
 nsSOCKS4SocketProvider::nsSOCKS4SocketProvider()
 {
-    NS_INIT_ISUPPORTS();
 }
 
 nsresult
diff --git a/mozilla/netwerk/socket/base/nsSOCKSIOLayer.cpp b/mozilla/netwerk/socket/base/nsSOCKSIOLayer.cpp
index 8e51293553a..d51aefe0844 100644
--- a/mozilla/netwerk/socket/base/nsSOCKSIOLayer.cpp
+++ b/mozilla/netwerk/socket/base/nsSOCKSIOLayer.cpp
@@ -76,8 +76,6 @@ protected:
 nsSOCKSSocketInfo::nsSOCKSSocketInfo()
 : mSOCKSVersion(-1)
 {
-    NS_INIT_ISUPPORTS();
-    
     mProxyHost = nsnull;
     mProxyPort = -1;
     mProxyType = nsnull;
diff --git a/mozilla/netwerk/socket/base/nsSOCKSSocketProvider.cpp b/mozilla/netwerk/socket/base/nsSOCKSSocketProvider.cpp
index b350a2468c7..7b84b7d4698 100644
--- a/mozilla/netwerk/socket/base/nsSOCKSSocketProvider.cpp
+++ b/mozilla/netwerk/socket/base/nsSOCKSSocketProvider.cpp
@@ -30,7 +30,6 @@
 
 nsSOCKSSocketProvider::nsSOCKSSocketProvider()
 {
-    NS_INIT_ISUPPORTS();
 }
 
 nsresult
diff --git a/mozilla/netwerk/socket/base/nsSocketProviderService.cpp b/mozilla/netwerk/socket/base/nsSocketProviderService.cpp
index 1f8a3edd85b..ae33bf7cd7d 100644
--- a/mozilla/netwerk/socket/base/nsSocketProviderService.cpp
+++ b/mozilla/netwerk/socket/base/nsSocketProviderService.cpp
@@ -45,7 +45,6 @@
 
 nsSocketProviderService::nsSocketProviderService()
 {
-  NS_INIT_ISUPPORTS();
 }
 
 nsresult
diff --git a/mozilla/netwerk/streamconv/converters/mozTXTToHTMLConv.cpp b/mozilla/netwerk/streamconv/converters/mozTXTToHTMLConv.cpp
index 5d9c177bb20..3058038cb9d 100644
--- a/mozilla/netwerk/streamconv/converters/mozTXTToHTMLConv.cpp
+++ b/mozilla/netwerk/streamconv/converters/mozTXTToHTMLConv.cpp
@@ -906,7 +906,6 @@ mozTXTToHTMLConv::GlyphHit(const PRUnichar * aInString, PRInt32 aInLength, PRBoo
 
 mozTXTToHTMLConv::mozTXTToHTMLConv()
 {
-  NS_INIT_ISUPPORTS();
   MOZ_TIMER_RESET(mScanTXTTimer);
   MOZ_TIMER_RESET(mGlyphHitTimer);
   MOZ_TIMER_RESET(mTotalMimeTime);
diff --git a/mozilla/netwerk/streamconv/converters/nsBinHexDecoder.cpp b/mozilla/netwerk/streamconv/converters/nsBinHexDecoder.cpp
index fd5e98dda45..a3b392116d6 100644
--- a/mozilla/netwerk/streamconv/converters/nsBinHexDecoder.cpp
+++ b/mozilla/netwerk/streamconv/converters/nsBinHexDecoder.cpp
@@ -68,7 +68,6 @@ nsBinHexDecoder::nsBinHexDecoder() :
   mDonePos(3), mInCRC(0), mCount(0), mMarker(0), mPosInbuff(0), 
   mPosOutputBuff(0)
 {
-  NS_INIT_ISUPPORTS();
   mDataBuffer = nsnull;
   mOutgoingBuffer = nsnull;
 
diff --git a/mozilla/netwerk/streamconv/converters/nsDirIndex.cpp b/mozilla/netwerk/streamconv/converters/nsDirIndex.cpp
index e05d58c41ce..21e022540ce 100644
--- a/mozilla/netwerk/streamconv/converters/nsDirIndex.cpp
+++ b/mozilla/netwerk/streamconv/converters/nsDirIndex.cpp
@@ -46,7 +46,6 @@ NS_IMPL_THREADSAFE_ISUPPORTS1(nsDirIndex,
 nsDirIndex::nsDirIndex() : mType(TYPE_UNKNOWN),
                            mSize((PRUint32)(-1)),
                            mLastModified(-1) {
-  NS_INIT_ISUPPORTS();
 };
 
 nsDirIndex::~nsDirIndex() {};
diff --git a/mozilla/netwerk/streamconv/converters/nsDirIndexParser.cpp b/mozilla/netwerk/streamconv/converters/nsDirIndexParser.cpp
index 018f6f9b887..8c1a21619ae 100644
--- a/mozilla/netwerk/streamconv/converters/nsDirIndexParser.cpp
+++ b/mozilla/netwerk/streamconv/converters/nsDirIndexParser.cpp
@@ -59,7 +59,6 @@ NS_IMPL_THREADSAFE_ISUPPORTS3(nsDirIndexParser,
                               nsIDirIndexParser)
 
 nsDirIndexParser::nsDirIndexParser() {
-  NS_INIT_ISUPPORTS();
 }
 
 nsresult
diff --git a/mozilla/netwerk/streamconv/converters/nsFTPDirListingConv.cpp b/mozilla/netwerk/streamconv/converters/nsFTPDirListingConv.cpp
index eb1a8e14439..c5f2df230ad 100644
--- a/mozilla/netwerk/streamconv/converters/nsFTPDirListingConv.cpp
+++ b/mozilla/netwerk/streamconv/converters/nsFTPDirListingConv.cpp
@@ -245,7 +245,6 @@ nsFTPDirListingConv::OnStopRequest(nsIRequest* request, nsISupports *ctxt,
 
 // nsFTPDirListingConv methods
 nsFTPDirListingConv::nsFTPDirListingConv() {
-    NS_INIT_ISUPPORTS();
     mFinalListener      = nsnull;
     mPartChannel        = nsnull;
     mSentHeading        = PR_FALSE;
diff --git a/mozilla/netwerk/streamconv/converters/nsGopherDirListingConv.cpp b/mozilla/netwerk/streamconv/converters/nsGopherDirListingConv.cpp
index eea49357f22..f99c456520b 100644
--- a/mozilla/netwerk/streamconv/converters/nsGopherDirListingConv.cpp
+++ b/mozilla/netwerk/streamconv/converters/nsGopherDirListingConv.cpp
@@ -241,7 +241,6 @@ nsGopherDirListingConv::OnStopRequest(nsIRequest *request, nsISupports *ctxt,
 
 // nsGopherDirListingConv methods
 nsGopherDirListingConv::nsGopherDirListingConv() {
-    NS_INIT_ISUPPORTS();
     mFinalListener      = nsnull;
     mPartChannel        = nsnull;
     mSentHeading        = PR_FALSE;
diff --git a/mozilla/netwerk/streamconv/converters/nsHTTPCompressConv.cpp b/mozilla/netwerk/streamconv/converters/nsHTTPCompressConv.cpp
index 57c7defc57a..9a4c1de6e65 100644
--- a/mozilla/netwerk/streamconv/converters/nsHTTPCompressConv.cpp
+++ b/mozilla/netwerk/streamconv/converters/nsHTTPCompressConv.cpp
@@ -58,7 +58,6 @@ nsHTTPCompressConv::nsHTTPCompressConv ()
         mGzipStreamEnded (PR_FALSE), mGzipStreamInitialized (PR_FALSE),
         mLen (0), hMode (0), mSkipCount (0), mFlags (0)
 {
-    NS_INIT_ISUPPORTS ();
 }
 
 nsHTTPCompressConv::~nsHTTPCompressConv ()
diff --git a/mozilla/netwerk/streamconv/converters/nsIndexedToHTML.cpp b/mozilla/netwerk/streamconv/converters/nsIndexedToHTML.cpp
index 71e8c06202f..cd6a5b4f686 100644
--- a/mozilla/netwerk/streamconv/converters/nsIndexedToHTML.cpp
+++ b/mozilla/netwerk/streamconv/converters/nsIndexedToHTML.cpp
@@ -585,7 +585,6 @@ void nsIndexedToHTML::FormatSizeString(PRUint32 inSize, nsString& outSizeString)
 }
 
 nsIndexedToHTML::nsIndexedToHTML() {
-    NS_INIT_ISUPPORTS();
 }
 
 nsIndexedToHTML::~nsIndexedToHTML() {
diff --git a/mozilla/netwerk/streamconv/converters/nsMultiMixedConv.cpp b/mozilla/netwerk/streamconv/converters/nsMultiMixedConv.cpp
index ccf56a2e762..8b621e6c507 100644
--- a/mozilla/netwerk/streamconv/converters/nsMultiMixedConv.cpp
+++ b/mozilla/netwerk/streamconv/converters/nsMultiMixedConv.cpp
@@ -115,8 +115,6 @@ nsPartChannel::nsPartChannel(nsIChannel *aMultipartChannel) :
   mByteRangeStart(0),
   mByteRangeEnd(0)
 {
-    NS_INIT_ISUPPORTS();
-
     mMultipartChannel = aMultipartChannel;
 
     // Inherit the load flags from the original channel...
@@ -715,7 +713,6 @@ nsMultiMixedConv::OnStopRequest(nsIRequest *request, nsISupports *ctxt,
 
 // nsMultiMixedConv methods
 nsMultiMixedConv::nsMultiMixedConv() {
-    NS_INIT_ISUPPORTS();
     mTokenLen           = 0;
     mNewPart            = PR_TRUE;
     mContentLength      = -1;
diff --git a/mozilla/netwerk/streamconv/converters/nsTXTToHTMLConv.cpp b/mozilla/netwerk/streamconv/converters/nsTXTToHTMLConv.cpp
index e08d74261c0..ab85a55dcbf 100644
--- a/mozilla/netwerk/streamconv/converters/nsTXTToHTMLConv.cpp
+++ b/mozilla/netwerk/streamconv/converters/nsTXTToHTMLConv.cpp
@@ -205,7 +205,6 @@ nsTXTToHTMLConv::OnDataAvailable(nsIRequest* request, nsISupports *aContext,
 } 
 // nsTXTToHTMLConv methods
 nsTXTToHTMLConv::nsTXTToHTMLConv() {
-    NS_INIT_ISUPPORTS();
     mToken = nsnull;
     mPreFormatHTML = PR_FALSE;
 }
diff --git a/mozilla/netwerk/streamconv/converters/nsUnknownDecoder.cpp b/mozilla/netwerk/streamconv/converters/nsUnknownDecoder.cpp
index b2012ee61fe..3a33a8eb445 100644
--- a/mozilla/netwerk/streamconv/converters/nsUnknownDecoder.cpp
+++ b/mozilla/netwerk/streamconv/converters/nsUnknownDecoder.cpp
@@ -66,8 +66,6 @@ static NS_DEFINE_IID(kPrefServiceCID, NS_PREF_CID);
 
 nsUnknownDecoder::nsUnknownDecoder()
 {
-  NS_INIT_ISUPPORTS();
-
   mBuffer = nsnull;
   mBufferLen = 0;
   mRequireHTMLsuffix = PR_FALSE;
diff --git a/mozilla/netwerk/streamconv/src/nsAppleFileDecoder.cpp b/mozilla/netwerk/streamconv/src/nsAppleFileDecoder.cpp
index bbf2cb1d2be..2fd28db5dd3 100644
--- a/mozilla/netwerk/streamconv/src/nsAppleFileDecoder.cpp
+++ b/mozilla/netwerk/streamconv/src/nsAppleFileDecoder.cpp
@@ -45,8 +45,6 @@ NS_IMPL_THREADSAFE_ISUPPORTS2(nsAppleFileDecoder, nsIAppleFileDecoder, nsIOutput
 
 nsAppleFileDecoder::nsAppleFileDecoder()
 {
-  NS_INIT_ISUPPORTS();
-
   m_state = parseHeaders;
   m_dataBufferLength = 0;
   m_dataBuffer = (unsigned char*) PR_MALLOC(MAX_BUFFERSIZE);
diff --git a/mozilla/netwerk/streamconv/src/nsStreamConverterService.cpp b/mozilla/netwerk/streamconv/src/nsStreamConverterService.cpp
index ce2dbd20784..dd8d24108ad 100644
--- a/mozilla/netwerk/streamconv/src/nsStreamConverterService.cpp
+++ b/mozilla/netwerk/streamconv/src/nsStreamConverterService.cpp
@@ -59,7 +59,6 @@ NS_IMPL_THREADSAFE_ISUPPORTS1(nsStreamConverterService, nsIStreamConverterServic
 ////////////////////////////////////////////////////////////
 // nsStreamConverterService methods
 nsStreamConverterService::nsStreamConverterService() : mAdjacencyList(nsnull) {
-    NS_INIT_ISUPPORTS();
 }
 
 nsStreamConverterService::~nsStreamConverterService() {
diff --git a/mozilla/netwerk/streamconv/test/Converters.cpp b/mozilla/netwerk/streamconv/test/Converters.cpp
index 655af4f69bc..2261b2e8821 100644
--- a/mozilla/netwerk/streamconv/test/Converters.cpp
+++ b/mozilla/netwerk/streamconv/test/Converters.cpp
@@ -10,7 +10,6 @@
 NS_IMPL_ISUPPORTS2(TestConverter, nsIStreamConverter, nsIStreamListener);
 
 TestConverter::TestConverter() {
-    NS_INIT_ISUPPORTS();
 }
 
 // Convert aFromStream (of type aFromType), to _retval (nsIInputStream of type aToType).
@@ -115,7 +114,6 @@ TestConverterFactory::TestConverterFactory(const nsCID &aClass,
                                    const char* contractID)
     : mClassID(aClass), mClassName(className), mContractID(contractID)
 {
-    NS_INIT_ISUPPORTS();
 }
 
 TestConverterFactory::~TestConverterFactory()
diff --git a/mozilla/netwerk/streamconv/test/TestStreamConv.cpp b/mozilla/netwerk/streamconv/test/TestStreamConv.cpp
index 3b617c0514e..f52c52b1b8b 100644
--- a/mozilla/netwerk/streamconv/test/TestStreamConv.cpp
+++ b/mozilla/netwerk/streamconv/test/TestStreamConv.cpp
@@ -88,7 +88,7 @@ public:
     // nsISupports declaration
     NS_DECL_ISUPPORTS
 
-    EndListener() {NS_INIT_ISUPPORTS();};
+    EndListener() {};
 
     // nsIStreamListener method
     NS_IMETHOD OnDataAvailable(nsIRequest* request, nsISupports *ctxt, nsIInputStream *inStr, 
diff --git a/mozilla/netwerk/test/TestCacheMgr.cpp b/mozilla/netwerk/test/TestCacheMgr.cpp
index 7aa6745c499..13105af6e8c 100644
--- a/mozilla/netwerk/test/TestCacheMgr.cpp
+++ b/mozilla/netwerk/test/TestCacheMgr.cpp
@@ -177,7 +177,6 @@ public:
     nsReader()
         : mStartTime(0), mBytesRead(0)
     {
-        NS_INIT_ISUPPORTS();
         gNumReaders++;
     }
 
diff --git a/mozilla/netwerk/test/TestCallbacks.cpp b/mozilla/netwerk/test/TestCallbacks.cpp
index ac687cdc214..674e1e88b34 100644
--- a/mozilla/netwerk/test/TestCallbacks.cpp
+++ b/mozilla/netwerk/test/TestCallbacks.cpp
@@ -79,7 +79,7 @@ class ConsumerContext : public nsIEquals {
 public:
     NS_DECL_ISUPPORTS
 
-    ConsumerContext() { NS_INIT_ISUPPORTS();}
+    ConsumerContext() { }
 
     NS_IMETHOD Equals(void *aPtr, PRBool *_retval) {
         *_retval = PR_TRUE;
@@ -180,7 +180,6 @@ Consumer::OnDataAvailable(nsIRequest *request, nsISupports *aContext,
 
 // Consumer implementation
 Consumer::Consumer() {
-    NS_INIT_ISUPPORTS();
     mOnStart = mOnStop = PR_FALSE;
     mOnDataCount = 0;
     gKeepRunning++;
diff --git a/mozilla/netwerk/test/TestFileInput.cpp b/mozilla/netwerk/test/TestFileInput.cpp
index a4c968bf55c..c634c60b011 100644
--- a/mozilla/netwerk/test/TestFileInput.cpp
+++ b/mozilla/netwerk/test/TestFileInput.cpp
@@ -92,7 +92,6 @@ public:
     nsReader()
         : mEventQueue(nsnull), mStartTime(0), mThread(nsnull), mBytesRead(0)
     {
-        NS_INIT_ISUPPORTS();
         mMonitor = PR_NewMonitor();
     }
 
diff --git a/mozilla/netwerk/test/TestFileInput2.cpp b/mozilla/netwerk/test/TestFileInput2.cpp
index 1173e2d8fc2..4ce06acf411 100644
--- a/mozilla/netwerk/test/TestFileInput2.cpp
+++ b/mozilla/netwerk/test/TestFileInput2.cpp
@@ -207,7 +207,6 @@ public:
         : mInPath(nsnull), mOutPath(nsnull), mBuffer(nsnull),
           mBufferSize(0)
     {
-        NS_INIT_ISUPPORTS();
     }
 
     nsresult Init(nsIFile* inPath, nsIFile* outPath,
@@ -300,7 +299,6 @@ public:
         : mInPath(nsnull), mOutPath(nsnull), mBuffer(nsnull),
           mBufferSize(0)
     {
-        NS_INIT_ISUPPORTS();
     }
 
     nsresult Init(nsIFile* inPath, nsIFile* outPath,
diff --git a/mozilla/netwerk/test/TestFileTransport.cpp b/mozilla/netwerk/test/TestFileTransport.cpp
index 90643fee2fc..2cedeed5878 100644
--- a/mozilla/netwerk/test/TestFileTransport.cpp
+++ b/mozilla/netwerk/test/TestFileTransport.cpp
@@ -83,7 +83,7 @@ class MyProgressEventSink : public nsIProgressEventSink
 public:
     NS_DECL_ISUPPORTS
 
-    MyProgressEventSink() { NS_INIT_ISUPPORTS(); }
+    MyProgressEventSink() { }
 
     NS_IMETHOD OnProgress(nsIRequest *request, nsISupports *ctxt,
                           PRUint32 progress, PRUint32 progressMax) {
@@ -152,7 +152,6 @@ public:
     }
 
     MyListener(PRUint32 stopCount = 1) : mTotal(0), mStopCount(stopCount) {
-        NS_INIT_ISUPPORTS();
     }
 
     nsresult Init(const char* origFile) {
@@ -330,7 +329,7 @@ public:
         return NS_OK;
     }
 
-    MyOpenObserver() { NS_INIT_ISUPPORTS(); }
+    MyOpenObserver() { }
     virtual ~MyOpenObserver() {}
 };
 
diff --git a/mozilla/netwerk/test/TestHttp.cpp b/mozilla/netwerk/test/TestHttp.cpp
index 70f870ae929..5dc726bcf22 100644
--- a/mozilla/netwerk/test/TestHttp.cpp
+++ b/mozilla/netwerk/test/TestHttp.cpp
@@ -29,7 +29,7 @@ public:
     NS_DECL_NSIREQUESTOBSERVER
     NS_DECL_NSISTREAMLISTENER
 
-    MyListener() { NS_INIT_ISUPPORTS(); }
+    MyListener() { }
     virtual ~MyListener() {}
 };
 
@@ -91,7 +91,7 @@ public:
     NS_DECL_NSIINTERFACEREQUESTOR
     NS_DECL_NSIPROGRESSEVENTSINK
 
-    MyNotifications() { NS_INIT_ISUPPORTS(); }
+    MyNotifications() { }
     virtual ~MyNotifications() {}
 };
 
diff --git a/mozilla/netwerk/test/TestMCTransport.cpp b/mozilla/netwerk/test/TestMCTransport.cpp
index f8d0d5dd577..779ae804f2b 100644
--- a/mozilla/netwerk/test/TestMCTransport.cpp
+++ b/mozilla/netwerk/test/TestMCTransport.cpp
@@ -95,7 +95,6 @@ TestListener::TestListener(char *filename)
     : mFilename(filename)
     , mFile(nsnull)
 {
-    NS_INIT_ISUPPORTS();
 }
 
 TestListener::~TestListener()
diff --git a/mozilla/netwerk/test/TestOverlappedIO.cpp b/mozilla/netwerk/test/TestOverlappedIO.cpp
index 5bc1f8c0666..8cef39bc2e4 100644
--- a/mozilla/netwerk/test/TestOverlappedIO.cpp
+++ b/mozilla/netwerk/test/TestOverlappedIO.cpp
@@ -84,7 +84,7 @@ static nsIEventQueue* gEventQ = nsnull;
 class TestListener : public nsIStreamListener
 {
 public:
-    TestListener() { NS_INIT_ISUPPORTS(); }
+    TestListener() { }
     virtual ~TestListener() {}
 
     NS_DECL_ISUPPORTS
@@ -163,7 +163,6 @@ NS_IMPL_ISUPPORTS2(TestProvider,
 
 TestProvider::TestProvider(char *data)
 {
-    NS_INIT_ISUPPORTS();
     mData = data;
     mDataLen = strlen(data);
     mOffset = 0;
diff --git a/mozilla/netwerk/test/TestPageLoad.cpp b/mozilla/netwerk/test/TestPageLoad.cpp
index b789cca27cc..15050286ff8 100644
--- a/mozilla/netwerk/test/TestPageLoad.cpp
+++ b/mozilla/netwerk/test/TestPageLoad.cpp
@@ -166,7 +166,7 @@ public:
     NS_DECL_NSIREQUESTOBSERVER
     NS_DECL_NSISTREAMLISTENER
 
-    MyListener() { NS_INIT_ISUPPORTS(); }
+    MyListener() { }
     virtual ~MyListener() {}
 };
 
@@ -231,7 +231,7 @@ public:
     NS_DECL_NSIINTERFACEREQUESTOR
     NS_DECL_NSIPROGRESSEVENTSINK
 
-    MyNotifications() { NS_INIT_ISUPPORTS(); }
+    MyNotifications() { }
     virtual ~MyNotifications() {}
 };
 
diff --git a/mozilla/netwerk/test/TestPerf.cpp b/mozilla/netwerk/test/TestPerf.cpp
index 6f6280de5a2..70cd909bfd1 100644
--- a/mozilla/netwerk/test/TestPerf.cpp
+++ b/mozilla/netwerk/test/TestPerf.cpp
@@ -57,7 +57,7 @@ public:
     NS_DECL_NSIREQUESTOBSERVER
     NS_DECL_NSISTREAMLISTENER
 
-    MyListener() { NS_INIT_ISUPPORTS(); }
+    MyListener() { }
     virtual ~MyListener() {}
 };
 
diff --git a/mozilla/netwerk/test/TestProtocols.cpp b/mozilla/netwerk/test/TestProtocols.cpp
index 078309b29e3..cbaf24a335e 100644
--- a/mozilla/netwerk/test/TestProtocols.cpp
+++ b/mozilla/netwerk/test/TestProtocols.cpp
@@ -93,7 +93,7 @@ public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIHTTPHEADERVISITOR
 
-  HeaderVisitor() { NS_INIT_ISUPPORTS(); }
+  HeaderVisitor() { }
   virtual ~HeaderVisitor() {}
 };
 NS_IMPL_ISUPPORTS1(HeaderVisitor, nsIHttpHeaderVisitor)
@@ -130,8 +130,6 @@ public:
 
 URLLoadInfo::URLLoadInfo(const char *aUrl) : mURLString(aUrl)
 {
-  NS_INIT_ISUPPORTS();
-
   mBytesRead = 0;
   mConnectTime = mTotalTime = PR_Now();
 }
@@ -159,7 +157,6 @@ public:
 
 TestHttpEventSink::TestHttpEventSink()
 {
-  NS_INIT_ISUPPORTS();
 }
 
 TestHttpEventSink::~TestHttpEventSink()
@@ -202,7 +199,6 @@ public:
 
 InputTestConsumer::InputTestConsumer()
 {
-  NS_INIT_ISUPPORTS();
 }
 
 InputTestConsumer::~InputTestConsumer()
@@ -404,7 +400,6 @@ public:
     NS_DECL_ISUPPORTS
 
     NotificationCallbacks() {
-        NS_INIT_ISUPPORTS();
     }
 
     NS_IMETHOD GetInterface(const nsIID& eventSinkIID, void* *result) {
diff --git a/mozilla/netwerk/test/TestRawCache.cpp b/mozilla/netwerk/test/TestRawCache.cpp
index 6b17e2cbeaa..aeef7e97db7 100644
--- a/mozilla/netwerk/test/TestRawCache.cpp
+++ b/mozilla/netwerk/test/TestRawCache.cpp
@@ -187,7 +187,6 @@ public:
     nsReader()
         : mStartTime(0), mBytesRead(0)
     {
-        NS_INIT_ISUPPORTS();
         gNumReaders++;
     }
 
diff --git a/mozilla/netwerk/test/TestRes.cpp b/mozilla/netwerk/test/TestRes.cpp
index b7e1cc0b82d..01258ce00fe 100644
--- a/mozilla/netwerk/test/TestRes.cpp
+++ b/mozilla/netwerk/test/TestRes.cpp
@@ -141,7 +141,7 @@ class Listener : public nsIStreamListener
 public:
     NS_DECL_ISUPPORTS
 
-    Listener() { NS_INIT_ISUPPORTS(); }
+    Listener() {}
     virtual ~Listener() {}
 
     NS_IMETHOD OnStartRequest(nsIRequest *request, nsISupports *ctxt) {
diff --git a/mozilla/netwerk/test/TestSocketIO.cpp b/mozilla/netwerk/test/TestSocketIO.cpp
index 885aa388dd8..62a3fc8a483 100644
--- a/mozilla/netwerk/test/TestSocketIO.cpp
+++ b/mozilla/netwerk/test/TestSocketIO.cpp
@@ -84,7 +84,7 @@ static nsIEventQueue* gEventQ = nsnull;
 class TestListener : public nsIStreamListener
 {
 public:
-    TestListener() { NS_INIT_ISUPPORTS(); }
+    TestListener() {}
     virtual ~TestListener() {}
 
     NS_DECL_ISUPPORTS
@@ -159,7 +159,6 @@ NS_IMPL_ISUPPORTS2(TestProvider,
 
 TestProvider::TestProvider(char *data)
 {
-    NS_INIT_ISUPPORTS();
     NS_NewByteArrayInputStream(getter_AddRefs(mData), data, strlen(data));
     LOG(("Constructing TestProvider [this=%x]\n", this));
 }
diff --git a/mozilla/netwerk/test/TestSocketInput.cpp b/mozilla/netwerk/test/TestSocketInput.cpp
index fd033fc92b2..ba07ab71536 100644
--- a/mozilla/netwerk/test/TestSocketInput.cpp
+++ b/mozilla/netwerk/test/TestSocketInput.cpp
@@ -85,7 +85,6 @@ public:
 
 InputTestConsumer::InputTestConsumer()
 {
-  NS_INIT_ISUPPORTS();
 }
 
 InputTestConsumer::~InputTestConsumer()
diff --git a/mozilla/netwerk/test/TestSocketTransport.cpp b/mozilla/netwerk/test/TestSocketTransport.cpp
index f76bcef69ba..9383e14c1e5 100644
--- a/mozilla/netwerk/test/TestSocketTransport.cpp
+++ b/mozilla/netwerk/test/TestSocketTransport.cpp
@@ -207,7 +207,6 @@ public:
 
   TestConnectionOpenObserver(TestConnection* test)
     : mTestConnection(test) { 
-    NS_INIT_ISUPPORTS();
   }
   virtual ~TestConnectionOpenObserver() {}
 
@@ -302,8 +301,6 @@ TestConnection::TestConnection(const char* aHostName, PRInt32 aPort,
 {
   nsresult rv;
 
-  NS_INIT_ISUPPORTS();
-
   mIsAsync      = aAsyncFlag;
 
   mBufferLength = TRANSFER_AMOUNT;
diff --git a/mozilla/netwerk/test/TestThreadedIO.cpp b/mozilla/netwerk/test/TestThreadedIO.cpp
index 435d46925d2..8182068fb4e 100644
--- a/mozilla/netwerk/test/TestThreadedIO.cpp
+++ b/mozilla/netwerk/test/TestThreadedIO.cpp
@@ -119,7 +119,6 @@ int TestListener::threadCount = 0;
 TestListener::TestListener()
     : mDone( PR_FALSE ), mThreadNo( ++threadCount ) {
     printf( "TestListener ctor called on thread %d\n", mThreadNo );
-    NS_INIT_ISUPPORTS();
 }
 
 TestListener::~TestListener() {
diff --git a/mozilla/netwerk/test/TestUpload.cpp b/mozilla/netwerk/test/TestUpload.cpp
index c16e680c3ad..2dfe494da58 100644
--- a/mozilla/netwerk/test/TestUpload.cpp
+++ b/mozilla/netwerk/test/TestUpload.cpp
@@ -72,7 +72,6 @@ public:
 
 InputTestConsumer::InputTestConsumer()
 {
-  NS_INIT_ISUPPORTS();
 }
 
 InputTestConsumer::~InputTestConsumer()
diff --git a/mozilla/plugin/oji/MRJ/plugin/Source/BackwardAdapter.cpp b/mozilla/plugin/oji/MRJ/plugin/Source/BackwardAdapter.cpp
index e5047c6f518..5e78be1b61a 100644
--- a/mozilla/plugin/oji/MRJ/plugin/Source/BackwardAdapter.cpp
+++ b/mozilla/plugin/oji/MRJ/plugin/Source/BackwardAdapter.cpp
@@ -742,7 +742,6 @@ public:
 	CPluginStreamInfo(const char* URL, nsIPluginInputStream* inStr, nsMIMEType type, PRBool seekable)
 		 : mURL(URL), mInputStream(inStr), mMimeType(type), mIsSeekable(seekable)
 	{
-		NS_INIT_ISUPPORTS();
 	}
 
 	virtual ~CPluginStreamInfo() {}
@@ -1490,9 +1489,6 @@ NPP_HandleEvent(NPP instance, void* event)
 
 CPluginManager::CPluginManager(void)
 {
-    // Set reference count to 0.
-    NS_INIT_ISUPPORTS();
-    
     mLiveconnect = NULL;
 
 #ifdef XP_MAC
@@ -2066,9 +2062,6 @@ CPluginInstancePeer::CPluginInstancePeer(nsIPluginInstance* pluginInstance,
 		npp(npp), typeString(typeString), type(type), attribute_cnt(attr_cnt),
 		attribute_list(NULL), values_list(NULL)
 {
-    // Set the reference count to 0.
-    NS_INIT_ISUPPORTS();
-    
     NS_IF_ADDREF(mInstance);
 
     attribute_list = (char**) NPN_MemAlloc(attr_cnt * sizeof(const char*));
@@ -2362,8 +2355,6 @@ CPluginInstancePeer::QueryInterface(const nsIID& iid, void** ptr)
 CPluginManagerStream::CPluginManagerStream(NPP npp, NPStream* pstr)
     : npp(npp), pstream(pstr)
 {
-    // Set the reference count to 0.
-    NS_INIT_ISUPPORTS();
 }
 
 CPluginManagerStream::~CPluginManagerStream(void)
@@ -2496,8 +2487,6 @@ CPluginInputStream::CPluginInputStream(nsIPluginStreamListener* listener)
       mBuffer(NULL), mBufferLength(0), mAmountRead(0),
       mStreamInfo(NULL)
 {
-    NS_INIT_ISUPPORTS();
-
     if (mListener != NULL) {
         mListener->AddRef();
         mListener->GetStreamType(&mStreamType);
diff --git a/mozilla/plugin/oji/MRJ/plugin/Source/EmbeddedFramePluginInstance.cpp b/mozilla/plugin/oji/MRJ/plugin/Source/EmbeddedFramePluginInstance.cpp
index 73bf8973661..df85bdb6c77 100644
--- a/mozilla/plugin/oji/MRJ/plugin/Source/EmbeddedFramePluginInstance.cpp
+++ b/mozilla/plugin/oji/MRJ/plugin/Source/EmbeddedFramePluginInstance.cpp
@@ -50,7 +50,6 @@
 EmbeddedFramePluginInstance::EmbeddedFramePluginInstance()
 	:	mPeer(NULL), mFrame(NULL)
 {
-	NS_INIT_ISUPPORTS();
 }
 
 EmbeddedFramePluginInstance::~EmbeddedFramePluginInstance()
diff --git a/mozilla/plugin/oji/MRJ/plugin/Source/LiveConnectNativeMethods.cpp b/mozilla/plugin/oji/MRJ/plugin/Source/LiveConnectNativeMethods.cpp
index 0fd33c634a6..377b323e9d0 100644
--- a/mozilla/plugin/oji/MRJ/plugin/Source/LiveConnectNativeMethods.cpp
+++ b/mozilla/plugin/oji/MRJ/plugin/Source/LiveConnectNativeMethods.cpp
@@ -201,8 +201,6 @@ static jobject GetCurrentThread(JNIEnv* env)
 MRJSecurityContext::MRJSecurityContext(const char* location)
     :   mLocation(nsnull), mConnection(nsnull)
 {
-    NS_INIT_ISUPPORTS();
-    
     mLocation = ::strdup(location);
     if (mLocation) {
         // find the 3rd slash of the URL, hopefully it's in canonical form.
diff --git a/mozilla/plugin/oji/MRJ/plugin/Source/MRJNetworking.cpp b/mozilla/plugin/oji/MRJ/plugin/Source/MRJNetworking.cpp
index 27ae4c7005f..b21c3bb549c 100644
--- a/mozilla/plugin/oji/MRJ/plugin/Source/MRJNetworking.cpp
+++ b/mozilla/plugin/oji/MRJ/plugin/Source/MRJNetworking.cpp
@@ -87,7 +87,6 @@ public:
     MRJInputStream(MRJSession* session)
         :   mMonitor(session), mOffset(0), mComplete(false)
     {
-        NS_INIT_ISUPPORTS();
         mBuffer.reserve(8192);
     }
     
diff --git a/mozilla/plugin/oji/MRJCarbon/plugin/Source/EmbeddedFramePluginInstance.cpp b/mozilla/plugin/oji/MRJCarbon/plugin/Source/EmbeddedFramePluginInstance.cpp
index 606e201337f..c8be5710475 100644
--- a/mozilla/plugin/oji/MRJCarbon/plugin/Source/EmbeddedFramePluginInstance.cpp
+++ b/mozilla/plugin/oji/MRJCarbon/plugin/Source/EmbeddedFramePluginInstance.cpp
@@ -50,7 +50,6 @@
 EmbeddedFramePluginInstance::EmbeddedFramePluginInstance()
 	:	mPeer(NULL), mFrame(NULL)
 {
-	NS_INIT_ISUPPORTS();
 }
 
 EmbeddedFramePluginInstance::~EmbeddedFramePluginInstance()
diff --git a/mozilla/uriloader/exthandler/nsMIMEInfoImpl.cpp b/mozilla/uriloader/exthandler/nsMIMEInfoImpl.cpp
index 716e8829f66..f54f960e38d 100644
--- a/mozilla/uriloader/exthandler/nsMIMEInfoImpl.cpp
+++ b/mozilla/uriloader/exthandler/nsMIMEInfoImpl.cpp
@@ -50,12 +50,10 @@ NS_IMPL_THREADSAFE_ISUPPORTS1(nsMIMEInfoImpl, nsIMIMEInfo);
 
 // nsMIMEInfoImpl methods
 nsMIMEInfoImpl::nsMIMEInfoImpl() {
-    NS_INIT_ISUPPORTS();
     mPreferredAction = nsIMIMEInfo::saveToDisk;
 }
 
 nsMIMEInfoImpl::nsMIMEInfoImpl(const char *aMIMEType) :mMIMEType( aMIMEType ){
-    NS_INIT_ISUPPORTS();
     mPreferredAction = nsIMIMEInfo::saveToDisk;
 }