diff --git a/gfx/src/windows/nsRegionWin.cpp b/gfx/src/windows/nsRegionWin.cpp
index 8bc99d0ebe6..c4126d8d89f 100644
--- a/gfx/src/windows/nsRegionWin.cpp
+++ b/gfx/src/windows/nsRegionWin.cpp
@@ -41,8 +41,6 @@
 
 nsRegionWin :: nsRegionWin()
 {
-  NS_INIT_ISUPPORTS();
-
   mRegion = NULL;
   mRegionType = NULLREGION;
   mData = NULL;
diff --git a/gfx/src/windows/nsRenderingContextWin.cpp b/gfx/src/windows/nsRenderingContextWin.cpp
index 416660e61a2..28885cab299 100644
--- a/gfx/src/windows/nsRenderingContextWin.cpp
+++ b/gfx/src/windows/nsRenderingContextWin.cpp
@@ -182,8 +182,6 @@ static HPEN   gStockWhitePen = (HPEN)::GetStockObject(WHITE_PEN);
 
 nsRenderingContextWin :: nsRenderingContextWin()
 {
-  NS_INIT_ISUPPORTS();
-
   // The first time in we initialize gIsWIN95 flag
   if (NOT_SETUP == gIsWIN95) {
     OSVERSIONINFO os;
diff --git a/gfx/src/windows/nsScreenManagerWin.cpp b/gfx/src/windows/nsScreenManagerWin.cpp
index d449ac8e0c0..27d1504f200 100644
--- a/gfx/src/windows/nsScreenManagerWin.cpp
+++ b/gfx/src/windows/nsScreenManagerWin.cpp
@@ -81,8 +81,6 @@ nsScreenManagerWin :: nsScreenManagerWin ( )
 : mHasMultiMonitorAPIs(PR_FALSE), mGetMonitorInfoProc(nsnull), mMonitorFromRectProc(nsnull),
     mEnumDisplayMonitorsProc(nsnull), mNumberOfScreens(0)
 {
-  NS_INIT_ISUPPORTS();
-
   // figure out if we can call the multiple monitor APIs that are only
   // available on Win98/2000.
   HMODULE lib = GetModuleHandle("user32.dll");
diff --git a/gfx/src/windows/nsScreenWin.cpp b/gfx/src/windows/nsScreenWin.cpp
index 72cdc9715f9..a796b49696c 100644
--- a/gfx/src/windows/nsScreenWin.cpp
+++ b/gfx/src/windows/nsScreenWin.cpp
@@ -65,8 +65,6 @@ nsScreenWin :: nsScreenWin ( void* inScreen )
   : mScreen(inScreen), mHasMultiMonitorAPIs(PR_FALSE),
       mGetMonitorInfoProc(nsnull)
 {
-  NS_INIT_ISUPPORTS();
-
 #ifdef DEBUG
   HDC hDCScreen = ::GetDC(nsnull);
   NS_ASSERTION(hDCScreen,"GetDC Failure");
diff --git a/gfx/src/x11shared/nsFT2FontCatalog.cpp b/gfx/src/x11shared/nsFT2FontCatalog.cpp
index ee701385d37..c55bd772e3d 100644
--- a/gfx/src/x11shared/nsFT2FontCatalog.cpp
+++ b/gfx/src/x11shared/nsFT2FontCatalog.cpp
@@ -129,8 +129,6 @@ NS_IMPL_ISUPPORTS1(nsFT2FontCatalog, nsIFontCatalogService)
 
 nsFT2FontCatalog::nsFT2FontCatalog()
 {
-  NS_INIT_ISUPPORTS();
-  
 #if (defined(MOZ_ENABLE_FREETYPE2))
   nsresult rv;
   mAvailableFontCatalogService = PR_FALSE;
diff --git a/gfx/src/xlib/nsDeviceContextSpecFactoryX.cpp b/gfx/src/xlib/nsDeviceContextSpecFactoryX.cpp
index ee2711441bd..30f5fbd9da1 100644
--- a/gfx/src/xlib/nsDeviceContextSpecFactoryX.cpp
+++ b/gfx/src/xlib/nsDeviceContextSpecFactoryX.cpp
@@ -47,7 +47,6 @@ NS_IMPL_ISUPPORTS1(nsDeviceContextSpecFactoryXlib, nsIDeviceContextSpecFactory)
 
 nsDeviceContextSpecFactoryXlib::nsDeviceContextSpecFactoryXlib() 
 {
-  NS_INIT_ISUPPORTS();
 }
 
 nsDeviceContextSpecFactoryXlib::~nsDeviceContextSpecFactoryXlib() 
diff --git a/gfx/src/xlib/nsDeviceContextSpecXlib.cpp b/gfx/src/xlib/nsDeviceContextSpecXlib.cpp
index 9e4d32bfe68..e7edffbd086 100644
--- a/gfx/src/xlib/nsDeviceContextSpecXlib.cpp
+++ b/gfx/src/xlib/nsDeviceContextSpecXlib.cpp
@@ -216,7 +216,6 @@ int            GlobalPrinters::mGlobalNumPrinters = 0;
 nsDeviceContextSpecXlib::nsDeviceContextSpecXlib()
 {
   DO_PR_DEBUG_LOG(("nsDeviceContextSpecXlib::nsDeviceContextSpecXlib()\n"));
-  NS_INIT_ISUPPORTS();
 }
 
 nsDeviceContextSpecXlib::~nsDeviceContextSpecXlib()
@@ -546,7 +545,6 @@ nsresult CopyPrinterCharPref(nsIPref *pref, const char *modulename, const char *
 //  Printer Enumerator
 nsPrinterEnumeratorXlib::nsPrinterEnumeratorXlib()
 {
-  NS_INIT_ISUPPORTS();
 }
 
 NS_IMPL_ISUPPORTS1(nsPrinterEnumeratorXlib, nsIPrinterEnumerator)
diff --git a/gfx/src/xlib/nsDrawingSurfaceXlib.cpp b/gfx/src/xlib/nsDrawingSurfaceXlib.cpp
index d1f585e7488..fc4ad547849 100644
--- a/gfx/src/xlib/nsDrawingSurfaceXlib.cpp
+++ b/gfx/src/xlib/nsDrawingSurfaceXlib.cpp
@@ -70,7 +70,6 @@ nsDrawingSurfaceXlibImpl::nsDrawingSurfaceXlibImpl() :
   mHeight(0),
   mIsOffscreen(PR_FALSE)
 {
-  NS_INIT_ISUPPORTS();
   PR_LOG(DrawingSurfaceXlibLM, PR_LOG_DEBUG, ("nsDrawingSurfaceXlibImpl::nsDrawingSurfaceXlibImpl()\n"));
 
 }
diff --git a/gfx/src/xlib/nsFontMetricsXlib.cpp b/gfx/src/xlib/nsFontMetricsXlib.cpp
index 80831c8d063..fd8a533e7f1 100644
--- a/gfx/src/xlib/nsFontMetricsXlib.cpp
+++ b/gfx/src/xlib/nsFontMetricsXlib.cpp
@@ -1453,7 +1453,6 @@ nsFontMetricsXlib::nsFontMetricsXlib()
   // XXX mFontIsGeneric will generally need to be the same size; right now
   // it's an nsAutoVoidArray.  If the average is under 8, that's ok.
 {
-  NS_INIT_ISUPPORTS();
   gFontMetricsXlibCount++;
 }
 
@@ -5467,7 +5466,6 @@ nsFontMetricsXlib::FindFont(PRUnichar aChar)
 
 nsFontEnumeratorXlib::nsFontEnumeratorXlib()
 {
-  NS_INIT_ISUPPORTS();
 }
 
 NS_IMPL_ISUPPORTS1(nsFontEnumeratorXlib, nsIFontEnumerator)
diff --git a/gfx/src/xlib/nsImageXlib.cpp b/gfx/src/xlib/nsImageXlib.cpp
index 0cb64029987..4c158fe0c1f 100644
--- a/gfx/src/xlib/nsImageXlib.cpp
+++ b/gfx/src/xlib/nsImageXlib.cpp
@@ -68,7 +68,6 @@ Display       *nsImageXlib::mDisplay       = nsnull;
 nsImageXlib::nsImageXlib()
 {
   PR_LOG(ImageXlibLM, PR_LOG_DEBUG, ("nsImageXlib::nsImageXlib()\n"));
-  NS_INIT_ISUPPORTS();
   mImageBits = nsnull;
   mAlphaBits = nsnull;
   mWidth = 0;
diff --git a/gfx/src/xlib/nsRegionXlib.cpp b/gfx/src/xlib/nsRegionXlib.cpp
index f08d8e028c2..922de6967c6 100644
--- a/gfx/src/xlib/nsRegionXlib.cpp
+++ b/gfx/src/xlib/nsRegionXlib.cpp
@@ -58,8 +58,6 @@ nsRegionXlib::nsRegionXlib()
       printf("REGIONS+ = %i\n", nRegions);
 #endif
 
-  NS_INIT_ISUPPORTS();
-
   mRegion = nsnull;
 }
 
diff --git a/gfx/src/xlib/nsRenderingContextXlib.cpp b/gfx/src/xlib/nsRenderingContextXlib.cpp
index 50d72a4cf9e..4fdabbd3b9e 100644
--- a/gfx/src/xlib/nsRenderingContextXlib.cpp
+++ b/gfx/src/xlib/nsRenderingContextXlib.cpp
@@ -120,7 +120,6 @@ nsRenderingContextXlib::nsRenderingContextXlib() :
   mCurrentLineStyle(nsLineStyle_kSolid)
 {
   PR_LOG(RenderingContextXlibLM, PR_LOG_DEBUG, ("nsRenderingContextXlib::nsRenderingContextXlib()\n"));
-  NS_INIT_ISUPPORTS();
 
   PushState();
 }
diff --git a/gfx/src/xlib/nsScreenManagerXlib.cpp b/gfx/src/xlib/nsScreenManagerXlib.cpp
index 224790b80dc..d64c1bc4900 100644
--- a/gfx/src/xlib/nsScreenManagerXlib.cpp
+++ b/gfx/src/xlib/nsScreenManagerXlib.cpp
@@ -44,8 +44,6 @@
 
 nsScreenManagerXlib :: nsScreenManagerXlib ( )
 {
-  NS_INIT_ISUPPORTS();
-
   // nothing else to do. I guess we could cache a bunch of information
   // here, but we want to ask the device at runtime in case anything
   // has changed.
diff --git a/gfx/src/xlib/nsScreenXlib.cpp b/gfx/src/xlib/nsScreenXlib.cpp
index 45dd2bf5d4c..e36734d4f11 100644
--- a/gfx/src/xlib/nsScreenXlib.cpp
+++ b/gfx/src/xlib/nsScreenXlib.cpp
@@ -44,8 +44,6 @@
 
 nsScreenXlib :: nsScreenXlib (  )
 {
-  NS_INIT_ISUPPORTS();
-
   // nothing else to do. I guess we could cache a bunch of information
   // here, but we want to ask the device at runtime in case anything
   // has changed.
diff --git a/gfx/src/xprint/nsXPrintContext.cpp b/gfx/src/xprint/nsXPrintContext.cpp
index 975f7e4e179..8e420d45fdd 100644
--- a/gfx/src/xprint/nsXPrintContext.cpp
+++ b/gfx/src/xprint/nsXPrintContext.cpp
@@ -111,7 +111,6 @@ nsXPrintContext::nsXPrintContext() :
   mPrintResolution(0L),
   mContext(nsnull)
 {
-  NS_INIT_ISUPPORTS();
   PR_LOG(nsXPrintContextLM, PR_LOG_DEBUG, ("nsXPrintContext::nsXPrintContext()\n"));
 }
 
diff --git a/htmlparser/robot/nsDebugRobot.cpp b/htmlparser/robot/nsDebugRobot.cpp
index 5023a01bd23..6aa7315ea7d 100644
--- a/htmlparser/robot/nsDebugRobot.cpp
+++ b/htmlparser/robot/nsDebugRobot.cpp
@@ -62,7 +62,6 @@ static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
 class RobotSinkObserver : public nsIRobotSinkObserver {
 public:
   RobotSinkObserver() {
-    NS_INIT_ISUPPORTS();
   }
 
   virtual ~RobotSinkObserver() {
@@ -148,8 +147,6 @@ class CStreamListener:  public nsIWebProgressListener,
 {
 public:
   CStreamListener() {
-    NS_INIT_ISUPPORTS();
-
   }
 
   virtual ~CStreamListener() {
diff --git a/htmlparser/src/CNavDTD.cpp b/htmlparser/src/CNavDTD.cpp
index 0557b8c15e5..b684d40b2cf 100644
--- a/htmlparser/src/CNavDTD.cpp
+++ b/htmlparser/src/CNavDTD.cpp
@@ -190,8 +190,6 @@ CNavDTD::CNavDTD() : nsIDTD(),
     mExpectedCRC32(0)
 #endif
 {
-  NS_INIT_ISUPPORTS(); 
-
   mBodyContext=new nsDTDContext();
 
 #ifdef  RICKG_DEBUG
diff --git a/htmlparser/src/COtherDTD.cpp b/htmlparser/src/COtherDTD.cpp
index d66fb2bbbf8..aaf6fe09074 100644
--- a/htmlparser/src/COtherDTD.cpp
+++ b/htmlparser/src/COtherDTD.cpp
@@ -146,7 +146,6 @@ NS_IMPL_RELEASE(COtherDTD)
  *  @return   
  */ 
 COtherDTD::COtherDTD() : nsIDTD() {
-  NS_INIT_ISUPPORTS();
   mSink = 0; 
   mParser=0;        
   mLineNumber=1;  
diff --git a/htmlparser/src/nsDTDUtils.cpp b/htmlparser/src/nsDTDUtils.cpp
index c3a17875702..aa6f63d01c7 100644
--- a/htmlparser/src/nsDTDUtils.cpp
+++ b/htmlparser/src/nsDTDUtils.cpp
@@ -1577,7 +1577,6 @@ NS_IMPL_ISUPPORTS1(nsObserverEntry, nsIObserverEntry)
 
 nsObserverEntry::nsObserverEntry(const nsAString& aTopic) : mTopic(aTopic) 
 {
-  NS_INIT_ISUPPORTS();
   memset(mObservers, 0, sizeof(mObservers));
 }
 
diff --git a/htmlparser/src/nsExpatDriver.cpp b/htmlparser/src/nsExpatDriver.cpp
index a5e7d7f0018..838f501bd8e 100644
--- a/htmlparser/src/nsExpatDriver.cpp
+++ b/htmlparser/src/nsExpatDriver.cpp
@@ -309,7 +309,6 @@ nsExpatDriver::nsExpatDriver()
    mSink(0), 
    mCatalogData(nsnull)
 {
-  NS_INIT_ISUPPORTS();
 }
 
 nsExpatDriver::~nsExpatDriver() 
diff --git a/htmlparser/src/nsHTMLNullSink.cpp b/htmlparser/src/nsHTMLNullSink.cpp
index 774822d65b9..f2c04ee6db9 100644
--- a/htmlparser/src/nsHTMLNullSink.cpp
+++ b/htmlparser/src/nsHTMLNullSink.cpp
@@ -135,7 +135,6 @@ NS_NewHTMLNullSink(nsIContentSink** aInstancePtrResult)
  *  @return  
  */
 nsHTMLNullSink::nsHTMLNullSink() : nsIHTMLContentSink() {
-  NS_INIT_ISUPPORTS();
   mNodeStackPos=0;
   memset(mNodeStack,0,sizeof(mNodeStack));
 }
diff --git a/htmlparser/src/nsHTMLTokenizer.cpp b/htmlparser/src/nsHTMLTokenizer.cpp
index 134cf545032..93292b26ea4 100644
--- a/htmlparser/src/nsHTMLTokenizer.cpp
+++ b/htmlparser/src/nsHTMLTokenizer.cpp
@@ -135,8 +135,6 @@ NS_IMPL_RELEASE(nsHTMLTokenizer)
                                   eParserCommands aCommand) :
   nsITokenizer(), mTokenDeque(0)
 {
-  NS_INIT_ISUPPORTS();
-  
   if (aParseMode==eDTDMode_full_standards ||
       aParseMode==eDTDMode_almost_standards) {
     mFlags = NS_IPARSER_FLAG_STRICT_MODE;
diff --git a/htmlparser/src/nsLoggingSink.cpp b/htmlparser/src/nsLoggingSink.cpp
index b580ee6f359..ecfa722d316 100644
--- a/htmlparser/src/nsLoggingSink.cpp
+++ b/htmlparser/src/nsLoggingSink.cpp
@@ -74,7 +74,6 @@ NS_NewHTMLLoggingSink(nsIContentSink** aInstancePtrResult)
 }
 
 nsLoggingSink::nsLoggingSink() {
-  NS_INIT_ISUPPORTS();
   mOutput = 0;
 	mLevel=-1;
   mSink=0;
diff --git a/htmlparser/src/nsParser.cpp b/htmlparser/src/nsParser.cpp
index bdcf370f1f1..69c099e48d8 100644
--- a/htmlparser/src/nsParser.cpp
+++ b/htmlparser/src/nsParser.cpp
@@ -300,8 +300,6 @@ static PRBool gDumpContent=PR_FALSE;
  *  @return   
  */
 nsParser::nsParser(nsITokenObserver* anObserver) {
-  NS_INIT_ISUPPORTS();
-
 #ifdef NS_DEBUG
   if(!gDumpContent) {
     gDumpContent=(PR_GetEnv("PARSER_DUMP_CONTENT"))? PR_TRUE:PR_FALSE;
diff --git a/htmlparser/src/nsParserService.cpp b/htmlparser/src/nsParserService.cpp
index aeba847bd0d..3743d7ed7c1 100644
--- a/htmlparser/src/nsParserService.cpp
+++ b/htmlparser/src/nsParserService.cpp
@@ -28,7 +28,6 @@
 
 nsParserService::nsParserService() : mEntries(0)
 {
-  NS_INIT_ISUPPORTS();
   mHaveNotifiedCategoryObservers = PR_FALSE;
 }
 
diff --git a/htmlparser/src/nsViewSourceHTML.cpp b/htmlparser/src/nsViewSourceHTML.cpp
index 64bcf7412f2..25727880215 100644
--- a/htmlparser/src/nsViewSourceHTML.cpp
+++ b/htmlparser/src/nsViewSourceHTML.cpp
@@ -328,8 +328,6 @@ static const char* const kDumpFileAfterText[] = {
  *  @return  
  */
 CViewSourceHTML::CViewSourceHTML() : mFilename(), mTags(), mErrors() {
-  NS_INIT_ISUPPORTS();
-
   mStartTag = VIEW_SOURCE_START_TAG;
   mEndTag = VIEW_SOURCE_END_TAG;
   mCommentTag = VIEW_SOURCE_COMMENT;
diff --git a/htmlparser/tests/grabpage/grabpage.cpp b/htmlparser/tests/grabpage/grabpage.cpp
index 03d4de1a54f..318def743e0 100644
--- a/htmlparser/tests/grabpage/grabpage.cpp
+++ b/htmlparser/tests/grabpage/grabpage.cpp
@@ -87,7 +87,6 @@ protected:
 
 StreamToFile::StreamToFile(FILE* fp)
 {
-  NS_INIT_ISUPPORTS();
   mDone = PR_FALSE;
   mError = PR_FALSE;
   mFile = fp;
diff --git a/intl/chardet/src/classic/nsClassicDetectors.cpp b/intl/chardet/src/classic/nsClassicDetectors.cpp
index 985a790736f..6a68372429b 100644
--- a/intl/chardet/src/classic/nsClassicDetectors.cpp
+++ b/intl/chardet/src/classic/nsClassicDetectors.cpp
@@ -218,7 +218,6 @@ NS_IMPL_ISUPPORTS1(nsClassicDetector, nsICharsetDetector)
 //----------------------------------------------------------
 nsClassicDetector::nsClassicDetector(const char* language)
 {
-  NS_INIT_ISUPPORTS();
   mObserver = nsnull;
   PL_strcpy(mLanguage, language);
 }
@@ -273,7 +272,6 @@ NS_IMPL_ISUPPORTS1(nsClassicStringDetector, nsIStringCharsetDetector)
 //----------------------------------------------------------
 nsClassicStringDetector::nsClassicStringDetector(const char* language)
 {
-  NS_INIT_ISUPPORTS();
   PL_strcpy(mLanguage, language);
 }
 //----------------------------------------------------------
diff --git a/intl/chardet/src/nsCyrillicDetector.cpp b/intl/chardet/src/nsCyrillicDetector.cpp
index d54216ee6d3..79d9c47f43e 100644
--- a/intl/chardet/src/nsCyrillicDetector.cpp
+++ b/intl/chardet/src/nsCyrillicDetector.cpp
@@ -109,7 +109,6 @@ nsCyrXPCOMDetector:: nsCyrXPCOMDetector(PRUint8 aItems,
                       const char **aCharsets)
 	     : nsCyrillicDetector(aItems, aCyrillicClass, aCharsets)
 {
-    NS_INIT_ISUPPORTS();
     mObserver = nsnull;
 }
 
@@ -165,7 +164,6 @@ nsCyrXPCOMStringDetector:: nsCyrXPCOMStringDetector(PRUint8 aItems,
                       const char **aCharsets)
 	     : nsCyrillicDetector(aItems, aCyrillicClass, aCharsets)
 {
-    NS_INIT_ISUPPORTS();
 }
 
 //---------------------------------------------------------------------
diff --git a/intl/chardet/src/nsDebugDetector.cpp b/intl/chardet/src/nsDebugDetector.cpp
index b8126a00546..48946196f66 100644
--- a/intl/chardet/src/nsDebugDetector.cpp
+++ b/intl/chardet/src/nsDebugDetector.cpp
@@ -52,7 +52,6 @@ nsDebugDetector::nsDebugDetector( nsDebugDetectorSel aSel)
   mBlks = 0;
   mObserver = nsnull;
   mStop = PR_FALSE;
-  NS_INIT_ISUPPORTS();
 }
 //--------------------------------------------------------------------
 nsDebugDetector::~nsDebugDetector()
diff --git a/intl/chardet/src/nsDetectionAdaptor.cpp b/intl/chardet/src/nsDetectionAdaptor.cpp
index 76dca5ada3a..c8a3f236d45 100644
--- a/intl/chardet/src/nsDetectionAdaptor.cpp
+++ b/intl/chardet/src/nsDetectionAdaptor.cpp
@@ -113,7 +113,6 @@ NS_IMPL_ISUPPORTS1 ( nsMyObserver ,nsICharsetDetectionObserver);
 //--------------------------------------------------------------
 nsDetectionAdaptor::nsDetectionAdaptor( void ) 
 {
-     NS_INIT_ISUPPORTS();
      mDontFeedToDetector = PR_TRUE;
 }
 //--------------------------------------------------------------
diff --git a/intl/chardet/src/nsDetectionAdaptor.h b/intl/chardet/src/nsDetectionAdaptor.h
index 1dd9ff1a980..9aaae10d15f 100644
--- a/intl/chardet/src/nsDetectionAdaptor.h
+++ b/intl/chardet/src/nsDetectionAdaptor.h
@@ -56,7 +56,6 @@ class nsMyObserver : public nsICharsetDetectionObserver
  public:
    nsMyObserver( void )
    {
-     NS_INIT_ISUPPORTS();
      mWebShellSvc = nsnull;
      mNotifyByReload = PR_FALSE;
      mWeakRefDocument = nsnull;
diff --git a/intl/chardet/src/nsDocumentCharsetInfo.cpp b/intl/chardet/src/nsDocumentCharsetInfo.cpp
index ea30f504e24..7753a2c5829 100644
--- a/intl/chardet/src/nsDocumentCharsetInfo.cpp
+++ b/intl/chardet/src/nsDocumentCharsetInfo.cpp
@@ -51,7 +51,6 @@ NS_IMPL_THREADSAFE_ISUPPORTS1(nsDocumentCharsetInfo, nsIDocumentCharsetInfo);
 
 nsDocumentCharsetInfo::nsDocumentCharsetInfo() 
 {
-  NS_INIT_ISUPPORTS();
   mParentCharsetSource = 0;
 }
 
diff --git a/intl/chardet/src/nsMetaCharsetObserver.cpp b/intl/chardet/src/nsMetaCharsetObserver.cpp
index 508c4d63133..69c48934dbb 100644
--- a/intl/chardet/src/nsMetaCharsetObserver.cpp
+++ b/intl/chardet/src/nsMetaCharsetObserver.cpp
@@ -67,7 +67,6 @@ static eHTMLTags gWatchTags[] =
 //-------------------------------------------------------------------------
 nsMetaCharsetObserver::nsMetaCharsetObserver()
 {
-  NS_INIT_ISUPPORTS();
   bMetaCharsetObserverStarted = PR_FALSE;
   nsresult res;
   mAlias = nsnull;
diff --git a/intl/chardet/src/nsPSMDetectors.cpp b/intl/chardet/src/nsPSMDetectors.cpp
index 85945655919..57d37d8eb75 100644
--- a/intl/chardet/src/nsPSMDetectors.cpp
+++ b/intl/chardet/src/nsPSMDetectors.cpp
@@ -491,7 +491,6 @@ void nsPSMDetector::Sample(const char* aBuf, PRUint32 aLen, PRBool aLastChance)
 nsXPCOMDetector::nsXPCOMDetector(PRUint8 aItems, nsVerifier **aVer, nsEUCStatistics** aStatisticsSet)
    : nsPSMDetector( aItems, aVer, aStatisticsSet)
 {
-  NS_INIT_ISUPPORTS();
   mObserver = nsnull;
 }
 //----------------------------------------------------------
@@ -538,7 +537,6 @@ void nsXPCOMDetector::Report(const char* charset)
 nsXPCOMStringDetector::nsXPCOMStringDetector(PRUint8 aItems, nsVerifier** aVer, nsEUCStatistics** aStatisticsSet)
    : nsPSMDetector( aItems, aVer, aStatisticsSet)
 {
-  NS_INIT_ISUPPORTS();
 }
 //----------------------------------------------------------
 nsXPCOMStringDetector::~nsXPCOMStringDetector()
diff --git a/intl/chardet/src/nsXMLEncodingObserver.cpp b/intl/chardet/src/nsXMLEncodingObserver.cpp
index 3ce05794e70..5c45e055f1e 100644
--- a/intl/chardet/src/nsXMLEncodingObserver.cpp
+++ b/intl/chardet/src/nsXMLEncodingObserver.cpp
@@ -63,7 +63,6 @@ static eHTMLTags gTags[] =
 //-------------------------------------------------------------------------
 nsXMLEncodingObserver::nsXMLEncodingObserver()
 {
-  NS_INIT_ISUPPORTS();
   bXMLEncodingObserverStarted = PR_FALSE;
 }
 //-------------------------------------------------------------------------
diff --git a/intl/chardet/src/windows/nsNativeDetectors.cpp b/intl/chardet/src/windows/nsNativeDetectors.cpp
index d37d6f3fc23..67c0891274c 100644
--- a/intl/chardet/src/windows/nsNativeDetectors.cpp
+++ b/intl/chardet/src/windows/nsNativeDetectors.cpp
@@ -129,7 +129,6 @@ NS_IMPL_ISUPPORTS1(nsNativeDetector, nsICharsetDetector)
 nsNativeDetector::nsNativeDetector(PRUint32 aCodePage)
 {
   HRESULT hr = CoInitialize(NULL);
-  NS_INIT_ISUPPORTS();
   mObserver = nsnull;
   mCodePage = aCodePage;
   mMultiLanguage = NULL;
@@ -220,7 +219,6 @@ NS_IMPL_ISUPPORTS1(nsNativeStringDetector, nsIStringCharsetDetector)
 nsNativeStringDetector::nsNativeStringDetector(PRUint32 aCodePage)
 {
   HRESULT hr = CoInitialize(NULL);
-  NS_INIT_ISUPPORTS();
   mCodePage = aCodePage;
   mMultiLanguage = NULL;
 }
@@ -275,7 +273,6 @@ class nsNativeDetectorFactory : public nsIFactory {
 
 public:
    nsNativeDetectorFactory(PRUint32 aCodePage, PRBool stringBase) {
-     NS_INIT_ISUPPORTS();
      mCodePage = aCodePage;
      mStringBase = stringBase;
    }
diff --git a/intl/chardet/tests/DetectCharset.cpp b/intl/chardet/tests/DetectCharset.cpp
index a176c2ecc1e..cba50d8238f 100644
--- a/intl/chardet/tests/DetectCharset.cpp
+++ b/intl/chardet/tests/DetectCharset.cpp
@@ -266,7 +266,7 @@ class nsReporter : public nsICharsetDetectionObserver
 {
    NS_DECL_ISUPPORTS
  public:
-   nsReporter() { NS_INIT_ISUPPORTS(); };
+   nsReporter() { };
    virtual ~nsReporter() { };
 
    NS_IMETHOD Notify(const char* aCharset, nsDetectionConfident aConf)
diff --git a/intl/compatibility/src/nsI18nCompatibility.cpp b/intl/compatibility/src/nsI18nCompatibility.cpp
index 035d60d54ec..27e9adafa5a 100644
--- a/intl/compatibility/src/nsI18nCompatibility.cpp
+++ b/intl/compatibility/src/nsI18nCompatibility.cpp
@@ -64,7 +64,7 @@ class nsI18nCompatibility : public nsII18nCompatibility {
   /* wstring CSIDtoCharsetName (in unsigned short csid); */
   NS_IMETHOD  CSIDtoCharsetName(PRUint16 csid, PRUnichar **_retval);
 
-  nsI18nCompatibility() {NS_INIT_ISUPPORTS();}
+  nsI18nCompatibility() {}
   virtual ~nsI18nCompatibility() {}
 };
 
diff --git a/intl/ctl/src/nsULE.cpp b/intl/ctl/src/nsULE.cpp
index 242a44b8023..5f36ef62618 100644
--- a/intl/ctl/src/nsULE.cpp
+++ b/intl/ctl/src/nsULE.cpp
@@ -52,7 +52,6 @@
  * Start of nsULE Public Functions
  */
 nsULE::nsULE() {
-  NS_INIT_ISUPPORTS(); // For Reference Counting
 }
 
 nsULE::~nsULE() {
diff --git a/parser/htmlparser/robot/nsDebugRobot.cpp b/parser/htmlparser/robot/nsDebugRobot.cpp
index 5023a01bd23..6aa7315ea7d 100644
--- a/parser/htmlparser/robot/nsDebugRobot.cpp
+++ b/parser/htmlparser/robot/nsDebugRobot.cpp
@@ -62,7 +62,6 @@ static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
 class RobotSinkObserver : public nsIRobotSinkObserver {
 public:
   RobotSinkObserver() {
-    NS_INIT_ISUPPORTS();
   }
 
   virtual ~RobotSinkObserver() {
@@ -148,8 +147,6 @@ class CStreamListener:  public nsIWebProgressListener,
 {
 public:
   CStreamListener() {
-    NS_INIT_ISUPPORTS();
-
   }
 
   virtual ~CStreamListener() {
diff --git a/parser/htmlparser/src/CNavDTD.cpp b/parser/htmlparser/src/CNavDTD.cpp
index 0557b8c15e5..b684d40b2cf 100644
--- a/parser/htmlparser/src/CNavDTD.cpp
+++ b/parser/htmlparser/src/CNavDTD.cpp
@@ -190,8 +190,6 @@ CNavDTD::CNavDTD() : nsIDTD(),
     mExpectedCRC32(0)
 #endif
 {
-  NS_INIT_ISUPPORTS(); 
-
   mBodyContext=new nsDTDContext();
 
 #ifdef  RICKG_DEBUG
diff --git a/parser/htmlparser/src/COtherDTD.cpp b/parser/htmlparser/src/COtherDTD.cpp
index d66fb2bbbf8..aaf6fe09074 100644
--- a/parser/htmlparser/src/COtherDTD.cpp
+++ b/parser/htmlparser/src/COtherDTD.cpp
@@ -146,7 +146,6 @@ NS_IMPL_RELEASE(COtherDTD)
  *  @return   
  */ 
 COtherDTD::COtherDTD() : nsIDTD() {
-  NS_INIT_ISUPPORTS();
   mSink = 0; 
   mParser=0;        
   mLineNumber=1;  
diff --git a/parser/htmlparser/src/nsDTDUtils.cpp b/parser/htmlparser/src/nsDTDUtils.cpp
index c3a17875702..aa6f63d01c7 100644
--- a/parser/htmlparser/src/nsDTDUtils.cpp
+++ b/parser/htmlparser/src/nsDTDUtils.cpp
@@ -1577,7 +1577,6 @@ NS_IMPL_ISUPPORTS1(nsObserverEntry, nsIObserverEntry)
 
 nsObserverEntry::nsObserverEntry(const nsAString& aTopic) : mTopic(aTopic) 
 {
-  NS_INIT_ISUPPORTS();
   memset(mObservers, 0, sizeof(mObservers));
 }
 
diff --git a/parser/htmlparser/src/nsExpatDriver.cpp b/parser/htmlparser/src/nsExpatDriver.cpp
index a5e7d7f0018..838f501bd8e 100644
--- a/parser/htmlparser/src/nsExpatDriver.cpp
+++ b/parser/htmlparser/src/nsExpatDriver.cpp
@@ -309,7 +309,6 @@ nsExpatDriver::nsExpatDriver()
    mSink(0), 
    mCatalogData(nsnull)
 {
-  NS_INIT_ISUPPORTS();
 }
 
 nsExpatDriver::~nsExpatDriver() 
diff --git a/parser/htmlparser/src/nsHTMLNullSink.cpp b/parser/htmlparser/src/nsHTMLNullSink.cpp
index 774822d65b9..f2c04ee6db9 100644
--- a/parser/htmlparser/src/nsHTMLNullSink.cpp
+++ b/parser/htmlparser/src/nsHTMLNullSink.cpp
@@ -135,7 +135,6 @@ NS_NewHTMLNullSink(nsIContentSink** aInstancePtrResult)
  *  @return  
  */
 nsHTMLNullSink::nsHTMLNullSink() : nsIHTMLContentSink() {
-  NS_INIT_ISUPPORTS();
   mNodeStackPos=0;
   memset(mNodeStack,0,sizeof(mNodeStack));
 }
diff --git a/parser/htmlparser/src/nsHTMLTokenizer.cpp b/parser/htmlparser/src/nsHTMLTokenizer.cpp
index 134cf545032..93292b26ea4 100644
--- a/parser/htmlparser/src/nsHTMLTokenizer.cpp
+++ b/parser/htmlparser/src/nsHTMLTokenizer.cpp
@@ -135,8 +135,6 @@ NS_IMPL_RELEASE(nsHTMLTokenizer)
                                   eParserCommands aCommand) :
   nsITokenizer(), mTokenDeque(0)
 {
-  NS_INIT_ISUPPORTS();
-  
   if (aParseMode==eDTDMode_full_standards ||
       aParseMode==eDTDMode_almost_standards) {
     mFlags = NS_IPARSER_FLAG_STRICT_MODE;
diff --git a/parser/htmlparser/src/nsLoggingSink.cpp b/parser/htmlparser/src/nsLoggingSink.cpp
index b580ee6f359..ecfa722d316 100644
--- a/parser/htmlparser/src/nsLoggingSink.cpp
+++ b/parser/htmlparser/src/nsLoggingSink.cpp
@@ -74,7 +74,6 @@ NS_NewHTMLLoggingSink(nsIContentSink** aInstancePtrResult)
 }
 
 nsLoggingSink::nsLoggingSink() {
-  NS_INIT_ISUPPORTS();
   mOutput = 0;
 	mLevel=-1;
   mSink=0;
diff --git a/parser/htmlparser/src/nsParser.cpp b/parser/htmlparser/src/nsParser.cpp
index bdcf370f1f1..69c099e48d8 100644
--- a/parser/htmlparser/src/nsParser.cpp
+++ b/parser/htmlparser/src/nsParser.cpp
@@ -300,8 +300,6 @@ static PRBool gDumpContent=PR_FALSE;
  *  @return   
  */
 nsParser::nsParser(nsITokenObserver* anObserver) {
-  NS_INIT_ISUPPORTS();
-
 #ifdef NS_DEBUG
   if(!gDumpContent) {
     gDumpContent=(PR_GetEnv("PARSER_DUMP_CONTENT"))? PR_TRUE:PR_FALSE;
diff --git a/parser/htmlparser/src/nsParserService.cpp b/parser/htmlparser/src/nsParserService.cpp
index aeba847bd0d..3743d7ed7c1 100644
--- a/parser/htmlparser/src/nsParserService.cpp
+++ b/parser/htmlparser/src/nsParserService.cpp
@@ -28,7 +28,6 @@
 
 nsParserService::nsParserService() : mEntries(0)
 {
-  NS_INIT_ISUPPORTS();
   mHaveNotifiedCategoryObservers = PR_FALSE;
 }
 
diff --git a/parser/htmlparser/src/nsViewSourceHTML.cpp b/parser/htmlparser/src/nsViewSourceHTML.cpp
index 64bcf7412f2..25727880215 100644
--- a/parser/htmlparser/src/nsViewSourceHTML.cpp
+++ b/parser/htmlparser/src/nsViewSourceHTML.cpp
@@ -328,8 +328,6 @@ static const char* const kDumpFileAfterText[] = {
  *  @return  
  */
 CViewSourceHTML::CViewSourceHTML() : mFilename(), mTags(), mErrors() {
-  NS_INIT_ISUPPORTS();
-
   mStartTag = VIEW_SOURCE_START_TAG;
   mEndTag = VIEW_SOURCE_END_TAG;
   mCommentTag = VIEW_SOURCE_COMMENT;
diff --git a/parser/htmlparser/tests/grabpage/grabpage.cpp b/parser/htmlparser/tests/grabpage/grabpage.cpp
index 03d4de1a54f..318def743e0 100644
--- a/parser/htmlparser/tests/grabpage/grabpage.cpp
+++ b/parser/htmlparser/tests/grabpage/grabpage.cpp
@@ -87,7 +87,6 @@ protected:
 
 StreamToFile::StreamToFile(FILE* fp)
 {
-  NS_INIT_ISUPPORTS();
   mDone = PR_FALSE;
   mError = PR_FALSE;
   mFile = fp;