diff --git a/mozilla/content/html/content/public/nsIFormSubmitObserver.h b/mozilla/content/html/content/public/nsIFormSubmitObserver.h
index 76494109233..f7057eb95df 100644
--- a/mozilla/content/html/content/public/nsIFormSubmitObserver.h
+++ b/mozilla/content/html/content/public/nsIFormSubmitObserver.h
@@ -39,7 +39,7 @@ class nsString;
 
 class nsIFormSubmitObserver : public nsISupports {
 public:
-  static const nsIID& GetIID() { static nsIID iid = NS_IFORMSUBMITOBSERVER_IID; return iid; }
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IFORMSUBMITOBSERVER_IID)
 
   /*
    *   Subject calls the observer when the form is submitted
diff --git a/mozilla/layout/forms/nsIComboboxControlFrame.h b/mozilla/layout/forms/nsIComboboxControlFrame.h
index 8c2cfb2b5e6..c2209b9a424 100644
--- a/mozilla/layout/forms/nsIComboboxControlFrame.h
+++ b/mozilla/layout/forms/nsIComboboxControlFrame.h
@@ -42,6 +42,7 @@ class nsVoidArray;
 class nsIComboboxControlFrame : public nsISupports {
 
 public:
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_ICOMBOBOXCONTROLFRAME_IID)
 
   /**
    * Sets the Drop Down List
diff --git a/mozilla/layout/forms/nsIFormControlFrame.h b/mozilla/layout/forms/nsIFormControlFrame.h
index 1f5de7a509e..45ca47bc2a0 100644
--- a/mozilla/layout/forms/nsIFormControlFrame.h
+++ b/mozilla/layout/forms/nsIFormControlFrame.h
@@ -40,6 +40,7 @@ class nsIContent;
 class nsIFormControlFrame : public nsISupports {
 
 public:
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IFORMCONTROLFRAME_IID)
 
   NS_IMETHOD GetType(PRInt32* aType) const =  0;
 
diff --git a/mozilla/layout/forms/nsIRadioControlFrame.h b/mozilla/layout/forms/nsIRadioControlFrame.h
index 2e116cde519..a9699e05cff 100644
--- a/mozilla/layout/forms/nsIRadioControlFrame.h
+++ b/mozilla/layout/forms/nsIRadioControlFrame.h
@@ -36,6 +36,7 @@ class nsIStyleContext;
 class nsIRadioControlFrame : public nsISupports {
 
 public:
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IRADIOCONTROLFRAME_IID)
 
   /**
    * Sets the Pseudo Style Contexts for the Radio button
diff --git a/mozilla/layout/html/forms/public/nsIComboboxControlFrame.h b/mozilla/layout/html/forms/public/nsIComboboxControlFrame.h
index 8c2cfb2b5e6..c2209b9a424 100644
--- a/mozilla/layout/html/forms/public/nsIComboboxControlFrame.h
+++ b/mozilla/layout/html/forms/public/nsIComboboxControlFrame.h
@@ -42,6 +42,7 @@ class nsVoidArray;
 class nsIComboboxControlFrame : public nsISupports {
 
 public:
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_ICOMBOBOXCONTROLFRAME_IID)
 
   /**
    * Sets the Drop Down List
diff --git a/mozilla/layout/html/forms/public/nsIFormControlFrame.h b/mozilla/layout/html/forms/public/nsIFormControlFrame.h
index 1f5de7a509e..45ca47bc2a0 100644
--- a/mozilla/layout/html/forms/public/nsIFormControlFrame.h
+++ b/mozilla/layout/html/forms/public/nsIFormControlFrame.h
@@ -40,6 +40,7 @@ class nsIContent;
 class nsIFormControlFrame : public nsISupports {
 
 public:
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IFORMCONTROLFRAME_IID)
 
   NS_IMETHOD GetType(PRInt32* aType) const =  0;
 
diff --git a/mozilla/layout/html/forms/public/nsIFormManager.h b/mozilla/layout/html/forms/public/nsIFormManager.h
index 70b48ab554a..3a33bde8362 100644
--- a/mozilla/layout/html/forms/public/nsIFormManager.h
+++ b/mozilla/layout/html/forms/public/nsIFormManager.h
@@ -33,6 +33,7 @@ class nsIFrame;
  **/
 class nsIFormManager : public nsISupports {
 public:
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IFORMMANAGER_IID)
   /**
     * Reset the values of all of this manager's controls back to their
     * initial values. This is in response to a reset button being pushed.
diff --git a/mozilla/layout/html/forms/public/nsIFormSubmitObserver.h b/mozilla/layout/html/forms/public/nsIFormSubmitObserver.h
index 76494109233..f7057eb95df 100644
--- a/mozilla/layout/html/forms/public/nsIFormSubmitObserver.h
+++ b/mozilla/layout/html/forms/public/nsIFormSubmitObserver.h
@@ -39,7 +39,7 @@ class nsString;
 
 class nsIFormSubmitObserver : public nsISupports {
 public:
-  static const nsIID& GetIID() { static nsIID iid = NS_IFORMSUBMITOBSERVER_IID; return iid; }
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IFORMSUBMITOBSERVER_IID)
 
   /*
    *   Subject calls the observer when the form is submitted
diff --git a/mozilla/layout/html/forms/public/nsIRadioControlFrame.h b/mozilla/layout/html/forms/public/nsIRadioControlFrame.h
index 2e116cde519..a9699e05cff 100644
--- a/mozilla/layout/html/forms/public/nsIRadioControlFrame.h
+++ b/mozilla/layout/html/forms/public/nsIRadioControlFrame.h
@@ -36,6 +36,7 @@ class nsIStyleContext;
 class nsIRadioControlFrame : public nsISupports {
 
 public:
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IRADIOCONTROLFRAME_IID)
 
   /**
    * Sets the Pseudo Style Contexts for the Radio button