diff --git a/mozilla/content/xul/templates/src/nsRuleNetwork.h b/mozilla/content/xul/templates/src/nsRuleNetwork.h
index e6b06cef168..5e557eae69e 100644
--- a/mozilla/content/xul/templates/src/nsRuleNetwork.h
+++ b/mozilla/content/xul/templates/src/nsRuleNetwork.h
@@ -132,6 +132,10 @@ public:
 //----------------------------------------------------------------------
 
 class MemoryElementSet {
+public:
+    class ConstIterator;
+    friend class ConstIterator;
+
 protected:
     class List {
     public:
@@ -223,8 +227,6 @@ public:
         List* mCurrent;
     };
 
-    friend class ConstIterator;
-
     ConstIterator First() const { return ConstIterator(mElements); }
     ConstIterator Last() const { return ConstIterator(nsnull); }
 
@@ -274,6 +276,10 @@ public:
 //----------------------------------------------------------------------
 
 class BindingSet {
+public:
+    class ConstIterator;
+    friend class ConstIterator;
+
 protected:
     class List {
     public:
@@ -364,8 +370,6 @@ public:
         List* mCurrent;
     };
 
-    friend class ConstIterator;
-
     ConstIterator First() const { return ConstIterator(mBindings); }
     ConstIterator Last() const { return ConstIterator(nsnull); }
 
@@ -445,6 +449,12 @@ public:
         MOZ_COUNT_DTOR(InstantiationSet);
         Clear(); }
 
+    class ConstIterator;
+    friend class ConstIterator;
+
+    class Iterator;
+    friend class Iterator;
+
 protected:
     class List {
     public:
@@ -507,8 +517,6 @@ public:
             return mCurrent != aConstIterator.mCurrent; }
     };
 
-    friend class ConstIterator;
-
     ConstIterator First() const { return ConstIterator(mHead.mNext); }
     ConstIterator Last() const { return ConstIterator(NS_CONST_CAST(List*, &mHead)); }
 
@@ -549,8 +557,6 @@ public:
         friend class InstantiationSet;
     };
 
-    friend class Iterator;
-
     Iterator First() { return Iterator(mHead.mNext); }
     Iterator Last() { return Iterator(&mHead); }
 
diff --git a/mozilla/content/xul/templates/src/nsXULTemplateBuilder.cpp b/mozilla/content/xul/templates/src/nsXULTemplateBuilder.cpp
index 86ec6b74c56..5e3d2ce9206 100644
--- a/mozilla/content/xul/templates/src/nsXULTemplateBuilder.cpp
+++ b/mozilla/content/xul/templates/src/nsXULTemplateBuilder.cpp
@@ -346,6 +346,12 @@ Rule::GetContent(nsIContent** aResult) const
 class MatchSet
 {
 public:
+    class ConstIterator;
+    friend class ConstIterator;
+
+    class Iterator;
+    friend class Iterator;
+
     /**
      * A single <rule, instantiation> tuple.
      */
@@ -458,8 +464,6 @@ public:
             return mCurrent != aConstIterator.mCurrent; }
     };
 
-    friend class ConstIterator;
-
     ConstIterator First() const { return ConstIterator(mHead.mNext); }
     ConstIterator Last() const { return ConstIterator(NS_CONST_CAST(MatchList*, &mHead)); }
 
@@ -500,8 +504,6 @@ public:
         friend class MatchSet;
     };
 
-    friend class Iterator;
-
     Iterator First() { return Iterator(mHead.mNext); }
     Iterator Last() { return Iterator(&mHead); }
 
@@ -739,6 +741,10 @@ Key::CompareKeys(const void* aLeft, const void* aRight)
 //----------------------------------------------------------------------
 
 class KeySet {
+public:
+    class ConstIterator;
+    friend class ConstIterator;
+
 protected:
     class Entry {
     public:
@@ -798,8 +804,6 @@ public:
             return mCurrent != aConstIterator.mCurrent; }
     };
 
-    friend class ConstIterator;
-
     ConstIterator First() const { return ConstIterator(mHead.mNext); }
     ConstIterator Last() const { return ConstIterator(NS_CONST_CAST(Entry*, &mHead)); }
 
