diff --git a/mozilla/extensions/xforms/nsXFormsModelElement.h b/mozilla/extensions/xforms/nsXFormsModelElement.h
index 740e9cfa5b9..54ee504288b 100644
--- a/mozilla/extensions/xforms/nsXFormsModelElement.h
+++ b/mozilla/extensions/xforms/nsXFormsModelElement.h
@@ -196,12 +196,13 @@ public:
 
   public:
     iterator();
-    iterator(const nsXFormsControlListItem::iterator&);
+    iterator(const iterator&);
     iterator operator=(nsXFormsControlListItem*);
     bool operator!=(const nsXFormsControlListItem*);
     iterator operator++();
     nsXFormsControlListItem* operator*();
   };
+  friend class nsXFormsControlListItem::iterator;
 
   /** The begining position for the node (itself) */
   nsXFormsControlListItem* begin();