diff --git a/mozilla/intl/ctl/src/nsUnicodeToSunIndic.cpp b/mozilla/intl/ctl/src/nsUnicodeToSunIndic.cpp
index e0c0c095783..d8424983481 100644
--- a/mozilla/intl/ctl/src/nsUnicodeToSunIndic.cpp
+++ b/mozilla/intl/ctl/src/nsUnicodeToSunIndic.cpp
@@ -120,8 +120,6 @@ nsUnicodeToSunIndic::nsUnicodeToSunIndic()
   static   NS_DEFINE_CID(kLECID, NS_ULE_CID);
   nsresult rv;
 
-  NS_INIT_ISUPPORTS();
-
   mCtlObj = do_CreateInstance(kLECID, &rv);
   if (NS_FAILED(rv)) {
 
diff --git a/mozilla/intl/ctl/src/nsUnicodeToTIS620.cpp b/mozilla/intl/ctl/src/nsUnicodeToTIS620.cpp
index 16ac1da411a..c89c154d6c3 100644
--- a/mozilla/intl/ctl/src/nsUnicodeToTIS620.cpp
+++ b/mozilla/intl/ctl/src/nsUnicodeToTIS620.cpp
@@ -131,8 +131,6 @@ nsUnicodeToTIS620::nsUnicodeToTIS620()
   static   NS_DEFINE_CID(kLECID, NS_ULE_CID);
   nsresult rv;
 
-  NS_INIT_ISUPPORTS();
-
   mCtlObj = do_CreateInstance(kLECID, &rv);
   if (NS_FAILED(rv)) {
 #ifdef DEBUG_prabhat
diff --git a/mozilla/intl/locale/src/mac/nsCollationMac.cpp b/mozilla/intl/locale/src/mac/nsCollationMac.cpp
index 6ed9a6e205f..65da3ea860d 100644
--- a/mozilla/intl/locale/src/mac/nsCollationMac.cpp
+++ b/mozilla/intl/locale/src/mac/nsCollationMac.cpp
@@ -128,7 +128,6 @@ NS_IMPL_ISUPPORTS1(nsCollationMac, nsICollation);
 
 nsCollationMac::nsCollationMac() 
 {
-  NS_INIT_ISUPPORTS(); 
   mCollation = NULL;
 }
 
diff --git a/mozilla/intl/locale/src/mac/nsCollationMacUC.cpp b/mozilla/intl/locale/src/mac/nsCollationMacUC.cpp
index a31dfb764ff..9f8b9fc981a 100644
--- a/mozilla/intl/locale/src/mac/nsCollationMacUC.cpp
+++ b/mozilla/intl/locale/src/mac/nsCollationMacUC.cpp
@@ -52,7 +52,6 @@ nsCollationMacUC::nsCollationMacUC()
   : mInit(PR_FALSE)
   , mHasCollator(PR_FALSE)
 {
-  NS_INIT_ISUPPORTS(); 
 }
 
 nsCollationMacUC::~nsCollationMacUC() 
diff --git a/mozilla/intl/locale/src/mac/nsDateTimeFormatMac.h b/mozilla/intl/locale/src/mac/nsDateTimeFormatMac.h
index af62e0c19f1..8c83e99c0a0 100644
--- a/mozilla/intl/locale/src/mac/nsDateTimeFormatMac.h
+++ b/mozilla/intl/locale/src/mac/nsDateTimeFormatMac.h
@@ -62,7 +62,7 @@ public:
                                   const PRExplodedTime*  explodedTime, 
                                   nsString& stringOut); 
 
-  nsDateTimeFormatMac() {NS_INIT_ISUPPORTS();}
+  nsDateTimeFormatMac() {}
   
   virtual ~nsDateTimeFormatMac() {}
   
diff --git a/mozilla/intl/locale/src/mac/nsMacLocale.cpp b/mozilla/intl/locale/src/mac/nsMacLocale.cpp
index ed3d1fab033..ca36113a222 100644
--- a/mozilla/intl/locale/src/mac/nsMacLocale.cpp
+++ b/mozilla/intl/locale/src/mac/nsMacLocale.cpp
@@ -222,7 +222,6 @@ NS_IMPL_ISUPPORTS1(nsMacLocale,nsIMacLocale)
 
 nsMacLocale::nsMacLocale(void)
 {
-  NS_INIT_ISUPPORTS();
 }
 
 nsMacLocale::~nsMacLocale(void)
diff --git a/mozilla/intl/locale/src/nsCollation.h b/mozilla/intl/locale/src/nsCollation.h
index 6167f0c9aa2..4e69f52f257 100644
--- a/mozilla/intl/locale/src/nsCollation.h
+++ b/mozilla/intl/locale/src/nsCollation.h
@@ -40,7 +40,7 @@ public:
 
   NS_IMETHOD CreateCollation(nsILocale* locale, nsICollation** instancePtr);
 
-  nsCollationFactory() {NS_INIT_ISUPPORTS();};
+  nsCollationFactory() {};
 };
 
 
