diff --git a/mozilla/content/events/src/nsEventStateManager.cpp b/mozilla/content/events/src/nsEventStateManager.cpp
index af591cbf453..9d515635c58 100644
--- a/mozilla/content/events/src/nsEventStateManager.cpp
+++ b/mozilla/content/events/src/nsEventStateManager.cpp
@@ -229,7 +229,7 @@ nsEventStateManager::Observe(nsISupports *aSubject, const PRUnichar *aTopic,
 }
 
 
-NS_IMPL_ISUPPORTS1(nsEventStateManager, nsIEventStateManager)
+NS_IMPL_ISUPPORTS3(nsEventStateManager, nsIEventStateManager, nsIObserver, nsISupportsWeakReference)
 
 NS_IMETHODIMP
 nsEventStateManager::PreHandleEvent(nsIPresContext* aPresContext, 
diff --git a/mozilla/content/events/src/nsEventStateManager.h b/mozilla/content/events/src/nsEventStateManager.h
index da3b26091c0..da5907b26aa 100644
--- a/mozilla/content/events/src/nsEventStateManager.h
+++ b/mozilla/content/events/src/nsEventStateManager.h
@@ -28,6 +28,7 @@
 #include "nsIContent.h"
 #include "nsIPref.h"
 #include "nsIObserver.h"
+#include "nsWeakReference.h"
 
 class nsIDocument;
 class nsIScrollableView;
@@ -37,7 +38,8 @@ class nsISelfScrollingFrame;
  * Event listener manager
  */
 
-class nsEventStateManager : public nsIEventStateManager,
+class nsEventStateManager : public nsSupportsWeakReference,
+                            public nsIEventStateManager,
                             public nsIObserver
 {
 
diff --git a/mozilla/layout/events/src/nsEventStateManager.cpp b/mozilla/layout/events/src/nsEventStateManager.cpp
index af591cbf453..9d515635c58 100644
--- a/mozilla/layout/events/src/nsEventStateManager.cpp
+++ b/mozilla/layout/events/src/nsEventStateManager.cpp
@@ -229,7 +229,7 @@ nsEventStateManager::Observe(nsISupports *aSubject, const PRUnichar *aTopic,
 }
 
 
-NS_IMPL_ISUPPORTS1(nsEventStateManager, nsIEventStateManager)
+NS_IMPL_ISUPPORTS3(nsEventStateManager, nsIEventStateManager, nsIObserver, nsISupportsWeakReference)
 
 NS_IMETHODIMP
 nsEventStateManager::PreHandleEvent(nsIPresContext* aPresContext, 
diff --git a/mozilla/layout/events/src/nsEventStateManager.h b/mozilla/layout/events/src/nsEventStateManager.h
index da3b26091c0..da5907b26aa 100644
--- a/mozilla/layout/events/src/nsEventStateManager.h
+++ b/mozilla/layout/events/src/nsEventStateManager.h
@@ -28,6 +28,7 @@
 #include "nsIContent.h"
 #include "nsIPref.h"
 #include "nsIObserver.h"
+#include "nsWeakReference.h"
 
 class nsIDocument;
 class nsIScrollableView;
@@ -37,7 +38,8 @@ class nsISelfScrollingFrame;
  * Event listener manager
  */
 
-class nsEventStateManager : public nsIEventStateManager,
+class nsEventStateManager : public nsSupportsWeakReference,
+                            public nsIEventStateManager,
                             public nsIObserver
 {