diff --git a/mozilla/content/base/public/nsIContent.h b/mozilla/content/base/public/nsIContent.h
index 958739942f8..fc2e0e17847 100644
--- a/mozilla/content/base/public/nsIContent.h
+++ b/mozilla/content/base/public/nsIContent.h
@@ -48,6 +48,8 @@ class nsIDOMRange;
 // is supported by all content objects.
 class nsIContent : public nsISupports {
 public:
+  static const nsIID& IID() { static nsIID iid = NS_ICONTENT_IID; return iid; }
+
   NS_IMETHOD GetDocument(nsIDocument*& aResult) const = 0;
 
   NS_IMETHOD SetDocument(nsIDocument* aDocument, PRBool aDeep) = 0;
diff --git a/mozilla/content/base/public/nsIStyleRule.h b/mozilla/content/base/public/nsIStyleRule.h
index 314f899a3ed..7dde16e4140 100644
--- a/mozilla/content/base/public/nsIStyleRule.h
+++ b/mozilla/content/base/public/nsIStyleRule.h
@@ -34,6 +34,8 @@ class nsIContent;
 
 class nsIStyleRule : public nsISupports {
 public:
+  static const nsIID& IID() { static nsIID iid = NS_ISTYLE_RULE_IID; return iid; }
+
   NS_IMETHOD Equals(const nsIStyleRule* aRule, PRBool& aResult) const = 0;
   NS_IMETHOD HashValue(PRUint32& aValue) const = 0;
 
diff --git a/mozilla/content/html/content/public/nsIHTMLContent.h b/mozilla/content/html/content/public/nsIHTMLContent.h
index 0f3e65796de..fe1af63d52a 100644
--- a/mozilla/content/html/content/public/nsIHTMLContent.h
+++ b/mozilla/content/html/content/public/nsIHTMLContent.h
@@ -40,6 +40,8 @@ typedef void (*nsMapAttributesFunc)(nsIHTMLAttributes* aAttributes,
 // Abstract interface for all html content
 class nsIHTMLContent : public nsIContent {
 public:
+  static const nsIID& IID() { static nsIID iid = NS_IHTMLCONTENT_IID; return iid; }
+
   /**
    * If this html content is a container, then compact asks it to minimize
    * it's storage usage.
diff --git a/mozilla/content/html/style/public/nsICSSStyleSheet.h b/mozilla/content/html/style/public/nsICSSStyleSheet.h
index d1314734caf..fef9f059b4e 100644
--- a/mozilla/content/html/style/public/nsICSSStyleSheet.h
+++ b/mozilla/content/html/style/public/nsICSSStyleSheet.h
@@ -30,6 +30,8 @@ class nsIDOMNode;
 
 class nsICSSStyleSheet : public nsIStyleSheet {
 public:
+  static const nsIID& IID() { static nsIID iid = NS_ICSS_STYLE_SHEET_IID; return iid; }
+
   virtual PRBool ContainsStyleSheet(nsIURL* aURL) const = 0;
 
   virtual void AppendStyleSheet(nsICSSStyleSheet* aSheet) = 0;
diff --git a/mozilla/content/html/style/src/nsICSSStyleRule.h b/mozilla/content/html/style/src/nsICSSStyleRule.h
index c6b70248444..31b279b01ab 100644
--- a/mozilla/content/html/style/src/nsICSSStyleRule.h
+++ b/mozilla/content/html/style/src/nsICSSStyleRule.h
@@ -99,6 +99,8 @@ public:
 
 class nsICSSStyleRule : public nsIStyleRule {
 public:
+  static const nsIID& IID() { static nsIID iid = NS_ICSS_STYLE_RULE_IID; return iid; }
+
   virtual nsCSSSelector* FirstSelector(void) = 0;
   virtual void AddSelector(const nsCSSSelector& aSelector) = 0;
   virtual void DeleteSelector(nsCSSSelector* aSelector) = 0;
diff --git a/mozilla/layout/base/public/nsIContent.h b/mozilla/layout/base/public/nsIContent.h
index 958739942f8..fc2e0e17847 100644
--- a/mozilla/layout/base/public/nsIContent.h
+++ b/mozilla/layout/base/public/nsIContent.h
@@ -48,6 +48,8 @@ class nsIDOMRange;
 // is supported by all content objects.
 class nsIContent : public nsISupports {
 public:
+  static const nsIID& IID() { static nsIID iid = NS_ICONTENT_IID; return iid; }
+
   NS_IMETHOD GetDocument(nsIDocument*& aResult) const = 0;
 
   NS_IMETHOD SetDocument(nsIDocument* aDocument, PRBool aDeep) = 0;
diff --git a/mozilla/layout/base/public/nsIStyleContext.h b/mozilla/layout/base/public/nsIStyleContext.h
index 1fdab678b4d..e33545bca14 100644
--- a/mozilla/layout/base/public/nsIStyleContext.h
+++ b/mozilla/layout/base/public/nsIStyleContext.h
@@ -237,6 +237,8 @@ inline nsBorderEdges::nsBorderEdges()
 
 class nsIStyleContext : public nsISupports {
 public:
+  static const nsIID& IID() { static nsIID iid = NS_ISTYLECONTEXT_IID; return iid; }
+
   virtual PRBool    Equals(const nsIStyleContext* aOther) const = 0;
   virtual PRUint32  HashValue(void) const = 0;
 
diff --git a/mozilla/layout/base/public/nsIStyleRule.h b/mozilla/layout/base/public/nsIStyleRule.h
index 314f899a3ed..7dde16e4140 100644
--- a/mozilla/layout/base/public/nsIStyleRule.h
+++ b/mozilla/layout/base/public/nsIStyleRule.h
@@ -34,6 +34,8 @@ class nsIContent;
 
 class nsIStyleRule : public nsISupports {
 public:
+  static const nsIID& IID() { static nsIID iid = NS_ISTYLE_RULE_IID; return iid; }
+
   NS_IMETHOD Equals(const nsIStyleRule* aRule, PRBool& aResult) const = 0;
   NS_IMETHOD HashValue(PRUint32& aValue) const = 0;
 
diff --git a/mozilla/layout/html/base/src/nsIHTMLContent.h b/mozilla/layout/html/base/src/nsIHTMLContent.h
index 0f3e65796de..fe1af63d52a 100644
--- a/mozilla/layout/html/base/src/nsIHTMLContent.h
+++ b/mozilla/layout/html/base/src/nsIHTMLContent.h
@@ -40,6 +40,8 @@ typedef void (*nsMapAttributesFunc)(nsIHTMLAttributes* aAttributes,
 // Abstract interface for all html content
 class nsIHTMLContent : public nsIContent {
 public:
+  static const nsIID& IID() { static nsIID iid = NS_IHTMLCONTENT_IID; return iid; }
+
   /**
    * If this html content is a container, then compact asks it to minimize
    * it's storage usage.
diff --git a/mozilla/layout/html/style/public/nsICSSStyleSheet.h b/mozilla/layout/html/style/public/nsICSSStyleSheet.h
index d1314734caf..fef9f059b4e 100644
--- a/mozilla/layout/html/style/public/nsICSSStyleSheet.h
+++ b/mozilla/layout/html/style/public/nsICSSStyleSheet.h
@@ -30,6 +30,8 @@ class nsIDOMNode;
 
 class nsICSSStyleSheet : public nsIStyleSheet {
 public:
+  static const nsIID& IID() { static nsIID iid = NS_ICSS_STYLE_SHEET_IID; return iid; }
+
   virtual PRBool ContainsStyleSheet(nsIURL* aURL) const = 0;
 
   virtual void AppendStyleSheet(nsICSSStyleSheet* aSheet) = 0;
diff --git a/mozilla/layout/html/style/src/nsICSSStyleRule.h b/mozilla/layout/html/style/src/nsICSSStyleRule.h
index c6b70248444..31b279b01ab 100644
--- a/mozilla/layout/html/style/src/nsICSSStyleRule.h
+++ b/mozilla/layout/html/style/src/nsICSSStyleRule.h
@@ -99,6 +99,8 @@ public:
 
 class nsICSSStyleRule : public nsIStyleRule {
 public:
+  static const nsIID& IID() { static nsIID iid = NS_ICSS_STYLE_RULE_IID; return iid; }
+
   virtual nsCSSSelector* FirstSelector(void) = 0;
   virtual void AddSelector(const nsCSSSelector& aSelector) = 0;
   virtual void DeleteSelector(nsCSSSelector* aSelector) = 0;
diff --git a/mozilla/layout/style/nsICSSStyleRule.h b/mozilla/layout/style/nsICSSStyleRule.h
index c6b70248444..31b279b01ab 100644
--- a/mozilla/layout/style/nsICSSStyleRule.h
+++ b/mozilla/layout/style/nsICSSStyleRule.h
@@ -99,6 +99,8 @@ public:
 
 class nsICSSStyleRule : public nsIStyleRule {
 public:
+  static const nsIID& IID() { static nsIID iid = NS_ICSS_STYLE_RULE_IID; return iid; }
+
   virtual nsCSSSelector* FirstSelector(void) = 0;
   virtual void AddSelector(const nsCSSSelector& aSelector) = 0;
   virtual void DeleteSelector(nsCSSSelector* aSelector) = 0;
diff --git a/mozilla/layout/style/nsICSSStyleSheet.h b/mozilla/layout/style/nsICSSStyleSheet.h
index d1314734caf..fef9f059b4e 100644
--- a/mozilla/layout/style/nsICSSStyleSheet.h
+++ b/mozilla/layout/style/nsICSSStyleSheet.h
@@ -30,6 +30,8 @@ class nsIDOMNode;
 
 class nsICSSStyleSheet : public nsIStyleSheet {
 public:
+  static const nsIID& IID() { static nsIID iid = NS_ICSS_STYLE_SHEET_IID; return iid; }
+
   virtual PRBool ContainsStyleSheet(nsIURL* aURL) const = 0;
 
   virtual void AppendStyleSheet(nsICSSStyleSheet* aSheet) = 0;
diff --git a/mozilla/layout/style/nsIStyleRule.h b/mozilla/layout/style/nsIStyleRule.h
index 314f899a3ed..7dde16e4140 100644
--- a/mozilla/layout/style/nsIStyleRule.h
+++ b/mozilla/layout/style/nsIStyleRule.h
@@ -34,6 +34,8 @@ class nsIContent;
 
 class nsIStyleRule : public nsISupports {
 public:
+  static const nsIID& IID() { static nsIID iid = NS_ISTYLE_RULE_IID; return iid; }
+
   NS_IMETHOD Equals(const nsIStyleRule* aRule, PRBool& aResult) const = 0;
   NS_IMETHOD HashValue(PRUint32& aValue) const = 0;
 
diff --git a/mozilla/network/public/nsIURL.h b/mozilla/network/public/nsIURL.h
index d047141ab36..5ed5346fb9d 100644
--- a/mozilla/network/public/nsIURL.h
+++ b/mozilla/network/public/nsIURL.h
@@ -34,6 +34,7 @@ class nsIURLGroup;
 
 class nsIURL : public nsISupports {
 public:
+  static const nsIID& IID() { static nsIID iid = NS_IURL_IID; return iid; }
 
   /** Equality operator */
   NS_IMETHOD_(PRBool) Equals(const nsIURL *aURL) const = 0;
diff --git a/mozilla/xpcom/ds/nsISupportsArray.h b/mozilla/xpcom/ds/nsISupportsArray.h
index 9846c632f63..717055683ee 100644
--- a/mozilla/xpcom/ds/nsISupportsArray.h
+++ b/mozilla/xpcom/ds/nsISupportsArray.h
@@ -32,6 +32,8 @@ typedef PRBool (*nsISupportsArrayEnumFunc)(nsISupports* aElement, void *aData);
 
 class nsISupportsArray : public nsISupports {
 public:
+  static const nsIID& IID() { static nsIID iid = NS_ISUPPORTSARRAY_IID; return iid; }
+
   NS_IMETHOD_(nsISupportsArray&) operator=(const nsISupportsArray& other) = 0;
   NS_IMETHOD_(PRBool) operator==(const nsISupportsArray& other) const = 0;
   NS_IMETHOD_(PRBool) Equals(const nsISupportsArray* other) const = 0;
diff --git a/mozilla/xpcom/public/nsISupportsArray.h b/mozilla/xpcom/public/nsISupportsArray.h
index 9846c632f63..717055683ee 100644
--- a/mozilla/xpcom/public/nsISupportsArray.h
+++ b/mozilla/xpcom/public/nsISupportsArray.h
@@ -32,6 +32,8 @@ typedef PRBool (*nsISupportsArrayEnumFunc)(nsISupports* aElement, void *aData);
 
 class nsISupportsArray : public nsISupports {
 public:
+  static const nsIID& IID() { static nsIID iid = NS_ISUPPORTSARRAY_IID; return iid; }
+
   NS_IMETHOD_(nsISupportsArray&) operator=(const nsISupportsArray& other) = 0;
   NS_IMETHOD_(PRBool) operator==(const nsISupportsArray& other) const = 0;
   NS_IMETHOD_(PRBool) Equals(const nsISupportsArray* other) const = 0;