diff --git a/mozilla/intl/locale/src/nsFontPackageService.cpp b/mozilla/intl/locale/src/nsFontPackageService.cpp
index d6897664f9c..73e7c71f2d8 100644
--- a/mozilla/intl/locale/src/nsFontPackageService.cpp
+++ b/mozilla/intl/locale/src/nsFontPackageService.cpp
@@ -61,7 +61,6 @@ NS_IMPL_THREADSAFE_ISUPPORTS2(nsFontPackageService,
 /* from nsIFontPackageSercice.h */
 nsFontPackageService::nsFontPackageService() : mHandler(nsnull)
 {
-  NS_INIT_ISUPPORTS();
   /* member initializers and constructor code */
 }
 
diff --git a/mozilla/intl/locale/src/nsLanguageAtomService.cpp b/mozilla/intl/locale/src/nsLanguageAtomService.cpp
index 6d2bdc3783f..32bdf892d87 100644
--- a/mozilla/intl/locale/src/nsLanguageAtomService.cpp
+++ b/mozilla/intl/locale/src/nsLanguageAtomService.cpp
@@ -66,7 +66,6 @@ NS_IMPL_ISUPPORTS1(nsLanguageAtom, nsILanguageAtom)
 
 nsLanguageAtom::nsLanguageAtom()
 {
-  NS_INIT_ISUPPORTS();
 }
 
 nsLanguageAtom::~nsLanguageAtom()
@@ -115,7 +114,6 @@ NS_IMPL_ISUPPORTS1(nsLanguageAtomService, nsILanguageAtomService)
 
 nsLanguageAtomService::nsLanguageAtomService()
 {
-  NS_INIT_ISUPPORTS();
 }
 
 nsLanguageAtomService::~nsLanguageAtomService()
diff --git a/mozilla/intl/locale/src/nsLocale.cpp b/mozilla/intl/locale/src/nsLocale.cpp
index b31b34c2439..023277ba133 100644
--- a/mozilla/intl/locale/src/nsLocale.cpp
+++ b/mozilla/intl/locale/src/nsLocale.cpp
@@ -55,8 +55,6 @@ NS_IMPL_THREADSAFE_ISUPPORTS1(nsLocale, nsILocale)
 nsLocale::nsLocale(void)
 :	fHashtable(nsnull), fCategoryCount(0)
 {
-	NS_INIT_ISUPPORTS();
-
 	fHashtable = PL_NewHashTable(LOCALE_HASH_SIZE,&nsLocale::Hash_HashFunction,
 		&nsLocale::Hash_CompareNSString,&nsLocale::Hash_CompareNSString,NULL,NULL);
 	NS_ASSERTION(fHashtable!=NULL,"nsLocale: failed to allocate PR_Hashtable");
@@ -65,8 +63,6 @@ nsLocale::nsLocale(void)
 nsLocale::nsLocale(nsLocale* other)
 :	fHashtable(nsnull), fCategoryCount(0)
 {
-	NS_INIT_ISUPPORTS();
-
 	fHashtable = PL_NewHashTable(LOCALE_HASH_SIZE,&nsLocale::Hash_HashFunction,
 		&nsLocale::Hash_CompareNSString,&nsLocale::Hash_CompareNSString,NULL,NULL);
 	NS_ASSERTION(fHashtable!=NULL,"nsLocale: failed to allocate PR_Hashtable");
@@ -86,8 +82,6 @@ nsLocale::nsLocale(nsString** categoryList,nsString** valueList, PRUint32 count)
 	PRUint32	i;
 	nsString*	key, *value;
 
-  NS_INIT_ISUPPORTS();
-
 	fHashtable = PL_NewHashTable(LOCALE_HASH_SIZE,&nsLocale::Hash_HashFunction,
 		&nsLocale::Hash_CompareNSString,&nsLocale::Hash_CompareNSString,NULL,NULL);
 	NS_ASSERTION(fHashtable!=NULL,"nsLocale: failed to allocate PR_Hashtable");
diff --git a/mozilla/intl/locale/src/nsLocaleService.cpp b/mozilla/intl/locale/src/nsLocaleService.cpp
index 08934640c2d..3e206044e41 100644
--- a/mozilla/intl/locale/src/nsLocaleService.cpp
+++ b/mozilla/intl/locale/src/nsLocaleService.cpp
@@ -159,7 +159,6 @@ protected:
 nsLocaleService::nsLocaleService(void)
 :	mSystemLocale(nsnull), mApplicationLocale(nsnull)
 {
-	NS_INIT_ISUPPORTS();
 #if defined(XP_WIN)
     nsresult result;
 	nsCOMPtr<nsIWin32Locale> win32Converter
@@ -531,8 +530,6 @@ NS_IMPL_ISUPPORTS1(nsLocaleDefinition,nsILocaleDefinition)
 
 nsLocaleDefinition::nsLocaleDefinition(void)
 {
-	NS_INIT_ISUPPORTS();
-
 	mLocaleDefinition = new nsLocale;
 	if (mLocaleDefinition)
 		mLocaleDefinition->AddRef();
diff --git a/mozilla/intl/locale/src/nsScriptableDateFormat.cpp b/mozilla/intl/locale/src/nsScriptableDateFormat.cpp
index 1692c515e5a..2e10a7355ff 100644
--- a/mozilla/intl/locale/src/nsScriptableDateFormat.cpp
+++ b/mozilla/intl/locale/src/nsScriptableDateFormat.cpp
@@ -83,7 +83,7 @@ class nsScriptableDateFormat : public nsIScriptableDateFormat {
                         {return FormatDateTime(locale, kDateFormatNone, timeFormatSelector, 
                                                1999, 1, 1, hour, minute, second, timeString);}
 
-  nsScriptableDateFormat() {NS_INIT_ISUPPORTS();}
+  nsScriptableDateFormat() {}
   virtual ~nsScriptableDateFormat() {}
 private:
   nsString mStringOut;   
diff --git a/mozilla/intl/locale/src/os2/nsCollationOS2.cpp b/mozilla/intl/locale/src/os2/nsCollationOS2.cpp
index 84e9d5f5383..e396c81f3a8 100644
--- a/mozilla/intl/locale/src/os2/nsCollationOS2.cpp
+++ b/mozilla/intl/locale/src/os2/nsCollationOS2.cpp
@@ -45,7 +45,6 @@ NS_IMPL_ISUPPORTS1(nsCollationOS2, nsICollation)
 
 nsCollationOS2::nsCollationOS2()
 {
-  NS_INIT_ISUPPORTS();
   mCollation = NULL;
 }
 
diff --git a/mozilla/intl/locale/src/os2/nsDateTimeFormatOS2.h b/mozilla/intl/locale/src/os2/nsDateTimeFormatOS2.h
index 202c0152a6a..6d08ecbf755 100644
--- a/mozilla/intl/locale/src/os2/nsDateTimeFormatOS2.h
+++ b/mozilla/intl/locale/src/os2/nsDateTimeFormatOS2.h
@@ -56,7 +56,7 @@ class nsDateTimeFormatOS2 : public nsIDateTimeFormat {
                                   const PRExplodedTime*  explodedTime, 
                                   nsString& stringOut);
 
-  nsDateTimeFormatOS2() {NS_INIT_ISUPPORTS();}
+  nsDateTimeFormatOS2() {}
 
   virtual ~nsDateTimeFormatOS2() {}
 };
diff --git a/mozilla/intl/locale/src/os2/nsOS2Locale.cpp b/mozilla/intl/locale/src/os2/nsOS2Locale.cpp
index 22c18f44ffd..f79236afb9c 100644
--- a/mozilla/intl/locale/src/os2/nsOS2Locale.cpp
+++ b/mozilla/intl/locale/src/os2/nsOS2Locale.cpp
@@ -47,7 +47,6 @@ NS_IMPL_ISUPPORTS1(nsOS2Locale,nsIOS2Locale)
 
 nsOS2Locale::nsOS2Locale(void)
 {
-   NS_INIT_ISUPPORTS();
 }
 
 nsOS2Locale::~nsOS2Locale(void)
diff --git a/mozilla/intl/locale/src/unix/nsCollationUnix.cpp b/mozilla/intl/locale/src/unix/nsCollationUnix.cpp
index 6e16b340a2a..57ed7d1a039 100644
--- a/mozilla/intl/locale/src/unix/nsCollationUnix.cpp
+++ b/mozilla/intl/locale/src/unix/nsCollationUnix.cpp
@@ -72,7 +72,6 @@ inline void nsCollationUnix::DoRestoreLocale()
 
 nsCollationUnix::nsCollationUnix() 
 {
-  NS_INIT_ISUPPORTS(); 
   mCollation = NULL;
   mUseCodePointOrder = PR_FALSE;
 }
diff --git a/mozilla/intl/locale/src/unix/nsDateTimeFormatUnix.h b/mozilla/intl/locale/src/unix/nsDateTimeFormatUnix.h
index 80e544cf0e2..f11ac07dea9 100644
--- a/mozilla/intl/locale/src/unix/nsDateTimeFormatUnix.h
+++ b/mozilla/intl/locale/src/unix/nsDateTimeFormatUnix.h
@@ -65,8 +65,7 @@ public:
                                   nsString& stringOut); 
 
 
-  nsDateTimeFormatUnix() {NS_INIT_ISUPPORTS();
-                          mLocale.Truncate();mAppLocale.Truncate();}
+  nsDateTimeFormatUnix() {mLocale.Truncate();mAppLocale.Truncate();}
 
   virtual ~nsDateTimeFormatUnix() {}
 
diff --git a/mozilla/intl/locale/src/unix/nsPosixLocale.cpp b/mozilla/intl/locale/src/unix/nsPosixLocale.cpp
index b642fbbe4b7..5c88b641fdd 100644
--- a/mozilla/intl/locale/src/unix/nsPosixLocale.cpp
+++ b/mozilla/intl/locale/src/unix/nsPosixLocale.cpp
@@ -50,7 +50,6 @@ NS_IMPL_ISUPPORTS1(nsPosixLocale, nsIPosixLocale)
 
 nsPosixLocale::nsPosixLocale(void)
 {
-  NS_INIT_ISUPPORTS();
 }
 
 nsPosixLocale::~nsPosixLocale(void)
diff --git a/mozilla/intl/locale/src/windows/nsCollationWin.cpp b/mozilla/intl/locale/src/windows/nsCollationWin.cpp
index 3a7c26175e9..073a4ead1f1 100644
--- a/mozilla/intl/locale/src/windows/nsCollationWin.cpp
+++ b/mozilla/intl/locale/src/windows/nsCollationWin.cpp
@@ -56,7 +56,6 @@ NS_IMPL_ISUPPORTS1(nsCollationWin, nsICollation);
 
 nsCollationWin::nsCollationWin() 
 {
-  NS_INIT_ISUPPORTS(); 
   mCollation = NULL;
 }
 
diff --git a/mozilla/intl/locale/src/windows/nsDateTimeFormatWin.h b/mozilla/intl/locale/src/windows/nsDateTimeFormatWin.h
index f0441717dcd..17b5cb25652 100644
--- a/mozilla/intl/locale/src/windows/nsDateTimeFormatWin.h
+++ b/mozilla/intl/locale/src/windows/nsDateTimeFormatWin.h
@@ -63,8 +63,7 @@ public:
                                   const PRExplodedTime*  explodedTime, 
                                   nsString& stringOut); 
 
-  nsDateTimeFormatWin() {NS_INIT_ISUPPORTS();
-                         mLocale.SetLength(0);mAppLocale.SetLength(0);}
+  nsDateTimeFormatWin() {mLocale.SetLength(0);mAppLocale.SetLength(0);}
 
 
   virtual ~nsDateTimeFormatWin() {}