diff --git a/mozilla/intl/chardet/public/nsIMetaCharsetService.h b/mozilla/intl/chardet/public/nsIMetaCharsetService.h
index 0f0136ed909..6c3aff31c15 100644
--- a/mozilla/intl/chardet/public/nsIMetaCharsetService.h
+++ b/mozilla/intl/chardet/public/nsIMetaCharsetService.h
@@ -27,6 +27,8 @@
 
 class nsIMetaCharsetService : public nsISupports {
 public:
+   NS_DEFINE_STATIC_IID_ACCESSOR( NS_IMETA_CHARSET_SERVICE_IID )
+
    NS_IMETHOD Start() = 0;
    NS_IMETHOD End() = 0;
 };
diff --git a/mozilla/intl/locale/public/nsILocale.h b/mozilla/intl/locale/public/nsILocale.h
index cd02bb4a609..efae031249b 100644
--- a/mozilla/intl/locale/public/nsILocale.h
+++ b/mozilla/intl/locale/public/nsILocale.h
@@ -32,6 +32,8 @@
 class nsILocale : public nsISupports {
 
 public:
+  
+        NS_DEFINE_STATIC_IID_ACCESSOR(NS_ILOCALE_IID)
 	
 	NS_IMETHOD GetCategory(const nsString* category, nsString* result) = 0;
 
diff --git a/mozilla/intl/locale/public/nsILocaleFactory.h b/mozilla/intl/locale/public/nsILocaleFactory.h
index 6ad950ed3a6..a9464ec403d 100644
--- a/mozilla/intl/locale/public/nsILocaleFactory.h
+++ b/mozilla/intl/locale/public/nsILocaleFactory.h
@@ -37,6 +37,7 @@ class nsILocaleFactory : public nsIFactory
 
 public:
 
+   NS_DEFINE_STATIC_IID_ACCESSOR(NS_ILOCALEFACTORY_IID)
    NS_IMETHOD NewLocale(nsString** categoryList,nsString**  
       valueList, PRUint8 count, nsILocale** locale) = 0;
 
diff --git a/mozilla/intl/locale/public/nsIMacLocale.h b/mozilla/intl/locale/public/nsIMacLocale.h
index 1cf57c4e224..e7dd6e821ec 100644
--- a/mozilla/intl/locale/public/nsIMacLocale.h
+++ b/mozilla/intl/locale/public/nsIMacLocale.h
@@ -34,6 +34,7 @@ class nsIMacLocale : public nsISupports {
 
 public:
 	
+        NS_DEFINE_STATIC_IID_ACCESSOR(NS_IMACLOCALE_IID)
 	NS_IMETHOD GetPlatformLocale(const nsString* locale,short* scriptCode,short* langCode) = 0;
 	NS_IMETHOD GetXPLocale(short scriptCode,short langCode, nsString* locale) = 0;
 };
diff --git a/mozilla/intl/locale/public/nsIPosixLocale.h b/mozilla/intl/locale/public/nsIPosixLocale.h
index c7a5fd3a2ab..aad59660fca 100644
--- a/mozilla/intl/locale/public/nsIPosixLocale.h
+++ b/mozilla/intl/locale/public/nsIPosixLocale.h
@@ -33,6 +33,7 @@ class nsIPosixLocale : public nsISupports {
 
 public:
 	
+        NS_DEFINE_STATIC_IID_ACCESSOR(NS_IPOSIXLOCALE_IID)
 	NS_IMETHOD GetPlatformLocale(const nsString* locale,char* posixLocale,size_t length)=0;
 	NS_IMETHOD GetXPLocale(const char* posixLocale, nsString* locale)=0;
 };
diff --git a/mozilla/intl/locale/public/nsIWin32Locale.h b/mozilla/intl/locale/public/nsIWin32Locale.h
index 3071ab9ff24..b0d9dd00861 100644
--- a/mozilla/intl/locale/public/nsIWin32Locale.h
+++ b/mozilla/intl/locale/public/nsIWin32Locale.h
@@ -34,6 +34,7 @@ class nsIWin32Locale : public nsISupports {
 
 public:
 	
+        NS_DEFINE_STATIC_IID_ACCESSOR(NS_IWIN32LOCALE_IID)
 	NS_IMETHOD GetPlatformLocale(const nsString* locale,LCID* winLCID) = 0;
 	NS_IMETHOD GetXPLocale(LCID winLCID,nsString* locale) = 0;
 };
diff --git a/mozilla/intl/lwbrk/public/nsIBinarySearchIterator.h b/mozilla/intl/lwbrk/public/nsIBinarySearchIterator.h
index 50a5b62b2d9..d93f9e1feb5 100644
--- a/mozilla/intl/lwbrk/public/nsIBinarySearchIterator.h
+++ b/mozilla/intl/lwbrk/public/nsIBinarySearchIterator.h
@@ -31,6 +31,7 @@
 class nsIBinarySearchIterator : public nsISupports {
 
 public: 
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IBINARYSEARCHITERATOR_IID)
 
   NS_IMETHOD First() = 0; 
   NS_IMETHOD Next(PRBool aForward) = 0; 
diff --git a/mozilla/intl/lwbrk/public/nsIBreakState.h b/mozilla/intl/lwbrk/public/nsIBreakState.h
index 0634d711537..adc7acbc1c4 100644
--- a/mozilla/intl/lwbrk/public/nsIBreakState.h
+++ b/mozilla/intl/lwbrk/public/nsIBreakState.h
@@ -33,6 +33,9 @@
 class nsIBreakState : public nsISupports
 {
 public:
+ 
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IBREAKSTATE_IID)
+
   NS_IMETHOD Set (PRUint32 aPos, PRBool aDone) = 0; 
   NS_IMETHOD GetText (const PRUnichar** oText) = 0; 
   NS_IMETHOD Length (PRUint32* oLen) = 0; 
diff --git a/mozilla/intl/lwbrk/public/nsILineBreaker.h b/mozilla/intl/lwbrk/public/nsILineBreaker.h
index bd17df74e4b..1d06ce83d2f 100644
--- a/mozilla/intl/lwbrk/public/nsILineBreaker.h
+++ b/mozilla/intl/lwbrk/public/nsILineBreaker.h
@@ -33,6 +33,7 @@
 class nsILineBreaker : public nsISupports
 {
 public:
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_ILINEBREAKER_IID)
   NS_IMETHOD BreakInBetween(const PRUnichar* aText1 , PRUint32 aTextLen1,
                             const PRUnichar* aText2 , PRUint32 aTextLen2,
                                   PRBool *oCanBreak) = 0;
diff --git a/mozilla/intl/lwbrk/public/nsILineBreakerFactory.h b/mozilla/intl/lwbrk/public/nsILineBreakerFactory.h
index 4b1ba2411a0..e212b1f279b 100644
--- a/mozilla/intl/lwbrk/public/nsILineBreakerFactory.h
+++ b/mozilla/intl/lwbrk/public/nsILineBreakerFactory.h
@@ -34,6 +34,8 @@
 class nsILineBreakerFactory : public nsISupports
 {
 public:
+
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_ILINEBREAKERFACTORY_IID)
   NS_IMETHOD GetBreaker(nsString& aParam, nsILineBreaker** breaker) = 0;
 };
 
