diff --git a/mozilla/layout/forms/nsComboboxControlFrame.h b/mozilla/layout/forms/nsComboboxControlFrame.h
index 911af4921da..29a86ffa6bf 100644
--- a/mozilla/layout/forms/nsComboboxControlFrame.h
+++ b/mozilla/layout/forms/nsComboboxControlFrame.h
@@ -51,7 +51,6 @@
 //#define DO_NEW_REFLOW
 #endif
 
-#include "nsIDOMMouseListener.h"
 #include "nsAreaFrame.h"
 #include "nsIFormControlFrame.h"
 #include "nsIComboboxControlFrame.h"
@@ -65,6 +64,7 @@
 #include "nsIScrollableViewProvider.h"
 #include "nsIStatefulFrame.h"
 
+class nsIDOMMouseListener;
 class nsIView;
 class nsStyleContext;
 class nsIHTMLContent;
diff --git a/mozilla/layout/html/forms/src/nsComboboxControlFrame.h b/mozilla/layout/html/forms/src/nsComboboxControlFrame.h
index 911af4921da..29a86ffa6bf 100644
--- a/mozilla/layout/html/forms/src/nsComboboxControlFrame.h
+++ b/mozilla/layout/html/forms/src/nsComboboxControlFrame.h
@@ -51,7 +51,6 @@
 //#define DO_NEW_REFLOW
 #endif
 
-#include "nsIDOMMouseListener.h"
 #include "nsAreaFrame.h"
 #include "nsIFormControlFrame.h"
 #include "nsIComboboxControlFrame.h"
@@ -65,6 +64,7 @@
 #include "nsIScrollableViewProvider.h"
 #include "nsIStatefulFrame.h"
 
+class nsIDOMMouseListener;
 class nsIView;
 class nsStyleContext;
 class nsIHTMLContent;
diff --git a/mozilla/xpcom/glue/nsCOMPtr.h b/mozilla/xpcom/glue/nsCOMPtr.h
index 188abb91839..7336094b239 100644
--- a/mozilla/xpcom/glue/nsCOMPtr.h
+++ b/mozilla/xpcom/glue/nsCOMPtr.h
@@ -444,17 +444,6 @@ class nsCOMPtr
     : private nsCOMPtr_base
 #endif
   {
-    enum { _force_even_compliant_compilers_to_fail_ = sizeof(T) };
-      /*
-        The declaration above exists specifically to make |nsCOMPtr<T>| _not_ compile with only
-        a forward declaration of |T|.  This should prevent Windows and Mac engineers from
-        breaking Solaris and other compilers that naturally have this behavior.  Thank
-        <law@netscape.com> for inventing this specific trick.
-
-        Of course, if you're using |nsCOMPtr| outside the scope of wanting to compile on
-        Solaris and old GCC, you probably want to remove the enum so you can exploit forward
-        declarations.
-      */
 
 #ifdef NSCAP_FEATURE_DEBUG_PTR_TYPES
     private: