Fix for bug 163955 (Header cleanup for transformiix). r=sicking, rs=jst.

content/xslt/src/base/txErrorObserver.h

@@ -27,10 +27,11 @@
 #define MITRE_ERROROBSERVER_H
 
 #include "baseutils.h"
-#include "TxString.h"
 #include "txError.h"
 #include <iostream.h>
 
+class String;
+
 /**
  * A simple interface for observing errors
 **/

content/xslt/src/base/txExpandedNameMap.h

@@ -39,9 +39,10 @@
 #ifndef TRANSFRMX_EXPANDEDNAMEMAP_H
 #define TRANSFRMX_EXPANDEDNAMEMAP_H
 
-#include "XMLUtils.h"
-#include "TxObject.h"
 #include "txError.h"
+#include "XMLUtils.h"
+
+class TxObject;
 
 class txExpandedNameMap {
 public:

content/xslt/src/base/txSimpleErrorObserver.cpp

@@ -24,6 +24,7 @@
  */
 
 #include "ErrorObserver.h"
+#include "TxString.h"
 
 /**
  * Creates a new SimpleErrorObserver.

content/xslt/src/xml/txXMLUtils.h

@@ -31,8 +31,8 @@
 #define MITRE_XMLUTILS_H
 
 #include "baseutils.h"
-#include "txAtom.h"
 #include "dom.h"
+#include "txAtom.h"
 #include "txError.h"
 
 class String;

content/xslt/src/xpath/nsXPathEvaluator.cpp

@@ -45,6 +45,7 @@
 #include "nsXPathNSResolver.h"
 #include "nsXPathResult.h"
 #include "nsContentCID.h"
+#include "Expr.h"
 #include "ExprParser.h"
 #include "nsDOMError.h"
 #include "txURIUtils.h"

content/xslt/src/xpath/nsXPathExpression.cpp

@@ -39,6 +39,7 @@
 
 #include "nsXPathExpression.h"
 #include "Expr.h"
+#include "ExprResult.h"
 #include "nsDOMError.h"
 #include "nsIDOMCharacterData.h"
 #include "nsIDOMClassInfo.h"

content/xslt/src/xpath/nsXPathResult.cpp

@@ -38,6 +38,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "nsXPathResult.h"
+#include "dom.h"
 #include "ExprResult.h"
 #include "NodeSet.h"
 #include "nsDOMError.h"

content/xslt/src/xpath/txBooleanExpr.cpp

@@ -35,6 +35,7 @@
 **/
 
 #include "Expr.h"
+#include "ExprResult.h"
 
 /**
  * Creates a new BooleanExpr using the given operator

content/xslt/src/xpath/txBooleanFunctionCall.cpp

@@ -27,6 +27,7 @@
  *
  */
 
+#include "ExprResult.h"
 #include "FunctionLib.h"
 #include "txAtoms.h"
 #include "txIXPathContext.h"

content/xslt/src/xpath/txExpr.h

@@ -35,24 +35,20 @@
 #ifndef TRANSFRMX_EXPR_H
 #define TRANSFRMX_EXPR_H
 
-#include "txError.h"
-#include "TxString.h"
-#include "ErrorObserver.h"
-#include "NodeSet.h"
-#include "Stack.h"
-#include "ExprResult.h"
 #include "baseutils.h"
+#include "dom.h"
+#include "List.h"
+#include "txAtom.h"
 #include "TxObject.h"
-#include "primitives.h"
+#include "TxString.h"
 
 /*
   XPath class definitions.
   Much of this code was ported from XSL:P.
 */
 
-/*
- * necessary prototypes
- */
+class ExprResult;
+class NodeSet;
 class txIParseContext;
 class txIMatchContext;
 class txIEvalContext;
@@ -138,7 +134,7 @@ public:
 
 protected:
 
-    List params;
+    txList params;
 
     FunctionCall();
 

content/xslt/src/xpath/txExprParser.cpp

@@ -39,8 +39,10 @@
 **/
 
 #include "ExprParser.h"
+#include "ExprLexer.h"
 #include "FunctionLib.h"
 #include "Names.h"
+#include "Stack.h"
 #include "txAtoms.h"
 #include "txIXPathContext.h"
 

content/xslt/src/xpath/txExprResult.h

@@ -28,8 +28,9 @@
 #ifndef TRANSFRMX_EXPRRESULT_H
 #define TRANSFRMX_EXPRRESULT_H
 
-#include "TxObject.h"
 #include "primitives.h"
+#include "TxObject.h"
+#include "TxString.h"
 
 /*
  * ExprResult

content/xslt/src/xpath/txFilterExpr.cpp

@@ -26,6 +26,7 @@
  */
 
 #include "Expr.h"
+#include "NodeSet.h"
 #include "txIXPathContext.h"
 
 //-- Implementation of FilterExpr --/

content/xslt/src/xpath/txFunctionCall.cpp

@@ -24,6 +24,7 @@
  */
 
 #include "Expr.h"
+#include "ExprResult.h"
 #include "txAtom.h"
 #include "txIXPathContext.h"
 

content/xslt/src/xpath/txLocationStep.cpp

@@ -28,6 +28,7 @@
 */
 
 #include "Expr.h"
+#include "NodeSet.h"
 #include "txIXPathContext.h"
 
 /**

content/xslt/src/xpath/txMultiplicativeExpr.cpp

@@ -36,7 +36,9 @@
 **/
 
 #include "Expr.h"
+#include "ExprResult.h"
 #include <math.h>
+#include "primitives.h"
 
 /**
  * Creates a new MultiplicativeExpr using the given operator

content/xslt/src/xpath/txPathExpr.cpp

@@ -32,9 +32,10 @@
  */
 
 #include "Expr.h"
-#include "XMLUtils.h"
+#include "Nodeset.h"
 #include "txNodeSetContext.h"
 #include "txSingleNodeContext.h"
+#include "XMLUtils.h"
 
   //------------/
  //- PathExpr -/

content/xslt/src/xpath/txRelationalExpr.cpp

@@ -28,6 +28,8 @@
  */
 
 #include "Expr.h"
+#include "NodeSet.h"
+#include "TxString.h"
 #include "XMLDOMUtils.h"
 
   //------------------/