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

content/xslt/src/xpath/txAttributeValueTemplate.cpp

@@ -28,6 +28,7 @@
 **/
 
 #include "Expr.h"
+#include "ExprResult.h"
 
 /**
  * Create a new AttributeValueTemplate

content/xslt/src/xpath/txForwardContext.cpp

@@ -37,7 +37,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "txForwardContext.h"
-#include "Nodeset.h"
+#include "NodeSet.h"
 
 Node* txForwardContext::getContextNode()
 {

content/xslt/src/xpath/txForwardContext.h

@@ -41,6 +41,8 @@
 
 #include "txIXPathContext.h"
 
+class NodeSet;
+
 class txForwardContext : public txIEvalContext
 {
 public:

content/xslt/src/xpath/txNodeSetContext.cpp

@@ -37,6 +37,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "txNodeSetContext.h"
+#include "NodeSet.h"
 
 Node* txNodeSetContext::getContextNode()
 {

content/xslt/src/xpath/txNodeSetContext.h

@@ -41,6 +41,8 @@
 
 #include "txIXPathContext.h"
 
+class NodeSet;
+
 class txNodeSetContext : public txIEvalContext
 {
 public:

content/xslt/src/xpath/txRootExpr.cpp

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

content/xslt/src/xslt/txRtfHandler.cpp

@@ -37,6 +37,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "txRtfHandler.h"
+#include "dom.h"
 
 txRtfHandler::txRtfHandler(Document* aDocument,
                            txResultTreeFragment* aResultTreeFragment) :

content/xslt/src/xslt/txRtfHandler.h

@@ -42,6 +42,9 @@
 #include "txXMLEventHandler.h"
 #include "NodeSet.h"
 
+class Document;
+class Node;
+
 class txRtfHandler : public txXMLEventHandler
 {
 public:

content/xslt/src/xslt/txXPathResultComparator.cpp

@@ -39,7 +39,8 @@
 
 #include "txXPathResultComparator.h"
 #include "Expr.h"
-#include "txNodeSorter.h"
+#include "ExprResult.h"
+#include "primitives.h"
 #ifndef TX_EXE
 #include "nsCollationCID.h"
 #include "nsILocale.h"

content/xslt/src/xslt/txXSLTFunctions.h

@@ -32,9 +32,8 @@
 #define TRANSFRMX_XSLT_FUNCTIONS_H
 
 #include "Expr.h"
-#include "TxString.h"
 #include "Map.h"
-#include "ExprResult.h"
+#include "NodeSet.h"
 
 class NamedMap;
 class ProcessorState;