diff --git a/mozilla/extensions/transformiix/source/base/Double.cpp b/mozilla/extensions/transformiix/source/base/Double.cpp
index 3c8c83386c2..8813395b3f1 100644
--- a/mozilla/extensions/transformiix/source/base/Double.cpp
+++ b/mozilla/extensions/transformiix/source/base/Double.cpp
@@ -36,7 +36,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "nsString.h"
-#include "primitives.h"
+#include "txCore.h"
 #include "XMLUtils.h"
 #include <math.h>
 #include <stdlib.h>
diff --git a/mozilla/extensions/transformiix/source/base/ErrorObserver.h b/mozilla/extensions/transformiix/source/base/ErrorObserver.h
index 28047056a0a..3927ed36d40 100644
--- a/mozilla/extensions/transformiix/source/base/ErrorObserver.h
+++ b/mozilla/extensions/transformiix/source/base/ErrorObserver.h
@@ -39,10 +39,10 @@
 #ifndef MITRE_ERROROBSERVER_H
 #define MITRE_ERROROBSERVER_H
 
-#include "baseutils.h"
-#include "txError.h"
+#include "txCore.h"
+#ifdef TX_EXE
 #include <iostream.h>
-class nsAString;
+#endif
 
 /**
  * A simple interface for observing errors
@@ -74,6 +74,7 @@ public:
 
 }; //-- ErrorObserver
 
+#ifdef TX_EXE
 /**
  * A simple ErrorObserver which allows printing error messages to a stream
 **/
@@ -109,3 +110,5 @@ private:
 }; //-- SimpleErrorObserver
 #endif
 
+#endif
+
diff --git a/mozilla/extensions/transformiix/source/base/List.h b/mozilla/extensions/transformiix/source/base/List.h
index 801c6a5d6fd..8b7fba13491 100644
--- a/mozilla/extensions/transformiix/source/base/List.h
+++ b/mozilla/extensions/transformiix/source/base/List.h
@@ -39,9 +39,7 @@
 #ifndef TRANSFRMX_LIST_H
 #define TRANSFRMX_LIST_H
 
-#include "baseutils.h"
-#include "TxObject.h"
-#include "txError.h"
+#include "txCore.h"
 
 class txListIterator;
 
diff --git a/mozilla/extensions/transformiix/source/base/TxObject.h b/mozilla/extensions/transformiix/source/base/TxObject.h
deleted file mode 100644
index 08ee31f4688..00000000000
--- a/mozilla/extensions/transformiix/source/base/TxObject.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is TransforMiiX XSLT processor code.
- *
- * The Initial Developer of the Original Code is
- * Keith Visco.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Keith Visco <kvisco@ziplink.net> (Original Author)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-
-#ifndef TRANSFRMX_TXOBJECT_H
-#define TRANSFRMX_TXOBJECT_H
-
-#include "baseutils.h"
-
-class TxObject {
-
- public:
-
-    /**
-     * Deletes this TxObject
-    **/
-    virtual ~TxObject() {};
-
-};
-
-#endif
diff --git a/mozilla/extensions/transformiix/source/base/baseutils.h b/mozilla/extensions/transformiix/source/base/baseutils.h
deleted file mode 100644
index 9d7e8109d46..00000000000
--- a/mozilla/extensions/transformiix/source/base/baseutils.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is TransforMiiX XSLT processor code.
- *
- * The Initial Developer of the Original Code is
- * The MITRE Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Keith Visco <kvisco@ziplink.net> (Original Author)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// Basic Definitions used throughout many of these classes
-
-
-#ifndef TRANSFRMX_BASEUTILS_H
-#define TRANSFRMX_BASEUTILS_H
-
-#include "prtypes.h"
-#include "nscore.h"
-#include "nsDebug.h"
-typedef PRBool MBool;
-
-#define MB_TRUE  PR_TRUE
-#define MB_FALSE PR_FALSE
-
-#endif
-
diff --git a/mozilla/extensions/transformiix/source/base/primitives.h b/mozilla/extensions/transformiix/source/base/txCore.h
similarity index 70%
rename from mozilla/extensions/transformiix/source/base/primitives.h
rename to mozilla/extensions/transformiix/source/base/txCore.h
index a7e91a70cbb..72f8ea31cab 100644
--- a/mozilla/extensions/transformiix/source/base/primitives.h
+++ b/mozilla/extensions/transformiix/source/base/txCore.h
@@ -20,6 +20,7 @@
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
+ *   Keith Visco <kvisco@ziplink.net> (Original Author)
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -35,53 +36,75 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef MITRE_PRIMITIVES_H
-#define MITRE_PRIMITIVES_H
+#ifndef __txCore_h__
+#define __txCore_h__
+
+#include "nscore.h"
+#include "nsDebug.h"
+#include "prtypes.h"
 