diff --git a/mozilla/rdf/content/src/nsRuleNetwork.h b/mozilla/rdf/content/src/nsRuleNetwork.h
index e6b06cef168..5e557eae69e 100644
--- a/mozilla/rdf/content/src/nsRuleNetwork.h
+++ b/mozilla/rdf/content/src/nsRuleNetwork.h
@@ -132,6 +132,10 @@ public:
 //----------------------------------------------------------------------
 
 class MemoryElementSet {
+public:
+    class ConstIterator;
+    friend class ConstIterator;
+
 protected:
     class List {
     public:
@@ -223,8 +227,6 @@ public:
         List* mCurrent;
     };
 
-    friend class ConstIterator;
-
     ConstIterator First() const { return ConstIterator(mElements); }
     ConstIterator Last() const { return ConstIterator(nsnull); }
 
@@ -274,6 +276,10 @@ public:
 //----------------------------------------------------------------------
 
 class BindingSet {
+public:
+    class ConstIterator;
+    friend class ConstIterator;
+
 protected:
     class List {
     public:
@@ -364,8 +370,6 @@ public:
         List* mCurrent;
     };
 
-    friend class ConstIterator;
-
     ConstIterator First() const { return ConstIterator(mBindings); }
     ConstIterator Last() const { return ConstIterator(nsnull); }
 
@@ -445,6 +449,12 @@ public:
         MOZ_COUNT_DTOR(InstantiationSet);
         Clear(); }
 
+    class ConstIterator;
+    friend class ConstIterator;
+
+    class Iterator;
+    friend class Iterator;
+
 protected:
     class List {
     public:
@@ -507,8 +517,6 @@ public:
             return mCurrent != aConstIterator.mCurrent; }
     };
 
-    friend class ConstIterator;
-
     ConstIterator First() const { return ConstIterator(mHead.mNext); }
     ConstIterator Last() const { return ConstIterator(NS_CONST_CAST(List*, &mHead)); }
 
@@ -549,8 +557,6 @@ public:
         friend class InstantiationSet;
     };
 
-    friend class Iterator;
-
     Iterator First() { return Iterator(mHead.mNext); }
     Iterator Last() { return Iterator(&mHead); }
 
diff --git a/mozilla/rdf/content/src/nsXULTemplateBuilder.cpp b/mozilla/rdf/content/src/nsXULTemplateBuilder.cpp
index 86ec6b74c56..5e3d2ce9206 100644
--- a/mozilla/rdf/content/src/nsXULTemplateBuilder.cpp
+++ b/mozilla/rdf/content/src/nsXULTemplateBuilder.cpp
@@ -346,6 +346,12 @@ Rule::GetContent(nsIContent** aResult) const
 class MatchSet
 {
 public:
+    class ConstIterator;
+    friend class ConstIterator;
+
+    class Iterator;
+    friend class Iterator;
+
     /**
      * A single <rule, instantiation> tuple.
      */
@@ -458,8 +464,6 @@ public:
             return mCurrent != aConstIterator.mCurrent; }
     };
 
-    friend class ConstIterator;
-
     ConstIterator First() const { return ConstIterator(mHead.mNext); }
     ConstIterator Last() const { return ConstIterator(NS_CONST_CAST(MatchList*, &mHead)); }
 
@@ -500,8 +504,6 @@ public:
         friend class MatchSet;
     };
 
-    friend class Iterator;
-
     Iterator First() { return Iterator(mHead.mNext); }
     Iterator Last() { return Iterator(&mHead); }
 
@@ -739,6 +741,10 @@ Key::CompareKeys(const void* aLeft, const void* aRight)
 //----------------------------------------------------------------------
 
 class KeySet {
+public:
+    class ConstIterator;
+    friend class ConstIterator;
+
 protected:
     class Entry {
     public:
@@ -798,8 +804,6 @@ public:
             return mCurrent != aConstIterator.mCurrent; }
     };
 
-    friend class ConstIterator;
-
     ConstIterator First() const { return ConstIterator(mHead.mNext); }
     ConstIterator Last() const { return ConstIterator(NS_CONST_CAST(Entry*, &mHead)); }