diff --git a/mozilla/content/base/public/nsIDocumentObserver.h b/mozilla/content/base/public/nsIDocumentObserver.h
index eb612677fd6..c478d56a0b0 100644
--- a/mozilla/content/base/public/nsIDocumentObserver.h
+++ b/mozilla/content/base/public/nsIDocumentObserver.h
@@ -34,6 +34,8 @@ class nsIDocument;
 // Document observer interface
 class nsIDocumentObserver : public nsISupports {
 public:
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOCUMENT_OBSERVER_IID; return iid; }
+
   /**
    * Notify that a content model update is beginning. This call can be
    * nested.
diff --git a/mozilla/content/base/public/nsINameSpace.h b/mozilla/content/base/public/nsINameSpace.h
index 973aef0b7f6..9f722007e1c 100644
--- a/mozilla/content/base/public/nsINameSpace.h
+++ b/mozilla/content/base/public/nsINameSpace.h
@@ -45,6 +45,8 @@ class nsINameSpaceManager;
  */
 class nsINameSpace : public nsISupports {
 public:
+  static const nsIID& GetIID() { static nsIID iid = NS_INAMESPACE_IID; return iid; }
+
   NS_IMETHOD GetNameSpaceManager(nsINameSpaceManager*& aManager) const = 0;
 
   // Get data of this name space
diff --git a/mozilla/content/html/content/public/nsIFormSubmitObserver.h b/mozilla/content/html/content/public/nsIFormSubmitObserver.h
index 881b337dda3..76494109233 100644
--- a/mozilla/content/html/content/public/nsIFormSubmitObserver.h
+++ b/mozilla/content/html/content/public/nsIFormSubmitObserver.h
@@ -39,6 +39,8 @@ class nsString;
 
 class nsIFormSubmitObserver : public nsISupports {
 public:
+  static const nsIID& GetIID() { static nsIID iid = NS_IFORMSUBMITOBSERVER_IID; return iid; }
+
   /*
    *   Subject calls the observer when the form is submitted
    *   @param formNode- the dom node corresonding to this form.
diff --git a/mozilla/dom/public/nsIDOMScriptObjectFactory.h b/mozilla/dom/public/nsIDOMScriptObjectFactory.h
index 6f40dfbe014..786a8769fdd 100644
--- a/mozilla/dom/public/nsIDOMScriptObjectFactory.h
+++ b/mozilla/dom/public/nsIDOMScriptObjectFactory.h
@@ -30,6 +30,8 @@ class nsIScriptContext;
 
 class nsIDOMScriptObjectFactory : public nsISupports {
 public:  
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOM_SCRIPT_OBJECT_FACTORY_IID; return iid; }
+
   NS_IMETHOD    NewScriptAttr(nsIScriptContext *aContext, 
                               nsISupports *aAttribute, 
                               nsISupports *aParent, 
diff --git a/mozilla/dom/public/nsIScriptGlobalObject.h b/mozilla/dom/public/nsIScriptGlobalObject.h
index 2e60e701f39..8ff49c59716 100644
--- a/mozilla/dom/public/nsIScriptGlobalObject.h
+++ b/mozilla/dom/public/nsIScriptGlobalObject.h
@@ -41,6 +41,8 @@ class nsIDOMWindow;
 
 class nsIScriptGlobalObject : public nsISupports {
 public:
+  static const nsIID& GetIID() { static nsIID iid = NS_ISCRIPTGLOBALOBJECT_IID; return iid; }
+
   NS_IMETHOD_(void)       SetContext(nsIScriptContext *aContext)=0;
   NS_IMETHOD_(void)       GetContext(nsIScriptContext **aContext)=0;
   NS_IMETHOD_(void)       SetNewDocument(nsIDOMDocument *aDocument)=0;
diff --git a/mozilla/htmlparser/src/nsIElementObserver.h b/mozilla/htmlparser/src/nsIElementObserver.h
index fd089ae17f5..076e98c2cb4 100644
--- a/mozilla/htmlparser/src/nsIElementObserver.h
+++ b/mozilla/htmlparser/src/nsIElementObserver.h
@@ -42,6 +42,8 @@ class nsString;
 
 class nsIElementObserver : public nsISupports {
 public:
+  static const nsIID& GetIID() { static nsIID iid = NS_IELEMENTOBSERVER_IID; return iid; }
+
   /*
    *   This method return the tag which the observer care about
    */
diff --git a/mozilla/layout/base/public/nsIDocumentObserver.h b/mozilla/layout/base/public/nsIDocumentObserver.h
index eb612677fd6..c478d56a0b0 100644
--- a/mozilla/layout/base/public/nsIDocumentObserver.h
+++ b/mozilla/layout/base/public/nsIDocumentObserver.h
@@ -34,6 +34,8 @@ class nsIDocument;
 // Document observer interface
 class nsIDocumentObserver : public nsISupports {
 public:
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOCUMENT_OBSERVER_IID; return iid; }
+
   /**
    * Notify that a content model update is beginning. This call can be
    * nested.
diff --git a/mozilla/layout/base/public/nsINameSpace.h b/mozilla/layout/base/public/nsINameSpace.h
index 973aef0b7f6..9f722007e1c 100644
--- a/mozilla/layout/base/public/nsINameSpace.h
+++ b/mozilla/layout/base/public/nsINameSpace.h
@@ -45,6 +45,8 @@ class nsINameSpaceManager;
  */
 class nsINameSpace : public nsISupports {
 public:
+  static const nsIID& GetIID() { static nsIID iid = NS_INAMESPACE_IID; return iid; }
+
   NS_IMETHOD GetNameSpaceManager(nsINameSpaceManager*& aManager) const = 0;
 
   // Get data of this name space
diff --git a/mozilla/layout/html/forms/public/nsIFormSubmitObserver.h b/mozilla/layout/html/forms/public/nsIFormSubmitObserver.h
index 881b337dda3..76494109233 100644
--- a/mozilla/layout/html/forms/public/nsIFormSubmitObserver.h
+++ b/mozilla/layout/html/forms/public/nsIFormSubmitObserver.h
@@ -39,6 +39,8 @@ class nsString;
 
 class nsIFormSubmitObserver : public nsISupports {
 public:
+  static const nsIID& GetIID() { static nsIID iid = NS_IFORMSUBMITOBSERVER_IID; return iid; }
+
   /*
    *   Subject calls the observer when the form is submitted
    *   @param formNode- the dom node corresonding to this form.
diff --git a/mozilla/mailnews/imap/public/nsIIMAPHostSessionList.h b/mozilla/mailnews/imap/public/nsIIMAPHostSessionList.h
index 84d2d1ce223..bb864b9a3ee 100644
--- a/mozilla/mailnews/imap/public/nsIIMAPHostSessionList.h
+++ b/mozilla/mailnews/imap/public/nsIIMAPHostSessionList.h
@@ -34,6 +34,7 @@ class nsIMAPBodyShell;
 class nsIImapHostSessionList : public nsISupports
 {
 public:
+   static const nsIID& GetIID() { static nsIID iid = NS_IIMAPHOSTSESSIONLIST_IID; return iid; }
 
 	// Host List
 	 NS_IMETHOD	AddHostToList(const char *hostname, const char *userName) = 0;
diff --git a/mozilla/mailnews/mime/public/nsIMsgHeaderParser.h b/mozilla/mailnews/mime/public/nsIMsgHeaderParser.h
index 2d60fb35d3c..e3547abb862 100644
--- a/mozilla/mailnews/mime/public/nsIMsgHeaderParser.h
+++ b/mozilla/mailnews/mime/public/nsIMsgHeaderParser.h
@@ -44,7 +44,7 @@
 class nsIMsgHeaderParser: public nsISupports { 
 public: 
 
-  static const nsIID& IID(void) { static nsIID iid = NS_IMSGHEADERPARSER_IID; return iid; }
+  static const nsIID& GetIID(void) { static nsIID iid = NS_IMSGHEADERPARSER_IID; return iid; }
   
 	/* Given a string which contains a list of Header addresses, parses it into
 	   their component names and mailboxes.
diff --git a/mozilla/network/cnvts/nsINetPluginInstance.h b/mozilla/network/cnvts/nsINetPluginInstance.h
index 4658514905c..b29c9a6897f 100644
--- a/mozilla/network/cnvts/nsINetPluginInstance.h
+++ b/mozilla/network/cnvts/nsINetPluginInstance.h
@@ -24,8 +24,17 @@
 #include "nsplugindefs.h"
 
 
+#define NS_INETPLUGININSTANCE_IID                       \
+{ /* ebe00f40-0199-11d2-815b-006008219d7a */         \
+    0xebe00f40,                                      \
+    0x0199,                                          \
+    0x11d2,                                          \
+    {0x81, 0x5b, 0x00, 0x60, 0x08, 0x21, 0x9d, 0x7a} \
+}
+
 class nsINetPluginInstance : public nsISupports {
 public:
+    static const nsIID& GetIID() { static nsIID iid = NS_INETPLUGININSTANCE_IID; return iid; }
 
     NS_IMETHOD
     Initialize(nsINetOStream* out_stream, const char *stream_name) = 0;
@@ -44,14 +53,6 @@ public:
 
 };
 
-#define NS_INETPLUGININSTANCE_IID                       \
-{ /* ebe00f40-0199-11d2-815b-006008219d7a */         \
-    0xebe00f40,                                      \
-    0x0199,                                          \
-    0x11d2,                                          \
-    {0x81, 0x5b, 0x00, 0x60, 0x08, 0x21, 0x9d, 0x7a} \
-}
-
 
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/mozilla/parser/htmlparser/src/nsIElementObserver.h b/mozilla/parser/htmlparser/src/nsIElementObserver.h
index fd089ae17f5..076e98c2cb4 100644
--- a/mozilla/parser/htmlparser/src/nsIElementObserver.h
+++ b/mozilla/parser/htmlparser/src/nsIElementObserver.h
@@ -42,6 +42,8 @@ class nsString;
 
 class nsIElementObserver : public nsISupports {
 public:
+  static const nsIID& GetIID() { static nsIID iid = NS_IELEMENTOBSERVER_IID; return iid; }
+
   /*
    *   This method return the tag which the observer care about
    */
diff --git a/mozilla/xpcom/ds/nsIByteBuffer.h b/mozilla/xpcom/ds/nsIByteBuffer.h
index 5246240d38c..2bd7f063d08 100644
--- a/mozilla/xpcom/ds/nsIByteBuffer.h
+++ b/mozilla/xpcom/ds/nsIByteBuffer.h
@@ -36,6 +36,8 @@ class nsIInputStream;
 /** Interface to a buffer that holds bytes */
 class nsIByteBuffer : public nsISupports {
 public:
+	static const nsIID& GetIID() { static nsIID iid = NS_IBYTEBUFFER_IID; return iid; }
+
   NS_IMETHOD Init(PRUint32 aBufferSize) = 0;
 
   /** @return length of buffer, i.e. how many bytes are currently in it. */
diff --git a/mozilla/xpcom/proxy/public/nsProxyObjectManager.h b/mozilla/xpcom/proxy/public/nsProxyObjectManager.h
index 71586e3e29b..48903ef27a0 100644
--- a/mozilla/xpcom/proxy/public/nsProxyObjectManager.h
+++ b/mozilla/xpcom/proxy/public/nsProxyObjectManager.h
@@ -86,6 +86,7 @@ class nsProxyEventFactory : public nsIFactory
 class nsIProxyObjectManager : public nsISupports
 {
 public:
+    static const nsIID& GetIID() { static nsIID iid = NS_IPROXYEVENT_MANAGER_IID; return iid; }
 
     NS_IMETHOD GetProxyObject(nsIEventQueue *destQueue, 
                               REFNSIID aIID, 
diff --git a/mozilla/xpcom/threads/nsIEventQueueService.h b/mozilla/xpcom/threads/nsIEventQueueService.h
index 3c958616a94..fe662552be7 100644
--- a/mozilla/xpcom/threads/nsIEventQueueService.h
+++ b/mozilla/xpcom/threads/nsIEventQueueService.h
@@ -41,6 +41,8 @@
 class nsIEventQueueService : public nsISupports
 {
 public:
+	static const nsIID& GetIID() { static nsIID iid = NS_IEVENTQUEUESERVICE_IID; return iid; }
+
   NS_IMETHOD CreateThreadEventQueue(void) = 0;
   NS_IMETHOD DestroyThreadEventQueue(void) = 0;