diff --git a/mozilla/layout/base/nsCSSFrameConstructor.cpp b/mozilla/layout/base/nsCSSFrameConstructor.cpp
index 32e178ceeab..e7144d30f74 100644
--- a/mozilla/layout/base/nsCSSFrameConstructor.cpp
+++ b/mozilla/layout/base/nsCSSFrameConstructor.cpp
@@ -1272,8 +1272,6 @@ nsCSSFrameConstructor::nsCSSFrameConstructor(void)
     mDocElementContainingBlock(nsnull),
     mGfxScrollFrame(nsnull)
 {
-  NS_INIT_ISUPPORTS();
-
 #ifdef DEBUG
   static PRBool gFirstTime = PR_TRUE;
   if (gFirstTime) {
diff --git a/mozilla/layout/base/nsFrameContentIterator.cpp b/mozilla/layout/base/nsFrameContentIterator.cpp
index df220e8301c..a8b7fff2fa5 100644
--- a/mozilla/layout/base/nsFrameContentIterator.cpp
+++ b/mozilla/layout/base/nsFrameContentIterator.cpp
@@ -57,7 +57,6 @@ nsFrameContentIterator::nsFrameContentIterator(nsIPresContext* aPresContext,
                                                    nsIFrame*       aFrame)
   : mPresContext(aPresContext), mParentFrame(aFrame), mIsDone(PR_FALSE)
 {
-  NS_INIT_ISUPPORTS();
   First();
 }
 
diff --git a/mozilla/layout/base/nsFrameManager.cpp b/mozilla/layout/base/nsFrameManager.cpp
index 3f0448c9fba..467b7169ede 100644
--- a/mozilla/layout/base/nsFrameManager.cpp
+++ b/mozilla/layout/base/nsFrameManager.cpp
@@ -454,7 +454,6 @@ NS_NewFrameManager(nsIFrameManager** aInstancePtrResult)
 
 FrameManager::FrameManager()
 {
-  NS_INIT_ISUPPORTS();
 }
 
 FrameManager::~FrameManager()
diff --git a/mozilla/layout/base/nsPresShell.cpp b/mozilla/layout/base/nsPresShell.cpp
index c5f4f0fd727..ae126a79a6e 100644
--- a/mozilla/layout/base/nsPresShell.cpp
+++ b/mozilla/layout/base/nsPresShell.cpp
@@ -769,8 +769,6 @@ nsDummyLayoutRequest::Create(nsIRequest** aResult, nsIPresShell* aPresShell)
 
 nsDummyLayoutRequest::nsDummyLayoutRequest(nsIPresShell* aPresShell)
 {
-  NS_INIT_ISUPPORTS();
-
   if (gRefCnt++ == 0) {
       nsresult rv;
       rv = NS_NewURI(&gURI, "about:layout-dummy-request", nsnull);
@@ -1519,7 +1517,6 @@ PresShell::PresShell():
   mEnablePrefStyleSheet(PR_TRUE),
   mScrollingEnabled(PR_TRUE)
 {
-  NS_INIT_ISUPPORTS();
 #ifdef MOZ_REFLOW_PERF
   mReflowCountMgr = new ReflowCountMgr();
   mReflowCountMgr->SetPresContext(mPresContext);
@@ -7218,7 +7215,6 @@ NS_IMPL_ISUPPORTS2(PresShellViewEventListener, nsIScrollPositionListener, nsICom
 
 PresShellViewEventListener::PresShellViewEventListener()
 {
-  NS_INIT_ISUPPORTS();
   mPresShell  = 0;
   mWasVisible = PR_FALSE;
   mCallCount  = 0;
diff --git a/mozilla/layout/forms/nsComboboxControlFrame.cpp b/mozilla/layout/forms/nsComboboxControlFrame.cpp
index c4736be5719..e0cfd6743a4 100644
--- a/mozilla/layout/forms/nsComboboxControlFrame.cpp
+++ b/mozilla/layout/forms/nsComboboxControlFrame.cpp
@@ -140,7 +140,6 @@ class nsComboButtonListener: public nsIDOMMouseListener
   nsComboButtonListener(nsComboboxControlFrame* aCombobox) 
   { 
     mComboBox = aCombobox; 
-    NS_INIT_ISUPPORTS(); 
   }
 
   virtual ~nsComboButtonListener() {}
diff --git a/mozilla/layout/forms/nsListControlFrame.cpp b/mozilla/layout/forms/nsListControlFrame.cpp
index efee64c9940..d98f412c798 100644
--- a/mozilla/layout/forms/nsListControlFrame.cpp
+++ b/mozilla/layout/forms/nsListControlFrame.cpp
@@ -252,7 +252,6 @@ public:
       : mPresContext(nsnull), mDelay(0), mHasBeenNotified(PR_FALSE), 
         mItemsAdded(PR_FALSE), mItemsRemoved(PR_FALSE), mItemsInxSet(PR_FALSE)
   {
-    NS_INIT_ISUPPORTS();
   }
 
   virtual ~nsSelectUpdateTimer();
@@ -3631,7 +3630,6 @@ NS_IMPL_RELEASE(nsListEventListener)
 
 nsListEventListener::nsListEventListener()
 {
-  NS_INIT_ISUPPORTS();
 }
 
 nsListEventListener::~nsListEventListener()
diff --git a/mozilla/layout/forms/nsTextControlFrame.cpp b/mozilla/layout/forms/nsTextControlFrame.cpp
index 3baf44908f0..a628bb4a996 100644
--- a/mozilla/layout/forms/nsTextControlFrame.cpp
+++ b/mozilla/layout/forms/nsTextControlFrame.cpp
@@ -221,7 +221,6 @@ nsTextInputListener::nsTextInputListener()
 , mHadUndoItems(PR_FALSE)
 , mHadRedoItems(PR_FALSE)
 {
-  NS_INIT_ISUPPORTS();
 }
 
 nsTextInputListener::~nsTextInputListener() 
@@ -509,7 +508,6 @@ NS_IMPL_ISUPPORTS3(nsTextInputSelectionImpl, nsISelectionController, nsISupports
 
 nsTextInputSelectionImpl::nsTextInputSelectionImpl(nsIFrameSelection *aSel, nsIPresShell *aShell, nsIContent *aLimiter)
 {
-  NS_INIT_ISUPPORTS();
   if (aSel && aShell)
   {
     mFrameSelection = aSel;//we are the owner now!
diff --git a/mozilla/layout/generic/nsBulletFrame.cpp b/mozilla/layout/generic/nsBulletFrame.cpp
index 20da669cfaa..41965086e68 100644
--- a/mozilla/layout/generic/nsBulletFrame.cpp
+++ b/mozilla/layout/generic/nsBulletFrame.cpp
@@ -1841,7 +1841,6 @@ NS_IMPL_ISUPPORTS2(nsBulletListener, imgIDecoderObserver, imgIContainerObserver)
 nsBulletListener::nsBulletListener() :
   mFrame(nsnull)
 {
-  NS_INIT_ISUPPORTS();
 }
 
 nsBulletListener::~nsBulletListener()
diff --git a/mozilla/layout/generic/nsFrame.cpp b/mozilla/layout/generic/nsFrame.cpp
index 234c7e5ac40..660c26f18f5 100644
--- a/mozilla/layout/generic/nsFrame.cpp
+++ b/mozilla/layout/generic/nsFrame.cpp
@@ -254,7 +254,6 @@ NS_IMPL_ISUPPORTS1(SelectionImageService, nsISelectionImageService)
 
 SelectionImageService::SelectionImageService()
 {
-  NS_INIT_ISUPPORTS();
 }
 
 SelectionImageService::~SelectionImageService()
diff --git a/mozilla/layout/generic/nsFrameFrame.cpp b/mozilla/layout/generic/nsFrameFrame.cpp
index 2ef7af1b850..da4fca36d5b 100644
--- a/mozilla/layout/generic/nsFrameFrame.cpp
+++ b/mozilla/layout/generic/nsFrameFrame.cpp
@@ -1347,8 +1347,6 @@ nsHTMLFrameInnerFrame::GetDesiredSize(nsIPresContext* aPresContext,
  *****************************************************************************/
 FrameLoadingInfo::FrameLoadingInfo(const nsSize& aSize)
 {
-  NS_INIT_ISUPPORTS();
-
   mFrameSize = aSize;
 }
 
diff --git a/mozilla/layout/generic/nsGfxScrollFrame.cpp b/mozilla/layout/generic/nsGfxScrollFrame.cpp
index 6bc49f41cfd..13bd355ebfa 100644
--- a/mozilla/layout/generic/nsGfxScrollFrame.cpp
+++ b/mozilla/layout/generic/nsGfxScrollFrame.cpp
@@ -905,7 +905,6 @@ nsGfxScrollFrameInner::nsGfxScrollFrameInner(nsGfxScrollFrame* aOuter):mHScrollb
                                                mHasVerticalScrollbar(PR_FALSE), 
                                                mHasHorizontalScrollbar(PR_FALSE)
 {
-   NS_INIT_ISUPPORTS();
    mOuter = aOuter;
    mMaxElementSize.width = 0;
    mMaxElementSize.height = 0;
diff --git a/mozilla/layout/generic/nsImageFrame.cpp b/mozilla/layout/generic/nsImageFrame.cpp
index e53f3fee979..aea827b7eee 100644
--- a/mozilla/layout/generic/nsImageFrame.cpp
+++ b/mozilla/layout/generic/nsImageFrame.cpp
@@ -2313,7 +2313,6 @@ NS_IMPL_ISUPPORTS2(nsImageListener, imgIDecoderObserver, imgIContainerObserver)
 nsImageListener::nsImageListener(nsImageFrame *aFrame) :
   mFrame(aFrame)
 {
-  NS_INIT_ISUPPORTS();
 }
 
 nsImageListener::~nsImageListener()
diff --git a/mozilla/layout/generic/nsImageMap.cpp b/mozilla/layout/generic/nsImageMap.cpp
index 5f2d290ccdf..84f2fea4cb8 100644
--- a/mozilla/layout/generic/nsImageMap.cpp
+++ b/mozilla/layout/generic/nsImageMap.cpp
@@ -756,7 +756,6 @@ void CircleArea::GetRect(nsIPresContext* aCX, nsRect& aRect)
 
 nsImageMap::nsImageMap()
 {
-  NS_INIT_ISUPPORTS();
   mDocument = nsnull;
   mContainsBlockContents = PR_FALSE;
 }
diff --git a/mozilla/layout/generic/nsLineBox.cpp b/mozilla/layout/generic/nsLineBox.cpp
index 1f5de998594..6d1a9aaa216 100644
--- a/mozilla/layout/generic/nsLineBox.cpp
+++ b/mozilla/layout/generic/nsLineBox.cpp
@@ -552,7 +552,6 @@ static nsLineBox* gDummyLines[1];
 
 nsLineIterator::nsLineIterator()
 {
-  NS_INIT_ISUPPORTS();
   mLines = gDummyLines;
   mNumLines = 0;
   mIndex = 0;
diff --git a/mozilla/layout/generic/nsObjectFrame.cpp b/mozilla/layout/generic/nsObjectFrame.cpp
index c13845f4ec6..b38870022d0 100644
--- a/mozilla/layout/generic/nsObjectFrame.cpp
+++ b/mozilla/layout/generic/nsObjectFrame.cpp
@@ -2057,7 +2057,6 @@ NS_NewObjectFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame)
 
 nsPluginDOMContextMenuListener::nsPluginDOMContextMenuListener()
 {
-  NS_INIT_ISUPPORTS();
 }
 
 nsPluginDOMContextMenuListener::~nsPluginDOMContextMenuListener()
@@ -2114,8 +2113,6 @@ nsresult nsPluginDOMContextMenuListener::Destroy(nsObjectFrame *aFrame)
 
 nsPluginInstanceOwner::nsPluginInstanceOwner()
 {
-  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/layout/generic/nsTextFrame.cpp b/mozilla/layout/generic/nsTextFrame.cpp
index 0908944bfaa..09c023ff447 100644
--- a/mozilla/layout/generic/nsTextFrame.cpp
+++ b/mozilla/layout/generic/nsTextFrame.cpp
@@ -261,7 +261,6 @@ static PRTime gLastTick;
 
 nsBlinkTimer::nsBlinkTimer()
 {
-  NS_INIT_ISUPPORTS();
 }
 
 nsBlinkTimer::~nsBlinkTimer()
diff --git a/mozilla/layout/html/base/src/nsBulletFrame.cpp b/mozilla/layout/html/base/src/nsBulletFrame.cpp
index 20da669cfaa..41965086e68 100644
--- a/mozilla/layout/html/base/src/nsBulletFrame.cpp
+++ b/mozilla/layout/html/base/src/nsBulletFrame.cpp
@@ -1841,7 +1841,6 @@ NS_IMPL_ISUPPORTS2(nsBulletListener, imgIDecoderObserver, imgIContainerObserver)
 nsBulletListener::nsBulletListener() :
   mFrame(nsnull)
 {
-  NS_INIT_ISUPPORTS();
 }
 
 nsBulletListener::~nsBulletListener()
diff --git a/mozilla/layout/html/base/src/nsFrame.cpp b/mozilla/layout/html/base/src/nsFrame.cpp
index 234c7e5ac40..660c26f18f5 100644
--- a/mozilla/layout/html/base/src/nsFrame.cpp
+++ b/mozilla/layout/html/base/src/nsFrame.cpp
@@ -254,7 +254,6 @@ NS_IMPL_ISUPPORTS1(SelectionImageService, nsISelectionImageService)
 
 SelectionImageService::SelectionImageService()
 {
-  NS_INIT_ISUPPORTS();
 }
 
 SelectionImageService::~SelectionImageService()
diff --git a/mozilla/layout/html/base/src/nsFrameManager.cpp b/mozilla/layout/html/base/src/nsFrameManager.cpp
index 3f0448c9fba..467b7169ede 100644
--- a/mozilla/layout/html/base/src/nsFrameManager.cpp
+++ b/mozilla/layout/html/base/src/nsFrameManager.cpp
@@ -454,7 +454,6 @@ NS_NewFrameManager(nsIFrameManager** aInstancePtrResult)
 
 FrameManager::FrameManager()
 {
-  NS_INIT_ISUPPORTS();
 }
 
 FrameManager::~FrameManager()
diff --git a/mozilla/layout/html/base/src/nsGfxScrollFrame.cpp b/mozilla/layout/html/base/src/nsGfxScrollFrame.cpp
index 6bc49f41cfd..13bd355ebfa 100644
--- a/mozilla/layout/html/base/src/nsGfxScrollFrame.cpp
+++ b/mozilla/layout/html/base/src/nsGfxScrollFrame.cpp
@@ -905,7 +905,6 @@ nsGfxScrollFrameInner::nsGfxScrollFrameInner(nsGfxScrollFrame* aOuter):mHScrollb
                                                mHasVerticalScrollbar(PR_FALSE), 
                                                mHasHorizontalScrollbar(PR_FALSE)
 {
-   NS_INIT_ISUPPORTS();
    mOuter = aOuter;
    mMaxElementSize.width = 0;
    mMaxElementSize.height = 0;
diff --git a/mozilla/layout/html/base/src/nsImageFrame.cpp b/mozilla/layout/html/base/src/nsImageFrame.cpp
index e53f3fee979..aea827b7eee 100644
--- a/mozilla/layout/html/base/src/nsImageFrame.cpp
+++ b/mozilla/layout/html/base/src/nsImageFrame.cpp
@@ -2313,7 +2313,6 @@ NS_IMPL_ISUPPORTS2(nsImageListener, imgIDecoderObserver, imgIContainerObserver)
 nsImageListener::nsImageListener(nsImageFrame *aFrame) :
   mFrame(aFrame)
 {
-  NS_INIT_ISUPPORTS();
 }
 
 nsImageListener::~nsImageListener()
diff --git a/mozilla/layout/html/base/src/nsImageMap.cpp b/mozilla/layout/html/base/src/nsImageMap.cpp
index 5f2d290ccdf..84f2fea4cb8 100644
--- a/mozilla/layout/html/base/src/nsImageMap.cpp
+++ b/mozilla/layout/html/base/src/nsImageMap.cpp
@@ -756,7 +756,6 @@ void CircleArea::GetRect(nsIPresContext* aCX, nsRect& aRect)
 
 nsImageMap::nsImageMap()
 {
-  NS_INIT_ISUPPORTS();
   mDocument = nsnull;
   mContainsBlockContents = PR_FALSE;
 }
diff --git a/mozilla/layout/html/base/src/nsLineBox.cpp b/mozilla/layout/html/base/src/nsLineBox.cpp
index 1f5de998594..6d1a9aaa216 100644
--- a/mozilla/layout/html/base/src/nsLineBox.cpp
+++ b/mozilla/layout/html/base/src/nsLineBox.cpp
@@ -552,7 +552,6 @@ static nsLineBox* gDummyLines[1];
 
 nsLineIterator::nsLineIterator()
 {
-  NS_INIT_ISUPPORTS();
   mLines = gDummyLines;
   mNumLines = 0;
   mIndex = 0;
diff --git a/mozilla/layout/html/base/src/nsObjectFrame.cpp b/mozilla/layout/html/base/src/nsObjectFrame.cpp
index c13845f4ec6..b38870022d0 100644
--- a/mozilla/layout/html/base/src/nsObjectFrame.cpp
+++ b/mozilla/layout/html/base/src/nsObjectFrame.cpp
@@ -2057,7 +2057,6 @@ NS_NewObjectFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame)
 
 nsPluginDOMContextMenuListener::nsPluginDOMContextMenuListener()
 {
-  NS_INIT_ISUPPORTS();
 }
 
 nsPluginDOMContextMenuListener::~nsPluginDOMContextMenuListener()
@@ -2114,8 +2113,6 @@ nsresult nsPluginDOMContextMenuListener::Destroy(nsObjectFrame *aFrame)
 
 nsPluginInstanceOwner::nsPluginInstanceOwner()
 {
-  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/layout/html/base/src/nsPresShell.cpp b/mozilla/layout/html/base/src/nsPresShell.cpp
index c5f4f0fd727..ae126a79a6e 100644
--- a/mozilla/layout/html/base/src/nsPresShell.cpp
+++ b/mozilla/layout/html/base/src/nsPresShell.cpp
@@ -769,8 +769,6 @@ nsDummyLayoutRequest::Create(nsIRequest** aResult, nsIPresShell* aPresShell)
 
 nsDummyLayoutRequest::nsDummyLayoutRequest(nsIPresShell* aPresShell)
 {
-  NS_INIT_ISUPPORTS();
-
   if (gRefCnt++ == 0) {
       nsresult rv;
       rv = NS_NewURI(&gURI, "about:layout-dummy-request", nsnull);
@@ -1519,7 +1517,6 @@ PresShell::PresShell():
   mEnablePrefStyleSheet(PR_TRUE),
   mScrollingEnabled(PR_TRUE)
 {
-  NS_INIT_ISUPPORTS();
 #ifdef MOZ_REFLOW_PERF
   mReflowCountMgr = new ReflowCountMgr();
   mReflowCountMgr->SetPresContext(mPresContext);
@@ -7218,7 +7215,6 @@ NS_IMPL_ISUPPORTS2(PresShellViewEventListener, nsIScrollPositionListener, nsICom
 
 PresShellViewEventListener::PresShellViewEventListener()
 {
-  NS_INIT_ISUPPORTS();
   mPresShell  = 0;
   mWasVisible = PR_FALSE;
   mCallCount  = 0;
diff --git a/mozilla/layout/html/base/src/nsTextFrame.cpp b/mozilla/layout/html/base/src/nsTextFrame.cpp
index 0908944bfaa..09c023ff447 100644
--- a/mozilla/layout/html/base/src/nsTextFrame.cpp
+++ b/mozilla/layout/html/base/src/nsTextFrame.cpp
@@ -261,7 +261,6 @@ static PRTime gLastTick;
 
 nsBlinkTimer::nsBlinkTimer()
 {
-  NS_INIT_ISUPPORTS();
 }
 
 nsBlinkTimer::~nsBlinkTimer()
diff --git a/mozilla/layout/html/document/src/nsFrameFrame.cpp b/mozilla/layout/html/document/src/nsFrameFrame.cpp
index 2ef7af1b850..da4fca36d5b 100644
--- a/mozilla/layout/html/document/src/nsFrameFrame.cpp
+++ b/mozilla/layout/html/document/src/nsFrameFrame.cpp
@@ -1347,8 +1347,6 @@ nsHTMLFrameInnerFrame::GetDesiredSize(nsIPresContext* aPresContext,
  *****************************************************************************/
 FrameLoadingInfo::FrameLoadingInfo(const nsSize& aSize)
 {
-  NS_INIT_ISUPPORTS();
-
   mFrameSize = aSize;
 }
 
diff --git a/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp b/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp
index c4736be5719..e0cfd6743a4 100644
--- a/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp
+++ b/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp
@@ -140,7 +140,6 @@ class nsComboButtonListener: public nsIDOMMouseListener
   nsComboButtonListener(nsComboboxControlFrame* aCombobox) 
   { 
     mComboBox = aCombobox; 
-    NS_INIT_ISUPPORTS(); 
   }
 
   virtual ~nsComboButtonListener() {}
diff --git a/mozilla/layout/html/forms/src/nsListControlFrame.cpp b/mozilla/layout/html/forms/src/nsListControlFrame.cpp
index efee64c9940..d98f412c798 100644
--- a/mozilla/layout/html/forms/src/nsListControlFrame.cpp
+++ b/mozilla/layout/html/forms/src/nsListControlFrame.cpp
@@ -252,7 +252,6 @@ public:
       : mPresContext(nsnull), mDelay(0), mHasBeenNotified(PR_FALSE), 
         mItemsAdded(PR_FALSE), mItemsRemoved(PR_FALSE), mItemsInxSet(PR_FALSE)
   {
-    NS_INIT_ISUPPORTS();
   }
 
   virtual ~nsSelectUpdateTimer();
@@ -3631,7 +3630,6 @@ NS_IMPL_RELEASE(nsListEventListener)
 
 nsListEventListener::nsListEventListener()
 {
-  NS_INIT_ISUPPORTS();
 }
 
 nsListEventListener::~nsListEventListener()
diff --git a/mozilla/layout/html/forms/src/nsTextControlFrame.cpp b/mozilla/layout/html/forms/src/nsTextControlFrame.cpp
index 3baf44908f0..a628bb4a996 100644
--- a/mozilla/layout/html/forms/src/nsTextControlFrame.cpp
+++ b/mozilla/layout/html/forms/src/nsTextControlFrame.cpp
@@ -221,7 +221,6 @@ nsTextInputListener::nsTextInputListener()
 , mHadUndoItems(PR_FALSE)
 , mHadRedoItems(PR_FALSE)
 {
-  NS_INIT_ISUPPORTS();
 }
 
 nsTextInputListener::~nsTextInputListener() 
@@ -509,7 +508,6 @@ NS_IMPL_ISUPPORTS3(nsTextInputSelectionImpl, nsISelectionController, nsISupports
 
 nsTextInputSelectionImpl::nsTextInputSelectionImpl(nsIFrameSelection *aSel, nsIPresShell *aShell, nsIContent *aLimiter)
 {
-  NS_INIT_ISUPPORTS();
   if (aSel && aShell)
   {
     mFrameSelection = aSel;//we are the owner now!
diff --git a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp
index 32e178ceeab..e7144d30f74 100644
--- a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp
+++ b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp
@@ -1272,8 +1272,6 @@ nsCSSFrameConstructor::nsCSSFrameConstructor(void)
     mDocElementContainingBlock(nsnull),
     mGfxScrollFrame(nsnull)
 {
-  NS_INIT_ISUPPORTS();
-
 #ifdef DEBUG
   static PRBool gFirstTime = PR_TRUE;
   if (gFirstTime) {
diff --git a/mozilla/layout/html/style/src/nsFrameContentIterator.cpp b/mozilla/layout/html/style/src/nsFrameContentIterator.cpp
index df220e8301c..a8b7fff2fa5 100644
--- a/mozilla/layout/html/style/src/nsFrameContentIterator.cpp
+++ b/mozilla/layout/html/style/src/nsFrameContentIterator.cpp
@@ -57,7 +57,6 @@ nsFrameContentIterator::nsFrameContentIterator(nsIPresContext* aPresContext,
                                                    nsIFrame*       aFrame)
   : mPresContext(aPresContext), mParentFrame(aFrame), mIsDone(PR_FALSE)
 {
-  NS_INIT_ISUPPORTS();
   First();
 }
 
diff --git a/mozilla/layout/mathml/base/src/nsMathMLChar.cpp b/mozilla/layout/mathml/base/src/nsMathMLChar.cpp
index 78a10c7e61d..838a334b731 100644
--- a/mozilla/layout/mathml/base/src/nsMathMLChar.cpp
+++ b/mozilla/layout/mathml/base/src/nsMathMLChar.cpp
@@ -676,7 +676,6 @@ public:
   nsGlyphTableList()
   {
     MOZ_COUNT_CTOR(nsGlyphTableList);
-    NS_INIT_ISUPPORTS();
     mDefaultCount = 0;
   }
 
diff --git a/mozilla/layout/xul/base/src/nsBoxLayout.cpp b/mozilla/layout/xul/base/src/nsBoxLayout.cpp
index 12f84b01263..c94e9ac1664 100644
--- a/mozilla/layout/xul/base/src/nsBoxLayout.cpp
+++ b/mozilla/layout/xul/base/src/nsBoxLayout.cpp
@@ -57,7 +57,6 @@
 
 nsBoxLayout::nsBoxLayout()
 {
-  NS_INIT_ISUPPORTS();
 }
 
 void
diff --git a/mozilla/layout/xul/base/src/nsBoxObject.cpp b/mozilla/layout/xul/base/src/nsBoxObject.cpp
index 783e177ae68..8c41fbc3e58 100644
--- a/mozilla/layout/xul/base/src/nsBoxObject.cpp
+++ b/mozilla/layout/xul/base/src/nsBoxObject.cpp
@@ -83,7 +83,6 @@ NS_IMPL_RELEASE(nsBoxObject)
 nsBoxObject::nsBoxObject(void)
   :mContent(nsnull), mPresShell(nsnull)
 {
-  NS_INIT_ISUPPORTS();
 }
 
 nsBoxObject::~nsBoxObject(void)
diff --git a/mozilla/layout/xul/base/src/nsBrowserBoxObject.cpp b/mozilla/layout/xul/base/src/nsBrowserBoxObject.cpp
index 76d0797613a..1c6728e2481 100644
--- a/mozilla/layout/xul/base/src/nsBrowserBoxObject.cpp
+++ b/mozilla/layout/xul/base/src/nsBrowserBoxObject.cpp
@@ -77,7 +77,6 @@ nsBrowserBoxObject::QueryInterface(REFNSIID iid, void** aResult)
 nsBrowserBoxObject::nsBrowserBoxObject()
 :mSrcURL(nsnull)
 {
-  NS_INIT_ISUPPORTS();
 }
 
 nsBrowserBoxObject::~nsBrowserBoxObject()
diff --git a/mozilla/layout/xul/base/src/nsEditorBoxObject.cpp b/mozilla/layout/xul/base/src/nsEditorBoxObject.cpp
index 38b1dfa829d..c5a7337d5fa 100644
--- a/mozilla/layout/xul/base/src/nsEditorBoxObject.cpp
+++ b/mozilla/layout/xul/base/src/nsEditorBoxObject.cpp
@@ -69,7 +69,6 @@ nsEditorBoxObject::SetDocument(nsIDocument* aDocument)
   
 nsEditorBoxObject::nsEditorBoxObject()
 {
-  NS_INIT_ISUPPORTS();
 }
 
 nsEditorBoxObject::~nsEditorBoxObject()
diff --git a/mozilla/layout/xul/base/src/nsIFrameBoxObject.cpp b/mozilla/layout/xul/base/src/nsIFrameBoxObject.cpp
index f943b8c3dc4..123878bc0d3 100644
--- a/mozilla/layout/xul/base/src/nsIFrameBoxObject.cpp
+++ b/mozilla/layout/xul/base/src/nsIFrameBoxObject.cpp
@@ -76,7 +76,6 @@ nsIFrameBoxObject::QueryInterface(REFNSIID iid, void** aResult)
   
 nsIFrameBoxObject::nsIFrameBoxObject()
 {
-  NS_INIT_ISUPPORTS();
 }
 
 nsIFrameBoxObject::~nsIFrameBoxObject()
diff --git a/mozilla/layout/xul/base/src/nsImageBoxFrame.cpp b/mozilla/layout/xul/base/src/nsImageBoxFrame.cpp
index 46e21b2ebb1..836d7d81a81 100644
--- a/mozilla/layout/xul/base/src/nsImageBoxFrame.cpp
+++ b/mozilla/layout/xul/base/src/nsImageBoxFrame.cpp
@@ -815,7 +815,6 @@ NS_IMPL_ISUPPORTS2(nsImageBoxListener, imgIDecoderObserver, imgIContainerObserve
 
 nsImageBoxListener::nsImageBoxListener()
 {
-  NS_INIT_ISUPPORTS();
 }
 
 nsImageBoxListener::~nsImageBoxListener()
diff --git a/mozilla/layout/xul/base/src/nsListBoxBodyFrame.cpp b/mozilla/layout/xul/base/src/nsListBoxBodyFrame.cpp
index 6c1cbb19597..a1838a940d6 100644
--- a/mozilla/layout/xul/base/src/nsListBoxBodyFrame.cpp
+++ b/mozilla/layout/xul/base/src/nsListBoxBodyFrame.cpp
@@ -115,7 +115,6 @@ public:
 
 nsListScrollSmoother::nsListScrollSmoother(nsListBoxBodyFrame* aOuter)
 {
-  NS_INIT_ISUPPORTS();
   mDelta = 0;
   mOuter = aOuter;
 }
diff --git a/mozilla/layout/xul/base/src/nsListBoxObject.cpp b/mozilla/layout/xul/base/src/nsListBoxObject.cpp
index 95ec6d7fde3..0946b2f9302 100644
--- a/mozilla/layout/xul/base/src/nsListBoxObject.cpp
+++ b/mozilla/layout/xul/base/src/nsListBoxObject.cpp
@@ -83,7 +83,6 @@ nsListBoxObject::QueryInterface(REFNSIID iid, void** aResult)
   
 nsListBoxObject::nsListBoxObject()
 {
-  NS_INIT_ISUPPORTS();
 }
 
 nsListBoxObject::~nsListBoxObject()
diff --git a/mozilla/layout/xul/base/src/nsMenuBarListener.cpp b/mozilla/layout/xul/base/src/nsMenuBarListener.cpp
index 09ef7998cc9..7af11b5e76e 100644
--- a/mozilla/layout/xul/base/src/nsMenuBarListener.cpp
+++ b/mozilla/layout/xul/base/src/nsMenuBarListener.cpp
@@ -85,7 +85,6 @@ PRBool nsMenuBarListener::mAccessKeyFocuses = PR_FALSE;
 nsMenuBarListener::nsMenuBarListener(nsMenuBarFrame* aMenuBar) 
   :mAccessKeyDown(PR_FALSE)
 {
-  NS_INIT_ISUPPORTS();
   mMenuBarFrame = aMenuBar;
 }
 
diff --git a/mozilla/layout/xul/base/src/nsMenuBoxObject.cpp b/mozilla/layout/xul/base/src/nsMenuBoxObject.cpp
index d8aa3349b94..2d8472150f2 100644
--- a/mozilla/layout/xul/base/src/nsMenuBoxObject.cpp
+++ b/mozilla/layout/xul/base/src/nsMenuBoxObject.cpp
@@ -75,7 +75,6 @@ nsMenuBoxObject::QueryInterface(REFNSIID iid, void** aResult)
   
 nsMenuBoxObject::nsMenuBoxObject()
 {
-  NS_INIT_ISUPPORTS();
 }
 
 nsMenuBoxObject::~nsMenuBoxObject()
diff --git a/mozilla/layout/xul/base/src/nsMenuDismissalListener.cpp b/mozilla/layout/xul/base/src/nsMenuDismissalListener.cpp
index 01041b4e713..19607517740 100644
--- a/mozilla/layout/xul/base/src/nsMenuDismissalListener.cpp
+++ b/mozilla/layout/xul/base/src/nsMenuDismissalListener.cpp
@@ -56,7 +56,6 @@ NS_IMPL_QUERY_INTERFACE3(nsMenuDismissalListener, nsIDOMMouseListener, nsIMenuRo
 nsMenuDismissalListener::nsMenuDismissalListener() :
   mEnabled(PR_TRUE)
 {
-  NS_INIT_ISUPPORTS();
   mMenuParent = nsnull;
 }
 
diff --git a/mozilla/layout/xul/base/src/nsMenuListener.cpp b/mozilla/layout/xul/base/src/nsMenuListener.cpp
index 13e07b403f6..ee31f5784de 100644
--- a/mozilla/layout/xul/base/src/nsMenuListener.cpp
+++ b/mozilla/layout/xul/base/src/nsMenuListener.cpp
@@ -78,7 +78,6 @@ NS_IMPL_QUERY_INTERFACE3(nsMenuListener, nsIDOMKeyListener, nsIDOMFocusListener,
 
 nsMenuListener::nsMenuListener(nsIMenuParent* aMenuParent) 
 {
-  NS_INIT_ISUPPORTS();
   mMenuParent = aMenuParent;
 }
 
diff --git a/mozilla/layout/xul/base/src/nsPopupBoxObject.cpp b/mozilla/layout/xul/base/src/nsPopupBoxObject.cpp
index 94062bed60c..c6dafca31da 100644
--- a/mozilla/layout/xul/base/src/nsPopupBoxObject.cpp
+++ b/mozilla/layout/xul/base/src/nsPopupBoxObject.cpp
@@ -87,7 +87,6 @@ nsPopupBoxObject::QueryInterface(REFNSIID iid, void** aResult)
   
 nsPopupBoxObject::nsPopupBoxObject()
 {
-  NS_INIT_ISUPPORTS();
 }
 
 nsPopupBoxObject::~nsPopupBoxObject()
diff --git a/mozilla/layout/xul/base/src/nsRepeatService.cpp b/mozilla/layout/xul/base/src/nsRepeatService.cpp
index 71e254941bc..be6884b15e3 100644
--- a/mozilla/layout/xul/base/src/nsRepeatService.cpp
+++ b/mozilla/layout/xul/base/src/nsRepeatService.cpp
@@ -58,7 +58,6 @@ nsRepeatService* nsRepeatService::gInstance = nsnull;
 nsRepeatService::nsRepeatService()
 : mFirstCall(PR_FALSE)
 {
-  NS_INIT_ISUPPORTS();
 }
 
 nsRepeatService::~nsRepeatService()
diff --git a/mozilla/layout/xul/base/src/nsScrollBoxObject.cpp b/mozilla/layout/xul/base/src/nsScrollBoxObject.cpp
index 4c92cb394cc..c296a271ae6 100644
--- a/mozilla/layout/xul/base/src/nsScrollBoxObject.cpp
+++ b/mozilla/layout/xul/base/src/nsScrollBoxObject.cpp
@@ -75,7 +75,6 @@ NS_IMPL_RELEASE_INHERITED(nsScrollBoxObject, nsBoxObject)
 
 nsScrollBoxObject::nsScrollBoxObject()
 {
-  NS_INIT_ISUPPORTS();
   /* member initializers and constructor code */
 }
 
diff --git a/mozilla/layout/xul/base/src/nsSliderFrame.h b/mozilla/layout/xul/base/src/nsSliderFrame.h
index a8593d1b40a..373a3ebba92 100644
--- a/mozilla/layout/xul/base/src/nsSliderFrame.h
+++ b/mozilla/layout/xul/base/src/nsSliderFrame.h
@@ -64,7 +64,7 @@ public:
 
   nsSliderFrame* mSlider;
 
-  nsSliderMediator(nsSliderFrame* aSlider) {  mSlider = aSlider; NS_INIT_ISUPPORTS(); }
+  nsSliderMediator(nsSliderFrame* aSlider) {  mSlider = aSlider; }
   virtual ~nsSliderMediator() {}
 
   virtual void SetSlider(nsSliderFrame* aSlider) { mSlider = aSlider; }
diff --git a/mozilla/layout/xul/base/src/nsSplitterFrame.cpp b/mozilla/layout/xul/base/src/nsSplitterFrame.cpp
index e20742da569..af326812937 100644
--- a/mozilla/layout/xul/base/src/nsSplitterFrame.cpp
+++ b/mozilla/layout/xul/base/src/nsSplitterFrame.cpp
@@ -101,7 +101,6 @@ public:
 
   nsSplitterFrameInner(nsSplitterFrame* aSplitter)
   {
-    NS_INIT_ISUPPORTS();
     mOuter = aSplitter;
     mPressed = PR_FALSE;
   }
diff --git a/mozilla/layout/xul/base/src/nsXULTooltipListener.cpp b/mozilla/layout/xul/base/src/nsXULTooltipListener.cpp
index 00d58b3e9aa..7096094a1c1 100644
--- a/mozilla/layout/xul/base/src/nsXULTooltipListener.cpp
+++ b/mozilla/layout/xul/base/src/nsXULTooltipListener.cpp
@@ -74,7 +74,6 @@ nsXULTooltipListener::nsXULTooltipListener()
   , mNeedTitletip(PR_FALSE)
   , mLastTreeRow(-1)
 {
-  NS_INIT_ISUPPORTS();
 }
 
 nsXULTooltipListener::~nsXULTooltipListener()
diff --git a/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp b/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
index 17a7ae75417..a15e6e32c2c 100644
--- a/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
+++ b/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
@@ -3776,7 +3776,6 @@ NS_IMPL_ISUPPORTS3(nsTreeImageListener, imgIDecoderObserver, imgIContainerObserv
 
 nsTreeImageListener::nsTreeImageListener(nsITreeBoxObject* aTree, const PRUnichar* aColID)
 {
-  NS_INIT_ISUPPORTS();
   mTree = aTree;
   mColID = aColID;
   mMin = -1; // min should start out "undefined"
diff --git a/mozilla/layout/xul/base/src/tree/src/nsTreeBoxObject.cpp b/mozilla/layout/xul/base/src/tree/src/nsTreeBoxObject.cpp
index c7e97e10334..0693f6a07b9 100644
--- a/mozilla/layout/xul/base/src/tree/src/nsTreeBoxObject.cpp
+++ b/mozilla/layout/xul/base/src/tree/src/nsTreeBoxObject.cpp
@@ -97,7 +97,6 @@ nsTreeBoxObject::InvalidatePresentationStuff()
   
 nsTreeBoxObject::nsTreeBoxObject()
 {
-  NS_INIT_ISUPPORTS();
 }
 
 nsTreeBoxObject::~nsTreeBoxObject()
diff --git a/mozilla/layout/xul/base/src/tree/src/nsTreeContentView.cpp b/mozilla/layout/xul/base/src/tree/src/nsTreeContentView.cpp
index be223e80c4a..21aad33754b 100644
--- a/mozilla/layout/xul/base/src/tree/src/nsTreeContentView.cpp
+++ b/mozilla/layout/xul/base/src/tree/src/nsTreeContentView.cpp
@@ -159,8 +159,6 @@ nsTreeContentView::nsTreeContentView(void) :
   mBoxObject(nsnull), mSelection(nsnull), mRoot(nsnull), mDocument(nsnull),
   mUpdateSelection(PR_FALSE)
 {
-  NS_INIT_ISUPPORTS();
-
   static const size_t kBucketSizes[] = {
     sizeof(Row)
   };
diff --git a/mozilla/layout/xul/base/src/tree/src/nsTreeSelection.cpp b/mozilla/layout/xul/base/src/tree/src/nsTreeSelection.cpp
index ea3ba998bed..a8289f3ad7f 100644
--- a/mozilla/layout/xul/base/src/tree/src/nsTreeSelection.cpp
+++ b/mozilla/layout/xul/base/src/tree/src/nsTreeSelection.cpp
@@ -254,7 +254,6 @@ struct nsTreeRange
 
 nsTreeSelection::nsTreeSelection(nsITreeBoxObject* aTree)
 {
-  NS_INIT_ISUPPORTS();
   mTree = aTree;
   mSuppressed = PR_FALSE;
   mFirstRange = nsnull;
diff --git a/mozilla/mailnews/absync/src/nsABSyncDriver.cpp b/mozilla/mailnews/absync/src/nsABSyncDriver.cpp
index 7f5b964b423..9f0da895ad1 100644
--- a/mozilla/mailnews/absync/src/nsABSyncDriver.cpp
+++ b/mozilla/mailnews/absync/src/nsABSyncDriver.cpp
@@ -51,7 +51,6 @@ static NS_DEFINE_CID(kAbSync, NS_ABSYNC_SERVICE_CID);
 
 nsAbSyncDriver::nsAbSyncDriver()
 {
-  NS_INIT_ISUPPORTS();
   /* member initializers and constructor code */
 
   mTransactionID = -1;