diff --git a/mozilla/xpfe/appshell/src/nsWindowMediator.cpp b/mozilla/xpfe/appshell/src/nsWindowMediator.cpp
index 1d38f0b9944..81fb45bc03d 100644
--- a/mozilla/xpfe/appshell/src/nsWindowMediator.cpp
+++ b/mozilla/xpfe/appshell/src/nsWindowMediator.cpp
@@ -117,27 +117,7 @@ struct nsWindowInfo
 	
 };
 
-class nsWindowEnumerator : public nsISimpleEnumerator
-{
-
-public:
-	nsWindowEnumerator ( nsString* inTypeString,  nsWindowMediator& inMediator  );
-	virtual ~nsWindowEnumerator();
-	NS_IMETHOD HasMoreElements(PRBool *retval);
-  NS_IMETHOD GetNext(nsISupports **retval);
-
-  NS_DECL_ISUPPORTS
-private:
-	friend nsWindowMediator;
-	
-	PRInt32 FindNext();
-	void WindowRemoved( PRInt32 inIndex);
-	
-	nsCOMPtr<nsWindowMediator> mWindowMediator;
-	nsString mType;
-	PRInt32 mCurrentPosition;
-};
-
+class nsWindowEnumerator;
 
 class nsWindowMediator : public nsIWindowMediator
 {
@@ -273,6 +253,30 @@ private:
   static nsIRDFDataSource* mInner;
 };
 
+
+class nsWindowEnumerator : public nsISimpleEnumerator
+{
+
+public:
+	nsWindowEnumerator ( nsString* inTypeString,  nsWindowMediator& inMediator  );
+	virtual ~nsWindowEnumerator();
+	NS_IMETHOD HasMoreElements(PRBool *retval);
+  NS_IMETHOD GetNext(nsISupports **retval);
+
+  NS_DECL_ISUPPORTS
+private:
+	friend nsWindowMediator;
+	
+	PRInt32 FindNext();
+	void WindowRemoved( PRInt32 inIndex);
+	
+	nsCOMPtr<nsWindowMediator> mWindowMediator;
+	nsString mType;
+	PRInt32 mCurrentPosition;
+};
+
+
+
 nsIRDFResource	*nsWindowMediator::kNC_WindowMediatorRoot = NULL;
 nsIRDFResource	*nsWindowMediator::kNC_Name = NULL;
 nsIRDFResource	*nsWindowMediator::kNC_URL = NULL;