-#include "baseutils.h"
 class nsAString;
 
-/*
+class txObject
+{
+public:
+    /**
+     * Deletes this txObject
+    **/
+    virtual ~txObject()
+    {
+    };
+};
+
+/**
  * Utility class for doubles
  */
-class Double {
+class txDouble
+{
 public:
-
-    /*
-     * Usefull constants
+    /**
+     * Useful constants
      */
-
     static const double NaN;
     static const double POSITIVE_INFINITY;
     static const double NEGATIVE_INFINITY;
 
-    /*
-     * Determines whether the given double represents positive or negative
+    /**
+     * Determines whether the given double represents positive or negative.
      * inifinity
      */
-    static MBool isInfinite(double aDbl);
+    static PRBool isInfinite(double aDbl);
 
-    /*
-     * Determines whether the given double is NaN
+    /**
+     * Determines whether the given double is NaN.
      */
-    static MBool isNaN(double aDbl);
+    static PRBool isNaN(double aDbl);
 
-    /*
-     * Determines whether the given double is negative
+    /**
+     * Determines whether the given double is negative.
      */
-    static MBool isNeg(double aDbl);
+    static PRBool isNeg(double aDbl);
 
-    /*
-     * Converts the value of the given double to a String, and appends
-     * the result to the destination String.
+    /**
+     * Converts the value of the given double to a string, and appends
+     * the result to the destination string.
      */
     static void toString(double aValue, nsAString& aDest);
 
-    /*
-     * Converts the given String to a double, if the String value does not
+    /**
+     * Converts the given String to a double, if the string value does not
      * represent a double, NaN will be returned
      */
     static double toDouble(const nsAString& aStr);
 };
 
+// XXX These should go away eventually.
+#define TxObject txObject
+typedef txDouble Double;
+typedef PRBool MBool;
+
+#define MB_TRUE  PR_TRUE
+#define MB_FALSE PR_FALSE
+// XXX
+
 #endif
diff --git a/mozilla/extensions/transformiix/source/base/txExpandedNameMap.cpp b/mozilla/extensions/transformiix/source/base/txExpandedNameMap.cpp
index ba4d61857d1..5044e1502c1 100644
--- a/mozilla/extensions/transformiix/source/base/txExpandedNameMap.cpp
+++ b/mozilla/extensions/transformiix/source/base/txExpandedNameMap.cpp
@@ -37,7 +37,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "txExpandedNameMap.h"
-#include "TxObject.h"
+#include "txCore.h"
 #include <string.h>
 
 const int kTxExpandedNameMapAllocSize = 16;
diff --git a/mozilla/extensions/transformiix/source/base/txNamespaceMap.h b/mozilla/extensions/transformiix/source/base/txNamespaceMap.h
index e842c572630..040ab8a0bfc 100644
--- a/mozilla/extensions/transformiix/source/base/txNamespaceMap.h
+++ b/mozilla/extensions/transformiix/source/base/txNamespaceMap.h
@@ -39,8 +39,6 @@
 #ifndef TRANSFRMX_TXNAMESPACEMAP_H
 #define TRANSFRMX_TXNAMESPACEMAP_H
 
-#include "txError.h"
-#include "baseutils.h"
 #include "nsIAtom.h"
 #include "nsCOMArray.h"
 
diff --git a/mozilla/extensions/transformiix/source/base/txURIUtils.h b/mozilla/extensions/transformiix/source/base/txURIUtils.h
index 951c769b753..f9795b5b97e 100644
--- a/mozilla/extensions/transformiix/source/base/txURIUtils.h
+++ b/mozilla/extensions/transformiix/source/base/txURIUtils.h
@@ -38,15 +38,14 @@
 #ifndef TRANSFRMX_URIUTILS_H
 #define TRANSFRMX_URIUTILS_H
 
-#include "baseutils.h"
+#include "txCore.h"
 #ifdef TX_EXE
 #include <fstream.h>
 #include <iostream.h>
 #include "nsString.h"
 #else
-#include "nsIDOMNode.h"
-
 class nsIDocument;
+class nsIDOMNode;
 class nsIScriptSecurityManager;
 extern nsIScriptSecurityManager *gTxSecurityManager;
 
diff --git a/mozilla/extensions/transformiix/source/xml/XMLUtils.h b/mozilla/extensions/transformiix/source/xml/XMLUtils.h
index cb335377504..a16aec4c390 100644
--- a/mozilla/extensions/transformiix/source/xml/XMLUtils.h
+++ b/mozilla/extensions/transformiix/source/xml/XMLUtils.h
@@ -43,16 +43,16 @@
 #ifndef MITRE_XMLUTILS_H
 #define MITRE_XMLUTILS_H
 
-#include "baseutils.h"
+#include "txCore.h"
+#include "nsCOMPtr.h"
 #include "nsDependentSubstring.h"
-#include "nsIAtom.h"
-#include "txError.h"
 #include "txXPathNode.h"
 
 #ifndef TX_EXE
 #include "nsIParserService.h"
 #endif
 
+class nsIAtom;
 class txNamespaceMap;
 
 class txExpandedName {
diff --git a/mozilla/extensions/transformiix/source/xml/dom/standalone/dom.h b/mozilla/extensions/transformiix/source/xml/dom/standalone/dom.h
index 9cf22169874..5702c0bb287 100644
--- a/mozilla/extensions/transformiix/source/xml/dom/standalone/dom.h
+++ b/mozilla/extensions/transformiix/source/xml/dom/standalone/dom.h
@@ -55,10 +55,10 @@
 
 #include "List.h"
 #include "nsIAtom.h"
-#include "baseutils.h"
 #include "nsDoubleHashtable.h"
 #include "nsString.h"
 #include "nsVoidArray.h"
+#include "txCore.h"
 
 #define kTxNsNodeIndexOffset 0x00000000;
 #define kTxAttrIndexOffset 0x40000000;
diff --git a/mozilla/extensions/transformiix/source/xml/parser/txXMLParser.h b/mozilla/extensions/transformiix/source/xml/parser/txXMLParser.h
index d0240b25caa..ea12a929d17 100644
--- a/mozilla/extensions/transformiix/source/xml/parser/txXMLParser.h
+++ b/mozilla/extensions/transformiix/source/xml/parser/txXMLParser.h
@@ -39,13 +39,12 @@
 #ifndef MITRE_XMLPARSER_H
 #define MITRE_XMLPARSER_H
 
-#include "baseutils.h"
+#include "txCore.h"
 
 #ifdef TX_EXE
 #include <iostream.h>
 #endif
 
-class nsAString;
 class txXPathNode;
 
 /**
diff --git a/mozilla/extensions/transformiix/source/xpath/AdditiveExpr.cpp b/mozilla/extensions/transformiix/source/xpath/AdditiveExpr.cpp
index 4b30360ea97..e94c1ea325b 100644
--- a/mozilla/extensions/transformiix/source/xpath/AdditiveExpr.cpp
+++ b/mozilla/extensions/transformiix/source/xpath/AdditiveExpr.cpp
@@ -45,7 +45,6 @@
 
 #include "Expr.h"
 #include "ExprResult.h"
-#include "primitives.h"
 #include "txIXPathContext.h"
 
 /**
diff --git a/mozilla/extensions/transformiix/source/xpath/BooleanFunctionCall.cpp b/mozilla/extensions/transformiix/source/xpath/BooleanFunctionCall.cpp
index 78d5cdd4e0b..855261202cf 100644
--- a/mozilla/extensions/transformiix/source/xpath/BooleanFunctionCall.cpp
+++ b/mozilla/extensions/transformiix/source/xpath/BooleanFunctionCall.cpp
@@ -40,6 +40,7 @@
 #include "FunctionLib.h"
 #include "nsReadableUtils.h"
 #include "txAtoms.h"
+#include "txError.h"
 #include "txIXPathContext.h"
 #include "txStringUtils.h"
 #include "txXPathTreeWalker.h"
diff --git a/mozilla/extensions/transformiix/source/xpath/Expr.h b/mozilla/extensions/transformiix/source/xpath/Expr.h
index db01b42b183..ac503fe5b6a 100644
--- a/mozilla/extensions/transformiix/source/xpath/Expr.h
+++ b/mozilla/extensions/transformiix/source/xpath/Expr.h
@@ -41,13 +41,9 @@
 #ifndef TRANSFRMX_EXPR_H
 #define TRANSFRMX_EXPR_H
 
-#include "baseutils.h"
 #include "List.h"
-#include "nsString.h"
-#include "nsIAtom.h"
-#include "TxObject.h"
 #include "nsAutoPtr.h"
-#include "ExprResult.h"
+#include "txCore.h"
 
 #ifdef DEBUG
 #define TX_TO_STRING
@@ -58,6 +54,8 @@
   Much of this code was ported from XSL:P.
 */
 
+class nsIAtom;
+class txAExprResult;
 class txIParseContext;
 class txIMatchContext;
 class txIEvalContext;
diff --git a/mozilla/extensions/transformiix/source/xpath/ExprLexer.cpp b/mozilla/extensions/transformiix/source/xpath/ExprLexer.cpp
index 081a57ccbae..ccb5584a105 100644
--- a/mozilla/extensions/transformiix/source/xpath/ExprLexer.cpp
+++ b/mozilla/extensions/transformiix/source/xpath/ExprLexer.cpp
@@ -43,6 +43,7 @@
 #include "ExprLexer.h"
 #include "txAtoms.h"
 #include "nsString.h"
+#include "txError.h"
 #include "XMLUtils.h"
 
 /**
diff --git a/mozilla/extensions/transformiix/source/xpath/ExprLexer.h b/mozilla/extensions/transformiix/source/xpath/ExprLexer.h
index 25e8d8a6036..fbcb3118fbb 100644
--- a/mozilla/extensions/transformiix/source/xpath/ExprLexer.h
+++ b/mozilla/extensions/transformiix/source/xpath/ExprLexer.h
@@ -41,7 +41,7 @@
 #ifndef MITREXSL_EXPRLEXER_H
 #define MITREXSL_EXPRLEXER_H
 
-#include "baseutils.h"
+#include "txCore.h"
 #include "nsString.h"
 
 /**
diff --git a/mozilla/extensions/transformiix/source/xpath/ExprParser.cpp b/mozilla/extensions/transformiix/source/xpath/ExprParser.cpp
index f8280800156..b0859a0edbd 100644
--- a/mozilla/extensions/transformiix/source/xpath/ExprParser.cpp
+++ b/mozilla/extensions/transformiix/source/xpath/ExprParser.cpp
@@ -47,6 +47,7 @@
 #include "FunctionLib.h"
 #include "txStack.h"
 #include "txAtoms.h"
+#include "txError.h"
 #include "txIXPathContext.h"
 #include "txStringUtils.h"
 #include "txXPathNode.h"
diff --git a/mozilla/extensions/transformiix/source/xpath/ExprParser.h b/mozilla/extensions/transformiix/source/xpath/ExprParser.h
index 21e9589b385..bf0a7e846d6 100644
--- a/mozilla/extensions/transformiix/source/xpath/ExprParser.h
+++ b/mozilla/extensions/transformiix/source/xpath/ExprParser.h
@@ -45,19 +45,20 @@
 #ifndef MITREXSL_EXPRPARSER_H
 #define MITREXSL_EXPRPARSER_H
 
-#include "baseutils.h"
-#include "nsIAtom.h"
-#include "txError.h"
-#include "Expr.h"
+#include "txCore.h"
+#include "nsAutoPtr.h"
+#include "nsString.h"
 
 class AttributeValueTemplate;
 class Expr;
 class txExprLexer;
 class FunctionCall;
 class LocationStep;
+class nsIAtom;
 class PredicateList;
 class Token;
 class txIParseContext;
+class txNodeTest;
 class txNodeTypeTest;
 
 class txExprParser
diff --git a/mozilla/extensions/transformiix/source/xpath/ExprResult.h b/mozilla/extensions/transformiix/source/xpath/ExprResult.h
index 9492200f56e..82f1cbb40ad 100644
--- a/mozilla/extensions/transformiix/source/xpath/ExprResult.h
+++ b/mozilla/extensions/transformiix/source/xpath/ExprResult.h
@@ -40,11 +40,10 @@
 #ifndef TRANSFRMX_EXPRRESULT_H
 #define TRANSFRMX_EXPRRESULT_H
 
-#include "primitives.h"
-#include "TxObject.h"
 #include "nsString.h"
-#include "txResultRecycler.h"
 #include "nsAutoPtr.h"
+#include "txCore.h"
+#include "txResultRecycler.h"
 
 /*
  * ExprResult
diff --git a/mozilla/extensions/transformiix/source/xpath/FunctionLib.h b/mozilla/extensions/transformiix/source/xpath/FunctionLib.h
index 3d939a7601a..2a78704bd26 100644
--- a/mozilla/extensions/transformiix/source/xpath/FunctionLib.h
+++ b/mozilla/extensions/transformiix/source/xpath/FunctionLib.h
@@ -39,7 +39,6 @@
 #ifndef TRANSFRMX_FUNCTIONLIB_H
 #define TRANSFRMX_FUNCTIONLIB_H
 
-#include "primitives.h"
 #include "Expr.h"
 
 /**
diff --git a/mozilla/extensions/transformiix/source/xpath/MultiplicativeExpr.cpp b/mozilla/extensions/transformiix/source/xpath/MultiplicativeExpr.cpp
index 215e3dacfc1..6beff6c3f10 100644
--- a/mozilla/extensions/transformiix/source/xpath/MultiplicativeExpr.cpp
+++ b/mozilla/extensions/transformiix/source/xpath/MultiplicativeExpr.cpp
@@ -47,7 +47,6 @@
 #include "Expr.h"
 #include "ExprResult.h"
 #include <math.h>
-#include "primitives.h"
 #include "txIXPathContext.h"
 
 /**
diff --git a/mozilla/extensions/transformiix/source/xpath/StringFunctionCall.cpp b/mozilla/extensions/transformiix/source/xpath/StringFunctionCall.cpp
index 2fbb7622e1c..f9b66d2b830 100644
--- a/mozilla/extensions/transformiix/source/xpath/StringFunctionCall.cpp
+++ b/mozilla/extensions/transformiix/source/xpath/StringFunctionCall.cpp
@@ -44,6 +44,7 @@
 #include "ExprResult.h"
 #include "FunctionLib.h"
 #include "txAtoms.h"
+#include "txError.h"
 #include "txIXPathContext.h"
 #include "XMLUtils.h"
 #include "txXPathTreeWalker.h"
diff --git a/mozilla/extensions/transformiix/source/xpath/nsXPathEvaluator.cpp b/mozilla/extensions/transformiix/source/xpath/nsXPathEvaluator.cpp
index e3075e36947..de0adae9b53 100644
--- a/mozilla/extensions/transformiix/source/xpath/nsXPathEvaluator.cpp
+++ b/mozilla/extensions/transformiix/source/xpath/nsXPathEvaluator.cpp
@@ -51,6 +51,7 @@
 #include "nsIDocument.h"
 #include "nsIDOMDocument.h"
 #include "nsDOMString.h"
+#include "txError.h"
 
 extern nsINameSpaceManager* gTxNameSpaceManager;
 
diff --git a/mozilla/extensions/transformiix/source/xpath/txIXPathContext.h b/mozilla/extensions/transformiix/source/xpath/txIXPathContext.h
index 788a6d971aa..86ac85e581c 100644
--- a/mozilla/extensions/transformiix/source/xpath/txIXPathContext.h
+++ b/mozilla/extensions/transformiix/source/xpath/txIXPathContext.h
@@ -39,12 +39,9 @@
 #ifndef __TX_I_XPATH_CONTEXT
 #define __TX_I_XPATH_CONTEXT
 
-#include "baseutils.h"
-#include "nsIAtom.h"
-#include "txError.h"
+#include "txCore.h"
 
 class FunctionCall;
-class nsAString;
 class nsIAtom;
 class txAExprResult;
 class txResultRecycler;
diff --git a/mozilla/extensions/transformiix/source/xpath/txLiteralExpr.cpp b/mozilla/extensions/transformiix/source/xpath/txLiteralExpr.cpp
index f85e33b7a0b..7a608bd0428 100644
--- a/mozilla/extensions/transformiix/source/xpath/txLiteralExpr.cpp
+++ b/mozilla/extensions/transformiix/source/xpath/txLiteralExpr.cpp
@@ -37,6 +37,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "Expr.h"
+#include "ExprResult.h"
 
 txLiteralExpr::txLiteralExpr(double aDbl)
     : mValue(new NumberResult(aDbl, nsnull))
diff --git a/mozilla/extensions/transformiix/source/xpath/txXPathTreeWalker.h b/mozilla/extensions/transformiix/source/xpath/txXPathTreeWalker.h
index bcff158e558..25f485d0857 100644
--- a/mozilla/extensions/transformiix/source/xpath/txXPathTreeWalker.h
+++ b/mozilla/extensions/transformiix/source/xpath/txXPathTreeWalker.h
@@ -39,10 +39,9 @@
 #ifndef txXPathTreeWalker_h__
 #define txXPathTreeWalker_h__
 
-#include "baseutils.h"
+#include "txCore.h"
 #include "txXPathNode.h"
 
-class nsAString;
 class nsIAtom;
 
 #ifndef TX_EXE
diff --git a/mozilla/extensions/transformiix/source/xslt/functions/ElementAvailableFnCall.cpp b/mozilla/extensions/transformiix/source/xslt/functions/ElementAvailableFnCall.cpp
index 4004f61e10e..c27d7033022 100644
--- a/mozilla/extensions/transformiix/source/xslt/functions/ElementAvailableFnCall.cpp
+++ b/mozilla/extensions/transformiix/source/xslt/functions/ElementAvailableFnCall.cpp
@@ -38,6 +38,7 @@
 
 #include "txIXPathContext.h"
 #include "txAtoms.h"
+#include "txError.h"
 #include "XMLUtils.h"
 #include "XSLTFunctions.h"
 #include "ExprResult.h"
diff --git a/mozilla/extensions/transformiix/source/xslt/functions/FunctionAvailableFnCall.cpp b/mozilla/extensions/transformiix/source/xslt/functions/FunctionAvailableFnCall.cpp
index 17b85d9bcf2..2187c461b08 100644
--- a/mozilla/extensions/transformiix/source/xslt/functions/FunctionAvailableFnCall.cpp
+++ b/mozilla/extensions/transformiix/source/xslt/functions/FunctionAvailableFnCall.cpp
@@ -39,6 +39,7 @@
 #include "txIXPathContext.h"
 #include "ExprResult.h"
 #include "txAtoms.h"
+#include "txError.h"
 #include "XMLUtils.h"
 #include "XSLTFunctions.h"
 #include "txNamespaceMap.h"
diff --git a/mozilla/extensions/transformiix/source/xslt/functions/SystemPropertyFunctionCall.cpp b/mozilla/extensions/transformiix/source/xslt/functions/SystemPropertyFunctionCall.cpp
index 2c40f9a4be2..2542f9b0d70 100644
--- a/mozilla/extensions/transformiix/source/xslt/functions/SystemPropertyFunctionCall.cpp
+++ b/mozilla/extensions/transformiix/source/xslt/functions/SystemPropertyFunctionCall.cpp
@@ -1,5 +1,45 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is TransforMiiX XSLT processor code.
+ *
+ * The Initial Developer of the Original Code is
+ * Axel Hecht.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Axel Hecht <axel@pike.org>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
 #include "txIXPathContext.h"
 #include "txAtoms.h"
+#include "txError.h"
 #include "XMLUtils.h"
 #include "XSLTFunctions.h"
 #include "ExprResult.h"
diff --git a/mozilla/extensions/transformiix/source/xslt/functions/txFormatNumberFunctionCall.cpp b/mozilla/extensions/transformiix/source/xslt/functions/txFormatNumberFunctionCall.cpp
index 690cc114f8f..d55fcd035ad 100644
--- a/mozilla/extensions/transformiix/source/xslt/functions/txFormatNumberFunctionCall.cpp
+++ b/mozilla/extensions/transformiix/source/xslt/functions/txFormatNumberFunctionCall.cpp
@@ -37,7 +37,6 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "XSLTFunctions.h"
-#include "primitives.h"
 #include "txAtoms.h"
 #include "txIXPathContext.h"
 #include "txStylesheet.h"
diff --git a/mozilla/extensions/transformiix/source/xslt/txExecutionState.h b/mozilla/extensions/transformiix/source/xslt/txExecutionState.h
index 4c82d900e76..ef0e8966329 100644
--- a/mozilla/extensions/transformiix/source/xslt/txExecutionState.h
+++ b/mozilla/extensions/transformiix/source/xslt/txExecutionState.h
@@ -39,9 +39,7 @@
 #ifndef TRANSFRMX_TXEXECUTIONSTATE_H
 #define TRANSFRMX_TXEXECUTIONSTATE_H
 
-#include "txError.h"
-#include "baseutils.h"
-#include "txXMLEventHandler.h"
+#include "txCore.h"
 #include "txStack.h"
 #include "XMLUtils.h"
 #include "nsVoidArray.h"
@@ -52,6 +50,8 @@
 #include "txKey.h"
 #include "txStylesheet.h"
 
+class txAOutputHandlerFactory;
+class txAXMLEventHandler;
 class txInstruction;
 class txIOutputHandlerFactory;
 class txExpandedNameMap;
diff --git a/mozilla/extensions/transformiix/source/xslt/txInstructions.h b/mozilla/extensions/transformiix/source/xslt/txInstructions.h
index 7ff9025aa3d..a82f7dcb250 100644
--- a/mozilla/extensions/transformiix/source/xslt/txInstructions.h
+++ b/mozilla/extensions/transformiix/source/xslt/txInstructions.h
@@ -39,9 +39,8 @@
 #ifndef TRANSFRMX_TXINSTRUCTIONS_H
 #define TRANSFRMX_TXINSTRUCTIONS_H
 
-#include "txError.h"
 #include "nsCOMPtr.h"
-#include "TxObject.h"
+#include "txCore.h"
 #include "nsString.h"
 #include "XMLUtils.h"
 #include "txNamespaceMap.h"
diff --git a/mozilla/extensions/transformiix/source/xslt/txMozillaStylesheetCompiler.cpp b/mozilla/extensions/transformiix/source/xslt/txMozillaStylesheetCompiler.cpp
index b714eee289a..8ee44bf6e5c 100644
--- a/mozilla/extensions/transformiix/source/xslt/txMozillaStylesheetCompiler.cpp
+++ b/mozilla/extensions/transformiix/source/xslt/txMozillaStylesheetCompiler.cpp
@@ -62,6 +62,7 @@
 #include "nsNetUtil.h"
 #include "nsParserCIID.h"
 #include "txAtoms.h"
+#include "TxLog.h"
 #include "txMozillaXSLTProcessor.h"
 #include "txStylesheetCompiler.h"
 #include "XMLUtils.h"
diff --git a/mozilla/extensions/transformiix/source/xslt/txOutputFormat.h b/mozilla/extensions/transformiix/source/xslt/txOutputFormat.h
index 7a7f3e7b684..4d6f35c5340 100644
--- a/mozilla/extensions/transformiix/source/xslt/txOutputFormat.h
+++ b/mozilla/extensions/transformiix/source/xslt/txOutputFormat.h
@@ -39,7 +39,6 @@
 #ifndef TRANSFRMX_OUTPUTFORMAT_H
 #define TRANSFRMX_OUTPUTFORMAT_H
 
-#include "baseutils.h"
 #include "List.h"
 #include "nsString.h"
 
diff --git a/mozilla/extensions/transformiix/source/xslt/txPatternParser.cpp b/mozilla/extensions/transformiix/source/xslt/txPatternParser.cpp
index b9a245720f1..fd465d05aa8 100644
--- a/mozilla/extensions/transformiix/source/xslt/txPatternParser.cpp
+++ b/mozilla/extensions/transformiix/source/xslt/txPatternParser.cpp
@@ -39,6 +39,7 @@
 #include "txPatternParser.h"
 #include "ExprLexer.h"
 #include "txAtoms.h"
+#include "txError.h"
 #include "txStringUtils.h"
 #include "txXSLTPatterns.h"
 #include "txIXPathContext.h"
diff --git a/mozilla/extensions/transformiix/source/xslt/txStandaloneStylesheetCompiler.cpp b/mozilla/extensions/transformiix/source/xslt/txStandaloneStylesheetCompiler.cpp
index b9512a778a6..96bd830b051 100644
--- a/mozilla/extensions/transformiix/source/xslt/txStandaloneStylesheetCompiler.cpp
+++ b/mozilla/extensions/transformiix/source/xslt/txStandaloneStylesheetCompiler.cpp
@@ -37,6 +37,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "txStandaloneStylesheetCompiler.h"
+#include "TxLog.h"
 #include "txStylesheetCompiler.h"
 #include "txURIUtils.h"
 #include "xmlparse.h"
diff --git a/mozilla/extensions/transformiix/source/xslt/txStylesheet.cpp b/mozilla/extensions/transformiix/source/xslt/txStylesheet.cpp
index a1b5bbb5485..674dd1fa343 100644
--- a/mozilla/extensions/transformiix/source/xslt/txStylesheet.cpp
+++ b/mozilla/extensions/transformiix/source/xslt/txStylesheet.cpp
@@ -41,7 +41,6 @@
 #include "txXSLTPatterns.h"
 #include "txToplevelItems.h"
 #include "txInstructions.h"
-#include "primitives.h"
 #include "XSLTFunctions.h"
 #include "TxLog.h"
 #include "txKey.h"
diff --git a/mozilla/extensions/transformiix/source/xslt/txStylesheetCompileHandlers.cpp b/mozilla/extensions/transformiix/source/xslt/txStylesheetCompileHandlers.cpp
index 93a6471c026..94a982bc124 100644
--- a/mozilla/extensions/transformiix/source/xslt/txStylesheetCompileHandlers.cpp
+++ b/mozilla/extensions/transformiix/source/xslt/txStylesheetCompileHandlers.cpp
@@ -41,7 +41,7 @@
 #include "txTokenizer.h"
 #include "txInstructions.h"
 #include "txAtoms.h"
-#include "primitives.h"
+#include "txCore.h"
 #include "txStringUtils.h"
 #include "txStylesheet.h"
 #include "txToplevelItems.h"
diff --git a/mozilla/extensions/transformiix/source/xslt/txStylesheetCompiler.cpp b/mozilla/extensions/transformiix/source/xslt/txStylesheetCompiler.cpp
index ccd35eb2547..048645c0502 100644
--- a/mozilla/extensions/transformiix/source/xslt/txStylesheetCompiler.cpp
+++ b/mozilla/extensions/transformiix/source/xslt/txStylesheetCompiler.cpp
@@ -45,6 +45,7 @@
 #include "txInstructions.h"
 #include "txToplevelItems.h"
 #include "ExprParser.h"
+#include "TxLog.h"
 #include "txPatternParser.h"
 #include "txStringUtils.h"
 #include "XSLTFunctions.h"
diff --git a/mozilla/extensions/transformiix/source/xslt/txStylesheetCompiler.h b/mozilla/extensions/transformiix/source/xslt/txStylesheetCompiler.h
index 7747099f27e..6d387e6cf57 100644
--- a/mozilla/extensions/transformiix/source/xslt/txStylesheetCompiler.h
+++ b/mozilla/extensions/transformiix/source/xslt/txStylesheetCompiler.h
@@ -39,16 +39,12 @@
 #ifndef TRANSFRMX_TXSTYLESHEETCOMPILER_H
 #define TRANSFRMX_TXSTYLESHEETCOMPILER_H
 
-#include "baseutils.h"
-#include "txError.h"
 #include "txStack.h"
 #include "txXSLTPatterns.h"
 #include "Expr.h"
-#include "XMLUtils.h"
 #include "txIXPathContext.h"
 #include "nsAutoPtr.h"
 #include "txStylesheet.h"
-#include "TxLog.h"
 
 class txHandlerTable;
 class txElementContext;
diff --git a/mozilla/extensions/transformiix/source/xslt/txXMLEventHandler.h b/mozilla/extensions/transformiix/source/xslt/txXMLEventHandler.h
index 05fc0b46590..23762b9657c 100644
--- a/mozilla/extensions/transformiix/source/xslt/txXMLEventHandler.h
+++ b/mozilla/extensions/transformiix/source/xslt/txXMLEventHandler.h
@@ -39,10 +39,8 @@
 #ifndef TRANSFRMX_XML_EVENT_HANDLER_H
 #define TRANSFRMX_XML_EVENT_HANDLER_H
 
-#include "baseutils.h"
-#include "txError.h"
+#include "txCore.h"
 
-class nsAString;
 class txOutputFormat;
 
 #ifdef TX_EXE
diff --git a/mozilla/extensions/transformiix/source/xslt/txXSLTNumber.cpp b/mozilla/extensions/transformiix/source/xslt/txXSLTNumber.cpp
index 13815f6ffdb..efc128e2eae 100644
--- a/mozilla/extensions/transformiix/source/xslt/txXSLTNumber.cpp
+++ b/mozilla/extensions/transformiix/source/xslt/txXSLTNumber.cpp
@@ -38,7 +38,7 @@
 
 #include "txXSLTNumber.h"
 #include "txAtoms.h"
-#include "primitives.h"
+#include "txCore.h"
 #include <math.h>
 #include "Expr.h"
 #include "ExprResult.h"
diff --git a/mozilla/extensions/transformiix/source/xslt/txXSLTNumberCounters.cpp b/mozilla/extensions/transformiix/source/xslt/txXSLTNumberCounters.cpp
index 1a89abddff0..9c8e6d720ac 100644
--- a/mozilla/extensions/transformiix/source/xslt/txXSLTNumberCounters.cpp
+++ b/mozilla/extensions/transformiix/source/xslt/txXSLTNumberCounters.cpp
@@ -38,7 +38,7 @@
 
 #include "txXSLTNumber.h"
 #include "nsReadableUtils.h"
-#include "primitives.h"
+#include "txCore.h"
 
 class txDecimalCounter : public txFormattedCounter {
 public:
diff --git a/mozilla/extensions/transformiix/source/xslt/util/txNodeSorter.h b/mozilla/extensions/transformiix/source/xslt/util/txNodeSorter.h
index e1181dfab34..6b4eea79624 100644
--- a/mozilla/extensions/transformiix/source/xslt/util/txNodeSorter.h
+++ b/mozilla/extensions/transformiix/source/xslt/util/txNodeSorter.h
@@ -40,12 +40,9 @@
 #ifndef TRANSFRMX_NODESORTER_H
 #define TRANSFRMX_NODESORTER_H
 
-#include "baseutils.h"
+#include "txCore.h"
 #include "List.h"
-#include "nsIAtom.h"
-#include "txXPathNode.h"
 
-class Element;
 class Expr;
 class txExecutionState;
 class txNodeSet;
diff --git a/mozilla/extensions/transformiix/source/xslt/util/txXPathResultComparator.cpp b/mozilla/extensions/transformiix/source/xslt/util/txXPathResultComparator.cpp
index 8378be67204..ba1904d5c96 100644
--- a/mozilla/extensions/transformiix/source/xslt/util/txXPathResultComparator.cpp
+++ b/mozilla/extensions/transformiix/source/xslt/util/txXPathResultComparator.cpp
@@ -40,7 +40,7 @@
 #include "txXPathResultComparator.h"
 #include "Expr.h"
 #include "ExprResult.h"
-#include "primitives.h"
+#include "txCore.h"
 #ifndef TX_EXE
 #include "nsCollationCID.h"
 #include "nsILocale.h"
diff --git a/mozilla/extensions/transformiix/source/xslt/util/txXPathResultComparator.h b/mozilla/extensions/transformiix/source/xslt/util/txXPathResultComparator.h
index 1e567147d6f..bff621b9902 100644
--- a/mozilla/extensions/transformiix/source/xslt/util/txXPathResultComparator.h
+++ b/mozilla/extensions/transformiix/source/xslt/util/txXPathResultComparator.h
@@ -40,7 +40,7 @@
 #ifndef TRANSFRMX_XPATHRESULTCOMPARATOR_H
 #define TRANSFRMX_XPATHRESULTCOMPARATOR_H
 
-#include "TxObject.h"
+#include "txCore.h"
 #ifndef TX_EXE
 #include "nsCOMPtr.h"
 #include "nsICollation.h"