diff --git a/mozilla/intl/lwbrk/public/nsILinearIterator.h b/mozilla/intl/lwbrk/public/nsILinearIterator.h
index 07566757692..65475b52d5c 100644
--- a/mozilla/intl/lwbrk/public/nsILinearIterator.h
+++ b/mozilla/intl/lwbrk/public/nsILinearIterator.h
@@ -32,6 +32,8 @@ class nsILinearIterator : public nsISupports {
 
 public: 
 
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_ILINEARITERATOR_IID)
+
   NS_IMETHOD First() = 0; 
   NS_IMETHOD Next() = 0; 
   NS_IMETHOD Current(PRUint32 *oPosition) = 0; 
diff --git a/mozilla/intl/lwbrk/public/nsIWordBreaker.h b/mozilla/intl/lwbrk/public/nsIWordBreaker.h
index 88449bde703..4f97a7d88d8 100644
--- a/mozilla/intl/lwbrk/public/nsIWordBreaker.h
+++ b/mozilla/intl/lwbrk/public/nsIWordBreaker.h
@@ -33,6 +33,8 @@
 class nsIWordBreaker : public nsISupports
 {
 public:
+
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IWORDBREAKER_IID)
   NS_IMETHOD BreakInBetween(const PRUnichar* aText1 , PRUint32 aTextLen1,
                             const PRUnichar* aText2 , PRUint32 aTextLen2,
                             PRBool *oCanBreak) = 0;
diff --git a/mozilla/intl/lwbrk/public/nsIWordBreakerFactory.h b/mozilla/intl/lwbrk/public/nsIWordBreakerFactory.h
index 3a312b50fed..f4306997605 100644
--- a/mozilla/intl/lwbrk/public/nsIWordBreakerFactory.h
+++ b/mozilla/intl/lwbrk/public/nsIWordBreakerFactory.h
@@ -34,6 +34,8 @@
 class nsIWordBreakerFactory : public nsISupports
 {
 public:
+
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IWORDBREAKERFACTORY_IID)
   NS_IMETHOD GetBreaker(nsString& aParam, nsIWordBreaker** breaker) = 0;
 };
 
