diff --git a/content/base/public/nsINode.h b/content/base/public/nsINode.h
index e153a692a299..33a892f071f5 100644
--- a/content/base/public/nsINode.h
+++ b/content/base/public/nsINode.h
@@ -402,8 +402,8 @@ public:
    *                          one already exists. [IN]
    * @param aResult           The event listener manager [OUT]
    */
-  virtual nsresult GetListenerManager(PRBool aCreateIfNotFound,
-                                      nsIEventListenerManager** aResult);
+  NS_IMETHOD GetListenerManager(PRBool aCreateIfNotFound,
+                                nsIEventListenerManager** aResult);
 
   /**
    * Get the parent nsIContent for this node.
diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp
index ff8d0a92eba3..690226e5e33c 100644
--- a/content/base/src/nsDocument.cpp
+++ b/content/base/src/nsDocument.cpp
@@ -4101,7 +4101,7 @@ nsDocument::GetOwnerDocument(nsIDOMDocument** aOwnerDocument)
   return NS_OK;
 }
 
-nsresult
+NS_IMETHODIMP
 nsDocument::GetListenerManager(PRBool aCreateIfNotFound,
                                nsIEventListenerManager** aInstancePtrResult)
 {
diff --git a/content/base/src/nsDocument.h b/content/base/src/nsDocument.h
index 00e224e298c5..8ae051c7dea4 100644
--- a/content/base/src/nsDocument.h
+++ b/content/base/src/nsDocument.h
@@ -618,8 +618,8 @@ public:
                                    const nsIID& aIID);
   NS_IMETHOD RemoveEventListenerByIID(nsIDOMEventListener *aListener,
                                       const nsIID& aIID);
-  virtual nsresult GetListenerManager(PRBool aCreateIfNotFound,
-                                      nsIEventListenerManager** aResult);
+  NS_IMETHOD GetListenerManager(PRBool aCreateIfNotFound,
+                                nsIEventListenerManager** aResult);
   NS_IMETHOD HandleEvent(nsIDOMEvent *aEvent);
   NS_IMETHOD GetSystemEventGroup(nsIDOMEventGroup** aGroup);
 
diff --git a/content/base/src/nsGenericElement.cpp b/content/base/src/nsGenericElement.cpp
index 5329602533bf..a3120ade71d1 100644
--- a/content/base/src/nsGenericElement.cpp
+++ b/content/base/src/nsGenericElement.cpp
@@ -275,7 +275,7 @@ nsINode::GetRangeList() const
   return rangeList;
 }
 
-nsresult
+NS_IMETHODIMP
 nsINode::GetListenerManager(PRBool aCreateIfNotFound,
                             nsIEventListenerManager** aResult)
 {
diff --git a/content/xul/content/src/nsXULElement.cpp b/content/xul/content/src/nsXULElement.cpp
index abe401e70e0e..2a69336db203 100644
--- a/content/xul/content/src/nsXULElement.cpp
+++ b/content/xul/content/src/nsXULElement.cpp
@@ -543,7 +543,7 @@ nsXULElement::GetEventListenerManagerForAttr(nsIEventListenerManager** aManager,
                                                             aDefer);
 }
 
-nsresult
+NS_IMETHODIMP
 nsXULElement::GetListenerManager(PRBool aCreateIfNotFound,
                                  nsIEventListenerManager** aResult)
 {
diff --git a/content/xul/content/src/nsXULElement.h b/content/xul/content/src/nsXULElement.h
index acc3f41714c0..f96df2785fd5 100644
--- a/content/xul/content/src/nsXULElement.h
+++ b/content/xul/content/src/nsXULElement.h
@@ -511,8 +511,8 @@ public:
 
     virtual nsIContent *GetBindingParent() const;
     virtual PRBool IsNodeOfType(PRUint32 aFlags) const;
-    virtual nsresult GetListenerManager(PRBool aCreateIfNotFound,
-                                        nsIEventListenerManager** aResult);
+    NS_IMETHOD GetListenerManager(PRBool aCreateIfNotFound,
+                                  nsIEventListenerManager** aResult);
     virtual PRBool IsFocusable(PRInt32 *aTabIndex = nsnull);
     virtual nsIAtom* GetID() const;
     virtual const nsAttrValue* GetClasses() const;