diff --git a/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp b/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp
index 3ca1deecf1d..c363045cb87 100644
--- a/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp
+++ b/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp
@@ -34,7 +34,6 @@
 #include "nsAppShellCIDs.h"
 
 #include "nsXULCommand.h"
-#include "nsIXULCommand.h"
 #include "nsIDOMCharacterData.h"
 
 #include "nsIMenuBar.h"
@@ -44,8 +43,6 @@
 // XXX: Only needed for the creation of the widget controller...
 #include "nsIDocumentViewer.h"
 #include "nsIDocument.h"
-#include "nsIDOMDocument.h"
-#include "nsIDOMNode.h"
 #include "nsIDOMElement.h"
 #include "nsIDocumentLoader.h"
 #include "nsIDOMHTMLInputElement.h"
diff --git a/mozilla/xpfe/appshell/src/nsWebShellWindow.h b/mozilla/xpfe/appshell/src/nsWebShellWindow.h
index 03bdd86e783..7be6bf7b0f3 100644
--- a/mozilla/xpfe/appshell/src/nsWebShellWindow.h
+++ b/mozilla/xpfe/appshell/src/nsWebShellWindow.h
@@ -25,6 +25,12 @@
 #include "nsIWebShell.h"  
 #include "nsIDocumentLoaderObserver.h"
 #include "nsVoidArray.h"
+
+// can't use forward class decl's because of template bugs on Solaris 
+#include "nsIDOMDocument.h"
+#include "nsIDOMNode.h"
+#include "nsIXULCommand.h"
+
 #include "nsCOMPtr.h"
 
 /* Forward declarations.... */
@@ -32,11 +38,7 @@ class nsIURL;
 class nsIAppShell;
 class nsIWidget;
 class nsIWidgetController;
-class nsIDOMDocument;
-class nsIDOMNode;
-class nsIXULCommand;
 class nsIDOMCharacterData;
-class nsIDOMDocument;
 class nsIDOMHTMLInputElement;
 class nsIDOMHTMLImageElement;
 class nsIDOMElement;