diff --git a/mozilla/intl/uconv/public/nsICharsetAlias.h b/mozilla/intl/uconv/public/nsICharsetAlias.h
index 9ad44962cf2..dcd9454e464 100644
--- a/mozilla/intl/uconv/public/nsICharsetAlias.h
+++ b/mozilla/intl/uconv/public/nsICharsetAlias.h
@@ -28,6 +28,10 @@
 NS_DECLARE_ID(kICharsetAliasIID,\
  0xccd4d374, 0xccdc, 0x11d2, 0xb3, 0xb1, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70 );
 
+#define NS_ICHARSETALIAS_IID \
+{ 0xccd4d374, 0xccdc, 0x11d2, { 0xb3, 0xb1, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70 }}
+
+
 // {98D41C21-CCF3-11d2-B3B1-00805F8A6670}
 NS_DECLARE_ID(kCharsetAliasCID,\
  0x98d41c21, 0xccf3, 0x11d2, 0xb3, 0xb1, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70 );
@@ -37,6 +41,8 @@ NS_DECLARE_ID(kCharsetAliasCID,\
 class nsICharsetAlias : public nsISupports
 {
 public:
+   NS_DEFINE_STATIC_IID_ACCESSOR(NS_ICHARSETALIAS_IID)
+
    NS_IMETHOD GetPreferred(const nsString& aAlias, nsString& aResult) = 0;
    NS_IMETHOD GetPreferred(const PRUnichar* aAlias, const PRUnichar** aResult) = 0;
    NS_IMETHOD GetPreferred(const char* aAlias, char* aResult, PRInt32 aBufLength) = 0;
diff --git a/mozilla/intl/uconv/public/nsICharsetConverterInfo.h b/mozilla/intl/uconv/public/nsICharsetConverterInfo.h
index 21f407eb40b..0a1eb79b14d 100644
--- a/mozilla/intl/uconv/public/nsICharsetConverterInfo.h
+++ b/mozilla/intl/uconv/public/nsICharsetConverterInfo.h
@@ -27,6 +27,9 @@
 NS_DECLARE_ID(kICharsetConverterInfoIID,
   0x6a7730e0, 0x8ed3, 0x11d2, 0x8a, 0x98, 0x0, 0x60, 0x8, 0x11, 0xa8, 0x36);
 
+#define NS_ICHARSETCONVERTERINFO_IID \
+{ 0x6a7730e0, 0x8ed3, 0x11d2, {0x8a, 0x98, 0x0, 0x60, 0x8, 0x11, 0xa8, 0x36}}
+
 /**
  * Interface for getting the Charset Converter information.
  *
@@ -43,6 +46,8 @@ NS_DECLARE_ID(kICharsetConverterInfoIID,
 class nsICharsetConverterInfo : public nsISupports
 {
 public:
+   NS_DEFINE_STATIC_IID_ACCESSOR(NS_ICHARSETCONVERTERINFO_IID)
+ 
 
   /**
    * Returns the character set this converter is converting from.
diff --git a/mozilla/intl/uconv/public/nsIPlatformCharset.h b/mozilla/intl/uconv/public/nsIPlatformCharset.h
index ba2bf8085f5..bb4451d4e05 100644
--- a/mozilla/intl/uconv/public/nsIPlatformCharset.h
+++ b/mozilla/intl/uconv/public/nsIPlatformCharset.h
@@ -29,6 +29,9 @@
 NS_DECLARE_ID(kIPlatformCharsetIID, 
  0x84b0f181, 0xc6c7, 0x11d2, 0xb3, 0xb0, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70 );
 
+#define NS_IPLATFORMCHARSET_IID \
+{ 0x84b0f181, 0xc6c7, 0x11d2, {0xb3, 0xb0, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70 }}
+
 
 // Class ID for our PlatformCharset implementation
 // {84B0F182-C6C7-11d2-B3B0-00805F8A6670}
@@ -46,6 +49,8 @@ typedef enum {
 class nsIPlatformCharset : public nsISupports
 {
 public:
+ 
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IPLATFORMCHARSET_IID)
 
   NS_IMETHOD GetCharset(nsPlatformCharsetSel selector, nsString& oResult) = 0;
 
diff --git a/mozilla/intl/uconv/public/nsIUnicodeDecodeHelper.h b/mozilla/intl/uconv/public/nsIUnicodeDecodeHelper.h
index 2168e8eadef..0cc38104b10 100644
--- a/mozilla/intl/uconv/public/nsIUnicodeDecodeHelper.h
+++ b/mozilla/intl/uconv/public/nsIUnicodeDecodeHelper.h
@@ -30,6 +30,9 @@
 NS_DECLARE_ID(kIUnicodeDecodeHelperIID,
   0x9cc39ff0, 0xdd5d, 0x11d2, 0x8a, 0xac, 0x0, 0x60, 0x8, 0x11, 0xa8, 0x36);
 
+#define NS_IUNICODEDECODEHELPER_IID \
+{ 0x9cc39ff0, 0xdd5d, 0x11d2, {0x8a, 0xac, 0x0, 0x60, 0x8, 0x11, 0xa8, 0x36}}
+
 // Class ID for our UnicodeDecoderHelper implementation
 // {9CC39FF1-DD5D-11d2-8AAC-00600811A836}
 NS_DECLARE_ID(kUnicodeDecodeHelperCID, 
@@ -52,6 +55,7 @@ NS_DECLARE_ID(kUnicodeDecodeHelperCID,
 class nsIUnicodeDecodeHelper : public nsISupports
 {
 public:
+   NS_DEFINE_STATIC_IID_ACCESSOR(NS_IUNICODEDECODEHELPER_IID)
 
   /**
    * Converts data using a lookup table.
diff --git a/mozilla/intl/unicharutil/public/nsICaseConversion.h b/mozilla/intl/unicharutil/public/nsICaseConversion.h
index 067c73d8b1a..aadee1720b2 100644
--- a/mozilla/intl/unicharutil/public/nsICaseConversion.h
+++ b/mozilla/intl/unicharutil/public/nsICaseConversion.h
@@ -31,6 +31,8 @@ class nsICaseConversion : public nsISupports {
 
 public: 
 
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_ICASECONVERSION_IID)
+
   // Convert one Unicode character into upper case
   NS_IMETHOD ToUpper( PRUnichar aChar, PRUnichar* aReturn) = 0;
 
diff --git a/mozilla/intl/unicharutil/public/nsIOrderIdFormater.h b/mozilla/intl/unicharutil/public/nsIOrderIdFormater.h
index b0d7a6c9556..ccabd14302c 100644
--- a/mozilla/intl/unicharutil/public/nsIOrderIdFormater.h
+++ b/mozilla/intl/unicharutil/public/nsIOrderIdFormater.h
@@ -34,6 +34,8 @@ class nsIOrderIdFormater : public nsISupports {
 
 public: 
 
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IORDERIDFORMATER_IID)
+
   // Convert one Unicode character into upper case
   NS_IMETHOD ToString( PRUint32 aOrder, nsString& aResult) = 0;
 
diff --git a/mozilla/intl/unicharutil/public/nsITextTransform.h b/mozilla/intl/unicharutil/public/nsITextTransform.h
index 59cb56e2ddc..d1a6b2789d9 100644
--- a/mozilla/intl/unicharutil/public/nsITextTransform.h
+++ b/mozilla/intl/unicharutil/public/nsITextTransform.h
@@ -34,6 +34,8 @@ class nsITextTransform : public nsISupports {
 
 public: 
 
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_ITEXTTRANSFORM_IID)
+
   NS_IMETHOD Change( nsString& aText, nsString& aResult) = 0;
 
 };
diff --git a/mozilla/intl/unicharutil/public/nsIUGenCategory.h b/mozilla/intl/unicharutil/public/nsIUGenCategory.h
index 704b8deedb2..f2ba6e51c1b 100644
--- a/mozilla/intl/unicharutil/public/nsIUGenCategory.h
+++ b/mozilla/intl/unicharutil/public/nsIUGenCategory.h
@@ -32,6 +32,8 @@ class nsIUGenCategory : public nsISupports {
 
 public: 
 
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IUGENCATEGORY_IID)
+
    /**
     *  Read ftp://ftp.unicode.org/Public/UNIDATA/ReadMe-Latest.txt
     *  section GENERAL CATEGORY
diff --git a/mozilla/intl/unicharutil/public/nsIUGenDetailCategory.h b/mozilla/intl/unicharutil/public/nsIUGenDetailCategory.h
index b9936393fab..2f394bee269 100644
--- a/mozilla/intl/unicharutil/public/nsIUGenDetailCategory.h
+++ b/mozilla/intl/unicharutil/public/nsIUGenDetailCategory.h
@@ -33,6 +33,8 @@ class nsIUGenDetailCategory : public nsISupports {
 
 public: 
 
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IUGENDETAILCATEGORY_IID)
+
    /**
     *  Read ftp://ftp.unicode.org/Public/UNIDATA/ReadMe-Latest.txt
     *  section GENERAL CATEGORY